mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-12 08:17:35 +00:00
Fix serverlang loading issue, by frontloading MC and Forge langs,
so error messaging works. Signed-off-by: cpw <cpw+github@weeksfamily.ca>
This commit is contained in:
3 files changed
+18
-3
No files matched your search
@@ -26,7 +26,7 @@ import net.minecraft.resources.IResource;
|
||||
import net.minecraft.server.MinecraftServer;
|
||||
import net.minecraft.util.JsonUtils;
|
||||
import net.minecraft.util.ResourceLocation;
|
||||
import net.minecraftforge.fml.packs.ResourcePackLoader;
|
||||
import net.minecraftforge.fml.ForgeI18n;
|
||||
import org.apache.commons.io.IOUtils;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
@@ -91,6 +91,17 @@ public class LanguageHook
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
static void loadForgeAndMCLangs() {
|
||||
modTable = new HashMap<>(5000);
|
||||
final InputStream mc = Thread.currentThread().getContextClassLoader().getResourceAsStream("assets/minecraft/lang/en_us.json");
|
||||
final InputStream forge = Thread.currentThread().getContextClassLoader().getResourceAsStream("assets/forge/lang/en_us.json");
|
||||
loadLocaleData(mc);
|
||||
loadLocaleData(forge);
|
||||
capturedTables.forEach(t->t.putAll(modTable));
|
||||
ForgeI18n.loadLanguageData(modTable);
|
||||
}
|
||||
|
||||
static void loadLanguagesOnServer(MinecraftServer server) {
|
||||
modTable = new HashMap<>(5000);
|
||||
// Possible multi-language server support?
|
||||
@@ -98,5 +109,6 @@ public class LanguageHook
|
||||
loadLanguage(lang, server);
|
||||
}
|
||||
capturedTables.forEach(t->t.putAll(modTable));
|
||||
ForgeI18n.loadLanguageData(modTable);
|
||||
}
|
||||
}
|
||||
@@ -23,7 +23,6 @@ import net.minecraft.server.dedicated.DedicatedServer;
|
||||
import net.minecraftforge.fml.LogicalSidedProvider;
|
||||
import net.minecraftforge.fml.ModLoader;
|
||||
import net.minecraftforge.fml.SidedProvider;
|
||||
import net.minecraftforge.fml.packs.ResourcePackLoader;
|
||||
|
||||
public class ServerModLoader
|
||||
{
|
||||
@@ -32,6 +31,7 @@ public class ServerModLoader
|
||||
ServerModLoader.server = dedicatedServer;
|
||||
SidedProvider.setServer(()->dedicatedServer);
|
||||
LogicalSidedProvider.setServer(()->dedicatedServer);
|
||||
LanguageHook.loadForgeAndMCLangs();
|
||||
ModLoader.get().loadMods();
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user