From 8ecc28d1317e01036a6d0f1cefa34b0aacd2d16a Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 00:37:23 -0800 Subject: Selectable ores on electronic prospector * Cleaned up some class/file names * Removed unused code/comments * Cached other mods being loaded * Various optimizations --- src/main/java/com/detrav/net/DetravNetwork.java | 20 +- src/main/java/com/detrav/net/DetravPacket.java | 4 - .../java/com/detrav/net/DetravProPickPacket00.java | 341 --------------------- .../java/com/detrav/net/ProspectingPacket.java | 185 +++++++++++ 4 files changed, 192 insertions(+), 358 deletions(-) delete mode 100644 src/main/java/com/detrav/net/DetravProPickPacket00.java create mode 100644 src/main/java/com/detrav/net/ProspectingPacket.java (limited to 'src/main/java/com/detrav/net') diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java index 798ccffeda..5e20fd1552 100644 --- a/src/main/java/com/detrav/net/DetravNetwork.java +++ b/src/main/java/com/detrav/net/DetravNetwork.java @@ -27,14 +27,9 @@ public class DetravNetwork extends MessageToMessageCodec mChannel; private DetravPacket[] mSubChannels; - public DetravNetwork() - { + public DetravNetwork() { INSTANCE = this; - this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", new ChannelHandler[]{this, new HandlerShared()}); - this.mSubChannels = new DetravPacket[] - { - new DetravProPickPacket00(), - }; + this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", this, new HandlerShared()); } @Override @@ -42,10 +37,12 @@ public class DetravNetwork extends MessageToMessageCodec out) throws Exception { ByteArrayDataInput aData = ByteStreams.newDataInput(msg.payload().array()); - out.add(this.mSubChannels[aData.readByte()].decode(aData)); + aData.readByte(); // Sub Channel - Ignore + out.add(ProspectingPacket.decode(aData)); } public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) { @@ -59,11 +56,8 @@ public class DetravNetwork extends MessageToMessageCodec { - protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket) - throws Exception { - //EntityPlayer aPlayer = GT_Values.GT.getThePlayer(); + static final class HandlerShared extends SimpleChannelInboundHandler { + protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket) throws Exception { aPacket.process(); } } diff --git a/src/main/java/com/detrav/net/DetravPacket.java b/src/main/java/com/detrav/net/DetravPacket.java index a2b3697bac..dcf61064ac 100644 --- a/src/main/java/com/detrav/net/DetravPacket.java +++ b/src/main/java/com/detrav/net/DetravPacket.java @@ -1,7 +1,5 @@ package com.detrav.net; -import com.google.common.io.ByteArrayDataInput; - /** * Created by wital_000 on 20.03.2016. */ @@ -11,7 +9,5 @@ public abstract class DetravPacket { public abstract byte[] encode() ; - public abstract Object decode(ByteArrayDataInput aData) ; - public abstract void process(); } diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java deleted file mode 100644 index 0a50fbbeed..0000000000 --- a/src/main/java/com/detrav/net/DetravProPickPacket00.java +++ /dev/null @@ -1,341 +0,0 @@ -package com.detrav.net; - -import com.detrav.DetravScannerMod; -import com.detrav.gui.DetravGuiProPick; -import com.detrav.gui.textures.DetravMapTexture; -import com.detrav.utils.GTppHelper; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; -import gregtech.api.GregTech_API; -import gregtech.api.enums.Materials; -import gregtech.api.util.GT_LanguageManager; -import net.minecraft.util.StatCollector; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.awt.image.BufferedImage; -import java.awt.image.WritableRaster; -import java.util.HashMap; - -/* -//DEBUG CLASSES -import java.util.Map; -import java.util.Iterator; -import java.util.Set; -*/ - -/** - * Created by wital_000 on 20.03.2016. - */ -public class DetravProPickPacket00 extends DetravPacket { - public int chunkX; - public int chunkZ; - public int size; - public int ptype; - private HashMap[][] map = null; - public static HashMap fluidColors = new HashMap<>(); - - @Override - public int getPacketID() { - return 0; - } - - public int level = -1; - - @Override - public byte[] encode() { - ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1); - tOut.writeInt(ptype); - tOut.writeInt(level); - tOut.writeInt(chunkX); - tOut.writeInt(chunkZ); - tOut.writeInt(size); - int aSize = (size*2+1)*16; - int checkOut = 0; - for(int i =0; i(); - for (int k = 0; k < kSize; k++) { - packet.map[i][j].put(aData.readByte(),aData.readShort()); - checkOut++; - } - } - int checkOut2 = aData.readInt(); - if(checkOut != checkOut2) return new DetravProPickPacket00(); - return packet; - } - - - @Override - public void process() { - DetravGuiProPick.newMap(new DetravMapTexture(this)); - DetravScannerMod.proxy.openProPickGui(); - } - - public void addBlock(int x, int y, int z, short metaData) { - if(map == null) - map = new HashMap[(size*2+1)*16][(size*2+1)*16]; - int aX = x - (chunkX-size)*16; - int aZ = z - (chunkZ-size)*16; - if(map[aX][aZ] == null) - map[aX][aZ] = new HashMap(); - map[aX][aZ].put((byte)y,metaData); - //String key = String.format(("x_y")) - } - - private HashMap ores = null; - - public BufferedImage getImage(int posX,int posZ) { - int wh = (size*2+1)*16; - //int aWh = 1024; - //while (aWh(); - int exception = 0; - switch (ptype) { - case 0: - case 1: - for (int i = 0; i < wh; i++) - for (int j = 0; j < wh; j++) { - if (map[i][j] == null) { - raster.setSample(i, j, 0, 255); - raster.setSample(i, j, 1, 255); - raster.setSample(i, j, 2, 255); - raster.setSample(i, j, 3, 255); - } else { - for (short meta : map[i][j].values()) { - String name; - short[] rgba; - Materials tMaterial = null; - gtPlusPlus.core.material.Material pMaterial = null; - try { - if (meta<7000||meta>7500) { - tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000]; - } else { - Short l = (short) (meta-7000); - pMaterial = GTppHelper.decodeoresGTpp.get(l); - } - } catch (Exception e) { - tMaterial = null; - } - if ((meta > 0 && meta<7000) || meta>7500) { - if (tMaterial == null) { - exception++; - continue; - } - rgba = tMaterial.getRGBA(); - //ores.put(GT_Ore) - - name = tMaterial.getLocalizedNameForItem(GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name")); - - raster.setSample(i, j, 0, rgba[0]); - raster.setSample(i, j, 1, rgba[1]); - raster.setSample(i, j, 2, rgba[2]); - raster.setSample(i, j, 3, 255); - if (!ores.containsKey(name)) - ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); - } - else if (meta<=0){ - name = GT_LanguageManager.getTranslation("bw.blockores.01." + (meta*-1) + ".name"); - rgba = new short[]{0,0,0,0}; - try { - rgba = Werkstoff.werkstoffHashMap.get((short) (meta*-1)).getRGBA(); - //name = getLocalizedNameForItem(Werkstoff.werkstoffHashMap.get((short) (meta - 7250)).getDefaultName(),GT_LanguageManager.getTranslation("bw.blockores.01." + (meta-7250) + ".name")); - } catch (Exception e){ - } - raster.setSample(i, j, 0, rgba[0]); - raster.setSample(i, j, 1, rgba[1]); - raster.setSample(i, j, 2, rgba[2]); - raster.setSample(i, j, 3, 255); - if (!ores.containsKey(name)) - ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); - } else { - if (pMaterial == null) { - exception++; - continue; - } - rgba = pMaterial.getRGBA(); - //ores.put(GT_Ore) - name = pMaterial.getLocalizedName() + " Ore"; - - raster.setSample(i, j, 0, rgba[0]); - raster.setSample(i, j, 1, rgba[1]); - raster.setSample(i, j, 2, rgba[2]); - raster.setSample(i, j, 3, 255); - if (!ores.containsKey(name)) - ores.put(name,((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); - } - } - } - if (playerI == i || playerJ == j) { - raster.setSample(i, j, 0, (raster.getSample(i, j, 0) + 255) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - if ((i) % 16 == 0 || (j) % 16 == 0) { // Draw grid on screen - raster.setSample(i, j, 0, raster.getSample(i, j, 0) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - } - break; - case 2: - - short[] metas = new short[2]; - for (int i = 0; i < wh; i++) - for (int j = 0; j < wh; j++) { - if (map[i][j] == null) { - raster.setSample(i, j, 0, 255); - raster.setSample(i, j, 1, 255); - raster.setSample(i, j, 2, 255); - raster.setSample(i, j, 3, 255); - } else { - metas[0] = map[i][j].get((byte) 1); // fluidID - metas[1] = map[i][j].get((byte) 2); // Size of the field - String name = null; - short[] rgba = null; - - rgba = (short[])fluidColors.get( (Integer) ((int) metas[0] ) ); - if (rgba == null) { - DetravScannerMod.proxy.sendPlayerExeption( "Unknown fluid ID = " + metas[0] + " Please add to DetravProPickPacket00.java!" ); - rgba = new short[]{ 0x00, 0xff, 0x00 }; - } - - name = FluidRegistry.getFluid( metas[0] ).getLocalizedName(new FluidStack( FluidRegistry.getFluid( metas[0] ), 0) ); - if (name == null) { - name = StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid"); - } - - if (!ores.containsKey(name)) - ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); - - int k = (i % 16); // Variables used to locate within a chunk. - int l = (j % 16); - - if( ( (k + l*16) * 3) < (metas[1]+48) ) { // draw an indicator in the chunk about how large the field is at this chunk. - raster.setSample(i, j, 0, rgba[0]); - raster.setSample(i, j, 1, rgba[1]); - raster.setSample(i, j, 2, rgba[2]); - raster.setSample(i, j, 3, 255); - } else { - raster.setSample(i, j, 0, 255); - raster.setSample(i, j, 1, 255); - raster.setSample(i, j, 2, 255); - raster.setSample(i, j, 3, 255); - } - - } - if (playerI == i || playerJ == j) { // Draw red line on screen - raster.setSample(i, j, 0, (raster.getSample(i, j, 0) + 255) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - if ((i) % 16 == 0 || (j) % 16 == 0) { // Draw grid on screen - raster.setSample(i, j, 0, raster.getSample(i, j, 0) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - } - break; - case 3: - ores.put(StatCollector.translateToLocal("gui.detrav.scanner.pollution"), ((0 & 0xFF) << 16) + ((0 & 0xFF) << 8) + ((0 & 0xFF))); - for (int i = 0; i < wh; i++) - for (int j = 0; j < wh; j++) { - if (map[i][j] == null) { - raster.setSample(i, j, 0, 255); - raster.setSample(i, j, 1, 255); - raster.setSample(i, j, 2, 255); - raster.setSample(i, j, 3, 255); - } else { - for (short meta : map[i][j].values()) { - raster.setSample(i, j, 0, meta); - raster.setSample(i, j, 1, meta); - raster.setSample(i, j, 2, meta); - raster.setSample(i, j, 3, 255); - } - } - if (playerI == i || playerJ == j) { - raster.setSample(i, j, 0, (raster.getSample(i, j, 0) + 255) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - if ((i) % 16 == 0 || (j) % 16 == 0) { // Draw grid on screen - raster.setSample(i, j, 0, raster.getSample(i, j, 0) / 2); - raster.setSample(i, j, 1, raster.getSample(i, j, 1) / 2); - raster.setSample(i, j, 2, raster.getSample(i, j, 2) / 2); - } - } - break; - default: - DetravScannerMod.proxy.sendPlayerExeption("Not been realized YET!"); - break; - } - if(exception > 0) - DetravScannerMod.proxy.sendPlayerExeption("null matertial exception: " + exception); - /*try { - File outputfile = new File("saved.png"); - ImageIO.write(image, "png", outputfile); - } - catch (Exception e) {}*/ - - return image; - - - //image.set - //return null; - } - - public HashMap getOres() - { - if(ores == null) return new HashMap(); - return ores; - } - - private static String getLocalizedNameForItem(String mDefaultLocalName, String aFormat) { - return String.format(aFormat.replace("%s", "%temp").replace("%material", "%s"), mDefaultLocalName).replace("%temp", "%s"); - } - - public int getSize() { - return (size*2+1)*16; - } -} diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java new file mode 100644 index 0000000000..932f3a9edc --- /dev/null +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -0,0 +1,185 @@ +package com.detrav.net; + +import com.detrav.DetravScannerMod; +import com.detrav.gui.DetravScannerGUI; +import com.detrav.gui.textures.DetravMapTexture; +import com.detrav.utils.GTppHelper; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.google.common.base.Objects; +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; +import gregtech.api.GregTech_API; +import gregtech.api.enums.Materials; +import gregtech.api.util.GT_LanguageManager; +import net.minecraft.util.StatCollector; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; + +import java.util.HashMap; + +/* +//DEBUG CLASSES +import java.util.Map; +import java.util.Iterator; +import java.util.Set; +*/ + +/** + * Created by wital_000 on 20.03.2016. + */ +public class ProspectingPacket extends DetravPacket { + public final int chunkX; + public final int chunkZ; + public final int posX; + public final int posZ; + public final int size; + public final int ptype; + public final HashMap[][] map; + public final HashMap ores; + public final HashMap metaMap; + public static final HashMap fluidColors = new HashMap<>(); + + public int level = -1; + + + public ProspectingPacket(int chunkX, int chunkZ, int posX, int posZ, int size, int ptype) { + this.chunkX = chunkX; + this.chunkZ = chunkZ; + this.posX = posX; + this.posZ = posZ; + this.size = size; + this.ptype = ptype; + this.map = new HashMap[(size*2+1)*16][(size*2+1)*16]; + this.ores = new HashMap<>(); + this.metaMap = new HashMap<>(); + } + + private static void addOre(ProspectingPacket packet, byte y, int i, int j, short meta) { + final String name; + short[] rgba; + + try { + 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) { + 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(); + } + } else { + gtPlusPlus.core.material.Material pMaterial = GTppHelper.decodeoresGTpp.get((short) (meta - 7000)); + rgba = pMaterial.getRGBA(); + name = pMaterial.getLocalizedName() + " Ore"; + } + } else if (packet.ptype == 2) { + // Fluid + rgba = fluidColors.get((int) meta); + if (rgba == null) { + DetravScannerMod.proxy.sendPlayerExeption( "Unknown fluid ID = " + meta + " Please add to DetravProPickPacket00.java!"); + rgba = new short[]{0,0,0,0}; + } + + name = Objects.firstNonNull( + FluidRegistry.getFluid(meta).getLocalizedName(new FluidStack(FluidRegistry.getFluid(meta), 0)), + StatCollector.translateToLocal("gui.detrav.scanner.unknown_fluid") + ); + } else if (packet.ptype == 3) { + // Pollution + name = StatCollector.translateToLocal("gui.detrav.scanner.pollution"); + rgba = new short[]{0,0,0,0}; + } else { + return; + } + } catch (Exception ignored) { + return; + } + packet.map[i][j].put(y, meta); + packet.ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); + packet.metaMap.put(meta, name); + } + + public static Object decode(ByteArrayDataInput aData) { + ProspectingPacket packet = new ProspectingPacket(aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt(), aData.readInt()); + packet.level = aData.readInt(); + + int aSize = (packet.size * 2 + 1) * 16; + int checkOut = 0; + for (int i = 0; i < aSize; i++) + for (int j = 0; j < aSize; j++) { + byte kSize = aData.readByte(); + if(kSize == 0) continue; + packet.map[i][j] = new HashMap<>(); + for (int k = 0; k < kSize; k++) { + final byte y = aData.readByte(); + final short meta = aData.readShort(); + addOre(packet, y, i, j, meta); + checkOut++; + } + } + int checkOut2 = aData.readInt(); + if(checkOut != checkOut2) return null; + return packet; + } + + + + @Override + public int getPacketID() { + return 0; + } + + @SuppressWarnings("UnstableApiUsage") + @Override + public byte[] encode() { + ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1); + tOut.writeInt(chunkX); + tOut.writeInt(chunkZ); + tOut.writeInt(posX); + tOut.writeInt(posZ); + tOut.writeInt(size); + tOut.writeInt(ptype); + tOut.writeInt(level); + + int aSize = (size*2+1)*16; + int checkOut = 0; + for(int i =0; i(); + map[aX][aZ].put((byte) y, metaData); + } + + public int getSize() { + return (size*2+1)*16; + } +} -- cgit From 7d918352b9f7c95d6fd28a5a85e0433fddc3b0eb Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 10:18:42 -0800 Subject: Fluids work now --- src/main/java/com/detrav/net/ProspectingPacket.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/main/java/com/detrav/net') diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index 932f3a9edc..f3b473ce9d 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -99,7 +99,6 @@ public class ProspectingPacket extends DetravPacket { } catch (Exception ignored) { return; } - packet.map[i][j].put(y, meta); packet.ores.put(name, ((rgba[0] & 0xFF) << 16) + ((rgba[1] & 0xFF) << 8) + ((rgba[2] & 0xFF))); packet.metaMap.put(meta, name); } @@ -118,7 +117,8 @@ public class ProspectingPacket extends DetravPacket { for (int k = 0; k < kSize; k++) { final byte y = aData.readByte(); final short meta = aData.readShort(); - addOre(packet, y, i, j, meta); + packet.map[i][j].put(y, meta); + if (packet.ptype != 2 || y == 1) addOre(packet, y, i, j, meta); checkOut++; } } -- cgit From eb7e8585e4496cf14893c618f53418905a32fb70 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 11:23:12 -0800 Subject: Pollution works now. --- src/main/java/com/detrav/net/ProspectingPacket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/detrav/net') diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index f3b473ce9d..411986fd42 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -92,7 +92,7 @@ public class ProspectingPacket extends DetravPacket { } else if (packet.ptype == 3) { // Pollution name = StatCollector.translateToLocal("gui.detrav.scanner.pollution"); - rgba = new short[]{0,0,0,0}; + rgba = new short[]{125,123,118,0}; } else { return; } -- cgit From 36b3c6473a4ff23fae44e8fc4b358e35b6a580d5 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 12:03:46 -0800 Subject: nit --- src/main/java/com/detrav/net/ProspectingPacket.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/com/detrav/net') diff --git a/src/main/java/com/detrav/net/ProspectingPacket.java b/src/main/java/com/detrav/net/ProspectingPacket.java index 411986fd42..36e5410730 100644 --- a/src/main/java/com/detrav/net/ProspectingPacket.java +++ b/src/main/java/com/detrav/net/ProspectingPacket.java @@ -81,7 +81,7 @@ public class ProspectingPacket extends DetravPacket { // Fluid rgba = fluidColors.get((int) meta); if (rgba == null) { - DetravScannerMod.proxy.sendPlayerExeption( "Unknown fluid ID = " + meta + " Please add to DetravProPickPacket00.java!"); + DetravScannerMod.proxy.sendPlayerExeption( "Unknown fluid ID = " + meta + " Please add to FluidColors.java!"); rgba = new short[]{0,0,0,0}; } -- cgit From c52efb53533390f7e3b3ef14558501121b35affe Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 24 Jan 2021 17:10:39 -0800 Subject: Properly handle BW ores --- src/main/java/com/detrav/net/ProspectingPacket.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/com/detrav/net') 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)); -- cgit