Fix of new Overflow Valve (#3186)

Co-authored-by: Martin Robertz <dream-master@gmx.net>

3 files changed, 66 insertions, 52 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflowValve.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflowValve.java
index fb1c58bd62..c86e18ea1a 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflowValve.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/covers/CoverOverflowValve.java
@@ -43,7 +43,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
 
     @Override
     public OverflowValveData createDataObject() {
-        return new OverflowValveData(0, 0, false, true);
+        return new OverflowValveData(maxOverflowPoint, maxOverflowPoint / 10, true, true);
     }
 
     @Override
@@ -64,9 +64,9 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
     @Override
     protected OverflowValveData doCoverThingsImpl(ForgeDirection side, byte aInputRedstone, int aCoverID,
         OverflowValveData data, ICoverable aTileEntity, long aTimer) {
-        if (data == null) return new OverflowValveData(0, 0, false, true);
+        if (data == null) return new OverflowValveData(maxOverflowPoint, maxOverflowPoint / 10, true, true);
 
-        if (data.voidingRate == 0 || data.voidingRate > data.overflowPoint) return data;
+        if (data.overflowPoint == 0 || data.voidingRate == 0) return data;
 
         if (aTileEntity instanceof CommonMetaTileEntity common) {
             IMetaTileEntity tile = common.getMetaTileEntity();
@@ -85,7 +85,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
     // Overrides methods
 
     @Override
-    protected boolean alwaysLookConnectedImpl(ForgeDirection side, int aCoverID, OverflowValveData data,
+    protected boolean alwaysLookConnectedImpl(ForgeDirection side, int aCoverID, OverflowValveData aCoverVariable,
         ICoverable aTileEntity) {
         return true;
     }
@@ -157,20 +157,19 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
 
         GTUtility.sendChatToPlayer(
             aPlayer,
-            StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_overflow_point") + data.overflowPoint
-                + StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_l_per_second"));
+            StatCollector
+                .translateToLocalFormatted("GTPP.chat.text.cover_overflow_valve_overflow_point", data.overflowPoint));
         return data;
     }
 
     @Override
     protected boolean onCoverRightClickImpl(ForgeDirection side, int aCoverID, OverflowValveData data,
         ICoverable aTileEntity, EntityPlayer aPlayer, float aX, float aY, float aZ) {
-        boolean aShift = aPlayer.isSneaking();
-        int aAmount = aShift ? 128 : 8;
+        int amount = aPlayer.isSneaking() ? 128 : 8;
         if (GTUtility.getClickedFacingCoords(side, aX, aY, aZ)[0] >= 0.5F) {
-            data.overflowPoint += aAmount;
+            data.overflowPoint += amount;
         } else {
-            data.overflowPoint -= aAmount;
+            data.overflowPoint -= amount;
         }
 
         if (data.overflowPoint > maxOverflowPoint) data.overflowPoint = minOverflowPoint;
@@ -178,12 +177,11 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
 
         GTUtility.sendChatToPlayer(
             aPlayer,
-            StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_overflow_point") + data.overflowPoint
-                + StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_l_per_second"));
+            StatCollector
+                .translateToLocalFormatted("GTPP.chat.text.cover_overflow_valve_overflow_point", data.overflowPoint));
         aTileEntity.setCoverDataAtSide(side, data);
         return true;
     }
-
     // GUI
 
     @Override
@@ -199,8 +197,24 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
     private final class OverflowUIFactory extends UIFactory {
 
         // width and height of text input for "Overflow Point" and "Voiding Rate"
-        private static final int width = 73;
-        private static final int height = 12;
+        private static final int width = 71;
+        private static final int height = 10;
+
+        // fluid input buttons coordinates
+        private static final int xFI = 43;
+        private static final int yFI = 81;
+
+        // fluid output buttons coordinates
+        private static final int xFO = 6;
+        private static final int yFO = 81;
+
+        // Overflow Point 2x text + input coordinates
+        private static final int xOP = 6;
+        private static final int yOP = 27;
+
+        // Voiding Rate 2x text + input coordinates
+        private static final int xVR = 6;
+        private static final int yVR = 53;
 
         public OverflowUIFactory(CoverUIBuildContext buildContext) {
             super(buildContext);
@@ -212,11 +226,11 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                 .widget(
                     new TextWidget(StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_overflow_point"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(57, 35))
+                        .setPos(xOP, yOP))
                 .widget(
-                    new TextWidget(StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_l_per_second"))
+                    new TextWidget(StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_liter"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(77, 35))
+                        .setPos(xOP + width + 3, yOP + 11))
                 .widget(
                     new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverOverflowValve.this)
                         .addFollower(
@@ -229,29 +243,29 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                             widget -> widget.setBounds(minOverflowPoint, maxOverflowPoint)
                                 .setScrollValues(1000, 144, 100000)
                                 .setFocusOnGuiOpen(true)
-                                .setPos(57, 45)
+                                .setPos(xOP, yOP + 10)
                                 .setSize(width, height)))
                 .widget(
                     new TextWidget(StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_voiding_rate"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(63, 77))
+                        .setPos(xVR + 6, yVR))
                 .widget(
                     new TextWidget(StatCollector.translateToLocal("GTPP.gui.text.cover_overflow_valve_l_per_update"))
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(77, 35))
+                        .setPos(xVR + width + 3, yVR + 11))
                 .widget(
                     new CoverDataControllerWidget<>(this::getCoverData, this::setCoverData, CoverOverflowValve.this)
                         .addFollower(
                             new CoverDataFollowerNumericWidget<>(),
                             coverData -> (double) coverData.voidingRate,
                             (coverData, state) -> {
-                                coverData.voidingRate = Math.min(state.intValue(), coverData.overflowPoint);
+                                coverData.voidingRate = state.intValue();
                                 return coverData;
                             },
                             widget -> widget.setBounds(minOverflowPoint, maxOverflowPoint)
                                 .setScrollValues(1000, 144, 100000)
                                 .setFocusOnGuiOpen(true)
-                                .setPos(57, 87)
+                                .setPos(xVR, yVR + 10)
                                 .setSize(width, height)))
                 .widget(
                     new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
@@ -267,7 +281,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                                     .addTooltip(
                                         StatCollector
                                             .translateToLocal("GTPP.gui.text.cover_overflow_valve_allow_fluid_input"))
-                                    .setPos(21, 69))
+                                    .setPos(xFI + 18, yFI))
                             .addToggleButton(
                                 1,
                                 CoverDataFollowerToggleButtonWidget.ofDisableable(),
@@ -275,7 +289,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                                     .addTooltip(
                                         StatCollector
                                             .translateToLocal("GTPP.gui.text.cover_overflow_valve_block_fluid_input"))
-                                    .setPos(12, 69))
+                                    .setPos(xFI, yFI))
                             .addToggleButton(
                                 2,
                                 CoverDataFollowerToggleButtonWidget.ofDisableable(),
@@ -283,7 +297,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                                     .addTooltip(
                                         StatCollector
                                             .translateToLocal("GTPP.gui.text.cover_overflow_valve_allow_fluid_output"))
-                                    .setPos(21, 86))
+                                    .setPos(xFO, yFO))
                             .addToggleButton(
                                 3,
                                 CoverDataFollowerToggleButtonWidget.ofDisableable(),
@@ -291,7 +305,7 @@ public class CoverOverflowValve extends CoverBehaviorBase<CoverOverflowValve.Ove
                                     .addTooltip(
                                         StatCollector
                                             .translateToLocal("GTPP.gui.text.cover_overflow_valve_block_fluid_output"))
-                                    .setPos(12, 86)));
+                                    .setPos(xFO + 18, yFO)));
         }
 
         private boolean getClickable(int id, OverflowValveData data) {
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
index d4c54bc66f..e4769e98ed 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedGregtechItems.java
@@ -17,11 +17,11 @@ import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Lithium;
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Battery_RE_EV_Sodium;
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Compressed_Fusion_Reactor;
-import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_EV;
-import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_HV;
-import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_IV;
-import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_LV;
-import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_MV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_Valve_EV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_Valve_HV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_Valve_IV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_Valve_LV;
+import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Cover_Overflow_Valve_MV;
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Distillus_Upgrade_Chip;
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Gregtech_Computer_Cube;
 import static gtPlusPlus.xmod.gregtech.common.items.MetaGeneratedItemIDs.Laser_Lens_Special;
@@ -184,9 +184,9 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
                 getTcAspectStack(TCAspects.METALLUM, 8L),
                 getTcAspectStack(TCAspects.POTENTIA, 8L)));
 
-        GregtechItemList.Cover_Overflow_LV.set(
+        GregtechItemList.Cover_Overflow_Valve_LV.set(
             this.addItem(
-                Cover_Overflow_LV.ID,
+                Cover_Overflow_Valve_LV.ID,
                 "Overflow Valve (LV)",
                 "Maximum void amount: 64,000",
                 getTcAspectStack(TCAspects.ELECTRUM, 1L),
@@ -194,9 +194,9 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
                 getTcAspectStack(TCAspects.ITER, 1L),
                 getTcAspectStack(TCAspects.AQUA, 1L)));
 
-        GregtechItemList.Cover_Overflow_MV.set(
+        GregtechItemList.Cover_Overflow_Valve_MV.set(
             this.addItem(
-                Cover_Overflow_MV.ID,
+                Cover_Overflow_Valve_MV.ID,
                 "Overflow Valve (MV)",
                 "Maximum void amount: 512,000",
                 getTcAspectStack(TCAspects.ELECTRUM, 1L),
@@ -204,9 +204,9 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
                 getTcAspectStack(TCAspects.ITER, 1L),
                 getTcAspectStack(TCAspects.AQUA, 1L)));
 
-        GregtechItemList.Cover_Overflow_HV.set(
+        GregtechItemList.Cover_Overflow_Valve_HV.set(
             this.addItem(
-                Cover_Overflow_HV.ID,
+                Cover_Overflow_Valve_HV.ID,
                 "Overflow Valve (HV)",
                 "Maximum void amount: 4,096,000",
                 getTcAspectStack(TCAspects.ELECTRUM, 1L),
@@ -214,9 +214,9 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
                 getTcAspectStack(TCAspects.ITER, 1L),
                 getTcAspectStack(TCAspects.AQUA, 1L)));
 
-        GregtechItemList.Cover_Overflow_EV.set(
+        GregtechItemList.Cover_Overflow_Valve_EV.set(
             this.addItem(
-                Cover_Overflow_EV.ID,
+                Cover_Overflow_Valve_EV.ID,
                 "Overflow Valve (EV)",
                 "Maximum void amount: 32,768,000",
                 getTcAspectStack(TCAspects.ELECTRUM, 1L),
@@ -224,9 +224,9 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
                 getTcAspectStack(TCAspects.ITER, 1L),
                 getTcAspectStack(TCAspects.AQUA, 1L)));
 
-        GregtechItemList.Cover_Overflow_IV.set(
+        GregtechItemList.Cover_Overflow_Valve_IV.set(
             this.addItem(
-                Cover_Overflow_IV.ID,
+                Cover_Overflow_Valve_IV.ID,
                 "Overflow Valve (IV)",
                 "Maximum void amount: 262,144,000",
                 getTcAspectStack(TCAspects.ELECTRUM, 1L),
@@ -369,31 +369,31 @@ public class MetaGeneratedGregtechItems extends GTMetaItemX32 {
 
     private void registerCovers() {
         GregTechAPI.registerCover(
-            GregtechItemList.Cover_Overflow_LV.get(1L),
+            GregtechItemList.Cover_Overflow_Valve_LV.get(1L),
             new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[4][0],
                 new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
             new CoverOverflowValve(64_000));
         GregTechAPI.registerCover(
-            GregtechItemList.Cover_Overflow_MV.get(1L),
+            GregtechItemList.Cover_Overflow_Valve_MV.get(1L),
             new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
                 new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
             new CoverOverflowValve(512_000));
         GregTechAPI.registerCover(
-            GregtechItemList.Cover_Overflow_HV.get(1L),
+            GregtechItemList.Cover_Overflow_Valve_HV.get(1L),
             new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[5][0],
                 new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
             new CoverOverflowValve(4_096_000));
         GregTechAPI.registerCover(
-            GregtechItemList.Cover_Overflow_EV.get(1L),
+            GregtechItemList.Cover_Overflow_Valve_EV.get(1L),
             new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
                 new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
             new CoverOverflowValve(32_768_000));
         GregTechAPI.registerCover(
-            GregtechItemList.Cover_Overflow_IV.get(1L),
+            GregtechItemList.Cover_Overflow_Valve_IV.get(1L),
             new GTMultiTexture(
                 Textures.BlockIcons.MACHINE_CASINGS[8][0],
                 new GTRenderedTexture(TexturesGtBlock.Overlay_Overflow_Valve)),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
index 72f5c66c58..abc98a9c40 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/items/MetaGeneratedItemIDs.java
@@ -14,11 +14,11 @@ public enum MetaGeneratedItemIDs {
     Battery_Gem_1(66),
     Battery_Gem_2(68),
     Battery_Gem_3(70),
-    Cover_Overflow_LV(72),
-    Cover_Overflow_MV(73),
-    Cover_Overflow_HV(74),
-    Cover_Overflow_EV(75),
-    Cover_Overflow_IV(76),
+    Cover_Overflow_Valve_LV(72),
+    Cover_Overflow_Valve_MV(73),
+    Cover_Overflow_Valve_HV(74),
+    Cover_Overflow_Valve_EV(75),
+    Cover_Overflow_Valve_IV(76),
     Compressed_Fusion_Reactor(100),
     Laser_Lens_Special(105),
     Battery_Casing_Gem_1(106),