Skip to content

Commit 63cb335

Browse files
committed
Fix potential NPE
1 parent 02502d5 commit 63cb335

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

forge/src/main/java/me/shedaniel/rei/impl/client/forge/CreativeModeTabCollectorImpl.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525

2626
import me.shedaniel.rei.api.common.display.basic.BasicDisplay;
2727
import me.shedaniel.rei.impl.common.InternalLogger;
28+
import net.minecraft.core.RegistryAccess;
2829
import net.minecraft.core.registries.BuiltInRegistries;
2930
import net.minecraft.resources.ResourceKey;
3031
import net.minecraft.world.flag.FeatureFlagSet;
@@ -37,12 +38,13 @@
3738
import java.util.Collection;
3839
import java.util.LinkedHashMap;
3940
import java.util.Map;
41+
import java.util.Objects;
4042

4143
public class CreativeModeTabCollectorImpl {
4244
public static Map<CreativeModeTab, Collection<ItemStack>> collectTabs() {
4345
Map<CreativeModeTab, Collection<ItemStack>> map = new LinkedHashMap<>();
4446
FeatureFlagSet featureFlags = FeatureFlags.REGISTRY.allFlags();
45-
CreativeModeTab.ItemDisplayParameters parameters = new CreativeModeTab.ItemDisplayParameters(featureFlags, true, BasicDisplay.registryAccess());
47+
CreativeModeTab.ItemDisplayParameters parameters = new CreativeModeTab.ItemDisplayParameters(featureFlags, true, Objects.requireNonNullElseGet(BasicDisplay.registryAccess(), () -> RegistryAccess.fromRegistryOfRegistries(BuiltInRegistries.REGISTRY)));
4648

4749
for (CreativeModeTab tab : CreativeModeTabs.allTabs()) {
4850
if (tab.getType() != CreativeModeTab.Type.HOTBAR && tab.getType() != CreativeModeTab.Type.INVENTORY) {

0 commit comments

Comments
 (0)