MixinBlockPane uses Local Captures instead

Roadhog360 · May 19, 2024 · e357915 · e357915
1 parent deca353
commit e357915
Showing 1 changed file with 5 additions and 31 deletions.
diff --git a/src/main/java/ganymedes01/etfuturum/mixins/thinpanes/MixinBlockPane.java b/src/main/java/ganymedes01/etfuturum/mixins/thinpanes/MixinBlockPane.java
@@ -7,62 +7,36 @@
 import net.minecraft.util.AxisAlignedBB;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 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 org.spongepowered.asm.mixin.injection.callback.LocalCapture;
 
 import java.util.List;
 
-import static net.minecraftforge.common.util.ForgeDirection.*;
-
 @Mixin(BlockPane.class)
 public abstract class MixinBlockPane extends Block {
 
 	protected MixinBlockPane(Material p_i45394_1_) {
 		super(p_i45394_1_);
 	}
 
-	@Inject(method = "addCollisionBoxesToList", at = @At("HEAD"), cancellable = true)
-	private void remapCollisionsBoxes(World worldIn, int posX, int posY, int posZ, AxisAlignedBB bb, List boxList, Entity entity, CallbackInfo ci) {
-		boolean flag  = this.canPaneConnectTo(worldIn, posX, posY, posZ - 1, NORTH);
-		boolean flag1 = this.canPaneConnectTo(worldIn, posX, posY, posZ + 1, SOUTH);
-		boolean flag2 = this.canPaneConnectTo(worldIn, posX - 1, posY, posZ, WEST );
-		boolean flag3 = this.canPaneConnectTo(worldIn, posX + 1, posY, posZ, EAST );
-
+	@Inject(method = "addCollisionBoxesToList", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/block/BlockPane;canPaneConnectTo(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraftforge/common/util/ForgeDirection;)Z", ordinal = 3, shift = At.Shift.AFTER), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
+	private void remapCollisionsBoxes(World worldIn, int posX, int posY, int posZ, AxisAlignedBB bb, List boxList, Entity entity, CallbackInfo ci, boolean flag, boolean flag1, boolean flag2, boolean flag3) {
 		if(!flag && !flag1 && !flag2 && !flag3){
 			this.setBlockBounds(0.4375F, 0.0F, 0.4375F, 0.5625F, 1.0F, 0.5625F);
 			super.addCollisionBoxesToList(worldIn, posX, posY, posZ, bb, boxList, entity);
 			ci.cancel();
 		}
 	}
 
-	@Inject(method = "setBlockBoundsBasedOnState", at = @At("HEAD"), cancellable = true)
-	public void setBlockBoundsBasedOnState(IBlockAccess worldIn, int posX, int posY, int posZ, CallbackInfo ci)
+	@Inject(method = "setBlockBoundsBasedOnState", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/block/BlockPane;canPaneConnectTo(Lnet/minecraft/world/IBlockAccess;IIILnet/minecraftforge/common/util/ForgeDirection;)Z", ordinal = 3, shift = At.Shift.AFTER), cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD)
+	public void setBlockBoundsBasedOnState(IBlockAccess worldIn, int posX, int posY, int posZ, CallbackInfo ci, float f, float f1, float f2, float f3, boolean flag, boolean flag1, boolean flag2, boolean flag3)
 	{
-		float f = 0.4375F;
-		float f1 = 0.5625F;
-		float f2 = 0.4375F;
-		float f3 = 0.5625F;
-		boolean flag  = this.canPaneConnectToBlock(worldIn.getBlock(posX, posY, posZ - 1));
-		boolean flag1 = this.canPaneConnectToBlock(worldIn.getBlock(posX, posY, posZ + 1));
-		boolean flag2 = this.canPaneConnectToBlock(worldIn.getBlock(posX - 1, posY, posZ));
-		boolean flag3 = this.canPaneConnectToBlock(worldIn.getBlock(posX + 1, posY, posZ ));
-
 		if(!flag2 && !flag3 && !flag && !flag1){
 			this.setBlockBounds(f, 0.0F, f2, f1, 1.0F, f3);
 			ci.cancel();
-			return;
 		}
 	}
-
-	@Shadow
-	public boolean canPaneConnectTo(IBlockAccess world, int x, int y, int z, ForgeDirection dir){
-		return true;
-	}
-
-	@Shadow
-	public final boolean canPaneConnectToBlock(Block blockIN) { return true; }
 }