From 8ecc28d1317e01036a6d0f1cefa34b0aacd2d16a Mon Sep 17 00:00:00 2001
From: Jason Mitchell <mitchej@gmail.com>
Date: Sun, 24 Jan 2021 00:37:23 -0800
Subject: Selectable ores on electronic prospector * Cleaned up some class/file
 names * Removed unused code/comments * Cached other mods being loaded *
 Various optimizations

---
 src/main/java/com/detrav/net/DetravNetwork.java | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'src/main/java/com/detrav/net/DetravNetwork.java')

diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java
index 798ccffeda..5e20fd1552 100644
--- a/src/main/java/com/detrav/net/DetravNetwork.java
+++ b/src/main/java/com/detrav/net/DetravNetwork.java
@@ -27,14 +27,9 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
     private final EnumMap<Side, FMLEmbeddedChannel> mChannel;
     private DetravPacket[] mSubChannels;
 
-    public DetravNetwork()
-    {
+    public DetravNetwork() {
         INSTANCE = this;
-        this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", new ChannelHandler[]{this, new HandlerShared()});
-        this.mSubChannels = new DetravPacket[]
-                {
-                        new DetravProPickPacket00(),
-                };
+        this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", this, new HandlerShared());
     }
 
     @Override
@@ -42,10 +37,12 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
         out.add(new FMLProxyPacket(Unpooled.buffer().writeByte(msg.getPacketID()).writeBytes(msg.encode()).copy(),(String) ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get()));
     }
 
+    @SuppressWarnings("UnstableApiUsage")
     @Override
     protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List<Object> out) throws Exception {
         ByteArrayDataInput aData = ByteStreams.newDataInput(msg.payload().array());
-        out.add(this.mSubChannels[aData.readByte()].decode(aData));
+        aData.readByte(); // Sub Channel - Ignore
+        out.add(ProspectingPacket.decode(aData));
     }
 
     public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) {
@@ -59,11 +56,8 @@ public class DetravNetwork extends MessageToMessageCodec<FMLProxyPacket, DetravP
     }
 
     @ChannelHandler.Sharable
-    static final class HandlerShared
-            extends SimpleChannelInboundHandler<DetravPacket> {
-        protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket)
-                throws Exception {
-            //EntityPlayer aPlayer = GT_Values.GT.getThePlayer();
+    static final class HandlerShared extends SimpleChannelInboundHandler<DetravPacket> {
+        protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket) throws Exception {
             aPacket.process();
         }
     }
-- 
cgit