auto-lowercase MC key names

DenizenScript · Nov 7, 2019 · ab0d5c5 · ab0d5c5
1 parent 5751a1e
commit ab0d5c5
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/.../main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java b/.../main/java/com/denizenscript/denizen/events/player/PlayerReceivesCommandsScriptEvent.java
@@ -11,8 +11,6 @@
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerCommandSendEvent;
 
-import java.util.Collection;
-
 public class PlayerReceivesCommandsScriptEvent extends BukkitScriptEvent implements Listener {
 
     // <--[event]

diff --git a/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptContainer.java b/.../src/main/java/com/denizenscript/denizen/scripts/containers/core/ItemScriptContainer.java
@@ -1,7 +1,7 @@
 package com.denizenscript.denizen.scripts.containers.core;
 
 import com.denizenscript.denizen.utilities.Utilities;
-import com.denizenscript.denizen.utilities.debugging.Debug;
+import com.denizenscript.denizencore.utilities.debugging.Debug;
 import com.denizenscript.denizen.utilities.nbt.LeatherColorer;
 import com.denizenscript.denizen.objects.ItemTag;
 import com.denizenscript.denizen.tags.BukkitTagContext;
@@ -263,9 +263,12 @@ public ItemTag getItemFrom(BukkitTagContext context) {
                         }
                         stack.getItemStack().addUnsafeEnchantment(ench, level);
                     }
-                    catch (Exception e) {
+                    catch (Exception ex) {
                         Debug.echoError("While constructing '" + getName() + "', encountered error: '"
-                                + enchantment + "' is an invalid enchantment!");
+                                + enchantment + "' is an invalid enchantment: " + ex.getClass().getName() + ": " + ex.getMessage());
+                        if (Debug.verbose) {
+                            Debug.echoError(ex);
+                        }
                     }
                 }
             }

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Settings.java
@@ -1,6 +1,5 @@
 package com.denizenscript.denizen.utilities;
 
-import com.denizenscript.denizen.utilities.DenizenAPI;
 import com.denizenscript.denizen.utilities.debugging.Debug;
 import com.denizenscript.denizencore.objects.core.DurationTag;
 import com.denizenscript.denizencore.scripts.ScriptHelper;
@@ -21,7 +20,7 @@ public static void refillCache() {
         cache_showExHelp = config.getBoolean("Debug.Ex command help", true);
         cache_showExDebug = config.getBoolean("Debug.Ex command debug", true);
         cache_getAlternateScriptPath = config.getString("Scripts location.Alternative folder path", "plugins/Denizen");
-        String cache_scriptEncoding = config.getString("Scripts.Encoding", "default");
+        cache_scriptEncoding = config.getString("Scripts.Encoding", "default");
         if (cache_scriptEncoding.equalsIgnoreCase("default")) {
             ScriptHelper.encoding = null;
         }
@@ -95,7 +94,7 @@ public static void refillCache() {
     private static String cache_getAlternateScriptPath, cache_scriptQueueSpeed, cache_healthTraitRespawnDelay,
             cache_engageTimeoutInSeconds, cache_chatMultipleTargetsFormat, cache_chatNoTargetFormat,
             cache_chatToTargetFormat, cache_chatWithTargetToBystandersFormat, cache_chatWithTargetsToBystandersFormat,
-            cache_chatToNpcFormat, cache_chatToNpcOverheardFormat, cache_interactQueueSpeed, cache_limitPath;
+            cache_chatToNpcFormat, cache_chatToNpcOverheardFormat, cache_interactQueueSpeed, cache_limitPath, cache_scriptEncoding;
 
     private static int cache_consoleWidth = 128, cache_trimLength = 1024, cache_whileMaxLoops, cache_blockTagsMaxBlocks,
             cache_chatHistoryMaxMessages, cache_tagTimeout, cache_debugLimitPerTick;
@@ -118,6 +117,10 @@ public static String getAlternateScriptPath() {
         return cache_getAlternateScriptPath;
     }
 
+    public static String scriptEncoding() {
+        return cache_scriptEncoding;
+    }
+
 
     /**
      * Whether Denizen should display debug in the console

diff --git a/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java b/plugin/src/main/java/com/denizenscript/denizen/utilities/Utilities.java
@@ -37,6 +37,7 @@
 public class Utilities {
 
     public static NamespacedKey parseNamespacedKey(String input) {
+        input = CoreUtilities.toLowerCase(input);
         int colonIndex = input.indexOf(':');
         if (colonIndex != -1) {
             return new NamespacedKey(input.substring(0, colonIndex), input.substring(colonIndex + 1));