Replaced string key in compound tag

src/api/java/mods/railcraft/api/core/CompoundTagKeys.java

@@ -10,17 +10,19 @@ public final class CompoundTagKeys {
 
   public static final String ACTION_SIGNAL_ASPECTS = "actionSignalAspects";
   public static final String ACTIVE = "active";
+  public static final String AURA = "aura";
   public static final String BACK_AUTO_LINK_ENABLED = "backAutoLinkEnabled";
   public static final String BACK_LINK = "backLink";
   public static final String BATTERIES = "batteries";
-  public static final String BATTERY = "battery";
   public static final String BLOCK_SIGNAL = "blockSignal";
   public static final String BOILER = "boiler";
   public static final String BURN_TIME = "burnTime";
   public static final String CART = "cart";
   public static final String CARTS = "carts";
   public static final String CART_FILTER = "cartFilter";
+  public static final String CART_FILTERS = "cartFilters";
   public static final String CHARGE = "charge";
+  public static final String COLOR = "color";
   public static final String CONTAINER = "container";
   public static final String CRAFT_MATRIX = "craftMatrix";
   public static final String CURRENT_CART = "currentCart";
@@ -33,6 +35,7 @@ public final class CompoundTagKeys {
   public static final String DELAY = "delay";
   public static final String DERAILED_REMAINING_TICKS = "derailedRemainingTicks";
   public static final String DEST = "dest";
+  public static final String DESTINATION = "destination";
   public static final String ELEVATOR_REMAINING_TICKS = "elevatorRemainingTicks";
   public static final String EMITTER_POS = "emitterPos";
   public static final String ENERGY = "energy";
@@ -48,6 +51,7 @@ public final class CompoundTagKeys {
   public static final String FUEL = "fuel";
   public static final String HIGH_SPEED = "highSpeed";
   public static final String ID = "id";
+  public static final String INDEX = "index";
   public static final String INPUT_SIGNAL = "inputSignal";
   public static final String INV_FILTER = "invFilter";
   public static final String ITEM_FILTER = "itemFilter";
@@ -60,6 +64,7 @@ public final class CompoundTagKeys {
   public static final String LOCKED = "locked";
   public static final String LOCKING_CARTS = "lockingCarts";
   public static final String LOCKING_MODE_CONTROLLER = "lockingModeController";
+  public static final String LOCKS = "locks";
   public static final String LOCK_ID = "lockId";
   public static final String LOG = "log";
   public static final String MASTER = "master";
@@ -73,6 +78,7 @@ public final class CompoundTagKeys {
   public static final String OUTPUT_DIRECTION = "outputDirection";
   public static final String OWNER = "owner";
   public static final String PATTERN = "pattern";
+  public static final String PEER_POS = "peerPos";
   public static final String PIPE_LENGTH = "pipeLength";
   public static final String PLAYERS = "players";
   public static final String POS = "pos";
@@ -89,9 +95,12 @@ public final class CompoundTagKeys {
   public static final String PROGRESS = "progress";
   public static final String RAILWAY = "railway";
   public static final String REBUILD_DELAY = "rebuildDelay";
+  public static final String REDSTONE_MODE = "redstoneMode";
   public static final String REDSTONE_TRIGGERED = "redstoneTriggered";
+  public static final String REFINED = "refined";
   public static final String REVERSE = "reverse";
   public static final String ROTOR_CONTAINER = "rotorContainer";
+  public static final String SEASON = "season";
   public static final String SECONDARY_COLOR = "secondaryColor";
   public static final String SIGNALS = "signals";
   public static final String SIGNAL_ASPECT = "signalAspect";
@@ -103,6 +112,7 @@ public final class CompoundTagKeys {
   public static final String SPRUNG = "sprung";
   public static final String STATE = "state";
   public static final String STEAM_TANK = "steamTank";
+  public static final String SYNC = "sync";
   public static final String TANK = "tank";
   public static final String TANK_MANAGER = "tankManager";
   public static final String TEMPERATURE = "temperature";

src/main/java/mods/railcraft/integrations/jade/RoutingTrackComponent.java

@@ -1,6 +1,7 @@
 package mods.railcraft.integrations.jade;
 
 import mods.railcraft.Translations;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.world.item.RailcraftItems;
 import mods.railcraft.world.item.TicketItem;
@@ -24,9 +25,9 @@ class RoutingTrackComponent implements IBlockComponentProvider,
   public void appendTooltip(ITooltip tooltip, BlockAccessor accessor, IPluginConfig config) {
     if (accessor.getBlock() instanceof RoutingTrackBlock) {
       var tag = accessor.getServerData();
-      if (tag.contains("destination")) {
+      if (tag.contains(CompoundTagKeys.DESTINATION)) {
         tooltip.add(Component.translatable(Translations.Tips.ROUTING_TICKET_DEST)
-            .append(" ").append(tag.getString("destination")));
+            .append(" ").append(tag.getString(CompoundTagKeys.DESTINATION)));
       }
       tooltip.remove(Identifiers.UNIVERSAL_ITEM_STORAGE);
     }
@@ -38,7 +39,7 @@ public void appendServerData(CompoundTag tag, BlockAccessor accessor) {
       var item = routingTrack.container().getItem(0);
       if (item.is(RailcraftItems.GOLDEN_TICKET.get())) {
         var dest = TicketItem.getDestination(item);
-        tag.putString("destination", dest);
+        tag.putString(CompoundTagKeys.DESTINATION, dest);
       }
     }
   }

src/main/java/mods/railcraft/util/container/AdvancedContainer.java

@@ -6,6 +6,7 @@
 import mods.railcraft.api.container.manipulator.ContainerManipulator;
 import mods.railcraft.api.container.manipulator.ContainerSlotAccessor;
 import mods.railcraft.api.container.manipulator.ModifiableSlotAccessor;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.world.module.ModuleProvider;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
@@ -91,7 +92,7 @@ public void stopOpen(Player player) {
   public void fromTag(ListTag tag) {
     for (int i = 0; i < tag.size(); ++i) {
       var slotTag = tag.getCompound(i);
-      this.setItem(slotTag.getInt("index"), ItemStack.of(slotTag));
+      this.setItem(slotTag.getInt(CompoundTagKeys.INDEX), ItemStack.of(slotTag));
     }
   }
 
@@ -100,7 +101,7 @@ public ListTag createTag() {
     var tag = new ListTag();
     for (int i = 0; i < this.getContainerSize(); ++i) {
       var slotTag = new CompoundTag();
-      slotTag.putInt("index", i);
+      slotTag.putInt(CompoundTagKeys.INDEX, i);
       this.getItem(i).save(slotTag);
       tag.add(slotTag);
     }

src/main/java/mods/railcraft/util/container/ContainerTools.java

@@ -3,6 +3,7 @@
 import java.util.function.Predicate;
 import java.util.stream.IntStream;
 import org.jetbrains.annotations.Nullable;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.item.Filter;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
@@ -64,7 +65,7 @@ public static ListTag writeContainer(Container container) {
       var itemStack = container.getItem(i);
       if (!itemStack.isEmpty()) {
         var slotTag = new CompoundTag();
-        slotTag.putByte("index", i);
+        slotTag.putByte(CompoundTagKeys.INDEX, i);
         itemStack.save(slotTag);
         tag.add(slotTag);
       }
@@ -75,7 +76,7 @@ public static ListTag writeContainer(Container container) {
   public static void readContainer(Container container, ListTag tag) {
     for (byte i = 0; i < tag.size(); i++) {
       var slotTag = tag.getCompound(i);
-      int slot = slotTag.getByte("index");
+      int slot = slotTag.getByte(CompoundTagKeys.INDEX);
       if (slot >= 0 && slot < container.getContainerSize()) {
         var itemStack = ItemStack.of(slotTag);
         container.setItem(slot, itemStack);

src/main/java/mods/railcraft/world/entity/FirestoneItemEntity.java

@@ -1,5 +1,6 @@
 package mods.railcraft.world.entity;
 
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.util.LevelUtil;
 import mods.railcraft.world.item.CrackedFirestoneItem;
 import mods.railcraft.world.item.FirestoneItem;
@@ -94,12 +95,12 @@ public void setRefined(boolean refined) {
   @Override
   public void addAdditionalSaveData(CompoundTag compound) {
     super.addAdditionalSaveData(compound);
-    compound.putBoolean("refined", this.refined);
+    compound.putBoolean(CompoundTagKeys.REFINED, this.refined);
   }
 
   @Override
   public void readAdditionalSaveData(CompoundTag compound) {
     super.readAdditionalSaveData(compound);
-    this.refined = compound.getBoolean("refined");
+    this.refined = compound.getBoolean(CompoundTagKeys.REFINED);
   }
 }

src/main/java/mods/railcraft/world/entity/vehicle/RailcraftMinecart.java

@@ -5,6 +5,7 @@
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.api.carts.ItemTransferHandler;
 import mods.railcraft.api.carts.RollingStock;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.track.TrackUtil;
 import mods.railcraft.network.RailcraftDataSerializers;
 import mods.railcraft.season.Season;
@@ -96,13 +97,13 @@ public void setSeason(Season season) {
   @Override
   protected void addAdditionalSaveData(CompoundTag tag) {
     super.addAdditionalSaveData(tag);
-    tag.putString("season", this.getSeason().getSerializedName());
+    tag.putString(CompoundTagKeys.SEASON, this.getSeason().getSerializedName());
   }
 
   @Override
   protected void readAdditionalSaveData(CompoundTag tag) {
     super.readAdditionalSaveData(tag);
-    this.setSeason(Season.fromName(tag.getString("season")));
+    this.setSeason(Season.fromName(tag.getString(CompoundTagKeys.SEASON)));
   }
 
   @Override

src/main/java/mods/railcraft/world/entity/vehicle/TrainImpl.java

@@ -7,6 +7,7 @@
 import java.util.stream.Stream;
 import mods.railcraft.api.carts.RollingStock;
 import mods.railcraft.api.carts.Train;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.util.FunctionalUtil;
 import mods.railcraft.util.fluids.CompositeFluidHandler;
 import mods.railcraft.world.entity.vehicle.locomotive.Locomotive;
@@ -160,24 +161,24 @@ public String toString() {
   }
 
   static TrainImpl fromTag(CompoundTag tag, RollingStockImpl minecart) {
-    var id = tag.getUUID("id");
+    var id = tag.getUUID(CompoundTagKeys.ID);
     var train = new TrainImpl(id, minecart);
-    State.fromName(tag.getString("state")).ifPresent(train::setState);
-    tag.getList("locks", Tag.TAG_INT_ARRAY).stream()
+    State.fromName(tag.getString(CompoundTagKeys.STATE)).ifPresent(train::setState);
+    tag.getList(CompoundTagKeys.LOCKS, Tag.TAG_INT_ARRAY).stream()
         .map(NbtUtils::loadUUID)
         .forEach(train::addLock);
     return train;
   }
 
   CompoundTag toTag() {
     var tag = new CompoundTag();
-    tag.putUUID("id", this.id);
-    tag.putString("state", this.state.getSerializedName());
+    tag.putUUID(CompoundTagKeys.ID, this.id);
+    tag.putString(CompoundTagKeys.STATE, this.state.getSerializedName());
     var locksTag = new ListTag();
     for (var uuid : this.locks) {
       locksTag.add(NbtUtils.createUUID(uuid));
     }
-    tag.put("locks", locksTag);
+    tag.put(CompoundTagKeys.LOCKS, locksTag);
     return tag;
   }
 }

src/main/java/mods/railcraft/world/item/GogglesItem.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.Translations;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.util.EnumUtil;
 import mods.railcraft.network.NetworkChannel;
 import mods.railcraft.network.play.UpdateAuraByKeyMessage;
@@ -27,11 +28,9 @@ public GogglesItem(Properties properties) {
   }
 
   public static Aura getAura(ItemStack itemStack) {
-    if (itemStack.hasTag()) {
-      var tag = itemStack.getTag();
-      if (tag.contains("aura")) {
-        return Aura.values()[tag.getInt("aura")];
-      }
+    var tag = itemStack.getTag();
+    if (tag != null && tag.contains(CompoundTagKeys.AURA)) {
+      return Aura.values()[tag.getInt(CompoundTagKeys.AURA)];
     }
     return Aura.NONE;
   }
@@ -41,7 +40,7 @@ public static Aura incrementAura(ItemStack itemStack) {
     if (aura == Aura.TRACKING) {
       aura.getNext();
     }
-    itemStack.getOrCreateTag().putInt("aura", aura.ordinal());
+    itemStack.getOrCreateTag().putInt(CompoundTagKeys.AURA, aura.ordinal());
     return aura;
   }
 

src/main/java/mods/railcraft/world/item/PairingToolItem.java

@@ -4,6 +4,7 @@
 import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import com.mojang.logging.LogUtils;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.item.ActivationBlockingItem;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.GlobalPos;
@@ -178,13 +179,13 @@ public static void setTargetPos(ItemStack itemStack, GlobalPos peerPos) {
     GlobalPos.CODEC
         .encodeStart(NbtOps.INSTANCE, peerPos)
         .resultOrPartial(logger::error)
-        .ifPresent(tag -> itemStack.getOrCreateTag().put("peerPos", tag));
+        .ifPresent(tag -> itemStack.getOrCreateTag().put(CompoundTagKeys.PEER_POS, tag));
   }
 
   public static void clearTargetPos(ItemStack itemStack) {
     var tag = itemStack.getTag();
     if (tag != null) {
-      tag.remove("peerPos");
+      tag.remove(CompoundTagKeys.PEER_POS);
     }
   }
 

src/main/java/mods/railcraft/world/item/SeasonsCrowbarItem.java

@@ -3,6 +3,7 @@
 import java.util.List;
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.Translations.Tips;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.season.Season;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
@@ -45,12 +46,12 @@ public void appendHoverText(ItemStack stack, @Nullable Level level, List<Compone
 
   public static Season getSeason(ItemStack itemStack) {
     var tag = itemStack.getOrCreateTag();
-    return Season.fromName(tag.getString("season"));
+    return Season.fromName(tag.getString(CompoundTagKeys.SEASON));
   }
 
   private static void incrementSeason(ItemStack itemStack) {
     var season = getSeason(itemStack).getNext();
-    itemStack.getOrCreateTag().putString("season", season.getSerializedName());
+    itemStack.getOrCreateTag().putString(CompoundTagKeys.SEASON, season.getSerializedName());
   }
 
   private static Component getDescriptionText(Season value, boolean tooltip) {

src/main/java/mods/railcraft/world/level/block/ForceTrackEmitterBlock.java

@@ -9,6 +9,7 @@
 import mods.railcraft.api.charge.ChargeBlock;
 import mods.railcraft.api.charge.ChargeStorage;
 import mods.railcraft.api.charge.ChargeStorage.State;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.util.container.ContainerTools;
 import mods.railcraft.world.level.block.entity.ForceTrackEmitterBlockEntity;
 import mods.railcraft.world.level.block.entity.ForceTrackEmitterState;
@@ -109,7 +110,7 @@ public InteractionResult use(BlockState state, Level level, BlockPos pos,
   private ItemStack getItem(BlockState blockState) {
     var itemStack = this.asItem().getDefaultInstance();
     var tag = itemStack.getOrCreateTag();
-    tag.putString("color", blockState.getValue(COLOR).getName());
+    tag.putString(CompoundTagKeys.COLOR, blockState.getValue(COLOR).getName());
     return itemStack;
   }
 
@@ -177,7 +178,7 @@ public void setPlacedBy(Level level, BlockPos pos, BlockState state,
     var tag = itemStack.getTag();
     if (tag != null) {
       if (level.getBlockEntity(pos) instanceof ForceTrackEmitterBlockEntity t) {
-        var color = DyeColor.byName(tag.getString("color"), null);
+        var color = DyeColor.byName(tag.getString(CompoundTagKeys.COLOR), null);
         if (color != null) {
           t.setColor(color);
         }

src/main/java/mods/railcraft/world/level/block/entity/RailcraftBlockEntity.java

@@ -55,13 +55,13 @@ public final CompoundTag getUpdateTag() {
     this.writeToBuf(packetBuffer);
     byte[] syncData = new byte[packetBuffer.readableBytes()];
     packetBuffer.readBytes(syncData);
-    nbt.putByteArray("sync", syncData);
+    nbt.putByteArray(CompoundTagKeys.SYNC, syncData);
     return nbt;
   }
 
   @Override
   public final void handleUpdateTag(CompoundTag tag) {
-    byte[] bytes = tag.getByteArray("sync");
+    byte[] bytes = tag.getByteArray(CompoundTagKeys.SYNC);
     this.readFromBuf(new FriendlyByteBuf(Unpooled.wrappedBuffer(bytes)));
   }
 

src/main/java/mods/railcraft/world/level/block/entity/manipulator/ManipulatorBlockEntity.java

@@ -6,6 +6,7 @@
 import java.util.function.Predicate;
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.Translations;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.util.EnumUtil;
 import mods.railcraft.client.gui.widget.button.ButtonTexture;
 import mods.railcraft.client.gui.widget.button.TexturePosition;
@@ -264,16 +265,16 @@ public void readFromBuf(FriendlyByteBuf data) {
   @Override
   protected void saveAdditional(CompoundTag tag) {
     super.saveAdditional(tag);
-    tag.putInt("redstoneMode", this.redstoneMode.ordinal());
-    tag.put("cartFilters", this.getCartFilters().createTag());
+    tag.putInt(CompoundTagKeys.REDSTONE_MODE, this.redstoneMode.ordinal());
+    tag.put(CompoundTagKeys.CART_FILTERS, this.getCartFilters().createTag());
   }
 
   @Override
   public void load(CompoundTag tag) {
     super.load(tag);
     this.setPowered(ManipulatorBlock.isPowered(this.getBlockState()));
-    this.redstoneMode = RedstoneMode.values()[tag.getInt("redstoneMode")];
-    this.getCartFilters().fromTag(tag.getList("cartFilters", Tag.TAG_COMPOUND));
+    this.redstoneMode = RedstoneMode.values()[tag.getInt(CompoundTagKeys.REDSTONE_MODE)];
+    this.getCartFilters().fromTag(tag.getList(CompoundTagKeys.CART_FILTERS, Tag.TAG_COMPOUND));
   }
 
   public enum TransferMode implements ButtonState<TransferMode> {