From 16ede1baabaac50bea8f7762542e7cb61f3b35c5 Mon Sep 17 00:00:00 2001 From: lucian929 Date: Wed, 2 Feb 2022 00:27:47 -0500 Subject: [PATCH 1/3] Modify default files --- build.gradle.kts | 4 ++-- src/main/resources/menus/dye-menu.yml | 4 +++- src/main/resources/menus/main.yml | 16 ++++++++++++---- src/main/resources/messages.yml | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 9a13f5e6..185afda1 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,8 +7,8 @@ plugins { } group = "io.github.fisher2911" -version = "1.6.2" -description = "The ultimate cosmetic plugin for your server." +version = "1.7.0" +description = "Intuitive, easy-to-use cosmetics plugin, designed for servers using resource packs.\n" repositories { mavenCentral() diff --git a/src/main/resources/menus/dye-menu.yml b/src/main/resources/menus/dye-menu.yml index f42de906..d6a664c3 100644 --- a/src/main/resources/menus/dye-menu.yml +++ b/src/main/resources/menus/dye-menu.yml @@ -95,4 +95,6 @@ items: name: "<#F7DCFA>Previous Page" amount: 1 model-data: 1 - open-menu: main \ No newline at end of file + action: # See how the action system works on the wiki + any: + open-menu: main \ No newline at end of file diff --git a/src/main/resources/menus/main.yml b/src/main/resources/menus/main.yml index 0766cd5c..c22801c8 100644 --- a/src/main/resources/menus/main.yml +++ b/src/main/resources/menus/main.yml @@ -18,7 +18,9 @@ items: red: 5 green: 230 blue: 100 - open-menu: dye-menu # Automatically open the dye menu when applying this cosmetic + action: # See how the action system works on the wiki + any: + open-menu: dye-menu permission: "cosmetics.colorful_hat" # Can be anything you want. id: colorful_hat # Internal identifier. Can be anything you want. 2: @@ -68,16 +70,22 @@ items: name: "<#40B7D6>Previous Page" amount: 1 model-data: 1 - open-menu: menu-2 + action: + any: + open-menu: menu-2 40: material: PAPER name: "Customization Menu" amount: 1 model-data: 3 - open-menu: dye-menu + action: + any: + open-menu: dye-menu 43: material: PAPER name: "<#40B7D6>Next Page" amount: 1 model-data: 2 - open-menu: menu-2 + action: + any: + open-menu: menu-2 \ No newline at end of file diff --git a/src/main/resources/messages.yml b/src/main/resources/messages.yml index 5d167fba..458018b4 100644 --- a/src/main/resources/messages.yml +++ b/src/main/resources/messages.yml @@ -18,7 +18,7 @@ help-command: "<#6D9DC5> - <#40B7D6>/cosmetics - <#6D9DC5>Opens cosmetics GUI. -<#5AE4B5>- <#40B7D6>/cosmetics add - <#6D9DC5>Adds cosmetic to player. +<#5AE4B5>- <#40B7D6>/cosmetics add (#HEX) - <#6D9DC5>Adds cosmetic to player. <#5AE4B5>- <#40B7D6>/cosmetics remove - <#6D9DC5>Removes cosmetic from a player. From 0c54f52785318eadf98f77e0ab43f0000fce3a7d Mon Sep 17 00:00:00 2001 From: Skyslycer Date: Wed, 2 Feb 2022 18:55:23 +0100 Subject: [PATCH 2/3] fix async event calling --- build.gradle.kts | 2 +- .../hmccosmetics/user/UserManager.java | 28 ++++++++++--------- 2 files changed, 16 insertions(+), 14 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3ed3dc1e..6121ff4c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "io.github.fisher2911" -version = "1.6.2" +version = "1.6.3" description = "The ultimate cosmetic plugin for your server." repositories { diff --git a/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java b/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java index 98103ee8..0155aceb 100644 --- a/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java +++ b/src/main/java/io/github/fisher2911/hmccosmetics/user/UserManager.java @@ -192,21 +192,23 @@ public class UserManager { } public void setItem(final User user, final ArmorItem armorItem) { - ArmorItem previous = user.getPlayerArmor().getItem(armorItem.getType()); + Bukkit.getScheduler().runTask(plugin, () -> { + ArmorItem previous = user.getPlayerArmor().getItem(armorItem.getType()); - final CosmeticChangeEvent event = - new CosmeticChangeEvent(new CosmeticItem(armorItem.copy()), - new CosmeticItem(previous.copy()), user); - Bukkit.getPluginManager().callEvent(event); - if (event.isCancelled()) { - return; - } - - user.setItem(event.getCosmeticItem().getArmorItem()); - Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> { - switch (armorItem.getType()) { - case HAT, OFF_HAND -> this.updateCosmetics(user); + final CosmeticChangeEvent event = + new CosmeticChangeEvent(new CosmeticItem(armorItem.copy()), + new CosmeticItem(previous.copy()), user); + Bukkit.getPluginManager().callEvent(event); + if (event.isCancelled()) { + return; } + + user.setItem(event.getCosmeticItem().getArmorItem()); + Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> { + switch (armorItem.getType()) { + case HAT, OFF_HAND -> this.updateCosmetics(user); + } + }); }); } From 231dcc163e8491001b4f099d5dd6c9b086a5e7f0 Mon Sep 17 00:00:00 2001 From: Skyslycer Date: Wed, 2 Feb 2022 19:01:49 +0100 Subject: [PATCH 3/3] bump version --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 185afda1..fc962fde 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -7,7 +7,7 @@ plugins { } group = "io.github.fisher2911" -version = "1.7.0" +version = "1.7.1" description = "Intuitive, easy-to-use cosmetics plugin, designed for servers using resource packs.\n" repositories {