diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-08-14 19:26:34 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-08-14 19:34:44 +0900 |
| commit | 612dddf0b65be65a70783622c6406a966d935ebc (patch) | |
| tree | c14ca86eae0dadace3617681aad605da5b849b56 /forge/src | |
| parent | d0a69811215c779229e9227264f5b79839c471af (diff) | |
| parent | 90af6e03bcf45b0c13d5b7af51126bd2fc7389a5 (diff) | |
| download | RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.tar.gz RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.tar.bz2 RoughlyEnoughItems-612dddf0b65be65a70783622c6406a966d935ebc.zip | |
Merge remote-tracking branch 'origin/15.x-1.20.5' into 16.x-1.21
Fixes #1665
Fixes #1662
Fixes #1663
Diffstat (limited to 'forge/src')
| -rw-r--r-- | forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java | 4 |
1 files changed, 3 insertions, 1 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..09c23d298 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,6 +23,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; @@ -37,12 +38,13 @@ import net.minecraftforge.common.ForgeHooks; 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, RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY)); + 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) { |