Merge pull request #15 from Peter253545/1.21

feat: mc 1.21
ashhhleyyy · Jul 2, 2024 · d0163ba · d0163ba
2 parents bea9e68 + e949e3d
commit d0163ba
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,10 +9,10 @@ jobs:
         uses: actions/checkout@v2
       - name: Validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: Setup JDK 17
+      - name: Setup JDK 21
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
       - name: Ensure gradlew is executable
         run: chmod +x ./gradlew
       - name: Build with gradle

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,7 +23,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 17
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,10 +1,10 @@
 plugins {
-    id("fabric-loom") version "1.5.+"
+    id("fabric-loom") version "1.7-SNAPSHOT"
     id("com.modrinth.minotaur") version "2.+"
     `maven-publish`
 }
 
-version = "2.1.0+1.20.4"
+version = "2.1.0+1.21"
 group = "dev.ashhhleyyy"
 
 repositories {
@@ -51,15 +51,15 @@ tasks.processResources {
 }
 
 java {
-    sourceCompatibility = JavaVersion.VERSION_17
-    targetCompatibility = JavaVersion.VERSION_17
+    sourceCompatibility = JavaVersion.VERSION_21
+    targetCompatibility = JavaVersion.VERSION_21
 
     withSourcesJar()
 }
 
 tasks.withType<JavaCompile> {
     options.encoding = "UTF-8"
-    options.release.set(17)
+    options.release.set(21)
 }
 
 tasks.jar {

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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/libs.versions.toml b/libs.versions.toml
@@ -1,13 +1,13 @@
 [versions]
-minecraft = "1.20.4"
-yarn = "1.20.4+build.3"
+minecraft = "1.21"
+yarn = "1.21+build.2"
 
-fabric-loader = "0.15.3"
-fabric-api = "0.95.3+1.20.4"
+fabric-loader = "0.15.11"
+fabric-api = "0.100.3+1.21"
 
-placeholder-api = "2.3.0+1.20.3"
+placeholder-api = "2.4.0+1.21"
 
-fabric-permissions = "0.2-SNAPSHOT"
+fabric-permissions = "0.3.1"
 
 [libraries]
 minecraft = { module = "com.mojang:minecraft", version.ref = "minecraft" }

diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/Config.java b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/Config.java
@@ -86,7 +86,7 @@ public static Config load() {
                 String s = Files.readString(path);
                 JsonElement ele = JsonParser.parseString(s);
                 DataResult<Config> result = CODEC.decode(JsonOps.INSTANCE, ele).map(Pair::getFirst);
-                Optional<DataResult.PartialResult<Config>> err = result.error();
+                Optional<DataResult.Error<Config>> err = result.error();
                 err.ifPresent(e -> PlayerPronouns.LOGGER.warn("Failed to load config: {}", e.message()));
                 return result.result().orElseGet(Config::new);
             } catch (IOException e) {

diff --git a/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java b/src/main/java/dev/ashhhleyyy/playerpronouns/impl/PlayerPronouns.java
@@ -138,10 +138,10 @@ public void onInitialize() {
             PronounsCommand.register(dispatcher);
         });
 
-        Placeholders.register(new Identifier(MOD_ID, "pronouns"), (ctx, argument) ->
+        Placeholders.register(Identifier.of(MOD_ID, "pronouns"), (ctx, argument) ->
                 fromContext(ctx, argument, true));
 
-        Placeholders.register(new Identifier(MOD_ID, "raw_pronouns"), (ctx, argument) ->
+        Placeholders.register(Identifier.of(MOD_ID, "raw_pronouns"), (ctx, argument) ->
                 fromContext(ctx, argument, false));
 
         PronounsApi.initReader(this);

diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
@@ -22,7 +22,7 @@
   "depends": {
     "fabricloader": "*",
     "fabric-api": "*",
-    "minecraft": ">=1.20.4",
+    "minecraft": ">=1.21",
     "placeholder-api": "*",
     "fabric-permissions-api-v0": "*"
   }