Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Crafting command #3960

Draft
wants to merge 44 commits into
base: master
Choose a base branch
from
Draft
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
e14afe5
Create CraftCommand.java
strubium May 18, 2023
aa18fdf
Update CraftCommand.java
strubium May 18, 2023
5c0fe9c
Update Settings.java
strubium May 18, 2023
15efa2b
More info in description
strubium May 18, 2023
4c5a5da
Update DefaultCommands.java
strubium May 18, 2023
31976c1
Add chat notifier
strubium May 18, 2023
6e71d89
Merge pull request #5 from strubium/master
rycbar0 May 22, 2023
1547431
prototype
rycbar0 May 25, 2023
a443dcc
not sure if this goes in the right direction
rycbar0 May 25, 2023
e7a36ec
resolving some mixin problems
rycbar0 May 26, 2023
98c1d64
revert some changes as they didnt worked out.
rycbar0 May 28, 2023
645dbc4
Update CraftingProcess.java
strubium Jun 2, 2023
5c61f53
Merge pull request #6 from strubium/patch-1
rycbar0 Jun 6, 2023
b009df2
craft-ability check
rycbar0 Jun 7, 2023
13c31c1
refactoring
rycbar0 Jun 7, 2023
c34eb89
small fix
rycbar0 Jun 8, 2023
49a33d0
remove autocraft setting because unused
rycbar0 Jun 8, 2023
79e417e
refactoring CraftingProcess
rycbar0 Jun 8, 2023
8d1b2c7
delete mixins because unused
rycbar0 Jun 8, 2023
1cb53c7
delete mixins because unused
rycbar0 Jun 8, 2023
c1f2d0c
revert changes on GetToBlockProcess
rycbar0 Jun 8, 2023
6d34c50
im hard at my limit here
rycbar0 Jun 8, 2023
f5c50df
i need help
rycbar0 Jun 8, 2023
f79077f
its amazing that it works sometimes
rycbar0 Jun 9, 2023
eae2dc3
delete extra line
rycbar0 Jun 11, 2023
ecfbc49
craft command
rycbar0 Jun 11, 2023
48dc674
getting closer to a finished product
rycbar0 Jun 11, 2023
0a85399
todos
rycbar0 Jun 11, 2023
4e71b04
codacy and selecting crafting table
rycbar0 Jun 13, 2023
d8c8884
comments and edge cases
rycbar0 Jun 13, 2023
857acd4
copying a good part of builder process
rycbar0 Jun 14, 2023
4285f53
small tweaks
rycbar0 Jun 14, 2023
8c40be4
i think its ready
rycbar0 Jun 14, 2023
49e7892
Merge branch 'cabaletta:master' into crafting
rycbar0 Jun 14, 2023
7eed809
Merge remote-tracking branch 'origin/crafting' into crafting
rycbar0 Jun 14, 2023
32bd0b4
changes on CraftCommand
rycbar0 Jun 15, 2023
15a4cc3
changes on CraftingProcess
rycbar0 Jun 15, 2023
df3f7a3
changes on CraftingProcess II
rycbar0 Jun 17, 2023
29d1df4
add recipe switching for item crafting
rycbar0 Jun 17, 2023
1ef0feb
ready for round two
rycbar0 Jun 17, 2023
913ae06
Merge remote-tracking branch 'upstream/master' into crafting
rycbar0 Jun 18, 2023
fbd1e0c
oopsie
rycbar0 Jun 18, 2023
6ddfdd5
change CraftCommand
rycbar0 Jun 20, 2023
927fa43
CraftingProcess uses now List<IRecipe>
rycbar0 Jun 21, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
im hard at my limit here
  • Loading branch information
rycbar0 committed Jun 8, 2023
commit 6d34c506e3718c0c512a6481c7e500046263d7bc
132 changes: 88 additions & 44 deletions src/main/java/baritone/process/CraftingProcess.java
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@
package baritone.process;

import baritone.Baritone;
import baritone.api.pathing.goals.*;
import baritone.api.process.ICraftingProcess;
import baritone.api.process.PathingCommand;
import baritone.api.process.PathingCommandType;
import baritone.api.utils.BlockOptionalMetaLookup;
import baritone.pathing.movement.CalculationContext;
import baritone.utils.BaritoneProcessHelper;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.util.RecipeItemHelper;
Expand All @@ -31,13 +34,17 @@
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.util.math.BlockPos;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

public final class CraftingProcess extends BaritoneProcessHelper implements ICraftingProcess {
private int amount;
private IRecipe recipe;
private Goal goal;
private BlockPos placeAt;

public CraftingProcess(Baritone baritone) {
super(baritone);
Expand All @@ -50,9 +57,16 @@ public boolean isActive() {

@Override
public synchronized PathingCommand onTick(boolean calcFailed, boolean isSafeToCancel) {
if (baritone.getGetToBlockProcess().isActive()) {
if (calcFailed) {
logDirect("path calculation failed");
onLostControl();
}
if (goal != null) {
//we are pathing to a table and therefor have to wait.
return new PathingCommand(null, PathingCommandType.DEFER);
return new PathingCommand(goal, PathingCommandType.SET_GOAL_AND_PATH);
} else if (placeAt != null) {

return new PathingCommand(null, PathingCommandType.CANCEL_AND_SET_GOAL);
} else {
//we no longer pathing so it's time to craft
try {
Expand All @@ -70,6 +84,8 @@ public synchronized PathingCommand onTick(boolean calcFailed, boolean isSafeToCa
public synchronized void onLostControl() {
amount = 0;
recipe = null;
goal = null;
placeAt = null;
}

@Override
Expand All @@ -81,9 +97,8 @@ public String displayName0() {
public void craftItem(Item item, int amount) {
if (canCraft(item, amount)) {
this.amount = amount;
//todo check for crafting tables that are close. if none are found place one. else gotoBlock.
baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
logDirect("Crafting now " + amount + "x [" + recipe.getRecipeOutput().getDisplayName() + "]");
getACraftingTable();
} else {
logDirect("Insufficient resources.");
}
Expand All @@ -94,46 +109,9 @@ public void craftRecipe(IRecipe recipe, int amount) {
if (canCraft(recipe, amount)) {
this.recipe = recipe;
this.amount = amount;
baritone.getGetToBlockProcess().getToBlock(Blocks.CRAFTING_TABLE);
getACraftingTable();
} else {
logDirect("this recipe is not craftable with the available resources.");
}
}

private int getInputCount() {
int stackSize = Integer.MAX_VALUE;
for (int i = 0; i < 9; i++) {
ItemStack itemStack = ((ContainerWorkbench) baritone.getPlayerContext().player().openContainer).craftMatrix.getStackInSlot(i);
if (itemStack.getItem() != Item.getItemFromBlock(Blocks.AIR)) {
stackSize = Math.min(itemStack.getCount(), stackSize);
}
}
return stackSize == Integer.MAX_VALUE ? 0 : stackSize;
}

private void takeResultFromOutput() {
int inputCount = getInputCount();
if (inputCount > 0) {
int windowId = ctx.player().openContainer.windowId;
int slotID = 0; //slot id. for crafting table output it is 0
int randomIntWeDontNeedButHaveToProvide = 0; //idk isnt used
mc.playerController.windowClick(windowId, slotID, randomIntWeDontNeedButHaveToProvide, ClickType.QUICK_MOVE, ctx.player());
amount = amount - (recipe.getRecipeOutput().getCount() * inputCount);
}

if (amount <= 0) {
logDirect("Done");
//we finished crafting
ctx.player().closeScreen();
onLostControl();
}
}

private void moveItemsToCraftingGrid() {
int windowId = baritone.getPlayerContext().player().openContainer.windowId;
//try to put the recipe the required amount of times in to the crafting grid.
for (int i = 0; i * recipe.getRecipeOutput().getCount() < amount; i++) {
mc.playerController.func_194338_a(windowId, recipe, GuiScreen.isShiftKeyDown(), ctx.player());
logDirect("Insufficient resources.");
}
}

Expand Down Expand Up @@ -184,9 +162,75 @@ public boolean canCraft(IRecipe recipe, int amount) {
return recipeItemHelper.canCraft(recipe, null, times);
}


@Override
public boolean canCraftInInventory(IRecipe recipe) {
return recipe.canFit(2,2);
}

private int getInputCount() {
int stackSize = Integer.MAX_VALUE;
for (int i = 0; i < 9; i++) {
ItemStack itemStack = ((ContainerWorkbench) baritone.getPlayerContext().player().openContainer).craftMatrix.getStackInSlot(i);
if (itemStack.getItem() != Item.getItemFromBlock(Blocks.AIR)) {
stackSize = Math.min(itemStack.getCount(), stackSize);
}
}
return stackSize == Integer.MAX_VALUE ? 0 : stackSize;
}

private void takeResultFromOutput() {
int inputCount = getInputCount();
if (inputCount > 0) {
int windowId = ctx.player().openContainer.windowId;
int slotID = 0; //slot id. for crafting table output it is 0
int randomIntWeDontNeedButHaveToProvide = 0; //idk isnt used
rycbar0 marked this conversation as resolved.
Show resolved Hide resolved
mc.playerController.windowClick(windowId, slotID, randomIntWeDontNeedButHaveToProvide, ClickType.QUICK_MOVE, ctx.player());
rycbar0 marked this conversation as resolved.
Show resolved Hide resolved
amount = amount - (recipe.getRecipeOutput().getCount() * inputCount);
}

if (amount <= 0) {
logDirect("Done");
//we finished crafting
ctx.player().closeScreen();
onLostControl();
}
}

private void moveItemsToCraftingGrid() {
int windowId = ctx.player().openContainer.windowId;
//try to put the recipe the required amount of times in to the crafting grid.
for (int i = 0; i * recipe.getRecipeOutput().getCount() < amount; i++) {
mc.playerController.func_194338_a(windowId, recipe, GuiScreen.isShiftKeyDown(), ctx.player());
}
}

private void getACraftingTable() {
List<BlockPos> knownLocations = MineProcess.searchWorld(new CalculationContext(baritone, false), new BlockOptionalMetaLookup(Blocks.CRAFTING_TABLE), 1, Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
if (knownLocations.isEmpty()) {
logDirect("no crafting table found");
if (hasCraftingTable()) {
logDirect("but player has one in inventory");
placeAt = ctx.playerFeet().north();
} else {
logDirect("No CraftingTable.");
onLostControl();
}
} else {
logDirect("crafting table found");
goal = new GoalComposite(knownLocations.stream().map(this::createGoal).toArray(Goal[]::new));
}
}

private boolean hasCraftingTable() {
for (ItemStack itemstack : ctx.player().inventory.mainInventory) {
rycbar0 marked this conversation as resolved.
Show resolved Hide resolved
if (itemstack.getItem() == Item.getItemFromBlock(Blocks.CRAFTING_TABLE)) {
return true;
}
}
return false;
}

private Goal createGoal(BlockPos pos) {
return new GoalGetToBlock(pos);
}
}