Merge pull request #5 from NeonAngelThreads/proxy-support

Proxy support

Author: NeonAngelThreads

README.md

@@ -228,11 +228,11 @@ public void scheduleReconnect() {
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }
-        this.scheduleConnect(0);
+        this.scheduleConnect();
     }
 
-    public void scheduleConnect(int wait) {
-        this.reconnectScheduler.schedule(() -> this.connect(), wait, TimeUnit.SECONDS);
+    public void scheduleConnect() {
+        this.reconnectScheduler.schedule(this::connect, 0, TimeUnit.SECONDS);
     }
 
     public void setBypassed(boolean bypassed) {

src/main/java/org/angellock/impl/AbstractRobot.java

@@ -23,8 +23,20 @@
 import org.angellock.impl.plugin.PluginManager;
 import org.angellock.impl.util.ConsoleTokens;
 import org.angellock.impl.util.math.Position;
+import org.cloudburstmc.math.immutable.vector.ImmutableVector3d;
+import org.cloudburstmc.math.vector.Vector3d;
+import org.cloudburstmc.math.vector.Vector3i;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.object.Direction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.InteractAction;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.PlayerAction;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.BlockPositionSource;
+import org.geysermc.mcprotocollib.protocol.data.game.level.particle.positionsource.PositionSource;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.inventory.ServerboundPlaceRecipePacket;
+import org.geysermc.mcprotocollib.protocol.packet.ingame.serverbound.player.*;
 
 import java.util.Optional;
+import java.util.Vector;
 
 public class RobotPlayer extends AbstractRobot {
     private long connectTime;
@@ -76,7 +88,7 @@ public void onKicked() {
     @Override
     public void onPreLogin() {
         this.connectTime = System.currentTimeMillis();
-        log.info(ConsoleTokens.colorizeText("&l&bAttempt to join to the server &3"+ this.infoHelper.getServer()+':'+this.infoHelper.getPort() +". &bWaiting for server establishing the connection..."));
+        log.info(ConsoleTokens.colorizeText("&l&bAttempt to join to the server &3{}:{}. &bWaiting for server establishing the connection..."), this.infoHelper.getServer(), this.infoHelper.getPort());
     }
 
     @Override
@@ -88,4 +100,11 @@ public double getDistanceFromOthers(IPlayer player) {
     public Position getPosition() {
         return this.loginPos;
     }
+
+    @Override
+    public void interactBlock(double x, double y, double z, int s) {
+        this.sendPacket(new ServerboundSwingPacket(Hand.MAIN_HAND));
+        this.sendPacket(new ServerboundUseItemOnPacket(Vector3i.from(x, y, z), Direction.SOUTH, Hand.MAIN_HAND, 0f,0f,0f,false, (int)(System.currentTimeMillis())));
+
+    }
 }

src/main/java/org/angellock/impl/RobotPlayer.java

@@ -7,4 +7,5 @@ public interface IPlayer extends IWalkable {
     double getDistanceFromOthers(IPlayer player);
 
     Position getPosition();
+    void interactBlock(double x, double y, double z, int s);
 }

src/main/java/org/angellock/impl/ingame/IPlayer.java

@@ -33,6 +33,11 @@ public Position getPosition() {
         return position;
     }
 
+    @Override
+    public void interactBlock(double x, double y, double z, int s) {
+
+    }
+
     public void setPosition(Position position) {
         this.position = position;
     }
@@ -54,4 +59,6 @@ public void pushVelocity(double x, double y, double z) {
     public double getDistanceFromOthers(IPlayer player) {
         return position.getDistance(player.getPosition());
     }
+
+
 }

src/main/java/org/angellock/impl/ingame/Player.java

@@ -193,7 +193,7 @@ public static Map<String, RobotPlayer> bots() {
 
     public void startAll(){
         for (RobotPlayer bot: bots.values()){
-            bot.scheduleConnect(0);
+            bot.scheduleConnect();
             while (bot.getServerGamemode() == GameMode.ADVENTURE){
                 try {
                     Thread.sleep(5000L);

src/main/java/org/angellock/impl/managers/BotManager.java

@@ -39,7 +39,7 @@ private void autoCopy(File outFile) throws IOException {
             InputStream in = Start.class.getClassLoader().getResourceAsStream(getFullFileName());
             if (in != null) {
                 OutputStream out = new FileOutputStream(outFile);
-                byte[] buf = new byte[512];
+                byte[] buf = new byte[1024];
                 int len;
                 while((len = in.read(buf)) > 0) {
                     out.write(buf, 0, len);

src/main/java/org/angellock/impl/managers/ResourceHelper.java

@@ -1,7 +1,7 @@
 {
   "profiles": {
     "bot#1": {
-      "name": "爱丽丝的DolphinBot1",
+      "name": "DolphinBot1",
       "password": "default_password",
       "owner": [
         "Melibertan"
@@ -14,7 +14,7 @@
       "proxy": {
         "enabled": true,
         "info": {
-          "address": "45.78.199.53",
+          "address": "",
           "port": 7777,
           "type": "SOCKS4",
           "username": "",
@@ -23,7 +23,7 @@
       }
     },
     "bot#2": {
-      "name": "爱丽丝的DolphinBot2",
+      "name": "DolphinBot2",
       "password": "default_password",
       "owner": [
         "Melibertan"
@@ -35,7 +35,7 @@
       "proxy": {
         "enabled": true,
         "info": {
-          "address": "47.91.89.3",
+          "address": "",
           "port": 40000,
           "type": "SOCKS4",
           "username": "",