Fix multiblock strcuture checking (#2247)

GregTechCEu · Oct 26, 2024 · 8e68f88 · 8e68f88
1 parent fc799fa
commit 8e68f88
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 47 deletions.
diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ChunkMixin.java
@@ -9,7 +9,6 @@
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.LevelChunk;
 
-import org.objectweb.asm.Opcodes;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -26,9 +25,10 @@ public class ChunkMixin {
 
     // We want to be as quick as possible here
     @Inject(method = "setBlockState",
-            at = @At(value = "INVOKE",
-                     opcode = Opcodes.GETFIELD,
-                     target = "Lnet/minecraft/world/level/block/state/BlockState;onPlace(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/level/block/state/BlockState;Z)V"))
+            at = @At(
+                     value = "INVOKE",
+                     target = "Lnet/minecraft/world/level/block/state/BlockState;hasBlockEntity()Z",
+                     ordinal = 2))
     private void gtceu$onChunkChanged(BlockPos pos, BlockState state, boolean isMoving,
                                       CallbackInfoReturnable<BlockState> cir) {
         MinecraftServer server = level.getServer();

diff --git a/src/main/java/com/gregtechceu/gtceu/core/mixins/ForgeHooksMixin.java b/src/main/java/com/gregtechceu/gtceu/core/mixins/ForgeHooksMixin.java
diff --git a/src/main/resources/gtceu.mixins.json b/src/main/resources/gtceu.mixins.json
@@ -27,7 +27,6 @@
     "ChunkMixin",
     "CreeperMixin",
     "EntityMixin",
-    "ForgeHooksMixin",
     "IFoliagePlacerTypeAccessor",
     "IHolderReferenceAccessor",
     "IngredientAccessor",