3 files changed, 26 insertions, 3 deletions
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
index ddbb550dfc..3bcf441128 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IColoredTileEntity.java
@@ -1,5 +1,8 @@
 package gregtech.api.interfaces.tileentity;
 
+import gregtech.api.enums.Dyes;
+import gregtech.api.util.GT_Util;
+
 public interface IColoredTileEntity {
     /**
      * @return 0 - 15 are Colors, while -1 means uncolored
@@ -12,4 +15,12 @@ public interface IColoredTileEntity {
      * @param aColor the Color you want to set it to. -1 for reset.
      */
     byte setColorization(byte aColor);
+
+    /**
+     * @return Actual color shown on GUI
+     */
+    default int getGUIColorization() {
+        return GT_Util.getRGBInt(
+                (getColorization() != -1 ? Dyes.get(getColorization()) : Dyes.MACHINE_METAL).getRGBA());
+    }
 }
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
index ad2af44e9e..b389c8be6c 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IGregTechTileEntity.java
@@ -4,6 +4,8 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.interfaces.IDescribable;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.modularui.IAddInventorySlots;
+import gregtech.api.interfaces.modularui.IGetGUITextureSet;
 import gregtech.common.blocks.GT_Block_Machines;
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +36,9 @@ public interface IGregTechTileEntity
                 IDigitalChest,
                 IDescribable,
                 IMachineBlockUpdateable,
-                IGregtechWailaProvider {
+                IGregtechWailaProvider,
+                IGetGUITextureSet,
+                IAddInventorySlots {
     /**
      * gets the Error displayed on the GUI
      */
diff --git a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java
index 2464816045..7f31d17d11 100644
--- a/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java
+++ b/src/main/java/gregtech/api/interfaces/tileentity/IHasWorldObjectAndCoords.java
@@ -164,11 +164,19 @@ public interface IHasWorldObjectAndCoords {
 
     /**
      * Opens the GUI with this ID of this MetaTileEntity
+     * @deprecated Use ModularUI
      */
-    boolean openGUI(EntityPlayer aPlayer, int aID);
+    @Deprecated
+    default boolean openGUI(EntityPlayer aPlayer, int aID) {
+        return false;
+    }
 
     /**
      * Opens the GUI with the ID = 0 of this TileEntity
+     * @deprecated Use ModularUI
      */
-    boolean openGUI(EntityPlayer aPlayer);
+    @Deprecated
+    default boolean openGUI(EntityPlayer aPlayer) {
+        return false;
+    }
 }