Reservoir hatch overhaul (#522)

2 files changed, 16 insertions, 73 deletions

diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index cace9cff2c..473a4899c1 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -2316,18 +2316,6 @@ public class RECIPES_Machines {
                     GregtechItemList.Hatch_Air_Intake.get(1));
 
             RecipeUtils.addShapedGregtechRecipe(
-                    CI.getPlate(6, 1),
-                    ItemList.Casing_Gearbox_Titanium.get(1),
-                    CI.getPlate(6, 1),
-                    CI.getPlate(6, 1),
-                    CI.getFluidRegulator(5, 1),
-                    CI.getPlate(6, 1),
-                    CI.getTieredCircuit(6),
-                    ItemList.Hatch_Input_IV.get(1),
-                    CI.getTieredCircuit(6),
-                    GregtechItemList.Hatch_Reservoir.get(1));
-
-            RecipeUtils.addShapedGregtechRecipe(
                     CI.getPlate(7, 1),
                     GregtechItemList.Hatch_Air_Intake.get(1),
                     CI.getPlate(7, 1),
@@ -3042,6 +3030,15 @@ public class RECIPES_Machines {
 
         int aCostMultiplier = 1;
 
+        // Reservoir Hatch
+        GT_Values.RA.addAssemblerRecipe(
+                new ItemStack[] { ItemList.Hatch_Input_EV.get(1), GT_ModHandler.getModItem("RIO", "tile.machine", 1),
+                        ItemList.Electric_Pump_EV.get(1) },
+                GT_Values.NF,
+                GregtechItemList.Hatch_Reservoir.get(1),
+                100,
+                1920);
+
         // Mystic Frame
         CORE.RA.addSixSlotAssemblingRecipe(
                 new ItemStack[] { GregtechItemList.Casing_Multi_Use.get(1),
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
index 67827bcbf5..bc28f744f6 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Reservoir.java
@@ -1,27 +1,17 @@
 package gtPlusPlus.xmod.gregtech.api.metatileentity.implementations;
 
-import net.minecraft.block.Block;
-import net.minecraft.init.Blocks;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
-import net.minecraftforge.fluids.IFluidHandler;
 
-import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.objects.GT_RenderedTexture;
-import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 
 public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_FluidGenerator {
 
-    private static Block sBlock_EIO;
-    private static Block sBlock_RIO;
-
     public GT_MetaTileEntity_Hatch_Reservoir(final int aID, final String aName, final String aNameRegional,
             final int aTier) {
         super(aID, aName, aNameRegional, aTier);
@@ -38,10 +28,9 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
 
     @Override
     public String[] getCustomTooltip() {
-        String[] aTooltip = new String[3];
-        aTooltip[0] = "Requires a Block of water facing the intake";
-        aTooltip[1] = "Infinite water supply hatch";
-        aTooltip[2] = "Creates 8000L of Water every 4 ticks";
+        String[] aTooltip = new String[2];
+        aTooltip[0] = "Infinite water supply hatch with 100ML capacity";
+        aTooltip[1] = "Fills to max capacity every 5 seconds";
         return aTooltip;
     }
 
@@ -52,65 +41,22 @@ public class GT_MetaTileEntity_Hatch_Reservoir extends GT_MetaTileEntity_Hatch_F
 
     @Override
     public int getAmountOfFluidToGenerate() {
-        return 8000;
+        return 100000000;
     }
 
     @Override
     public int getMaxTickTime() {
-        return 4;
+        return 100;
     }
 
     @Override
     public int getCapacity() {
-        return 256000;
-    }
-
-    private static void setCrossModData() {
-        if (LoadedMods.EnderIO && sBlock_EIO == null) {
-            sBlock_EIO = GameRegistry.findBlock("EnderIO", "blockReservoir");
-        }
-        if (LoadedMods.RemoteIO && sBlock_RIO == null) {
-            sBlock_RIO = GameRegistry.findBlock("RIO", "machine");
-        }
-    }
-
-    public static boolean isTileValid(TileEntity aTile) {
-        if (aTile != null) {
-            if (aTile instanceof IFluidHandler) {
-                IFluidHandler aFluidHandler = (IFluidHandler) aTile;
-                return aFluidHandler.canDrain(ForgeDirection.UNKNOWN, FluidRegistry.WATER);
-            }
-        }
-        return false;
+        return 100000000;
     }
 
     @Override
     public boolean doesHatchMeetConditionsToGenerate() {
-        Block aWater = this.getBaseMetaTileEntity().getBlockAtSide(this.getBaseMetaTileEntity().getFrontFacing());
-        if (aWater != null && aWater != Blocks.air) {
-            if (!this.canTankBeFilled()) {
-                return false;
-            }
-            setCrossModData();
-            if (LoadedMods.EnderIO) {
-                if (aWater == sBlock_EIO) {
-                    return isTileValid(
-                            this.getBaseMetaTileEntity()
-                                    .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
-                }
-            }
-            if (LoadedMods.RemoteIO) {
-                if (aWater == sBlock_RIO
-                        && this.getBaseMetaTileEntity().getMetaIDAtSide(this.getBaseMetaTileEntity().getFrontFacing())
-                                == 0) {
-                    return isTileValid(
-                            this.getBaseMetaTileEntity()
-                                    .getTileEntityAtSide(this.getBaseMetaTileEntity().getFrontFacing()));
-                }
-            }
-            return aWater == Blocks.water || aWater == Blocks.flowing_water;
-        }
-        return false;
+        return true;
     }
 
     @Override