Merge pull request #2 from GTNewHorizons/experimental

5.09.33.57

37 files changed, 1256 insertions, 501 deletions

diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
index d11b1f2f81..6605d4fc35 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_ChestBuffer.java
@@ -19,11 +19,15 @@ import java.util.Comparator;
 
 public class GT_MetaTileEntity_ChestBuffer
         extends GT_MetaTileEntity_Buffer {
+    private static final int[] tickRate = {400, 200, 100, 20, 4, 1, 1, 1,1,1};
+
+
     public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 28, new String[]{
                         		"Buffers up to 27 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 3EU per moved Item"});
+                        		"Consumes 3EU per moved Item",
+                        		getTickRateDesc(aTier)});
     }
 
     public GT_MetaTileEntity_ChestBuffer(int aID, String aName, String aNameRegional, int aTier, int aInvSlotCount, String aDescription) {
@@ -55,6 +59,8 @@ public class GT_MetaTileEntity_ChestBuffer
     }
 
     protected void moveItems(IGregTechTileEntity aBaseMetaTileEntity, long aTimer) {
+        if (aTimer % tickRate[mTier] > 0) return;
+
         if(aBaseMetaTileEntity.hasInventoryBeenModified()) {
             fillStacksIntoFirstSlots();
         }
@@ -64,9 +70,9 @@ public class GT_MetaTileEntity_ChestBuffer
             super.moveItems(aBaseMetaTileEntity, aTimer);
         }
         // mSuccesss is set to 50 on a successful move
-        if(mSuccess == 50) {
-            fillStacksIntoFirstSlots();
-        }
+        //if(mSuccess == 50) {
+        //    fillStacksIntoFirstSlots();
+        //}
         if(mSuccess < 0) {
             mSuccess = 0;
         }
@@ -85,47 +91,32 @@ public class GT_MetaTileEntity_ChestBuffer
                         return 1;
                     Item item1 = o1.getItem();
                     Item item2 = o2.getItem();
-                
-                    // If item1 is a block and item2 isn't, sort item1 before item2
-                    if (((item1 instanceof ItemBlock)) && (!(item2 instanceof ItemBlock))) {
+
+                    if(item1 instanceof ItemBlock) {
+                        if (!(item2 instanceof ItemBlock))
+                            return -1; // If item1 is a block and item2 isn't, sort item1 before item2
+                    } else if (item2 instanceof ItemBlock)
+                        return 1; // If item2 is a block and item1 isn't, sort item1 after item2
+
+                    int id1 = Item.getIdFromItem( item1 );
+                    int id2 = Item.getIdFromItem( item2 );
+                    if ( id1 < id2 ) {
                         return -1;
                     }
-                
-                    // If item2 is a block and item1 isn't, sort item1 after item2
-                    if (((item2 instanceof ItemBlock)) && (!(item1 instanceof ItemBlock))) {
+                    if ( id1 > id2 ) {
                         return 1;
                     }
 
-                    // If the items are blocks, use the string comparison
-                    if ((item1 instanceof ItemBlock)) { // only need to check one since we did the check above
-                        String displayName1 = o1.getDisplayName();
-                        String displayName2 = o2.getDisplayName();
-                        int result = displayName1.compareToIgnoreCase(displayName2);
-                        //GT_FML_LOGGER.info("sorter: " + displayName1 + " " + displayName2 + " " + result);
-                        return result;
-                    } else
-                    {
-                        // Not a block.  Use the ID and damage to compare them.
-                        int id1 = Item.getIdFromItem( item1 );
-                        int id2 = Item.getIdFromItem( item2 );
-                        if ( id1 < id2 ) {
-                            return -1;
-                        }
-                        if ( id1 > id2 ) {
-                            return 1;
-                        }
-                        // id1 must equal id2, get their damage and compare
-                        id1 = o1.getItemDamage();
-                        id2 = o2.getItemDamage();
-                        
-                        if ( id1 < id2 ) {
-                        	return -1;
-                        }
-                        if ( id1 > id2 ) {
-                        	return 1;
-                        }
-                        return 0;
+                    id1 = o1.getItemDamage();
+                    id2 = o2.getItemDamage();
+
+                    if ( id1 < id2 ) {
+                        return -1;
+                    }
+                    if ( id1 > id2 ) {
+                        return 1;
                     }
+                    return 0;
                 }
             });
     }
@@ -155,4 +146,21 @@ public class GT_MetaTileEntity_ChestBuffer
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_GUIContainer_ChestBuffer(aPlayerInventory, aBaseMetaTileEntity);
     }
+
+    protected static String getTickRateDesc(int tier){
+        int tickRate = getTickRate(tier);
+        String s = "";
+        if (tickRate < 20)
+            s = "1/" + 20/tickRate + " ";
+        else if (tickRate > 20) {
+            s = (tickRate / 20) + "th ";
+        }
+        return "Moves items every " + s + "second";
+    }
+
+    protected static int getTickRate(int tier) {
+        if (tier > 9)
+            return 1;
+        return tickRate[tier];
+    }
 }
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
index 10fcb47d12..da35f17518 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_SuperBuffer.java
@@ -15,7 +15,8 @@ public class GT_MetaTileEntity_SuperBuffer
         super(aID, aName, aNameRegional, aTier, 257, new String[]{
                         		"Buffers up to 256 Item Stacks",
                         		"Use Screwdriver to regulate output stack size",
-                        		"Consumes 1EU per moved Item"});
+                        		"Consumes 1EU per moved Item",
+                                getTickRateDesc(aTier)});
     }
 
     public GT_MetaTileEntity_SuperBuffer(String aName, int aTier, int aInvSlotCount, String aDescription, ITexture[][][] aTextures) {
diff --git a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
index 9b9f782601..6292a769a2 100644
--- a/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
+++ b/src/main/java/gregtech/common/tileentities/automation/GT_MetaTileEntity_TypeFilter.java
@@ -83,17 +83,17 @@ public class GT_MetaTileEntity_TypeFilter
                     }
                 }
             }
-            this.mRotationIndex = 0;
+            this.mRotationIndex = -1;
         }
     }
 
     public void onPreTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
         super.onPreTick(aBaseMetaTileEntity, aTick);
-        if ((getBaseMetaTileEntity().isServerSide()) && (aTick % 8L == 0L)) {
+        if ((getBaseMetaTileEntity().isServerSide()) && ((aTick % 8L == 0L) || mRotationIndex == -1)) {
             if (this.mPrefix.mPrefixedItems.isEmpty()) {
                 this.mInventory[9] = null;
             } else {
-                this.mInventory[9] = GT_Utility.copyAmount(1L, new Object[]{this.mPrefix.mPrefixedItems.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size())});
+                this.mInventory[9] = GT_Utility.copyAmount(1L, this.mPrefix.mPrefixedItems.get(this.mRotationIndex = (this.mRotationIndex + 1) % this.mPrefix.mPrefixedItems.size()));
                 if (this.mInventory[9].getItemDamage() == 32767) {
                     this.mInventory[9].setItemDamage(0);
                 }
diff --git a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
index 6db4013a60..eeb8ec252f 100644
--- a/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/boilers/GT_MetaTileEntity_Boiler_Bronze.java
@@ -137,7 +137,11 @@ public class GT_MetaTileEntity_Boiler_Bronze
                         (GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Charcoal) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
                         (GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Lignite) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
                         (GT_Utility.isPartOfMaterials(this.mInventory[2],Materials.Diamond) && !GT_Utility.isPartOfOrePrefix(this.mInventory[2],OrePrefixes.block)) ||
-                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke")
+                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCoke") ||
+                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCactusCharcoal") ||
+                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelCactusCoke") ||
+                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelSugarCharcoal") ||
+                        GT_OreDictUnificator.isItemStackInstanceOf(this.mInventory[2], "fuelSugarCoke")
                 ) {
                     if ((TileEntityFurnace.getItemBurnTime(this.mInventory[2])/10) > 0) {
                         this.mProcessingEnergy += (TileEntityFurnace.getItemBurnTime(this.mInventory[2])/10);
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
index 46ea555ad0..28f661c339 100644
--- 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
@@ -216,12 +216,13 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             }
         } 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;
+            ItemStack is = new ItemStack(tBlock, 1, tMetaID);
+            ItemData association = GT_OreDictUnificator.getAssociation(is);
+            if ((association != null) && (association.mPrefix.toString().startsWith("ore")))
+                return association.mMaterial.mMaterial.mDefaultLocalName;
+            else if (GT_Utility.isOre(is))
+                return tBlock.getLocalizedName();
         }
-
         return null;
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
index 938c2d6900..6895310b46 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Boxinator.java
@@ -6,6 +6,7 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
+import gregtech.api.objects.GT_ItemStack;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.api.util.GT_Recipe;
@@ -14,6 +15,10 @@ import net.minecraft.item.ItemStack;
 
 public class GT_MetaTileEntity_Boxinator
         extends GT_MetaTileEntity_BasicMachine {
+    ItemStack aInputCache;
+    ItemStack aOutputCache;
+    int aTypeCache = 0;
+
     public GT_MetaTileEntity_Boxinator(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "Puts things into Boxes", 2, 1, "Packager.png", "", new ITexture[]{new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_BOXINATOR), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR_ACTIVE), new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_BOXINATOR)});
     }
@@ -34,28 +39,56 @@ public class GT_MetaTileEntity_Boxinator
         return GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes;
     }
 
+    private boolean hasValidCache(ItemStack mItem,int mType,boolean mClearOnFailure) {
+        if (aInputCache != null
+                && aOutputCache != null
+                && aTypeCache == mType
+                && aInputCache.isItemEqual(mItem)
+                && ItemStack.areItemStackTagsEqual(mItem,aInputCache))
+            return true;
+        // clear cache if it was invalid
+        if (mClearOnFailure) {
+            aInputCache = null;
+            aOutputCache = null;
+            aTypeCache = 0;
+        }
+        return false;
+    }
+
+    private void cacheItem(ItemStack mInputItem,ItemStack mOutputItem,int mType) {
+        aTypeCache = mType;
+        aOutputCache = mOutputItem.copy();
+        aInputCache = mInputItem.copy();
+    }
+
     public int checkRecipe() {
         int tCheck = super.checkRecipe();
         if (tCheck != DID_NOT_FIND_RECIPE) {
             return tCheck;
         }
-        if ((GT_Utility.isStackValid(getInputAt(0))) && (GT_Utility.isStackValid(getInputAt(1))) && (GT_Utility.getContainerItem(getInputAt(0), true) == null)) {
-            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 1)) {
-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0)});
+        ItemStack tSlot0 = getInputAt(0);
+        ItemStack tSlot1 = getInputAt(1);
+        if ((GT_Utility.isStackValid(tSlot0)) && (GT_Utility.isStackValid(tSlot1)) && (GT_Utility.getContainerItem(tSlot0, true) == null)) {
+            if ((ItemList.Schematic_1by1.isStackEqual(tSlot1)) && (tSlot0.stackSize >= 1)) {
+                boolean tIsCached = hasValidCache(tSlot0,1,true);
+                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GT_ModHandler.getRecipeOutput(new ItemStack[]{tSlot0});
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
-                        getInputAt(0).stackSize -= 1;
+                        tSlot0.stackSize -= 1;
                         calculateOverclockedNess(32,16);
                         //In case recipe is too OP for that machine
                         if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+                        if (!tIsCached)
+                            cacheItem(tSlot0,this.mOutputItems[0],1);
                         return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
                     }
                 }
                 return DID_NOT_FIND_RECIPE;
             }
-            if ((ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 4)) {
-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), null, getInputAt(0), getInputAt(0)});
+            if ((ItemList.Schematic_2by2.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 4)) {
+                boolean tIsCached = hasValidCache(tSlot0,2,true);
+                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GT_ModHandler.getRecipeOutput(new ItemStack[]{tSlot0, tSlot0, null, tSlot0, tSlot0});
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
                         getInputAt(0).stackSize -= 4;
@@ -63,13 +96,16 @@ public class GT_MetaTileEntity_Boxinator
                         //In case recipe is too OP for that machine
                         if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+                        if (!tIsCached)
+                            cacheItem(tSlot0,this.mOutputItems[0],2);
                         return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
                     }
                 }
                 return DID_NOT_FIND_RECIPE;
             }
-            if ((ItemList.Schematic_3by3.isStackEqual(getInputAt(1))) && (getInputAt(0).stackSize >= 9)) {
-                this.mOutputItems[0] = GT_ModHandler.getRecipeOutput(new ItemStack[]{getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0), getInputAt(0)});
+            if ((ItemList.Schematic_3by3.isStackEqual(tSlot1)) && (getInputAt(0).stackSize >= 9)) {
+                boolean tIsCached = hasValidCache(tSlot0,3,true);
+                this.mOutputItems[0] = tIsCached ? aOutputCache.copy() : GT_ModHandler.getRecipeOutput(new ItemStack[]{tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0, tSlot0});
                 if (this.mOutputItems[0] != null) {
                     if (canOutput(new ItemStack[]{this.mOutputItems[0]})) {
                         getInputAt(0).stackSize -= 9;
@@ -77,6 +113,8 @@ public class GT_MetaTileEntity_Boxinator
                         //In case recipe is too OP for that machine
                         if (mMaxProgresstime == Integer.MAX_VALUE - 1 && mEUt == Integer.MAX_VALUE - 1)
                             return FOUND_RECIPE_BUT_DID_NOT_MEET_REQUIREMENTS;
+                        if (!tIsCached)
+                            cacheItem(tSlot0,this.mOutputItems[0],3);
                         return FOUND_AND_SUCCESSFULLY_USED_RECIPE;
                     }
                 }
@@ -88,8 +126,11 @@ public class GT_MetaTileEntity_Boxinator
 
     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {
         if (super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {
-            if ((ItemList.Schematic_1by1.isStackEqual(getInputAt(1))) || (ItemList.Schematic_2by2.isStackEqual(getInputAt(1))) || (ItemList.Schematic_3by3.isStackEqual(getInputAt(1)))) {
-                if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[mTier], null, new ItemStack[]{GT_Utility.copyAmount(64L, new Object[]{aStack}), getInputAt(1)}) != null) {
+            ItemStack tInput1 = getInputAt(1);
+            if ((ItemList.Schematic_1by1.isStackEqual(tInput1)) || (ItemList.Schematic_2by2.isStackEqual(tInput1)) || (ItemList.Schematic_3by3.isStackEqual(tInput1))) {
+                if (hasValidCache(aStack,aTypeCache,false))
+                    return true;
+                if (GT_Recipe.GT_Recipe_Map.sBoxinatorRecipes.findRecipe(getBaseMetaTileEntity(), true, gregtech.api.enums.GT_Values.V[mTier], null, new ItemStack[]{GT_Utility.copyAmount(64L, new Object[]{aStack}), tInput1}) != null) {
                     return true;
                 }
                 if (ItemList.Schematic_1by1.isStackEqual(getInputAt(1)) && GT_ModHandler.getRecipeOutput(new ItemStack[]{aStack}) != null)
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
index 44db32e6b9..69543a7196 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
@@ -6,13 +6,12 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
 import gregtech.api.objects.GT_RenderedTexture;
-import gregtech.api.objects.ItemData;
 import gregtech.api.util.GT_Log;
 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 net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -21,6 +20,7 @@ import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
+import net.minecraft.world.ChunkPosition;
 import net.minecraftforge.common.util.FakePlayer;
 
 import java.util.ArrayList;
@@ -33,7 +33,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
     private static final Block MINING_PIPE_BLOCK = GT_Utility.getBlockFromStack(MINING_PIPE);
     private static final Block MINING_PIPE_TIP_BLOCK = GT_Utility.getBlockFromStack(GT_ModHandler.getIC2Item("miningPipeTip", 0));
 
-    int drillX, drillY, drillZ;
+    int drillY = 0;
     boolean isPickingPipes;
     boolean waitMiningPipe;
     final static int[] RADIUS = new int[]{8, 8, 16, 24, 32}; //Miner radius per tier
@@ -41,6 +41,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
     final static int[] ENERGY = new int[]{8, 8, 32, 128, 512}; //Miner energy consumption per tier
 
     private int radiusConfig; //Miner configured radius
+    private final ArrayList<ChunkPosition> oreBlockPositions = new ArrayList<>();
 
     public GT_MetaTileEntity_Miner(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1,
@@ -90,7 +91,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
         }
         return true;
     }
-
+    
     @Override
     public void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
         super.onScrewdriverRightClick(aSide, aPlayer, aX, aY, aZ);
@@ -109,8 +110,14 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                     radiusConfig = 0;
             }
             GT_Utility.sendChatToPlayer(aPlayer, StatCollector.translateToLocal("GT5U.machines.workareaset") + " " + (radiusConfig * 2 + 1) + "x" + (radiusConfig * 2 + 1));//TODO Add translation support
+            oreBlockPositions.clear();
+            fillOreList(getBaseMetaTileEntity());
         }
     }
+    @Override
+    public void onFirstTick(IGregTechTileEntity aBaseMetaTileEntity) {
+        fillOreList(aBaseMetaTileEntity);
+    }
 
     @Override
     public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) {
@@ -165,50 +172,34 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                     }
                     return;
                 }
-                if (drillY == 0) {
+                if (drillY == 0 || oreBlockPositions.isEmpty()) {
                     moveOneDown(aBaseMetaTileEntity);
-                    return;
-                }
-                if (drillZ > radiusConfig) {
-                    moveOneDown(aBaseMetaTileEntity);
-                    return;
-                }<