Skip to content

Resolve advancement icons lazily to avoid an intermittent RegisterEvent boot crash #10534

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
Jus144tice wants to merge 1 commit into
base: mc1.21.1/dev
Choose a base branch
from
Open

Resolve advancement icons lazily to avoid an intermittent RegisterEvent boot crash #10534

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
18 changes: 16 additions & 2 deletions src/main/java/com/simibubi/create/foundation/advancement/CreateAdvancement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@ void save(Consumer<AdvancementHolder> t, HolderLookup.Provider registries) {
if (createBuilder.func != null)
createBuilder.icon(createBuilder.func.apply(registries));

if (createBuilder.awardOnIconCollected)
mcBuilder.addCriterion(String.valueOf(createBuilder.keyIndex++),
InventoryChangeTrigger.TriggerInstance.hasItems(createBuilder.icon.getItem()));

mcBuilder.display(createBuilder.icon, Component.translatable(titleKey()),
Component.translatable(descriptionKey()).withStyle(s -> s.withColor(0xDBA213)),
id.equals("root") ? BACKGROUND : null, createBuilder.type.advancementType, createBuilder.type.toast,
Expand Down Expand Up @@ -141,6 +145,7 @@ class Builder {
private int keyIndex;
private ItemStack icon;
private Function<Provider, ItemStack> func;
private boolean awardOnIconCollected;

Builder special(TaskType type) {
this.type = type;
Expand All @@ -153,7 +158,11 @@ Builder after(CreateAdvancement other) {
}

Builder icon(ItemProviderEntry<?, ?> item) {
return icon(item.asStack());
// Resolve lazily at save() rather than now: AllAdvancements' static
// initializer runs inside RegisterEvent, where this Create item may not be
// bound yet under some mod-load orders, causing an intermittent
// "Trying to access unbound value" boot crash on large modpacks.
return icon(registries -> item.asStack());
}

Builder icon(ItemLike item) {
Expand Down Expand Up @@ -185,7 +194,12 @@ Builder whenBlockPlaced(Block block) {
}

Builder whenIconCollected() {
return externalTrigger(InventoryChangeTrigger.TriggerInstance.hasItems(icon.getItem()));
// The icon may resolve lazily (see icon(ItemProviderEntry)), so its item
// isn't available at build time. Flag externalTrigger so no builtin trigger
// is added; the real criterion is appended in save(), once the icon resolves.
externalTrigger = true;
awardOnIconCollected = true;
return this;
}

Builder whenItemCollected(ItemProviderEntry<?, ?> item) {
Expand Down