Skip to content

Commit 9de3845

Browse files
committed
fix: šŸ› Fixed recipe restocking for recipes with many ingredient alternatives
1 parent 4f98449 commit 9de3845

3 files changed

Lines changed: 20 additions & 1 deletion

File tree

ā€Žgradle.propertiesā€Ž

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ loader_version_range=[4,)
1515
mod_id=sophisticatedcore
1616
mod_name=Sophisticated Core
1717
mod_license=All Rights Reserved
18-
mod_version=1.4.96
18+
mod_version=1.4.97
1919
mod_group_id=net.p3pp3rf1y
2020
mod_authors=P3pp3rF1y
2121
mod_description=A library / shared functionality mod for Sophisticated Storage and Backpacks

ā€Žsrc/main/java/net/p3pp3rf1y/sophisticatedcore/compat/recipeviewers/common/ClientRecipeHelper.javaā€Ž

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.util.ArrayList;
2323
import java.util.Collections;
2424
import java.util.List;
25+
import java.util.Optional;
2526
import java.util.function.BiFunction;
2627
import java.util.function.Function;
2728
import java.util.stream.Stream;
@@ -36,6 +37,20 @@ public static Ingredient emptyDisplayIngredient() {
3637
return EMPTY_DISPLAY_INGREDIENT;
3738
}
3839

40+
public static Optional<RecipeHolder<?>> getRecipe(ResourceLocation recipeId) {
41+
Minecraft minecraft = Minecraft.getInstance();
42+
ClientLevel level = minecraft.level;
43+
if (level == null) {
44+
return Optional.empty();
45+
}
46+
47+
return getRecipe(level.getRecipeManager(), recipeId);
48+
}
49+
50+
public static Optional<RecipeHolder<?>> getRecipe(RecipeManager recipeManager, ResourceLocation recipeId) {
51+
return recipeManager.byKey(recipeId);
52+
}
53+
3954
public static <I extends RecipeInput, T extends Recipe<I>, U extends Recipe<?>, V> List<V> transformAllRecipesOfType(RecipeType<T> recipeType,
4055
Class<U> filterRecipeClass, BiFunction<Identifier, U, V> transformRecipe) {
4156
Minecraft minecraft = Minecraft.getInstance();

ā€Žsrc/main/java/net/p3pp3rf1y/sophisticatedcore/util/RecipeHelper.javaā€Ž

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -329,6 +329,10 @@ public static <T extends AbstractCookingRecipe> Optional<RecipeHolder<T>> getCoo
329329
return getLevel().flatMap(w -> safeGetRecipeFor(recipeType, new SingleRecipeInput(stack), w, null));
330330
}
331331

332+
public static Optional<RecipeHolder<?>> getRecipe(ResourceLocation recipeId) {
333+
return getLevel().flatMap(level -> level.getRecipeManager().byKey(recipeId));
334+
}
335+
332336
public static Set<CompactingShape> getItemCompactingShapes(ItemStack stack) {
333337
return getFromCache(cache -> cache.getItemCompactingShapes(stack), Collections.emptySet());
334338
}

0 commit comments

Comments
Ā (0)