Fix remap

MohistMC · Oct 17, 2024 · d8a1fcb · d8a1fcb
1 parent e00f49e
commit d8a1fcb
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/banner-api/src/main/java/com/mohistmc/banner/bukkit/remapping/RemapSourceHandler.java b/banner-api/src/main/java/com/mohistmc/banner/bukkit/remapping/RemapSourceHandler.java
@@ -4,6 +4,8 @@
 import net.fabricmc.api.EnvType;
 import net.fabricmc.loader.impl.transformer.FabricTransformer;
 import org.objectweb.asm.ClassReader;
+import org.spongepowered.asm.mixin.MixinEnvironment;
+import org.spongepowered.asm.mixin.transformer.IMixinTransformer;
 
 import java.io.ByteArrayInputStream;
 import java.io.FileNotFoundException;
@@ -43,16 +45,18 @@ public void connect() throws IOException {
             byte[] bytes = ByteStreams.toByteArray(url.openStream());
             String className = new ClassReader(bytes).getClassName();
             if (className.startsWith("net/minecraft/") || className.equals("com/mojang/brigadier/tree/CommandNode")) {
-                String handledName = className.replace('/', '.');
-                try {
-                    bytes = FabricTransformer.transform(false, EnvType.SERVER, handledName, bytes);
-                } catch (Throwable e) {
-                    throw new IOException(e);
-                }
+                bytes = fabricRemapClass(bytes);
             }
             this.array = Remapper.getResourceMapper().remapClassFile(bytes, GlobalClassRepo.INSTANCE);
         }
 
+        public byte[] fabricRemapClass(byte[] cl) {
+            var name = new ClassReader(cl).getClassName();
+            var bytes = FabricTransformer.transform(false, EnvType.SERVER, name.replace('/', '.'), cl);
+            bytes = ((IMixinTransformer) MixinEnvironment.getCurrentEnvironment().getActiveTransformer()).transformClassBytes(name, name, bytes);
+            return bytes;
+        }
+
         @Override
         public InputStream getInputStream() throws IOException {
             connect();