Properly handle BW ores

2 files changed, 6 insertions, 5 deletions

diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index cc866f8d85..444064594e 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -44,7 +44,8 @@ public class DetravMapTexture extends AbstractTexture {
                         for (short meta : packet.map[i][j].values()) {
                             final String name = packet.metaMap.get(meta);
                             if (!selected.equals("All") && !selected.equals(name)) continue;
-                            image.setRGB(i, j, packet.ores.get(name) | 0XFF000000);
+
+                            image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000);
                             break;
                         }
                     } else if (packet.ptype == 2) {
@@ -55,7 +56,7 @@ public class DetravMapTexture extends AbstractTexture {
                         final int k = (i % 16), l = (j % 16);
                         
                         if( ( (k + l * 16) * 3) < (fluidSize + 48) && (selected.equals("All") || selected.equals(name))) {
-                            image.setRGB(i, j, packet.ores.get(name) | 0XFF000000);
+                            image.setRGB(i, j, packet.ores.getOrDefault(name, Color.BLACK.getRGB()) | 0XFF000000);
                         }
                     }else if (packet.ptype == 3) {
                         final short meta = packet.map[i][j].get((byte) 1);
diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java
index 36e5410730..0e9facf160 100644
--- a/src/main/java/com/detrav/net/ProspectingPacket.java
+++ b/src/main/java/com/detrav/net/ProspectingPacket.java
@@ -63,14 +63,14 @@ public class ProspectingPacket extends DetravPacket {
             if(packet.ptype == 0 || packet.ptype == 1) {
                 // Ore or Small Ore
                 if (meta < 7000 || meta > 7500) {
-                    Materials tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
-
                     if (meta > 0) {
+                        Materials tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
                         rgba = tMaterial.getRGBA();
                         name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name"));
                     } else {
                         name = GT_LanguageManager.getTranslation("bw.blockores.01." + (meta * -1) + ".name");
-                        rgba = Werkstoff.werkstoffHashMap.get((short) (meta * -1)).getRGBA();
+                        final Werkstoff werkstoff = Werkstoff.werkstoffHashMap.getOrDefault((short) (meta * -1), null);
+                        rgba = werkstoff != null ? werkstoff.getRGBA() : new short[]{0,0,0,0}; 
                     }
                 } else {
                     gtPlusPlus.core.material.Material pMaterial = GTppHelper.decodeoresGTpp.get((short) (meta - 7000));