Merge branch '1.21' into 1.21-neoforge2

Trins-mods · Sep 10, 2024 · 9bd95d2 · 9bd95d2
2 parents 37ae3c7 + e39db0c
commit 9bd95d2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,3 +1,8 @@
+------------------------------------------------------
+Version 1.10.0
+------------------------------------------------------
+- Updated to MC 1.21 (thanks peterv5!)
+
 ------------------------------------------------------
 Version 1.9.0
 ------------------------------------------------------

diff --git a/src/main/java/io/github/ladysnake/pal/Pal.java b/src/main/java/io/github/ladysnake/pal/Pal.java
@@ -109,7 +109,7 @@ public static void revokeAbility(PlayerEntity player, PlayerAbility ability, Abi
      * @throws NullPointerException if any of the arguments is null
      */
     public static AbilitySource getAbilitySource(String namespace, String name) {
-        return getAbilitySource(new Identifier(namespace, name));
+        return getAbilitySource(Identifier.of(namespace, name));
     }
 
     /**
@@ -168,7 +168,7 @@ public static AbilitySource getAbilitySource(Identifier abilitySourceId, int pri
      * @see #registerAbility(String, String, BiFunction)
      */
     public static PlayerAbility registerAbility(String namespace, String path, BiFunction<PlayerAbility, PlayerEntity, AbilityTracker> factory) {
-        return registerAbility(new Identifier(namespace, path), factory);
+        return registerAbility(Identifier.of(namespace, path), factory);
     }
 
     /**

diff --git a/src/testmod/java/io/github/ladysnake/paltest/PalTest.java b/src/testmod/java/io/github/ladysnake/paltest/PalTest.java
@@ -36,7 +36,7 @@
 public final class PalTest implements ModInitializer {
 
     public static Identifier id(String path) {
-        return new Identifier("paltest", path);
+        return Identifier.of("paltest", path);
     }
 
     @Override