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
Show file tree
Hide file tree
Changes from 42 commits
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
6 changes: 6 additions & 0 deletions src/api/java/baritone/api/IBaritone.java
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ public interface IBaritone {
*/
IGetToBlockProcess getGetToBlockProcess();

/**
* @return The {@link IGetToBlockProcess} instance
* @see IGetToBlockProcess
*/
ICraftingProcess getCraftingProcess();

/**
* @return The {@link IWorldProvider} instance
* @see IWorldProvider
Expand Down
51 changes: 51 additions & 0 deletions src/api/java/baritone/api/command/datatypes/ItemById.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* This file is part of Baritone.
*
* Baritone is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Baritone is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/

package baritone.api.command.datatypes;

import baritone.api.command.exception.CommandException;
import baritone.api.command.helpers.TabCompleteHelper;
import net.minecraft.item.Item;
import net.minecraft.util.ResourceLocation;

import java.util.stream.Stream;

/**
* @author ZacSharp
* written for a yet unmerged #pickUp command
*/
public enum ItemById implements IDatatypeFor<Item> {
INSTANCE;

@Override
public Item get(IDatatypeContext ctx) throws CommandException {
Item item;
if ((item = Item.getByNameOrId(ctx.getConsumer().getString())) == null) {
throw new IllegalArgumentException("No item found by that id");
}
return item;
}

@Override
public Stream<String> tabComplete(IDatatypeContext ctx) throws CommandException {
return new TabCompleteHelper()
.append(Item.REGISTRY.getKeys().stream().map(ResourceLocation::toString))
.filterPrefixNamespaced(ctx.getConsumer().getString())
.sortAlphabetically()
.stream();
}
}
75 changes: 75 additions & 0 deletions src/api/java/baritone/api/process/ICraftingProcess.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
/*
* This file is part of Baritone.
*
* Baritone is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Baritone is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/

package baritone.api.process;

import net.minecraft.item.Item;
import net.minecraft.item.crafting.IRecipe;

import java.util.List;

/**
* Allows you to craft items.
*/
public interface ICraftingProcess extends IBaritoneProcess {

/**
* Executes the crafting of the requested item such that we obtain the requested amount.
* @param item that should be crafted
* @param amount how much of that item is wanted.
*/
void craftItem(Item item, int amount);

/**
* Executes the crafting of the requested recipe such that we obtain the requested amount of output.
* @param recipe recipe that should be used.
* @param amount how many result items are wanted.
*/
void craftRecipe(IRecipe recipe, int amount);

/**
* @param item that should be crafted.
* @return Can the item be crafted in a crafting table?
*/
boolean hasCraftingRecipe(Item item);

/**
* @param item that should be crafted.
* @return List of all recipes that result in the provided Item.
*/
List<IRecipe> getCraftingRecipes(Item item);

/**
* @param item that should be crafted.
* @param amount how much of this item should be crafted.
* @return Can we craft this item the requested amount of times?
*/
boolean canCraft(Item item, int amount);

/**
* @param recipe that should be crafted.
* @param amount how much output is wanted.
* @return Can we craft this recipe to get the requested amount of output?
*/
boolean canCraft(IRecipe recipe, int amount);

/**
* @param recipe the recipe we want to craft.
* @return Do we need a crafting table or can we craft it in our inventory?
*/
boolean canCraftInInventory(IRecipe recipe);
}
7 changes: 7 additions & 0 deletions src/main/java/baritone/Baritone.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public class Baritone implements IBaritone {
private final BuilderProcess builderProcess;
private final ExploreProcess exploreProcess;
private final FarmProcess farmProcess;
private final CraftingProcess craftingProcess;
private final InventoryPauserProcess inventoryPauserProcess;

private final PathingControlManager pathingControlManager;
Expand Down Expand Up @@ -117,6 +118,7 @@ public class Baritone implements IBaritone {
this.builderProcess = this.registerProcess(BuilderProcess::new);
this.exploreProcess = this.registerProcess(ExploreProcess::new);
this.farmProcess = this.registerProcess(FarmProcess::new);
this.craftingProcess = this.registerProcess(CraftingProcess::new);
this.inventoryPauserProcess = this.registerProcess(InventoryPauserProcess::new);
this.registerProcess(BackfillProcess::new);
}
Expand Down Expand Up @@ -162,6 +164,11 @@ public GetToBlockProcess getGetToBlockProcess() {
return this.getToBlockProcess;
}

@Override
public CraftingProcess getCraftingProcess() {
return this.craftingProcess;
}

@Override
public IPlayerContext getPlayerContext() {
return this.playerContext;
Expand Down
35 changes: 34 additions & 1 deletion src/main/java/baritone/command/argparser/DefaultArgParsers.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import baritone.api.command.argparser.IArgParser;
import baritone.api.command.argument.ICommandArgument;
import net.minecraft.item.Item;

import java.util.Arrays;
import java.util.List;
Expand Down Expand Up @@ -114,11 +115,43 @@ public Boolean parseArg(ICommandArgument arg) throws RuntimeException {
}
}

public static class ItemArgumentParser implements IArgParser.Stateless<Item> {
public static final ItemArgumentParser INSTANCE = new ItemArgumentParser();

@Override
public Class<Item> getTarget() {
return Item.class;
}

@Override
public Item parseArg(ICommandArgument arg) throws Exception {
/*
String value = arg.getValue();
Item item = Item.getByNameOrId(value);
if (item == null) {
for (IRecipe recipe : CraftingManager.REGISTRY) {
if (recipe.getRecipeOutput().getDisplayName().equalsIgnoreCase(value)) {
return recipe.getRecipeOutput().getItem();
}
}
throw new IllegalArgumentException("invalid item");
} else {
return item;
}/**/
Item item = Item.getByNameOrId(arg.getValue());
if (item == null) {
throw new IllegalArgumentException("invalid item");
}
return item;
}
}

public static final List<IArgParser<?>> ALL = Arrays.asList(
IntArgumentParser.INSTANCE,
LongArgumentParser.INSTANCE,
FloatArgumentParser.INSTANCE,
DoubleArgumentParser.INSTANCE,
BooleanArgumentParser.INSTANCE
BooleanArgumentParser.INSTANCE,
ItemArgumentParser.INSTANCE
);
}
100 changes: 100 additions & 0 deletions src/main/java/baritone/command/defaults/CraftCommand.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
/*
* This file is part of Baritone.
*
* Baritone is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Baritone is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Baritone. If not, see <https://www.gnu.org/licenses/>.
*/

package baritone.command.defaults;

import baritone.api.IBaritone;
import baritone.api.command.Command;
import baritone.api.command.argument.IArgConsumer;
import baritone.api.command.datatypes.ItemById;
import baritone.api.command.exception.CommandException;
import net.minecraft.item.Item;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;

import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;

public class CraftCommand extends Command {

protected CraftCommand(IBaritone baritone) {
super(baritone, "craft");
}

@Override
public void execute(String label, IArgConsumer args) throws CommandException {
int amount = args.getAsOrDefault(Integer.class, 1);

Item item = args.getAsOrNull(Item.class);
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, I'll take that as my fault. The method I wanted was getDatatypeForOrNull (basically the same but works without the wrapper arg parser) and I should have looked it up instead of guessing a name which ended up existing with slightly different functionality.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is no IDatatypeFor for Integers so i would have to add that before i could use getDatatypeForOrDefault() which in my opinion is nonsense. For the item, what is wrong with getAsOrNull()? i will do it but i dont understand why.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can freely mix datatypes and arg types so you can use getAsOrDefault for the integer and getDatatypeForOrNull for the item. That way you don't need to create a new parser for either of them.


if (item == null) {
String itemName = args.rawRest();
//boolean recipeExists = false;
for (IRecipe recipe : CraftingManager.REGISTRY) {
if (recipe.getRecipeOutput().getDisplayName().equalsIgnoreCase(itemName)) {
if (baritone.getCraftingProcess().canCraft(recipe, amount)) {
baritone.getCraftingProcess().craftRecipe(recipe, amount);
return;
} /*else { //a recipe exists but we cant craft it
recipeExists = true;
}/**/
}
}/*
if (recipeExists) {
logDirect("Insufficient Resources");
} else {
logDirect("Invalid Item");
}/**/
} else if (!baritone.getCraftingProcess().hasCraftingRecipe(item)) {
logDirect("no crafting recipe for "+item.getTranslationKey()+" found.");
} else if (!baritone.getCraftingProcess().canCraft(item, amount)){
logDirect("Insufficient Resources");
} else {
baritone.getCraftingProcess().craftItem(item, amount);
}
}

@Override
public Stream<String> tabComplete(String label, IArgConsumer args) throws CommandException {
while (args.has(2)) {
if (args.peekDatatypeOrNull(ItemById.INSTANCE) == null) {
return Stream.empty();
}
args.get();
}
return args.tabCompleteDatatype(ItemById.INSTANCE);
}

@Override
public String getShortDesc() {
return "Craft a item.";
}

@Override
public List<String> getLongDesc() {
return Arrays.asList(
"Go to a crafting table and craft a item.",
"",
"Usage:",
"> craft [quantity] <item> - Go to a crafting table, and craft a item.",
"Examples:",
"> craft 17 planks -> will craft 20 planks out of any logs you have.",
"> craft oak wood planks -> will craft 4 oak wood planks."
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ public static List<ICommand> createAll(IBaritone baritone) {
new SetCommand(baritone),
new CommandAlias(baritone, Arrays.asList("modified", "mod", "baritone", "modifiedsettings"), "List modified settings", "set modified"),
new CommandAlias(baritone, "reset", "Reset all settings or just one", "set reset"),
new CraftCommand(baritone),
new GoalCommand(baritone),
new GotoCommand(baritone),
new PathCommand(baritone),
Expand Down
Loading