From 3136ee7505810670253dacecc83cc075b11e22c6 Mon Sep 17 00:00:00 2001 From: Detrav Date: Mon, 21 Mar 2016 09:29:35 +0300 Subject: Refactor --- src/main/java/com/detrav/DetravScannerMod.java | 3 +- .../BehaviourDetravToolElectricProPick.java | 7 +- src/main/java/com/detrav/net/DetravNetwork.java | 63 ++++++++++++++ src/main/java/com/detrav/net/DetravPacket.java | 17 ++++ .../java/com/detrav/net/DetravProPickPacket01.java | 94 +++++++++++++++++++++ src/main/java/com/detrav/utils/DetravNetwork.java | 64 --------------- src/main/java/com/detrav/utils/DetravPacket.java | 17 ---- .../com/detrav/utils/DetravProPickPacket01.java | 96 ---------------------- 8 files changed, 177 insertions(+), 184 deletions(-) create mode 100644 src/main/java/com/detrav/net/DetravNetwork.java create mode 100644 src/main/java/com/detrav/net/DetravPacket.java create mode 100644 src/main/java/com/detrav/net/DetravProPickPacket01.java delete mode 100644 src/main/java/com/detrav/utils/DetravNetwork.java delete mode 100644 src/main/java/com/detrav/utils/DetravPacket.java delete mode 100644 src/main/java/com/detrav/utils/DetravProPickPacket01.java (limited to 'src/main/java') diff --git a/src/main/java/com/detrav/DetravScannerMod.java b/src/main/java/com/detrav/DetravScannerMod.java index c02308bb06..17ea564795 100644 --- a/src/main/java/com/detrav/DetravScannerMod.java +++ b/src/main/java/com/detrav/DetravScannerMod.java @@ -1,9 +1,8 @@ package com.detrav; import com.detrav.proxies.CommonProxy; -import com.detrav.commands.DetravScannerCommand; import com.detrav.utils.DetravCreativeTab; -import com.detrav.utils.DetravNetwork; +import com.detrav.net.DetravNetwork; import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; diff --git a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java index dfb944e385..214f992245 100644 --- a/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java +++ b/src/main/java/com/detrav/items/behaviours/BehaviourDetravToolElectricProPick.java @@ -1,8 +1,8 @@ package com.detrav.items.behaviours; import com.detrav.items.DetravMetaGeneratedTool01; -import com.detrav.utils.DetravNetwork; -import com.detrav.utils.DetravProPickPacket01; +import com.detrav.net.DetravNetwork; +import com.detrav.net.DetravProPickPacket01; import gregtech.api.GregTech_API; import gregtech.api.items.GT_MetaBase_Item; import gregtech.api.util.GT_LanguageManager; @@ -12,11 +12,8 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.world.World; import net.minecraft.world.chunk.Chunk; -import net.minecraft.world.chunk.storage.ChunkLoader; -import net.minecraftforge.common.ForgeChunkManager; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/detrav/net/DetravNetwork.java b/src/main/java/com/detrav/net/DetravNetwork.java new file mode 100644 index 0000000000..ea79d4cdc3 --- /dev/null +++ b/src/main/java/com/detrav/net/DetravNetwork.java @@ -0,0 +1,63 @@ +package com.detrav.net; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteStreams; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.common.network.internal.FMLProxyPacket; +import cpw.mods.fml.relauncher.Side; +import io.netty.buffer.Unpooled; +import io.netty.channel.ChannelHandler; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import io.netty.handler.codec.MessageToMessageCodec; +import net.minecraft.entity.player.EntityPlayerMP; + +import java.util.EnumMap; +import java.util.List; + +/** + * Created by wital_000 on 20.03.2016. + */ +@ChannelHandler.Sharable +public class DetravNetwork extends MessageToMessageCodec { + + static public DetravNetwork INSTANCE; + private final EnumMap mChannel; + private DetravPacket[] mSubChannels; + + public DetravNetwork() + { + INSTANCE = this; + this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", new ChannelHandler[]{this, new HandlerShared()}); + this.mSubChannels = new DetravPacket[]{new DetravProPickPacket01()}; + } + + @Override + protected void encode(ChannelHandlerContext ctx, DetravPacket msg, List out) throws Exception { + out.add(new FMLProxyPacket(Unpooled.buffer().writeByte(msg.getPacketID()).writeBytes(msg.encode()).copy(),(String) ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get())); + } + + @Override + protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List out) throws Exception { + ByteArrayDataInput aData = ByteStreams.newDataInput(msg.payload().array()); + out.add(this.mSubChannels[aData.readByte()].decode(aData)); + } + + public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) { + ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); + ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); + ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); + } + + @ChannelHandler.Sharable + static final class HandlerShared + extends SimpleChannelInboundHandler { + protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket) + throws Exception { + //EntityPlayer aPlayer = GT_Values.GT.getThePlayer(); + aPacket.process(); + } + } +} diff --git a/src/main/java/com/detrav/net/DetravPacket.java b/src/main/java/com/detrav/net/DetravPacket.java new file mode 100644 index 0000000000..a2b3697bac --- /dev/null +++ b/src/main/java/com/detrav/net/DetravPacket.java @@ -0,0 +1,17 @@ +package com.detrav.net; + +import com.google.common.io.ByteArrayDataInput; + +/** + * Created by wital_000 on 20.03.2016. + */ +public abstract class DetravPacket { + + public abstract int getPacketID() ; + + public abstract byte[] encode() ; + + public abstract Object decode(ByteArrayDataInput aData) ; + + public abstract void process(); +} diff --git a/src/main/java/com/detrav/net/DetravProPickPacket01.java b/src/main/java/com/detrav/net/DetravProPickPacket01.java new file mode 100644 index 0000000000..ad6aba226e --- /dev/null +++ b/src/main/java/com/detrav/net/DetravProPickPacket01.java @@ -0,0 +1,94 @@ +package com.detrav.net; + +import com.google.common.io.ByteArrayDataInput; +import com.google.common.io.ByteArrayDataOutput; +import com.google.common.io.ByteStreams; +import net.minecraft.client.Minecraft; +import net.minecraft.util.ChatComponentText; + +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[][] 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(); + 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() { + Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("NetworkTested: " + Integer.toString(level))); + } + + 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(); + map[aX][aZ].put((byte)y,metaData); + //String key = String.format(("x_y")) + } +} diff --git a/src/main/java/com/detrav/utils/DetravNetwork.java b/src/main/java/com/detrav/utils/DetravNetwork.java deleted file mode 100644 index 3b005ae8a0..0000000000 --- a/src/main/java/com/detrav/utils/DetravNetwork.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.detrav.utils; - -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteStreams; -import cpw.mods.fml.common.network.FMLEmbeddedChannel; -import cpw.mods.fml.common.network.FMLOutboundHandler; -import cpw.mods.fml.common.network.NetworkRegistry; -import cpw.mods.fml.common.network.internal.FMLProxyPacket; -import cpw.mods.fml.relauncher.Side; -import io.netty.buffer.Unpooled; -import io.netty.channel.ChannelHandler; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; -import io.netty.handler.codec.MessageToMessageCodec; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.player.EntityPlayerMP; - -import java.util.EnumMap; -import java.util.List; - -/** - * Created by wital_000 on 20.03.2016. - */ -@ChannelHandler.Sharable -public class DetravNetwork extends MessageToMessageCodec { - - static public DetravNetwork INSTANCE; - private final EnumMap mChannel; - private DetravPacket[] mSubChannels; - - public DetravNetwork() - { - INSTANCE = this; - this.mChannel = NetworkRegistry.INSTANCE.newChannel("DetravScanner", new ChannelHandler[]{this, new HandlerShared()}); - this.mSubChannels = new DetravPacket[]{new DetravProPickPacket01()}; - } - - @Override - protected void encode(ChannelHandlerContext ctx, DetravPacket msg, List out) throws Exception { - out.add(new FMLProxyPacket(Unpooled.buffer().writeByte(msg.getPacketID()).writeBytes(msg.encode()).copy(),(String) ctx.channel().attr(NetworkRegistry.FML_CHANNEL).get())); - } - - @Override - protected void decode(ChannelHandlerContext ctx, FMLProxyPacket msg, List out) throws Exception { - ByteArrayDataInput aData = ByteStreams.newDataInput(msg.payload().array()); - out.add(this.mSubChannels[aData.readByte()].decode(aData)); - } - - public void sendToPlayer(DetravPacket aPacket, EntityPlayerMP aPlayer) { - ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); - ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(aPlayer); - ((FMLEmbeddedChannel) this.mChannel.get(Side.SERVER)).writeAndFlush(aPacket); - } - - @ChannelHandler.Sharable - static final class HandlerShared - extends SimpleChannelInboundHandler { - protected void channelRead0(ChannelHandlerContext ctx, DetravPacket aPacket) - throws Exception { - //EntityPlayer aPlayer = GT_Values.GT.getThePlayer(); - aPacket.process(); - } - } -} diff --git a/src/main/java/com/detrav/utils/DetravPacket.java b/src/main/java/com/detrav/utils/DetravPacket.java deleted file mode 100644 index b1736ae928..0000000000 --- a/src/main/java/com/detrav/utils/DetravPacket.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.detrav.utils; - -import com.google.common.io.ByteArrayDataInput; - -/** - * Created by wital_000 on 20.03.2016. - */ -public abstract class DetravPacket { - - public abstract int getPacketID() ; - - public abstract byte[] encode() ; - - public abstract Object decode(ByteArrayDataInput aData) ; - - public abstract void process(); -} diff --git a/src/main/java/com/detrav/utils/DetravProPickPacket01.java b/src/main/java/com/detrav/utils/DetravProPickPacket01.java deleted file mode 100644 index b06de84037..0000000000 --- a/src/main/java/com/detrav/utils/DetravProPickPacket01.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.detrav.utils; - -import com.google.common.base.Strings; -import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; -import com.google.common.io.ByteStreams; -import net.minecraft.client.Minecraft; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.util.ChatComponentText; - -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[][] 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(); - 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() { - Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("NetworkTested: " + Integer.toString(level))); - } - - 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(); - map[aX][aZ].put((byte)y,metaData); - //String key = String.format(("x_y")) - } -} -- cgit