Fix Ore Drill EU calculation; now Ore Drill is using DrillerBase

1 files changed, 30 insertions, 252 deletions

diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index a227ab74c2..bc523114bc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -1,18 +1,15 @@
 package gregtech.common.tileentities.machines.multi;
 
-import gregtech.api.GregTech_API;
+import static gregtech.api.enums.GT_Values.*;
+
+import java.util.ArrayList;
+
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.Textures;
 import gregtech.api.gui.GT_GUIContainer_MultiMachine;
-import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy;
-import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase;
-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_Recipe;
 import gregtech.api.util.GT_Utility;
@@ -22,106 +19,40 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.ChunkPosition;
-import net.minecraftforge.common.util.ForgeDirection;
 import net.minecraftforge.fluids.FluidStack;
 
-import java.util.ArrayList;
-
-import static gregtech.api.enums.GT_Values.*;
-
-public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTileEntity_MultiBlockBase {
-    private static final ItemStack miningPipe = GT_ModHandler.getIC2Item("miningPipe", 0);
-    private static final ItemStack miningPipeTip = GT_ModHandler.getIC2Item("miningPipeTip", 0);
-    private static final Block miningPipeBlock = GT_Utility.getBlockFromStack(miningPipe);
-    private static final Block miningPipeTipBlock = GT_Utility.getBlockFromStack(miningPipeTip);
-
+public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTileEntity_DrillerBase {
+    
     private final ArrayList<ChunkPosition> oreBlockPositions = new ArrayList<>();
 
-    private Block casingBlock;
-    private int casingMeta;
-    private int frameMeta;
-    private int casingTextureIndex;
-
-    private ForgeDirection back;
-    private int xDrill, yDrill, zDrill, xCenter, zCenter, yHead;
-
-    private boolean isPickingPipes;
-
     public GT_MetaTileEntity_OreDrillingPlantBase(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
-        initFields();
     }
 
     public GT_MetaTileEntity_OreDrillingPlantBase(String aName) {
         super(aName);
-        initFields();
-    }
-
-    private void initFields() {
-        casingBlock = getCasingBlockItem().getBlock();
-        casingMeta = getCasingBlockItem().get(0).getItemDamage();
-        int frameId = 4096 + getFrameMaterial().mMetaItemSubID;
-        frameMeta = GregTech_API.METATILEENTITIES[frameId] != null ? GregTech_API.METATILEENTITIES[frameId].getTileEntityBaseType() : W;
-        casingTextureIndex = getCasingTextureIndex();
-        isPickingPipes = false;
-    }
-
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        if (aSide == aFacing)
-            return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[casingTextureIndex],new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_ORE_DRILL)};
-        return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[casingTextureIndex]};
     }
 
+    @Override
     public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
         return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "OreDrillingPlant.png");
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setBoolean("isPickingPipes", isPickingPipes);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-        isPickingPipes = aNBT.getBoolean("isPickingPipes");
-    }
-
-    @Override
-    public boolean checkRecipe(ItemStack aStack) {
-        setElectricityStats();
-        int oldYHead = yHead;
-        if (!checkPipesAndSetYHead() || !isEnergyEnough()) {
-            stopMachine();
-            return false;
-        }
-        if (yHead != oldYHead) oreBlockPositions.clear();
-        if (isPickingPipes) {
-            if (tryPickPipe()) {
-                mOutputItems = new ItemStack[] {GT_Utility.copyAmount(1, miningPipe)};
-                return true;
-            } else {
-                isPickingPipes = false;
-                stopMachine();
-                return false;
-            }
-        }
+    protected boolean workingDownward(ItemStack aStack, int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead, int oldYHead) {
+    	if (yHead != oldYHead) oreBlockPositions.clear();
 
-        putMiningPipesFromInputsInController();
-        if (!tryConsumeDrillingFluid()) return false;
-
-        fillMineListIfEmpty();
+        fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead);
         if (oreBlockPositions.isEmpty()) {
             if (!tryLowerPipe()) {
-                isPickingPipes = true;
+            	if (waitForPipes()) return false;
+                workState = STATE_AT_BOTTOM;
                 return true;
             }
             //new layer - fill again
-            fillMineListIfEmpty();
+            fillMineListIfEmpty(xDrill, yDrill, zDrill, xPipe, zPipe, yHead);
         }
 
         ChunkPosition oreBlockPos = null;
@@ -132,6 +63,7 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
             oreBlock = getBaseMetaTileEntity().getBlock(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
         }
 
+        if (!tryConsumeDrillingFluid()) return false;
         if (oreBlock != null && oreBlock != Blocks.air) {
             ArrayList<ItemStack> oreBlockDrops = getBlockDrops(oreBlock, oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
             getBaseMetaTileEntity().getWorld().setBlockToAir(oreBlockPos.chunkPosX, oreBlockPos.chunkPosY, oreBlockPos.chunkPosZ);
@@ -141,29 +73,19 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         return true;
     }
 
-    private boolean isEnergyEnough() {
-        long requiredEnergy = 512 + getMaxInputVoltage() * 4;
-        for (GT_MetaTileEntity_Hatch_Energy energyHatch : mEnergyHatches) {
-            requiredEnergy -= energyHatch.getEUVar();
-            if (requiredEnergy <= 0) return true;
-        }
-        return false;
-    }
-
-    private boolean tryPickPipe() {
-        if (yHead == yDrill) return false;
-        if (checkBlockAndMeta(xCenter, yHead + 1, zCenter, miningPipeBlock, W))
-            getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead + 1, zCenter, miningPipeTipBlock);
-        getBaseMetaTileEntity().getWorld().setBlockToAir(xCenter, yHead, zCenter);
-        return true;
+    @Override
+    protected boolean checkHatches(){
+    	return !mMaintenanceHatches.isEmpty() && !mInputHatches.isEmpty() && !mOutputBusses.isEmpty() && !mEnergyHatches.isEmpty();
     }
-
-    private void setElectricityStats() {
+    
+    @Override
+    protected void setElectricityStats() {
         this.mEfficiency = getCurrentEfficiency(null);
         this.mEfficiencyIncrease = 10000;
-        int overclock = 1 << GT_Utility.getTier(getMaxInputVoltage()) - 1;
-        this.mEUt = -12 * overclock * overclock;
-        this.mMaxProgresstime = (isPickingPipes ? 80 : getBaseProgressTime()) / overclock;
+        int tier = Math.max(1, GT_Utility.getTier(getMaxInputVoltage()));
+        this.mEUt = -3 * (1 << (tier << 1));
+        this.mMaxProgresstime = (workState == STATE_DOWNWARD ? getBaseProgressTime() : 80) / (1 <<tier);
+        this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime);
     }
 
     private ItemStack[] getOutputByDrops(ArrayList<ItemStack> oreBlockDrops) {
@@ -216,37 +138,17 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
     }
 
     private boolean tryConsumeDrillingFluid() {
-        return depleteInput(new FluidStack(ItemList.sDrillingFluid, 2000));
-    }
-
-    private void putMiningPipesFromInputsInController() {
-        int maxPipes = miningPipe.getMaxStackSize();
-        if (isHasMiningPipes(maxPipes)) return;
-
-        ItemStack pipes = getStackInSlot(1);
-        for (ItemStack storedItem : getStoredInputs()) {
-            if (!storedItem.isItemEqual(miningPipe)) continue;
-
-            if (pipes == null) {
-                setInventorySlotContents(1, GT_Utility.copy(miningPipe));
-                pipes = getStackInSlot(1);
-            }
-
-            if (pipes.stackSize == maxPipes) break;
-
-            int needPipes = maxPipes - pipes.stackSize;
-            int transferPipes = storedItem.stackSize < needPipes ? storedItem.stackSize : needPipes;
-
-            pipes.stackSize += transferPipes;
-            storedItem.stackSize -= transferPipes;
+        if (!depleteInput(new FluidStack(ItemList.sDrillingFluid, 2000))) {
+        	mMaxProgresstime = 0;
+        	return false;
         }
-        updateSlots();
+        return true;
     }
 
-    private void fillMineListIfEmpty() {
+    private void fillMineListIfEmpty(int xDrill, int yDrill, int zDrill, int xPipe, int zPipe, int yHead) {
         if (!oreBlockPositions.isEmpty()) return;
 
-        tryAddOreBlockToMineList(xCenter, yHead - 1, zCenter);
+        tryAddOreBlockToMineList(xPipe, yHead - 1, zPipe);
         if (yHead == yDrill) return; //skip controller block layer
 
         int radius = getRadiusInChunks() << 4;
@@ -271,132 +173,8 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
         }
     }
 
-    private boolean tryLowerPipe() {
-        if (!isHasMiningPipes()) return false;
-
-        if (yHead <= 0) return false;
-        if (checkBlockAndMeta(xCenter, yHead - 1, zCenter, Blocks.bedrock, W)) return false;
-
-        getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead - 1, zCenter, miningPipeTipBlock);
-        if (yHead != yDrill) getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeBlock);
-
-        getBaseMetaTileEntity().decrStackSize(1, 1);
-        return true;
-    }
-
-    private boolean isHasMiningPipes() {
-        return isHasMiningPipes(1);
-    }
-
-    private boolean isHasMiningPipes(int minCount) {
-        ItemStack pipe = getStackInSlot(1);
-        return pipe != null && pipe.stackSize > minCount - 1 && pipe.isItemEqual(miningPipe);
-    }
-
-    @Override
-    public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) {
-        updateCoordinates();
-        //check base layer
-        for (int xOff = -1 + back.offsetX; xOff <= 1 + back.offsetX; xOff++) {
-            for (int zOff = -1 + back.offsetZ; zOff <= 1 + back.offsetZ; zOff++) {
-                if (xOff == 0 && zOff == 0) continue;
-
-                IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xOff, 0, zOff);
-                if (!checkCasingBlock(xOff, 0, zOff)
-                        && !addMaintenanceToMachineList(tTileEntity, casingTextureIndex)
-                        && !addInputToMachineList(tTileEntity, casingTextureIndex)
-                        && !addOutputToMachineList(tTileEntity, casingTextureIndex)
-                        && !addEnergyInputToMachineList(tTileEntity, casingTextureIndex))
-                    return false;
-            }
-        }
-        if (mMaintenanceHatches.isEmpty() || mInputHatches.isEmpty() || mOutputBusses.isEmpty() || mEnergyHatches.isEmpty()) return false;
-        if (GT_Utility.getTier(getMaxInputVoltage()) < getMinTier()) return false;
-        //check tower
-        for (int yOff = 1; yOff < 4; yOff++) {
-            if (!checkCasingBlock(back.offsetX, yOff, back.offsetZ)
-                    || !checkFrameBlock(back.offsetX + 1, yOff, back.offsetZ)
-                    || !checkFrameBlock(back.offsetX - 1, yOff, back.offsetZ)
-                    || !checkFrameBlock(back.offsetX, yOff, back.offsetZ + 1)
-                    || !checkFrameBlock(back.offsetX, yOff, back.offsetZ - 1)
-                    || !checkFrameBlock(back.offsetX, yOff + 3, back.offsetZ))
-                return false;
-        }
-        return true;
-    }
-
-    private void updateCoordinates() {
-        xDrill = getBaseMetaTileEntity().getXCoord();
-        yDrill = getBaseMetaTileEntity().getYCoord();
-        zDrill = getBaseMetaTileEntity().getZCoord();
-        back = ForgeDirection.getOrientation(getBaseMetaTileEntity().getBackFacing());
-        xCenter = xDrill + back.offsetX;
-        zCenter = zDrill + back.offsetZ;
-    }
-
-    private boolean checkPipesAndSetYHead() {
-        yHead = yDrill - 1;
-        while (checkBlockAndMeta(xCenter, yHead, zCenter, miningPipeBlock, W)) yHead--; //skip pipes
-        //is pipe tip OR is controller layer
-        if (checkBlockAndMeta(xCenter, yHead, zCenter, miningPipeTipBlock, W) || ++yHead == yDrill) return true;
-        //pipe column is broken - try fix
-        getBaseMetaTileEntity().getWorld().setBlock(xCenter, yHead, zCenter, miningPipeTipBlock);
-        return true;
-    }
-
-    private boolean checkCasingBlock(int xOff, int yOff, int zOff) {
-        return checkBlockAndMetaOffset(xOff, yOff, zOff, casingBlock, casingMeta);
-    }
-    //meta of frame is getTileEntityBaseType; frame should be checked using its drops (possible a high weight operation)
-    private boolean checkFrameBlock(int xOff, int yOff, int zOff) {
-        return checkBlockAndMetaOffset(xOff, yOff, zOff, GregTech_API.sBlockMachines, frameMeta);
-    }
-
-    private boolean checkBlockAndMetaOffset(int xOff, int yOff, int zOff, Block block, int meta) {
-        return checkBlockAndMeta(xDrill + xOff, yDrill + yOff, zDrill + zOff, block, meta);
-    }
-
-    private boolean checkBlockAndMeta(int x, int y, int z, Block block, int meta) {
-        return (meta == W || getBaseMetaTileEntity().getMetaID(x, y, z) == meta)
-                && getBaseMetaTileEntity().getBlock(x, y, z) == block;
-    }
-
-    @Override
-    public boolean isCorrectMachinePart(ItemStack aStack) {
-        return true;
-    }
-
-    @Override
-    public int getMaxEfficiency(ItemStack aStack) {
-        return 10000;
-    }
-
-    @Override
-    public int getPollutionPerTick(ItemStack aStack) {
-        return 0;
-    }
-
-    @Override
-    public int getDamageToComponent(ItemStack aStack) {
-        return 0;
-    }
-
-    @Override
-    public boolean explodesOnComponentBreak(ItemStack aStack) {
-        return false;
-    }
-
-    protected abstract ItemList getCasingBlockItem();
-
-    protected abstract Materials getFrameMaterial();
-
-    protected abstract int getCasingTextureIndex();
-
     protected abstract int getRadiusInChunks();
 
-    protected abstract int getMinTier();
-
-    //returns theoretical progress time for LV energy hatch
     protected abstract int getBaseProgressTime();
 
     protected String[] getDescriptionInternal(String tierSuffix) {