From 916b187aa8cc6dbd9663e728ec19b4675795163e Mon Sep 17 00:00:00 2001
From: JozsefA <jozsefaug@gmail.com>
Date: Tue, 11 May 2021 11:39:13 -0700
Subject: [PATCH] Better belt breaking

---
 .../contraptions/relays/belt/BeltBlock.java   |  3 ++-
 .../create/foundation/BreakProgressHook.java  | 22 +++++++++++++++
 .../foundation/mixin/BreakProgressMixin.java  | 27 +++++++++++++++++++
 src/main/resources/create.mixins.json         | 21 ++++++++-------
 4 files changed, 62 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/com/simibubi/create/foundation/BreakProgressHook.java
 create mode 100644 src/main/java/com/simibubi/create/foundation/mixin/BreakProgressMixin.java

diff --git a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
index 444c963cf..f8a518fa7 100644
--- a/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
+++ b/src/main/java/com/simibubi/create/content/contraptions/relays/belt/BeltBlock.java
@@ -126,7 +126,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE<BeltTileEnt
 
 	/*
 	 * FIXME
-	 * 
+	 *
 	 * @Override
 	 * public Material getMaterial(BlockState state) {
 	 * return state.get(CASING) ? Material.WOOD : Material.WOOL;
@@ -474,6 +474,7 @@ public class BeltBlock extends HorizontalKineticBlock implements ITE<BeltTileEnt
 			BlockPos currentPos = nextSegmentPosition(state, pos, forward);
 			if (currentPos == null)
 				continue;
+			world.sendBlockBreakProgress(currentPos.hashCode(), currentPos, -1);
 			BlockState currentState = world.getBlockState(currentPos);
 			if (!AllBlocks.BELT.has(currentState))
 				continue;
diff --git a/src/main/java/com/simibubi/create/foundation/BreakProgressHook.java b/src/main/java/com/simibubi/create/foundation/BreakProgressHook.java
new file mode 100644
index 000000000..34c16f20e
--- /dev/null
+++ b/src/main/java/com/simibubi/create/foundation/BreakProgressHook.java
@@ -0,0 +1,22 @@
+package com.simibubi.create.foundation;
+
+import com.simibubi.create.AllBlocks;
+import com.simibubi.create.content.contraptions.relays.belt.BeltBlock;
+import com.simibubi.create.content.contraptions.relays.belt.BeltTileEntity;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.BlockPos;
+
+public class BreakProgressHook {
+
+	public static void whenBreaking(ClientWorld world, WorldRenderer renderer, int playerEntityId, BlockPos pos, int progress) {
+		if (AllBlocks.BELT.has(world.getBlockState(pos))) {
+			BeltTileEntity belt = (BeltTileEntity) world.getTileEntity(pos);
+
+			for (BlockPos beltPos : BeltBlock.getBeltChain(world, belt.getController())) {
+				renderer.sendBlockBreakProgress(beltPos.hashCode(), beltPos, progress);
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/simibubi/create/foundation/mixin/BreakProgressMixin.java b/src/main/java/com/simibubi/create/foundation/mixin/BreakProgressMixin.java
new file mode 100644
index 000000000..10165a4ea
--- /dev/null
+++ b/src/main/java/com/simibubi/create/foundation/mixin/BreakProgressMixin.java
@@ -0,0 +1,27 @@
+package com.simibubi.create.foundation.mixin;
+
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.simibubi.create.foundation.BreakProgressHook;
+
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.world.ClientWorld;
+import net.minecraft.util.math.BlockPos;
+
+@Mixin(ClientWorld.class)
+public class BreakProgressMixin {
+	@Shadow
+	@Final
+	private WorldRenderer worldRenderer;
+	private final ClientWorld self = (ClientWorld) (Object) this;
+
+	@Inject(at = @At("HEAD"), method = "sendBlockBreakProgress")
+	private void onBreakProgress(int playerEntityId, BlockPos pos, int progress, CallbackInfo ci) {
+		BreakProgressHook.whenBreaking(self, this.worldRenderer, playerEntityId, pos, progress);
+	}
+}
diff --git a/src/main/resources/create.mixins.json b/src/main/resources/create.mixins.json
index 6e988aa5a..3aae131af 100644
--- a/src/main/resources/create.mixins.json
+++ b/src/main/resources/create.mixins.json
@@ -5,16 +5,17 @@
     "compatibilityLevel": "JAVA_8",
     "refmap": "create.refmap.json",
     "client": [
-        "TileWorldHookMixin",
-        "CancelTileEntityRenderMixin",
-        "FogColorTrackerMixin",
-        "LightUpdateMixin",
-        "NetworkLightUpdateMixin",
-        "RenderHooksMixin",
-        "ShaderCloseMixin",
-        "TileRemoveMixin",
-        "EntityContraptionInteractionMixin",
-        "StoreProjectionMatrixMixin"
+      "BreakProgressMixin",
+      "CancelTileEntityRenderMixin",
+      "EntityContraptionInteractionMixin",
+      "FogColorTrackerMixin",
+      "LightUpdateMixin",
+      "NetworkLightUpdateMixin",
+      "RenderHooksMixin",
+      "ShaderCloseMixin",
+      "StoreProjectionMatrixMixin",
+      "TileRemoveMixin",
+      "TileWorldHookMixin"
     ],
     "injectors": {
         "defaultRequire": 1