Skip to content

Commit 02502d5

Browse files
committed
Fix potential NPE
1 parent 879f3e0 commit 02502d5

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

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

+3-5
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import me.shedaniel.rei.impl.common.InternalLogger;
2828
import net.fabricmc.fabric.api.itemgroup.v1.FabricItemGroupEntries;
2929
import net.fabricmc.fabric.api.itemgroup.v1.ItemGroupEvents;
30+
import net.minecraft.core.RegistryAccess;
3031
import net.minecraft.core.registries.BuiltInRegistries;
3132
import net.minecraft.resources.ResourceKey;
3233
import net.minecraft.world.flag.FeatureFlagSet;
@@ -35,16 +36,13 @@
3536
import net.minecraft.world.item.CreativeModeTabs;
3637
import net.minecraft.world.item.ItemStack;
3738

38-
import java.util.Collection;
39-
import java.util.LinkedHashMap;
40-
import java.util.LinkedList;
41-
import java.util.Map;
39+
import java.util.*;
4240

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

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

0 commit comments

Comments
 (0)