lots of fixes, changes, code cleanup

Author: Ikos3k

BetterProxy/config.json

@@ -1,17 +1,16 @@
 {
-  "port": 1337,
-  "motd": {
-    "versionInfo": "&4BetterProxy",
-    "line1": "     &f✖ &l&m\\-\\-\\-\\-&r&f&l>> &6BetterProxy &f&l<<&m-/-/-/-/&r&f ✖&r",
-    "line2":  "        &c----&e/ &6✯ &eProxy by ANONIMUS &6✯ &e\\&c----",
-    "playerList": [
-      "&f---------------------------------------------------",
-      "                     &8Supported versions:",
-      " &e%supported_versions%",
-      "&f---------------------------------------------------"
-    ],
-    "icon": "icon.png",
-    "protocol": 0
+  "motd" : {
+    "protocol" : 0,
+    "playerList" : [ "&f---------------------------------------------------", "                     &8Supported versions:", " &e%supported_versions%", "&f---------------------------------------------------" ],
+    "icon" : "icon.png",
+    "versionInfo" : "&4BetterProxy",
+    "line2" : "        &c----&e/ &6✯ &eProxy by ANONIMUS &6✯ &e\\&c----",
+    "line1" : "     &f✖ &l&m\\-\\-\\-\\-&r&f&l>> &6BetterProxy &f&l<<&m-/-/-/-/&r&f ✖&r"
   },
-  "packet_debugger": true
+  "debug" : {
+    "debugType" : "LEGIBLE",
+    "debugger" : true,
+    "showCustomPackets" : false
+  },
+  "port" : 1337
 }

BetterProxy/exploits/dream.json

@@ -19,18 +19,18 @@
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
-            <version>1.18.16</version>
+            <version>1.18.20</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.45.Final</version>
+            <version>4.1.67.Final</version>
         </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
-            <version>2.8.6</version>
+            <version>2.8.7</version>
         </dependency>
         <dependency>
             <groupId>com.google.guava</groupId>
@@ -45,7 +45,7 @@
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-lang3</artifactId>
-            <version>3.11</version>
+            <version>3.12.0</version>
         </dependency>
         <dependency>
             <groupId>com.googlecode.json-simple</groupId>
@@ -55,7 +55,7 @@
         <dependency>
             <groupId>javax.json</groupId>
             <artifactId>javax.json-api</artifactId>
-            <version>1.1</version>
+            <version>1.1.4</version>
         </dependency>
         <dependency>
             <groupId>org.reflections</groupId>
@@ -75,9 +75,10 @@
         <dependency>
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-xc</artifactId>
-            <version>1.9.12</version>
+            <version>1.9.13</version>
         </dependency>
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

BetterProxy/exploits/good.json

@@ -20,11 +20,11 @@
 public class BetterProxy {
     private final CommandManager commandManager;
     private final PacketRegistry packetRegistry;
+    private final Map<String, Account> accounts;
     private final ExploitManager exploitManager;
     private final ConfigManager configManager;
     private final PlayerManager playerManager;
     private static BetterProxy instance;
-    private final Map<String, Account> accounts;
     private final ProxyServer server;
     private final File dirFolder;
 

BetterProxy/exploits/killer.json

@@ -21,7 +21,7 @@ public CommandHelp() {
 
     @Override
     public void onCommand(Player sender, String[] args) {
-        List<Command> list = BetterProxy.getInstance().getCommandManager().getCommands();
+        List<Command> list = BetterProxy.getInstance().getCommandManager().elements;
         list.sort(Comparator.comparingInt(s -> StringUtil.getStringWidth(s.getPrefix())));
 
         int i = 1;
@@ -32,19 +32,20 @@ public void onCommand(Player sender, String[] args) {
         int k = i - 1;
         int l = Math.min((k + 1) * 10, list.size());
         int j = (list.size() - 1) / 10;
+        int f = j + 1;
 
         if (i < 1) {
             ChatUtil.sendChatMessage("&cThe given number (" + i + ") is too small, must be at least 1", sender, false);
             return;
         }
 
-        if (i > (j + 1)) {
-            ChatUtil.sendChatMessage("&cThe given number (" + i + ") is too high, cannot exceed " + (j + 1), sender, false);
+        if (i > f) {
+            ChatUtil.sendChatMessage("&cThe given number (" + i + ") is too high, cannot exceed " + f, sender, false);
             return;
         }
 
         ChatUtil.clearChat(1, sender);
-        ChatUtil.sendChatMessage(" &8 --- Showing help page: " + sender.getThemeType().getColor(1) + i + " &8of " + sender.getThemeType().getColor(1) + (j + 1) + " &8---", sender, false);
+        ChatUtil.sendChatMessage(" &8 --- Showing help page: " + sender.getThemeType().getColor(1) + i + " &8of " + sender.getThemeType().getColor(1) + f + " &8---", sender, false);
         for (int i1 = k * 10; i1 < l; ++i1) {
             final Command command = list.get(i1);
             ChatUtil.sendHoverMessage(sender, "&8>> &f" + sender.getPrefixCMD() + command.getPrefix() + " &7" + command.getUsage(), sender.getThemeType().getColor(1) + command.getDesc());
@@ -56,11 +57,12 @@ public void onCommand(Player sender, String[] args) {
             msg.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, sender.getPrefixCMD() + "help " + (i - 1)));
         }
 
-        TextComponent msg2 = new TextComponent(ChatUtil.fixColor((i != (j + 1) ? "&a" : "&7") + "[NEXT]"));
-        if (i != (j + 1)) {
+        TextComponent msg2 = new TextComponent(ChatUtil.fixColor((i != f ? "&a" : "&7") + "[NEXT]"));
+        if (i != f) {
             msg2.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent(ChatUtil.fixColor(sender.getThemeType().getColor(2) + "Click to go to the next page!"))));
             msg2.setClickEvent(new ClickEvent(ClickEvent.Action.RUN_COMMAND, sender.getPrefixCMD() + "help " + (i + 1)));
         }
+
         sender.getSession().sendPacket(new ServerChatPacket(msg, new TextComponent(" "), msg2));
     }
 }