Clear enchantments on screen close

Author: FlorianMichael

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/packets/BlockItemPackets1_9.java

@@ -65,7 +65,14 @@ protected void registerPackets() {
 
 		protocol.registerClientbound(ClientboundPackets1_9.CLOSE_WINDOW, wrapper -> {
 			final short windowId = wrapper.passthrough(Type.UNSIGNED_BYTE);
-			wrapper.user().get(WindowTracker.class).remove(windowId);
+
+			final WindowTracker tracker = wrapper.user().get(WindowTracker.class);
+
+			final String windowType = tracker.get(windowId);
+			if (windowType != null && windowType.equalsIgnoreCase("minecraft:enchanting_table")) {
+				tracker.clearEnchantmentProperties();
+			}
+			tracker.remove(windowId);
 		});
 
 		protocol.registerClientbound(ClientboundPackets1_9.OPEN_WINDOW, wrapper -> {
@@ -173,11 +180,11 @@ public void register() {
 			final String windowType = tracker.get(windowId);
 			if (windowType != null && windowType.equalsIgnoreCase("minecraft:enchanting_table")) {
 				if (key >= 4 && key <= 6) { // Store enchantment ids
-					tracker.storeEnchantmentTableProperty(windowId, key, value);
+					tracker.putEnchantmentProperty(key, value);
 					wrapper.cancel();
 				} else if (key >= 7 && key <= 9) { // Mix levels with tracked ids
 					key -= 3;
-					final short property = tracker.getEnchantmentTableProperty(windowId, key);
+					final short property = tracker.getEnchantmentValue(key);
 					value = (short) (property | (value << 8));
 				}
 			}

common/src/main/java/com/viaversion/viarewind/protocol/protocol1_8to1_9/storage/WindowTracker.java

@@ -37,7 +37,7 @@
 public class WindowTracker extends StoredObject {
 	private final HashMap<Short, String> types = new HashMap<>();
 	private final HashMap<Short, Item[]> brewingItems = new HashMap<>();
-	private final Map<Short, WindowProperties> enchantmentProperties = new HashMap<>();
+	private final Map<Short, Short> enchantmentProperties = new HashMap<>();
 
 	public WindowTracker(UserConnection user) {
 		super(user);
@@ -65,19 +65,19 @@ public Item[] getBrewingItems(short windowId) {
 		});
 	}
 
-	public void storeEnchantmentTableProperty(short windowId, int key, int value) {
-		enchantmentProperties.computeIfAbsent(windowId, aShort -> new WindowProperties()).put(key, value);
+	public short getEnchantmentValue(final short key) {
+		if (!enchantmentProperties.containsKey(key)) {
+			return 0;
+		}
+		return enchantmentProperties.remove(key);
 	}
 
-	public short getEnchantmentTableProperty(short windowId, int key) {
-		final Integer value = enchantmentProperties.get(windowId).get(key);
-		if (value == null) {
-			return 0; // Assume default value, nothing we can do about
-		}
-		if (enchantmentProperties.get(windowId).properties.isEmpty()) { // Remove from list if nothing to track
-			enchantmentProperties.remove(windowId);
-		}
-		return value.shortValue();
+	public void putEnchantmentProperty(short key, short value) {
+		enchantmentProperties.put(key, value);
+	}
+
+	public void clearEnchantmentProperties() {
+		enchantmentProperties.clear();
 	}
 
 	public static void updateBrewingStand(UserConnection user, Item blazePowder, short windowId) throws Exception {
@@ -109,20 +109,4 @@ public static void updateBrewingStand(UserConnection user, Item blazePowder, sho
 			setSlot.scheduleSend(Protocol1_8To1_9.class);
 		}
 	}
-
-	public static class WindowProperties {
-
-		private final Map<Integer, Integer> properties = new HashMap<>();
-
-		public Integer get(int key) {
-			if (!properties.containsKey(key)) {
-				return null;
-			}
-			return properties.remove(key);
-		}
-
-		public void put(int key, int value) {
-			properties.put(key, value);
-		}
-	}
 }