Develop beta 25 (#509)

Author: Su5eD

README.md

@@ -72,7 +72,12 @@ repositories {
     }
 }
 dependencies {
-    implementation fg.deobf("dev.su5ed.sinytra:Connector:<version>")
+    // Add Connector to the launch classpath
+    minecraftLibrary fg.deobf("dev.su5ed.sinytra:Connector:<version>")
+    // Add FFAPI dependency (if required)
+    runtimeOnly fg.deobf("dev.su5ed.sinytra.fabric-api:fabric-api:<version>")
+    // Install desired Fabric mods 
+    implementation "some.fabric:mod:<version>"
 }
 ```
 

build.gradle.kts

@@ -145,10 +145,14 @@ val fullJar: Jar by tasks.creating(Jar::class) {
         into("adapter_data")
         include("*.json")
     }
-    from(modJar)
+    // Despite not being part of jarjar metadata, the mod jar must be located in this directory
+    // in order to be deobfuscated by FG in userdev environments
+    into("META-INF/jarjar/") {
+        from(modJar)
+    }
     manifest {
         from(tasks.jar.get().manifest)
-        attributes("Embedded-Dependencies-Mod" to modJar.archiveFile.get().asFile.name)
+        attributes("Embedded-Dependencies-Mod" to "META-INF/jarjar/" + modJar.archiveFile.get().asFile.name)
     }
 }
 

gradle.properties

@@ -4,16 +4,16 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 
 # Versions
-versionConnector=1.0.0-beta.24
-versionAdapter=1.8.9-1.20.1-20231106.225239
-versionAdapterDefinition=1.8.10
+versionConnector=1.0.0-beta.25
+versionAdapter=1.8.12-1.20.1-20231112.230129
+versionAdapterDefinition=1.8.16
 
 versionMc=1.20.1
 versionForge=47.1.3
 versionForgeAutoRenamingTool=1.0.8
-versionFabricLoader=2.5.1+0.14.21+1.20.1
+versionFabricLoader=2.5.2+0.14.21+1.20.1
 versionAccessWidener=2.1.0
-versionFabricApi=0.90.4+1.9.30+1.20.1
+versionFabricApi=0.90.7+1.9.32+1.20.1
 versionMixin=0.12.5+mixin.0.8.5
 versionMixinTransmog=0.4.1+1.20.1
 

src/main/java/dev/su5ed/sinytra/connector/transformer/MixinPatchTransformer.java

@@ -2,7 +2,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
@@ -77,6 +76,18 @@ public class MixinPatchTransformer implements Transformer {
             .targetInjectionPoint("Lnet/fabricmc/loader/impl/game/minecraft/Hooks;startServer(Ljava/io/File;Ljava/lang/Object;)V")
             .modifyInjectionPoint("Lnet/minecraftforge/server/loading/ServerModLoader;load()V")
             .build(),
+        Patch.builder()
+            .targetClass("net/minecraft/world/level/NaturalSpawner")
+            .targetMethod("m_220443_")
+            .targetInjectionPoint("Lnet/minecraft/world/level/levelgen/structure/structures/NetherFortressStructure;f_228517_:Lnet/minecraft/util/random/WeightedRandomList;")
+            .modifyInjectionPoint("INVOKE", "Lnet/minecraft/world/level/StructureManager;m_220521_()Lnet/minecraft/core/RegistryAccess;")
+            .build(),
+        Patch.builder()
+            .targetClass("net/minecraft/world/item/Item")
+            .targetMethod("m_7203_")
+            .targetInjectionPoint("Lnet/minecraft/world/item/Item;m_41473_()Lnet/minecraft/world/food/FoodProperties;")
+            .modifyInjectionPoint("Lnet/minecraft/world/item/ItemStack;getFoodProperties(Lnet/minecraft/world/entity/LivingEntity;)Lnet/minecraft/world/food/FoodProperties;")
+            .build(),
         Patch.builder()
             .targetClass("net/minecraft/world/entity/Entity")
             .targetMethod("m_204031_(Lnet/minecraft/tags/TagKey;D)Z")
@@ -113,13 +124,6 @@ public class MixinPatchTransformer implements Transformer {
             .extractMixin("net/minecraftforge/common/extensions/IForgeLivingEntity")
             .modifyTarget("sinkInFluid(Lnet/minecraftforge/fluids/FluidType;)V")
             .build(),
-        Patch.builder()
-            .targetClass("net/minecraft/client/renderer/entity/layers/ElytraLayer")
-            .targetMethod("m_6494_(Lcom/mojang/blaze3d/vertex/PoseStack;Lnet/minecraft/client/renderer/MultiBufferSource;ILnet/minecraft/world/entity/LivingEntity;FFFFFF)V")
-            .targetInjectionPoint("Lnet/minecraft/world/item/ItemStack;m_150930_(Lnet/minecraft/world/item/Item;)Z")
-            .targetMixinType(Patch.MODIFY_EXPR_VAL)
-            .modifyInjectionPoint("Lnet/minecraft/client/renderer/entity/layers/ElytraLayer;shouldRender(Lnet/minecraft/world/item/ItemStack;Lnet/minecraft/world/entity/LivingEntity;)Z")
-            .build(),
         Patch.builder()
             .targetClass("net/minecraft/world/item/BoneMealItem")
             .targetMethod("m_40627_")
@@ -187,11 +191,19 @@ public class MixinPatchTransformer implements Transformer {
             .targetInjectionPoint("Lnet/minecraft/world/level/block/FireBlock;m_221150_(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/util/RandomSource;I)V")
             .modifyInjectionPoint("Lnet/minecraft/world/level/block/FireBlock;tryCatchFire(Lnet/minecraft/world/level/Level;Lnet/minecraft/core/BlockPos;ILnet/minecraft/util/RandomSource;ILnet/minecraft/core/Direction;)V")
             .build(),
+        Patch.builder()
+            .targetClass("net/minecraft/client/gui/Gui")
+            .targetMethod("m_280173_(Lnet/minecraft/client/gui/GuiGraphics;)V")
+            .targetInjectionPoint("Lnet/minecraft/client/gui/Gui;m_168688_(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/world/entity/player/Player;IIIIFIIIZ)V")
+            .extractMixin("net/minecraftforge/client/gui/overlay/ForgeGui")
+            .modifyTarget("renderHealth(IILnet/minecraft/client/gui/GuiGraphics;)V")
+            .modifyParams(b -> b.insert(0, Type.INT_TYPE).insert(1, Type.INT_TYPE).targetType(ModifyMethodParams.TargetType.METHOD))
+            .build(),
         Patch.builder()
             .targetClass("net/minecraft/client/gui/Gui")
             .targetMethod("m_280173_(Lnet/minecraft/client/gui/GuiGraphics;)V")
             .extractMixin("net/minecraftforge/client/gui/overlay/ForgeGui")
-            .modifyTarget("Lnet/minecraftforge/client/gui/overlay/ForgeGui;renderArmor(Lnet/minecraft/client/gui/GuiGraphics;II)V")
+            .modifyTarget("renderArmor(Lnet/minecraft/client/gui/GuiGraphics;II)V")
             .modifyParams(b -> b.insert(1, Type.INT_TYPE).insert(2, Type.INT_TYPE).targetType(ModifyMethodParams.TargetType.METHOD))
             .build(),
         Patch.builder()
@@ -440,7 +452,7 @@ public MixinPatchTransformer(LVTOffsets lvtOffsets, Set<String> mixinPackages, P
             .build();
     }
 
-    public void finalize(Path zipRoot, Collection<String> configs, SrgRemappingReferenceMapper.SimpleRefmap refmap) throws IOException {
+    public void finalize(Path zipRoot, Collection<String> configs, Map<String, SrgRemappingReferenceMapper.SimpleRefmap> refmapFiles, Set<String> dirtyRefmaps) throws IOException {
         Map<String, MixinClassGenerator.GeneratedClass> generatedMixinClasses = this.environment.getClassGenerator().getGeneratedMixinClasses();
         if (!generatedMixinClasses.isEmpty()) {
             for (String config : configs) {
@@ -463,8 +475,14 @@ public void finalize(Path zipRoot, Collection<String> configs, SrgRemappingRefer
 
                                 // Update refmap
                                 if (json.has("refmap")) {
-                                    for (MixinClassGenerator.GeneratedClass generatedClass : mixins.values()) {
-                                        moveRefmapMappings(generatedClass.originalName(), generatedClass.generatedName(), json.get("refmap").getAsString(), zipRoot, refmap);
+                                    String refmapName = json.get("refmap").getAsString();
+                                    if (dirtyRefmaps.contains(refmapName)) {
+                                        SrgRemappingReferenceMapper.SimpleRefmap refmap = refmapFiles.get(refmapName);
+                                        Path path = zipRoot.resolve(refmapName);
+                                        if (Files.exists(path)) {
+                                            String refmapString = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(refmap);
+                                            Files.writeString(path, refmapString, StandardCharsets.UTF_8);
+                                        }
                                     }
                                 }
                             }
@@ -503,30 +521,6 @@ public void finalize(Path zipRoot, Collection<String> configs, SrgRemappingRefer
         }
     }
 
-    private void moveRefmapMappings(String oldClass, String newClass, String refmap, Path root, SrgRemappingReferenceMapper.SimpleRefmap oldRefmap) throws IOException {
-        Map<String, String> mappingsEntry = oldRefmap.mappings.get(oldClass);
-        if (mappingsEntry == null) {
-            return;
-        }
-        Map<String, String> dataMappingsEntry = oldRefmap.data.get("searge").get(oldClass);
-        if (dataMappingsEntry == null) {
-            return;
-        }
-        Path path = root.resolve(refmap);
-        if (Files.notExists(path)) {
-            return;
-        }
-        try (Reader reader = Files.newBufferedReader(path)) {
-            SrgRemappingReferenceMapper.SimpleRefmap configRefmap = new Gson().fromJson(reader, SrgRemappingReferenceMapper.SimpleRefmap.class);
-
-            configRefmap.mappings.put(newClass, mappingsEntry);
-            configRefmap.data.get("searge").put(newClass, dataMappingsEntry);
-
-            String output = new GsonBuilder().disableHtmlEscaping().setPrettyPrinting().create().toJson(configRefmap);
-            Files.writeString(path, output, StandardCharsets.UTF_8);
-        }
-    }
-
     private Map<String, MixinClassGenerator.GeneratedClass> getMixinsInPackage(String mixinPackage, Map<String, MixinClassGenerator.GeneratedClass> generatedMixinClasses) {
         Map<String, MixinClassGenerator.GeneratedClass> classes = new HashMap<>();
         for (Map.Entry<String, MixinClassGenerator.GeneratedClass> entry : generatedMixinClasses.entrySet()) {

src/main/java/dev/su5ed/sinytra/connector/transformer/OptimizedRenamingTransformer.java

@@ -1,5 +1,6 @@
 package dev.su5ed.sinytra.connector.transformer;
 
+import dev.su5ed.sinytra.adapter.patch.util.MethodQualifier;
 import net.minecraftforge.fart.api.ClassProvider;
 import net.minecraftforge.fart.api.Transformer;
 import net.minecraftforge.fart.internal.ClassProviderImpl;
@@ -28,7 +29,6 @@
 
 public final class OptimizedRenamingTransformer extends RenamingTransformer {
     private static final String CLASS_DESC_PATTERN = "^L[a-zA-Z0-9/$_]+;$";
-    private static final String METHOD_DESC_PATTERN = "^(?<desc>\\((?:\\[*[ZCBSIFJD]|\\[*L[a-zA-Z0-9/_$]+;)*\\)(?:[VZCBSIFJD]|\\[?L[a-zA-Z0-9/_;$]+))$";
 
     public static Transformer create(ClassProvider classProvider, Consumer<String> log, IMappingFile mappingFile, Map<String, String> flatMappings) {
         RenamingClassProvider reverseProvider = new RenamingClassProvider(classProvider, mappingFile, mappingFile.reverse(), log);
@@ -196,14 +196,18 @@ public Object mapValue(Object value) {
                         return 'L' + mapped + ';';
                     }
                 }
-                else if (str.matches(METHOD_DESC_PATTERN)) {
-                    return mapMethodDesc(str);
+
+                MethodQualifier qualifier = MethodQualifier.create(str).orElse(null);
+                if (qualifier != null && qualifier.desc() != null) {
+                    String owner = qualifier.owner() != null ? mapDesc(qualifier.owner()) : "";
+                    String name = qualifier.name() != null ? this.flatMappings.getOrDefault(qualifier.name(), qualifier.name()) : "";
+                    String desc = qualifier.desc() != null ? mapMethodDesc(qualifier.desc()) : "";
+                    return owner + name + desc;
                 }
-                else {
-                    String mapped = this.flatMappings.get(str);
-                    if (mapped != null) {
-                        return mapped;
-                    }
+
+                String mapped = this.flatMappings.get(str);
+                if (mapped != null) {
+                    return mapped;
                 }
             }
             return super.mapValue(value);

src/main/java/dev/su5ed/sinytra/connector/transformer/jar/JarTransformInstance.java

@@ -21,6 +21,7 @@
 import dev.su5ed.sinytra.connector.transformer.OptimizedRenamingTransformer;
 import dev.su5ed.sinytra.connector.transformer.RefmapRemapper;
 import dev.su5ed.sinytra.connector.transformer.SrgRemappingReferenceMapper;
+import dev.su5ed.sinytra.connector.transformer.patch.ConnectorRefmapHolder;
 import net.fabricmc.loader.impl.FabricLoaderImpl;
 import net.fabricmc.loader.impl.MappingResolverImpl;
 import net.minecraftforge.coremod.api.ASMAPI;
@@ -118,7 +119,8 @@ public void transformJar(File input, Path output, FabricModFileMetadata metadata
         AccessorRedirectTransformer accessorRedirectTransformer = new AccessorRedirectTransformer(srgToIntermediary);
 
         List<Patch> extraPatches = Stream.concat(this.adapterPatches.stream(), AccessorRedirectTransformer.PATCHES.stream()).toList();
-        PatchEnvironment environment = new PatchEnvironment(refmap.merged().mappings, this.cleanClassLookup, this.bfu.unwrap());
+        ConnectorRefmapHolder refmapHolder = new ConnectorRefmapHolder(refmap.merged(), refmap.files());
+        PatchEnvironment environment = new PatchEnvironment(refmapHolder, this.cleanClassLookup, this.bfu.unwrap());
         MixinPatchTransformer patchTransformer = new MixinPatchTransformer(this.lvtOffsetsData, metadata.mixinPackages(), environment, extraPatches);
         RefmapRemapper refmapRemapper = new RefmapRemapper(metadata.visibleMixinConfigs(), refmap.files());
         Renamer.Builder builder = Renamer.builder()
@@ -140,7 +142,7 @@ public void transformJar(File input, Path output, FabricModFileMetadata metadata
             renamer.run(input, output.toFile());
 
             try (FileSystem zipFile = FileSystems.newFileSystem(output)) {
-                patchTransformer.finalize(zipFile.getPath("/"), metadata.mixinConfigs(), refmap.merged());
+                patchTransformer.finalize(zipFile.getPath("/"), metadata.mixinConfigs(), refmap.files(), refmapHolder.getDirtyRefmaps());
             }
         } catch (Throwable t) {
             LOGGER.error("Encountered error while transforming jar file " + input.getAbsolutePath(), t);

src/main/java/dev/su5ed/sinytra/connector/transformer/patch/ConnectorRefmapHolder.java

@@ -0,0 +1,60 @@
+package dev.su5ed.sinytra.connector.transformer.patch;
+
+import dev.su5ed.sinytra.adapter.patch.RefmapHolder;
+import dev.su5ed.sinytra.connector.transformer.SrgRemappingReferenceMapper;
+
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+
+public class ConnectorRefmapHolder implements RefmapHolder {
+    private final SrgRemappingReferenceMapper.SimpleRefmap merged;
+    private final Map<String, SrgRemappingReferenceMapper.SimpleRefmap> refmapFiles;
+    private final Set<String> dirtyRefmaps = new HashSet<>();
+
+    public ConnectorRefmapHolder(SrgRemappingReferenceMapper.SimpleRefmap merged, Map<String, SrgRemappingReferenceMapper.SimpleRefmap> refmapFiles) {
+        this.merged = merged;
+        this.refmapFiles = refmapFiles;
+    }
+
+    public Set<String> getDirtyRefmaps() {
+        return this.dirtyRefmaps;
+    }
+
+    @Override
+    public String remap(String cls, String reference) {
+        String cleanReference = reference.replaceAll(" ", "");
+        return Optional.ofNullable(this.merged.mappings.get(cls))
+            .map(map -> map.get(cleanReference))
+            .orElse(reference);
+    }
+
+    @Override
+    public void copyEntries(String from, String to) {
+        copyMapEntries(this.merged, from, to);
+        this.refmapFiles.forEach((name, refmap) -> {
+            if (copyMapEntries(refmap, from, to)) {
+                this.dirtyRefmaps.add(name);
+            }
+        });
+    }
+
+    private boolean copyMapEntries(SrgRemappingReferenceMapper.SimpleRefmap refmap, String from, String to) {
+        boolean dirty = false;
+        Map<String, String> mappingsRefs = refmap.mappings.get(from);
+        if (mappingsRefs != null) {
+            refmap.mappings.put(to, mappingsRefs);
+            dirty = true;
+        }
+        for (Map.Entry<String, Map<String, Map<String, String>>> entry : refmap.data.entrySet()) {
+            Map<String, Map<String, String>> map = entry.getValue();
+            Map<String, String> dataRefs = map.get(from);
+            if (dataRefs != null) {
+                map.put(to, dataRefs);
+                dirty = true;
+            }
+        }
+        return dirty;
+    }
+}

src/mod/java/dev/su5ed/sinytra/connector/mod/mixin/PlayerListMixin.java

@@ -0,0 +1,27 @@
+package dev.su5ed.sinytra.connector.mod.mixin;
+
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.players.PlayerList;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+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.callback.CallbackInfoReturnable;
+
+import java.util.Collections;
+import java.util.List;
+
+@Mixin(PlayerList.class)
+public class PlayerListMixin {
+    @Shadow
+    @Final
+    private List<ServerPlayer> players;
+
+    @Inject(method = "getPlayers", at = @At("HEAD"), cancellable = true)
+    private void onGetPlayers(CallbackInfoReturnable<List<ServerPlayer>> cir) {
+        // Ensure returned view is up-to-date
+        // Mods may replace the value of players, invalidating the view initially created by Forge
+        cir.setReturnValue(Collections.unmodifiableList(players));
+    }
+}

src/mod/resources/connectormod.mixins.json

@@ -10,6 +10,7 @@
     "ForgeHooksMixin",
     "LivingEntityMixin",
     "PoiTypesMixin",
+    "PlayerListMixin",
     "item.IForgeItemMixin",
     "lang.PathPackResourcesAnonMixin",
     "lang.PathPackResourcesMixin",