Merge 1.19.4 into 1.20

This commit is contained in:
embeddedt 2023-08-03 13:14:38 -04:00
commit d5a9f68575
No known key found for this signature in database
GPG Key ID: A69433EC199B5613

View File

@ -33,7 +33,6 @@ public abstract class MinecraftMixin {
if(provider == null)
return;
ModernFix.LOGGER.info("Replacing search trees with '{}' provider", provider.getName());
mfix$runItemFillingQuirk();
SearchRegistry.TreeBuilderSupplier<ItemStack> nameSupplier = list -> provider.getSearchTree(false);
SearchRegistry.TreeBuilderSupplier<ItemStack> tagSupplier = list -> provider.getSearchTree(true);
this.searchRegistry.register(SearchRegistry.CREATIVE_NAMES, nameSupplier);
@ -50,8 +49,4 @@ public abstract class MinecraftMixin {
GLFW.glfwSetErrorCallback(oldCb);
ci.cancel();
}
private void mfix$runItemFillingQuirk() {
// currently unimplemented on 1.19.4+
}
}