diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index 300983c34..13959e3c1 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -60,6 +60,10 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manaCookie); addItem(ModItems.rune); + addItem(ModItems.dirtRod); + addItem(ModItems.terraformRod); + addItem(ModItems.timeRod); + addBlock(ModBlocks.livingrock); addBlock(ModBlocks.livingwood); addBlock(ModBlocks.altar); @@ -69,7 +73,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addBlock(ModBlocks.unstableBlock); addBlock(ModBlocks.manaBeacon); addItem(ModItems.signalFlare); - + addItem(ModItems.manaTablet); addBlock(ModBlocks.pool); addBlock(ModBlocks.distributor); diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index f00cbf573..e34d1e57a 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -15,6 +15,9 @@ import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; +import vazkii.botania.common.item.magic.ItemDirtRod; +import vazkii.botania.common.item.magic.ItemTerraformRod; +import vazkii.botania.common.item.magic.ItemTimeRod; import vazkii.botania.common.lib.LibOreDict; public final class ModItems { @@ -35,6 +38,8 @@ public final class ModItems { public static Item fertilizer; public static Item grassSeeds; public static Item timeRod; + public static Item dirtRod; + public static Item terraformRod; public static void init() { lexicon = new ItemLexicon(); @@ -53,6 +58,8 @@ public final class ModItems { fertilizer = new ItemFertilizer(); grassSeeds = new ItemGrassSeeds(); timeRod = new ItemTimeRod(); + dirtRod = new ItemDirtRod(); + terraformRod = new ItemTerraformRod(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/MODSRC/vazkii/botania/common/item/magic/ItemDirtRod.java b/MODSRC/vazkii/botania/common/item/magic/ItemDirtRod.java new file mode 100644 index 000000000..c20061d36 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/magic/ItemDirtRod.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 @ [Apr 11, 2014, 2:53:41 PM (GMT)] + */ +package vazkii.botania.common.item.magic; + +import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemDirtRod extends ItemMod { + + public ItemDirtRod() { + super(); + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.DIRT_ROD); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/magic/ItemGrassHorn.java b/MODSRC/vazkii/botania/common/item/magic/ItemGrassHorn.java new file mode 100644 index 000000000..eb1f7e316 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/magic/ItemGrassHorn.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 @ [Apr 11, 2014, 2:57:30 PM (GMT)] + */ +package vazkii.botania.common.item.magic; + +import vazkii.botania.common.item.ItemMod; + +public class ItemGrassHorn extends ItemMod { + +} diff --git a/MODSRC/vazkii/botania/common/item/magic/ItemTerraformRod.java b/MODSRC/vazkii/botania/common/item/magic/ItemTerraformRod.java new file mode 100644 index 000000000..b399be4c0 --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/magic/ItemTerraformRod.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 @ [Apr 11, 2014, 2:56:39 PM (GMT)] + */ +package vazkii.botania.common.item.magic; + +import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemTerraformRod extends ItemMod { + + public ItemTerraformRod() { + super(); + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.TERRAFORM_ROD); + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ItemTimeRod.java b/MODSRC/vazkii/botania/common/item/magic/ItemTimeRod.java similarity index 92% rename from MODSRC/vazkii/botania/common/item/ItemTimeRod.java rename to MODSRC/vazkii/botania/common/item/magic/ItemTimeRod.java index 30cfa73cb..74eca7891 100644 --- a/MODSRC/vazkii/botania/common/item/ItemTimeRod.java +++ b/MODSRC/vazkii/botania/common/item/magic/ItemTimeRod.java @@ -9,12 +9,13 @@ * * File Created @ [Apr 10, 2014, 6:46:03 PM (GMT)] */ -package vazkii.botania.common.item; +package vazkii.botania.common.item.magic; import net.minecraft.block.Block; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.world.World; +import vazkii.botania.common.item.ItemMod; import vazkii.botania.common.lib.LibItemNames; public class ItemTimeRod extends ItemMod { diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index c9824cd7c..b7e316b59 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -31,6 +31,8 @@ public final class LibItemNames { public static final String FERTILIZER = LibResources.PREFIX_MOD + "fertilizer"; public static final String GRASS_SEEDS = LibResources.PREFIX_MOD + "grassSeeds"; public static final String TIME_ROD = LibResources.PREFIX_MOD + "timeRod"; + public static final String DIRT_ROD = LibResources.PREFIX_MOD + "dirtRod"; + public static final String TERRAFORM_ROD = LibResources.PREFIX_MOD + "terraformRod"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/resources/assets/botania/textures/blocks/manaMirror.png b/resources/assets/botania/textures/blocks/manaMirror.png new file mode 100644 index 000000000..c6a7386d7 Binary files /dev/null and b/resources/assets/botania/textures/blocks/manaMirror.png differ diff --git a/resources/assets/botania/textures/items/dirtRod.png b/resources/assets/botania/textures/items/dirtRod.png index 9f8787595..f3c17713f 100644 Binary files a/resources/assets/botania/textures/items/dirtRod.png and b/resources/assets/botania/textures/items/dirtRod.png differ diff --git a/resources/assets/botania/textures/items/dirtRod.png.mcmeta b/resources/assets/botania/textures/items/dirtRod.png.mcmeta index 386ee8988..16a9732b2 100644 --- a/resources/assets/botania/textures/items/dirtRod.png.mcmeta +++ b/resources/assets/botania/textures/items/dirtRod.png.mcmeta @@ -7,7 +7,9 @@ }, 1, 2, - 3 + 3, + 4, + 5 ] } } \ No newline at end of file diff --git a/resources/assets/botania/textures/items/terraformRod.png b/resources/assets/botania/textures/items/terraformRod.png new file mode 100644 index 000000000..872aa05be Binary files /dev/null and b/resources/assets/botania/textures/items/terraformRod.png differ