Skip to content

Commit 46c726d

Browse files
pupnewfsterpupnewfster
committed
Move some things that were using raw strings to using constants declared in SerializationConstants
1 parent ab5dccc commit 46c726d

38 files changed

+268
-216
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package mekanism.additions.common.world.modifier;
22

3-
import com.mojang.serialization.Codec;
43
import com.mojang.serialization.MapCodec;
54
import com.mojang.serialization.codecs.RecordCodecBuilder;
65
import java.util.List;
76
import mekanism.additions.common.config.AdditionsConfig;
87
import mekanism.additions.common.config.MekanismAdditionsConfig;
98
import mekanism.additions.common.entity.baby.BabyType;
109
import mekanism.additions.common.registries.AdditionsBiomeModifierSerializers;
10+
import mekanism.api.SerializationConstants;
1111
import mekanism.common.Mekanism;
1212
import mekanism.common.util.RegistryUtils;
1313
import net.minecraft.core.Holder;
@@ -61,7 +61,7 @@ public MapCodec<? extends BiomeModifier> codec() {
6161

6262
public static MapCodec<BabyEntitySpawnBiomeModifier> makeCodec() {
6363
return RecordCodecBuilder.mapCodec(builder -> builder.group(
64-
BabyType.CODEC.fieldOf("babyType").forGetter(BabyEntitySpawnBiomeModifier::babyType)
64+
BabyType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(BabyEntitySpawnBiomeModifier::babyType)
6565
).apply(builder, BabyEntitySpawnBiomeModifier::new));
6666
}
6767
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package mekanism.additions.common.world.modifier;
22

3-
import com.mojang.serialization.Codec;
43
import com.mojang.serialization.MapCodec;
54
import com.mojang.serialization.codecs.RecordCodecBuilder;
65
import mekanism.additions.common.config.AdditionsConfig;
76
import mekanism.additions.common.config.MekanismAdditionsConfig;
87
import mekanism.additions.common.entity.baby.BabyType;
98
import mekanism.additions.common.registries.AdditionsStructureModifierSerializers;
9+
import mekanism.api.SerializationConstants;
1010
import mekanism.common.Mekanism;
1111
import mekanism.common.util.RegistryUtils;
1212
import net.minecraft.core.Holder;
@@ -52,7 +52,7 @@ public MapCodec<? extends StructureModifier> codec() {
5252

5353
public static MapCodec<BabyEntitySpawnStructureModifier> makeCodec() {
5454
return RecordCodecBuilder.mapCodec(builder -> builder.group(
55-
BabyType.CODEC.fieldOf("babyType").forGetter(BabyEntitySpawnStructureModifier::babyType)
55+
BabyType.CODEC.fieldOf(SerializationConstants.TYPE).forGetter(BabyEntitySpawnStructureModifier::babyType)
5656
).apply(builder, BabyEntitySpawnStructureModifier::new));
5757
}
5858
}

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

Lines changed: 40 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ private SerializationConstants() {
3232
public static final String BASE = "base";
3333
public static final String CHILDREN = "children";
3434
public static final String FLUID = "fluid";
35+
public static final String INGREDIENT = "ingredient";
3536
public static final String INGREDIENTS = "ingredients";
3637
public static final String ITEM = "item";
3738
public static final String GAS = "gas";
@@ -97,19 +98,23 @@ private SerializationConstants() {
9798
public static final String SCALE_ALT_2 = "scale_2";
9899
public static final String SCALE_ALT_3 = "scale_3";
99100
public static final String SOUND_SCALE = "sound_scale";
100-
public static final String VALUE = "value";
101101
public static final String VALVE = "valve";
102102
public static final String VOLUME = "volume";
103103

104104
//Generic constants
105105
public static final String ACTIVE_COOLED = "active_cooled";
106106
public static final String ACTIVE_NODES = "active_nodes";
107107
public static final String ACTIVE_STATE = "active_state";
108+
public static final String ADVANCEMENT = "advancement";
108109
public static final String ALLOW_DEFAULT = "allow_default";
109110
public static final String AGE = "age";
111+
public static final String ASSEMBLIES = "assemblies";
110112
public static final String AUTO = "auto";
111113
public static final String BLADES = "blades";
114+
public static final String BLOCK = "block";
115+
public static final String BLOCK_ENTITY_TAG = "block_entity_tag";
112116
public static final String BOXED_CHEMICAL = "boxed_chemical";
117+
public static final String BUILT_IN_TABLES = "built_in_tables";
113118
public static final String BURNING = "burning";
114119
public static final String BURN_TIME = "burn_time";
115120
public static final String CACHE = "cache";
@@ -123,17 +128,24 @@ private SerializationConstants() {
123128
public static final String COMPONENT_FREQUENCY = "component_frequency";
124129
public static final String COMPONENT_SECURITY = "component_security";
125130
public static final String COMPONENT_UPGRADE = "component_upgrade";
131+
public static final String COMPONENTS = "components";
132+
public static final String CONDITION = "condition";
126133
public static final String CONFIG = "config";
127134
public static final String CONNECTION = "connection";
128135
public static final String CONTAINER = "container";
129136
public static final String CONTROL_TYPE = "control_type";
130137
public static final String COULD_OPERATE = "could_operate";
131138
public static final String CURRENT_REDSTONE = "current_redstone";
139+
public static final String CUSTOM_MODEL = "custom_model";
132140
public static final String DATA = "data";
133141
public static final String DATA_NAME = "data_name";
134142
public static final String DATA_TYPE = "data_type";
135143
public static final String DELAY = "delay";
144+
public static final String DESCRIPTION = "description";
145+
public static final String DIMENSION = "dimension";
146+
public static final String DIRECTION = "direction";
136147
public static final String DISABLED = "disabled";
148+
public static final String DISTANCE = "distance";
137149
public static final String DRAINING = "draining";
138150
public static final String DRIVES = "drives";
139151
public static final String DUMP_LEFT = "dump_left";
@@ -145,9 +157,11 @@ private SerializationConstants() {
145157
public static final String ENABLED = "enabled";
146158
public static final String ENCHANTMENTS = "enchantments";
147159
public static final String ENERGY_CONTAINERS = "energy_containers";
148-
public static final String ENERGY_STORED = "energy";
160+
public static final String ENERGY = "energy";
149161
public static final String ENERGY_USAGE = "energy_usage";
150-
public static final String BE_TAG = "block_entity_tag";
162+
public static final String ENUMS = "enums";
163+
public static final String EXTENDS = "extends";
164+
public static final String FIELDS = "fields";
151165
public static final String FILLING = "filling";
152166
public static final String FILTER = "filter";
153167
public static final String FILTERS = "filters";
@@ -156,8 +170,7 @@ private SerializationConstants() {
156170
public static final String FLUID_TANKS = "fluid_tanks";
157171
public static final String FOLLOW = "follow";
158172
public static final String FREQUENCY_LIST = "freq_list";
159-
public static final String ASSEMBLIES = "assemblies";
160-
public static final String FUZZY_MODE = "fuzzy_mode";
173+
public static final String FUZZY = "fuzzy";
161174
public static final String GAS_STORED_ALT = "gas_1";
162175
public static final String GAS_STORED_ALT_2 = "gas_2";
163176
public static final String GAS_TANKS = "gas_tanks";
@@ -167,6 +180,7 @@ private SerializationConstants() {
167180
public static final String HEAT_CAPACITY = "heat_capacity";
168181
public static final String HEAT_STORED = "heat";
169182
public static final String HOME_LOCATION = "home_location";
183+
public static final String HUMAN_NAME = "human_name";
170184
public static final String IDENTITY = "identity";
171185
public static final String IDLE_DIR = "idle_dir";
172186
public static final String INDEX = "index";
@@ -178,6 +192,9 @@ private SerializationConstants() {
178192
public static final String INVERSE = "inverse";
179193
public static final String INVERSE_REQUIRES_REPLACE = "inverse_replace";
180194
public static final String ITEMS = "items";
195+
public static final String JAVA_EXTRA = "java_extra";
196+
public static final String JAVA_TYPE = "java_type";
197+
public static final String KEY = "key";
181198
public static final String LAST_FIRED = "last_fired";
182199
public static final String LAST_PROCESSED = "last_processed";
183200
public static final String LATCHED = "latched";
@@ -190,6 +207,8 @@ private SerializationConstants() {
190207
public static final String MAX_BURN_TIME = "max_burn_time";
191208
public static final String MEK_DATA = "mek_data";
192209
public static final String MELTDOWNS = "meltdowns";
210+
public static final String METHOD_NAME = "methodName";
211+
public static final String METHODS = "methods";
193212
public static final String MIN = "min";
194213
public static final String MODE = "mode";
195214
public static final String MODID = "modid";
@@ -203,6 +222,7 @@ private SerializationConstants() {
203222
public static final String OVERRIDE = "override";
204223
public static final String OWNER_NAME = "owner_name";
205224
public static final String OWNER_UUID = "owner";
225+
public static final String PARAMETERS = "params";
206226
public static final String PARTIAL_WASTE = "partial_waste";
207227
public static final String PATH_TYPE = "path_type";
208228
public static final String PERSONAL_STORAGE_ID = "personal_storage_id";
@@ -222,8 +242,12 @@ private SerializationConstants() {
222242
public static final String RECEIVED_COORDS = "received_coords";
223243
public static final String RECURRING_NODES = "recurring_nodes";
224244
public static final String REDSTONE = "redstone";
225-
public static final String REPLACE_STACK = "replace_stack";
226-
public static final String REQUIRE_STACK = "require_stack";
245+
public static final String REPLACE_TARGET = "replace_target";
246+
public static final String REQUIRES_REPLACEMENT = "requires_replacement";
247+
public static final String REQUIRES_PUBLIC_SECURITY = "requires_public_security";
248+
public static final String RESTRICTION = "restriction";
249+
public static final String RETRO_GEN = "retro_gen";
250+
public static final String RETURNS = "returns";
227251
public static final String ROUND_ROBIN = "round_robin";
228252
public static final String ROUND_ROBIN_TARGET = "rr_target";
229253
public static final String RUNNING = "running";
@@ -232,25 +256,33 @@ private SerializationConstants() {
232256
public static final String SIDE = "side";
233257
public static final String SILK_TOUCH = "silk_touch";
234258
public static final String SINGLE_ITEM = "single_item";
235-
public static final String SIZE_MODE = "size_mode";
259+
public static final String SIZE = "size";
236260
public static final String SIZE_OVERRIDE = "size_override";
237261
public static final String SLOT = "slot";
238262
public static final String SLURRY_TANKS = "slurry_tanks";
239263
public static final String SORTING = "sorting";
240264
public static final String STABILIZER_CHUNKS_TO_LOAD = "stabilizer_chunks_to_load";
241265
public static final String STATE = "state";
266+
public static final String STATE_PROVIDER = "state_provider";
242267
public static final String STOCK_CONTROL = "stock_control";
243268
public static final String STORED = "stored";
244269
public static final String STRICT_INPUT = "strict_input";
245270
public static final String TANK = "tank";
271+
public static final String TARGET = "target";
246272
public static final String TARGET_STACK = "target_stack";
273+
public static final String TARGETS = "targets";
247274
public static final String TEMPERATURE = "temperature";
275+
public static final String TEXT = "text";
276+
public static final String TEXTURES = "textures";
248277
public static final String TIME = "time";
249278
public static final String TRUSTED = "trusted";
250279
public static final String TYPES = "types";
251280
public static final String UPDATE_DELAY = "update_delay";
252281
public static final String UPGRADES = "upgrades";
253282
public static final String USED_NODES = "used_nodes";
254283
public static final String USED_SO_FAR = "used_so_far";
284+
public static final String VALUE = "value";
285+
public static final String VALUES = "values";
286+
public static final String VERSION = "version";
255287
public static final String WORLD_GEN_VERSION = "mek_world_gen_version";
256288
}

‎src/api/java/mekanism/api/recipes/ingredients/GasStackIngredient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class GasStackIngredient extends ChemicalStackIngredient<Gas, GasSt
7878
* @since 10.6.0
7979
*/
8080
public static final Codec<GasStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
81-
IngredientCreatorAccess.gas().codecNonEmpty().fieldOf("ingredient").forGetter(GasStackIngredient::ingredient),
81+
IngredientCreatorAccess.gas().codecNonEmpty().fieldOf(SerializationConstants.INGREDIENT).forGetter(GasStackIngredient::ingredient),
8282
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(SerializationConstants.AMOUNT).forGetter(GasStackIngredient::amount)
8383
).apply(instance, GasStackIngredient::new));
8484

‎src/api/java/mekanism/api/recipes/ingredients/InfusionStackIngredient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class InfusionStackIngredient extends ChemicalStackIngredient<Infus
7878
* @since 10.6.0
7979
*/
8080
public static final Codec<InfusionStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
81-
IngredientCreatorAccess.infusion().codecNonEmpty().fieldOf("ingredient").forGetter(InfusionStackIngredient::ingredient),
81+
IngredientCreatorAccess.infusion().codecNonEmpty().fieldOf(SerializationConstants.INGREDIENT).forGetter(InfusionStackIngredient::ingredient),
8282
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(SerializationConstants.AMOUNT).forGetter(InfusionStackIngredient::amount)
8383
).apply(instance, InfusionStackIngredient::new));
8484

‎src/api/java/mekanism/api/recipes/ingredients/PigmentStackIngredient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class PigmentStackIngredient extends ChemicalStackIngredient<Pigmen
7878
* @since 10.6.0
7979
*/
8080
public static final Codec<PigmentStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
81-
IngredientCreatorAccess.pigment().codecNonEmpty().fieldOf("ingredient").forGetter(PigmentStackIngredient::ingredient),
81+
IngredientCreatorAccess.pigment().codecNonEmpty().fieldOf(SerializationConstants.INGREDIENT).forGetter(PigmentStackIngredient::ingredient),
8282
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(SerializationConstants.AMOUNT).forGetter(PigmentStackIngredient::amount)
8383
).apply(instance, PigmentStackIngredient::new));
8484

‎src/api/java/mekanism/api/recipes/ingredients/SlurryStackIngredient.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public final class SlurryStackIngredient extends ChemicalStackIngredient<Slurry,
7878
* @since 10.6.0
7979
*/
8080
public static final Codec<SlurryStackIngredient> NESTED_CODEC = RecordCodecBuilder.create(instance -> instance.group(
81-
IngredientCreatorAccess.slurry().codecNonEmpty().fieldOf("ingredient").forGetter(SlurryStackIngredient::ingredient),
81+
IngredientCreatorAccess.slurry().codecNonEmpty().fieldOf(SerializationConstants.INGREDIENT).forGetter(SlurryStackIngredient::ingredient),
8282
SerializerHelper.POSITIVE_LONG_CODEC.fieldOf(SerializationConstants.AMOUNT).forGetter(SlurryStackIngredient::amount)
8383
).apply(instance, SlurryStackIngredient::new));
8484

‎src/api/java/mekanism/api/robit/RobitSkinSerializationHelper.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.util.Optional;
77
import java.util.function.Function;
88
import mekanism.api.MekanismAPI;
9+
import mekanism.api.SerializationConstants;
910
import net.minecraft.core.Holder;
1011
import net.minecraft.core.HolderSet;
1112
import net.minecraft.core.RegistryCodecs;
@@ -45,15 +46,16 @@ private RobitSkinSerializationHelper() {
4546
* conditions.
4647
*/
4748
public static final MapCodec<RobitSkin> NETWORK_CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
48-
ExtraCodecs.nonEmptyList(ResourceLocation.CODEC.listOf()).fieldOf("textures").forGetter(RobitSkin::textures),
49-
ResourceLocation.CODEC.optionalFieldOf("customModel").forGetter(skin -> Optional.ofNullable(skin.customModel()))
49+
ExtraCodecs.nonEmptyList(ResourceLocation.CODEC.listOf()).fieldOf(SerializationConstants.TEXTURES).forGetter(RobitSkin::textures),
50+
//TODO - 1.20.5: Update wiki to state that in 1.20.6+ it is custom_model instead of customModel
51+
ResourceLocation.CODEC.optionalFieldOf(SerializationConstants.CUSTOM_MODEL).forGetter(skin -> Optional.ofNullable(skin.customModel()))
5052
).apply(builder, (textures, model) -> new BasicRobitSkin(textures, model.orElse(null))));
5153
/**
5254
* Codec for serializing and deserializing {@link AdvancementBasedRobitSkin}'s over the network.
5355
*/
5456
public static final MapCodec<AdvancementBasedRobitSkin> ADVANCEMENT_BASED_ROBIT_SKIN_CODEC = RecordCodecBuilder.mapCodec(builder -> builder.group(
55-
ExtraCodecs.nonEmptyList(ResourceLocation.CODEC.listOf()).fieldOf("textures").forGetter(RobitSkin::textures),
56-
ResourceLocation.CODEC.optionalFieldOf("customModel").forGetter(skin -> Optional.ofNullable(skin.customModel())),
57-
ResourceLocation.CODEC.fieldOf("advancement").forGetter(AdvancementBasedRobitSkin::advancement)
57+
ExtraCodecs.nonEmptyList(ResourceLocation.CODEC.listOf()).fieldOf(SerializationConstants.TEXTURES).forGetter(RobitSkin::textures),
58+
ResourceLocation.CODEC.optionalFieldOf(SerializationConstants.CUSTOM_MODEL).forGetter(skin -> Optional.ofNullable(skin.customModel())),
59+
ResourceLocation.CODEC.fieldOf(SerializationConstants.ADVANCEMENT).forGetter(AdvancementBasedRobitSkin::advancement)
5860
).apply(builder, (textures, model, advancement) -> new AdvancementBasedRobitSkin(textures, model.orElse(null), advancement)));
5961
}

‎src/datagen/main/java/mekanism/client/integration/emi/BaseEmiAliasProvider.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,13 @@
2121
import java.util.List;
2222
import java.util.concurrent.CompletableFuture;
2323
import java.util.function.Function;
24+
import mekanism.api.SerializationConstants;
2425
import mekanism.api.annotations.NothingNullByDefault;
2526
import mekanism.api.providers.IChemicalProvider;
2627
import mekanism.api.providers.IFluidProvider;
2728
import mekanism.api.text.IHasTranslationKey;
2829
import mekanism.client.recipe_viewer.emi.ChemicalEmiStack;
30+
import mekanism.common.DataGenSerializationConstants;
2931
import mekanism.common.integration.MekanismHooks;
3032
import mekanism.common.lib.collection.HashList;
3133
import net.minecraft.core.HolderLookup;
@@ -137,10 +139,10 @@ private record AliasInfo(List<EmiIngredient> ingredients, List<String> aliases)
137139
}, ingredient -> new Dynamic<>(JsonOps.INSTANCE, EmiIngredientSerializer.getSerialized(ingredient))
138140
);
139141
private static final Codec<AliasInfo> CODEC = RecordCodecBuilder.create(instance -> instance.group(
140-
singleOrListCodec(INGREDIENT_CODEC).fieldOf("stacks").forGetter(AliasInfo::ingredients),
141-
singleOrListCodec(ExtraCodecs.NON_EMPTY_STRING).fieldOf("text").forGetter(AliasInfo::aliases)
142+
singleOrListCodec(INGREDIENT_CODEC).fieldOf(DataGenSerializationConstants.STACKS).forGetter(AliasInfo::ingredients),
143+
singleOrListCodec(ExtraCodecs.NON_EMPTY_STRING).fieldOf(SerializationConstants.TEXT).forGetter(AliasInfo::aliases)
142144
).apply(instance, AliasInfo::new));
143-
private static final Codec<List<AliasInfo>> LIST_CODEC = ExtraCodecs.nonEmptyList(CODEC.listOf()).fieldOf("aliases").codec();
145+
private static final Codec<List<AliasInfo>> LIST_CODEC = ExtraCodecs.nonEmptyList(CODEC.listOf()).fieldOf(DataGenSerializationConstants.ALIASES).codec();
144146

145147
private static <T> Codec<List<T>> singleOrListCodec(Codec<T> codec) {
146148
return Codec.either(codec, ExtraCodecs.nonEmptyList(codec.listOf())).xmap(

‎src/datagen/main/java/mekanism/client/state/BaseBlockStateProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
import java.util.function.Function;
55
import mekanism.api.providers.IBlockProvider;
66
import mekanism.client.model.BaseBlockModelProvider;
7-
import mekanism.common.DataGenJsonConstants;
7+
import mekanism.common.DataGenSerializationConstants;
88
import mekanism.common.registration.impl.FluidDeferredRegister;
99
import mekanism.common.registration.impl.FluidDeferredRegister.MekanismFluidType;
1010
import mekanism.common.util.RegistryUtils;
@@ -54,7 +54,7 @@ protected void registerFluidBlockStates(FluidDeferredRegister register) {
5454
for (Holder<Block> blockEntry : register.getBlockEntries()) {
5555
//Note: We expect this to always be the case
5656
if (blockEntry.value() instanceof LiquidBlock block && block.fluid.getFluidType() instanceof MekanismFluidType fluidType) {
57-
simpleBlock(block, models().getBuilder(RegistryUtils.getPath(block)).texture(DataGenJsonConstants.PARTICLE, fluidType.stillTexture));
57+
simpleBlock(block, models().getBuilder(RegistryUtils.getPath(block)).texture(DataGenSerializationConstants.PARTICLE, fluidType.stillTexture));
5858
}
5959
}
6060
}

0 commit comments

Comments
 (0)