Simplify ChestMaterial codec

CyclopsMC · Jun 21, 2024 · 599dc34 · 599dc34
1 parent 73fd1bc
commit 599dc34
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 20 deletions.
diff --git a/src/main/java/org/cyclops/colossalchests/block/ChestMaterial.java b/src/main/java/org/cyclops/colossalchests/block/ChestMaterial.java
@@ -4,8 +4,8 @@
 import com.google.common.collect.Maps;
 import com.google.gson.JsonSyntaxException;
 import com.mojang.serialization.Codec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import net.minecraft.core.Vec3i;
+import net.minecraft.util.ExtraCodecs;
 import net.minecraft.world.inventory.MenuType;
 import org.cyclops.colossalchests.GeneralConfig;
 import org.cyclops.colossalchests.Reference;
@@ -29,11 +29,9 @@
  */
 public class ChestMaterial {
 
-    public static final Codec<ChestMaterial> CODEC = RecordCodecBuilder.create(
-            builder -> builder.group(
-                            Codec.STRING.fieldOf("name").forGetter(ChestMaterial::getName)
-                    )
-                    .apply(builder, ChestMaterial::valueOfSafe)
+    public static final Codec<ChestMaterial> CODEC = ExtraCodecs.stringResolverCodec(
+                    ChestMaterial::getName,
+                    ChestMaterial::valueOfSafe
     );
 
     public static final List<ChestMaterial> VALUES = Lists.newArrayList();

diff --git a/src/main/resources/data/colossalchests/advancements/base/copper.json b/src/main/resources/data/colossalchests/advancements/base/copper.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "COPPER" }
+        "material": "COPPER"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/diamond.json b/src/main/resources/data/colossalchests/advancements/base/diamond.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "DIAMOND" }
+        "material": "DIAMOND"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/gold.json b/src/main/resources/data/colossalchests/advancements/base/gold.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "GOLD" }
+        "material": "GOLD"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/iron.json b/src/main/resources/data/colossalchests/advancements/base/iron.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "IRON" }
+        "material": "IRON"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/obsidian.json b/src/main/resources/data/colossalchests/advancements/base/obsidian.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "OBSIDIAN" }
+        "material": "OBSIDIAN"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/silver.json b/src/main/resources/data/colossalchests/advancements/base/silver.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "SILVER" }
+        "material": "SILVER"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/base/wood.json b/src/main/resources/data/colossalchests/advancements/base/wood.json
@@ -15,7 +15,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "WOOD" }
+        "material": "WOOD"
       }
     }
   }

diff --git a/src/main/resources/data/colossalchests/advancements/size/copper.json b/src/main/resources/data/colossalchests/advancements/size/copper.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "COPPER" },
+        "material": "COPPER",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/diamond.json b/src/main/resources/data/colossalchests/advancements/size/diamond.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "DIAMOND" },
+        "material": "DIAMOND",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/gold.json b/src/main/resources/data/colossalchests/advancements/size/gold.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "GOLD" },
+        "material": "GOLD",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/iron.json b/src/main/resources/data/colossalchests/advancements/size/iron.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "IRON" },
+        "material": "IRON",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/obsidian.json b/src/main/resources/data/colossalchests/advancements/size/obsidian.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "OBSIDIAN" },
+        "material": "OBSIDIAN",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/silver.json b/src/main/resources/data/colossalchests/advancements/size/silver.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "SILVER" },
+        "material": "SILVER",
         "minimumSize": 10
       }
     }

diff --git a/src/main/resources/data/colossalchests/advancements/size/wood.json b/src/main/resources/data/colossalchests/advancements/size/wood.json
@@ -16,7 +16,7 @@
     "criteria_0": {
       "trigger": "colossalchests:chest_formed",
       "conditions": {
-        "material": { "name": "WOOD" },
+        "material": "WOOD",
         "minimumSize": 10
       }
     }