From c2a01e47da7188cfc158651f130e5d581a136fe4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Sun, 30 Mar 2014 14:21:55 +0100 Subject: [PATCH] Added Floral Fertilizer. --- .../common/core/BotaniaCreativeTab.java | 1 + .../core/handler/BiomeDecorationHandler.java | 2 +- .../botania/common/item/ItemFertilizer.java | 72 ++++++++++++++++++ .../vazkii/botania/common/item/ModItems.java | 4 +- .../botania/common/lib/LibItemNames.java | 1 + resources/assets/botania/lang/en_US.lang | 37 ++++----- .../botania/textures/items/fertilizer.png | Bin 0 -> 3108 bytes 7 files changed, 97 insertions(+), 20 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/ItemFertilizer.java create mode 100644 resources/assets/botania/textures/items/fertilizer.png diff --git a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java index d8978bbd0..592d65c3f 100644 --- a/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java +++ b/MODSRC/vazkii/botania/common/core/BotaniaCreativeTab.java @@ -53,6 +53,7 @@ public final class BotaniaCreativeTab extends CreativeTabs { addItem(ModItems.manaPetal); addItem(ModItems.pestleAndMortar); addItem(ModItems.dye); + addItem(ModItems.fertilizer); addItem(ModItems.twigWand); addItem(ModItems.manaResource); addItem(ModItems.manaCookie); diff --git a/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java b/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java index fa1f7f0c9..eda77b020 100644 --- a/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java +++ b/MODSRC/vazkii/botania/common/core/handler/BiomeDecorationHandler.java @@ -34,7 +34,7 @@ public class BiomeDecorationHandler { int y1 = y + event.rand.nextInt(4) - event.rand.nextInt(4); int z1 = z + event.rand.nextInt(8) - event.rand.nextInt(8); - if (event.world.isAirBlock(x1, y1, z1) && (!event.world.provider.hasNoSky || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1)) + if(event.world.isAirBlock(x1, y1, z1) && (!event.world.provider.hasNoSky || y1 < 127) && ModBlocks.flower.canBlockStay(event.world, x1, y1, z1)) event.world.setBlock(x1, y1, z1, ModBlocks.flower, event.rand.nextInt(16), 2); } } diff --git a/MODSRC/vazkii/botania/common/item/ItemFertilizer.java b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java new file mode 100644 index 000000000..b8a42eb2b --- /dev/null +++ b/MODSRC/vazkii/botania/common/item/ItemFertilizer.java @@ -0,0 +1,72 @@ +/** + * 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 @ [Mar 29, 2014, 10:41:52 PM (GMT)] + */ +package vazkii.botania.common.item; + +import java.util.ArrayList; +import java.util.List; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ChunkCoordinates; +import net.minecraft.world.World; +import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; +import vazkii.botania.common.lib.LibItemNames; + +public class ItemFertilizer extends ItemMod { + + public ItemFertilizer() { + super(); + setUnlocalizedName(LibItemNames.FERTILIZER); + } + + @Override + public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) { + final int range = 3; + if(!par3World.isRemote) { + List validCoords = new ArrayList(); + + for(int i = -range; i < (range + 1); i++) + for(int j = -range; j < (range + 1); j++) { + for(int k = 2; k >= 0; k--) { + int x = par4 + i + 1; + int y = par5 + k + 1; + int z = par6 + j + 1; + if(par3World.isAirBlock(x, y, z) && (!par3World.provider.hasNoSky || y < 255) && ModBlocks.flower.canBlockStay(par3World, x, y, z)) + validCoords.add(new ChunkCoordinates(x, y, z)); + } + } + + int flowerCount = Math.min(validCoords.size(), par3World.rand.nextBoolean() ? 2 : 3); + for(int i = 0; i < flowerCount; i++) { + ChunkCoordinates coords = validCoords.get(par3World.rand.nextInt(validCoords.size())); + validCoords.remove(coords); + par3World.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2); + } + par1ItemStack.stackSize--; + } else { + for(int i = 0; i < 15; i++) { + double x = par4 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + double y = par5 + 1; + double z = par6 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random(); + float red = (float) Math.random(); + float green = (float) Math.random(); + float blue = (float) Math.random(); + Botania.proxy.wispFX(par3World, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F); + } + } + + return true; + } + +} diff --git a/MODSRC/vazkii/botania/common/item/ModItems.java b/MODSRC/vazkii/botania/common/item/ModItems.java index 83029a291..a90dbae79 100644 --- a/MODSRC/vazkii/botania/common/item/ModItems.java +++ b/MODSRC/vazkii/botania/common/item/ModItems.java @@ -32,6 +32,7 @@ public final class ModItems { public static Item manaTablet; public static Item manaGun; public static Item manaCookie; + public static Item fertilizer; public static void init() { lexicon = new ItemLexicon(); @@ -47,7 +48,8 @@ public final class ModItems { manaTablet = new ItemManaTablet(); manaGun = new ItemManaGun(); manaCookie = new ItemManaCookie(); - + fertilizer = new ItemFertilizer(); + OreDictionary.registerOre(LibOreDict.LEXICON, lexicon); for(int i = 0; i < 16; i++) { OreDictionary.registerOre(LibOreDict.PETAL[i], new ItemStack(petal, 1, i)); diff --git a/MODSRC/vazkii/botania/common/lib/LibItemNames.java b/MODSRC/vazkii/botania/common/lib/LibItemNames.java index 3389be4d2..6a671ccea 100644 --- a/MODSRC/vazkii/botania/common/lib/LibItemNames.java +++ b/MODSRC/vazkii/botania/common/lib/LibItemNames.java @@ -28,6 +28,7 @@ public final class LibItemNames { public static final String MANA_TABLET = LibResources.PREFIX_MOD + "manaTablet"; public static final String MANA_GUN = LibResources.PREFIX_MOD + "manaGun"; public static final String MANA_COOKIE = LibResources.PREFIX_MOD + "manaCookie"; + public static final String FERTILIZER = LibResources.PREFIX_MOD + "fertilizer"; public static final String[] LENS_NAMES = new String[] { LibResources.PREFIX_MOD + "lensNormal", diff --git a/resources/assets/botania/lang/en_US.lang b/resources/assets/botania/lang/en_US.lang index 571ae23f2..293ad90f6 100644 --- a/resources/assets/botania/lang/en_US.lang +++ b/resources/assets/botania/lang/en_US.lang @@ -170,22 +170,22 @@ item.botania:petal12.name=Mystical Brown Petal item.botania:petal13.name=Mystical Green Petal item.botania:petal14.name=Mystical Red Petal item.botania:petal15.name=Mystical Black Petal -item.botania:dye0.name=Floral White Dye -item.botania:dye1.name=Floral Orange Dye -item.botania:dye2.name=Floral Magenta Dye -item.botania:dye3.name=Floral Light Blue Dye -item.botania:dye4.name=Floral Yellow Dye -item.botania:dye5.name=Floral Lime Dye -item.botania:dye6.name=Floral Pink Dye -item.botania:dye7.name=Floral Gray Dye -item.botania:dye8.name=Floral Light Gray Dye -item.botania:dye9.name=Floral Cyan Dye -item.botania:dye10.name=Floral Purple Dye -item.botania:dye11.name=Floral Blue Dye -item.botania:dye12.name=Floral Brown Dye -item.botania:dye13.name=Floral Green Dye -item.botania:dye14.name=Floral Red Dye -item.botania:dye15.name=Floral Black Dye +item.botania:dye0.name=Floral White Powder +item.botania:dye1.name=Floral Orange Powder +item.botania:dye2.name=Floral Magenta Powder +item.botania:dye3.name=Floral Light Blue Powder +item.botania:dye4.name=Floral Yellow Powder +item.botania:dye5.name=Floral Lime Powder +item.botania:dye6.name=Floral Pink Powder +item.botania:dye7.name=Floral Gray Powder +item.botania:dye8.name=Floral Light Gray Powder +item.botania:dye9.name=Floral Cyan Powder +item.botania:dye10.name=Floral Purple Powder +item.botania:dye11.name=Floral Blue Powder +item.botania:dye12.name=Floral Brown Powder +item.botania:dye13.name=Floral Green Powder +item.botania:dye14.name=Floral Red Powder +item.botania:dye15.name=Floral Black Powder item.botania:pestleAndMortar.name=Pestle and Mortar item.botania:twigWand.name=Wand of the Forest item.botania:manasteel.name=Manasteel Ingot @@ -251,6 +251,7 @@ item.botania:manaTablet.name=Mana Tablet item.botania:manaGun.name=Mana Blaster item.botania:compositeLens.name=Composite Mana Lens: %s %s item.botania:manaCookie.name=Mana Cookie +item.botania:fertilizer.name=Floral Fertilizer # GUI TEXT botania.gui.lexicon.header=Lexica Botania Index - Pick which category you would like to study: @@ -276,10 +277,10 @@ botania.page.lexicon1=Crafting the &1Lexica Botania&0. botania.entry.flowers=Mystical Flowers botania.page.flowers0=Around the world, you may stumble upon a large variety of Mystical Flora. Spotting these doesn't take much work as the flowers themselves emit a fair amount of shine.
They come in a total of &416 &0different colors.
It's also possible to grow these flowers using &1Bone Meal&0. botania.page.flowers1=Flowers as far as the eye can see... -botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
These petals can also be crushed into &1Floral Dye&0, by the use of a &1Pestle and Mortar&0, which function much alike any mundane piece of dye. +botania.page.flowers2=These flowers can be plucked for &1Mystical Petals&0, that can be used for making magical instruments and plants alike.
These petals can also be crushed into &1Floral Power&0, by the use of a &1Pestle and Mortar&0, which functions much alike any mundane piece of dye. botania.page.flowers3=Plucking Petals off Flowers. botania.page.flowers4=Crafting the &1Pestle and Mortar&0. -botania.page.flowers5=Grinding Petals into Dye. +botania.page.flowers5=Grinding Petals into Powder. # -- PETAL APOTHECARY botania.entry.apothecary=Petal Apothecary diff --git a/resources/assets/botania/textures/items/fertilizer.png b/resources/assets/botania/textures/items/fertilizer.png new file mode 100644 index 0000000000000000000000000000000000000000..3d8918f764072f8e416f6b1153617c309b459092 GIT binary patch literal 3108 zcmV+<4BPXGP)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0003`NklD%45QhB(1;r^d2#Gql7?hUg0V2hyI3&z|g@8<}1{PLORjV{G zPz8*HhIk}-f@*K^543knlN8mGW7(0v`|m%W03aTjm(O(si6?@@!*vzIF+7_BAa65V zAvd5td=dbF0bjpQi0hC+^zZp+&-)P|NIZPJRj^LOIt_x+rM|kmfVd8!jKtzlAa662 zt2xppLfS-7M#4IcvbX^6rf}N$uuel6iM-8VoyJT4j^caHpzU&oAo0cu=)$_Ipo~OW z>{(Tic)X@f^q0000