diff --git a/gradle.properties b/gradle.properties index 8e5e9043..6264f900 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,8 +5,8 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=1.15.2 - yarn_mappings=1.15.2+build.1 - loader_version=0.7.5+build.178 + yarn_mappings=1.15.2+build.7 + loader_version=0.7.6+build.180 # Mod Properties mod_version = 1.3.7+v200127 diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/ContainerMixin.java index 2056d82f..21075b1c 100644 --- a/src/main/java/carpet/mixins/ContainerMixin.java +++ b/src/main/java/carpet/mixins/ContainerMixin.java @@ -19,19 +19,19 @@ import java.util.List; @Mixin(Container.class) public abstract class ContainerMixin { - @Shadow @Final public List slotList; - + @Shadow @Final public List slots; + @Shadow public abstract ItemStack onSlotClick(int int_1, int int_2, SlotActionType slotActionType_1, PlayerEntity playerEntity_1); @Shadow public abstract void sendContentUpdates(); - + @Inject( method = "onSlotClick", 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.inventory.getCursorStack().isEmpty() && slotId >= 0) { ItemStack itemStack_1 = ItemStack.EMPTY; - Slot slot_4 = slotList.get(slotId); + Slot slot_4 = slots.get(slotId); if (slot_4 != null && slot_4.hasStack() && slot_4.canTakeItems(playerEntity)) { if(slotId == 0 && clickData == 1) diff --git a/src/main/java/carpet/script/CarpetExpression.java b/src/main/java/carpet/script/CarpetExpression.java index 9783a422..4741d425 100644 --- a/src/main/java/carpet/script/CarpetExpression.java +++ b/src/main/java/carpet/script/CarpetExpression.java @@ -43,7 +43,7 @@ import net.minecraft.block.CommandBlock; import net.minecraft.block.JigsawBlock; import net.minecraft.block.StructureBlock; import net.minecraft.block.entity.BlockEntity; -import net.minecraft.client.network.packet.GuiSlotUpdateS2CPacket; +import net.minecraft.client.network.packet.ContainerSlotUpdateS2CPacket; import net.minecraft.client.network.packet.PlaySoundIdS2CPacket; import net.minecraft.command.arguments.ItemStackArgument; import net.minecraft.command.arguments.ParticleArgumentType; @@ -1890,7 +1890,7 @@ public class CarpetExpression if (inventory.owner instanceof ServerPlayerEntity && !inventory.isEnder) { ServerPlayerEntity player = (ServerPlayerEntity) inventory.owner; - player.networkHandler.sendPacket(new GuiSlotUpdateS2CPacket( + player.networkHandler.sendPacket(new ContainerSlotUpdateS2CPacket( -2, int_1, inventory.inventory.getInvStack(int_1)