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, 82 insertions, 76 deletions

diff --git a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
index 8c52ade5d2..a2707043ef 100644
--- a/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
+++ b/src/main/java/gregtech/common/covers/GT_Cover_FacadeBase.java
@@ -1,30 +1,29 @@
 package gregtech.common.covers;
 
 import com.google.common.io.ByteArrayDataInput;
+import com.gtnewhorizons.modularui.api.drawable.ItemDrawable;
+import com.gtnewhorizons.modularui.api.screen.ModularWindow;
+import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import cpw.mods.fml.common.network.ByteBufUtils;
-import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUICover;
-import gregtech.api.gui.widgets.GT_GuiIcon;
-import gregtech.api.gui.widgets.GT_GuiIconCheckButton;
+import gregtech.api.gui.modularui.GT_CoverUIBuildContext;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.ICoverable;
-import gregtech.api.net.GT_Packet_TileEntityCoverNew;
 import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_CoverBehaviorBase;
 import gregtech.api.util.GT_RenderingWorld;
 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_ToggleButtonWidget;
 import io.netty.buffer.ByteBuf;
 import javax.annotation.Nonnull;
 import net.minecraft.block.Block;
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTBase;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 
@@ -301,94 +300,91 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
         }
     }
 
-    /**
-     * GUI Stuff
-     */
+    // GUI stuff
+
     @Override
     public boolean hasCoverGUI() {
         return true;
     }
 
     @Override
-    protected Object getClientGUIImpl(
-            byte aSide,
-            int aCoverID,
-            FacadeData coverData,
-            ICoverable aTileEntity,
-            EntityPlayer aPlayer,
-            World aWorld) {
-        return new GT_Cover_FacadeBase.GUI(aSide, aCoverID, coverData, aTileEntity);
+    public boolean useModularUI() {
+        return true;
+    }
+
+    @Override
+    public ModularWindow createWindow(GT_CoverUIBuildContext buildContext) {
+        return new FacadeBaseUIFactory(buildContext).createWindow();
     }
 
-    private class GUI extends GT_GUICover {
-        private final byte side;
-        private final int coverID;
-        private FacadeData coverVariable;
+    private class FacadeBaseUIFactory 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;
 
-        private final int textColor = this.getTextColorOrDefault("text", 0xFF555555);
-
-        public GUI(byte aSide, int aCoverID, FacadeData aCoverVariable, ICoverable aTileEntity) {
-            super(aTileEntity, 176, 107, aCoverVariable.mStack);
-            this.side = aSide;
-            this.coverID = aCoverID;
-            this.coverVariable = aCoverVariable;
-
-            new GT_GuiIconCheckButton(
-                            this, 0, startX + spaceX * 0, startY + spaceY * 0, GT_GuiIcon.CHECKMARK, GT_GuiIcon.CROSS)
-                    .setChecked((coverVariable.mFlags & 0x1) == 0);
-            new GT_GuiIconCheckButton(
-                            this, 1, startX + spaceX * 0, startY + spaceY * 1, GT_GuiIcon.CHECKMARK, GT_GuiIcon.CROSS)
-                    .setChecked((coverVariable.mFlags & 0x2) == 0);
-            new GT_GuiIconCheckButton(
-                            this, 2, startX + spaceX * 0, startY + spaceY * 2, GT_GuiIcon.CHECKMARK, GT_GuiIcon.CROSS)
-                    .setChecked((coverVariable.mFlags & 0x4) == 0);
-            new GT_GuiIconCheckButton(
-                            this, 3, startX + spaceX * 0, startY + spaceY * 3, GT_GuiIcon.CHECKMARK, GT_GuiIcon.CROSS)
-                    .setChecked((coverVariable.mFlags & 0x8) == 0);
+        public FacadeBaseUIFactory(GT_CoverUIBuildContext buildContext) {
+            super(buildContext);
         }
 
+        @SuppressWarnings("PointlessArithmeticExpression")
         @Override
-        public void drawExtras(int mouseX, int mouseY, float parTicks) {
-            super.drawExtras(mouseX, mouseY, parTicks);
-            this.fontRendererObj.drawString(
-                    GT_Utility.trans("128", "Redstone"), 3 + startX + spaceX * 1, 4 + startY + spaceY * 0, textColor);
-            this.fontRendererObj.drawString(
-                    GT_Utility.trans("129", "Energy"), 3 + startX + spaceX * 1, 4 + startY + spaceY * 1, textColor);
-            this.fontRendererObj.drawString(
-                    GT_Utility.trans("130", "Fluids"), 3 + startX + spaceX * 1, 4 + startY + spaceY * 2, textColor);
-            this.fontRendererObj.drawString(
-                    GT_Utility.trans("131", "Items"), 3 + startX + spaceX * 1, 4 + startY + spaceY * 3, textColor);
+        protected void addUIWidgets(ModularWindow.Builder builder) {
+            builder.widget(new CoverDataControllerWidget.CoverDataIndexedControllerWidget_ToggleButtons<>(
+                                    this::getCoverData,
+                                    this::setCoverData,
+                                    GT_Cover_FacadeBase.this,
+                                    this::isEnabled,
+                                    (id, coverData) -> {
+                                        coverData.mFlags = getNewCoverVariable(id, coverData);
+                                        return coverData;
+                                    })
+                            .addToggleButton(
+                                    0,
+                                    CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                                    widget -> widget.setPos(spaceX * 0, spaceY * 0))
+                            .addToggleButton(
+                                    1,
+                                    CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                                    widget -> widget.setPos(spaceX * 0, spaceY * 1))
+                            .addToggleButton(
+                                    2,
+                                    CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                                    widget -> widget.setPos(spaceX * 0, spaceY * 2))
+                            .addToggleButton(
+                                    3,
+                                    CoverDataFollower_ToggleButtonWidget.ofCheckAndCross(),
+                                    widget -> widget.setPos(spaceX * 0, spaceY * 3))
+                            .setPos(startX, startY))
+                    .widget(new ItemDrawable(() -> getCoverData() != null ? getCoverData().mStack : null)
+                            .asWidget()
+                            .setPos(5, 5)
+                            .setSize(16, 16))
+                    .widget(TextWidget.dynamicString(() -> getCoverData() != null
+                                    ? getCoverData().mStack.getDisplayName()
+                                    : "")
+                            .setSynced(false)
+                            .setDefaultColor(COLOR_TITLE.get())
+                            .setPos(25, 9))
+                    .widget(new TextWidget(GT_Utility.trans("128", "Redstone"))
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 0))
+                    .widget(new TextWidget(GT_Utility.trans("129", "Energy"))
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 1))
+                    .widget(new TextWidget(GT_Utility.trans("130", "Fluids"))
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 2))
+                    .widget(new TextWidget(GT_Utility.trans("131", "Items"))
+                            .setDefaultColor(COLOR_TEXT_GRAY.get())
+                            .setPos(3 + startX + spaceX * 1, 4 + startY + spaceY * 3));
         }
 
         @Override
-        protected void onInitGui(int guiLeft, int guiTop, int gui_width, int gui_height) {
-            updateButtons();
-        }
+        protected void addTitleToUI(ModularWindow.Builder builder) {}
 
-        @Override
-        public void buttonClicked(GuiButton btn) {
-            if (getClickable(btn.id)) {
-                coverVariable.mFlags = getNewCoverVariable(btn.id);
-                GT_Values.NW.sendToServer(new GT_Packet_TileEntityCoverNew(side, coverID, coverVariable, tile));
-            }
-            updateButtons();
-        }
-
-        private void updateButtons() {
-            GT_GuiIconCheckButton b;
-            for (Object o : buttonList) {
-                b = (GT_GuiIconCheckButton) o;
-                b.enabled = getClickable(b.id);
-                b.setChecked((coverVariable.mFlags & (1 << b.id)) != 0);
-            }
-        }
-
-        private int getNewCoverVariable(int id) {
+        private int getNewCoverVariable(int id, FacadeData coverVariable) {
             switch (id) {
                 case 0:
                     return coverVariable.mFlags ^ 0x1;
@@ -402,8 +398,18 @@ public abstract class GT_Cover_FacadeBase extends GT_CoverBehaviorBase<GT_Cover_
             return coverVariable.mFlags;
         }
 
-        private boolean getClickable(int id) {
-            return coverVariable.mFlags >= 0 && coverVariable.mFlags <= 15;
+        private boolean isEnabled(int id, FacadeData coverVariable) {
+            switch (id) {
+                case 0:
+                    return (coverVariable.mFlags & 0x1) > 0;
+                case 1:
+                    return (coverVariable.mFlags & 0x2) > 0;
+                case 2:
+                    return (coverVariable.mFlags & 0x4) > 0;
+                case 3:
+                    return (coverVariable.mFlags & 0x8) > 0;
+            }
+            return false;
         }
     }
 }