Fixed some missing strings

railcraft-reborn · Feb 2, 2024 · 9914dcb · 9914dcb
1 parent a05b2d0
commit 9914dcb
Show file tree

Hide file tree

Showing 15 changed files with 21 additions and 22 deletions.
diff --git a/src/api/java/mods/railcraft/api/core/CompoundTagKeys.java b/src/api/java/mods/railcraft/api/core/CompoundTagKeys.java
@@ -99,6 +99,7 @@ public final class CompoundTagKeys {
   public static final String TRANSFER_MODE = "transferMode";
   public static final String VALUE = "value";
   public static final String WATER_TANK = "waterTank";
+  public static final String WHISTLE_PITCH = "whistlePitch";
 
   private CompoundTagKeys() {
   }

diff --git a/src/main/java/mods/railcraft/integrations/jei/RailcraftJeiPlugin.java b/src/main/java/mods/railcraft/integrations/jei/RailcraftJeiPlugin.java
@@ -1,6 +1,5 @@
 package mods.railcraft.integrations.jei;
 
-import java.util.function.Supplier;
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.JeiPlugin;
 import mezz.jei.api.registration.IGuiHandlerRegistration;

diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/TankMinecart.java b/src/main/java/mods/railcraft/world/entity/vehicle/TankMinecart.java
@@ -5,9 +5,9 @@
 import mods.railcraft.RailcraftConfig;
 import mods.railcraft.api.carts.FluidTransferHandler;
 import mods.railcraft.api.carts.RollingStock;
-import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.util.container.ContainerTools;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.world.entity.RailcraftEntityTypes;
 import mods.railcraft.world.inventory.TankMinecartMenu;
 import mods.railcraft.world.item.RailcraftItems;

diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/TrainImpl.java b/src/main/java/mods/railcraft/world/entity/vehicle/TrainImpl.java
@@ -7,8 +7,8 @@
 import java.util.stream.Stream;
 import mods.railcraft.api.carts.RollingStock;
 import mods.railcraft.api.carts.Train;
-import mods.railcraft.util.fluids.CompositeFluidHandler;
 import mods.railcraft.util.FunctionalUtil;
+import mods.railcraft.util.fluids.CompositeFluidHandler;
 import mods.railcraft.world.entity.vehicle.locomotive.Locomotive;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;

diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/BaseSteamLocomotive.java b/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/BaseSteamLocomotive.java
@@ -8,9 +8,9 @@
 import mods.railcraft.particle.RailcraftParticleTypes;
 import mods.railcraft.season.Seasons;
 import mods.railcraft.sounds.RailcraftSoundEvents;
+import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.fluids.FluidTools.ProcessType;
-import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.world.level.material.RailcraftFluids;
 import mods.railcraft.world.level.material.StandardTank;
 import mods.railcraft.world.level.material.TankManager;

diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/ElectricLocomotive.java b/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/ElectricLocomotive.java
@@ -3,6 +3,7 @@
 import java.util.Set;
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.api.carts.RollingStock;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.charge.ChargeCartStorageImpl;
 import mods.railcraft.sounds.RailcraftSoundEvents;
 import mods.railcraft.util.container.ContainerMapper;
@@ -166,13 +167,13 @@ public IEnergyStorage getBatteryCart() {
   @Override
   public void readAdditionalSaveData(CompoundTag tag) {
     super.readAdditionalSaveData(tag);
-    this.cartStorage.receiveEnergy(tag.getInt("energy"), false);
+    this.cartStorage.receiveEnergy(tag.getInt(CompoundTagKeys.ENERGY), false);
   }
 
   @Override
   public void addAdditionalSaveData(CompoundTag tag) {
     super.addAdditionalSaveData(tag);
-    tag.putInt("energy", this.cartStorage.getEnergyStored());
+    tag.putInt(CompoundTagKeys.ENERGY, this.cartStorage.getEnergyStored());
   }
 
   @Override
@@ -182,13 +183,13 @@ protected void loadFromItemStack(ItemStack itemStack) {
     if (this.cartStorage == null) {
       this.cartStorage = new ChargeCartStorageImpl(MAX_CHARGE);
     }
-    this.cartStorage.receiveEnergy(tag.getInt("energy"), false);
+    this.cartStorage.receiveEnergy(tag.getInt(CompoundTagKeys.ENERGY), false);
   }
 
   @Override
   public ItemStack getPickResult() {
     var itemStack = super.getPickResult();
-    itemStack.getOrCreateTag().putInt("energy", this.cartStorage.getEnergyStored());
+    itemStack.getOrCreateTag().putInt(CompoundTagKeys.ENERGY, this.cartStorage.getEnergyStored());
     return itemStack;
   }
 

diff --git a/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/Locomotive.java b/src/main/java/mods/railcraft/world/entity/vehicle/locomotive/Locomotive.java
@@ -15,6 +15,7 @@
 import mods.railcraft.api.carts.Paintable;
 import mods.railcraft.api.carts.RollingStock;
 import mods.railcraft.api.carts.Routable;
+import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.api.core.Lockable;
 import mods.railcraft.api.core.RailcraftConstants;
 import mods.railcraft.api.util.EnumUtil;
@@ -143,18 +144,18 @@ protected void loadFromItemStack(ItemStack itemStack) {
     this.setPrimaryColor(LocomotiveItem.getPrimaryColor(itemStack));
     this.setSecondaryColor(LocomotiveItem.getSecondaryColor(itemStack));
 
-    if (tag.contains("whistlePitch")) {
-      this.whistlePitch = tag.getFloat("whistlePitch");
+    if (tag.contains(CompoundTagKeys.WHISTLE_PITCH)) {
+      this.whistlePitch = tag.getFloat(CompoundTagKeys.WHISTLE_PITCH);
     }
 
-    if (tag.contains("owner", Tag.TAG_COMPOUND)) {
-      GameProfile ownerProfile = NbtUtils.readGameProfile(tag.getCompound("owner"));
+    if (tag.contains(CompoundTagKeys.OWNER, Tag.TAG_COMPOUND)) {
+      GameProfile ownerProfile = NbtUtils.readGameProfile(tag.getCompound(CompoundTagKeys.OWNER));
       this.setOwner(ownerProfile);
       this.setLock(Lock.LOCKED);
     }
 
-    if (tag.contains("lock", Tag.TAG_STRING)) {
-      Lock.fromNameOptional(tag.getString("lock")).ifPresent(this::setLock);
+    if (tag.contains(CompoundTagKeys.LOCK, Tag.TAG_STRING)) {
+      Lock.fromNameOptional(tag.getString(CompoundTagKeys.LOCK)).ifPresent(this::setLock);
     }
   }
 

diff --git a/src/main/java/mods/railcraft/world/level/block/entity/ManualRollingMachineBlockEntity.java b/src/main/java/mods/railcraft/world/level/block/entity/ManualRollingMachineBlockEntity.java
@@ -13,7 +13,6 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
 import net.minecraft.world.Container;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;

diff --git a/...main/java/mods/railcraft/world/level/block/entity/manipulator/FluidLoaderBlockEntity.java b/...main/java/mods/railcraft/world/level/block/entity/manipulator/FluidLoaderBlockEntity.java
@@ -7,8 +7,8 @@
 import mods.railcraft.api.carts.FluidTransferHandler;
 import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.util.EntitySearcher;
-import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.Predicates;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.world.entity.vehicle.locomotive.SteamLocomotive;
 import mods.railcraft.world.level.block.entity.RailcraftBlockEntityTypes;
 import net.minecraft.SharedConstants;

diff --git a/...java/mods/railcraft/world/level/block/entity/manipulator/FluidManipulatorBlockEntity.java b/...java/mods/railcraft/world/level/block/entity/manipulator/FluidManipulatorBlockEntity.java
@@ -3,9 +3,9 @@
 import java.util.Optional;
 import org.jetbrains.annotations.Nullable;
 import mods.railcraft.api.core.CompoundTagKeys;
-import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.container.AdvancedContainer;
 import mods.railcraft.util.container.ContainerTools;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.world.inventory.FluidManipulatorMenu;
 import mods.railcraft.world.level.material.FluidItemHelper;
 import mods.railcraft.world.level.material.StandardTank;

diff --git a/...in/java/mods/railcraft/world/level/block/entity/manipulator/FluidUnloaderBlockEntity.java b/...in/java/mods/railcraft/world/level/block/entity/manipulator/FluidUnloaderBlockEntity.java
@@ -2,8 +2,8 @@
 
 import java.util.stream.Stream;
 import mods.railcraft.RailcraftConfig;
-import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.Predicates;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.world.level.block.entity.RailcraftBlockEntityTypes;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

diff --git a/...in/java/mods/railcraft/world/level/block/entity/signal/SignalCapacitorBoxBlockEntity.java b/...in/java/mods/railcraft/world/level/block/entity/signal/SignalCapacitorBoxBlockEntity.java
@@ -8,7 +8,6 @@
 import mods.railcraft.client.gui.widget.button.ButtonTexture;
 import mods.railcraft.client.gui.widget.button.TexturePosition;
 import mods.railcraft.gui.button.ButtonState;
-import mods.railcraft.season.Season;
 import mods.railcraft.util.RedstoneUtil;
 import mods.railcraft.world.level.block.entity.RailcraftBlockEntityTypes;
 import net.minecraft.core.BlockPos;

diff --git a/src/main/java/mods/railcraft/world/level/block/manipulator/ManipulatorBlock.java b/src/main/java/mods/railcraft/world/level/block/manipulator/ManipulatorBlock.java
@@ -15,7 +15,6 @@
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.StateDefinition;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;

diff --git a/src/main/java/mods/railcraft/world/module/CokeOvenModule.java b/src/main/java/mods/railcraft/world/module/CokeOvenModule.java
@@ -2,8 +2,8 @@
 
 import org.jetbrains.annotations.NotNull;
 import mods.railcraft.api.core.CompoundTagKeys;
-import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.container.ContainerMapper;
+import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.world.item.crafting.CokeOvenRecipe;
 import mods.railcraft.world.item.crafting.RailcraftRecipeTypes;
 import mods.railcraft.world.level.block.entity.CokeOvenBlockEntity;

diff --git a/src/main/java/mods/railcraft/world/module/SteamBoilerModule.java b/src/main/java/mods/railcraft/world/module/SteamBoilerModule.java
@@ -3,9 +3,9 @@
 import org.jetbrains.annotations.NotNull;
 import mods.railcraft.api.core.CompoundTagKeys;
 import mods.railcraft.tags.RailcraftTags;
+import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.util.fluids.FluidTools;
 import mods.railcraft.util.fluids.FluidTools.ProcessType;
-import mods.railcraft.util.container.ContainerMapper;
 import mods.railcraft.world.level.block.entity.steamboiler.SteamBoilerBlockEntity;
 import mods.railcraft.world.level.block.steamboiler.FireboxBlock;
 import mods.railcraft.world.level.material.StandardTank;