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.

Sign up for GitHub

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 ItemStack inputNBT method #2431

Merged
merged 1 commit into from
Mar 28, 2024
Merged

add ItemStack inputNBT method #2431

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 22 additions & 10 deletions src/main/java/gregtech/api/recipes/RecipeBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,49 +331,61 @@ public R inputNBT(OrePrefix orePrefix, Material material, int count, NBTMatcher
}

public R inputNBT(Item item, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(item)), matcher, condition);
return inputNBT(new ItemStack(item), matcher, condition);
}

public R inputNBT(Item item, int count, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(item), count), matcher, condition);
return inputNBT(new ItemStack(item, count), matcher, condition);
}

public R inputNBT(Item item, int count, int meta, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(item, count, meta)), matcher, condition);
return inputNBT(new ItemStack(item, count, meta), matcher, condition);
}

public R inputNBT(Item item, int count, @SuppressWarnings("unused") boolean wild, NBTMatcher matcher,
NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(item, count, GTValues.W)), matcher, condition);
return inputNBT(new ItemStack(item, count, GTValues.W), matcher, condition);
}

public R inputNBT(Block block, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(block, 1, matcher, condition);
}

public R inputNBT(Block block, int count, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(block, count)), matcher, condition);
return inputNBT(new ItemStack(block, count), matcher, condition);
}

public R inputNBT(Block block, int count, @SuppressWarnings("unused") boolean wild, NBTMatcher matcher,
NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(new ItemStack(block, count, GTValues.W)), matcher, condition);
return inputNBT(new ItemStack(block, count, GTValues.W), matcher, condition);
}

public R inputNBT(MetaItem<?>.MetaValueItem item, int count, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(item.getStackForm(count)), matcher, condition);
return inputNBT(item.getStackForm(count), matcher, condition);
}

public R inputNBT(MetaItem<?>.MetaValueItem item, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(item.getStackForm()), matcher, condition);
return inputNBT(item.getStackForm(), matcher, condition);
}

public R inputNBT(MetaTileEntity mte, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(mte.getStackForm()), matcher, condition);
return inputNBT(mte.getStackForm(), matcher, condition);
}

public R inputNBT(MetaTileEntity mte, int amount, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(mte.getStackForm(amount)), matcher, condition);
return inputNBT(mte.getStackForm(amount), matcher, condition);
}

/**
* NBT tags are stripped from the input stack and are not automatically checked.
*
* @param stack the itemstack to input.
* @param matcher the matcher for the stack's nbt
* @param condition the condition for the stack's nbt
* @return this
*/
public R inputNBT(@NotNull ItemStack stack, NBTMatcher matcher, NBTCondition condition) {
return inputNBT(new GTRecipeItemInput(stack), matcher, condition);
}

public R inputs(ItemStack... inputs) {
Expand Down
Loading