From 40bca919d838fed27bcc52299b0f3c10562601a2 Mon Sep 17 00:00:00 2001 From: MoriyaShiine <45156123+MoriyaShiine@users.noreply.github.com> Date: Fri, 18 Oct 2024 00:16:09 -0500 Subject: [PATCH] mixin cleanup --- .../java/ladysnake/blast/common/entity/ShrapnelBlockEntity.java | 2 +- src/main/java/ladysnake/blast/mixin/EnderEyeItemMixin.java | 2 +- .../java/ladysnake/blast/mixin/FallingBlockEntityAccessor.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/ladysnake/blast/common/entity/ShrapnelBlockEntity.java b/src/main/java/ladysnake/blast/common/entity/ShrapnelBlockEntity.java index 28e91c3..af72724 100644 --- a/src/main/java/ladysnake/blast/common/entity/ShrapnelBlockEntity.java +++ b/src/main/java/ladysnake/blast/common/entity/ShrapnelBlockEntity.java @@ -25,7 +25,7 @@ public ShrapnelBlockEntity(EntityType entityType, private ShrapnelBlockEntity(World world, double x, double y, double z, BlockState block, @Nullable PlayerEntity owner) { this(EntityType.FALLING_BLOCK, world); - ((FallingBlockEntityAccessor) this).setBlock(block); + ((FallingBlockEntityAccessor) this).blast$setBlock(block); intersectionChecked = true; setPosition(x, y, z); setVelocity(Vec3d.ZERO); diff --git a/src/main/java/ladysnake/blast/mixin/EnderEyeItemMixin.java b/src/main/java/ladysnake/blast/mixin/EnderEyeItemMixin.java index 658071f..caebf7e 100644 --- a/src/main/java/ladysnake/blast/mixin/EnderEyeItemMixin.java +++ b/src/main/java/ladysnake/blast/mixin/EnderEyeItemMixin.java @@ -22,7 +22,7 @@ @Mixin(EnderEyeItem.class) public class EnderEyeItemMixin { @Inject(method = "use", at = @At("HEAD"), cancellable = true) - private void use(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> callbackInfoReturnable) { + private void blast$remoteDetonator(World world, PlayerEntity user, Hand hand, CallbackInfoReturnable> callbackInfoReturnable) { BlockPos hitPos = world.raycast(new RaycastContext(user.getEyePos(), user.getEyePos().add(user.getRotationVector().multiply(160)), RaycastContext.ShapeType.COLLIDER, RaycastContext.FluidHandling.NONE, user)).getBlockPos(); BlockPos closestDetonatorPos = null; diff --git a/src/main/java/ladysnake/blast/mixin/FallingBlockEntityAccessor.java b/src/main/java/ladysnake/blast/mixin/FallingBlockEntityAccessor.java index 58ed74c..da096cb 100644 --- a/src/main/java/ladysnake/blast/mixin/FallingBlockEntityAccessor.java +++ b/src/main/java/ladysnake/blast/mixin/FallingBlockEntityAccessor.java @@ -8,5 +8,5 @@ @Mixin(FallingBlockEntity.class) public interface FallingBlockEntityAccessor { @Accessor("block") - void setBlock(BlockState block); + void blast$setBlock(BlockState block); }