mirror of
https://github.com/MCCTeam/Minecraft-Console-Client
synced 2026-08-15 13:04:36 +00:00
Bugfixes to the Looking and Movement. Added General prompt engineer.
This commit is contained in:
parent
dfef24ad10
commit
691057fe13
6 changed files with 498 additions and 15 deletions
|
|
@ -1176,6 +1176,7 @@ namespace MinecraftClient.Scripting
|
|||
protected void LookAtLocation(Location location)
|
||||
{
|
||||
Handler.UpdateLocation(Handler.GetCurrentLocation(), location);
|
||||
Handler.SendLocationUpdate();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -1186,6 +1187,7 @@ namespace MinecraftClient.Scripting
|
|||
protected void LookAtLocation(float yaw, float pitch)
|
||||
{
|
||||
Handler.UpdateLocation(Handler.GetCurrentLocation(), yaw, pitch);
|
||||
Handler.SendLocationUpdate();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ using System;
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
using MinecraftClient.Inventory;
|
||||
using MinecraftClient.Mapping;
|
||||
using MinecraftClient.Protocol;
|
||||
|
|
@ -629,6 +630,8 @@ public sealed class MccGameApi
|
|||
|
||||
/// <summary>
|
||||
/// Move to a tracked player by name and verify arrival.
|
||||
/// Callers running on ChatBot update callbacks should prefer <see cref="MoveToPlayerAsync"/>
|
||||
/// so the main MCC updater thread is not blocked while pathfinding completes.
|
||||
/// </summary>
|
||||
public MccGameResult<MccMoveToPlayerResult> MoveToPlayer(string playerName, bool allowUnsafe = false, bool allowDirectTeleport = false, int maxOffset = 0, int minOffset = 0, int timeoutMs = 0)
|
||||
{
|
||||
|
|
@ -698,6 +701,14 @@ public sealed class MccGameApi
|
|||
: MccGameResult<MccMoveToPlayerResult>.Fail("action_incomplete", data: resultData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Run <see cref="MoveToPlayer"/> on a worker thread so ChatBot callbacks can poll the result without blocking MCC updates.
|
||||
/// </summary>
|
||||
public Task<MccGameResult<MccMoveToPlayerResult>> MoveToPlayerAsync(string playerName, bool allowUnsafe = false, bool allowDirectTeleport = false, int maxOffset = 0, int minOffset = 0, int timeoutMs = 0)
|
||||
{
|
||||
return Task.Run(() => MoveToPlayer(playerName, allowUnsafe, allowDirectTeleport, maxOffset, minOffset, timeoutMs));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Select a hotbar item by item type without moving items around.
|
||||
/// </summary>
|
||||
|
|
@ -953,6 +964,8 @@ public sealed class MccGameApi
|
|||
|
||||
/// <summary>
|
||||
/// Move to nearby dropped items and verify pickup completion.
|
||||
/// Callers running on ChatBot update callbacks should prefer <see cref="PickupItemsAsync"/>
|
||||
/// so the main MCC updater thread is not blocked while movement and pickup verification complete.
|
||||
/// </summary>
|
||||
public MccGameResult<MccPickupItemsResult> PickupItems(string itemType, double radius = 16, int maxItems = 10, bool allowUnsafe = false, int timeoutMs = 0)
|
||||
{
|
||||
|
|
@ -1039,6 +1052,14 @@ public sealed class MccGameApi
|
|||
: MccGameResult<MccPickupItemsResult>.Fail("action_incomplete", data: resultData);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Run <see cref="PickupItems"/> on a worker thread so ChatBot callbacks can poll the result without blocking MCC updates.
|
||||
/// </summary>
|
||||
public Task<MccGameResult<MccPickupItemsResult>> PickupItemsAsync(string itemType, double radius = 16, int maxItems = 10, bool allowUnsafe = false, int timeoutMs = 0)
|
||||
{
|
||||
return Task.Run(() => PickupItems(itemType, radius, maxItems, allowUnsafe, timeoutMs));
|
||||
}
|
||||
|
||||
private static MccGameResult<T> NotConnected<T>()
|
||||
{
|
||||
return MccGameResult<T>.Fail("disconnected");
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue