Skip to content
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

Jump to bottom

Use client-side registry access for rendering guidebook recipes. #8117

Merged
merged 1 commit into from
Aug 5, 2024
Merged

Use client-side registry access for rendering guidebook recipes. #8117

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
20 changes: 6 additions & 14 deletions src/main/java/appeng/client/guidebook/compiler/tags/RecipeCompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ private record RecipeTypeMapping<T extends Recipe<C>, C extends RecipeInput>(
Function<RecipeHolder<T>, LytBlock> factory) {
@Nullable
LytBlock tryCreate(RecipeManager recipeManager, Item resultItem) {
var registryAccess = Platform.getClientRegistryAccess();

// We try to find non-special recipes first then fall back to special
List<RecipeHolder<T>> fallbackCandidates = new ArrayList<>();
for (var recipe : recipeManager.byType(recipeType)) {
Expand All @@ -117,24 +119,14 @@ LytBlock tryCreate(RecipeManager recipeManager, Item resultItem) {
continue;
}

try {
if (recipe.value().getResultItem(null).getItem() == resultItem) {
return factory.apply(recipe);
}
} catch (Exception ignored) {
// :-P
// Happens if the recipe doesn't accept a null RegistryAccess
if (recipe.value().getResultItem(registryAccess).getItem() == resultItem) {
return factory.apply(recipe);
}
}

for (var recipe : fallbackCandidates) {
try {
if (recipe.value().getResultItem(null).getItem() == resultItem) {
return factory.apply(recipe);
}
} catch (Exception ignored) {
// :-P
// Happens if the recipe doesn't accept a null RegistryAccess
if (recipe.value().getResultItem(registryAccess).getItem() == resultItem) {
return factory.apply(recipe);
}
}

Expand Down