Merge pull request #1 from GTNewHorizons/experimental

update

9 files changed, 203 insertions, 61 deletions

diff --git a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
index 2a275a5354..cfb34eb34e 100644
--- a/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java
@@ -447,11 +447,16 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE
                                 }
 
                                 if (getRandomNumber(1000) == 0) {
+				    int precipitationHeightAtSide2 = worldObj.getPrecipitationHeight(xCoord, zCoord - 1);
+                                    int precipitationHeightAtSide3 = worldObj.getPrecipitationHeight(xCoord, zCoord + 1);
+                                    int precipitationHeightAtSide4 = worldObj.getPrecipitationHeight(xCoord - 1, zCoord);
+                                    int precipitationHeightAtSide5 = worldObj.getPrecipitationHeight(xCoord + 1, zCoord);
+
                                     if ((getCoverIDAtSide((byte) 1) == 0 && worldObj.getPrecipitationHeight(xCoord, zCoord) - 2 < yCoord)
-                                            || (getCoverIDAtSide((byte) 2) == 0 && worldObj.getPrecipitationHeight(xCoord, zCoord - 1) - 1 < yCoord)
-                                            || (getCoverIDAtSide((byte) 3) == 0 && worldObj.getPrecipitationHeight(xCoord, zCoord + 1) - 1 < yCoord)
-                                            || (getCoverIDAtSide((byte) 4) == 0 && worldObj.getPrecipitationHeight(xCoord - 1, zCoord) - 1 < yCoord)
-                                            || (getCoverIDAtSide((byte) 5) == 0 && worldObj.getPrecipitationHeight(xCoord + 1, zCoord) - 1 < yCoord)) {
+                                            || (getCoverIDAtSide((byte) 2) == 0 && precipitationHeightAtSide2 - 1 < yCoord && precipitationHeightAtSide2 > -1)
+                                            || (getCoverIDAtSide((byte) 3) == 0 && precipitationHeightAtSide3 - 1 < yCoord && precipitationHeightAtSide3 > -1)
+                                            || (getCoverIDAtSide((byte) 4) == 0 && precipitationHeightAtSide4 - 1 < yCoord && precipitationHeightAtSide4 > -1)
+                                            || (getCoverIDAtSide((byte) 5) == 0 && precipitationHeightAtSide5 - 1 < yCoord && precipitationHeightAtSide5 > -1)) {
                                         if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) {
                                             if (getRandomNumber(10) == 0) {
                                                 try{
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
index 9cadeaddc2..b3998b62e7 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_Hatch_Muffler.java
@@ -12,6 +12,8 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
 import net.minecraftforge.common.util.ForgeDirection;
 
+import java.util.Arrays;
+
 import static gregtech.api.objects.XSTR.XSTR_INSTANCE;
 
 public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
@@ -53,10 +55,23 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
         return true;
     }
 
+    private int[] mFacings;
+
+    /*private void init()*/ {
+        setInValidFacings(ForgeDirection.DOWN);
+    }
+
+    public void setInValidFacings(ForgeDirection... aFacings) {
+        mFacings = Arrays.stream(aFacings).mapToInt(Enum::ordinal).toArray();
+    }
+
     @Override
     public boolean isFacingValid(byte aFacing) {
-        return aFacing != 0;
-    }    
+        for (int x : mFacings)
+            if (x == aFacing)
+                return false;
+        return true;
+    }
 
     @Override
     public boolean isAccessAllowed(EntityPlayer aPlayer) {
@@ -80,9 +95,9 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
         }
         return false;
     }
-    
-    public int calculatePollutionReduction(int aPollution){
-    	return (int) (aPollution *(Math.pow(0.85F, mTier - 1)));
+
+    public int calculatePollutionReduction(int aPollution) {
+        return (int) (aPollution * (Math.pow(0.85F, mTier - 1)));
     }
 
     @Override
@@ -98,51 +113,51 @@ public class GT_MetaTileEntity_Hatch_Muffler extends GT_MetaTileEntity_Hatch {
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPostTick(aBaseMetaTileEntity, aTick);
-        if(aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity().isActive())
-            pollutionParticles(this.getBaseMetaTileEntity().getWorld(),"largesmoke");
-    }
-
-    public void pollutionParticles(World aWorld,String name){
-        boolean chk1,chk2,chk3;
-        float ran1=XSTR_INSTANCE.nextFloat(),ran2=0,ran3=0;
-        chk1=ran1*100<calculatePollutionReduction(100);
-        if(GT_Pollution.getPollution(getBaseMetaTileEntity())>= GT_Mod.gregtechproxy.mPollutionSmogLimit){
-            ran2=XSTR_INSTANCE.nextFloat();
-            ran3=XSTR_INSTANCE.nextFloat();
-            chk2=ran2*100<calculatePollutionReduction(100);
-            chk3=ran3*100<calculatePollutionReduction(100);
-            if(!(chk1||chk2||chk3))return;
-        }else{
-            if(!chk1)return;
-            chk2=chk3=false;
+        if (aBaseMetaTileEntity.isClientSide() && this.getBaseMetaTileEntity().isActive())
+            pollutionParticles(this.getBaseMetaTileEntity().getWorld(), "largesmoke");
+    }
+
+    public void pollutionParticles(World aWorld, String name) {
+        boolean chk1, chk2, chk3;
+        float ran1 = XSTR_INSTANCE.nextFloat(), ran2 = 0, ran3 = 0;
+        chk1 = ran1 * 100 < calculatePollutionReduction(100);
+        if (GT_Pollution.getPollution(getBaseMetaTileEntity()) >= GT_Mod.gregtechproxy.mPollutionSmogLimit) {
+            ran2 = XSTR_INSTANCE.nextFloat();
+            ran3 = XSTR_INSTANCE.nextFloat();
+            chk2 = ran2 * 100 < calculatePollutionReduction(100);
+            chk3 = ran3 * 100 < calculatePollutionReduction(100);
+            if (!(chk1 || chk2 || chk3)) return;
+        } else {
+            if (!chk1) return;
+            chk2 = chk3 = false;
         }
 
-        IGregTechTileEntity aMuffler=this.getBaseMetaTileEntity();
-        ForgeDirection aDir=ForgeDirection.getOrientation(aMuffler.getFrontFacing());
-        float xPos=aDir.offsetX*0.76F+aMuffler.getXCoord()+0.25F;
-        float yPos=aDir.offsetY*0.76F+aMuffler.getYCoord()+0.25F;
-        float zPos=aDir.offsetZ*0.76F+aMuffler.getZCoord()+0.25F;
+        IGregTechTileEntity aMuffler = this.getBaseMetaTileEntity();
+        ForgeDirection aDir = ForgeDirection.getOrientation(aMuffler.getFrontFacing());
+        float xPos = aDir.offsetX * 0.76F + aMuffler.getXCoord() + 0.25F;
+        float yPos = aDir.offsetY * 0.76F + aMuffler.getYCoord() + 0.25F;
+        float zPos = aDir.offsetZ * 0.76F + aMuffler.getZCoord() + 0.25F;
 
-        float ySpd=aDir.offsetY*0.1F+0.2F+0.1F*XSTR_INSTANCE.nextFloat();
+        float ySpd = aDir.offsetY * 0.1F + 0.2F + 0.1F * XSTR_INSTANCE.nextFloat();
         float xSpd;
         float zSpd;
 
-        if(aDir.offsetY==-1){
-            float temp=XSTR_INSTANCE.nextFloat()*2*(float)Math.PI;
-            xSpd=(float)Math.sin(temp)*0.1F;
-            zSpd=(float)Math.cos(temp)*0.1F;
-        }else{
-            xSpd=aDir.offsetX*(0.1F+0.2F*XSTR_INSTANCE.nextFloat());
-            zSpd=aDir.offsetZ*(0.1F+0.2F*XSTR_INSTANCE.nextFloat());
+        if (aDir.offsetY == -1) {
+            float temp = XSTR_INSTANCE.nextFloat() * 2 * (float) Math.PI;
+            xSpd = (float) Math.sin(temp) * 0.1F;
+            zSpd = (float) Math.cos(temp) * 0.1F;
+        } else {
+            xSpd = aDir.offsetX * (0.1F + 0.2F * XSTR_INSTANCE.nextFloat());
+            zSpd = aDir.offsetZ * (0.1F + 0.2F * XSTR_INSTANCE.nextFloat());
         }
 
-        if(chk1)
-            aWorld.spawnParticle(name, xPos + ran1*0.5F, yPos + XSTR_INSTANCE.nextFloat()*0.5F, zPos + XSTR_INSTANCE.nextFloat()*0.5F, xSpd, ySpd, zSpd);
+        if (chk1)
+            aWorld.spawnParticle(name, xPos + ran1 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, zPos + XSTR_INSTANCE.nextFloat() * 0.5F, xSpd, ySpd, zSpd);
 
-        if(chk2)
-            aWorld.spawnParticle(name, xPos + ran2*0.5F, yPos + XSTR_INSTANCE.nextFloat()*0.5F, zPos + XSTR_INSTANCE.nextFloat()*0.5F, xSpd, ySpd, zSpd);
+        if (chk2)
+            aWorld.spawnParticle(name, xPos + ran2 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, zPos + XSTR_INSTANCE.nextFloat() * 0.5F, xSpd, ySpd, zSpd);
 
-        if(chk3)
-            aWorld.spawnParticle(name, xPos + ran3*0.5F, yPos + XSTR_INSTANCE.nextFloat()*0.5F, zPos + XSTR_INSTANCE.nextFloat()*0.5F, xSpd, ySpd, zSpd);
+        if (chk3)
+            aWorld.spawnParticle(name, xPos + ran3 * 0.5F, yPos + XSTR_INSTANCE.nextFloat() * 0.5F, zPos + XSTR_INSTANCE.nextFloat() * 0.5F, xSpd, ySpd, zSpd);
     }
 }
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
index c6828c707e..6d2110baee 100644
--- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
+++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java
@@ -617,8 +617,19 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity {
             while (tempEUt <= V[mTier - 1] * mAmperage) {
                 tempEUt <<= 2;//this actually controls overclocking
                 //xEUt *= 4;//this is effect of everclocking
+                int oldTime = mMaxProgresstime;
                 mMaxProgresstime >>= ocTimeShift;//this is effect of overclocking
-                xEUt = mMaxProgresstime==0 ? xEUt >> ocTimeShift : xEUt << 2;//U know, if the time is less than 1 tick make the machine use less power
+                if (mMaxProgresstime <1)
+                {
+                    if(oldTime == 1)
+                        break;
+                    xEUt *= oldTime * (perfectOC ? 1:2);
+                    break;
+                }
+                else
+                {
+                    xEUt <<= ocTimeShift;
+                }
             }
             if(xEUt > Integer.MAX_VALUE - 1) {
                 mEUt = Integer.MAX_VALUE - 1;
diff --git a/src/main/java/gregtech/api/util/GT_ModHandler.java b/src/main/java/gregtech/api/util/GT_ModHandler.java
index e195bf9b02..4d264bec9b 100644
--- a/src/main/java/gregtech/api/util/GT_ModHandler.java
+++ b/src/main/java/gregtech/api/util/GT_ModHandler.java
@@ -1,5 +1,7 @@
 package gregtech.api.util;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameRegistry;
 import gregtech.GT_Mod;
@@ -122,6 +124,7 @@ public class GT_ModHandler {
     public static List<Integer> sSingleNonBlockDamagableRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static List<Integer> sVanillaRecipeList_warntOutput = new ArrayList<Integer>(50);
     public static final List<IRecipe> sSingleNonBlockDamagableRecipeList_verified = new ArrayList<IRecipe>(1000);
+    private static Cache<GT_ItemStack, ItemStack> sSmeltingRecipeCache = CacheBuilder.newBuilder().maximumSize(1000).build();
 
     static {
         sNativeRecipeClasses.add(ShapedRecipes.class.getName());
@@ -1565,8 +1568,14 @@ public class GT_ModHandler {
      * Used in my own Furnace.
      */
     public static ItemStack getSmeltingOutput(ItemStack aInput, boolean aRemoveInput, ItemStack aOutputSlot) {
-        if (aInput == null || aInput.stackSize < 1) return null;
-        ItemStack rStack = GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput));
+        if (aInput == null || aInput.stackSize < 1)
+            return null;
+        ItemStack rStack = null;
+        try {
+            rStack = sSmeltingRecipeCache.get(new GT_ItemStack(aInput), () -> GT_OreDictUnificator.get(FurnaceRecipes.smelting().getSmeltingResult(aInput)));
+        } catch (Exception ignored){
+        }
+
         if (rStack != null && (aOutputSlot == null || (GT_Utility.areStacksEqual(rStack, aOutputSlot) && rStack.stackSize + aOutputSlot.stackSize <= aOutputSlot.getMaxStackSize()))) {
             if (aRemoveInput) aInput.stackSize--;
             return rStack;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
index 8e29d620c3..4bd44ef80c 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_LargeTurbine_Gas.java
@@ -88,6 +88,17 @@ public class GT_MetaTileEntity_LargeTurbine_Gas extends GT_MetaTileEntity_LargeT
 
             FluidStack firstFuelType = new FluidStack(aFluids.get(0), 0); // Identify a SINGLE type of fluid to process.  Doesn't matter which one. Ignore the rest!
             int fuelValue = getFuelValue(firstFuelType);
+            
+            if (aOptFlow < fuelValue) {
+                // turbine too weak and/or fuel too powerful
+                // at least consume 1L
+                this.realOptFlow = 1;
+                // wastes the extra fuel and generate aOptFlow directly
+                depleteInput(new FluidStack(firstFuelType, 1));
+                this.storedFluid += 1;
+                return GT_Utility.safeInt((long)aOptFlow * (long)aBaseEff / 10000L);
+            }
+            
             actualOptimalFlow = GT_Utility.safeInt((long)aOptFlow / fuelValue);
             this.realOptFlow = actualOptimalFlow;
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
index b21d8fe73c..cdc68702d2 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_MultiFurnace.java
@@ -82,15 +82,49 @@ public class GT_MetaTileEntity_MultiFurnace
         ArrayList<ItemStack> tInputList = getStoredInputs();
         if (!tInputList.isEmpty()) {
             int mVolatage=GT_Utility.safeInt(getMaxInputVoltage());
-
-            int j = 0;
-            this.mOutputItems = new ItemStack[8 * this.mLevel];
-            for (int i = 0; (i < 256) && (j < this.mOutputItems.length); i++) {
-                if (null != (this.mOutputItems[j] = GT_ModHandler.getSmeltingOutput((ItemStack) tInputList.get(i % tInputList.size()), true, null))) {
-                    j++;
+            int tMaxParrallel = 8 * this.mLevel;
+            int tCurrenParrallel = 0;
+            ItemStack tSmeltStack = tInputList.get(0);
+            ItemStack tOutputStack = GT_ModHandler.getSmeltingOutput(tSmeltStack,false,null);
+            if (tOutputStack == null)
+                    return false;
+            for (int i = 0;i<tInputList.size();i++)
+            {
+                ItemStack item = tInputList.get(i);
+                if (tSmeltStack.isItemEqual(item))
+                {
+                    if (item.stackSize<(tMaxParrallel-tCurrenParrallel))
+                    {
+                        tCurrenParrallel += item.stackSize;
+                        item.stackSize = 0;
+                    }
+                    else
+                    {
+                        item.stackSize = (tCurrenParrallel + item.stackSize) - tMaxParrallel;
+                        tCurrenParrallel = tMaxParrallel;
+                        break;
+                    }
                 }
             }
-            if (j > 0) {
+//            this.mOutputItems = new ItemStack[8 * this.mLevel];
+//            for (int i = 0; (i < 256) && (j < this.mOutputItems.length); i++) {
+//                if (null != (this.mOutputItems[j] = GT_ModHandler.getSmeltingOutput((ItemStack) tInputList.get(i % tInputList.size()), true, null))) {
+//                    j++;
+//                }
+//            }
+            tCurrenParrallel *= tOutputStack.stackSize;
+            this.mOutputItems = new ItemStack[(tCurrenParrallel/64)+1];
+            for (int i = 0; i<this.mOutputItems.length;i++)
+            {
+                ItemStack tNewStack = tOutputStack.copy();
+                int size = tCurrenParrallel>64 ? 64 : tCurrenParrallel;
+                tNewStack.stackSize = size;
+                tCurrenParrallel -= size;
+                this.mOutputItems[i] = tNewStack;
+            }
+
+
+            if (this.mOutputItems != null && this.mOutputItems.length > 0) {
                 this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);
                 this.mEfficiencyIncrease = 10000;
                 calculateOverclockedNessMulti(4, 512, 1, mVolatage);
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 63f4abcf65..1951c37382 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -2,6 +2,7 @@ package gregtech.loaders.oreprocessing;
 
 import appeng.api.config.TunnelType;
 import appeng.core.Api;
+import cpw.mods.fml.common.Optional;
 import gregtech.GT_Mod;
 import gregtech.api.enums.*;
 import gregtech.api.util.GT_Log;
@@ -18,7 +19,8 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
     private Materials[] dielectrics = {Materials.PolyvinylChloride, Materials.Polydimethylsiloxane};
     private Materials[] rubbers = {Materials.Rubber, Materials.StyreneButadieneRubber, Materials.Silicone};
     private Materials[] syntheticRubbers = {Materials.StyreneButadieneRubber, Materials.Silicone};
-    static private TunnelType tt = TunnelType.ME;
+
+    private static Object tt;
     public ProcessingWire() {
         OrePrefixes.wireGt01.add(this);
         OrePrefixes.wireGt02.add(this);
@@ -93,7 +95,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
                 GT_ModHandler.addShapelessCraftingRecipe(GT_Utility.copyAmount(1L, new Object[]{aStack}), new Object[]{OrePrefixes.wireGt12.get(aMaterial), OrePrefixes.wireGt04.get(aMaterial)});
 
                 if (GT_Mod.gregtechproxy.mAE2Integration) {
-                    Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, tt);
+                    AE2addNewAttunement(aStack);
                 }
                 break;
             default:
@@ -183,8 +185,30 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
         }
         GT_Values.RA.addUnboxingRecipe(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), GT_Utility.copyAmount(1L, new Object[]{aStack}), null, 100, 8);
         if (GT_Mod.gregtechproxy.mAE2Integration) {
-            Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, tt);
-            Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L), tt);
+            AE2AddNetAttunementCable(aStack, correspondingCable, aMaterial);
         }
     }
-}
+
+    //region AE2 compat
+    static {
+        if (GT_Mod.gregtechproxy.mAE2Integration)
+            setAE2Field();
+    }
+
+    @Optional.Method(modid = "appliedenergistics2")
+    private static void setAE2Field(){
+        tt = TunnelType.ME;
+    }
+
+    @Optional.Method(modid = "appliedenergistics2")
+    private void AE2addNewAttunement(ItemStack aStack){
+        Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
+    }
+
+    @Optional.Method(modid = "appliedenergistics2")
+    private void AE2AddNetAttunementCable(ItemStack aStack, OrePrefixes correspondingCable, Materials aMaterial){
+        Api.INSTANCE.registries().p2pTunnel().addNewAttunement(aStack, (TunnelType) tt);
+        Api.INSTANCE.registries().p2pTunnel().addNewAttunement(GT_OreDictUnificator.get(correspondingCable, aMaterial, 1L),(TunnelType) tt);
+    }
+//end region
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
index 82992d1272..1b70ac498e 100644
--- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
+++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java
@@ -17,6 +17,7 @@ import mods.railcraft.common.items.RailcraftToolItems;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
 import net.minecraftforge.common.ForgeHooks;
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
@@ -530,7 +531,37 @@ public class GT_MachineRecipeLoader implements Runnable {
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_HV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Gold, 1L), ItemList.Circuit_Chip_LPIC.get(2L), ItemList.HV_Coil.get(2L), ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_HV.get(1L)}, GT_Values.NF, ItemList.Hatch_Dynamo_HV.get(1L), 200, 480);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Aluminium, 1L), ItemList.Circuit_Chip_PIC.get(2L), ItemList.EV_Coil.get(2L), ItemList.Reactor_Coolant_NaK_1.get(1L), ItemList.Electric_Pump_EV.get(1L)}, GT_Values.NF, ItemList.Hatch_Dynamo_EV.get(1L), 200, 1920);
         GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_IV.get(1L), GT_OreDictUnificator.get(OrePrefixes.spring, Materials.Vanadiumtriindinid, 1L), ItemList.Circuit_Chip_HPIC.get(2L), ItemList.IV_Coil.get(2L), ItemList.Reactor_Coolant_NaK_3.get(1L), ItemList.Electric_Pump_IV.get(1L)}, GT_Values.NF, ItemList.Hatch_Dynamo_IV.get(1L), 200, 7680);
-
+	
+	 {//limiting life time of the variables
+             ItemStack flask = ItemList.VOLUMETRIC_FLASK.get(1);
+             NBTTagCompound nbtFlask = new NBTTagCompound();
+             nbtFlask.setInteger("Capacity", 144);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(1), flask, 10, 30);
+             nbtFlask.setInteger("Capacity", 288);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(2), flask, 10, 30);
+             nbtFlask.setInteger("Capacity", 576);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(3), flask, 10, 30);
+             nbtFlask.setInteger("Capacity", 720);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(4), flask, 10, 30);
+	     nbtFlask.setInteger("Capacity", 864);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(5), flask, 10, 30);
+             nbtFlask.setInteger("Capacity", 250);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(10), flask, 10, 30);
+	     nbtFlask.setInteger("Capacity", 500);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(ItemList.VOLUMETRIC_FLASK.get(1), GT_Utility.getIntegratedCircuit(11), flask, 10, 30);
+             // make the 1000L recipe actualy in
+             ItemStack flask500 = flask.copy();
+             nbtFlask.setInteger("Capacity", 1000);
+             flask.setTagCompound(nbtFlask);
+             GT_Values.RA.addAssemblerRecipe(flask500, GT_Utility.getIntegratedCircuit(24), flask, 10, 30);
+         }
 //        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_HV.get(1L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Brass, 1L), ItemList.Conveyor_Module_HV.get(1L), new ItemStack(Blocks.chest, 1, 0), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.Hatch_Input_Bus_HV.get(1L), 200, 480);
 //        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_EV.get(1L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Electrum, 1L), ItemList.Conveyor_Module_EV.get(1L), new ItemStack(Blocks.chest, 1, 0), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.Hatch_Input_Bus_EV.get(1L), 200, 1920);
 //        GT_Values.RA.addAssemblerRecipe(new ItemStack[]{ItemList.Hull_IV.get(1L), GT_OreDictUnificator.get(OrePrefixes.pipeMedium, Materials.Platinum, 1L), ItemList.Conveyor_Module_IV.get(1L), new ItemStack(Blocks.chest, 1, 0), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.Hatch_Input_Bus_IV.get(1L), 200, 7680);
diff --git a/src/main/resources/assets/gregtech/lang/en_US.lang b/src/main/resources/assets/gregtech/lang/en_US.lang
index 882c237c5b..bda0fbff87 100644
--- a/src/main/resources/assets/gregtech/lang/en_US.lang
+++ b/src/main/resources/assets/gregtech/lang/en_US.lang
@@ -815,6 +815,8 @@ achievement.gt.blockmachines.multimachine.em.emtoessentia=Essentia Dequantizer
 achievement.gt.blockmachines.multimachine.em.emtoessentia.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockmachines.multimachine.em.scanner=Elemental Scanner
 achievement.gt.blockmachines.multimachine.em.scanner.desc=Pickup this item to see the recipe in NEI
+achievement.gt.blockmachines.multimachine.em.scanner=Data Bank
+achievement.gt.blockmachines.multimachine.em.databank.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockcasingsTT.8=Hollow Casing
 achievement.gt.blockcasingsTT.8.desc=Pickup this item to see the recipe in NEI
 achievement.gt.blockcasingsTT.7=Molecular Coil