Jam the mixin module's buildscript in

This does *not* work properly

LICENSE

@@ -18,7 +18,7 @@ LICENSE: LGPLv2.1
 ## GasStation
 
 Directory: module-gasstation
-LICENSE: LGPLv3+SNEED
+LICENSE: LGPLv3
 
 ## GTNHMixins
 

README.md

@@ -127,6 +127,7 @@ The project needs to be compiled using Java 8. For example: `JAVA_HOME=/path/to/
 * `-Plocal`: use the locally built version of `unimix` when building the Mixin module.
     * Invoke `./gradlew publishToMavenLocal` in the UniMix repo first to install a local build.
 * `-PenableAltMixin`: build alternate flavors of the Mixin module, not just UniMix.
+* `-PpublishAll`: publish all modules, not just the combined one.
 
 ### Roadmap
 

build.gradle.disabled

@@ -45,7 +45,7 @@ allprojects {
 		}
 		maven {
 			name = "GTNH Maven"
-			url = "http://jenkins.usrv.eu:8081/nexus/content/groups/public/"
+			url = "https://nexus.gtnewhorizons.com/nexus/content/groups/public/"
 			allowInsecureProtocol = true
 		}
 		maven {
@@ -61,25 +61,25 @@ allprojects {
 		// TODO only include IFMLLoadingPlugin, Mod and ComparableVersion
 		compileOnly "net.minecraftforge:forge:1.12.2-14.23.5.2860:universal"
 	}
-	
-	// When publishing locally, publish every module and use the -1.7.10 suffix.
-	// Otherwise (for GTNH maven) only publish the -all module and don't use the suffix or the -all name or the unimixins group.
-	ext.localPublish = System.getenv("MAVEN_USER") == null;
-	ext.publishModuleToMaven = project.name == "module-all" || localPublish
-	ext.mavenIdSuffix = localPublish ? "-1.7.10" : ""
-	ext.mavenGroupId = localPublish ? project.group : project.group.replace(".unimixins", "")
 
-	if(project.name.startsWith("module-") && project.name != "module-mixin" && project.name != "module-common") {
-		if(project.name != "module-all") {
-			task sourcesJar(type: Jar) {
+	// The all module is published without any suffix, and to the normal group
+	// Other modules are published if publishAll is set, to io.github.legacymoddingmc.unimixins, with a -1.7.10 suffix
+	boolean publishAll = project.hasProperty("publishAll")
+	ext.mainModule = project.name == "module-all"
+	ext.publishModuleToMaven = mainModule || publishAll
+	ext.mavenGroupId = !mainModule ? project.group : project.group.replace(".unimixins", "")
+
+	if (project.name.startsWith("module-") && project.name != "module-mixin" && project.name != "module-common") {
+		if (project.name != "module-all") {
+			tasks.register('sourcesJar', Jar) {
 				from sourceSets.main.allSource
 				classifier = 'sources'
 			}
 		}
 		
 		afterEvaluate {
-			if(project.name != "module-all") {
-				task devJar(type: Jar) {
+			if (!mainModule) {
+				tasks.register('devJar', Jar) {
 					classifier = 'dev'
 					def jarTask = (jar.enabled ? jar : shadowJar)
 					from zipTree(jarTask.getOutputs().getFiles().getSingleFile())
@@ -96,14 +96,17 @@ allprojects {
 				archives tasks."devJar"
 			}
 			
-			if(publishModuleToMaven) {
+			if (publishModuleToMaven) {
 				publishing {
 					publications {
 						create("maven", MavenPublication) {
 							artifact jar.enabled ? jar : shadowJar
 							artifact source: tasks."sourcesJar", classifier: 'sources'
 							artifact source: tasks."devJar", classifier: 'dev'
-							artifactId = archivesBaseName.substring(1).replace("-1.7.10", mavenIdSuffix).replace("-all", localPublish ? "-all" : "")
+							if (mainModule)
+								artifactId = "unimixins"
+							else
+								artifactId = archivesBaseName.substring(1)
 							version = projectVersion
 							groupId = mavenGroupId
 						}
@@ -112,7 +115,7 @@ allprojects {
 			}
 
 			project.tasks.forEach {
-				if(it.name.startsWith("publish") && it.name.contains("PublicationTo")) {
+				if (it.name.startsWith("publish") && it.name.contains("PublicationTo")) {
 					it.dependsOn reobf
 				}
 			}
@@ -124,7 +127,6 @@ allprojects {
 			if (System.getenv("MAVEN_USER") != null) {
 				maven {
 					url = System.getenv("MAVEN_URL")
-					allowInsecureProtocol = System.getenv("MAVEN_URL").startsWith("http://") // Mostly for the GTNH maven
 					credentials {
 						username = System.getenv("MAVEN_USER") ?: "NONE"
 						password = System.getenv("MAVEN_PASSWORD") ?: "NONE"

build.gradle.kts

@@ -0,0 +1,353 @@
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+import org.gradle.kotlin.dsl.exclude
+import xyz.wagyourtail.unimined.util.capitalized
+
+// The previous buildscript was spaghetti
+// Time will tell if I do better.
+
+// First, we need the mixin module, which means we need Unimixins!
+plugins {
+    id("java")
+    id("maven-publish")
+    id("xyz.wagyourtail.unimined") version "1.3.14"
+    id("com.gradleup.shadow") version "8.3.6"
+}
+
+repositories {
+    maven {
+        name = "wagyourtail releases"
+        url = uri("https://maven.wagyourtail.xyz/releases")
+    }
+    maven {
+        name = "sponge"
+        url = uri("https://repo.spongepowered.org/maven")
+    }
+    mavenCentral()
+}
+
+group = rootProject.properties["group"].toString()
+val versionBase = version.toString()
+var archivesBaseName = "+unimixins-1.7.10".replace("-1.7.10", "-mixin-1.7.10")
+
+val fabricMixinVersion = "0.15.3+mixin.0.8.7"
+val gasmixMixinVersion = "0.8.7-gasstation_7"
+val gtnhMixinVersion = "0.8.7-GTNH-2"
+val spongepoweredMixinVersion = "0.8.7"
+val unimixMixinVersion = "0.15.4+mixin.0.8.7"
+
+val asmVersion = "9.7.1"
+
+val project_url = "https://github.com/LegacyModdingMC/UniMixins"
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+lateinit var moduleCommon: SourceSet
+lateinit var moduleMixin: SourceSet
+sourceSets {
+    moduleCommon = create("module-common")
+    moduleMixin = create("module-mixin")
+}
+
+configurations {
+    this[moduleMixin.compileOnlyConfigurationName].extendsFrom(this[moduleCommon.compileOnlyConfigurationName])
+}
+
+val flavors = if (project.hasProperty("enableAltMixin"))
+    mapOf("spongepowered" to "SpongePowered",
+        "fabric" to "Fabric",
+        "gasmix" to "GasMix",
+        "gtnh" to "GTNH",
+        "unimix" to "UniMix")
+else
+    mapOf("unimix" to "UniMix")
+
+flavors.forEach {
+    val mixinFlavor = it.key
+    val _flavor = mixinFlavor.capitalized()
+    var mixinFlavorClassifier = "UNKNOWN"
+    val mixinFlavorCapitalized = it.value
+    var mixinVersion = "UNKNOWN"
+
+    val shadowFlavor = configurations.create("shadow$_flavor")
+    val shadowBridgeFlavor = configurations.create("shadowBridge$_flavor")
+    val shadowSourcesFlavor = configurations.create("shadowSources$_flavor")
+
+    shadowFlavor.isTransitive = false
+
+    dependencies {
+        shadowFlavor(moduleCommon.output) // { isTransitive = false }
+    }
+
+    lateinit var shadowJarFlavor: TaskProvider<ShadowJar>
+
+    if (mixinFlavor in listOf("fabric", "spongepowered", "unimix", "gtnh")) {
+        when (mixinFlavor) {
+            in listOf("fabric", "unimix") -> {
+                val uniLocal = mixinFlavor == "unimix" && project.hasProperty("local")
+                val uniJitpack = mixinFlavor == "unimix" && !uniLocal
+
+                mixinVersion = if (mixinFlavor == "fabric") fabricMixinVersion else unimixMixinVersion
+                if (uniLocal) {
+                    mixinVersion += "-local"
+                }
+
+                // jitpack differences:
+                // - domain is com instead of io (for some strange reason)
+                // - we have to use _ instead of + in version string because the latter is not supported (for some strange reason)
+                // - artifact id is UniMix, not sponge-mixin (this one makes sense at least)
+
+                val mixinGroup = if (mixinFlavor == "fabric") "net.fabricmc" else "${if (uniJitpack) "com" else "io"}.github.legacymoddingmc"
+                val mixinArtifactId = if (uniJitpack) "UniMix" else "sponge-mixin"
+                val mixinDepVersion = if (uniJitpack) mixinVersion.replace('+', '_') else mixinVersion
+                val mixinDep = "$mixinGroup:$mixinArtifactId:$mixinDepVersion"
+
+                mixinFlavorClassifier = "$mixinFlavor.${mixinVersion.replace('+', '-')}"
+
+                dependencies {
+                    add("shadow$_flavor", mixinDep, {
+                        exclude(group = "org.ow2.asm")
+                    })
+                    add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
+
+                    add("shadowBridge$_flavor", mixinDep, {
+                        isTransitive = false
+                    })
+
+                    add("shadowSources$_flavor", "$mixinDep:sources", {
+                        isTransitive = false
+                    })
+                }
+            }
+            "spongepowered" -> {
+                mixinVersion = spongepoweredMixinVersion
+
+                mixinFlavorClassifier = "spongepowered.$mixinVersion"
+
+                dependencies {
+                    add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
+                    add("shadowBridge$_flavor", "org.spongepowered:mixin:$mixinVersion", {
+                        isTransitive = false
+                    })
+                    add("shadow$_flavor", "com.google.guava:guava:21.0")
+                    add("shadow$_flavor", "com.google.code.gson:gson:2.2.4")
+                    add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
+
+                    add("shadowSources$_flavor", "org.spongepowered:mixin:$mixinVersion:sources")
+                }
+            }
+            "gtnh" -> {
+                // Adapted from GTNHMixins's build script
+
+                mixinVersion = gtnhMixinVersion
+                mixinFlavorClassifier = "gtnh.$mixinVersion"
+
+                dependencies {
+                    add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-tree:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-commons:$asmVersion")
+                    add("shadow$_flavor", "org.ow2.asm:asm-util:$asmVersion")
+                    add("shadow$_flavor", "com.google.guava:guava:21.0")
+                    add("shadowBridge$_flavor", "org.spongepowered:mixin:$spongepoweredMixinVersion")
+                    add("shadowSources$_flavor", "org.spongepowered:mixin:$spongepoweredMixinVersion:sources")
+                }
+
+            }
+        }
+
+        // We want to *not* relocate ASM in the bridge classes. So we use a multi-step
+        // build procedure:
+
+        // 1. Create relocated Mixin jar, without the bridge classes
+        val mixinJarFlavor = tasks.register("mixinJar$_flavor", ShadowJar::class) {
+            destinationDirectory = file("build/tmp")
+            archiveClassifier = "tmpMixin$_flavor"
+            configurations = listOf(shadowFlavor)
+
+            relocate("org.objectweb.asm", "org.spongepowered.asm.lib")
+            if (mixinFlavor != "gtnh") {
+                relocate("com.google", "org.spongepowered.libraries.com.google")
+            } else {
+                // we don't use this ASM package name
+                //relocate 'org.objectweb.asm', 'org.spongepowered.libraries.org.objectweb.asm'
+                relocate("com.google.common", "org.spongepowered.libraries.com.google.common")
+                relocate("com.google.thirdparty.publicsuffix", "org.spongepowered.libraries.com.google.thirdparty.publicsuffix")
+            }
+
+            exclude("org/spongepowered/asm/bridge/RemapperAdapter.class")
+            exclude("org/spongepowered/asm/bridge/RemapperAdapterFML.class")
+
+            // Exclude stuff that's compiled for Java 16
+
+            exclude("org/spongepowered/asm/service/modlauncher/*")
+            exclude("org/spongepowered/asm/launch/MixinTransformationServiceLegacy*")
+            exclude("org/spongepowered/asm/launch/MixinLaunchPlugin*")
+            exclude("org/spongepowered/asm/launch/MixinTransformationService*")
+            exclude("org/spongepowered/asm/launch/platform/container/ContainerHandleModLauncherEx*")
+
+            exclude("META-INF/services/cpw.mods.modlauncher.api.ITransformationService")
+            exclude("META-INF/services/cpw.mods.modlauncher.serviceapi.ILaunchPluginService")
+
+            exclude("**/module-info.class")
+
+            // Exclude jar-specific stuff
+
+            exclude("META-INF/MANIFEST.MF", "META-INF/maven/**", "META-INF/*.RSA", "META-INF/*.SF")
+        }.get()
+
+        // 2. Create Mixin jar without relocation, with *only* the bridge classes
+        val bridgeJarFlavor = tasks.register("bridgeJar$_flavor", ShadowJar::class) {
+            destinationDirectory = file("build/tmp")
+            archiveClassifier = "tmpBridge$_flavor"
+            configurations = listOf(shadowBridgeFlavor)
+
+            include("*.jar")
+            include("org/spongepowered/asm/bridge/*")
+        }.get()
+
+        // 3. Combine the two jars
+        shadowJarFlavor = tasks.register("shadowJar$_flavor", ShadowJar::class) {
+            version = "$versionBase+$mixinFlavorClassifier"
+            from(moduleMixin.output) {
+                exclude("mcmod.info")
+            }
+
+            relocate("io.github.legacymoddingmc.unimixins.common", "io.github.legacymoddingmc.unimixins.mixin.repackage.common")
+
+            dependsOn("mixinJar$_flavor")
+            dependsOn("bridgeJar$_flavor")
+            dependsOn("mixinJar$_flavor")
+            dependsOn("bridgeJar$_flavor")
+
+            from(zipTree(mixinJarFlavor.archiveFile).matching {
+                exclude("module-info.class")
+                eachFile {
+                    if (path.startsWith("META-INF/services/")) {
+                        filter({ l -> (if (!l.startsWith("org.spongepowered.asm.service.modlauncher.")) l else null).toString() })
+                    }
+                }
+            })
+            from(zipTree(bridgeJarFlavor.archiveFile).matching {
+                include("org/spongepowered/asm/bridge/*")
+            })
+
+            doLast {
+                delete(mixinJarFlavor.archiveFile)
+                delete(bridgeJarFlavor.archiveFile)
+            }
+        }
+
+        tasks["jar"].dependsOn(shadowJarFlavor)
+    } else if (mixinFlavor == "gasmix") {
+        // GasMix
+
+        mixinVersion = gasmixMixinVersion
+
+        mixinFlavorClassifier = "gasmix.$mixinVersion"
+
+        dependencies {
+            add("shadow$_flavor", "org.spongepowered:mixin:$mixinVersion")
+            add("shadowSources$_flavor", "org.spongepowered:mixin:$mixinVersion:sources")
+        }
+
+        shadowJarFlavor = tasks.register("shadowJar$_flavor", ShadowJar::class) {
+            from(moduleMixin.output) {
+                exclude("mcmod.info")
+            }
+
+            version = "$versionBase+$mixinFlavorClassifier"
+            archiveClassifier = ""
+            configurations = listOf(shadowFlavor)
+
+            relocate("io.github.legacymoddingmc.unimixins.common", "io.github.legacymoddingmc.unimixins.mixin.repackage.common")
+        }
+
+        tasks["jar"].dependsOn(shadowJarFlavor)
+    }
+
+    // Common
+
+    val createMcmodInfoFlavor = tasks.register("createMcmodInfo$_flavor", Copy::class) {
+        outputs.upToDateWhen { false }
+        from("src/main/resources/mcmod.info")
+        into("build/tmp/mcmod.${mixinFlavor}.info")
+        filter {
+            line -> line
+                .replace("@MIXIN_CLASSIFIER@", mixinFlavorClassifier)
+                .replace("@MIXIN_SOURCE_CAPITALIZED@", mixinFlavorCapitalized)
+                .replace("@VERSION@", "$versionBase+$mixinFlavorClassifier")
+                .replace("@PROJECT_URL@", project_url)
+        }
+    }
+
+    shadowJarFlavor {
+        dependsOn("createMcmodInfo$_flavor")
+        from("build/tmp/mcmod.${mixinFlavor}.info/mcmod.info")
+
+        manifest {
+            attributes(
+                "TweakClass" to "org.spongepowered.asm.launch.MixinTweaker",
+            "FMLCorePluginContainsFMLMod" to "true",
+            "ForceLoadAsMod" to "true",
+            "FMLCorePlugin" to "io.github.legacymoddingmc.unimixins.mixin.MixinCore",
+            "Premain-Class" to "org.spongepowered.tools.agent.MixinAgent",
+            "Agent-Class" to "org.spongepowered.tools.agent.MixinAgent",
+            "Can-Redefine-Classes" to true,
+            "Can-Retransform-Classes" to true,
+            "Implementation-Version" to mixinVersion
+            )
+        }
+    }
+
+    val shadowSourcesJarFlavor = tasks.register("shadowSourcesJar$_flavor", ShadowJar::class) {
+        from(moduleMixin.allSource)
+
+        version = "$versionBase+$mixinFlavorClassifier"
+        archiveClassifier = "sources"
+        configurations = listOf(shadowSourcesFlavor)
+    }
+
+    tasks["jar"].dependsOn(shadowSourcesJarFlavor)
+
+    // if (false){
+    //     publishing {
+    //         publications {
+    //             create("maven$_flavor", MavenPublication::class) {
+    //                 artifact(shadowJarFlavor)
+    //                 artifact(shadowSourcesJarFlavor)
+    //
+    //                 artifactId = archivesBaseName.substring(1) + (if (mixinFlavor == "unimix") "" else "-$mixinFlavor")
+    //                 groupId = mavenGroupId
+    //             }
+    //         }
+    //     }
+    // }
+}
+
+dependencies {
+    // TODO only include IFMLLoadingPlugin, Mod and ComparableVersion
+    moduleCommon.compileOnlyConfigurationName("net.minecraftforge:forge:1.12.2-14.23.5.2860:universal")
+    moduleMixin.implementationConfigurationName(moduleCommon.output)
+
+    moduleMixin.implementationConfigurationName(moduleCommon.output)
+    moduleMixin.compileOnlyConfigurationName("org.spongepowered:mixin:$spongepoweredMixinVersion")
+}
+
+unimined.minecraft(moduleCommon, moduleMixin) {
+    version = project.properties["minecraft_version"].toString()
+
+    mappings {
+        searge()
+        mcp("stable", "12-1.7.10")
+    }
+
+    minecraftForge {
+        loader(project.properties["forge_version"].toString())
+    }
+}

gradle.properties

@@ -2,13 +2,10 @@
 modid=unimixins
 archives_base=+unimixins
 # http://maven.apache.org/guides/mini/guide-naming-conventions.html
-group=io.github.legacymoddingmc.unimixins
+group=io.github.legacymoddingmc
 
 # Forge properties
 minecraft_version=1.7.10
 forge_version=10.13.4.1614-1.7.10
 
-enable_mixin=false
-multiproject_structure=false
-
-project_url=https://github.com/LegacyModdingMC/UniMixins
+org.gradle.jvmargs = -Xmx2G

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=`expr $i + 1`
-    done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-exec "$JAVACMD" "$@"
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,15 +76,17 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
 
-:omega
+:omega

module-mixin/build.gradle.disabled

@@ -266,14 +266,14 @@ flavors.each {
 
 	jar.dependsOn("shadowSourcesJar$_flavor")
 	
-	if(publishModuleToMaven){
+	if (publishModuleToMaven){
 		publishing {
 			publications {
 				create("maven$_flavor", MavenPublication) {
 					artifact tasks."shadowJar$_flavor"
 					artifact tasks."shadowSourcesJar$_flavor"
 
-					artifactId = archivesBaseName.substring(1).replace("-1.7.10", mavenIdSuffix) + (mixinFlavor == "unimix" ? "" : "-" + mixinFlavor)
+					artifactId = archivesBaseName.substring(1) + (mixinFlavor == "unimix" ? "" : "-" + mixinFlavor)
 					groupId = mavenGroupId
 				}
 			}

module-mixin/gradle.properties

@@ -1,7 +0,0 @@
-fabricMixinVersion=0.15.3+mixin.0.8.7
-unimixMixinVersion=0.15.4+mixin.0.8.7
-spongepoweredMixinVersion=0.8.7
-gtnhMixinVersion=0.8.7-GTNH-2
-gasmixMixinVersion=0.8.7-gasstation_7
-
-asmVersion=9.7.1

settings.gradle

@@ -1,11 +0,0 @@
-include 'module-mixin'
-include 'module-compat'
-include 'module-compatfuture'
-include 'module-mixingasm'
-include 'module-spongemixins'
-include 'module-mixinbooterlegacy'
-include 'module-gasstation'
-include 'module-gtnhmixins'
-include 'module-mixinextras'
-include 'module-all'
-include 'module-common'

settings.gradle.kts

@@ -0,0 +1,39 @@
+pluginManagement {
+    repositories {
+        mavenCentral()
+        maven {
+            url = uri("https://maven.neoforged.net/releases")
+        }
+        maven {
+            url = uri("https://maven.minecraftforge.net/")
+        }
+        maven {
+            url = uri("https://maven.fabricmc.net/")
+        }
+        maven {
+            url = uri("https://maven.wagyourtail.xyz/releases")
+        }
+        maven {
+            url = uri("https://maven.wagyourtail.xyz/snapshots")
+        }
+        gradlePluginPortal {
+            content {
+                excludeGroup("org.apache.logging.log4j")
+            }
+        }
+    }
+}
+
+rootProject.name = "UniMixins"
+
+// include("module-mixin")
+// include("module-compat")
+// include("module-compatfuture")
+// include("module-mixingasm")
+// include("module-spongemixins")
+// include("module-mixinbooterlegacy")
+// include("module-gasstation")
+// include("module-gtnhmixins")
+// include("module-mixinextras")
+// include("module-all")
+// include("module-common")