helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2026-08-15 13:04:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

bugfix: /useitem offhand handling for edible items

Browse source 
Fix `/useitem` offhand handling for edible items
This commit is contained in:
Anon 2026-06-02 10:47:13 +02:00 • committed by GitHub
commit 4cc5fc00c3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 54 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

52
MinecraftClient/Commands/UseItem.cs
View file

@ -10,7 +10,7 @@ namespace MinecraftClient.Commands
class UseItem : Command class UseItem : Command
{ {
public override string CmdName { get { return "useitem"; } } public override string CmdName { get { return "useitem"; } }
public override string CmdUsage { get { return "useitem [x] [y] [z]"; } } public override string CmdUsage { get { return "useitem [mainhand|offhand] | useitem [x] [y] [z] [mainhand|offhand]"; } }
public override string CmdDesc { get { return Translations.cmd_useitem_desc; } } public override string CmdDesc { get { return Translations.cmd_useitem_desc; } }
public override void RegisterCommand(CommandDispatcher<CmdResult> dispatcher) public override void RegisterCommand(CommandDispatcher<CmdResult> dispatcher)
@ -23,8 +23,16 @@ namespace MinecraftClient.Commands
dispatcher.Register(l => l.Literal(CmdName) dispatcher.Register(l => l.Literal(CmdName)
.Executes(r => DoUseItem(r.Source)) .Executes(r => DoUseItem(r.Source))
.Then(l => l.Literal("mainhand")
.Executes(r => DoUseItem(r.Source, Hand.MainHand)))
.Then(l => l.Literal("offhand")
.Executes(r => DoUseItem(r.Source, Hand.OffHand)))
.Then(l => l.Argument("Location", MccArguments.Location()) .Then(l => l.Argument("Location", MccArguments.Location())
.Executes(r => DoUseItemAtLocation(r.Source, MccArguments.GetLocation(r, "Location")))) .Executes(r => DoUseItemAtLocation(r.Source, MccArguments.GetLocation(r, "Location"), Hand.MainHand))
.Then(l => l.Literal("mainhand")
.Executes(r => DoUseItemAtLocation(r.Source, MccArguments.GetLocation(r, "Location"), Hand.MainHand)))
.Then(l => l.Literal("offhand")
.Executes(r => DoUseItemAtLocation(r.Source, MccArguments.GetLocation(r, "Location"), Hand.OffHand))))
.Then(l => l.Literal("_help") .Then(l => l.Literal("_help")
.Executes(r => GetUsage(r.Source, string.Empty)) .Executes(r => GetUsage(r.Source, string.Empty))
.Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName))) .Redirect(dispatcher.GetRoot().GetChild("help").GetChild(CmdName)))
@ -41,29 +49,53 @@ namespace MinecraftClient.Commands
}); });
} }
private int DoUseItem(CmdResult r) private static bool ShouldUseOffhandFood(McClient handler)
{
Container? inventory = handler.GetInventory(0);
if (inventory is null)
return false;
if (!inventory.Items.TryGetValue(45, out Item? offhandItem)
|| offhandItem.IsEmpty
|| !offhandItem.Type.IsFood())
return false;
int mainHandSlot = 36 + handler.GetCurrentSlot();
return !inventory.Items.TryGetValue(mainHandSlot, out Item? mainHandItem)
|| mainHandItem.IsEmpty
|| !mainHandItem.Type.IsFood();
}
private int DoUseItem(CmdResult r, Hand? requestedHand = null)
{ {
McClient handler = CmdResult.currentHandler!; McClient handler = CmdResult.currentHandler!;
if (!handler.GetInventoryEnabled()) if (!handler.GetInventoryEnabled())
return r.SetAndReturn(Status.FailNeedInventory); return r.SetAndReturn(Status.FailNeedInventory);
if (handler.GetTerrainEnabled()) Hand hand = requestedHand ?? (ShouldUseOffhandFood(handler) ? Hand.OffHand : Hand.MainHand);
bool useOffhandFood = !requestedHand.HasValue && hand == Hand.OffHand;
if (!useOffhandFood && handler.GetTerrainEnabled())
{ {
const double maxDistance = 4.5; const double maxDistance = 4.5;
var raycast = RaycastHelper.RaycastBlock(handler, maxDistance, false); var raycast = RaycastHelper.RaycastBlock(handler, maxDistance, false);
if (raycast.Item1 && raycast.Item3.Type != Material.Air) if (raycast.Item1 && raycast.Item3.Type != Material.Air)
{ {
handler.PlaceBlock(raycast.Item2, Direction.Up, lookAtBlock: true); handler.PlaceBlock(raycast.Item2, Direction.Up, hand, lookAtBlock: true);
handler.DoAnimation((int)Hand.MainHand); handler.DoAnimation((int)hand);
return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use); return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use);
} }
} }
handler.UseItemOnHand(); if (hand == Hand.OffHand)
handler.UseItemOnLeftHand();
else
handler.UseItemOnHand();
return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use); return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use);
} }
private int DoUseItemAtLocation(CmdResult r, Location block) private int DoUseItemAtLocation(CmdResult r, Location block, Hand hand)
{ {
McClient handler = CmdResult.currentHandler!; McClient handler = CmdResult.currentHandler!;
if (!handler.GetTerrainEnabled()) if (!handler.GetTerrainEnabled())
@ -71,8 +103,8 @@ namespace MinecraftClient.Commands
Location current = handler.GetCurrentLocation(); Location current = handler.GetCurrentLocation();
block = block.ToAbsolute(current).ToFloor(); block = block.ToAbsolute(current).ToFloor();
handler.PlaceBlock(block, Direction.Up, lookAtBlock: true); handler.PlaceBlock(block, Direction.Up, hand, lookAtBlock: true);
handler.DoAnimation((int)Hand.MainHand); handler.DoAnimation((int)hand);
return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use); return r.SetAndReturn(Status.Done, Translations.cmd_useitem_use);
} }

12
docs/guide/usage.md
View file

@ -1157,12 +1157,24 @@ In scripts and remote control, no slash is needed to perform the command, eg. `q
/useitem /useitem
``` ```
Use the item from a specific hand:
```
/useitem <mainhand|offhand>
```
Use the item on a specific block: Use the item on a specific block:
``` ```
/useitem <x> <y> <z> /useitem <x> <y> <z>
``` ```
Use the item from a specific hand on a specific block:
```
/useitem <x> <y> <z> <mainhand|offhand>
```
</details> </details>
<details> <details>