Merge branch '1.20.4' into 1.20.6

# Conflicts: # common/build.gradle.kts # fabric/build.gradle.kts # fabric/libs/baritone-unoptimized-fabric-1.10.5.jar # forge/build.gradle.kts # neo/build.gradle.kts # neo/libs/baritone-unoptimized-neoforge-1.10.5.jar # settings.gradle.kts
rfresh2 · Nov 14, 2024 · 7b00d22 · 7b00d22
2 parents 70b59b2 + c059e55
commit 7b00d22
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 5 deletions.
diff --git a/common/build.gradle.kts b/common/build.gradle.kts
@@ -19,7 +19,7 @@ dependencies {
     modCompileOnly(libs.minimap.fabric)
     implementation(libs.caffeine)
     implementation(libs.lambdaEvents)
-    modCompileOnly(files("../fabric/libs/baritone-unoptimized-fabric-1.10.5.jar"))
+    modCompileOnly(libs.baritone.fabric)
     modCompileOnly(libs.waystones.fabric)
     modCompileOnly(libs.balm.fabric)
     modCompileOnly(libs.fabric.waystones)

diff --git a/fabric/build.gradle.kts b/fabric/build.gradle.kts
@@ -45,7 +45,7 @@ dependencies {
 	implementation(libs.sqlite)
 	modImplementation(libs.worldmap.fabric)
 	modImplementation(libs.minimap.fabric)
-    modCompileOnly(files("libs/baritone-unoptimized-fabric-1.10.5.jar"))
+    modImplementation(libs.baritone.fabric)
 	modCompileOnly(libs.waystones.fabric)
 	modCompileOnly(libs.balm.fabric)
 	modCompileOnly(libs.fabric.waystones)

diff --git a/fabric/libs/baritone-unoptimized-fabric-1.10.5.jar b/fabric/libs/baritone-unoptimized-fabric-1.10.5.jar
diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts
@@ -46,7 +46,7 @@ dependencies {
     implementation(include(libs.mixinextras.forge.get())!!)
     modImplementation(libs.worldmap.forge)
     modImplementation(libs.minimap.forge)
-    modCompileOnly(files("libs/baritone-unoptimized-forge-1.10.2.jar"))
+    modImplementation(libs.baritone.forge)
     modCompileOnly(libs.waystones.forge)
     modCompileOnly(libs.balm.forge)
     modCompileOnly(libs.worldtools)

diff --git a/forge/libs/baritone-unoptimized-forge-1.10.2.jar b/forge/libs/baritone-unoptimized-forge-1.10.2.jar
diff --git a/neo/build.gradle.kts b/neo/build.gradle.kts
@@ -40,7 +40,7 @@ dependencies {
     neoForge(libs.neoforge)
     modImplementation(libs.worldmap.neo)
     modImplementation(libs.minimap.neo)
-    modCompileOnly(files("libs/baritone-unoptimized-neoforge-1.10.5.jar"))
+    modImplementation(libs.baritone.neoforge)
     modCompileOnly(libs.waystones.neoforge)
     modCompileOnly(libs.balm.neoforge)
     modCompileOnly(libs.worldtools)

diff --git a/neo/libs/baritone-unoptimized-neoforge-1.10.5.jar b/neo/libs/baritone-unoptimized-neoforge-1.10.5.jar
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -54,7 +54,10 @@ dependencyResolutionManagement {
 			library("cloth-config-fabric", "me.shedaniel.cloth:cloth-config-fabric:14.0.126")
             library("embeddium", "maven.modrinth:embeddium:0.3.19+mc1.20.6")
 			library("embeddium-forge", "maven.modrinth:embeddium:0.3.20+mc1.20.6")
-            library("oldbiomes", "com.github.rfresh2:OldBiomes:1.0")
+            library("oldbiomes", "com.github.rfresh2:OldBiomes:1.0.0")
+            library("baritone-fabric", "com.github.rfresh2:baritone-fabric:${gradle.extra.get("minecraft_version")}")
+            library("baritone-forge", "com.github.rfresh2:baritone-forge:${gradle.extra.get("minecraft_version")}")
+            library("baritone-neoforge", "com.github.rfresh2:baritone-neoforge:${gradle.extra.get("minecraft_version")}")
         }
 	}
 }