From 4dd3cc7fd62865d401a8900aaee69ba524cf644e Mon Sep 17 00:00:00 2001 From: gnembon Date: Wed, 14 Jul 2021 00:57:37 -0300 Subject: [PATCH] mappings --- gradle.properties | 2 +- src/main/java/carpet/helpers/InventoryHelper.java | 6 +++--- src/main/java/carpet/mixins/ItemEntityMixin.java | 2 +- .../carpet/mixins/PlayerInventory_scarpetEventMixin.java | 2 +- src/main/java/carpet/script/api/WorldAccess.java | 4 ++-- src/main/java/carpet/script/value/NBTSerializableValue.java | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gradle.properties b/gradle.properties index d4c5e67d..e8678a40 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=1.17.1 - yarn_mappings=1.17.1+build.1 + yarn_mappings=1.17.1+build.13 loader_version=0.11.6 fabric_version=0.36.1+1.17 diff --git a/src/main/java/carpet/helpers/InventoryHelper.java b/src/main/java/carpet/helpers/InventoryHelper.java index 73093f83..c099ae19 100644 --- a/src/main/java/carpet/helpers/InventoryHelper.java +++ b/src/main/java/carpet/helpers/InventoryHelper.java @@ -23,7 +23,7 @@ public class InventoryHelper public static boolean cleanUpShulkerBoxTag(ItemStack stack) { boolean changed = false; - NbtCompound tag = stack.getTag(); + NbtCompound tag = stack.getNbt(); if (tag == null || !tag.contains("BlockEntityTag", TAG_COMPOUND)) return false; @@ -42,7 +42,7 @@ public class InventoryHelper } if (tag.isEmpty()) { - stack.setTag(null); + stack.setNbt(null); changed = true; } return changed; @@ -50,7 +50,7 @@ public class InventoryHelper public static boolean shulkerBoxHasItems(ItemStack stack) { - NbtCompound tag = stack.getTag(); + NbtCompound tag = stack.getNbt(); if (tag == null || !tag.contains("BlockEntityTag", TAG_COMPOUND)) return false; diff --git a/src/main/java/carpet/mixins/ItemEntityMixin.java b/src/main/java/carpet/mixins/ItemEntityMixin.java index 233540e8..4a58ac11 100644 --- a/src/main/java/carpet/mixins/ItemEntityMixin.java +++ b/src/main/java/carpet/mixins/ItemEntityMixin.java @@ -96,7 +96,7 @@ public abstract class ItemEntityMixin extends Entity implements ItemEntityInterf if (selfStack.getItem() == otherStack.getItem() && !InventoryHelper.shulkerBoxHasItems(selfStack) && !InventoryHelper.shulkerBoxHasItems(otherStack) - && selfStack.hasTag() == otherStack.hasTag() + && selfStack.hasNbt() == otherStack.hasNbt() && selfStack.getCount() + otherStack.getCount() <= SHULKERBOX_MAX_STACK_AMOUNT) { int amount = Math.min(otherStack.getCount(), SHULKERBOX_MAX_STACK_AMOUNT - selfStack.getCount()); diff --git a/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java b/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java index a0e6830a..24f2e4ee 100644 --- a/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java +++ b/src/main/java/carpet/mixins/PlayerInventory_scarpetEventMixin.java @@ -32,7 +32,7 @@ public abstract class PlayerInventory_scarpetEventMixin if (count != stack.getCount()) // res returns false for larger item adding to a almost full ineventory { ItemStack diffStack = new ItemStack(item, count - stack.getCount()); - diffStack.setTag(stack.getTag()); + diffStack.setNbt(stack.getNbt()); PLAYER_PICKS_UP_ITEM.onItemAction((ServerPlayerEntity) player, null, diffStack); } return res; diff --git a/src/main/java/carpet/script/api/WorldAccess.java b/src/main/java/carpet/script/api/WorldAccess.java index 4bd79a1d..c02adb03 100644 --- a/src/main/java/carpet/script/api/WorldAccess.java +++ b/src/main/java/carpet/script/api/WorldAccess.java @@ -857,7 +857,7 @@ public class WorldAccess { ItemStack tool = new ItemStack(item, 1); if (tag != null) - tool.setTag(tag); + tool.setNbt(tag); if (playerBreak && state.getHardness(world, where) < 0.0) return Value.FALSE; boolean removed = world.removeBlock(where, false); if (!removed) return Value.FALSE; @@ -902,7 +902,7 @@ public class WorldAccess { return Value.TRUE; if (toolBroke) return Value.NULL; - NbtElement outtag = tool.getTag(); + NbtElement outtag = tool.getNbt(); if (outtag == null) return Value.TRUE; return new NBTSerializableValue(() -> outtag); diff --git a/src/main/java/carpet/script/value/NBTSerializableValue.java b/src/main/java/carpet/script/value/NBTSerializableValue.java index 4a3a7b00..f2993e32 100644 --- a/src/main/java/carpet/script/value/NBTSerializableValue.java +++ b/src/main/java/carpet/script/value/NBTSerializableValue.java @@ -96,10 +96,10 @@ public class NBTSerializableValue extends Value implements ContainerValueInterfa public static Value fromStack(ItemStack stack) { - if (stack.hasTag()) + if (stack.hasNbt()) { NBTSerializableValue value = new NBTSerializableValue(); - value.nbtSupplier = stack::getTag; + value.nbtSupplier = stack::getNbt; return value; } return Value.NULL;