25-02-2023_02:22

Removed Lang. It was causing issues.
Valorless · Feb 25, 2023 · 8022d01 · 8022d01
1 parent f708719
commit 8022d01
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 13 deletions.
diff --git a/src/main/java/valorless/valorlessutils/ValorlessUtils.java b/src/main/java/valorless/valorlessutils/ValorlessUtils.java
@@ -97,7 +97,7 @@ public static void Error(JavaPlugin caller, String msg) {
 
     	public static void Debug(JavaPlugin caller, String msg) {
     		if(Config.GetBool(thisPlugin, "debug") == true) {
-    			Logger.getLogger("Minecraft").log(Level.CONFIG, "[DEBUG]: [" + caller.getName() + "] " + msg);
+    			Logger.getLogger("Minecraft").log(Level.WARNING, "[DEBUG]: [" + caller.getName() + "] " + msg);
     		}
     	}
 
@@ -133,7 +133,7 @@ public static Boolean Has(JavaPlugin caller, PersistentDataContainer container,
 
     }
 
-    public static class Lang {
+    /*public static class Lang {
     	
     	// Example, new Placeholder(this, "%target%", "PlayerName");
     	public static class Placeholder {
@@ -154,19 +154,42 @@ public static void AddPlaceholder(JavaPlugin caller, String key, String value) {
     		if (caller == null) { Log.Error(thisPlugin, "Lang.AddPlaceholder() was called without a null caller!"); return; }
     		if (Utils.IsStringNullOrEmpty(key)) { Log.Debug(caller, "[ValorlessUtils] Lang.AddPlaceholder() was called without a null or empty key!"); return; }
     		if (Utils.IsStringNullOrEmpty(value)) { Log.Debug(caller, "[ValorlessUtils] Lang.AddPlaceholder() was called without a null or empty value!\nWas this intentional?"); }
-    		placeholders.add(new Placeholder(caller.getName(),key,value));
+    		for(int i = 0; i < placeholders.size(); i++){
+    			Log.Error(caller, "[PH] " + placeholders.get(i).plugin + placeholders.get(i).key + placeholders.get(i).value);
+    			if(placeholders.get(i).plugin == caller.getName()) {
+    				Log.Error(caller, "[PH] " + placeholders.get(i).plugin + caller.getName());
+    				if(placeholders.get(i).key == key) {
+        				Log.Error(caller, "[PH] " + placeholders.get(i).key + key);
+    					placeholders.set(i, new Placeholder(caller.getName(),key,value));
+        				Log.Debug(caller, "Updated Placeholder " + placeholders.get(i).key + " - " + placeholders.get(i).value);
+        				return;
+        			}else {
+        				placeholders.add(new Placeholder(caller.getName(),key,value));
+        				Log.Debug(caller, "Added Placeholder " + placeholders.get(i).key + " - " + placeholders.get(i).value);
+        				return;
+        			}
+    			} else {
+    				placeholders.add(new Placeholder(caller.getName(),key,value));
+    				Log.Debug(caller, "Added Placeholder " + placeholders.get(i).key + " - " + placeholders.get(i).value);
+    				return;
+    			}
+    		}
+    		if(placeholders.size() == 0) {
+    			placeholders.add(new Placeholder(caller.getName(),key,value));
+				Log.Debug(caller, "Added Placeholder " + key + " - " + value);
+    		}
     	}
     	
     	public static String Parse(JavaPlugin caller, String text) {
     		if (caller == null) { Log.Error(thisPlugin, "Lang.Parse() was called without a null caller!"); return ""; }
     		if (Utils.IsStringNullOrEmpty(text)) { Log.Debug(caller, "[ValorlessUtils] Lang.Parse() was called without a null or empty text!\nWas this intentional?"); }
-    		Log.Debug(caller, text);
+    		Log.Debug(caller, "[PARSE] " + text);
     		if(text.contains("&")) text = text.replace("&", "§");
 
     		for(Placeholder placeholder : placeholders) {
 				//Log.Warning(caller, placeholder.plugin + placeholder.key + placeholder.value);
     			if(placeholder.plugin.equalsIgnoreCase(caller.getName())) {
-    				Log.Warning(caller, placeholder.plugin + placeholder.key + placeholder.value);
+    				//Log.Warning(caller, placeholder.plugin + placeholder.key + placeholder.value);
     				if(text.contains(placeholder.key)) { 
     					text = text.replace(placeholder.key, placeholder.value); 
     				}
@@ -181,7 +204,7 @@ public static String Get(JavaPlugin caller, String key) {
     		if (Utils.IsStringNullOrEmpty(key)) { Log.Error(caller, "[ValorlessUtils] Lang.Get() was called without a null or empty key!"); return ""; }
     		return Parse(caller, Config.GetString(caller, key));
     	}
-    }
+    }*/
 
     public static class Config {
 

diff --git a/src/main/resources/buildNumber.properties b/src/main/resources/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Fri Feb 24 22:26:51 CET 2023
-buildNumber=76
+#Sat Feb 25 01:48:42 CET 2023
+buildNumber=88
diff --git a/target/ValorlessUtils-1.0.0.77-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.77-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.78-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.78-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.79-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.79-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.80-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.80-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.81-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.81-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.82-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.82-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.83-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.83-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.84-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.84-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.85-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.85-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.86-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.86-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.87-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.87-SNAPSHOT.jar
diff --git a/target/ValorlessUtils-1.0.0.88-SNAPSHOT.jar b/target/ValorlessUtils-1.0.0.88-SNAPSHOT.jar
diff --git a/target/classes/buildNumber.properties b/target/classes/buildNumber.properties
@@ -1,3 +1,3 @@
 #maven.buildNumber.plugin properties file
-#Fri Feb 24 22:26:51 CET 2023
-buildNumber=76
+#Sat Feb 25 01:48:42 CET 2023
+buildNumber=88
diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml
@@ -1,6 +1,6 @@
 name: ValorlessUtils
 main: valorless.valorlessutils.ValorlessUtils
-version: 1.0.0.76
+version: 1.0.0.88
 author: Valorless
 api-version: 1.18
 commands:

diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils$Config$ValidationListEntry.class b/target/classes/valorless/valorlessutils/ValorlessUtils$Config$ValidationListEntry.class
diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils$Config.class b/target/classes/valorless/valorlessutils/ValorlessUtils$Config.class
diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils$Lang$Placeholder.class b/target/classes/valorless/valorlessutils/ValorlessUtils$Lang$Placeholder.class
diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils$Lang.class b/target/classes/valorless/valorlessutils/ValorlessUtils$Lang.class
diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils$Log.class b/target/classes/valorless/valorlessutils/ValorlessUtils$Log.class
diff --git a/target/classes/valorless/valorlessutils/ValorlessUtils.class b/target/classes/valorless/valorlessutils/ValorlessUtils.class
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst
@@ -1,8 +1,6 @@
 valorless\valorlessutils\ValorlessUtils$Config.class
-valorless\valorlessutils\ValorlessUtils$Lang$Placeholder.class
 valorless\valorlessutils\ValorlessUtils$Log.class
 valorless\valorlessutils\ValorlessUtils$Tags.class
 valorless\valorlessutils\ValorlessUtils$Utils.class
 valorless\valorlessutils\ValorlessUtils$Config$ValidationListEntry.class
-valorless\valorlessutils\ValorlessUtils$Lang.class
 valorless\valorlessutils\ValorlessUtils.class