aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/multi
diff options
context:
space:
mode:
authorrepo_alt <wvk17@yandex.ru>2020-11-16 11:49:53 +0300
committerrepo_alt <wvk17@yandex.ru>2020-11-16 11:49:53 +0300
commitcd5e797dc31ceb771c8903d1c2cb2a5b42e35e60 (patch)
tree1bea9f3ca139d24950dca5057be0c607c17b9207 /src/main/java/gregtech/common/tileentities/machines/multi
parentb0b861120f91a2bf060c0fc6c6a2c0b20bce06df (diff)
downloadGT5-Unofficial-cd5e797dc31ceb771c8903d1c2cb2a5b42e35e60.tar.gz
GT5-Unofficial-cd5e797dc31ceb771c8903d1c2cb2a5b42e35e60.tar.bz2
GT5-Unofficial-cd5e797dc31ceb771c8903d1c2cb2a5b42e35e60.zip
GT ore blocks in world are not recognized as an oredicted stack
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/multi')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java13
1 files changed, 11 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
index 3bfb18be2b..5ead0bf896 100644
--- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
+++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_OreDrillingPlantBase.java
@@ -11,6 +11,9 @@ import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
+import gregtech.common.blocks.GT_Block_Ores_Abstract;
+import gregtech.common.blocks.GT_TileEntity_Ores;
+
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;
@@ -316,8 +319,14 @@ public abstract class GT_MetaTileEntity_OreDrillingPlantBase extends GT_MetaTile
Block block = getBaseMetaTileEntity().getBlock(x, y, z);
int blockMeta = getBaseMetaTileEntity().getMetaID(x, y, z);
ChunkPosition blockPos = new ChunkPosition(x, y, z);
- if (!oreBlockPositions.contains(blockPos) && GT_Utility.isOre(new ItemStack(block, 1, blockMeta)))
- oreBlockPositions.add(blockPos);
+ if (!oreBlockPositions.contains(blockPos)) {
+ if (block instanceof GT_Block_Ores_Abstract) {
+ TileEntity tTileEntity = getBaseMetaTileEntity().getTileEntityOffset(x, y, z);
+ if (tTileEntity instanceof GT_TileEntity_Ores && ((GT_TileEntity_Ores) tTileEntity).mNatural)
+ oreBlockPositions.add(blockPos);
+ } else if (GT_Utility.isOre(new ItemStack(block, 1, blockMeta)))
+ oreBlockPositions.add(blockPos);
+ }
}
protected abstract int getRadiusInChunks();