Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix mixin conflict with questadditions (#587 #892)

Browse Source
This commit is contained in:
IzzelAliz 2023-02-26 15:16:20 +08:00
parent 16a5f7413f
commit bf99715ee2
No known key found for this signature in database
GPG Key ID: EE50E123A11D8338
1 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/server/management/ServerPlayerGameModeMixin.java
View File

@ -291,7 +291,9 @@ public abstract class ServerPlayerGameModeMixin implements PlayerInteractionMana
public InteractionResult useItemOn(ServerPlayer playerIn, Level worldIn, ItemStack stackIn, InteractionHand handIn, BlockHitResult blockRaytraceResultIn) { public InteractionResult useItemOn(ServerPlayer playerIn, Level worldIn, ItemStack stackIn, InteractionHand handIn, BlockHitResult blockRaytraceResultIn) {
BlockPos blockpos = blockRaytraceResultIn.getBlockPos(); BlockPos blockpos = blockRaytraceResultIn.getBlockPos();
BlockState blockstate = worldIn.getBlockState(blockpos); BlockState blockstate = worldIn.getBlockState(blockpos);
InteractionResult resultType = InteractionResult.PASS; // InteractionResult resultType = InteractionResult.PASS;
{ // compatible with questadditions
// these variables are not available inside next if block
boolean cancelledBlock = false; boolean cancelledBlock = false;
if (this.gameModeForPlayer == GameType.SPECTATOR) { if (this.gameModeForPlayer == GameType.SPECTATOR) {
MenuProvider provider = blockstate.getMenuProvider(worldIn, blockpos); MenuProvider provider = blockstate.getMenuProvider(worldIn, blockpos);
@ -317,8 +319,10 @@ public abstract class ServerPlayerGameModeMixin implements PlayerInteractionMana
playerIn.connection.send(new ClientboundBlockUpdatePacket(level, blockpos.above())); playerIn.connection.send(new ClientboundBlockUpdatePacket(level, blockpos.above()));
} }
((ServerPlayerEntityBridge) playerIn).bridge$getBukkitEntity().updateInventory(); ((ServerPlayerEntityBridge) playerIn).bridge$getBukkitEntity().updateInventory();
resultType = ((bukkitEvent.useItemInHand() != Event.Result.ALLOW) ? InteractionResult.SUCCESS : InteractionResult.PASS); return ((bukkitEvent.useItemInHand() != Event.Result.ALLOW) ? InteractionResult.SUCCESS : InteractionResult.PASS);
} else if (this.gameModeForPlayer == GameType.SPECTATOR) { }
}
if (this.gameModeForPlayer == GameType.SPECTATOR) {
MenuProvider inamedcontainerprovider = blockstate.getMenuProvider(worldIn, blockpos); MenuProvider inamedcontainerprovider = blockstate.getMenuProvider(worldIn, blockpos);
if (inamedcontainerprovider != null) { if (inamedcontainerprovider != null) {
playerIn.openMenu(inamedcontainerprovider); playerIn.openMenu(inamedcontainerprovider);
@ -337,6 +341,7 @@ public abstract class ServerPlayerGameModeMixin implements PlayerInteractionMana
boolean flag = !playerIn.getMainHandItem().isEmpty() || !playerIn.getOffhandItem().isEmpty(); boolean flag = !playerIn.getMainHandItem().isEmpty() || !playerIn.getOffhandItem().isEmpty();
boolean flag1 = (playerIn.isSecondaryUseActive() && flag) && !(playerIn.getMainHandItem().doesSneakBypassUse(worldIn, blockpos, playerIn) && playerIn.getOffhandItem().doesSneakBypassUse(worldIn, blockpos, playerIn)); boolean flag1 = (playerIn.isSecondaryUseActive() && flag) && !(playerIn.getMainHandItem().doesSneakBypassUse(worldIn, blockpos, playerIn) && playerIn.getOffhandItem().doesSneakBypassUse(worldIn, blockpos, playerIn));
ItemStack itemstack = stackIn.copy(); ItemStack itemstack = stackIn.copy();
InteractionResult resultType = InteractionResult.PASS;
if (event.getUseBlock() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1)) { if (event.getUseBlock() == net.minecraftforge.eventbus.api.Event.Result.ALLOW || (event.getUseBlock() != net.minecraftforge.eventbus.api.Event.Result.DENY && !flag1)) {
resultType = blockstate.use(worldIn, playerIn, handIn, blockRaytraceResultIn); resultType = blockstate.use(worldIn, playerIn, handIn, blockRaytraceResultIn);
if (resultType.consumesAction()) { if (resultType.consumesAction()) {
@ -364,6 +369,5 @@ public abstract class ServerPlayerGameModeMixin implements PlayerInteractionMana
return resultType; return resultType;
} }
} }
return resultType;
} }
} }