Clean up predicates a bit

Author: eclipseisoffline

api/src/main/java/org/geysermc/geyser/api/item/custom/v2/predicate/CustomModelDataProperty.java api/src/main/java/org/geysermc/geyser/api/item/custom/v2/predicate/match/CustomModelDataString.java

@@ -23,7 +23,7 @@
  * @link https://github.com/GeyserMC/Geyser
  */
 
-package org.geysermc.geyser.api.item.custom.v2.predicate;
+package org.geysermc.geyser.api.item.custom.v2.predicate.match;
 
-public record CustomModelDataProperty<T>(T data, int index) {
+public record CustomModelDataString(String value, int index) {
 }

api/src/main/java/org/geysermc/geyser/api/item/custom/v2/predicate/match/MatchPredicateProperty.java

@@ -26,15 +26,14 @@
 package org.geysermc.geyser.api.item.custom.v2.predicate.match;
 
 import net.kyori.adventure.key.Key;
-import org.geysermc.geyser.api.item.custom.v2.predicate.CustomModelDataProperty;
 
 // TODO can we do more?
 public class MatchPredicateProperty<T> {
 
     public static final MatchPredicateProperty<ChargeType> CHARGE_TYPE = create();
     public static final MatchPredicateProperty<Key> TRIM_MATERIAL = create();
     public static final MatchPredicateProperty<Key> CONTEXT_DIMENSION = create();
-    public static final MatchPredicateProperty<CustomModelDataProperty<String>> CUSTOM_MODEL_DATA = create();
+    public static final MatchPredicateProperty<CustomModelDataString> CUSTOM_MODEL_DATA = create();
 
     private MatchPredicateProperty() {}
 

core/src/main/java/org/geysermc/geyser/registry/mappings/versions/MappingsReader_v2.java

@@ -36,7 +36,7 @@
 import org.geysermc.geyser.api.item.custom.v2.CustomItemBedrockOptions;
 import org.geysermc.geyser.api.item.custom.v2.CustomItemDefinition;
 import org.geysermc.geyser.api.item.custom.v2.predicate.ConditionPredicate;
-import org.geysermc.geyser.api.item.custom.v2.predicate.CustomModelDataProperty;
+import org.geysermc.geyser.api.item.custom.v2.predicate.match.CustomModelDataString;
 import org.geysermc.geyser.api.item.custom.v2.predicate.RangeDispatchPredicate;
 import org.geysermc.geyser.api.item.custom.v2.predicate.match.ChargeType;
 import org.geysermc.geyser.api.item.custom.v2.predicate.MatchPredicate;
@@ -278,7 +278,7 @@ private void readPredicate(CustomItemDefinition.Builder builder, @NonNull JsonNo
                         if (indexNode != null && indexNode.isIntegralNumber()) {
                             index = indexNode.asInt();
                         }
-                        builder.predicate(new MatchPredicate<>(MatchPredicateProperty.CUSTOM_MODEL_DATA, new CustomModelDataProperty<>(value, index)));
+                        builder.predicate(new MatchPredicate<>(MatchPredicateProperty.CUSTOM_MODEL_DATA, new CustomModelDataString(value, index)));
                     }
                     default -> throw new InvalidCustomMappingsFileException("Unknown property " + property);
                 }