Merge branch '1.20.1' into 1.19.4

# Conflicts: # fabric/build.gradle.kts # forge/build.gradle.kts # settings.gradle.kts
rfresh2 · Nov 14, 2024 · d2b4b6c · d2b4b6c
2 parents 3c34e60 + 0e09aa5
commit d2b4b6c
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 4 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-api-fabric-1.20.1-elytra-beta-v1.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-api-fabric-1.20.1-elytra-beta-v1.jar"))
+    modImplementation(libs.baritone.fabric)
 	modCompileOnly(libs.waystones.fabric)
 	modCompileOnly(libs.balm.fabric)
 	modCompileOnly(libs.fabric.waystones)

diff --git a/fabric/libs/baritone-api-fabric-1.20.1-elytra-beta-v1.jar b/fabric/libs/baritone-api-fabric-1.20.1-elytra-beta-v1.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)
-    modImplementation(files("libs/baritone-unoptimized-forge-1.10.1.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.1.jar b/forge/libs/baritone-unoptimized-forge-1.10.1.jar
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -40,7 +40,9 @@ dependencyResolutionManagement {
             library("sqlite", "org.rfresh.xerial:sqlite-jdbc:3.46.1.0") // relocated xerial sqlite to avoid conflicts with other mods
 			library("sodium", "maven.modrinth:sodium:mc1.19.4-0.4.10")
             library("modmenu", "maven.modrinth:modmenu:6.3.1")
-            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")}")
         }
 	}
 }