Merge pull request #4 from Blood-Asp/unstable

update

26 files changed, 393 insertions, 100 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
new file mode 100644
index 0000000000..bf58418246
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
@@ -0,0 +1,221 @@
+package gregtech.common.tileentities.machines.basic;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.TreeMap;
+
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+import ic2.core.Ic2Items;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraftforge.fluids.FluidStack;
+import sun.text.resources.es.CollationData_es;
+
+public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_BasicMachine {    
+    boolean ready = false;
+    int radius;
+    int near;
+    int middle;
+    int step;
+
+    public GT_MetaTileEntity_AdvSeismicProspector(int aID, String aName, String aNameRegional, int aTier, int aRadius, int aStep) {
+        super(aID, aName, aNameRegional, aTier, 1, // amperage
+                "Place, activate with explosives ("
+                + "8 Glyceryl, "
+                + "32 TNT or "
+                + "16 ITNT), use Data Stick",
+                1, // input slot count
+                1, // output slot count
+                "Default.png", // GUI name
+                "", // NEI name
+                new ITexture[] { new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER_ACTIVE),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_ROCK_BREAKER),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER_ACTIVE),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_ROCK_BREAKER),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER_ACTIVE),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_ROCK_BREAKER),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER_ACTIVE),
+                        new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_ROCK_BREAKER) });
+        radius = aRadius;
+        near = radius / 3;
+        near = near + near % 2; // making near value even;
+        middle = near * 2;
+        step = aStep;
+    }
+
+    protected GT_MetaTileEntity_AdvSeismicProspector(String aName, int aTier, String aDescription, ITexture[][][] aTextures,
+            String aGUIName, String aNEIName, int aNear, int aMiddle, int aRadius, int aStep) {
+        super(aName, aTier, 1, aDescription, aTextures, 1, 1, aGUIName, aNEIName);
+        radius = aRadius;
+        near = aNear;
+        middle = aMiddle;
+        step = aStep;
+    }
+
+    public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_AdvSeismicProspector(this.mName, this.mTier, this.mDescription, this.mTextures,
+                this.mGUIName, this.mNEIName, this.near, this.middle, this.radius, this.step);
+    }
+
+    @Override
+    public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) {
+        if (aBaseMetaTileEntity.isServerSide()) {
+            ItemStack aStack = aPlayer.getCurrentEquippedItem();
+
+            if (!ready && (GT_Utility.consumeItems(aPlayer, aStack, Item.getItemFromBlock(Blocks.tnt), 32)
+                    || GT_Utility.consumeItems(aPlayer, aStack, Ic2Items.industrialTnt.getItem(), 16)
+                    || GT_Utility.consumeItems(aPlayer, aStack, Materials.Glyceryl, 8))) {
+
+                this.ready = true;
+                this.mMaxProgresstime = (aPlayer.capabilities.isCreativeMode ? 20 : 800);
+
+            } else if (ready && mMaxProgresstime == 0
+                    && aStack != null && aStack.stackSize == 1
+                    && aStack.getItem() == ItemList.Tool_DataStick.getItem()) {
+                this.ready = false;
+
+                // prospecting ores
+                HashMap<String, Integer> tNearOres = new HashMap<String, Integer>();
+                HashMap<String, Integer> tMiddleOres = new HashMap<String, Integer>();
+                HashMap<String, Integer> tFarOres = new HashMap<String, Integer>();
+                prospectOres(tNearOres, tMiddleOres, tFarOres);
+
+                // prospecting oils
+                HashMap<String, Integer> tOils = new HashMap<String, Integer>(9);
+                prospectOils(tOils);
+
+                GT_Utility.ItemNBT.setAdvancedProspectionData(mTier,
+                    aStack,
+                    this.getBaseMetaTileEntity().getXCoord(),
+                    this.getBaseMetaTileEntity().getYCoord(),
+                    this.getBaseMetaTileEntity().getZCoord(),
+                    this.getBaseMetaTileEntity().getWorld().provider.dimensionId,
+                    GT_Utility.sortByValueToList(tOils),
+                    GT_Utility.sortByValueToList(tNearOres),
+                    GT_Utility.sortByValueToList(tMiddleOres),
+                    GT_Utility.sortByValueToList(tFarOres),
+                    near, middle, radius);
+            }
+        }
+
+        return true;
+    }
+
+    private void prospectOils(HashMap<String, Integer> aOils) {
+
+        int tLeftXBound = this.getBaseMetaTileEntity().getXCoord() - radius;
+        int tRightXBound = tLeftXBound + 2*radius;
+
+        int tLeftZBound = this.getBaseMetaTileEntity().getZCoord() - radius;
+        int tRightZBound = tLeftZBound + 2*radius;
+
+        ArrayList<String> filterList = new ArrayList<String>(9);
+        String filter;
+
+        for (int x = tLeftXBound; x <= tRightXBound; ++x)
+            for (int z = tLeftZBound; z <= tRightZBound; ++z) {
+                filter = x/96 + "," + z/96;
+
+                if (!filterList.contains(filter)) {
+                    filterList.add(filter);
+
+                    putOil((x/96)*96, (z/96)*96, aOils);
+                }
+            }
+    }
+
+    private void putOil(int x, int z, HashMap<String, Integer> aOils) {
+        FluidStack tFluid = GT_Utility.getUndergroundOil(getBaseMetaTileEntity().getWorld(), x, z);
+        if (tFluid.amount / 5000 > 0)
+            aOils.put(x + "," + z + "," + (tFluid.amount / 5000) + "," + tFluid.getLocalizedName(), tFluid.amount / 5000);
+    }
+
+    private void prospectOres(Map<String, Integer> aNearOres, Map<String, Integer> aMiddleOres, Map<String, Integer> aFarOres) {        
+        int tLeftXBound = this.getBaseMetaTileEntity().getXCoord() - radius;
+        int tRightXBound = tLeftXBound + 2*radius;
+
+        int tLeftZBound = this.getBaseMetaTileEntity().getZCoord() - radius;
+        int tRightZBound = tLeftZBound + 2*radius;
+
+        for (int i = tLeftXBound; i <= tRightXBound; i += step)
+            for (int k = tLeftZBound; k <= tRightZBound; k += step) {
+                int di = Math.abs(i - this.getBaseMetaTileEntity().getXCoord());
+                int dk = Math.abs(k - this.getBaseMetaTileEntity().getZCoord());
+
+                if (di <= near && dk <= near)
+                    prospectHole(i, k, aNearOres);
+                else if (di <= middle && dk <= middle)
+                    prospectHole(i, k, aMiddleOres);
+                else
+                    prospectHole(i, k, aFarOres);
+            } 
+    }
+
+    private void prospectHole(
+            int i, int k, Map<String, Integer> aOres) {
+
+        String tFoundOre = null;
+        for (int j = this.getBaseMetaTileEntity().getYCoord(); j > 0; j--) {
+            tFoundOre = checkForOre(i, j, k);                            
+            if (tFoundOre == null)
+                continue;
+
+            countOre(aOres, tFoundOre);
+        }
+    }
+
+    private String checkForOre(int x, int y, int z) {
+        Block tBlock = this.getBaseMetaTileEntity().getBlock(x, y, z);
+
+        if (tBlock instanceof GT_Block_Ores_Abstract) {
+            TileEntity tTileEntity = getBaseMetaTileEntity().getWorld().getTileEntity(x, y, z);
+
+            if ((tTileEntity instanceof GT_TileEntity_Ores)
+                && (((GT_TileEntity_Ores) tTileEntity).mMetaData < 16000)) { // Filtering small ores
+                Materials tMaterial
+                    = GregTech_API.sGeneratedMaterials[((GT_TileEntity_Ores) tTileEntity).mMetaData % 1000];
+
+                if ((tMaterial != null) && (tMaterial != Materials._NULL))
+                    return tMaterial.mDefaultLocalName;
+            }
+        } else {
+            int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z);
+            ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID));
+
+            if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore")))
+                return tAssotiation.mMaterial.mMaterial.mDefaultLocalName;
+        }
+
+        return null;
+    }
+
+    private static void countOre(Map<String, Integer> map, String ore) {
+        Integer oldCount = map.get(ore);
+        oldCount = (oldCount == null) ? 0 : oldCount;
+
+        map.put(ore, oldCount + 1);
+    }
+}
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
index 793602e3f6..9c35e87e7d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Disassembler.java
@@ -41,7 +41,7 @@ public class GT_MetaTileEntity_Disassembler
                         }

                     }

                     if(this.mTier>5){

-                    	this.mMaxProgresstime = this.mMaxProgresstime << (mTier-5);

+                    	this.mMaxProgresstime = this.mMaxProgresstime >> (mTier-5);

                     }

                     if(mMaxProgresstime==80){

                     	return 0;

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_LightningRod.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_LightningRod.java
new file mode 100644
index 0000000000..d64db1f0a6
--- /dev/null
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_LightningRod.java
@@ -0,0 +1,130 @@
+package gregtech.common.tileentities.machines.basic;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.interfaces.ITexture;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.objects.XSTR;
+import net.minecraft.entity.effect.EntityLightningBolt;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.world.World;
+
+public class GT_MetaTileEntity_LightningRod extends GT_MetaTileEntity_TieredMachineBlock {
+    public GT_MetaTileEntity_LightningRod(int aID, String aName, String aNameRegional, int aTier) {
+        super(aID, aName, aNameRegional, aTier, 0, "Generates EU From Lightning Bolts");
+    }
+
+    public GT_MetaTileEntity_LightningRod(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
+        super(aName, aTier, aInvSlotCount, aDescription, aTextures);
+    }
+
+    @Override
+    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+        return new ITexture[]{aActive ? new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS_YELLOW) : new GT_RenderedTexture(Textures.BlockIcons.MACHINE_CASING_FUSION_GLASS)};
+    }
+
+    @Override
+    public ITexture[][][] getTextureSet(ITexture[] aTextures) {
+        return null;
+    }
+
+    public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) {
+        return new GT_MetaTileEntity_LightningRod(this.mName, this.mTier, this.mInventory.length, this.mDescription, this.mTextures);
+    }
+
+    @Override
+    public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
+        World aWorld = aBaseMetaTileEntity.getWorld();
+        XSTR aXSTR = new XSTR();
+        if (!aWorld.isRemote) {
+            if (aTick % 256 == 0 && (aWorld.isThundering() || (aWorld.isRaining() && aXSTR.nextInt(10) == 0))) {
+                int aRodValue = 0;
+                boolean isRodValid = true;
+                int aX = aBaseMetaTileEntity.getXCoord();
+                int aY = aBaseMetaTileEntity.getYCoord();
+                int aZ = aBaseMetaTileEntity.getZCoord();
+
+                for (int i = aBaseMetaTileEntity.getYCoord() + 1; i < aWorld.getHeight()-1; i++) {
+                    if (isRodValid && aBaseMetaTileEntity.getBlock(aX, i, aZ).getUnlocalizedName().equals("blockFenceIron")) {
+                        aRodValue++;
+                    } else {
+                        isRodValid = false;
+                        if (aBaseMetaTileEntity.getBlock(aX, i, aZ) != Blocks.air) {
+                            aRodValue=0;
+                            break;
+                        }
+                    }
+                }
+                if (!aWorld.isThundering() && ((aY + aRodValue) < 128)) aRodValue = 0;
+                if (aXSTR.nextInt(4 * aWorld.getHeight()) < (aRodValue * (aY + aRodValue))) {
+                    aBaseMetaTileEntity.setActive(true);
+                    aBaseMetaTileEntity.increaseStoredEnergyUnits(maxEUStore() - aBaseMetaTileEntity.getStoredEU(), false);
+                    aWorld.addWeatherEffect(new EntityLightningBolt(aWorld, aX, aY + aRodValue, aZ));
+                    aBaseMetaTileEntity.setActive(false);
+                }
+            }
+        }
+    }
+
+    @Override
+    public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return false;
+    }
+
+    @Override
+    public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
+        return false;
+    }
+
+    @Override
+    public boolean isSimpleMachine() {
+        return false;
+    }
+
+    @Override
+    public boolean isFacingValid(byte aFacing) {
+        return true;
+    }
+
+    @Override
+    public boolean isOutputFacing(byte aSide) {
+        return true;
+    }
+
+    @Override
+    public boolean isEnetOutput() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnetInput() {
+        return false;
+    }
+
+    @Override
+    public long maxEUStore() {
+        return 25000000;
+    }
+
+    @Override
+    public long maxEUOutput() {
+        return 8192;
+    }
+
+    @Override
+    public long maxAmperesOut() {
+        return 1;
+    }
+
+    @Override
+    public void saveNBTData(NBTTagCompound aNBT) {
+    }
+
+    @Override
+    public void loadNBTData(NBTTagCompound aNBT) {
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
index fbeda8f014..4ea6166058 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Massfabricator.java
@@ -10,6 +10,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_Config;

+import gregtech.api.util.GT_Recipe;

 import net.minecraftforge.fluids.FluidStack;

 

 import static gregtech.api.enums.GT_Values.V;

@@ -68,6 +69,11 @@ public class GT_MetaTileEntity_Massfabricator
         return 0;

     }

 

+    @Override

+    public GT_Recipe.GT_Recipe_Map getRecipeList() {

+        return GT_Recipe.GT_Recipe_Map.sMassFabFakeRecipes;

+    }

+

     public boolean isFluidInputAllowed(FluidStack aFluid) {

         return aFluid.isFluidEqual(Materials.UUAmplifier.getFluid(1L));

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
index 6d11864f26..2e50df6e54 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Replicator.java
@@ -8,6 +8,7 @@ import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;

 import gregtech.api.objects.GT_RenderedTexture;

 import gregtech.api.util.GT_OreDictUnificator;

+import gregtech.api.util.GT_Recipe;

 import gregtech.api.util.GT_Utility;

 import gregtech.common.items.behaviors.Behaviour_DataOrb;

 import net.minecraft.item.ItemStack;

@@ -74,6 +75,11 @@ public class GT_MetaTileEntity_Replicator
         return 0;

     }

 

+    @Override

+    public GT_Recipe.GT_Recipe_Map getRecipeList() {

+        return GT_Recipe.GT_Recipe_Map.sReplicatorFakeRecipes;

+    }

+

     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

         return (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) && (ItemList.Cell_Empty.isStackEqual(aStack));

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
index 8d3f5cb1fa..2fe1a3e273 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
@@ -330,11 +330,6 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
     }
 
     @Override
-    public int getAmountOfOutputs() {
-        return 0;
-    }
-
-    @Override
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
index 97f3f89ecc..e305af1eb9 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AssemblyLine.java
@@ -228,11 +228,6 @@ public class GT_MetaTileEntity_AssemblyLine
     public int getDamageToComponent(ItemStack aStack) {
         return 0;
     }
-
-    public int getAmountOfOutputs() {
-        return 2;
-    }
-
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
index fbb1b98601..6196d44f98 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Charcoal_Pit.java
@@ -218,10 +218,6 @@ public class GT_MetaTileEntity_Charcoal_Pit extends GT_MetaTileEntity_MultiBlock
         return 0;
     }
 
-    public int getAmountOfOutputs() {
-        return 1;
-    }
-
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
     }
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
index 27687323e3..adcede79ba 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DieselEngine.java
@@ -39,14 +39,15 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
         return new String[]{
                 "Controller Block for the Large Diesel Engine",
                 "Size(WxHxD): 3x3x4, Controller (front centered)",
-                "3x3x4 of Stable Titanium Casing (hollow, Min 24!)",
+                "3x3x4 of Stable Titanium Casing (hollow, Min 16!)",
                 "2x Titanium Gear Box Casing inside the Hollow Casing",
-                "8x Engine Intake Casings (around controller, Min 8!)",
-                "1x Input Hatch (one of the Casings)",
-                "1x Maintenance Hatch (one of the Casings)",
-                "1x Muffler Hatch (top middle back)",
+                "8x Engine Intake Casings (around controller)",
+                "2x Input Hatch (one of the Casings next to a Gear Box)",
+                "1x Maintenance Hatch (one of the Casings next to a Gear Box)",
+                "1x Muffler Hatch (top middle back, next to the rear Gear Box)",
                 "1x Dynamo Hatch (back centered)",
-                "Engine Intake Casings not obstructed (only air blocks)",
+                "Engine Intake Casings not obstructed in front (only air blocks)",
+                "Supply Diesel Fuel and Lubricant to run. Supply Oxygen to boost output (optional).",
                 "2048EU/t default output, 6144EU/t boosted output"};
     }
 
@@ -88,7 +89,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
 
                                 fuelValue = aFuel.mSpecialValue;
                                 fuelRemaining = hatchFluid1.amount; //Record available fuel
-                                this.mEUt = mEfficiency < 2000 ? 0 : (int) (2048 * ((float) mEfficiency / 10000)); //Output 0 if startup is less than 20%
+                                this.mEUt = mEfficiency < 2000 ? 0 : 2048; //Output 0 if startup is less than 20%
                                 this.mProgresstime = 1;
                                 this.mMaxProgresstime = 1;
                                 this.mEfficiencyIncrease = 15;
@@ -217,12 +218,6 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
     public int getPollutionPerTick(ItemStack aStack) {
         return 15;
     }
-
-    @Override
-    public int getAmountOfOutputs() {
-        return 0;
-    }
-
     @Override
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return true;
@@ -232,7 +227,7 @@ public class GT_MetaTileEntity_DieselEngine extends GT_MetaTileEntity_MultiBlock
     public String[] getInfoData() {
         return new String[]{
             "Diesel Engine",
-            "Current Output: "+mEUt+" EU/t",
+            "Current Output: "+mEUt*mEfficiency/10000 +" EU/t",
             "Fuel Consumption: "+fuelConsumption+"L/t",
             "Fuel Value: "+fuelValue+" EU/L",
             "Fuel Remaining: "+fuelRemaining+" Litres",
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
index 246df6707c..22dd01c755 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_DistillationTower.java
@@ -197,9 +197,6 @@ public class GT_MetaTileEntity_DistillationTower
         return 0;
     }
 
-    public int getAmountOfOutputs() {
-        return 1;
-    }
 
     public boolean explodesOnComponentBreak(ItemStack aStack) {
         return false;
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
index 2f058e6e76..a1c2543723 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ElectricBlastFurnace.java
@@ -109,17 +109,21 @@ public class GT_MetaTileEntity_ElectricBlastFurnace
             if ((tRecipe != null) && (this.mHeatingCapacity >= tRecipe.mSpecialValue) && (tRecipe.isRecipeInputEqual(true, tFluids, tInputs))) {

                 this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000);

                 this.mEfficiencyIncrease = 10000;

+                int tHeatCapacityDivTiers = (mHeatingCapacity - tRecipe.mSpecialValue)/900;

                 if (tRecipe.mEUt <= 16) {

                     this.mEUt = (tRecipe.mEUt * (1 << tTier - 1) * (1 << tTier - 1));

                     this.mMaxProgresstime = (tRecipe.mDuration / (1 << tTier - 1));

                 } else {

                     this.mEUt = tRecipe.mEUt;

                     this.mMaxProgresstime = tRecipe.mDuration;

+                    int i = 2;

                     while (this.mEUt <= gregtech.api.enums.GT_Values.V[(tTier - 1)]) {

                         this.mEUt *= 4;