Merge pull request #3 from Ethryan/master

GT Scanner

3 files changed, 0 insertions, 38 deletions

diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 988b6c3a69..798ccffeda 100644
--- a/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
@@ -34,7 +34,6 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
         this.mSubChannels = new DetravPacket[]
                 {
                         new DetravProPickPacket00(),
-                        new DetravPortableChargerPacket01(),
                 };
     }
 
diff --git a/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java b/src/main/java/com/detrav/net/DetravPortableChargerPacket01.java
deleted file mode 100644
index a99f684140..0000000000
--- a/src/main/java/com/detrav/net/DetravPortableChargerPacket01.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 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
index dc59032922..0dd6e9f406 100644
--- a/src/main/java/com/detrav/net/DetravProPickPacket00.java
+++ b/src/main/java/com/detrav/net/DetravProPickPacket00.java
@@ -135,7 +135,6 @@ public class DetravProPickPacket00 extends DetravPacket {
                         for (short meta : map[i][j].values()) {
                             String name;
                             short[] rgba;
-                            //Пока только по одному буду
                             Materials tMaterial = null;
                             try {
                                 tMaterial = GregTech_API.sGeneratedMaterials[meta % 1000];