Migrate to ModularUI

9 files changed, 3 insertions, 80 deletions

diff --git a/dependencies.gradle b/dependencies.gradle
index e92b38489a..511a159cfa 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -1,9 +1,9 @@
 // Add your dependencies here
 
 dependencies {
-    compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.68:dev'
-    compile 'com.github.GTNewHorizons:TecTech:5.0.42:dev'
-    compile 'com.github.GTNewHorizons:bartworks:0.5.89:dev'
+    compile 'com.github.GTNewHorizons:GT5-Unofficial:5.09.41.158:dev'
+    compile 'com.github.GTNewHorizons:TecTech:5.0.52:dev'
+    compile 'com.github.GTNewHorizons:bartworks:0.5.119:dev'
     compile 'com.github.GTNewHorizons:StructureLib:1.1.12:dev'
     compile 'com.github.GTNewHorizons:ThaumicTinkerer:2.6.4:dev'
 
diff --git a/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java b/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java
deleted file mode 100644
index eabbb26ff1..0000000000
--- a/src/main/java/client/gui/GUIContainer_ModularNuclearReactor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package client.gui;
-
-import common.container.Container_ModularNuclearReactor;
-import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import kekztech.KekzCore;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.util.ResourceLocation;
-import org.lwjgl.opengl.GL11;
-
-public class GUIContainer_ModularNuclearReactor extends GuiContainer {
-
-    private ResourceLocation texture =
-            new ResourceLocation(KekzCore.MODID, "textures/gui/MultiblockDisplay_REACTOR.png");
-
-    private InventoryPlayer inventory;
-    private IGregTechTileEntity te;
-
-    public GUIContainer_ModularNuclearReactor(IGregTechTileEntity te, EntityPlayer player) {
-        super(new Container_ModularNuclearReactor(te, player));
-        inventory = player.inventory;
-        this.te = te;
-    }
-
-    @Override
-    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
-        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-
-        GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
-
-        final int x = (super.width - super.xSize) / 2;
-        final int y = (super.height - super.ySize) / 2;
-        super.drawTexturedModalRect(x, y, 0, 0, super.xSize, super.ySize);
-    }
-
-    @Override
-    protected void drawGuiContainerForegroundLayer(int par1, int par2) {}
-}
diff --git a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
index a989cc3886..f492d3c643 100644
--- a/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
+++ b/src/main/java/common/tileentities/GTMTE_LapotronicSuperCapacitor.java
@@ -28,7 +28,6 @@ import common.Blocks;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.Textures.BlockIcons;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.IGlobalWirelessEnergy;
 import gregtech.api.interfaces.IHatchElement;
 import gregtech.api.interfaces.ITexture;
@@ -46,7 +45,6 @@ import java.util.function.Consumer;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -473,11 +471,6 @@ public class GTMTE_LapotronicSuperCapacitor
         return sTexture;
     }
 
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(
-                aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
-    }
-
     private String global_energy_user_uuid;
 
     @Override
diff --git a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
index 67aaf2a0f9..ee9c0550b0 100644
--- a/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
+++ b/src/main/java/common/tileentities/GTMTE_ModularNuclearReactor.java
@@ -1,6 +1,5 @@
 package common.tileentities;
 
-import client.gui.GUIContainer_ModularNuclearReactor;
 import common.Blocks;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Textures;
@@ -10,7 +9,6 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
 import gregtech.api.objects.GT_RenderedTexture;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.util.ForgeDirection;
 import org.joml.Vector3i;
@@ -94,13 +92,6 @@ public class GTMTE_ModularNuclearReactor extends GT_MetaTileEntity_MultiBlockBas
                 : new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID)};
     }
 
-    // TODO: Opening UI crashes server. Controller isn't craftable right now.
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        /*return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(),
-        "MultiblockDisplay.png");*/
-        return new GUIContainer_ModularNuclearReactor(aBaseMetaTileEntity, aPlayerInventory.player);
-    }
-
     @Override
     public boolean isCorrectMachinePart(ItemStack stack) {
         return true;
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
index 1909b5ef27..11e941584f 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK1.java
@@ -10,7 +10,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -24,7 +23,6 @@ import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -139,11 +137,6 @@ public class GTMTE_SOFuelCellMK1 extends GT_MetaTileEntity_EnhancedMultiBlockBas
         return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID)};
     }
 
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(
-                aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
-    }
-
     @Override
     public boolean isCorrectMachinePart(ItemStack stack) {
         return true;
diff --git a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
index 4438c0add1..a7b806add9 100644
--- a/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
+++ b/src/main/java/common/tileentities/GTMTE_SOFuelCellMK2.java
@@ -12,7 +12,6 @@ import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -25,7 +24,6 @@ import gregtech.api.util.GT_Utility;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Iterator;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
@@ -142,11 +140,6 @@ public class GTMTE_SOFuelCellMK2 extends GT_MetaTileEntity_EnhancedMultiBlockBas
         return new ITexture[] {Textures.BlockIcons.getCasingTextureForId(CASING_TEXTURE_ID)};
     }
 
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(
-                aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
-    }
-
     @Override
     public boolean isCorrectMachinePart(ItemStack stack) {
         return true;
diff --git a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
index cabf4552d6..097c16af59 100644
--- a/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
+++ b/src/main/java/common/tileentities/GTMTE_SpaceElevator.java
@@ -3,7 +3,6 @@ package common.tileentities;
 import common.Blocks;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -12,7 +11,6 @@ import gregtech.api.objects.GT_RenderedTexture;
 import java.util.ArrayList;
 import java.util.HashSet;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
@@ -103,11 +101,6 @@ public class GTMTE_SpaceElevator extends GT_MetaTileEntity_MultiBlockBase {
         return sTexture;
     }
 
-    public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(
-                aPlayerInventory, aBaseMetaTileEntity, this.getLocalName(), "MultiblockDisplay.png");
-    }
-
     @Override
     public boolean isCorrectMachinePart(ItemStack stack) {
         return true;
diff --git a/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png b/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png
deleted file mode 100644
index aff9248d4a..0000000000
--- a/src/main/resources/assets/kekztech/textures/gui/MultiblockDisplay_REACTOR.png
+++ /dev/null
diff --git a/src/main/resources/assets/kekztech/textures/gui/ReaktorGUI_background.png b/src/main/resources/assets/kekztech/textures/gui/ReaktorGUI_background.png
deleted file mode 100644
index 7c87a7de7d..0000000000
--- a/src/main/resources/assets/kekztech/textures/gui/ReaktorGUI_background.png
+++ /dev/null