Port all the modules

build.gradle

@@ -29,10 +29,6 @@ allprojects {
 	// For some reason this is needed when using Gradle 6.9 (but not if using 4.4.1)
 	repositories {
 		mavenLocal()
-		maven {
-			name 'Overmind forge repo mirror'
-			url 'https://gregtech.overminddl1.com/'
-		}
 		maven {
 			name = "forge"
 			url = "https://maven.minecraftforge.net/"

module-compat/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 def mixinExtrasVersion = "0.1.1"
 
 configurations.create("shadowMixinExtras")
@@ -29,7 +31,7 @@ task mixinExtrasJar(type: ShadowJar) {
 
 shadowJar {
 	configurations = [project.configurations.shadow]
-	classifier = ''
+	archiveClassifier = 'dev'
 	relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.compat.repackage.common'
 	relocate 'io.github.legacymoddingmc.unimixins.compat.stub.cpw', 'cpw'
 
@@ -51,3 +53,7 @@ shadowJar.dependsOn mixinExtrasJar
 
 jar.dependsOn shadowJar
 jar.enabled = false
+
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.compat.Tags")
+}

module-compat/src/main/java/io/github/legacymoddingmc/unimixins/compat/CompatModule.java

@@ -5,7 +5,7 @@ import cpw.mods.fml.common.Mod;
 /**
  * This is only here to help Forge detect the mod.
  */
-@Mod(modid = "unimixins-compat", version = "@VERSION@", acceptableRemoteVersions = "*")
-@net.minecraftforge.fml.common.Mod(modid = "unimixins-compat", version = "@VERSION@", acceptableRemoteVersions = "*")
+@Mod(modid = "unimixins-compat", version = Tags.VERSION, acceptableRemoteVersions = "*")
+@net.minecraftforge.fml.common.Mod(modid = "unimixins-compat", version = Tags.VERSION, acceptableRemoteVersions = "*")
 public class CompatModule {
 }

module-devcompat/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 dependencies {
 	compileOnly('org.spongepowered:mixin:0.8.5')
 }
@@ -5,6 +7,7 @@ dependencies {
 archivesBaseName = archivesBaseName.replace("-1.7.10", "-devcompat-1.7.10")
 
 jar {
+	archiveClassifier = ''
 	manifest {
 		attributes (
 			'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
@@ -14,3 +17,9 @@ jar {
 		)
 	}
 }
+
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.devcompat.Tags")
+}
+
+reobfJar.enabled = false

module-devcompat/src/main/java/io/github/legacymoddingmc/unimixins/devcompat/DevCompatModule.java

@@ -5,7 +5,7 @@ import cpw.mods.fml.common.Mod;
 /**
  * This is only here to help Forge detect the mod.
  */
-@Mod(modid = "unimixins-devcompat", version = "@VERSION@", acceptableRemoteVersions = "*")
-@net.minecraftforge.fml.common.Mod(modid = "unimixins-devcompat", version = "@VERSION@", acceptableRemoteVersions = "*")
+@Mod(modid = "unimixins-devcompat", version = Tags.VERSION, acceptableRemoteVersions = "*")
+@net.minecraftforge.fml.common.Mod(modid = "unimixins-devcompat", version = Tags.VERSION, acceptableRemoteVersions = "*")
 public class DevCompatModule {
 }

module-gasstation/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 dependencies {
 	compileOnly("org.spongepowered:mixin:$gasMixVersion")
 	compileOnly project(':module-mixinbooterlegacy')
@@ -10,7 +12,7 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-gasstation-1.7.10")
 
 shadowJar {
 	configurations = [project.configurations.shadow]
-	classifier = ''
+	archiveClassifier = ''
 	relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.gasstation.repackage.common'
 
 	manifest {
@@ -29,13 +31,19 @@ jar {
 	dependsOn shadowJar
 }
 
+reobfJar.enabled = false
+
 ext.uniVersion = version
 ext.mcversion = "1.7.10"
 version += "+" + ext.extraVersion
 
 minecraft {
-	replace("GRADLETOKEN_MODID", "gasstation")
-	replace("GRADLETOKEN_MODNAME", "GasStation")
-	replace("GRADLETOKEN_VERSION", extraVersion)
-	replace("GRADLETOKEN_GROUPNAME", "com.falsepattern.gasstation")
+	injectedTags.put("MODID", "gasstation")
+	injectedTags.put("MODNAME", "GasStation")
+	injectedTags.put("VERSION", extraVersion)
+	injectedTags.put("GROUPNAME", "com.falsepattern.gasstation")
+}
+
+tasks.injectTags.configure {
+	outputClassName.set("com.falsepattern.gasstation.Tags")
 }

module-gasstation/src/main/java/com/falsepattern/gasstation/Tags.java

@@ -1,12 +0,0 @@
-package com.falsepattern.gasstation;
-
-// Use this class for Strings only. Do not import any classes here. It will lead to issues with Mixins if in use!
-
-public class Tags {
-
-    // GRADLETOKEN_* will be replaced by your configuration values at build time
-    public static final String MODID = "GRADLETOKEN_MODID";
-    public static final String MODNAME = "GRADLETOKEN_MODNAME";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
-    public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
-}

module-gtnhmixins/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 dependencies {
 	compileOnly('org.spongepowered:mixin:0.8.5')
 	shadow(project(":module-common")) {
@@ -10,7 +12,7 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-gtnhmixins-1.7.10")
 apply plugin: "com.github.johnrengelman.shadow"
 
 shadowJar {
-	classifier = ''
+	archiveClassifier = ''
 	configurations = [project.configurations.shadow]
 	
 	relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
@@ -32,12 +34,15 @@ jar {
 	enabled = false
 }
 
+reobfJar.enabled = false
+
 ext.uniVersion = version
 ext.extraModid = "gtnhmixins"
 ext.mcversion = "1.7.10"
 version += "+" + ext.extraVersion
 
-minecraft {
-	replaceIn("GTNHMixins.java")
-    replace("GRADLETOKEN_VERSION", extraVersion)
+minecraft.injectedTags.put("VERSION", extraVersion)
+
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.gtnhmixins.Tags")
 }

module-gtnhmixins/src/main/java/com/gtnewhorizon/gtnhmixins/GTNHMixins.java

@@ -4,11 +4,13 @@ import cpw.mods.fml.common.Mod;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import io.github.legacymoddingmc.unimixins.gtnhmixins.Tags;
+
 @Mod(modid = GTNHMixins.MODID, version = GTNHMixins.VERSION, name = GTNHMixins.NAME, acceptableRemoteVersions = "*")
 @net.minecraftforge.fml.common.Mod(modid = GTNHMixins.MODID, version = GTNHMixins.VERSION, name = GTNHMixins.NAME, acceptableRemoteVersions = "*")
 public class GTNHMixins {
     public static final String NAME = "GTNHMixins";
     public static final String MODID = "gtnhmixins";
-    public static final String VERSION = "GRADLETOKEN_VERSION";
+    public static final String VERSION = Tags.VERSION;
     public static final Logger LOGGER = LogManager.getLogger(NAME);
 }

module-mixinbooterlegacy/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 repositories {
 	maven {
 		name = 'sponge'
@@ -20,7 +22,7 @@ archivesBaseName = archivesBaseName.replace("-1.7.10", "-mixinbooterlegacy-1.7.1
 apply plugin: "com.github.johnrengelman.shadow"
 
 shadowJar {
-	classifier = ''
+	archiveClassifier = ''
 	configurations = [project.configurations.shadow]
 
 	relocate 'io.github.legacymoddingmc.unimixins.common', 'io.github.legacymoddingmc.unimixins.mixinbooterlegacy.repackage.common'
@@ -40,10 +42,14 @@ jar {
 	enabled = false
 }
 
+reobfJar.enabled = false
+
 ext.uniVersion = version
 ext.mcversion = "1.7.10"
 version += "+" + extraVersion
 
-minecraft {
-	replace("@VERSION@", extraVersion)
+minecraft.injectedTags.put("VERSION", extraVersion)
+
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.mixinbooterlegacy.Tags")
 }

module-mixinbooterlegacy/src/main/java/io/github/tox1cozz/mixinbooterlegacy/MixinBooterLegacyPlugin.java

@@ -8,6 +8,7 @@ import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
 import io.github.tox1cozz.mixinextras.MixinExtrasBootstrap;
 import io.github.legacymoddingmc.unimixins.mixinbooterlegacy.MixinBooterLegacyModule;
+import io.github.legacymoddingmc.unimixins.mixinbooterlegacy.Tags;
 import net.minecraft.launchwrapper.Launch;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -83,8 +84,8 @@ public final class MixinBooterLegacyPlugin implements IFMLLoadingPlugin {
         return null;
     }
 
-    @Mod(modid = "mixinbooterlegacy", name = "MixinBooterLegacy", version = "@VERSION@", acceptableRemoteVersions = "*")
-    @net.minecraftforge.fml.common.Mod(modid = "mixinbooterlegacy", name = "MixinBooterLegacy", version = "@VERSION@", acceptableRemoteVersions = "*")
+    @Mod(modid = "mixinbooterlegacy", name = "MixinBooterLegacy", version = Tags.VERSION, acceptableRemoteVersions = "*")
+    @net.minecraftforge.fml.common.Mod(modid = "mixinbooterlegacy", name = "MixinBooterLegacy", version = Tags.VERSION, acceptableRemoteVersions = "*")
     public static class Container {
 
     }

module-mixinextras/build.gradle

@@ -1,3 +1,5 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 configurations {
 	shadowBridge
 }
@@ -15,7 +17,7 @@ version += "+${extraVersion}"
 apply plugin: "com.github.johnrengelman.shadow"
 
 shadowJar {
-	classifier = ''
+	archiveClassifier = ''
 	configurations = [project.configurations.shadow]
 	
 	relocate 'org.objectweb.asm', 'org.spongepowered.asm.lib'
@@ -34,3 +36,9 @@ jar {
 	enabled = false
 	dependsOn shadowJar
 }
+
+reobfJar.enabled = false
+
+tasks.injectTags.configure {
+	outputClassName.set("io.github.legacymoddingmc.unimixins.mixinextras.Tags")
+}

module-mixinextras/src/main/java/io/github/legacymoddingmc/unimixins/mixinextras/MixinExtrasModule.java

@@ -5,8 +5,8 @@ import cpw.mods.fml.common.Mod;
 /**
  * This is only here to help Forge detect the mod.
  */
-@Mod(modid = "mixinextras", version = "@VERSION@", acceptableRemoteVersions = "*")
-@net.minecraftforge.fml.common.Mod(modid = "mixinextras", version = "@VERSION@", acceptableRemoteVersions = "*")
+@Mod(modid = "mixinextras", version = Tags.VERSION, acceptableRemoteVersions = "*")
+@net.minecraftforge.fml.common.Mod(modid = "mixinextras", version = Tags.VERSION, acceptableRemoteVersions = "*")
 public class MixinExtrasModule {
 }
 

module-mixinextras/src/main/resources/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2022 LlamaLad7
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

module-spongemixins/build.gradle

@@ -1,10 +1,15 @@
+apply from: "${rootDir}/module-conventions.gradle"
+
 dependencies {
 	compileOnly('org.spongepowered:mixin:0.8.5')
 }
 
 archivesBaseName = archivesBaseName.replace("-1.7.10", "-spongemixins-1.7.10")
 
-jar {
+shadowJar {
+	archiveClassifier = ''
+	configurations = []
+	relocate 'com.gtnewhorizon', 'ru.timeconqueror.spongemixins.repackage.com.gtnewhorizon'
 	manifest {
 		attributes (
 			'TweakClass': 'org.spongepowered.asm.launch.MixinTweaker',
@@ -14,10 +19,10 @@ jar {
 	}
 }
 
-minecraft {
-	srgExtra "PK: com/gtnewhorizon ru/timeconqueror/spongemixins/repackage/com/gtnewhorizon"
-}
-
 ext.uniVersion = version
 ext.mcversion = "1.7.10"
 version += "+gtnh." + ext.extraVersion
+
+reobfJar.enabled = false
+jar.dependsOn shadowJar
+jar.enabled = false

settings.gradle

@@ -17,13 +17,13 @@ pluginManagement {
 }
 
 include 'module-mixin'
-// include 'module-compat'
-// include 'module-devcompat'
+include 'module-compat'
+include 'module-devcompat'
 include 'module-mixingasm'
-// include 'module-spongemixins'
-// include 'module-mixinbooterlegacy'
-// include 'module-gasstation'
-// include 'module-gtnhmixins'
-// include 'module-mixinextras'
+include 'module-spongemixins'
+include 'module-mixinbooterlegacy'
+include 'module-gasstation'
+include 'module-gtnhmixins'
+include 'module-mixinextras'
 // include 'module-all'
 include 'module-common'