Merge branch 'experimental' into Boxinator

21 files changed, 833 insertions, 174 deletions

diff --git a/src/main/java/gregtech/common/GT_Client.java b/src/main/java/gregtech/common/GT_Client.java
index 55efd20920..b9701bb451 100644
--- a/src/main/java/gregtech/common/GT_Client.java
+++ b/src/main/java/gregtech/common/GT_Client.java
@@ -152,6 +152,7 @@ public class GT_Client extends GT_Proxy
     private GT_ClientPreference mPreference;
     private boolean mFirstTick = false;
     public static final int ROTATION_MARKER_RESOLUTION = 120;
+    private int mReloadCount;
 
     public GT_Client() {
         mCapeRenderer = new GT_CapeRenderer(mCapeList);
@@ -505,6 +506,12 @@ public class GT_Client extends GT_Proxy
     @SubscribeEvent
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {
         mFirstTick = true;
+        mReloadCount++;
+    }
+
+    @Override
+    public int getReloadCount() {
+        return mReloadCount;
     }
 
     @SubscribeEvent
diff --git a/src/main/java/gregtech/common/GT_Proxy.java b/src/main/java/gregtech/common/GT_Proxy.java
index 282542c152..dc9db6e8e3 100644
--- a/src/main/java/gregtech/common/GT_Proxy.java
+++ b/src/main/java/gregtech/common/GT_Proxy.java
@@ -26,6 +26,7 @@ import gregtech.api.util.*;
 import gregtech.common.entities.GT_Entity_Arrow;
 import gregtech.common.gui.GT_ContainerVolumetricFlask;
 import gregtech.common.gui.GT_GUIContainerVolumetricFlask;
+import gregtech.common.items.GT_MetaGenerated_Item_98;
 import gregtech.common.items.GT_MetaGenerated_Tool_01;
 import net.minecraft.block.Block;
 import net.minecraft.enchantment.Enchantment;
@@ -230,6 +231,11 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
      */
     public boolean mRenderFlippedMachinesFlipped = true;
 
+    /**
+     * This enables indicators on input/output hatches
+     */
+    public boolean mRenderIndicatorsOnHatch = true;
+
     public static final int GUI_ID_COVER_SIDE_BASE = 10; // Takes GUI ID 10 - 15
 
     public static Map<String, Integer> oreDictBurnTimes = new HashMap<>();
@@ -771,6 +777,10 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
     public void onClientConnectedToServerEvent(FMLNetworkEvent.ClientConnectedToServerEvent aEvent) {
     }
 
+    public int getReloadCount() {
+        return 0;
+    }
+
     @SubscribeEvent
     public void onArrowNockEvent(ArrowNockEvent aEvent) {
         if ((!aEvent.isCanceled()) && (GT_Utility.isStackValid(aEvent.result))
@@ -1803,6 +1813,8 @@ public abstract class GT_Proxy implements IGT_Mod, IGuiHandler, IFuelHandler {
                     new FluidStack(crackedFluids[i], 1000), 40 + 20 * i, 240 + 120 * i);
             GT_Values.RA.addChemicalRecipe(GT_ModHandler.getIC2Item("steamCell", 1L), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000),
                     new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30);
+            GT_Values.RA.addChemicalRecipe(GT_MetaGenerated_Item_98.FluidCell.steam.get(), GT_Utility.getIntegratedCircuit(i + 1), new FluidStack(uncrackedFluid, 1000),
+                    new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30);
             GT_Values.RA.addChemicalRecipe(aMaterial.getCells(1), GT_Utility.getIntegratedCircuit(i + 1), GT_ModHandler.getSteam(1000),
                     new FluidStack(crackedFluids[i], 800), Materials.Empty.getCells(1), 160 + 80 * i, 30);
         }
diff --git a/src/main/java/gregtech/common/GT_RecipeAdder.java b/src/main/java/gregtech/common/GT_RecipeAdder.java
index cdf3bf38b7..23f539952f 100644
--- a/src/main/java/gregtech/common/GT_RecipeAdder.java
+++ b/src/main/java/gregtech/common/GT_RecipeAdder.java
@@ -10,11 +10,8 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.interfaces.internal.IGT_RecipeAdder;
 import gregtech.api.objects.GT_FluidStack;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.*;
 import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
-import gregtech.api.util.GT_Utility;
 import gregtech.common.items.GT_IntegratedCircuit_Item;
 import mods.railcraft.common.blocks.aesthetics.cube.EnumCube;
 import mods.railcraft.common.items.RailcraftToolItems;
@@ -660,6 +657,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
             return false;
         }
         new GT_Recipe(aInput1, aOutput1, aDuration, aEUt, 0);//Since all other methods are taken
+        FluidStack tInputFluid = GT_Utility.getFluidForFilledItem(aInput1, true);
+        FluidStack tOutputFluid = GT_Utility.getFluidForFilledItem(aOutput1, true);
+        if (tInputFluid != null && tOutputFluid != null) {
+            addVacuumFreezerRecipe(tInputFluid, tOutputFluid, aDuration, aEUt);
+        }
         return true;
     }
 
@@ -672,6 +674,20 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
             return false;
         }
         new GT_Recipe(aInput1, aOutput1, aDuration);
+        FluidStack tInputFluid = GT_Utility.getFluidForFilledItem(aInput1, true);
+        FluidStack tOutputFluid = GT_Utility.getFluidForFilledItem(aOutput1, true);
+        if (tInputFluid != null && tOutputFluid != null) {
+            addVacuumFreezerRecipe(tInputFluid, tOutputFluid, aDuration, 120);
+        }
+        return true;
+    }
+
+    @Override
+    public boolean addVacuumFreezerRecipe(FluidStack aInput1, FluidStack aOutput1, int aDuration, int aEUt) {
+        if ((aInput1 == null) || (aOutput1 == null)) {
+            return false;
+        }
+        new GT_Recipe(aInput1,  aOutput1, aDuration, aEUt);
         return true;
     }
 
@@ -706,6 +722,11 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
     }
 
     @Override
+    public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, FluidStack aFluidOutput, int[] aChances, int aDuration, int aEUt) {
+        return false;
+    }
+
+    @Override
     public boolean addForgeHammerRecipe(ItemStack aInput1, ItemStack aOutput1, int aDuration, int aEUt) {
         if ((aInput1 == null) || (aOutput1 == null)) {
             return false;
@@ -974,7 +995,6 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         GT_Recipe.GT_Recipe_Map.sFluidCannerRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput}, null, new FluidStack[]{aFluidInput == null ? null : aFluidInput}, new FluidStack[]{aFluidOutput == null ? null : aFluidOutput}, aDuration, aEUt, 0);
         return true;
     }
-
     @Override
     public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) {
         if ((aInput == null) || (aBathingFluid == null) || (aOutput1 == null)) {
@@ -988,6 +1008,18 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
     }
 
     @Override
+    public boolean addChemicalBathRecipe(ItemStack aInput, FluidStack aBathingFluid, FluidStack aFluidOutput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) {
+        if ((aInput == null) || (aBathingFluid == null) || (aOutput1 == null)) {
+            return false;
+        }
+        if ((aDuration = GregTech_API.sRecipeFile.get("chemicalbath", aInput, aDuration)) <= 0) {
+            return false;
+        }
+        GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.addRecipe(true, new ItemStack[]{aInput}, new ItemStack[]{aOutput1, aOutput2, aOutput3}, null, aChances, new FluidStack[]{aBathingFluid}, new FluidStack[]{aFluidOutput}, aDuration, aEUt, 0);
+        return true;
+    }
+
+    @Override
     public boolean addElectromagneticSeparatorRecipe(ItemStack aInput, ItemStack aOutput1, ItemStack aOutput2, ItemStack aOutput3, int[] aChances, int aDuration, int aEUt) {
         if ((aInput == null) || (aOutput1 == null)) {
             return false;
@@ -1076,6 +1108,20 @@ public class GT_RecipeAdder implements IGT_RecipeAdder {
         GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[]{aInput, aCircuit}, new ItemStack[]{aOutput}, null, new int[]{aChance}, new FluidStack[]{aFluid}, null, aDuration, aEUt, aCleanroom ? -100 : 0);
         return true;
     }
+    @Override
+    public boolean addAutoclave4Recipe(ItemStack aInput, ItemStack aCircuit, FluidStack aFluidIn, FluidStack aFluidOut, ItemStack[] aOutputs, int[] aChances, int aDuration, int aEUt, boolean aCleanroom) {
+        if ((aInput == null) || (aFluidIn == null) || (aOutputs == null)) {
+            return false;
+        }
+        if ((aDuration = GregTech_API.sRecipeFile.get("autoclave", aInput, aDuration)) <= 0) {
+            return false;
+        }
+        if (!GT_Mod.gregtechproxy.mEnableCleanroom){
+            aCleanroom = false;
+        }
+        GT_Recipe.GT_Recipe_Map.sAutoclaveRecipes.addRecipe(true, new ItemStack[] {aInput, aCircuit} , aOutputs, null, aChances, new FluidStack[]{aFluidIn}, new FluidStack[]{aFluidOut}, aDuration, aEUt, aCleanroom ? -200 : 0);
+        return true;
+    }
 
     @Override
     public boolean addMixerRecipe(ItemStack aInput1, ItemStack aInput2, ItemStack aInput3, ItemStack aInput4, FluidStack aFluidInput, FluidStack aFluidOutput, ItemStack aOutput, int aDuration, int aEUt) {
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
index 6c2a1eabc5..4f719ffeaf 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Casings8.java
@@ -14,7 +14,7 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
     //WATCH OUT FOR TEXTURE ID's
     public GT_Block_Casings8() {
         super(GT_Item_Casings8.class, "gt.blockcasings8", GT_Material_Casings.INSTANCE);
-        for (int i = 0; i < 6; i = (i + 1)) {
+        for (int i = 0; i < 9; i = (i + 1)) {
             Textures.BlockIcons.casingTexturePages[1][i+48] = TextureFactory.of(this, i);
         }
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Chemically Inert Machine Casing");
@@ -23,6 +23,9 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Mining Black Plutonium Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Extreme Engine Intake Casing");
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Europium Reinforced Radiation Proof Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Advanced Rhodium Plated Palladium Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Advanced Iridium Plated Machine Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Magical Machine Casing");
 
         ItemList.Casing_Chemically_Inert.set(new ItemStack(this, 1, 0));
         ItemList.Casing_Pipe_Polytetrafluoroethylene.set(new ItemStack(this, 1, 1));
@@ -30,6 +33,9 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
         ItemList.Casing_MiningBlackPlutonium.set(new ItemStack(this, 1, 3));
         ItemList.Casing_ExtremeEngineIntake.set(new ItemStack(this, 1, 4));
         ItemList.Casing_AdvancedRadiationProof.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_Advanced_Rhodium_Palladium.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_Advanced_Iridium.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_Magical.set(new ItemStack(this, 1, 8));
     }
 
     @Override
@@ -48,6 +54,12 @@ public class GT_Block_Casings8 extends GT_Block_Casings_Abstract {
             return Textures.BlockIcons.MACHINE_CASING_EXTREME_ENGINE_INTAKE.getIcon();//changed color in a terrible way
         case 5:
             return Textures.BlockIcons.MACHINE_CASING_ADVANCEDRADIATIONPROOF.getIcon();
+        case 6:
+            return Textures.BlockIcons.MACHINE_CASING_RHODIUM_PALLADIUM.getIcon();
+        case 7:
+            return Textures.BlockIcons.MACHINE_CASING_IRIDIUM.getIcon();
+            case 8:
+                return Textures.BlockIcons.MACHINE_CASING_MAGICAL.getIcon();
         }
         return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
     }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
index 48cd41187d..d862e5a555 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Ores_Abstract.java
@@ -12,6 +12,7 @@ import gregtech.api.items.GT_Generic_Block;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
 import gregtech.common.render.GT_Renderer_Block;
 import net.minecraft.block.Block;
 import net.minecraft.block.ITileEntityProvider;
@@ -20,6 +21,7 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.boss.EntityDragon;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -135,6 +137,22 @@ public abstract class GT_Block_Ores_Abstract extends GT_Generic_Block implements
     }
 
     @Override
+    public boolean onBlockActivated(World aWorld, int aX, int aY, int aZ, EntityPlayer aPlayer, int aSide, float par1, float par2, float par3) {
+        if (!aPlayer.isSneaking() || !aPlayer.capabilities.isCreativeMode) {
+            return false;
+        }
+
+        TileEntity tTileEntity = aWorld.getTileEntity(aX, aY, aZ);
+        if (!(tTileEntity instanceof GT_TileEntity_Ores)) {
+            return false;
+        }
+
+        boolean tNatural = (((GT_TileEntity_Ores) tTileEntity).mNatural = !((GT_TileEntity_Ores) tTileEntity).mNatural);
+        GT_Utility.sendChatToPlayer(aPlayer, "Ore \"mNatural\" flag set to: " + tNatural);
+        return true;
+    }
+
+    @Override
     public boolean onBlockEventReceived(World p_149696_1_, int p_149696_2_, int p_149696_3_, int p_149696_4_, int p_149696_5_, int p_149696_6_) {
         super.onBlockEventReceived(p_149696_1_, p_149696_2_, p_149696_3_, p_149696_4_, p_149696_5_, p_149696_6_);
         TileEntity tileentity = p_149696_1_.getTileEntity(p_149696_2_, p_149696_3_, p_149696_4_);
diff --git a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
index 0e5cc35e02..96e918e27b 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_MicrowaveEnergyTransmitter.java
@@ -138,25 +138,25 @@ public class GT_Container_MicrowaveEnergyTransmitter extends GT_ContainerMetaTil
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 101:
                 this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 103:
                 this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 105:
                 this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 107:
                 this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
diff --git a/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
new file mode 100644
index 0000000000..1006acebf1
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_Container_OutputHatch.java
@@ -0,0 +1,123 @@
+package gregtech.common.gui;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.gui.GT_Container_BasicTank;
+import gregtech.api.gui.GT_Slot_Output;
+import gregtech.api.gui.GT_Slot_Render;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Output;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+
+import java.nio.ByteBuffer;
+
+public class GT_Container_OutputHatch extends GT_Container_BasicTank {
+
+    private ByteBuffer buffer;
+    private String fluidName = "";
+    private byte mMode;
+
+    public GT_Container_OutputHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
+        super(aInventoryPlayer, aTileEntity);
+    }
+
+    @Override
+    public void addSlots(InventoryPlayer aInventoryPlayer) {
+        addSlotToContainer(new Slot(mTileEntity, 0, 80, 17));
+        addSlotToContainer(new GT_Slot_Output(mTileEntity, 1, 80, 53));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 2, 59, 42));
+        addSlotToContainer(new GT_Slot_Render(mTileEntity, 3, 150, 42));
+    }
+
+    @Override
+    public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
+        if (aSlotIndex == 3 && aMouseclick < 2) {
+            GT_MetaTileEntity_Hatch_Output tHatch = (GT_MetaTileEntity_Hatch_Output) mTileEntity.getMetaTileEntity();
+            FluidStack tReadyLockFluid = GT_Utility.getFluidForFilledItem(aPlayer.inventory.getItemStack(), true);
+            byte tMode = tHatch.getMode();
+            // If player click the locker slot with empty or the same fluid cell, clear the lock fluid
+            if (tReadyLockFluid == null || (tMode >= 8 && tReadyLockFluid.getUnlocalizedName().equals(tHatch.getLockedFluidName()))) {
+                tHatch.setLockedFluidName(null);
+                GT_Utility.sendChatToPlayer(aPlayer, trans("300", "Fluid Lock Cleared."));
+                tHatch.mMode = 0;
+                fluidName = "";
+            }
+            else {
+                tHatch.setLockedFluidName(tReadyLockFluid.getUnlocalizedName());
+                GT_Utility.sendChatToPlayer(aPlayer, String.format(trans("151.4", "Sucessfully locked Fluid to %s"), tReadyLockFluid.getLocalizedName()));
+                tHatch.mMode = 9;
+                fluidName = tReadyLockFluid.getUnlocalizedName();
+            }
+        }
+        return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
+    }
+
+    @Override
+    public void addCraftingToCrafters(ICrafting clientHandle) {
+        buffer.putInt(0, fluidName.length());
+        buffer.put(Integer.BYTES, mMode);
+        for (int i = 0; i < fluidName.length(); i++) {
+            buffer.putChar(Integer.BYTES + Character.BYTES * i + 1, fluidName.charAt(i));
+        }
+        sendStateUpdate(clientHandle);
+        super.addCraftingToCrafters(clientHandle);
+    }
+
+    @Override
+    public void detectAndSendChanges() {
+        super.detectAndSendChanges();
+        if (buffer == null) {
+            buffer = ByteBuffer.allocate(256);
+        }
+        if(mTileEntity.isServerSide()) {
+            GT_MetaTileEntity_Hatch_Output tile = (GT_MetaTileEntity_Hatch_Output) mTileEntity.getMetaTileEntity();
+            if (tile == null) return;
+            fluidName = tile.getLockedFluidName() == null ? "" : tile.getLockedFluidName();
+            mMode = tile.getMode();
+            buffer.putInt(0, fluidName.length());
+            buffer.put(Integer.BYTES, mMode);
+            for (int i = 0; i < fluidName.length(); i++) {
+                buffer.putChar(Integer.BYTES + Character.BYTES * i + 1, fluidName.charAt(i));
+            }
+            for (Object clientHandle : this.crafters) {
+                sendStateUpdate((ICrafting) clientHandle);
+            }
+        }
+    }
+
+    private void sendStateUpdate(ICrafting clientHandle) {
+        final int bytes = Character.BYTES * fluidName.length() + Integer.BYTES + 1;
+        for (int i = 0; i < bytes; i++) {
+            clientHandle.sendProgressBarUpdate(this, i + 110, buffer.get(i));
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public void updateProgressBar(int index, int value) {
+        super.updateProgressBar(index, value);
+        index = index - 110;
+        if(index >= 0 && index < buffer.capacity()) {
+            buffer.put(index, (byte) value);
+        }
+    }
+
+    @SideOnly(Side.CLIENT)
+    public String getFluidName() {
+        StringBuilder sb = new StringBuilder();
+        for (int i = 0; i < buffer.getInt(0); ++i) {
+            sb.append(buffer.getChar(i * Character.BYTES + Integer.BYTES + 1));
+        }
+        byte mode = buffer.get(Integer.BYTES);
+        FluidStack tFluid = FluidRegistry.getFluidStack(sb.toString().replace("fluid.", "")
+                .replace(".name", "").replace("ic2.fluid", "ic2").toLowerCase(), 1);
+        if (tFluid == null || mode < 8) return "Empty";
+        else return tFluid.getLocalizedName().replace("fluid.", "");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
index c50bb5ce52..22098a0350 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_QuantumChest.java
@@ -53,10 +53,10 @@ public class GT_Container_QuantumChest extends GT_ContainerMetaTile_Machine {
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                mContent = mContent & -65536 | par2;
+                mContent = mContent & 0xffff0000 | par2 & 0x0000ffff;
                 break;
             case 101:
-                mContent = mContent & 65535 | par2 << 16;
+                mContent = mContent & 0x0000ffff | par2 << 16;
                 break;
         }
     }
diff --git a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
index 2337a21c12..2b1bc3b584 100644
--- a/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
+++ b/src/main/java/gregtech/common/gui/GT_Container_Teleporter.java
@@ -141,25 +141,25 @@ public class GT_Container_Teleporter extends GT_ContainerMetaTile_Machine {
         super.updateProgressBar(par1, par2);
         switch (par1) {
             case 100:
-                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2);
+                this.mTargetX = (this.mTargetX & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 101:
                 this.mTargetX = (this.mTargetX & 0xFFFF | par2 << 16);
                 break;
             case 102:
-                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2);
+                this.mTargetY = (this.mTargetY & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 103:
                 this.mTargetY = (this.mTargetY & 0xFFFF | par2 << 16);
                 break;
             case 104:
-                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2);
+                this.mTargetZ = (this.mTargetZ & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 105:
                 this.mTargetZ = (this.mTargetZ & 0xFFFF | par2 << 16);
                 break;
             case 106:
-                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2);
+                this.mTargetD = (this.mTargetD & 0xFFFF0000 | par2 & 0xFFFF);
                 break;
             case 107:
                 this.mTargetD = (this.mTargetD & 0xFFFF | par2 << 16);
diff --git a/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
new file mode 100644
index 0000000000..1adf66c1b7
--- /dev/null
+++ b/src/main/java/gregtech/common/gui/GT_GUIContainer_OutputHatch.java
@@ -0,0 +1,39 @@
+package gregtech.common.gui;
+
+import gregtech.api.gui.GT_GUIContainerMetaTile_Machine;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.util.GT_Utility;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.StatCollector;
+
+import static gregtech.api.enums.GT_Values.RES_PATH_GUI;
+
+public class GT_GUIContainer_OutputHatch extends GT_GUIContainerMetaTile_Machine {
+
+    private final String mName;
+
+    public GT_GUIContainer_OutputHatch(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity, String aName) {
+        super(new GT_Container_OutputHatch(aInventoryPlayer, aTileEntity), RES_PATH_GUI + "OutputHatch.png");
+        mName = aName;
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int par1, int par2) {
+        fontRendererObj.drawString(StatCollector.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
+        fontRendererObj.drawString(mName, 8, 6, 4210752);
+        if (mContainer != null) {
+            fontRendererObj.drawString("Liquid Amount", 10, 20, 16448255);
+            fontRendererObj.drawString(GT_Utility.parseNumberToString(((GT_Container_OutputHatch) mContainer).mContent), 10, 30, 16448255);
+            fontRendererObj.drawString("Locked Fluid", 101, 20, 16448255);
+            fontRendererObj.drawString(((GT_Container_OutputHatch) mContainer).getFluidName(), 101, 30, 16448255);
+        }
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float par1, int par2, int par3) {
+        super.drawGuiContainerBackgroundLayer(par1, par2, par3);
+        int x = (width - xSize) / 2;
+        int y = (height - ySize) / 2;
+        drawTexturedModalRect(x, y, 0, 0, xSize, ySize);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
index a8487651b4..ad4e1f6bdd 100644
--- a/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
+++ b/src/main/java/gregtech/common/items/GT_FluidDisplayItem.java
@@ -4,6 +4,7 @@ import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.GT_Values;
 import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
 import gregtech.api.items.GT_Generic_Item;
 import gregtech.api.util.GT_Utility;
 import net.minecraft.client.renderer.texture.IIconRegister;
@@ -16,13 +17,20 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IIcon;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Stream;
 
 @SuppressWarnings({"rawtypes","unchecked"})
 public class GT_FluidDisplayItem extends GT_Generic_Item {
+
+    private static final Map<Fluid, String> sFluidTooltips = new HashMap<>();
+
     public GT_FluidDisplayItem() {
         super("GregTech_FluidDisplay", "Fluid Display", null);
         ItemList.Display_Fluid.set(this);
@@ -30,6 +38,10 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
 
     @Override
     protected void addAdditionalToolTips(List aList, ItemStack aStack, EntityPlayer aPlayer) {
+        if (FluidRegistry.getFluid(aStack.getItemDamage()) != null) {
+            String tChemicalFormula = getChemicalFormula(new FluidStack(FluidRegistry.getFluid(aStack.getItemDamage()), 1));
+            if (!tChemicalFormula.isEmpty()) aList.add(EnumChatFormatting.GRAY + tChemicalFormula + EnumChatFormatting.GRAY);
+        }
         NBTTagCompound aNBT = aStack.getTagCompound();
         if (GT_Values.D1) {
             Fluid tFluid = FluidRegistry.getFluid(aStack.getItemDamage());
@@ -40,7 +52,7 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
         if (aNBT != null) {
             long tToolTipAmount = aNBT.getLong("mFluidDisplayAmount");
             if (tToolTipAmount > 0L) {
-            	aList.add(EnumChatFormatting.BLUE + String.format(trans("016", "Amount: %s L"), "" + tToolTipAmount) + EnumChatFormatting.GRAY);
+                aList.add(EnumChatFormatting.BLUE + String.format(trans("016", "Amount: %s L"), "" + tToolTipAmount) + EnumChatFormatting.GRAY);
             }
             aList.add(EnumChatFormatting.RED + String.format(trans("017", "Temperature: %s K"), "" + aNBT.getLong("mFluidDisplayHeat")) + EnumChatFormatting.GRAY);
             aList.add(EnumChatFormatting.GREEN + String.format(trans("018", "State: %s"), aNBT.getBoolean("mFluidState") ? "Gas" : "Liquid") + EnumChatFormatting.GRAY);
@@ -90,6 +102,37 @@ public class GT_FluidDisplayItem extends GT_Generic_Item {
         return "";
     }
 
+    @SideOnly(Side.CLIENT)
+    public String getChemicalFormula(FluidStack aRealFluid) {
+        return sFluidTooltips.computeIfAbsent(aRealFluid.getFluid(),
+                fluid -> {
+                    for(ItemStack tContainer : GT_Utility.getContainersFromFluid(aRealFluid)) {
+                        if (isCell(tContainer)) {
+                            Materials tMaterial = getMaterialFromCell(tContainer);
+                            if (!tMaterial.equals(Materials._NULL)) {
+                                if (tMaterial.mChemicalFormula.equals("?")) {
+                                    return "";
+                                }
+                                else {
+                                    return tMaterial.mChemicalFormula;
+                                }
+                            }
+