port to 1.21 (lol, lmao even)

ModFest · Nov 23, 2024 · 75710d2 · 75710d2
1 parent 274c43c
commit 75710d2
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 17 deletions.
diff --git a/build.gradle b/build.gradle
@@ -49,13 +49,13 @@ processResources {
 
 tasks.withType(JavaCompile).configureEach {
 	it.options.encoding = "UTF-8"
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	withSourcesJar()
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

diff --git a/gradle.properties b/gradle.properties
@@ -19,7 +19,7 @@ license=CC0-1.0
 # Mod Version
 baseVersion=1.4.1
 # Branch Metadata
-branch=1.20
+branch=1.21
 tagBranch=1.20
-compatibleVersions=1.20.1
-compatibleLoaders=fabric, quilt, forge
+compatibleVersions=1.21.1
+compatibleLoaders=fabric, quilt, neoforge
diff --git a/libs.versions.toml b/libs.versions.toml
@@ -5,10 +5,10 @@ minotaur = "2.+"
 
 kaleidoConfig = "0.3.1+1.3.2"
 
-mc = "1.20.1"
-fl = "0.15.0"
-yarn = "1.20.1+build.10"
-fapi = "0.83.0+1.20.1"
+mc = "1.21.1"
+fl = "0.15.11"
+yarn = "1.21.1+build.3"
+fapi = "0.104.0+1.21.1"
 
 [plugins]
 loom = { id = "fabric-loom", version.ref = "loom" }

diff --git a/src/main/java/com/unascribed/qdwarp/QDWarp.java b/src/main/java/com/unascribed/qdwarp/QDWarp.java
@@ -65,7 +65,7 @@ public String toString() {
 
 		public static WarpPos fromString(String str) {
 			var iter = COMMA_SPLITTER.split(str).iterator();
-			Identifier id = new Identifier(iter.next());
+			Identifier id = Identifier.tryParse(iter.next());
 			double x = Double.parseDouble(iter.next());
 			double y = Double.parseDouble(iter.next());
 			double z = Double.parseDouble(iter.next());

diff --git a/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml b/src/main/resources/META-INF/mods.toml → ...ain/resources/META-INF/neoforge.mods.toml
@@ -16,29 +16,29 @@ logoFile = "assets/${modId}/icon.png"
 "connector:placeholder" = true
 
 [[dependencies.${ modId }]]
-modId = "connectormod"
-mandatory = true
+modId = "connector"
+type = "required"
 versionRange = "*"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${ modId }]]
-modId = "forge"
-mandatory = true
+modId = "neoforge"
+type = "required"
 versionRange = "*"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${ modId }]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "[${mc},)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${ modId }]]
 modId = "fabric_api"
-mandatory = true
+type = "required"
 versionRange = "[${fapi},)"
 ordering = "NONE"
 side = "BOTH"