Skip to content

Commit 72e3a11

Browse files
committed
Move item filling quirk to correct vanilla location on 1.19+
1 parent 33fa870 commit 72e3a11

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/blast_search_trees/MinecraftMixin.java

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
import net.minecraft.client.KeyMapping;
44
import net.minecraft.client.Minecraft;
55
import net.minecraft.client.searchtree.SearchRegistry;
6-
import net.minecraft.core.NonNullList;
7-
import net.minecraft.core.Registry;
8-
import net.minecraft.world.item.CreativeModeTab;
9-
import net.minecraft.world.item.Item;
10-
import net.minecraft.world.item.ItemStack;
116
import org.embeddedt.modernfix.ModernFix;
127
import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
138
import org.embeddedt.modernfix.searchtree.DummySearchTree;
@@ -32,7 +27,6 @@ private void replaceSearchTrees(CallbackInfo ci) {
3227
if(provider == null)
3328
return;
3429
ModernFix.LOGGER.info("Replacing search trees with '{}' provider", provider.getName());
35-
mfix$runItemFillingQuirk();
3630
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, list -> provider.getSearchTree(false));
3731
this.searchRegistry.register(SearchRegistry.CREATIVE_TAGS, list -> provider.getSearchTree(true));
3832
this.searchRegistry.register(SearchRegistry.RECIPE_COLLECTIONS, list -> new DummySearchTree<>());
@@ -46,14 +40,4 @@ private void replaceSearchTrees(CallbackInfo ci) {
4640
GLFW.glfwSetErrorCallback(oldCb);
4741
ci.cancel();
4842
}
49-
50-
private void mfix$runItemFillingQuirk() {
51-
// quirk: call fillItemCategory on all items in the registry in case they do classloading inside it
52-
// see https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29 for an example of this
53-
NonNullList<ItemStack> stacks = NonNullList.create();
54-
for(Item item : Registry.ITEM) {
55-
stacks.clear();
56-
item.fillItemCategory(CreativeModeTab.TAB_SEARCH, stacks);
57-
}
58-
}
5943
}

common/src/main/java/org/embeddedt/modernfix/searchtree/DummySearchTree.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package org.embeddedt.modernfix.searchtree;
22

33
import net.minecraft.client.searchtree.RefreshableSearchTree;
4+
import net.minecraft.core.NonNullList;
5+
import net.minecraft.core.Registry;
6+
import net.minecraft.world.item.CreativeModeTab;
7+
import net.minecraft.world.item.Item;
48
import net.minecraft.world.item.ItemStack;
59

610
import java.util.Collections;
@@ -16,7 +20,13 @@ public DummySearchTree() {
1620

1721
@Override
1822
public void refresh() {
19-
23+
// quirk: call fillItemCategory on all items in the registry in case they do classloading inside it
24+
// see https://github.com/Shadows-of-Fire/GatewaysToEternity/issues/29 for an example of this
25+
NonNullList<ItemStack> stacks = NonNullList.create();
26+
for(Item item : Registry.ITEM) {
27+
stacks.clear();
28+
item.fillItemCategory(CreativeModeTab.TAB_SEARCH, stacks);
29+
}
2030
}
2131

2232
@Override

0 commit comments

Comments
 (0)