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/mixins/DebugRenderer_scarpetRenderMixin.java

@@ -1,11 +1,7 @@
 package carpet.mixins;
 
 import carpet.network.CarpetClient;
-import carpet.script.utils.ShapesRenderer;
-import net.minecraft.client.MinecraftClient;
-import net.minecraft.client.render.VertexConsumerProvider;
 import net.minecraft.client.render.debug.DebugRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,25 +10,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(DebugRenderer.class)
 public class DebugRenderer_scarpetRenderMixin
 {
-    private ShapesRenderer shapes;
-
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void addRenderers(MinecraftClient client, CallbackInfo ci)
-    {
-        shapes = new ShapesRenderer(client);
-        CarpetClient.shapes = shapes;
-    }
-
     @Inject(method = "reset", at = @At("HEAD"))
     private void resetScarpetRenderes(CallbackInfo ci)
     {
-        shapes.reset();
+        if (CarpetClient.shapes != null)
+            CarpetClient.shapes.reset();
     }
-
-    @Inject(method = "render", at = @At("HEAD"))
-    private void renderScarpetThings(MatrixStack matrices, VertexConsumerProvider.Immediate vertexConsumers, double cameraX, double cameraY, double cameraZ, CallbackInfo ci)
-    {
-        shapes.render(matrices, vertexConsumers, cameraX, cameraY, cameraZ);
-    }
-
 }

src/main/java/carpet/mixins/HungerManagerMixin_scarpetEventsMixin.java

@@ -0,0 +1,20 @@
+package carpet.mixins;
+
+import carpet.fakes.HungerManagerInterface;
+import net.minecraft.entity.player.HungerManager;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+
+@Mixin(HungerManager.class)
+public class HungerManagerMixin_scarpetEventsMixin implements HungerManagerInterface {
+    @Shadow private float exhaustion;
+    public float getExhaustionCM(){
+        return exhaustion;
+    }
+
+    @Override
+    public void setExhaustionCM(float exhaust)
+    {
+        exhaustion = exhaust;
+    }
+}

src/main/java/carpet/mixins/WorldRenderer_scarpetRenderMixin.java

@@ -0,0 +1,32 @@
+package carpet.mixins;
+
+import carpet.network.CarpetClient;
+import carpet.script.utils.ShapesRenderer;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.BufferBuilderStorage;
+import net.minecraft.client.render.Camera;
+import net.minecraft.client.render.GameRenderer;
+import net.minecraft.client.render.LightmapTextureManager;
+import net.minecraft.client.render.WorldRenderer;
+import net.minecraft.client.util.math.Matrix4f;
+import net.minecraft.client.util.math.MatrixStack;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(WorldRenderer.class)
+public class WorldRenderer_scarpetRenderMixin
+{
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void addRenderers(MinecraftClient client, BufferBuilderStorage bufferBuilders, CallbackInfo ci)
+    {
+        CarpetClient.shapes = new ShapesRenderer(client);
+    }
+
+    @Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/debug/DebugRenderer;render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider$Immediate;DDD)V"))
+    private void renderScarpetThings(MatrixStack matrices, float tickDelta, long limitTime, boolean renderBlockOutline, Camera camera, GameRenderer gameRenderer, LightmapTextureManager lightmapTextureManager, Matrix4f matrix4f, CallbackInfo ci)
+    {
+        if (CarpetClient.shapes != null) CarpetClient.shapes.render(camera, tickDelta);
+    }
+}