From 28eaa261e316518d83460b94c7b3678ac00acf7e Mon Sep 17 00:00:00 2001 From: repo_alt Date: Fri, 4 Dec 2020 00:06:25 +0300 Subject: Non-GT ores support for the seismic prospector (GT++, BW(?)) --- .../basic/GT_MetaTileEntity_AdvSeismicProspector.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'src/main/java/gregtech/common/tileentities') diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java index 46ea555ad0..28f661c339 100644 --- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java +++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java @@ -216,12 +216,13 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba } } else { int tMetaID = getBaseMetaTileEntity().getWorld().getBlockMetadata(x, y, z); - ItemData tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); - - if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) - return tAssotiation.mMaterial.mMaterial.mDefaultLocalName; + ItemStack is = new ItemStack(tBlock, 1, tMetaID); + ItemData association = GT_OreDictUnificator.getAssociation(is); + if ((association != null) && (association.mPrefix.toString().startsWith("ore"))) + return association.mMaterial.mMaterial.mDefaultLocalName; + else if (GT_Utility.isOre(is)) + return tBlock.getLocalizedName(); } - return null; } -- cgit