From afd9cb7ca543bc8b7e8e9230dfd726e6394fdc02 Mon Sep 17 00:00:00 2001
From: fullwall <fullwall25@gmail.com>
Date: Thu, 7 Jun 2018 16:59:52 +0800
Subject: [PATCH] Change locale order

---
 .../main/java/net/citizensnpcs/Citizens.java  | 60 ++++++++++++-------
 1 file changed, 39 insertions(+), 21 deletions(-)

diff --git a/main/src/main/java/net/citizensnpcs/Citizens.java b/main/src/main/java/net/citizensnpcs/Citizens.java
index c447d0d18..f4a3e5b22 100644
--- a/main/src/main/java/net/citizensnpcs/Citizens.java
+++ b/main/src/main/java/net/citizensnpcs/Citizens.java
@@ -1,7 +1,22 @@
 package net.citizensnpcs;
 
+import java.io.File;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.Callable;
+
+import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Maps;
+
 import net.citizensnpcs.Settings.Setting;
 import net.citizensnpcs.api.CitizensAPI;
 import net.citizensnpcs.api.CitizensPlugin;
@@ -10,7 +25,11 @@ import net.citizensnpcs.api.command.CommandContext;
 import net.citizensnpcs.api.command.CommandManager;
 import net.citizensnpcs.api.command.CommandManager.CommandInfo;
 import net.citizensnpcs.api.command.Injector;
-import net.citizensnpcs.api.event.*;
+import net.citizensnpcs.api.event.CitizensDisableEvent;
+import net.citizensnpcs.api.event.CitizensEnableEvent;
+import net.citizensnpcs.api.event.CitizensPreReloadEvent;
+import net.citizensnpcs.api.event.CitizensReloadEvent;
+import net.citizensnpcs.api.event.DespawnReason;
 import net.citizensnpcs.api.exception.NPCLoadException;
 import net.citizensnpcs.api.npc.NPC;
 import net.citizensnpcs.api.npc.NPCDataStore;
@@ -20,8 +39,17 @@ import net.citizensnpcs.api.scripting.EventRegistrar;
 import net.citizensnpcs.api.scripting.ObjectProvider;
 import net.citizensnpcs.api.scripting.ScriptCompiler;
 import net.citizensnpcs.api.trait.TraitFactory;
-import net.citizensnpcs.api.util.*;
-import net.citizensnpcs.commands.*;
+import net.citizensnpcs.api.util.Messaging;
+import net.citizensnpcs.api.util.NBTStorage;
+import net.citizensnpcs.api.util.Storage;
+import net.citizensnpcs.api.util.Translator;
+import net.citizensnpcs.api.util.YamlStorage;
+import net.citizensnpcs.commands.AdminCommands;
+import net.citizensnpcs.commands.EditorCommands;
+import net.citizensnpcs.commands.NPCCommands;
+import net.citizensnpcs.commands.TemplateCommands;
+import net.citizensnpcs.commands.TraitCommands;
+import net.citizensnpcs.commands.WaypointCommands;
 import net.citizensnpcs.editor.Editor;
 import net.citizensnpcs.npc.CitizensNPCRegistry;
 import net.citizensnpcs.npc.CitizensTraitFactory;
@@ -30,23 +58,12 @@ import net.citizensnpcs.npc.ai.speech.Chat;
 import net.citizensnpcs.npc.ai.speech.CitizensSpeechFactory;
 import net.citizensnpcs.npc.profile.ProfileFetcher;
 import net.citizensnpcs.npc.skin.Skin;
-import net.citizensnpcs.util.*;
+import net.citizensnpcs.util.Messages;
+import net.citizensnpcs.util.NMS;
+import net.citizensnpcs.util.PlayerUpdateTask;
+import net.citizensnpcs.util.StringHelper;
+import net.citizensnpcs.util.Util;
 import net.milkbowl.vault.economy.Economy;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.Callable;
 
 public class Citizens extends JavaPlugin implements CitizensPlugin {
     private final CommandManager commands = new CommandManager();
@@ -239,9 +256,9 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
 
     @Override
     public void onEnable() {
+        config = new Settings(getDataFolder());
         setupTranslator();
         CitizensAPI.setImplementation(this);
-        config = new Settings(getDataFolder());
         // Disable if the server is not using the compatible Minecraft version
         String mcVersion = Util.getMinecraftRevision();
         compatible = true;
@@ -403,7 +420,8 @@ public class Citizens extends JavaPlugin implements CitizensPlugin {
             metrics.addCustomChart(new Metrics.SingleLineChart("total_npcs", new Callable<Integer>() {
                 @Override
                 public Integer call() {
-                    if (npcRegistry == null) return 0;
+                    if (npcRegistry == null)
+                        return 0;
                     return Iterables.size(npcRegistry);
                 }
             }));