From a392e7c441c5da126023cdb08540e318b54e6be2 Mon Sep 17 00:00:00 2001 From: IzzelAliz Date: Sat, 20 Feb 2021 23:56:50 +0800 Subject: [PATCH] Add missing cancellable --- .../common/mixin/core/block/RedstoneLampBlockMixin.java | 2 +- .../core/entity/item/minecart/AbstractMinecartEntityMixin.java | 2 +- .../mixin/core/inventory/container/LoomContainerMixin.java | 2 +- .../arclight/common/mixin/core/item/MerchantOfferMixin.java | 2 +- .../common/mixin/core/tileentity/BeehiveTileEntityMixin.java | 2 +- .../mixin/core/tileentity/BrewingStandTileEntityMixin.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java index 2ef4c206..3784979a 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/block/RedstoneLampBlockMixin.java @@ -17,7 +17,7 @@ import java.util.Random; @Mixin(RedstoneLampBlock.class) public class RedstoneLampBlockMixin { - @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z")) + @Inject(method = "tick", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/world/server/ServerWorld;setBlockState(Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;I)Z")) private void arclight$redstoneChange(BlockState state, ServerWorld worldIn, BlockPos pos, Random rand, CallbackInfo ci) { if (CraftEventFactory.callRedstoneChange(worldIn, pos, 15, 0).getNewCurrent() != 0) { ci.cancel(); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java index 1763847b..c83b8bcf 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/entity/item/minecart/AbstractMinecartEntityMixin.java @@ -284,7 +284,7 @@ public abstract class AbstractMinecartEntityMixin extends EntityMixin { return this.isBeingRidden() || !this.slowWhenEmpty; } - @Inject(method = "applyEntityCollision", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/item/minecart/AbstractMinecartEntity;isPassenger(Lnet/minecraft/entity/Entity;)Z")) + @Inject(method = "applyEntityCollision", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/item/minecart/AbstractMinecartEntity;isPassenger(Lnet/minecraft/entity/Entity;)Z")) private void arclight$vehicleCollide(Entity entityIn, CallbackInfo ci) { if (!this.isPassenger(entityIn)) { VehicleEntityCollisionEvent collisionEvent = new VehicleEntityCollisionEvent((Vehicle) this.getBukkitEntity(), ((EntityBridge) entityIn).bridge$getBukkitEntity()); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java index 03f9b12b..220000c8 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/inventory/container/LoomContainerMixin.java @@ -35,7 +35,7 @@ public abstract class LoomContainerMixin extends ContainerMixin implements PosCo this.playerInventory = playerInventory; } - @Inject(method = "canInteractWith", at = @At("HEAD")) + @Inject(method = "canInteractWith", cancellable = true, at = @At("HEAD")) public void arclight$unreachable(PlayerEntity playerIn, CallbackInfoReturnable cir) { if (!bridge$isCheckReachable()) { cir.setReturnValue(true); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java index d3a99286..e9d75d97 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/item/MerchantOfferMixin.java @@ -37,7 +37,7 @@ public class MerchantOfferMixin implements MerchantOfferBridge { return asBukkit(); } - @Inject(method = "getDiscountedBuyingStackFirst", at = @At("HEAD")) + @Inject(method = "getDiscountedBuyingStackFirst", cancellable = true, at = @At("HEAD")) private void arclight$fix(CallbackInfoReturnable cir) { if (this.buyingStackFirst.getCount() <= 0) { cir.setReturnValue(ItemStack.EMPTY); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeehiveTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeehiveTileEntityMixin.java index a210ed2d..29a774d9 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeehiveTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BeehiveTileEntityMixin.java @@ -62,7 +62,7 @@ public abstract class BeehiveTileEntityMixin extends TileEntityMixin { return list; } - @Inject(method = "tryEnterHive(Lnet/minecraft/entity/Entity;ZI)V", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;stopRiding()V")) + @Inject(method = "tryEnterHive(Lnet/minecraft/entity/Entity;ZI)V", cancellable = true, at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/Entity;stopRiding()V")) private void arclight$beeEnterBlock(Entity entity, boolean p_226962_2_, int p_226962_3_, CallbackInfo ci) { if (this.world != null) { EntityEnterBlockEvent event = new EntityEnterBlockEvent(((EntityBridge) entity).bridge$getBukkitEntity(), CraftBlock.at(this.world, this.getPos())); diff --git a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java index 11c0f70b..faf7a0df 100644 --- a/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java +++ b/arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/BrewingStandTileEntityMixin.java @@ -64,7 +64,7 @@ public abstract class BrewingStandTileEntityMixin extends LockableTileEntityMixi arclight$consume = false; } - @Inject(method = "brewPotions", at = @At("HEAD")) + @Inject(method = "brewPotions", cancellable = true, at = @At("HEAD")) public void arclight$brewPotion(CallbackInfo ci) { InventoryHolder owner = this.getOwner(); if (owner != null) {