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 cae6651..35428df 100644 Binary files a/src/main/resources/ResourcePack/assets/minecraft/textures/gui/bars.png and b/src/main/resources/ResourcePack/assets/minecraft/textures/gui/bars.png differ diff --git a/src/main/resources/messages/english.yml b/src/main/resources/messages/english.yml index e436bba..cab94f9 100644 --- a/src/main/resources/messages/english.yml +++ b/src/main/resources/messages/english.yml @@ -20,7 +20,7 @@ messages: not-exist-nameplates: '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