Rename ICreativeTabHelper to IConstructHelper.

Author: Darkhax

Common/src/main/java/net/darkhax/bookshelf/api/Services.java

@@ -4,7 +4,7 @@
 import net.darkhax.bookshelf.api.data.ITagHelper;
 import net.darkhax.bookshelf.api.event.IEventHelper;
 import net.darkhax.bookshelf.api.registry.IGameRegistries;
-import net.darkhax.bookshelf.api.util.ICreativeTabHelper;
+import net.darkhax.bookshelf.api.util.IConstructHelper;
 import net.darkhax.bookshelf.api.util.IInventoryHelper;
 import net.darkhax.bookshelf.api.util.IPlatformHelper;
 
@@ -16,8 +16,8 @@ public class Services {
     public static final IEventHelper EVENTS = load(IEventHelper.class);
     public static final IGameRegistries REGISTRIES = load(IGameRegistries.class);
     public static final ITagHelper TAGS = load(ITagHelper.class);
-    public static final ICreativeTabHelper CREATIVE_TABS = load(ICreativeTabHelper.class);
     public static final IInventoryHelper INVENTORY_HELPER = load(IInventoryHelper.class);
+    public static final IConstructHelper CONSTRUCTS = load(IConstructHelper.class);
 
     public static <T> T load(Class<T> clazz) {
 

Common/src/main/java/net/darkhax/bookshelf/api/registry/RegistryDataProvider.java

@@ -66,7 +66,7 @@ public final RegistryDataProvider withCreativeTab(Supplier<? extends ItemLike> i
 
     public final RegistryDataProvider withCreativeTab(Supplier<? extends ItemLike> iconProvider, String id) {
 
-        return this.withCreativeTab(Services.CREATIVE_TABS.createBuilder(this.ownerId, id).setIcon(iconProvider).build());
+        return this.withCreativeTab(Services.CONSTRUCTS.creativeTab(this.ownerId, id).setIcon(iconProvider).build());
     }
 
     public final RegistryDataProvider withCreativeTab(CreativeModeTab tab) {

Common/src/main/java/net/darkhax/bookshelf/api/util/IConstructHelper.java

@@ -0,0 +1,18 @@
+package net.darkhax.bookshelf.api.util;
+
+import net.darkhax.bookshelf.api.item.ICreativeTabBuilder;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
+public interface IConstructHelper {
+
+    ICreativeTabBuilder creativeTab(String namespace, String tabName);
+
+    <T extends BlockEntity> Supplier<BlockEntityType<T>> blockEntityType(BiFunction<BlockPos, BlockState, T> factory, Supplier<Block>... blocks);
+}

Common/src/main/java/net/darkhax/bookshelf/api/util/ICreativeTabHelper.java

@@ -0,0 +1,30 @@
+package net.darkhax.bookshelf.impl.util;
+
+import net.darkhax.bookshelf.api.item.ICreativeTabBuilder;
+import net.darkhax.bookshelf.api.util.IConstructHelper;
+import net.fabricmc.fabric.api.object.builder.v1.block.entity.FabricBlockEntityTypeBuilder;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.Arrays;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
+public class ConstructBuilderFabric implements IConstructHelper {
+
+    @Override
+    public ICreativeTabBuilder creativeTab(String namespace, String tabName) {
+
+        return new net.darkhax.bookshelf.impl.item.CreativeTabBuilderFabric(new ResourceLocation(namespace, tabName));
+    }
+
+    @Override
+    public <T extends BlockEntity> Supplier<BlockEntityType<T>> blockEntityType(BiFunction<BlockPos, BlockState, T> factory, Supplier<Block>... validBlocks) {
+
+        return () -> FabricBlockEntityTypeBuilder.create(factory::apply, Arrays.stream(validBlocks).map(Supplier::get).toArray(Block[]::new)).build();
+    }
+}

Fabric/src/main/java/net/darkhax/bookshelf/impl/util/ConstructBuilderFabric.java

@@ -0,0 +1 @@
+net.darkhax.bookshelf.impl.util.ConstructBuilderFabric

Fabric/src/main/java/net/darkhax/bookshelf/impl/util/CreativeTabBuilderFabric.java

@@ -0,0 +1,30 @@
+package net.darkhax.bookshelf.impl.util;
+
+import net.darkhax.bookshelf.api.item.ICreativeTabBuilder;
+import net.darkhax.bookshelf.api.util.IConstructHelper;
+import net.darkhax.bookshelf.impl.item.CreativeTabBuilderForge;
+import net.minecraft.core.BlockPos;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+
+import java.util.Arrays;
+import java.util.function.BiFunction;
+import java.util.function.Supplier;
+
+public class ConstructHelperForge implements IConstructHelper {
+
+    @Override
+    public ICreativeTabBuilder creativeTab(String namespace, String tabName) {
+
+        return new CreativeTabBuilderForge(new ResourceLocation(namespace, tabName));
+    }
+
+    @Override
+    public <T extends BlockEntity> Supplier<BlockEntityType<T>> blockEntityType(BiFunction<BlockPos, BlockState, T> factory, Supplier<Block>... validBlocks) {
+
+        return () -> BlockEntityType.Builder.of(factory::apply, Arrays.stream(validBlocks).map(Supplier::get).toArray(Block[]::new)).build(null);
+    }
+}