diff --git a/.gitignore b/.gitignore index dc8c6a4..cf4646a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ build/ *.ipr run/ +run-data/ *.iws out/ *.iml diff --git a/.run/NeoForge Client (_neoforge_1.21.1).run.xml b/.run/NeoForge Client (_neoforge_1.21.1).run.xml new file mode 100644 index 0000000..d8ad521 --- /dev/null +++ b/.run/NeoForge Client (_neoforge_1.21.1).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Client (_neoforge_1.21.11).run.xml b/.run/NeoForge Client (_neoforge_1.21.11).run.xml new file mode 100644 index 0000000..ba6265f --- /dev/null +++ b/.run/NeoForge Client (_neoforge_1.21.11).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Client Data (_neoforge_1.21.11).run.xml b/.run/NeoForge Client Data (_neoforge_1.21.11).run.xml new file mode 100644 index 0000000..34ff661 --- /dev/null +++ b/.run/NeoForge Client Data (_neoforge_1.21.11).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Data (_neoforge_1.21.1).run.xml b/.run/NeoForge Data (_neoforge_1.21.1).run.xml new file mode 100644 index 0000000..06d358e --- /dev/null +++ b/.run/NeoForge Data (_neoforge_1.21.1).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Server (_neoforge_1.21.1).run.xml b/.run/NeoForge Server (_neoforge_1.21.1).run.xml new file mode 100644 index 0000000..8473ae0 --- /dev/null +++ b/.run/NeoForge Server (_neoforge_1.21.1).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Server (_neoforge_1.21.11).run.xml b/.run/NeoForge Server (_neoforge_1.21.11).run.xml new file mode 100644 index 0000000..95e9878 --- /dev/null +++ b/.run/NeoForge Server (_neoforge_1.21.11).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/NeoForge Server Data (_neoforge_1.21.11).run.xml b/.run/NeoForge Server Data (_neoforge_1.21.11).run.xml new file mode 100644 index 0000000..073d725 --- /dev/null +++ b/.run/NeoForge Server Data (_neoforge_1.21.11).run.xml @@ -0,0 +1,22 @@ + + + + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.16.5_runClient.run.xml b/.run/_minecraftforge_1.16.5_runClient.run.xml new file mode 100644 index 0000000..6003241 --- /dev/null +++ b/.run/_minecraftforge_1.16.5_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.16.5_runData.run.xml b/.run/_minecraftforge_1.16.5_runData.run.xml new file mode 100644 index 0000000..84e9328 --- /dev/null +++ b/.run/_minecraftforge_1.16.5_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.16.5_runServer.run.xml b/.run/_minecraftforge_1.16.5_runServer.run.xml new file mode 100644 index 0000000..e46a3a2 --- /dev/null +++ b/.run/_minecraftforge_1.16.5_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.18.2_runClient.run.xml b/.run/_minecraftforge_1.18.2_runClient.run.xml new file mode 100644 index 0000000..41002c7 --- /dev/null +++ b/.run/_minecraftforge_1.18.2_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.18.2_runData.run.xml b/.run/_minecraftforge_1.18.2_runData.run.xml new file mode 100644 index 0000000..b4cab5f --- /dev/null +++ b/.run/_minecraftforge_1.18.2_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.18.2_runServer.run.xml b/.run/_minecraftforge_1.18.2_runServer.run.xml new file mode 100644 index 0000000..d130e9e --- /dev/null +++ b/.run/_minecraftforge_1.18.2_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.19.2_runClient.run.xml b/.run/_minecraftforge_1.19.2_runClient.run.xml new file mode 100644 index 0000000..2b116f4 --- /dev/null +++ b/.run/_minecraftforge_1.19.2_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.19.2_runData.run.xml b/.run/_minecraftforge_1.19.2_runData.run.xml new file mode 100644 index 0000000..54e03fb --- /dev/null +++ b/.run/_minecraftforge_1.19.2_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.19.2_runServer.run.xml b/.run/_minecraftforge_1.19.2_runServer.run.xml new file mode 100644 index 0000000..73062b4 --- /dev/null +++ b/.run/_minecraftforge_1.19.2_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.20.1_runClient.run.xml b/.run/_minecraftforge_1.20.1_runClient.run.xml new file mode 100644 index 0000000..dbe5b3c --- /dev/null +++ b/.run/_minecraftforge_1.20.1_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.20.1_runData.run.xml b/.run/_minecraftforge_1.20.1_runData.run.xml new file mode 100644 index 0000000..965401d --- /dev/null +++ b/.run/_minecraftforge_1.20.1_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.20.1_runServer.run.xml b/.run/_minecraftforge_1.20.1_runServer.run.xml new file mode 100644 index 0000000..ccb51b6 --- /dev/null +++ b/.run/_minecraftforge_1.20.1_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.21.11_runClient.run.xml b/.run/_minecraftforge_1.21.11_runClient.run.xml new file mode 100644 index 0000000..c32a072 --- /dev/null +++ b/.run/_minecraftforge_1.21.11_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.21.1_runClient.run.xml b/.run/_minecraftforge_1.21.1_runClient.run.xml new file mode 100644 index 0000000..5604bf0 --- /dev/null +++ b/.run/_minecraftforge_1.21.1_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_minecraftforge_1.21.1_runData.run.xml b/.run/_minecraftforge_1.21.1_runData.run.xml new file mode 100644 index 0000000..5d3d9a7 --- /dev/null +++ b/.run/_minecraftforge_1.21.1_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.11_runClient.run.xml b/.run/_neoforge_1.21.11_runClient.run.xml new file mode 100644 index 0000000..52796c8 --- /dev/null +++ b/.run/_neoforge_1.21.11_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.11_runClientData.run.xml b/.run/_neoforge_1.21.11_runClientData.run.xml new file mode 100644 index 0000000..6b399f3 --- /dev/null +++ b/.run/_neoforge_1.21.11_runClientData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.11_runServer.run.xml b/.run/_neoforge_1.21.11_runServer.run.xml new file mode 100644 index 0000000..672ba48 --- /dev/null +++ b/.run/_neoforge_1.21.11_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.11_runServerData.run.xml b/.run/_neoforge_1.21.11_runServerData.run.xml new file mode 100644 index 0000000..1904b26 --- /dev/null +++ b/.run/_neoforge_1.21.11_runServerData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.1_runClient.run.xml b/.run/_neoforge_1.21.1_runClient.run.xml new file mode 100644 index 0000000..d78ad36 --- /dev/null +++ b/.run/_neoforge_1.21.1_runClient.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.1_runData.run.xml b/.run/_neoforge_1.21.1_runData.run.xml new file mode 100644 index 0000000..17e7d59 --- /dev/null +++ b/.run/_neoforge_1.21.1_runData.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/.run/_neoforge_1.21.1_runServer.run.xml b/.run/_neoforge_1.21.1_runServer.run.xml new file mode 100644 index 0000000..4e0e14e --- /dev/null +++ b/.run/_neoforge_1.21.1_runServer.run.xml @@ -0,0 +1,27 @@ + + + + + + + true + true + false + false + false + false + false + + + \ No newline at end of file diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index a6f4b77..18afd1d 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -1,6 +1,5 @@ plugins { `kotlin-dsl` - kotlin("jvm") version "2.3.0" } repositories { @@ -10,5 +9,5 @@ repositories { } dependencies { - implementation("dev.kikugie:stonecutter:0.8") + implementation("dev.kikugie:stonecutter:0.9.1-beta.5") } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/build-extensions.kt b/buildSrc/src/main/kotlin/build-extensions.kt index 860c9db..a6cbbc0 100644 --- a/buildSrc/src/main/kotlin/build-extensions.kt +++ b/buildSrc/src/main/kotlin/build-extensions.kt @@ -35,5 +35,4 @@ value class ModData(private val project: Project) { fun prop(key: String) = requireNotNull(propOrNull(key)) { "Missing '$key'" } fun modPropOrNull(key: String) = project.prop("mod.$key") fun modProp(key: String) = requireNotNull(modPropOrNull(key)) { "Missing 'mod.$key'" } - fun modrinth(name: String, version: String) = "maven.modrinth:$name:$version" } \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/multiloader-loader.gradle.kts b/buildSrc/src/main/kotlin/multiloader-loader.gradle.kts deleted file mode 100644 index 01d3c91..0000000 --- a/buildSrc/src/main/kotlin/multiloader-loader.gradle.kts +++ /dev/null @@ -1,33 +0,0 @@ -plugins { - id("multiloader-common") -} - -val commonJava: Configuration by configurations.creating { - isCanBeResolved = true -} -val commonResources: Configuration by configurations.creating { - isCanBeResolved = true -} - -dependencies { - val commonPath = common.hierarchy.toString() - compileOnly(project(path = commonPath)) - commonJava(project(path = commonPath, configuration = "commonJava")) - commonResources(project(path = commonPath, configuration = "commonResources")) -} - -tasks { - compileJava { - dependsOn(commonJava) - source(commonJava) - } - - processResources { - dependsOn(commonResources) - from(commonResources) - } - - jar { - exclude("accesswideners/**") - } -} \ No newline at end of file diff --git a/buildSrc/src/main/kotlin/multiloader-common.gradle.kts b/buildSrc/src/main/kotlin/multiloader.gradle.kts similarity index 68% rename from buildSrc/src/main/kotlin/multiloader-common.gradle.kts rename to buildSrc/src/main/kotlin/multiloader.gradle.kts index 5648609..a4afb88 100644 --- a/buildSrc/src/main/kotlin/multiloader-common.gradle.kts +++ b/buildSrc/src/main/kotlin/multiloader.gradle.kts @@ -15,28 +15,6 @@ java { // withJavadocJar() } -repositories { - maven("https://libraries.minecraft.net") { name = "Mojang" } - mavenCentral() - exclusiveContent { - forRepository { - maven("https://repo.spongepowered.org/repository/maven-public") { name = "Sponge" } - } - filter { includeGroupAndSubgroups("org.spongepowered") } - } - exclusiveContent { - forRepositories( - maven("https://maven.parchmentmc.org") { name = "ParchmentMC" }, - maven("https://maven.neoforged.net/releases") { name = "NeoForge" } - ) - filter { includeGroup("org.parchmentmc.data") } - } - maven("https://maven.quiltmc.org/repository/release/") { name = "QuiltMC" } - maven("https://maven.fabricmc.net/") { name = "FabricMC" } - maven("https://maven.neoforged.net/releases") { name = "NeoForge" } - maven("https://maven.minecraftforge.net") { name = "MinecraftForge" } -} - tasks { processResources { val expandProps = mapOf( @@ -60,8 +38,8 @@ tasks { "minecraftforge_version_range" to commonMod.propOrNull("minecraftforge_version_range"), "minecraftforge_eventbus_validator_version" to commonMod.propOrNull("minecraftforge_eventbus_validator_version"), - "quilted_fabric_api_version" to commonMod.propOrNull("quilted_fabric_api_version"), - "quilt_loader_version" to commonMod.propOrNull("quilt_loader_version"), + "fabric_mixin_version" to commonMod.propOrNull("fabric_mixin_version"), + "mixinextras_version" to commonMod.propOrNull("mixinextras_version"), ).filterValues { it?.isNotEmpty() == true }.mapValues { (_, v) -> v!! } val jsonExpandProps = expandProps.mapValues { (_, v) -> v.replace("\n", "\\\\n") } diff --git a/common/build.gradle.kts b/common/build.gradle.kts deleted file mode 100644 index 245d70e..0000000 --- a/common/build.gradle.kts +++ /dev/null @@ -1,48 +0,0 @@ -plugins { - id("multiloader-common") - id("org.quiltmc.loom.remap") -} - -loom { - accessWidenerPath = - common.project.file("../../src/main/resources/accesswideners/${commonMod.minecraft_version}-${mod.id}.accesswidener") -} - -dependencies { - minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") - mappings(loom.layered { - officialMojangMappings() - commonMod.propOrNull("parchment_mappings")?.let { parchmentVersion -> - if (parchmentVersion != "") parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") - } - }) - - compileOnly("org.spongepowered:mixin:0.8.5") - - "io.github.llamalad7:mixinextras-common:0.5.0".let { - compileOnly(it) - annotationProcessor(it) - } -} - -val commonJava: Configuration by configurations.creating { - isCanBeResolved = false - isCanBeConsumed = true -} - -val commonResources: Configuration by configurations.creating { - isCanBeResolved = false - isCanBeConsumed = true -} - -artifacts { - afterEvaluate { - val mainSourceSet = sourceSets.main.get() - mainSourceSet.java.sourceDirectories.files.forEach { - add(commonJava.name, it) - } - mainSourceSet.resources.sourceDirectories.files.forEach { - add(commonResources.name, it) - } - } -} \ No newline at end of file diff --git a/common/split.gradle.kts b/common/split.gradle.kts new file mode 100644 index 0000000..6911679 --- /dev/null +++ b/common/split.gradle.kts @@ -0,0 +1,95 @@ +plugins { + multiloader + id("net.fabricmc.fabric-loom-remap") +} + +repositories { + maven("https://libraries.minecraft.net") { name = "Mojang" } + mavenCentral() + exclusiveContent { + forRepositories( + maven("https://maven.parchmentmc.org") { name = "ParchmentMC" } + ) + filter { includeGroup("org.parchmentmc.data") } + } + maven("https://maven.quiltmc.org/repository/release/") { name = "QuiltMC" } + maven("https://maven.fabricmc.net/") { name = "FabricMC" } +} + +loom { + accessWidenerPath = + common.project.file("../../src/main/resources/classtweakers/${commonMod.minecraft_version}-${mod.id}.classtweaker") + + splitEnvironmentSourceSets() + + mods { + create(mod.id) { + sourceSet(sourceSets.main.get()) + sourceSet(sourceSets.named("client").get()) + } + } +} + +sourceSets { + getByName("client") { + compileClasspath += sourceSets["main"].output + configurations.getByName("compileClasspath") + runtimeClasspath += sourceSets["main"].output + configurations.getByName("runtimeClasspath") + } +} + +dependencies { + minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") + mappings(loom.layered { + officialMojangMappings() + commonMod.propOrNull("parchment_mappings")?.let { parchmentVersion -> + if (parchmentVersion != "") + parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") + } + }) + + compileOnly("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + + "io.github.llamalad7:mixinextras-common:${commonMod.prop("mixinextras_version")}".let { + compileOnly(it) + annotationProcessor(it) + } +} + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +val commonResources: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +val commonClientJava: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +val commonClientResources: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +artifacts { + afterEvaluate { + val mainSourceSet = sourceSets.main.get() + mainSourceSet.java.sourceDirectories.files.forEach { + add(commonJava.name, it) + } + mainSourceSet.resources.sourceDirectories.files.forEach { + add(commonResources.name, it) + } + val clientSourceSet = sourceSets.named("client").get() + clientSourceSet.java.sourceDirectories.files.forEach { + add(commonClientJava.name, it) + } + clientSourceSet.resources.sourceDirectories.files.forEach { + add(commonClientResources.name, it) + } + } +} \ No newline at end of file diff --git a/common/src/main/java/com/example/examplemod/CommonClass.java b/common/src/main/java/com/example/examplemod/CommonClass.java index b39129c..504303e 100644 --- a/common/src/main/java/com/example/examplemod/CommonClass.java +++ b/common/src/main/java/com/example/examplemod/CommonClass.java @@ -1,7 +1,11 @@ package com.example.examplemod; import com.example.examplemod.platform.Services; -import net.minecraft.core.registries.BuiltInRegistries; +//? if >=1.19.3 { +/*import net.minecraft.core.registries.BuiltInRegistries; + *///? } else { +import net.minecraft.core.Registry; +//? } import net.minecraft.world.item.Items; // This class is part of the common project meaning it is shared between all supported loaders. Code written here can only @@ -17,7 +21,12 @@ public class CommonClass public static void init() { Constants.LOG.info("Hello from Common init on {}! we are currently in a {} environment!", Services.PLATFORM.getPlatformName(), Services.PLATFORM.getEnvironmentName()); - Constants.LOG.info("The ID for diamonds is {}", BuiltInRegistries.ITEM.getKey(Items.DIAMOND)); + + //? if >=1.19.3 { + /*Constants.LOG.info("The ID for diamonds is {}", BuiltInRegistries.ITEM.getKey(Items.DIAMOND)); + *///? } else { + Constants.LOG.info("The ID for diamonds is {}", Registry.ITEM.getKey(Items.DIAMOND)); + //? } // It is common for all supported loaders to provide a similar feature that can not be used directly in the // common code. A popular way to get around this is using Java's built-in service loader feature to create diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.20.2.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.16.5.cfg similarity index 100% rename from common/src/main/resources/accesstransformers/accesstransformer-1.20.2.cfg rename to common/src/main/resources/accesstransformers/accesstransformer-1.16.5.cfg diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.20.4.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.18.2.cfg similarity index 100% rename from common/src/main/resources/accesstransformers/accesstransformer-1.20.4.cfg rename to common/src/main/resources/accesstransformers/accesstransformer-1.18.2.cfg diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.20.6.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.19.2.cfg similarity index 100% rename from common/src/main/resources/accesstransformers/accesstransformer-1.20.6.cfg rename to common/src/main/resources/accesstransformers/accesstransformer-1.19.2.cfg diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.10.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.10.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.2.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.2.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.3.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.3.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.4.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.4.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.5.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.5.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.6.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.6.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.7.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.7.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.8.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.8.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.9.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.9.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesstransformers/accesstransformer-1.21.cfg b/common/src/main/resources/accesstransformers/accesstransformer-1.21.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/common/src/main/resources/accesswideners/1.20.1-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.20.1-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.20.1-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.20.2-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.20.2-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.20.2-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.20.4-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.20.4-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.20.4-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.20.6-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.20.6-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.20.6-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.1-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.1-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.1-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.10-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.10-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.10-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.11-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.11-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.11-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.2-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.2-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.2-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.3-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.3-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.3-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.4-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.4-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.4-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.5-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.5-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.5-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.6-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.6-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.6-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.7-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.7-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.7-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.8-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.8-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.8-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/accesswideners/1.21.9-examplemod.accesswidener b/common/src/main/resources/accesswideners/1.21.9-examplemod.accesswidener deleted file mode 100644 index 2464d6d..0000000 --- a/common/src/main/resources/accesswideners/1.21.9-examplemod.accesswidener +++ /dev/null @@ -1 +0,0 @@ -accessWidener v2 named \ No newline at end of file diff --git a/common/src/main/resources/classtweakers/1.16.5-examplemod.classtweaker b/common/src/main/resources/classtweakers/1.16.5-examplemod.classtweaker new file mode 100644 index 0000000..9656789 --- /dev/null +++ b/common/src/main/resources/classtweakers/1.16.5-examplemod.classtweaker @@ -0,0 +1 @@ +classTweaker v1 named \ No newline at end of file diff --git a/common/src/main/resources/classtweakers/1.18.2-examplemod.classtweaker b/common/src/main/resources/classtweakers/1.18.2-examplemod.classtweaker new file mode 100644 index 0000000..9656789 --- /dev/null +++ b/common/src/main/resources/classtweakers/1.18.2-examplemod.classtweaker @@ -0,0 +1 @@ +classTweaker v1 named \ No newline at end of file diff --git a/common/src/main/resources/classtweakers/1.19.2-examplemod.classtweaker b/common/src/main/resources/classtweakers/1.19.2-examplemod.classtweaker new file mode 100644 index 0000000..9656789 --- /dev/null +++ b/common/src/main/resources/classtweakers/1.19.2-examplemod.classtweaker @@ -0,0 +1 @@ +classTweaker v1 named \ No newline at end of file diff --git a/common/src/main/resources/classtweakers/1.20.1-examplemod.classtweaker b/common/src/main/resources/classtweakers/1.20.1-examplemod.classtweaker new file mode 100644 index 0000000..9656789 --- /dev/null +++ b/common/src/main/resources/classtweakers/1.20.1-examplemod.classtweaker @@ -0,0 +1 @@ +classTweaker v1 named \ No newline at end of file diff --git a/common/src/main/resources/classtweakers/1.21.1-examplemod.classtweaker b/common/src/main/resources/classtweakers/1.21.1-examplemod.classtweaker new file mode 100644 index 0000000..9656789 --- /dev/null +++ b/common/src/main/resources/classtweakers/1.21.1-examplemod.classtweaker @@ -0,0 +1 @@ +classTweaker v1 named \ No newline at end of file diff --git a/common/unsplit.gradle.kts b/common/unsplit.gradle.kts new file mode 100644 index 0000000..56918c5 --- /dev/null +++ b/common/unsplit.gradle.kts @@ -0,0 +1,69 @@ +plugins { + multiloader + id("net.fabricmc.fabric-loom-remap") +} + +repositories { + maven("https://libraries.minecraft.net") { name = "Mojang" } + mavenCentral() + exclusiveContent { + forRepositories( + maven("https://maven.parchmentmc.org") { name = "ParchmentMC" } + ) + filter { includeGroup("org.parchmentmc.data") } + } + maven("https://maven.quiltmc.org/repository/release/") { name = "QuiltMC" } + maven("https://maven.fabricmc.net/") { name = "FabricMC" } +} + +loom { + accessWidenerPath = + common.project.file("../../src/main/resources/classtweakers/${commonMod.minecraft_version}-${mod.id}.classtweaker") + + + mods { + create(mod.id) { + sourceSet(sourceSets.main.get()) + } + } +} + +dependencies { + minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") + mappings(loom.layered { + officialMojangMappings() + commonMod.propOrNull("parchment_mappings")?.let { parchmentVersion -> + if (parchmentVersion != "") + parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") + } + }) + + compileOnly("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + + "io.github.llamalad7:mixinextras-common:${commonMod.prop("mixinextras_version")}".let { + compileOnly(it) + annotationProcessor(it) + } +} + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +val commonResources: Configuration by configurations.creating { + isCanBeResolved = false + isCanBeConsumed = true +} + +artifacts { + afterEvaluate { + val mainSourceSet = sourceSets.main.get() + mainSourceSet.java.sourceDirectories.files.forEach { + add(commonJava.name, it) + } + mainSourceSet.resources.sourceDirectories.files.forEach { + add(commonResources.name, it) + } + } +} \ No newline at end of file diff --git a/fabricmc/build.gradle.kts b/fabricmc/build.gradle.kts deleted file mode 100644 index c793e38..0000000 --- a/fabricmc/build.gradle.kts +++ /dev/null @@ -1,45 +0,0 @@ -plugins { - `multiloader-loader` - id("org.quiltmc.loom.remap") -} - -dependencies { - minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") - mappings(loom.layered { - officialMojangMappings() - commonMod.propOrNull("parchment")?.let { parchmentVersion -> - if (parchmentVersion != "") parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") - } - }) - - modImplementation("net.fabricmc:fabric-loader:${commonMod.prop("fabric_loader_version")}") - modApi("net.fabricmc.fabric-api:fabric-api:${commonMod.prop("fabric_api_version")}") -} - -loom { - accessWidenerPath = - common.project.file("../../src/main/resources/accesswideners/${commonMod.minecraft_version}-${mod.id}.accesswidener") - - runs { - getByName("client") { - client() - configName = "Fabric Client" - ideConfigGenerated(true) - } - getByName("server") { - server() - configName = "Fabric Server" - ideConfigGenerated(true) - } - } -} - -tasks.named("processResources") { - val awFile = project(":common").file("src/main/resources/accesswideners/${commonMod.minecraft_version}-${mod.id}.accesswidener") - - from(awFile.parentFile) { - include(awFile.name) - rename(awFile.name, "${mod.id}.accesswidener") - into("") - } -} \ No newline at end of file diff --git a/fabricmc/split.gradle.kts b/fabricmc/split.gradle.kts new file mode 100644 index 0000000..47e9348 --- /dev/null +++ b/fabricmc/split.gradle.kts @@ -0,0 +1,128 @@ +plugins { + multiloader + id("net.fabricmc.fabric-loom-remap") +} + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonResources: Configuration by configurations.creating { + isCanBeResolved = true +} + +val commonClientJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonClientResources: Configuration by configurations.creating { + isCanBeResolved = true +} + +repositories { + maven("https://libraries.minecraft.net") { name = "Mojang" } + mavenCentral() + exclusiveContent { + forRepositories( + maven("https://maven.parchmentmc.org") { name = "ParchmentMC" } + ) + filter { includeGroup("org.parchmentmc.data") } + } + maven("https://maven.quiltmc.org/repository/release/") { name = "QuiltMC" } + maven("https://maven.fabricmc.net/") { name = "FabricMC" } +} + +loom { + accessWidenerPath = + common.project.file("../../src/main/resources/classtweakers/${commonMod.minecraft_version}-${mod.id}.classtweaker") + + splitEnvironmentSourceSets() + + mods { + create("jingling_journeys") { + sourceSet(sourceSets.main.get()) + sourceSet(sourceSets.named("client").get()) + } + } + + runConfigs.configureEach { + ideConfigGenerated(false) + } + + runs { + getByName("client") { + client() + configName = "Fabric Client" + } + getByName("server") { + server() + configName = "Fabric Server" + } + } +} + +sourceSets { + getByName("client") { + compileClasspath += sourceSets["main"].output + configurations.getByName("compileClasspath") + runtimeClasspath += sourceSets["main"].output + configurations.getByName("runtimeClasspath") + } +} + +dependencies { + minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") + mappings(loom.layered { + officialMojangMappings() + commonMod.propOrNull("parchment_mappings")?.let { parchmentVersion -> + if (parchmentVersion != "") parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") + } + }) + + modImplementation("net.fabricmc:fabric-loader:${commonMod.prop("fabric_loader_version")}") + modApi("net.fabricmc.fabric-api:fabric-api:${commonMod.prop("fabric_api_version")}") + + include("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + annotationProcessor("io.github.llamalad7:mixinextras-fabric:${commonMod.prop("mixinextras_version")}") + include("io.github.llamalad7:mixinextras-fabric:${commonMod.prop("mixinextras_version")}") + + compileOnly(project(":common")) + commonJava(project(":common", "commonJava")) + commonResources(project(":common", "commonResources")) + + sourceSets.named("client") { + commonClientJava(project(":common", "commonClientJava")) + commonClientResources(project(":common", "commonClientResources")) + } +} + +if (stonecutter.eval(stonecutter.current.version, ">=1.17")) { + fabricApi { + configureDataGeneration() { + client = true + modId = mod.id + } + } +} + +tasks { + compileJava { + dependsOn(commonJava) + source(commonJava) + } + + processResources { + dependsOn(commonResources) + from(commonResources) + } + + getByName("compileClientJava") { + dependsOn(commonJava, commonClientJava) + source(commonJava, commonClientJava) + } + + getByName("processClientResources") { + dependsOn(commonResources, commonClientResources) + from(commonResources, commonClientResources) + } + + jar { + duplicatesStrategy = DuplicatesStrategy.WARN + } +} \ No newline at end of file diff --git a/fabricmc/src/main/resources/fabric.mod.json b/fabricmc/src/main/resources/fabric.mod.json index 25155ca..9bcdb74 100644 --- a/fabricmc/src/main/resources/fabric.mod.json +++ b/fabricmc/src/main/resources/fabric.mod.json @@ -19,6 +19,7 @@ "com.example.examplemod.ExampleMod" ] }, + "accessWidener": "classtweakers/${minecraft_version}-${mod_id}.classtweaker", "mixins": [ "${mod_id}.mixins.json", "${mod_id}.fabricmc.mixins.json" diff --git a/fabricmc/unsplit.gradle.kts b/fabricmc/unsplit.gradle.kts new file mode 100644 index 0000000..9d08f4c --- /dev/null +++ b/fabricmc/unsplit.gradle.kts @@ -0,0 +1,96 @@ +plugins { + multiloader + id("net.fabricmc.fabric-loom-remap") +} + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonResources: Configuration by configurations.creating { + isCanBeResolved = true +} + +repositories { + maven("https://libraries.minecraft.net") { name = "Mojang" } + mavenCentral() + exclusiveContent { + forRepositories( + maven("https://maven.parchmentmc.org") { name = "ParchmentMC" } + ) + filter { includeGroup("org.parchmentmc.data") } + } + maven("https://maven.quiltmc.org/repository/release/") { name = "QuiltMC" } + maven("https://maven.fabricmc.net/") { name = "FabricMC" } +} + +loom { + accessWidenerPath = + common.project.file("../../src/main/resources/classtweakers/${commonMod.minecraft_version}-${mod.id}.classtweaker") + + mods { + create("jingling_journeys") { + sourceSet(sourceSets.main.get()) + } + } + + runConfigs.configureEach { + ideConfigGenerated(false) + } + + runs { + getByName("client") { + client() + configName = "Fabric Client" + } + getByName("server") { + server() + configName = "Fabric Server" + } + } +} + +dependencies { + minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") + mappings(loom.layered { + officialMojangMappings() + commonMod.propOrNull("parchment_mappings")?.let { parchmentVersion -> + if (parchmentVersion != "") parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") + } + }) + + modImplementation("net.fabricmc:fabric-loader:${commonMod.prop("fabric_loader_version")}") + modApi("net.fabricmc.fabric-api:fabric-api:${commonMod.prop("fabric_api_version")}") + + include("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + annotationProcessor("io.github.llamalad7:mixinextras-fabric:${commonMod.prop("mixinextras_version")}") + include("io.github.llamalad7:mixinextras-fabric:${commonMod.prop("mixinextras_version")}") + + compileOnly(project(":common")) + commonJava(project(":common", "commonJava")) + commonResources(project(":common", "commonResources")) +} + +if (stonecutter.eval(stonecutter.current.version, ">=1.17")) { + fabricApi { + configureDataGeneration() { + client = true + modId = mod.id + } + } +} + +tasks { + compileJava { + dependsOn(commonJava) + source(commonJava) + } + + processResources { + dependsOn(commonResources) + from(commonResources) + } + + jar { + duplicatesStrategy = DuplicatesStrategy.WARN + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index ed07522..04f2d3d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,11 @@ # Dev org.gradle.jvmargs=-Xmx3G -# If your computer can handle it, turn this to true -org.gradle.parallel=false +org.gradle.caching=true +org.gradle.configureondemand=true + +org.gradle.parallel=true + +net.minecraftforge.gradle.merge-source-sets=true # IntelliJ IDEA is not yet fully compatible with configuration cache, see: https://github.com/FabricMC/fabric-loom/issues/1349 org.gradle.configuration-cache=false @@ -18,17 +22,20 @@ mod.license=CC0-1.0 mod.credits=Foboslav, for making the friends-and-foes mod I based this template's buildscript off of. # Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge, quiltmc -stonecutter_enabled_common_versions=1.20.1, 1.20.2, 1.20.4, 1.20.6, 1.21, 1.21.1, 1.21.3, 1.21.4, 1.21.5, 1.21.8, 1.21.10, 1.21.11 -stonecutter_enabled_fabricmc_versions=1.20.1, 1.20.2, 1.20.4, 1.20.6, 1.21.1, 1.21.3, 1.21.4, 1.21.5, 1.21.8, 1.21.10, 1.21.11 -stonecutter_enabled_legacy_minecraftforge_versions=1.20.1 -stonecutter_enabled_minecraftforge_versions=1.20.6, 1.21.1, 1.21.3, 1.21.4, 1.21.5, 1.21.8, 1.21.10, 1.21.11 -stonecutter_enabled_neoforge_versions=1.20.6, 1.21.1, 1.21.3, 1.21.4, 1.21.5, 1.21.8, 1.21.10, 1.21.11 -stonecutter_enabled_quiltmc_versions=1.20.1, 1.20.2, 1.20.4, 1.20.6, 1.21 -# Fabric https://fabricmc.net/develop -fabric_loader_version=0.18.3 -# Forge https://files.minecraftforge.net/net/minecraftforge/forge -# NeoForge https://projects.neoforged.net/neoforged/neoforge -# Quilt https://quiltmc.org/en/usage/latest-versions -quilt_loader_version=0.30.0-beta.0 +stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge +# LTS versions or Latest version +# Must support Mojmaps or be unobfuscated to Qualify +stonecutter_enabled_common_split_versions=1.20.1, 1.21.1 +stonecutter_enabled_common_unsplit_versions=1.16.5, 1.18.2, 1.19.2 +stonecutter_enabled_fabricmc_split_versions=1.20.1, 1.21.1 +stonecutter_enabled_fabricmc_unsplit_versions=1.16.5, 1.18.2, 1.19.2 +stonecutter_enabled_minecraftforge_normal_versions=1.21.1 +stonecutter_enabled_minecraftforge_renamer_versions=1.16.5, 1.18.2, 1.19.2, 1.20.1 +stonecutter_enabled_neoforge_versions=1.21.1 +# Fabric https://fabricmc.net/develop/ +fabric_loader_version=0.19.1 +fabric_mixin_version=0.17.1+mixin.0.8.7 +mixinextras_version=0.5.3 +# Forge https://files.minecraftforge.net/net/minecraftforge/forge/ +# NeoForge https://projects.neoforged.net/neoforged/neoforge/ java.version=21 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3b7fa92..c82ad3f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-all.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/minecraftforge/legacy.gradle.kts b/minecraftforge/legacy.gradle.kts deleted file mode 100644 index 93e8142..0000000 --- a/minecraftforge/legacy.gradle.kts +++ /dev/null @@ -1,80 +0,0 @@ -import org.slf4j.event.Level - -plugins { - `multiloader-loader` - id("net.neoforged.moddev.legacyforge") -} - -legacyForge { - version = "${commonMod.minecraft_version}-${commonMod.prop("minecraftforge_version")}" -} - -dependencies { - -} - -legacyForge { - val at = project.file("build/resources/main/META-INF/accesstransformer.cfg"); - - accessTransformers.from(at.absolutePath) - validateAccessTransformers = true - - runs { - register("client") { - client() - ideName = "MinecraftForge Client (${project.path})" - logLevel = Level.TRACE - } - register("gameTestServer") { - type = "gameTestServer" - ideName = "MinecraftForge GameTestServer (${project.path})" - logLevel = Level.TRACE - } - register("data") { - data() - ideName = "MinecraftForge Data (${project.path})" - logLevel = Level.TRACE - } - register("server") { - server() - ideName = "MinecraftForge Server (${project.path})" - logLevel = Level.TRACE - } - } - - parchment { - commonMod.propOrNull("parchment_mappings")?.let { - mappingsVersion = it - minecraftVersion = if (it != "") commonMod.minecraft_version else "" - } - } - - mods { - register(commonMod.id) { - sourceSet(sourceSets.main.get()) - } - } -} - -sourceSets.main { - resources.srcDir("src/generated/resources") -} - -tasks { - processResources { - exclude("${mod.id}.accesswidener") - - val atFile = - project(":common").file("src/main/resources/accesstransformers/accesstransformer-${commonMod.minecraft_version}.cfg") - - from(atFile.parentFile) { - include(atFile.name) - rename(atFile.name, "META-INF/accesstransformer.cfg") - into("") - } - } -} - -tasks.named("createMinecraftArtifacts") { - dependsOn(":minecraftforge:${commonMod.propOrNull("minecraft_version")}:processResources") -} \ No newline at end of file diff --git a/minecraftforge/build.gradle.kts b/minecraftforge/normal.gradle.kts similarity index 73% rename from minecraftforge/build.gradle.kts rename to minecraftforge/normal.gradle.kts index e3ed47a..408bfab 100644 --- a/minecraftforge/build.gradle.kts +++ b/minecraftforge/normal.gradle.kts @@ -1,12 +1,10 @@ plugins { - `multiloader-loader` + multiloader id("net.minecraftforge.gradle") id("net.minecraftforge.jarjar") - // id("net.minecraftforge.accesstransformers") + id("net.fabricmc.fabric-loom-companion") } -minecraft.mavenizer(repositories) - println( "Java: ${providers.systemProperty("java.version").get()}, " + "JVM: ${providers.systemProperty("java.vm.version").get()} (${ @@ -15,13 +13,19 @@ println( "Arch: ${providers.systemProperty("os.arch").get()}" ) +val commonJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonResources: Configuration by configurations.creating { + isCanBeResolved = true +} + minecraft { - /*mappings( + mappings( if (commonMod.propOrNull("parchment_mappings") != null) "parchment" else "official", if (commonMod.propOrNull("parchment_mappings") != null) "${commonMod.minecraft_version}-${commonMod.prop("parchment_mappings")}" else commonMod.minecraft_version - )*/ - mappings("official", commonMod.minecraft_version) + ) //setAccessTransformers(true) @@ -35,6 +39,8 @@ minecraft { systemProperty("eventbus.api.strictRuntimeChecks", "true") + systemProperty("mixin.env.disableRefMap", "true") + //args ("-mixin.config=${commonMod.id}.mixins.json") //classpath(sourceSets.main.get()) @@ -70,8 +76,8 @@ minecraft { } // Include resources generated by data generators. -sourceSets.main { - resources.srcDir(layout.projectDirectory.dir("src/generated/resources")) +sourceSets.named("main") { + resources { srcDir(layout.projectDirectory.dir("src/generated/resources")) } } // This methods registers jarJar for the default jar task. @@ -80,6 +86,26 @@ jarJar.register() { archiveClassifier = null } +minecraft.mavenizer(repositories) +repositories { + maven(fg.forgeMaven) + maven(fg.minecraftLibsMaven) + mavenCentral() + exclusiveContent { + forRepository { + maven("https://repo.spongepowered.org/repository/maven-public") { name = "Sponge" } + } + filter { includeGroupAndSubgroups("org.spongepowered") } + } + exclusiveContent { + forRepositories( + maven("https://maven.parchmentmc.org") { name = "ParchmentMC" } + ) + filter { includeGroup("org.parchmentmc.data") } + } + maven("https://maven.fabricmc.net/") { name = "FabricMC" } +} + dependencies { // Specify the version of Minecraft to use. // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. @@ -87,6 +113,9 @@ dependencies { // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. implementation(minecraft.dependency("net.minecraftforge:forge:${commonMod.minecraft_version}-${commonMod.prop("minecraftforge_version")}")) + { + exclude(group = "org.spongepowered", module = "mixin") + } // Forge 1.21.6+ uses EventBus 7, which shifts most of its runtime validation to compile-time via an annotation processor // to improve performance in production environments. This line is required to enable said compile-time validation @@ -94,6 +123,16 @@ dependencies { if (stonecutter.eval(stonecutter.current.version, ">=1.21.6")) annotationProcessor("net.minecraftforge:eventbus-validator:${commonMod.prop("minecraftforge_eventbus_validator_version")}") + compileOnly(project(":common")) + commonJava(project(":common", "commonJava")) + commonResources(project(":common", "commonResources")) + commonJava(project(":common", "commonClientJava")) + commonResources(project(":common", "commonClientResources")) + + "jarJar"("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + annotationProcessor("io.github.llamalad7:mixinextras-common:${commonMod.prop("mixinextras_version")}") + "jarJar"("io.github.llamalad7:mixinextras-forge:${commonMod.prop("mixinextras_version")}") + // Example mod dependency with JEI // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime //compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" @@ -111,13 +150,19 @@ dependencies { // http://www.gradle.org/docs/current/userguide/dependency_management.html } -tasks.withType(JavaCompile::class).configureEach { +tasks.withType().configureEach { options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation } tasks { + compileJava { + dependsOn(commonJava) + source(commonJava) + } + processResources { - exclude("${mod.id}.accesswidener") + dependsOn(commonResources) + from(commonResources) } register("copyAT") { @@ -134,10 +179,4 @@ tasks { tasks.named("stonecutterPrepare") { finalizedBy(tasks.named("copyAT")) -} - -sourceSets.forEach { - val dir = layout.buildDirectory.dir("sourcesSets/$it.name") - it.output.setResourcesDir(dir) - it.java.destinationDirectory = dir } \ No newline at end of file diff --git a/minecraftforge/renamer.gradle.kts b/minecraftforge/renamer.gradle.kts new file mode 100644 index 0000000..24d2606 --- /dev/null +++ b/minecraftforge/renamer.gradle.kts @@ -0,0 +1,201 @@ +plugins { + multiloader + id("net.minecraftforge.gradle") + id("net.minecraftforge.jarjar") + id("net.minecraftforge.renamer") +} + +println( + "Java: ${providers.systemProperty("java.version").get()}, " + + "JVM: ${providers.systemProperty("java.vm.version").get()} (${ + providers.systemProperty("java.vendor").get() + }), " + + "Arch: ${providers.systemProperty("os.arch").get()}" +) + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonResources: Configuration by configurations.creating { + isCanBeResolved = true +} + +minecraft { + mappings( + if (commonMod.propOrNull("parchment_mappings") != null) "parchment" else "official", + if (commonMod.propOrNull("parchment_mappings") != null) + "${commonMod.minecraft_version}-${commonMod.prop("parchment_mappings")}" else commonMod.minecraft_version + ) + + //setAccessTransformers(true) + + runs { + configureEach { + workingDir.convention(layout.projectDirectory.dir("run")) + + //systemProperty ("forge.logging.markers", "REGISTRIES") + + systemProperty("forge.logging.console.level", "debug") + + systemProperty("eventbus.api.strictRuntimeChecks", "true") + + systemProperty("mixin.env.disableRefMap", "true") + + //args ("-mixin.config=${commonMod.id}.mixins.json") + + //classpath(sourceSets.main.get()) + } + + register("client") { + systemProperty("forge.enabledGameTestNamespaces", commonMod.id) + } + + register("server") { + systemProperty("forge.enabledGameTestNamespaces", commonMod.id) + args("--nogui") + } + + register("gameTestServer") { + systemProperty("forge.enabledGameTestNamespaces", commonMod.id) + } + + register("data") { + workingDir = layout.projectDirectory.dir("run-data") + + args( + "--mod", + commonMod.id, + "--all", + "--output", + layout.projectDirectory.dir("src/generated/resources"), + "--existing", + layout.projectDirectory.dir("src/main/resources") + ) + } + } +} + +renamer.enableMixinRefmaps { + mappings { + map.from(minecraft.dependency.toSrgFile) + reverse = true + } +} + +// Include resources generated by data generators. +sourceSets.named("main") { + resources { srcDir(layout.projectDirectory.dir("src/generated/resources")) } +} + +// This methods registers jarJar for the default jar task. +// The closure allows you to configure the task, instead of needing to do this: +jarJar.register() { + archiveClassifier = null +} + +minecraft.mavenizer(repositories) +repositories { + maven(fg.forgeMaven) + maven(fg.minecraftLibsMaven) + exclusiveContent { + forRepository { + maven { + name = "Sponge" + url = uri("https://repo.spongepowered.org/repository/maven-public") + } + } + filter { + includeGroupAndSubgroups("org.spongepowered") + } + } + mavenCentral() + mavenLocal() +} + +dependencies { + // Specify the version of Minecraft to use. + // Any artifact can be supplied so long as it has a "userdev" classifier artifact and is a compatible patcher artifact. + // The "userdev" classifier will be requested and setup by ForgeGradle. + // If the group id is "net.minecraft" and the artifact id is one of ["client", "server", "joined"], + // then special handling is done to allow a setup of a vanilla dependency without the use of an external repository. + implementation(minecraft.dependency("net.minecraftforge:forge:${commonMod.minecraft_version}-${commonMod.prop("minecraftforge_version")}")) + { + exclude(group = "org.spongepowered", module = "mixin") + } + + compileOnly(project(":common")) + commonJava(project(":common", "commonJava")) + commonResources(project(":common", "commonResources")) + commonJava(project(":common", "commonClientJava")) + commonResources(project(":common", "commonClientResources")) + + // Example mod dependency with JEI + // The JEI API is declared for compile time use, while the full JEI artifact is used at runtime + //compileOnly "mezz.jei:jei-${mc_version}-common-api:${jei_version}" + //compileOnly "mezz.jei:jei-${mc_version}-forge-api:${jei_version}" + //runtimeOnly "mezz.jei:jei-${mc_version}-forge:${jei_version}" + + "jarJar"("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + annotationProcessor("io.github.llamalad7:mixinextras-common:${commonMod.prop("mixinextras_version")}") + "jarJar"(renamer.dependency("io.github.llamalad7:mixinextras-forge:${commonMod.prop("mixinextras_version")}") { + map.from(minecraft.dependency.toSrgFile) + reverse = true + naiveSrg = true + }) + + // Example mod dependency using a mod jar from ./libs with a flat dir repository + // This maps to ./libs/coolmod-${mc_version}-${coolmod_version}.jar + // The group id is ignored when searching -- in this case, it is "blank" + // NOTE: Support for deobfuscated dependencies has not yet been added in ForgeGradle 7. + //implementation "blank:coolmod-${mc_version}:${coolmod_version}" + + // For more info: + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html +} + +// Creates a task named 'renameJar' +renamer.classes(tasks.named("jar")) { + // You need to point to the mappings you wish to apply, typically this is the Mapped names to SRG for older versions. + // ForgeGradle/Mavenizer generate these files for the dependencies you declare. So you can use the helper. + // Or you can specify the file or dependency if you host them yourself. + map.from(minecraft.dependency.toSrgFile) + // This is publishable task so you can specify things such as the classifier + archiveClassifier = "srg" +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation +} + +tasks { + compileJava { + dependsOn(commonJava) + source(commonJava) + } + + processResources { + duplicatesStrategy = DuplicatesStrategy.WARN + dependsOn(commonResources) + from(commonResources) + } + + named("renameJar") { + mustRunAfter( "jarJar") + } + + register("copyAT") { + val atFile = + project(":common").file("src/main/resources/accesstransformers/accesstransformer-${commonMod.minecraft_version}.cfg") + from(atFile) { + rename("accesstransformer-${commonMod.minecraft_version}.cfg", "accesstransformer.cfg") + } + setDuplicatesStrategy(DuplicatesStrategy.INHERIT) + into("src/main/resources/META-INF") + mustRunAfter(common.project.tasks.getByName("stonecutterMerge")) + } +} + +tasks.named("stonecutterPrepare") { + finalizedBy(tasks.named("copyAT")) +} \ No newline at end of file diff --git a/minecraftforge/versions/1.20.6/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.20.6/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.1/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.1/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.10/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.10/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.11/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.11/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.3/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.3/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.4/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.4/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.5/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.5/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/minecraftforge/versions/1.21.8/src/main/resources/META-INF/accesstransformer.cfg b/minecraftforge/versions/1.21.8/src/main/resources/META-INF/accesstransformer.cfg deleted file mode 100644 index e69de29..0000000 diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index 24f8703..c66df2f 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -1,6 +1,19 @@ plugins { - `multiloader-loader` + multiloader id("net.neoforged.moddev") + id("net.fabricmc.fabric-loom-companion") +} + +val commonJava: Configuration by configurations.creating { + isCanBeResolved = true +} +val commonResources: Configuration by configurations.creating { + isCanBeResolved = true +} + +repositories { + mavenCentral() + maven("https://maven.fabricmc.net/") { name = "FabricMC" } } neoForge { @@ -10,7 +23,14 @@ neoForge { } dependencies { + jarJar("net.fabricmc:sponge-mixin:${commonMod.prop("fabric_mixin_version")}") + jarJar("io.github.llamalad7:mixinextras-neoforge:${commonMod.prop("mixinextras_version")}") + compileOnly(project(":common")) + commonJava(project(":common", "commonJava")) + commonResources(project(":common", "commonResources")) + commonJava(project(":common", "commonClientJava")) + commonResources(project(":common", "commonClientResources")) } neoForge { @@ -64,8 +84,15 @@ sourceSets.main { } tasks { + compileJava { + dependsOn(commonJava) + source(commonJava) + } + processResources { exclude("${mod.id}.accesswidener") + dependsOn(commonResources) + from(commonResources) val atFile = project(":common").file("src/main/resources/accesstransformers/accesstransformer-${commonMod.minecraft_version}.cfg") diff --git a/neoforge/legacy.gradle.kts b/neoforge/legacy.gradle.kts deleted file mode 100644 index 9a75148..0000000 --- a/neoforge/legacy.gradle.kts +++ /dev/null @@ -1,113 +0,0 @@ -plugins { - `multiloader-loader` - id ("net.neoforged.gradle.userdev") version "7.1.4" -} - -repositories { - // Add here additional repositories if required by some of the dependencies below. -} - -println( - "Java: ${providers.systemProperty("java.version").get()}, " + - "JVM: ${providers.systemProperty("java.vm.version").get()} (${ - providers.systemProperty("java.vendor").get() - }), " + - "Arch: ${providers.systemProperty("os.arch").get()}" -) - -//minecraft.accessTransformers.file rootProject.file('src/main/resources/META-INF/accesstransformer.cfg') -//minecraft.accessTransformers.entry public net.minecraft.client.Minecraft textureManager # textureManager - -// Default run configurations. -// These can be tweaked, removed, or duplicated as needed. -runs { - // applies to all the run configs below - configureEach { - // Recommended logging data for a userdev environment - // The markers can be added/remove as needed separated by commas. - // "SCAN": For mods scan. - // "REGISTRIES": For firing of registry events. - // "REGISTRYDUMP": For getting the contents of all registries. - systemProperty("forge.logging.markers", "REGISTRIES") - - // Recommended logging level for the console - // You can set various levels here. - // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels - systemProperty("forge.logging.console.level", "debug") - - modSource(project.sourceSets.main.get()) - } - - register("client") { - // Comma-separated list of namespaces to load gametests from. Empty = all namespaces. - systemProperty("neoforge.enabledGameTestNamespaces", commonMod.id) - } - - register("server") { - systemProperty("neoforge.enabledGameTestNamespaces", commonMod.id) - argument("--nogui") - } - - // This run config launches GameTestServer and runs all registered gametests, then exits. - // By default, the server will crash when no gametests are provided. - // The gametest system is also enabled by default for other run configs under the /test command. - register("gameTestServer") { - systemProperty("neoforge.enabledGameTestNamespaces", commonMod.id) - } - - register("data") { - // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it - // workingDirectory project.file('run-data') - - // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources. - arguments.addAll("--mod", commonMod.id, "--all", "--output", file("src/generated/resources/").getAbsolutePath(), "--existing", file("src/main/resources/").getAbsolutePath()) - } -} - -// Include resources generated by data generators. -sourceSets.main { resources.srcDir("src/generated/resources") } - -// Sets up a dependency configuration called 'localRuntime'. -// This configuration should be used instead of 'runtimeOnly' to declare -// a dependency that will be present for runtime testing but that is -// "optional", meaning it will not be pulled by dependents of this mod. -//configurations { -// runtimeClasspath.extendsFrom(localRuntime) -//} - -dependencies { - implementation("net.neoforged:neoforge:${commonMod.prop("neoforge_version")}") - -} - - -tasks.withType(JavaCompile::class).configureEach { - options.encoding = "UTF-8" // Use the UTF-8 charset for Java compilation -} - -tasks { - processResources { - exclude("${mod.id}.accesswidener") - } - - register("copyAT") { - val atFile = - project(":common").file("src/main/resources/accesstransformers/accesstransformer-${commonMod.minecraft_version}.cfg") - from(atFile) { - rename("accesstransformer-${commonMod.minecraft_version}.cfg", "accesstransformer.cfg") - } - setDuplicatesStrategy(DuplicatesStrategy.INHERIT) - into("src/main/resources/META-INF") - mustRunAfter(common.project.tasks.getByName("stonecutterMerge")) - } -} - -tasks.named("stonecutterPrepare") { - finalizedBy(tasks.named("copyAT")) -} - -sourceSets.forEach { - val dir = layout.buildDirectory.dir("sourcesSets/$it.name") - it.output.setResourcesDir(dir) - it.java.destinationDirectory = dir -} \ No newline at end of file diff --git a/neoforge/src/main/java/com/example/examplemod/platform/NeoForgePlatformHelper.java b/neoforge/src/main/java/com/example/examplemod/platform/NeoForgePlatformHelper.java index 017fd6f..a4490f4 100644 --- a/neoforge/src/main/java/com/example/examplemod/platform/NeoForgePlatformHelper.java +++ b/neoforge/src/main/java/com/example/examplemod/platform/NeoForgePlatformHelper.java @@ -23,9 +23,9 @@ public boolean isModLoaded(String modId) { public boolean isDevelopmentEnvironment() { //? if >=1.21.9 { - return !FMLLoader.getCurrent().isProduction(); - //?} else { - /*return !FMLLoader.isProduction(); - *///?} + /*return !FMLLoader.getCurrent().isProduction(); + *///?} else { + return !FMLLoader.isProduction(); + //?} } } \ No newline at end of file diff --git a/quiltmc/build.gradle.kts b/quiltmc/build.gradle.kts deleted file mode 100644 index de38efb..0000000 --- a/quiltmc/build.gradle.kts +++ /dev/null @@ -1,59 +0,0 @@ -plugins { - `multiloader-loader` - id("org.quiltmc.loom.remap") -} - -dependencies { - minecraft("com.mojang:minecraft:${commonMod.minecraft_version}") - mappings(loom.layered { - officialMojangMappings() - commonMod.propOrNull("parchment")?.let { parchmentVersion -> - if (parchmentVersion != "") parchment("org.parchmentmc.data:parchment-${commonMod.minecraft_version}:$parchmentVersion@zip") - } - }) - - modImplementation("org.quiltmc:quilt-loader:${commonMod.prop("quilt_loader_version")}") - modApi("org.quiltmc:qsl:${commonMod.prop("qsl_version")}") - commonMod.propOrNull("quilted_fabric_api_version")?.let { - modApi("org.quiltmc.quilted-fabric-api:quilted-fabric-api:${it}") - } -} - -loom { - accessWidenerPath = - common.project.file("../../src/main/resources/accesswideners/${commonMod.minecraft_version}-${mod.id}.accesswidener") - - runs { - getByName("client") { - client() - configName = "Quilt Client" - ideConfigGenerated(true) - } - getByName("server") { - server() - configName = "Quilt Server" - ideConfigGenerated(true) - } - } - - mods { - // This should match your mod id. - create(mod.id) { - // Tell Loom about each source set used by your mod here. This ensures that your mod's classes are properly transformed by Loader. - sourceSet("main") - // If you shade (directly include classes, not JiJ) a dependency into your mod, include it here using one of these methods: - // dependency("com.example.shadowedmod:1.2.3") - // configuration("exampleShadedConfigurationName") - } - } -} - -tasks.named("processResources") { - val awFile = project(":common").file("src/main/resources/accesswideners/${commonMod.minecraft_version}-${mod.id}.accesswidener") - - from(awFile.parentFile) { - include(awFile.name) - rename(awFile.name, "${mod.id}.accesswidener") - into("") - } -} \ No newline at end of file diff --git a/quiltmc/gradle.properties b/quiltmc/gradle.properties deleted file mode 100644 index 72c1f58..0000000 --- a/quiltmc/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loader=quiltmc \ No newline at end of file diff --git a/quiltmc/src/main/java/com/example/examplemod/ExampleMod.java b/quiltmc/src/main/java/com/example/examplemod/ExampleMod.java deleted file mode 100644 index 1e60120..0000000 --- a/quiltmc/src/main/java/com/example/examplemod/ExampleMod.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.example.examplemod; - -import org.quiltmc.loader.api.ModContainer; -import org.quiltmc.qsl.base.api.entrypoint.ModInitializer; - -public class ExampleMod implements ModInitializer -{ - - @Override - public void onInitialize(ModContainer mod) { - - // This method is invoked by the Quilt mod loader when it is ready - // to load your mod. You can access Quilt and Common code in this - // project. - - // Use Quilt to bootstrap the Common mod. - Constants.LOG.info("Hello Quilt world!"); - CommonClass.init(); - } -} diff --git a/quiltmc/src/main/java/com/example/examplemod/mixin/MixinTitleScreen.java b/quiltmc/src/main/java/com/example/examplemod/mixin/MixinTitleScreen.java deleted file mode 100644 index 1632580..0000000 --- a/quiltmc/src/main/java/com/example/examplemod/mixin/MixinTitleScreen.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.example.examplemod.mixin; - -import com.example.examplemod.Constants; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.screens.TitleScreen; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; - -@Mixin(TitleScreen.class) -public class MixinTitleScreen -{ - - @Inject(at = @At("HEAD"), method = "init()V") - private void init(CallbackInfo info) { - - Constants.LOG.info("This line is printed by an example mod mixin from Quilt!"); - Constants.LOG.info("MC Version: {}", Minecraft.getInstance().getVersionType()); - } -} \ No newline at end of file diff --git a/quiltmc/src/main/java/com/example/examplemod/platform/QuiltPlatformHelper.java b/quiltmc/src/main/java/com/example/examplemod/platform/QuiltPlatformHelper.java deleted file mode 100644 index 3ea09ad..0000000 --- a/quiltmc/src/main/java/com/example/examplemod/platform/QuiltPlatformHelper.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.example.examplemod.platform; - -import com.example.examplemod.platform.services.IPlatformHelper; -import org.quiltmc.loader.api.QuiltLoader; - -public class QuiltPlatformHelper implements IPlatformHelper -{ - - @Override - public String getPlatformName() { - return "QuiltMC"; - } - - @Override - public boolean isModLoaded(String modId) { - - return QuiltLoader.isModLoaded(modId); - } - - @Override - public boolean isDevelopmentEnvironment() { - - return QuiltLoader.isDevelopmentEnvironment(); - } -} diff --git a/quiltmc/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper b/quiltmc/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper deleted file mode 100644 index 5c34e6c..0000000 --- a/quiltmc/src/main/resources/META-INF/services/com.example.examplemod.platform.services.IPlatformHelper +++ /dev/null @@ -1 +0,0 @@ -com.example.examplemod.platform.QuiltPlatformHelper \ No newline at end of file diff --git a/quiltmc/src/main/resources/examplemod.quiltmc.mixins.json b/quiltmc/src/main/resources/examplemod.quiltmc.mixins.json deleted file mode 100644 index e9cfa6b..0000000 --- a/quiltmc/src/main/resources/examplemod.quiltmc.mixins.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "com.example.examplemod.mixin", - "compatibilityLevel": "JAVA_21", - "mixins": [], - "client": [ - "MixinTitleScreen" - ], - "injectors": { - "defaultRequire": 1 - } -} diff --git a/quiltmc/src/main/resources/quilt.mod.json b/quiltmc/src/main/resources/quilt.mod.json deleted file mode 100644 index 080eb80..0000000 --- a/quiltmc/src/main/resources/quilt.mod.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "schema_version": 1, - "quilt_loader": { - "group": "${group}", - "id": "${mod_id}", - "version": "${version}", - "metadata": { - "name": "${mod_name}", - "description": "${description}", - "contributors": { - "${mod_author}": "Owner" - }, - "contact": { - "homepage": "https://example.com/", - "issues": "https://github.com/QuiltMC/quilt-template-mod/issues", - "sources": "https://github.com/QuiltMC/quilt-template-mod" - }, - "icon": "${mod_id}.png", - "license": "${license}" - }, - "intermediate_mappings": "net.fabricmc:intermediary", - "entrypoints": { - "init": "com.example.examplemod.ExampleMod" - }, - "depends": [ - { - "id": "quilt_loader", - "versions": ">=${quilt_loader_version}" - }, - { - "id": "quilted_fabric_api", - "versions": "*" - }, - { - "id": "minecraft", - "versions": "~${minecraft_version}" - }, - { - "id": "java", - "versions": ">=${java_version}" - } - ] - }, - "mixin": [ - "${mod_id}.mixins.json", - "${mod_id}.quiltmc.mixins.json" - ] -} diff --git a/settings.gradle.kts b/settings.gradle.kts index 44a81f2..a70ab87 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -8,59 +8,57 @@ pluginManagement { maven("https://maven.minecraftforge.net") { name = "MinecraftForge" } maven("https://maven.kikugie.dev/snapshots") maven("https://maven.kikugie.dev/releases") - // Temporary until https://github.com/QuiltMC/quilt-loom/pull/59 is merged - maven("./temp-quilt-loom-1.14") } } plugins { - id("dev.kikugie.stonecutter") version "0.8" + id("dev.kikugie.stonecutter") version "0.9.1-beta.5" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } -val commonVersions = - providers.gradleProperty("stonecutter_enabled_common_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() -val fabricmcVersions = - providers.gradleProperty("stonecutter_enabled_fabricmc_versions").orNull?.split(",")?.map { it.trim() } +val commonSplitVersions = + providers.gradleProperty("stonecutter_enabled_common_split_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() +val commonUnsplitVersions = + providers.gradleProperty("stonecutter_enabled_common_unsplit_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() +val fabricMCSplitVersions = + providers.gradleProperty("stonecutter_enabled_fabricmc_split_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() -val minecraftforgeVersions = - providers.gradleProperty("stonecutter_enabled_minecraftforge_versions").orNull?.split(",")?.map { it.trim() } +val fabricMCUnsplitVersions = + providers.gradleProperty("stonecutter_enabled_fabricmc_unsplit_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() -val legacyMinecraftForgeVersions = - providers.gradleProperty("stonecutter_enabled_legacy_minecraftforge_versions").orNull?.split(",")?.map { it.trim() } +val minecraftForgeNormalVersions = + providers.gradleProperty("stonecutter_enabled_minecraftforge_normal_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() -val neoforgeVersions = - providers.gradleProperty("stonecutter_enabled_neoforge_versions").orNull?.split(",")?.map { it.trim() } +val minecraftForgeRenamerVersions = + providers.gradleProperty("stonecutter_enabled_minecraftforge_renamer_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() -val quiltmcVersions = - providers.gradleProperty("stonecutter_enabled_quiltmc_versions").orNull?.split(",")?.map { it.trim() } +val neoForgeVersions = + providers.gradleProperty("stonecutter_enabled_neoforge_versions").orNull?.split(",")?.map { it.trim() } ?: emptyList() stonecutter { kotlinController = true centralScript = "build.gradle.kts" create(rootProject) { - versions(*commonVersions.toTypedArray()) + versions(*(commonSplitVersions + commonUnsplitVersions).toTypedArray()) branch("common") { - versions(*commonVersions.toTypedArray()) + versions(*commonSplitVersions.toTypedArray()).buildscript("split.gradle.kts") + versions(*commonUnsplitVersions.toTypedArray()).buildscript("unsplit.gradle.kts") } branch("fabricmc") { - versions(*fabricmcVersions.toTypedArray()) + versions(*fabricMCSplitVersions.toTypedArray()).buildscript("split.gradle.kts") + versions(*fabricMCUnsplitVersions.toTypedArray()).buildscript("unsplit.gradle.kts") } branch("minecraftforge") { - versions(*minecraftforgeVersions.toTypedArray()) - versions(*legacyMinecraftForgeVersions.toTypedArray()).buildscript("legacy.gradle.kts") + versions(*minecraftForgeNormalVersions.toTypedArray()).buildscript("normal.gradle.kts") + versions(*minecraftForgeRenamerVersions.toTypedArray()).buildscript("renamer.gradle.kts") } branch("neoforge") { - versions(*neoforgeVersions.toTypedArray()) - } - - branch("quiltmc") { - versions(*quiltmcVersions.toTypedArray()) + versions(*neoForgeVersions.toTypedArray()).buildscript("build.gradle.kts") } } } diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts index 831d6bc..d3d179d 100644 --- a/stonecutter.gradle.kts +++ b/stonecutter.gradle.kts @@ -2,13 +2,14 @@ val IS_CI = System.getenv("CI") == "true" plugins { id("dev.kikugie.stonecutter") - id("net.neoforged.moddev") version "2.0.134" apply false - id("net.neoforged.moddev.legacyforge") version "2.0.134" apply false - id("org.quiltmc.loom.remap") version "1.14-SNAPSHOT" apply false - id("net.minecraftforge.accesstransformers") version "5.0.3" apply false - id("net.minecraftforge.gradle") version "7.0.0-beta.55" apply false + id("net.neoforged.moddev") version "2.0.141" apply false + id("net.fabricmc.fabric-loom-remap") version "1.16-SNAPSHOT" apply false + id("net.fabricmc.fabric-loom") version "1.16-SNAPSHOT" apply false + id("net.fabricmc.fabric-loom-companion") version "1.16-SNAPSHOT" apply false + id("net.minecraftforge.gradle") version "7.0.20" apply false id("net.minecraftforge.jarjar") version "0.2.3" apply false + id("net.minecraftforge.renamer") version "1.0.15" apply false } if (IS_CI) stonecutter active null -else stonecutter active "1.21.11" /* [SC] DO NOT EDIT */ \ No newline at end of file +else stonecutter active "1.16.5" /* [SC] DO NOT EDIT */ \ No newline at end of file diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT-sources.jar b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT-sources.jar deleted file mode 100644 index ebf8e6c..0000000 Binary files a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT-sources.jar and /dev/null differ diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.jar b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.jar deleted file mode 100644 index b214e9f..0000000 Binary files a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.jar and /dev/null differ diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.module b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.module deleted file mode 100644 index 062db8a..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.module +++ /dev/null @@ -1,224 +0,0 @@ -{ - "formatVersion": "1.1", - "component": { - "group": "org.quiltmc", - "module": "loom", - "version": "1.14-SNAPSHOT", - "attributes": { - "org.gradle.status": "integration" - } - }, - "createdBy": { - "gradle": { - "version": "9.2.0" - } - }, - "variants": [ - { - "name": "apiElements", - "attributes": { - "org.gradle.category": "library", - "org.gradle.dependency.bundling": "external", - "org.gradle.jvm.environment": "standard-jvm", - "org.gradle.jvm.version": 21, - "org.gradle.libraryelements": "jar", - "org.gradle.usage": "java-api", - "org.jetbrains.kotlin.platform.type": "jvm" - }, - "files": [ - { - "name": "loom-1.14-SNAPSHOT.jar", - "url": "loom-1.14-SNAPSHOT.jar", - "size": 1384068, - "sha512": "91365800f7f0f0a74bcedb52bc17ca75dcb517b1986e98e7b24cb945cae284ee23435b36e990fe21e2e5ec5d48bac4a6b9abcfa75aed4418882530fcbc81816c", - "sha256": "84bff93c168e22500fbeb69ee6469067e5b2bf06a3f358ffec4c872c0e9297dc", - "sha1": "07380b8fd41755536fd145296a57cbceb19c2132", - "md5": "c1a9ad5ab900f5b2e0972f114a54d6c4" - } - ] - }, - { - "name": "runtimeElements", - "attributes": { - "org.gradle.category": "library", - "org.gradle.dependency.bundling": "external", - "org.gradle.jvm.environment": "standard-jvm", - "org.gradle.jvm.version": 21, - "org.gradle.libraryelements": "jar", - "org.gradle.plugin.api-version": "9.2.0", - "org.gradle.usage": "java-runtime", - "org.jetbrains.kotlin.platform.type": "jvm" - }, - "dependencies": [ - { - "group": "com.google.code.gson", - "module": "gson", - "version": { - "requires": "2.10.1" - } - }, - { - "group": "org.ow2.asm", - "module": "asm", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-analysis", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-commons", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-tree", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-util", - "version": { - "requires": "9.9" - } - }, - { - "group": "net.fabricmc", - "module": "stitch", - "version": { - "requires": "0.6.2" - }, - "excludes": [ - { - "group": "*", - "module": "enigma" - } - ] - }, - { - "group": "net.fabricmc", - "module": "tiny-remapper", - "version": { - "requires": "0.12.0" - } - }, - { - "group": "net.fabricmc", - "module": "class-tweaker", - "version": { - "requires": "0.1.1" - } - }, - { - "group": "net.fabricmc", - "module": "mapping-io", - "version": { - "requires": "0.8.0" - } - }, - { - "group": "net.fabricmc", - "module": "lorenz-tiny", - "version": { - "requires": "4.0.2" - }, - "excludes": [ - { - "group": "*", - "module": "*" - } - ] - }, - { - "group": "net.fabricmc", - "module": "fabric-loom-native", - "version": { - "requires": "0.2.0" - } - }, - { - "group": "net.fabricmc", - "module": "mercury", - "version": { - "requires": "0.4.3" - } - }, - { - "group": "net.fabricmc", - "module": "mercurymixin", - "version": { - "requires": "0.2.2" - } - }, - { - "group": "net.fabricmc.unpick", - "module": "unpick", - "version": { - "requires": "3.0.0-beta.13" - } - }, - { - "group": "net.fabricmc.unpick", - "module": "unpick-format-utils", - "version": { - "requires": "3.0.0-beta.13" - } - }, - { - "group": "org.jetbrains.kotlin", - "module": "kotlin-metadata-jvm", - "version": { - "requires": "2.2.20" - }, - "excludes": [ - { - "group": "*", - "module": "*" - } - ] - } - ], - "files": [ - { - "name": "loom-1.14-SNAPSHOT.jar", - "url": "loom-1.14-SNAPSHOT.jar", - "size": 1384068, - "sha512": "91365800f7f0f0a74bcedb52bc17ca75dcb517b1986e98e7b24cb945cae284ee23435b36e990fe21e2e5ec5d48bac4a6b9abcfa75aed4418882530fcbc81816c", - "sha256": "84bff93c168e22500fbeb69ee6469067e5b2bf06a3f358ffec4c872c0e9297dc", - "sha1": "07380b8fd41755536fd145296a57cbceb19c2132", - "md5": "c1a9ad5ab900f5b2e0972f114a54d6c4" - } - ] - }, - { - "name": "sourcesElements", - "attributes": { - "org.gradle.category": "documentation", - "org.gradle.dependency.bundling": "external", - "org.gradle.docstype": "sources", - "org.gradle.usage": "java-runtime" - }, - "files": [ - { - "name": "loom-1.14-SNAPSHOT-sources.jar", - "url": "loom-1.14-SNAPSHOT-sources.jar", - "size": 832155, - "sha512": "a249db32710cf96e82553bd146443f23c744b8a3fd654e02241c7fa3d253e546d7bbe1194057643694c2ff058b4ae2167a884ccd50d864d3a0b452c4a8117dda", - "sha256": "f3ac3f2ad5f25f701277ef0d1613ace434c226d1b2308f49229e98cff5c1908e", - "sha1": "943354d2bdc99344367e3f2c062d540e6a608a60", - "md5": "25169493aa0948568539d3516c20190a" - } - ] - } - ] -} diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.pom deleted file mode 100644 index 42716c6..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/loom-1.14-SNAPSHOT.pom +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - 4.0.0 - org.quiltmc - loom - 1.14-SNAPSHOT - - - com.google.code.gson - gson - 2.10.1 - runtime - - - org.ow2.asm - asm - 9.9 - runtime - - - org.ow2.asm - asm-analysis - 9.9 - runtime - - - org.ow2.asm - asm-commons - 9.9 - runtime - - - org.ow2.asm - asm-tree - 9.9 - runtime - - - org.ow2.asm - asm-util - 9.9 - runtime - - - net.fabricmc - stitch - 0.6.2 - runtime - - - * - enigma - - - - - net.fabricmc - tiny-remapper - 0.12.0 - runtime - - - net.fabricmc - class-tweaker - 0.1.1 - runtime - - - net.fabricmc - mapping-io - 0.8.0 - runtime - - - net.fabricmc - lorenz-tiny - 4.0.2 - runtime - - - * - * - - - - - net.fabricmc - fabric-loom-native - 0.2.0 - runtime - - - net.fabricmc - mercury - 0.4.3 - runtime - - - net.fabricmc - mercurymixin - 0.2.2 - runtime - - - net.fabricmc.unpick - unpick - 3.0.0-beta.13 - runtime - - - net.fabricmc.unpick - unpick-format-utils - 3.0.0-beta.13 - runtime - - - org.jetbrains.kotlin - kotlin-metadata-jvm - 2.2.20 - runtime - - - * - * - - - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index ecfb14d..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - org.quiltmc - loom - - 20251211033001 - - true - - - - pom - 1.14-SNAPSHOT - 20251211033001 - - - module - 1.14-SNAPSHOT - 20251211033001 - - - sources - jar - 1.14-SNAPSHOT - 20251211033001 - - - jar - 1.14-SNAPSHOT - 20251211033001 - - - - 1.14-SNAPSHOT - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local-sources.jar b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local-sources.jar deleted file mode 100644 index ebf8e6c..0000000 Binary files a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local-sources.jar and /dev/null differ diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.jar b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.jar deleted file mode 100644 index b214e9f..0000000 Binary files a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.jar and /dev/null differ diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.module b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.module deleted file mode 100644 index 62bf4c6..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.module +++ /dev/null @@ -1,224 +0,0 @@ -{ - "formatVersion": "1.1", - "component": { - "group": "org.quiltmc", - "module": "loom", - "version": "1.14.local", - "attributes": { - "org.gradle.status": "release" - } - }, - "createdBy": { - "gradle": { - "version": "9.2.0" - } - }, - "variants": [ - { - "name": "apiElements", - "attributes": { - "org.gradle.category": "library", - "org.gradle.dependency.bundling": "external", - "org.gradle.jvm.environment": "standard-jvm", - "org.gradle.jvm.version": 21, - "org.gradle.libraryelements": "jar", - "org.gradle.usage": "java-api", - "org.jetbrains.kotlin.platform.type": "jvm" - }, - "files": [ - { - "name": "loom-1.14.local.jar", - "url": "loom-1.14.local.jar", - "size": 1384068, - "sha512": "91365800f7f0f0a74bcedb52bc17ca75dcb517b1986e98e7b24cb945cae284ee23435b36e990fe21e2e5ec5d48bac4a6b9abcfa75aed4418882530fcbc81816c", - "sha256": "84bff93c168e22500fbeb69ee6469067e5b2bf06a3f358ffec4c872c0e9297dc", - "sha1": "07380b8fd41755536fd145296a57cbceb19c2132", - "md5": "c1a9ad5ab900f5b2e0972f114a54d6c4" - } - ] - }, - { - "name": "runtimeElements", - "attributes": { - "org.gradle.category": "library", - "org.gradle.dependency.bundling": "external", - "org.gradle.jvm.environment": "standard-jvm", - "org.gradle.jvm.version": 21, - "org.gradle.libraryelements": "jar", - "org.gradle.plugin.api-version": "9.2.0", - "org.gradle.usage": "java-runtime", - "org.jetbrains.kotlin.platform.type": "jvm" - }, - "dependencies": [ - { - "group": "com.google.code.gson", - "module": "gson", - "version": { - "requires": "2.10.1" - } - }, - { - "group": "org.ow2.asm", - "module": "asm", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-analysis", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-commons", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-tree", - "version": { - "requires": "9.9" - } - }, - { - "group": "org.ow2.asm", - "module": "asm-util", - "version": { - "requires": "9.9" - } - }, - { - "group": "net.fabricmc", - "module": "stitch", - "version": { - "requires": "0.6.2" - }, - "excludes": [ - { - "group": "*", - "module": "enigma" - } - ] - }, - { - "group": "net.fabricmc", - "module": "tiny-remapper", - "version": { - "requires": "0.12.0" - } - }, - { - "group": "net.fabricmc", - "module": "class-tweaker", - "version": { - "requires": "0.1.1" - } - }, - { - "group": "net.fabricmc", - "module": "mapping-io", - "version": { - "requires": "0.8.0" - } - }, - { - "group": "net.fabricmc", - "module": "lorenz-tiny", - "version": { - "requires": "4.0.2" - }, - "excludes": [ - { - "group": "*", - "module": "*" - } - ] - }, - { - "group": "net.fabricmc", - "module": "fabric-loom-native", - "version": { - "requires": "0.2.0" - } - }, - { - "group": "net.fabricmc", - "module": "mercury", - "version": { - "requires": "0.4.3" - } - }, - { - "group": "net.fabricmc", - "module": "mercurymixin", - "version": { - "requires": "0.2.2" - } - }, - { - "group": "net.fabricmc.unpick", - "module": "unpick", - "version": { - "requires": "3.0.0-beta.13" - } - }, - { - "group": "net.fabricmc.unpick", - "module": "unpick-format-utils", - "version": { - "requires": "3.0.0-beta.13" - } - }, - { - "group": "org.jetbrains.kotlin", - "module": "kotlin-metadata-jvm", - "version": { - "requires": "2.2.20" - }, - "excludes": [ - { - "group": "*", - "module": "*" - } - ] - } - ], - "files": [ - { - "name": "loom-1.14.local.jar", - "url": "loom-1.14.local.jar", - "size": 1384068, - "sha512": "91365800f7f0f0a74bcedb52bc17ca75dcb517b1986e98e7b24cb945cae284ee23435b36e990fe21e2e5ec5d48bac4a6b9abcfa75aed4418882530fcbc81816c", - "sha256": "84bff93c168e22500fbeb69ee6469067e5b2bf06a3f358ffec4c872c0e9297dc", - "sha1": "07380b8fd41755536fd145296a57cbceb19c2132", - "md5": "c1a9ad5ab900f5b2e0972f114a54d6c4" - } - ] - }, - { - "name": "sourcesElements", - "attributes": { - "org.gradle.category": "documentation", - "org.gradle.dependency.bundling": "external", - "org.gradle.docstype": "sources", - "org.gradle.usage": "java-runtime" - }, - "files": [ - { - "name": "loom-1.14.local-sources.jar", - "url": "loom-1.14.local-sources.jar", - "size": 832155, - "sha512": "a249db32710cf96e82553bd146443f23c744b8a3fd654e02241c7fa3d253e546d7bbe1194057643694c2ff058b4ae2167a884ccd50d864d3a0b452c4a8117dda", - "sha256": "f3ac3f2ad5f25f701277ef0d1613ace434c226d1b2308f49229e98cff5c1908e", - "sha1": "943354d2bdc99344367e3f2c062d540e6a608a60", - "md5": "25169493aa0948568539d3516c20190a" - } - ] - } - ] -} diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.pom deleted file mode 100644 index eb3f1bf..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/1.14.local/loom-1.14.local.pom +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - 4.0.0 - org.quiltmc - loom - 1.14.local - - - com.google.code.gson - gson - 2.10.1 - runtime - - - org.ow2.asm - asm - 9.9 - runtime - - - org.ow2.asm - asm-analysis - 9.9 - runtime - - - org.ow2.asm - asm-commons - 9.9 - runtime - - - org.ow2.asm - asm-tree - 9.9 - runtime - - - org.ow2.asm - asm-util - 9.9 - runtime - - - net.fabricmc - stitch - 0.6.2 - runtime - - - * - enigma - - - - - net.fabricmc - tiny-remapper - 0.12.0 - runtime - - - net.fabricmc - class-tweaker - 0.1.1 - runtime - - - net.fabricmc - mapping-io - 0.8.0 - runtime - - - net.fabricmc - lorenz-tiny - 4.0.2 - runtime - - - * - * - - - - - net.fabricmc - fabric-loom-native - 0.2.0 - runtime - - - net.fabricmc - mercury - 0.4.3 - runtime - - - net.fabricmc - mercurymixin - 0.2.2 - runtime - - - net.fabricmc.unpick - unpick - 3.0.0-beta.13 - runtime - - - net.fabricmc.unpick - unpick-format-utils - 3.0.0-beta.13 - runtime - - - org.jetbrains.kotlin - kotlin-metadata-jvm - 2.2.20 - runtime - - - * - * - - - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index de6ca17..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.quiltmc.loom.companion - org.quiltmc.loom.companion.gradle.plugin - - 20251211033000 - - true - - - - pom - 1.14-SNAPSHOT - 20251211033000 - - - - 1.14-SNAPSHOT - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.companion.gradle.plugin-1.14-SNAPSHOT.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.companion.gradle.plugin-1.14-SNAPSHOT.pom deleted file mode 100644 index 47aa866..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.companion.gradle.plugin-1.14-SNAPSHOT.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.companion - org.quiltmc.loom.companion.gradle.plugin - 1.14-SNAPSHOT - pom - - - org.quiltmc - loom - 1.14-SNAPSHOT - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14.local/org.quiltmc.loom.companion.gradle.plugin-1.14.local.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14.local/org.quiltmc.loom.companion.gradle.plugin-1.14.local.pom deleted file mode 100644 index a0331fe..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/1.14.local/org.quiltmc.loom.companion.gradle.plugin-1.14.local.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.companion - org.quiltmc.loom.companion.gradle.plugin - 1.14.local - pom - - - org.quiltmc - loom - 1.14.local - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/maven-metadata-local.xml deleted file mode 100644 index 1ccd4db..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/companion/org.quiltmc.loom.companion.gradle.plugin/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.quiltmc.loom.companion - org.quiltmc.loom.companion.gradle.plugin - - 1.14.local - 1.14.local - - 1.14-SNAPSHOT - 1.14.local - - 20251211033001 - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/maven-metadata-local.xml deleted file mode 100644 index e775452..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.quiltmc - loom - - 1.14-SNAPSHOT - 1.14.local - - 1.14.local - 1.14-SNAPSHOT - - 20251211033001 - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 1425816..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.quiltmc.loom.no_remap - org.quiltmc.loom.no_remap.gradle.plugin - - 20251211033000 - - true - - - - pom - 1.14-SNAPSHOT - 20251211033000 - - - - 1.14-SNAPSHOT - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.no_remap.gradle.plugin-1.14-SNAPSHOT.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.no_remap.gradle.plugin-1.14-SNAPSHOT.pom deleted file mode 100644 index 064fc06..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.no_remap.gradle.plugin-1.14-SNAPSHOT.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.no_remap - org.quiltmc.loom.no_remap.gradle.plugin - 1.14-SNAPSHOT - pom - - - org.quiltmc - loom - 1.14-SNAPSHOT - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14.local/org.quiltmc.loom.no_remap.gradle.plugin-1.14.local.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14.local/org.quiltmc.loom.no_remap.gradle.plugin-1.14.local.pom deleted file mode 100644 index b2011a0..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/1.14.local/org.quiltmc.loom.no_remap.gradle.plugin-1.14.local.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.no_remap - org.quiltmc.loom.no_remap.gradle.plugin - 1.14.local - pom - - - org.quiltmc - loom - 1.14.local - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/maven-metadata-local.xml deleted file mode 100644 index 3030598..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/no_remap/org.quiltmc.loom.no_remap.gradle.plugin/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.quiltmc.loom.no_remap - org.quiltmc.loom.no_remap.gradle.plugin - - 1.14.local - 1.14.local - - 1.14-SNAPSHOT - 1.14.local - - 20251211033001 - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 6bfe308..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.quiltmc.loom - org.quiltmc.loom.gradle.plugin - - 20251211033000 - - true - - - - pom - 1.14-SNAPSHOT - 20251211033000 - - - - 1.14-SNAPSHOT - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.gradle.plugin-1.14-SNAPSHOT.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.gradle.plugin-1.14-SNAPSHOT.pom deleted file mode 100644 index 2147818..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.gradle.plugin-1.14-SNAPSHOT.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom - org.quiltmc.loom.gradle.plugin - 1.14-SNAPSHOT - pom - - - org.quiltmc - loom - 1.14-SNAPSHOT - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14.local/org.quiltmc.loom.gradle.plugin-1.14.local.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14.local/org.quiltmc.loom.gradle.plugin-1.14.local.pom deleted file mode 100644 index 53fc045..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/1.14.local/org.quiltmc.loom.gradle.plugin-1.14.local.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom - org.quiltmc.loom.gradle.plugin - 1.14.local - pom - - - org.quiltmc - loom - 1.14.local - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/maven-metadata-local.xml deleted file mode 100644 index d5cb39f..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/org.quiltmc.loom.gradle.plugin/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.quiltmc.loom - org.quiltmc.loom.gradle.plugin - - 1.14.local - 1.14.local - - 1.14-SNAPSHOT - 1.14.local - - 20251211033001 - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml deleted file mode 100644 index 030f734..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/maven-metadata-local.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - org.quiltmc.loom.remap - org.quiltmc.loom.remap.gradle.plugin - - 20251211033000 - - true - - - - pom - 1.14-SNAPSHOT - 20251211033000 - - - - 1.14-SNAPSHOT - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.remap.gradle.plugin-1.14-SNAPSHOT.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.remap.gradle.plugin-1.14-SNAPSHOT.pom deleted file mode 100644 index 3582085..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14-SNAPSHOT/org.quiltmc.loom.remap.gradle.plugin-1.14-SNAPSHOT.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.remap - org.quiltmc.loom.remap.gradle.plugin - 1.14-SNAPSHOT - pom - - - org.quiltmc - loom - 1.14-SNAPSHOT - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14.local/org.quiltmc.loom.remap.gradle.plugin-1.14.local.pom b/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14.local/org.quiltmc.loom.remap.gradle.plugin-1.14.local.pom deleted file mode 100644 index f15227a..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/1.14.local/org.quiltmc.loom.remap.gradle.plugin-1.14.local.pom +++ /dev/null @@ -1,15 +0,0 @@ - - - 4.0.0 - org.quiltmc.loom.remap - org.quiltmc.loom.remap.gradle.plugin - 1.14.local - pom - - - org.quiltmc - loom - 1.14.local - - - diff --git a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/maven-metadata-local.xml b/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/maven-metadata-local.xml deleted file mode 100644 index 85daf1c..0000000 --- a/temp-quilt-loom-1.14/org/quiltmc/loom/remap/org.quiltmc.loom.remap.gradle.plugin/maven-metadata-local.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - org.quiltmc.loom.remap - org.quiltmc.loom.remap.gradle.plugin - - 1.14.local - 1.14.local - - 1.14-SNAPSHOT - 1.14.local - - 20251211033001 - - diff --git a/versions/1.16.5/gradle.properties b/versions/1.16.5/gradle.properties new file mode 100644 index 0000000..1ede7fb --- /dev/null +++ b/versions/1.16.5/gradle.properties @@ -0,0 +1,10 @@ +# Minecraft +minecraft_version=1.16.5 +minecraft_version_range=[1.16.4,1.17) +# Mappings +parchment_mappings=2022.03.06 +# Fabric +fabric_api_version=0.42.0+1.16 +# MinecraftForge +minecraftforge_version=36.2.42 +minecraftforge_version_range=[35,37) diff --git a/versions/1.18.2/gradle.properties b/versions/1.18.2/gradle.properties new file mode 100644 index 0000000..378c2d1 --- /dev/null +++ b/versions/1.18.2/gradle.properties @@ -0,0 +1,10 @@ +# Minecraft +minecraft_version=1.18.2 +minecraft_version_range=[1.18.2,1.19) +# Mappings +parchment_mappings=2022.11.06 +# Fabric +fabric_api_version=0.77.0+1.18.2 +# MinecraftForge +minecraftforge_version=40.3.12 +minecraftforge_version_range=[40,41) diff --git a/versions/1.19.2/gradle.properties b/versions/1.19.2/gradle.properties new file mode 100644 index 0000000..d858c4a --- /dev/null +++ b/versions/1.19.2/gradle.properties @@ -0,0 +1,10 @@ +# Minecraft +minecraft_version=1.19.2 +minecraft_version_range=[1.19.1,1.19.2) +# Mappings +parchment_mappings=2022.11.27 +# Fabric +fabric_api_version=0.77.0+1.19.2 +# MinecraftForge +minecraftforge_version=43.5.2 +minecraftforge_version_range=[43,44) diff --git a/versions/1.20.1/gradle.properties b/versions/1.20.1/gradle.properties index 9fe5b01..64a00f2 100644 --- a/versions/1.20.1/gradle.properties +++ b/versions/1.20.1/gradle.properties @@ -1,15 +1,10 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, minecraftforge, quiltmc # Minecraft minecraft_version=1.20.1 minecraft_version_range=[1.20,1.20.2) # Mappings parchment_mappings=2023.09.03 # Fabric -fabric_api_version=0.92.6+1.20.1 +fabric_api_version=0.92.7+1.20.1 # MinecraftForge -minecraftforge_version=47.4.13 +minecraftforge_version=47.4.20 minecraftforge_version_range=[46,48) -# Quilt -qsl_version=6.3.0+1.20.1 -quilted_fabric_api_version=7.7.0+0.92.2-1.20.1 diff --git a/versions/1.20.2/gradle.properties b/versions/1.20.2/gradle.properties deleted file mode 100644 index 3dd1fba..0000000 --- a/versions/1.20.2/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, minecraftforge, quiltmc -# Minecraft -minecraft_version=1.20.2 -minecraft_version_range=[1.20.2,1.20.3) -# Mappings -parchment_mappings=2023.12.10 -# Fabric -fabric_api_version=0.91.6+1.20.2 -# NeoForge -neoforge_version=20.2.93 -neoforge_version_range=[20.2,20.3) -neoforge_loader_version_range=[1,2) -# MinecraftForge -minecraftforge_version=48.1.0 -minecraftforge_version_range=[48,49) -# Quilt -qsl_version=7.0.0-alpha.13+1.20.2 -quilted_fabric_api_version=8.0.0-alpha.6+0.91.6-1.20.2 diff --git a/versions/1.20.4/gradle.properties b/versions/1.20.4/gradle.properties deleted file mode 100644 index d4e7863..0000000 --- a/versions/1.20.4/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge, quiltmc -# Minecraft -minecraft_version=1.20.4 -minecraft_version_range=[1.20.3,1.20.5) -# Mappings -parchment_mappings=2024.04.14 -# Fabric -fabric_api_version=0.97.3+1.20.4 -# NeoForge -neoforge_version=20.4.251 -neoforge_version_range=[20.3,20.4) -neoforge_loader_version_range=[3,4) -# MinecraftForge -minecraftforge_version=49.2.4 -minecraftforge_version_range=[49,50) -# Quilt -qsl_version=8.0.0-alpha.13+1.20.4 -quilted_fabric_api_version=9.0.0-alpha.8+0.97.0-1.20.4 diff --git a/versions/1.20.6/gradle.properties b/versions/1.20.6/gradle.properties deleted file mode 100644 index 6580b10..0000000 --- a/versions/1.20.6/gradle.properties +++ /dev/null @@ -1,19 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge, quiltmc -# Minecraft -minecraft_version=1.20.6 -minecraft_version_range=[1.20.5,1.21) -# Mappings -parchment_mappings=2024.06.16 -# Fabric -fabric_api_version=0.100.8+1.20.6 -# NeoForge -neoforge_version=20.6.139 -neoforge_version_range=[20.6,21.0) -neoforge_loader_version_range=[3,4) -# MinecraftForge -minecraftforge_version=50.2.4 -minecraftforge_version_range=[50,51) -# Quilt -qsl_version=9.0.0-alpha.1+1.20.6 -quilted_fabric_api_version=10.0.0-alpha.3+0.100.4-1.20.6 diff --git a/versions/1.21.1/gradle.properties b/versions/1.21.1/gradle.properties index 819bb11..ac9a78d 100644 --- a/versions/1.21.1/gradle.properties +++ b/versions/1.21.1/gradle.properties @@ -1,18 +1,14 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge # Minecraft minecraft_version=1.21.1 minecraft_version_range=[1.21,1.21.2) # Mappings parchment_mappings=2024.11.17 # Fabric -fabric_api_version=0.116.7+1.21.1 +fabric_api_version=0.116.10+1.21.1 # NeoForge -neoforge_version=21.1.217 +neoforge_version=21.1.225 neoforge_version_range=[21.1,21.2) neoforge_loader_version_range=[4,5) # MinecraftForge -minecraftforge_version=52.1.8 -minecraftforge_version_range=[51,53) -# Quilt -qsl_version=10.0.0-alpha.5+1.21.1 \ No newline at end of file +minecraftforge_version=52.1.14 +minecraftforge_version_range=[51,53) \ No newline at end of file diff --git a/versions/1.21.10/gradle.properties b/versions/1.21.10/gradle.properties deleted file mode 100644 index bd2a0c2..0000000 --- a/versions/1.21.10/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.10 -minecraft_version_range=[1.21.9,1.21.11) -# Mappings -parchment_mappings=2025.10.12 -# Fabric -fabric_api_version=0.138.4+1.21.10 -# NeoForge -neoforge_version=21.10.64 -neoforge_version_range=[21.9,21.11) -neoforge_loader_version_range=[10,11) -# MinecraftForge -minecraftforge_version=60.1.5 -minecraftforge_version_range=[59,61) -minecraftforge_eventbus_validator_version=7.0-beta.12 \ No newline at end of file diff --git a/versions/1.21.11/gradle.properties b/versions/1.21.11/gradle.properties deleted file mode 100644 index 267368c..0000000 --- a/versions/1.21.11/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.11 -minecraft_version_range=[1.21.11,26.1) -# Mappings -# parchment_mappings=2025.10.12 -# Fabric -fabric_api_version=0.140.2+1.21.11 -# NeoForge -neoforge_version=21.11.12-beta -neoforge_version_range=[21.11,22.0) -neoforge_loader_version_range=[10,11) -# MinecraftForge -minecraftforge_version=61.0.3 -minecraftforge_version_range=[61,62) -minecraftforge_eventbus_validator_version=7.0-beta.12 \ No newline at end of file diff --git a/versions/1.21.3/gradle.properties b/versions/1.21.3/gradle.properties deleted file mode 100644 index 9913385..0000000 --- a/versions/1.21.3/gradle.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.3 -minecraft_version_range=[1.21.2,1.21.4) -# Mappings -parchment_mappings=2024.12.07 -# Fabric -fabric_api_version=0.114.1+1.21.3 -# NeoForge -neoforge_version=21.3.95 -neoforge_version_range=[21.2,21.4) -neoforge_loader_version_range=[5,6) -# MinecraftForge -minecraftforge_version=53.1.6 -minecraftforge_version_range=[53,54) diff --git a/versions/1.21.4/gradle.properties b/versions/1.21.4/gradle.properties deleted file mode 100644 index 3623f90..0000000 --- a/versions/1.21.4/gradle.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.4 -minecraft_version_range=[1.21.4,1.21.5) -# Mappings -parchment_mappings=2025.03.23 -# Fabric -fabric_api_version=0.119.4+1.21.4 -# NeoForge -neoforge_version=21.4.156 -neoforge_version_range=[21.4,21.5) -neoforge_loader_version_range=[6,7) -# MinecraftForge -minecraftforge_version=54.1.11 -minecraftforge_version_range=[54,55) diff --git a/versions/1.21.5/gradle.properties b/versions/1.21.5/gradle.properties deleted file mode 100644 index a9cf0bc..0000000 --- a/versions/1.21.5/gradle.properties +++ /dev/null @@ -1,16 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.5 -minecraft_version_range=[1.21.5,1.21.6) -# Mappings -parchment_mappings=2025.06.15 -# Fabric -fabric_api_version=0.128.2+1.21.5 -# NeoForge -neoforge_version=21.5.96 -neoforge_version_range=[21.5,21.6) -neoforge_loader_version_range=[7,8) -# MinecraftForge -minecraftforge_version=55.1.4 -minecraftforge_version_range=[55,56) \ No newline at end of file diff --git a/versions/1.21.8/gradle.properties b/versions/1.21.8/gradle.properties deleted file mode 100644 index 8803d35..0000000 --- a/versions/1.21.8/gradle.properties +++ /dev/null @@ -1,17 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=fabricmc, neoforge, minecraftforge -# Minecraft -minecraft_version=1.21.8 -minecraft_version_range=[1.21.6,1.21.9) -# Mappings -parchment_mappings=2025.09.14 -# Fabric -fabric_api_version=0.136.1+1.21.8 -# NeoForge -neoforge_version=21.8.52 -neoforge_version_range=[21.6,21.9) -neoforge_loader_version_range=[9,10) -# MinecraftForge -minecraftforge_version=58.1.11 -minecraftforge_version_range=[56,59) -minecraftforge_eventbus_validator_version=7.0-beta.10 \ No newline at end of file diff --git a/versions/1.21/gradle.properties b/versions/1.21/gradle.properties deleted file mode 100644 index 454fed6..0000000 --- a/versions/1.21/gradle.properties +++ /dev/null @@ -1,8 +0,0 @@ -# Stonecutter -stonecutter_enabled_platforms=quiltmc -# Minecraft -minecraft_version=1.21 -minecraft_version_range=[1.21,1.21.1) -# Quilt -qsl_version=10.0.0-alpha.1+1.21 -quilted_fabric_api_version=11.0.0-alpha.3+0.102.0-1.21 \ No newline at end of file