Merge branch 'master' into enablemidrecipe

7 files changed, 36 insertions, 46 deletions

diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
index 9342ae3962..29abece11a 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -19,7 +19,6 @@ import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
 import gregtech.api.enums.HeatingCoilLevel;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
@@ -28,7 +27,6 @@ import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import java.util.ArrayList;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -136,11 +134,6 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
     }
 
     @Override
-    public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Digester.png");
-    }
-
-    @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
         return new Digester(this.mName);
     }
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
index 46d9a49b3d..cff40a6adc 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -19,7 +19,6 @@ import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable;
 import com.gtnewhorizon.structurelib.structure.IStructureDefinition;
 import com.gtnewhorizon.structurelib.structure.StructureDefinition;
 import gregtech.api.GregTech_API;
-import gregtech.api.gui.GT_GUIContainer_MultiMachine;
 import gregtech.api.interfaces.ISecondaryDescribable;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
@@ -30,7 +29,6 @@ import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
 import gregtech.api.util.GT_Recipe;
 import java.util.List;
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -171,11 +169,6 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
     }
 
     @Override
-    public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) {
-        return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Disstank.png");
-    }
-
-    @Override
     public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) {
         return new DissolutionTank(this.mName);
     }
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index 2d4fc46d80..7db207458e 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -1,5 +1,6 @@
 package com.elisis.gtnhlanth.loader;
 
+import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.util.GT_Recipe;
 import java.util.Collection;
 import java.util.HashSet;
@@ -11,39 +12,42 @@ public class RecipeAdder {
 
     public static final RecipeAdder instance = new RecipeAdder();
 
-    public final DigestMap DigesterRecipes = new DigestMap(
-            new HashSet<>(100),
-            "gtnhlanth.recipe.digester",
-            StatCollector.translateToLocal("tile.recipe.digester"),
-            null,
-            "gtnhlanth:textures/gui/Digester",
-            1,
-            1,
-            1,
-            1,
-            1,
-            StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity
-            1,
-            "K",
-            false,
-            false);
+    public final DigestMap DigesterRecipes = (DigestMap) new DigestMap(
+                    new HashSet<>(100),
+                    "gtnhlanth.recipe.digester",
+                    StatCollector.translateToLocal("tile.recipe.digester"),
+                    null,
+                    "gtnhlanth:textures/gui/Digester",
+                    1,
+                    1,
+                    1,
+                    1,
+                    1,
+                    StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity
+                    1,
+                    "K",
+                    false,
+                    false)
+            .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE);
 
-    public final DissolutionTankMap DissolutionTankRecipes = new DissolutionTankMap(
-            new HashSet<>(100),
-            "gtnhlanth.recipe.disstank",
-            StatCollector.translateToLocal("tile.recipe.disstank"),
-            null,
-            "gtnhlanth:textures/gui/Disstank",
-            2,
-            3,
-            1,
-            1,
-            1,
-            StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
-            1,
-            ":1",
-            false,
-            false);
+    public final DissolutionTankMap DissolutionTankRecipes = (DissolutionTankMap) new DissolutionTankMap(
+                    new HashSet<>(100),
+                    "gtnhlanth.recipe.disstank",
+                    StatCollector.translateToLocal("tile.recipe.disstank"),
+                    null,
+                    "gtnhlanth:textures/gui/Disstank",
+                    2,
+                    3,
+                    1,
+                    1,
+                    1,
+                    StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
+                    1,
+                    ":1",
+                    false,
+                    false)
+            .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+            .setUsualFluidInputCount(2);
 
     public class DigestMap extends GT_Recipe.GT_Recipe_Map {
 
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/Digester.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/Digester.png
deleted file mode 100644
index 57e92ac9db..0000000000
--- a/src/main/resources/assets/gregtech/textures/gui/multimachines/Digester.png
+++ /dev/null
diff --git a/src/main/resources/assets/gregtech/textures/gui/multimachines/Disstank.png b/src/main/resources/assets/gregtech/textures/gui/multimachines/Disstank.png
deleted file mode 100644
index 57e92ac9db..0000000000
--- a/src/main/resources/assets/gregtech/textures/gui/multimachines/Disstank.png
+++ /dev/null
diff --git a/src/main/resources/assets/gtnhlanth/textures/gui/Digester.png b/src/main/resources/assets/gtnhlanth/textures/gui/Digester.png
deleted file mode 100644
index 53d776aa81..0000000000
--- a/src/main/resources/assets/gtnhlanth/textures/gui/Digester.png
+++ /dev/null
diff --git a/src/main/resources/assets/gtnhlanth/textures/gui/Disstank.png b/src/main/resources/assets/gtnhlanth/textures/gui/Disstank.png
deleted file mode 100644
index f72b37ac2f..0000000000
--- a/src/main/resources/assets/gtnhlanth/textures/gui/Disstank.png
+++ /dev/null