Remove missed usages of Primitive Collections

src/main/java/org/embeddedt/archaicfix/ArchaicFix.java

@@ -16,6 +16,7 @@
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.network.NetHandlerPlayServer;
 import net.minecraftforge.common.MinecraftForge;
+import org.embeddedt.archaicfix.asm.EarlyStringPool;
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.embeddedt.archaicfix.ducks.IAcceleratedRecipe;
 import org.embeddedt.archaicfix.proxy.CommonProxy;
@@ -73,7 +74,7 @@ public void preinit(FMLPreInitializationEvent event)
 
     @EventHandler
     public void init(FMLInitializationEvent event) {
-
+        EarlyStringPool.clear();
     }
 
     @EventHandler

src/main/java/org/embeddedt/archaicfix/asm/EarlyStringPool.java

@@ -0,0 +1,20 @@
+package org.embeddedt.archaicfix.asm;
+
+import java.util.HashMap;
+import java.util.function.Function;
+
+public class EarlyStringPool {
+    private static final HashMap<String, String> POOL = new HashMap<>();
+
+    public static String canonicalize(String str) {
+        synchronized (POOL) {
+            return POOL.computeIfAbsent(str, Function.identity());
+        }
+    }
+
+    public static void clear() {
+        synchronized (POOL) {
+            POOL.clear();
+        }
+    }
+}

src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinASMData.java

@@ -1,11 +1,11 @@
 package org.embeddedt.archaicfix.mixins.common.core;
 
 import cpw.mods.fml.common.discovery.ASMDataTable;
+import org.embeddedt.archaicfix.asm.EarlyStringPool;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import zone.rong.loliasm.api.LoliStringPool;
 
 @Mixin(value = ASMDataTable.ASMData.class, remap = false)
 public class MixinASMData {
@@ -15,11 +15,11 @@ public class MixinASMData {
 
     @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lcpw/mods/fml/common/discovery/ASMDataTable$ASMData;annotationName:Ljava/lang/String;"))
     private void canonicalizeAnnotation(ASMDataTable.ASMData instance, String value) {
-        this.annotationName = value == null ? null : LoliStringPool.canonicalize(value);
+        this.annotationName = value == null ? null : EarlyStringPool.canonicalize(value);
     }
 
     @Redirect(method = "<init>", at = @At(value = "FIELD", target = "Lcpw/mods/fml/common/discovery/ASMDataTable$ASMData;className:Ljava/lang/String;"))
     private void canonicalizeClassName(ASMDataTable.ASMData instance, String value) {
-        this.className = value == null ? null : LoliStringPool.canonicalize(value);
+        this.className = value == null ? null : EarlyStringPool.canonicalize(value);
     }
 }

src/main/java/org/embeddedt/archaicfix/mixins/common/core/MixinModCandidate.java

@@ -2,12 +2,12 @@
 
 import cpw.mods.fml.common.discovery.ASMDataTable;
 import cpw.mods.fml.common.discovery.ModCandidate;
+import org.embeddedt.archaicfix.asm.EarlyStringPool;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
-import zone.rong.loliasm.api.LoliStringPool;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -39,7 +39,7 @@ public void addClassEntry(String name) {
         className = className.replace('/','.');
         int pkgIdx = className.lastIndexOf('.');
         if (pkgIdx > -1) {
-            String pkg = LoliStringPool.canonicalize(className.substring(0, pkgIdx));
+            String pkg = EarlyStringPool.canonicalize(className.substring(0, pkgIdx));
             packageSet.add(pkg);
             table.registerPackage((ModCandidate)(Object)this, pkg);
         }

src/main/java/org/embeddedt/archaicfix/proxy/ClientProxy.java

@@ -15,7 +15,6 @@
 import org.embeddedt.archaicfix.config.ArchaicConfig;
 import org.embeddedt.archaicfix.helpers.BuiltInResourcePack;
 import org.embeddedt.archaicfix.helpers.SoundDeviceThread;
-import zone.rong.loliasm.api.LoliStringPool;
 
 import java.lang.management.ManagementFactory;
 
@@ -26,7 +25,6 @@ public class ClientProxy extends CommonProxy {
     public void preinit() {
         super.preinit();
         Minecraft.memoryReserve = new byte[0];
-        MinecraftForge.EVENT_BUS.register(new LoliStringPool.EventHandler());
         MinecraftForge.EVENT_BUS.register(this);
         FMLCommonHandler.instance().bus().register(this);
         if(ArchaicConfig.modernizeTextures) {

src/main/java/zone/rong/loliasm/api/CaptureSet.java

@@ -1,7 +1,5 @@
 package zone.rong.loliasm.api;
 
-import speiger.src.collections.objects.sets.ObjectOpenHashSet;
-
 import java.util.HashSet;
 import java.util.Set;
 
@@ -11,7 +9,7 @@ public class CaptureSet<K> extends HashSet<K> {
 
     public CaptureSet() {
         super();
-        this.backingCaptures = new ObjectOpenHashSet<>();
+        this.backingCaptures = new HashSet<>();
     }
 
     public CaptureSet(Set<K> populate) {

src/main/java/zone/rong/loliasm/api/ResourceCache.java

@@ -1,8 +1,8 @@
 package zone.rong.loliasm.api;
 
-import speiger.src.collections.objects.maps.impl.hash.Object2ObjectOpenHashMap;
+import java.util.HashMap;
 
-public class ResourceCache extends Object2ObjectOpenHashMap<String, byte[]> {
+public class ResourceCache extends HashMap<String, byte[]> {
 
     public byte[] add(String s, byte[] bytes) {
         return super.put(s, bytes);