From 568cb99cf164a8f0fcdf75d41b99f5661428b2e8 Mon Sep 17 00:00:00 2001 From: XiaoMoMi <972454774@qq.com> Date: Thu, 27 Jul 2023 01:04:21 +0800 Subject: [PATCH] 2.2.3.3 --- build.gradle | 2 +- .../command/AbstractMainCommand.java | 3 +-- .../command/subcmd/NameplatesListCommand.java | 3 +-- .../manager/ChatBubblesManager.java | 2 +- .../placeholders/NameplatePlaceholders.java | 11 +++++++++-- .../assets/minecraft/textures/gui/bars.png | Bin 1376 -> 3759 bytes src/main/resources/messages/english.yml | 4 ++-- 7 files changed, 15 insertions(+), 10 deletions(-) diff --git a/build.gradle b/build.gradle index 6dd7a9e..60cd592 100644 --- a/build.gradle +++ b/build.gradle @@ -4,7 +4,7 @@ plugins { } group = 'net.momirealms' -version = '2.2.3.2' +version = '2.2.3.3' repositories { maven {name = "aliyun-repo"; url = "https://maven.aliyun.com/repository/public/"} diff --git a/src/main/java/net/momirealms/customnameplates/command/AbstractMainCommand.java b/src/main/java/net/momirealms/customnameplates/command/AbstractMainCommand.java index b0085e3..8fb1b5d 100644 --- a/src/main/java/net/momirealms/customnameplates/command/AbstractMainCommand.java +++ b/src/main/java/net/momirealms/customnameplates/command/AbstractMainCommand.java @@ -50,8 +50,7 @@ public abstract class AbstractMainCommand implements TabExecutor { return true; } return subCommand.onCommand(sender, argList.subList(1, argList.size())); - } - else { + } else { AdventureUtils.sendMessage(sender, MessageManager.prefix + MessageManager.unavailableArgs); return true; } diff --git a/src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesListCommand.java b/src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesListCommand.java index 1993b7e..bce5484 100644 --- a/src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesListCommand.java +++ b/src/main/java/net/momirealms/customnameplates/command/subcmd/NameplatesListCommand.java @@ -46,8 +46,7 @@ public class NameplatesListCommand extends AbstractSubCommand { stringJoiner.add(availableNameplate); } AdventureUtils.playerMessage(player, MessageManager.prefix + MessageManager.np_available.replace("{Nameplates}", stringJoiner.toString())); - } - else { + } else { AdventureUtils.playerMessage(player, MessageManager.prefix + MessageManager.np_haveNone); } return true; diff --git a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java index b977ac2..3988e15 100644 --- a/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java +++ b/src/main/java/net/momirealms/customnameplates/manager/ChatBubblesManager.java @@ -272,7 +272,7 @@ public class ChatBubblesManager extends Function { for (int i = 0; i < split.length; i++) { int finalI = i; String finalBubble = bubble; - plugin.getScheduler().runTaskAsyncLater(() -> sendBubble(player, split[finalI], bubbleConfig, finalBubble), (long) i * coolDown / 50); + plugin.getScheduler().runTaskAsyncLater(() -> sendBubble(player, split[finalI], bubbleConfig, finalBubble), (long) i * (coolDown / 50) + 1); } } diff --git a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java index c22c675..bb13c64 100644 --- a/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java +++ b/src/main/java/net/momirealms/customnameplates/object/placeholders/NameplatePlaceholders.java @@ -226,8 +226,15 @@ public class NameplatePlaceholders extends PlaceholderExpansion { private String getVanilla(String param, Player player) { VanillaHud vanillaHud = placeholderManager.getVanillaHud(param); if (vanillaHud == null) return param + " NOT FOUND"; - double current = Double.parseDouble(PlaceholderAPI.setPlaceholders(player, vanillaHud.papi())); - double max = Double.parseDouble(PlaceholderAPI.setPlaceholders(player, vanillaHud.max())); + double current; + double max; + try { + current= Double.parseDouble(PlaceholderAPI.setPlaceholders(player, vanillaHud.papi())); + max = Double.parseDouble(PlaceholderAPI.setPlaceholders(player, vanillaHud.max())); + } catch (NumberFormatException e) { + current = 1; + max = 1; + } int point = (int) ((current / max) * 20); int full_amount = point / 2; int half_amount = point % 2; diff --git a/src/main/resources/ResourcePack/assets/minecraft/textures/gui/bars.png b/src/main/resources/ResourcePack/assets/minecraft/textures/gui/bars.png index cae6651406a4b633ce6aa2f732438d080a8e22db..35428df352fb5882d5e6e39a6763a627fcabf4f9 100644 GIT binary patch literal 3759 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 LmGar9=*)it_=Rt^ literal 1376 zcmd6m|5MX-9LJvp-4p4r z4T$u5{qpj%(P#`<0*Z`mBXDVHX)l)0Z481GMk9(Uu|y*T-$4kWkXB(Jt*$WbfQbgj zRWNy*fLfEl8TJDBLLk6a!N%h#h8SUD8duO71ThbCB?n4G%dt-`m%Au|XeEsRO1UTK zn6n)CkV2~3k$|TG27|$yf|~Z#YV0B?d=v|Vn;L3gP|t#J1A$#as0~5D8-`~PGow0po&OPXq%fk6SJzE9RBXx>lZqs zcT-l`Ya`zu`>Z#Y^Y_X^XyDXc{?+`xr_P-{#<>&J?>9iali+lGqMPLVn|%FS?H2xW z%Uc^=^o#FEJ(}S(^JB*IO{Jg-Qjd=6H{kahpxO3z-7hx8QI*u;=?-||D3I7 zw|-temgeok3)j01G3x!R6^+Ar^#d~f@<^~|EhUv%7rD{_2Nw(br0*H=ep_u6_fr%p#S zl?4Y|1~~^Sgb@*2H$5o7aVS-$)qAuK*#6SL4E4e3y(H!~N#&PUha*oVGPBEm_ZyIh zU$Gxzh;U(Ctm0ieH_v1AUh}`bJf&drqrPewb8r|))`yJ^k~iDz-bX%N-yUmUX(UUw zQLKgWue11-`|>vy!n$b9kM9_*BAh(}d6Y<53LIeOxJ=?Y!Xq7W1=9-^gT3M8Yi+b1(+e*GQ z_nfHCvE{m%^;}z9ZV$6%`hKG!XtG}tn^YB5DOsJ7grA}>gBj<This nameplate does not exist!' not-available-nameplates: 'This nameplate is currently not available!' available-nameplates: 'Available nameplates: {Nameplates}.' - have-no-nameplates: 'You don''t have any nameplates yet' + have-no-nameplates: 'You don''t have any nameplate yet' equip-bubbles: 'Successfully equipped chatting bubbles {Bubble}' force-equip-bubbles: 'Successfully equipped chatting bubbles {Bubbles}' @@ -29,4 +29,4 @@ messages: not-exist-bubbles: 'This bubble does not exist!' not-available-bubbles: 'This bubble is currently not available!' available-bubbles: 'Available bubbles: {Bubbles}' - have-no-bubbles: 'You don''t have any bubbles yet' \ No newline at end of file + have-no-bubbles: 'You don''t have any bubble yet' \ No newline at end of file