Fixes.

TheNewEconomy · May 15, 2019 · df4e7bd · df4e7bd
1 parent ee1abaf
commit df4e7bd
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/pom.xml b/pom.xml
@@ -98,7 +98,7 @@
         </repository>
         <repository>
             <id>articdive-repo</id>
-            <url>https://nexus.articdive.de/repository/maven-releases</url>
+            <url>http://maven.elmakers.com/repository</url>
         </repository>
         <repository>
             <id>placeholderapi</id>
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>com.palmergames</groupId>
             <artifactId>Towny</artifactId>
-            <version>0.93.0.3</version>
+            <version>0.89.2.0</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/src/net/tnemc/tnc/core/ChatManager.java b/src/net/tnemc/tnc/core/ChatManager.java
@@ -107,22 +107,26 @@ public void loadReplacements() {
   }
 
   public void loadChats() {
+    System.out.println("Loading Chats");
     final String baseNode = "Chats";
     if(TheNewChat.instance().getChatsConfiguration().contains(baseNode)) {
       Set<String> chatConfigs = TheNewChat.instance().getChatsConfiguration().getConfigurationSection(baseNode).getKeys(false);
       for(String entry : chatConfigs) {
+        System.out.println("Loading Chat " + entry);
         if(!TheNewChat.instance().getChatsConfiguration().contains(baseNode + "." + entry + ".Handler") ||
             !TheNewChat.instance().getChatsConfiguration().contains(baseNode + "." + entry + ".Type")) {
           continue;
         }
-        final String handler = TheNewChat.instance().getChatsConfiguration().getString(baseNode + "." + entry + ".Handler");
-        final String type = TheNewChat.instance().getChatsConfiguration().getString(baseNode + "." + entry + ".Type");
+        final String handler = TheNewChat.instance().getChatsConfiguration().getString(baseNode + "." + entry + ".Handler").toLowerCase();
+        final String type = TheNewChat.instance().getChatsConfiguration().getString(baseNode + "." + entry + ".Type").toLowerCase();
 
+        System.out.println("Loading Chat Handler " + entry);
         if(handlers.containsKey(handler) && handlers.get(handler).getTypes().containsKey(type)) {
+          System.out.println("Loading Chat Entry " + entry);
           ChatEntry chatConfig = new ChatEntry(handler, type);
 
           List<String> commands = TheNewChat.instance().getChatsConfiguration().getStringList(baseNode + "." + entry + ".Commands");
-          chatConfig.setCommands(commands.toArray(new String[commands.size()]));
+          chatConfig.setCommands(commands.toArray(new String[0]));
           chatConfig.setIgnorable(TheNewChat.instance().getChatsConfiguration().getBoolean(baseNode + "." + entry + ".Ignorable", true));
           chatConfig.setWorld(TheNewChat.instance().getChatsConfiguration().getBoolean(baseNode + "." + entry + ".WorldBased", false));
           chatConfig.setRadial(TheNewChat.instance().getChatsConfiguration().getBoolean(baseNode + "." + entry + ".Radial", false));
@@ -131,6 +135,7 @@ public void loadChats() {
           chatConfig.setFormat(TheNewChat.instance().getChatsConfiguration().getString(baseNode + "." + entry + ".Format", handlers.get(handler).getType(type).getDefaultFormat()));
 
           addChatEntry(chatConfig);
+          System.out.println("Loading Chat Finalization " + entry);
         }
       }
     }
@@ -337,8 +342,8 @@ public void setGeneralHandler(String generalHandler) {
   }
 
   public void addHandler(ChatHandler handler) {
-    handlers.put(handler.getName(), handler);
-    handlersMap.put(handler.getTypes().keySet(), handler.getName());
+    handlers.put(handler.getName().toLowerCase(), handler);
+    handlersMap.put(handler.getTypes().keySet(), handler.getName().toLowerCase());
   }
 
   public LinkedHashMap<String, ChatHandler> getHandlers() {

diff --git a/src/net/tnemc/tnc/core/TheNewChat.java b/src/net/tnemc/tnc/core/TheNewChat.java
@@ -133,13 +133,12 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
   }
 
   public void registerChatCommand() {
-    List<String> commands = new ArrayList<>();
-    commands.addAll(manager.getCommands().keySet());
+    List<String> commands = new ArrayList<>(manager.getCommands().keySet());
     commands.add("gc");
     commands.add("generalchat");
     commands.add("generalchat");
     commands.add("tnc");
-    final String[] commandsArray = commands.toArray(new String[commands.size()]);
+    final String[] commandsArray = commands.toArray(new String[0]);
 
     registerCommand(commandsArray, new ChatCommand(this, commandsArray));
   }

diff --git a/src/net/tnemc/tnc/core/common/chat/ChatHandler.java b/src/net/tnemc/tnc/core/common/chat/ChatHandler.java
@@ -49,11 +49,11 @@ public void addVariable(final ChatVariable variable) {
   }
 
   public void addType(final ChatType type) {
-    types.put(type.getName(), type);
+    types.put(type.getName().toLowerCase(), type);
   }
 
   public ChatType getType(String name) {
-    return types.get(name);
+    return types.get(name.toLowerCase());
   }
 
   public Map<String, ChatType> getTypes() {

diff --git a/src/net/tnemc/tnc/core/common/chat/handlers/CoreHandler.java b/src/net/tnemc/tnc/core/common/chat/handlers/CoreHandler.java
@@ -21,6 +21,6 @@ public CoreHandler() {
 
   @Override
   public String getName() {
-    return "core";
+    return "Core";
   }
 }
diff --git a/src/net/tnemc/tnc/core/common/chat/handlers/core/BasicType.java b/src/net/tnemc/tnc/core/common/chat/handlers/core/BasicType.java
@@ -16,7 +16,7 @@
  */
 public class BasicType extends ChatType {
   public BasicType() {
-    super("basic", "<white>[<blue>$display<white>]: <yellow>$message");
+    super("Basic", "<white>[<blue>$display<white>]: <yellow>$message");
   }
 
   @Override

diff --git a/src/net/tnemc/tnc/resources/plugin.yml b/src/net/tnemc/tnc/resources/plugin.yml
@@ -1,6 +1,6 @@
 #General Data
 name: TheNewChat
-version: 1.2.0.0
+version: 1.3.0.0
 description: A chat management plugin for non-player made chat channels. With TNK and Towny Support.
 author: creatorfromhell
 api-version: 1.13