Merge NBTConstants and JsonConstants into a single SerializationConstants class

Author: pupnewfster

src/additions/java/mekanism/additions/common/entity/EntityBalloon.java

@@ -6,7 +6,7 @@
 import mekanism.additions.common.registries.AdditionsEntityTypes;
 import mekanism.additions.common.registries.AdditionsItems;
 import mekanism.additions.common.registries.AdditionsSounds;
-import mekanism.api.NBTConstants;
+import mekanism.api.SerializationConstants;
 import mekanism.api.text.EnumColor;
 import mekanism.common.util.NBTUtils;
 import mekanism.common.util.WorldUtils;
@@ -277,22 +277,22 @@ protected void defineSynchedData(@NotNull SynchedEntityData.Builder builder) {
 
     @Override
     protected void readAdditionalSaveData(@NotNull CompoundTag nbtTags) {
-        NBTUtils.setEnumIfPresent(nbtTags, NBTConstants.COLOR, EnumColor.BY_ID, color -> this.color = color);
-        NBTUtils.setBlockPosIfPresent(nbtTags, NBTConstants.LATCHED, pos -> latched = pos);
-        NBTUtils.setUUIDIfPresent(nbtTags, NBTConstants.OWNER_UUID, uuid -> {
+        NBTUtils.setEnumIfPresent(nbtTags, SerializationConstants.COLOR, EnumColor.BY_ID, color -> this.color = color);
+        NBTUtils.setBlockPosIfPresent(nbtTags, SerializationConstants.LATCHED, pos -> latched = pos);
+        NBTUtils.setUUIDIfPresent(nbtTags, SerializationConstants.OWNER_UUID, uuid -> {
             hasCachedEntity = true;
             cachedEntityUUID = uuid;
         });
     }
 
     @Override
     protected void addAdditionalSaveData(@NotNull CompoundTag nbtTags) {
-        NBTUtils.writeEnum(nbtTags, NBTConstants.COLOR, color);
+        NBTUtils.writeEnum(nbtTags, SerializationConstants.COLOR, color);
         if (latched != null) {
-            nbtTags.put(NBTConstants.LATCHED, NbtUtils.writeBlockPos(latched));
+            nbtTags.put(SerializationConstants.LATCHED, NbtUtils.writeBlockPos(latched));
         }
         if (latchedEntity != null) {
-            nbtTags.putUUID(NBTConstants.OWNER_UUID, latchedEntity.getUUID());
+            nbtTags.putUUID(SerializationConstants.OWNER_UUID, latchedEntity.getUUID());
         }
     }
 

src/additions/java/mekanism/additions/common/item/ItemWalkieTalkie.java

@@ -7,7 +7,7 @@
 import mekanism.additions.common.AdditionsLang;
 import mekanism.additions.common.config.MekanismAdditionsConfig;
 import mekanism.additions.common.registries.AdditionsDataComponents;
-import mekanism.api.NBTConstants;
+import mekanism.api.SerializationConstants;
 import mekanism.api.text.EnumColor;
 import mekanism.common.item.interfaces.IModeItem;
 import mekanism.common.util.text.BooleanStateDisplay.OnOff;
@@ -81,8 +81,8 @@ public record WalkieData(int channel, boolean running) {
         public static final WalkieData DEFAULT = new WalkieData(1, false);
 
         public static final Codec<WalkieData> CODEC = RecordCodecBuilder.create(instance -> instance.group(
-              ExtraCodecs.intRange(1, 8).fieldOf(NBTConstants.CHANNEL).forGetter(WalkieData::channel),
-              Codec.BOOL.fieldOf(NBTConstants.RUNNING).forGetter(WalkieData::running)
+              ExtraCodecs.intRange(1, 8).fieldOf(SerializationConstants.CHANNEL).forGetter(WalkieData::channel),
+              Codec.BOOL.fieldOf(SerializationConstants.RUNNING).forGetter(WalkieData::running)
         ).apply(instance, WalkieData::new));
         public static final StreamCodec<ByteBuf, WalkieData> STREAM_CODEC = StreamCodec.composite(
               ByteBufCodecs.VAR_INT, WalkieData::channel,

src/api/java/mekanism/api/IConfigCardAccess.java

@@ -45,7 +45,7 @@ default boolean isConfigurationDataCompatible(Block type) {
      * Collects configuration data for this capability into a new {@link CompoundTag}.
      * <br><br>
      * Mekanism additionally adds two extra pieces of data to this {@link CompoundTag} afterwards corresponding to the following two constants:
-     * {@link NBTConstants#DATA_NAME} and {@link NBTConstants#DATA_TYPE} so it is recommended to ensure you don't put any data in a matching entry, or it will be
+     * {@link SerializationConstants#DATA_NAME} and {@link SerializationConstants#DATA_TYPE} so it is recommended to ensure you don't put any data in a matching entry, or it will be
      * overwritten.
      *
      * @param provider - Provider to lookup holders from.