From 74d28ed997a4434754755ad970f2a963f4b742c9 Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Fri, 11 Aug 2023 19:50:33 -0400 Subject: [PATCH] Update mixin --- .../compact_mojang_registries/MappedRegistryMixin.java | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java index c907ce45..f6e86477 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java +++ b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compact_mojang_registries/MappedRegistryMixin.java @@ -3,8 +3,6 @@ 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; @@ -20,7 +18,7 @@ import java.util.Map; @Mixin(MappedRegistry.class) @IgnoreOutsideDev -public abstract class MappedRegistryMixin extends Registry { +public abstract class MappedRegistryMixin { @Shadow @Final @Mutable @@ -28,11 +26,7 @@ public abstract class MappedRegistryMixin extends Registry { private static final ImmutableSet MFIX$NEW_STORAGE_KEYS = ImmutableSet.of(new ResourceLocation("block"), new ResourceLocation("item")); - protected MappedRegistryMixin(ResourceKey> resourceKey, Lifecycle lifecycle) { - super(resourceKey, lifecycle); - } - - @Inject(method = "", at = @At("RETURN")) + @Inject(method = "(Lnet/minecraft/resources/ResourceKey;Lcom/mojang/serialization/Lifecycle;Z)V", at = @At("RETURN")) private void replaceStorage(CallbackInfo ci) { this.lifecycles = new LifecycleMap<>(); /*