Merge branch 'master' into 1.16

src/main/java/carpet/script/CarpetExpression.java

@@ -2923,9 +2923,30 @@ public class CarpetExpression
             }
 
             ArmorStandEntity armorstand = new ArmorStandEntity(EntityType.ARMOR_STAND, cc.s.getWorld());
+            double yoffset;
+            if (targetBlock == null && name.isEmpty())
+            {
+                yoffset = 0.0;
+            }
+            else if (!interactable && targetBlock == null)
+            {
+                yoffset = -0.41;
+            }
+            else
+            {
+                if (targetBlock==null)
+                {
+                    yoffset = -armorstand.getHeight()-0.41;
+                }
+                else
+                {
+                    yoffset = -armorstand.getHeight()+0.3;
+                }
+            }
             armorstand.refreshPositionAndAngles(
                     pointLocator.vec.x,
-                    pointLocator.vec.y - ((targetBlock==null)?(armorstand.getHeight()+0.41):(armorstand.getHeight()-0.3)),
+                    //pointLocator.vec.y - ((!interactable && targetBlock == null)?0.41f:((targetBlock==null)?(armorstand.getHeight()+0.41):(armorstand.getHeight()-0.3))),
+                    pointLocator.vec.y + yoffset,
                     pointLocator.vec.z,
                     (float)pointLocator.yaw,
                     (float) pointLocator.pitch

src/main/java/carpet/script/CarpetScriptServer.java

@@ -44,14 +44,22 @@ public class CarpetScriptServer
     private  Set<String> holyMoly;
     public  CarpetEventServer events;
 
-    private static final List<Module> bundledModuleData = new ArrayList<Module>(){{
-        add(new BundledModule("camera", false));
-        add(new BundledModule("overlay", false));
-        add(new BundledModule("event_test", false));
-        add(new BundledModule("stats_test", false));
-        add(new BundledModule("math", true));
-        add(new BundledModule("chunk_display", false));
-    }};
+    private static final List<Module> bundledModuleData = new ArrayList<>();
+
+    public static void registerBuiltInScript(BundledModule app)
+    {
+        bundledModuleData.add(app);
+    }
+
+    static
+    {
+        registerBuiltInScript(BundledModule.carpetNative("camera", false));
+        registerBuiltInScript(BundledModule.carpetNative("overlay", false));
+        registerBuiltInScript(BundledModule.carpetNative("event_test", false));
+        registerBuiltInScript(BundledModule.carpetNative("stats_test", false));
+        registerBuiltInScript(BundledModule.carpetNative("math", true));
+        registerBuiltInScript(BundledModule.carpetNative("chunk_display", false));
+    }
 
     public CarpetScriptServer(MinecraftServer server)
     {

src/main/java/carpet/script/bundled/BundledModule.java

@@ -11,22 +11,29 @@ public class BundledModule extends Module
     private String name;
     private String code;
     private boolean library;
-    public BundledModule(String scriptName, boolean isLibrary)
+    public BundledModule(String name, String code, boolean isLibrary)
     {
         library = isLibrary;
+        this.name = name;
+        this.code = code;
+    }
+    public static BundledModule carpetNative(String scriptName, boolean isLibrary)
+    {
+        BundledModule module = new BundledModule(null, null, isLibrary);
         try
         {
-            name = scriptName.toLowerCase(Locale.ROOT);
-            code = IOUtils.toString(
-                    getClass().getClassLoader().getResourceAsStream("assets/carpet/scripts/"+name+(isLibrary?".scl":".sc")),
+            module.name = scriptName.toLowerCase(Locale.ROOT);
+            module.code = IOUtils.toString(
+                    BundledModule.class.getClassLoader().getResourceAsStream("assets/carpet/scripts/"+scriptName+(isLibrary?".scl":".sc")),
                     StandardCharsets.UTF_8
             );
         }
         catch ( NullPointerException | IOException e)
         {
-            name = null;
-            code = null;
+            module.name = null;
+            module.code = null;
         }
+        return module;
     }
 
     @Override