Merge branch 'master' into 1.17

# Conflicts:
#	src/main/java/carpet/script/utils/ShapesRenderer.java

src/main/java/carpet/CarpetSettings.java

@@ -42,7 +42,7 @@ import static carpet.settings.RuleCategory.CLIENT;
 @SuppressWarnings("CanBeFinal")
 public class CarpetSettings
 {
-    public static final String carpetVersion = "1.4.29+v210310";
+    public static final String carpetVersion = "1.4.30+v210317";
     public static final Logger LOG = LogManager.getLogger("carpet");
     public static boolean skipGenerationChecks = false;
     public static boolean impendingFillSkipUpdates = false;

src/main/java/carpet/script/utils/ShapeDispatcher.java

@@ -418,6 +418,8 @@ public class ShapeDispatcher
                 put("facing", new StringValue("player")).
                 put("raise", new NumericValue(0)).
                 put("tilt", new NumericValue(0)).
+                put("lean", new NumericValue(0)).
+                put("turn", new NumericValue(0)).
                 put("indent", new NumericValue(0)).
                 put("height", new NumericValue(0)).
                 put("align", new StringValue("center")).
@@ -439,6 +441,8 @@ public class ShapeDispatcher
         Direction facing;
         float raise;
         float tilt;
+        float lean;
+        float turn;
         float size;
         float indent;
         int align;
@@ -487,6 +491,8 @@ public class ShapeDispatcher
 
             raise = NumericValue.asNumber(options.getOrDefault("raise", optional.get("raise"))).getFloat();
             tilt = NumericValue.asNumber(options.getOrDefault("tilt", optional.get("tilt"))).getFloat();
+            lean = NumericValue.asNumber(options.getOrDefault("lean", optional.get("lean"))).getFloat();
+            turn = NumericValue.asNumber(options.getOrDefault("turn", optional.get("turn"))).getFloat();
             indent = NumericValue.asNumber(options.getOrDefault("indent", optional.get("indent"))).getFloat();
             height = NumericValue.asNumber(options.getOrDefault("height", optional.get("height"))).getFloat();
 
@@ -519,6 +525,8 @@ public class ShapeDispatcher
             if (facing!= null) hash ^= facing.hashCode(); hash *= 1099511628211L;
             hash ^= Float.hashCode(raise); hash *= 1099511628211L;
             hash ^= Float.hashCode(tilt); hash *= 1099511628211L;
+            hash ^= Float.hashCode(lean); hash *= 1099511628211L;
+            hash ^= Float.hashCode(turn); hash *= 1099511628211L;
             hash ^= Float.hashCode(indent); hash *= 1099511628211L;
             hash ^= Float.hashCode(height); hash *= 1099511628211L;
             hash ^= Float.hashCode(size); hash *= 1099511628211L;

src/main/java/carpet/script/utils/ShapesRenderer.java

@@ -278,11 +278,11 @@ public class ShapesRenderer
             }
             matrices.scale(shape.size* 0.0025f, -shape.size*0.0025f, shape.size*0.0025f);
             //RenderSystem.scalef(shape.size* 0.0025f, -shape.size*0.0025f, shape.size*0.0025f);
-            if (shape.tilt!=0.0f)
-            {
-                matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(shape.tilt));
-            }
+            if (shape.tilt!=0.0f) matrices.multiply(Vec3f.POSITIVE_Z.getDegreesQuaternion(shape.tilt));
+            if (shape.lean!=0.0f) matrices.multiply(Vec3f.POSITIVE_X.getDegreesQuaternion(shape.lean));
+            if (shape.turn!=0.0f) matrices.multiply(Vec3f.POSITIVE_Y.getDegreesQuaternion(shape.turn));
             matrices.translate(-10*shape.indent, -10*shape.height-9,  (-10*renderEpsilon)-10*shape.raise);
+            RenderSystem.translatef(-10*shape.indent, -10*shape.height-9, (float) (-10*renderEpsilon)-10*shape.raise);
             //if (visibleThroughWalls) RenderSystem.disableDepthTest();
             matrices.scale(-1, 1, 1);
             //RenderSystem.applyModelViewMatrix(); // passed matrix directly to textRenderer.draw, not AffineTransformation.identity().getMatrix(),

src/main/java/carpet/settings/SettingsManager.java

@@ -318,10 +318,12 @@ public class SettingsManager
         }
         server.send(new ServerTask(this.server.getTicks(), () ->
         {
-            for (ServerPlayerEntity entityplayermp : server.getPlayerManager().getPlayerList())
-            {
-                server.getCommandManager().sendCommandTree(entityplayermp);
+            try {
+                for (ServerPlayerEntity entityplayermp : server.getPlayerManager().getPlayerList()) {
+                    server.getCommandManager().sendCommandTree(entityplayermp);
+                }
             }
+            catch (NullPointerException ignored) {}
         }));
     }