Dual hatch nerfing and hlsa naming (#1738)

GregTechCEu · Aug 18, 2024 · ff9b7c6 · ff9b7c6
1 parent d0b63da
commit ff9b7c6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 13 deletions.
diff --git a/src/generated/resources/assets/gtceu/compass/nodes/materials/frame.json b/src/generated/resources/assets/gtceu/compass/nodes/materials/frame.json
@@ -4,8 +4,8 @@
     "res": "gtceu:aluminium_frame"
   },
   "items": [
-    "#forge:frames",
-    "#minecraft:climbable"
+    "#minecraft:climbable",
+    "#forge:frames"
   ],
   "page": "gtceu:materials/frame",
   "position": [

diff --git a/src/generated/resources/assets/gtceu/lang/en_ud.json b/src/generated/resources/assets/gtceu/lang/en_ud.json
@@ -5321,7 +5321,7 @@
   "material.gtceu.hot_brine": "ǝuıɹᗺ ʇoH",
   "material.gtceu.hot_chlorinated_brominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹᗺ pǝʇɐuıɹoןɥƆ ʇoH",
   "material.gtceu.hot_debrominated_brine": "ǝuıɹᗺ pǝʇɐuıɯoɹqǝᗡ ʇoH",
-  "material.gtceu.hsla_steel": "ןǝǝʇS ɐןsH",
+  "material.gtceu.hsla_steel": "ןǝǝʇS ⱯꞀSH",
   "material.gtceu.hsse": "Ǝ-SSH",
   "material.gtceu.hssg": "⅁-SSH",
   "material.gtceu.hsss": "S-SSH",

diff --git a/src/generated/resources/assets/gtceu/lang/en_us.json b/src/generated/resources/assets/gtceu/lang/en_us.json
@@ -5321,7 +5321,7 @@
   "material.gtceu.hot_brine": "Hot Brine",
   "material.gtceu.hot_chlorinated_brominated_brine": "Hot Chlorinated Brominated Brine",
   "material.gtceu.hot_debrominated_brine": "Hot Debrominated Brine",
-  "material.gtceu.hsla_steel": "Hsla Steel",
+  "material.gtceu.hsla_steel": "HSLA Steel",
   "material.gtceu.hsse": "HSS-E",
   "material.gtceu.hssg": "HSS-G",
   "material.gtceu.hsss": "HSS-S",

diff --git a/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java b/src/main/java/com/gregtechceu/gtceu/common/data/GTMachines.java
@@ -1118,12 +1118,11 @@ public static BiConsumer<ItemStack, List<Component>> createTankTooltips(String n
                             Component.translatable("gtceu.machine.buffer.import.tooltip"),
                             Component.translatable(
                                     "gtceu.universal.tooltip.item_storage_capacity",
-                                    (1 + Math.min(9, tier)) * (1 + Math.min(9, tier))),
+                                    (int) Math.pow((tier - 4), 2)),
                             Component.translatable(
                                     "gtceu.universal.tooltip.fluid_storage_capacity_mult",
-                                    1 + Math.min(9, tier),
-                                    FluidHatchPartMachine.getTankCapacity(
-                                            DualHatchPartMachine.INITIAL_TANK_CAPACITY, tier)),
+                                    (tier - 4),
+                                    DualHatchPartMachine.INITIAL_TANK_CAPACITY * (1L << (tier - 6))),
                             Component.translatable("gtceu.universal.enabled"))
                     .compassNode("dual_hatch")
                     .register(),

diff --git a/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java b/src/main/java/com/gregtechceu/gtceu/common/machine/multiblock/part/DualHatchPartMachine.java
@@ -28,7 +28,7 @@
 @MethodsReturnNonnullByDefault
 public class DualHatchPartMachine extends ItemBusPartMachine {
 
-    public static final long INITIAL_TANK_CAPACITY = 4 * FluidHelper.getBucket();
+    public static final long INITIAL_TANK_CAPACITY = 16 * FluidHelper.getBucket();
     protected static final ManagedFieldHolder MANAGED_FIELD_HOLDER = new ManagedFieldHolder(DualHatchPartMachine.class,
             TieredIOPartMachine.MANAGED_FIELD_HOLDER);
 
@@ -51,12 +51,11 @@ public DualHatchPartMachine(IMachineBlockEntity holder, int tier, IO io, Object.
     ////////////////////////////////
 
     public static long getTankCapacity(long initialCapacity, int tier) {
-        return initialCapacity * (1L << Math.min(9, tier));
+        return initialCapacity * (1L << (tier - 6));
     }
 
-    protected int getInventorySize() {
-        int sizeRoot = 1 + Math.min(9, getTier());
-        return sizeRoot * sizeRoot;
+    public int getInventorySize() {
+        return (int) Math.pow((getTier() - 4), 2);
     }
 
     protected NotifiableFluidTank createTank(long initialCapacity, int slots, Object... args) {

diff --git a/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java b/src/main/java/com/gregtechceu/gtceu/data/lang/LangHandler.java
@@ -472,6 +472,7 @@ public static void init(RegistrateLangProvider provider) {
         replace(provider, GTMaterials.HSSE.getUnlocalizedName(), "HSS-E");
         replace(provider, GTMaterials.HSSS.getUnlocalizedName(), "HSS-S");
         replace(provider, GTMaterials.RTMAlloy.getUnlocalizedName(), "RTM Alloy");
+        replace(provider, GTMaterials.HSLASteel.getUnlocalizedName(), "HSLA Steel");
 
         replace(provider, GTMaterials.UUMatter.getUnlocalizedName(), "UU-Matter");
         replace(provider, GTMaterials.PCBCoolant.getUnlocalizedName(), "PCB Coolant");