Sangui/GT5-Unofficial
2
1
Fork 0
Code Issues 6 Pull requests Projects Releases Packages Wiki Activity Actions

Changed miner mechanics and rates.

Browse source
This commit is contained in:
Dimach 2017-07-06 13:42:45 +03:00
parent 98e214b873
commit 0334a19993
1 changed files with 25 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Miner.java
View file

@ -29,7 +29,7 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
boolean isPickingPipes; boolean isPickingPipes;
boolean waitMiningPipe; boolean waitMiningPipe;
final static int[] RADIUS = new int[]{8, 8, 24, 40}; //Miner radius per tier final static int[] RADIUS = new int[]{8, 8, 24, 40}; //Miner radius per tier
final static int[] SPEED = new int[]{20, 20, 5, 2}; //Miner cycle time per tier final static int[] SPEED = new int[]{200, 200, 100, 50}; //Miner cycle time per tier
final static int[] ENERGY = new int[]{24, 24, 96, 384}; //Miner energy consumption per tier final static int[] ENERGY = new int[]{24, 24, 96, 384}; //Miner energy consumption per tier
public GT_MetaTileEntity_Miner(int aID, String aName, String aNameRegional, int aTier) { public GT_MetaTileEntity_Miner(int aID, String aName, String aNameRegional, int aTier) {
@ -99,37 +99,34 @@ public class GT_MetaTileEntity_Miner extends GT_MetaTileEntity_BasicMachine {
return; return;
} }
if (drillY == 0) { if (drillY == 0) {
if (moveOneDown(aBaseMetaTileEntity)) { moveOneDown(aBaseMetaTileEntity);
return;
}
}
if (drillZ > RADIUS[mTier]) {
if (moveOneDown(aBaseMetaTileEntity)) {
return;
}
}
if (drillX > RADIUS[mTier]) {
drillX = -RADIUS[mTier];
drillZ++;
return; return;
} }
while (drillX <= RADIUS[mTier]) { if (drillZ > RADIUS[mTier]) {
Block block = aBaseMetaTileEntity.getBlockOffset(drillX, drillY, drillZ); moveOneDown(aBaseMetaTileEntity);
int blockMeta = aBaseMetaTileEntity.getMetaIDOffset(drillX, drillY, drillZ); return;
if (block instanceof GT_Block_Ores_Abstract) { }
TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(drillX, drillY, drillZ); while (drillZ <= RADIUS[mTier]) {
if (tTileEntity != null && tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural) { while (drillX <= RADIUS[mTier]) {
mineBlock(aBaseMetaTileEntity, drillX, drillY, drillZ); Block block = aBaseMetaTileEntity.getBlockOffset(drillX, drillY, drillZ);
return; int blockMeta = aBaseMetaTileEntity.getMetaIDOffset(drillX, drillY, drillZ);
} if (block instanceof GT_Block_Ores_Abstract) {
} else { TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(drillX, drillY, drillZ);
ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta)); if (tTileEntity != null && tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural) {
if (association != null && association.mPrefix.toString().startsWith("ore")) { mineBlock(aBaseMetaTileEntity, drillX, drillY, drillZ);
mineBlock(aBaseMetaTileEntity, drillX, drillY, drillZ); return;
return; }
} else {
ItemData association = GT_OreDictUnificator.getAssociation(new ItemStack(block, 1, blockMeta));
if (association != null && association.mPrefix.toString().startsWith("ore")) {
mineBlock(aBaseMetaTileEntity, drillX, drillY, drillZ);
return;
}
} }
drillX++;
} }
drillX++; drillX = -RADIUS[mTier];
drillZ++;
} }
} }
} }