Some tweaks around the code base. A functional consumer for networking - return a bool from your consumer function, rather than setPacketHandled.

Tweak the server modloading behaviour to try and be a bit clearer that a mod errored.

Signed-off-by: cpw <[email protected]>
This commit is contained in:
cpw committed 2019-09-16 20:14:25 -04:00
1 parent 79ce18ac3e
commit 71a4828809
7 files changed
+80 -15

No files matched your search

@@ -21,10 +21,7 @@ package net.minecraftforge.fml.server;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.fml.LogicalSidedProvider;
import net.minecraftforge.fml.ModLoader;
import net.minecraftforge.fml.ModLoadingWarning;
import net.minecraftforge.fml.SidedProvider;
import net.minecraftforge.fml.*;
import net.minecraftforge.fml.network.FMLStatusPing;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
@@ -37,17 +34,31 @@ public class ServerModLoader
{
private static final Logger LOGGER = LogManager.getLogger();
private static DedicatedServer server;
private static boolean hasErrors = false;
public static void begin(DedicatedServer dedicatedServer) {
ServerModLoader.server = dedicatedServer;
SidedProvider.setServer(()->dedicatedServer);
LogicalSidedProvider.setServer(()->dedicatedServer);
LanguageHook.loadForgeAndMCLangs();
ModLoader.get().gatherAndInitializeMods(null);
ModLoader.get().loadMods(Runnable::run, (a)->{}, (a)->{});
try {
ModLoader.get().gatherAndInitializeMods(null);
ModLoader.get().loadMods(Runnable::run, (a)->{}, (a)->{});
} catch (LoadingFailedException e) {
ServerModLoader.hasErrors = true;
throw e;
}
}
public static void end() {
ModLoader.get().finishMods(Runnable::run);
try {
ModLoader.get().finishMods(Runnable::run);
} catch (LoadingFailedException e) {
ServerModLoader.hasErrors = true;
throw e;
}
List<ModLoadingWarning> warnings = ModLoader.get().getWarnings();
if (!warnings.isEmpty()) {
LOGGER.warn(LOADING, "Mods loaded with {} warnings", warnings.size());
@@ -56,4 +67,8 @@ public class ServerModLoader
MinecraftForge.EVENT_BUS.start();
server.getServerStatusResponse().setForgeData(new FMLStatusPing()); //gathers NetworkRegistry data
}
public static boolean hasErrors() {
return ServerModLoader.hasErrors;
}
}