diff --git a/TheButtonAutoFlair.jar b/TheButtonAutoFlair.jar index f0adb78..4ef3f56 100644 Binary files a/TheButtonAutoFlair.jar and b/TheButtonAutoFlair.jar differ diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java index a37ede2..e775234 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/Commands.java @@ -173,9 +173,6 @@ public class Commands implements CommandExecutor { } else player.sendMessage("Unknown command: " + cmd.getName()); break; - case "quiz": - DoQuiz(player, args, null); - break; case "kittycannon": DoKittyCannon(player, args); break; @@ -213,12 +210,6 @@ public class Commands implements CommandExecutor { else DoAnnounce(null, args, null); return true; - } else if (args.length > 0 && args[0].toLowerCase().equals("quiz")) { - if (sender instanceof BlockCommandSender) - DoQuiz(null, args, (BlockCommandSender) sender); - else - DoQuiz(null, args, null); - return true; } return false; } @@ -334,6 +325,11 @@ public class Commands implements CommandExecutor { SendMessage(player, "User flair: " + p.GetFormattedFlair()); SendMessage(player, "Username: " + p.UserName); SendMessage(player, "Flair state: " + p.FlairState); + StringBuilder sb = new StringBuilder(); + sb.append("§6Usernames:"); + for (String username : p.UserNames) + sb.append(" ").append(username); + SendMessage(player, sb.toString()); } private static void SendMessage(Player player, String message) { // 2015.08.09. @@ -545,82 +541,6 @@ public class Commands implements CommandExecutor { } } - public static ArrayList Quiz = new ArrayList<>(); - - private static void DoQuiz(Player player, String[] args, - BlockCommandSender commandblock) { - if (player == null || player.isOp() - || player.getName().equals("NorbiPeti")) { - if (args.length == 1) { - String message = "§cUsage: /u quiz add|remove|list|edit§r"; - SendMessage(player, message); - return; - } - switch (args[1].toLowerCase()) { - case "add": - if (args.length < 3) { - SendMessage(player, "§cUsage: /u quiz add "); - return; - } - StringBuilder sb = new StringBuilder(); - for (int i = 2; i < args.length; i++) { - sb.append(args[i]); - if (i != args.length - 1) - sb.append(" "); - } - String finalmessage = sb.toString().replace('&', '§'); - Quiz.add(finalmessage); - SendMessage(player, "§Quiz question added.§r"); - break; - case "remove": - if (args.length < 3) { - SendMessage(player, "§cUsage: /u quiz remove "); - return; - } - Quiz.remove(Integer.parseInt(args[2])); - break; - case "list": - SendMessage(player, "§bList of quiz questions:§r"); - SendMessage(player, "§bFormat: [index] question§r"); - int i = 0; - for (String question : Quiz) - SendMessage(player, "[" + i++ + "] " + question); - break; - case "edit": - if (commandblock == null) { - SendMessage( - player, - "§cError: This command can only be used from a command block. Use /u quiz remove."); - break; - } - if (args.length < 4) { - commandblock - .sendMessage("§cUsage: /u quiz edit "); - return; - } - StringBuilder sb1 = new StringBuilder(); - for (int i1 = 3; i1 < args.length; i1++) { - sb1.append(args[i1]); - if (i1 != args.length - 1) - sb1.append(" "); - } - String finalmessage1 = sb1.toString().replace('&', '§'); - int index = Integer.parseInt(args[2]); - if (index > 100) - break; - while (Quiz.size() <= index) - Quiz.add(""); - Quiz.set(Integer.parseInt(args[2]), finalmessage1); - commandblock.sendMessage("Question edited."); - break; - default: - String message = "§cUsage: /u quiz add|remove|list|edit§r"; - SendMessage(player, message); - return; - } - } - } - private static Random random = new Random(); public static String KittyCannonMinigame = "KittyCannon"; diff --git a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java index eddb864..ceb7a8c 100644 --- a/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java +++ b/TheButtonAutoFlair/src/tk/sznp/thebuttonautoflair/PluginMain.java @@ -238,6 +238,8 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. default: return; } + if (text.equals("-1")) + text = "--"; p.FlairTime = text; } @@ -283,7 +285,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. .println("The Button Minecraft plugin cleanup for reloading..."); MaybeOfflinePlayer.AllPlayers.clear(); AnnounceMessages.clear(); - Commands.Quiz.clear(); } System.out.println("Loading files for The Button Minecraft plugin..."); try { @@ -307,7 +308,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. .getDouble("notificationpitch"); AnnounceTime = yc.getInt("announcetime"); AnnounceMessages.addAll(yc.getStringList("announcements")); - Commands.Quiz.addAll(yc.getStringList("quiz")); } System.out.println("The Button Minecraft plugin loaded files!"); } catch (IOException e) { @@ -329,7 +329,6 @@ public class PluginMain extends JavaPlugin { // Translated to Java: 2015.07.15. yc.set("notificationpitch", PlayerListener.NotificationPitch); yc.set("announcetime", AnnounceTime); yc.set("announcements", AnnounceMessages); - yc.set("quiz", Commands.Quiz); yc.save(file); System.out.println("The Button Minecraft plugin saved files!"); } catch (IOException e) { diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class index 6d7119e..bb3cfae 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands$2.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class index f0d4e50..90ecd0b 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/Commands.class differ diff --git a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class index 5c52610..bcd89c7 100644 Binary files a/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class and b/TheButtonAutoFlair/target/classes/tk/sznp/thebuttonautoflair/PluginMain.class differ