From 91bb99725081ca34a0ea1fadbc3126fa17194e26 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 5 Jun 2022 15:46:12 -0400 Subject: [PATCH] Use a weak hash map instead of manually clearing the map --- src/main/java/codechicken/nei/ClientHandler.java | 2 -- src/main/java/codechicken/nei/ItemMobSpawner.java | 9 ++++----- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/main/java/codechicken/nei/ClientHandler.java b/src/main/java/codechicken/nei/ClientHandler.java index 7004839e..e8a17444 100644 --- a/src/main/java/codechicken/nei/ClientHandler.java +++ b/src/main/java/codechicken/nei/ClientHandler.java @@ -328,8 +328,6 @@ public class ClientHandler if (!Minecraft.getMinecraft().isSingleplayer())//wait for server to initiate in singleplayer NEIClientConfig.loadWorld("remote/" + ClientUtils.getServerIP().replace(':', '~')); - - ItemMobSpawner.clearEntityReferences(world); } lastworld = world; diff --git a/src/main/java/codechicken/nei/ItemMobSpawner.java b/src/main/java/codechicken/nei/ItemMobSpawner.java index 87f028aa..63893a18 100644 --- a/src/main/java/codechicken/nei/ItemMobSpawner.java +++ b/src/main/java/codechicken/nei/ItemMobSpawner.java @@ -1,5 +1,6 @@ package codechicken.nei; +import com.google.common.collect.MapMaker; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityList; @@ -33,7 +34,9 @@ public class ItemMobSpawner extends ItemBlock hasSubtypes = true; MinecraftForgeClient.registerItemRenderer(this, new SpawnerRenderer()); - entityHashMap = new HashMap<>(); + entityHashMap = new MapMaker() + .weakValues() + .makeMap(); IDtoNameMap = new HashMap<>(); } @@ -96,10 +99,6 @@ public class ItemMobSpawner extends ItemBlock return e; } - public static void clearEntityReferences(World newWorld) { - entityHashMap.values().removeIf(e -> e.worldObj != newWorld); - } - private void setDefaultTag(ItemStack itemstack) { if (!IDtoNameMap.containsKey(itemstack.getItemDamage())) itemstack.setItemDamage(idPig);