From 57efdc62dab13829e7ed57901940b83f2a68d94e Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 14 Jan 2014 18:02:54 +0000 Subject: [PATCH] Added the Lexicon. It does nothing but prove that items work, I guess. --- .../client/core/helper/IconHelper.java | 2 +- .../vazkii/botania/common/block/BlockMod.java | 7 +++++ .../botania/common/block/ModBlocks.java | 2 +- .../common/core/BotaniaCreativeTab.java | 6 +++-- .../common/core/handler/ConfigHandler.java | 7 +++++ .../botania/common/item/ItemLexicon.java | 25 ++++++++++++++++++ .../vazkii/botania/common/item/ItemMod.java | 7 +++++ .../vazkii/botania/common/item/ModItems.java | 6 ++++- .../vazkii/botania/common/lib/LibItemIDs.java | 18 +++++++++++++ .../botania/common/lib/LibItemNames.java | 20 ++++++++++++++ MODSRC/vazkii/botania/common/lib/LibMisc.java | 2 +- .../assets/botania/textures/items/lexicon.png | Bin 0 -> 3314 bytes 12 files changed, 96 insertions(+), 6 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/ItemLexicon.java create mode 100644 MODSRC/vazkii/botania/common/lib/LibItemIDs.java create mode 100644 MODSRC/vazkii/botania/common/lib/LibItemNames.java create mode 100644 resources/assets/botania/textures/items/lexicon.png 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 0000000000000000000000000000000000000000..db21044d2a95d06ea222fc087cc388d2667818ff GIT binary patch literal 3314 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