mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-21 04:32:15 +00:00
Some import renames and compile error fixes, killed ~800.
This commit is contained in:
1 parent
1f80eb17df
commit
ac7c4d2f6c
90 files changed
+454
-441
No files matched your search
@@ -42,7 +42,7 @@ import net.minecraft.network.NetworkManager;
|
||||
import net.minecraft.network.handshake.client.C00Handshake;
|
||||
import net.minecraft.network.login.server.S00PacketDisconnect;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.ChatComponentText;
|
||||
import net.minecraft.util.TextComponentString;
|
||||
import net.minecraft.util.IThreadListener;
|
||||
import net.minecraft.world.World;
|
||||
import net.minecraft.world.storage.SaveHandler;
|
||||
@@ -609,7 +609,7 @@ public class FMLCommonHandler
|
||||
{
|
||||
if (!shouldAllowPlayerLogins())
|
||||
{
|
||||
ChatComponentText text = new ChatComponentText("Server is still starting! Please wait before reconnecting.");
|
||||
TextComponentString text = new TextComponentString("Server is still starting! Please wait before reconnecting.");
|
||||
FMLLog.info("Disconnecting Player: " + text.getUnformattedText());
|
||||
manager.sendPacket(new S00PacketDisconnect(text));
|
||||
manager.closeChannel(text);
|
||||
@@ -619,7 +619,7 @@ public class FMLCommonHandler
|
||||
if (packet.getRequestedState() == EnumConnectionState.LOGIN && (!NetworkRegistry.INSTANCE.isVanillaAccepted(Side.CLIENT) && !packet.hasFMLMarker()))
|
||||
{
|
||||
manager.setConnectionState(EnumConnectionState.LOGIN);
|
||||
ChatComponentText text = new ChatComponentText("This server requires FML/Forge to be installed. Contact your server admin for more details.");
|
||||
TextComponentString text = new TextComponentString("This server requires FML/Forge to be installed. Contact your server admin for more details.");
|
||||
FMLLog.info("Disconnecting Player: " + text.getUnformattedText());
|
||||
manager.sendPacket(new S00PacketDisconnect(text));
|
||||
manager.closeChannel(text);
|
||||
|
||||
+6
-6
@@ -32,7 +32,7 @@ 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.ChatComponentText;
|
||||
import net.minecraft.util.TextComponentString;
|
||||
import net.minecraftforge.common.DimensionManager;
|
||||
import net.minecraftforge.common.MinecraftForge;
|
||||
import net.minecraftforge.fml.common.FMLCommonHandler;
|
||||
@@ -235,7 +235,7 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
|
||||
this.state = ConnectionState.CONNECTED;
|
||||
MinecraftForge.EVENT_BUS.post(new FMLNetworkEvent.ServerConnectionFromClientEvent(manager));
|
||||
if (DEBUG_HANDSHAKE)
|
||||
manager.closeChannel(new ChatComponentText("Handshake Complete review log file for details."));
|
||||
manager.closeChannel(new TextComponentString("Handshake Complete review log file for details."));
|
||||
scm.initializeConnectionToPlayer(manager, player, serverHandler);
|
||||
}
|
||||
|
||||
@@ -306,19 +306,19 @@ public class NetworkDispatcher extends SimpleChannelInboundHandler<Packet> imple
|
||||
@SuppressWarnings("unchecked")
|
||||
private void kickWithMessage(String message)
|
||||
{
|
||||
final ChatComponentText chatcomponenttext = new ChatComponentText(message);
|
||||
final TextComponentString TextComponentString = new TextComponentString(message);
|
||||
if (side == Side.CLIENT)
|
||||
{
|
||||
manager.closeChannel(chatcomponenttext);
|
||||
manager.closeChannel(TextComponentString);
|
||||
}
|
||||
else
|
||||
{
|
||||
manager.sendPacket(new S40PacketDisconnect(chatcomponenttext), new GenericFutureListener<Future<? super Void>>()
|
||||
manager.sendPacket(new S40PacketDisconnect(TextComponentString), new GenericFutureListener<Future<? super Void>>()
|
||||
{
|
||||
@Override
|
||||
public void operationComplete(Future<? super Void> result)
|
||||
{
|
||||
manager.closeChannel(chatcomponenttext);
|
||||
manager.closeChannel(TextComponentString);
|
||||
}
|
||||
}, new GenericFutureListener[0]);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user