Skip to content

Commit 2ce5b3e

Browse files
committed
Fix a few more accidental conflicts with dispatch codecs
1 parent 3674476 commit 2ce5b3e

39 files changed

+73
-62
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ private SerializationConstants() {
4343
public static final String TAG = "tag";
4444

4545
//Recipes
46+
public static final String CHEMICAL_TYPE = "chemical_type";
4647
public static final String TYPE = "type";
4748
public static final String ENERGY_MULTIPLIER = "energy_multiplier";
4849
public static final String ENERGY_REQUIRED = "energy_required";

src/api/java/mekanism/api/chemical/Chemical.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public abstract class Chemical<CHEMICAL extends Chemical<CHEMICAL>> implements I
4040
* @see mekanism.api.chemical.merged.BoxedChemical
4141
* @since 10.6.0
4242
*/
43-
public static final Codec<Chemical<?>> BOXED_OPTIONAL_CODEC = ChemicalType.CODEC.dispatch(SerializationConstants.TYPE, ChemicalType::getTypeFor,
43+
public static final Codec<Chemical<?>> BOXED_OPTIONAL_CODEC = ChemicalType.CODEC.dispatch(SerializationConstants.CHEMICAL_TYPE, ChemicalType::getTypeFor,
4444
type -> switch (type) {
4545
case GAS -> MekanismAPI.GAS_REGISTRY.byNameCodec().fieldOf(SerializationConstants.GAS);
4646
case INFUSION -> MekanismAPI.INFUSE_TYPE_REGISTRY.byNameCodec().fieldOf(SerializationConstants.INFUSE_TYPE);

src/api/java/mekanism/api/chemical/ChemicalStack.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ public void encode(RegistryFriendlyByteBuf buffer, STACK stack) {
164164
* @see mekanism.api.chemical.merged.BoxedChemicalStack
165165
* @since 10.6.0
166166
*/
167-
public static final Codec<ChemicalStack<?>> BOXED_CODEC = ChemicalType.CODEC.dispatch(SerializationConstants.TYPE, ChemicalType::getTypeFor, type -> switch (type) {
167+
public static final Codec<ChemicalStack<?>> BOXED_CODEC = ChemicalType.CODEC.dispatch(SerializationConstants.CHEMICAL_TYPE, ChemicalType::getTypeFor, type -> switch (type) {
168168
case GAS -> GasStack.MAP_CODEC;
169169
case INFUSION -> InfusionStack.MAP_CODEC;
170170
case PIGMENT -> PigmentStack.MAP_CODEC;

src/datagen/generated/mekanism/.cache/9fb1092f32d4fcbf9e061ffd718d4ec689c6c95e

Lines changed: 34 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/crystallizing/lithium.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/crystallizing/salt.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/processing/copper/crystal/from_slurry.json

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/processing/copper/slurry/dirty/from_ore.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/processing/copper/slurry/dirty/from_raw_block.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/datagen/generated/mekanism/data/mekanism/recipes/processing/copper/slurry/dirty/from_raw_ore.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)