diff options
| author | shedaniel <daniel@shedaniel.me> | 2024-08-14 17:06:59 +0900 |
|---|---|---|
| committer | shedaniel <daniel@shedaniel.me> | 2024-08-14 17:06:59 +0900 |
| commit | a0e666f6656cdad355b3038f6696aef2dc943ab6 (patch) | |
| tree | abdd972795d6e8a03d997b347b42a28aecd34e4a /forge | |
| parent | a81a4367c95fa9de4a959b9fad0a4331bb09591b (diff) | |
| parent | e00c81335f57d60bac5034c1b05c6c94dbf5f8d0 (diff) | |
| download | RoughlyEnoughItems-a0e666f6656cdad355b3038f6696aef2dc943ab6.tar.gz RoughlyEnoughItems-a0e666f6656cdad355b3038f6696aef2dc943ab6.tar.bz2 RoughlyEnoughItems-a0e666f6656cdad355b3038f6696aef2dc943ab6.zip | |
Merge remote-tracking branch 'refs/remotes/origin/14.x-1.20.4' into 15.x-1.20.5
# Conflicts:
# neoforge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java
Diffstat (limited to 'forge')
| -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) { |