Revert a couple changes that cause conflicts with naming when used in dispatch codecs

Author: pupnewfster

src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnBiomeModifier.java

@@ -61,7 +61,7 @@ public MapCodec<? extends BiomeModifier> codec() {
 
     public static MapCodec<BabyEntitySpawnBiomeModifier> makeCodec() {
         return RecordCodecBuilder.mapCodec(builder -> builder.group(
-              BabyType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(BabyEntitySpawnBiomeModifier::babyType)
+              BabyType.CODEC.fieldOf(SerializationConstants.BABY_TYPE).forGetter(BabyEntitySpawnBiomeModifier::babyType)
         ).apply(builder, BabyEntitySpawnBiomeModifier::new));
     }
 }

src/additions/java/mekanism/additions/common/world/modifier/BabyEntitySpawnStructureModifier.java

@@ -52,7 +52,7 @@ public MapCodec<? extends StructureModifier> codec() {
 
     public static MapCodec<BabyEntitySpawnStructureModifier> makeCodec() {
         return RecordCodecBuilder.mapCodec(builder -> builder.group(
-              BabyType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(BabyEntitySpawnStructureModifier::babyType)
+              BabyType.CODEC.fieldOf(SerializationConstants.BABY_TYPE).forGetter(BabyEntitySpawnStructureModifier::babyType)
         ).apply(builder, BabyEntitySpawnStructureModifier::new));
     }
 }

src/api/java/mekanism/api/SerializationConstants.java

@@ -110,6 +110,7 @@ private SerializationConstants() {
     public static final String AGE = "age";
     public static final String ASSEMBLIES = "assemblies";
     public static final String AUTO = "auto";
+    public static final String BABY_TYPE = "baby_type";
     public static final String BLADES = "blades";
     public static final String BLOCK = "block";
     public static final String BLOCK_ENTITY_TAG = "block_entity_tag";
@@ -216,6 +217,7 @@ private SerializationConstants() {
     public static final String NAME = "name";
     public static final String NEXT = "next";
     public static final String NUM_POWERING = "num_powering";
+    public static final String ORE_TYPE = "ore_type";
     public static final String ORIGINAL_LOCATION = "original_location";
     public static final String OUTPUT_MODE = "output_mode";
     public static final String OVERFLOW = "overflow";

src/main/java/mekanism/common/attachments/qio/DriveMetadata.java

@@ -16,7 +16,7 @@ public record DriveMetadata(long count, int types) {
 
     public static final Codec<DriveMetadata> CODEC = RecordCodecBuilder.create(instance -> instance.group(
           SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(SerializationConstants.COUNT).forGetter(DriveMetadata::count),
-          ExtraCodecs.NON_NEGATIVE_INT.fieldOf(SerializationConstants.QIO_META_TYPES).forGetter(DriveMetadata::types)
+          ExtraCodecs.NON_NEGATIVE_INT.fieldOf(SerializationConstants.TYPES).forGetter(DriveMetadata::types)
     ).apply(instance, DriveMetadata::new));
     public static final StreamCodec<ByteBuf, DriveMetadata> STREAM_CODEC = StreamCodec.composite(
           ByteBufCodecs.VAR_LONG, DriveMetadata::count,

src/main/java/mekanism/common/world/ConfigurableConstantInt.java

@@ -17,7 +17,7 @@
 public class ConfigurableConstantInt extends IntProvider {
 
     public static final MapCodec<ConfigurableConstantInt> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          OreVeinType.CODEC.optionalFieldOf(SerializationConstants.TYPE).forGetter(config -> Optional.ofNullable(config.oreVeinType))
+          OreVeinType.CODEC.optionalFieldOf(SerializationConstants.ORE_TYPE).forGetter(config -> Optional.ofNullable(config.oreVeinType))
     ).apply(builder, oreType -> {
         if (oreType.isPresent()) {
             OreVeinType type = oreType.get();

src/main/java/mekanism/common/world/DisableableFeaturePlacement.java

@@ -20,7 +20,7 @@
 public class DisableableFeaturePlacement extends PlacementFilter {
 
     public static final MapCodec<DisableableFeaturePlacement> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          OreVeinType.CODEC.optionalFieldOf(SerializationConstants.TYPE).forGetter(config -> Optional.ofNullable(config.oreVeinType)),
+          OreVeinType.CODEC.optionalFieldOf(SerializationConstants.ORE_TYPE).forGetter(config -> Optional.ofNullable(config.oreVeinType)),
           Codec.BOOL.fieldOf(SerializationConstants.RETRO_GEN).forGetter(config -> config.retroGen)
     ).apply(builder, (oreType, retroGen) -> {
         if (oreType.isPresent()) {

src/main/java/mekanism/common/world/ResizableOreFeatureConfig.java

@@ -18,7 +18,7 @@ public record ResizableOreFeatureConfig(List<TargetBlockState> targetStates, Ore
 
     public static final Codec<ResizableOreFeatureConfig> CODEC = RecordCodecBuilder.create(builder -> builder.group(
           Codec.list(OreConfiguration.TargetBlockState.CODEC).fieldOf(SerializationConstants.TARGETS).forGetter(config -> config.targetStates),
-          OreVeinType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(config -> config.oreVeinType)
+          OreVeinType.CODEC.fieldOf(SerializationConstants.ORE_TYPE).forGetter(config -> config.oreVeinType)
     ).apply(builder, (targetStates, oreVeinType) -> {
         OreVeinConfig veinConfig = MekanismConfig.world.getVeinConfig(oreVeinType);
         return new ResizableOreFeatureConfig(targetStates, oreVeinType, veinConfig.maxVeinSize(), veinConfig.discardChanceOnAirExposure());

src/main/java/mekanism/common/world/height/ConfigurableHeightProvider.java

@@ -20,7 +20,7 @@
 public class ConfigurableHeightProvider extends HeightProvider {
 
     public static final MapCodec<ConfigurableHeightProvider> CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
-          OreVeinType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(config -> config.oreVeinType)
+          OreVeinType.CODEC.fieldOf(SerializationConstants.ORE_TYPE).forGetter(config -> config.oreVeinType)
     ).apply(builder, type -> new ConfigurableHeightProvider(type, MekanismConfig.world.getVeinConfig(type))));
 
     private final OreVeinType oreVeinType;