diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-08-14 17:02:59 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-08-14 17:03:12 +0900 |
| commit | 709c33c851c01bfbae3d529fb890dc1b1f6e6f35 (patch) | |
| tree | 19a55203a92bca3225516f3bebcbaaa454d06600 /neoforge/src | |
| parent | 842621bb26c466b3b0759405277dbc808812db03 (diff) | |
| parent | 63cb335e2bf28df6fcbaa29cde3be33d8842ec03 (diff) | |
| download | RoughlyEnoughItems-709c33c851c01bfbae3d529fb890dc1b1f6e6f35.tar.gz RoughlyEnoughItems-709c33c851c01bfbae3d529fb890dc1b1f6e6f35.tar.bz2 RoughlyEnoughItems-709c33c851c01bfbae3d529fb890dc1b1f6e6f35.zip | |
Merge remote-tracking branch 'refs/remotes/origin/12.x-1.20' into 13.x-1.20.2
Diffstat (limited to 'neoforge/src')
| -rw-r--r-- | neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java b/neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java index 1b098fea4..78e901c50 100644 --- a/neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java +++ b/neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java @@ -25,6 +25,7 @@ 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; @@ -37,12 +38,13 @@ import net.neoforged.neoforge.client.ClientHooks; import java.util.Collection; import java.util.LinkedHashMap; import java.util.Map; +import java.util.Objects; 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, BasicDisplay.registryAccess()); + CreativeModeTab.ItemDisplayParameters parameters = new CreativeModeTab.ItemDisplayParameters(featureFlags, true, Objects.requireNonNullElseGet(BasicDisplay.registryAccess(), () -> RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY))); for (CreativeModeTab tab : CreativeModeTabs.allTabs()) { if (tab.getType() != CreativeModeTab.Type.HOTBAR && tab.getType() != CreativeModeTab.Type.INVENTORY) { |