From eabd07cd3c76a090f03b14b4cbea47a8a265b888 Mon Sep 17 00:00:00 2001
From: Detrav <witalyezep@gmail.com>
Date: Mon, 21 Mar 2016 20:49:53 +0300
Subject: Hot fix server crash

---
 src/main/java/com/detrav/gui/DetravMapTexture.java    |  3 ++-
 .../java/com/detrav/net/DetravProPickPacket01.java    | 19 ++++++-------------
 src/main/java/com/detrav/proxies/ClientProxy.java     | 12 ++++++++++++
 src/main/java/com/detrav/proxies/CommonProxy.java     |  5 +++++
 4 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/detrav/gui/DetravMapTexture.java b/src/main/java/com/detrav/gui/DetravMapTexture.java
index ab58128ee2..3c90a57d45 100644
--- a/src/main/java/com/detrav/gui/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/DetravMapTexture.java
@@ -1,6 +1,7 @@
 package com.detrav.gui;
 
 import com.detrav.net.DetravProPickPacket01;
+import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.AbstractTexture;
 import net.minecraft.client.renderer.texture.TextureUtil;
@@ -35,7 +36,7 @@ public class DetravMapTexture extends AbstractTexture {
         {
             int tId = getGlTextureId();
             if(tId <0) return;
-            BufferedImage bufferedimage = packet.getImage();
+            BufferedImage bufferedimage = packet.getImage((int)Minecraft.getMinecraft().thePlayer.posX,(int)Minecraft.getMinecraft().thePlayer.posZ);
             TextureUtil.uploadTextureImageAllocate(this.getGlTextureId(), bufferedimage, false, false);
             width = packet.getSize();
             height = packet.getSize();
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket01.java b/src/main/java/com/detrav/net/DetravProPickPacket01.java
index f691231b22..426db03714 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket01.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket01.java
@@ -9,17 +9,11 @@ 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.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.ChatComponentText;
 
-import javax.imageio.ImageIO;
 import java.awt.image.BufferedImage;
-import java.awt.image.ColorModel;
 import java.awt.image.WritableRaster;
-import java.io.File;
 import java.util.HashMap;
-import java.util.List;
+
 
 /**
  * Created by wital_000 on 20.03.2016.
@@ -91,12 +85,11 @@ public class DetravProPickPacket01 extends DetravPacket {
         return packet;
     }
 
+
     @Override
     public void process() {
         DetravGuiProPick.newMap(new DetravMapTexture(this));
-        EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-        player.openGui(DetravScannerMod.instance, DetravGuiProPick.GUI_ID,player.worldObj,(int)player.posX,(int)player.posY,(int)player.posZ);
-        Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("NetworkTested: " + Integer.toString(level)));
+
     }
 
     public void addBlock(int x, int y, int z, short metaData) {
@@ -110,15 +103,15 @@ public class DetravProPickPacket01 extends DetravPacket {
 
     private HashMap<String,Integer> ores = null;
 
-    public BufferedImage getImage() {
+    public BufferedImage getImage(int posX,int posZ) {
         int wh = (size*2+1)*16;
         //int aWh = 1024;
         //while (aWh<wh) aWh*=2;
         BufferedImage image = new BufferedImage(wh,wh,BufferedImage.TYPE_INT_ARGB );
         WritableRaster raster = image.getRaster();
 
-        int playerI = (int)Minecraft.getMinecraft().thePlayer.posX - (chunkX-size)*16;
-        int playerJ = (int)Minecraft.getMinecraft().thePlayer.posZ - (chunkZ-size)*16;
+        int playerI = posX - (chunkX-size)*16;
+        int playerJ = posZ - (chunkZ-size)*16;
 
         if(ores == null) ores = new HashMap<String, Integer>();
 
diff --git a/src/main/java/com/detrav/proxies/ClientProxy.java b/src/main/java/com/detrav/proxies/ClientProxy.java
index e96d616359..57e6935349 100644
--- a/src/main/java/com/detrav/proxies/ClientProxy.java
+++ b/src/main/java/com/detrav/proxies/ClientProxy.java
@@ -1,7 +1,12 @@
 package com.detrav.proxies;
 
+import com.detrav.DetravScannerMod;
 import com.detrav.enums.Textures01;
+import com.detrav.gui.DetravGuiProPick;
 import gregtech.api.enums.Textures;
+import net.minecraft.client.Minecraft;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.ChatComponentText;
 
 /**
  * Created by wital_000 on 19.03.2016.
@@ -25,4 +30,11 @@ public class ClientProxy extends CommonProxy {
     {
         super.onLoad();
     }
+
+    public void openProPickGui()
+    {
+        EntityPlayer player = Minecraft.getMinecraft().thePlayer;
+        player.openGui(DetravScannerMod.instance, DetravGuiProPick.GUI_ID,player.worldObj,(int)player.posX,(int)player.posY,(int)player.posZ);
+        //Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("NetworkTested: " + Integer.toString(level)));
+    }
 }
diff --git a/src/main/java/com/detrav/proxies/CommonProxy.java b/src/main/java/com/detrav/proxies/CommonProxy.java
index 70a39ccf1e..52a3e11e26 100644
--- a/src/main/java/com/detrav/proxies/CommonProxy.java
+++ b/src/main/java/com/detrav/proxies/CommonProxy.java
@@ -44,4 +44,9 @@ public class CommonProxy implements IGuiHandler {
             return new DetravGuiProPick();
         return null;
     }
+
+    public void openProPickGui()
+    {
+
+    }
 }
-- 
cgit