aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2017-12-12 10:44:22 +0100
committerGitHub <noreply@github.com>2017-12-12 10:44:22 +0100
commit391bc8801f25a2f508d11d6e0873b102ca176ae6 (patch)
tree5844d6f2fb387fded738bb5fe6c5daf0144d6d18 /src/main
parent78a04b5d7607e3ba0fb53bd40fa12a020d36d0b2 (diff)
parentfe47490eea5aecd39cceed7232818cdd32624e5e (diff)
downloadGT5-Unofficial-391bc8801f25a2f508d11d6e0873b102ca176ae6.tar.gz
GT5-Unofficial-391bc8801f25a2f508d11d6e0873b102ca176ae6.tar.bz2
GT5-Unofficial-391bc8801f25a2f508d11d6e0873b102ca176ae6.zip
Merge pull request #3 from richardhendricks/galena_fix_outer_space
Galena fix outer space
Diffstat (limited to 'src/main')
-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 682a4d98bd..e100f4557f 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);