diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java index 37693c723a..09733f9d14 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/GameServer.java @@ -146,6 +146,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -341,6 +343,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/NpcStringId.java index 6138f1bdde..920642637a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -33104,7 +33103,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -33216,8 +33214,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -33265,6 +33261,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/SystemMessageId.java index bf6d7144c7..c42923b38a 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -13979,7 +13978,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -14085,8 +14083,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -14134,6 +14130,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java index 717772e98d..4025568560 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/GameServer.java @@ -150,6 +150,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -349,6 +351,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/NpcStringId.java index 65ec1abd0e..d57a28e5ce 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -36245,7 +36244,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -36357,8 +36355,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -36406,6 +36402,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/SystemMessageId.java index c562aa7b5d..4614ed3843 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -15620,7 +15619,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -15726,8 +15724,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -15775,6 +15771,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java index 717772e98d..4025568560 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/GameServer.java @@ -150,6 +150,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -349,6 +351,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/NpcStringId.java index 3cb8b143eb..d6fae8aa2b 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -37961,7 +37960,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -38073,8 +38071,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -38122,6 +38118,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/SystemMessageId.java index e61b678a98..28befd5103 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -15848,7 +15847,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -15954,8 +15952,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -16003,6 +15999,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java index 9e7d7cec03..ced6976385 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/GameServer.java @@ -150,6 +150,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -349,6 +351,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/NpcStringId.java index 1d26fdad69..a123fa325e 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -39521,7 +39520,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -39633,8 +39631,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -39682,6 +39678,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/SystemMessageId.java index a9d8d671db..cb628594d1 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -16190,7 +16189,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -16296,8 +16294,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -16345,6 +16341,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java index eb71b8ff1e..d8d175b741 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/GameServer.java @@ -152,6 +152,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -353,6 +355,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/NpcStringId.java index 8005083ec0..d21085bb94 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -42011,7 +42010,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -42123,8 +42121,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -42172,6 +42168,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 9274946660..447796c6d1 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -16865,7 +16864,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -16971,8 +16969,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17020,6 +17016,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java index eb71b8ff1e..d8d175b741 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/GameServer.java @@ -152,6 +152,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -353,6 +355,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/NpcStringId.java index cdd22e090d..974821002b 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -42887,7 +42886,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -42999,8 +42997,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -43048,6 +43044,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 0e1043763f..898db3601c 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -17123,7 +17122,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -17229,8 +17227,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17278,6 +17274,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java index b5c635c4c8..622fc759c1 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/GameServer.java @@ -153,6 +153,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -355,6 +357,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/NpcStringId.java index cb3e2cfe42..ce2987d9ba 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -43898,7 +43897,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -44010,8 +44008,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -44059,6 +44055,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/SystemMessageId.java index cea3115c11..efbeee564a 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -17183,7 +17182,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -17289,8 +17287,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17338,6 +17334,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java index 92c2cd1b4e..e75d22e905 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/GameServer.java @@ -144,6 +144,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -331,6 +333,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/NpcStringId.java index 2737646549..8a5923a9e9 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -17792,7 +17791,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -17903,8 +17901,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17952,6 +17948,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/SystemMessageId.java index ab8e9a4c79..22a688b4f3 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -9755,7 +9754,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -9861,8 +9859,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -9910,6 +9906,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java index b0ed8693fe..8bf2bd0cd6 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/GameServer.java @@ -147,6 +147,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -345,6 +347,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/NpcStringId.java index d141654348..e2ebe26b7d 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -33884,7 +33883,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -33996,8 +33994,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -34045,6 +34041,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 984cb719d3..b5e2567756 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -15869,7 +15868,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -15975,8 +15973,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -16024,6 +16020,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java index b0ed8693fe..8bf2bd0cd6 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/GameServer.java @@ -147,6 +147,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -345,6 +347,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/NpcStringId.java index 15ee06a5de..20b83c220c 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -35246,7 +35245,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -35358,8 +35356,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -35407,6 +35403,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 0db051bda7..9fa75f4b7e 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -16187,7 +16186,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -16293,8 +16291,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -16342,6 +16338,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java index b0ed8693fe..8bf2bd0cd6 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/GameServer.java @@ -147,6 +147,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -345,6 +347,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/NpcStringId.java index e9804e0247..a49e0beb3b 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -35405,7 +35404,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -35517,8 +35515,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -35566,6 +35562,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 87a9127813..2d357ce0c9 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -16865,7 +16864,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -16971,8 +16969,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17020,6 +17016,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java index b0ed8693fe..8bf2bd0cd6 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/GameServer.java @@ -147,6 +147,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -345,6 +347,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/NpcStringId.java index 613b57ca4f..45e1b43489 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -35546,7 +35545,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -35658,8 +35656,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -35707,6 +35703,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 5aa7618ea9..18a48f5659 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -17123,7 +17122,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -17229,8 +17227,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17278,6 +17274,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java index 960a31fcb3..4b6f559189 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/GameServer.java @@ -148,6 +148,8 @@ import org.l2jmobius.gameserver.model.events.EventDispatcher; import org.l2jmobius.gameserver.model.olympiad.Olympiad; import org.l2jmobius.gameserver.model.votereward.VoteSystem; import org.l2jmobius.gameserver.network.ClientNetworkManager; +import org.l2jmobius.gameserver.network.NpcStringId; +import org.l2jmobius.gameserver.network.SystemMessageId; import org.l2jmobius.gameserver.network.loginserver.LoginServerNetworkManager; import org.l2jmobius.gameserver.network.telnet.TelnetServer; import org.l2jmobius.gameserver.scripting.ScriptEngineManager; @@ -347,6 +349,8 @@ public class GameServer } if (Config.MULTILANG_ENABLE) { + SystemMessageId.loadLocalisations(); + NpcStringId.loadLocalisations(); SendMessageLocalisationData.getInstance(); NpcNameLocalisationData.getInstance(); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java index e374cd78a5..860b472e47 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/NpcNameLocalisationData.java @@ -19,6 +19,7 @@ package org.l2jmobius.gameserver.data.xml.impl; import java.io.File; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -67,7 +68,7 @@ public class NpcNameLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java index 1d54c17b5b..c52c6c519b 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/data/xml/impl/SendMessageLocalisationData.java @@ -20,6 +20,7 @@ import java.io.File; import java.util.Map; import java.util.Map.Entry; import java.util.concurrent.ConcurrentHashMap; +import java.util.logging.Level; import java.util.logging.Logger; import org.w3c.dom.Document; @@ -69,7 +70,7 @@ public class SendMessageLocalisationData implements IXmlReader } else { - LOGGER.info(getClass().getSimpleName() + ": Loaded localisations for '" + lang + "'"); + LOGGER.log(Level.INFO, getClass().getSimpleName() + ": Loaded localisations for [" + lang + "]."); } } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/NpcStringId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/NpcStringId.java index 6f6a639883..4e87b0c2c6 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/NpcStringId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/NpcStringId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.ExShowScreenMessage; public final class NpcStringId { private static final Logger LOGGER = Logger.getLogger(NpcStringId.class.getName()); - private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; - public static final NpcStringId[] EMPTY_ARRAY = new NpcStringId[0]; - private static Map VALUES = new HashMap<>(); + private static final NSLocalisation[] EMPTY_NSL_ARRAY = new NSLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 1, message = "Hello! I am $s1. You are $s2, right? Hehehe") public static NpcStringId HELLO_I_AM_S1_YOU_ARE_S2_RIGHT_HEHEHE; @@ -35792,7 +35791,6 @@ public final class NpcStringId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -35904,8 +35902,6 @@ public final class NpcStringId continue; } - LOGGER.log(Level.INFO, "NpcStringId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -35953,6 +35949,8 @@ public final class NpcStringId { LOGGER.log(Level.SEVERE, "NpcStringId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "NpcStringId: Loaded localisations for [" + lang + "]."); } } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/SystemMessageId.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/SystemMessageId.java index 75b5a5ce97..9cd371a88a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/SystemMessageId.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/SystemMessageId.java @@ -39,10 +39,9 @@ import org.l2jmobius.gameserver.network.serverpackets.SystemMessage; public final class SystemMessageId { private static final Logger LOGGER = Logger.getLogger(SystemMessageId.class.getName()); - private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; - public static final SystemMessageId[] EMPTY_ARRAY = new SystemMessageId[0]; - private static Map VALUES = new HashMap<>(); + private static final SMLocalisation[] EMPTY_SML_ARRAY = new SMLocalisation[0]; + private static final Map VALUES = new HashMap<>(); @ClientString(id = 0, message = "You have been disconnected from the server.") public static SystemMessageId YOU_HAVE_BEEN_DISCONNECTED_FROM_THE_SERVER; @@ -17264,7 +17263,6 @@ public final class SystemMessageId static { buildFastLookupTable(); - loadLocalisations(); } private static void buildFastLookupTable() @@ -17370,8 +17368,6 @@ public final class SystemMessageId continue; } - LOGGER.log(Level.INFO, "SystemMessageId: Loading localisation for '" + lang + "'"); - try { doc = factory.newDocumentBuilder().parse(file); @@ -17419,6 +17415,8 @@ public final class SystemMessageId { LOGGER.log(Level.SEVERE, "SystemMessageId: Failed loading '" + file + "'", e); } + + LOGGER.log(Level.INFO, "SystemMessageId: Loaded localisations for [" + lang + "]."); } }