aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Hendricks <richardhendricks@pobox.com>2017-12-11 20:54:29 -0600
committerRichard Hendricks <richardhendricks@pobox.com>2017-12-11 20:54:29 -0600
commit8f0fa74d14d88fa438151f0c6e215e5eedbde77b (patch)
treef4d6a581cc446a79020b896793b87fdb5cd97e4f
parent0a75249eb470083bb12162aed5bd029e4514d979 (diff)
downloadGT5-Unofficial-8f0fa74d14d88fa438151f0c6e215e5eedbde77b.tar.gz
GT5-Unofficial-8f0fa74d14d88fa438151f0c6e215e5eedbde77b.tar.bz2
GT5-Unofficial-8f0fa74d14d88fa438151f0c6e215e5eedbde77b.zip
Change setBlock to align with GT5U. Makes Galena and Lead use pickaxe instead of shovel for harvesting on planets.
-rw-r--r--src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java
index 86442b778e..5fcf162c6e 100644
--- a/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java
+++ b/src/main/java/bloodasp/galacticgreg/GT_TileEntity_Ores_Space.java
@@ -3,6 +3,7 @@ package bloodasp.galacticgreg;
import gregtech.api.GregTech_API;
import gregtech.api.util.GT_Log;
import gregtech.common.blocks.GT_TileEntity_Ores;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
import net.minecraft.block.Block;
import net.minecraft.init.Blocks;
import net.minecraft.tileentity.TileEntity;
@@ -108,8 +109,8 @@ public class GT_TileEntity_Ores_Space {
pMetaData += pDimensionDef.getStoneType().getOffset();
else
pMetaData += pCustomGTOreOffset;
-
- pWorld.setBlock(pX, pY, pZ, GregTech_API.sBlockOres1, GT_TileEntity_Ores.getHarvestData((short) 1, pMetaData), 0);
+ // This fix seems like cargo cult coding...The Abstract class just returns 0 for the harvest level. But it aligns with the GT5U method, so yay?
+ pWorld.setBlock(pX, pY, pZ, GregTech_API.sBlockOres1, GT_TileEntity_Ores.getHarvestData((short) pMetaData, ( (GT_Block_Ores_Abstract)GregTech_API.sBlockOres1).getBaseBlockHarvestLevel(pMetaData % 16000 / 1000)), 0);
TileEntity tTileEntity = pWorld.getTileEntity(pX, pY, pZ);
if ((tTileEntity instanceof GT_TileEntity_Ores)) {
((GT_TileEntity_Ores) tTileEntity).mMetaData = ((short) pMetaData);