Rewrite GUIs with ModularUI (#1381)

* Base work for ModularUI compat

* Remove useless interface

* Add almost all the widgets

* Invert method

* Refactor NEI stack placement positions

* NEI handlers on ModularUI

* Add some more docs

* AdvDebugStructureWriter

* Fix NEI progressbar not working

* PrimitiveBlastFurnace

* clean

* derp

* clean

* spotlessApply

* Boilers

* Buffers

* clean

* N by N slots containers

* Fix boilers not having bucket interaction
Put opening UI to individual MetaTEs

* Maintenance Hatch

* clean

* spotlessApply

* Add dependency

* IndustrialApiary

* Adapt to ModularUI change

* Base work for covers & fix crash with MP

* Fix crash with server

* Rewrite base work for covers

* Send initial cover data on cover GUI open
so that the time of showing incorrect data will be eliminated

* Covers part 1

* Rename package: ModularUI -> modularui

* Rename class: GT_UIInfo -> GT_UIInfos

* Fix build

* Covers part2

* Fix missing client check with tile UI & fix title overlap

* CoverTabLine

* Move cover window creators to inner class

* Fix crash with null base TE

* Close GUI when tile is broken

* Color cover window with tile colorization

* Change signature of addUIWidgets

* FluidFilter cover, FluidDisplaySlotWidget, BasicTank, BasicGenerator, Output Hatch, MicrowaveEnergyTransmitter, Teleporter, DigitalChest, DigitalTank

* Add title tab

* Move package: modularui -> modularui/widget

* Programmed circuit + IConfigurationCircuitSupport

* clean

* VolumetricFlask

* Remove integrated circuit overlay from recipe input slots

* Input Hatch & Quadruple Input Hatch

* Multiblock

* Deprecate old cover GUI

* BasicMachines

* Finish BasicMachine & NEI

* Expand DTPF NEI to 9 slots

* Fix ME input bus on MP

* Move AESlotWidget to public class

* Move GT_Recipe_Map constructors with mNEIUnificateOutput to setter method

* Move SteamTexture.Variant to outer enum

* Switch to remote repository

* oops

* Update MUI

* Update MUI

* Minor refactor for change amount buttons

* Display items and fluids that exceed usual count

* blah

* use +=, why didn't I do this

* Update MUI

* Move ModularUI to Base (#1510)

* Move ModularUI to Base
* Move most of the ModularUI functionality to `BaseTileEntity` (and `CoverableTileEntity`)
* `CommonMetaTileEntity` delegates ato the MetaTileEntity
* Added several interfaces (with defaults) to indicate if a tile/metatile override/implement certain behaviors.
* Moved `IConfigurationCircuitSupport` interface such that it will work with BaseTileEntity or a MetaTileEntity

* Address reviews

Co-authored-by: miozune <miozune@gmail.com>

* Update MUI

* Minor changes to NEI

* Return :facepalm:

* IGetTabIconSet override

* Some more changes to NEI

* Merge texture getter interfaces to new class GUITextureSet

* Remove BBF structure picture as it's auto-buildable now

* Make unified title tab style of texture angular

* Expose some boiler texture getters for addon

* Fix crash with cover GUI on pipe

* Lower the number of recipe per page for DTPF & update MUI

* Update MUI

* Fix crash with middle-clicking slot on circuit selection GUI

* Fix circuit selection window not syncing item from base machine

* Merge GT_NEI_AssLineHandler into GT_NEI_DefaultHandler

* Update MUI

* Add in TecTech multi message

* Allow changing the way of binding player inventory

* Update MUI

* Update MUI

* Update MUI

* Update MUI

* Update MUI

* Make MUI non-transitive to allow addons to use their own version

* Force enable mixin

* Format fluid amount tooltip

* Add GUITextureSet.STEAM

* Add guard against null ModularWindow creation

* Add constructors for Muffler Hatch with inventory

* Fix output slot on digital chest and tank allowing insertion

* Don't log null ModularWindow

* Add default implementation for IHasWorldObjectAndCoords#openGUI

* Make openGTTileEntityUI accept MultiTE & cleanup

Co-authored-by: Jason Mitchell <mitchej@gmail.com>

1 files changed, 87 insertions, 151 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
index c9e7ef363a..fbac598d19 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_EUMeter.java
@@ -1,31 +1,31 @@
 package gregtech.common.covers;
 
 import com.google.common.io.ByteArrayDataInput;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.gui.GT_GUICover;
-import gregtech.api.gui.widgets.GT_GuiIcon;
-import gregtech.api.gui.widgets.GT_GuiIconButton;
-import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
-import gregtech.api.gui.widgets.GT_GuiIntegerTextBox;
+import com.gtnewhorizons.modularui.api.math.MathExpression;
+import com.gtnewhorizons.modularui.api.screen.ModularWindow;
+import com.gtnewhorizons.modularui.common.widget.TextWidget;
+import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
+import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicBatteryBuffer;
-import gregtech.api.net.GT_Packet_TileEntityCoverNew;
 import gregtech.api.util.GT_CoverBehaviorBase;
 import gregtech.api.util.GT_Utility;
 import gregtech.api.util.ISerializableObject;
+import gregtech.common.gui.modularui.widget.CoverDataControllerWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollower_CycleButtonWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollower_TextFieldWidget;
+import gregtech.common.gui.modularui.widget.CoverDataFollower_ToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 import java.util.function.Function;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 import net.minecraftforge.fluids.Fluid;
 
 public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMeterData> {
@@ -208,15 +208,85 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
     }
 
     @Override
-    public Object getClientGUIImpl(
-            byte aSide,
-            int aCoverID,
-            EUMeterData coverData,
-            ICoverable aTileEntity,
-            EntityPlayer aPlayer,
-            World aWorld) {
-        return new GUI(aSide, aCoverID, coverData, aTileEntity);
+    public boolean useModularUI() {
+        return true;
+    }
+
+    @Override
+    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+        return new EUMeterUIFactory(buildContext).createWindow();
+    }
+
+    private class EUMeterUIFactory extends UIFactory {
+
+        private static final int startX = 10;
+        private static final int startY = 25;
+        private static final int spaceX = 18;
+        private static final int spaceY = 18;
+
+        public EUMeterUIFactory(GT_CoverUIBuildContext buildContext) {
+            super(buildContext);
+        }
+
+        @SuppressWarnings("PointlessArithmeticExpression")
+        @Override
+        protected void addUIWidgets(ModularWindow.Builder builder) {
+            final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
+            final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
+
+            builder.widget(new CoverDataControllerWidget<>(
+                                    this::getCoverData, this::setCoverData, GT_Cover_EUMeter.this)
+                            .addFollower(
+                                    new CoverDataFollower_CycleButtonWidget<>(),
+                                    coverData -> coverData.type.ordinal(),
+                                    (coverData, state) -> {
+                                        coverData.type = EnergyType.getEnergyType(state);
+                                        return coverData;
+                                    },
+                                    widget -> widget.setLength(EnergyType.values().length)
+                                            .addTooltip(state -> EnergyType.getEnergyType(state)
+                                                    .getTooltip())
+                                            .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_CYCLIC)
+                                            .setPos(spaceX * 0, spaceY * 0))
+                            .addFollower(
+                                    CoverDataFollower_ToggleButtonWidget.ofRedstone(),
+                                    coverData -> coverData.inverted,
+                                    (coverData, state) -> {
+                                        coverData.inverted = state;
+                                        return coverData;
+                                    },
+                                    widget -> widget.addTooltip(0, NORMAL)
+                                            .addTooltip(1, INVERTED)
+                                            .setPos(spaceX * 0, spaceY * 1))
+                            .addFollower(
+                                    new CoverDataFollower_TextFieldWidget<>(),
+                                    coverData -> String.valueOf(coverData.threshold),
+                                    (coverData, state) -> {
+                                        coverData.threshold = (long) MathExpression.parseMathExpression(state);
+                                        return coverData;
+                                    },
+                                    widget -> widget.setOnScrollNumbersLong(1000, 100, 100000)
+                                            .setNumbersLong(() -> 0L, () -> Long.MAX_VALUE)
+                                            .setFocusOnGuiOpen(true)
+                                            .setPos(spaceX * 0, spaceY * 2 + 2)
+                                            .setSize(spaceX * 8, 12))
+                            .setPos(startX, startY))
+                    .widget(TextWidget.dynamicString(() ->
+                                    getCoverData() != null ? getCoverData().type.getTitle() : "")
+                            .setSynced(false)
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(startX + spaceX, 4 + startY))
+                    .widget(TextWidget.dynamicString(
+                                    () -> getCoverData() != null ? getCoverData().inverted ? INVERTED : NORMAL : "")
+                            .setSynced(false)
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(startX + spaceX, 4 + startY + spaceY))
+                    .widget(new TextWidget(GT_Utility.trans("222.1", "Energy threshold"))
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(startX, startY + spaceY * 3 + 4));
+        }
     }
+
     // endregion
 
     public static class EUMeterData implements ISerializableObject {
@@ -390,138 +460,4 @@ public class GT_Cover_EUMeter extends GT_CoverBehaviorBase<GT_Cover_EUMeter.EUMe
             return values()[ordinal];
         }
     }
-
-    private class GUI extends GT_GUICover {
-        private final byte side;
-        private final int coverID;
-        private final GT_GuiIconButton typeButton;
-        private final GT_GuiIconCheckButton invertedButton;
-        private final GT_GuiIntegerTextBox thresholdSlot;
-        private final EUMeterData coverVariable;
-
-        private static final int startX = 10;
-        private static final int startY = 25;
-        private static final int spaceX = 18;
-        private static final int spaceY = 18;
-
-        private final String INVERTED = GT_Utility.trans("INVERTED", "Inverted");
-        private final String NORMAL = GT_Utility.trans("NORMAL", "Normal");
-
-        private final int textColor = this.getTextColorOrDefault("text", 0xFF555555);
-
-        public GUI(byte aSide, int aCoverID, EUMeterData aCoverVariable, ICoverable aTileEntity) {
-            super(aTileEntity, 176, 107, GT_Utility.intToStack(aCoverID));
-            this.side = aSide;
-            this.coverID = aCoverID;
-            this.coverVariable = aCoverVariable;
-
-            typeButton = new GT_GuiIconButton(this, 0, startX, startY, GT_GuiIcon.CYCLIC);
-            invertedButton = new GT_GuiIconCheckButton(
-                    this,
-                    2,
-                    startX,
-                    startY + spaceY,
-                    GT_GuiIcon.REDSTONE_ON,
-                    GT_GuiIcon.REDSTONE_OFF,
-                    INVERTED,
-                    NORMAL);
-            thresholdSlot = new GT_GuiIntegerTextBox(this, 4, startX, startY + spaceY * 2 + 2, spaceX * 8, 12);
-        }
-
-        @Override
-        public void drawExtras(int mouseX, int mouseY, float parTicks) {
-            super.drawExtras(mouseX, mouseY, parTicks);
-            this.getFontRenderer().drawString(coverVariable.type.getTitle(), startX + spaceX, 4 + startY, textColor);
-            this.getFontRenderer()
-                    .drawString(
-                            coverVariable.inverted ? INVERTED : NORMAL,
-                            startX + spaceX,
-                            4 + startY + spaceY,
-                            textColor);
-            this.getFontRenderer()
-                    .drawString(
-                            GT_Utility.trans("222.1", "Energy threshold"), startX, startY + spaceY * 3 + 4, textColor);
-        }
-
-        @Override
-        protected void onInitGui(int guiLeft, int guiTop, int gui_width, int gui_height) {
-            update();
-            thresholdSlot.setFocused(true);
-        }
-
-        @Override
-        public void buttonClicked(GuiButton btn) {
-            if (btn == typeButton) {
-                coverVariable.type = coverVariable.type.getNext();
-            }
-            if (btn == invertedButton) {
-                coverVariable.inverted = !coverVariable.inverted;
-            }
-            GT_Values.NW.sendToServer(new GT_Packet_TileEntityCoverNew(side, coverID, coverVariable, tile));
-            update();
-        }
-
-        @Override
-        public void onMouseWheel(int x, int y, int delta) {
-            if (thresholdSlot.isFocused()) {
-                long val = parseTextBox(thresholdSlot);
-
-                long step = 1000;
-                if (isShiftKeyDown()) {
-                    step *= 100;
-                }
-                if (isCtrlKeyDown()) {
-                    step /= 10;
-                }
-
-                try {
-                    val = Math.addExact(val, delta * step);
-                } catch (ArithmeticException e) {
-                    val = Long.MAX_VALUE;
-                }
-                val = Math.max(0, val);
-                thresholdSlot.setText(Long.toString(val));
-            }
-        }
-
-        @Override
-        public void applyTextBox(GT_GuiIntegerTextBox box) {
-            if (box == thresholdSlot) {
-                coverVariable.threshold = parseTextBox(thresholdSlot);
-            }
-
-            GT_Values.NW.sendToServer(new GT_Packet_TileEntityCoverNew(side, coverID, coverVariable, tile));
-            update();
-        }
-
-        @Override
-        public void resetTextBox(GT_GuiIntegerTextBox box) {
-            if (box == thresholdSlot) {
-                thresholdSlot.setText(Long.toString(coverVariable.threshold));
-            }
-        }
-
-        private void update() {
-            invertedButton.setChecked(coverVariable.inverted);
-            typeButton.setTooltipText(coverVariable.type.getTooltip());
-            resetTextBox(thresholdSlot);
-        }
-
-        private long parseTextBox(GT_GuiIntegerTextBox box) {
-            if (box == thresholdSlot) {
-                String text = box.getText();
-                if (text == null) {
-                    return 0;
-                }
-                long val;
-                try {
-                    val = Long.parseLong(text.trim());
-                } catch (NumberFormatException e) {
-                    return 0;
-                }
-                return Math.max(0, val);
-            }
-            throw new UnsupportedOperationException("Unknown text box: " + box);
-        }
-    }
 }