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

Jump to bottom

[1.20] Make DissolutionChamberRecipe and JEI Category respect NBT on input items #1461

Open
wants to merge 1 commit into
base: 1.20
Choose a base branch
from
Open

[1.20] Make DissolutionChamberRecipe and JEI Category respect NBT on input items #1461

Show file tree
Hide file tree
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
7 changes: 4 additions & 3 deletions src/main/java/com/buuz135/industrial/plugin/jei/category/DissolutionChamberCategory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
import com.buuz135.industrial.block.core.tile.DissolutionChamberTile;
import com.buuz135.industrial.config.machine.core.DissolutionChamberConfig;
import com.buuz135.industrial.module.ModuleCore;
import com.buuz135.industrial.plugin.jei.CustomJeiDrawable;
import com.buuz135.industrial.plugin.jei.IndustrialRecipeTypes;
import com.buuz135.industrial.recipe.DissolutionChamberRecipe;
import com.hrznstudio.titanium.api.client.AssetTypes;
Expand All @@ -33,7 +32,6 @@
import com.hrznstudio.titanium.client.screen.asset.DefaultAssetProvider;
import com.hrznstudio.titanium.client.screen.asset.IAssetProvider;
import com.hrznstudio.titanium.util.AssetUtil;
import com.mojang.blaze3d.vertex.PoseStack;
import mezz.jei.api.constants.VanillaTypes;
import mezz.jei.api.forge.ForgeTypes;
import mezz.jei.api.gui.builder.IRecipeLayoutBuilder;
Expand All @@ -49,6 +47,7 @@
import net.minecraft.network.chat.Component;
import net.minecraft.world.item.DyeColor;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.Ingredient;
import org.apache.commons.lang3.tuple.Pair;

import java.awt.*;
Expand Down Expand Up @@ -91,7 +90,9 @@ public IDrawable getIcon() {
public void setRecipe(IRecipeLayoutBuilder builder, DissolutionChamberRecipe recipe, IFocusGroup focuses) {
for (int i = 0; i < 8; i++) {
if (i < recipe.input.length) {
builder.addSlot(RecipeIngredientRole.INPUT, 24 + DissolutionChamberTile.getSlotPos(i).getLeft(), 11 + DissolutionChamberTile.getSlotPos(i).getRight()).addIngredients(VanillaTypes.ITEM_STACK, recipe.input[i].getItems().stream().toList());
ItemStack stack = recipe.input[i].getItems().stream().toList().get(0);
stack.getItem().onCraftedBy(stack, null, null);
builder.addSlot(RecipeIngredientRole.INPUT, 24 + DissolutionChamberTile.getSlotPos(i).getLeft(), 11 + DissolutionChamberTile.getSlotPos(i).getRight()).addIngredients(Ingredient.of(stack));
}
}
if (recipe.inputFluid != null && !recipe.inputFluid.isEmpty()) {
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/buuz135/industrial/recipe/DissolutionChamberRecipe.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ public boolean matches(IItemHandler handler, FluidTankComponent tank) {
for (ItemStack stack : iItemList.getItems()) {
int i = 0;
for (; i < handlerItems.size(); i++) {
if (ItemStack.isSameItem(handlerItems.get(i), stack)) {
if (ItemStack.isSameItemSameTags(handlerItems.get(i), stack)) {
found = true;
break;
}
Expand Down