Split registry rewrite into separate off-by-default option

This needs more testing

src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -45,6 +45,8 @@ public class ModernFixEarlyConfig {
         this.addMixinRule("feature.reduce_loading_screen_freezes", false);
         this.addMixinRule("feature.direct_stack_trace", false);
         this.addMixinRule("perf.fast_registry_validation", true);
+        // not stable yet
+        this.addMixinRule("perf.rewrite_registry", false);
         this.addMixinRule("perf.use_integrated_resources.jepb", modPresent("jepb"));
         this.addMixinRule("perf.use_integrated_resources.jeresources", modPresent("jeresources"));
         this.addMixinRule("perf.jeresources_startup", modPresent("jeresources"));

src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java

@@ -1,19 +1,11 @@
 package org.embeddedt.modernfix.mixin.perf.fast_registry_validation;
 
-import com.google.common.collect.BiMap;
-import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.registries.ForgeRegistry;
 import net.minecraftforge.registries.IForgeRegistryEntry;
 import org.apache.logging.log4j.Logger;
 import org.apache.logging.log4j.Marker;
-import org.embeddedt.modernfix.registry.FastForgeRegistry;
-import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.Redirect;
@@ -67,44 +59,4 @@ public class ForgeRegistryMixin<V extends IForgeRegistryEntry<V>> {
     private void skipTrace(Logger logger, Marker marker, String s, Object o, Object o1, Object o2, Object o3, Object o4) {
 
     }
-
-    @Shadow @Final @Mutable private BiMap<Integer, V> ids;
-
-    @Shadow @Final @Mutable private BiMap<ResourceKey<V>, V> keys;
-
-    @Shadow @Final private ResourceKey<Registry<V>> key;
-
-    @Shadow @Final @Mutable private BiMap<ResourceLocation, V> names;
-
-    @Shadow @Final @Mutable private BiMap owners;
-
-    private FastForgeRegistry<V> fastRegistry;
-
-    /**
-     * The following code replaces the Forge HashBiMaps with a more efficient data structure based around
-     * an array list for IDs and one HashMap going from value -> information.
-     */
-    @Inject(method = "<init>", at = @At("RETURN"))
-    private void replaceBackingMaps(CallbackInfo ci) {
-        this.fastRegistry = new FastForgeRegistry<>(this.key);
-        this.ids = fastRegistry.getIds();
-        this.keys = fastRegistry.getKeys();
-        this.names = fastRegistry.getNames();
-        this.owners = fastRegistry.getOwners();
-    }
-
-    @Inject(method = "freeze", at = @At("RETURN"))
-    private void optimizeRegistry(CallbackInfo ci) {
-        this.fastRegistry.optimize();
-    }
-
-    @Redirect(method = "sync", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/BiMap;clear()V"))
-    private void clearBiMap(BiMap map) {
-        if(map == this.owners) {
-            this.fastRegistry.clear();
-        } else if(map == this.keys || map == this.names || map == this.ids) {
-            // do nothing, the registry is faster at clearing everything at once
-        } else
-            map.clear();
-    }
 }

src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistryMixin.java

@@ -0,0 +1,63 @@
+package org.embeddedt.modernfix.mixin.perf.rewrite_registry;
+
+import com.google.common.collect.BiMap;
+import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.registries.ForgeRegistry;
+import net.minecraftforge.registries.IForgeRegistryEntry;
+import org.embeddedt.modernfix.registry.FastForgeRegistry;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.Redirect;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(value = ForgeRegistry.class, remap = false)
+public class ForgeRegistryMixin<V extends IForgeRegistryEntry<V>> {
+    @Shadow
+    @Final
+    @Mutable
+    private BiMap<Integer, V> ids;
+
+    @Shadow @Final @Mutable private BiMap<ResourceKey<V>, V> keys;
+
+    @Shadow @Final private ResourceKey<Registry<V>> key;
+
+    @Shadow @Final @Mutable private BiMap<ResourceLocation, V> names;
+
+    @Shadow @Final @Mutable private BiMap owners;
+
+    private FastForgeRegistry<V> fastRegistry;
+
+    /**
+     * The following code replaces the Forge HashBiMaps with a more efficient data structure based around
+     * an array list for IDs and one HashMap going from value -> information.
+     */
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void replaceBackingMaps(CallbackInfo ci) {
+        this.fastRegistry = new FastForgeRegistry<>(this.key);
+        this.ids = fastRegistry.getIds();
+        this.keys = fastRegistry.getKeys();
+        this.names = fastRegistry.getNames();
+        this.owners = fastRegistry.getOwners();
+    }
+
+    @Inject(method = "freeze", at = @At("RETURN"))
+    private void optimizeRegistry(CallbackInfo ci) {
+        this.fastRegistry.optimize();
+    }
+
+    @Redirect(method = "sync", at = @At(value = "INVOKE", target = "Lcom/google/common/collect/BiMap;clear()V"))
+    private void clearBiMap(BiMap map) {
+        if(map == this.owners) {
+            this.fastRegistry.clear();
+        } else if(map == this.keys || map == this.names || map == this.ids) {
+            // do nothing, the registry is faster at clearing everything at once
+        } else
+            map.clear();
+    }
+}

src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.fast_registry_validation;
+package org.embeddedt.modernfix.mixin.perf.rewrite_registry;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;

src/main/resources/modernfix.mixins.json

@@ -64,7 +64,8 @@
     "perf.kubejs.CustomIngredientMixin",
     "perf.nbt_memory_usage.CompoundTagMixin",
     "perf.fast_registry_validation.ForgeRegistryMixin",
-    "perf.fast_registry_validation.ForgeRegistrySnapshotMixin",
+    "perf.rewrite_registry.ForgeRegistryMixin",
+    "perf.rewrite_registry.ForgeRegistrySnapshotMixin",
     "perf.fast_registry_validation.ResourceKeyMixin",
     "perf.cache_strongholds.ChunkGeneratorMixin",
     "perf.cache_upgraded_structures.StructureManagerMixin",