Develop connector beta 36

.github/workflows/build.yml

@@ -18,8 +18,13 @@ jobs:
           gradle-home-cache-cleanup: true
           gradle-home-cache-excludes: |
             gradle.properties
-      - run: ./gradlew clean build publishToMavenLocal --stacktrace
+      - name: Run Auto test Client
+        uses: modmuss50/xvfb-action@v1
+        with:
+          run: ./gradlew runTestModClient
+      - run: ./gradlew clean build --stacktrace
+      - run: ./gradlew publishToMavenLocal --stacktrace
       - uses: actions/upload-artifact@v3
         with:
           name: Maven Local
-          path: ~/.m2/repository
+          path: ~/.m2/repository

build.gradle.kts

@@ -1,18 +1,32 @@
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import me.modmuss50.mpp.ReleaseType
+import net.minecraftforge.gradle.common.tasks.DownloadAssets
 import net.minecraftforge.gradle.common.util.MavenArtifactDownloader
 import net.minecraftforge.gradle.common.util.RunConfig
 import net.minecraftforge.gradle.userdev.tasks.JarJar
 import net.minecraftforge.gradle.userdev.util.MavenPomUtils
-import net.minecraftforge.jarjar.metadata.*
+import net.minecraftforge.jarjar.metadata.ContainedJarIdentifier
+import net.minecraftforge.jarjar.metadata.ContainedJarMetadata
+import net.minecraftforge.jarjar.metadata.ContainedVersion
+import net.minecraftforge.jarjar.metadata.MetadataIOHandler
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion
 import org.apache.maven.artifact.versioning.VersionRange
+import org.yaml.snakeyaml.Yaml
 import java.nio.file.FileSystems
 import java.nio.file.Files
 import java.nio.file.StandardOpenOption
 import java.time.LocalDateTime
 import kotlin.io.path.inputStream
 
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath(group = "org.yaml", name = "snakeyaml", version = "2.2")
+    }
+}
+
 plugins {
     java
     `maven-publish`
@@ -56,6 +70,7 @@ if (!PUBLISH_RELEASE_TYPE.isPresent) {
 println("Project version: $version")
 
 val mod: SourceSet by sourceSets.creating
+val test: SourceSet by sourceSets
 
 val shade: Configuration by configurations.creating { isTransitive = false }
 val adapterData: Configuration by configurations.creating
@@ -113,7 +128,7 @@ val modJar: JarJar by tasks.creating(JarJar::class) {
                 false
             )
             Files.deleteIfExists(metadataPath)
-            Files.write(metadataPath, MetadataIOHandler.toLines(metadata), StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)   
+            Files.write(metadataPath, MetadataIOHandler.toLines(metadata), StandardOpenOption.CREATE_NEW, StandardOpenOption.WRITE)
         }
     }
     manifest.attributes(
@@ -198,6 +213,20 @@ configurations {
     }
 }
 
+repositories {
+    exclusiveContent {
+        forRepository {
+            maven {
+                url = uri("https://cursemaven.com")
+            }
+        }
+        forRepositories(fg.repository)
+        filter {
+            includeGroup("curse.maven")
+        }
+    }
+}
+
 sourceSets {
     main {
         runtimeClasspath = runtimeClasspath.minus(output).plus(files(fullJar))
@@ -231,8 +260,20 @@ minecraft {
             }
         }
 
-        create("client", config)
+        val clientConfig = create("client", config)
         create("server", config)
+
+        create("testModClient") {
+            mods {
+                create("testconnector") {
+                    sources(test)
+                }
+            }
+            args("--mixin.config", "connectortest.mixins.json")
+            args("--quickPlaySingleplayer", "ctest")
+            parent(clientConfig)
+            workingDirectory = project.file("run/test").canonicalPath
+        }
     }
 }
 
@@ -255,6 +296,13 @@ repositories {
         name = "Su5eD"
         url = uri("https://maven.su5ed.dev/releases")
     }
+    exclusiveRepo("https://api.modrinth.com/maven/", "maven.modrinth")
+    maven {
+        url = uri("https://www.cursemaven.com")
+        content {
+            includeGroup("curse.maven")
+        }
+    }
     mavenLocal()
 }
 
@@ -282,6 +330,8 @@ dependencies {
 
     "modCompileOnly"(sourceSets.main.get().output)
     "modCompileOnly"("io.github.llamalad7:mixinextras-common:${mixinextrasVersion}")
+
+    runtimeOnly(fg.deobf("curse.maven:connector-extras-913445:5027683"))
 }
 
 tasks {
@@ -312,6 +362,23 @@ tasks {
         dependsOn("reobfModJar", fullJar)
     }
 
+    val modDownload = register("resolveTestMods") {
+        doFirst {
+            val configFile = rootProject.file("testmods.yaml")
+            val data: List<Map<String, String>> = configFile.reader().use(Yaml()::load)
+            val deps = data.map { project.dependencies.create(it["maven"] as String) }
+
+            val config = configurations.detachedConfiguration(*deps.toTypedArray())
+            val files = config.resolve()
+
+            val dir = project.file("run/test/mods").apply {
+                if (exists()) deleteRecursively()
+                mkdirs()
+            }
+            files.forEach { it.copyTo(dir.resolve(it.name)) }
+        }
+    }
+
     configureEach {
         if (name == "prepareRuns") {
             dependsOn(fullJar)
@@ -322,6 +389,13 @@ tasks {
         if (name == "reobfModJar") {
             mustRunAfter(modJar)
         }
+        if (name == "runTestModClient") {
+            dependsOn(modDownload)
+        }
+        if (name == "downloadAssets" && providers.environmentVariable("CI").isPresent) {
+            enabled = false
+            (this as DownloadAssets).output.mkdirs()
+        }
     }
 }
 
@@ -388,3 +462,19 @@ publishing {
         }
     }
 }
+
+// Adapted from https://gist.github.com/pupnewfster/6c21401789ca6d74f9892be8c1c505c9
+fun RepositoryHandler.exclusiveRepo(location: String, vararg groups: String) {
+    exclusiveRepo(location) {
+        for (group in groups) {
+            includeGroup(group)
+        }
+    }
+}
+
+fun RepositoryHandler.exclusiveRepo(location: String, config: Action<InclusiveRepositoryContentDescriptor>) {
+    exclusiveContent {
+        forRepositories(maven(location), fg.repository)
+        filter(config)
+    }
+}

gradle.properties

@@ -4,9 +4,9 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=true
 
 # Versions
-versionConnector=1.0.0-beta.35
+versionConnector=1.0.0-beta.36
 versionAdapter=1.11.19-1.20.1-20240126.215012
-versionAdapterDefinition=1.11.22
+versionAdapterDefinition=1.11.24
 
 versionMc=1.20.1
 versionForge=47.1.3

run/test/config/fml.toml

@@ -0,0 +1,25 @@
+#Early window height
+earlyWindowHeight = 480
+#Early window framebuffer scale
+earlyWindowFBScale = 1
+#Enable forge global version checking
+versionCheck = true
+#Early window provider
+earlyWindowProvider = "fmlearlywindow"
+#Early window width
+earlyWindowWidth = 854
+#Early window starts maximized
+earlyWindowMaximized = false
+#Default config path for servers
+defaultConfigPath = "defaultconfigs"
+#Disables Optimized DFU client-side - already disabled on servers
+disableOptimizedDFU = true
+#Skip specific GL versions, may help with buggy graphics card drivers
+earlyWindowSkipGLVersions = []
+#Should we control the window. Disabling this disables new GL features and can be bad for mods that rely on them.
+earlyWindowControl = false
+#Max threads for early initialization parallelism,  -1 is based on processor count
+maxThreads = -1
+#Squir?
+earlyWindowSquir = false
+

src/main/java/dev/su5ed/sinytra/connector/locator/DependencyResolver.java

@@ -45,12 +45,12 @@
 public final class DependencyResolver {
     private static final Logger LOGGER = LogUtils.getLogger();
     public static final VersionOverrides VERSION_OVERRIDES = new VersionOverrides();
-    public static final Supplier<DependencyOverrides> DEPENDENCY_OVERRIDES = Suppliers.memoize(DependencyResolver::loadDependencyOverrides);
-    private static final GlobalModAliases GLOBAL_MOD_ALIASES = new GlobalModAliases(FMLPaths.CONFIGDIR.get(), ConnectorUtil.DEFAULT_GLOBAL_MOD_ALIASES);
+    public static final Supplier<DependencyOverrides> DEPENDENCY_OVERRIDES = Suppliers.memoize(() -> loadConfigFile("fabric_loader_dependencies.json", () -> new DependencyOverrides(FMLPaths.CONFIGDIR.get())));
+    private static final Supplier<GlobalModAliases> GLOBAL_MOD_ALIASES = Suppliers.memoize(() -> loadConfigFile("connector_global_mod_aliases.json", () -> new GlobalModAliases(FMLPaths.CONFIGDIR.get(), ConnectorUtil.DEFAULT_GLOBAL_MOD_ALIASES)));
 
     public static List<JarTransformer.TransformableJar> resolveDependencies(Collection<JarTransformer.TransformableJar> keys, Multimap<JarTransformer.TransformableJar, JarTransformer.TransformableJar> jars, Iterable<IModFile> loadedMods) {
         // Add global mod aliases
-        FabricLoaderImpl.INSTANCE.aliasMods(GLOBAL_MOD_ALIASES.getAliases());
+        FabricLoaderImpl.INSTANCE.aliasMods(GLOBAL_MOD_ALIASES.get().getAliases());
         BiMap<JarTransformer.TransformableJar, ModCandidate> jarToCandidate = HashBiMap.create();
         // Fabric candidates
         List<ModCandidate> candidates = createCandidatesRecursive(keys, keys, jars, jarToCandidate);
@@ -130,11 +130,11 @@ private static ModCandidate createFabricLoaderMod() {
         return ModCandidate.createBuiltin(builtinMod, VERSION_OVERRIDES, DEPENDENCY_OVERRIDES.get());
     }
 
-    private static DependencyOverrides loadDependencyOverrides() {
+    private static <T> T loadConfigFile(String name, Supplier<T> supplier) {
         try {
-            return new DependencyOverrides(FMLPaths.CONFIGDIR.get());
-        } catch (Exception e) {
-            throw ConnectorEarlyLoader.createGenericLoadingException(e, "Invalid config file fabric_loader_dependencies.json");
+            return supplier.get();
+        } catch (Throwable t) {
+            throw ConnectorEarlyLoader.createGenericLoadingException(t, "Invalid config file " + name);
         }
     }
 }

src/main/java/dev/su5ed/sinytra/connector/service/FabricMixinBootstrap.java

@@ -18,10 +18,10 @@
 
 import com.mojang.logging.LogUtils;
 import dev.su5ed.sinytra.connector.loader.ConnectorEarlyLoader;
-import net.fabricmc.loader.api.ModContainer;
 import net.fabricmc.loader.api.SemanticVersion;
 import net.fabricmc.loader.api.Version;
 import net.fabricmc.loader.api.metadata.ModDependency;
+import net.fabricmc.loader.api.metadata.ModMetadata;
 import net.fabricmc.loader.api.metadata.version.VersionInterval;
 import net.fabricmc.loader.impl.FabricLoaderImpl;
 import net.minecraftforge.fml.loading.LoadingModList;
@@ -72,7 +72,7 @@ public static void init() {
         }
     }
 
-    private static final class MixinConfigDecorator {
+    public static final class MixinConfigDecorator {
         private static final List<LoaderMixinVersionEntry> VERSIONS = List.of(
             LoaderMixinVersionEntry.create("0.12.0-", FabricUtil.COMPATIBILITY_0_10_0)
         );
@@ -87,21 +87,21 @@ static void apply(Map<String, ModFileInfo> configToModMap) {
                 if (!mod.getMods().isEmpty()) {
                     String modid = mod.getMods().get(0).getModId();
                     int compat = ConnectorEarlyLoader.isConnectorMod(modid) ? FabricLoaderImpl.INSTANCE.getModContainer(modid)
-                        .map(MixinConfigDecorator::getMixinCompat)
+                        .map(m -> getMixinCompat(m.getMetadata()))
                         .orElse(FabricUtil.COMPATIBILITY_0_10_0)
                         : FabricUtil.COMPATIBILITY_0_10_0;
                     config.decorate(FabricUtil.KEY_COMPATIBILITY, compat);
                 }
             }
         }
 
-        private static int getMixinCompat(ModContainer mod) {
+        public static int getMixinCompat(ModMetadata metadata) {
             // infer from loader dependency by determining the least relevant loader version the mod accepts
             // AND any loader deps
 
             List<VersionInterval> reqIntervals = List.of(VersionInterval.INFINITE);
 
-            for (ModDependency dep : mod.getMetadata().getDependencies()) {
+            for (ModDependency dep : metadata.getDependencies()) {
                 if (dep.getModId().equals("fabricloader") || dep.getModId().equals("fabric-loader")) {
                     if (dep.getKind() == ModDependency.Kind.DEPENDS) {
                         reqIntervals = VersionInterval.and(reqIntervals, dep.getVersionIntervals());
@@ -112,7 +112,7 @@ else if (dep.getKind() == ModDependency.Kind.BREAKS) {
                 }
             }
 
-            if (reqIntervals.isEmpty()) throw new IllegalStateException("mod " + mod + " is incompatible with every loader version?"); // shouldn't get there
+            if (reqIntervals.isEmpty()) throw new IllegalStateException("mod " + metadata.getId() + " is incompatible with every loader version?"); // shouldn't get there
 
             Version minLoaderVersion = reqIntervals.get(0).getMin(); // it is sorted, to 0 has the absolute lower bound
 

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

@@ -11,13 +11,11 @@
 import dev.su5ed.sinytra.adapter.patch.LVTOffsets;
 import dev.su5ed.sinytra.adapter.patch.api.ClassTransform;
 import dev.su5ed.sinytra.adapter.patch.api.MixinClassGenerator;
-import dev.su5ed.sinytra.adapter.patch.api.MixinConstants;
 import dev.su5ed.sinytra.adapter.patch.api.Patch;
 import dev.su5ed.sinytra.adapter.patch.api.PatchContext;
 import dev.su5ed.sinytra.adapter.patch.api.PatchEnvironment;
 import dev.su5ed.sinytra.adapter.patch.fixes.FieldTypePatchTransformer;
 import dev.su5ed.sinytra.adapter.patch.fixes.FieldTypeUsageTransformer;
-import dev.su5ed.sinytra.adapter.patch.transformer.ModifyMethodParams;
 import dev.su5ed.sinytra.adapter.patch.transformer.dynamic.DynamicAnonymousShadowFieldTypePatch;
 import dev.su5ed.sinytra.adapter.patch.transformer.dynamic.DynamicInheritedInjectionPointPatch;
 import dev.su5ed.sinytra.adapter.patch.transformer.dynamic.DynamicInjectorOrdinalPatch;
@@ -29,18 +27,7 @@
 import net.minecraftforge.forgespi.locating.IModFile;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.Type;
-import org.objectweb.asm.tree.AbstractInsnNode;
 import org.objectweb.asm.tree.ClassNode;
-import org.objectweb.asm.tree.FieldInsnNode;
-import org.objectweb.asm.tree.InsnList;
-import org.objectweb.asm.tree.InsnNode;
-import org.objectweb.asm.tree.JumpInsnNode;
-import org.objectweb.asm.tree.LabelNode;
-import org.objectweb.asm.tree.MethodInsnNode;
-import org.objectweb.asm.tree.TypeInsnNode;
-import org.objectweb.asm.tree.VarInsnNode;
 import org.slf4j.Logger;
 
 import java.io.IOException;
@@ -53,7 +40,6 @@
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
-import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Stream;