Add a few primitives to script shutter

Adventurecraft-Awakening · Jul 17, 2024 · 6fc35ac · 6fc35ac
1 parent 375d8c2
commit 6fc35ac
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/dev/adventurecraft/awakening/mixin/client/MixinMinecraft.java b/src/main/java/dev/adventurecraft/awakening/mixin/client/MixinMinecraft.java
@@ -1053,16 +1053,16 @@ private void method_2107(int mouseButton) {
             }
         }
         // Trigger item scripts
+        String scriptName;
         if(stack != null) {
-            String scriptName = stack.usesMeta()
+            scriptName = stack.usesMeta()
                 ? String.format("item_%d_%d.js", stack.itemId, stack.getMeta())
                 : String.format("item_%d.js", stack.itemId);
-            exWorld.getScriptHandler().runScript(scriptName, exWorld.getScope(), false);
         }
         else {
-            String scriptName = String.format("item_0.js", 0);
-            exWorld.getScriptHandler().runScript(scriptName, exWorld.getScope(), false);
+            scriptName = "item_0.js";
         }
+        exWorld.getScriptHandler().runScript(scriptName, exWorld.getScope(), false);
 
         if (swapOffhand) {
             ((ExPlayerInventory) this.player.inventory).swapOffhandWithMain();

diff --git a/src/main/java/dev/adventurecraft/awakening/script/Script.java b/src/main/java/dev/adventurecraft/awakening/script/Script.java
@@ -43,9 +43,15 @@ public Script(World var1) {
         if (!shutterSet) {
             this.cx.setClassShutter(fullClassName -> fullClassName.startsWith(SCRIPT_PACKAGE) ||
                 fullClassName.equals("java.lang.Object") ||
+                fullClassName.equals("java.lang.Character") ||
                 fullClassName.equals("java.lang.String") ||
+                fullClassName.equals("java.lang.Float") ||
                 fullClassName.equals("java.lang.Double") ||
                 fullClassName.equals("java.lang.Boolean") ||
+                fullClassName.equals("java.lang.Byte") ||
+                fullClassName.equals("java.lang.Short") ||
+                fullClassName.equals("java.lang.Integer") ||
+                fullClassName.equals("java.lang.Long") ||
                 fullClassName.equals("org.mozilla.javascript.ConsString"));
             shutterSet = true;
         }