Skip to content

Commit c5b61e4

Browse files
committed
fix: šŸ› Fixed recipe restocking for recipes with many ingredient alternatives
1 parent 1f2f5ed commit c5b61e4

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.89
18+
mod_version=1.4.90
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
@@ -11,13 +11,28 @@
1111
import java.util.ArrayList;
1212
import java.util.Collections;
1313
import java.util.List;
14+
import java.util.Optional;
1415
import java.util.function.BiFunction;
1516
import java.util.function.Function;
1617

1718
public class ClientRecipeHelper {
1819
private ClientRecipeHelper() {
1920
}
2021

22+
public static Optional<RecipeHolder<?>> getRecipe(ResourceLocation recipeId) {
23+
Minecraft minecraft = Minecraft.getInstance();
24+
ClientLevel level = minecraft.level;
25+
if (level == null) {
26+
return Optional.empty();
27+
}
28+
29+
return getRecipe(level.getRecipeManager(), recipeId);
30+
}
31+
32+
public static Optional<RecipeHolder<?>> getRecipe(RecipeManager recipeManager, ResourceLocation recipeId) {
33+
return recipeManager.byKey(recipeId);
34+
}
35+
2136
public static <I extends RecipeInput, T extends Recipe<I>, U extends Recipe<?>, V> List<V> transformAllRecipesOfType(RecipeType<T> recipeType,
2237
Class<U> filterRecipeClass, BiFunction<ResourceLocation, U, V> transformRecipe) {
2338
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
@@ -312,6 +312,10 @@ public static <T extends AbstractCookingRecipe> Optional<RecipeHolder<T>> getCoo
312312
return getLevel().flatMap(w -> safeGetRecipeFor(recipeType, new SingleRecipeInput(stack), w, null));
313313
}
314314

315+
public static Optional<RecipeHolder<?>> getRecipe(ResourceLocation recipeId) {
316+
return getLevel().flatMap(level -> level.getRecipeManager().byKey(recipeId));
317+
}
318+
315319
public static Set<CompactingShape> getItemCompactingShapes(ItemStack stack) {
316320
return getFromCache(cache -> cache.getItemCompactingShapes(stack), Collections.emptySet());
317321
}

0 commit comments

Comments
Ā (0)