Fixup API a bit, fix block placing and add block place cmd

AlexProgrammerDE · Nov 6, 2024 · d98d187 · d98d187
1 parent c982e4a
commit d98d187
Show file tree

Hide file tree

Showing 23 changed files with 218 additions and 108 deletions.
diff --git a/...remc/brigadier/ClientBrigadierHelper.java → ...lfiremc/client/ClientBrigadierHelper.java b/...remc/brigadier/ClientBrigadierHelper.java → ...lfiremc/client/ClientBrigadierHelper.java
@@ -15,13 +15,16 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package com.soulfiremc.brigadier;
+package com.soulfiremc.client;
 
 import com.mojang.brigadier.Command;
 import com.mojang.brigadier.RedirectModifier;
 import com.mojang.brigadier.arguments.ArgumentType;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.builder.RequiredArgumentBuilder;
+import com.soulfiremc.brigadier.CommandHelpWrapper;
+import com.soulfiremc.brigadier.CommandSource;
+import com.soulfiremc.brigadier.RedirectHelpWrapper;
 
 public class ClientBrigadierHelper {
   private ClientBrigadierHelper() {}

diff --git a/client/src/main/java/com/soulfiremc/client/ClientCommandManager.java b/client/src/main/java/com/soulfiremc/client/ClientCommandManager.java
@@ -35,8 +35,8 @@
 import javax.inject.Inject;
 import java.util.List;
 
-import static com.soulfiremc.brigadier.ClientBrigadierHelper.help;
-import static com.soulfiremc.brigadier.ClientBrigadierHelper.literal;
+import static com.soulfiremc.client.ClientBrigadierHelper.help;
+import static com.soulfiremc.client.ClientBrigadierHelper.literal;
 
 @Slf4j
 @RequiredArgsConstructor(onConstructor_ = @Inject)

diff --git a/server/src/main/java/com/soulfiremc/server/ServerCommandManager.java b/server/src/main/java/com/soulfiremc/server/ServerCommandManager.java
@@ -47,6 +47,7 @@
 import com.soulfiremc.server.pathfinding.goals.PosGoal;
 import com.soulfiremc.server.pathfinding.goals.XZGoal;
 import com.soulfiremc.server.pathfinding.goals.YGoal;
+import com.soulfiremc.server.pathfinding.graph.BlockFace;
 import com.soulfiremc.server.pathfinding.graph.PathConstraint;
 import com.soulfiremc.server.protocol.BotConnection;
 import com.soulfiremc.server.spark.SFSparkCommandSender;
@@ -65,6 +66,7 @@
 import org.cloudburstmc.math.GenericMath;
 import org.cloudburstmc.math.vector.Vector2d;
 import org.geysermc.mcprotocollib.protocol.data.game.entity.RotationOrigin;
+import org.geysermc.mcprotocollib.protocol.data.game.entity.player.Hand;
 
 import javax.annotation.PostConstruct;
 import javax.imageio.ImageIO;
@@ -357,7 +359,7 @@ public void postConstruct() {
                             return false;
                           }));
 
-                  bot.dataManager().controlState().resetAll();
+                  bot.controlState().resetAll();
 
                   if (changed == 0) {
                     c.getSource().sendWarn("No pathfinding was running!");
@@ -400,7 +402,7 @@ public void postConstruct() {
                   forEveryBot(
                     c,
                     bot -> {
-                      var controlState = bot.dataManager().controlState();
+                      var controlState = bot.controlState();
 
                       controlState.forward(!controlState.forward());
                       controlState.backward(false);
@@ -415,7 +417,7 @@ public void postConstruct() {
                   forEveryBot(
                     c,
                     bot -> {
-                      var controlState = bot.dataManager().controlState();
+                      var controlState = bot.controlState();
 
                       controlState.backward(!controlState.backward());
                       controlState.forward(false);
@@ -430,7 +432,7 @@ public void postConstruct() {
                   forEveryBot(
                     c,
                     bot -> {
-                      var controlState = bot.dataManager().controlState();
+                      var controlState = bot.controlState();
 
                       controlState.left(!controlState.left());
                       controlState.right(false);
@@ -445,7 +447,7 @@ public void postConstruct() {
                   forEveryBot(
                     c,
                     bot -> {
-                      var controlState = bot.dataManager().controlState();
+                      var controlState = bot.controlState();
 
                       controlState.right(!controlState.right());
                       controlState.left(false);
@@ -460,7 +462,7 @@ public void postConstruct() {
               forEveryBot(
                 c,
                 bot -> {
-                  var controlState = bot.dataManager().controlState();
+                  var controlState = bot.controlState();
 
                   controlState.jumping(!controlState.jumping());
                   return Command.SINGLE_SUCCESS;
@@ -486,10 +488,31 @@ public void postConstruct() {
               forEveryBot(
                 c,
                 bot -> {
-                  bot.dataManager().controlState().resetAll();
+                  bot.controlState().resetAll();
                   return Command.SINGLE_SUCCESS;
                 }))));
 
+    // Inventory controls
+    dispatcher.register(
+      literal("placeon")
+        .then(argument("block", new DynamicXYZArgumentType())
+          .then(
+            argument("face", new EnumArgumentType<>(BlockFace.class))
+              .executes(
+                help(
+                  "Makes selected bots place a block on the specified face of a block",
+                  c -> {
+                    var block = c.getArgument("block", DynamicXYZArgumentType.XYZLocationMapper.class);
+                    var face = c.getArgument("face", BlockFace.class);
+
+                    return forEveryBot(
+                      c,
+                      bot -> {
+                        bot.botActionManager().placeBlock(Hand.MAIN_HAND, block.getAbsoluteLocation(bot.dataManager().clientEntity().pos()).toInt(), face);
+                        return Command.SINGLE_SUCCESS;
+                      });
+                  })))));
+
     // Attack controls
     dispatcher.register(
       literal("stop-attack")

diff --git a/server/src/main/java/com/soulfiremc/server/brigadier/EnumArgumentType.java b/server/src/main/java/com/soulfiremc/server/brigadier/EnumArgumentType.java
@@ -0,0 +1,74 @@
+/*
+ * SoulFire
+ * Copyright (C) 2024  AlexProgrammerDE
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.soulfiremc.server.brigadier;
+
+import com.mojang.brigadier.LiteralMessage;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.arguments.ArgumentType;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.mojang.brigadier.exceptions.SimpleCommandExceptionType;
+import com.mojang.brigadier.suggestion.Suggestions;
+import com.mojang.brigadier.suggestion.SuggestionsBuilder;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Collection;
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Stream;
+
+@RequiredArgsConstructor
+public class EnumArgumentType<T extends Enum<T>> implements ArgumentType<T> {
+  private final Class<T> type;
+
+  @Override
+  public T parse(StringReader stringReader) throws CommandSyntaxException {
+    final var start = stringReader.getCursor();
+    var string = stringReader.readString();
+
+    for (var constant : type.getEnumConstants()) {
+      if (constant.name().equalsIgnoreCase(string)) {
+        return constant;
+      }
+    }
+
+    stringReader.setCursor(start);
+    throw new SimpleCommandExceptionType(new LiteralMessage("Invalid enum value"))
+      .createWithContext(stringReader);
+  }
+
+  @Override
+  public <S> CompletableFuture<Suggestions> listSuggestions(CommandContext<S> context, SuggestionsBuilder builder) {
+    final var remaining = builder.getRemaining().toLowerCase(Locale.ROOT);
+
+    for (var constant : type.getEnumConstants()) {
+      if (constant.name().toLowerCase(Locale.ROOT).startsWith(remaining)) {
+        builder.suggest(constant.name());
+      }
+    }
+
+    return builder.buildFuture();
+  }
+
+  @Override
+  public Collection<String> getExamples() {
+    return Stream.of(type.getEnumConstants())
+      .map(Enum::name)
+      .toList();
+  }
+}
diff --git a/server/src/main/java/com/soulfiremc/server/data/BlockState.java b/server/src/main/java/com/soulfiremc/server/data/BlockState.java
@@ -76,4 +76,13 @@ public boolean equals(Object o) {
   public int hashCode() {
     return id;
   }
+
+  @Override
+  public String toString() {
+    return "BlockState{" +
+      "id=" + id +
+      ", properties=" + properties +
+      ", blockShapeGroup=" + blockShapeGroup +
+      '}';
+  }
 }
diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/BlockBreakAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/BlockBreakAction.java
@@ -62,7 +62,7 @@ public SFVec3i targetPosition(BotConnection connection) {
   public void tick(BotConnection connection) {
     var dataManager = connection.dataManager();
     var clientEntity = dataManager.clientEntity();
-    dataManager.controlState().resetAll();
+    connection.controlState().resetAll();
 
     var level = dataManager.currentLevel();
     if (!didLook) {
@@ -97,10 +97,10 @@ public void tick(BotConnection connection) {
             dataManager.tagsState(),
             dataManager.clientEntity(),
             clientEntity.onGround(),
-            dataManager.inventoryManager().playerInventory().getHeldItem().item(),
+            connection.inventoryManager().playerInventory().getHeldItem().item(),
             optionalBlockType)
           .ticks();
-      dataManager.botActionManager()
+      connection.botActionManager()
         .sendStartBreakBlock(blockPosition.toVector3i(), blockBreakSideHint.toDirection());
 
       // We instamine or are in creative mode
@@ -113,11 +113,11 @@ public void tick(BotConnection connection) {
         dataManager.currentLevel().setBlock(blockPosition.toVector3i(), BlockState.forDefaultBlockType(BlockType.AIR));
       }
     } else if (--remainingTicks == 0) {
-      dataManager.botActionManager()
+      connection.botActionManager()
         .sendEndBreakBlock(blockPosition.toVector3i(), blockBreakSideHint.toDirection());
       finishedDigging = true;
     } else {
-      dataManager.botActionManager().sendBreakBlockAnimation();
+      connection.botActionManager().sendBreakBlockAnimation();
     }
   }
 

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/BlockPlaceAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/BlockPlaceAction.java
@@ -50,10 +50,10 @@ public SFVec3i targetPosition(BotConnection connection) {
   @Override
   public void tick(BotConnection connection) {
     var dataManager = connection.dataManager();
-    dataManager.controlState().resetAll();
+    connection.controlState().resetAll();
 
     if (!putOnHotbar) {
-      if (ItemPlaceHelper.placeBestBlockInHand(dataManager)) {
+      if (ItemPlaceHelper.placeBestBlockInHand(connection)) {
         putOnHotbar = true;
       }
 
@@ -64,7 +64,7 @@ public void tick(BotConnection connection) {
       return;
     }
 
-    connection.dataManager().botActionManager().placeBlock(Hand.MAIN_HAND, blockPlaceAgainstData);
+    connection.botActionManager().placeBlock(Hand.MAIN_HAND, blockPlaceAgainstData);
     finishedPlacing = true;
   }
 

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/GapJumpAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/GapJumpAction.java
@@ -58,7 +58,7 @@ public SFVec3i targetPosition(BotConnection connection) {
   @Override
   public void tick(BotConnection connection) {
     var clientEntity = connection.dataManager().clientEntity();
-    clientEntity.controlState().resetAll();
+    connection.controlState().resetAll();
 
     var level = connection.dataManager().currentLevel();
 
@@ -81,10 +81,10 @@ public void tick(BotConnection connection) {
       clientEntity.lastYRot(newYRot);
     }
 
-    clientEntity.controlState().forward(true);
+    connection.controlState().forward(true);
 
     if (shouldJump()) {
-      clientEntity.controlState().jumping(true);
+      connection.controlState().jumping(true);
     }
   }
 

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/ItemPlaceHelper.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/ItemPlaceHelper.java
@@ -22,6 +22,7 @@
 import com.soulfiremc.server.data.ItemType;
 import com.soulfiremc.server.pathfinding.Costs;
 import com.soulfiremc.server.pathfinding.SFVec3i;
+import com.soulfiremc.server.protocol.BotConnection;
 import com.soulfiremc.server.protocol.bot.SessionDataManager;
 import com.soulfiremc.server.protocol.bot.container.ContainerSlot;
 import com.soulfiremc.server.protocol.bot.container.InventoryManager;
@@ -32,8 +33,8 @@
 import java.util.concurrent.TimeUnit;
 
 public class ItemPlaceHelper {
-  public static boolean placeBestBlockInHand(SessionDataManager dataManager) {
-    var inventoryManager = dataManager.inventoryManager();
+  public static boolean placeBestBlockInHand(BotConnection connection) {
+    var inventoryManager = connection.inventoryManager();
     var playerInventory = inventoryManager.playerInventory();
 
     ItemType leastHardItemType = null;
@@ -69,7 +70,7 @@ public static boolean placeBestBlockInHand(SessionDataManager dataManager) {
   }
 
   public static boolean placeBestToolInHand(SessionDataManager dataManager, SFVec3i blockPosition) {
-    var inventoryManager = dataManager.inventoryManager();
+    var inventoryManager = dataManager.connection().inventoryManager();
     var playerInventory = inventoryManager.playerInventory();
 
     SFItemStack bestItemStack = null;

diff --git a/...er/src/main/java/com/soulfiremc/server/pathfinding/execution/JumpAndPlaceBelowAction.java b/...er/src/main/java/com/soulfiremc/server/pathfinding/execution/JumpAndPlaceBelowAction.java
@@ -49,10 +49,10 @@ public SFVec3i targetPosition(BotConnection connection) {
   public void tick(BotConnection connection) {
     var dataManager = connection.dataManager();
     var clientEntity = dataManager.clientEntity();
-    dataManager.controlState().resetAll();
+    connection.controlState().resetAll();
 
     if (!putOnHotbar) {
-      if (ItemPlaceHelper.placeBestBlockInHand(dataManager)) {
+      if (ItemPlaceHelper.placeBestBlockInHand(connection)) {
         putOnHotbar = true;
       }
 
@@ -65,13 +65,13 @@ public void tick(BotConnection connection) {
 
     if (clientEntity.y() < blockPlacePosition.y + 1) {
       // Make sure we are so high that we can place the block
-      dataManager.controlState().jumping(true);
+      connection.controlState().jumping(true);
       return;
     } else {
-      dataManager.controlState().jumping(false);
+      connection.controlState().jumping(false);
     }
 
-    connection.dataManager().botActionManager().placeBlock(Hand.MAIN_HAND, blockPlaceAgainstData);
+    connection.botActionManager().placeBlock(Hand.MAIN_HAND, blockPlaceAgainstData);
     finishedPlacing = true;
   }
 

diff --git a/server/src/main/java/com/soulfiremc/server/pathfinding/execution/MovementAction.java b/server/src/main/java/com/soulfiremc/server/pathfinding/execution/MovementAction.java
@@ -64,7 +64,7 @@ public SFVec3i targetPosition(BotConnection connection) {
   @Override
   public void tick(BotConnection connection) {
     var clientEntity = connection.dataManager().clientEntity();
-    clientEntity.controlState().resetAll();
+    connection.controlState().resetAll();
 
     var level = connection.dataManager().currentLevel();
 
@@ -87,12 +87,12 @@ public void tick(BotConnection connection) {
       clientEntity.lastYRot(newYRot);
     }
 
-    clientEntity.controlState().forward(true);
+    connection.controlState().forward(true);
 
     var botPosition = clientEntity.pos();
     if (targetMiddleBlock.getY() - STEP_HEIGHT > botPosition.getY()
       && shouldJump()) {
-      clientEntity.controlState().jumping(true);
+      connection.controlState().jumping(true);
     }
   }