tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #3860 from Creators-of-Create/mc1.18/basin-recipe-fix

Browse source 
Fixed basin recipes that override Recipe#getRemainingItems
This commit is contained in:
Cael Warner 2022-10-01 13:35:12 -07:00 committed by GitHub
commit 0098f0e147
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 92 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/main/java/com/simibubi/create/content/contraptions/processing/BasinRecipe.java
View file

@ -16,9 +16,11 @@ import com.simibubi.create.foundation.tileEntity.behaviour.filtering.FilteringBe
import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour; import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour;
import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment; import com.simibubi.create.foundation.tileEntity.behaviour.fluid.SmartFluidTankBehaviour.TankSegment;
import com.simibubi.create.foundation.utility.Iterate; import com.simibubi.create.foundation.utility.Iterate;
import com.simibubi.create.foundation.utility.recipe.DummyCraftingContainer;
import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo; import com.simibubi.create.foundation.utility.recipe.IRecipeTypeInfo;
import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.Ingredient; import net.minecraft.world.item.crafting.Ingredient;
import net.minecraft.world.item.crafting.Recipe; import net.minecraft.world.item.crafting.Recipe;
import net.minecraft.world.level.Level; import net.minecraft.world.level.Level;
@ -104,9 +106,6 @@ public class BasinRecipe extends ProcessingRecipe<SmartInventory> {
continue Ingredients; continue Ingredients;
if (!simulate) if (!simulate)
availableItems.extractItem(slot, 1, false); availableItems.extractItem(slot, 1, false);
else if (extracted.hasContainerItem())
recipeOutputItems.add(extracted.getContainerItem()
.copy());
extractedItemsFromSlot[slot]++; extractedItemsFromSlot[slot]++;
continue Ingredients; continue Ingredients;
} }
@ -150,11 +149,17 @@ public class BasinRecipe extends ProcessingRecipe<SmartInventory> {
} }
if (simulate) { if (simulate) {
if (recipe instanceof BasinRecipe) { if (recipe instanceof BasinRecipe basinRecipe) {
recipeOutputItems.addAll(((BasinRecipe) recipe).rollResults()); recipeOutputItems.addAll(basinRecipe.rollResults());
recipeOutputFluids.addAll(((BasinRecipe) recipe).getFluidResults()); recipeOutputFluids.addAll(basinRecipe.getFluidResults());
} else recipeOutputItems.addAll(basinRecipe.getRemainingItems(basin.getInputInventory()));
} else {
recipeOutputItems.add(recipe.getResultItem()); recipeOutputItems.add(recipe.getResultItem());
if (recipe instanceof CraftingRecipe craftingRecipe) {
recipeOutputItems.addAll(craftingRecipe.getRemainingItems(new DummyCraftingContainer(availableItems, extractedItemsFromSlot)));
}
}
} }
if (!basin.acceptOutputs(recipeOutputItems, recipeOutputFluids, simulate)) if (!basin.acceptOutputs(recipeOutputItems, recipeOutputFluids, simulate))

80
src/main/java/com/simibubi/create/foundation/utility/recipe/DummyCraftingContainer.java Normal file
View file

@ -0,0 +1,80 @@
package com.simibubi.create.foundation.utility.recipe;
import org.jetbrains.annotations.NotNull;
import net.minecraft.core.NonNullList;
import net.minecraft.world.entity.player.StackedContents;
import net.minecraft.world.inventory.CraftingContainer;
import net.minecraft.world.item.ItemStack;
import net.minecraftforge.items.IItemHandler;
public class DummyCraftingContainer extends CraftingContainer {
private final NonNullList<ItemStack> inv;
public DummyCraftingContainer(IItemHandler itemHandler, int[] extractedItemsFromSlot) {
super(null, 0, 0);
this.inv = createInventory(itemHandler, extractedItemsFromSlot);
}
@Override
public int getContainerSize() {
return this.inv.size();
}
@Override
public boolean isEmpty() {
for (int slot = 0; slot < this.getContainerSize(); slot++) {
if (!this.getItem(slot).isEmpty())
return false;
}
return true;
}
@Override
public @NotNull ItemStack getItem(int slot) {
return slot >= this.getContainerSize() ? ItemStack.EMPTY : this.inv.get(slot);
}
@Override
public @NotNull ItemStack removeItemNoUpdate(int slot) {
return ItemStack.EMPTY;
}
@Override
public @NotNull ItemStack removeItem(int slot, int count) {
return ItemStack.EMPTY;
}
@Override
public void setItem(int slot, @NotNull ItemStack stack) {}
@Override
public void clearContent() {}
@Override
public void fillStackedContents(@NotNull StackedContents helper) {}
private static NonNullList<ItemStack> createInventory(IItemHandler itemHandler, int[] extractedItemsFromSlot) {
NonNullList<ItemStack> inv = NonNullList.create();
for (int slot = 0; slot < itemHandler.getSlots(); slot++) {
ItemStack stack = itemHandler.getStackInSlot(slot);
if (stack.isEmpty())
continue;
for (int i = 0; i < extractedItemsFromSlot[slot]; i++) {
ItemStack stackCopy = stack.copy();
stackCopy.setCount(1);
inv.add(stackCopy);
}
}
return inv;
}
}