Added slot textures to /open, added villager inventory to /open, made lectern has_book blockstate get updated by /open, fixed occasional disconnect from packet encode/decode

mega12345mega · mega12345mega · commit da69e6c28c19 · 2025-09-10T21:10:39.000-07:00
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/ArmorHandsContainerIO.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/ArmorHandsContainerIO.java
@@ -18,17 +18,19 @@ public boolean isSupported(NbtCompound container) {
 		NbtElement armorItemsNbtElement = container.get("ArmorItems");
 		if (armorItemsNbtElement != null) {
 			if (!(armorItemsNbtElement instanceof NbtList armorItemsNbt) ||
-					armorItemsNbt.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isEmpty() ||
-					armorItemsNbt.size() > 4) {
+					armorItemsNbt.size() > 4 ||
+					armorItemsNbt.nbte$getHeldType().filter(
+							heldType -> heldType == 0 || heldType == NbtElement.COMPOUND_TYPE).isEmpty()) {
 				return false;
 			}
 		}
 		
 		NbtElement handItemsNbtElement = container.get("HandItems");
 		if (handItemsNbtElement != null) {
 			if (!(handItemsNbtElement instanceof NbtList handItemsNbt) ||
-					handItemsNbt.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isEmpty() ||
-					handItemsNbt.size() > 2) {
+					handItemsNbt.size() > 2 ||
+					handItemsNbt.nbte$getHeldType().filter(
+							heldType -> heldType == 0 || heldType == NbtElement.COMPOUND_TYPE).isEmpty()) {
 				return false;
 			}
 		}
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/ContainerIOs.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/ContainerIOs.java
@@ -75,7 +75,8 @@ public static void registerItemEntityIO(Item item, EntityType<?> entity, Functio
 	private static final ItemBlockContainerIO DISPENSER_IO = ItemBlockContainerIO.forSlotKeyItems(9);
 	private static final ItemBlockContainerIO HOPPER_IO = ItemBlockContainerIO.forSlotKeyItems(5);
 	private static final ItemBlockContainerIO JUKEBOX_IO = ItemBlockContainerIO.forKeys(BlockEntityType.JUKEBOX, "RecordItem");
-	private static final ItemBlockContainerIO LECTERN_IO = ItemBlockContainerIO.forKeys(BlockEntityType.LECTERN, "Book");
+	private static final ItemBlockContainerIO LECTERN_IO = BlockStateUpdatingContainerIO.forItemBlock(
+			ItemBlockContainerIO.forKeys(BlockEntityType.LECTERN, "Book"), "has_book");
 	private static final Function<EntityType<?>, ItemEntityContainerIO> ITEM_FRAME_IO =
 			entityId -> ItemEntityContainerIO.forKeys(entityId, "Item");
 	private static final ContainerIO<ItemStack> BUNDLE_IO = Version.<ContainerIO<ItemStack>>newSwitch()
@@ -142,6 +143,9 @@ public static void registerItemEntityIO(Item item, EntityType<?> entity, Functio
 					.range(null, "1.20.4", () -> new ConcatContainerIO<>(
 							new ArmorHandsContainerIO(), new KeysContainerIO(false, "DecorItem"), new DonkeyChestContainerIO(true)))
 					.get());
+	private static final ContainerIO<LocalEntity> VILLAGER_IO = new ConcatContainerIO<>(
+			EQUIPMENT_IO.apply(EntityType.VILLAGER).entity(),
+			ContainerIO.forLocalNBT(new OrderNbtListContainerIO(8).forNbtCompound("Inventory")));
 	private static final ContainerIO<LocalEntity> CHEST_BOAT_IO =
 			ContainerIO.forLocalNBT(new SlotKeyNbtListContainerIO(27).forNbtCompoundItems());
 	
@@ -208,6 +212,7 @@ public static void loadClass() {}
 		registerEntityIO(EntityType.MULE, DONKEY_IO);
 		registerEntityIO(EntityType.LLAMA, LLAMA_IO);
 		registerEntityIO(EntityType.TRADER_LLAMA, LLAMA_IO);
+		registerEntityIO(EntityType.VILLAGER, VILLAGER_IO);
 		MVClientNetworking.PlayNetworkStateEvents.Join.EVENT.register(() -> {
 			for (EntityType<?> entityType : MVRegistry.ENTITY_TYPE) {
 				if (ENTITY_IO.containsKey(entityType))
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/OrderNbtListContainerIO.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/containers/OrderNbtListContainerIO.java
@@ -29,8 +29,8 @@ public ContainerIO<NbtCompound> forNbtCompoundItems() {
 	
 	@Override
 	public boolean isSupported(NbtList container) {
-		return container.size() <= maxSlots &&
-				container.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isPresent();
+		return container.size() <= maxSlots && container.nbte$getHeldType().filter(
+				heldType -> heldType == 0 || heldType == NbtElement.COMPOUND_TYPE).isPresent();
 	}
 	
 	@Override
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/localnbt/LocalEntity.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/localnbt/LocalEntity.java
@@ -203,7 +203,7 @@ public Text toHoverableText() {
 	
 	public CompletableFuture<Optional<EntityReference>> summon(RegistryKey<World> world, Vec3d pos) {
 		return NBTEditorClient.SERVER_CONN
-				.sendRequest(requestId -> new SummonEntityC2SPacket(requestId, world, pos, getId(), nbt), ViewEntityS2CPacket.class)
+				.sendRequest(requestId -> new SummonEntityC2SPacket(requestId, world, pos, getId(), nbt.copy()), ViewEntityS2CPacket.class)
 				.thenApply(optional -> optional.filter(ViewEntityS2CPacket::foundEntity)
 						.map(packet -> {
 							EntityReference ref = new EntityReference(packet.getWorld(), packet.getUUID(),
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/BlockReference.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/BlockReference.java
@@ -82,7 +82,7 @@ public void saveLocalNBT(LocalBlock block, Runnable onFinished) {
 		this.block = block.getBlock();
 		this.state = block.getState();
 		this.nbt = block.getNBT();
-		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, block.getId(), state, nbt,
+		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, block.getId(), state.copy(), nbt.copy(),
 				ConfigScreen.isRecreateBlocksAndEntities(), ConfigScreen.isTriggerBlockUpdates()));
 		onFinished.run();
 	}
@@ -99,7 +99,7 @@ public NbtCompound getNBT() {
 	public void saveNBT(Identifier id, NbtCompound toSave, Runnable onFinished) {
 		this.block = MVRegistry.BLOCK.get(id);
 		this.nbt = toSave;
-		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, id, state, toSave,
+		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, id, state.copy(), toSave.copy(),
 				ConfigScreen.isRecreateBlocksAndEntities(), ConfigScreen.isTriggerBlockUpdates()));
 		onFinished.run();
 	}
@@ -113,7 +113,7 @@ public BlockStateProperties getState() {
 	}
 	public void saveState(BlockStateProperties state, Runnable onFinished) {
 		this.state = state;
-		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, MVRegistry.BLOCK.getId(block), state, nbt,
+		MVClientNetworking.send(new SetBlockC2SPacket(world, pos, MVRegistry.BLOCK.getId(block), state.copy(), nbt.copy(),
 				ConfigScreen.isRecreateBlocksAndEntities(), ConfigScreen.isTriggerBlockUpdates()));
 		onFinished.run();
 	}
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/EntityReference.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/EntityReference.java
@@ -70,7 +70,7 @@ public NbtCompound getNBT() {
 	public void saveNBT(Identifier id, NbtCompound toSave, Runnable onFinished) {
 		this.entityType = MVRegistry.ENTITY_TYPE.get(id);
 		this.nbt = toSave;
-		MVClientNetworking.send(new SetEntityC2SPacket(world, uuid, id, toSave,
+		MVClientNetworking.send(new SetEntityC2SPacket(world, uuid, id, toSave.copy(),
 				ConfigScreen.isRecreateBlocksAndEntities()));
 		onFinished.run();
 	}
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/itemreferences/ServerItemReference.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/nbtreferences/itemreferences/ServerItemReference.java
@@ -44,7 +44,7 @@ public ItemStack getItem() {
 	public void saveItem(ItemStack toSave, Runnable onFinished) {
 		screen.getScreenHandler().getSlot(slot).setStackNoCallbacks(toSave);
 		if (NBTEditorClient.SERVER_CONN.isContainerScreen())
-			MVClientNetworking.send(new SetSlotC2SPacket(slot, toSave));
+			MVClientNetworking.send(new SetSlotC2SPacket(slot, toSave.copy()));
 		onFinished.run();
 	}
 	
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientChestScreen.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientChestScreen.java
@@ -73,7 +73,7 @@ public static void show() {
 	private ButtonWidget nextPageJump;
 	
 	private ClientChestScreen() {
-		super(new ClientScreenHandler(6), TextInst.translatable("nbteditor.client_chest"));
+		super(6, TextInst.translatable("nbteditor.client_chest"));
 	}
 	private void setPageData(ClientChestPage pageData) {
 		ItemStack[] items = pageData.getItemsOrThrow();
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientHandledScreen.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientHandledScreen.java
@@ -29,7 +29,6 @@
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
-import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.slot.Slot;
 import net.minecraft.screen.slot.SlotActionType;
 import net.minecraft.text.Text;
@@ -79,11 +78,16 @@ public static boolean handleKeybind(int keyCode, ItemStack item, ItemReference r
 	
 	private ServerInventoryManager serverInv;
 	
-	protected ClientHandledScreen(GenericContainerScreenHandler handler, Text title) {
-		super(handler, MainUtil.client.player.getInventory(), title);
+	protected ClientHandledScreen(int rows, Text title) {
+		super(new ClientScreenHandler(rows), MainUtil.client.player.getInventory(), title);
+		((ClientScreenHandler) handler).setScreen(this);
 		handler.disableSyncing();
 	}
 	
+	protected void setSlotTextures(Identifier... textures) {
+		((ClientScreenHandler) handler).setSlotTextures(textures);
+	}
+	
 	public ServerInventoryManager getServerInventoryManager() {
 		return serverInv;
 	}
@@ -200,7 +204,7 @@ protected void onMouseClick(Slot slot, int slotId, int button, SlotActionType ac
 						}
 						case QUICK_MOVE -> {
 							ItemStack prevItem = slot.getStack().copy();
-							LockableSlot.unlockDuring(() -> handler.onSlotClick(slot.id, button, actionType, MainUtil.client.player));
+							ClientScreenHandlerSlot.unlockDuring(() -> handler.onSlotClick(slot.id, button, actionType, MainUtil.client.player));
 							slot.setStackNoCallbacks(prevItem);
 							serverInv.updateServer();
 						}
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientScreenHandler.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientScreenHandler.java
@@ -12,6 +12,7 @@
 import net.minecraft.screen.GenericContainerScreenHandler;
 import net.minecraft.screen.ScreenHandlerType;
 import net.minecraft.screen.slot.Slot;
+import net.minecraft.util.Identifier;
 
 public class ClientScreenHandler extends GenericContainerScreenHandler {
 	
@@ -28,7 +29,16 @@ public ClientScreenHandler(int rows) {
 			default -> throw new IllegalArgumentException("Invalid row count: " + rows);
 		}, SYNC_ID, MainUtil.client.player.getInventory(), new SimpleInventory(rows * 9), rows);
 		
-		slots.replaceAll(LockableSlot::new);
+		slots.replaceAll(ClientScreenHandlerSlot::new);
+	}
+	
+	public void setScreen(ClientHandledScreen screen) {
+		slots.forEach(slot -> ((ClientScreenHandlerSlot) slot).setScreen(screen));
+	}
+	
+	public void setSlotTextures(Identifier... textures) {
+		for (int i = 0; i < textures.length; i++)
+			((ClientScreenHandlerSlot) slots.get(i)).setTexture(textures[i]);
 	}
 	
 	@Override
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientScreenHandlerSlot.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ClientScreenHandlerSlot.java
@@ -4,13 +4,12 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.luneruniverse.minecraft.mod.nbteditor.util.MainUtil;
-
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.screen.slot.Slot;
+import net.minecraft.util.Identifier;
 
-public class LockableSlot extends Slot {
+public class ClientScreenHandlerSlot extends Slot {
 	
 	private static final Set<Thread> UNLOCKED_THREADS = Collections.synchronizedSet(new HashSet<>());
 	public static void unlockDuring(Runnable callback) {
@@ -22,20 +21,27 @@ public static void unlockDuring(Runnable callback) {
 		}
 	}
 	
-	public LockableSlot(Slot slot) {
+	private ClientHandledScreen screen;
+	private Identifier texture;
+	
+	public ClientScreenHandlerSlot(Slot slot) {
 		super(slot.inventory, slot.getIndex(), slot.x, slot.y);
 		this.id = slot.id;
 	}
 	
+	public void setScreen(ClientHandledScreen screen) {
+		this.screen = screen;
+	}
+	
+	public void setTexture(Identifier texture) {
+		this.texture = texture;
+	}
+	
 	private boolean isBlocked() {
 		if (UNLOCKED_THREADS.contains(Thread.currentThread()))
 			return false;
 		
-		if (MainUtil.client.currentScreen instanceof ClientHandledScreen clientHandledScreen) {
-			if (clientHandledScreen.getLockedSlotsInfo().isBlocked(this, false))
-				return true;
-		}
-		return false;
+		return screen.getLockedSlotsInfo().isBlocked(this, false);
 	}
 	
 	@Override
@@ -60,4 +66,9 @@ public int getMaxItemCount() {
 		return super.getMaxItemCount();
 	}
 	
+	@Override
+	public Identifier getBackgroundSprite() {
+		return texture;
+	}
+	
 }
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ContainerScreen.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/ContainerScreen.java
@@ -41,7 +41,7 @@ public static <L extends LocalNBT> void show(NBTReference<L> ref) {
 	private boolean navigationClicked;
 	
 	private ContainerScreen(NBTReference<L> ref) {
-		super(new ClientScreenHandler(3), TextInst.translatable("nbteditor.container.title").append(ref.getLocalNBT().getName()));
+		super(3, TextInst.translatable("nbteditor.container.title").append(ref.getLocalNBT().getName()));
 		
 		this.unsavedTitle = TextInst.copy(title).append("*");
 		
@@ -50,6 +50,8 @@ private ContainerScreen(NBTReference<L> ref) {
 		this.numSlots = ContainerIOs.getMaxSlots(localNBT);
 		this.saved = true;
 		
+		setSlotTextures(ContainerIOs.getTextures(localNBT));
+		
 		ItemStack[] contents = ContainerIOs.read(localNBT);
 		for (int i = 0; i < contents.length; i++)
 			handler.getSlot(i).setStackNoCallbacks(contents[i] == null ? ItemStack.EMPTY : contents[i].copy());
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/CursorHistoryScreen.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/CursorHistoryScreen.java
@@ -16,7 +16,7 @@ public static void show(List<ItemStack> items, List<Integer> lockedItems) {
 	private final LockedSlotsInfo lockedSlots;
 	
 	private CursorHistoryScreen(List<ItemStack> items, List<Integer> lockedItems) {
-		super(new ClientScreenHandler(6), TextInst.translatable("nbteditor.container.title")
+		super(6, TextInst.translatable("nbteditor.container.title")
 				.append(TextInst.translatable("nbteditor.get.lost_item.history")));
 		
 		for (int i = 0; i < handler.getInventory().size() && i < items.size(); i++)
diff --git a/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/CursorManager.java b/src/main/java/com/luneruniverse/minecraft/mod/nbteditor/screens/containers/CursorManager.java
@@ -72,7 +72,7 @@ private void transferCursorTo(HandledScreen<?> branch) {
 		
 		if (currentRootHasServerCursor) {
 			if (branch == currentRoot)
-				MVClientNetworking.send(new SetCursorC2SPacket(handler.getCursorStack()));
+				MVClientNetworking.send(new SetCursorC2SPacket(handler.getCursorStack().copy()));
 			else if (currentBranch == currentRoot)
 				MVClientNetworking.send(new SetCursorC2SPacket(ItemStack.EMPTY));
 		}
@@ -146,7 +146,7 @@ public void setCursor(ItemStack item) {
 		MainUtil.setCursorStackSilently(currentBranch.getScreenHandler(), item);
 		
 		if (currentRootHasServerCursor && currentBranch == currentRoot)
-			MVClientNetworking.send(new SetCursorC2SPacket(item));
+			MVClientNetworking.send(new SetCursorC2SPacket(item.copy()));
 	}
 	
 }
diff --git a/src/main/java/tsp/headdb/ported/inventory/InventoryUtils.java b/src/main/java/tsp/headdb/ported/inventory/InventoryUtils.java
@@ -7,7 +7,6 @@
 
 import com.luneruniverse.minecraft.mod.nbteditor.multiversion.TextInst;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.containers.ClientHandledScreen;
-import com.luneruniverse.minecraft.mod.nbteditor.screens.containers.ClientScreenHandler;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.widgets.InputOverlay;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.widgets.StringInput;
 import com.luneruniverse.minecraft.mod.nbteditor.tagreferences.ItemTagReferences;
@@ -141,7 +140,7 @@ else if (e.getClickType() == ClickTypeMod.RIGHT)
     }
 
     public static void openDatabase() {
-    	ClientHandledScreen screen = new ClientHandledScreen(new ClientScreenHandler(6),
+    	ClientHandledScreen screen = new ClientHandledScreen(6,
     			TextInst.of(Utils.colorize("&c&lHeadDB &8(" + HeadAPI.getHeads().size() + ")"))) {
     		@Override
     		protected void onMouseClick(Slot slot, int slotId, int button, SlotActionType actionType) {
diff --git a/src/main/java/tsp/headdb/ported/inventory/PagedPane.java b/src/main/java/tsp/headdb/ported/inventory/PagedPane.java
@@ -14,7 +14,6 @@
 
 import com.luneruniverse.minecraft.mod.nbteditor.multiversion.TextInst;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.containers.ClientHandledScreen;
-import com.luneruniverse.minecraft.mod.nbteditor.screens.containers.ClientScreenHandler;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.widgets.InputOverlay;
 import com.luneruniverse.minecraft.mod.nbteditor.screens.widgets.StringInput;
 import com.luneruniverse.minecraft.mod.nbteditor.tagreferences.ItemTagReferences;
@@ -45,7 +44,7 @@ public class PagedPane extends ClientHandledScreen {
      * @param pageSize The page size. inventory rows - 2
      */
     public PagedPane(int pageSize, int rows, String title) {
-    	super(new ClientScreenHandler(rows), TextInst.of(MainUtil.colorize(title)));
+    	super(rows, TextInst.of(MainUtil.colorize(title)));
         this.pageSize = pageSize;
         pages.put(0, new Page(pageSize));
     }
diff --git a/src/main/resources/assets/nbteditor/lang/en_us.json b/src/main/resources/assets/nbteditor/lang/en_us.json
@@ -526,15 +526,8 @@
 	"nbteditor.help.open_4": "§7Changes are automatically saved.",
 	"nbteditor.help.open_5": "§7Any item can be put into any slot, regardless of typical restrictions.",
 	"nbteditor.help.open_6": "§7Normal containers like chests, hoppers, and furnaces use the slots at the beginning of the gui, which map directly to the container's slots.",
-	"nbteditor.help.open_7": "§7Special containers assign meaning to each slot: (in order of the slots in the gui)",
-	"nbteditor.help.open_8": "§7 - Jukeboxes: record",
-	"nbteditor.help.open_9": "§7 - Lecterns: book",
-	"nbteditor.help.open_10": "§7 - Item Frames: item",
-	"nbteditor.help.open_11": "§7 - Suspicious Sand & Gravel: item",
-	"nbteditor.help.open_12": "§7 - Decorated Pot: item",
-	"nbteditor.help.open_13": "§7 - Most Spawn Eggs & Entities: head, chest, legs, feet, main hand, off hand",
-	"nbteditor.help.open_14": "§7 - Horse/Donkey/etc. Spawn Eggs & Entities: saddle, armor/carpet, chest contents (all only if applicable)",
-	"nbteditor.help.open_15": "§7--------------------",
+	"nbteditor.help.open_7": "§7Special containers assign meaning to each slot, and often have textures to indicate the slot's purpose.",
+	"nbteditor.help.open_8": "§7--------------------",
 	
 	"nbteditor.help.get_1": "§7--------------------",
 	"nbteditor.help.get_2": "§6Help: /get <supplier> [<args>]",

Original file line number	Diff line number	Diff line change
`@@ -18,17 +18,19 @@ public boolean isSupported(NbtCompound container) {`
`18`	`18`	`NbtElement armorItemsNbtElement = container.get("ArmorItems");`
`19`	`19`	`if (armorItemsNbtElement != null) {`
`20`	`20`	`if (!(armorItemsNbtElement instanceof NbtList armorItemsNbt) \|\|`
`21`		`- armorItemsNbt.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isEmpty() \|\|`
`22`		`- armorItemsNbt.size() > 4) {`
	`21`	`+ armorItemsNbt.size() > 4 \|\|`
	`22`	`+ armorItemsNbt.nbte$getHeldType().filter(`
	`23`	`+ heldType -> heldType == 0 \|\| heldType == NbtElement.COMPOUND_TYPE).isEmpty()) {`
`23`	`24`	`return false;`
`24`	`25`	`}`
`25`	`26`	`}`
`26`	`27`
`27`	`28`	`NbtElement handItemsNbtElement = container.get("HandItems");`
`28`	`29`	`if (handItemsNbtElement != null) {`
`29`	`30`	`if (!(handItemsNbtElement instanceof NbtList handItemsNbt) \|\|`
`30`		`- handItemsNbt.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isEmpty() \|\|`
`31`		`- handItemsNbt.size() > 2) {`
	`31`	`+ handItemsNbt.size() > 2 \|\|`
	`32`	`+ handItemsNbt.nbte$getHeldType().filter(`
	`33`	`+ heldType -> heldType == 0 \|\| heldType == NbtElement.COMPOUND_TYPE).isEmpty()) {`
`32`	`34`	`return false;`
`33`	`35`	`}`
`34`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ public ContainerIO<NbtCompound> forNbtCompoundItems() {`
`29`	`29`
`30`	`30`	`@Override`
`31`	`31`	`public boolean isSupported(NbtList container) {`
`32`		`- return container.size() <= maxSlots &&`
`33`		`- container.nbte$getHeldType().filter(heldType -> heldType == NbtElement.COMPOUND_TYPE).isPresent();`
	`32`	`+ return container.size() <= maxSlots && container.nbte$getHeldType().filter(`
	`33`	`+ heldType -> heldType == 0 \|\| heldType == NbtElement.COMPOUND_TYPE).isPresent();`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ public NbtCompound getNBT() {`
`70`	`70`	`public void saveNBT(Identifier id, NbtCompound toSave, Runnable onFinished) {`
`71`	`71`	`this.entityType = MVRegistry.ENTITY_TYPE.get(id);`
`72`	`72`	`this.nbt = toSave;`
`73`		`- MVClientNetworking.send(new SetEntityC2SPacket(world, uuid, id, toSave,`
	`73`	`+ MVClientNetworking.send(new SetEntityC2SPacket(world, uuid, id, toSave.copy(),`
`74`	`74`	`ConfigScreen.isRecreateBlocksAndEntities()));`
`75`	`75`	`onFinished.run();`
`76`	`76`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public ItemStack getItem() {`
`44`	`44`	`public void saveItem(ItemStack toSave, Runnable onFinished) {`
`45`	`45`	`screen.getScreenHandler().getSlot(slot).setStackNoCallbacks(toSave);`
`46`	`46`	`if (NBTEditorClient.SERVER_CONN.isContainerScreen())`
`47`		`- MVClientNetworking.send(new SetSlotC2SPacket(slot, toSave));`
	`47`	`+ MVClientNetworking.send(new SetSlotC2SPacket(slot, toSave.copy()));`
`48`	`48`	`onFinished.run();`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public static void show() {`
`73`	`73`	`private ButtonWidget nextPageJump;`
`74`	`74`
`75`	`75`	`private ClientChestScreen() {`
`76`		`- super(new ClientScreenHandler(6), TextInst.translatable("nbteditor.client_chest"));`
	`76`	`+ super(6, TextInst.translatable("nbteditor.client_chest"));`
`77`	`77`	`}`
`78`	`78`	`private void setPageData(ClientChestPage pageData) {`
`79`	`79`	`ItemStack[] items = pageData.getItemsOrThrow();`