upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-13 00:37:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

NetworkDispatcher/FMLProxyPacket 41 more errors cleaned.

Browse Source
This commit is contained in:
LexManos committed 2016-03-06 18:45:21 -08:00
1 parent a83fe44d8a
commit 2847644368
2 files changed
+32 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/main/java/net/minecraftforge/fml/common/network/handshake/NetworkDispatcher.java
+24 -24
View File
@@ -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<Packet> 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<Packet> imple
public static final AttributeKey<Boolean> IS_LOCAL = AttributeKey.valueOf("fml:isLocal");
public static final AttributeKey<PersistentRegistryManager.GameDataSnapshot> 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<Packet> 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<Packet> 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<Packet> 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<Packet> 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<Packet> 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<Packet> imple
}
else
{
manager.sendPacket(new S40PacketDisconnect(TextComponentString), new GenericFutureListener<Future<? super Void>>()
manager.sendPacket(new SPacketDisconnect(TextComponentString), new GenericFutureListener<Future<? super Void>>()
{
@Override
public void operationComplete(Future<? super Void> result)
@@ -326,7 +326,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> 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<Packet> 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<Packet> 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<Packet> 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<Packet> 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;
src/main/java/net/minecraftforge/fml/common/network/internal/FMLProxyPacket.java
+8 -8
View File
@@ -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<INetHandler> {
private static Multiset<String> 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<INetHandler> {
}
public Packet<INetHandlerPlayServer> 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<INetHandler> {
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<INetHandler> {
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<INetHandler> {
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;