From 6ff6f8636f863b8dc8abb1f53ecef5d0fd6b40a0 Mon Sep 17 00:00:00 2001 From: Elkatra2 <116808419+Elkatra2@users.noreply.github.com> Date: Wed, 18 Sep 2024 11:00:42 +0200 Subject: Fix of new Overflow Valve (#3186) Co-authored-by: Martin Robertz --- .../gtPlusPlus/core/recipe/RecipesMachines.java | 6 +- .../xmod/gregtech/api/enums/GregtechItemList.java | 10 ++-- .../gregtech/common/covers/CoverOverflowValve.java | 68 +++++++++++++--------- .../common/items/MetaGeneratedGregtechItems.java | 40 ++++++------- .../common/items/MetaGeneratedItemIDs.java | 10 ++-- src/main/resources/assets/gregtech/lang/en_US.lang | 17 +++--- 6 files changed, 83 insertions(+), 68 deletions(-) (limited to 'src') diff --git a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java index 75feeb6f6b..2b22652344 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RecipesMachines.java @@ -857,9 +857,9 @@ public class RecipesMachines { } private static void overflowValveCovers() { - ItemStack aOutputs[] = new ItemStack[] { GregtechItemList.Cover_Overflow_LV.get(1L), - GregtechItemList.Cover_Overflow_MV.get(1L), GregtechItemList.Cover_Overflow_HV.get(1L), - GregtechItemList.Cover_Overflow_EV.get(1L), GregtechItemList.Cover_Overflow_IV.get(1L), }; + ItemStack[] aOutputs = new ItemStack[] { GregtechItemList.Cover_Overflow_Valve_LV.get(1L), + GregtechItemList.Cover_Overflow_Valve_MV.get(1L), GregtechItemList.Cover_Overflow_Valve_HV.get(1L), + GregtechItemList.Cover_Overflow_Valve_EV.get(1L), GregtechItemList.Cover_Overflow_Valve_IV.get(1L), }; long[] voltageTiers = new long[] { TierEU.RECIPE_LV, TierEU.RECIPE_MV, TierEU.RECIPE_HV, TierEU.RECIPE_EV, TierEU.RECIPE_IV }; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index e51d60834f..4858b55583 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -806,11 +806,11 @@ public enum GregtechItemList implements IGregtechItemContainer { */ // Fluid Void Covers - Cover_Overflow_LV, - Cover_Overflow_MV, - Cover_Overflow_HV, - Cover_Overflow_EV, - Cover_Overflow_IV, + Cover_Overflow_Valve_LV, + Cover_Overflow_Valve_MV, + Cover_Overflow_Valve_HV, + Cover_Overflow_Valve_EV, + Cover_Overflow_Valve_IV, // Item Void Covers Cover_Overflow_Item_ULV, 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 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= 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(this::getCoverData, this::setCoverData, CoverOverflowValve.this) .addFollower( @@ -229,29 +243,29 @@ public class CoverOverflowValve extends CoverBehaviorBase 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