From dfdccb652acb08c3de48735a5e14a916ba87a5c0 Mon Sep 17 00:00:00 2001
From: Adubbz <Adubbz@users.noreply.github.com>
Date: Sat, 10 Dec 2022 22:09:32 +1100
Subject: [PATCH] Creative tab adjustments

---
 .../java/biomesoplenty/api/item/BOPItems.java |  7 ++---
 .../biomesoplenty/core/BiomesOPlenty.java     | 30 ++++++++++---------
 2 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/src/main/java/biomesoplenty/api/item/BOPItems.java b/src/main/java/biomesoplenty/api/item/BOPItems.java
index b95ba68d6..21d24680e 100644
--- a/src/main/java/biomesoplenty/api/item/BOPItems.java
+++ b/src/main/java/biomesoplenty/api/item/BOPItems.java
@@ -12,7 +12,8 @@ public class BOPItems
     public static RegistryObject<Item> BOP_ICON;
 
     public static RegistryObject<Item> ROSE_QUARTZ_SHARD;
-
+    public static RegistryObject<Item> BLOOD_BUCKET;
+    public static RegistryObject<Item> MUSIC_DISC_WANDERER;
     public static RegistryObject<Item> FIR_SIGN;
     public static RegistryObject<Item> REDWOOD_SIGN;
     public static RegistryObject<Item> CHERRY_SIGN;
@@ -47,8 +48,4 @@ public class BOPItems
     public static RegistryObject<Item> UMBRAN_CHEST_BOAT;
     public static RegistryObject<Item> HELLBARK_BOAT;
     public static RegistryObject<Item> HELLBARK_CHEST_BOAT;
-
-    public static RegistryObject<Item> MUSIC_DISC_WANDERER;
-
-    public static RegistryObject<Item> BLOOD_BUCKET;
 }
diff --git a/src/main/java/biomesoplenty/core/BiomesOPlenty.java b/src/main/java/biomesoplenty/core/BiomesOPlenty.java
index 87517053c..825e3a811 100644
--- a/src/main/java/biomesoplenty/core/BiomesOPlenty.java
+++ b/src/main/java/biomesoplenty/core/BiomesOPlenty.java
@@ -10,6 +10,7 @@
 import biomesoplenty.init.*;
 import net.minecraft.core.particles.ParticleType;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvent;
 import net.minecraft.world.entity.EntityType;
@@ -129,38 +130,39 @@ private void loadComplete(final FMLLoadCompleteEvent event)
     private void registerTab(CreativeModeTabEvent.Register event)
     {
         List<RegistryObject<Item>> itemBlacklist = List.of(BOPItems.BOP_ICON);
-        List<RegistryObject<Item>> blockBlacklist = List.of();
+        List<RegistryObject<Block>> blockBlacklist = List.of(BOPBlocks.BLOOD);
 
         event.registerCreativeModeTab(new ResourceLocation(BiomesOPlenty.MOD_ID, "main"), builder -> {
             builder.icon(() -> new ItemStack(BOPItems.BOP_ICON.get()))
+            .title(Component.translatable("itemGroup.biomesoplenty"))
             .displayItems((featureFlags, output, hasOp) -> {
-                // Add items
-                for (Field field : BOPItems.class.getFields())
+                // Add blocks
+                for (Field field : BOPBlocks.class.getFields())
                 {
                     if (field.getType() != RegistryObject.class) continue;
 
+                    // Don't add potted things to our tab
+                    if (field.getName().startsWith("POTTED_")) continue;
+
                     try
                     {
-                        RegistryObject<Item> item = (RegistryObject)field.get(null);
-                        if (!itemBlacklist.contains(item))
-                            output.accept(new ItemStack(item.get()));
+                        RegistryObject<Block> block = (RegistryObject)field.get(null);
+                        if (!blockBlacklist.contains(block))
+                            output.accept(new ItemStack(block.get()));
                     }
                     catch (IllegalAccessException e) {}
                 }
 
-                // Add blocks
-                for (Field field : BOPBlocks.class.getFields())
+                // Add items
+                for (Field field : BOPItems.class.getFields())
                 {
                     if (field.getType() != RegistryObject.class) continue;
 
-                    // Don't add potted things to our tab
-                    if (field.getName().startsWith("POTTED_")) continue;
-
                     try
                     {
-                        RegistryObject<Block> block = (RegistryObject)field.get(null);
-                        if (!blockBlacklist.contains(block))
-                            output.accept(new ItemStack(block.get()));
+                        RegistryObject<Item> item = (RegistryObject)field.get(null);
+                        if (!itemBlacklist.contains(item))
+                            output.accept(new ItemStack(item.get()));
                     }
                     catch (IllegalAccessException e) {}
                 }