dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

also allow matching patterns from addons

Browse Source
This commit is contained in:
Darkere
2021-10-17 16:57:19 +02:00
parent 5867749883
commit b9a3507862
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/refinedmods/refinedstorage/apiimpl/network/grid/CraftingGridBehavior.java
View File

@@ -1,6 +1,7 @@
package com.refinedmods.refinedstorage.apiimpl.network.grid; package com.refinedmods.refinedstorage.apiimpl.network.grid;
import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider;
import com.refinedmods.refinedstorage.api.network.INetwork; import com.refinedmods.refinedstorage.api.network.INetwork;
import com.refinedmods.refinedstorage.api.network.grid.GridType; import com.refinedmods.refinedstorage.api.network.grid.GridType;
import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior; import com.refinedmods.refinedstorage.api.network.grid.ICraftingGridBehavior;
@@ -286,7 +287,7 @@ public class CraftingGridBehavior implements ICraftingGridBehavior {
for (int j = 0; j < player.inventory.getSizeInventory(); j++) { for (int j = 0; j < player.inventory.getSizeInventory(); j++) {
ItemStack inventoryStack = player.inventory.getStackInSlot(j); ItemStack inventoryStack = player.inventory.getStackInSlot(j);
if (inventoryStack.getItem() instanceof PatternItem) { if (inventoryStack.getItem() instanceof ICraftingPatternProvider) {
ICraftingPattern pattern = PatternItem.fromCache(network.getWorld(), inventoryStack); ICraftingPattern pattern = PatternItem.fromCache(network.getWorld(), inventoryStack);
if (pattern.isValid()) { if (pattern.isValid()) {
for (ItemStack stack : pattern.getOutputs()) { for (ItemStack stack : pattern.getOutputs()) {

3
src/main/java/com/refinedmods/refinedstorage/integration/jei/IngredientTracker.java
View File

@@ -1,6 +1,7 @@
package com.refinedmods.refinedstorage.integration.jei; package com.refinedmods.refinedstorage.integration.jei;
import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern; import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPattern;
import com.refinedmods.refinedstorage.api.autocrafting.ICraftingPatternProvider;
import com.refinedmods.refinedstorage.api.util.IComparer; import com.refinedmods.refinedstorage.api.util.IComparer;
import com.refinedmods.refinedstorage.apiimpl.API; import com.refinedmods.refinedstorage.apiimpl.API;
import com.refinedmods.refinedstorage.item.PatternItem; import com.refinedmods.refinedstorage.item.PatternItem;
@@ -35,7 +36,7 @@ public class IngredientTracker {
public void addAvailableStack(ItemStack stack, @Nullable IGridStack gridStack) { public void addAvailableStack(ItemStack stack, @Nullable IGridStack gridStack) {
int available = stack.getCount(); int available = stack.getCount();
if (doTransfer) { if (doTransfer) {
if (stack.getItem() instanceof PatternItem) { if (stack.getItem() instanceof ICraftingPatternProvider) {
ICraftingPattern pattern = PatternItem.fromCache(Minecraft.getInstance().world, stack); ICraftingPattern pattern = PatternItem.fromCache(Minecraft.getInstance().world, stack);
if (pattern.isValid()) { if (pattern.isValid()) {
for (ItemStack outputStack : pattern.getOutputs()) { for (ItemStack outputStack : pattern.getOutputs()) {