Further, reduce duplicate code relating to codecs for the various chemical ingredient types

pupnewfster · pupnewfster · commit 961588664f30 · 2024-05-18T13:54:04.000-05:00
diff --git a/src/api/java/mekanism/api/recipes/ingredients/chemical/CompoundChemicalIngredient.java b/src/api/java/mekanism/api/recipes/ingredients/chemical/CompoundChemicalIngredient.java
@@ -1,10 +1,15 @@
 package mekanism.api.recipes.ingredients.chemical;
 
+import com.mojang.serialization.MapCodec;
 import java.util.List;
+import java.util.function.Function;
 import java.util.stream.Stream;
+import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.Chemical;
+import mekanism.api.recipes.ingredients.creator.IChemicalIngredientCreator;
 import net.neoforged.neoforge.common.crafting.CompoundIngredient;
+import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.Nullable;
 
@@ -19,6 +24,17 @@
 public abstract non-sealed class CompoundChemicalIngredient<CHEMICAL extends Chemical<CHEMICAL>, INGREDIENT extends IChemicalIngredient<CHEMICAL, INGREDIENT>>
       extends ChemicalIngredient<CHEMICAL, INGREDIENT> {
 
+    /**
+     * Helper to create the codec for compound ingredients.
+     */
+    @Internal
+    protected static <INGREDIENT extends IChemicalIngredient<?, INGREDIENT>, COMPOUND extends CompoundChemicalIngredient<?, INGREDIENT>> MapCodec<COMPOUND> codec(
+          IChemicalIngredientCreator<?, INGREDIENT> creator, Function<List<INGREDIENT>, COMPOUND> constructor) {
+        return NeoForgeExtraCodecs.aliasedFieldOf(creator.listCodecMultipleElements(), JsonConstants.CHILDREN, JsonConstants.INGREDIENTS).xmap(
+              constructor, CompoundChemicalIngredient::children
+        );
+    }
+
     private final List<INGREDIENT> children;
 
     /**
diff --git a/src/api/java/mekanism/api/recipes/ingredients/chemical/DifferenceChemicalIngredient.java b/src/api/java/mekanism/api/recipes/ingredients/chemical/DifferenceChemicalIngredient.java
@@ -1,9 +1,14 @@
 package mekanism.api.recipes.ingredients.chemical;
 
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.Objects;
+import java.util.function.BiFunction;
 import java.util.stream.Stream;
+import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.Chemical;
+import mekanism.api.recipes.ingredients.creator.IChemicalIngredientCreator;
 import net.neoforged.neoforge.common.crafting.DifferenceIngredient;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.Nullable;
@@ -19,6 +24,18 @@
 public abstract non-sealed class DifferenceChemicalIngredient<CHEMICAL extends Chemical<CHEMICAL>, INGREDIENT extends IChemicalIngredient<CHEMICAL, INGREDIENT>>
       extends ChemicalIngredient<CHEMICAL, INGREDIENT> {
 
+    /**
+     * Helper to create the codec for difference ingredients.
+     */
+    @Internal
+    protected static <INGREDIENT extends IChemicalIngredient<?, INGREDIENT>, DIFFERENCE extends DifferenceChemicalIngredient<?, INGREDIENT>> MapCodec<DIFFERENCE> codec(
+          IChemicalIngredientCreator<?, INGREDIENT> creator, BiFunction<INGREDIENT, INGREDIENT, DIFFERENCE> constructor) {
+        return RecordCodecBuilder.mapCodec(builder -> builder.group(
+              creator.codecNonEmpty().fieldOf(JsonConstants.BASE).forGetter(DifferenceChemicalIngredient::base),
+              creator.codecNonEmpty().fieldOf(JsonConstants.SUBTRACTED).forGetter(DifferenceChemicalIngredient::subtracted)
+        ).apply(builder, constructor));
+    }
+
     private final INGREDIENT base;
     private final INGREDIENT subtracted;
 
diff --git a/src/api/java/mekanism/api/recipes/ingredients/chemical/IntersectionChemicalIngredient.java b/src/api/java/mekanism/api/recipes/ingredients/chemical/IntersectionChemicalIngredient.java
@@ -1,10 +1,15 @@
 package mekanism.api.recipes.ingredients.chemical;
 
+import com.mojang.serialization.MapCodec;
+import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
 import java.util.Objects;
+import java.util.function.Function;
 import java.util.stream.Stream;
+import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.Chemical;
+import mekanism.api.recipes.ingredients.creator.IChemicalIngredientCreator;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +22,17 @@
 public abstract non-sealed class IntersectionChemicalIngredient<CHEMICAL extends Chemical<CHEMICAL>, INGREDIENT extends IChemicalIngredient<CHEMICAL, INGREDIENT>>
       extends ChemicalIngredient<CHEMICAL, INGREDIENT> {
 
+    /**
+     * Helper to create the codec for intersection ingredients.
+     */
+    @Internal
+    protected static <INGREDIENT extends IChemicalIngredient<?, INGREDIENT>, INTERSECTION extends IntersectionChemicalIngredient<?, INGREDIENT>> MapCodec<INTERSECTION> codec(
+          IChemicalIngredientCreator<?, INGREDIENT> creator, Function<List<INGREDIENT>, INTERSECTION> constructor) {
+        return RecordCodecBuilder.mapCodec(builder -> builder.group(
+              creator.listCodecMultipleElements().fieldOf(JsonConstants.CHILDREN).forGetter(IntersectionChemicalIngredient::children)
+        ).apply(builder, constructor));
+    }
+
     private final List<INGREDIENT> children;
 
     /**
diff --git a/src/api/java/mekanism/api/recipes/ingredients/chemical/TagChemicalIngredient.java b/src/api/java/mekanism/api/recipes/ingredients/chemical/TagChemicalIngredient.java
@@ -1,11 +1,15 @@
 package mekanism.api.recipes.ingredients.chemical;
 
+import com.mojang.serialization.MapCodec;
+import java.util.function.Function;
 import java.util.stream.Stream;
+import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.Chemical;
 import net.minecraft.core.Holder;
 import net.minecraft.core.HolderSet;
 import net.minecraft.core.Registry;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.tags.TagKey;
 import org.jetbrains.annotations.ApiStatus.Internal;
 import org.jetbrains.annotations.Nullable;
@@ -22,6 +26,15 @@
 public abstract non-sealed class TagChemicalIngredient<CHEMICAL extends Chemical<CHEMICAL>, INGREDIENT extends IChemicalIngredient<CHEMICAL, INGREDIENT>>
       extends ChemicalIngredient<CHEMICAL, INGREDIENT> {
 
+    /**
+     * Helper to create the codec for tag ingredients.
+     */
+    @Internal
+    protected static <CHEMICAL extends Chemical<CHEMICAL>, TAG extends TagChemicalIngredient<CHEMICAL, ?>> MapCodec<TAG> codec(
+          ResourceKey<? extends Registry<CHEMICAL>> registryName, Function<TagKey<CHEMICAL>, TAG> constructor) {
+        return TagKey.codec(registryName).xmap(constructor, TagChemicalIngredient::tag).fieldOf(JsonConstants.TAG);
+    }
+
     private final TagKey<CHEMICAL> tag;
 
     /**
diff --git a/src/main/java/mekanism/common/recipe/ingredients/gas/CompoundGasIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/gas/CompoundGasIngredient.java
@@ -2,22 +2,17 @@
 
 import com.mojang.serialization.MapCodec;
 import java.util.List;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
 import mekanism.api.recipes.ingredients.chemical.CompoundChemicalIngredient;
 import mekanism.api.recipes.ingredients.chemical.IGasIngredient;
 import mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess;
 import mekanism.common.registries.MekanismGasIngredientTypes;
-import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
 
 @NothingNullByDefault
 public final class CompoundGasIngredient extends CompoundChemicalIngredient<Gas, IGasIngredient> implements IGasIngredient {
 
-    public static final MapCodec<CompoundGasIngredient> CODEC = NeoForgeExtraCodecs.aliasedFieldOf(IngredientCreatorAccess.gas().listCodecMultipleElements(),
-          JsonConstants.CHILDREN, JsonConstants.INGREDIENTS).xmap(
-          CompoundGasIngredient::new, CompoundGasIngredient::children
-    );
+    public static final MapCodec<CompoundGasIngredient> CODEC = codec(IngredientCreatorAccess.gas(), CompoundGasIngredient::new);
 
     CompoundGasIngredient(List<IGasIngredient> children) {
         super(children);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/gas/DifferenceGasIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/gas/DifferenceGasIngredient.java
@@ -1,8 +1,6 @@
 package mekanism.common.recipe.ingredients.gas;
 
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
 import mekanism.api.recipes.ingredients.chemical.DifferenceChemicalIngredient;
@@ -13,10 +11,7 @@
 @NothingNullByDefault
 public final class DifferenceGasIngredient extends DifferenceChemicalIngredient<Gas, IGasIngredient> implements IGasIngredient {
 
-    public static final MapCodec<DifferenceGasIngredient> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          IngredientCreatorAccess.gas().codecNonEmpty().fieldOf(JsonConstants.BASE).forGetter(DifferenceGasIngredient::base),
-          IngredientCreatorAccess.gas().codecNonEmpty().fieldOf(JsonConstants.SUBTRACTED).forGetter(DifferenceGasIngredient::subtracted)
-    ).apply(builder, DifferenceGasIngredient::new));
+    public static final MapCodec<DifferenceGasIngredient> CODEC = codec(IngredientCreatorAccess.gas(), DifferenceGasIngredient::new);
 
     DifferenceGasIngredient(IGasIngredient base, IGasIngredient subtracted) {
         super(base, subtracted);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/gas/EmptyGasIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/gas/EmptyGasIngredient.java
@@ -11,7 +11,6 @@
 public final class EmptyGasIngredient extends EmptyChemicalIngredient<Gas, IGasIngredient> implements IGasIngredient {
 
     public static final EmptyGasIngredient INSTANCE = new EmptyGasIngredient();
-
     public static final MapCodec<EmptyGasIngredient> CODEC = MapCodec.unit(INSTANCE);
 
     private EmptyGasIngredient() {
diff --git a/src/main/java/mekanism/common/recipe/ingredients/gas/IntersectionGasIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/gas/IntersectionGasIngredient.java
@@ -1,9 +1,7 @@
 package mekanism.common.recipe.ingredients.gas;
 
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
 import mekanism.api.recipes.ingredients.chemical.IGasIngredient;
@@ -14,9 +12,7 @@
 @NothingNullByDefault
 public final class IntersectionGasIngredient extends IntersectionChemicalIngredient<Gas, IGasIngredient> implements IGasIngredient {
 
-    public static final MapCodec<IntersectionGasIngredient> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          IngredientCreatorAccess.gas().listCodecMultipleElements().fieldOf(JsonConstants.CHILDREN).forGetter(IntersectionGasIngredient::children)
-    ).apply(builder, IntersectionGasIngredient::new));
+    public static final MapCodec<IntersectionGasIngredient> CODEC = codec(IngredientCreatorAccess.gas(), IntersectionGasIngredient::new);
 
     IntersectionGasIngredient(List<IGasIngredient> children) {
         super(children);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/gas/TagGasIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/gas/TagGasIngredient.java
@@ -1,7 +1,6 @@
 package mekanism.common.recipe.ingredients.gas;
 
 import com.mojang.serialization.MapCodec;
-import mekanism.api.JsonConstants;
 import mekanism.api.MekanismAPI;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.gas.Gas;
@@ -14,8 +13,7 @@
 @NothingNullByDefault
 public final class TagGasIngredient extends TagChemicalIngredient<Gas, IGasIngredient> implements IGasIngredient {
 
-    public static final MapCodec<TagGasIngredient> CODEC = TagKey.codec(MekanismAPI.GAS_REGISTRY_NAME).xmap(TagGasIngredient::new, TagGasIngredient::tag)
-          .fieldOf(JsonConstants.TAG);
+    public static final MapCodec<TagGasIngredient> CODEC = codec(MekanismAPI.GAS_REGISTRY_NAME, TagGasIngredient::new);
 
     TagGasIngredient(TagKey<Gas> tag) {
         super(tag);
@@ -27,7 +25,7 @@ public MapCodec<TagGasIngredient> codec() {
     }
 
     @Override
-    public Registry<Gas> registry() {
+    protected Registry<Gas> registry() {
         return MekanismAPI.GAS_REGISTRY;
     }
 }
diff --git a/src/main/java/mekanism/common/recipe/ingredients/infusion/CompoundInfusionIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/infusion/CompoundInfusionIngredient.java
@@ -2,22 +2,17 @@
 
 import com.mojang.serialization.MapCodec;
 import java.util.List;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.infuse.InfuseType;
 import mekanism.api.recipes.ingredients.chemical.CompoundChemicalIngredient;
 import mekanism.api.recipes.ingredients.chemical.IInfusionIngredient;
 import mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess;
 import mekanism.common.registries.MekanismInfusionIngredientTypes;
-import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
 
 @NothingNullByDefault
 public final class CompoundInfusionIngredient extends CompoundChemicalIngredient<InfuseType, IInfusionIngredient> implements IInfusionIngredient {
 
-    public static final MapCodec<CompoundInfusionIngredient> CODEC = NeoForgeExtraCodecs.aliasedFieldOf(IngredientCreatorAccess.infusion().listCodecMultipleElements(),
-          JsonConstants.CHILDREN, JsonConstants.INGREDIENTS).xmap(
-          CompoundInfusionIngredient::new, CompoundInfusionIngredient::children
-    );
+    public static final MapCodec<CompoundInfusionIngredient> CODEC = codec(IngredientCreatorAccess.infusion(), CompoundInfusionIngredient::new);
 
     CompoundInfusionIngredient(List<IInfusionIngredient> children) {
         super(children);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/infusion/DifferenceInfusionIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/infusion/DifferenceInfusionIngredient.java
@@ -1,8 +1,6 @@
 package mekanism.common.recipe.ingredients.infusion;
 
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.infuse.InfuseType;
 import mekanism.api.recipes.ingredients.chemical.DifferenceChemicalIngredient;
@@ -13,10 +11,7 @@
 @NothingNullByDefault
 public final class DifferenceInfusionIngredient extends DifferenceChemicalIngredient<InfuseType, IInfusionIngredient> implements IInfusionIngredient {
 
-    public static final MapCodec<DifferenceInfusionIngredient> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          IngredientCreatorAccess.infusion().codecNonEmpty().fieldOf(JsonConstants.BASE).forGetter(DifferenceInfusionIngredient::base),
-          IngredientCreatorAccess.infusion().codecNonEmpty().fieldOf(JsonConstants.SUBTRACTED).forGetter(DifferenceInfusionIngredient::subtracted)
-    ).apply(builder, DifferenceInfusionIngredient::new));
+    public static final MapCodec<DifferenceInfusionIngredient> CODEC = codec(IngredientCreatorAccess.infusion(), DifferenceInfusionIngredient::new);
 
     DifferenceInfusionIngredient(IInfusionIngredient base, IInfusionIngredient subtracted) {
         super(base, subtracted);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/infusion/EmptyInfusionIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/infusion/EmptyInfusionIngredient.java
@@ -11,7 +11,6 @@
 public final class EmptyInfusionIngredient extends EmptyChemicalIngredient<InfuseType, IInfusionIngredient> implements IInfusionIngredient {
 
     public static final EmptyInfusionIngredient INSTANCE = new EmptyInfusionIngredient();
-
     public static final MapCodec<EmptyInfusionIngredient> CODEC = MapCodec.unit(INSTANCE);
 
     private EmptyInfusionIngredient() {
diff --git a/src/main/java/mekanism/common/recipe/ingredients/infusion/IntersectionInfusionIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/infusion/IntersectionInfusionIngredient.java
@@ -1,9 +1,7 @@
 package mekanism.common.recipe.ingredients.infusion;
 
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
 import java.util.List;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.infuse.InfuseType;
 import mekanism.api.recipes.ingredients.chemical.IInfusionIngredient;
@@ -14,9 +12,7 @@
 @NothingNullByDefault
 public final class IntersectionInfusionIngredient extends IntersectionChemicalIngredient<InfuseType, IInfusionIngredient> implements IInfusionIngredient {
 
-    public static final MapCodec<IntersectionInfusionIngredient> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          IngredientCreatorAccess.infusion().listCodecMultipleElements().fieldOf(JsonConstants.CHILDREN).forGetter(IntersectionInfusionIngredient::children)
-    ).apply(builder, IntersectionInfusionIngredient::new));
+    public static final MapCodec<IntersectionInfusionIngredient> CODEC = codec(IngredientCreatorAccess.infusion(), IntersectionInfusionIngredient::new);
 
     IntersectionInfusionIngredient(List<IInfusionIngredient> children) {
         super(children);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/infusion/TagInfusionIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/infusion/TagInfusionIngredient.java
@@ -1,7 +1,6 @@
 package mekanism.common.recipe.ingredients.infusion;
 
 import com.mojang.serialization.MapCodec;
-import mekanism.api.JsonConstants;
 import mekanism.api.MekanismAPI;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.infuse.InfuseType;
@@ -14,8 +13,7 @@
 @NothingNullByDefault
 public final class TagInfusionIngredient extends TagChemicalIngredient<InfuseType, IInfusionIngredient> implements IInfusionIngredient {
 
-    public static final MapCodec<TagInfusionIngredient> CODEC = TagKey.codec(MekanismAPI.INFUSE_TYPE_REGISTRY_NAME).xmap(TagInfusionIngredient::new, TagInfusionIngredient::tag)
-          .fieldOf(JsonConstants.TAG);
+    public static final MapCodec<TagInfusionIngredient> CODEC = codec(MekanismAPI.INFUSE_TYPE_REGISTRY_NAME, TagInfusionIngredient::new);
 
     TagInfusionIngredient(TagKey<InfuseType> tag) {
         super(tag);
@@ -27,7 +25,7 @@ public MapCodec<TagInfusionIngredient> codec() {
     }
 
     @Override
-    public Registry<InfuseType> registry() {
+    protected Registry<InfuseType> registry() {
         return MekanismAPI.INFUSE_TYPE_REGISTRY;
     }
 }
diff --git a/src/main/java/mekanism/common/recipe/ingredients/pigment/CompoundPigmentIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/pigment/CompoundPigmentIngredient.java
@@ -2,22 +2,17 @@
 
 import com.mojang.serialization.MapCodec;
 import java.util.List;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.pigment.Pigment;
 import mekanism.api.recipes.ingredients.chemical.CompoundChemicalIngredient;
 import mekanism.api.recipes.ingredients.chemical.IPigmentIngredient;
 import mekanism.api.recipes.ingredients.creator.IngredientCreatorAccess;
 import mekanism.common.registries.MekanismPigmentIngredientTypes;
-import net.neoforged.neoforge.common.util.NeoForgeExtraCodecs;
 
 @NothingNullByDefault
 public final class CompoundPigmentIngredient extends CompoundChemicalIngredient<Pigment, IPigmentIngredient> implements IPigmentIngredient {
 
-    public static final MapCodec<CompoundPigmentIngredient> CODEC = NeoForgeExtraCodecs.aliasedFieldOf(IngredientCreatorAccess.pigment().listCodecMultipleElements(),
-          JsonConstants.CHILDREN, JsonConstants.INGREDIENTS).xmap(
-          CompoundPigmentIngredient::new, CompoundPigmentIngredient::children
-    );
+    public static final MapCodec<CompoundPigmentIngredient> CODEC = codec(IngredientCreatorAccess.pigment(), CompoundPigmentIngredient::new);
 
     CompoundPigmentIngredient(List<IPigmentIngredient> children) {
         super(children);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/pigment/DifferencePigmentIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/pigment/DifferencePigmentIngredient.java
@@ -1,8 +1,6 @@
 package mekanism.common.recipe.ingredients.pigment;
 
 import com.mojang.serialization.MapCodec;
-import com.mojang.serialization.codecs.RecordCodecBuilder;
-import mekanism.api.JsonConstants;
 import mekanism.api.annotations.NothingNullByDefault;
 import mekanism.api.chemical.pigment.Pigment;
 import mekanism.api.recipes.ingredients.chemical.DifferenceChemicalIngredient;
@@ -13,10 +11,7 @@
 @NothingNullByDefault
 public final class DifferencePigmentIngredient extends DifferenceChemicalIngredient<Pigment, IPigmentIngredient> implements IPigmentIngredient {
 
-    public static final MapCodec<DifferencePigmentIngredient> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          IngredientCreatorAccess.pigment().codecNonEmpty().fieldOf(JsonConstants.BASE).forGetter(DifferencePigmentIngredient::base),
-          IngredientCreatorAccess.pigment().codecNonEmpty().fieldOf(JsonConstants.SUBTRACTED).forGetter(DifferencePigmentIngredient::subtracted)
-    ).apply(builder, DifferencePigmentIngredient::new));
+    public static final MapCodec<DifferencePigmentIngredient> CODEC = codec(IngredientCreatorAccess.pigment(), DifferencePigmentIngredient::new);
 
     DifferencePigmentIngredient(IPigmentIngredient base, IPigmentIngredient subtracted) {
         super(base, subtracted);
diff --git a/src/main/java/mekanism/common/recipe/ingredients/pigment/EmptyPigmentIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/pigment/EmptyPigmentIngredient.java
@@ -11,7 +11,6 @@
 public final class EmptyPigmentIngredient extends EmptyChemicalIngredient<Pigment, IPigmentIngredient> implements IPigmentIngredient {
 
     public static final EmptyPigmentIngredient INSTANCE = new EmptyPigmentIngredient();
-
     public static final MapCodec<EmptyPigmentIngredient> CODEC = MapCodec.unit(INSTANCE);
 
     private EmptyPigmentIngredient() {
diff --git a/src/main/java/mekanism/common/recipe/ingredients/pigment/IntersectionPigmentIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/pigment/IntersectionPigmentIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/pigment/TagPigmentIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/pigment/TagPigmentIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/slurry/CompoundSlurryIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/slurry/CompoundSlurryIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/slurry/DifferenceSlurryIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/slurry/DifferenceSlurryIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/slurry/EmptySlurryIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/slurry/EmptySlurryIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/slurry/IntersectionSlurryIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/slurry/IntersectionSlurryIngredient.java
diff --git a/src/main/java/mekanism/common/recipe/ingredients/slurry/TagSlurryIngredient.java b/src/main/java/mekanism/common/recipe/ingredients/slurry/TagSlurryIngredient.java
