use utf-8 file encoding; closes #226

weaondara · Feb 10, 2016 · 63a55c6 · 63a55c6
1 parent 53b964b
commit 63a55c6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/pom.xml b/pom.xml
@@ -138,6 +138,6 @@
         </dependency>
     </dependencies>
     <properties>
-        <project.build.sourceEncoding>ISO-8859-1</project.build.sourceEncoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 </project>
diff --git a/src/main/java/net/alpenblock/bungeeperms/ChatColor.java b/src/main/java/net/alpenblock/bungeeperms/ChatColor.java
@@ -33,7 +33,7 @@ public enum ChatColor
 
     static String strip(String text)
     {
-        return text.replaceAll("§.", "");
+        return text.replaceAll(COLOR_CHAR + ".", "");
     }
 
     private final char code;

diff --git a/src/main/java/net/alpenblock/bungeeperms/FileExtractor.java b/src/main/java/net/alpenblock/bungeeperms/FileExtractor.java
@@ -39,7 +39,6 @@ public static void extract(String file, String dest)
         f.getParentFile().mkdirs();
         try
         {
-            //file öffnen
             ClassLoader cl = FileExtractor.class.getClassLoader();
             URL url = cl.getResource(file);
             if (url != null)

diff --git a/src/main/java/net/alpenblock/bungeeperms/Lang.java b/src/main/java/net/alpenblock/bungeeperms/Lang.java
@@ -30,7 +30,7 @@ public static String translate(MessageType type, Object... vars)
             s = type.getDefaultValue();
         }
         s = Statics.format(s, vars);
-        return s.replaceAll("&", "§");
+        return s.replaceAll("&", ChatColor.COLOR_CHAR + "");
     }
 
     @AllArgsConstructor

diff --git a/src/main/java/net/alpenblock/bungeeperms/User.java b/src/main/java/net/alpenblock/bungeeperms/User.java
@@ -684,9 +684,9 @@ public String buildPrefix(Sender sender)
 
         for (String p : prefixes)
         {
-            if (!ChatColor.strip(p.replaceAll("&", "§")).isEmpty()
+            if (!ChatColor.strip(p.replaceAll("&", ChatColor.COLOR_CHAR + "")).isEmpty()
                     && !prefix.isEmpty()
-                    && !ChatColor.strip(prefix.replaceAll("&", "§")).endsWith(" "))
+                    && !ChatColor.strip(prefix.replaceAll("&", ChatColor.COLOR_CHAR + "")).endsWith(" "))
             {
                 prefix += " ";
             }
@@ -763,9 +763,9 @@ public String buildSuffix(Sender sender)
 
         for (String suf : suffixes)
         {
-            if (!ChatColor.strip(suf.replaceAll("&", "§")).isEmpty()
+            if (!ChatColor.strip(suf.replaceAll("&", ChatColor.COLOR_CHAR + "")).isEmpty()
                     && !suffix.isEmpty()
-                    && !ChatColor.strip(suffix.replaceAll("&", "§")).endsWith(" "))
+                    && !ChatColor.strip(suffix.replaceAll("&", ChatColor.COLOR_CHAR + "")).endsWith(" "))
             {
                 suffix += " ";
             }

diff --git a/...ava/net/alpenblock/bungeeperms/platform/bukkit/bridge/bridges/vault/Chat_BungeePerms.java b/...ava/net/alpenblock/bungeeperms/platform/bukkit/bridge/bridges/vault/Chat_BungeePerms.java
@@ -2,6 +2,7 @@
 
 import java.util.logging.Logger;
 import net.alpenblock.bungeeperms.BungeePerms;
+import net.alpenblock.bungeeperms.ChatColor;
 import net.alpenblock.bungeeperms.Group;
 import net.alpenblock.bungeeperms.Server;
 import net.alpenblock.bungeeperms.User;
@@ -98,7 +99,7 @@ public String getPlayerPrefix(String world, String player)
     @Override
     public void setPlayerPrefix(String world, String player, String prefix)
     {
-        prefix = prefix.replaceAll("&", "§");
+        prefix = prefix.replaceAll("&", ChatColor.COLOR_CHAR + "");
 
         User u = perms.getPermissionsManager().getUser(player);
         if (u == null)
@@ -120,7 +121,7 @@ public String getPlayerSuffix(String world, String player)
     @Override
     public void setPlayerSuffix(String world, String player, String suffix)
     {
-        suffix = suffix.replaceAll("&", "§");
+        suffix = suffix.replaceAll("&", ChatColor.COLOR_CHAR + "");
 
         User u = perms.getPermissionsManager().getUser(player);
         if (u == null)
@@ -143,7 +144,7 @@ public String getGroupPrefix(String world, String group)
     @Override
     public void setGroupPrefix(String world, String group, String prefix)
     {
-        prefix = prefix.replaceAll("&", "§");
+        prefix = prefix.replaceAll("&", ChatColor.COLOR_CHAR + "");
 
         Group g = perms.getPermissionsManager().getGroup(group);
         if (g == null)
@@ -166,7 +167,7 @@ public String getGroupSuffix(String world, String group)
     @Override
     public void setGroupSuffix(String world, String group, String suffix)
     {
-        suffix = suffix.replaceAll("&", "§");
+        suffix = suffix.replaceAll("&", ChatColor.COLOR_CHAR + "");
 
         Group g = perms.getPermissionsManager().getGroup(group);
         if (g == null)