diff --git a/.github/README.md b/.github/README.md index 2ed30b2..ceeb119 100644 --- a/.github/README.md +++ b/.github/README.md @@ -1,6 +1,6 @@ # CivVoxelMap -This is a 'fork' of [VoxelMap](https://modrinth.com/mod/voxelmap-updated) for 1.20.6 that's [CivMC](https://civmc.net) +This is a 'fork' of [VoxelMap](https://modrinth.com/mod/voxelmap-updated) for 1.21.1 that's [CivMC](https://civmc.net) legal. ## Changes @@ -34,11 +34,11 @@ legal. ## Requirements - Fabric Loader: `0.16.2` (or newer) -- [Fabric API](https://modrinth.com/mod/fabric-api): `0.100.8+1.20.6` (or newer) +- [Fabric API](https://modrinth.com/mod/fabric-api): `0.102.1+1.21.1` (or newer) ## Recommended -- [ModMenu](https://modrinth.com/mod/modmenu): `v10.0.0` (or newer) +- [ModMenu](https://modrinth.com/mod/modmenu): `v11.0.1` (or newer) ## Having issues? diff --git a/build.gradle.kts b/build.gradle.kts index ff629c0..cc83e8d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ // See Gradle's releases here: https://gradle.org/releases/ plugins { - id("fabric-loom") version "1.6-SNAPSHOT" + id("fabric-loom") version "1.7-SNAPSHOT" } version = "${rootProject.extra["mod_version"]}-${project.extra["minecraft_version"]}" @@ -22,28 +22,28 @@ dependencies { @Suppress("UnstableApiUsage") mappings(layered { officialMojangMappings() - parchment("org.parchmentmc.data:parchment-${project.extra["minecraft_version"]}:${project.extra["parchment_version"]}@zip") + parchment("org.parchmentmc.data:${project.extra["parchment_name"]}:${project.extra["parchment_version"]}@zip") }) } modImplementation("net.fabricmc:fabric-loader:${project.extra["fabric_loader_version"]}") modImplementation("net.fabricmc.fabric-api:fabric-api:${project.extra["fabric_api_version"]}") - // https://modrinth.com/mod/voxelmap-updated/version/1.20.6-1.12.19 - "maven.modrinth:voxelmap-updated:yfOx8RrC".also { + // https://modrinth.com/mod/voxelmap-updated/version/1.21-1.13.1 + "maven.modrinth:voxelmap-updated:QZuVdvFR".also { modImplementation(it) include(it) } - // https://modrinth.com/mod/modmenu/version/10.0.0 - "maven.modrinth:modmenu:HLa8flfl".also { + // https://modrinth.com/mod/modmenu/version/11.0.1 + "maven.modrinth:modmenu:xhN1IvHi".also { modCompileOnly(it) modLocalRuntime(it) } // This is literally only here to make Minecraft SHUT UP about non-signed messages while testing. - // https://modrinth.com/mod/no-chat-reports/version/Fabric-1.20.6-v2.7.1 - modLocalRuntime("maven.modrinth:no-chat-reports:MNkuIjea") + // https://modrinth.com/mod/no-chat-reports/version/Fabric-1.21-v2.8.0 + modLocalRuntime("maven.modrinth:no-chat-reports:riMhCAII") } repositories { diff --git a/gradle.properties b/gradle.properties index 4564339..8c4aacc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,9 +10,10 @@ mod_home_url=https://github.com/Protonull/CivVoxelMap mod_source_url=https://github.com/Protonull/CivVoxelMap mod_issues_url=https://github.com/Protonull/CivVoxelMap/issues -minecraft_version=1.20.6 +minecraft_version=1.21.1 # https://parchmentmc.org/docs/getting-started -parchment_version=2024.06.16 +parchment_name=parchment-1.21 +parchment_version=2024.07.28 # https://fabricmc.net/versions.html fabric_loader_version=0.16.2 -fabric_api_version=0.100.8+1.20.6 +fabric_api_version=0.102.1+1.21.1 diff --git a/src/main/java/uk/protonull/civvoxelmap/features/waypoints/AttemptWaypointParse.java b/src/main/java/uk/protonull/civvoxelmap/features/waypoints/AttemptWaypointParse.java index 0849b81..00a2061 100644 --- a/src/main/java/uk/protonull/civvoxelmap/features/waypoints/AttemptWaypointParse.java +++ b/src/main/java/uk/protonull/civvoxelmap/features/waypoints/AttemptWaypointParse.java @@ -24,7 +24,7 @@ public static boolean isValidResourceLocation( final @NotNull String location ) { try { - new ResourceLocation(location); + ResourceLocation.tryParse(location); return true; } catch (final ResourceLocationException ignore) {