Merge branch 'master' into 1.16

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

src/main/java/carpet/fakes/HungerManagerInterface.java

@@ -0,0 +1,6 @@
+package carpet.fakes;
+
+public interface HungerManagerInterface {
+    float getExhaustionCM();
+    void setExhaustionCM(float exhaust);
+}