Skip to content

Read crafting automation categories by recipe type so mechanical crafting recipes no longer leak into them #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
syukoGit merged 1 commit into from
Aug 9, 2026
Merged

Read crafting automation categories by recipe type so mechanical crafting recipes no longer leak into them #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 4 additions & 8 deletions ...main/java/fr/syuko/emicreatecompat/category/automaticpacking/AutomaticPackingRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package fr.syuko.emicreatecompat.category.automaticpacking;

import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.content.kinetics.crafter.MechanicalCraftingRecipe;
import com.simibubi.create.content.kinetics.press.MechanicalPressBlockEntity;
import com.simibubi.create.infrastructure.config.AllConfigs;
import fr.syuko.emicreatecompat.category.basin.BasinDisplay;
Expand All @@ -12,10 +11,7 @@
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
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.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraft.world.item.crafting.*;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -33,9 +29,9 @@ public static List<BasinDisplay> all(RecipeManager manager) {

List<BasinDisplay> displays = new ArrayList<>();

for (RecipeHolder<?> holder : manager.getRecipes()) {
if (!(holder.value() instanceof CraftingRecipe recipe) || recipe instanceof MechanicalCraftingRecipe || !MechanicalPressBlockEntity.canCompress(
recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
CraftingRecipe recipe = holder.value();
if (!MechanicalPressBlockEntity.canCompress(recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
continue;
}

Expand Down
26 changes: 10 additions & 16 deletions src/main/java/fr/syuko/emicreatecompat/category/automaticshaped/AutomaticShapedRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.ClientLevel;
import net.minecraft.world.item.ItemStack;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraft.world.item.crafting.ShapedRecipe;
import net.minecraft.world.item.crafting.*;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -26,8 +23,9 @@ public static List<AutomaticShapedDisplay> all(RecipeManager manager) {

List<AutomaticShapedDisplay> displays = new ArrayList<>();

for (RecipeHolder<?> holder : manager.getRecipes()) {
if (!(holder.value() instanceof CraftingRecipe recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
CraftingRecipe recipe = holder.value();
if (AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
continue;
}

Expand All @@ -41,16 +39,12 @@ public static List<AutomaticShapedDisplay> all(RecipeManager manager) {
continue;
}

int
width =
shaped
? ((ShapedRecipe) recipe).getWidth()
: 1;
int
height =
shaped
? ((ShapedRecipe) recipe).getHeight()
: 1;
int width = shaped
? ((ShapedRecipe) recipe).getWidth()
: 1;
int height = shaped
? ((ShapedRecipe) recipe).getHeight()
: 1;

displays.add(new AutomaticShapedDisplay(holder.id(),
List.copyOf(recipe.getIngredients()),
Expand Down
13 changes: 5 additions & 8 deletions .../java/fr/syuko/emicreatecompat/category/automaticshapeless/AutomaticShapelessRecipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
import fr.syuko.emicreatecompat.category.basin.BasinDisplays;
import fr.syuko.emicreatecompat.create.recipe.BasinRecipes;
import net.minecraft.client.Minecraft;
import net.minecraft.world.item.crafting.CraftingRecipe;
import net.minecraft.world.item.crafting.RecipeHolder;
import net.minecraft.world.item.crafting.RecipeManager;
import net.minecraft.world.item.crafting.ShapedRecipe;
import net.minecraft.world.item.crafting.*;

import java.util.ArrayList;
import java.util.List;
Expand All @@ -28,10 +25,10 @@ public static List<BasinDisplay> all(RecipeManager manager) {

List<BasinDisplay> displays = new ArrayList<>();

for (RecipeHolder<?> holder : manager.getRecipes()) {
if (!(holder.value() instanceof CraftingRecipe recipe) || recipe instanceof ShapedRecipe || BasinRecipes.present(
recipe.getIngredients())
.size() <= 1 || MechanicalPressBlockEntity.canCompress(
for (RecipeHolder<CraftingRecipe> holder : manager.getAllRecipesFor(RecipeType.CRAFTING)) {
CraftingRecipe recipe = holder.value();
if (recipe instanceof ShapedRecipe || BasinRecipes.present(recipe.getIngredients())
.size() <= 1 || MechanicalPressBlockEntity.canCompress(
recipe) || AllRecipeTypes.shouldIgnoreInAutomation(holder)) {
continue;
}
Expand Down
Loading