Merge branch 'experimental' into Boxinator

2 files changed, 26 insertions, 16 deletions

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 4d7a6c4af5..6d4b160a86 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
@@ -176,18 +176,21 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                     moveOneDown(aBaseMetaTileEntity);
                 } else {
                     ChunkPosition oreBlockPos;
-                    Block block;
+                    int x = 0, y = 0, z = 0;
+                    Block oreBlock;
+                    int oreBlockMetadata = 0;
                     do {
                         oreBlockPos = oreBlockPositions.remove(0);
-                        block = aBaseMetaTileEntity.getBlockOffset(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+                        oreBlock = aBaseMetaTileEntity.getBlockOffset(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
+                        x = aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX;
+                        y = aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY;
+                        z = aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ;
+                        oreBlockMetadata = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z);
                     } // someone else might have removed the block
-                    while (block == Blocks.air && !oreBlockPositions.isEmpty());
+                    while (!GT_Utility.isOre(oreBlock, oreBlockMetadata) && !oreBlockPositions.isEmpty());
 
-                    if (block != Blocks.air) {
-                        mineBlock(aBaseMetaTileEntity, block,
-                            aBaseMetaTileEntity.getXCoord() + oreBlockPos.chunkPosX,
-                            aBaseMetaTileEntity.getYCoord() + oreBlockPos.chunkPosY,
-                            aBaseMetaTileEntity.getZCoord() + oreBlockPos.chunkPosZ);
+                    if (GT_Utility.isOre(oreBlock, oreBlockMetadata)) {
+                        mineBlock(aBaseMetaTileEntity, oreBlock, x, y, z);
                     }
                 }
             }
@@ -265,7 +268,15 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
                 mOutputItems[0] = drops.get(0);
             if (drops.size() > 1)
                 mOutputItems[1] = drops.get(1);
-            aBaseMetaTileEntity.getWorld().setBlockToAir(x, y, z);
+
+            short metaData = 0;
+            TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntity(x, y, z);
+            if (tTileEntity instanceof GT_TileEntity_Ores) {
+                metaData = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+            }
+
+            ItemStack cobble = GT_Utility.getCobbleForOre(block, metaData);
+            aBaseMetaTileEntity.getWorld().setBlock(x, y, z, Block.getBlockFromItem(cobble.getItem()), cobble.getItemDamage(), 3);
             if (debugBlockMiner)
                 GT_Log.out.println("MINER: Mining GT ore block at " + x + " " + y + " " + z);
         }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
index 60056ec39d..79b363fac3 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_PotionBrewer.java
@@ -144,16 +144,15 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
     }
 
     private int setOutput(String aFluidName) {
+        if (getFillableStack().amount < 750) {
+            return 0;
+        }
+
         this.mOutputFluid = FluidRegistry.getFluidStack(aFluidName, 750);
         if (this.mOutputFluid == null) {
             this.mOutputFluid = FluidRegistry.getFluidStack("potion.mundane", getFillableStack().amount);
-            getInputAt(0).stackSize -= 1;
-            getFillableStack().amount = 0;
-            return 2;
-        }
-        if (getFillableStack().amount < 750) {
-            return 0;
         }
+        
         getInputAt(0).stackSize -= 1;
         getFillableStack().amount -= 750;
         return 2;
@@ -171,6 +170,6 @@ public class GT_MetaTileEntity_PotionBrewer extends GT_MetaTileEntity_BasicMachi
 
     @Override
     public int getCapacity() {
-        return 750;
+        return 6000;
     }
 }