From 0213c1280a70e157dcbad104afc83c8a3058ae10 Mon Sep 17 00:00:00 2001
From: Detrav <witalyezep@gmail.com>
Date: Thu, 7 Apr 2016 23:22:24 +0300
Subject: Refactor wrong names

---
 .../containers/DetravPortableChargerContainer.java |   5 +-
 .../com/detrav/gui/textures/DetravMapTexture.java  |   8 +-
 .../BehaviourDetravToolElectricProPick.java        |   6 +-
 src/main/java/com/detrav/net/DetravNetwork.java    |   2 +-
 .../detrav/net/DetravPortableChargerPacker02.java  |  36 -----
 .../detrav/net/DetravPortableChargerPacket01.java  |  36 +++++
 .../java/com/detrav/net/DetravProPickPacket00.java | 179 +++++++++++++++++++++
 .../java/com/detrav/net/DetravProPickPacket01.java | 179 ---------------------
 8 files changed, 224 insertions(+), 227 deletions(-)
 delete mode 100644 src/main/java/com/detrav/net/DetravPortableChargerPacker02.java
 create mode 100644 src/main/java/com/detrav/net/DetravPortableChargerPacket01.java
 create mode 100644 src/main/java/com/detrav/net/DetravProPickPacket00.java
 delete mode 100644 src/main/java/com/detrav/net/DetravProPickPacket01.java

(limited to 'src')

diff --git a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
index 8be85ee690..9a641452d0 100644
--- a/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
+++ b/src/main/java/com/detrav/gui/containers/DetravPortableChargerContainer.java
@@ -2,7 +2,7 @@ package com.detrav.gui.containers;
 
 import com.detrav.items.DetravMetaGeneratedTool01;
 import com.detrav.net.DetravNetwork;
-import com.detrav.net.DetravPortableChargerPacker02;
+import com.detrav.net.DetravPortableChargerPacket01;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_ModHandler;
 import gregtech.common.items.armor.SlotLocked;
@@ -16,7 +16,6 @@ import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.world.World;
-import org.lwjgl.Sys;
 
 /**
  * Created by wital_000 on 07.04.2016.
@@ -107,7 +106,7 @@ public class DetravPortableChargerContainer extends Container {
 
         if(aWorld.isRemote) return;
         if(aPlayer instanceof EntityPlayerMP) {
-            DetravPortableChargerPacker02 packet = new DetravPortableChargerPacker02();
+            DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01();
             packet.charge = selfCharge - removeEnergy + loss * aTimer;
             DetravNetwork.INSTANCE.sendToPlayer(packet, (EntityPlayerMP)aPlayer);
             //crafters
diff --git a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
index 2e4be47af2..7696e67d43 100644
--- a/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
+++ b/src/main/java/com/detrav/gui/textures/DetravMapTexture.java
@@ -1,6 +1,6 @@
 package com.detrav.gui.textures;
 
-import com.detrav.net.DetravProPickPacket01;
+import com.detrav.net.DetravProPickPacket00;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.AbstractTexture;
@@ -9,18 +9,16 @@ import net.minecraft.client.resources.IResourceManager;
 import org.lwjgl.opengl.GL11;
 
 import java.awt.image.BufferedImage;
-import java.io.IOException;
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * Created by wital_000 on 21.03.2016.
  */
 public class DetravMapTexture extends AbstractTexture {
 
-    private DetravProPickPacket01 packet;
+    private DetravProPickPacket00 packet;
 
-    public DetravMapTexture(DetravProPickPacket01 aPacket)
+    public DetravMapTexture(DetravProPickPacket00 aPacket)
     {
         packet = aPacket;
     }
diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
index cc78300084..e7fcb07693 100644
--- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
+++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java
@@ -2,7 +2,7 @@ package com.detrav.items.behaviours;
 
 import com.detrav.items.DetravMetaGeneratedTool01;
 import com.detrav.net.DetravNetwork;
-import com.detrav.net.DetravProPickPacket01;
+import com.detrav.net.DetravProPickPacket00;
 import gregtech.api.GregTech_API;
 import gregtech.api.items.GT_MetaBase_Item;
 import gregtech.api.util.GT_LanguageManager;
@@ -39,14 +39,14 @@ public class BehaviourDetravToolElectricProPick extends BehaviourDetravToolProPi
             int size = aItem.getHarvestLevel(aStack, "") + 1;
             List<Chunk> chunks = new ArrayList<Chunk>();
             //aPlayer.addChatMessage(new ChatComponentText("Scanning Begin, wait!"));
-            //DetravProPickPacket01 packet = new DetravProPickPacket01();
+            //DetravProPickPacket00 packet = new DetravProPickPacket00();
             for (int i = -size; i <= size; i++)
                 for (int j = -size; j <= size; j++)
                     if (i != -size && i != size && j != -size && j != size)
                         chunks.add(aWorld.getChunkFromChunkCoords(cX + i, cZ + j));
             size = size - 1;
             //c.gene
-            DetravProPickPacket01 packet = new DetravProPickPacket01();
+            DetravProPickPacket00 packet = new DetravProPickPacket00();
             packet.chunkX = cX;
             packet.chunkZ = cZ;
             packet.size = size;
diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 3e0fce1b0c..86780ab81c 100644
--- a/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
@@ -31,7 +31,7 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
     {
         INSTANCE = this;
         this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", new ChannelHandler[]{this, new HandlerShared()});
-        this.mSubChannels = new DetravPacket[]{new DetravProPickPacket01(),new DetravPortableChargerPacker02()};
+        this.mSubChannels = new DetravPacket[]{new DetravProPickPacket00(),new DetravPortableChargerPacket01()};
     }
 
     @Override
diff --git a/src/main/java/com/detrav/net/DetravPortableChargerPacker02.java b/src/main/java/com/detrav/net/DetravPortableChargerPacker02.java
deleted file mode 100644
index d5643ca984..0000000000
--- a/src/main/java/com/detrav/net/DetravPortableChargerPacker02.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.detrav.net;
-
-import com.detrav.gui.DetravPortableChargerGui;
-import com.google.common.io.ByteArrayDataInput;
-import com.google.common.io.ByteArrayDataOutput;
-import com.google.common.io.ByteStreams;
-
-/**
- * Created by wital_000 on 07.04.2016.
- */
-public class DetravPortableChargerPacker02 extends DetravPacket {
-    public long charge = 0;
-    @Override
-    public int getPacketID() {
-        return 1;
-    }
-
-    @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
-        tOut.writeLong(charge);
-        return tOut.toByteArray();
-    }
-
-    @Override
-    public Object decode(ByteArrayDataInput aData) {
-        DetravPortableChargerPacker02 packet = new DetravPortableChargerPacker02();
-        packet.charge = aData.readLong();
-        return packet;
-    }
-
-    @Override
-    public void process() {
-        DetravPortableChargerGui.charge = charge;
-    }
-}
diff --git a/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java b/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java
new file mode 100644
index 0000000000..a99f684140
--- /dev/null
+++ b/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java
@@ -0,0 +1,36 @@
+package com.detrav.net;
+
+import com.detrav.gui.DetravPortableChargerGui;
+import com.google.common.io.ByteArrayDataInput;
+import com.google.common.io.ByteArrayDataOutput;
+import com.google.common.io.ByteStreams;
+
+/**
+ * Created by wital_000 on 07.04.2016.
+ */
+public class DetravPortableChargerPacket01 extends DetravPacket {
+    public long charge = 0;
+    @Override
+    public int getPacketID() {
+        return 1;
+    }
+
+    @Override
+    public byte[] encode() {
+        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
+        tOut.writeLong(charge);
+        return tOut.toByteArray();
+    }
+
+    @Override
+    public Object decode(ByteArrayDataInput aData) {
+        DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01();
+        packet.charge = aData.readLong();
+        return packet;
+    }
+
+    @Override
+    public void process() {
+        DetravPortableChargerGui.charge = charge;
+    }
+}
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket00.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java
new file mode 100644
index 0000000000..d2e9ed57b6
--- /dev/null
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -0,0 +1,179 @@
+package com.detrav.net;
+
+import com.detrav.DetravScannerMod;
+import com.detrav.gui.DetravGuiProPick;
+import com.detrav.gui.textures.DetravMapTexture;
+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 java.awt.image.BufferedImage;
+import java.awt.image.WritableRaster;
+import java.util.HashMap;
+
+
+/**
+ * Created by wital_000 on 20.03.2016.
+ */
+public class DetravProPickPacket00 extends DetravPacket {
+    public int chunkX;
+    public int chunkZ;
+    public int size;
+    HashMap<Byte,Short>[][] map = null;
+
+    @Override
+    public int getPacketID() {
+        return 0;
+    }
+
+    public int level = -1;
+
+    @Override
+    public byte[] encode() {
+        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
+        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<aSize; i++)
+            for(int j =0; j<aSize; j++)
+            {
+                if(map[i][j]==null)
+                    tOut.writeByte(0);
+                else
+                {
+                    tOut.writeByte(map[i][j].keySet().size());
+                    for(byte key : map[i][j].keySet())
+                    {
+                        tOut.writeByte(key);
+                        tOut.writeShort(map[i][j].get(key));
+                        checkOut++;
+                    }
+                }
+            }
+        tOut.writeInt(checkOut);
+        return tOut.toByteArray();
+    }
+
+    @Override
+    public Object decode(ByteArrayDataInput aData) {
+        DetravProPickPacket00 packet = new DetravProPickPacket00();
+        packet.level = aData.readInt();
+        packet.chunkX = aData.readInt();
+        packet.chunkZ = aData.readInt();
+        packet.size = aData.readInt();
+        packet.map = new HashMap[(packet.size * 2 + 1) * 16][(packet.size * 2 + 1) * 16];
+        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<Byte, Short>();
+                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<Byte, Short>();
+        map[aX][aZ].put((byte)y,metaData);
+        //String key = String.format(("x_y"))
+    }
+
+    private HashMap<String,Integer> ores = null;
+
+    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 = posX - (chunkX-size)*16;
+        int playerJ = posZ - (chunkZ-size)*16;
+
+        if(ores == null) ores = new HashMap<String, Integer>();
+
+        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()) {
+                        //Пока только по одному буду
+                        Materials tMaterial = GregTech_API.sGeneratedMaterials[meta% 1000];
+                        short[] rgba = tMaterial.getRGBA();
+                        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);
+                        //ores.put(GT_Ore)
+                        String name = GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name");
+                        if(!ores.containsKey(name))
+                            ores.put(name,(0xFF << 24) + ((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-15)%16 == 0 || (j-15)%16 == 0)
+                {
+                    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);
+                }
+            }
+        /*try {
+            File outputfile = new File("saved.png");
+            ImageIO.write(image, "png", outputfile);
+        }
+        catch (Exception e) {}*/
+
+        return image;
+
+
+        //image.set
+        //return null;
+    }
+
+    public HashMap<String,Integer> getOres()
+    {
+        if(ores == null) return new HashMap<String, Integer>();
+        return ores;
+    }
+
+
+    public int getSize() {
+        return (size*2+1)*16;
+    }
+}
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket01.java b/src/main/java/com/detrav/net/DetravProPickPacket01.java
deleted file mode 100644
index db0db3edcb..0000000000
--- a/src/main/java/com/detrav/net/DetravProPickPacket01.java
+++ /dev/null
@@ -1,179 +0,0 @@
-package com.detrav.net;
-
-import com.detrav.DetravScannerMod;
-import com.detrav.gui.DetravGuiProPick;
-import com.detrav.gui.textures.DetravMapTexture;
-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 java.awt.image.BufferedImage;
-import java.awt.image.WritableRaster;
-import java.util.HashMap;
-
-
-/**
- * Created by wital_000 on 20.03.2016.
- */
-public class DetravProPickPacket01 extends DetravPacket {
-    public int chunkX;
-    public int chunkZ;
-    public int size;
-    HashMap<Byte,Short>[][] map = null;
-
-    @Override
-    public int getPacketID() {
-        return 0;
-    }
-
-    public int level = -1;
-
-    @Override
-    public byte[] encode() {
-        ByteArrayDataOutput tOut = ByteStreams.newDataOutput(1);
-        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<aSize; i++)
-            for(int j =0; j<aSize; j++)
-            {
-                if(map[i][j]==null)
-                    tOut.writeByte(0);
-                else
-                {
-                    tOut.writeByte(map[i][j].keySet().size());
-                    for(byte key : map[i][j].keySet())
-                    {
-                        tOut.writeByte(key);
-                        tOut.writeShort(map[i][j].get(key));
-                        checkOut++;
-                    }
-                }
-            }
-        tOut.writeInt(checkOut);
-        return tOut.toByteArray();
-    }
-
-    @Override
-    public Object decode(ByteArrayDataInput aData) {
-        DetravProPickPacket01 packet = new DetravProPickPacket01();
-        packet.level = aData.readInt();
-        packet.chunkX = aData.readInt();
-        packet.chunkZ = aData.readInt();
-        packet.size = aData.readInt();
-        packet.map = new HashMap[(packet.size * 2 + 1) * 16][(packet.size * 2 + 1) * 16];
-        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<Byte, Short>();
-                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 DetravProPickPacket01();
-        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<Byte, Short>();
-        map[aX][aZ].put((byte)y,metaData);
-        //String key = String.format(("x_y"))
-    }
-
-    private HashMap<String,Integer> ores = null;
-
-    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 = posX - (chunkX-size)*16;
-        int playerJ = posZ - (chunkZ-size)*16;
-
-        if(ores == null) ores = new HashMap<String, Integer>();
-
-        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()) {
-                        //Пока только по одному буду
-                        Materials tMaterial = GregTech_API.sGeneratedMaterials[meta% 1000];
-                        short[] rgba = tMaterial.getRGBA();
-                        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);
-                        //ores.put(GT_Ore)
-                        String name = GT_LanguageManager.getTranslation("gt.blockores." + meta + ".name");
-                        if(!ores.containsKey(name))
-                            ores.put(name,(0xFF << 24) + ((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-15)%16 == 0 || (j-15)%16 == 0)
-                {
-                    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);
-                }
-            }
-        /*try {
-            File outputfile = new File("saved.png");
-            ImageIO.write(image, "png", outputfile);
-        }
-        catch (Exception e) {}*/
-
-        return image;
-
-
-        //image.set
-        //return null;
-    }
-
-    public HashMap<String,Integer> getOres()
-    {
-        if(ores == null) return new HashMap<String, Integer>();
-        return ores;
-    }
-
-
-    public int getSize() {
-        return (size*2+1)*16;
-    }
-}
-- 
cgit