Merge branch '1.20.2' into 1.20.4

# Conflicts: # .github/workflows/1.20.4.yml # .github/workflows/release.yml # common/build.gradle.kts # fabric/build.gradle.kts # forge/build.gradle.kts # gradle.properties # neo/build.gradle.kts
rfresh2 · Mar 8, 2024 · ad93d07 · ad93d07
2 parents 808c10d + f9b34cb
commit ad93d07
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 76 deletions.
diff --git a/.github/workflows/1.20.4.yml b/.github/workflows/1.20.4.yml
@@ -7,9 +7,6 @@ on:
       - "1.20.4"
 env:
   MINECRAFT_VERSION: "1.20.4"
-  MINECRAFT_VERSION_SHORT: "1.20.4"
-  FABRIC_API_VERSION: "0.91.2+1.20.4"
-  FABRIC_API_MODRINTH_VERSION_ID: "yGY1P8Yr"
 
 jobs:
   build:

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -26,7 +26,6 @@ on:
 
 env:
   MINECRAFT_VERSION: "1.20.4"
-  MINECRAFT_VERSION_SHORT: "1.20.4"
 
 jobs:
   build:

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -7,10 +7,9 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
 }
 
-val minecraft_version: String by rootProject
-val parchment_version: String by rootProject
-val worldmap_version: String by rootProject
-val minimap_version: String by rootProject
+val minecraft_version: String by gradle.extra
+val mc = libs.minecraft.get()
+val parchment = libs.parchment.get()
 
 architectury {
     minecraft = minecraft_version
@@ -30,10 +29,10 @@ subprojects {
     }
 
     dependencies {
-        "minecraft"("com.mojang:minecraft:${minecraft_version}")
+        "minecraft"(mc)
         "mappings"((project.extensions.getByType(LoomGradleExtensionAPI::class)).layered {
             officialMojangMappings()
-            parchment("org.parchmentmc.data:parchment-${minecraft_version}:${parchment_version}@zip")
+            parchment(parchment)
         })
     }
 
@@ -66,11 +65,11 @@ allprojects {
     apply(plugin = "maven-publish")
 
     configure<BasePluginExtension> {
-        archivesName = rootProject.properties["archives_base_name"].toString()
+        archivesName = gradle.extra.get("archives_base_name").toString()
     }
 
-    version = rootProject.properties["mod_version"].toString()
-    group = rootProject.properties["maven_group"].toString()
+    version = gradle.extra.get("mod_version").toString()
+    group = gradle.extra.get("maven_group").toString()
 
     repositories {
         maven("https://maven.neoforged.net/releases/") {
@@ -108,10 +107,10 @@ allprojects {
 
 tasks {
     register("printWorldMapVersion") {
-        println(worldmap_version)
+        println(gradle.extra.get("worldmap_version"))
     }
     register("printMinimapVersion") {
-        println(minimap_version)
+        println(gradle.extra.get("minimap_version"))
     }
     register("printXaeroPlusVersion") {
         println(version)

diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -6,14 +6,10 @@ loom {
     accessWidenerPath = file("src/main/resources/xaeroplus.accesswidener")
 }
 
-val worldmap_version: String by rootProject
-val minimap_version: String by rootProject
-val loader_version: String by rootProject
-
 dependencies {
-    modImplementation("net.fabricmc:fabric-loader:${loader_version}")
-    modCompileOnly("maven.modrinth:xaeros-world-map:${worldmap_version}_Fabric_1.20.4")
-    modCompileOnly("maven.modrinth:xaeros-minimap:${minimap_version}_Fabric_1.20.4")
+    modImplementation(libs.fabric.loader)
+    modCompileOnly(libs.worldmap.fabric)
+    modCompileOnly(libs.minimap.fabric)
     implementation(libs.caffeine)
     implementation(libs.lambdaEvents)
     modCompileOnly(files("../fabric/libs/baritone-unoptimized-fabric-1.10.4.jar"))

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -27,31 +27,28 @@ afterEvaluate {
 	}
 }
 
-val worldmap_version: String by rootProject
-val minimap_version: String by rootProject
-val minecraft_version: String by rootProject
-val parchment_version: String by rootProject
-val loader_version: String by rootProject
-val fabric_version: String by rootProject
+val worldmap_version: String by gradle.extra
+val minimap_version: String by gradle.extra
+val minecraft_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
 val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
 
 dependencies {
-	modImplementation("net.fabricmc:fabric-loader:${loader_version}")
-	modApi("net.fabricmc.fabric-api:fabric-api:${fabric_version}")
+	modImplementation(libs.fabric.loader)
+	modApi(libs.fabric.api)
 	shadowCommon(libs.sqlite)
-    implementation(libs.sqlite)
-    modImplementation("maven.modrinth:xaeros-world-map:${worldmap_version}_Fabric_1.20.4")
-	modImplementation("maven.modrinth:xaeros-minimap:${minimap_version}_Fabric_1.20.4")
-	modCompileOnly(files("libs/baritone-unoptimized-fabric-1.10.4.jar"))
+	implementation(libs.sqlite)
+	modImplementation(libs.worldmap.fabric)
+	modImplementation(libs.minimap.fabric)
+    modCompileOnly(files("libs/baritone-unoptimized-fabric-1.10.4.jar"))
 	modCompileOnly(libs.waystones.fabric)
 	modCompileOnly(libs.balm.fabric)
 	modCompileOnly(libs.fabric.waystones)
-	modRuntimeOnly("maven.modrinth:immediatelyfast:1.2.10+1.20.4-fabric")
-	modRuntimeOnly("maven.modrinth:modmenu:9.0.0")
-	modRuntimeOnly("maven.modrinth:sodium:mc1.20.4-0.5.8")
-	modRuntimeOnly("maven.modrinth:fpsdisplay:3.1.0+1.20.x")
-	modRuntimeOnly("me.shedaniel.cloth:cloth-config-fabric:13.0.121") {
+	modRuntimeOnly(libs.immediatelyfast)
+	modRuntimeOnly(libs.modmenu)
+	modRuntimeOnly(libs.sodium)
+	modRuntimeOnly(libs.fpsdisplay)
+	modRuntimeOnly(libs.cloth.config.fabric) {
 		exclude(group = "net.fabricmc.fabric-api")
 	}
 	implementation(include(libs.caffeine.get())!!)

diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -29,24 +29,21 @@ loom {
     }
 }
 
-val worldmap_version: String by rootProject
-val minimap_version: String by rootProject
-val minecraft_version: String by rootProject
-val parchment_version: String by rootProject
-val loader_version: String by rootProject
-val forge_version: String by rootProject
+val worldmap_version: String by gradle.extra
+val minimap_version: String by gradle.extra
+val minecraft_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
 val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
 
 sourceSets.main.get().java.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/java")
 sourceSets.main.get().resources.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/resources")
 
 dependencies {
-    forge("net.minecraftforge:forge:${forge_version}")
-    implementation(annotationProcessor("io.github.llamalad7:mixinextras-common:0.3.5")!!)
-    implementation(include("io.github.llamalad7:mixinextras-forge:0.3.5")!!)
-    modImplementation("maven.modrinth:xaeros-world-map:${worldmap_version}_Forge_1.20.4")
-    modImplementation("maven.modrinth:xaeros-minimap:${minimap_version}_Forge_1.20.4")
+    forge(libs.forge)
+    implementation(annotationProcessor(libs.mixinextras.common.get())!!)
+    implementation(include(libs.mixinextras.forge.get())!!)
+    modImplementation(libs.worldmap.forge)
+    modImplementation(libs.minimap.forge)
     modImplementation(files("libs/baritone-unoptimized-forge-1.10.2.jar"))
     modCompileOnly(libs.waystones.forge)
     modCompileOnly(libs.balm.forge)

diff --git a/gradle.properties b/gradle.properties
@@ -1,21 +1,4 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx4G
 org.gradle.parallel=false
-# Fabric Properties
-# check these on https://fabricmc.net/develop
-minecraft_version=1.20.4
-parchment_version=2024.02.25
-loader_version=0.15.2
-# Mod Properties
-mod_version=2.1
-maven_group=xaeroplus
-archives_base_name=XaeroPlus
-# Dependencies
-fabric_version=0.91.2+1.20.4
-forge_version=1.20.4-49.0.3
-neoforge_version=20.4.167
-
-worldmap_version=1.37.8
-minimap_version=23.9.7
-
 enabled_platforms=fabric,forge,neoforge
diff --git a/neo/build.gradle.kts b/neo/build.gradle.kts
@@ -25,22 +25,22 @@ loom {
 // todo: reset when other loaders mods are updated
 val worldmap_version = "1.38.0"
 val minimap_version = "24.0.0"
-//val worldmap_version: String by rootProject
-//val minimap_version: String by rootProject
-val minecraft_version: String by rootProject
-val parchment_version: String by rootProject
-val loader_version: String by rootProject
-val neoforge_version: String by rootProject
+//val worldmap_version: String by gradle.extra
+//val minimap_version: String by gradle.extra
+val minecraft_version: String by gradle.extra
+val parchment_version: String by gradle.extra
+val loader_version: String by gradle.extra
+val neoforge_version: String by gradle.extra
 val destArchiveVersion = "${project.version}+${loom.platform.get().id()}-${minecraft_version}"
 val destArchiveClassifier = "WM${worldmap_version}-MM${minimap_version}"
 
 sourceSets.main.get().java.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/java")
 sourceSets.main.get().resources.srcDir(common.layout.buildDirectory.get().asFile.path + "/remappedSources/forge/resources")
 
 dependencies {
-    neoForge("net.neoforged:neoforge:${neoforge_version}")
-    modImplementation("maven.modrinth:xaeros-world-map:${worldmap_version}_NeoForge_1.20.4")
-    modImplementation("maven.modrinth:xaeros-minimap:${minimap_version}_NeoForge_1.20.4")
+    neoForge(libs.neoforge)
+    modImplementation(libs.worldmap.neo)
+    modImplementation(libs.minimap.neo)
     modImplementation(files("libs/baritone-unoptimized-neoforge-1.10.2.jar"))
     modCompileOnly(libs.waystones.neoforge)
     modCompileOnly(libs.balm.neoforge)

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -7,10 +7,39 @@ pluginManagement {
 		gradlePluginPortal()
 	}
 }
+gradle.extra.apply {
+	set("mod_version", "2.1")
+	set("maven_group", "xaeroplus")
+	set("archives_base_name", "XaeroPlus")
+	set("minecraft_version", "1.20.4")
+	set("parchment_version", "2024.02.25")
+	set("fabric_loader_version", "0.15.2")
+	set("fabric_api_version", "0.91.2+1.20.4")
+	set("forge_loader_version", "49.0.3")
+	set("worldmap_version", "1.37.8")
+	set("minimap_version", "23.9.7")
+	set("neoforge_version", "20.4.167")
+}
 
 dependencyResolutionManagement {
 	versionCatalogs {
 		create("libs") {
+			library("minecraft", "com.mojang:minecraft:${gradle.extra.get("minecraft_version")}")
+			library("fabric-loader", "net.fabricmc:fabric-loader:${gradle.extra.get("fabric_loader_version")}")
+			library("forge", "net.minecraftforge:forge:${gradle.extra.get("minecraft_version")}-${gradle.extra.get("forge_loader_version")}")
+			library("fabric-api", "net.fabricmc.fabric-api:fabric-api:${gradle.extra.get("fabric_api_version")}")
+			library("parchment", "org.parchmentmc.data:parchment-${gradle.extra.get("minecraft_version")}:${gradle.extra.get("parchment_version")}")
+			library("neoforge", "net.neoforged:neoforge:${gradle.extra.get("neoforge_version")}")
+			library("worldmap-fabric", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version")}_Fabric_${gradle.extra.get("minecraft_version")}")
+			library("worldmap-forge", "maven.modrinth:xaeros-world-map:${gradle.extra.get("worldmap_version")}_Forge_${gradle.extra.get("minecraft_version")}")
+			// todo: reset when other loaders mods are updated
+			library("worldmap-neo", "maven.modrinth:xaeros-world-map:${"1.38.0"}_NeoForge_${gradle.extra.get("minecraft_version")}")
+			library("minimap-fabric", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version")}_Fabric_${gradle.extra.get("minecraft_version")}")
+			library("minimap-forge", "maven.modrinth:xaeros-minimap:${gradle.extra.get("minimap_version")}_Forge_${gradle.extra.get("minecraft_version")}")
+			// todo: reset when other loaders mods are updated
+			library("minimap-neo", "maven.modrinth:xaeros-minimap:${"24.0.0"}_NeoForge_${gradle.extra.get("minecraft_version")}")
+			library("mixinextras-common", "io.github.llamalad7:mixinextras-common:0.3.5")
+			library("mixinextras-forge", "io.github.llamalad7:mixinextras-forge:0.3.5")
 			library("caffeine", "com.github.ben-manes.caffeine:caffeine:3.1.8")
 			library("lambdaEvents", "net.lenni0451:LambdaEvents:2.4.1")
 			library("waystones-fabric", "maven.modrinth:waystones:16.0.3+fabric-1.20.4")
@@ -22,6 +51,11 @@ dependencyResolutionManagement {
 			library("fabric-waystones", "maven.modrinth:fwaystones:3.3.2+mc1.20.4")
 			library("worldtools", "maven.modrinth:worldtools:1.2.0+1.20.4")
 			library("sqlite", "org.xerial:sqlite-jdbc:3.45.1.0")
+			library("immediatelyfast", "maven.modrinth:immediatelyfast:1.2.10+1.20.4-fabric")
+			library("modmenu", "maven.modrinth:modmenu:9.0.0")
+			library("sodium", "maven.modrinth:sodium:mc1.20.4-0.5.8")
+			library("fpsdisplay", "maven.modrinth:fpsdisplay:3.1.0+1.20.x")
+			library("cloth-config-fabric", "me.shedaniel.cloth:cloth-config-fabric:13.0.121")
 		}
 	}
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,7 +26,6 @@ on: @@
     env:
       MINECRAFT_VERSION: "1.20.4"
-      MINECRAFT_VERSION_SHORT: "1.20.4"
     jobs:
       build:
@@ Expand Down @@