From 00ad9eccc744c6ec143a8e183a25258bab2dc72e Mon Sep 17 00:00:00 2001 From: gnembon Date: Mon, 14 Dec 2020 02:51:01 -0400 Subject: [PATCH] mappings --- gradle.properties | 2 +- src/main/java/carpet/helpers/InventoryHelper.java | 4 ++-- src/main/java/carpet/mixins/ContainerMixin.java | 2 +- src/main/java/carpet/script/value/BlockValue.java | 2 +- src/main/java/carpet/script/value/NBTSerializableValue.java | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 946fe691..e90ca8d1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.jvmargs=-Xmx1G # check these on https://fabricmc.net/use # or better: https://modmuss50.me/fabric.html minecraft_version=20w49a - yarn_mappings=20w49a+build.1 + yarn_mappings=20w49a+build.8 loader_version=0.10.8 # Mod Properties diff --git a/src/main/java/carpet/helpers/InventoryHelper.java b/src/main/java/carpet/helpers/InventoryHelper.java index 073408e7..acc3c0f2 100644 --- a/src/main/java/carpet/helpers/InventoryHelper.java +++ b/src/main/java/carpet/helpers/InventoryHelper.java @@ -35,12 +35,12 @@ public class InventoryHelper changed = true; } - if (bet.method_33133()) // isEmpty + if (bet.isEmpty()) { tag.remove("BlockEntityTag"); changed = true; } - if (tag.method_33133()) + if (tag.isEmpty()) { stack.setTag(null); changed = true; diff --git a/src/main/java/carpet/mixins/ContainerMixin.java b/src/main/java/carpet/mixins/ContainerMixin.java index 485128ad..0b3125c0 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 = "method_30010", at = @At(value = "HEAD"), cancellable = true) // on slot click + @Inject( method = "removeStack", 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) diff --git a/src/main/java/carpet/script/value/BlockValue.java b/src/main/java/carpet/script/value/BlockValue.java index 1556fb36..e883f27f 100644 --- a/src/main/java/carpet/script/value/BlockValue.java +++ b/src/main/java/carpet/script/value/BlockValue.java @@ -108,7 +108,7 @@ public class BlockValue extends Value { if (data != null) { - if (data.method_33133()) + if (data.isEmpty()) return null; return data; } diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index 2f6e41bd..4b9dce80 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/src/main/java/carpet/script/value/NBTSerializableValue.java @@ -392,7 +392,7 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa { Tag tag = getTag(); if (tag instanceof CompoundTag) - return !((CompoundTag) tag).method_33133(); + return !((CompoundTag) tag).isEmpty(); if (tag instanceof AbstractListTag) return ((AbstractListTag) tag).isEmpty(); if (tag instanceof AbstractNumberTag)