Update to 1.20.5

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.5-SNAPSHOT'
 	id 'maven-publish'
 }
 

gradle.properties

@@ -3,15 +3,15 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use
-	minecraft_version=1.20.2-rc2
-	yarn_mappings=1.20.2-rc2+build.1
-	loader_version=0.14.21
+	minecraft_version=24w13a
+	yarn_mappings=24w13a+build.2
+	loader_version=0.15.7
 
 	#Fabric api
-	fabric_version=0.89.0+1.20.2
+	fabric_version=0.96.12+1.20.5
 
 	# Mod Properties
-	mod_version = 0.3.0+1.20.2
+	mod_version = 0.3.0+1.20.5
 	maven_group = eu.pb4
 	archives_base_name = predicate-api
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

src/main/java/eu/pb4/predicate/api/PredicateContext.java

@@ -10,8 +10,7 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.math.Vec2f;
 import net.minecraft.util.math.Vec3d;
-
-import javax.annotation.Nullable;
+import org.jetbrains.annotations.Nullable;
 
 public record PredicateContext(MinecraftServer server,
                                ServerCommandSource source,

src/main/java/eu/pb4/predicate/api/PredicateRegistry.java

@@ -25,12 +25,8 @@ public static MinecraftPredicate decode(JsonElement object) {
     }
 
     public static <T> MinecraftPredicate decode(DynamicOps<T> ops, T object) {
-        try {
-            var data = CODEC.decode(ops, object);
-            return data.getOrThrow(false, (s) -> {}).getFirst();
-        } catch (Throwable e) {
-            throw new IllegalArgumentException(e);
-        }
+        var data = CODEC.decode(ops, object);
+        return data.getOrThrow(IllegalArgumentException::new).getFirst();
     }
 
     @Nullable

src/main/java/eu/pb4/predicate/api/PredicateResult.java

@@ -1,7 +1,7 @@
 package eu.pb4.predicate.api;
 
+import net.minecraft.text.PlainTextContent;
 import net.minecraft.text.Text;
-import net.minecraft.text.TextContent;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Optional;
@@ -32,7 +32,7 @@ public static PredicateResult<Boolean> ofBoolean(boolean value) {
     }
 
     public static PredicateResult<Text> ofText(Text value) {
-        return new PredicateResult<>(!value.getSiblings().isEmpty() && value.getContent() != TextContent.EMPTY, value);
+        return new PredicateResult<>(!value.getSiblings().isEmpty() && value.getContent() != PlainTextContent.EMPTY, value);
     }
 
     public static <T> PredicateResult<T> ofOptional(Optional<T> optional) {