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

Merge pull request #536 from Techlone/experimental

Browse source 
AdvMinerII: check that ore block still exists; consider chance output
This commit is contained in:
Blood-Asp 2016-06-22 22:14:44 +02:00 committed by GitHub
commit e8936bf8d9
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_AdvMiner2.java
View file

@ -119,10 +119,13 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
} }
}else{return false;} }else{return false;}
} }
ArrayList<ItemStack> tDrops = new ArrayList();
if (!mMineList.isEmpty()) { if (!mMineList.isEmpty()) {
ChunkPosition oreBlockOffsetPos = mMineList.get(0); ChunkPosition oreBlockOffsetPos = mMineList.get(0);
tDrops = ((GT_TileEntity_Ores) getBaseMetaTileEntity().getTileEntityOffset(oreBlockOffsetPos.chunkPosX, oreBlockOffsetPos.chunkPosY, oreBlockOffsetPos.chunkPosZ)).getDrops(1); ArrayList<ItemStack> tDrops = new ArrayList<ItemStack>();
GT_TileEntity_Ores oreBlockTileEntity = (GT_TileEntity_Ores) getBaseMetaTileEntity().getTileEntityOffset(oreBlockOffsetPos.chunkPosX, oreBlockOffsetPos.chunkPosY, oreBlockOffsetPos.chunkPosZ);
if (oreBlockTileEntity != null) {
tDrops = oreBlockTileEntity.getDrops(1);
}
if (!tDrops.isEmpty()) { if (!tDrops.isEmpty()) {
ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy()); ItemData tData = GT_OreDictUnificator.getItemData(tDrops.get(0).copy());
if (tData.mPrefix != OrePrefixes.crushed&& tData.mMaterial.mMaterial != Materials.Oilsands) { if (tData.mPrefix != OrePrefixes.crushed&& tData.mMaterial.mMaterial != Materials.Oilsands) {
@ -131,7 +134,9 @@ public class GT_MetaTileEntity_AdvMiner2 extends GT_MetaTileEntity_MultiBlockBas
this.mOutputItems = new ItemStack[tRecipe.mOutputs.length]; this.mOutputItems = new ItemStack[tRecipe.mOutputs.length];
for (int g = 0; g < mOutputItems.length; g++) { for (int g = 0; g < mOutputItems.length; g++) {
mOutputItems[g] = tRecipe.mOutputs[g].copy(); mOutputItems[g] = tRecipe.mOutputs[g].copy();
mOutputItems[g].stackSize = mOutputItems[g].stackSize * (getBaseMetaTileEntity().getRandomNumber(4) + 1); if (getBaseMetaTileEntity().getRandomNumber(10000) < tRecipe.getOutputChance(g)) {
mOutputItems[g].stackSize *= getBaseMetaTileEntity().getRandomNumber(4) + 1;
}
} }
} }
} else { } else {