Update Config Updater

Ste3et · Sep 14, 2022 · 8fb37ca · 8fb37ca
1 parent b909c58
commit 8fb37ca
Show file tree

Hide file tree

Showing 35 changed files with 282 additions and 126 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/.gradle/buildOutputCleanup/outputFiles.bin b/.gradle/buildOutputCleanup/outputFiles.bin
diff --git a/.gradle/checksums/checksums.lock b/.gradle/checksums/checksums.lock
diff --git a/.gradle/checksums/md5-checksums.bin b/.gradle/checksums/md5-checksums.bin
diff --git a/.gradle/checksums/sha1-checksums.bin b/.gradle/checksums/sha1-checksums.bin
diff --git a/.project b/.project
@@ -20,10 +20,16 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>net.sourceforge.metrics.builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
+		<nature>net.sourceforge.metrics.nature</nature>
 	</natures>
 </projectDescription>
diff --git a/build.gradle b/build.gradle
@@ -72,7 +72,7 @@ dependencies {
     compileOnly 'com.github.BeYkeRYkt.LightAPI:lightapi-bukkit-backward-support:5.1.0-Bukkit'
 }
 
-version = '2.8.0'
+version = '2.8.2'
 group = 'de.Ste3et_C0st.furniture'
 sourceCompatibility = 1.8
 targetCompatibility = 1.8

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/debugCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/debugCommand.java
@@ -189,15 +189,15 @@ public void run() {
             	}
         } else {
             if (args.length != 1) {
-                sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                getLHandler().sendMessage(sender, "message.WrongArgument");
                 return;
             }
             if (sender instanceof Player) {
                 if (hasCommandPermission(sender)) {
                     command.playerList.add((Player) sender);
-                    sender.sendMessage(getLHandler().getString("message.DebugModeEntered"));
+                    getLHandler().sendMessage(sender, "message.DebugModeEntered");
                 } else {
-                    sender.sendMessage(getLHandler().getString("message.NoPermissions"));
+                    getLHandler().sendMessage(sender, "message.NoPermissions");
                 }
             }
         }

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/downloadCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/downloadCommand.java
@@ -247,7 +247,7 @@ private void addOld(NBTTagCompound compound, String project, CommandSender sende
 				Project projObj = ModelFileLoader.loadModelFile(new File("plugins/"+FurnitureLib.getInstance().getName()+"/Crafting/" + project + ".yml"));
 				if(Objects.nonNull(projObj) && projObj.haveModelSchematic()) {
 					if(!projObj.getModelschematic().isDestroyAble()) {
-						sender.sendMessage(getLHandler().getString("command.download.noHitbox"));
+						getLHandler().sendMessage(sender, "command.download.noHitbox");
 					}
 				}
 			});
@@ -365,7 +365,7 @@ private void save(NBTTagCompound compound, String project, CommandSender sender)
 			Project projObj = ModelFileLoader.loadModelFile(new File("plugins/"+FurnitureLib.getInstance().getName()+"/models/" + project + ".dModel"));
 			if(Objects.nonNull(projObj) && projObj.haveModelSchematic()) {
 				if(!projObj.getModelschematic().isDestroyAble()) {
-					sender.sendMessage(getLHandler().getString("command.download.noHitbox"));
+					getLHandler().sendMessage(sender, "command.download.noHitbox");
 				}
 			}
 		});
@@ -478,7 +478,7 @@ private void convert(NBTTagCompound compound, String project, CommandSender send
 		Project projObj = ModelFileLoader.loadModelFile(new File(filePath));
 		if(Objects.nonNull(projObj) && projObj.haveModelSchematic()) {
 			if(!projObj.getModelschematic().isDestroyAble()) {
-				sender.sendMessage(getLHandler().getString("command.download.noHitbox"));
+				getLHandler().sendMessage(sender, "command.download.noHitbox");
 			}
 		}
 	}

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/giveCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/giveCommand.java
@@ -1,6 +1,7 @@
 package de.Ste3et_C0st.FurnitureLib.Command;
 
 import de.Ste3et_C0st.FurnitureLib.Crafting.Project;
+import de.Ste3et_C0st.FurnitureLib.Utilitis.StringTranslator;
 import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib;
 
 import java.util.Objects;
@@ -26,11 +27,11 @@ public void execute(CommandSender sender, String[] args) {
         if (args.length > 1) {
             pro = getProject(args[1]);
             if (pro == null) {
-                sender.sendMessage(getLHandler().getString("message.ProjectNotFound").replaceAll("#PROJECT#", args[1]));
+                getLHandler().sendMessage(sender, "message.ProjectNotFound", new StringTranslator("project", args[1]));
                 return;
             }
         } else {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            getLHandler().sendMessage(sender, "message.WrongArgument");
             return;
         }
         if (args.length == 2) {
@@ -40,7 +41,7 @@ public void execute(CommandSender sender, String[] args) {
                 player.updateInventory();
                 return;
             } else {
-                sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                getLHandler().sendMessage(sender, "message.WrongArgument");
                 return;
             }
         } else if (args.length == 3) {
@@ -55,7 +56,7 @@ public void execute(CommandSender sender, String[] args) {
                     player.updateInventory();
                     return;
                 } else {
-                    sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                    getLHandler().sendMessage(sender, "message.WrongArgument");
                     return;
                 }
             } else if (Bukkit.getPlayer(args[2]) != null) {
@@ -69,22 +70,24 @@ public void execute(CommandSender sender, String[] args) {
                     if (sender.equals(p2)) {
                         return;
                     }
-                    String str = getLHandler().getString("message.GivePlayer");
-                    str = str.replace("#PLAYER#", p2.getName());
-                    str = str.replace("#PROJECT#", pro.getName());
-                    str = str.replace("#AMOUNT#", 1 + "");
-                    sender.sendMessage(str);
+
+                    getLHandler().sendMessage(sender, "message.GivePlayer", 
+                    		new StringTranslator("project", pro.getName()), 
+                    		new StringTranslator("player", p2.getName()), 
+                    		new StringTranslator("amount", 1 + "")
+                    );
+
                     return;
                 } else {
-                    String s = getLHandler().getString("message.PlayerNotOnline");
-                    s = s.replace("#PLAYER#", args[2]);
-                    sender.sendMessage(s);
+                    getLHandler().sendMessage(sender, "message.PlayerNotOnline",
+                    		new StringTranslator("player", args[2])
+                    );
                     return;
                 }
             } else {
-                String s = getLHandler().getString("message.PlayerNotOnline");
-                s = s.replace("#PLAYER#", args[2]);
-                sender.sendMessage(s);
+            	getLHandler().sendMessage(sender, "message.PlayerNotOnline",
+                		new StringTranslator("player", args[2])
+                );
                 return;
             }
         } else if (args.length == 4) {
@@ -94,9 +97,9 @@ public void execute(CommandSender sender, String[] args) {
                 }
                 Player p2 = Bukkit.getPlayer(args[2]);
                 if(Objects.isNull(p2)) {
-                	String s = getLHandler().getString("message.PlayerNotOnline");
-                    s = s.replace("#PLAYER#", args[2]);
-                    sender.sendMessage(s);
+                	getLHandler().sendMessage(sender, "message.PlayerNotOnline",
+                    		new StringTranslator("player", args[2])
+                    );
                     return;
                 }
                 if (p2.isOnline()) {
@@ -110,31 +113,27 @@ public void execute(CommandSender sender, String[] args) {
                         if (sender.equals(p2)) {
                             return;
                         }
-                        String str = getLHandler().getString("message.GivePlayer");
-                        str = str.replace("#PLAYER#", p2.getName());
-                        str = str.replace("#PROJECT#", pro.getName());
-                        str = str.replace("#AMOUNT#", i + "");
-                        sender.sendMessage(str);
+                        getLHandler().sendMessage(sender, "message.GivePlayer", 
+                        		new StringTranslator("project", pro.getName()), 
+                        		new StringTranslator("player", p2.getName()), 
+                        		new StringTranslator("amount", i + "")
+                        );
                         return;
                     } else {
-                        sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                    	getLHandler().sendMessage(sender, "message.WrongArgument");
                         return;
                     }
                 } else {
-                    String s = getLHandler().getString("message.PlayerNotOnline");
-                    s = s.replace("#PLAYER#", args[2]);
-                    sender.sendMessage(s);
+                    getLHandler().sendMessage(sender, "message.PlayerNotOnline", new StringTranslator("player", args[2]));
                     return;
                 }
             } else {
-                String s = getLHandler().getString("message.PlayerNotOnline");
-                s = s.replace("#PLAYER#", args[2]);
-                sender.sendMessage(s);
+            	getLHandler().sendMessage(sender, "message.PlayerNotOnline", new StringTranslator("player", args[2]));
                 return;
             }
         } else {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
-            return;
+        	getLHandler().sendMessage(sender, "message.WrongArgument");
+        	return;
         }
     }
 

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/manageCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/manageCommand.java
@@ -12,16 +12,16 @@ public manageCommand(String subCommand, String... args) {
     @Override
     public void execute(CommandSender sender, String[] args) {
         if (args.length != 1) {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            getLHandler().sendMessage(sender, "message.WrongArgument");
             return;
         }
         if (sender instanceof Player) {
             if (hasCommandPermission(sender)) {
                 command.manageList.add((Player) sender);
-                sender.sendMessage(getLHandler().getString("message.ManageModeEntered"));
+                getLHandler().sendMessage(sender, "message.ManageModeEntered");
                 return;
             } else {
-                sender.sendMessage(getLHandler().getString("message.NoPermissions"));
+                getLHandler().sendMessage(sender, "message.NoPermissions");
             }
         }
     }

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/purgeCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/purgeCommand.java
@@ -1,5 +1,6 @@
 package de.Ste3et_C0st.FurnitureLib.Command;
 
+import de.Ste3et_C0st.FurnitureLib.Utilitis.StringTranslator;
 import de.Ste3et_C0st.FurnitureLib.main.FurnitureConfig;
 import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib;
 import de.Ste3et_C0st.FurnitureLib.main.ObjectID;
@@ -20,11 +21,11 @@ public void execute(CommandSender sender, String[] args) {
             if (FurnitureLib.getInstance().isInt(args[1])) {
                 purgeTime = Integer.parseInt(args[1]);
             } else {
-                sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                getLHandler().sendMessage(sender, "message.WrongArgument");
                 return;
             }
         } else {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            getLHandler().sendMessage(sender, "message.WrongArgument");
             return;
         }
 
@@ -37,11 +38,10 @@ public void execute(CommandSender sender, String[] args) {
         }
 
         if (!FurnitureConfig.getFurnitureConfig().isPurgeRemove()) {
-            sender.sendMessage(getLHandler().getString("message.PurgeMarked").replace("#AMOUNT#", i + ""));
+            getLHandler().sendMessage(sender, "message.PurgeMarked", new StringTranslator("amount", Integer.toString(i)));
             return;
         }
-
-        sender.sendMessage(getLHandler().getString("message.RemoveDistance").replace("#AMOUNT#", i + ""));
+        getLHandler().sendMessage(sender, "message.RemoveDistance", new StringTranslator("amount", Integer.toString(i)));
         return;
     }
 }
diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/recipeCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/recipeCommand.java
@@ -1,7 +1,10 @@
 package de.Ste3et_C0st.FurnitureLib.Command;
 
 import de.Ste3et_C0st.FurnitureLib.Crafting.Project;
+import de.Ste3et_C0st.FurnitureLib.Utilitis.StringTranslator;
 import de.Ste3et_C0st.FurnitureLib.main.FurnitureLib;
+
+import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -19,11 +22,11 @@ public void execute(CommandSender sender, String[] args) {
         if (args.length > 1) {
             pro = getProject(args[1]);
             if (pro == null) {
-                sender.sendMessage(getLHandler().getString("message.ProjectNotFound").replaceAll("#PROJECT#", args[1]));
+                getLHandler().sendMessage(sender, "message.ProjectNotFound", new StringTranslator("project", args[1]));
                 return;
             }
         } else {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            getLHandler().sendMessage(sender, "message.WrongArgument");
             return;
         }
 
@@ -35,7 +38,7 @@ public void execute(CommandSender sender, String[] args) {
                 FurnitureLib.getInstance().getCraftingInv().openCrafting((Player) sender, pro, false);
                 return;
             } else {
-                sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            	getLHandler().sendMessage(sender, "message.WrongArgument");
                 return;
             }
         } else if (args.length == 3) {
@@ -44,17 +47,16 @@ public void execute(CommandSender sender, String[] args) {
                     FurnitureLib.getInstance().getCraftingInv().openCrafting(Bukkit.getPlayer(args[2]), pro, false);
                     return;
                 } else {
-                    String s = getLHandler().getString("message.PlayerNotOnline");
-                    s = s.replace("#PLAYER#", args[2]);
-                    sender.sendMessage(s);
+                    getLHandler().sendMessage(sender, "message.PlayerNotOnline", new StringTranslator("player", args[2]));
+
                     return;
                 }
             } else {
                 if (args[2].equalsIgnoreCase("edit")) {
                     if (!hasCommandPermission(sender, ".edit")) return;
                     pro = getProject(args[1]);
                     if (pro == null) {
-                        sender.sendMessage(getLHandler().getString("message.ProjectNotFound").replaceAll("#PROJECT#", args[1]));
+                        getLHandler().sendMessage(sender, "message.ProjectNotFound", new StringTranslator("project", args[1]));
                         return;
                     }
                     FurnitureLib.getInstance().getCraftingInv().openCrafting((Player) sender, pro, true);
@@ -63,20 +65,20 @@ public void execute(CommandSender sender, String[] args) {
                     if (!hasCommandPermission(sender, ".remove")) return;
                     pro = getProject(args[1]);
                     if (pro == null) {
-                        sender.sendMessage(getLHandler().getString("message.ProjectNotFound").replaceAll("#PROJECT#", args[1]));
+                        getLHandler().sendMessage(sender, "message.ProjectNotFound", new StringTranslator("project", args[1]));
                         return;
                     }
                     pro.getCraftingFile().removeCrafting(pro.getCraftingFile().getItemstack());
                     //pro.getCraftingFile().setCraftingDisabled(true);
-                    sender.sendMessage(getLHandler().getString("message.CraftingRemove"));
+                    getLHandler().sendMessage(sender, "message.CraftingRemove");
                     return;
                 } else {
-                    sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+                    getLHandler().sendMessage(sender, "message.WrongArgument");
                     return;
                 }
             }
         } else {
-            sender.sendMessage(getLHandler().getString("message.WrongArgument"));
+            getLHandler().sendMessage(sender, "message.WrongArgument");
             return;
         }
     }

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/reloadCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/reloadCommand.java
@@ -13,7 +13,7 @@ public reloadCommand(String subCommand, String... args) {
     public void execute(CommandSender sender, String[] args) {
         if (!hasCommandPermission(sender)) return;
         FurnitureLib.getInstance().reloadPluginConfig();
-        sender.sendMessage(getLHandler().getString("message.reload"));
+        getLHandler().sendMessage(sender, "message.reload");
         return;
     }
 

diff --git a/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/removeCommand.java b/src/main/java/de/Ste3et_C0st/FurnitureLib/Command/removeCommand.java
@@ -33,7 +33,7 @@ public void execute(CommandSender sender, String[] args) {
         String filterTypes = "";
         boolean remove = true;
         if(args.length < 2) {
-        	getLHandler().getString("message.WrongArgument");
+        	getLHandler().sendMessage(sender, "message.WrongArgument");
         	return;
         }
 
@@ -120,11 +120,12 @@ public void execute(CommandSender sender, String[] args) {
     			}
     		});
 
-        	sender.sendMessage(getLHandler().getString("command.remove.result", 
-					new StringTranslator("#FILTERS#", StringUtils.removeEnd(filterTypes, "|")),
-					new StringTranslator("#SIZE#", count.get() + "")));
+        	getLHandler().sendMessage(sender, "command.remove.result",
+        			new StringTranslator("filters", StringUtils.removeEnd(filterTypes, "|")),
+					new StringTranslator("size", count.get() + ""));
         }else if(!remove){
-        	sender.sendMessage(getLHandler().getString("command.remove.result", new StringTranslator("#FILTERS#", StringUtils.removeEnd(filterTypes, "|"))));
+        	getLHandler().sendMessage(sender, "command.remove.result",
+        			new StringTranslator("filters", StringUtils.removeEnd(filterTypes, "|")));
         }
 	}