From 932ae61733d9b809d15187f2d62b9a98439b99a6 Mon Sep 17 00:00:00 2001 From: Esophose Date: Fri, 17 Jan 2020 03:53:54 -0700 Subject: [PATCH] Bug fixes --- .../command/DataCommandModule.java | 2 +- .../command/GUICommandModule.java | 2 +- .../command/HelpCommandModule.java | 2 +- .../command/VersionCommandModule.java | 2 +- .../command/WorldsCommandModule.java | 8 +++--- .../manager/ConfigurationManager.java | 25 ++++++++----------- .../manager/LocaleManager.java | 2 +- .../manager/ParticleGroupPresetManager.java | 5 +++- .../particles/ParticleGroupPreset.java | 5 ++-- src/main/resources/plugin.yml | 1 - 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/src/main/java/dev/esophose/playerparticles/command/DataCommandModule.java b/src/main/java/dev/esophose/playerparticles/command/DataCommandModule.java index 09a0067..10d5a55 100644 --- a/src/main/java/dev/esophose/playerparticles/command/DataCommandModule.java +++ b/src/main/java/dev/esophose/playerparticles/command/DataCommandModule.java @@ -73,7 +73,7 @@ public class DataCommandModule implements CommandModule { } public boolean canConsoleExecute() { - return false; + return true; } } diff --git a/src/main/java/dev/esophose/playerparticles/command/GUICommandModule.java b/src/main/java/dev/esophose/playerparticles/command/GUICommandModule.java index d1e90b2..5c4dd23 100644 --- a/src/main/java/dev/esophose/playerparticles/command/GUICommandModule.java +++ b/src/main/java/dev/esophose/playerparticles/command/GUICommandModule.java @@ -17,7 +17,7 @@ public class GUICommandModule implements CommandModule { GuiManager guiManager = PlayerParticles.getInstance().getManager(GuiManager.class); if (!permissionManager.canOpenGui(pplayer)) { - localeManager.sendMessage(pplayer, "command-no-permission"); + localeManager.sendMessage(pplayer, "gui-no-permission"); return; } diff --git a/src/main/java/dev/esophose/playerparticles/command/HelpCommandModule.java b/src/main/java/dev/esophose/playerparticles/command/HelpCommandModule.java index 19f1421..ab216e8 100644 --- a/src/main/java/dev/esophose/playerparticles/command/HelpCommandModule.java +++ b/src/main/java/dev/esophose/playerparticles/command/HelpCommandModule.java @@ -41,7 +41,7 @@ public class HelpCommandModule implements CommandModule { } public boolean canConsoleExecute() { - return false; + return true; } } diff --git a/src/main/java/dev/esophose/playerparticles/command/VersionCommandModule.java b/src/main/java/dev/esophose/playerparticles/command/VersionCommandModule.java index 4a62f59..b8870b5 100644 --- a/src/main/java/dev/esophose/playerparticles/command/VersionCommandModule.java +++ b/src/main/java/dev/esophose/playerparticles/command/VersionCommandModule.java @@ -36,7 +36,7 @@ public class VersionCommandModule implements CommandModule { } public boolean canConsoleExecute() { - return false; + return true; } } diff --git a/src/main/java/dev/esophose/playerparticles/command/WorldsCommandModule.java b/src/main/java/dev/esophose/playerparticles/command/WorldsCommandModule.java index c774110..476cb2c 100644 --- a/src/main/java/dev/esophose/playerparticles/command/WorldsCommandModule.java +++ b/src/main/java/dev/esophose/playerparticles/command/WorldsCommandModule.java @@ -4,6 +4,7 @@ import dev.esophose.playerparticles.PlayerParticles; import dev.esophose.playerparticles.manager.LocaleManager; import dev.esophose.playerparticles.manager.PermissionManager; import dev.esophose.playerparticles.particles.PPlayer; +import dev.esophose.playerparticles.util.StringPlaceholders; import java.util.ArrayList; import java.util.List; @@ -21,9 +22,10 @@ public class WorldsCommandModule implements CommandModule { for (String s : permissionManager.getDisabledWorlds()) { worlds.append(s).append(", "); } - if (worlds.length() > 2) worlds = new StringBuilder(worlds.substring(0, worlds.length() - 2)); + if (worlds.length() > 2) + worlds = new StringBuilder(worlds.substring(0, worlds.length() - 2)); - localeManager.sendCustomMessage(pplayer, localeManager.getLocaleMessage("disabled-worlds") + " " + worlds); + localeManager.sendCustomMessage(pplayer, localeManager.getLocaleMessage("disabled-worlds", StringPlaceholders.single("worlds", worlds))); } public List onTabComplete(PPlayer pplayer, String[] args) { @@ -47,7 +49,7 @@ public class WorldsCommandModule implements CommandModule { } public boolean canConsoleExecute() { - return false; + return true; } } diff --git a/src/main/java/dev/esophose/playerparticles/manager/ConfigurationManager.java b/src/main/java/dev/esophose/playerparticles/manager/ConfigurationManager.java index ac2664b..c097719 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/ConfigurationManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/ConfigurationManager.java @@ -63,20 +63,17 @@ public class ConfigurationManager extends Manager { MYSQL_USER_PASSWORD("mysql-settings.user-password", "", "MySQL Database User Password"), MYSQL_USE_SSL("mysql-settings.use-ssl", false, "If the database connection should use SSL", "You should enable this if your database supports SSL"), - GUI_ICON("gui-icon", null, "=================================================================== #", - " GUI ICON SETTINGS #", - "This configuration option allows you to change any of the GUI #", - "icons to whatever block/item you want. #", - " #", - "Important Notes: #", - "* If any of the block/item names are invalid the icon in the GUI #", - " will be the barrier icon to show that it failed to load. #", - "* Do NOT change the particle/style name #", - "* You MUST use the Spigot-given name for it to work. You can see #", - " all the Spigot-given names at the link below: #", - " https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html #", - "* If two icons are listed, the second one is used for below MC 1.13 #", - "=================================================================== #"), + GUI_ICON("gui-icon", null, + "This configuration option allows you to change any of the GUI", + "icons to whatever block/item you want.", + "Notes: If any of the block/item names are invalid the icon in the GUI", + "will be the barrier icon to show that it failed to load.", + "Do NOT change the particle/style name", + "You MUST use the Spigot-given name for it to work. You can see", + "all the Spigot-given names at the link below:", + "https://hub.spigotmc.org/javadocs/spigot/org/bukkit/Material.html", + "If two icons are listed, the second one is used for below MC 1.13" + ), GUI_ICON_MISC("gui-icon.misc", null), GUI_ICON_MISC_PARTICLES("gui-icon.misc.particles", Collections.singletonList("BLAZE_POWDER")), GUI_ICON_MISC_GROUPS("gui-icon.misc.groups", Collections.singletonList("CHEST")), diff --git a/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java b/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java index 03b7b65..61dc709 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/LocaleManager.java @@ -107,7 +107,7 @@ public class LocaleManager extends Manager { public String getLocaleMessage(String messageKey, StringPlaceholders stringPlaceholders) { String message = this.locale.getString(messageKey); if (message == null) - return "null"; + return ChatColor.RED + "Missing message in locale file: " + messageKey; return ChatColor.translateAlternateColorCodes('&', stringPlaceholders.apply(message)); } diff --git a/src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java b/src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java index 143fe35..147cfcc 100644 --- a/src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java +++ b/src/main/java/dev/esophose/playerparticles/manager/ParticleGroupPresetManager.java @@ -172,7 +172,10 @@ public class ParticleGroupPresetManager extends Manager { * @return a List of preset ParticleGroups the player can use */ public List getPresetGroupsForPlayer(PPlayer player) { - return this.presetGroups.stream().filter(x -> x.canPlayerUse(player)).sorted(Comparator.comparing(ParticleGroupPreset::getDisplayName)).collect(Collectors.toList()); + return this.presetGroups.stream() + .filter(x -> x.canPlayerUse(player)) + .sorted(Comparator.comparing(ParticleGroupPreset::getDisplayName)) + .collect(Collectors.toList()); } /** diff --git a/src/main/java/dev/esophose/playerparticles/particles/ParticleGroupPreset.java b/src/main/java/dev/esophose/playerparticles/particles/ParticleGroupPreset.java index a033d01..9c76ab8 100644 --- a/src/main/java/dev/esophose/playerparticles/particles/ParticleGroupPreset.java +++ b/src/main/java/dev/esophose/playerparticles/particles/ParticleGroupPreset.java @@ -44,9 +44,8 @@ public class ParticleGroupPreset { */ public boolean canPlayerUse(PPlayer player) { // If this particle group has a permission, does the player have it? - if (!this.permission.isEmpty()) - if (!player.getPlayer().hasPermission(this.permission)) - return false; + if (!this.permission.isEmpty() && !player.getPlayer().hasPermission(this.permission)) + return false; // If allowPermissionOverride is true, always let the player apply this group if (this.allowPermissionOverride) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7118881..14cffec 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -11,4 +11,3 @@ commands: description: The main PlayerParticles command. By default, opens the GUI. ppo: description: Allows executing a /pp command for another player. - permission: playerparticles.override