From 18bdd6d32d8d99e28b568589ef0f322835d08ea4 Mon Sep 17 00:00:00 2001 From: Vasco Lavos Date: Tue, 17 Nov 2015 21:59:31 +0000 Subject: [PATCH] S E E D S B O Y Z --- .../botania/common/block/BlockAltGrass.java | 35 +++++++++++++----- .../block/decor/BlockFloatingFlower.java | 7 +++- .../botania/common/item/ItemGrassSeeds.java | 31 +++++++++++----- .../resources/assets/botania/lang/en_US.lang | 6 +++ .../{grassSeeds9.png => grassSeeds3.png} | Bin 17783 -> 19470 bytes .../botania/textures/items/grassSeeds4.png | Bin 17830 -> 18627 bytes .../botania/textures/items/grassSeeds5.png | Bin 19470 -> 17830 bytes .../botania/textures/items/grassSeeds6.png | Bin 18627 -> 17783 bytes .../botania/textures/items/grassSeeds7.png | Bin 17783 -> 17758 bytes .../botania/textures/items/grassSeeds8.png | Bin 17758 -> 17783 bytes 10 files changed, 58 insertions(+), 21 deletions(-) rename src/main/resources/assets/botania/textures/items/{grassSeeds9.png => grassSeeds3.png} (86%) diff --git a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java index 4c0270d6c..0bb2f00a9 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAltGrass.java +++ b/src/main/java/vazkii/botania/common/block/BlockAltGrass.java @@ -22,7 +22,12 @@ import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; +import net.minecraftforge.common.EnumPlantType; +import net.minecraftforge.common.IPlantable; +import net.minecraftforge.common.util.ForgeDirection; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; import vazkii.botania.common.item.block.ItemBlockWithMetadataAndName; @@ -70,19 +75,19 @@ public class BlockAltGrass extends BlockMod { return side == 0 || meta >= SUBTYPES ? Blocks.dirt.getIcon(side, meta) : side == 1 ? icons[meta * 2] : icons[meta * 2 + 1]; } - // All from below is from BlockMycelium (adapted a bit) - @Override - public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) { - if(!p_149674_1_.isRemote && p_149674_1_.getBlockLightValue(p_149674_2_, p_149674_3_ + 1, p_149674_4_) >= 9) { + public void updateTick(World world, int x, int y, int z, Random rand) { + if(!world.isRemote && world.getBlockLightValue(x, y + 1, z) >= 9) { + int meta = world.getBlockMetadata(x, y, z); for(int l = 0; l < 4; ++l) { - int i1 = p_149674_2_ + p_149674_5_.nextInt(3) - 1; - int j1 = p_149674_3_ + p_149674_5_.nextInt(5) - 3; - int k1 = p_149674_4_ + p_149674_5_.nextInt(3) - 1; - Block block = p_149674_1_.getBlock(i1, j1 + 1, k1); + int i1 = x + rand.nextInt(3) - 1; + int j1 = y + rand.nextInt(5) - 3; + int k1 = z + rand.nextInt(3) - 1; + + Block block = world.getBlock(i1, j1 + 1, k1); - if(p_149674_1_.getBlock(i1, j1, k1) == Blocks.dirt && p_149674_1_.getBlockMetadata(i1, j1, k1) == 0 && p_149674_1_.getBlockLightValue(i1, j1 + 1, k1) >= 4 && p_149674_1_.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) - p_149674_1_.setBlock(i1, j1, k1, this); + if(world.getBlock(i1, j1, k1) == Blocks.dirt && world.getBlockMetadata(i1, j1, k1) == 0 && world.getBlockLightValue(i1, j1 + 1, k1) >= 4 && world.getBlockLightOpacity(i1, j1 + 1, k1) <= 2) + world.setBlock(i1, j1, k1, this, meta, 1 | 2); } } } @@ -92,6 +97,16 @@ public class BlockAltGrass extends BlockMod { return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_); } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) { + return new ItemStack(this, 1, world.getBlockMetadata(x, y, z)); + } + + @Override + public boolean canSustainPlant(IBlockAccess world, int x, int y, int z, ForgeDirection direction, IPlantable plantable) { + return plantable.getPlantType(world, x, y - 1, z) == EnumPlantType.Plains; + } + @Override public void randomDisplayTick(World world, int x, int y, int z, Random r) { int meta = world.getBlockMetadata(x, y, z); diff --git a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java index b86f54c7e..fc1fae8f9 100644 --- a/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java +++ b/src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java @@ -133,8 +133,11 @@ public class BlockFloatingFlower extends BlockModContainer implements ILexiconab IslandType type = null; if(stack.getItem() == Items.snowball) type = IslandType.SNOW; - else if(stack.getItem() == ModItems.grassSeeds) - type = ItemGrassSeeds.getIslandType(stack); + else if(stack.getItem() == ModItems.grassSeeds) { + IslandType newType = ItemGrassSeeds.getIslandType(stack); + if(newType != null) + type = newType; + } if(type != null && type != flower.getIslandType()) { if(!world.isRemote) { diff --git a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java index 35985a50a..0ae989bd2 100644 --- a/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java +++ b/src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java @@ -28,6 +28,7 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; import vazkii.botania.client.core.helper.IconHelper; import vazkii.botania.common.Botania; +import vazkii.botania.common.block.ModBlocks; import vazkii.botania.common.block.decor.IFloatingFlower.IslandType; import vazkii.botania.common.lib.LibItemNames; import cpw.mods.fml.common.FMLCommonHandler; @@ -42,10 +43,11 @@ public class ItemGrassSeeds extends ItemMod { private static Map> blockSwappers = new HashMap(); private static final IslandType[] ISLAND_TYPES = { - IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL + IslandType.GRASS, IslandType.PODZOL, IslandType.MYCEL, + null, null, null, null, null, null }; - private static final int types = 3; + private static final int SUBTYPES = 9; IIcon[] icons; public ItemGrassSeeds() { @@ -57,15 +59,15 @@ public class ItemGrassSeeds extends ItemMod { @Override public void getSubItems(Item par1, CreativeTabs par2, List par3) { - for(int i = 0; i < types; i++) + for(int i = 0; i < SUBTYPES; i++) par3.add(new ItemStack(par1, 1, i)); } @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister par1IconRegister) { - icons = new IIcon[types]; - for(int i = 0; i < types; i++) + icons = new IIcon[SUBTYPES]; + for(int i = 0; i < SUBTYPES; i++) icons[i] = IconHelper.forItem(par1IconRegister, this, i); } @@ -85,7 +87,7 @@ public class ItemGrassSeeds extends ItemMod { Block block = par3World.getBlock(par4, par5, par6); int bmeta = par3World.getBlockMetadata(par4, par5, par6); - if(block == Blocks.dirt && bmeta == 0) { + if((block == Blocks.dirt || (block == Blocks.grass && par1ItemStack.getItemDamage() != 0)) && bmeta == 0) { int meta = par1ItemStack.getItemDamage(); BlockSwapper swapper = addBlockSwapper(par3World, par4, par5, par6, meta); @@ -98,14 +100,19 @@ public class ItemGrassSeeds extends ItemMod { float r = 0F; float g = 0.4F; float b = 0F; - if(meta == 1) { + switch(meta) { + case 1: { r = 0.5F; g = 0.37F; b = 0F; - } else if(meta == 2) { + break; + } + case 2: { r = 0.27F; g = 0F; b = 0.33F; + break; + } } float velMul = 0.025F; @@ -148,6 +155,12 @@ public class ItemGrassSeeds extends ItemMod { switch(meta) { case 1 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.dirt, 2); case 2 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.mycelium, 0); + case 3 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 0); + case 4 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 1); + case 5 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 2); + case 6 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 3); + case 7 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 4); + case 8 : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), ModBlocks.altGrass, 5); default : return new BlockSwapper(world, new ChunkCoordinates(x, y, z), Blocks.grass, 0); } } @@ -191,7 +204,7 @@ public class ItemGrassSeeds extends ItemMod { int z1 = z + l; Block block1 = world.getBlock(x1, y, z1); int meta1 = world.getBlockMetadata(x1, y, z1); - if(block1 == Blocks.dirt && meta1 == 0) + if((block1 == Blocks.dirt || block1 == Blocks.grass) && meta1 == 0) validCoords.add(new ChunkCoordinates(x1, y, z1)); } diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 4f929963e..06e64218c 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -1415,6 +1415,12 @@ item.botania:fertilizer.name=Floral Fertilizer item.botania:grassSeeds0.name=Pasture Seeds item.botania:grassSeeds1.name=Boreal Seeds item.botania:grassSeeds2.name=Infestation Spores +item.botania:grassSeeds3.name=Dry Pasture Seeds +item.botania:grassSeeds4.name=Golden Pasture Seeds +item.botania:grassSeeds5.name=Vivid Pasture Seeds +item.botania:grassSeeds6.name=Scorched Pasture Seeds +item.botania:grassSeeds7.name=Infused Pasture Seeds +item.botania:grassSeeds8.name=Mutated Pasture Seeds item.botania:livingwoodTwig.name=Livingwood Twig item.botania:dirtRod.name=Rod of the Lands item.botania:terraformRod.name=Rod of the Terra Firma diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds9.png b/src/main/resources/assets/botania/textures/items/grassSeeds3.png similarity index 86% rename from src/main/resources/assets/botania/textures/items/grassSeeds9.png rename to src/main/resources/assets/botania/textures/items/grassSeeds3.png index 4bccf737fcae00b2d21dd6f98e9a088540bff25b..abd76123bc7bf7c809e5865eed7a21872ea6f44e 100644 GIT binary patch delta 1531 zcmey~#n?B4al>RTCR^UkQ@JdeS&dAs3@s*K=Cu$pvNATZGBl2|(XYrYu=34M$xN%9 z{D4<uailv1` z>f~Jl<|?U)sm4i`1}VCU#s)^ZsfH%Tx|SA+2D(Y+sRn6=risSJX6BPc1?`DbSRr_y zIEB?h4p4s`5bB$JUeJ}fII(Q9q>!D8Nt&T$in+PDF3`D&x~V26iMoj6gzzz{o)eWvJxw(z+`n{brkc73K`fdIV92~P{Ptuo7rlBG1y2{pkP1cy0haf_8UO$P&p-)aB2{xex(1R>pv(Xa`+>&M z(+Sw@$K?b^4{-+PP-(D-J%Xhe?0v;?#uf{Duz>jTsyqzezWoMEef#|Tzl1nXJtH=S zATg{a{P^{Y;p?k^|D8i5!1_ME{enwB_F(++lkvZ?r5u9<4;zD^7#l;qs2U$>p7{Rb z55vXtPZ@sv`^)h6*B=HCK@HNJU>NtDQJYbgLHIR4gIPVN3QpZ139MRTCd;*(r*c^`vzl0185mB!%xfWHY-M0%Wn>g(qhFC*VC9>il9^UH z`2nx!WD`CKcBtg$U_NIi74yWDv}A*{Bwdr_WOH4EM3Y2a3p3+1T_aPAlq56bR1@<= zp1(=L<9dg$#1vHL@&i^Z8uk!T4T4v zZv9Q~7!~e$^OPBPd|1tpRNGk|EAMdV#b>Ri0#8>zmvv4F Gj7Tk08_nwy)L>nIo*7@F!E80#Aw=o%SY znHX4^7;X08c4lG$NlfnItrIs7F|@EUG_f+ah_cbI$Stt)%}>cptDO9RS9G!opC}hX zeseINGn0zBL0XEriLsHcS&DIzZi|=6i7EL> zsa7fZ$(bou1sVAz`NbLe1y*ThMkyvnCZ@U;DW+z+hK8v?mVv3MZd#H_vWdB2Qj&>z z>Sj?vOQy-^1znko6U!z`3fZZcq#0VKn46pHrWzzA>ZY2QBMRV zq$MR!t`>4&H8!#`G@g7wsA95}5SK)9Mq*xiYKon{jec>7YgvgERA92YusVwQM0u)O z$eI%#8k6@6c|ih^L)ZYXWt-K7qCtGJWfph@%5Yj;r97rJbgmdKI;Vst0Gc-1>i_@% delta 430 zcmV;f0a5GBF@GIW93ZG&wObEFdy4F*7eQFfTGW zEio}VG&ediHnT_zLjsc=6AP1@4RVvt4F&`_Ix;bn7Y;X*&J6|xI65*hvsey80+VVI zCX>MsEt6jnG_x=fF#@y37Wgm(i$z@@lfp+Xe*qXtL_t(|+QgH)N&{gKg}>QL784?y zpe9iy3JO|UDuSJbT_mNCpsyjmf?#3oD_H6a*jj{0Op%DjT#fs0b}YnBxaO2i8Rz4JQZUS8w!jHFZ0zG&JlF!-c~3F+Ng9o_Z>AXAyM zeYsz6QtHMOh(aX;d^AO zCDrGVSi2A#McRE0w-;4>F!x>gl?#(cqf6_XJlx#jZiEC|MNK;I_5@Bgpw+11mvbcD zh*PtQ)H?PA$47N>E_bxv>abGG0kB^kFxV&Y>_GXlY`G8u$kj>orzlIK_4@O`zklP$ Y0LrmrMtB=`+yDRo07*qoM6N<$f~Uy17XSbN diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds5.png b/src/main/resources/assets/botania/textures/items/grassSeeds5.png index abd76123bc7bf7c809e5865eed7a21872ea6f44e..a303a694bc2154952134b826d0d5f64d35f94853 100644 GIT binary patch delta 387 zcmV-}0et?Bm;t7X0kD$_0y(X-l?r$R5;8bCGBH{_FL-TmI!$k6X=Zto;0+a%G!7aC zGB`RiF|$(+Ljsdm5+<{}5Rw9uKoADAv=;I(1dByoACsy_E`I?SNklzS}KB_gRF!GuFr}tm;C1RztHvwtUWUj~?Df)jY;4htIf$KoZ90%COolX1~tp7?1jn>5^+7qPK zGE7F%XW@Hft0mRvkyyJB8%5fE4YwCnd@%Q2`IQTkN25#Yn>^gy;ckQkTSZMe@Ad>v zHlWq0;g@qH-H21Oiqtyx1jk2paV~eX-s-SY%mJ`p9WdA@@$5kPvTV5!0?5@#^rt9G hqxJgpz`uXv#{kN)V@7xzcH95}002ovPDHLkV1fRTCR^UkQ@JXbg^Z1?42`2~^eb`;tbFrRGSez2Kj0OeY{DnS3YOX& z%;(IcVrpV!Y+z_^plf1bkgRKJYGR^mnQD-vo0w)`WMYzL!|`rRW-(86>8d8YY{hB_&U;7IJ{tH2Hu~ z#bhfXE{Wuf#Ju#>6gzzz{o)eWvJxw(z+`n{brkc7aTN*XZ&nwUH)L7AGyL{sFBiRf z76nfi$B+s}1_74$zZw7k|Ia`PU?Np>J-P;xO`yyG4Euq`(bEao?8oH| zhdqL&80>w;amE%4da!`_@~S)x-@g3@OMUzN`@e)ZPdy_xg&;AkCj9vIi{b05fB&6B zB*6MUzWstrKlWh!@sshtv85b?1P>d7pcorNy{H-=X`cB0;}65d^G_Lm{QJxB_tzf= z4?zvmoM0IDoKc%mmO=P6KZ994rwUHpAPKB#p~DO8WN^^QiVJ|$;S5Hs27q)xKs^KF q9?E71jkzWe{5Nya4BVR5G(NYc~Q&t;ucLK6T#hMY10 diff --git a/src/main/resources/assets/botania/textures/items/grassSeeds6.png b/src/main/resources/assets/botania/textures/items/grassSeeds6.png index 53ce0f6ffd6e88eeaceaa3db80a212c2df5b8d6b..a0f186b6c7bb5298d7a6542f2622b6f1d4c46c9c 100644 GIT binary patch delta 554 zcmX>+k@0&M6)3OrleVzm?kHuCQsfkps!PrTcDScnPNqh1`R=b z;!N%qyic6MJ|Sn2j{-z0Hg6E)Gi2$g-snF0kh^~UOHUWakcwMLfByfsXI5?KY;6});8&SrY=KhL#OIu^{rt3TfV z|2MUw>>q!#iM;UP-|;*=LG$vK>~tu(R`0fq)$PCho{IAeloUOxoL+tSb)KPk)0!O& r%=@-DXs8<5)%|4L-^6&nw}Fu%sn^f>{d)VK3_#%N>gTe~DWM4fop#R_ delta 743 zcma)3O-NKx6n188vhjD`WX-ISRNQoX_r81IyE9L7@Q*aeMH*2N&bxEpYh2W54)#iP zCMhGKA-e@Ff*@K;;jSz#>1PqRXcG~n6|~4mq0B;N8Y#$C_^l4-JLi0S-}y1>m>F~2 z6&~lFYH{6@uGT;lYP5oeb|aNiLU&at5UDc6GKN6GI)OS-CRz)docU{n7%krGL_zVY zSlv!LQBX%j$H60YvVEdQ-yi4Q))_HZTrNmSx#u50(NWUmtfJ83lwbvD95cWb5(Nw^ z7C=yi1Th3P#>D+HSvPo`nL3Y0ySd&IizniJv3QSeX$mI_Q9+Qa8bHX*RZvxd#YmJ; z#2BHbDEEe|OvA)11UWD;RDg*H2BDw<0i!0gkZNG8QDJ-EZESErYFaZqEv3b*x5d?G z^oxL0Ur8(!;*?TgLS_Jy5Ca&*;s9yT;3|p|i;1&R!zQfg2E(S$}?GSq(_F>q5?nwEg)}fe-#yZKB4v1LYTNO)QCh&2sW#TXRFF z{f4b(vtd_t>e9JJC>7nfR+&j2NC&&!iKngT<@i{tHxTgqGlHkao|L-hzfSqr@MtiS zDOJzgt|6SU?8Vfl?9Eg2*`gehUGJB77HW^>?Cb0U|2^gHh_RJ{nU$eQl#PBxZh@6=eoAIq<>UvvqLWSdB-o*nn}hkBnN$qZ z%uEc-ObvC7OcN7z(=1I4bdxNMOmr=hjZ;j`lg!L4Op+$=5-=xDp{SreaSAI0?-QkP zbG6WELzZX%EbJ$Hx#-tl@N{tuskoK&=l_3uX4QtyMkj+0Y#S1UQ+P_#e(bN(XHKqR zU}hHnT;KNp4bOjZon)1JtVKdRJ&}eyJgeCL|34pp`ow|r-m|zR;_8zUe*Br-*x1OJ zq|MLXnfT#3d-KMfZ|mEZ+y6J7_T=yX`&JVtsxbHX=KN2;dCOQLI?~7>?ar6h>?|vg_V&}l#PBxZh@6=eoAIq<>UvvqLWSdB-o*nn}hkBnN$o+ zk}S+j(hPJ>EX~byO)X7~bS+H{lXT5YQd80_OiYuLQvK@EC2F`u|j+~mHb@1qi&(_R`*ZJt|KGpnz&gI=+;zr(QY-#-KCR!c!hX8` zT>X#3lGze}5|aO|PdR$5;MI$8Hq(3md9Iz(v0xTn{qg?)zo`{v|M;6t*kCqLj7oovD<%>t6y z9L(p;q+*_!l9p_cmZWQvoNTUZkZ6*qYhh-brfXzsk&X2`Ps#YvaRUM~9eFFjoxLn>|^nY_{OP=bit`M)bK1u(M+ zzgFr{d}v#uaPaQj4Vw*i?flGT*TA3f=)ftbLpq$!o{JaqgnCLR%_^#8O#XBDfcd?L z&uY}acdgpw&r|*E1NWT!ZL<5FuUZ}zk>TC8aLS$JV-HXN=e$;v$kq3)Jvr-W*SyaB z@Pnsg8Ftp!X9Sp~RaIfR+QxgsR<0QY`DiggFtF_%+U22Wp4!iX?y<=3k=gm`Q-0@*GLsD&L nd91v{p%*kCqLj7oovD<%>t6y z9L(p;q+*z6W@2DwYN%^unwY4YW@%!en`B{RqHB?CoMLL8WM*bzk~DdjfH`prMFs7N zQ&=H*pE!lpLJklgZ9X8>X2|mFpN0KoFBkp#3!W~HAr-fh{`~)M&#cHJ`pn5S49v{JpX=NHzv1~Wu9K{CkF`jMrzg^ohi4Vr|NrOXPoFq&-g_3e zL|lDR!jC_b8yg!LleGESI}<-VXK&uP^KE_Ga{K?r)1LhOf8T22L>1;9-<<#HH*XnB zL`NDKq}|zd;DE&AZ}V03=h&9FCf+hnYuj9&XJD}5qoI%RAO9$cDei02QldV5*?+71 zI}evo6Aup$(~?%l_UrW(45zxd6__UXv>f^I<0<