From 2847644368572c84489d3a2886d01f7d7babeb43 Mon Sep 17 00:00:00 2001 From: LexManos Date: Sun, 6 Mar 2016 18:45:21 -0800 Subject: [PATCH] NetworkDispatcher/FMLProxyPacket 41 more errors cleaned. --- .../network/handshake/NetworkDispatcher.java | 48 +++++++++---------- .../network/internal/FMLProxyPacket.java | 16 +++---- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java index a88abe4cf8..e99d59767e 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java +++ b/src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java @@ -27,12 +27,12 @@ import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; -import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.network.play.server.S01PacketJoinGame; -import net.minecraft.network.play.server.S3FPacketCustomPayload; -import net.minecraft.network.play.server.S40PacketDisconnect; -import net.minecraft.server.management.ServerConfigurationManager; -import net.minecraft.util.TextComponentString; +import net.minecraft.network.play.client.CPacketCustomPayload; +import net.minecraft.network.play.server.SPacketJoinGame; +import net.minecraft.network.play.server.SPacketCustomPayload; +import net.minecraft.network.play.server.SPacketDisconnect; +import net.minecraft.server.management.PlayerList; +import net.minecraft.util.text.TextComponentString; import net.minecraftforge.common.DimensionManager; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fml.common.FMLCommonHandler; @@ -73,7 +73,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple return net; } - public static NetworkDispatcher allocAndSet(NetworkManager manager, ServerConfigurationManager scm) + public static NetworkDispatcher allocAndSet(NetworkManager manager, PlayerList scm) { NetworkDispatcher net = new NetworkDispatcher(manager, scm); manager.channel().attr(FML_DISPATCHER).getAndSet(net); @@ -84,7 +84,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple public static final AttributeKey IS_LOCAL = AttributeKey.valueOf("fml:isLocal"); public static final AttributeKey FML_GAMEDATA_SNAPSHOT = AttributeKey.valueOf("fml:gameDataSnapshot"); public final NetworkManager manager; - private final ServerConfigurationManager scm; + private final PlayerList scm; private EntityPlayerMP player; private ConnectionState state; private ConnectionType connectionType; @@ -110,7 +110,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple PacketLoggingHandler.register(manager); } - public NetworkDispatcher(NetworkManager manager, ServerConfigurationManager scm) + public NetworkDispatcher(NetworkManager manager, PlayerList scm) { super(Packet.class, false); this.manager = manager; @@ -206,7 +206,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple int dimension = playerNBT.getInteger("Dimension"); if (DimensionManager.isDimensionRegistered(dimension)) { - return dimension; + return dimension; } } return 0; @@ -243,13 +243,13 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple protected void channelRead0(ChannelHandlerContext ctx, Packet msg) throws Exception { boolean handled = false; - if (msg instanceof C17PacketCustomPayload) + if (msg instanceof CPacketCustomPayload) { - handled = handleServerSideCustomPacket((C17PacketCustomPayload) msg, ctx); + handled = handleServerSideCustomPacket((CPacketCustomPayload) msg, ctx); } - else if (msg instanceof S3FPacketCustomPayload) + else if (msg instanceof SPacketCustomPayload) { - handled = handleClientSideCustomPacket((S3FPacketCustomPayload)msg, ctx); + handled = handleClientSideCustomPacket((SPacketCustomPayload)msg, ctx); } else if (state != ConnectionState.CONNECTED && state != ConnectionState.HANDSHAKECOMPLETE) { @@ -263,7 +263,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple private boolean handleVanilla(Packet msg) { - if (state == ConnectionState.AWAITING_HANDSHAKE && msg instanceof S01PacketJoinGame) + if (state == ConnectionState.AWAITING_HANDSHAKE && msg instanceof SPacketJoinGame) { handshakeChannel.pipeline().fireUserEventTriggered(msg); } @@ -304,7 +304,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple kickWithMessage("This is modded. No modded response received. Bye!"); } @SuppressWarnings("unchecked") - private void kickWithMessage(String message) + private void kickWithMessage(String message) { final TextComponentString TextComponentString = new TextComponentString(message); if (side == Side.CLIENT) @@ -313,7 +313,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple } else { - manager.sendPacket(new S40PacketDisconnect(TextComponentString), new GenericFutureListener>() + manager.sendPacket(new SPacketDisconnect(TextComponentString), new GenericFutureListener>() { @Override public void operationComplete(Future result) @@ -326,7 +326,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple } private MultiPartCustomPayload multipart = null; - private boolean handleClientSideCustomPacket(S3FPacketCustomPayload msg, ChannelHandlerContext context) + private boolean handleClientSideCustomPacket(SPacketCustomPayload msg, ChannelHandlerContext context) { String channelName = msg.getChannelName(); if ("FML|MP".equals(channelName)) @@ -389,7 +389,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple return false; } - private boolean handleServerSideCustomPacket(C17PacketCustomPayload msg, ChannelHandlerContext context) + private boolean handleServerSideCustomPacket(CPacketCustomPayload msg, ChannelHandlerContext context) { if (state == ConnectionState.AWAITING_HANDSHAKE) { @@ -457,11 +457,11 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple { if (side == Side.CLIENT) { - MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ClientDisconnectionFromServerEvent(manager)); + MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ClientDisconnectionFromServerEvent(manager)); } else { - MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ServerDisconnectionFromClientEvent(manager)); + MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ServerDisconnectionFromClientEvent(manager)); } cleanAttributes(ctx); ctx.disconnect(promise); @@ -476,7 +476,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple } else { - MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ServerDisconnectionFromClientEvent(manager)); + MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ServerDisconnectionFromClientEvent(manager)); } cleanAttributes(ctx); ctx.close(promise); @@ -582,12 +582,12 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler imple FMLLog.fine("Received override dimension %d", overrideDim); } - public int getOverrideDimension(S01PacketJoinGame packetIn) { + public int getOverrideDimension(SPacketJoinGame packetIn) { FMLLog.fine("Overriding dimension: using %d", this.overrideLoginDim); return this.overrideLoginDim != 0 ? this.overrideLoginDim : packetIn.getDimension(); } - private class MultiPartCustomPayload extends S3FPacketCustomPayload + private class MultiPartCustomPayload extends SPacketCustomPayload { private String channel; private byte[] data; diff --git a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java index 66a9cd302d..b05b8b13b9 100644 --- a/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java +++ b/src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java @@ -13,8 +13,8 @@ import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; import net.minecraft.network.play.INetHandlerPlayClient; import net.minecraft.network.play.INetHandlerPlayServer; -import net.minecraft.network.play.client.C17PacketCustomPayload; -import net.minecraft.network.play.server.S3FPacketCustomPayload; +import net.minecraft.network.play.client.CPacketCustomPayload; +import net.minecraft.network.play.server.SPacketCustomPayload; import net.minecraftforge.fml.common.FMLLog; import net.minecraftforge.fml.common.network.FMLNetworkException; import net.minecraftforge.fml.common.network.NetworkRegistry; @@ -39,13 +39,13 @@ public class FMLProxyPacket implements Packet { private static Multiset badPackets = ConcurrentHashMultiset.create(); private static int packetCountWarning = Integers.parseInt(System.getProperty("fml.badPacketCounter", "100"), 100); - public FMLProxyPacket(S3FPacketCustomPayload original) + public FMLProxyPacket(SPacketCustomPayload original) { this(original.getBufferData(), original.getChannelName()); this.target = Side.CLIENT; } - public FMLProxyPacket(C17PacketCustomPayload original) + public FMLProxyPacket(CPacketCustomPayload original) { this(original.getBufferData(), original.getChannelName()); this.target = Side.SERVER; @@ -121,7 +121,7 @@ public class FMLProxyPacket implements Packet { } public Packet toC17Packet() { - return new C17PacketCustomPayload(channel, payload); + return new CPacketCustomPayload(channel, payload); } static final int PART_SIZE = 0x1000000 - 0x50; // Make it a constant so that it gets inlined below. @@ -133,7 +133,7 @@ public class FMLProxyPacket implements Packet { if (data.length < PART_SIZE) { - ret.add(new S3FPacketCustomPayload(channel, new PacketBuffer(payload.duplicate()))); + ret.add(new SPacketCustomPayload(channel, new PacketBuffer(payload.duplicate()))); } else { @@ -146,7 +146,7 @@ public class FMLProxyPacket implements Packet { preamble.writeString(channel); preamble.writeByte(parts); preamble.writeInt(data.length); - ret.add(new S3FPacketCustomPayload("FML|MP", preamble)); + ret.add(new SPacketCustomPayload("FML|MP", preamble)); int offset = 0; for (int x = 0; x < parts; x++) @@ -156,7 +156,7 @@ public class FMLProxyPacket implements Packet { tmp[0] = (byte)(x & 0xFF); System.arraycopy(data, offset, tmp, 1, tmp.length - 1); offset += tmp.length - 1; - ret.add(new S3FPacketCustomPayload("FML|MP", new PacketBuffer(Unpooled.wrappedBuffer(tmp)))); + ret.add(new SPacketCustomPayload("FML|MP", new PacketBuffer(Unpooled.wrappedBuffer(tmp)))); } } return ret;