socks proxy support, version bump

Author: crpmax

README.md

@@ -5,6 +5,7 @@
 
 ## 🆒 Features
 - ✅ Connect as many bots as you want
+- ✅ Use SOCKS4 or SOCKS5 proxies
 - ✅ Receive colored or noncolored chat
 - ✅ Set connection delay
 - ✅ Set message or command on join
@@ -17,7 +18,7 @@ Use of pre-compiled jar from [releases](https://github.com/crpmax/mc-bots/releas
 When running, you can write a chat message to the terminal to send it by all bots.
 
 ## 🧪 Example
-`java -jar mc-bots-1.0.0.jar -s 192.168.0.189:25565 -d 10 11 -r -p BOT_ -c 30`
+`java -jar mc-bots-1.2.0.jar -s 192.168.0.189:25565 -d 10 11 -r -p BOT_ -c 30`
 
 <img src="https://imgur.com/XWcckas.png" title="Connected bots" width="350px"/>
 <img src="https://imgur.com/CvJq1Io.gif" title="Sending chat message by bots" width="350px"/>
@@ -32,6 +33,8 @@ When running, you can write a chat message to the terminal to send it by all bot
 `-n` Do not use color in terminal - useful when the terminal does not support it  
 `-m` Minimal run - do not use any listeners, will not receive chat, useful for large amounts of bots  
 `-x` The most minimal run - No listeners, no control, no chat - useful for large amounts of bots for better performance  
+`-t` Set proxy type - SOCKS4 or SOCKS5  
+`-l` Set proxy list file  
 
 ## ⚠ DISCLAIMER
 **This app is made for educational and testing purposes only.  

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group 'me.creepermaxcz.mc-bots'
-version '1.1.0'
+version '1.2.0'
 
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
@@ -14,7 +14,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.github.Steveice10:MCProtocolLib:1.18-2'
+    implementation 'com.github.Steveice10:MCProtocolLib:1.18-3'
     implementation 'commons-cli:commons-cli:1.5.0'
     implementation 'com.diogonunes:JColor:5.2.0'
     implementation 'dnsjava:dnsjava:3.4.3'

src/main/java/me/creepermaxcz/mcbots/Bot.java

@@ -29,7 +29,7 @@ public Bot(String nickname, InetSocketAddress address, ProxyInfo proxy) {
 
         Log.info("Creating bot", nickname);
         protocol = new MinecraftProtocol(nickname);
-        client = new TcpClientSession(address.getHostString(), address.getPort(), protocol);
+        client = new TcpClientSession(address.getHostString(), address.getPort(), protocol, proxy);
     }
 
     @Override

src/main/java/me/creepermaxcz/mcbots/Main.java

@@ -1,16 +1,27 @@
 package me.creepermaxcz.mcbots;
 
+import com.github.steveice10.packetlib.ProxyInfo;
 import org.apache.commons.cli.*;
 import org.xbill.DNS.Lookup;
 import org.xbill.DNS.Record;
 import org.xbill.DNS.SRVRecord;
 import org.xbill.DNS.Type;
 
+import java.io.*;
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.InvalidPathException;
+import java.nio.file.Paths;
 import java.security.SecureRandom;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import java.util.Scanner;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 public class Main {
 
@@ -26,6 +37,12 @@ public class Main {
     private static boolean mostMinimal = false;
     public static String joinMessage;
 
+    private static boolean useProxies = false;
+    private static ArrayList<InetSocketAddress> proxies = new ArrayList<>();
+    private static int proxyIndex = 0;
+    private static int proxyCount = 0;
+    private static ProxyInfo.Type proxyType;
+
     public static void main(String[] args) throws Exception {
 
         Options options = new Options();
@@ -47,6 +64,9 @@ public static void main(String[] args) throws Exception {
         options.addOption("x", "most-minimal", false, "minimal run without any control, just connect the bots");
         options.addOption("j", "join-msg", true, "join message / command");
 
+        options.addOption("l", "proxy-list", true, "Path to proxy list file with proxy:port on every line");
+        options.addOption("t", "proxy-type", true, "Proxy type: SOCKS4 or SOCKS5");
+
         CommandLineParser parser = new DefaultParser();
         CommandLine cmd = null;
 
@@ -58,6 +78,45 @@ public static void main(String[] args) throws Exception {
             System.exit(1);
         }
 
+        if (cmd.hasOption('t') && cmd.hasOption('l')) {
+            String typeStr = cmd.getOptionValue('t').toUpperCase();
+
+            //get proxy type
+            try {
+                proxyType = ProxyInfo.Type.valueOf(typeStr);
+            } catch (IllegalArgumentException e) {
+                Log.error("Inavlid proxy type, use SOCKS4 or SOCKS5.");
+                System.exit(1);
+            }
+
+            //read proxy list file
+            try {
+                Scanner scanner = new Scanner(new File(cmd.getOptionValue('l')));
+                while (scanner.hasNextLine()) {
+                    try {
+                        String[] parts = scanner.nextLine().trim().split(":");
+                        if (parts.length == 2) {
+                            int port = Integer.parseInt(parts[1]);
+                            proxies.add(new InetSocketAddress(parts[0], port));
+                            proxyCount++;
+                        }
+                    }
+                    catch (Exception ignored) { }
+                }
+                scanner.close();
+            } catch (FileNotFoundException e) {
+                Log.error("Invalid proxy list file path.");
+                System.exit(1);
+            }
+
+            if (proxyCount == 0) {
+                Log.error("No valid proxies found in file");
+                System.exit(1);
+            }
+
+            useProxies = true;
+        }
+
 
         botCount = Integer.parseInt(cmd.getOptionValue('c', "1"));
 
@@ -119,10 +178,35 @@ public static void main(String[] args) throws Exception {
         new Thread(() -> {
             for (int i = 0; i < botCount; i++) {
                 try {
+                    ProxyInfo proxyInfo = null;
+                    if (useProxies) {
+                        InetSocketAddress proxySocket = proxies.get(proxyIndex);
+
+                        if (!minimal) {
+                            Log.info(
+                                    "Using proxy: (" + proxyIndex + ")",
+                                    proxySocket.getHostString() + ":" + proxySocket.getPort()
+                            );
+                        }
+
+                        proxyInfo = new ProxyInfo(
+                                proxyType,
+                                proxySocket
+                        );
+
+                        //increment or reset current proxy index
+                        if (proxyIndex < (proxyCount - 1)) {
+                            proxyIndex++;
+                        } else {
+                            proxyIndex = 0;
+                        }
+
+                    }
+
                     Bot bot = new Bot(
                             nickGen.nextNick(),
                             inetAddr,
-                            null
+                            proxyInfo
                     );
                     bot.start();