From e47fa70279ec81c54abb3381c428ff3c1e9d7c35 Mon Sep 17 00:00:00 2001 From: cpw Date: Sun, 17 Feb 2019 16:07:47 -0500 Subject: [PATCH] Fix connection to vanilla servers. Generate a default mod server config for mods connecting to servers. Signed-off-by: cpw --- .../network/NetHandlerLoginClient.java.patch | 10 +++++++- .../fml/config/ConfigTracker.java | 9 +++++++ .../fml/network/FMLHandshakeHandler.java | 2 ++ .../fml/network/NetworkHooks.java | 25 ++++++++++++++----- .../server/command/TextComponentHelper.java | 2 +- 5 files changed, 40 insertions(+), 8 deletions(-) diff --git a/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch b/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch index fbee390e30..09506aeb60 100644 --- a/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch +++ b/patches/minecraft/net/minecraft/client/network/NetHandlerLoginClient.java.patch @@ -1,6 +1,14 @@ --- a/net/minecraft/client/network/NetHandlerLoginClient.java +++ b/net/minecraft/client/network/NetHandlerLoginClient.java -@@ -122,6 +122,7 @@ +@@ -98,6 +98,7 @@ + this.field_209525_d.accept(new TextComponentTranslation("connect.joining")); + this.field_175091_e = p_147390_1_.func_179730_a(); + this.field_147393_d.func_150723_a(EnumConnectionState.PLAY); ++ net.minecraftforge.fml.network.NetworkHooks.handleClientLoginSuccess(this.field_147393_d); + this.field_147393_d.func_150719_a(new NetHandlerPlayClient(this.field_147394_b, this.field_147395_c, this.field_147393_d, this.field_175091_e)); + } + +@@ -122,6 +123,7 @@ } public void func_209521_a(SPacketCustomPayloadLogin p_209521_1_) { diff --git a/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java b/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java index 47d0186ff2..4cdc9e4c65 100644 --- a/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java +++ b/src/main/java/net/minecraftforge/fml/config/ConfigTracker.java @@ -19,6 +19,7 @@ package net.minecraftforge.fml.config; +import com.electronwill.nightconfig.core.CommentedConfig; import com.electronwill.nightconfig.core.file.CommentedFileConfig; import com.electronwill.nightconfig.toml.TomlFormat; import net.minecraft.client.Minecraft; @@ -98,4 +99,12 @@ public class ConfigTracker { }); } } + + public void loadDefaultServerConfigs() { + configSets.get(ModConfig.Type.SERVER).forEach(modConfig -> { + final CommentedConfig commentedConfig = CommentedConfig.inMemory(); + modConfig.getSpec().correct(commentedConfig); + modConfig.setConfigData(commentedConfig); + }); + } } diff --git a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java index 0c39926526..2896075d02 100644 --- a/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java +++ b/src/main/java/net/minecraftforge/fml/network/FMLHandshakeHandler.java @@ -197,6 +197,8 @@ public class FMLHandshakeHandler { final FMLHandshakeMessages.C2SModListReply reply = new FMLHandshakeMessages.C2SModListReply(); channel.reply(reply, c.get()); LOGGER.debug(FMLHSMARKER, "Accepted server connection"); + // Set the modded marker on the channel so we know we got packets + c.get().getNetworkManager().channel().attr(FMLNetworking.FML_MARKER).set(NetworkHooks.NETVERSION); } private void handleIndexedMessage(MSG message, Supplier c) diff --git a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java index 5ac839cb84..ed948a2d5c 100644 --- a/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java +++ b/src/main/java/net/minecraftforge/fml/network/NetworkHooks.java @@ -23,7 +23,6 @@ import io.netty.buffer.Unpooled; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayerMP; import net.minecraft.inventory.Container; -import net.minecraft.network.NetHandlerPlayServer; import net.minecraft.network.NetworkManager; import net.minecraft.network.Packet; import net.minecraft.network.PacketBuffer; @@ -33,13 +32,17 @@ import net.minecraft.util.ResourceLocation; import net.minecraft.world.IInteractionObject; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.entity.player.PlayerContainerEvent; +import net.minecraftforge.fml.config.ConfigTracker; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; -import javax.annotation.Nullable; import java.util.Objects; import java.util.function.Consumer; +import java.util.function.Supplier; public class NetworkHooks { + private static final Logger LOGGER = LogManager.getLogger(); public static final String NETVERSION = "FML1"; public static final String NOVERSION = "NONE"; @@ -53,9 +56,9 @@ public class NetworkHooks return Objects.equals(packet.getFMLVersion(), NETVERSION) || NetworkRegistry.acceptsVanillaConnections(); } - public static ConnectionType getConnectionType(final NetHandlerPlayServer connection) + public static ConnectionType getConnectionType(final Supplier connection) { - return ConnectionType.forVersionFlag(connection.netManager.channel().attr(FMLNetworking.FML_MARKER).get()); + return ConnectionType.forVersionFlag(connection.get().channel().attr(FMLNetworking.FML_MARKER).get()); } public static Packet getEntitySpawningPacket(Entity entity) @@ -80,11 +83,21 @@ public class NetworkHooks public static void registerClientLoginChannel(NetworkManager manager) { - if (manager == null) return; - manager.channel().attr(FMLNetworking.FML_MARKER).set(NETVERSION); + if (manager == null || manager.channel() == null) return; + manager.channel().attr(FMLNetworking.FML_MARKER).set(NOVERSION); FMLHandshakeHandler.registerHandshake(manager, NetworkDirection.LOGIN_TO_SERVER); } + public static void handleClientLoginSuccess(NetworkManager manager) { + if (manager == null || manager.channel() == null) return; + if (getConnectionType(()->manager) == ConnectionType.VANILLA) { + LOGGER.info("Connected to a vanilla server. Catching up missing behaviour."); + ConfigTracker.INSTANCE.loadDefaultServerConfigs(); + } else { + LOGGER.info("Connected to a modded server."); + } + } + public static boolean tickNegotiation(NetHandlerLoginServer netHandlerLoginServer, NetworkManager networkManager, EntityPlayerMP player) { return FMLHandshakeHandler.tickLogin(networkManager); diff --git a/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java b/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java index d2c210d5f1..811caa07ef 100644 --- a/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java +++ b/src/main/java/net/minecraftforge/server/command/TextComponentHelper.java @@ -52,7 +52,7 @@ public class TextComponentHelper { EntityPlayerMP playerMP = (EntityPlayerMP) sender; NetHandlerPlayServer channel = playerMP.connection; - return NetworkHooks.getConnectionType(channel) == ConnectionType.VANILLA; + return NetworkHooks.getConnectionType(()->channel.netManager) == ConnectionType.VANILLA; } return false; }