Rewrite GUIs with ModularUI (#440)

* Update GT

* NEI migration & cleanup
Deprecate GTPP_Recipe_Map_Internal#sMappingsEx and delegate to GT_Recipe_Map#sMappings instead
Remove recipe modification check

* Boiler

* Programmed Circuit & Super Bus

* Lower the number of fluid slots for multi mixer NEI

* Solar Generator

* Crop Manager

* Bronze Workbench & Advanced Workbench

* Turbine Housing & Rotor Assembly

* Iron Plated Blast Furnace

* Player Safe

* Advanced Muffler Hatch

* spotlessApply

* Auto Workbench

* Breaker, Control Core, RTG Hatch, Steam Bus, some cleanup

* Fix crash when removing Breaker

* Data Orb Repository

* Charging/Discharging Bus

* Pollution Scrubber

* Storage Crate, Shelf, TieredChest
They're just broken in the first place, don't blame me

* cleanup

* Steam Condenser
It's broken in the first place, never blame me!

* Catalyst Housing, Ball Housing

* Fluid Tank, generators, custom hatches, cleanup

* Computer Cube MKII
Many things are broken in the first place, I swear

* Inventory Manager

* Migrate multiblock dehydrator recipemap to ModularUI

* Overflow cover

* Redstone Circuit Block

* Multiblock

* cleanup

* Update GT

2 files changed, 196 insertions, 41 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
index 2f88c6a784..9846813ba0 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneBase.java
@@ -6,7 +6,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachi
 import gregtech.api.objects.GT_ItemStack;
 import gtPlusPlus.core.lib.CORE;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 
@@ -83,22 +82,6 @@ public abstract class GT_MetaTileEntity_RedstoneBase extends GT_MetaTileEntity_T
     }
 
     @Override
-    public Object getServerGUI(
-            int aID,
-            InventoryPlayer aPlayerInventory,
-            gregtech.api.interfaces.tileentity.IGregTechTileEntity aBaseMetaTileEntity) {
-        return null;
-    }
-
-    @Override
-    public Object getClientGUI(
-            int aID,
-            InventoryPlayer aPlayerInventory,
-            gregtech.api.interfaces.tileentity.IGregTechTileEntity aBaseMetaTileEntity) {
-        return null;
-    }
-
-    @Override
     public final void onOpenGUI() {
         super.onOpenGUI();
         mOpenerCount++;
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
index caba805f65..64efa84154 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/redstone/GT_MetaTileEntity_RedstoneCircuitBlock.java
@@ -1,28 +1,38 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.redstone;
 
+import com.gtnewhorizons.modularui.api.screen.ModularWindow;
+import com.gtnewhorizons.modularui.api.screen.UIBuildContext;
+import com.gtnewhorizons.modularui.common.widget.ButtonWidget;
+import com.gtnewhorizons.modularui.common.widget.CycleButtonWidget;
+import com.gtnewhorizons.modularui.common.widget.DrawableWidget;
+import com.gtnewhorizons.modularui.common.widget.FakeSyncWidget;
+import com.gtnewhorizons.modularui.common.widget.SlotWidget;
+import com.gtnewhorizons.modularui.common.widget.TextWidget;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.GT_Values;
+import gregtech.api.gui.modularui.GT_UIInfos;
+import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.IRedstoneCircuitBlock;
 import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.modularui.IAddUIWidgets;
 import gregtech.api.interfaces.tileentity.ICoverable;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.*;
-import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_Container_RedstoneCircuitBlock;
-import gtPlusPlus.xmod.gregtech.api.gui.computer.GT_GUIContainer_RedstoneCircuitBlock;
+import gtPlusPlus.xmod.gregtech.api.gui.GTPP_UITextures;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 import java.util.*;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.oredict.OreDictionary;
 
 public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_RedstoneBase
-        implements IRedstoneCircuitBlock {
+        implements IRedstoneCircuitBlock, IAddUIWidgets {
 
     public int mGate = 0, mGateData[] = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
     public boolean bOutput = true;
@@ -42,18 +52,6 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     }
 
     @Override
-    public Object getServerGUI(
-            final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_Container_RedstoneCircuitBlock(aPlayerInventory, aBaseMetaTileEntity);
-    }
-
-    @Override
-    public Object getClientGUI(
-            final int aID, final InventoryPlayer aPlayerInventory, final IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_RedstoneCircuitBlock(aPlayerInventory, aBaseMetaTileEntity);
-    }
-
-    @Override
     public boolean hasSidedRedstoneOutputBehavior() {
         return true;
     }
@@ -130,10 +128,7 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
 
     @Override
     public boolean onRightclick(final IGregTechTileEntity aBaseMetaTileEntity, final EntityPlayer aPlayer) {
-        if (aBaseMetaTileEntity.isClientSide()) {
-            return true;
-        }
-        aBaseMetaTileEntity.openGUI(aPlayer, 147);
+        GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer);
         return true;
     }
 
@@ -150,10 +145,6 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
         if (mGateData.length != 8) mGateData = new int[] {0, 0, 0, 0, 0, 0, 0, 0};
     }
 
-    public void switchOutput() {
-        bOutput = !bOutput;
-    }
-
     public void switchGateForward(boolean aShift) {
         try {
             Set<Integer> tKeys = GregTech_API.sCircuitryBehaviors.keySet();
@@ -499,4 +490,185 @@ public class GT_MetaTileEntity_RedstoneCircuitBlock extends GT_MetaTileEntity_Re
     public ITexture[] getSidesActive(final byte aColor) {
         return new ITexture[] {getBase(), new GT_RenderedTexture(TexturesGtBlock.Casing_Redstone_Side_On)};
     }
+
+    @Override
+    public boolean useModularUI() {
+        return true;
+    }
+
+    @Override
+    public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
+        builder.widget(new DrawableWidget()
+                .setDrawable(GTPP_UITextures.PICTURE_REDSTONE_CIRCUIT_SCREEN)
+                .setPos(43, 5)
+                .setSize(108, 72));
+        for (int i = 0; i < 4; i++) {
+            final int index = i;
+            builder.widget(new ButtonWidget()
+                            .setOnClick((clickData, widget) -> {
+                                ItemStack tStack = widget.getContext()
+                                        .getPlayer()
+                                        .inventory
+                                        .getItemStack();
+                                if (tStack == null) {
+                                    changeGateData(
+                                            index,
+                                            clickData.mouseButton == 0
+                                                    ? clickData.shift ? +128 : +1
+                                                    : clickData.shift ? -128 : -1);
+                                } else {
+                                    tStack = GT_Utility.copy(tStack);
+                                    if (clickData.mouseButton != 0) tStack.setItemDamage(OreDictionary.WILDCARD_VALUE);
+                                    stackGateData(index, tStack);
+                                }
+                            })
+                            .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_PLUS_MINUS)
+                            .setPos(7, 5 + i * 18)
+                            .setSize(18, 18))
+                    .widget(SlotWidget.phantom(inventoryHandler, i + 1)
+                            .disableInteraction()
+                            .setPos(25, 5 + i * 18));
+        }
+        builder.widget(new CycleButtonWidget()
+                        .setToggle(() -> bOutput, val -> bOutput = val)
+                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                        .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_EMIT_ENERGY)
+                        .addTooltip("Toggle EU Output")
+                        .setPos(151, 5)
+                        .setSize(18, 18))
+                .widget(new CycleButtonWidget()
+                        .setToggle(() -> getBaseMetaTileEntity().isActive(), val -> getBaseMetaTileEntity()
+                                .setActive(val))
+                        .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+                        .setStaticTexture(GTPP_UITextures.OVERLAY_BUTTON_ACTIVE_STATE)
+                        .addTooltip("Toggle Active State")
+                        .setPos(151, 23)
+                        .setSize(18, 18))
+                .widget(new ButtonWidget()
+                        .setOnClick((clickData, widget) -> {
+                            if (clickData.mouseButton == 0) switchGateForward(clickData.shift);
+                            else switchGateBackward(clickData.shift);
+                        })
+                        .setBackground(GT_UITextures.BUTTON_STANDARD, GTPP_UITextures.OVERLAY_BUTTON_CHANGE_MODE)
+                        .addTooltip("Change Redstone Circuit")
+                        .setPos(151, 41)
+                        .setSize(18, 18));
+
+        builder.widget(new FakeSyncWidget.IntegerSyncer(() -> mGate, val -> mGate = val));
+        for (int i = 0; i < mGateData.length; i++) {
+            final int index = i;
+            builder.widget(new FakeSyncWidget.IntegerSyncer(() -> mGateData[index], val -> mGateData[index] = val));
+        }
+
+        builder.widget(new DrawableWidget()
+                        .setDrawable(() -> {
+                            if (getBaseMetaTileEntity().getErrorDisplayID() > 0) {
+                                if ((getBaseMetaTileEntity().getTimer() / 5) % 2 == 0) {
+                                    return GTPP_UITextures.PICTURE_ELECTRICITY_ERROR;
+                                } else {
+                                    return null;
+                                }
+                            } else {
+                                return GTPP_UITextures.PICTURE_ELECTRICITY_FINE;
+                            }
+                        })
+                        .setPos(140, 9)
+                        .setSize(7, 7))
+                .widget(new FakeSyncWidget.IntegerSyncer(
+                        () -> getBaseMetaTileEntity().getErrorDisplayID(),
+                        val -> getBaseMetaTileEntity().setErrorDisplayID(val)));
+
+        builder.widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getName();
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 8))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getDescription();
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 19))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 0);
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 33))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 1);
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 44))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 2);
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 55))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) return tCircuit.getDataDescription(mGateData, 3);
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(46, 66))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) {
+                                String tString = tCircuit.getDataDisplay(mGateData, 0);
+                                return tString == null ? GT_Utility.parseNumberToString(mGateData[0]) : tString;
+                            }
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(99, 33))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) {
+                                String tString = tCircuit.getDataDisplay(mGateData, 1);
+                                return tString == null ? GT_Utility.parseNumberToString(mGateData[1]) : tString;
+                            }
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(99, 44))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) {
+                                String tString = tCircuit.getDataDisplay(mGateData, 2);
+                                return tString == null ? GT_Utility.parseNumberToString(mGateData[2]) : tString;
+                            }
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(99, 55))
+                .widget(TextWidget.dynamicString(() -> {
+                            GT_CircuitryBehavior tCircuit = GregTech_API.sCircuitryBehaviors.get(mGate);
+                            if (tCircuit != null) {
+                                String tString = tCircuit.getDataDisplay(mGateData, 3);
+                                return tString == null ? GT_Utility.parseNumberToString(mGateData[3]) : tString;
+                            }
+                            return "";
+                        })
+                        .setSynced(false)
+                        .setDefaultColor(COLOR_TEXT_WHITE.get())
+                        .setPos(99, 66));
+    }
 }