Merge 1.18 into 1.19.2

Author: embeddedt

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/DirectObjectMixin.java

@@ -1,11 +1,9 @@
 package org.embeddedt.modernfix.common.mixin.perf.compact_mojang_registries;
 
-import com.google.common.collect.ImmutableSet;
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.core.MappedRegistry;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import org.embeddedt.modernfix.annotation.IgnoreOutsideDev;
 import org.embeddedt.modernfix.registry.LifecycleMap;
 import org.spongepowered.asm.mixin.Final;
@@ -26,21 +24,12 @@ public abstract class MappedRegistryMixin<T> extends Registry<T> {
     @Mutable
     private Map<T, Lifecycle> lifecycles;
 
-    private static final ImmutableSet<ResourceLocation> MFIX$NEW_STORAGE_KEYS = ImmutableSet.of(new ResourceLocation("block"), new ResourceLocation("item"));
-
     protected MappedRegistryMixin(ResourceKey<? extends Registry<T>> resourceKey, Lifecycle lifecycle) {
         super(resourceKey, lifecycle);
     }
 
     @Inject(method = "<init>", at = @At("RETURN"))
     private void replaceStorage(CallbackInfo ci) {
         this.lifecycles = new LifecycleMap<>();
-        /*
-        if(MFIX$NEW_STORAGE_KEYS.contains(this.key().location())) {
-            ModernFixMixinPlugin.instance.logger.info("Using experimental registry storage for {}", this.key());
-            this.storage = (BiMap<ResourceLocation, T>) RegistryStorage.createStorage();
-            this.keyStorage = (BiMap<ResourceKey<T>, T>)RegistryStorage.createKeyStorage(this.key(), (BiMap<ResourceLocation, DirectStorageRegistryObject>)this.storage);
-        }
-        */
     }
 }

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java

@@ -162,9 +162,7 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
 
     private static final ImmutableMap<String, Boolean> DEFAULT_SETTING_OVERRIDES = new DefaultSettingMapBuilder()
             .put("mixin.perf.dynamic_resources", false)
-            .put("mixin.perf.dynamic_block_codecs", false)
             .put("mixin.feature.direct_stack_trace", false)
-            .putConditionally(ModernFixPlatformHooks.INSTANCE::isDevEnv, "mixin.perf.rewrite_registry", false)
             .put("mixin.perf.clear_mixin_classinfo", false)
             .put("mixin.perf.deduplicate_climate_parameters", false)
             .put("mixin.bugfix.packet_leak", false)