From 257aca4254ab0d189e87922e2dab5b767cb24e28 Mon Sep 17 00:00:00 2001 From: gnembon Date: Tue, 9 Feb 2021 00:16:07 -0400 Subject: [PATCH] mappings --- gradle.properties | 6 +++--- .../java/carpet/helpers/EntityPlayerActionPack.java | 12 ++++++------ src/main/java/carpet/mixins/CarpetBlockMixin.java | 7 +++---- src/main/java/carpet/mixins/ContainerMixin.java | 2 +- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/gradle.properties b/gradle.properties index 192cf593..ed7ae03f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,10 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html - minecraft_version=21w05a - yarn_mappings=21w05a+build.1 + minecraft_version=21w05b + yarn_mappings=21w05b+build.14 loader_version=0.11.1 - fabric_version=0.30.0+1.17 + fabric_version=0.30.1+1.17 # Mod Properties mod_version = 1.4.25 diff --git a/src/main/java/carpet/helpers/EntityPlayerActionPack.java b/src/main/java/carpet/helpers/EntityPlayerActionPack.java index 87cb6eab..971d6647 100644 --- a/src/main/java/carpet/helpers/EntityPlayerActionPack.java +++ b/src/main/java/carpet/helpers/EntityPlayerActionPack.java @@ -312,7 +312,7 @@ public class EntityPlayerActionPack BlockHitResult blockHit = (BlockHitResult) hit; BlockPos pos = blockHit.getBlockPos(); Direction side = blockHit.getSide(); - if (pos.getY() < player.getServerWorld().getTopHeightLimit() - (side == Direction.UP ? 1 : 0) && world.canPlayerModifyAt(player, pos)) + if (pos.getY() < player.getServerWorld().getTopY() - (side == Direction.UP ? 1 : 0) && world.canPlayerModifyAt(player, pos)) { ActionResult result = player.interactionManager.interactBlock(player, world, player.getStackInHand(hand), hand, blockHit); if (result.isAccepted()) @@ -400,7 +400,7 @@ public class EntityPlayerActionPack boolean blockBroken = false; if (player.interactionManager.getGameMode().isCreative()) { - player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getServerWorld().getTopHeightLimit()); + player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getServerWorld().getTopY()); ap.blockHitDelay = 5; blockBroken = true; } @@ -408,9 +408,9 @@ public class EntityPlayerActionPack { if (ap.currentBlock != null) { - player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getServerWorld().getTopHeightLimit()); + player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, side, player.getServerWorld().getTopY()); } - player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getServerWorld().getTopHeightLimit()); + player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.START_DESTROY_BLOCK, side, player.getServerWorld().getTopY()); boolean notAir = !state.isAir(); if (notAir && ap.curBlockDamageMP == 0) { @@ -433,7 +433,7 @@ public class EntityPlayerActionPack ap.curBlockDamageMP += state.calcBlockBreakingDelta(player, player.world, pos); if (ap.curBlockDamageMP >= 1) { - player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getServerWorld().getTopHeightLimit()); + player.interactionManager.processBlockBreakingAction(pos, PlayerActionC2SPacket.Action.STOP_DESTROY_BLOCK, side, player.getServerWorld().getTopY()); ap.currentBlock = null; ap.blockHitDelay = 5; blockBroken = true; @@ -455,7 +455,7 @@ public class EntityPlayerActionPack EntityPlayerActionPack ap = ((ServerPlayerEntityInterface) player).getActionPack(); if (ap.currentBlock == null) return; player.world.setBlockBreakingInfo(-1, ap.currentBlock, -1); - player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getServerWorld().getTopHeightLimit()); + player.interactionManager.processBlockBreakingAction(ap.currentBlock, PlayerActionC2SPacket.Action.ABORT_DESTROY_BLOCK, Direction.DOWN, player.getServerWorld().getTopY()); ap.currentBlock = null; } }, diff --git a/src/main/java/carpet/mixins/CarpetBlockMixin.java b/src/main/java/carpet/mixins/CarpetBlockMixin.java index f5eafed6..32b4b481 100644 --- a/src/main/java/carpet/mixins/CarpetBlockMixin.java +++ b/src/main/java/carpet/mixins/CarpetBlockMixin.java @@ -3,13 +3,12 @@ package carpet.mixins; import carpet.utils.WoolTool; import net.minecraft.block.Block; import net.minecraft.block.BlockState; -import net.minecraft.block.CarpetBlock; -import net.minecraft.class_5815; +import net.minecraft.block.DyedCarpetBlock; import net.minecraft.item.ItemPlacementContext; import net.minecraft.server.world.ServerWorld; import org.spongepowered.asm.mixin.Mixin; -@Mixin(class_5815.class) // WoolCarpetBlock +@Mixin(DyedCarpetBlock.class) // WoolCarpetBlock public abstract class CarpetBlockMixin extends Block { @@ -23,7 +22,7 @@ public abstract class CarpetBlockMixin extends Block BlockState state = super.getPlacementState(context); if (context.getPlayer() != null && !context.getWorld().isClient) { // getColor() - WoolTool.carpetPlacedAction(((class_5815)(Object)this).method_33635(), context.getPlayer(), context.getBlockPos(), (ServerWorld) context.getWorld()); + WoolTool.carpetPlacedAction(((DyedCarpetBlock)(Object)this).getDyeColor(), context.getPlayer(), context.getBlockPos(), (ServerWorld) context.getWorld()); } return state; } diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/ContainerMixin.java index 0b3125c0..83d71954 100644 --- a/src/main/java/carpet/mixins/ContainerMixin.java +++ b/src/main/java/carpet/mixins/ContainerMixin.java @@ -27,7 +27,7 @@ public abstract class ContainerMixin @Shadow @Final public DefaultedList slots; - @Inject( method = "removeStack", at = @At(value = "HEAD"), cancellable = true) + @Inject( method = "internalOnSlotClick", at = @At(value = "HEAD"), cancellable = true) private void onThrowClick( int slotId, int clickData, SlotActionType actionType, PlayerEntity playerEntity, CallbackInfoReturnable cir) { if (actionType == SlotActionType.THROW && CarpetSettings.ctrlQCraftingFix && playerEntity.getInventory().getCursorStack().isEmpty() && slotId >= 0)