Develop 1.21.1 beta 8 (#1720)

Author: Su5eD

.github/workflows/probe.yml

@@ -0,0 +1,107 @@
+name: Compatibility tests
+
+on:
+  workflow_dispatch:
+    inputs:
+      test_count:
+        type: number
+        default: 1000
+        description: Number of mods to test
+        required: true
+      tag:
+        type: string
+        required: true
+        description: Target release tag
+
+env:
+  TEST_COUNT: ${{ inputs.test_count }}
+  GATHERER_IMG: ghcr.io/sinytra/probe/gatherer:latest
+
+jobs:
+  run_tests:
+    name: Run tests
+    runs-on: ubuntu-latest
+
+    services:
+      redis:
+        image: redis
+        options: >-
+          --health-cmd "redis-cli ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+          --name probe_redis
+        ports:
+          - 6379:6379
+
+    permissions:
+      contents: write
+      packages: read
+
+    steps:
+      - name: Setup env
+        run: mkdir probe
+
+      - name: Cache test data
+        uses: tespkg/actions-cache@v1
+        with:
+          accessKey: ${{ secrets.S3_ACCESS_KEY }}
+          secretKey: ${{ secrets.S3_SECRET_KEY }}
+          bucket: ${{ secrets.S3_BUCKET_NAME }}
+          use-fallback: false
+
+          key: ${{ runner.os }}-cache-${{ env.TEST_COUNT }}
+          path: |
+            probe/.setup
+            probe/mods
+            probe/candidates.json
+            probe/dump.rdb
+          restore-keys: |
+            ${{ runner.os }}-cache-
+
+      - name: Restore redis data
+        if: ${{ hashFiles('probe/dump.rdb') != '' }}
+        run: |
+          docker stop probe_redis
+          docker cp probe/dump.rdb probe_redis:/data/dump.rdb
+          docker start probe_redis
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Run tests in a container
+        run: >
+          docker run --rm
+          --network host
+          -v ./probe:/probe
+          -e REDIS_URL=redis://localhost:6379/0
+          -e TEST_COUNT=${{ env.TEST_COUNT }}
+          -e FORCE_RETAKE_TESTS=true
+          -e CLEANUP_OUTPUT=true
+          ${{ env.GATHERER_IMG }}
+
+      - name: Backup redis data
+        run: |
+          docker stop probe_redis
+          docker cp probe_redis:/data/dump.rdb probe/dump.rdb
+
+      - name: Upload report
+        if: ${{ hashFiles('probe/report.md') != '' }}
+        run: cat probe/report.md >> $GITHUB_STEP_SUMMARY
+
+      - name: Upload test results
+        uses: actions/upload-artifact@v4
+        with:
+          name: test-results
+          path: probe/results.json
+
+      - name: Uploade release assets
+        uses: softprops/action-gh-release@v2
+        if: ${{ inputs.tag != '' || github.ref_type == 'tag' }}
+        with:
+          tag_name: ${{ inputs.tag || github.ref_name }}
+          files: probe/results.json

build.gradle.kts

@@ -8,7 +8,7 @@ plugins {
     java
     `maven-publish`
     id("net.neoforged.moddev") version "2.0.78"
-    id("io.github.goooler.shadow") version "8.1.8" apply false
+    id("com.gradleup.shadow") version "9.0.0-beta12" apply false
     id("me.modmuss50.mod-publish-plugin") version "0.5.+"
     id("net.neoforged.gradleutils") version "3.0.0"
     id("org.sinytra.adapter.userdev") version "1.2.1-SNAPSHOT"
@@ -34,7 +34,6 @@ val forgifiedFabricApiCurseForge: String by project
 val forgifiedFabricApiModrinth: String by project
 val connectorExtrasCurseForge: String by project
 val connectorExtrasModrinth: String by project
-val mixinextrasVersion: String by project
 
 val PUBLISH_RELEASE_TYPE: Provider<String> = providers.environmentVariable("PUBLISH_RELEASE_TYPE")
 
@@ -47,7 +46,6 @@ if (!PUBLISH_RELEASE_TYPE.isPresent) {
 logger.lifecycle("Project version: $version")
 
 val mod: SourceSet by sourceSets.creating
-val test: SourceSet by sourceSets
 
 val shade: Configuration by configurations.creating
 val adapterData: Configuration by configurations.creating
@@ -137,6 +135,7 @@ dependencies {
     shade(group = "org.sinytra", name = "ForgeAutoRenamingTool", version = versionForgeAutoRenamingTool) { isTransitive = false }
     shade(group = "org.sinytra.adapter", name = "definition", version = versionAdapterDefinition) { isTransitive = false }
     adapterData(group = "org.sinytra.adapter", name = "adapter", version = versionAdapter)
+    shade(project(":transformer")) { isTransitive = false }
 
     jarJar(implementation(group = "org.sinytra.adapter", name = "runtime", version = versionAdapterRuntime))
     "modImplementation"(implementation(group = "org.sinytra.forgified-fabric-api", name = "forgified-fabric-api", version = versionForgifiedFabricApi)) {
@@ -180,7 +179,9 @@ val depsJar: ShadowJar by tasks.creating(ShadowJar::class) {
 }
 
 val fullJar by tasks.registering(ShadowJar::class) {
-    from(tasks.jar, depsJar)
+    from(
+        depsJar.archiveFile.map(::zipTree),
+        tasks.jar.flatMap { it.archiveFile.map(::zipTree) })
     mergeServiceFiles() // Relocate services
     relocate("net.minecraftforge.fart", "reloc.net.minecraftforge.fart")
     relocate("net.minecraftforge.srgutils", "reloc.net.minecraftforge.srgutils")
@@ -274,6 +275,9 @@ publishing {
             from(components["java"])
         }
     }
+}
+
+allprojects {
     repositories {
         val env = System.getenv()
         if (env["MAVEN_URL"] != null) {

gradle.properties

@@ -7,9 +7,9 @@ org.gradle.caching=true
 #org.gradle.configuration-cache=true
 
 # Versions
-versionConnector=2.0.0-beta.7
+versionConnector=2.0.0-beta.8
 versionAdapter=1.13.20+1.21.1-20240811.191740
-versionAdapterDefinition=1.13.25+1.21.1
+versionAdapterDefinition=1.13.26+1.21.1
 versionAdapterRuntime=1.0.0+1.21.1
 
 versionMc=1.21.1

settings.gradle.kts

@@ -13,3 +13,5 @@ pluginManagement {
 }
 
 rootProject.name = "connector"
+
+include("transformer")

src/main/java/org/sinytra/connector/ConnectorCoremods.java

@@ -67,15 +67,13 @@ public Iterable<? extends ITransformer<?>> getTransformers() {
                 method.visitVarInsn(Opcodes.ALOAD, 5);
                 // displayItemsGenerator
                 method.visitVarInsn(Opcodes.ALOAD, 6);
-                // backgroundLocation
-                method.visitTypeInsn(Opcodes.NEW, "net/minecraft/resources/ResourceLocation");
-                method.visitInsn(Opcodes.DUP);
-                method.visitLdcInsn("textures/gui/container/creative_inventory/tab_items.png");
-                method.visitMethodInsn(Opcodes.INVOKESPECIAL, "net/minecraft/resources/ResourceLocation", "<init>", "(Ljava/lang/String;)V", false);
+                // scrollerSpriteLocation
+                method.visitInsn(Opcodes.ACONST_NULL);
                 // hasSearchBar
                 method.visitInsn(Opcodes.ICONST_0);
                 // searchBarWidth
                 method.visitLdcInsn(89);
+                // tabsImage
                 method.visitFieldInsn(Opcodes.GETSTATIC, "net/minecraft/world/item/CreativeModeTab$Builder", "CREATIVE_INVENTORY_TABS_IMAGE", "Lnet/minecraft/resources/ResourceLocation;"); // tabsImage
                 // labelColor
                 method.visitLdcInsn(4210752);

src/main/java/org/sinytra/connector/locator/ConnectorLocator.java

@@ -6,6 +6,9 @@
 import cpw.mods.jarhandling.JarContents;
 import cpw.mods.jarhandling.JarContentsBuilder;
 import cpw.mods.jarhandling.SecureJar;
+import cpw.mods.modlauncher.Launcher;
+import cpw.mods.modlauncher.api.IModuleLayerManager;
+import net.fabricmc.loader.impl.metadata.LoaderModMetadata;
 import net.fabricmc.loader.impl.metadata.NestedJarEntry;
 import net.neoforged.fml.ModLoadingException;
 import net.neoforged.fml.loading.FMLPaths;
@@ -14,17 +17,15 @@
 import net.neoforged.fml.loading.moddiscovery.readers.JarModsDotTomlModFileReader;
 import net.neoforged.fml.loading.progress.StartupNotificationManager;
 import net.neoforged.neoforgespi.language.IModInfo;
-import net.neoforged.neoforgespi.locating.IDependencyLocator;
-import net.neoforged.neoforgespi.locating.IDiscoveryPipeline;
-import net.neoforged.neoforgespi.locating.IModFile;
-import net.neoforged.neoforgespi.locating.IncompatibleFileReporting;
-import net.neoforged.neoforgespi.locating.ModFileDiscoveryAttributes;
+import net.neoforged.neoforgespi.locating.*;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 import org.jetbrains.annotations.Nullable;
 import org.sinytra.connector.ConnectorEarlyLoader;
 import org.sinytra.connector.locator.filter.ForgeModPackageFilter;
 import org.sinytra.connector.locator.filter.SplitPackageMerger;
+import org.sinytra.connector.locator.transform.ConnectorTransformerEnvironment;
+import org.sinytra.connector.transformer.TransformerEnvironment;
 import org.sinytra.connector.transformer.jar.JarTransformer;
 import org.sinytra.connector.util.ConnectorUtil;
 import org.sinytra.connector.util.PriorityModLoadingException;
@@ -34,19 +35,13 @@
 import java.lang.module.ModuleDescriptor;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
 import static cpw.mods.modlauncher.api.LambdaExceptionUtils.rethrowFunction;
 import static cpw.mods.modlauncher.api.LambdaExceptionUtils.uncheck;
 import static net.neoforged.fml.loading.LogMarkers.SCAN;
-import static org.sinytra.connector.transformer.jar.JarTransformer.cacheTransformableJar;
 
 public class ConnectorLocator implements IDependencyLocator {
     public static final String PLACEHOLDER_PROPERTY = "connector:placeholder";
@@ -63,13 +58,14 @@ public void scanMods(List<IModFile> loadedMods, IDiscoveryPipeline pipeline) {
             LOGGER.error("Skipping mod scan due to previously encountered error");
             return;
         }
+
         try {
-            List<IModFile> results = locateFabricMods(loadedMods);
+            LocationResult results = locateFabricMods(loadedMods);
             if (results != null) {
-                results.forEach(pipeline::addModFile);
+                results.mods().forEach(pipeline::addModFile);
 
                 // Create mod file for generated adapter mixins jar
-                Path generatedAdapterJar = JarTransformer.getGeneratedJarPath();
+                Path generatedAdapterJar = results.generatedJarPath();
                 if (Files.exists(generatedAdapterJar)) {
                     pipeline.addPath(generatedAdapterJar, ModFileDiscoveryAttributes.DEFAULT, IncompatibleFileReporting.ERROR);
                 }
@@ -93,28 +89,37 @@ public void scanMods(List<IModFile> loadedMods, IDiscoveryPipeline pipeline) {
     }
 
     @Nullable
-    private List<IModFile> locateFabricMods(List<IModFile> discoveredMods) {
+    private LocationResult locateFabricMods(List<IModFile> discoveredMods) {
         LOGGER.debug(SCAN, "Scanning mods dir {} for mods", FMLPaths.MODSDIR.get());
         Path tempDir = ConnectorUtil.CONNECTOR_FOLDER.resolve("temp");
 
         // Get all existing mods
         Collection<SimpleModInfo> loadedModInfos = getPreviouslyDiscoveredMods(discoveredMods);
         Collection<IModFile> loadedModFiles = loadedModInfos.stream().map(SimpleModInfo::origin).toList();
         Collection<String> loadedModIds = loadedModInfos.stream().filter(mod -> !mod.library()).map(SimpleModInfo::modid).collect(Collectors.toUnmodifiableSet());
-        Collection<String> loadedModuleNames = loadedModInfos.stream().filter(SimpleModInfo::library).map(SimpleModInfo::moduleName).filter(Objects::nonNull).collect(Collectors.toUnmodifiableSet());
+        Collection<String> loadedModuleNames = Stream.concat(
+                Launcher.INSTANCE.findLayerManager().flatMap(m -> m.getLayer(IModuleLayerManager.Layer.BOOT))
+                    .stream()
+                    .flatMap(m -> m.modules().stream())
+                    .map(Module::getName),
+                loadedModInfos.stream().filter(SimpleModInfo::library).map(SimpleModInfo::moduleName).filter(Objects::nonNull))
+            .collect(Collectors.toUnmodifiableSet());
+
+        TransformerEnvironment environment = new ConnectorTransformerEnvironment(loadedModFiles);
+        JarTransformer transformer = new JarTransformer(environment);
 
         // Discover fabric mod jars
         List<JarTransformer.TransformableJar> discoveredJars = FabricModsDiscoverer.scanFabricMods()
-            .map(rethrowFunction(p -> cacheTransformableJar(p.toFile())))
+            .map(rethrowFunction(p -> transformer.cacheTransformableJar(p.toFile())))
             .filter(jar -> !shouldIgnoreMod(jar, loadedModIds, loadedModuleNames))
             .toList();
 
         // Discover fabric nested mod jars
         Multimap<JarTransformer.TransformableJar, JarTransformer.TransformableJar> parentToChildren = HashMultimap.create();
         List<JarTransformer.TransformableJar> discoveredNestedJars = discoveredJars.stream()
             .flatMap(jar -> {
-                ConnectorFabricModMetadata metadata = jar.modPath().metadata().modMetadata();
-                return shouldIgnoreMod(jar, loadedModIds, loadedModuleNames) ? Stream.empty() : discoverNestedJarsRecursive(tempDir, jar, metadata.getJars(), parentToChildren, loadedModIds, loadedModuleNames);
+                LoaderModMetadata metadata = jar.modPath().metadata().modMetadata();
+                return shouldIgnoreMod(jar, loadedModIds, loadedModuleNames) ? Stream.empty() : discoverNestedJarsRecursive(transformer, tempDir, jar, metadata.getJars(), parentToChildren, loadedModIds, loadedModuleNames);
             })
             .toList();
 
@@ -131,7 +136,7 @@ private List<IModFile> locateFabricMods(List<IModFile> discoveredMods) {
         List<Path> renameLibs = loadedModFiles.stream().map(modFile -> modFile.getSecureJar().getRootPath()).toList();
 
         // Run jar transformations (or get existing outputs from cache)
-        List<JarTransformer.TransformedFabricModPath> transformed = JarTransformer.transform(candidates, renameLibs, loadedModFiles);
+        List<JarTransformer.TransformedFabricModPath> transformed = transformer.transform(candidates, renameLibs);
 
         List<JarTransformer.TransformedFabricModPath> failing = transformed.stream().filter(j -> j.auditTrail() != null && j.auditTrail().hasFailingMixins()).toList();
         if (!failing.isEmpty()) {
@@ -148,7 +153,8 @@ private List<IModFile> locateFabricMods(List<IModFile> discoveredMods) {
         // Deal with split packages (thanks modules)
         List<SplitPackageMerger.FilteredModPath> moduleSafeJars = SplitPackageMerger.mergeSplitPackages(transformed.stream().map(JarTransformer.TransformedFabricModPath::output).toList(), loadedModFiles, ignoredModFiles);
 
-        return moduleSafeJars.stream().map(ConnectorLocator::createConnectorModFile).toList();
+        List<IModFile> loadedMods = moduleSafeJars.stream().map(ConnectorLocator::createConnectorModFile).toList();
+        return new LocationResult(loadedMods, environment.getGeneratedJarPath());
     }
 
     private static IModFile createConnectorModFile(SplitPackageMerger.FilteredModPath modPath) {
@@ -158,36 +164,36 @@ private static IModFile createConnectorModFile(SplitPackageMerger.FilteredModPat
         }
         ModJarMetadata modJarMetadata = new ModJarMetadata(jarContents);
         SecureJar secureJar = SecureJar.from(jarContents, modJarMetadata);
-        IModFile modFile = IModFile.create(secureJar, f -> FabricModMetadataParser.createForgeMetadata(f, modPath.metadata().modMetadata(), modPath.metadata().visibleMixinConfigs(), modPath.metadata().generated()));
+        IModFile modFile = IModFile.create(secureJar, f -> FabricModMetadataParser.createForgeMetadata(f, (ConnectorFabricModMetadata) modPath.metadata().modMetadata(), modPath.metadata().visibleMixinConfigs(), modPath.metadata().generated()));
         modJarMetadata.setModFile(modFile);
         return modFile;
     }
 
-    private static Stream<JarTransformer.TransformableJar> discoverNestedJarsRecursive(Path tempDir, JarTransformer.TransformableJar parent, Collection<NestedJarEntry> jars, Multimap<JarTransformer.TransformableJar, JarTransformer.TransformableJar> parentToChildren, Collection<String> loadedModIds, Collection<String> loadedModuleNames) {
+    private static Stream<JarTransformer.TransformableJar> discoverNestedJarsRecursive(JarTransformer transformer, Path tempDir, JarTransformer.TransformableJar parent, Collection<NestedJarEntry> jars, Multimap<JarTransformer.TransformableJar, JarTransformer.TransformableJar> parentToChildren, Collection<String> loadedModIds, Collection<String> loadedModuleNames) {
         SecureJar secureJar = SecureJar.from(parent.input().toPath());
         return jars.stream()
             .map(entry -> secureJar.getPath(entry.getFile()))
             .filter(Files::exists)
             .flatMap(path -> {
-                JarTransformer.TransformableJar jar = uncheck(() -> prepareNestedJar(tempDir, secureJar.getPrimaryPath().getFileName().toString(), path));
+                JarTransformer.TransformableJar jar = uncheck(() -> prepareNestedJar(transformer, tempDir, secureJar.getPrimaryPath().getFileName().toString(), path));
                 if (shouldIgnoreMod(jar, loadedModIds, loadedModuleNames)) {
                     return Stream.empty();
                 }
                 parentToChildren.put(parent, jar);
-                ConnectorFabricModMetadata metadata = jar.modPath().metadata().modMetadata();
-                return Stream.concat(Stream.of(jar), discoverNestedJarsRecursive(tempDir, jar, metadata.getJars(), parentToChildren, loadedModIds, loadedModuleNames));
+                LoaderModMetadata metadata = jar.modPath().metadata().modMetadata();
+                return Stream.concat(Stream.of(jar), discoverNestedJarsRecursive(transformer, tempDir, jar, metadata.getJars(), parentToChildren, loadedModIds, loadedModuleNames));
             });
     }
 
-    private static JarTransformer.TransformableJar prepareNestedJar(Path tempDir, String parentName, Path path) throws IOException {
+    private static JarTransformer.TransformableJar prepareNestedJar(JarTransformer transformer, Path tempDir, String parentName, Path path) throws IOException {
         Files.createDirectories(tempDir);
 
         String parentNameWithoutExt = parentName.split("\\.(?!.*\\.)")[0];
         // Extract JiJ
         Path extracted = tempDir.resolve(parentNameWithoutExt + "$" + path.getFileName().toString());
         ConnectorUtil.cache(path, extracted, () -> Files.copy(path, extracted));
 
-        return uncheck(() -> JarTransformer.cacheTransformableJar(extracted.toFile()));
+        return uncheck(() -> transformer.cacheTransformableJar(extracted.toFile()));
     }
 
     // Removes any duplicates from located connector mods, as well as mods that are already located by FML.
@@ -225,7 +231,7 @@ private static List<JarTransformer.TransformableJar> handleDuplicateMods(List<Ja
     }
 
     private static boolean shouldIgnoreMod(JarTransformer.TransformableJar jar, Collection<String> loadedModIds, Collection<String> loadedModuleNames) {
-        ConnectorFabricModMetadata metadata = jar.modPath().metadata().modMetadata();
+        LoaderModMetadata metadata = jar.modPath().metadata().modMetadata();
         String id = metadata.getId();
         return ConnectorUtil.DISABLED_MODS.contains(id) || loadedModIds.contains(id)
             || jar.modPath().metadata().generated() && loadedModuleNames.contains(jar.moduleName());
@@ -260,4 +266,6 @@ private static void loadEmbeddedJars(IDiscoveryPipeline pipeline) throws Excepti
 
     private record SimpleModInfo(String modid, ArtifactVersion version, boolean library, @Nullable IModFile origin, @Nullable String moduleName) {
     }
+
+    private record LocationResult(List<IModFile> mods, Path generatedJarPath) {} 
 }