helpy4/Minecraft-Console-Client
1
0
Fork 0
mirror of https://github.com/MCCTeam/Minecraft-Console-Client synced 2025-10-14 21:22:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove IsFood method from Item class

Browse source
This commit is contained in:
ReinforceZwei 2020-04-09 21:17:08 +08:00 • committed by ORelio
parent b1121e91e3
commit 3f9b084a45
3 changed files with 3 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

4
MinecraftClient/ChatBots/AutoEat.cs
View file

@ -50,7 +50,7 @@ namespace MinecraftClient.ChatBots
Container inventory = GetPlayerInventory(); Container inventory = GetPlayerInventory();
bool found = false; bool found = false;
LastSlot = CurrentSlot; LastSlot = CurrentSlot;
if (inventory.Items.ContainsKey(CurrentSlot + 36) && ItemTypeExtensions.IsFood(inventory.Items[CurrentSlot + 36].Type)) if (inventory.Items.ContainsKey(CurrentSlot + 36) && inventory.Items[CurrentSlot + 36].Type.IsFood())
{ {
// no need to change slot // no need to change slot
found = true; found = true;
@ -60,7 +60,7 @@ namespace MinecraftClient.ChatBots
for (int i = 36; i <= 44; i++) for (int i = 36; i <= 44; i++)
{ {
if (!inventory.Items.ContainsKey(i)) continue; if (!inventory.Items.ContainsKey(i)) continue;
if (inventory.Items[i].IsFood()) if (inventory.Items[i].Type.IsFood())
{ {
int slot = i - 36; int slot = i - 36;
ChangeSlot((short)slot); ChangeSlot((short)slot);

19
MinecraftClient/Inventory/Item.cs
View file

@ -70,24 +70,5 @@ namespace MinecraftClient.Inventory
return null; return null;
} }
} }
/// <summary>
/// Check item is a food
/// </summary>
/// <returns>True if is a food</returns>
public bool IsFood()
{
// non-poison and stackable food
// remarks: auto eat may works with non-stackable food <- not tested
int[] foods = { 524, 765, 821, 823, 562, 763, 680, 629, 801, 585, 788, 630, 670, 674, 588, 587, 768, 673, 764, 777, 677, 679, 625, 800, 584, 787, 626, 678, 876, 627 };
if (foods.Contains((int)Type))
{
return true;
}
else
{
return false;
}
}
} }
} }

7
MinecraftClient/Inventory/ItemTypeExtensions.cs
View file

@ -7,12 +7,7 @@ namespace MinecraftClient.Inventory
{ {
public static class ItemTypeExtensions public static class ItemTypeExtensions
{ {
/** public static bool IsFood(this ItemType m)
* I see "this" in the MaterialExtensions class method, why need that?
* public static bool IsSolid(this Material m)
* ^^^^
*/
public static bool IsFood(ItemType m)
{ {
ItemType[] t = ItemType[] t =
{ {