diff --git a/src/main/java/com/progwml6/natura/Natura.java b/src/main/java/com/progwml6/natura/Natura.java index ca51e1ac..bc093645 100644 --- 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 index 49de1bc8..8456d497 100644 --- 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 index 8dffbf1d..60f53195 100644 --- 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 prop, Class 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 index c307b60a..3cd08916 100644 --- 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 index 47fad769..5bb1e037 100644 --- 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 index ef8d3be2..34c07e94 100644 --- 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 index 23e5463f..a6de0b53 100644 --- 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 index 08d107ab..305e2362 100644 --- 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 index bc3020d0..bb87ee55 100644 --- 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 index 0439b02e..d2bc7d5a 100644 --- 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/src/main/java/com/progwml6/natura/decorative/block/bookshelves/BlockOverworldBookshelves.java b/src/main/java/com/progwml6/natura/decorative/block/bookshelves/BlockOverworldBookshelves.java index cdcc3cc3..cab3f508 100644 --- a/src/main/java/com/progwml6/natura/decorative/block/bookshelves/BlockOverworldBookshelves.java +++ b/src/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 index 8eae707c..81d16d71 100644 --- 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/src/main/java/com/progwml6/natura/decorative/block/workbenches/BlockOverworldWorkbenches.java b/src/main/java/com/progwml6/natura/decorative/block/workbenches/BlockOverworldWorkbenches.java index 489ff295..9a536e26 100644 --- a/src/main/java/com/progwml6/natura/decorative/block/workbenches/BlockOverworldWorkbenches.java +++ b/src/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 new file mode 100644 index 00000000..8e113bb2 --- /dev/null +++ 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 index 752d8c62..6a06f42a 100644 --- a/src/main/java/com/progwml6/natura/library/NaturaRegistry.java +++ b/src/main/java/com/progwml6/natura/library/NaturaRegistry.java @@ -3,10 +3,6 @@ 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 { @@ -14,16 +10,6 @@ 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 index 1cc35313..2c8c4f27 100644 --- 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 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 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 index 31dc5702..e5314770 100644 --- 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 index eb559fe4..c587568e 100644 --- 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 index c7b63ce8..77410578 100644 --- 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 index a0346b0f..3793b39d 100644 --- 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); } /** diff --git a/src/main/java/com/progwml6/natura/nether/block/hopper/BlockBlazeHopper.java b/src/main/java/com/progwml6/natura/nether/block/hopper/BlockBlazeHopper.java index 051cd0c9..09044e77 100644 --- a/src/main/java/com/progwml6/natura/nether/block/hopper/BlockBlazeHopper.java +++ b/src/main/java/com/progwml6/natura/nether/block/hopper/BlockBlazeHopper.java @@ -1,7 +1,6 @@ package com.progwml6.natura.nether.block.hopper; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.BlockHopper; import net.minecraft.block.SoundType; @@ -10,7 +9,7 @@ public class BlockBlazeHopper extends BlockHopper public BlockBlazeHopper() { super(); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(3.0F); this.setResistance(8.0F); this.setSoundType(SoundType.METAL); diff --git a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java index c8effeb6..f7121367 100644 --- a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java +++ b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves.java @@ -7,8 +7,8 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.nether.NaturaNether; import net.minecraft.block.properties.PropertyEnum; @@ -34,7 +34,7 @@ public class BlockNetherLeaves extends BlockLeavesBase public BlockNetherLeaves() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 0, 0); diff --git a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java index 661aeeb5..c6e17b3f 100644 --- a/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java +++ b/src/main/java/com/progwml6/natura/nether/block/leaves/BlockNetherLeaves2.java @@ -7,8 +7,8 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.nether.NaturaNether; import com.progwml6.natura.shared.NaturaCommons; @@ -34,7 +34,7 @@ public class BlockNetherLeaves2 extends BlockLeavesBase public BlockNetherLeaves2() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 0, 0); diff --git a/src/main/java/com/progwml6/natura/nether/block/lever/BlockNetherLever.java b/src/main/java/com/progwml6/natura/nether/block/lever/BlockNetherLever.java index 0eff3c6e..0a92f628 100644 --- a/src/main/java/com/progwml6/natura/nether/block/lever/BlockNetherLever.java +++ b/src/main/java/com/progwml6/natura/nether/block/lever/BlockNetherLever.java @@ -1,7 +1,6 @@ package com.progwml6.natura.nether.block.lever; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.BlockLever; import net.minecraft.block.SoundType; @@ -12,6 +11,6 @@ public BlockNetherLever() super(); this.setHardness(0.5F); this.setSoundType(SoundType.WOOD); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java b/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java index f9f2b557..15309f95 100644 --- a/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java +++ b/src/main/java/com/progwml6/natura/nether/block/logs/BlockNetherLog2.java @@ -1,7 +1,6 @@ package com.progwml6.natura.nether.block.logs; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.Block; import net.minecraft.block.SoundType; import net.minecraft.block.material.Material; @@ -31,7 +30,7 @@ public BlockNetherLog2() this.setHardness(8.0F); this.setResistance(25.0F); this.setSoundType(SoundType.METAL); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHarvestLevel("axe", 2); this.setDefaultState(this.blockState.getBaseState().withProperty(META, Integer.valueOf(0))); } diff --git a/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java b/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java index 2d6c6b9a..533bf4f1 100644 --- a/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java +++ b/src/main/java/com/progwml6/natura/nether/block/obelisk/BlockRespawnObelisk.java @@ -3,8 +3,7 @@ import java.util.Locale; import java.util.Random; -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.PropertyEnum; @@ -34,7 +33,7 @@ public class BlockRespawnObelisk extends EnumBlock { public BlockTaintedSoil() { super(Material.GROUND, TYPE, SoilType.class); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(0.5F); this.setSoundType(SoundType.GROUND); this.setHarvestLevel("shovel", 0); diff --git a/src/main/java/com/progwml6/natura/nether/block/vine/BlockNetherThornVines.java b/src/main/java/com/progwml6/natura/nether/block/vine/BlockNetherThornVines.java index b44efce6..b97f005a 100644 --- a/src/main/java/com/progwml6/natura/nether/block/vine/BlockNetherThornVines.java +++ b/src/main/java/com/progwml6/natura/nether/block/vine/BlockNetherThornVines.java @@ -2,8 +2,7 @@ import java.util.Random; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.BlockVine; import net.minecraft.block.SoundType; import net.minecraft.block.state.IBlockState; @@ -19,7 +18,7 @@ public class BlockNetherThornVines extends BlockVine public BlockNetherThornVines() { super(); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(1.0F); this.setLightLevel(0.825F); this.setSoundType(SoundType.PLANT); diff --git a/src/main/java/com/progwml6/natura/overworld/NaturaOverworld.java b/src/main/java/com/progwml6/natura/overworld/NaturaOverworld.java index b0ac01fe..842b2aed 100644 --- a/src/main/java/com/progwml6/natura/overworld/NaturaOverworld.java +++ b/src/main/java/com/progwml6/natura/overworld/NaturaOverworld.java @@ -15,13 +15,13 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; import net.minecraftforge.registries.IForgeRegistry; +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.overworld.block.bush.BlockOverworldBerryBush; import com.progwml6.natura.overworld.block.crops.BlockNaturaBarley; @@ -308,9 +308,9 @@ public void registerItems(Register event) saguaroFruitItem = registerItem(registry, new ItemSaguaroFruit(3, 0.3f, NaturaOverworld.saguaroBaby), "saguaro_fruit_item"); - overworldSeeds.setCreativeTab(NaturaRegistry.tabGeneral); - overworldSeedBags.setCreativeTab(NaturaRegistry.tabGeneral); - overworldDoors.setCreativeTab(NaturaRegistry.tabDecorative); + overworldSeeds.setCreativeTab(Natura.TAB); + overworldSeedBags.setCreativeTab(Natura.TAB); + overworldDoors.setCreativeTab(Natura.TAB); barley_seeds = overworldSeeds.addMeta(0, "barley_seeds", NaturaOverworld.barleyCrop.getDefaultState().withProperty(BlockNaturaBarley.AGE, 0)); cotton_seeds = overworldSeeds.addMeta(1, "cotton_seeds", NaturaOverworld.cottonCrop.getDefaultState().withProperty(BlockNaturaCotton.AGE, 0)); @@ -342,9 +342,6 @@ public void registerItems(Register event) willowDoor.setDoor(NaturaOverworld.willow_door); appleDoor.setDoor(NaturaOverworld.apple_door); // Items End - - NaturaRegistry.tabWorld.setDisplayIcon(new ItemStack(coloredGrass)); - NaturaRegistry.tabDecorative.setDisplayIcon(redwood_door); } @SubscribeEvent diff --git a/src/main/java/com/progwml6/natura/overworld/block/flower/BlockBluebellsFlower.java b/src/main/java/com/progwml6/natura/overworld/block/flower/BlockBluebellsFlower.java index 42a5795f..bce9b865 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/flower/BlockBluebellsFlower.java +++ b/src/main/java/com/progwml6/natura/overworld/block/flower/BlockBluebellsFlower.java @@ -1,7 +1,6 @@ package com.progwml6.natura.overworld.block.flower; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.BlockBush; import net.minecraft.block.SoundType; @@ -11,6 +10,6 @@ public BlockBluebellsFlower() { super(); this.setSoundType(SoundType.PLANT); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/overworld/block/grass/BlockColoredGrass.java b/src/main/java/com/progwml6/natura/overworld/block/grass/BlockColoredGrass.java index 0337639f..27d8c457 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/grass/BlockColoredGrass.java +++ b/src/main/java/com/progwml6/natura/overworld/block/grass/BlockColoredGrass.java @@ -2,8 +2,7 @@ import java.util.Locale; -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.PropertyEnum; @@ -24,7 +23,7 @@ public BlockColoredGrass() { super(Material.GRASS, TYPE, GrassType.class); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(0.6F); this.setSoundType(SoundType.PLANT); } diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockAppleLeaves.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockAppleLeaves.java index 49593fd7..c53f42fb 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockAppleLeaves.java +++ b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockAppleLeaves.java @@ -21,8 +21,8 @@ import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import slimeknights.mantle.block.EnumBlock; @@ -32,7 +32,7 @@ public class BlockAppleLeaves extends BlockLeavesBase public BlockAppleLeaves() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 5, 20); diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java index 3f84aa38..b137c812 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java +++ b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves.java @@ -6,8 +6,8 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog.LogType; @@ -27,7 +27,7 @@ public class BlockOverworldLeaves extends BlockLeavesBase { public BlockOverworldLeaves() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 30, 60); diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java index 019fffb6..2edaf66a 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java +++ b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockOverworldLeaves2.java @@ -6,8 +6,8 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog2; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog2.LogType; @@ -27,7 +27,7 @@ public class BlockOverworldLeaves2 extends BlockLeavesBase { public BlockOverworldLeaves2() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 30, 60); diff --git a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java index 18607947..5018ec42 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java +++ b/src/main/java/com/progwml6/natura/overworld/block/leaves/BlockRedwoodLeaves.java @@ -7,8 +7,8 @@ import javax.annotation.Nonnull; import com.google.common.collect.Lists; +import com.progwml6.natura.Natura; import com.progwml6.natura.common.block.base.BlockLeavesBase; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import net.minecraft.block.Block; @@ -33,7 +33,7 @@ public class BlockRedwoodLeaves extends BlockLeavesBase public BlockRedwoodLeaves() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); Blocks.FIRE.setFireInfo(this, 5, 20); diff --git a/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java b/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java index 389f8255..260deaf2 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java +++ b/src/main/java/com/progwml6/natura/overworld/block/logs/BlockRedwoodLog.java @@ -2,8 +2,7 @@ import java.util.Locale; -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.PropertyEnum; @@ -22,7 +21,7 @@ public BlockRedwoodLog() super(Material.WOOD, TYPE, RedwoodType.class); this.setHardness(2.0f); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setSoundType(SoundType.WOOD); this.setHarvestLevel("axe", -1); Blocks.FIRE.setFireInfo(this, 5, 20); diff --git a/src/main/java/com/progwml6/natura/overworld/block/planks/BlockOverworldPlanks.java b/src/main/java/com/progwml6/natura/overworld/block/planks/BlockOverworldPlanks.java index 2d39c36b..76d27ff3 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/planks/BlockOverworldPlanks.java +++ b/src/main/java/com/progwml6/natura/overworld/block/planks/BlockOverworldPlanks.java @@ -9,7 +9,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IStringSerializable; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import slimeknights.mantle.block.EnumBlock; public class BlockOverworldPlanks extends EnumBlock @@ -22,7 +22,7 @@ public BlockOverworldPlanks() Blocks.FIRE.setFireInfo(this, 5, 20); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(2.0f); this.setSoundType(SoundType.WOOD); } diff --git a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaro.java b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaro.java index 76434bab..f458a714 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaro.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaro.java @@ -5,7 +5,7 @@ import javax.annotation.Nullable; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import net.minecraft.block.Block; @@ -89,7 +89,7 @@ public BlockSaguaro() this.setSoundType(SoundType.CLOTH); this.setHardness(0.3f); this.setTickRandomly(true); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroBaby.java b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroBaby.java index 06202fa3..5866806c 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroBaby.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroBaby.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.world.worldgen.saguaro.SaguaroGenerator; @@ -44,7 +44,7 @@ public BlockSaguaroBaby() this.setSoundType(SoundType.CLOTH); this.setHardness(0.3f); this.setTickRandomly(true); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroFruit.java b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroFruit.java index e395be51..4ca649cf 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroFruit.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saguaro/BlockSaguaroFruit.java @@ -2,7 +2,7 @@ import java.util.Random; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import net.minecraft.block.Block; @@ -41,7 +41,7 @@ public BlockSaguaroFruit() this.setDefaultState(this.blockState.getBaseState().withProperty(FACING, EnumFacing.NORTH)); this.setSoundType(SoundType.CLOTH); this.setHardness(0.3f); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); } /** diff --git a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockAppleSapling.java b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockAppleSapling.java index fd5de51c..9f89774b 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockAppleSapling.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockAppleSapling.java @@ -23,7 +23,6 @@ import net.minecraftforge.event.terraingen.TerrainGen; import com.progwml6.natura.Natura; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.leaves.BlockAppleLeaves; import com.progwml6.natura.overworld.block.logs.BlockAppleLog; @@ -37,7 +36,7 @@ public class BlockAppleSapling extends BlockSapling public BlockAppleSapling() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setDefaultState(this.blockState.getBaseState()); this.setSoundType(SoundType.PLANT); this.setHardness(0.0F); diff --git a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling.java b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling.java index a45e0aa1..aec4388f 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling.java @@ -23,7 +23,6 @@ import net.minecraftforge.event.terraingen.TerrainGen; import com.progwml6.natura.Natura; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog; import com.progwml6.natura.world.worldgen.trees.BaseTreeGenerator; @@ -36,7 +35,7 @@ public class BlockOverworldSapling extends BlockSapling public BlockOverworldSapling() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setDefaultState(this.blockState.getBaseState()); this.setSoundType(SoundType.PLANT); this.setHardness(0.0F); diff --git a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling2.java b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling2.java index 0b3432b6..7f6b8682 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling2.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockOverworldSapling2.java @@ -22,7 +22,6 @@ import net.minecraftforge.common.EnumPlantType; import com.progwml6.natura.Natura; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.logs.BlockOverworldLog2; import com.progwml6.natura.world.worldgen.trees.BaseTreeGenerator; @@ -38,7 +37,7 @@ public class BlockOverworldSapling2 extends BlockSapling public BlockOverworldSapling2() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setDefaultState(this.blockState.getBaseState()); this.setSoundType(SoundType.PLANT); this.setHardness(0.0F); diff --git a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockRedwoodSapling.java b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockRedwoodSapling.java index 018d3b8e..6d2f3716 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockRedwoodSapling.java +++ b/src/main/java/com/progwml6/natura/overworld/block/saplings/BlockRedwoodSapling.java @@ -25,7 +25,6 @@ import net.minecraftforge.event.terraingen.TerrainGen; import com.progwml6.natura.Natura; -import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.leaves.BlockRedwoodLeaves; import com.progwml6.natura.overworld.block.logs.BlockRedwoodLog; @@ -41,7 +40,7 @@ public class BlockRedwoodSapling extends BlockSapling public BlockRedwoodSapling() { - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setDefaultState(this.blockState.getBaseState()); this.setSoundType(SoundType.PLANT); this.setHardness(0.0F); diff --git a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockColoredGrassSlab.java b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockColoredGrassSlab.java index ee2986e4..57bfaeb0 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockColoredGrassSlab.java +++ b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockColoredGrassSlab.java @@ -1,6 +1,6 @@ package com.progwml6.natura.overworld.block.slabs; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.grass.BlockColoredGrass; @@ -17,7 +17,7 @@ public BlockColoredGrassSlab() this.setHardness(0.6F); this.setSoundType(SoundType.PLANT); - this.setCreativeTab(NaturaRegistry.tabDecorative); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab.java b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab.java index 30547660..dd4c6cdd 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab.java +++ b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab.java @@ -2,7 +2,7 @@ import java.util.Locale; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.planks.BlockOverworldPlanks; @@ -27,7 +27,7 @@ public BlockOverworldSlab() this.setHardness(2.0F); this.setSoundType(SoundType.WOOD); - this.setCreativeTab(NaturaRegistry.tabDecorative); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab2.java b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab2.java index ed914103..e6775bc0 100644 --- a/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab2.java +++ b/src/main/java/com/progwml6/natura/overworld/block/slabs/BlockOverworldSlab2.java @@ -10,7 +10,7 @@ import net.minecraft.init.Blocks; import net.minecraft.util.IStringSerializable; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; import com.progwml6.natura.overworld.NaturaOverworld; import com.progwml6.natura.overworld.block.planks.BlockOverworldPlanks; import slimeknights.mantle.block.EnumBlock; @@ -28,7 +28,7 @@ public BlockOverworldSlab2() this.setHardness(2.0F); this.setSoundType(SoundType.WOOD); - this.setCreativeTab(NaturaRegistry.tabDecorative); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java b/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java index 17221545..ebd33356 100644 --- a/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java +++ b/src/main/java/com/progwml6/natura/overworld/item/ItemSaguaroFruit.java @@ -4,8 +4,7 @@ import javax.annotation.Nullable; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.Block; import net.minecraft.block.state.IBlockState; import net.minecraft.client.util.ITooltipFlag; @@ -35,7 +34,7 @@ public ItemSaguaroFruit(int healAmount, float saturation, Block crop) super(healAmount, saturation, crop, Blocks.FARMLAND); this.crop = crop; - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/shared/NaturaCommons.java b/src/main/java/com/progwml6/natura/shared/NaturaCommons.java index 2e5e1412..ab2af041 100644 --- a/src/main/java/com/progwml6/natura/shared/NaturaCommons.java +++ b/src/main/java/com/progwml6/natura/shared/NaturaCommons.java @@ -3,9 +3,9 @@ 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.library.NaturaRegistry; import com.progwml6.natura.library.Util; import com.progwml6.natura.shared.block.clouds.BlockCloud; import com.progwml6.natura.shared.item.bags.ItemBoneBag; @@ -120,9 +120,9 @@ public void registerItems(Register event) edibles = registerItem(registry, new ItemNaturaEdible(), "edibles"); seed_bags = registerItem(registry, new ItemSeedBag(), "seed_bags"); - materials.setCreativeTab(NaturaRegistry.tabGeneral); - edibles.setCreativeTab(NaturaRegistry.tabGeneral); - seed_bags.setCreativeTab(NaturaRegistry.tabGeneral); + materials.setCreativeTab(Natura.TAB); + edibles.setCreativeTab(Natura.TAB); + seed_bags.setCreativeTab(Natura.TAB); barley = materials.addMeta(0, "barley"); barleyFlour = materials.addMeta(1, "barley_flour"); @@ -147,7 +147,7 @@ public void registerItems(Register event) blueberry = edibles.addFood(3, 1, 0.4F, 16, "blueberry", false); blackberry = edibles.addFood(4, 1, 0.4F, 16, "blackberry", false); maloberry = edibles.addFood(5, 1, 0.4F, 16, "maloberry", false); - berryMedley = registerItem(registry, new ItemNaturaEdibleSoup(5, 1.4F, false), "berry_medley").setCreativeTab(NaturaRegistry.tabGeneral); + berryMedley = registerItem(registry, new ItemNaturaEdibleSoup(5, 1.4F, false), "berry_medley").setCreativeTab(Natura.TAB); } if (isNetherLoaded()) @@ -162,7 +162,7 @@ public void registerItems(Register event) cactusJuice = edibles.addFood(11, 1, 0.1f, 12, "cactusjuice", false); - glowshroom_stew = registerItem(registry, new ItemNaturaEdibleSoup(6, 0.6F, false), "glowshroom_stew").setCreativeTab(NaturaRegistry.tabGeneral); + glowshroom_stew = registerItem(registry, new ItemNaturaEdibleSoup(6, 0.6F, false), "glowshroom_stew").setCreativeTab(Natura.TAB); wheat_seed_bag = seed_bags.addMeta(0, "wheat_seed_bag", Blocks.WHEAT.getDefaultState().withProperty(BlockCrops.AGE, Integer.valueOf(0))); carrots_seed_bag = seed_bags.addMeta(1, "carrots_seed_bag", Blocks.CARROTS.getDefaultState().withProperty(BlockCrops.AGE, Integer.valueOf(0))); @@ -170,13 +170,6 @@ public void registerItems(Register event) nether_wart_seed_bag = seed_bags.addMeta(3, "nether_wart_seed_bag", Blocks.NETHER_WART.getDefaultState().withProperty(BlockNetherWart.AGE, Integer.valueOf(0))); boneMealBag = registerItem(registry, new ItemBoneBag(), "bonemeal_bag"); - - NaturaRegistry.tabGeneral.setDisplayIcon(cotton); - - if (!isOverworldLoaded()) - { - NaturaRegistry.tabWorld.setDisplayIcon(new ItemStack(clouds)); - } } @SubscribeEvent diff --git a/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java b/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java index 3f73e2a0..de45c9f5 100644 --- a/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java +++ b/src/main/java/com/progwml6/natura/shared/block/clouds/BlockCloud.java @@ -2,6 +2,7 @@ import java.util.Locale; +import com.progwml6.natura.Natura; import com.progwml6.natura.library.NaturaRegistry; import com.progwml6.natura.shared.NaturaCommons; @@ -36,7 +37,7 @@ public class BlockCloud extends EnumBlock public BlockCloud() { super(NaturaRegistry.cloud, TYPE, CloudType.class); - this.setCreativeTab(NaturaRegistry.tabWorld); + this.setCreativeTab(Natura.TAB); this.setHardness(0.3F); this.setSoundType(SoundType.CLOTH); } diff --git a/src/main/java/com/progwml6/natura/shared/item/bags/ItemBoneBag.java b/src/main/java/com/progwml6/natura/shared/item/bags/ItemBoneBag.java index 0ff15a4a..a6def636 100644 --- a/src/main/java/com/progwml6/natura/shared/item/bags/ItemBoneBag.java +++ b/src/main/java/com/progwml6/natura/shared/item/bags/ItemBoneBag.java @@ -1,7 +1,6 @@ package com.progwml6.natura.shared.item.bags; -import com.progwml6.natura.library.NaturaRegistry; - +import com.progwml6.natura.Natura; import net.minecraft.block.IGrowable; import net.minecraft.block.state.IBlockState; import net.minecraft.entity.player.EntityPlayer; @@ -23,7 +22,7 @@ public class ItemBoneBag extends Item public ItemBoneBag() { super(); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } /** diff --git a/src/main/java/com/progwml6/natura/tools/item/bows/ItemNaturaBow.java b/src/main/java/com/progwml6/natura/tools/item/bows/ItemNaturaBow.java index 8bdc67ff..fb038a5e 100644 --- a/src/main/java/com/progwml6/natura/tools/item/bows/ItemNaturaBow.java +++ b/src/main/java/com/progwml6/natura/tools/item/bows/ItemNaturaBow.java @@ -19,7 +19,7 @@ import net.minecraft.world.World; import net.minecraftforge.event.ForgeEventFactory; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaBow extends ItemBow { @@ -31,7 +31,7 @@ public class ItemNaturaBow extends ItemBow public ItemNaturaBow(int durability, float damageMult, float velocityMult, float drawTimeMult, float inaccuracy, Ingredient repairMaterial) { - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); this.maxStackSize = 1; this.setMaxDamage(durability); this.damageMult = damageMult; diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaAxe.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaAxe.java index f94fc552..5bc7372a 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaAxe.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaAxe.java @@ -2,7 +2,7 @@ import net.minecraft.item.ItemAxe; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaAxe extends ItemAxe { @@ -10,6 +10,6 @@ public ItemNaturaAxe(ToolMaterial material, float damage, float speed) { super(material, damage - 1.0F, speed - 4.0F); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaFlintAndBlaze.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaFlintAndBlaze.java index f8dc015e..37edf37e 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaFlintAndBlaze.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaFlintAndBlaze.java @@ -14,7 +14,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaFlintAndBlaze extends Item { @@ -22,7 +22,7 @@ public ItemNaturaFlintAndBlaze() { this.maxStackSize = 1; this.setMaxDamage(64); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } /** diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaHoe.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaHoe.java index 0066b1d6..989c9cbb 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaHoe.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaHoe.java @@ -2,7 +2,7 @@ import net.minecraft.item.ItemHoe; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaHoe extends ItemHoe { @@ -10,6 +10,6 @@ public ItemNaturaHoe(ToolMaterial toolMaterialIn) { super(toolMaterialIn); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaPickaxe.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaPickaxe.java index 2ff8a08f..13b34d9e 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaPickaxe.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaPickaxe.java @@ -2,7 +2,7 @@ import net.minecraft.item.ItemPickaxe; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaPickaxe extends ItemPickaxe { @@ -10,6 +10,6 @@ public ItemNaturaPickaxe(ToolMaterial toolMaterialIn) { super(toolMaterialIn); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShears.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShears.java index 238bf8cf..057cd1db 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShears.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShears.java @@ -6,7 +6,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.item.crafting.Ingredient; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaShears extends ItemShears { @@ -17,7 +17,7 @@ public ItemNaturaShears(int durability, Ingredient repairMaterial) this.maxStackSize = 1; this.repairMaterial = repairMaterial; this.setMaxDamage(durability); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } @Override diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShovel.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShovel.java index ae5d1125..bb43d950 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShovel.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaShovel.java @@ -2,7 +2,7 @@ import net.minecraft.item.ItemSpade; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaShovel extends ItemSpade { @@ -10,6 +10,6 @@ public ItemNaturaShovel(ToolMaterial toolMaterialIn) { super(toolMaterialIn); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaSword.java b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaSword.java index bbe5761d..36ee733b 100644 --- a/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaSword.java +++ b/src/main/java/com/progwml6/natura/tools/item/tools/ItemNaturaSword.java @@ -2,13 +2,13 @@ import net.minecraft.item.ItemSword; -import com.progwml6.natura.library.NaturaRegistry; +import com.progwml6.natura.Natura; public class ItemNaturaSword extends ItemSword { public ItemNaturaSword(ToolMaterial toolMaterialIn) { super(toolMaterialIn); - this.setCreativeTab(NaturaRegistry.tabGeneral); + this.setCreativeTab(Natura.TAB); } } diff --git a/src/main/resources/assets/natura/lang/de_de.lang b/src/main/resources/assets/natura/lang/de_de.lang index 74ed5992..dd903f53 100644 --- a/src/main/resources/assets/natura/lang/de_de.lang +++ b/src/main/resources/assets/natura/lang/de_de.lang @@ -571,9 +571,7 @@ entity.nitrocreeper.name=Nitrocreeper # GUIs # ################ -itemGroup.NaturaGeneral=Natura allgemeine Items -itemGroup.NaturaWorld=Naturas Welt-Items -itemGroup.NaturaDecorative=Naturas dekorative Items +//itemGroup.natura.tab=Natura Legacy msg.natura.respawn_obelisk.activate=Obelisk aktiviert. Spawnpunkt wurde gesetzt! msg.natura.respawn_obelisk.deactivate=Obelisk deaktiviert. Spawnpunkt wurde zurückgesetzt! diff --git a/src/main/resources/assets/natura/lang/en_ud.lang b/src/main/resources/assets/natura/lang/en_ud.lang index 755b33f4..0d208d0b 100644 --- a/src/main/resources/assets/natura/lang/en_ud.lang +++ b/src/main/resources/assets/natura/lang/en_ud.lang @@ -512,11 +512,5 @@ entity.natura.heatscarspider.name=ɹǝpᴉdS ɹɐɔsʇɐǝH entity.natura.babyheatscarspider.name=ɹǝpᴉdS ɹɐɔsʇɐǝH ʎqɐᗺ entity.natura.nitrocreeper.name=ɹǝdǝǝɹƆ oɹʇᴉN - -itemGroup.NaturaGeneral=sɯǝʇI ꞁɐɹǝuǝ⅁ s,ɐɹnʇɐN -itemGroup.NaturaWorld=sɯǝʇI pꞁɹoM s,ɐɹnʇɐN -itemGroup.NaturaDecorative=sɯǝʇI ǝʌᴉʇɐɹoɔǝᗡ s,ɐɹnʇɐN - - option.natura.alternatecropitem=doɹƆ ǝʇɐuɹǝʇꞁⱯ option.natura.alternatedooritem=ɹooᗡ ǝʇɐuɹǝʇꞁⱯ diff --git a/src/main/resources/assets/natura/lang/en_us.lang b/src/main/resources/assets/natura/lang/en_us.lang index 2311c5c2..8c1cb71b 100644 --- a/src/main/resources/assets/natura/lang/en_us.lang +++ b/src/main/resources/assets/natura/lang/en_us.lang @@ -588,9 +588,7 @@ entity.nitrocreeper.name=Nitro Creeper # GUIs # ################ -itemGroup.NaturaGeneral=Natura's General Items -itemGroup.NaturaWorld=Natura's World Items -itemGroup.NaturaDecorative=Natura's Decorative Items +itemGroup.natura.tab=Natura Legacy msg.natura.respawn_obelisk.activate=Obelisk activated. Spawn point has been set! msg.natura.respawn_obelisk.deactivate=Obelisk deactivated. Spawn point has been reset! diff --git a/src/main/resources/assets/natura/lang/ja_jp.lang b/src/main/resources/assets/natura/lang/ja_jp.lang index eb9e469a..d35dbc3e 100644 --- a/src/main/resources/assets/natura/lang/ja_jp.lang +++ b/src/main/resources/assets/natura/lang/ja_jp.lang @@ -532,9 +532,7 @@ entity.natura.nitrocreeper.name=ニトロクリーパー # GUIs # ################ -itemGroup.NaturaGeneral=Natura: 通常アイテム -itemGroup.NaturaWorld=Natura: 自然生成 -itemGroup.NaturaDecorative=Natura: 装飾品 +//itemGroup.natura.tab=Natura Legacy ############### # HWYLA # diff --git a/src/main/resources/assets/natura/lang/ru_ru.lang b/src/main/resources/assets/natura/lang/ru_ru.lang index b4492436..f0882156 100644 --- a/src/main/resources/assets/natura/lang/ru_ru.lang +++ b/src/main/resources/assets/natura/lang/ru_ru.lang @@ -531,9 +531,7 @@ entity.natura.nitrocreeper.name=Адский крипер # GUIs # ################ -itemGroup.NaturaGeneral=Natura: Основные предметы -itemGroup.NaturaWorld=Natura: Предметы мира -itemGroup.NaturaDecorative=Natura: Декоративные предметы +//itemGroup.natura.tab=Natura Legacy ############### # HWYLA # diff --git a/src/main/resources/assets/natura/lang/sv_se.lang b/src/main/resources/assets/natura/lang/sv_se.lang index be2f4c9e..a9fd2839 100644 --- a/src/main/resources/assets/natura/lang/sv_se.lang +++ b/src/main/resources/assets/natura/lang/sv_se.lang @@ -542,9 +542,7 @@ entity.natura.nitrocreeper.name=Nitrocreeper # GUIs # ################ -itemGroup.NaturaGeneral=Naturas allmänna föremål -itemGroup.NaturaWorld=Naturas världsföremål -itemGroup.NaturaDecorative=Naturas dekorativa föremål +//itemGroup.natura.tab=Natura Legacy ############### # HWYLA # diff --git a/src/main/resources/assets/natura/lang/zh_cn.lang b/src/main/resources/assets/natura/lang/zh_cn.lang index 0cc7eeb0..cacfcb25 100644 --- a/src/main/resources/assets/natura/lang/zh_cn.lang +++ b/src/main/resources/assets/natura/lang/zh_cn.lang @@ -542,9 +542,7 @@ entity.natura.nitrocreeper.name=硝基爬行者 # GUIs # ################ -itemGroup.NaturaGeneral=自然|一般物品 -itemGroup.NaturaWorld=自然|世界生成 -itemGroup.NaturaDecorative=自然|装饰性 +//itemGroup.natura.tab=Natura Legacy ############### # HWYLA # diff --git a/src/main/resources/assets/natura/lang/zh_tw.lang b/src/main/resources/assets/natura/lang/zh_tw.lang index 2ec7a680..387d6c8d 100644 --- a/src/main/resources/assets/natura/lang/zh_tw.lang +++ b/src/main/resources/assets/natura/lang/zh_tw.lang @@ -531,9 +531,7 @@ entity.natura.nitrocreeper.name=地獄苦力怕 # GUIs # ################ -itemGroup.NaturaGeneral=自然的一般物品 -itemGroup.NaturaWorld=自然的世界生成 -itemGroup.NaturaDecorative=自然的裝飾品 +//itemGroup.natura.tab=Natura Legacy ############### # HWYLA #