helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-11-07 17:36:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Imporve auto-craft mechanism (#1415)

Browse source 
Fix #1414
This commit is contained in:
ReinforceZwei 2021-01-15 20:25:23 +08:00 • committed by GitHub
parent 106acab66f
commit f20abb6fbc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 58 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

60
MinecraftClient/ChatBots/AutoCraft.cs
View file

@ -50,7 +50,8 @@ namespace MinecraftClient.ChatBots
ShiftClick, ShiftClick,
WaitForUpdate, WaitForUpdate,
ResetCraftArea, ResetCraftArea,
Repeat Repeat,
CheckResult
} }
/// <summary> /// <summary>
@ -571,6 +572,8 @@ namespace MinecraftClient.ChatBots
{ {
// Wait for server to send us the crafting result // Wait for server to send us the crafting result
actionSteps.Add(new ActionStep(ActionType.WaitForUpdate, inventoryInUse, 0)); actionSteps.Add(new ActionStep(ActionType.WaitForUpdate, inventoryInUse, 0));
// Check the crafting result is the item we want
actionSteps.Add(new ActionStep(ActionType.CheckResult, inventoryInUse, recipe.ResultItem));
// Put item back to inventory. (Using shift-click can take all item at once) // Put item back to inventory. (Using shift-click can take all item at once)
actionSteps.Add(new ActionStep(ActionType.ShiftClick, inventoryInUse, 0)); actionSteps.Add(new ActionStep(ActionType.ShiftClick, inventoryInUse, 0));
// We need to wait for server to update us after taking item from crafting result // We need to wait for server to update us after taking item from crafting result
@ -590,6 +593,8 @@ namespace MinecraftClient.ChatBots
private void StopCrafting() private void StopCrafting()
{ {
actionSteps.Clear(); actionSteps.Clear();
// Put item back to inventory or they will be dropped
ClearCraftingArea(inventoryInUse);
// Closing inventory can make server to update our inventory // Closing inventory can make server to update our inventory
// Useful when // Useful when
// - There are some items left in the crafting area // - There are some items left in the crafting area
@ -646,6 +651,22 @@ namespace MinecraftClient.ChatBots
else craftingFailed = true; else craftingFailed = true;
break; break;
// Compare the crafting result with the recipe result
case ActionType.CheckResult:
if (GetInventories()[step.InventoryID].Items.ContainsKey(0)
&& GetInventories()[step.InventoryID].Items[0].Type == step.ItemType)
{
// OK
break;
}
else
{
// Bad, reset everything
ClearCraftingArea(step.InventoryID);
index = 0;
}
break;
case ActionType.WaitForUpdate: case ActionType.WaitForUpdate:
if (step.InventoryID != -2) if (step.InventoryID != -2)
{ {
@ -656,7 +677,7 @@ namespace MinecraftClient.ChatBots
case ActionType.ResetCraftArea: case ActionType.ResetCraftArea:
if (step.InventoryID != -2) if (step.InventoryID != -2)
CloseInventory(step.InventoryID); ClearCraftingArea(step.InventoryID);
else else
craftingFailed = true; craftingFailed = true;
break; break;
@ -698,6 +719,41 @@ namespace MinecraftClient.ChatBots
} }
} }
/// <summary>
/// Put any item left in the crafting area back to inventory
/// </summary>
/// <param name="inventoryId">Inventory ID to operate with</param>
private void ClearCraftingArea(int inventoryId)
{
if (GetInventories().ContainsKey(inventoryId))
{
var inventory = GetInventories()[inventoryId];
int areaStart = 1;
int areaEnd = 4;
if (inventory.Type == ContainerType.Crafting)
{
areaEnd = 9;
}
List<int> emptySlots = inventory.GetEmpytSlots().Where(s => s > 9).ToList();
for (int i = areaStart; i <= areaEnd; i++)
{
if (inventory.Items.ContainsKey(i))
{
if (emptySlots.Count != 0)
{
WindowAction(inventoryId, i, WindowActionType.LeftClick);
WindowAction(inventoryId, emptySlots[0], WindowActionType.LeftClick);
emptySlots.RemoveAt(0);
}
else
{
WindowAction(inventoryId, i, WindowActionType.DropItemStack);
}
}
}
}
}
private void HandleUpdateTimeout() private void HandleUpdateTimeout()
{ {
LogToConsoleTranslated("bot.autoCraft.timeout", timeoutAction); LogToConsoleTranslated("bot.autoCraft.timeout", timeoutAction);