Merge branch 'master' into multiSQLConnections

src/de/steamwar/bungeecore/commands/CheckCommand.java

@@ -130,18 +130,20 @@ public class CheckCommand extends BasicCommand {
             CheckSession current = currentSchems.get(schematic.getId());
             long waitedMillis = Timestamp.from(Instant.now()).getTime() - schematic.getLastUpdate().getTime();
             String color = waitedMillis > 14400000 ? (waitedMillis > 86400000 ? "§c" : "§e") : "§a";
-            String waitTime = Timestamp.from(Instant.ofEpochMilli(waitedMillis)).toLocalDateTime().format(DateTimeFormatter.ofPattern(Message.parse("CHECK_LIST_WAIT", player, color)));
+            long hours = waitedMillis / 3600000;
+            long minutes = (waitedMillis - hours * 3600000) / 60000;
+            String waitTime = color + Message.parse("CHECK_LIST_WAIT", player, hours, (minutes < 10) ? "0" + minutes : minutes);
             if (current == null) {
                 Message.sendPrefixless("CHECK_LIST_TO_CHECK", player,
-                        waitTime,
                         Message.parse("CHECK_LIST_TO_CHECK_HOVER", player),
                         new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/check schematic " + schematic.getId()),
+                        waitTime,
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName());
             } else {
                 Message.sendPrefixless("CHECK_LIST_CHECKING", player,
-                        waitTime,
                         Message.parse("CHECK_LIST_CHECKING_HOVER", player),
                         new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/join " + current.checker.getName()),
+                        waitTime,
                         schematic.getSchemtype().getKuerzel(), SteamwarUser.get(schematic.getOwner()).getUserName(), schematic.getName(), current.checker.getName());
             }
         }

src/de/steamwar/bungeecore/sql/UserGroup.java

@@ -24,12 +24,12 @@ import java.util.stream.Collectors;
 
 public enum UserGroup {
 
-    Admin("§4", "§e", "Obererzieher", true, true, true, true),
+    Admin("§4", "§e", "Admin", true, true, true, true),
-    Developer("§3", "§f", "Seelsorger", true, true, true, true),
+    Developer("§3", "§f", "Dev", true, true, true, true),
-    Moderator("§c", "§f", "Schichtleiter", true, true, true, true),
+    Moderator("§c", "§f", "Mod", true, true, true, true),
-    Supporter("§9", "§f", "Kindergärtner", false, true, true, true),
+    Supporter("§9", "§f", "Sup", false, true, true, true),
-    Builder("§2", "§f", "Hausmeister", false, true, false, true),
+    Builder("§2", "§f", "Arch", false, true, false, true),
-    YouTuber("§5", "§f", "Reporter", false, false, false, true),
+    YouTuber("§5", "§f", "YT", false, false, false, true),
     Member("§7", "§7", "", false, false, false, false);
 
     private final String colorCode;

src/de/steamwar/messages/BungeeCore.properties

@@ -246,7 +246,7 @@ CHECK_HELP_DECLINE=§8/§7check decline §8[§eGrund§8] - §7Schematic ablehnen
 CHECK_HELP_CANCEL=§8/§7check cancel §8- §7Bricht den Prüfvorgang ab
 CHECK_LIST_HEADER=§e§lZu prüfen sind {0} Schematics
 CHECK_LIST_TO_CHECK={0} §8{1} §7{2} §e{3}
-CHECK_LIST_WAIT={0}d HH:mm
+CHECK_LIST_WAIT={0}:{1}
 CHECK_LIST_TO_CHECK_HOVER=§eSchematic prüfen
 CHECK_LIST_CHECKING={0} §8{1} §7{2} §e{3} §7wird geprüft von §e{4}
 CHECK_LIST_CHECKING_HOVER=§eZum Prüfer