Merge branch 'master' into 1.15

src/main/java/carpet/CarpetSettings.java

@@ -131,7 +131,7 @@ public class CarpetSettings
 
     @Rule( desc = "Sets the horizontal random angle on TNT for debugging of TNT contraptions", category = TNT, options = "-1", strict = false,
             validate = TNTAngleValidator.class, extra = "Set to -1 for default behavior")
-    public static double hardcodeTNTangle;
+    public static double hardcodeTNTangle = -1.0D;
 
     private static class TNTAngleValidator extends Validator<Double> {
         @Override

src/main/java/carpet/mixins/TntEntityMixin.java

@@ -36,7 +36,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
                 at = @At("RETURN"))
     private void modifyTNTAngle(World world, double x, double y, double z, LivingEntity entity, CallbackInfo ci)
     {
-        if (CarpetSettings.hardcodeTNTangle != -1)
+        if (CarpetSettings.hardcodeTNTangle != -1.0D)
             setVelocity(-Math.sin(CarpetSettings.hardcodeTNTangle) * 0.02, 0.2, -Math.cos(CarpetSettings.hardcodeTNTangle) * 0.02);
     }
 

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

@@ -43,7 +43,7 @@ public class CarpetScriptServer
 
     private static final List<Module> bundledModuleData = new ArrayList<Module>(){{
         add(new BundledModule("camera", false));
-        add(new BundledModule("structures", false));
+        add(new BundledModule("overlay", false));
         add(new BundledModule("event_test", false));
         add(new BundledModule("stats_test", false));
         add(new BundledModule("math", true));

src/main/java/carpet/script/value/MapValue.java

@@ -85,7 +85,8 @@ public class MapValue extends AbstractListValue implements ContainerValueInterfa
     @Override
     public Value add(Value o)
     {
-        throw new InternalExpressionException("Cannot add to a map value");
+        append(o);
+        return this;
     }
 
     @Override