chore: update dependencies, depend on codex

mcbrawls · Jan 12, 2025 · ec37d6a · ec37d6a
1 parent 2d51524
commit ec37d6a
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 34 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.8-SNAPSHOT"
+    id "fabric-loom" version "1.9-SNAPSHOT"
     id "org.jetbrains.kotlin.jvm"
     id "maven-publish"
 }
@@ -13,8 +13,8 @@ base {
 
 repositories {
     maven {
-        name = "Andante"
-        url  = "https://maven.andante.dev/releases/"
+        name = "MC Brawls"
+        url  = "https://maven.mcbrawls.net/releases/"
     }
 }
 
@@ -58,6 +58,8 @@ dependencies {
 
     modImplementation "net.fabricmc:fabric-language-kotlin:$fabric_kotlin_version+kotlin.$kotlin_version"
 
+    include modImplementation ("net.mcbrawls:codex:$codex_version")
+
     testImplementation sourceSets.main.output
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -3,18 +3,22 @@ org.gradle.jvmargs=-Xmx1G
 org.gradle.parallel=true
 
 # minecraft
-minecraft_version=1.21.3
-yarn_build=2
+minecraft_version=1.21.4
+yarn_build=8
 
 # fabric
-loader_version=0.16.9
-fabric_version=0.107.0+1.21.3
+loader_version=0.16.10
+fabric_version=0.114.2+1.21.4
 
 # kotlin
-kotlin_version=2.0.21
-fabric_kotlin_version=1.12.3
+kotlin_version=2.1.0
+fabric_kotlin_version=1.13.0
 
 # mod properties
 mod_version=1.3.0
 maven_group=net.mcbrawls
 mod_id=railroad
+
+# dependencies
+
+codex_version=1.1
diff --git 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-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/src/main/kotlin/net/mcbrawls/railroad/CameraTrack.kt b/src/main/kotlin/net/mcbrawls/railroad/CameraTrack.kt
@@ -2,7 +2,7 @@ package net.mcbrawls.railroad
 
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.mcbrawls.railroad.codec.ExtraCodecs
+import dev.andante.codex.ExtraCodecs
 import kotlin.time.Duration
 
 /**

diff --git a/src/main/kotlin/net/mcbrawls/railroad/Keyframe.kt b/src/main/kotlin/net/mcbrawls/railroad/Keyframe.kt
@@ -2,7 +2,7 @@ package net.mcbrawls.railroad
 
 import com.mojang.serialization.Codec
 import com.mojang.serialization.codecs.RecordCodecBuilder
-import net.mcbrawls.railroad.codec.ExtraCodecs
+import dev.andante.codex.ExtraCodecs
 import org.joml.Vector2f
 import org.joml.Vector3d
 

diff --git a/src/main/kotlin/net/mcbrawls/railroad/codec/ExtraCodecs.kt b/src/main/kotlin/net/mcbrawls/railroad/codec/ExtraCodecs.kt
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -26,8 +26,9 @@
 	},
 	"depends": {
 		"fabricloader": "*",
-		"minecraft": "~1.21.3",
+		"minecraft": "~1.21.4",
 		"fabric-api": "*",
-		"fabric-language-kotlin": "*"
+		"fabric-language-kotlin": "*",
+		"codex": ">=1.1"
 	}
 }