diff options
Diffstat (limited to 'src/main/java/com')
| -rw-r--r-- | src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/detrav/net/ProspectingPacket.java | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java index 65a2f9e80e..d2db2ec860 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolProspector.java @@ -4,6 +4,7 @@ import com.detrav.DetravScannerMod; import com.detrav.items.DetravMetaGeneratedTool01; import com.detrav.utils.BartWorksHelper; import com.detrav.utils.GTppHelper; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.sinthoras.visualprospecting.VisualProspecting_API; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.LanguageRegistry; @@ -256,7 +257,8 @@ public class BehaviourDetravToolProspector extends Behaviour_None { addOreToHashMap(name, aPlayer); } else if (DetravScannerMod.isBartWorksLoaded && BartWorksHelper.isOre(tBlock)){ if (data != 1 && BartWorksHelper.isSmallOre(tBlock)) continue; - addOreToHashMap(GT_LanguageManager.getTranslation((BartWorksHelper.isSmallOre(tBlock) ? "bw.blockores.02." : "bw.blockores.01.") + ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1) + ".name"), aPlayer); + final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) ((BartWorksHelper.getMetaFromBlock(aChunk,x,y,z,tBlock))*-1), null); + addOreToHashMap(werkstoff.getLocalizedName() + " Ore", aPlayer); } else if (data == 1) { tAssotiation = GT_OreDictUnificator.getAssociation(new ItemStack(tBlock, 1, tMetaID)); if ((tAssotiation != null) && (tAssotiation.mPrefix.toString().startsWith("ore"))) { diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index 0e9facf160..df21799da2 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -68,9 +68,9 @@ public class ProspectingPacket extends DetravPacket { rgba = tMaterial.getRGBA(); name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); } else { - name = GT_LanguageManager.getTranslation("bw.blockores.01." + (meta * -1) + ".name"); final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) (meta * -1), null); - rgba = werkstoff != null ? werkstoff.getRGBA() : new short[]{0,0,0,0}; + name = werkstoff.getLocalizedName() + " Ore"; + rgba = werkstoff != null ? werkstoff.getRGBA() : new short[]{0,0,0,0}; } } else { gtPlusPlus.core.material.Material pMaterial = GTppHelper.decodeoresGTpp.get((short) (meta - 7000)); |