use a simplified version of remapper sequence

should be faster
ZZZank · Jun 25, 2024 · a44fe6b · a44fe6b
1 parent 16d45a0
commit a44fe6b
Show file tree

Hide file tree

Showing 4 changed files with 52 additions and 5 deletions.
diff --git a/common/src/main/java/dev/latvian/mods/rhino/ContextFactory.java b/common/src/main/java/dev/latvian/mods/rhino/ContextFactory.java
@@ -8,7 +8,6 @@
 
 package dev.latvian.mods.rhino;
 
-import dev.latvian.mods.rhino.util.remapper.DummyRemapper;
 import dev.latvian.mods.rhino.util.remapper.Remapper;
 import dev.latvian.mods.rhino.util.remapper.RemapperManager;
 import dev.latvian.mods.rhino.util.wrap.TypeWrappers;

diff --git a/common/src/main/java/dev/latvian/mods/rhino/util/remapper/DualRemapper.java b/common/src/main/java/dev/latvian/mods/rhino/util/remapper/DualRemapper.java
@@ -0,0 +1,48 @@
+package dev.latvian.mods.rhino.util.remapper;
+
+import lombok.val;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.Objects;
+
+/**
+ * @author ZZZank
+ */
+public class DualRemapper implements Remapper {
+
+    private final Remapper first;
+    private final Remapper second;
+
+    public DualRemapper(@NotNull Remapper first, @NotNull Remapper second) {
+        Objects.requireNonNull(first);
+        Objects.requireNonNull(second);
+        this.first = first;
+        this.second = second;
+    }
+
+    @Override
+    public String remapClass(Class<?> from) {
+        val remap1 = first.remapClass(from);
+        return remap1.isEmpty() ? second.remapClass(from) : remap1;
+    }
+
+    @Override
+    public String remapMethod(Class<?> from, Method method) {
+        val remap1 = first.remapMethod(from, method);
+        return remap1.isEmpty() ? second.remapMethod(from, method) : remap1;
+    }
+
+    @Override
+    public String remapField(Class<?> from, Field field) {
+        val remap1 = first.remapField(from, field);
+        return remap1.isEmpty() ? second.remapField(from, field) : remap1;
+    }
+
+    @Override
+    public String unmapClass(String from) {
+        val remap1 = first.unmapClass(from);
+        return remap1.isEmpty() ? second.unmapClass(from) : remap1;
+    }
+}
diff --git a/fabric/src/main/java/dev/latvian/mods/rhino/mod/fabric/RhinoModFabric.java b/fabric/src/main/java/dev/latvian/mods/rhino/mod/fabric/RhinoModFabric.java
@@ -6,8 +6,8 @@
 import dev.latvian.mods.rhino.mod.remapper.RhizoRemapper;
 import dev.latvian.mods.rhino.mod.remapper.info.Clazz;
 import dev.latvian.mods.rhino.util.remapper.AnnotatedRemapper;
+import dev.latvian.mods.rhino.util.remapper.DualRemapper;
 import dev.latvian.mods.rhino.util.remapper.RemapperManager;
-import dev.latvian.mods.rhino.util.remapper.SequencedRemapper;
 import lombok.val;
 import net.fabricmc.api.ModInitializer;
 import net.fabricmc.loader.impl.launch.FabricLauncherBase;
@@ -23,7 +23,7 @@ public class RhinoModFabric implements ModInitializer {
 
     @Override
     public void onInitialize() {
-        RemapperManager.setDefault(new SequencedRemapper(AnnotatedRemapper.INSTANCE, RhizoRemapper.instance()));
+        RemapperManager.setDefault(new DualRemapper(AnnotatedRemapper.INSTANCE, RhizoRemapper.instance()));
         if (RhinoProperties.INSTANCE.generateMapping) {
             RhizoMappingGen.generate(
                 "1.16.5",

diff --git a/forge/src/main/java/dev/latvian/mods/rhino/mod/forge/RhinoModForge.java b/forge/src/main/java/dev/latvian/mods/rhino/mod/forge/RhinoModForge.java
@@ -3,8 +3,8 @@
 import dev.latvian.mods.rhino.mod.RhinoProperties;
 import dev.latvian.mods.rhino.mod.remapper.*;
 import dev.latvian.mods.rhino.util.remapper.AnnotatedRemapper;
+import dev.latvian.mods.rhino.util.remapper.DualRemapper;
 import dev.latvian.mods.rhino.util.remapper.RemapperManager;
-import dev.latvian.mods.rhino.util.remapper.SequencedRemapper;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
@@ -16,7 +16,7 @@ public class RhinoModForge {
 
     public RhinoModForge() {
         FMLJavaModLoadingContext.get().getModEventBus().register(RhinoModForge.class);
-        RemapperManager.setDefault(new SequencedRemapper(AnnotatedRemapper.INSTANCE, RhizoRemapper.instance()));
+        RemapperManager.setDefault(new DualRemapper(AnnotatedRemapper.INSTANCE, RhizoRemapper.instance()));
     }
 
     @SubscribeEvent