From 21700e8d7e4c5382a6b736692daeee1f9912a0ae Mon Sep 17 00:00:00 2001
From: gnembon <gnembonmc@gmail.com>
Date: Wed, 11 Nov 2020 16:18:27 -0400
Subject: [PATCH] 20w46a

---
 gradle.properties                              |  4 ++--
 ...stonBlockEntityRenderer_movableTEMixin.java |  2 +-
 .../java/carpet/mixins/TntEntityMixin.java     | 10 +++++-----
 src/main/java/carpet/utils/BlockInfo.java      | 18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index f0a78e37..5b122dc7 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 	# check these on https://fabricmc.net/use
     # or better: https://modmuss50.me/fabric.html
-	minecraft_version=20w45a
-	yarn_mappings=20w45a+build.20
+	minecraft_version=20w46a
+	yarn_mappings=20w46a+build.2
 	loader_version=0.10.6+build.214
 
 # Mod Properties
diff --git a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
index 62fcc876..d41652b0 100644
--- a/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
+++ b/src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
@@ -21,7 +21,7 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin implements BlockE
 {
     BlockEntityRenderDispatcher dispatcher;
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void onInitCM(BlockEntityRendererFactory.Arguments arguments, CallbackInfo ci)
+    private void onInitCM(BlockEntityRendererFactory.Context arguments, CallbackInfo ci)
     {
         dispatcher = arguments.getRenderDispatcher();
     }
diff --git a/src/main/java/carpet/mixins/TntEntityMixin.java b/src/main/java/carpet/mixins/TntEntityMixin.java
index 3b95dd24..52849252 100644
--- a/src/main/java/carpet/mixins/TntEntityMixin.java
+++ b/src/main/java/carpet/mixins/TntEntityMixin.java
@@ -20,7 +20,9 @@ import carpet.logging.logHelpers.TNTLogHelper;
 @Mixin(TntEntity.class)
 public abstract class TntEntityMixin extends Entity implements TntEntityInterface
 {
-    @Shadow private int fuseTimer;
+    //@Shadow private int fuseTimer;
+
+    @Shadow public abstract int getFuse();
 
     private TNTLogHelper logHelper;
     private boolean mergeBool = false;
@@ -98,7 +100,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
                         Vec3d tntVelocity = entityTNTPrimed.getVelocity();
                         if(tntVelocity.x == 0 && tntVelocity.y == 0 && tntVelocity.z == 0
                                 && this.getX() == entityTNTPrimed.getX() && this.getZ() == entityTNTPrimed.getZ() && this.getY() == entityTNTPrimed.getY()
-                                && this.fuseTimer == entityTNTPrimed.getFuseTimer()){
+                                && getFuse() == entityTNTPrimed.getFuse()){
                             mergedTNT += ((TntEntityInterface) entityTNTPrimed).getMergedTNT();
                             entityTNTPrimed.discard(); // discard remove();
                         }
@@ -108,9 +110,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
         }
     }
 
-    @Inject(method = "tick", at = @At(value = "FIELD",
-                                        target = "Lnet/minecraft/entity/TntEntity;fuseTimer:I",
-                                        ordinal = 0))
+    @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/TntEntity;setFuse(I)V"))
     private void setMergeable(CallbackInfo ci)
     {
         // Merge code, merge only tnt that have had a chance to move CARPET-XCOM
diff --git a/src/main/java/carpet/utils/BlockInfo.java b/src/main/java/carpet/utils/BlockInfo.java
index 2a420ba0..6705c82d 100644
--- a/src/main/java/carpet/utils/BlockInfo.java
+++ b/src/main/java/carpet/utils/BlockInfo.java
@@ -72,15 +72,15 @@ public class BlockInfo
         put(BlockSoundGroup.CHAIN, "chain");
         put(BlockSoundGroup.NETHER_GOLD_ORE, "nether_gold_ore");
         put(BlockSoundGroup.GILDED_BLACKSTONE, "gilded_blackstone");
-        put(BlockSoundGroup.field_27196, "candle");
-        put(BlockSoundGroup.field_27197, "amethyst");
-        put(BlockSoundGroup.field_27198, "amethyst_cluster");
-        put(BlockSoundGroup.field_27199, "small_amethyst_bud");
-        put(BlockSoundGroup.field_27200, "large_amethyst_bud");
-        put(BlockSoundGroup.field_27201, "medium_amethyst_bud");
-        put(BlockSoundGroup.field_27202, "tuff");
-        put(BlockSoundGroup.field_27203, "calcite");
-        put(BlockSoundGroup.field_27204, "copper");
+        put(BlockSoundGroup.CANDLE, "candle");
+        put(BlockSoundGroup.AMETHYST_BLOCK, "amethyst");
+        put(BlockSoundGroup.AMETHYST_CLUSTER, "amethyst_cluster");
+        put(BlockSoundGroup.SMALL_AMETHYST_BUD, "small_amethyst_bud");
+        put(BlockSoundGroup.LARGE_AMETHYST_BUD, "large_amethyst_bud");
+        put(BlockSoundGroup.MEDIUM_AMETHYST_BUD, "medium_amethyst_bud");
+        put(BlockSoundGroup.TUFF, "tuff");
+        put(BlockSoundGroup.CALCITE, "calcite");
+        put(BlockSoundGroup.COPPER, "copper");
     }};
 
     public static final Map<MapColor, String> mapColourName = new HashMap<MapColor, String>() {{