trying to clean up a little

psu-de · Mar 13, 2024 · b7ef677 · b7ef677
1 parent 500220d
commit b7ef677
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 29 deletions.
diff --git a/Plugins/MineSharp.Pathfinder/Moves/DirectMove.cs b/Plugins/MineSharp.Pathfinder/Moves/DirectMove.cs
@@ -40,7 +40,6 @@ public override bool IsMovePossible(Position position, IWorld world)
     /// <inheritdoc />
     protected override async Task PerformMove(MineSharpBot bot, int count, Movements movements)
     { 
-        // TODO: IsMovePossible() ist nicht korrekt
         var player  = bot.GetPlugin<PlayerPlugin>();
         var physics = bot.GetPlugin<PhysicsPlugin>();
         var entity  = player.Entity ?? throw new NullReferenceException("Player entity not initialized.");
@@ -66,12 +65,5 @@ protected override async Task PerformMove(MineSharpBot bot, int count, Movements
             }
         }
         physics.InputControls.Reset();
-
-        if (!CollisionHelper.IsPointInBlockBb(entity.Position, targetBlock))
-        {
-            throw new Exception("move went wrong"); // TODO: Move exception
-        }
-
-        await MovementUtils.MoveInsideBlock(entity, targetBlock, physics);
     }
 }
diff --git a/Plugins/MineSharp.Pathfinder/Moves/FallDownMove.cs b/Plugins/MineSharp.Pathfinder/Moves/FallDownMove.cs
@@ -52,7 +52,7 @@ protected override async Task PerformMove(MineSharpBot bot, int count, Movements
         MovementUtils.SetHorizontalMovementsFromVector(this.Motion, physics.InputControls);
 
         var stopNextTick = false;
-        while (player.Entity.IsOnGround)
+        while (entity.IsOnGround)
         {
             if (!stopNextTick)
             {
@@ -71,12 +71,5 @@ protected override async Task PerformMove(MineSharpBot bot, int count, Movements
 
         physics.InputControls.Reset();
         await physics.WaitForOnGround();
-
-        if (!CollisionHelper.IntersectsBbWithBlock(entity.GetBoundingBox(), targetBlock))
-        {
-            throw new Exception("move went wrong."); // TODO: Better exception
-        }
-
-        await MovementUtils.MoveInsideBlock(entity, targetBlock, physics);
     }
 }
diff --git a/Plugins/MineSharp.Pathfinder/Moves/JumpOneBlock.cs b/Plugins/MineSharp.Pathfinder/Moves/JumpOneBlock.cs
@@ -84,13 +84,5 @@ protected override async Task PerformMove(MineSharpBot bot, int count, Movements
         }
 
         await physics.WaitForOnGround();
-
-        if (!CollisionHelper.IntersectsBbWithBlock(entity.GetBoundingBox(), targetBlock))
-        {
-            throw new Exception("move went wrong."); // TODO: Better exception
-        }
-
-        Console.WriteLine($"target={target}, block={targetBlock}");
-        await MovementUtils.MoveInsideBlock(entity, targetBlock, physics);
     }
 }
diff --git a/Plugins/MineSharp.Pathfinder/Moves/JumpUpMove.cs b/Plugins/MineSharp.Pathfinder/Moves/JumpUpMove.cs
@@ -40,9 +40,6 @@ public override bool IsMovePossible(Position position, IWorld world)
     /// <inheritdoc />
     protected override async Task PerformMove(MineSharpBot bot, int count, Movements movements)
     {
-        if (count != 1)
-            throw new InvalidOperationException();
-
         var physics = bot.GetPlugin<PhysicsPlugin>();
         var player  = bot.GetPlugin<PlayerPlugin>();
         var entity  = player.Entity ?? throw new NullReferenceException("player is not initialized");
@@ -62,7 +59,7 @@ protected override async Task PerformMove(MineSharpBot bot, int count, Movements
         {
             await physics.WaitForTick();
 
-            if (CollisionHelper.IsXzPointInBlockBb(entity.Position, targetBlock))
+            if (CollisionHelper.IntersectsBbWithBlock(entity.GetBoundingBox(), targetBlock))
             {
                 break;
             }

diff --git a/Plugins/MineSharp.Pathfinder/Moves/Move.cs b/Plugins/MineSharp.Pathfinder/Moves/Move.cs
@@ -4,6 +4,7 @@
 using MineSharp.Core.Common.Entities;
 using MineSharp.Core.Geometry;
 using MineSharp.Data;
+using MineSharp.Pathfinder.Exceptions;
 using MineSharp.Pathfinder.Utils;
 using MineSharp.Physics.Input;
 using MineSharp.World;
@@ -46,14 +47,24 @@ internal async Task Perform(MineSharpBot bot, int count, Position startPosition,
         var player  = bot.GetPlugin<PlayerPlugin>();
         var physics = bot.GetPlugin<PhysicsPlugin>();
         var entity  = player.Entity ?? throw new NullReferenceException("player is not initialized");
-
+        var target  = (Position)this.Motion.Scaled(count).Add(startPosition);
+
         if (entity.Velocity.HorizontalLengthSquared() > 0.15 * 0.15)
             await MovementUtils.SlowDown(entity, physics); 
 
         await physics.Look(0, 0);
         await MovementUtils.MoveInsideBlock(entity, startPosition, physics);
 
         await PerformMove(bot, count, movements);
+
+        physics.InputControls.Reset();
+
+        if (!CollisionHelper.IntersectsBbWithBlock(entity.GetBoundingBox(), target))
+        {
+            throw new MoveWentWrongException($"bot is not on expected position (actual={entity.Position}, expected={target})");
+        }
+
+        await MovementUtils.MoveInsideBlock(entity, target, physics);
     }
 
     /// <summary>