diff --git a/src/main/java/net/knarcraft/dynmapcitizens/DynmapCitizens.java b/src/main/java/net/knarcraft/dynmapcitizens/DynmapCitizens.java index cac77f9..10a8bdb 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/DynmapCitizens.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/DynmapCitizens.java @@ -8,7 +8,6 @@ import net.knarcraft.dynmapcitizens.handler.trait.MinstrelHandler; import net.knarcraft.dynmapcitizens.handler.trait.SentinelHandler; import net.knarcraft.dynmapcitizens.handler.trait.quests.QuestsHandler; import net.knarcraft.dynmapcitizens.settings.GlobalSettings; -import net.knarcraft.knarlib.KnarLib; import net.knarcraft.knarlib.formatting.TranslatableTimeUnit; import net.knarcraft.knarlib.formatting.Translator; import org.bukkit.Bukkit; @@ -26,6 +25,7 @@ import java.util.logging.Level; public final class DynmapCitizens extends JavaPlugin { private static DynmapCitizens instance; + private static Translator translator; private DynmapAPI dynmapAPI; private VaultHandler vaultHandler; private GlobalSettings globalSettings; @@ -34,7 +34,6 @@ public final class DynmapCitizens extends JavaPlugin { @Override public void onEnable() { DynmapCitizens.instance = this; - KnarLib.setPlugin(this); //Initialize quest and dynmap APIs PluginManager pluginManager = Bukkit.getPluginManager(); @@ -56,9 +55,10 @@ public final class DynmapCitizens extends JavaPlugin { this.globalSettings.load(configuration); //Load all messages - Translator.registerMessageCategory(TranslatableTimeUnit.UNIT_SECOND); - Translator.registerMessageCategory(DynmapCitizensTranslatableMessage.SENTINEL_DESCRIPTION); - Translator.loadLanguages("en"); + translator = new Translator(); + translator.registerMessageCategory(TranslatableTimeUnit.UNIT_SECOND); + translator.registerMessageCategory(DynmapCitizensTranslatableMessage.SENTINEL_DESCRIPTION); + translator.loadLanguages(this.getDataFolder(), "en"); //Initialize all enabled traits initializeTraitHandlers(configuration); @@ -80,6 +80,15 @@ public final class DynmapCitizens extends JavaPlugin { //TODO: Perhaps remove icons, just in case? } + /** + * Gets the translator to use for translation + * + * @return
The translator to use
+ */ + public static Translator getTranslator() { + return translator; + } + /** * Gets the global settings for this plugin * diff --git a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java index 4bb64f9..d3bce69 100644 --- a/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java +++ b/src/main/java/net/knarcraft/dynmapcitizens/handler/trait/quests/QuestPlannerInfoGenerator.java @@ -2,6 +2,7 @@ package net.knarcraft.dynmapcitizens.handler.trait.quests; import me.blackvein.quests.quests.IQuest; import me.blackvein.quests.quests.Planner; +import net.knarcraft.dynmapcitizens.DynmapCitizens; import net.knarcraft.knarlib.formatting.TimeFormatter; import java.text.DateFormat; @@ -37,7 +38,8 @@ public class QuestPlannerInfoGenerator { //Quest can be repeated after a cool-down if (planner.hasCooldown()) { plannerInfo.append("