fix command generation pre-scanning of enumerated values with undersc…

…ores
DenizenScript · Sep 16, 2022 · 81ca442 · 81ca442
1 parent 2f8d3b0
commit 81ca442
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java b/src/main/java/com/denizenscript/denizencore/scripts/ScriptEntry.java
@@ -554,7 +554,7 @@ else if (rawText.equals("false")) {
                 if (argVal.prefix == null && argVal.value.rawObject != null && internal.actualCommand != null) {
                     String raw = CoreUtilities.toLowerCase(argVal.value.rawObject.toString());
                     for (Map.Entry<EnumHelper, Integer> enumType : internal.actualCommand.enumsHandled.entrySet()) {
-                        Enum val = (Enum) enumType.getKey().valuesMapLower.get(raw);
+                        Enum val = (Enum) enumType.getKey().valuesMapLower.get(EnumHelper.cleanKey(raw));
                         if (val != null && internal.enumVals[enumType.getValue()] == null) {
                             internal.enumVals[enumType.getValue()] = new EnumArg(val, 0);
                             argVal.shouldUse = false;

diff --git a/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java b/src/main/java/com/denizenscript/denizencore/scripts/commands/core/WebGetCommand.java
@@ -104,7 +104,7 @@ public enum Method { GET, POST, HEAD, OPTIONS, PUT, DELETE, TRACE, PATCH }
     public static void autoExecute(ScriptEntry scriptEntry,
                                    @ArgLinear @ArgName("url") @ArgRaw ElementTag originalUrl,
                                    @ArgPrefixed @ArgName("data") @ArgDefaultNull ElementTag data,
-                                   @ArgName("method") @ArgDefaultNull Method method,
+                                   @ArgPrefixed @ArgName("method") @ArgDefaultNull Method method,
                                    @ArgName("hide_failure") boolean hideFailure,
                                    @ArgPrefixed @ArgName("timeout") @ArgDefaultText("10s") DurationTag timeout,
                                    @ArgPrefixed @ArgName("headers") @ArgDefaultNull ObjectTag headersLegacyCompat,

diff --git a/...a/com/denizenscript/denizencore/scripts/commands/generator/CommandExecutionGenerator.java b/...a/com/denizenscript/denizencore/scripts/commands/generator/CommandExecutionGenerator.java
@@ -294,7 +294,7 @@ public static CommandExecutor generateExecutorFor(Class<? extends AbstractComman
                                 }
                             }
                             else if (Enum.class.isAssignableFrom(argData.type)) {
-                                argData.defaultObject = EnumHelper.get(argData.type).valuesMapLower.get(CoreUtilities.toLowerCase(argData.defaultValue));
+                                argData.defaultObject = EnumHelper.get(argData.type).valuesMapLower.get(EnumHelper.cleanKey(argData.defaultValue));
                                 if (argData.defaultObject == null) {
                                     Debug.echoError("Cannot generate executor for command '" + cmdClass.getName() + "': autoExecute method has param '" + argData.name
                                             + "' which specifies default value '" + argData.defaultValue + "' which is a not a valid '" + DebugInternals.getClassNameOpti(argData.type) + "'");