diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-08-14 16:54:04 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-08-14 16:54:04 +0900 |
| commit | 31cff9b7e8b74f0821f8591c19e289185ae91b5d (patch) | |
| tree | a627bfe89caf7dbfab4b7d1b690cb3827c95d426 /forge | |
| parent | 559ce07496aac9b974abbc03583bf70e19c862fd (diff) | |
| parent | 10810a2a602059c8b91a3efd0dadc1f5a967372e (diff) | |
| download | RoughlyEnoughItems-31cff9b7e8b74f0821f8591c19e289185ae91b5d.tar.gz RoughlyEnoughItems-31cff9b7e8b74f0821f8591c19e289185ae91b5d.tar.bz2 RoughlyEnoughItems-31cff9b7e8b74f0821f8591c19e289185ae91b5d.zip | |
Merge remote-tracking branch 'refs/remotes/origin/13.x-1.20.2' into 14.x-1.20.4
Diffstat (limited to 'forge')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java index 13f06f360..0b3dcb6b7 100644 --- a/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java +++ b/forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java @@ -23,8 +23,8 @@ package me.shedaniel.rei.impl.client.forge; +import me.shedaniel.rei.api.common.display.basic.BasicDisplay; import me.shedaniel.rei.impl.common.InternalLogger; -import net.minecraft.core.RegistryAccess; import net.minecraft.core.registries.BuiltInRegistries; import net.minecraft.resources.ResourceKey; import net.minecraft.world.flag.FeatureFlagSet; @@ -42,7 +42,7 @@ public class CreativeModeTabCollectorImpl { public static Map<CreativeModeTab, Collection<ItemStack>> collectTabs() { Map<CreativeModeTab, Collection<ItemStack>> map = new LinkedHashMap<>(); FeatureFlagSet featureFlags = FeatureFlags.REGISTRY.allFlags(); - CreativeModeTab.ItemDisplayParameters parameters = new CreativeModeTab.ItemDisplayParameters(featureFlags, true, RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY)); + CreativeModeTab.ItemDisplayParameters parameters = new CreativeModeTab.ItemDisplayParameters(featureFlags, true, BasicDisplay.registryAccess()); for (CreativeModeTab tab : CreativeModeTabs.allTabs()) { if (tab.getType() != CreativeModeTab.Type.HOTBAR && tab.getType() != CreativeModeTab.Type.INVENTORY) { |