R3944Realms/ModernFix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Invalidate memoization for non-category creative tabs when categories are rebuilt

Browse Source
This commit is contained in:
embeddedt 2025-06-02 19:08:23 -04:00
parent e7542afd1c
commit a170f072ff
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
1 changed files with 28 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/memoize_creative_tab_build/CreativeModeTabMixin.java
View File

@ -2,15 +2,22 @@ package org.embeddedt.modernfix.common.mixin.perf.memoize_creative_tab_build;
import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod; import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
import com.llamalad7.mixinextras.injector.wrapoperation.Operation; import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
import net.minecraft.core.registries.BuiltInRegistries;
import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.CreativeModeTab;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Shadow;
import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.Unique;
@Mixin(CreativeModeTab.class) @Mixin(CreativeModeTab.class)
public class CreativeModeTabMixin { public abstract class CreativeModeTabMixin {
@Shadow public abstract CreativeModeTab.Type getType();
@Unique @Unique
private CreativeModeTab.ItemDisplayParameters mfix$oldParameters; private CreativeModeTab.ItemDisplayParameters mfix$oldParameters;
@Unique
private static boolean MFIX$REBUILT_NON_CATEGORY = false;
/** /**
* @author embeddedt * @author embeddedt
* @reason Vanilla already does similar memoization in the CreativeModeTabs class, but mods often have to bypass * @reason Vanilla already does similar memoization in the CreativeModeTabs class, but mods often have to bypass
@ -20,9 +27,26 @@ public class CreativeModeTabMixin {
*/ */
@WrapMethod(method = "buildContents") @WrapMethod(method = "buildContents")
private synchronized void buildContentsIfChanged(CreativeModeTab.ItemDisplayParameters parameters, Operation<Void> original) { private synchronized void buildContentsIfChanged(CreativeModeTab.ItemDisplayParameters parameters, Operation<Void> original) {
if (mfix$oldParameters == null || mfix$oldParameters.needsUpdate(parameters.enabledFeatures(), parameters.hasPermissions(), parameters.holders())) { synchronized (CreativeModeTab.class) {
original.call(parameters); if (mfix$oldParameters == null || mfix$oldParameters.needsUpdate(parameters.enabledFeatures(), parameters.hasPermissions(), parameters.holders())) {
original.call(parameters);
if (this.getType() == CreativeModeTab.Type.CATEGORY) {
if (MFIX$REBUILT_NON_CATEGORY) {
// We must mark every other tab that's not a category as needing rebuild. Not doing this causes mods
// that build a search tab early on without having built the dependencies to permanently leave it
// in a broken state.
for (CreativeModeTab tab : BuiltInRegistries.CREATIVE_MODE_TAB) {
if (tab.getType() != CreativeModeTab.Type.CATEGORY) {
((CreativeModeTabMixin)(Object)tab).mfix$oldParameters = null;
}
}
MFIX$REBUILT_NON_CATEGORY = false;
}
} else {
MFIX$REBUILT_NON_CATEGORY = true;
}
}
mfix$oldParameters = parameters;
} }
mfix$oldParameters = parameters;
} }
} }