Merge all creative tabs into one

Elite-Modding-Team · Jul 15, 2024 · d024cf6 · d024cf6
1 parent 2dd28e8
commit d024cf6
Show file tree

Hide file tree

Showing 77 changed files with 162 additions and 219 deletions.
diff --git a/src/main/java/com/progwml6/natura/Natura.java b/src/main/java/com/progwml6/natura/Natura.java
@@ -5,6 +5,7 @@
 import com.progwml6.natura.common.gui.GuiHandler;
 import com.progwml6.natura.decorative.NaturaDecorative;
 import com.progwml6.natura.entities.NaturaEntities;
+import com.progwml6.natura.library.NaturaCreativeTab;
 import com.progwml6.natura.library.Util;
 import com.progwml6.natura.library.datafixes.ItemIDFixer;
 import com.progwml6.natura.nether.NaturaNether;
@@ -14,6 +15,8 @@
 import com.progwml6.natura.shared.NaturaCommons;
 import com.progwml6.natura.tools.NaturaTools;
 import com.progwml6.natura.world.NaturaWorld;
+
+import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.util.datafix.FixTypes;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.util.ModFixs;
@@ -39,6 +42,8 @@ public class Natura
     public static final String modName = "Natura Legacy";
 
     public static final Logger log = LogManager.getLogger(modID);
+
+    public static final CreativeTabs TAB = new NaturaCreativeTab(CreativeTabs.CREATIVE_TAB_ARRAY.length, modID + ".tab");
 
     /* Instance of this mod, used for grabbing prototype fields */
     @Instance(modID) public static Natura instance;

diff --git a/src/main/java/com/progwml6/natura/common/block/BlockEnumBerryBush.java b/src/main/java/com/progwml6/natura/common/block/BlockEnumBerryBush.java
@@ -4,7 +4,7 @@
 
 import javax.annotation.Nonnull;
 
-import com.progwml6.natura.library.NaturaRegistry;
+import com.progwml6.natura.Natura;
 import com.progwml6.natura.overworld.NaturaOverworld;
 
 import net.minecraft.block.Block;
@@ -47,7 +47,7 @@ public BlockEnumBerryBush()
     {
         super(Material.LEAVES);
 
-        this.setCreativeTab(NaturaRegistry.tabWorld);
+        this.setCreativeTab(Natura.TAB);
         this.setTickRandomly(true);
         this.setHardness(0.3F);
         this.setSoundType(SoundType.PLANT);

diff --git a/src/main/java/com/progwml6/natura/common/block/BlockEnumLog.java b/src/main/java/com/progwml6/natura/common/block/BlockEnumLog.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.properties.IProperty;
@@ -29,7 +28,7 @@ public BlockEnumLog(PropertyEnum<T> prop, Class<T> clazz)
         this.setResistance(5F);
         this.setSoundType(SoundType.WOOD);
         Blocks.FIRE.setFireInfo(this, 5, 20);
-        this.setCreativeTab(NaturaRegistry.tabWorld);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockButtonBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockButtonBase.java
@@ -2,8 +2,7 @@
 
 import javax.annotation.Nullable;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.BlockButton;
 import net.minecraft.block.SoundType;
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,7 +18,7 @@ public BlockButtonBase()
         super(true);
         this.setHardness(0.5F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockFenceBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockFenceBase.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block.base;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockFence;
 import net.minecraft.block.BlockFenceGate;
@@ -22,7 +21,7 @@ public BlockFenceBase()
         this.setHardness(2.0F);
         this.setResistance(5.0F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockFenceGateBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockFenceGateBase.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block.base;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.BlockFenceGate;
 import net.minecraft.block.BlockPlanks.EnumType;
 import net.minecraft.block.SoundType;
@@ -14,7 +13,7 @@ public BlockFenceGateBase()
         this.setHardness(2.0F);
         this.setResistance(5.0F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
 }
diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockNaturaStairsBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockNaturaStairsBase.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block.base;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.state.IBlockState;
 import slimeknights.mantle.block.BlockStairsBase;
 
@@ -10,6 +9,6 @@ public class BlockNaturaStairsBase extends BlockStairsBase
     public BlockNaturaStairsBase(IBlockState modelState)
     {
         super(modelState);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 }
diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockPressurePlateBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockPressurePlateBase.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block.base;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.BlockPressurePlate;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -13,6 +12,6 @@ public BlockPressurePlateBase()
         super(Material.WOOD, Sensitivity.EVERYTHING);
         this.setHardness(0.5F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 }
diff --git a/src/main/java/com/progwml6/natura/common/block/base/BlockTrapDoorBase.java b/src/main/java/com/progwml6/natura/common/block/base/BlockTrapDoorBase.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.common.block.base;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.BlockTrapDoor;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
@@ -14,6 +13,6 @@ public BlockTrapDoorBase()
         this.disableStats();
         this.setHardness(3.0F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 }
diff --git a/src/main/java/com/progwml6/natura/decorative/block/bookshelves/BlockNetherBookshelves.java b/src/main/java/com/progwml6/natura/decorative/block/bookshelves/BlockNetherBookshelves.java
@@ -5,7 +5,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.progwml6.natura.library.NaturaRegistry;
+import com.progwml6.natura.Natura;
 import com.progwml6.natura.nether.block.planks.BlockNetherPlanks;
 
 import net.minecraft.block.SoundType;
@@ -32,7 +32,7 @@ public BlockNetherBookshelves()
         this.setSoundType(SoundType.WOOD);
         this.setHardness(1.5F);
         this.setResistance(10.0F);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     /**

diff --git a/...main/java/com/progwml6/natura/decorative/block/bookshelves/BlockOverworldBookshelves.java b/...main/java/com/progwml6/natura/decorative/block/bookshelves/BlockOverworldBookshelves.java
@@ -5,7 +5,7 @@
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.progwml6.natura.library.NaturaRegistry;
+import com.progwml6.natura.Natura;
 import com.progwml6.natura.overworld.block.planks.BlockOverworldPlanks;
 
 import net.minecraft.block.SoundType;
@@ -31,7 +31,7 @@ public BlockOverworldBookshelves()
 
         this.setSoundType(SoundType.WOOD);
         this.setHardness(1.5F);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     /**

diff --git a/src/main/java/com/progwml6/natura/decorative/block/workbenches/BlockNetherWorkbenches.java b/src/main/java/com/progwml6/natura/decorative/block/workbenches/BlockNetherWorkbenches.java
@@ -2,7 +2,6 @@
 
 import com.progwml6.natura.Natura;
 import com.progwml6.natura.common.GuiIDs;
-import com.progwml6.natura.library.NaturaRegistry;
 import com.progwml6.natura.nether.block.planks.BlockNetherPlanks;
 
 import net.minecraft.block.SoundType;
@@ -27,7 +26,7 @@ public BlockNetherWorkbenches()
         this.setSoundType(SoundType.WOOD);
         this.setHardness(2.5F);
         this.setResistance(10.0F);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/...main/java/com/progwml6/natura/decorative/block/workbenches/BlockOverworldWorkbenches.java b/...main/java/com/progwml6/natura/decorative/block/workbenches/BlockOverworldWorkbenches.java
@@ -2,7 +2,6 @@
 
 import com.progwml6.natura.Natura;
 import com.progwml6.natura.common.GuiIDs;
-import com.progwml6.natura.library.NaturaRegistry;
 import com.progwml6.natura.overworld.block.planks.BlockOverworldPlanks;
 
 import net.minecraft.block.SoundType;
@@ -26,7 +25,7 @@ public BlockOverworldWorkbenches()
 
         this.setSoundType(SoundType.WOOD);
         this.setHardness(2.5F);
-        this.setCreativeTab(NaturaRegistry.tabDecorative);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/library/NaturaCreativeTab.java b/src/main/java/com/progwml6/natura/library/NaturaCreativeTab.java
@@ -0,0 +1,22 @@
+package com.progwml6.natura.library;
+
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+
+public class NaturaCreativeTab extends CreativeTabs
+{
+    public NaturaCreativeTab(int length, String name)
+    {
+        super(length, name);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public ItemStack createIcon()
+    {
+        return new ItemStack(Blocks.SAPLING, 1, 0);
+    }
+}
diff --git a/src/main/java/com/progwml6/natura/library/NaturaRegistry.java b/src/main/java/com/progwml6/natura/library/NaturaRegistry.java
@@ -3,27 +3,13 @@
 import com.progwml6.natura.common.block.MaterialCloud;
 
 import net.minecraft.block.material.Material;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import slimeknights.mantle.client.CreativeTab;
 
 public final class NaturaRegistry
 {
     private NaturaRegistry()
     {
     }
 
-    /*---------------------------------------------------------------------------
-    | CREATIVE TABS                                                             |
-    ---------------------------------------------------------------------------*/
-
-    public static CreativeTab tabGeneral = new CreativeTab("NaturaGeneral", new ItemStack(Item.getItemFromBlock(Blocks.SLIME_BLOCK)));
-
-    public static CreativeTab tabWorld = new CreativeTab("NaturaWorld", new ItemStack(Item.getItemFromBlock(Blocks.SLIME_BLOCK)));
-
-    public static CreativeTab tabDecorative = new CreativeTab("NaturaDecorative", new ItemStack(Item.getItemFromBlock(Blocks.SLIME_BLOCK)));
-
     /*---------------------------------------------------------------------------
     | MATERIALS                                                                 |
     ---------------------------------------------------------------------------*/

diff --git a/src/main/java/com/progwml6/natura/nether/NaturaNether.java b/src/main/java/com/progwml6/natura/nether/NaturaNether.java
@@ -3,13 +3,13 @@
 import org.apache.logging.log4j.Logger;
 
 import com.google.common.eventbus.Subscribe;
+import com.progwml6.natura.Natura;
 import com.progwml6.natura.common.CommonProxy;
 import com.progwml6.natura.common.NaturaPulse;
 import com.progwml6.natura.common.block.BlockEnumBerryBush;
 import com.progwml6.natura.common.block.BlockNaturaDoor;
 import com.progwml6.natura.common.item.ItemBlockLeaves;
 import com.progwml6.natura.common.item.ItemNaturaDoor;
-import com.progwml6.natura.library.NaturaRegistry;
 import com.progwml6.natura.library.Util;
 import com.progwml6.natura.nether.block.BlockSmoothNetherrack;
 import com.progwml6.natura.nether.block.bush.BlockNetherBerryBush;
@@ -272,7 +272,7 @@ public void registerItems(Register<Item> event)
         // Items Start
         netherDoors = registerItem(registry, new ItemNaturaDoor(), "nether_doors");
 
-        netherDoors.setCreativeTab(NaturaRegistry.tabDecorative);
+        netherDoors.setCreativeTab(Natura.TAB);
 
         ghostwood_door = netherDoors.addMeta(0, "ghostwood_door", NaturaNether.ghostwoodDoor.getDefaultState());
         bloodwood_door = netherDoors.addMeta(1, "bloodwood_door", NaturaNether.bloodwoodDoor.getDefaultState());
@@ -284,11 +284,6 @@ public void registerItems(Register<Item> event)
         darkwoodDoor.setDoor(NaturaNether.darkwood_door);
         fusewoodDoor.setDoor(NaturaNether.fusewood_door);
         // Items End
-
-        if (!isOverworldLoaded())
-        {
-            NaturaRegistry.tabDecorative.setDisplayIcon(ghostwood_door);
-        }
     }
 
     @SubscribeEvent

diff --git a/src/main/java/com/progwml6/natura/nether/block/BlockSmoothNetherrack.java b/src/main/java/com/progwml6/natura/nether/block/BlockSmoothNetherrack.java
@@ -1,7 +1,6 @@
 package com.progwml6.natura.nether.block;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -16,7 +15,7 @@ public class BlockSmoothNetherrack extends Block {
     public BlockSmoothNetherrack() {
         super(Material.ROCK);
 
-        this.setCreativeTab(NaturaRegistry.tabWorld);
+        this.setCreativeTab(Natura.TAB);
         this.setHardness(1.5F);
         this.setResistance(10.0F);
         this.setHarvestLevel("pickaxe", 0);

diff --git a/src/main/java/com/progwml6/natura/nether/block/button/BlockNetherButton.java b/src/main/java/com/progwml6/natura/nether/block/button/BlockNetherButton.java
@@ -2,8 +2,7 @@
 
 import javax.annotation.Nullable;
 
-import com.progwml6.natura.library.NaturaRegistry;
-
+import com.progwml6.natura.Natura;
 import net.minecraft.block.BlockButton;
 import net.minecraft.block.SoundType;
 import net.minecraft.entity.player.EntityPlayer;
@@ -19,7 +18,7 @@ public BlockNetherButton()
         super(false);
         this.setHardness(0.5F);
         this.setSoundType(SoundType.WOOD);
-        this.setCreativeTab(NaturaRegistry.tabWorld);
+        this.setCreativeTab(Natura.TAB);
     }
 
     @Override

diff --git a/src/main/java/com/progwml6/natura/nether/block/furnace/BlockNetherrackFurnace.java b/src/main/java/com/progwml6/natura/nether/block/furnace/BlockNetherrackFurnace.java
@@ -6,7 +6,6 @@
 
 import com.progwml6.natura.Natura;
 import com.progwml6.natura.common.GuiIDs;
-import com.progwml6.natura.library.NaturaRegistry;
 import com.progwml6.natura.nether.NaturaNether;
 import com.progwml6.natura.nether.block.furnace.tile.TileEntityNetherrackFurnace;
 
@@ -55,7 +54,7 @@ public BlockNetherrackFurnace(boolean isBurning)
 
         if (!this.isBurning)
         {
-            this.setCreativeTab(NaturaRegistry.tabWorld);
+            this.setCreativeTab(Natura.TAB);
         }
     }
 

diff --git a/src/main/java/com/progwml6/natura/nether/block/glass/BlockNetherGlass.java b/src/main/java/com/progwml6/natura/nether/block/glass/BlockNetherGlass.java
@@ -5,7 +5,7 @@
 
 import javax.annotation.Nullable;
 
-import com.progwml6.natura.library.NaturaRegistry;
+import com.progwml6.natura.Natura;
 import com.progwml6.natura.nether.NaturaNether;
 
 import net.minecraft.block.Block;
@@ -41,7 +41,7 @@ public BlockNetherGlass()
         this.setHardness(1.0F);
         this.setResistance(3000F);
         this.setSoundType(SoundType.GLASS);
-        this.setCreativeTab(NaturaRegistry.tabWorld);
+        this.setCreativeTab(Natura.TAB);
     }
 
     /**