From aba931f0cedabf032be20b7704827266bce0b5d9 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Fri, 11 Apr 2014 16:11:56 +0100 Subject: [PATCH] Some magic items, textures and base code. --- .../common/core/BotaniaCreativeTab.java | 6 ++++- .../vazkii/botania/common/item/ModItems.java | 7 +++++ .../common/item/magic/ItemDirtRod.java | 25 ++++++++++++++++++ .../common/item/magic/ItemGrassHorn.java | 18 +++++++++++++ .../common/item/magic/ItemTerraformRod.java | 25 ++++++++++++++++++ .../common/item/{ => magic}/ItemTimeRod.java | 3 ++- .../botania/common/lib/LibItemNames.java | 2 ++ .../botania/textures/blocks/manaMirror.png | Bin 0 -> 3272 bytes .../assets/botania/textures/items/dirtRod.png | Bin 3205 -> 3406 bytes .../botania/textures/items/dirtRod.png.mcmeta | 4 ++- .../botania/textures/items/terraformRod.png | Bin 0 -> 3229 bytes 11 files changed, 87 insertions(+), 3 deletions(-) create mode 100644 MODSRC/vazkii/botania/common/item/magic/ItemDirtRod.java create mode 100644 MODSRC/vazkii/botania/common/item/magic/ItemGrassHorn.java create mode 100644 MODSRC/vazkii/botania/common/item/magic/ItemTerraformRod.java rename MODSRC/vazkii/botania/common/item/{ => magic}/ItemTimeRod.java (92%) create mode 100644 resources/assets/botania/textures/blocks/manaMirror.png create mode 100644 resources/assets/botania/textures/items/terraformRod.png 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 0000000000000000000000000000000000000000..c6a7386d732cbd5ed51e63770ec2e918290ddc6d GIT binary patch literal 3272 zcmV;(3^((MP)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} z0005=Nkl^H-qsEO_;MP6dgWiDm z;lf1|OjsZ>h@k-!jDLwrrGQN#ZHIoH`CJ&AsA1~6Jvrw*@A(m93~AcfTsHMq%r}xwr6$i)RW97cP)L8RA$j zUXP*jy~6Cx`_d_(wMIm+Z5ypMH%3C^qWKZUJbW@w-m_>PM2wA1Q7GiOdgX5C4#XHk zk|bm@zua6u9T*o)O+%oN7u${0L;GU}T5HGTgcf)k|aSX#oBJ8JHgCQ&IAgoM+t+uUTHKM zRF4wg>@~X**Z@%!aU??Mh}7$Knv$hdJ>-8R-QKyIehvV%AiZ*JfbbFk0000aDhfiO_617my(bHW(r?gfKY*8hi9*3c=?5siG<`dX7%j92HH`?m7V8FW zUd$%@^iZ<(rMrfPg3uWlc9xmvnR))R^W&LSB0?+0IBURYx>velQPTZ!_KOt&-hA9p ze~o?>w1UxeuROYYh0UD;0KdYJx5Xr*0${CL)hFY zFp^4eWAYLJnQV@9f86U21sQj?M;IRL@eJ3u_sCner^P7;uInM7fB$?;55N=9bKp1*N+}G(z;PU2KY1vbY>vET z^We@jw;w-Keqn|H!r?H6@k`IE7y9Mt%O!7uOg7j2hvYa8wOS2pedB2CD#$?ypkA*7 zFqMo++z<}xzqK7nC4%=^L=X`sdZThP9h0eKOhklR!(Ge_#Ssyvk}+@G$*M$zf0?1U zv`dx!nj#f%SEW)3`_N^1w@f%3=FAW(l?sKb&~2iM#Udq4R_&^1>^P3E1J&wr4$)%K zJkUHi=R8<=`$@ILgSpu;(LB&R&^-9B@`Dh7X_`#-wMnug!hTJ$XdNg(0n9)D!1O>z zu!EVQxOAIfAG!>5M%DFH8-TYxe@owr!N++#5fP;niD*cqlBMA!hzCX^KR8s1mA#7ktJAn@SN~+#lryFOA7~zE9{l_KfM)Uo z-}}PR1S9Ca;LC%1*DiZ)zvM#mK=VNJ;5_l5<@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} z0005VNklFBNoFQ_*TvA3lzjBSg9q=Pch9-!JyBIAK}1IT zObxZikSaj9&FDZ?Nihd^m#^rDCruV#O({^-iR+a7=}lA1uhC2moy2u#b$6*ID*N|3 zY=nPw;W0e>yh^H&)QwrN)>1ELvDVV=4&_$0tS{Faw6@y3&o$v`qN?@nH{p-OlAMpR zUd|#Sh=>js3gmNXmMaAw)@}mu?&AhKyMN_$h@z^*ag2!Ix-M}X)2NozBj&I_80 zjg_hb_`PUE9!tS-98#%d91m_(wBT5dVuz)?BYG47X9=9g*bw75W-u5aB1BPy=Xvwq z*_j1n40jfdRy@Orb-0{$