Merge remote-tracking branch 'origin/8.x-1.18.2' into 9.x-1.19

4 files changed, 19 insertions, 2 deletions

diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
index f4a4d0ca6..55f0ba48a 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java
@@ -81,6 +81,9 @@ public class DefaultCraftingCategory implements DisplayCategory<DefaultCraftingD
         }
         widgets.addAll(slots);
         widgets.add(Widgets.createSlot(new Point(startPoint.x + 95, startPoint.y + 19)).entries(display.getOutputEntries().get(0)).disableBackground().markOutput());
+        if (display.isShapeless()) {
+            widgets.add(Widgets.createShapelessIcon(bounds));
+        }
         return widgets;
     }
     
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
index 74adb6305..5ba026cc5 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/DefaultPlugin.java
@@ -88,7 +88,7 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
             ItemStack stack = entry.getValue();
             Item item = stack.getItem();
             if (item instanceof BucketItem bucketItem) {
-                Fluid fluid = bucketItem.content;
+                Fluid fluid = getFluidFromBucket(bucketItem);
                 if (fluid != null) {
                     return CompoundEventResult.interruptTrue(Stream.of(EntryStacks.of(fluid, FluidStackHooks.bucketAmount())));
                 }
@@ -103,7 +103,12 @@ public class DefaultPlugin implements BuiltinPlugin, REIServerPlugin {
     @ExpectPlatform
     @PlatformOnly(PlatformOnly.FORGE)
     private static void registerForgeFluidSupport(FluidSupportProvider support) {
-        
+        throw new AssertionError();
+    }
+    
+    @ExpectPlatform
+    private static Fluid getFluidFromBucket(BucketItem item) {
+        throw new AssertionError();
     }
     
     @Override
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
index d405d9f5c..49be00f02 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java
@@ -143,6 +143,10 @@ public abstract class DefaultCraftingDisplay<C extends Recipe<?>> extends BasicD
         return list;
     }
     
+    public boolean isShapeless() {
+        return false;
+    }
+    
     public static int getSlotWithSize(DefaultCraftingDisplay<?> display, int index, int craftingGridWidth) {
         return getSlotWithSize(display.getInputWidth(), index, craftingGridWidth);
     }
diff --git a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultShapelessDisplay.java b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultShapelessDisplay.java
index 502c5c61b..8f500bfb9 100644
--- a/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultShapelessDisplay.java
+++ b/default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultShapelessDisplay.java
@@ -61,4 +61,9 @@ public class DefaultShapelessDisplay extends DefaultCraftingDisplay<ShapelessRec
     public int getInputHeight() {
         return (int) Math.ceil(recipe.get().getIngredients().size() / 3.0);
     }
+    
+    @Override
+    public boolean isShapeless() {
+        return true;
+    }
 }