Partly fix memory leak, remove some unnecessary concurrenthashmap usages

The block entity caching in 1.13->1.12 protocol did not uncache any of the positions/blocks - this at least clears the cache on respawn, but an uncache in the chunkunload is still required to be done

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/data/AdvancementTranslations.java

@@ -10,11 +10,11 @@
 
 package nl.matsv.viabackwards.protocol.protocol1_11_1to1_12.data;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class AdvancementTranslations {
-    private static final Map<String, String> advancements = new ConcurrentHashMap<>();
+    private static final Map<String, String> advancements = new HashMap<>();
 
     static {
         add("advancements.nether.get_wither_skull.title", "Spooky Scary Skeleton");
@@ -140,10 +140,6 @@ public class AdvancementTranslations {
         advancements.put(key, value);
     }
 
-    public static boolean has(String key) {
-        return advancements.containsKey(key);
-    }
-
     public static String get(String key) {
         return advancements.get(key);
     }

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_11_1to1_12/packets/ChatPackets1_12.java

@@ -75,10 +75,13 @@ public class ChatPackets1_12 extends Rewriter<Protocol1_11_1To1_12> {
         if (object.isJsonObject()) {
             for (Map.Entry<String, JsonElement> entry : copiedObj.entrySet()) {
                 // Get the text that doesn't exist for 1.11 <
-                if (entry.getKey().equalsIgnoreCase("translate") && AdvancementTranslations.has(entry.getValue().getAsString())) {
+
-                    String trans = entry.getValue().getAsString();
+                if (entry.getKey().equalsIgnoreCase("translate")) {
-                    object.remove("translate");
+                    String translate = entry.getValue().getAsString();
-                    object.addProperty("translate", AdvancementTranslations.get(trans));
+                    String text = AdvancementTranslations.get(translate);
+                    if (text != null) {
+                        object.addProperty("translate", text);
+                    }
                 }
                 // Handle arrays
                 if (entry.getValue().isJsonArray())

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/Protocol1_12_2To1_13.java

@@ -96,7 +96,6 @@ public class Protocol1_12_2To1_13 extends BackwardsProtocol {
         out(State.PLAY, 0x1C, 0x1B); // Entity Status
         out(State.PLAY, 0x1D, -1, cancel()); // NBT Query Response (client won't send a request, so the server should not answer)
         out(State.PLAY, 0x1E, 0x1C); // Explosion
-        out(State.PLAY, 0x1F, 0x1D); // Unload Chunk
         out(State.PLAY, 0x20, 0x1E); // Change Game State
         out(State.PLAY, 0x21, 0x1F); // Keep Alive (clientbound)
         out(State.PLAY, 0x27, 0x25); // Entity

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/block_entity_handlers/FlowerPotHandler.java

@@ -17,15 +17,16 @@ import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag;
 import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsBlockEntityHandler {
 
-    private static final Map<Integer, Pair<String, Byte>> flowers = new ConcurrentHashMap<>();
+    private static final Map<Integer, Pair<String, Byte>> flowers = new HashMap<>();
+    private static final Pair<String, Byte> AIR = new Pair<>("minecraft:air", (byte) 0);
 
     static {
-        register(5265, "minecraft:air", (byte) 0);
+        flowers.put(5265, AIR);
         register(5266, "minecraft:sapling", (byte) 0);
         register(5267, "minecraft:sapling", (byte) 1);
         register(5268, "minecraft:sapling", (byte) 2);
@@ -58,10 +59,8 @@ public class FlowerPotHandler implements BackwardsBlockEntityProvider.BackwardsB
     }
 
     public Pair<String, Byte> getOrDefault(int blockId) {
-        if (flowers.containsKey(blockId))
+        Pair<String, Byte> pair = flowers.get(blockId);
-            return flowers.get(blockId);
+        return pair != null ? pair : AIR;
-
-        return flowers.get(5265);
     }
 
     // TODO THIS IS NEVER CALLED BECAUSE ITS NO LONGER A BLOCK ENTITY :(

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/BlockItemPackets1_13.java

@@ -174,6 +174,22 @@ public class BlockItemPackets1_13 extends nl.matsv.viabackwards.api.rewriters.It
             }
         });
 
+        // Unload chunk
+        protocol.registerOutgoing(State.PLAY, 0x1F, 0x1D, new PacketRemapper() {
+            @Override
+            public void registerMap() {
+                handler(new PacketHandler() {
+                    @Override
+                    public void handle(PacketWrapper wrapper) throws Exception {
+                        /*int x = wrapper.passthrough(Type.INT);
+                        int z = wrapper.passthrough(Type.INT;
+                        BackwardsBlockStorage blockStorage = wrapper.user().get(BackwardsBlockStorage.class);*/
+                        //TODO UNCACHE BLOCKSTORAGE ENTRIES - MEMORY LEAK!
+                    }
+                });
+            }
+        });
+
         // Block Change
         protocol.out(State.PLAY, 0x0B, 0x0B, new PacketRemapper() {
             @Override

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/packets/EntityPackets1_13.java

@@ -8,6 +8,7 @@ import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.Protocol1_12_2To1_13;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.EntityTypeMapping;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.PaintingMapping;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.data.ParticleMapping;
+import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.BackwardsBlockStorage;
 import nl.matsv.viabackwards.protocol.protocol1_12_2to1_13.storage.PlayerPositionStorage1_13;
 import us.myles.ViaVersion.api.PacketWrapper;
 import us.myles.ViaVersion.api.entities.Entity1_13Types;
@@ -216,6 +217,7 @@ public class EntityPackets1_13 extends LegacyEntityRewriter<Protocol1_12_2To1_13
                 map(Type.INT); // 0 - Dimension ID
 
                 handler(getDimensionHandler(0));
+                handler(wrapper -> wrapper.user().get(BackwardsBlockStorage.class).clear());
             }
         });
 

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/providers/BackwardsBlockEntityProvider.java

@@ -21,11 +21,11 @@ import us.myles.viaversion.libs.opennbt.tag.builtin.CompoundTag;
 import us.myles.viaversion.libs.opennbt.tag.builtin.IntTag;
 import us.myles.viaversion.libs.opennbt.tag.builtin.StringTag;
 
+import java.util.HashMap;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class BackwardsBlockEntityProvider implements Provider {
-    private final Map<String, BackwardsBlockEntityProvider.BackwardsBlockEntityHandler> handlers = new ConcurrentHashMap<>();
+    private final Map<String, BackwardsBlockEntityProvider.BackwardsBlockEntityHandler> handlers = new HashMap<>();
 
     public BackwardsBlockEntityProvider() {
         handlers.put("minecraft:flower_pot", new FlowerPotHandler()); // TODO requires special treatment, manually send
@@ -64,15 +64,15 @@ public class BackwardsBlockEntityProvider implements Provider {
         }
 
         BackwardsBlockStorage storage = user.get(BackwardsBlockStorage.class);
-
+        Integer blockId = storage.get(position);
-        if (!storage.contains(position)) {
+        if (blockId == null) {
             if (Via.getManager().isDebug()) {
                 ViaBackwards.getPlatform().getLogger().warning("Handled BlockEntity does not have a stored block :( " + id + " full tag: " + tag);
             }
             return tag;
         }
 
-        return handler.transform(user, storage.get(position), tag);
+        return handler.transform(user, blockId, tag);
     }
 
     /**

core/src/main/java/nl/matsv/viabackwards/protocol/protocol1_12_2to1_13/storage/BackwardsBlockStorage.java

@@ -56,7 +56,7 @@ public class BackwardsBlockStorage extends StoredObject {
     }
 
 
-    private Map<Position, Integer> blocks = new ConcurrentHashMap<>();
+    private final Map<Position, Integer> blocks = new ConcurrentHashMap<>();
 
     public BackwardsBlockStorage(UserConnection user) {
         super(user);
@@ -76,11 +76,7 @@ public class BackwardsBlockStorage extends StoredObject {
         return whitelist.contains(block);
     }
 
-    public boolean contains(Position position) {
+    public Integer get(Position position) {
-        return blocks.containsKey(position);
-    }
-
-    public int get(Position position) {
         return blocks.get(position);
     }
 
@@ -88,4 +84,7 @@ public class BackwardsBlockStorage extends StoredObject {
         return blocks.remove(position);
     }
 
+    public void clear() {
+        blocks.clear();
+    }
 }