fix merge conflict correctly (#1926)

GTNewHorizons · Apr 26, 2023 · 6d2ea3c · 6d2ea3c
1 parent 51c5918
commit 6d2ea3c
Showing 1 changed file with 2 additions and 17 deletions.
diff --git a/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_LiquidMeter.java
@@ -211,16 +211,6 @@ protected void addUIWidgets(ModularWindow.Builder builder) {
                         widget -> widget.addTooltip(0, NORMAL)
                             .addTooltip(1, INVERTED)
                             .setPos(spaceX * 0, spaceY * 0))
-                    .addFollower(
-                        CoverDataFollower_ToggleButtonWidget.ofRedstone(),
-                        coverData -> coverData.strong,
-                        (coverData, state) -> {
-                            coverData.strong = state;
-                            return coverData;
-                        },
-                        widget -> widget.addTooltip(0, WEAK)
-                            .addTooltip(1, STRONG)
-                            .setPos(spaceX * 0, spaceY * 1))
                     .addFollower(
                         new CoverDataFollower_TextFieldWidget<>(),
                         coverData -> String.valueOf(coverData.threshold),
@@ -231,7 +221,7 @@ protected void addUIWidgets(ModularWindow.Builder builder) {
                         widget -> widget.setOnScrollNumbers(1000, 100, 100000)
                             .setNumbers(0, maxCapacity > 0 ? maxCapacity : Integer.MAX_VALUE)
                             .setFocusOnGuiOpen(true)
-                            .setPos(spaceX * 0, spaceY * 2 + 2)
+                            .setPos(spaceX * 0, spaceY * 1 + 2)
                             .setSize(spaceX * 4 + 5, 12))
                     .setPos(startX, startY))
                 .widget(
@@ -240,14 +230,9 @@ protected void addUIWidgets(ModularWindow.Builder builder) {
                         .setSynced(false)
                         .setDefaultColor(COLOR_TEXT_GRAY.get())
                         .setPos(startX + spaceX * 1, 4 + startY + spaceY * 0))
-                .widget(
-                    TextWidget.dynamicString(() -> getCoverData() != null ? getCoverData().strong ? STRONG : WEAK : "")
-                        .setSynced(false)
-                        .setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(startX + spaceX * 1, 4 + startY + spaceY * 1))
                 .widget(
                     new TextWidget(GT_Utility.trans("222", "Fluid threshold")).setDefaultColor(COLOR_TEXT_GRAY.get())
-                        .setPos(startX + spaceX * 5 - 10, startY + spaceY * 2 + 4));
+                        .setPos(startX + spaceX * 5 - 10, startY + spaceY * 1 + 4));
         }
     }