Skip to content

Commit 2f9c6fe

Browse files
committed
Simplify internal recipe building
1 parent 6f09848 commit 2f9c6fe

File tree

1 file changed

+4
-37
lines changed

1 file changed

+4
-37
lines changed

src/client/java/aztech/modern_industrialization/compat/viewer/usage/MachineCategory.java

Lines changed: 4 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -38,25 +38,22 @@
3838
import aztech.modern_industrialization.machines.init.MIMachineRecipeTypes;
3939
import aztech.modern_industrialization.machines.init.MachineTier;
4040
import aztech.modern_industrialization.machines.recipe.MachineRecipe;
41-
import aztech.modern_industrialization.machines.recipe.RecipeConversions;
4241
import aztech.modern_industrialization.thirdparty.fabrictransfer.api.fluid.FluidVariant;
4342
import aztech.modern_industrialization.util.TextHelper;
4443
import java.util.ArrayList;
4544
import java.util.Comparator;
4645
import java.util.List;
47-
import java.util.Objects;
4846
import java.util.function.Consumer;
4947
import net.minecraft.ChatFormatting;
48+
import net.minecraft.client.Minecraft;
5049
import net.minecraft.core.RegistryAccess;
5150
import net.minecraft.core.registries.BuiltInRegistries;
5251
import net.minecraft.network.chat.Component;
5352
import net.minecraft.network.chat.Style;
5453
import net.minecraft.resources.ResourceLocation;
5554
import net.minecraft.world.item.crafting.RecipeHolder;
5655
import net.minecraft.world.item.crafting.RecipeManager;
57-
import net.minecraft.world.item.crafting.RecipeType;
5856
import net.minecraft.world.level.ItemLike;
59-
import net.minecraft.world.level.block.ComposterBlock;
6057

6158
public class MachineCategory extends ViewerCategory<RecipeHolder<MachineRecipe>> {
6259
public static MachineCategory create(MachineCategoryParams params) {
@@ -96,41 +93,11 @@ public void buildWorkstations(WorkstationConsumer consumer) {
9693

9794
@Override
9895
public void buildRecipes(RecipeManager recipeManager, RegistryAccess registryAccess, Consumer<RecipeHolder<MachineRecipe>> consumer) {
99-
var machineRecipes = recipeManager.getRecipes().stream()
100-
.filter(r -> r.value() instanceof MachineRecipe)
101-
.map(r -> (RecipeHolder<MachineRecipe>) r)
102-
.toList();
103-
104-
// regular recipes
105-
machineRecipes.stream()
106-
.filter(r -> params.recipePredicate.test(r.value()))
96+
MIMachineRecipeTypes.getRecipeTypes().stream()
97+
.flatMap(type -> type.getRecipes(Minecraft.getInstance().level).stream())
98+
.filter(recipe -> params.recipePredicate.test(recipe.value()))
10799
.sorted(Comparator.comparing(RecipeHolder::id))
108100
.forEach(consumer);
109-
110-
// converted recipes
111-
if (params.category.getNamespace().equals(MI.ID)) {
112-
switch (params.category.getPath()) {
113-
case "bronze_furnace" -> {
114-
recipeManager.getAllRecipesFor(RecipeType.SMELTING)
115-
.stream()
116-
.map(r -> RecipeConversions.ofSmelting(r, MIMachineRecipeTypes.FURNACE, registryAccess))
117-
.forEach(consumer);
118-
}
119-
case "bronze_cutting_machine" -> {
120-
recipeManager.getAllRecipesFor(RecipeType.STONECUTTING)
121-
.stream()
122-
.map(r -> RecipeConversions.ofStonecutting(r, MIMachineRecipeTypes.CUTTING_MACHINE, registryAccess))
123-
.forEach(consumer);
124-
}
125-
case "centrifuge" -> {
126-
ComposterBlock.COMPOSTABLES.keySet()
127-
.stream()
128-
.map(RecipeConversions::ofCompostable)
129-
.filter(Objects::nonNull)
130-
.forEach(consumer);
131-
}
132-
}
133-
}
134101
}
135102

136103
@Override

0 commit comments

Comments
 (0)