Ver/3.5.3.8 (#271)

Ver/3.5.3.8

Author: darbyjack

pom.xml

@@ -30,7 +30,7 @@
 
     <groupId>me.glaremasters</groupId>
     <artifactId>guilds</artifactId>
-    <version>3.5.3.7-RELEASE</version>
+    <version>3.5.3.8-RELEASE</version>
     <packaging>jar</packaging>
 
     <name>Guilds</name>
@@ -270,6 +270,12 @@
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
             <version>2.10.3</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.bstats</groupId>
+                    <artifactId>bstats-bukkit</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>provided</scope>
         </dependency>
 

src/main/java/me/glaremasters/guilds/acf/ACFHandler.java

@@ -164,7 +164,7 @@ public void registerCustomCompletions(PaperCommandManager commandManager, GuildH
         });
 
         commandManager.getCommandCompletions().registerCompletion("members-admin", c -> {
-           Guild guild = guildHandler.getGuild(c.getContextValue(String.class, 1));
+            Guild guild = c.getContextValue(Guild.class, 1);
            if (guild == null) {
                return null;
            }

src/main/java/me/glaremasters/guilds/commands/admin/manage/CommandAdminTransfer.java

@@ -62,7 +62,7 @@ public class CommandAdminTransfer extends BaseCommand {
     @Description("{@@descriptions.admin-transfer}")
     @CommandCompletion("@guilds @members-admin")
     @Syntax("<guild> <new master>")
-    public void execute(Player player, @Flags("admin") @Values("@guilds") Guild guild, @Values("@members-admin") @Single String newMaster) {
+    public void execute(Player player, @Flags("admin") @Values("@guilds") @Single Guild guild, @Values("@members-admin") @Single String newMaster) {
 
         if (guild == null) {
             ACFUtil.sneaky(new ExpectationNotMet(Messages.ERROR__GUILD_NO_EXIST));

src/main/java/me/glaremasters/guilds/guis/BuffGUI.java

@@ -58,13 +58,15 @@ public class BuffGUI {
 
     private Guilds guilds;
     private SettingsManager settingsManager;
+    private SettingsManager mainConfig;
     private GuildHandler guildHandler;
     private CommandManager commandManager;
     private CooldownHandler cooldownHandler;
 
-    public BuffGUI(Guilds guilds, SettingsManager settingsManager, GuildHandler guildHandler, CommandManager commandManager, CooldownHandler cooldownHandler) {
+    public BuffGUI(Guilds guilds, SettingsManager settingsManager, SettingsManager mainConfig, GuildHandler guildHandler, CommandManager commandManager, CooldownHandler cooldownHandler) {
         this.guilds = guilds;
         this.settingsManager = settingsManager;
+        this.mainConfig = mainConfig;
         this.guildHandler = guildHandler;
         this.commandManager = commandManager;
         this.cooldownHandler = cooldownHandler;
@@ -277,7 +279,7 @@ private void setBuffItem(CommandManager commandManager, String type, int length,
             if (!settingsManager.getProperty(GuildBuffSettings.BUFF_STACKING) && !player.getActivePotionEffects().isEmpty()) return;
             guild.setBalance(guild.getBalance() - cost);
             guild.addPotion(type, (length * 20), amplifier);
-            cooldownHandler.addCooldown(guild, Cooldown.Type.Buffs.name(), settingsManager.getProperty(CooldownSettings.BUFF), TimeUnit.SECONDS);
+            cooldownHandler.addCooldown(guild, Cooldown.Type.Buffs.name(), mainConfig.getProperty(CooldownSettings.BUFF), TimeUnit.SECONDS);
 
             executeClickerCommands(clickerCheck, clickerCommands, player);
             executeGuildCommands(guildCheck, guildCommands, guild);

src/main/java/me/glaremasters/guilds/guis/GUIHandler.java

@@ -56,7 +56,7 @@ public GUIHandler(Guilds guilds, SettingsManager settingsManager, GuildHandler g
         this.commandManager = commandManager;
         this.cooldownHandler = cooldownHandler;
 
-        buffGUI = new BuffGUI(this.guilds, guilds.getSettingsHandler().getBuffSettings(), this.guildHandler, this.commandManager, this.cooldownHandler);
+        buffGUI = new BuffGUI(this.guilds, guilds.getSettingsHandler().getBuffSettings(), this.settingsManager, this.guildHandler, this.commandManager, this.cooldownHandler);
         listGUI = new ListGUI(this.guilds, this.settingsManager, this.guildHandler);
         infoGUI = new InfoGUI(this.guilds, this.settingsManager, this.guildHandler, this.cooldownHandler, commandManager);
         infoMembersGUI = new InfoMembersGUI(this.guilds, this.settingsManager, this.guildHandler);

src/main/java/me/glaremasters/guilds/placeholders/PlaceholderAPI.java

@@ -31,9 +31,12 @@
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
+import java.text.DecimalFormat;
+
 public class PlaceholderAPI extends PlaceholderExpansion {
 
     private GuildHandler guildHandler;
+    private DecimalFormat df = new DecimalFormat("###.##");
 
     public PlaceholderAPI(GuildHandler guildHandler) {
         this.guildHandler = guildHandler;
@@ -113,11 +116,7 @@ public String onPlaceholderRequest(Player p, String arg) {
             case "tier":
                 return String.valueOf(api.getGuild(p).getTier().getLevel());
             case "balance":
-                return String.valueOf(api.getGuild(p).getBalance());
-            case "tier_name":
-                return api.getGuild(p).getTier().getName();
-            case "role_node":
-                return api.getGuildRole(p).getNode();
+                return df.format(api.getGuild(p).getBalance());
             case "code_amount":
                 return String.valueOf(api.getGuild(p).getCodes().size());
             case "max_members":

src/main/resources/plugin.yml

@@ -45,7 +45,7 @@ permissions:
       guilds.command.list: true
       guilds.command.members: true
       guilds.command.motd: true
-      guilds.command.motd-modify: true
+      guilds.command.motd.modify: true
       guilds.command.prefix: true
       guilds.command.promote: true
       guilds.command.rename: true