used proper codecs in item attribute modifiers

TheDeathlyCow · Apr 13, 2024 · 1c48cc9 · 1c48cc9
1 parent 20e9594
commit 1c48cc9
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/main/java/com/github/thedeathlycow/thermoo/api/ThermooCodecs.java b/src/main/java/com/github/thedeathlycow/thermoo/api/ThermooCodecs.java
@@ -3,7 +3,6 @@
 import com.mojang.datafixers.util.Either;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
-import net.minecraft.entity.EquipmentSlot;
 import net.minecraft.entity.attribute.EntityAttributeModifier;
 import net.minecraft.util.Uuids;
 import net.minecraft.util.math.MathHelper;
@@ -18,13 +17,9 @@
 @ApiStatus.Experimental
 public class ThermooCodecs {
 
-    public static final Codec<EquipmentSlot> EQUIPMENT_SLOT_CODEC = createEnumCodec(EquipmentSlot.class);
-
-    public static final Codec<EntityAttributeModifier.Operation> ENTITY_ATTRIBUTE_OPERATION_CODEC = createEnumCodec(EntityAttributeModifier.Operation.class);
-
     public static final Codec<EntityAttributeModifier> ATTRIBUTE_MODIFIER_CODEC = RecordCodecBuilder.create(
             instance -> instance.group(
-                    Uuids.CODEC
+                    Uuids.STRING_CODEC
                             .fieldOf("uuid")
                             .orElseGet(() -> MathHelper.randomUuid(Random.createLocal()))
                             .forGetter(EntityAttributeModifier::getId),
@@ -34,7 +29,7 @@ public class ThermooCodecs {
                     Codec.DOUBLE
                             .fieldOf("value")
                             .forGetter(EntityAttributeModifier::getValue),
-                    ENTITY_ATTRIBUTE_OPERATION_CODEC
+                    EntityAttributeModifier.Operation.CODEC
                             .fieldOf("operation")
                             .forGetter(EntityAttributeModifier::getOperation)
             ).apply(instance, EntityAttributeModifier::new)

diff --git a/src/main/java/com/github/thedeathlycow/thermoo/api/attribute/ItemAttributeModifier.java b/src/main/java/com/github/thedeathlycow/thermoo/api/attribute/ItemAttributeModifier.java
@@ -88,7 +88,7 @@ public record ItemAttributeModifier(
                     ItemTypePredicate.CODEC
                             .fieldOf("item")
                             .forGetter(ItemAttributeModifier::itemPredicate),
-                    ThermooCodecs.EQUIPMENT_SLOT_CODEC
+                    EquipmentSlot.CODEC
                             .fieldOf("slot")
                             .forGetter(ItemAttributeModifier::slot)
             ).apply(instance, ItemAttributeModifier::new)

diff --git a/src/testmod/resources/data/thermoo-test/thermoo/item_attribute_modifier/diamond_weapons.json b/src/testmod/resources/data/thermoo-test/thermoo/item_attribute_modifier/diamond_weapons.json
@@ -4,13 +4,13 @@
         "uuid": "413a10a0-bf0b-47db-a9a9-2eb3dda3bbaf",
         "name": "Test",
         "value": 1.0,
-        "operation": "ADDITION"
+        "operation": "addition"
     },
     "item": {
         "items": [
             "minecraft:diamond_axe",
             "minecraft:diamond_sword"
         ]
     },
-    "slot": "MAINHAND"
+    "slot": "mainhand"
 }