Clear creative tab parameter cache after search order refresh

Author: NotRyken

common/src/main/java/dev/terminalmc/clientsort/client/order/CreativeSearchOrder.java

@@ -19,6 +19,7 @@
 
 import dev.terminalmc.clientsort.client.ClientSort;
 import dev.terminalmc.clientsort.client.config.Config;
+import dev.terminalmc.clientsort.mixin.client.accessor.CreativeModeTabsAccessor;
 import it.unimi.dsi.fastutil.objects.Object2IntMap;
 import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
@@ -94,9 +95,8 @@ private static void refreshStackPositionMap() {
             return;
         }
         FeatureFlagSet enabledFeatures = mc.level.enabledFeatures();
-        boolean opTab = mc.player.canUseGameMasterBlocks() && mc.options.operatorItemsTab().get();
 
-        CreativeModeTabs.tryRebuildTabContents(enabledFeatures, !opTab, mc.level.registryAccess());
+        CreativeModeTabs.tryRebuildTabContents(enabledFeatures, true, mc.level.registryAccess());
 
         Collection<ItemStack> displayStacks =
                 new ArrayList<>(CreativeModeTabs.searchTab().getDisplayItems());
@@ -123,5 +123,7 @@ private static void refreshStackPositionMap() {
                     lock.unlock();
                 }, ClientSort.MOD_NAME + ": creative search stack position lookup builder"
         ).start();
+
+        CreativeModeTabsAccessor.setCachedParameters(null);
     }
 }

common/src/main/java/dev/terminalmc/clientsort/mixin/client/LocalPlayerMixin.java

@@ -21,7 +21,6 @@
 import dev.terminalmc.clientsort.client.interaction.InteractionManager;
 import dev.terminalmc.clientsort.client.order.CreativeSearchOrder;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.world.level.GameType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -52,12 +51,4 @@ private void afterPermissionLevelChange(int level, CallbackInfo ci) {
             CreativeSearchOrder.tryRefreshStackPositionMap();
         }
     }
-
-    @Inject(
-            method = "onGameModeChanged",
-            at = @At("RETURN")
-    )
-    private void afterGameModeChange(GameType gameMode, CallbackInfo ci) {
-        CreativeSearchOrder.tryRefreshStackPositionMap();
-    }
 }

common/src/main/java/dev/terminalmc/clientsort/mixin/client/accessor/CreativeModeTabsAccessor.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright 2025 TerminalMC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package dev.terminalmc.clientsort.mixin.client.accessor;
+
+import net.minecraft.world.item.CreativeModeTab.ItemDisplayParameters;
+import net.minecraft.world.item.CreativeModeTabs;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+@Mixin(CreativeModeTabs.class)
+public interface CreativeModeTabsAccessor {
+
+    @Accessor("CACHED_PARAMETERS")
+    static void setCachedParameters(ItemDisplayParameters parameters) {
+        throw new UnsupportedOperationException();
+    }
+}

common/src/main/resources/clientsort.mixins.json

@@ -16,6 +16,7 @@
     "client.MinecraftMixin",
     "client.ScreenMixin",
     "client.accessor.AbstractContainerScreenAccessor",
+    "client.accessor.CreativeModeTabsAccessor",
     "client.accessor.KeyMappingAccessor",
     "client.accessor.ScreenAccessor",
     "client.compat.emi.ReloadWorkerMixin",