From 89aef7867ce5b65aa459b611fb90b65e37ea7a10 Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 17 May 2023 23:54:03 +0200 Subject: [PATCH] Removed `CreativeModeTab` from Registries --- .../org/betterx/bclib/registry/BaseRegistry.java | 8 +++----- .../org/betterx/bclib/registry/BlockRegistry.java | 12 ++++++++---- .../org/betterx/bclib/registry/ItemRegistry.java | 4 ++-- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/main/java/org/betterx/bclib/registry/BaseRegistry.java b/src/main/java/org/betterx/bclib/registry/BaseRegistry.java index 851e4306..f9a67092 100644 --- a/src/main/java/org/betterx/bclib/registry/BaseRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/BaseRegistry.java @@ -3,7 +3,6 @@ package org.betterx.bclib.registry; import org.betterx.bclib.config.PathConfig; import net.minecraft.resources.ResourceLocation; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.level.block.Block; @@ -12,18 +11,16 @@ import com.google.common.collect.Maps; import java.util.List; import java.util.Map; +import org.jetbrains.annotations.ApiStatus; public abstract class BaseRegistry { private static final List> REGISTRIES = Lists.newArrayList(); private static final Map> MOD_BLOCK_ITEMS = Maps.newHashMap(); private static final Map> MOD_BLOCKS = Maps.newHashMap(); private static final Map> MOD_ITEMS = Maps.newHashMap(); - - protected final CreativeModeTab creativeTab; protected final PathConfig config; - protected BaseRegistry(CreativeModeTab creativeTab, PathConfig config) { - this.creativeTab = creativeTab; + protected BaseRegistry(PathConfig config) { this.config = config; REGISTRIES.add(this); } @@ -75,6 +72,7 @@ public abstract class BaseRegistry { return modBlocks; } + @ApiStatus.Internal public static void register() { REGISTRIES.forEach(BaseRegistry::registerInternal); } diff --git a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java index 69901afa..594c60b4 100644 --- a/src/main/java/org/betterx/bclib/registry/BlockRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/BlockRegistry.java @@ -17,16 +17,18 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; import net.minecraft.tags.ItemTags; import net.minecraft.world.item.BlockItem; -import net.minecraft.world.item.CreativeModeTab; import net.minecraft.world.item.Item; import net.minecraft.world.item.Items; +import net.minecraft.world.item.SignItem; import net.minecraft.world.level.block.Block; +import net.minecraft.world.level.block.Blocks; +import net.minecraft.world.level.block.SignBlock; import net.fabricmc.fabric.api.registry.FlammableBlockRegistry; public class BlockRegistry extends BaseRegistry { - public BlockRegistry(CreativeModeTab creativeTab, PathConfig config) { - super(creativeTab, config); + public BlockRegistry(PathConfig config) { + super(config); } @Override @@ -36,7 +38,9 @@ public class BlockRegistry extends BaseRegistry { return block; } BlockItem item = null; - if (block instanceof CustomItemProvider) { + if (block instanceof SignBlock sb) { + item = new SignItem(makeItemSettings().stacksTo(16), sb, Blocks.SPRUCE_WALL_SIGN); + } else if (block instanceof CustomItemProvider) { item = ((CustomItemProvider) block).getCustomItem(id, makeItemSettings()); } else { item = new BlockItem(block, makeItemSettings()); diff --git a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java index fb2f1a0e..fa8861a9 100644 --- a/src/main/java/org/betterx/bclib/registry/ItemRegistry.java +++ b/src/main/java/org/betterx/bclib/registry/ItemRegistry.java @@ -31,8 +31,8 @@ import net.minecraft.world.item.*; import net.minecraft.world.level.block.DispenserBlock; public class ItemRegistry extends BaseRegistry { - public ItemRegistry(CreativeModeTab creativeTab, PathConfig config) { - super(creativeTab, config); + public ItemRegistry(PathConfig config) { + super(config); } public Item registerDisc(ResourceLocation itemId, int power, SoundEvent sound, int lengthInSeconds) {