aboutsummaryrefslogtreecommitdiff
path: root/default-plugin
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2024-09-05 01:33:01 +0900
committershedaniel <daniel@shedaniel.me>2024-09-05 01:33:01 +0900
commit97adf5d548ddb76d94e1c0542573cd21b7c6827c (patch)
treee1435bd2b828676bca9a02609793e06af39678c7 /default-plugin
parent63cb335e2bf28df6fcbaa29cde3be33d8842ec03 (diff)
parent7b5ed400a9bb5a26013441a7ca5589ca30803abd (diff)
downloadRoughlyEnoughItems-97adf5d548ddb76d94e1c0542573cd21b7c6827c.tar.gz
RoughlyEnoughItems-97adf5d548ddb76d94e1c0542573cd21b7c6827c.tar.bz2
RoughlyEnoughItems-97adf5d548ddb76d94e1c0542573cd21b7c6827c.zip
Merge remote-tracking branch 'origin/11.x-1.19.4' into 12.x-1.20
# Conflicts: # api/src/main/java/me/shedaniel/rei/api/client/registry/transfer/simple/SimpleTransferHandler.java
Diffstat (limited to 'default-plugin')
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/InventoryCraftingTransferHandler.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/InventoryCraftingTransferHandler.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/InventoryCraftingTransferHandler.java
index d377c2add..d57fc1bb6 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/InventoryCraftingTransferHandler.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/autocrafting/InventoryCraftingTransferHandler.java
@@ -24,6 +24,7 @@
package me.shedaniel.rei.plugin.autocrafting;
import me.shedaniel.rei.api.client.registry.transfer.TransferHandler;
+import me.shedaniel.rei.api.client.registry.transfer.TransferHandlerMeta;
import me.shedaniel.rei.api.client.registry.transfer.simple.SimpleTransferHandler;
import me.shedaniel.rei.api.common.entry.EntryStack;
import me.shedaniel.rei.api.common.entry.InputIngredient;
@@ -31,10 +32,11 @@ import me.shedaniel.rei.api.common.entry.type.VanillaEntryTypes;
import me.shedaniel.rei.api.common.util.CollectionUtils;
import me.shedaniel.rei.plugin.common.displays.crafting.DefaultCraftingDisplay;
import net.minecraft.network.chat.Component;
+import net.minecraft.world.item.ItemStack;
import java.util.List;
-public class InventoryCraftingTransferHandler implements TransferHandler {
+public class InventoryCraftingTransferHandler implements TransferHandler, TransferHandlerMeta {
private final SimpleTransferHandler parent;
public InventoryCraftingTransferHandler(SimpleTransferHandler parent) {
@@ -61,4 +63,9 @@ public class InventoryCraftingTransferHandler implements TransferHandler {
CollectionUtils.map(inputs, entry -> InputIngredient.withType(entry, VanillaEntryTypes.ITEM)),
parent.getInputSlots(context), parent.getInventorySlots(context));
}
+
+ @Override
+ public Iterable<ItemStack> getAvailableIngredients(Context context) {
+ return parent.getAvailableIngredients(context);
+ }
}