Refactor wrong names

6 files changed, 14 insertions, 17 deletions

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/DetravPortableChargerPacket01.java
index d5643ca984..a99f684140 100644
--- a/src/main/java/com/detrav/net/DetravPortableChargerPacker02.java
+++ b/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java
@@ -8,7 +8,7 @@ import com.google.common.io.ByteStreams;
 /**
  * Created by wital_000 on 07.04.2016.
  */
-public class DetravPortableChargerPacker02 extends DetravPacket {
+public class DetravPortableChargerPacket01 extends DetravPacket {
     public long charge = 0;
     @Override
     public int getPacketID() {
@@ -24,7 +24,7 @@ public class DetravPortableChargerPacker02 extends DetravPacket {
 
     @Override
     public Object decode(ByteArrayDataInput aData) {
-        DetravPortableChargerPacker02 packet = new DetravPortableChargerPacker02();
+        DetravPortableChargerPacket01 packet = new DetravPortableChargerPacket01();
         packet.charge = aData.readLong();
         return packet;
     }
diff --git a/src/main/java/com/detrav/net/DetravProPickPacket01.java b/src/main/java/com/detrav/net/DetravProPickPacket00.java
index db0db3edcb..d2e9ed57b6 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket01.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -18,7 +18,7 @@ import java.util.HashMap;
 /**
  * Created by wital_000 on 20.03.2016.
  */
-public class DetravProPickPacket01 extends DetravPacket {
+public class DetravProPickPacket00 extends DetravPacket {
     public int chunkX;
     public int chunkZ;
     public int size;
@@ -62,7 +62,7 @@ public class DetravProPickPacket01 extends DetravPacket {
 
     @Override
     public Object decode(ByteArrayDataInput aData) {
-        DetravProPickPacket01 packet = new DetravProPickPacket01();
+        DetravProPickPacket00 packet = new DetravProPickPacket00();
         packet.level = aData.readInt();
         packet.chunkX = aData.readInt();
         packet.chunkZ = aData.readInt();
@@ -81,7 +81,7 @@ public class DetravProPickPacket01 extends DetravPacket {
                 }
             }
         int checkOut2 = aData.readInt();
-        if(checkOut != checkOut2) return new DetravProPickPacket01();
+        if(checkOut != checkOut2) return new DetravProPickPacket00();
         return packet;
     }