From a966c61b0a610d9064a9580765b3aebcf6cfb1b1 Mon Sep 17 00:00:00 2001 From: Sen Date: Thu, 5 Jun 2025 11:24:38 +0200 Subject: [PATCH] move classes --- proxy/src/main/java/proxy/Proxy.java | 38 +-- .../src/main/java/proxy/command/Command.java | 2 +- .../main/java/proxy/command/CommandAdmin.java | 2 +- .../java/proxy/command/CommandDelete.java | 2 +- .../main/java/proxy/command/CommandExit.java | 2 +- .../main/java/proxy/command/CommandHelp.java | 2 +- .../java/proxy/command/CommandRegister.java | 2 +- .../java/proxy/command/CommandRevoke.java | 2 +- .../proxy/{network => handler}/Handler.java | 4 +- .../HandshakeHandler.java | 4 +- .../{network => handler}/LoginHandler.java | 3 +- .../{network => handler}/ProxyHandler.java | 8 +- .../{network => handler}/StatusHandler.java | 3 +- ...ompressingEncoder.java => Compressor.java} | 4 +- .../main/java/proxy/network/Connection.java | 29 +-- .../{PacketDecoder.java => Decoder.java} | 6 +- ...pressingDecoder.java => Decompressor.java} | 4 +- .../{PacketDirection.java => Direction.java} | 2 +- .../{PacketEncoder.java => Encoder.java} | 6 +- proxy/src/main/java/proxy/network/Packet.java | 2 + .../main/java/proxy/network/PacketBuffer.java | 6 +- .../{PacketPrepender.java => Prepender.java} | 2 +- .../src/main/java/proxy/network/Protocol.java | 234 +++++++++--------- .../{PacketSplitter.java => Splitter.java} | 2 +- .../java/proxy/packet/C00PacketKeepAlive.java | 2 +- .../proxy/packet/C01PacketChatMessage.java | 2 +- .../java/proxy/packet/C02PacketUseEntity.java | 2 +- .../java/proxy/packet/C03PacketPlayer.java | 2 +- .../proxy/packet/C07PacketPlayerDigging.java | 3 +- .../packet/C08PacketPlayerBlockPlacement.java | 4 +- .../proxy/packet/C09PacketHeldItemChange.java | 2 +- .../java/proxy/packet/C0APacketAnimation.java | 2 +- .../proxy/packet/C0BPacketEntityAction.java | 2 +- .../java/proxy/packet/C0CPacketInput.java | 2 +- .../proxy/packet/C0DPacketCloseWindow.java | 2 +- .../proxy/packet/C0EPacketClickWindow.java | 3 +- .../packet/C0FPacketConfirmTransaction.java | 2 +- .../C10PacketCreativeInventoryAction.java | 3 +- .../proxy/packet/C11PacketEnchantItem.java | 2 +- .../proxy/packet/C12PacketUpdateSign.java | 3 +- .../packet/C13PacketPlayerAbilities.java | 2 +- .../proxy/packet/C14PacketTabComplete.java | 3 +- .../proxy/packet/C15PacketClientSettings.java | 2 +- .../proxy/packet/C16PacketClientStatus.java | 2 +- .../proxy/packet/C17PacketCustomPayload.java | 2 +- .../java/proxy/packet/C18PacketSpectate.java | 2 +- .../packet/C19PacketResourcePackStatus.java | 2 +- .../proxy/{util => packet}/EntityData.java | 2 +- .../proxy/packet/EntityIdPacketClient.java | 2 +- .../proxy/packet/EntityIdPacketServer.java | 2 +- .../java/proxy/packet/H00PacketHandshake.java | 2 +- .../proxy/packet/I00PacketServerInfo.java | 3 +- .../main/java/proxy/packet/I01PacketPong.java | 2 +- .../proxy/packet/L00PacketLoginStart.java | 2 +- .../packet/L01PacketEncryptionResponse.java | 2 +- .../main/java/proxy/{util => packet}/Nbt.java | 2 +- .../java/proxy/{util => packet}/Profile.java | 2 +- .../proxy/packet/Q00PacketServerQuery.java | 2 +- .../main/java/proxy/packet/Q01PacketPing.java | 2 +- .../proxy/packet/R00PacketDisconnect.java | 2 +- .../packet/R01PacketEncryptionRequest.java | 2 +- .../proxy/packet/R02PacketLoginSuccess.java | 2 +- .../packet/R03PacketEnableCompression.java | 2 +- .../java/proxy/packet/S00PacketKeepAlive.java | 2 +- .../java/proxy/packet/S01PacketJoinGame.java | 2 +- .../main/java/proxy/packet/S02PacketChat.java | 2 +- .../proxy/packet/S03PacketTimeUpdate.java | 2 +- .../packet/S04PacketEntityEquipment.java | 3 +- .../proxy/packet/S05PacketSpawnPosition.java | 3 +- .../proxy/packet/S06PacketUpdateHealth.java | 2 +- .../java/proxy/packet/S07PacketRespawn.java | 2 +- .../proxy/packet/S08PacketPlayerPosLook.java | 2 +- .../proxy/packet/S09PacketHeldItemChange.java | 2 +- .../java/proxy/packet/S0APacketUseBed.java | 3 +- .../java/proxy/packet/S0BPacketAnimation.java | 2 +- .../proxy/packet/S0CPacketSpawnPlayer.java | 3 +- .../proxy/packet/S0DPacketCollectItem.java | 2 +- .../proxy/packet/S0EPacketSpawnObject.java | 2 +- .../java/proxy/packet/S0FPacketSpawnMob.java | 3 +- .../proxy/packet/S10PacketSpawnPainting.java | 3 +- .../packet/S11PacketSpawnExperienceOrb.java | 2 +- .../proxy/packet/S12PacketEntityVelocity.java | 2 +- .../packet/S13PacketDestroyEntities.java | 2 +- .../java/proxy/packet/S14PacketEntity.java | 2 +- .../proxy/packet/S18PacketEntityTeleport.java | 2 +- .../proxy/packet/S19PacketEntityHeadLook.java | 2 +- .../proxy/packet/S19PacketEntityStatus.java | 2 +- .../proxy/packet/S1BPacketEntityAttach.java | 2 +- .../proxy/packet/S1CPacketEntityMetadata.java | 3 +- .../proxy/packet/S1DPacketEntityEffect.java | 2 +- .../packet/S1EPacketRemoveEntityEffect.java | 2 +- .../proxy/packet/S1FPacketSetExperience.java | 2 +- .../packet/S20PacketEntityProperties.java | 2 +- .../java/proxy/packet/S21PacketChunkData.java | 2 +- .../packet/S22PacketMultiBlockChange.java | 2 +- .../proxy/packet/S23PacketBlockChange.java | 3 +- .../proxy/packet/S24PacketBlockAction.java | 3 +- .../proxy/packet/S25PacketBlockBreakAnim.java | 3 +- .../proxy/packet/S26PacketMapChunkBulk.java | 2 +- .../java/proxy/packet/S27PacketExplosion.java | 3 +- .../java/proxy/packet/S28PacketEffect.java | 3 +- .../proxy/packet/S29PacketSoundEffect.java | 2 +- .../java/proxy/packet/S2APacketParticles.java | 2 +- .../packet/S2BPacketChangeGameState.java | 2 +- .../packet/S2CPacketSpawnGlobalEntity.java | 2 +- .../proxy/packet/S2DPacketOpenWindow.java | 2 +- .../proxy/packet/S2EPacketCloseWindow.java | 2 +- .../java/proxy/packet/S2FPacketSetSlot.java | 3 +- .../proxy/packet/S30PacketWindowItems.java | 3 +- .../proxy/packet/S31PacketWindowProperty.java | 2 +- .../packet/S32PacketConfirmTransaction.java | 2 +- .../proxy/packet/S33PacketUpdateSign.java | 3 +- .../main/java/proxy/packet/S34PacketMaps.java | 2 +- .../packet/S35PacketUpdateTileEntity.java | 3 +- .../proxy/packet/S36PacketSignEditorOpen.java | 3 +- .../proxy/packet/S37PacketStatistics.java | 2 +- .../proxy/packet/S38PacketPlayerListItem.java | 5 +- .../packet/S39PacketPlayerAbilities.java | 2 +- .../proxy/packet/S3APacketTabComplete.java | 2 +- .../packet/S3BPacketScoreboardObjective.java | 2 +- .../proxy/packet/S3CPacketUpdateScore.java | 2 +- .../packet/S3DPacketDisplayScoreboard.java | 2 +- .../java/proxy/packet/S3EPacketTeams.java | 2 +- .../proxy/packet/S3FPacketCustomPayload.java | 2 +- .../proxy/packet/S40PacketDisconnect.java | 2 +- .../packet/S41PacketServerDifficulty.java | 2 +- .../proxy/packet/S42PacketCombatEvent.java | 2 +- .../java/proxy/packet/S43PacketCamera.java | 2 +- .../proxy/packet/S44PacketWorldBorder.java | 2 +- .../java/proxy/packet/S45PacketTitle.java | 2 +- .../packet/S46PacketSetCompressionLevel.java | 2 +- .../S47PacketPlayerListHeaderFooter.java | 2 +- .../packet/S48PacketResourcePackSend.java | 2 +- .../packet/S49PacketUpdateEntityNBT.java | 2 +- .../proxy/{util => packet}/ServerInfo.java | 2 +- .../java/proxy/{util => packet}/Stack.java | 2 +- .../java/proxy/{util => packet}/Vec3.java | 2 +- .../src/main/java/proxy/util/LazyLoader.java | 4 +- 138 files changed, 311 insertions(+), 318 deletions(-) rename proxy/src/main/java/proxy/{network => handler}/Handler.java (91%) rename proxy/src/main/java/proxy/{network => handler}/HandshakeHandler.java (94%) rename proxy/src/main/java/proxy/{network => handler}/LoginHandler.java (98%) rename proxy/src/main/java/proxy/{network => handler}/ProxyHandler.java (99%) rename proxy/src/main/java/proxy/{network => handler}/StatusHandler.java (94%) rename proxy/src/main/java/proxy/network/{CompressingEncoder.java => Compressor.java} (92%) rename proxy/src/main/java/proxy/network/{PacketDecoder.java => Decoder.java} (90%) rename proxy/src/main/java/proxy/network/{CompressingDecoder.java => Decompressor.java} (94%) rename proxy/src/main/java/proxy/network/{PacketDirection.java => Direction.java} (58%) rename proxy/src/main/java/proxy/network/{PacketEncoder.java => Encoder.java} (86%) rename proxy/src/main/java/proxy/network/{PacketPrepender.java => Prepender.java} (92%) rename proxy/src/main/java/proxy/network/{PacketSplitter.java => Splitter.java} (96%) rename proxy/src/main/java/proxy/{util => packet}/EntityData.java (99%) rename proxy/src/main/java/proxy/{util => packet}/Nbt.java (99%) rename proxy/src/main/java/proxy/{util => packet}/Profile.java (98%) rename proxy/src/main/java/proxy/{util => packet}/ServerInfo.java (98%) rename proxy/src/main/java/proxy/{util => packet}/Stack.java (96%) rename proxy/src/main/java/proxy/{util => packet}/Vec3.java (96%) diff --git a/proxy/src/main/java/proxy/Proxy.java b/proxy/src/main/java/proxy/Proxy.java index 60fa6cf..3ee3b92 100755 --- a/proxy/src/main/java/proxy/Proxy.java +++ b/proxy/src/main/java/proxy/Proxy.java @@ -54,19 +54,19 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFutureTask; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import proxy.network.PacketDirection; -import proxy.network.PacketDecoder; -import proxy.network.PacketSplitter; -import proxy.network.PacketEncoder; -import proxy.network.PacketPrepender; -import proxy.network.Handler.ThreadQuickExitException; -import proxy.network.HandshakeHandler; -import proxy.network.ProxyHandler; +import proxy.network.Direction; +import proxy.network.Decoder; +import proxy.network.Splitter; +import proxy.network.Encoder; +import proxy.network.Prepender; import proxy.command.*; +import proxy.handler.HandshakeHandler; +import proxy.handler.ProxyHandler; +import proxy.handler.Handler.ThreadQuickExitException; import proxy.network.Connection; import proxy.packet.S40PacketDisconnect; +import proxy.packet.ServerInfo; import proxy.util.Formatter; -import proxy.util.ServerInfo; import proxy.util.User; import proxy.util.LazyLoader; import proxy.util.Log; @@ -95,7 +95,7 @@ public class Proxy { private final Thread serverThread; private int compression = -1; - private boolean epoll = false; + private boolean epoll = true; private boolean register = true; private boolean checkCase = true; private boolean kickOnConnect = true; @@ -105,6 +105,8 @@ public class Proxy { private int proxyPort = 25564; private int minPassLength = 8; private int maxAttempts = 5; + private int maxPlayers = 64; + private ServerInfo status = getStatus(new File("icon.png"), Formatter.AQUA + "Server\n" + Formatter.GREEN + "Test!!", 90, 10, "Test1", "Test2 ...", "Test #3 !!"); @@ -251,16 +253,16 @@ public class Proxy { } p_initChannel_1_.pipeline().addLast((String)"timeout", (ChannelHandler)(new ReadTimeoutHandler(30))) - .addLast((String)"splitter", (ChannelHandler)(new PacketSplitter())) - .addLast((String)"decoder", (ChannelHandler)(new PacketDecoder(PacketDirection.SERVER))) - .addLast((String)"prepender", (ChannelHandler)(new PacketPrepender())) - .addLast((String)"encoder", (ChannelHandler)(new PacketEncoder(PacketDirection.CLIENT))); - Connection networkmanager = new Connection(PacketDirection.SERVER); + .addLast((String)"splitter", (ChannelHandler)(new Splitter())) + .addLast((String)"decoder", (ChannelHandler)(new Decoder(Direction.SERVER))) + .addLast((String)"prepender", (ChannelHandler)(new Prepender())) + .addLast((String)"encoder", (ChannelHandler)(new Encoder(Direction.CLIENT))); + Connection networkmanager = new Connection(Direction.SERVER); Proxy.this.networkManagers.add(networkmanager); p_initChannel_1_.pipeline().addLast((String)"packet_handler", (ChannelHandler)networkmanager); networkmanager.setNetHandler(new HandshakeHandler(Proxy.this, networkmanager)); } - }).group((EventLoopGroup)lazyloadbase.getValue()).localAddress(address, port)).bind().syncUninterruptibly()); + }).group(lazyloadbase.getValue()).localAddress(address, port)).bind().syncUninterruptibly()); } } @@ -375,6 +377,10 @@ public class Proxy { public int getMaximumPasswordAttempts() { return this.maxAttempts; } + + public int getMaximumPlayers() { + return this.maxPlayers; + } public User getUser(String user) { return this.users.get(user.toLowerCase(Locale.US)); diff --git a/proxy/src/main/java/proxy/command/Command.java b/proxy/src/main/java/proxy/command/Command.java index a6d72ab..c7e5c74 100644 --- a/proxy/src/main/java/proxy/command/Command.java +++ b/proxy/src/main/java/proxy/command/Command.java @@ -1,7 +1,7 @@ package proxy.command; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; import proxy.util.Log; diff --git a/proxy/src/main/java/proxy/command/CommandAdmin.java b/proxy/src/main/java/proxy/command/CommandAdmin.java index 6b1573b..68395dc 100644 --- a/proxy/src/main/java/proxy/command/CommandAdmin.java +++ b/proxy/src/main/java/proxy/command/CommandAdmin.java @@ -3,7 +3,7 @@ package proxy.command; import com.google.common.collect.Collections2; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; import proxy.util.User; diff --git a/proxy/src/main/java/proxy/command/CommandDelete.java b/proxy/src/main/java/proxy/command/CommandDelete.java index 16b8829..7df2c86 100644 --- a/proxy/src/main/java/proxy/command/CommandDelete.java +++ b/proxy/src/main/java/proxy/command/CommandDelete.java @@ -3,7 +3,7 @@ package proxy.command; import com.google.common.collect.Collections2; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.User; public class CommandDelete extends Command { diff --git a/proxy/src/main/java/proxy/command/CommandExit.java b/proxy/src/main/java/proxy/command/CommandExit.java index ffc1860..f011b75 100644 --- a/proxy/src/main/java/proxy/command/CommandExit.java +++ b/proxy/src/main/java/proxy/command/CommandExit.java @@ -3,7 +3,7 @@ package proxy.command; import com.google.common.collect.Lists; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; public class CommandExit extends Command { diff --git a/proxy/src/main/java/proxy/command/CommandHelp.java b/proxy/src/main/java/proxy/command/CommandHelp.java index 9d1cc23..48f2d21 100644 --- a/proxy/src/main/java/proxy/command/CommandHelp.java +++ b/proxy/src/main/java/proxy/command/CommandHelp.java @@ -3,7 +3,7 @@ package proxy.command; import java.util.Locale; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; public class CommandHelp extends Command { diff --git a/proxy/src/main/java/proxy/command/CommandRegister.java b/proxy/src/main/java/proxy/command/CommandRegister.java index f4c5ed5..5b29011 100644 --- a/proxy/src/main/java/proxy/command/CommandRegister.java +++ b/proxy/src/main/java/proxy/command/CommandRegister.java @@ -1,7 +1,7 @@ package proxy.command; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; import proxy.util.User; diff --git a/proxy/src/main/java/proxy/command/CommandRevoke.java b/proxy/src/main/java/proxy/command/CommandRevoke.java index 168289c..bc94f8d 100644 --- a/proxy/src/main/java/proxy/command/CommandRevoke.java +++ b/proxy/src/main/java/proxy/command/CommandRevoke.java @@ -1,7 +1,7 @@ package proxy.command; import proxy.Proxy; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.util.Formatter; import proxy.util.User; diff --git a/proxy/src/main/java/proxy/network/Handler.java b/proxy/src/main/java/proxy/handler/Handler.java similarity index 91% rename from proxy/src/main/java/proxy/network/Handler.java rename to proxy/src/main/java/proxy/handler/Handler.java index 3ef1957..0dcbaa1 100755 --- a/proxy/src/main/java/proxy/network/Handler.java +++ b/proxy/src/main/java/proxy/handler/Handler.java @@ -1,6 +1,8 @@ -package proxy.network; +package proxy.handler; import proxy.Proxy; +import proxy.network.Connection; +import proxy.network.Packet; public interface Handler { public static final class ThreadQuickExitException extends RuntimeException { diff --git a/proxy/src/main/java/proxy/network/HandshakeHandler.java b/proxy/src/main/java/proxy/handler/HandshakeHandler.java similarity index 94% rename from proxy/src/main/java/proxy/network/HandshakeHandler.java rename to proxy/src/main/java/proxy/handler/HandshakeHandler.java index 824b69a..bc44719 100755 --- a/proxy/src/main/java/proxy/network/HandshakeHandler.java +++ b/proxy/src/main/java/proxy/handler/HandshakeHandler.java @@ -1,6 +1,8 @@ -package proxy.network; +package proxy.handler; import proxy.Proxy; +import proxy.network.Connection; +import proxy.network.Protocol; import proxy.packet.H00PacketHandshake; import proxy.packet.R00PacketDisconnect; diff --git a/proxy/src/main/java/proxy/network/LoginHandler.java b/proxy/src/main/java/proxy/handler/LoginHandler.java similarity index 98% rename from proxy/src/main/java/proxy/network/LoginHandler.java rename to proxy/src/main/java/proxy/handler/LoginHandler.java index 0c251cf..1aeda28 100755 --- a/proxy/src/main/java/proxy/network/LoginHandler.java +++ b/proxy/src/main/java/proxy/handler/LoginHandler.java @@ -1,8 +1,9 @@ -package proxy.network; +package proxy.handler; import io.netty.channel.ChannelFuture; import io.netty.channel.ChannelFutureListener; import proxy.Proxy; +import proxy.network.Connection; import proxy.packet.L00PacketLoginStart; import proxy.packet.L01PacketEncryptionResponse; import proxy.packet.R00PacketDisconnect; diff --git a/proxy/src/main/java/proxy/network/ProxyHandler.java b/proxy/src/main/java/proxy/handler/ProxyHandler.java similarity index 99% rename from proxy/src/main/java/proxy/network/ProxyHandler.java rename to proxy/src/main/java/proxy/handler/ProxyHandler.java index 5972107..d89a51a 100755 --- a/proxy/src/main/java/proxy/network/ProxyHandler.java +++ b/proxy/src/main/java/proxy/handler/ProxyHandler.java @@ -1,4 +1,4 @@ -package proxy.network; +package proxy.handler; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; @@ -16,12 +16,14 @@ import com.google.common.collect.Lists; import proxy.Proxy; import proxy.command.Command; +import proxy.network.Connection; +import proxy.network.Packet; +import proxy.network.PacketBuffer; +import proxy.network.Protocol; import proxy.packet.*; import proxy.util.Formatter; import proxy.util.User; -import proxy.util.Stack; import proxy.util.Log; -import proxy.util.Nbt; public class ProxyHandler extends User implements Handler { public class ProxyLoginHandler implements Handler { diff --git a/proxy/src/main/java/proxy/network/StatusHandler.java b/proxy/src/main/java/proxy/handler/StatusHandler.java similarity index 94% rename from proxy/src/main/java/proxy/network/StatusHandler.java rename to proxy/src/main/java/proxy/handler/StatusHandler.java index cd21baa..b5606b3 100755 --- a/proxy/src/main/java/proxy/network/StatusHandler.java +++ b/proxy/src/main/java/proxy/handler/StatusHandler.java @@ -1,6 +1,7 @@ -package proxy.network; +package proxy.handler; import proxy.Proxy; +import proxy.network.Connection; import proxy.packet.I00PacketServerInfo; import proxy.packet.I01PacketPong; import proxy.packet.Q00PacketServerQuery; diff --git a/proxy/src/main/java/proxy/network/CompressingEncoder.java b/proxy/src/main/java/proxy/network/Compressor.java similarity index 92% rename from proxy/src/main/java/proxy/network/CompressingEncoder.java rename to proxy/src/main/java/proxy/network/Compressor.java index 68918ed..9eb2ece 100755 --- a/proxy/src/main/java/proxy/network/CompressingEncoder.java +++ b/proxy/src/main/java/proxy/network/Compressor.java @@ -5,13 +5,13 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; import java.util.zip.Deflater; -public class CompressingEncoder extends MessageToByteEncoder +public class Compressor extends MessageToByteEncoder { private final byte[] buffer = new byte[8192]; private final Deflater deflater; private int treshold; - public CompressingEncoder(int treshold) + public Compressor(int treshold) { this.treshold = treshold; this.deflater = new Deflater(); diff --git a/proxy/src/main/java/proxy/network/Connection.java b/proxy/src/main/java/proxy/network/Connection.java index e090240..fff5d37 100755 --- a/proxy/src/main/java/proxy/network/Connection.java +++ b/proxy/src/main/java/proxy/network/Connection.java @@ -29,7 +29,8 @@ import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.locks.ReentrantReadWriteLock; import com.google.common.util.concurrent.ThreadFactoryBuilder; -import proxy.network.Handler.ThreadQuickExitException; +import proxy.handler.Handler; +import proxy.handler.Handler.ThreadQuickExitException; import proxy.util.LazyLoader; import proxy.util.Log; @@ -50,7 +51,7 @@ public class Connection extends SimpleChannelInboundHandler return new EpollEventLoopGroup(0, (new ThreadFactoryBuilder()).setNameFormat("Netty Epoll Client IO #%d").setDaemon(true).build()); } }; - private final PacketDirection direction; + private final Direction direction; private final Queue outboundPacketsQueue = new ConcurrentLinkedQueue(); private final ReentrantReadWriteLock readWriteLock = new ReentrantReadWriteLock(); @@ -60,7 +61,7 @@ public class Connection extends SimpleChannelInboundHandler private String exitMessage; private boolean disconnected; - public Connection(PacketDirection direction) + public Connection(Direction direction) { this.direction = direction; } @@ -299,7 +300,7 @@ public class Connection extends SimpleChannelInboundHandler */ public static Connection createNetworkManagerAndConnect(InetAddress address, int serverPort, boolean useNativeTransport) { - final Connection networkmanager = new Connection(PacketDirection.CLIENT); + final Connection networkmanager = new Connection(Direction.CLIENT); Class oclass; LazyLoader lazyloadbase; @@ -314,7 +315,7 @@ public class Connection extends SimpleChannelInboundHandler lazyloadbase = CLIENT_NIO_EVENTLOOP; } - ((Bootstrap)((Bootstrap)((Bootstrap)(new Bootstrap()).group((EventLoopGroup)lazyloadbase.getValue())).handler(new ChannelInitializer() + ((Bootstrap)((Bootstrap)((Bootstrap)(new Bootstrap()).group(lazyloadbase.getValue())).handler(new ChannelInitializer() { protected void initChannel(Channel p_initChannel_1_) throws Exception { @@ -327,7 +328,7 @@ public class Connection extends SimpleChannelInboundHandler ; } - p_initChannel_1_.pipeline().addLast((String)"timeout", (ChannelHandler)(new ReadTimeoutHandler(30))).addLast((String)"splitter", (ChannelHandler)(new PacketSplitter())).addLast((String)"decoder", (ChannelHandler)(new PacketDecoder(PacketDirection.CLIENT))).addLast((String)"prepender", (ChannelHandler)(new PacketPrepender())).addLast((String)"encoder", (ChannelHandler)(new PacketEncoder(PacketDirection.SERVER))).addLast((String)"packet_handler", (ChannelHandler)networkmanager); + p_initChannel_1_.pipeline().addLast((String)"timeout", (ChannelHandler)(new ReadTimeoutHandler(30))).addLast((String)"splitter", (ChannelHandler)(new Splitter())).addLast((String)"decoder", (ChannelHandler)(new Decoder(Direction.CLIENT))).addLast((String)"prepender", (ChannelHandler)(new Prepender())).addLast((String)"encoder", (ChannelHandler)(new Encoder(Direction.SERVER))).addLast((String)"packet_handler", (ChannelHandler)networkmanager); } })).channel(oclass)).connect(address, serverPort).syncUninterruptibly(); return networkmanager; @@ -371,32 +372,32 @@ public class Connection extends SimpleChannelInboundHandler { if (treshold >= 0) { - if (this.channel.pipeline().get("decompress") instanceof CompressingDecoder) + if (this.channel.pipeline().get("decompress") instanceof Decompressor) { - ((CompressingDecoder)this.channel.pipeline().get("decompress")).setCompressionTreshold(treshold); + ((Decompressor)this.channel.pipeline().get("decompress")).setCompressionTreshold(treshold); } else { - this.channel.pipeline().addBefore("decoder", "decompress", new CompressingDecoder(treshold)); + this.channel.pipeline().addBefore("decoder", "decompress", new Decompressor(treshold)); } - if (this.channel.pipeline().get("compress") instanceof CompressingEncoder) + if (this.channel.pipeline().get("compress") instanceof Compressor) { - ((CompressingEncoder)this.channel.pipeline().get("decompress")).setCompressionTreshold(treshold); + ((Compressor)this.channel.pipeline().get("decompress")).setCompressionTreshold(treshold); } else { - this.channel.pipeline().addBefore("encoder", "compress", new CompressingEncoder(treshold)); + this.channel.pipeline().addBefore("encoder", "compress", new Compressor(treshold)); } } else { - if (this.channel.pipeline().get("decompress") instanceof CompressingDecoder) + if (this.channel.pipeline().get("decompress") instanceof Decompressor) { this.channel.pipeline().remove("decompress"); } - if (this.channel.pipeline().get("compress") instanceof CompressingEncoder) + if (this.channel.pipeline().get("compress") instanceof Compressor) { this.channel.pipeline().remove("compress"); } diff --git a/proxy/src/main/java/proxy/network/PacketDecoder.java b/proxy/src/main/java/proxy/network/Decoder.java similarity index 90% rename from proxy/src/main/java/proxy/network/PacketDecoder.java rename to proxy/src/main/java/proxy/network/Decoder.java index f7de6c1..f701c5c 100755 --- a/proxy/src/main/java/proxy/network/PacketDecoder.java +++ b/proxy/src/main/java/proxy/network/Decoder.java @@ -6,11 +6,11 @@ import io.netty.handler.codec.ByteToMessageDecoder; import java.io.IOException; import java.util.List; -public class PacketDecoder extends ByteToMessageDecoder +public class Decoder extends ByteToMessageDecoder { - private final PacketDirection direction; + private final Direction direction; - public PacketDecoder(PacketDirection direction) + public Decoder(Direction direction) { this.direction = direction; } diff --git a/proxy/src/main/java/proxy/network/CompressingDecoder.java b/proxy/src/main/java/proxy/network/Decompressor.java similarity index 94% rename from proxy/src/main/java/proxy/network/CompressingDecoder.java rename to proxy/src/main/java/proxy/network/Decompressor.java index ff7f2e9..ec5cc48 100755 --- a/proxy/src/main/java/proxy/network/CompressingDecoder.java +++ b/proxy/src/main/java/proxy/network/Decompressor.java @@ -9,12 +9,12 @@ import java.util.List; import java.util.zip.DataFormatException; import java.util.zip.Inflater; -public class CompressingDecoder extends ByteToMessageDecoder +public class Decompressor extends ByteToMessageDecoder { private final Inflater inflater; private int treshold; - public CompressingDecoder(int treshold) + public Decompressor(int treshold) { this.treshold = treshold; this.inflater = new Inflater(); diff --git a/proxy/src/main/java/proxy/network/PacketDirection.java b/proxy/src/main/java/proxy/network/Direction.java similarity index 58% rename from proxy/src/main/java/proxy/network/PacketDirection.java rename to proxy/src/main/java/proxy/network/Direction.java index 3eb6695..77671e1 100755 --- a/proxy/src/main/java/proxy/network/PacketDirection.java +++ b/proxy/src/main/java/proxy/network/Direction.java @@ -1,5 +1,5 @@ package proxy.network; -public enum PacketDirection { +public enum Direction { SERVER, CLIENT; } diff --git a/proxy/src/main/java/proxy/network/PacketEncoder.java b/proxy/src/main/java/proxy/network/Encoder.java similarity index 86% rename from proxy/src/main/java/proxy/network/PacketEncoder.java rename to proxy/src/main/java/proxy/network/Encoder.java index e082234..c4432e1 100755 --- a/proxy/src/main/java/proxy/network/PacketEncoder.java +++ b/proxy/src/main/java/proxy/network/Encoder.java @@ -7,11 +7,11 @@ import proxy.util.Log; import java.io.IOException; -public class PacketEncoder extends MessageToByteEncoder +public class Encoder extends MessageToByteEncoder { - private final PacketDirection direction; + private final Direction direction; - public PacketEncoder(PacketDirection direction) + public Encoder(Direction direction) { this.direction = direction; } diff --git a/proxy/src/main/java/proxy/network/Packet.java b/proxy/src/main/java/proxy/network/Packet.java index b674712..86711ec 100755 --- a/proxy/src/main/java/proxy/network/Packet.java +++ b/proxy/src/main/java/proxy/network/Packet.java @@ -2,6 +2,8 @@ package proxy.network; import java.io.IOException; +import proxy.handler.Handler; + public interface Packet { void readPacketData(PacketBuffer buf) throws IOException; void writePacketData(PacketBuffer buf) throws IOException; diff --git a/proxy/src/main/java/proxy/network/PacketBuffer.java b/proxy/src/main/java/proxy/network/PacketBuffer.java index 92bbdf6..ef81104 100755 --- a/proxy/src/main/java/proxy/network/PacketBuffer.java +++ b/proxy/src/main/java/proxy/network/PacketBuffer.java @@ -19,9 +19,9 @@ import java.nio.charset.Charset; import java.util.Map; import java.util.UUID; -import proxy.util.Vec3; -import proxy.util.Nbt; -import proxy.util.Stack; +import proxy.packet.Nbt; +import proxy.packet.Stack; +import proxy.packet.Vec3; public class PacketBuffer extends ByteBuf { diff --git a/proxy/src/main/java/proxy/network/PacketPrepender.java b/proxy/src/main/java/proxy/network/Prepender.java similarity index 92% rename from proxy/src/main/java/proxy/network/PacketPrepender.java rename to proxy/src/main/java/proxy/network/Prepender.java index d747b64..2b260ca 100755 --- a/proxy/src/main/java/proxy/network/PacketPrepender.java +++ b/proxy/src/main/java/proxy/network/Prepender.java @@ -4,7 +4,7 @@ import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToByteEncoder; -public class PacketPrepender extends MessageToByteEncoder +public class Prepender extends MessageToByteEncoder { protected void encode(ChannelHandlerContext p_encode_1_, ByteBuf p_encode_2_, ByteBuf p_encode_3_) throws Exception { diff --git a/proxy/src/main/java/proxy/network/Protocol.java b/proxy/src/main/java/proxy/network/Protocol.java index 04e55a2..0557e4e 100755 --- a/proxy/src/main/java/proxy/network/Protocol.java +++ b/proxy/src/main/java/proxy/network/Protocol.java @@ -15,132 +15,132 @@ public enum Protocol HANDSHAKE(-1) { { - this.registerPacket(PacketDirection.SERVER, H00PacketHandshake.class); + this.registerPacket(Direction.SERVER, H00PacketHandshake.class); } }, PLAY(0) { { - this.registerPacket(PacketDirection.CLIENT, S00PacketKeepAlive.class); - this.registerPacket(PacketDirection.CLIENT, S01PacketJoinGame.class); - this.registerPacket(PacketDirection.CLIENT, S02PacketChat.class); - this.registerPacket(PacketDirection.CLIENT, S03PacketTimeUpdate.class); - this.registerPacket(PacketDirection.CLIENT, S04PacketEntityEquipment.class); - this.registerPacket(PacketDirection.CLIENT, S05PacketSpawnPosition.class); - this.registerPacket(PacketDirection.CLIENT, S06PacketUpdateHealth.class); - this.registerPacket(PacketDirection.CLIENT, S07PacketRespawn.class); - this.registerPacket(PacketDirection.CLIENT, S08PacketPlayerPosLook.class); - this.registerPacket(PacketDirection.CLIENT, S09PacketHeldItemChange.class); - this.registerPacket(PacketDirection.CLIENT, S0APacketUseBed.class); - this.registerPacket(PacketDirection.CLIENT, S0BPacketAnimation.class); - this.registerPacket(PacketDirection.CLIENT, S0CPacketSpawnPlayer.class); - this.registerPacket(PacketDirection.CLIENT, S0DPacketCollectItem.class); - this.registerPacket(PacketDirection.CLIENT, S0EPacketSpawnObject.class); - this.registerPacket(PacketDirection.CLIENT, S0FPacketSpawnMob.class); - this.registerPacket(PacketDirection.CLIENT, S10PacketSpawnPainting.class); - this.registerPacket(PacketDirection.CLIENT, S11PacketSpawnExperienceOrb.class); - this.registerPacket(PacketDirection.CLIENT, S12PacketEntityVelocity.class); - this.registerPacket(PacketDirection.CLIENT, S13PacketDestroyEntities.class); - this.registerPacket(PacketDirection.CLIENT, S14PacketEntity.class); - this.registerPacket(PacketDirection.CLIENT, S14PacketEntity.S15PacketEntityRelMove.class); - this.registerPacket(PacketDirection.CLIENT, S14PacketEntity.S16PacketEntityLook.class); - this.registerPacket(PacketDirection.CLIENT, S14PacketEntity.S17PacketEntityLookMove.class); - this.registerPacket(PacketDirection.CLIENT, S18PacketEntityTeleport.class); - this.registerPacket(PacketDirection.CLIENT, S19PacketEntityHeadLook.class); - this.registerPacket(PacketDirection.CLIENT, S19PacketEntityStatus.class); - this.registerPacket(PacketDirection.CLIENT, S1BPacketEntityAttach.class); - this.registerPacket(PacketDirection.CLIENT, S1CPacketEntityMetadata.class); - this.registerPacket(PacketDirection.CLIENT, S1DPacketEntityEffect.class); - this.registerPacket(PacketDirection.CLIENT, S1EPacketRemoveEntityEffect.class); - this.registerPacket(PacketDirection.CLIENT, S1FPacketSetExperience.class); - this.registerPacket(PacketDirection.CLIENT, S20PacketEntityProperties.class); - this.registerPacket(PacketDirection.CLIENT, S21PacketChunkData.class); - this.registerPacket(PacketDirection.CLIENT, S22PacketMultiBlockChange.class); - this.registerPacket(PacketDirection.CLIENT, S23PacketBlockChange.class); - this.registerPacket(PacketDirection.CLIENT, S24PacketBlockAction.class); - this.registerPacket(PacketDirection.CLIENT, S25PacketBlockBreakAnim.class); - this.registerPacket(PacketDirection.CLIENT, S26PacketMapChunkBulk.class); - this.registerPacket(PacketDirection.CLIENT, S27PacketExplosion.class); - this.registerPacket(PacketDirection.CLIENT, S28PacketEffect.class); - this.registerPacket(PacketDirection.CLIENT, S29PacketSoundEffect.class); - this.registerPacket(PacketDirection.CLIENT, S2APacketParticles.class); - this.registerPacket(PacketDirection.CLIENT, S2BPacketChangeGameState.class); - this.registerPacket(PacketDirection.CLIENT, S2CPacketSpawnGlobalEntity.class); - this.registerPacket(PacketDirection.CLIENT, S2DPacketOpenWindow.class); - this.registerPacket(PacketDirection.CLIENT, S2EPacketCloseWindow.class); - this.registerPacket(PacketDirection.CLIENT, S2FPacketSetSlot.class); - this.registerPacket(PacketDirection.CLIENT, S30PacketWindowItems.class); - this.registerPacket(PacketDirection.CLIENT, S31PacketWindowProperty.class); - this.registerPacket(PacketDirection.CLIENT, S32PacketConfirmTransaction.class); - this.registerPacket(PacketDirection.CLIENT, S33PacketUpdateSign.class); - this.registerPacket(PacketDirection.CLIENT, S34PacketMaps.class); - this.registerPacket(PacketDirection.CLIENT, S35PacketUpdateTileEntity.class); - this.registerPacket(PacketDirection.CLIENT, S36PacketSignEditorOpen.class); - this.registerPacket(PacketDirection.CLIENT, S37PacketStatistics.class); - this.registerPacket(PacketDirection.CLIENT, S38PacketPlayerListItem.class); - this.registerPacket(PacketDirection.CLIENT, S39PacketPlayerAbilities.class); - this.registerPacket(PacketDirection.CLIENT, S3APacketTabComplete.class); - this.registerPacket(PacketDirection.CLIENT, S3BPacketScoreboardObjective.class); - this.registerPacket(PacketDirection.CLIENT, S3CPacketUpdateScore.class); - this.registerPacket(PacketDirection.CLIENT, S3DPacketDisplayScoreboard.class); - this.registerPacket(PacketDirection.CLIENT, S3EPacketTeams.class); - this.registerPacket(PacketDirection.CLIENT, S3FPacketCustomPayload.class); - this.registerPacket(PacketDirection.CLIENT, S40PacketDisconnect.class); - this.registerPacket(PacketDirection.CLIENT, S41PacketServerDifficulty.class); - this.registerPacket(PacketDirection.CLIENT, S42PacketCombatEvent.class); - this.registerPacket(PacketDirection.CLIENT, S43PacketCamera.class); - this.registerPacket(PacketDirection.CLIENT, S44PacketWorldBorder.class); - this.registerPacket(PacketDirection.CLIENT, S45PacketTitle.class); - this.registerPacket(PacketDirection.CLIENT, S46PacketSetCompressionLevel.class); - this.registerPacket(PacketDirection.CLIENT, S47PacketPlayerListHeaderFooter.class); - this.registerPacket(PacketDirection.CLIENT, S48PacketResourcePackSend.class); - this.registerPacket(PacketDirection.CLIENT, S49PacketUpdateEntityNBT.class); - this.registerPacket(PacketDirection.SERVER, C00PacketKeepAlive.class); - this.registerPacket(PacketDirection.SERVER, C01PacketChatMessage.class); - this.registerPacket(PacketDirection.SERVER, C02PacketUseEntity.class); - this.registerPacket(PacketDirection.SERVER, C03PacketPlayer.class); - this.registerPacket(PacketDirection.SERVER, C03PacketPlayer.C04PacketPlayerPosition.class); - this.registerPacket(PacketDirection.SERVER, C03PacketPlayer.C05PacketPlayerLook.class); - this.registerPacket(PacketDirection.SERVER, C03PacketPlayer.C06PacketPlayerPosLook.class); - this.registerPacket(PacketDirection.SERVER, C07PacketPlayerDigging.class); - this.registerPacket(PacketDirection.SERVER, C08PacketPlayerBlockPlacement.class); - this.registerPacket(PacketDirection.SERVER, C09PacketHeldItemChange.class); - this.registerPacket(PacketDirection.SERVER, C0APacketAnimation.class); - this.registerPacket(PacketDirection.SERVER, C0BPacketEntityAction.class); - this.registerPacket(PacketDirection.SERVER, C0CPacketInput.class); - this.registerPacket(PacketDirection.SERVER, C0DPacketCloseWindow.class); - this.registerPacket(PacketDirection.SERVER, C0EPacketClickWindow.class); - this.registerPacket(PacketDirection.SERVER, C0FPacketConfirmTransaction.class); - this.registerPacket(PacketDirection.SERVER, C10PacketCreativeInventoryAction.class); - this.registerPacket(PacketDirection.SERVER, C11PacketEnchantItem.class); - this.registerPacket(PacketDirection.SERVER, C12PacketUpdateSign.class); - this.registerPacket(PacketDirection.SERVER, C13PacketPlayerAbilities.class); - this.registerPacket(PacketDirection.SERVER, C14PacketTabComplete.class); - this.registerPacket(PacketDirection.SERVER, C15PacketClientSettings.class); - this.registerPacket(PacketDirection.SERVER, C16PacketClientStatus.class); - this.registerPacket(PacketDirection.SERVER, C17PacketCustomPayload.class); - this.registerPacket(PacketDirection.SERVER, C18PacketSpectate.class); - this.registerPacket(PacketDirection.SERVER, C19PacketResourcePackStatus.class); + this.registerPacket(Direction.CLIENT, S00PacketKeepAlive.class); + this.registerPacket(Direction.CLIENT, S01PacketJoinGame.class); + this.registerPacket(Direction.CLIENT, S02PacketChat.class); + this.registerPacket(Direction.CLIENT, S03PacketTimeUpdate.class); + this.registerPacket(Direction.CLIENT, S04PacketEntityEquipment.class); + this.registerPacket(Direction.CLIENT, S05PacketSpawnPosition.class); + this.registerPacket(Direction.CLIENT, S06PacketUpdateHealth.class); + this.registerPacket(Direction.CLIENT, S07PacketRespawn.class); + this.registerPacket(Direction.CLIENT, S08PacketPlayerPosLook.class); + this.registerPacket(Direction.CLIENT, S09PacketHeldItemChange.class); + this.registerPacket(Direction.CLIENT, S0APacketUseBed.class); + this.registerPacket(Direction.CLIENT, S0BPacketAnimation.class); + this.registerPacket(Direction.CLIENT, S0CPacketSpawnPlayer.class); + this.registerPacket(Direction.CLIENT, S0DPacketCollectItem.class); + this.registerPacket(Direction.CLIENT, S0EPacketSpawnObject.class); + this.registerPacket(Direction.CLIENT, S0FPacketSpawnMob.class); + this.registerPacket(Direction.CLIENT, S10PacketSpawnPainting.class); + this.registerPacket(Direction.CLIENT, S11PacketSpawnExperienceOrb.class); + this.registerPacket(Direction.CLIENT, S12PacketEntityVelocity.class); + this.registerPacket(Direction.CLIENT, S13PacketDestroyEntities.class); + this.registerPacket(Direction.CLIENT, S14PacketEntity.class); + this.registerPacket(Direction.CLIENT, S14PacketEntity.S15PacketEntityRelMove.class); + this.registerPacket(Direction.CLIENT, S14PacketEntity.S16PacketEntityLook.class); + this.registerPacket(Direction.CLIENT, S14PacketEntity.S17PacketEntityLookMove.class); + this.registerPacket(Direction.CLIENT, S18PacketEntityTeleport.class); + this.registerPacket(Direction.CLIENT, S19PacketEntityHeadLook.class); + this.registerPacket(Direction.CLIENT, S19PacketEntityStatus.class); + this.registerPacket(Direction.CLIENT, S1BPacketEntityAttach.class); + this.registerPacket(Direction.CLIENT, S1CPacketEntityMetadata.class); + this.registerPacket(Direction.CLIENT, S1DPacketEntityEffect.class); + this.registerPacket(Direction.CLIENT, S1EPacketRemoveEntityEffect.class); + this.registerPacket(Direction.CLIENT, S1FPacketSetExperience.class); + this.registerPacket(Direction.CLIENT, S20PacketEntityProperties.class); + this.registerPacket(Direction.CLIENT, S21PacketChunkData.class); + this.registerPacket(Direction.CLIENT, S22PacketMultiBlockChange.class); + this.registerPacket(Direction.CLIENT, S23PacketBlockChange.class); + this.registerPacket(Direction.CLIENT, S24PacketBlockAction.class); + this.registerPacket(Direction.CLIENT, S25PacketBlockBreakAnim.class); + this.registerPacket(Direction.CLIENT, S26PacketMapChunkBulk.class); + this.registerPacket(Direction.CLIENT, S27PacketExplosion.class); + this.registerPacket(Direction.CLIENT, S28PacketEffect.class); + this.registerPacket(Direction.CLIENT, S29PacketSoundEffect.class); + this.registerPacket(Direction.CLIENT, S2APacketParticles.class); + this.registerPacket(Direction.CLIENT, S2BPacketChangeGameState.class); + this.registerPacket(Direction.CLIENT, S2CPacketSpawnGlobalEntity.class); + this.registerPacket(Direction.CLIENT, S2DPacketOpenWindow.class); + this.registerPacket(Direction.CLIENT, S2EPacketCloseWindow.class); + this.registerPacket(Direction.CLIENT, S2FPacketSetSlot.class); + this.registerPacket(Direction.CLIENT, S30PacketWindowItems.class); + this.registerPacket(Direction.CLIENT, S31PacketWindowProperty.class); + this.registerPacket(Direction.CLIENT, S32PacketConfirmTransaction.class); + this.registerPacket(Direction.CLIENT, S33PacketUpdateSign.class); + this.registerPacket(Direction.CLIENT, S34PacketMaps.class); + this.registerPacket(Direction.CLIENT, S35PacketUpdateTileEntity.class); + this.registerPacket(Direction.CLIENT, S36PacketSignEditorOpen.class); + this.registerPacket(Direction.CLIENT, S37PacketStatistics.class); + this.registerPacket(Direction.CLIENT, S38PacketPlayerListItem.class); + this.registerPacket(Direction.CLIENT, S39PacketPlayerAbilities.class); + this.registerPacket(Direction.CLIENT, S3APacketTabComplete.class); + this.registerPacket(Direction.CLIENT, S3BPacketScoreboardObjective.class); + this.registerPacket(Direction.CLIENT, S3CPacketUpdateScore.class); + this.registerPacket(Direction.CLIENT, S3DPacketDisplayScoreboard.class); + this.registerPacket(Direction.CLIENT, S3EPacketTeams.class); + this.registerPacket(Direction.CLIENT, S3FPacketCustomPayload.class); + this.registerPacket(Direction.CLIENT, S40PacketDisconnect.class); + this.registerPacket(Direction.CLIENT, S41PacketServerDifficulty.class); + this.registerPacket(Direction.CLIENT, S42PacketCombatEvent.class); + this.registerPacket(Direction.CLIENT, S43PacketCamera.class); + this.registerPacket(Direction.CLIENT, S44PacketWorldBorder.class); + this.registerPacket(Direction.CLIENT, S45PacketTitle.class); + this.registerPacket(Direction.CLIENT, S46PacketSetCompressionLevel.class); + this.registerPacket(Direction.CLIENT, S47PacketPlayerListHeaderFooter.class); + this.registerPacket(Direction.CLIENT, S48PacketResourcePackSend.class); + this.registerPacket(Direction.CLIENT, S49PacketUpdateEntityNBT.class); + this.registerPacket(Direction.SERVER, C00PacketKeepAlive.class); + this.registerPacket(Direction.SERVER, C01PacketChatMessage.class); + this.registerPacket(Direction.SERVER, C02PacketUseEntity.class); + this.registerPacket(Direction.SERVER, C03PacketPlayer.class); + this.registerPacket(Direction.SERVER, C03PacketPlayer.C04PacketPlayerPosition.class); + this.registerPacket(Direction.SERVER, C03PacketPlayer.C05PacketPlayerLook.class); + this.registerPacket(Direction.SERVER, C03PacketPlayer.C06PacketPlayerPosLook.class); + this.registerPacket(Direction.SERVER, C07PacketPlayerDigging.class); + this.registerPacket(Direction.SERVER, C08PacketPlayerBlockPlacement.class); + this.registerPacket(Direction.SERVER, C09PacketHeldItemChange.class); + this.registerPacket(Direction.SERVER, C0APacketAnimation.class); + this.registerPacket(Direction.SERVER, C0BPacketEntityAction.class); + this.registerPacket(Direction.SERVER, C0CPacketInput.class); + this.registerPacket(Direction.SERVER, C0DPacketCloseWindow.class); + this.registerPacket(Direction.SERVER, C0EPacketClickWindow.class); + this.registerPacket(Direction.SERVER, C0FPacketConfirmTransaction.class); + this.registerPacket(Direction.SERVER, C10PacketCreativeInventoryAction.class); + this.registerPacket(Direction.SERVER, C11PacketEnchantItem.class); + this.registerPacket(Direction.SERVER, C12PacketUpdateSign.class); + this.registerPacket(Direction.SERVER, C13PacketPlayerAbilities.class); + this.registerPacket(Direction.SERVER, C14PacketTabComplete.class); + this.registerPacket(Direction.SERVER, C15PacketClientSettings.class); + this.registerPacket(Direction.SERVER, C16PacketClientStatus.class); + this.registerPacket(Direction.SERVER, C17PacketCustomPayload.class); + this.registerPacket(Direction.SERVER, C18PacketSpectate.class); + this.registerPacket(Direction.SERVER, C19PacketResourcePackStatus.class); } }, STATUS(1) { { - this.registerPacket(PacketDirection.SERVER, Q00PacketServerQuery.class); - this.registerPacket(PacketDirection.CLIENT, I00PacketServerInfo.class); - this.registerPacket(PacketDirection.SERVER, Q01PacketPing.class); - this.registerPacket(PacketDirection.CLIENT, I01PacketPong.class); + this.registerPacket(Direction.SERVER, Q00PacketServerQuery.class); + this.registerPacket(Direction.CLIENT, I00PacketServerInfo.class); + this.registerPacket(Direction.SERVER, Q01PacketPing.class); + this.registerPacket(Direction.CLIENT, I01PacketPong.class); } }, LOGIN(2) { { - this.registerPacket(PacketDirection.CLIENT, R00PacketDisconnect.class); - this.registerPacket(PacketDirection.CLIENT, R01PacketEncryptionRequest.class); - this.registerPacket(PacketDirection.CLIENT, R02PacketLoginSuccess.class); - this.registerPacket(PacketDirection.CLIENT, R03PacketEnableCompression.class); - this.registerPacket(PacketDirection.SERVER, L00PacketLoginStart.class); - this.registerPacket(PacketDirection.SERVER, L01PacketEncryptionResponse.class); + this.registerPacket(Direction.CLIENT, R00PacketDisconnect.class); + this.registerPacket(Direction.CLIENT, R01PacketEncryptionRequest.class); + this.registerPacket(Direction.CLIENT, R02PacketLoginSuccess.class); + this.registerPacket(Direction.CLIENT, R03PacketEnableCompression.class); + this.registerPacket(Direction.SERVER, L00PacketLoginStart.class); + this.registerPacket(Direction.SERVER, L01PacketEncryptionResponse.class); } }; @@ -149,15 +149,15 @@ public enum Protocol private static final Protocol[] STATES_BY_ID = new Protocol[field_181137_f - field_181136_e + 1]; private static final Map < Class , Protocol > STATES_BY_CLASS = Maps. < Class , Protocol > newHashMap(); private final int id; - private final Map < PacketDirection, BiMap < Integer, Class >> directionMaps; + private final Map < Direction, BiMap < Integer, Class >> directionMaps; private Protocol(int protocolId) { - this.directionMaps = Maps.newEnumMap(PacketDirection.class); + this.directionMaps = Maps.newEnumMap(Direction.class); this.id = protocolId; } - protected Protocol registerPacket(PacketDirection direction, Class packetClass) + protected Protocol registerPacket(Direction direction, Class packetClass) { BiMap < Integer, Class > bimap = (BiMap)this.directionMaps.get(direction); @@ -180,12 +180,12 @@ public enum Protocol } } - public Integer getPacketId(PacketDirection direction, Packet packetIn) + public Integer getPacketId(Direction direction, Packet packetIn) { return (Integer)((BiMap)this.directionMaps.get(direction)).inverse().get(packetIn.getClass()); } - public Packet getPacket(PacketDirection direction, int packetId) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { + public Packet getPacket(Direction direction, int packetId) throws InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException { Class oclass = (Class)((BiMap)this.directionMaps.get(direction)).get(Integer.valueOf(packetId)); return oclass == null ? null : (Packet)oclass.getConstructor().newInstance(); } @@ -217,7 +217,7 @@ public enum Protocol STATES_BY_ID[i - field_181136_e] = enumconnectionstate; - for (PacketDirection enumpacketdirection : enumconnectionstate.directionMaps.keySet()) + for (Direction enumpacketdirection : enumconnectionstate.directionMaps.keySet()) { for (Class oclass : (enumconnectionstate.directionMaps.get(enumpacketdirection)).values()) { diff --git a/proxy/src/main/java/proxy/network/PacketSplitter.java b/proxy/src/main/java/proxy/network/Splitter.java similarity index 96% rename from proxy/src/main/java/proxy/network/PacketSplitter.java rename to proxy/src/main/java/proxy/network/Splitter.java index 2e17488..d76882f 100755 --- a/proxy/src/main/java/proxy/network/PacketSplitter.java +++ b/proxy/src/main/java/proxy/network/Splitter.java @@ -7,7 +7,7 @@ import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.CorruptedFrameException; import java.util.List; -public class PacketSplitter extends ByteToMessageDecoder +public class Splitter extends ByteToMessageDecoder { protected void decode(ChannelHandlerContext p_decode_1_, ByteBuf p_decode_2_, List p_decode_3_) throws Exception { diff --git a/proxy/src/main/java/proxy/packet/C00PacketKeepAlive.java b/proxy/src/main/java/proxy/packet/C00PacketKeepAlive.java index 2a48ccb..ffb15b0 100755 --- a/proxy/src/main/java/proxy/packet/C00PacketKeepAlive.java +++ b/proxy/src/main/java/proxy/packet/C00PacketKeepAlive.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C01PacketChatMessage.java b/proxy/src/main/java/proxy/packet/C01PacketChatMessage.java index d34e928..e8ebee9 100755 --- a/proxy/src/main/java/proxy/packet/C01PacketChatMessage.java +++ b/proxy/src/main/java/proxy/packet/C01PacketChatMessage.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C02PacketUseEntity.java b/proxy/src/main/java/proxy/packet/C02PacketUseEntity.java index de2e04e..9103f47 100755 --- a/proxy/src/main/java/proxy/packet/C02PacketUseEntity.java +++ b/proxy/src/main/java/proxy/packet/C02PacketUseEntity.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C03PacketPlayer.java b/proxy/src/main/java/proxy/packet/C03PacketPlayer.java index 88a9724..b2b8371 100755 --- a/proxy/src/main/java/proxy/packet/C03PacketPlayer.java +++ b/proxy/src/main/java/proxy/packet/C03PacketPlayer.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C07PacketPlayerDigging.java b/proxy/src/main/java/proxy/packet/C07PacketPlayerDigging.java index a27ae9a..df2f14d 100755 --- a/proxy/src/main/java/proxy/packet/C07PacketPlayerDigging.java +++ b/proxy/src/main/java/proxy/packet/C07PacketPlayerDigging.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class C07PacketPlayerDigging implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C08PacketPlayerBlockPlacement.java b/proxy/src/main/java/proxy/packet/C08PacketPlayerBlockPlacement.java index 5205793..43d340d 100755 --- a/proxy/src/main/java/proxy/packet/C08PacketPlayerBlockPlacement.java +++ b/proxy/src/main/java/proxy/packet/C08PacketPlayerBlockPlacement.java @@ -2,11 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; -import proxy.util.Stack; public class C08PacketPlayerBlockPlacement implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C09PacketHeldItemChange.java b/proxy/src/main/java/proxy/packet/C09PacketHeldItemChange.java index 8fa4b02..8189871 100755 --- a/proxy/src/main/java/proxy/packet/C09PacketHeldItemChange.java +++ b/proxy/src/main/java/proxy/packet/C09PacketHeldItemChange.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C0APacketAnimation.java b/proxy/src/main/java/proxy/packet/C0APacketAnimation.java index 8a3c46f..1518a25 100755 --- a/proxy/src/main/java/proxy/packet/C0APacketAnimation.java +++ b/proxy/src/main/java/proxy/packet/C0APacketAnimation.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C0BPacketEntityAction.java b/proxy/src/main/java/proxy/packet/C0BPacketEntityAction.java index a72e554..f7f67d4 100755 --- a/proxy/src/main/java/proxy/packet/C0BPacketEntityAction.java +++ b/proxy/src/main/java/proxy/packet/C0BPacketEntityAction.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C0CPacketInput.java b/proxy/src/main/java/proxy/packet/C0CPacketInput.java index 87df2b0..23cedd6 100755 --- a/proxy/src/main/java/proxy/packet/C0CPacketInput.java +++ b/proxy/src/main/java/proxy/packet/C0CPacketInput.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C0DPacketCloseWindow.java b/proxy/src/main/java/proxy/packet/C0DPacketCloseWindow.java index 2744295..7f45353 100755 --- a/proxy/src/main/java/proxy/packet/C0DPacketCloseWindow.java +++ b/proxy/src/main/java/proxy/packet/C0DPacketCloseWindow.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C0EPacketClickWindow.java b/proxy/src/main/java/proxy/packet/C0EPacketClickWindow.java index e10fd9a..4825d6b 100755 --- a/proxy/src/main/java/proxy/packet/C0EPacketClickWindow.java +++ b/proxy/src/main/java/proxy/packet/C0EPacketClickWindow.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Stack; public class C0EPacketClickWindow implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C0FPacketConfirmTransaction.java b/proxy/src/main/java/proxy/packet/C0FPacketConfirmTransaction.java index baec4e2..633b34e 100755 --- a/proxy/src/main/java/proxy/packet/C0FPacketConfirmTransaction.java +++ b/proxy/src/main/java/proxy/packet/C0FPacketConfirmTransaction.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C10PacketCreativeInventoryAction.java b/proxy/src/main/java/proxy/packet/C10PacketCreativeInventoryAction.java index 31c2318..1934a49 100755 --- a/proxy/src/main/java/proxy/packet/C10PacketCreativeInventoryAction.java +++ b/proxy/src/main/java/proxy/packet/C10PacketCreativeInventoryAction.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Stack; public class C10PacketCreativeInventoryAction implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C11PacketEnchantItem.java b/proxy/src/main/java/proxy/packet/C11PacketEnchantItem.java index 2a73327..d062ce7 100755 --- a/proxy/src/main/java/proxy/packet/C11PacketEnchantItem.java +++ b/proxy/src/main/java/proxy/packet/C11PacketEnchantItem.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C12PacketUpdateSign.java b/proxy/src/main/java/proxy/packet/C12PacketUpdateSign.java index 6eebb6f..0302377 100755 --- a/proxy/src/main/java/proxy/packet/C12PacketUpdateSign.java +++ b/proxy/src/main/java/proxy/packet/C12PacketUpdateSign.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class C12PacketUpdateSign implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C13PacketPlayerAbilities.java b/proxy/src/main/java/proxy/packet/C13PacketPlayerAbilities.java index 90205b9..86cf1d3 100755 --- a/proxy/src/main/java/proxy/packet/C13PacketPlayerAbilities.java +++ b/proxy/src/main/java/proxy/packet/C13PacketPlayerAbilities.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C14PacketTabComplete.java b/proxy/src/main/java/proxy/packet/C14PacketTabComplete.java index 505f514..20aa9ee 100755 --- a/proxy/src/main/java/proxy/packet/C14PacketTabComplete.java +++ b/proxy/src/main/java/proxy/packet/C14PacketTabComplete.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class C14PacketTabComplete implements Packet { diff --git a/proxy/src/main/java/proxy/packet/C15PacketClientSettings.java b/proxy/src/main/java/proxy/packet/C15PacketClientSettings.java index af626bd..92182ce 100755 --- a/proxy/src/main/java/proxy/packet/C15PacketClientSettings.java +++ b/proxy/src/main/java/proxy/packet/C15PacketClientSettings.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C16PacketClientStatus.java b/proxy/src/main/java/proxy/packet/C16PacketClientStatus.java index bf93ffc..a89a8c9 100755 --- a/proxy/src/main/java/proxy/packet/C16PacketClientStatus.java +++ b/proxy/src/main/java/proxy/packet/C16PacketClientStatus.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C17PacketCustomPayload.java b/proxy/src/main/java/proxy/packet/C17PacketCustomPayload.java index 1c09d77..afadf67 100755 --- a/proxy/src/main/java/proxy/packet/C17PacketCustomPayload.java +++ b/proxy/src/main/java/proxy/packet/C17PacketCustomPayload.java @@ -5,7 +5,7 @@ import io.netty.buffer.Unpooled; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C18PacketSpectate.java b/proxy/src/main/java/proxy/packet/C18PacketSpectate.java index 1927fb8..eb7063c 100755 --- a/proxy/src/main/java/proxy/packet/C18PacketSpectate.java +++ b/proxy/src/main/java/proxy/packet/C18PacketSpectate.java @@ -3,7 +3,7 @@ package proxy.packet; import java.io.IOException; import java.util.UUID; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/C19PacketResourcePackStatus.java b/proxy/src/main/java/proxy/packet/C19PacketResourcePackStatus.java index a3eebfc..20faf6e 100755 --- a/proxy/src/main/java/proxy/packet/C19PacketResourcePackStatus.java +++ b/proxy/src/main/java/proxy/packet/C19PacketResourcePackStatus.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/util/EntityData.java b/proxy/src/main/java/proxy/packet/EntityData.java similarity index 99% rename from proxy/src/main/java/proxy/util/EntityData.java rename to proxy/src/main/java/proxy/packet/EntityData.java index e7873a7..c46ab14 100644 --- a/proxy/src/main/java/proxy/util/EntityData.java +++ b/proxy/src/main/java/proxy/packet/EntityData.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; import java.io.IOException; import java.util.List; diff --git a/proxy/src/main/java/proxy/packet/EntityIdPacketClient.java b/proxy/src/main/java/proxy/packet/EntityIdPacketClient.java index 77dc130..4f3d86c 100644 --- a/proxy/src/main/java/proxy/packet/EntityIdPacketClient.java +++ b/proxy/src/main/java/proxy/packet/EntityIdPacketClient.java @@ -1,7 +1,7 @@ package proxy.packet; +import proxy.handler.ProxyHandler; import proxy.network.Packet; -import proxy.network.ProxyHandler; public abstract class EntityIdPacketClient implements Packet { protected int entityId; diff --git a/proxy/src/main/java/proxy/packet/EntityIdPacketServer.java b/proxy/src/main/java/proxy/packet/EntityIdPacketServer.java index 9cc84ea..64f5e61 100644 --- a/proxy/src/main/java/proxy/packet/EntityIdPacketServer.java +++ b/proxy/src/main/java/proxy/packet/EntityIdPacketServer.java @@ -1,7 +1,7 @@ package proxy.packet; +import proxy.handler.ProxyHandler; import proxy.network.Packet; -import proxy.network.ProxyHandler; public abstract class EntityIdPacketServer implements Packet { protected int entityId; diff --git a/proxy/src/main/java/proxy/packet/H00PacketHandshake.java b/proxy/src/main/java/proxy/packet/H00PacketHandshake.java index aea65f3..2ebbb45 100755 --- a/proxy/src/main/java/proxy/packet/H00PacketHandshake.java +++ b/proxy/src/main/java/proxy/packet/H00PacketHandshake.java @@ -3,7 +3,7 @@ package proxy.packet; import java.io.IOException; import proxy.network.Protocol; -import proxy.network.HandshakeHandler; +import proxy.handler.HandshakeHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/I00PacketServerInfo.java b/proxy/src/main/java/proxy/packet/I00PacketServerInfo.java index 72db9d6..81414d5 100755 --- a/proxy/src/main/java/proxy/packet/I00PacketServerInfo.java +++ b/proxy/src/main/java/proxy/packet/I00PacketServerInfo.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.StatusHandler; +import proxy.handler.StatusHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.ServerInfo; public class I00PacketServerInfo implements Packet { diff --git a/proxy/src/main/java/proxy/packet/I01PacketPong.java b/proxy/src/main/java/proxy/packet/I01PacketPong.java index 9e6b0c8..acf9b99 100755 --- a/proxy/src/main/java/proxy/packet/I01PacketPong.java +++ b/proxy/src/main/java/proxy/packet/I01PacketPong.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.StatusHandler; +import proxy.handler.StatusHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/L00PacketLoginStart.java b/proxy/src/main/java/proxy/packet/L00PacketLoginStart.java index f3f2037..7256372 100755 --- a/proxy/src/main/java/proxy/packet/L00PacketLoginStart.java +++ b/proxy/src/main/java/proxy/packet/L00PacketLoginStart.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.LoginHandler; +import proxy.handler.LoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/L01PacketEncryptionResponse.java b/proxy/src/main/java/proxy/packet/L01PacketEncryptionResponse.java index 5e727de..639e3e7 100755 --- a/proxy/src/main/java/proxy/packet/L01PacketEncryptionResponse.java +++ b/proxy/src/main/java/proxy/packet/L01PacketEncryptionResponse.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.LoginHandler; +import proxy.handler.LoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/util/Nbt.java b/proxy/src/main/java/proxy/packet/Nbt.java similarity index 99% rename from proxy/src/main/java/proxy/util/Nbt.java rename to proxy/src/main/java/proxy/packet/Nbt.java index 4f08d4a..afdfd1f 100755 --- a/proxy/src/main/java/proxy/util/Nbt.java +++ b/proxy/src/main/java/proxy/packet/Nbt.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; import java.io.DataInput; import java.io.DataOutput; diff --git a/proxy/src/main/java/proxy/util/Profile.java b/proxy/src/main/java/proxy/packet/Profile.java similarity index 98% rename from proxy/src/main/java/proxy/util/Profile.java rename to proxy/src/main/java/proxy/packet/Profile.java index 86517a0..18b2587 100644 --- a/proxy/src/main/java/proxy/util/Profile.java +++ b/proxy/src/main/java/proxy/packet/Profile.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; import java.util.UUID; diff --git a/proxy/src/main/java/proxy/packet/Q00PacketServerQuery.java b/proxy/src/main/java/proxy/packet/Q00PacketServerQuery.java index 46d2fa8..b9e5916 100755 --- a/proxy/src/main/java/proxy/packet/Q00PacketServerQuery.java +++ b/proxy/src/main/java/proxy/packet/Q00PacketServerQuery.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.StatusHandler; +import proxy.handler.StatusHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/Q01PacketPing.java b/proxy/src/main/java/proxy/packet/Q01PacketPing.java index 565a765..48418e5 100755 --- a/proxy/src/main/java/proxy/packet/Q01PacketPing.java +++ b/proxy/src/main/java/proxy/packet/Q01PacketPing.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.StatusHandler; +import proxy.handler.StatusHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/R00PacketDisconnect.java b/proxy/src/main/java/proxy/packet/R00PacketDisconnect.java index 7192317..2f498e8 100755 --- a/proxy/src/main/java/proxy/packet/R00PacketDisconnect.java +++ b/proxy/src/main/java/proxy/packet/R00PacketDisconnect.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler.ProxyLoginHandler; +import proxy.handler.ProxyHandler.ProxyLoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.Formatter; diff --git a/proxy/src/main/java/proxy/packet/R01PacketEncryptionRequest.java b/proxy/src/main/java/proxy/packet/R01PacketEncryptionRequest.java index 856ba98..04a91f0 100755 --- a/proxy/src/main/java/proxy/packet/R01PacketEncryptionRequest.java +++ b/proxy/src/main/java/proxy/packet/R01PacketEncryptionRequest.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler.ProxyLoginHandler; +import proxy.handler.ProxyHandler.ProxyLoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/R02PacketLoginSuccess.java b/proxy/src/main/java/proxy/packet/R02PacketLoginSuccess.java index 69e78ba..d3d261e 100755 --- a/proxy/src/main/java/proxy/packet/R02PacketLoginSuccess.java +++ b/proxy/src/main/java/proxy/packet/R02PacketLoginSuccess.java @@ -3,7 +3,7 @@ package proxy.packet; import java.io.IOException; import java.util.UUID; -import proxy.network.ProxyHandler.ProxyLoginHandler; +import proxy.handler.ProxyHandler.ProxyLoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/R03PacketEnableCompression.java b/proxy/src/main/java/proxy/packet/R03PacketEnableCompression.java index 1743cea..427590f 100755 --- a/proxy/src/main/java/proxy/packet/R03PacketEnableCompression.java +++ b/proxy/src/main/java/proxy/packet/R03PacketEnableCompression.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler.ProxyLoginHandler; +import proxy.handler.ProxyHandler.ProxyLoginHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S00PacketKeepAlive.java b/proxy/src/main/java/proxy/packet/S00PacketKeepAlive.java index 97ac2eb..312d84a 100755 --- a/proxy/src/main/java/proxy/packet/S00PacketKeepAlive.java +++ b/proxy/src/main/java/proxy/packet/S00PacketKeepAlive.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S01PacketJoinGame.java b/proxy/src/main/java/proxy/packet/S01PacketJoinGame.java index f59580e..5556ba4 100755 --- a/proxy/src/main/java/proxy/packet/S01PacketJoinGame.java +++ b/proxy/src/main/java/proxy/packet/S01PacketJoinGame.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S02PacketChat.java b/proxy/src/main/java/proxy/packet/S02PacketChat.java index fadeae8..49ab3e9 100755 --- a/proxy/src/main/java/proxy/packet/S02PacketChat.java +++ b/proxy/src/main/java/proxy/packet/S02PacketChat.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.Formatter; diff --git a/proxy/src/main/java/proxy/packet/S03PacketTimeUpdate.java b/proxy/src/main/java/proxy/packet/S03PacketTimeUpdate.java index 5359e91..101c096 100755 --- a/proxy/src/main/java/proxy/packet/S03PacketTimeUpdate.java +++ b/proxy/src/main/java/proxy/packet/S03PacketTimeUpdate.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S04PacketEntityEquipment.java b/proxy/src/main/java/proxy/packet/S04PacketEntityEquipment.java index b7b4f18..10b2fac 100755 --- a/proxy/src/main/java/proxy/packet/S04PacketEntityEquipment.java +++ b/proxy/src/main/java/proxy/packet/S04PacketEntityEquipment.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Stack; public class S04PacketEntityEquipment extends EntityIdPacketClient implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S05PacketSpawnPosition.java b/proxy/src/main/java/proxy/packet/S05PacketSpawnPosition.java index 511bb61..7551440 100755 --- a/proxy/src/main/java/proxy/packet/S05PacketSpawnPosition.java +++ b/proxy/src/main/java/proxy/packet/S05PacketSpawnPosition.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S05PacketSpawnPosition implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S06PacketUpdateHealth.java b/proxy/src/main/java/proxy/packet/S06PacketUpdateHealth.java index 52624a9..c2d8ede 100755 --- a/proxy/src/main/java/proxy/packet/S06PacketUpdateHealth.java +++ b/proxy/src/main/java/proxy/packet/S06PacketUpdateHealth.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S07PacketRespawn.java b/proxy/src/main/java/proxy/packet/S07PacketRespawn.java index 8191a5a..554dc61 100755 --- a/proxy/src/main/java/proxy/packet/S07PacketRespawn.java +++ b/proxy/src/main/java/proxy/packet/S07PacketRespawn.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S08PacketPlayerPosLook.java b/proxy/src/main/java/proxy/packet/S08PacketPlayerPosLook.java index de275c0..6656b20 100755 --- a/proxy/src/main/java/proxy/packet/S08PacketPlayerPosLook.java +++ b/proxy/src/main/java/proxy/packet/S08PacketPlayerPosLook.java @@ -5,7 +5,7 @@ import java.util.Collections; import java.util.EnumSet; import java.util.Set; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S09PacketHeldItemChange.java b/proxy/src/main/java/proxy/packet/S09PacketHeldItemChange.java index edeefb5..627c04c 100755 --- a/proxy/src/main/java/proxy/packet/S09PacketHeldItemChange.java +++ b/proxy/src/main/java/proxy/packet/S09PacketHeldItemChange.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S0APacketUseBed.java b/proxy/src/main/java/proxy/packet/S0APacketUseBed.java index df3eae0..27ad291 100755 --- a/proxy/src/main/java/proxy/packet/S0APacketUseBed.java +++ b/proxy/src/main/java/proxy/packet/S0APacketUseBed.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S0APacketUseBed extends EntityIdPacketClient implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S0BPacketAnimation.java b/proxy/src/main/java/proxy/packet/S0BPacketAnimation.java index e42ff04..d54ec19 100755 --- a/proxy/src/main/java/proxy/packet/S0BPacketAnimation.java +++ b/proxy/src/main/java/proxy/packet/S0BPacketAnimation.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S0CPacketSpawnPlayer.java b/proxy/src/main/java/proxy/packet/S0CPacketSpawnPlayer.java index a2c1bf6..bfeb266 100755 --- a/proxy/src/main/java/proxy/packet/S0CPacketSpawnPlayer.java +++ b/proxy/src/main/java/proxy/packet/S0CPacketSpawnPlayer.java @@ -4,10 +4,9 @@ import java.io.IOException; import java.util.List; import java.util.UUID; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.EntityData; public class S0CPacketSpawnPlayer extends EntityIdPacketClient implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S0DPacketCollectItem.java b/proxy/src/main/java/proxy/packet/S0DPacketCollectItem.java index 8f6320e..e29e7f1 100755 --- a/proxy/src/main/java/proxy/packet/S0DPacketCollectItem.java +++ b/proxy/src/main/java/proxy/packet/S0DPacketCollectItem.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S0EPacketSpawnObject.java b/proxy/src/main/java/proxy/packet/S0EPacketSpawnObject.java index fee30d1..59e19a9 100755 --- a/proxy/src/main/java/proxy/packet/S0EPacketSpawnObject.java +++ b/proxy/src/main/java/proxy/packet/S0EPacketSpawnObject.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S0FPacketSpawnMob.java b/proxy/src/main/java/proxy/packet/S0FPacketSpawnMob.java index 6f5cdf2..cd11e06 100755 --- a/proxy/src/main/java/proxy/packet/S0FPacketSpawnMob.java +++ b/proxy/src/main/java/proxy/packet/S0FPacketSpawnMob.java @@ -3,10 +3,9 @@ package proxy.packet; import java.io.IOException; import java.util.List; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.EntityData; public class S0FPacketSpawnMob implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S10PacketSpawnPainting.java b/proxy/src/main/java/proxy/packet/S10PacketSpawnPainting.java index a861540..2655091 100755 --- a/proxy/src/main/java/proxy/packet/S10PacketSpawnPainting.java +++ b/proxy/src/main/java/proxy/packet/S10PacketSpawnPainting.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S10PacketSpawnPainting implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S11PacketSpawnExperienceOrb.java b/proxy/src/main/java/proxy/packet/S11PacketSpawnExperienceOrb.java index fbd6d7e..43cc845 100755 --- a/proxy/src/main/java/proxy/packet/S11PacketSpawnExperienceOrb.java +++ b/proxy/src/main/java/proxy/packet/S11PacketSpawnExperienceOrb.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S12PacketEntityVelocity.java b/proxy/src/main/java/proxy/packet/S12PacketEntityVelocity.java index 42848bf..3b8c6ce 100755 --- a/proxy/src/main/java/proxy/packet/S12PacketEntityVelocity.java +++ b/proxy/src/main/java/proxy/packet/S12PacketEntityVelocity.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S13PacketDestroyEntities.java b/proxy/src/main/java/proxy/packet/S13PacketDestroyEntities.java index 5ada6e8..e72a7af 100755 --- a/proxy/src/main/java/proxy/packet/S13PacketDestroyEntities.java +++ b/proxy/src/main/java/proxy/packet/S13PacketDestroyEntities.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S14PacketEntity.java b/proxy/src/main/java/proxy/packet/S14PacketEntity.java index b61f899..2912018 100755 --- a/proxy/src/main/java/proxy/packet/S14PacketEntity.java +++ b/proxy/src/main/java/proxy/packet/S14PacketEntity.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S18PacketEntityTeleport.java b/proxy/src/main/java/proxy/packet/S18PacketEntityTeleport.java index 3c62b0d..9008e0f 100755 --- a/proxy/src/main/java/proxy/packet/S18PacketEntityTeleport.java +++ b/proxy/src/main/java/proxy/packet/S18PacketEntityTeleport.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S19PacketEntityHeadLook.java b/proxy/src/main/java/proxy/packet/S19PacketEntityHeadLook.java index 16a3ffc..5f19e8f 100755 --- a/proxy/src/main/java/proxy/packet/S19PacketEntityHeadLook.java +++ b/proxy/src/main/java/proxy/packet/S19PacketEntityHeadLook.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S19PacketEntityStatus.java b/proxy/src/main/java/proxy/packet/S19PacketEntityStatus.java index feb1918..ccd2acf 100755 --- a/proxy/src/main/java/proxy/packet/S19PacketEntityStatus.java +++ b/proxy/src/main/java/proxy/packet/S19PacketEntityStatus.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S1BPacketEntityAttach.java b/proxy/src/main/java/proxy/packet/S1BPacketEntityAttach.java index 7057c45..3a5b720 100755 --- a/proxy/src/main/java/proxy/packet/S1BPacketEntityAttach.java +++ b/proxy/src/main/java/proxy/packet/S1BPacketEntityAttach.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S1CPacketEntityMetadata.java b/proxy/src/main/java/proxy/packet/S1CPacketEntityMetadata.java index 17292c1..054de1e 100755 --- a/proxy/src/main/java/proxy/packet/S1CPacketEntityMetadata.java +++ b/proxy/src/main/java/proxy/packet/S1CPacketEntityMetadata.java @@ -3,10 +3,9 @@ package proxy.packet; import java.io.IOException; import java.util.List; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.EntityData; public class S1CPacketEntityMetadata extends EntityIdPacketClient implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S1DPacketEntityEffect.java b/proxy/src/main/java/proxy/packet/S1DPacketEntityEffect.java index 3c5b648..da4aabc 100755 --- a/proxy/src/main/java/proxy/packet/S1DPacketEntityEffect.java +++ b/proxy/src/main/java/proxy/packet/S1DPacketEntityEffect.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S1EPacketRemoveEntityEffect.java b/proxy/src/main/java/proxy/packet/S1EPacketRemoveEntityEffect.java index e9f5d56..9b48cd8 100755 --- a/proxy/src/main/java/proxy/packet/S1EPacketRemoveEntityEffect.java +++ b/proxy/src/main/java/proxy/packet/S1EPacketRemoveEntityEffect.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S1FPacketSetExperience.java b/proxy/src/main/java/proxy/packet/S1FPacketSetExperience.java index 2ecd54a..a6e78bb 100755 --- a/proxy/src/main/java/proxy/packet/S1FPacketSetExperience.java +++ b/proxy/src/main/java/proxy/packet/S1FPacketSetExperience.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S20PacketEntityProperties.java b/proxy/src/main/java/proxy/packet/S20PacketEntityProperties.java index 0581bab..e336ac8 100755 --- a/proxy/src/main/java/proxy/packet/S20PacketEntityProperties.java +++ b/proxy/src/main/java/proxy/packet/S20PacketEntityProperties.java @@ -7,7 +7,7 @@ import java.util.UUID; import com.google.common.collect.Lists; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S21PacketChunkData.java b/proxy/src/main/java/proxy/packet/S21PacketChunkData.java index a12c074..cc35a0a 100755 --- a/proxy/src/main/java/proxy/packet/S21PacketChunkData.java +++ b/proxy/src/main/java/proxy/packet/S21PacketChunkData.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S22PacketMultiBlockChange.java b/proxy/src/main/java/proxy/packet/S22PacketMultiBlockChange.java index 88f4eff..1a45385 100755 --- a/proxy/src/main/java/proxy/packet/S22PacketMultiBlockChange.java +++ b/proxy/src/main/java/proxy/packet/S22PacketMultiBlockChange.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S23PacketBlockChange.java b/proxy/src/main/java/proxy/packet/S23PacketBlockChange.java index d4cf211..4827ef6 100755 --- a/proxy/src/main/java/proxy/packet/S23PacketBlockChange.java +++ b/proxy/src/main/java/proxy/packet/S23PacketBlockChange.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S23PacketBlockChange implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S24PacketBlockAction.java b/proxy/src/main/java/proxy/packet/S24PacketBlockAction.java index 001162d..76bd0bc 100755 --- a/proxy/src/main/java/proxy/packet/S24PacketBlockAction.java +++ b/proxy/src/main/java/proxy/packet/S24PacketBlockAction.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S24PacketBlockAction implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S25PacketBlockBreakAnim.java b/proxy/src/main/java/proxy/packet/S25PacketBlockBreakAnim.java index 76307e3..2e7a3e3 100755 --- a/proxy/src/main/java/proxy/packet/S25PacketBlockBreakAnim.java +++ b/proxy/src/main/java/proxy/packet/S25PacketBlockBreakAnim.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S25PacketBlockBreakAnim extends EntityIdPacketClient implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S26PacketMapChunkBulk.java b/proxy/src/main/java/proxy/packet/S26PacketMapChunkBulk.java index 8aa6360..bdcf066 100755 --- a/proxy/src/main/java/proxy/packet/S26PacketMapChunkBulk.java +++ b/proxy/src/main/java/proxy/packet/S26PacketMapChunkBulk.java @@ -3,7 +3,7 @@ package proxy.packet; import java.io.IOException; import java.util.Arrays; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S27PacketExplosion.java b/proxy/src/main/java/proxy/packet/S27PacketExplosion.java index 805463c..5c84864 100755 --- a/proxy/src/main/java/proxy/packet/S27PacketExplosion.java +++ b/proxy/src/main/java/proxy/packet/S27PacketExplosion.java @@ -5,10 +5,9 @@ import java.util.List; import com.google.common.collect.Lists; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S27PacketExplosion implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S28PacketEffect.java b/proxy/src/main/java/proxy/packet/S28PacketEffect.java index f57f2bc..3bbb985 100755 --- a/proxy/src/main/java/proxy/packet/S28PacketEffect.java +++ b/proxy/src/main/java/proxy/packet/S28PacketEffect.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S28PacketEffect implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S29PacketSoundEffect.java b/proxy/src/main/java/proxy/packet/S29PacketSoundEffect.java index 5a886c6..6e9c42f 100755 --- a/proxy/src/main/java/proxy/packet/S29PacketSoundEffect.java +++ b/proxy/src/main/java/proxy/packet/S29PacketSoundEffect.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2APacketParticles.java b/proxy/src/main/java/proxy/packet/S2APacketParticles.java index e7e8c0e..fb5610f 100755 --- a/proxy/src/main/java/proxy/packet/S2APacketParticles.java +++ b/proxy/src/main/java/proxy/packet/S2APacketParticles.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2BPacketChangeGameState.java b/proxy/src/main/java/proxy/packet/S2BPacketChangeGameState.java index 82100de..451b5de 100755 --- a/proxy/src/main/java/proxy/packet/S2BPacketChangeGameState.java +++ b/proxy/src/main/java/proxy/packet/S2BPacketChangeGameState.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2CPacketSpawnGlobalEntity.java b/proxy/src/main/java/proxy/packet/S2CPacketSpawnGlobalEntity.java index 7e43b19..e9e377d 100755 --- a/proxy/src/main/java/proxy/packet/S2CPacketSpawnGlobalEntity.java +++ b/proxy/src/main/java/proxy/packet/S2CPacketSpawnGlobalEntity.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2DPacketOpenWindow.java b/proxy/src/main/java/proxy/packet/S2DPacketOpenWindow.java index 44eb94a..3737e4a 100755 --- a/proxy/src/main/java/proxy/packet/S2DPacketOpenWindow.java +++ b/proxy/src/main/java/proxy/packet/S2DPacketOpenWindow.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2EPacketCloseWindow.java b/proxy/src/main/java/proxy/packet/S2EPacketCloseWindow.java index 0ccf2e4..36ad664 100755 --- a/proxy/src/main/java/proxy/packet/S2EPacketCloseWindow.java +++ b/proxy/src/main/java/proxy/packet/S2EPacketCloseWindow.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S2FPacketSetSlot.java b/proxy/src/main/java/proxy/packet/S2FPacketSetSlot.java index 0f58473..bc379bc 100755 --- a/proxy/src/main/java/proxy/packet/S2FPacketSetSlot.java +++ b/proxy/src/main/java/proxy/packet/S2FPacketSetSlot.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Stack; public class S2FPacketSetSlot implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S30PacketWindowItems.java b/proxy/src/main/java/proxy/packet/S30PacketWindowItems.java index 03061b9..2868158 100755 --- a/proxy/src/main/java/proxy/packet/S30PacketWindowItems.java +++ b/proxy/src/main/java/proxy/packet/S30PacketWindowItems.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Stack; public class S30PacketWindowItems implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S31PacketWindowProperty.java b/proxy/src/main/java/proxy/packet/S31PacketWindowProperty.java index 4b7b0e8..3406338 100755 --- a/proxy/src/main/java/proxy/packet/S31PacketWindowProperty.java +++ b/proxy/src/main/java/proxy/packet/S31PacketWindowProperty.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S32PacketConfirmTransaction.java b/proxy/src/main/java/proxy/packet/S32PacketConfirmTransaction.java index ec4bf76..c0f00bb 100755 --- a/proxy/src/main/java/proxy/packet/S32PacketConfirmTransaction.java +++ b/proxy/src/main/java/proxy/packet/S32PacketConfirmTransaction.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S33PacketUpdateSign.java b/proxy/src/main/java/proxy/packet/S33PacketUpdateSign.java index 97939b2..00a2cd1 100755 --- a/proxy/src/main/java/proxy/packet/S33PacketUpdateSign.java +++ b/proxy/src/main/java/proxy/packet/S33PacketUpdateSign.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; import proxy.util.Formatter; public class S33PacketUpdateSign implements Packet diff --git a/proxy/src/main/java/proxy/packet/S34PacketMaps.java b/proxy/src/main/java/proxy/packet/S34PacketMaps.java index ea56d9d..88a64d0 100755 --- a/proxy/src/main/java/proxy/packet/S34PacketMaps.java +++ b/proxy/src/main/java/proxy/packet/S34PacketMaps.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S35PacketUpdateTileEntity.java b/proxy/src/main/java/proxy/packet/S35PacketUpdateTileEntity.java index cf06528..5daf1b5 100755 --- a/proxy/src/main/java/proxy/packet/S35PacketUpdateTileEntity.java +++ b/proxy/src/main/java/proxy/packet/S35PacketUpdateTileEntity.java @@ -3,10 +3,9 @@ package proxy.packet; import java.io.IOException; import java.util.Map; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S35PacketUpdateTileEntity implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S36PacketSignEditorOpen.java b/proxy/src/main/java/proxy/packet/S36PacketSignEditorOpen.java index dce2edc..1cda3c0 100755 --- a/proxy/src/main/java/proxy/packet/S36PacketSignEditorOpen.java +++ b/proxy/src/main/java/proxy/packet/S36PacketSignEditorOpen.java @@ -2,10 +2,9 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Vec3; public class S36PacketSignEditorOpen implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S37PacketStatistics.java b/proxy/src/main/java/proxy/packet/S37PacketStatistics.java index bf343b0..e3639af 100755 --- a/proxy/src/main/java/proxy/packet/S37PacketStatistics.java +++ b/proxy/src/main/java/proxy/packet/S37PacketStatistics.java @@ -6,7 +6,7 @@ import java.util.Map.Entry; import com.google.common.collect.Maps; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S38PacketPlayerListItem.java b/proxy/src/main/java/proxy/packet/S38PacketPlayerListItem.java index 01e0abf..6a3611c 100755 --- a/proxy/src/main/java/proxy/packet/S38PacketPlayerListItem.java +++ b/proxy/src/main/java/proxy/packet/S38PacketPlayerListItem.java @@ -6,11 +6,10 @@ import com.google.common.collect.Lists; import java.io.IOException; import java.util.List; -import proxy.network.ProxyHandler; +import proxy.packet.Profile.Property; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; -import proxy.util.Profile; -import proxy.util.Profile.Property; public class S38PacketPlayerListItem implements Packet { diff --git a/proxy/src/main/java/proxy/packet/S39PacketPlayerAbilities.java b/proxy/src/main/java/proxy/packet/S39PacketPlayerAbilities.java index 1fd62c5..8fd4e4a 100755 --- a/proxy/src/main/java/proxy/packet/S39PacketPlayerAbilities.java +++ b/proxy/src/main/java/proxy/packet/S39PacketPlayerAbilities.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3APacketTabComplete.java b/proxy/src/main/java/proxy/packet/S3APacketTabComplete.java index d98a8c0..30857ac 100755 --- a/proxy/src/main/java/proxy/packet/S3APacketTabComplete.java +++ b/proxy/src/main/java/proxy/packet/S3APacketTabComplete.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3BPacketScoreboardObjective.java b/proxy/src/main/java/proxy/packet/S3BPacketScoreboardObjective.java index b939490..6e70c17 100755 --- a/proxy/src/main/java/proxy/packet/S3BPacketScoreboardObjective.java +++ b/proxy/src/main/java/proxy/packet/S3BPacketScoreboardObjective.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3CPacketUpdateScore.java b/proxy/src/main/java/proxy/packet/S3CPacketUpdateScore.java index aa44b84..c6c6ba0 100755 --- a/proxy/src/main/java/proxy/packet/S3CPacketUpdateScore.java +++ b/proxy/src/main/java/proxy/packet/S3CPacketUpdateScore.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3DPacketDisplayScoreboard.java b/proxy/src/main/java/proxy/packet/S3DPacketDisplayScoreboard.java index a80270b..eb5807a 100755 --- a/proxy/src/main/java/proxy/packet/S3DPacketDisplayScoreboard.java +++ b/proxy/src/main/java/proxy/packet/S3DPacketDisplayScoreboard.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3EPacketTeams.java b/proxy/src/main/java/proxy/packet/S3EPacketTeams.java index 126397c..eb0cf19 100755 --- a/proxy/src/main/java/proxy/packet/S3EPacketTeams.java +++ b/proxy/src/main/java/proxy/packet/S3EPacketTeams.java @@ -5,7 +5,7 @@ import java.util.Collection; import com.google.common.collect.Lists; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S3FPacketCustomPayload.java b/proxy/src/main/java/proxy/packet/S3FPacketCustomPayload.java index e023426..f2bb4fc 100755 --- a/proxy/src/main/java/proxy/packet/S3FPacketCustomPayload.java +++ b/proxy/src/main/java/proxy/packet/S3FPacketCustomPayload.java @@ -3,7 +3,7 @@ package proxy.packet; import io.netty.buffer.ByteBuf; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S40PacketDisconnect.java b/proxy/src/main/java/proxy/packet/S40PacketDisconnect.java index 61a31a3..452a9f1 100755 --- a/proxy/src/main/java/proxy/packet/S40PacketDisconnect.java +++ b/proxy/src/main/java/proxy/packet/S40PacketDisconnect.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; import proxy.util.Formatter; diff --git a/proxy/src/main/java/proxy/packet/S41PacketServerDifficulty.java b/proxy/src/main/java/proxy/packet/S41PacketServerDifficulty.java index 3c78a61..7d34469 100755 --- a/proxy/src/main/java/proxy/packet/S41PacketServerDifficulty.java +++ b/proxy/src/main/java/proxy/packet/S41PacketServerDifficulty.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S42PacketCombatEvent.java b/proxy/src/main/java/proxy/packet/S42PacketCombatEvent.java index 6820c18..f0d087a 100755 --- a/proxy/src/main/java/proxy/packet/S42PacketCombatEvent.java +++ b/proxy/src/main/java/proxy/packet/S42PacketCombatEvent.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S43PacketCamera.java b/proxy/src/main/java/proxy/packet/S43PacketCamera.java index 9eae330..46430e3 100755 --- a/proxy/src/main/java/proxy/packet/S43PacketCamera.java +++ b/proxy/src/main/java/proxy/packet/S43PacketCamera.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S44PacketWorldBorder.java b/proxy/src/main/java/proxy/packet/S44PacketWorldBorder.java index 7381c51..3cb00ae 100755 --- a/proxy/src/main/java/proxy/packet/S44PacketWorldBorder.java +++ b/proxy/src/main/java/proxy/packet/S44PacketWorldBorder.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S45PacketTitle.java b/proxy/src/main/java/proxy/packet/S45PacketTitle.java index 79f9b04..d962708 100755 --- a/proxy/src/main/java/proxy/packet/S45PacketTitle.java +++ b/proxy/src/main/java/proxy/packet/S45PacketTitle.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S46PacketSetCompressionLevel.java b/proxy/src/main/java/proxy/packet/S46PacketSetCompressionLevel.java index ac891d4..6ac195c 100755 --- a/proxy/src/main/java/proxy/packet/S46PacketSetCompressionLevel.java +++ b/proxy/src/main/java/proxy/packet/S46PacketSetCompressionLevel.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S47PacketPlayerListHeaderFooter.java b/proxy/src/main/java/proxy/packet/S47PacketPlayerListHeaderFooter.java index 9f937a8..130a296 100755 --- a/proxy/src/main/java/proxy/packet/S47PacketPlayerListHeaderFooter.java +++ b/proxy/src/main/java/proxy/packet/S47PacketPlayerListHeaderFooter.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S48PacketResourcePackSend.java b/proxy/src/main/java/proxy/packet/S48PacketResourcePackSend.java index 86a1b7e..0e4bd6c 100755 --- a/proxy/src/main/java/proxy/packet/S48PacketResourcePackSend.java +++ b/proxy/src/main/java/proxy/packet/S48PacketResourcePackSend.java @@ -2,7 +2,7 @@ package proxy.packet; import java.io.IOException; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/packet/S49PacketUpdateEntityNBT.java b/proxy/src/main/java/proxy/packet/S49PacketUpdateEntityNBT.java index 43212de..d18628a 100755 --- a/proxy/src/main/java/proxy/packet/S49PacketUpdateEntityNBT.java +++ b/proxy/src/main/java/proxy/packet/S49PacketUpdateEntityNBT.java @@ -3,7 +3,7 @@ package proxy.packet; import java.io.IOException; import java.util.Map; -import proxy.network.ProxyHandler; +import proxy.handler.ProxyHandler; import proxy.network.Packet; import proxy.network.PacketBuffer; diff --git a/proxy/src/main/java/proxy/util/ServerInfo.java b/proxy/src/main/java/proxy/packet/ServerInfo.java similarity index 98% rename from proxy/src/main/java/proxy/util/ServerInfo.java rename to proxy/src/main/java/proxy/packet/ServerInfo.java index 916470a..d90109a 100755 --- a/proxy/src/main/java/proxy/util/ServerInfo.java +++ b/proxy/src/main/java/proxy/packet/ServerInfo.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; import com.google.gson.Gson; import com.google.gson.GsonBuilder; diff --git a/proxy/src/main/java/proxy/util/Stack.java b/proxy/src/main/java/proxy/packet/Stack.java similarity index 96% rename from proxy/src/main/java/proxy/util/Stack.java rename to proxy/src/main/java/proxy/packet/Stack.java index 266998e..0da44d4 100755 --- a/proxy/src/main/java/proxy/util/Stack.java +++ b/proxy/src/main/java/proxy/packet/Stack.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; import java.util.Map; diff --git a/proxy/src/main/java/proxy/util/Vec3.java b/proxy/src/main/java/proxy/packet/Vec3.java similarity index 96% rename from proxy/src/main/java/proxy/util/Vec3.java rename to proxy/src/main/java/proxy/packet/Vec3.java index 0db7ade..405d474 100755 --- a/proxy/src/main/java/proxy/util/Vec3.java +++ b/proxy/src/main/java/proxy/packet/Vec3.java @@ -1,4 +1,4 @@ -package proxy.util; +package proxy.packet; public class Vec3 { private final int x; diff --git a/proxy/src/main/java/proxy/util/LazyLoader.java b/proxy/src/main/java/proxy/util/LazyLoader.java index 8827d11..65b6b2e 100755 --- a/proxy/src/main/java/proxy/util/LazyLoader.java +++ b/proxy/src/main/java/proxy/util/LazyLoader.java @@ -1,6 +1,8 @@ package proxy.util; -public abstract class LazyLoader { +import io.netty.channel.EventLoopGroup; + +public abstract class LazyLoader { private T value; private boolean isLoaded = false;