diff --git a/src/main/java/buttondevteam/chat/PluginMain.java b/src/main/java/buttondevteam/chat/PluginMain.java index 6e0f929..acfd694 100644 --- a/src/main/java/buttondevteam/chat/PluginMain.java +++ b/src/main/java/buttondevteam/chat/PluginMain.java @@ -69,13 +69,13 @@ public class PluginMain extends ButtonPlugin { // Translated to Java: 2015.07.15 Component.registerComponent(this, new FunComponent()); Component.registerComponent(this, new AppendTextComponent()); Component.registerComponent(this, new FormatterComponent()); - getCommand2MC().registerCommand(new DebugCommand()); - getCommand2MC().registerCommand(new HelpCommand()); - getCommand2MC().registerCommand(new HistoryCommand()); - getCommand2MC().registerCommand(new InfoCommand()); - getCommand2MC().registerCommand(new MWikiCommand()); - getCommand2MC().registerCommand(new ReloadCommand()); - getCommand2MC().registerCommand(new SnapCommand()); + registerCommand(new DebugCommand()); + registerCommand(new HelpCommand()); + registerCommand(new HistoryCommand()); + registerCommand(new InfoCommand()); + registerCommand(new MWikiCommand()); + registerCommand(new ReloadCommand()); + registerCommand(new SnapCommand()); } public static Essentials essentials = null; diff --git a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java index d6d0886..7c50ebd 100644 --- a/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java +++ b/src/main/java/buttondevteam/chat/components/towncolors/TownColorComponent.java @@ -19,14 +19,12 @@ import lombok.val; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.plugin.Plugin; import org.dynmap.towny.DTBridge; -import java.io.File; import java.util.*; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.BiFunction; @@ -81,14 +79,10 @@ public class TownColorComponent extends Component implements Listene var cs = getConfig().getConfig().getConfigurationSection("towncolors"); if (cs != null) loadTC.accept(cs); - else - load_old(loadTC, null); //Load old data if (usenc) { var ncs = getConfig().getConfig().getConfigurationSection("nationcolors"); if (ncs != null) loadNC.accept(ncs); - else - load_old(null, loadNC); //Why not choose by making different args null } TownColors.keySet().removeIf(t -> !TownyComponent.TU.getTownsMap().containsKey(t)); // Removes town colors for deleted/renamed towns @@ -227,25 +221,4 @@ public class TownColorComponent extends Component implements Listene public void onPlayerJoin(TBMCPlayerJoinEvent event) { updatePlayerColors(event.getPlayer(), event.GetPlayer().asPluginPlayer(ChatPlayer.class)); } - - private static void load_old(Consumer loadTC, - Consumer loadNC) { - PluginMain.Instance.getLogger().info("Loading files..."); - try { - File file = new File("TBMC/chatsettings.yml"); - if (file.exists()) { - YamlConfiguration yc = new YamlConfiguration(); - yc.load(file); - ConfigurationSection cs; - if (loadTC != null && (cs = yc.getConfigurationSection("towncolors")) != null) - loadTC.accept(cs); - if (loadNC != null && (cs = yc.getConfigurationSection("nationcolors")) != null) - loadNC.accept(cs); - PluginMain.Instance.getLogger().info("Loaded files!"); - } else - PluginMain.Instance.getLogger().info("No files to load, first run probably."); - } catch (Exception e) { - TBMCCoreAPI.SendException("Error while loading chat files!", e); - } - } }