diff --git a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java index f5b219881..a1be0410a 100644 --- a/MODSRC/vazkii/botania/client/core/helper/IconHelper.java +++ b/MODSRC/vazkii/botania/client/core/helper/IconHelper.java @@ -17,7 +17,7 @@ import net.minecraft.item.Item; import net.minecraft.util.Icon; import vazkii.botania.client.lib.LibResources; -public class IconHelper { +public final class IconHelper { private static Icon emptyTexture; diff --git a/MODSRC/vazkii/botania/common/block/BlockMod.java b/MODSRC/vazkii/botania/common/block/BlockMod.java index 01287cfd1..3ee73ba54 100644 --- a/MODSRC/vazkii/botania/common/block/BlockMod.java +++ b/MODSRC/vazkii/botania/common/block/BlockMod.java @@ -16,6 +16,7 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -27,6 +28,12 @@ public class BlockMod extends Block { setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Override + public Block setUnlocalizedName(String par1Str) { + GameRegistry.registerBlock(this, par1Str); + return super.setUnlocalizedName(par1Str); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/block/ModBlocks.java b/MODSRC/vazkii/botania/common/block/ModBlocks.java index 11e999127..837b46d40 100644 --- a/MODSRC/vazkii/botania/common/block/ModBlocks.java +++ b/MODSRC/vazkii/botania/common/block/ModBlocks.java @@ -11,7 +11,7 @@ */ package vazkii.botania.common.block; -public class ModBlocks { +public final class ModBlocks { public static void init() { diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 954432816..c2f82d1ad 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -17,9 +17,10 @@ import net.minecraft.block.Block; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import vazkii.botania.common.item.ModItems; import vazkii.botania.common.lib.LibMisc; -public class BotaniaCreativeTab extends CreativeTabs { +public final class BotaniaCreativeTab extends CreativeTabs { public static BotaniaCreativeTab INSTANCE = new BotaniaCreativeTab(); List list; @@ -30,13 +31,14 @@ public class BotaniaCreativeTab extends CreativeTabs { @Override public ItemStack getIconItemStack() { - return new ItemStack(Block.plantRed); + return new ItemStack(ModItems.lexicon); } @Override public void displayAllReleventItems(List list) { this.list = list; + addItem(ModItems.lexicon); } private void addItem(Item item) { diff --git a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java index d649ba777..303641ebd 100644 --- a/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/ConfigHandler.java @@ -14,6 +14,8 @@ package vazkii.botania.common.core.handler; import java.io.File; import net.minecraftforge.common.Configuration; +import vazkii.botania.common.lib.LibItemIDs; +import vazkii.botania.common.lib.LibItemNames; public final class ConfigHandler { @@ -24,6 +26,11 @@ public final class ConfigHandler { config.load(); + // Block IDs + + // Item IDs + LibItemIDs.idLexicon = loadItem(LibItemNames.LEXICON, LibItemIDs.idLexicon); + config.save(); } diff --git a/MODSRC/vazkii/botania/common/item/ItemLexicon.java b/MODSRC/vazkii/botania/common/item/ItemLexicon.java new file mode 100644 index 000000000..a8a6e6ccd --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemLexicon.java @@ -0,0 +1,25 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 14, 2014, 5:53:00 PM (GMT)] + */ +package vazkii.botania.common.item; + +import vazkii.botania.common.lib.LibItemIDs; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemLexicon extends ItemMod { + + public ItemLexicon() { + super(LibItemIDs.idLexicon); + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.LEXICON); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemMod.java b/MODSRC/vazkii/botania/common/item/ItemMod.java index cb4f0fdde..15443f563 100644 --- a/MODSRC/vazkii/botania/common/item/ItemMod.java +++ b/MODSRC/vazkii/botania/common/item/ItemMod.java @@ -15,6 +15,7 @@ import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.item.Item; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.core.BotaniaCreativeTab; +import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -25,6 +26,12 @@ public class ItemMod extends Item { setCreativeTab(BotaniaCreativeTab.INSTANCE); } + @Override + public Item setUnlocalizedName(String par1Str) { + GameRegistry.registerItem(this, par1Str); + return super.setUnlocalizedName(par1Str); + } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IconRegister par1IconRegister) { diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index b812c3a4a..7f62cad83 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -11,10 +11,14 @@ */ package vazkii.botania.common.item; +import net.minecraft.item.Item; + public final class ModItems { + public static Item lexicon; + public static void init() { - + lexicon = new ItemLexicon(); } } diff --git a/MODSRC/vazkii/botania/common/lib/LibItemIDs.java b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java new file mode 100644 index 000000000..245ae5040 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lib/LibItemIDs.java @@ -0,0 +1,18 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 14, 2014, 5:49:24 PM (GMT)] + */ +package vazkii.botania.common.lib; + +public final class LibItemIDs { + + public static int idLexicon = 19555; + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java new file mode 100644 index 000000000..f677157d8 --- /dev/null +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -0,0 +1,20 @@ +/** + * This class was created by . It's distributed as + * part of the Botania Mod. Get the Source Code in github: + * https://github.com/Vazkii/Botania + * + * Botania is Open Source and distributed under a + * Creative Commons Attribution-NonCommercial-ShareAlike 3.0 License + * (http://creativecommons.org/licenses/by-nc-sa/3.0/deed.en_GB) + * + * File Created @ [Jan 14, 2014, 5:49:06 PM (GMT)] + */ +package vazkii.botania.common.lib; + +import vazkii.botania.client.lib.LibResources; + +public final class LibItemNames { + + public static final String LEXICON = LibResources.PREFIX_MOD + "lexicon"; + +} diff --git a/MODSRC/vazkii/botania/common/lib/LibMisc.java b/MODSRC/vazkii/botania/common/lib/LibMisc.java index fcd554297..9d2cd4a08 100644 --- a/MODSRC/vazkii/botania/common/lib/LibMisc.java +++ b/MODSRC/vazkii/botania/common/lib/LibMisc.java @@ -11,7 +11,7 @@ */ package vazkii.botania.common.lib; -public class LibMisc { +public final class LibMisc { // Mod Constants public static final String MOD_ID = "Botania"; diff --git a/resources/assets/botania/textures/items/lexicon.png b/resources/assets/botania/textures/items/lexicon.png new file mode 100644 index 000000000..db21044d2 Binary files /dev/null and b/resources/assets/botania/textures/items/lexicon.png differ