Skip to content

Fix client crash: lazy CategoryIcon recipe-viewer wrapper (JEI runtime accessed during RegisterEvent) #5115

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

Open
ascorblack wants to merge 1 commit into
base: 1.21
Choose a base branch
from
+21 −12
Open

Fix client crash: lazy CategoryIcon recipe-viewer wrapper (JEI runtime accessed during RegisterEvent) #5115

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
33 changes: 21 additions & 12 deletions src/main/java/com/gregtechceu/gtceu/integration/recipeviewer/CategoryIcon.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,36 @@
// Generic recipe viewer category icon
public class CategoryIcon {

// Resolved lazily: constructing icons happens during RegisterEvent dispatch
// (GTRecipeCategories.init), when the JEI runtime does not exist yet —
// calling GTJEIPlugin.getRuntime() there crashes the client (unbound
// gtceu:data_item follow-up). Defer wrapper creation to first get().
private Object wrappedValue;
private ResourceLocation texture;
private ItemStack stack;
private boolean resolved = false;

public CategoryIcon(ResourceLocation texture) {
if (!GTCEu.isClientSide()) return;
if (GTCEu.Mods.isEMILoaded()) {
wrappedValue = EmiCallWrapper.getRenderable(texture);
} else if (GTCEu.Mods.isJEILoaded()) {
wrappedValue = JeiCallWrapper.getRenderable(texture);
}
this.texture = texture;
}

public CategoryIcon(ItemStack stack) {
if (!GTCEu.isClientSide()) return;
if (GTCEu.Mods.isEMILoaded()) {
wrappedValue = EmiCallWrapper.getRenderable(stack);
} else if (GTCEu.Mods.isJEILoaded()) {
wrappedValue = JeiCallWrapper.getRenderable(stack);
}
this.stack = stack;
}

public Object get() {
if (!resolved) {
resolved = true;
if (GTCEu.isClientSide()) {
if (GTCEu.Mods.isEMILoaded()) {
wrappedValue = texture != null ? EmiCallWrapper.getRenderable(texture) :
EmiCallWrapper.getRenderable(stack);
} else if (GTCEu.Mods.isJEILoaded()) {
wrappedValue = texture != null ? JeiCallWrapper.getRenderable(texture) :
JeiCallWrapper.getRenderable(stack);
}
}
}
return wrappedValue;
}

Expand Down
Loading