From fa0a61aaf937955fbc42018f2f601be82e1db1d8 Mon Sep 17 00:00:00 2001
From: Detrav <witalyezep@gmail.com>
Date: Sat, 8 Oct 2016 10:46:06 +0300
Subject: Updated to 5.09.24 gregtech

---
 src/main/java/com/detrav/DetravScannerMod.java          | 2 +-
 src/main/java/com/detrav/net/DetravProPickPacket00.java | 4 +++-
 src/main/java/com/detrav/proxies/ClientProxy.java       | 5 +++++
 src/main/java/com/detrav/proxies/CommonProxy.java       | 4 ++++
 4 files changed, 13 insertions(+), 2 deletions(-)

(limited to 'src/main/java')

diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java
index 4c2806920d..18ef1a999a 100644
--- a/src/main/java/com/detrav/DetravScannerMod.java
+++ b/src/main/java/com/detrav/DetravScannerMod.java
@@ -22,7 +22,7 @@ import net.minecraftforge.common.config.Configuration;
 public class DetravScannerMod
 {
     public static final String MODID = "detravscannermod";
-    public static final String VERSION = "0.22";
+    public static final String VERSION = "0.23";
 
     public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
 
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java
index f691896621..460d96e846 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket00.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -114,7 +114,7 @@ public class DetravProPickPacket00 extends DetravPacket {
         int playerJ = posZ - (chunkZ-size)*16;
 
         if(ores == null) ores = new HashMap<String, Integer>();
-
+        int exception = 0;
         for(int i =0; i<wh; i++)
             for(int j =0; j<wh; j++) {
                 if (map[i][j] == null)
@@ -132,6 +132,7 @@ public class DetravProPickPacket00 extends DetravPacket {
                         if(meta>=0) {
                             //Пока только по одному буду
                             Materials tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];
+                            if(tMaterial == null) { exception++; continue;}
                             rgba = tMaterial.getRGBA();
                             //ores.put(GT_Ore)
                             name = GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name");
@@ -169,6 +170,7 @@ public class DetravProPickPacket00 extends DetravPacket {
                     raster.setSample(i,j,2,raster.getSample(i,j,2)/2);
                 }
             }
+            DetravScannerMod.proxy.sendPlayerExeption("null matertial exception: " + exception);
         /*try {
             File outputfile = new File("saved.png");
             ImageIO.write(image, "png", outputfile);
diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java
index 6eccd8738c..013894b39e 100644
--- a/src/main/java/com/detrav/proxies/ClientProxy.java
+++ b/src/main/java/com/detrav/proxies/ClientProxy.java
@@ -46,4 +46,9 @@ public class ClientProxy extends CommonProxy {
         super.onPreInit();
         //DetravKeyHandler.register();
     }
+
+    @Override
+    public void sendPlayerExeption(String s) {
+        Minecraft.getMinecraft().thePlayer.sendChatMessage("DetravScannerMod: " + s);
+    }
 }
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 70a6dd8ecd..90887cd8e2 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -98,4 +98,8 @@ public class CommonProxy implements IGuiHandler {
     {
 
     }
+
+    public void sendPlayerExeption(String s) {
+
+    }
 }
-- 
cgit