From bec0603ce39882713760176d81db5a85f292c462 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Sat, 24 Jan 2015 22:59:26 +0000 Subject: [PATCH] Added the Rod of the Depths. --- .../common/core/BotaniaCreativeTab.java | 1 + .../common/crafting/ModCraftingRecipes.java | 10 ++++ .../vazkii/botania/common/item/ModItems.java | 3 ++ .../common/item/rod/ItemCobbleRod.java | 51 ++++++++++++++++++ .../botania/common/item/rod/ItemDirtRod.java | 13 +++-- .../botania/common/lexicon/LexiconData.java | 6 ++- .../botania/common/lib/LibItemNames.java | 1 + .../vazkii/botania/common/lib/LibLexicon.java | 1 + .../resources/assets/botania/lang/en_US.lang | 6 +++ .../{unused/depthsRod.png => cobbleRod.png} | Bin ...thsRod.png.mcmeta => cobbleRod.png.mcmeta} | 0 11 files changed, 87 insertions(+), 5 deletions(-) create mode 100644 src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java rename src/main/resources/assets/botania/textures/items/{unused/depthsRod.png => cobbleRod.png} (100%) rename src/main/resources/assets/botania/textures/items/{unused/depthsRod.png.mcmeta => cobbleRod.png.mcmeta} (100%) diff --git a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java index 05e67e3c5..405590845 100644 --- a/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/src/main/java/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -74,6 +74,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.dirtRod); addItem(ModItems.skyDirtRod); + addItem(ModItems.cobbleRod); addItem(ModItems.terraformRod); addItem(ModItems.laputaShard); addItem(ModItems.grassHorn); diff --git a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java index 13caacc86..a71581704 100644 --- a/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java +++ b/src/main/java/vazkii/botania/common/crafting/ModCraftingRecipes.java @@ -216,6 +216,7 @@ public final class ModCraftingRecipes { public static IRecipe recipeDreamwoodTwig; public static IRecipe recipeMonocle; public static IRecipe recipeClip; + public static IRecipe recipeCobbleRod; public static void init() { // Lexicon Recipe @@ -1409,6 +1410,15 @@ public final class ModCraftingRecipes { 'D', LibOreDict.DREAM_WOOD); recipeClip = BotaniaAPI.getLatestAddedRecipe(); + // Rod of the Depths Recipe + addOreDictRecipe(new ItemStack(ModItems.cobbleRod), + " FC", " TW", "T ", + 'F', LibOreDict.RUNE[1], + 'W', LibOreDict.RUNE[0], + 'T', LibOreDict.LIVINGWOOD_TWIG, + 'C', new ItemStack(Blocks.cobblestone)); + recipeCobbleRod = BotaniaAPI.getLatestAddedRecipe(); + // Storage Block Recipes addOreDictRecipe(new ItemStack(ModBlocks.storage, 1, 0), "III", "III", "III", diff --git a/src/main/java/vazkii/botania/common/item/ModItems.java b/src/main/java/vazkii/botania/common/item/ModItems.java index 1ba57cf29..9b338a40b 100644 --- a/src/main/java/vazkii/botania/common/item/ModItems.java +++ b/src/main/java/vazkii/botania/common/item/ModItems.java @@ -79,6 +79,7 @@ import vazkii.botania.common.item.material.ItemPestleAndMortar; import vazkii.botania.common.item.material.ItemPetal; import vazkii.botania.common.item.material.ItemQuartz; import vazkii.botania.common.item.material.ItemRune; +import vazkii.botania.common.item.rod.ItemCobbleRod; import vazkii.botania.common.item.rod.ItemDirtRod; import vazkii.botania.common.item.rod.ItemDiviningRod; import vazkii.botania.common.item.rod.ItemFireRod; @@ -192,6 +193,7 @@ public final class ModItems { public static Item blackLotus; public static Item monocle; public static Item clip; + public static Item cobbleRod; public static void init() { lexicon = new ItemLexicon(); @@ -293,6 +295,7 @@ public final class ModItems { blackLotus = new ItemBlackLotus(); monocle = new ItemMonocle(); clip = new ItemClip(); + cobbleRod = new ItemCobbleRod(); OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java new file mode 100644 index 000000000..97a73dd6a --- /dev/null +++ b/src/main/java/vazkii/botania/common/item/rod/ItemCobbleRod.java @@ -0,0 +1,51 @@ +/** + * 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 24, 2015, 10:28:03 PM (GMT)] + */ +package vazkii.botania.common.item.rod; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Blocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import vazkii.botania.api.mana.IManaUsingItem; +import vazkii.botania.api.mana.ManaItemHandler; +import vazkii.botania.common.Botania; +import vazkii.botania.common.item.ItemMod; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemCobbleRod extends ItemMod implements IManaUsingItem { + + static final int COST = 150; + + public ItemCobbleRod() { + setMaxStackSize(1); + setUnlocalizedName(LibItemNames.COBBLE_ROD); + } + + @Override + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + return ItemDirtRod.place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.cobblestone, COST, 0.3F, 0.3F, 0.3F); + } + + @Override + public boolean isFull3D() { + return true; + } + + @Override + public boolean usesMana(ItemStack stack) { + return true; + } + +} diff --git a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java index fe65f3bcc..0264dc897 100644 --- a/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java +++ b/src/main/java/vazkii/botania/common/item/rod/ItemDirtRod.java @@ -11,6 +11,7 @@ */ package vazkii.botania.common.item.rod; +import net.minecraft.block.Block; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Blocks; @@ -40,18 +41,22 @@ public class ItemDirtRod extends ItemMod implements IManaUsingItem { @Override public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { - if(ManaItemHandler.requestManaExact(par1ItemStack, par2EntityPlayer, COST, false)) { + return place(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10, Blocks.dirt, COST, 0.35F, 0.2F, 0.05F); + } + + public static boolean place(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10, Block block, int cost, float r, float g, float b) { + if(ManaItemHandler.requestManaExact(par1ItemStack, par2EntityPlayer, cost, false)) { ForgeDirection dir = ForgeDirection.getOrientation(par7); int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size(); if(entities == 0) { - ItemStack stackToPlace = new ItemStack(Blocks.dirt); + ItemStack stackToPlace = new ItemStack(block); stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10); if(stackToPlace.stackSize == 0) { - ManaItemHandler.requestManaExact(par1ItemStack, par2EntityPlayer, COST, true); + ManaItemHandler.requestManaExact(par1ItemStack, par2EntityPlayer, cost, true); for(int i = 0; i < 6; i++) - Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), 0.35F, 0.2F, 0.05F, 1F, 5); + Botania.proxy.sparkleFX(par3World, par4 + dir.offsetX + Math.random(), par5 + dir.offsetY + Math.random(), par6 + dir.offsetZ + Math.random(), r, g, b, 1F, 5); } } } diff --git a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java index 85330fc4a..bfba93d45 100644 --- a/src/main/java/vazkii/botania/common/lexicon/LexiconData.java +++ b/src/main/java/vazkii/botania/common/lexicon/LexiconData.java @@ -153,7 +153,8 @@ public final class LexiconData { public static LexiconEntry missileRod; public static LexiconEntry craftingHalo; public static LexiconEntry clip; - + public static LexiconEntry cobbleRod; + public static LexiconEntry baublesIntro; public static LexiconEntry tinyPlanet; public static LexiconEntry manaRing; @@ -587,6 +588,9 @@ public final class LexiconData { clip = new ALexiconEntry(LibLexicon.TOOL_CLIP, categoryTools); clip.setLexiconPages(new PageText("0"), new PageText("1"), new PageCraftingRecipe("2", ModCraftingRecipes.recipeClip)); + cobbleRod = new BLexiconEntry(LibLexicon.TOOL_COBBLE_ROD, categoryTools); + cobbleRod.setLexiconPages(new PageText("0"), new PageCraftingRecipe("1", ModCraftingRecipes.recipeCobbleRod)); + // BAUBLES ENTRIES baublesIntro = new BLexiconEntry(LibLexicon.BAUBLE_INTRO, categoryBaubles); baublesIntro.setPriority().setLexiconPages(new PageText("0"), new PageImage("1", LibResources.ENTRY_BAUBLES), new PageText("2")); diff --git a/src/main/java/vazkii/botania/common/lib/LibItemNames.java b/src/main/java/vazkii/botania/common/lib/LibItemNames.java index 2826b92f4..ecf9bbb3b 100644 --- a/src/main/java/vazkii/botania/common/lib/LibItemNames.java +++ b/src/main/java/vazkii/botania/common/lib/LibItemNames.java @@ -113,6 +113,7 @@ public final class LibItemNames { public static final String BLACK_LOTUS = "blackLotus"; public static final String MONOCLE = "monocle"; public static final String CLIP = "clip"; + public static final String COBBLE_ROD = "cobbleRod"; public static final String[] LENS_NAMES = new String[] { "lensNormal", diff --git a/src/main/java/vazkii/botania/common/lib/LibLexicon.java b/src/main/java/vazkii/botania/common/lib/LibLexicon.java index 5148ffefc..80a716b68 100644 --- a/src/main/java/vazkii/botania/common/lib/LibLexicon.java +++ b/src/main/java/vazkii/botania/common/lib/LibLexicon.java @@ -134,6 +134,7 @@ public final class LibLexicon { public static final String TOOL_MISSILE_ROD = "missileRod"; public static final String TOOL_CRAFTING_HALO = "craftingHalo"; public static final String TOOL_CLIP = "clip"; + public static final String TOOL_COBBLE_ROD = "cobbleRod"; public static final String BAUBLE_INTRO = "bIntro"; public static final String BAUBLE_TINY_PLANET = "tinyPlanet"; diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index d55d06b31..be453e095 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -803,6 +803,7 @@ item.botania:blackLotus1.name=Void Lotus item.botania:dreamwoodTwig.name=Dreamwood Twig item.botania:monocle.name=Manaseer Monocle item.botania:clip.name=Lens Clip +item.botania:cobbleRod.name=Rod of the Depths # BREW NAMES botania.brew.fallback=Fallback @@ -1649,6 +1650,11 @@ botania.page.clip0=While a formidable and versatile tool, the &1Mana Blaster&0's botania.page.clip1=Adding and removing &1Lenses&0 works just as it did previously, with one detail. The lens will be added or removed in the slot that the clip is currently on.
To change this slot, simply shift-right click the &1Mana Blaster&0 in the air. This will also change which lens is selected, case there is one in that slot. botania.page.clip2=Since we're dubbed by 4Kids we must make do without one +# -- ROD OF THE DEPTHS +botania.entry.cobbleRod=Rod of the Depths +botania.page.cobbleRod0=The &1Rod of the Depths&0 acts pretty much as a variant to the the &1Rod of the Lands&0. It does exactly the same thing but with &1Cobblestone&0 for a bit of a higher price. +botania.page.cobbleRod1=It's cobbling time + # - BAUBLES # -- AN INTRODUCTION TO BAUBLES botania.entry.bIntro=An Introduction to Baubles diff --git a/src/main/resources/assets/botania/textures/items/unused/depthsRod.png b/src/main/resources/assets/botania/textures/items/cobbleRod.png similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/depthsRod.png rename to src/main/resources/assets/botania/textures/items/cobbleRod.png diff --git a/src/main/resources/assets/botania/textures/items/unused/depthsRod.png.mcmeta b/src/main/resources/assets/botania/textures/items/cobbleRod.png.mcmeta similarity index 100% rename from src/main/resources/assets/botania/textures/items/unused/depthsRod.png.mcmeta rename to src/main/resources/assets/botania/textures/items/cobbleRod.png.mcmeta