diff options
| author | Muramasa <haydenkilloh@gmail.com> | 2016-07-23 03:09:25 +0100 |
|---|---|---|
| committer | Muramasa <haydenkilloh@gmail.com> | 2016-07-23 03:09:25 +0100 |
| commit | d756cebd17c558ce10cd9311d68e2e90b3a0799e (patch) | |
| tree | d7916d336c0414069c8a912cdb3d4ae14d3b15b3 /src/main/java/gregtech/common/GT_Worldgen_Stone.java | |
| parent | 2704680a2e7f88f55188777f1e21baa1821c02ee (diff) | |
| download | GT5-Unofficial-d756cebd17c558ce10cd9311d68e2e90b3a0799e.tar.gz GT5-Unofficial-d756cebd17c558ce10cd9311d68e2e90b3a0799e.tar.bz2 GT5-Unofficial-d756cebd17c558ce10cd9311d68e2e90b3a0799e.zip | |
Fix "stone" veins
Fix an issue where an "stone" vein would override ore textures but not
other stones.
Added missing small ore for marble and basalt.
Removed wither check from Block_Stones.
Diffstat (limited to 'src/main/java/gregtech/common/GT_Worldgen_Stone.java')
| -rw-r--r-- | src/main/java/gregtech/common/GT_Worldgen_Stone.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/gregtech/common/GT_Worldgen_Stone.java b/src/main/java/gregtech/common/GT_Worldgen_Stone.java index 8654ac3f57..2febb35f1e 100644 --- a/src/main/java/gregtech/common/GT_Worldgen_Stone.java +++ b/src/main/java/gregtech/common/GT_Worldgen_Stone.java @@ -60,12 +60,13 @@ public class GT_Worldgen_Stone if (tTargetedBlock instanceof GT_Block_Ores_Abstract) {
TileEntity tTileEntity = aWorld.getTileEntity(eX, eY, eZ);
if ((tTileEntity instanceof GT_TileEntity_Ores)) {
- if(tTargetedBlock != GregTech_API.sBlockOres1) {
- ((GT_TileEntity_Ores) tTileEntity).convertOreBlock(aWorld, ((GT_TileEntity_Ores) tTileEntity).mMetaData, eX, eY, eZ);
+ short aMeta = ((GT_TileEntity_Ores) tTileEntity).mMetaData;
+ if (tTargetedBlock != GregTech_API.sBlockOres1) {
+ ((GT_TileEntity_Ores) tTileEntity).convertOreBlock(aWorld, aMeta, eX, eY, eZ);
}
((GT_TileEntity_Ores)tTileEntity).overrideOreBlockMaterial(this.mBlock, (byte) this.mBlockMeta);
}
- } else if (((this.mAllowToGenerateinVoid) && (aWorld.getBlock(eX, eY, eZ).isAir(aWorld, eX, eY, eZ))) || ((tTargetedBlock != null) && ((tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.stone)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.end_stone)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.netherrack))))) {
+ } else if (((this.mAllowToGenerateinVoid) && (aWorld.getBlock(eX, eY, eZ).isAir(aWorld, eX, eY, eZ))) || ((tTargetedBlock != null) && ((tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.stone)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.end_stone)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, Blocks.netherrack)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, GregTech_API.sBlockGranites)) || (tTargetedBlock.isReplaceableOreGen(aWorld, eX, eY, eZ, GregTech_API.sBlockStones))))) {
aWorld.setBlock(eX, eY, eZ, this.mBlock, this.mBlockMeta, 0);
}
}
|