Handle differing network versions for FML gracefully?

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-02-28 00:59:27 -05:00
1 parent 7f1ea578d6
commit cb70702ab5
8 files changed
+52 -37

No files matched your search

@@ -37,7 +37,10 @@ import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppedEvent;
import net.minecraftforge.fml.event.server.FMLServerStoppingEvent;
import net.minecraftforge.fml.loading.FileUtils;
import net.minecraftforge.fml.network.ConnectionType;
import net.minecraftforge.fml.network.FMLNetworkConstants;
import net.minecraftforge.fml.network.NetworkHooks;
import net.minecraftforge.fml.network.NetworkRegistry;
import net.minecraftforge.fml.packs.ResourcePackLoader;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -120,15 +123,19 @@ public class ServerLifecycleHooks
return false;
}
if (packet.getRequestedState() == EnumConnectionState.LOGIN && !NetworkHooks.accepts(packet))
{
manager.setConnectionState(EnumConnectionState.LOGIN);
TextComponentString text = new TextComponentString("This server has mods that require Forge to be installed on the client. Contact your server admin for more details.");
List<String> modNames = net.minecraftforge.fml.network.NetworkRegistry.getNonVanillaNetworkMods();
LOGGER.info(SERVERHOOKS,"Disconnecting vanilla connection attempt. Required mods {}", modNames);
manager.sendPacket(new SPacketDisconnectLogin(text));
manager.closeChannel(text);
return false;
if (packet.getRequestedState() == EnumConnectionState.LOGIN) {
final ConnectionType connectionType = ConnectionType.forVersionFlag(packet.getFMLVersion());
final int versionNumber = connectionType.getFMLVersionNumber(packet.getFMLVersion());
if (connectionType == ConnectionType.MODDED && versionNumber != FMLNetworkConstants.FMLNETVERSION) {
rejectConnection(manager, connectionType, "This modded server is not network compatible with your modded client. Please verify your Forge version closely matches the server. Got net version "+ versionNumber + " this server is net version "+FMLNetworkConstants.FMLNETVERSION);
return false;
}
if (connectionType == ConnectionType.VANILLA && !NetworkRegistry.acceptsVanillaClientConnections()) {
rejectConnection(manager, connectionType, "This server has mods that require Forge to be installed on the client. Contact your server admin for more details.");
return false;
}
}
if (packet.getRequestedState() == EnumConnectionState.STATUS) return true;
@@ -138,6 +145,14 @@ public class ServerLifecycleHooks
}
private static void rejectConnection(final NetworkManager manager, ConnectionType type, String message) {
manager.setConnectionState(EnumConnectionState.LOGIN);
LOGGER.info(SERVERHOOKS, "Disconnecting {} connection attempt: ", type, message);
TextComponentString text = new TextComponentString(message);
manager.sendPacket(new SPacketDisconnectLogin(text));
manager.closeChannel(text);
}
public static void handleExit(int retVal)
{
/*