aboutsummaryrefslogtreecommitdiff
path: root/default-plugin/src/main/java/me/shedaniel/rei
diff options
context:
space:
mode:
authorshedaniel <daniel@shedaniel.me>2022-04-16 03:15:46 +0800
committershedaniel <daniel@shedaniel.me>2022-04-16 03:15:46 +0800
commitad476378effa1dfd5fbef9c4d4cb5eadb9954d32 (patch)
tree5a9c0ada8e451b6ce84de8ef4f4520c092f4c680 /default-plugin/src/main/java/me/shedaniel/rei
parent8d9d53b65561fedea8f61d194d411565fd89b57e (diff)
downloadRoughlyEnoughItems-ad476378effa1dfd5fbef9c4d4cb5eadb9954d32.tar.gz
RoughlyEnoughItems-ad476378effa1dfd5fbef9c4d4cb5eadb9954d32.tar.bz2
RoughlyEnoughItems-ad476378effa1dfd5fbef9c4d4cb5eadb9954d32.zip
Add shapeless indicator
Diffstat (limited to 'default-plugin/src/main/java/me/shedaniel/rei')
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/client/categories/crafting/DefaultCraftingCategory.java3
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultCraftingDisplay.java4
-rw-r--r--default-plugin/src/main/java/me/shedaniel/rei/plugin/common/displays/crafting/DefaultShapelessDisplay.java5
3 files changed, 12 insertions, 0 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/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;
+ }
}