From 306770be613914023684091014bc06f3597f9588 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Mon, 23 Sep 2013 15:02:46 -0400 Subject: [PATCH] Changed reeds to river cane, started adding proper reeds --- common/biomesoplenty/api/BlockReferences.java | 3 ++- common/biomesoplenty/blocks/BlockBOPPlant.java | 13 +++++++++---- .../integration/ThaumcraftIntegration.java | 2 +- .../itemblocks/ItemBlockPlant.java | 9 ++++++--- resources/assets/biomesoplenty/lang/en_US.xml | 3 ++- .../biomesoplenty/textures/blocks/item_reed.png | Bin 283 -> 471 bytes .../textures/blocks/item_rivercane.png | Bin 0 -> 283 bytes .../biomesoplenty/textures/blocks/reed.png | Bin 518 -> 720 bytes .../textures/blocks/reedbottom.png | Bin 0 -> 688 bytes .../biomesoplenty/textures/blocks/rivercane.png | Bin 0 -> 518 bytes 10 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 resources/assets/biomesoplenty/textures/blocks/item_rivercane.png create mode 100644 resources/assets/biomesoplenty/textures/blocks/reedbottom.png create mode 100644 resources/assets/biomesoplenty/textures/blocks/rivercane.png diff --git a/common/biomesoplenty/api/BlockReferences.java b/common/biomesoplenty/api/BlockReferences.java index 5f1fb5d42..ac1e86637 100644 --- a/common/biomesoplenty/api/BlockReferences.java +++ b/common/biomesoplenty/api/BlockReferences.java @@ -161,9 +161,10 @@ public class BlockReferences { thorn (Blocks.plants, 5), barley (Blocks.plants, 6), cattail (Blocks.plants, 7), - reed (Blocks.plants, 8), + rivercane (Blocks.plants, 8), tinyCactus (Blocks.plants, 12), witherwart (Blocks.plants, 13), + reed (Blocks.plants, 14), treeMoss (Blocks.treeMoss, 0), moss (Blocks.moss, 0), diff --git a/common/biomesoplenty/blocks/BlockBOPPlant.java b/common/biomesoplenty/blocks/BlockBOPPlant.java index 90f819436..7eab225c6 100644 --- a/common/biomesoplenty/blocks/BlockBOPPlant.java +++ b/common/biomesoplenty/blocks/BlockBOPPlant.java @@ -30,7 +30,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class BlockBOPPlant extends BlockFlower implements IShearable { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed"}; private Icon[] textures; private static final int CATTAILTOP = 9; @@ -130,6 +130,8 @@ public class BlockBOPPlant extends BlockFlower implements IShearable return blockID == Block.sand.blockID || blockID == Blocks.redRock.get().blockID || blockID == Block.slowSand.blockID; else if (metadata == 13) return blockID == Block.slowSand.blockID; + else if (metadata == 14) + return blockID == Block.waterStill.blockID; else return blockID == Block.grass.blockID || blockID == Block.dirt.blockID || blockID == Block.tilledField.blockID || blockID == Blocks.longGrass.get().blockID; } @@ -138,7 +140,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable protected boolean canThisPlantGrowOnThisBlockID(int id) { return id == Blocks.driedDirt.get().blockID || id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Blocks.holyGrass.get().blockID - || id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; + || id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID || id == Block.waterStill.blockID; } @Override @@ -172,7 +174,7 @@ public class BlockBOPPlant extends BlockFlower implements IShearable case 7: // Cattail return id != Block.grass.blockID ? false : (world.getBlockMaterial(x - 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x + 1, y - 1, z) == Material.water ? true : (world.getBlockMaterial(x, y - 1, z - 1) == Material.water ? true : world.getBlockMaterial(x, y - 1, z + 1) == Material.water))); - case 8: // Reed + case 8: // River Cane return id == blockID || id == Block.grass.blockID; case 10: // High Cattail Bottom @@ -181,9 +183,12 @@ public class BlockBOPPlant extends BlockFlower implements IShearable case 12: // Tiny Cactus return id == Block.sand.blockID || id == Blocks.redRock.get().blockID || id == Block.slowSand.blockID; - case 13: // Antiwart + case 13: // Wither Wart return id == Block.slowSand.blockID; + case 14: // Reed + return id == Block.waterStill.blockID; + default: return id == Block.grass.blockID || id == Block.dirt.blockID || id == Block.tilledField.blockID; } diff --git a/common/biomesoplenty/integration/ThaumcraftIntegration.java b/common/biomesoplenty/integration/ThaumcraftIntegration.java index 44cd2882b..461b01ab6 100644 --- a/common/biomesoplenty/integration/ThaumcraftIntegration.java +++ b/common/biomesoplenty/integration/ThaumcraftIntegration.java @@ -179,7 +179,7 @@ public class ThaumcraftIntegration { //Placer Items ThaumcraftApi.registerObjectTag(getBID("barley"), getBMeta("barley"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag(getBID("cattail"), getBMeta("cattail"), (new AspectList()).add(Aspect.WATER, 1).add(Aspect.PLANT, 1)); - ThaumcraftApi.registerObjectTag(getBID("reed"), getBMeta("reed"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.PLANT, 1)); + ThaumcraftApi.registerObjectTag(getBID("rivercane"), getBMeta("rivercane"), (new AspectList()).add(Aspect.TREE, 1).add(Aspect.PLANT, 1)); ThaumcraftApi.registerObjectTag(getBID("bamboo"), getBMeta("bamboo"), (new AspectList()).add(Aspect.PLANT, 1).add(Aspect.LIFE, 1)); ThaumcraftApi.registerObjectTag(getBID("sproutItem"), getBMeta("sproutItem"), (new AspectList()).add(Aspect.PLANT, 2)); ThaumcraftApi.registerObjectTag(getBID("bushItem"), getBMeta("bushItem"), (new AspectList()).add(Aspect.PLANT, 2)); diff --git a/common/biomesoplenty/itemblocks/ItemBlockPlant.java b/common/biomesoplenty/itemblocks/ItemBlockPlant.java index 03055bfc7..51944d99b 100644 --- a/common/biomesoplenty/itemblocks/ItemBlockPlant.java +++ b/common/biomesoplenty/itemblocks/ItemBlockPlant.java @@ -13,7 +13,7 @@ import cpw.mods.fml.relauncher.SideOnly; public class ItemBlockPlant extends ItemBlock { - private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "reed", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart"}; + private static final String[] plants = new String[] {"deadgrass", "desertgrass", "desertsprouts", "dunegrass", "holytallgrass", "thorn", "barley", "cattail", "rivercane", "cattailtop", "cattailbottom", "wildcarrot", "cactus", "witherwart", "reed"}; @SideOnly(Side.CLIENT) private Icon[] textures; @@ -34,12 +34,13 @@ public class ItemBlockPlant extends ItemBlock @SideOnly(Side.CLIENT) public void registerIcons(IconRegister iconRegister) { - textures = new Icon[4]; + textures = new Icon[5]; textures[0] = iconRegister.registerIcon("biomesoplenty:item_barley"); textures[1] = iconRegister.registerIcon("biomesoplenty:item_cattail"); - textures[2] = iconRegister.registerIcon("biomesoplenty:item_reed"); + textures[2] = iconRegister.registerIcon("biomesoplenty:item_rivercane"); textures[3] = iconRegister.registerIcon("biomesoplenty:item_witherwart"); + textures[4] = iconRegister.registerIcon("biomesoplenty:item_reed"); } @Override @@ -64,6 +65,8 @@ public class ItemBlockPlant extends ItemBlock return textures[2]; else if (meta == 13) return textures[3]; + else if (meta == 14) + return textures[4]; else return Block.blocksList[itemID].getIcon(0, meta); } diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 21e5e244e..c73c75861 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -33,9 +33,10 @@ Cattail Cattail Cattail - Reed + River Cane Tiny Cactus Wither Wart + Reed Clover Swampflower diff --git a/resources/assets/biomesoplenty/textures/blocks/item_reed.png b/resources/assets/biomesoplenty/textures/blocks/item_reed.png index b46401411e648811c9ea7c68612468efb27cde76..b9b3c790ade6ad14587f20e48af6a04921e1ccba 100644 GIT binary patch delta 392 zcmV;30eAkJ0@nkOBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8JP^FlWO00Blx zL_t(IPh%M7;O3#O|4=5w`5g^#Hql^GQ`CQu#wTZ|{{MKjpLhdcHov+&`~RN@v;Lpn zQuBZH^wj@TT4IPZ1Z4Bqo0I>~?@#{^GHk_^r2jweOamJNRe}j%w!-KWTN?krxH$8F zUtQS$%X?bD^r_9&|9^kooALkB?q*DbK(_8%RsJ7DgEa40Qux2F!2AEKuB87DxR`G0Y5*Z(tHYyW?{H3ck&GaR-p z%KzV06aK%wGUR`6eboPnjgkM)>}dVJXGQ7%o|=&VA8#%C-(^)51P&9Z7F5tu7WluX zF7kg;gx&wm^K-!7IJ>Rxe|4@0SQE%AAax)wf;C_RvB8#Lzc&{9{lBoY@&EMpc*2^{ mK~0_~STV>8V1Ypn7#IMzUfuPf7Tf9o0000vqb&|A*OJ-Q}Hh1^kzPn@wI>M-C6x5YKW&oN11B`5RB@+O;XlIzyu`N`D zS$8$YJssPU38fD!6>&ky{Dcd1@3*lnneer!lvI6;>1s;*b z3=Dh+K$tP>S|=w^P^!c=q9iy!t)x7$D3u`~F*C13&(AePq0Cs%RL{`B;7id$psMMf zE{-7<{!1t9~w57v4E#k9T`S-i~cBime9a@nla%HMR8pA9G z=AN7qRbhr*8R;`FZ`2KGi7Y>6D|>qq=Td%c(L%?Qe_FUp-f!QiJM+WV%}z(9R{W6V aRM*~hRAE)jKQ*8e89ZJ6T-G@yGywpphG;VY literal 0 HcmV?d00001 diff --git a/resources/assets/biomesoplenty/textures/blocks/reed.png b/resources/assets/biomesoplenty/textures/blocks/reed.png index 884a553868276895d212b4d768ecd8ccf4e8c7a5..3019d31f3f90fb540c340373ca6438ef20ab9628 100644 GIT binary patch delta 643 zcmV-}0(||31keSLBnkm@Qb$4nuFf3kks%uj!vFvd!vV){sAQ2wA%8JP^FlWO00KWr zL_t(IPeoE|Q&LeBJ-@dvYMMPYC5=iQErUw!g$)_W0BV4k1cPO0D4|A!)nwCSoFcd| zyf5rp>(0G?*yrrm*?aA^kJ5EriHIr|i@aN{7H>#4c1^0)s%4wfZnrI+N2yd|a;;WV z&1O@T%VkwNbO?$cr+@5%qK!s_F$ms#cx4y(SnX)*mefBv|ND)qFBi^8dUaSr^WBmP z4hn4ek@IbPTK;Cntz33T=N~&xDQ9mo(CKv8`EX-gqMoz#ZTJUdH#{WC7dG0JO66n( zpoqA81+X@khXghXzg-!YpSySX;P?IP=!K)C{P*X?XQor7zoTJrkD&_f7WkxhG;n#butbGk7A4GWiQmj zfGJV0P0Y>Y-b{0?*b2r&+)4x-1m8z&Twh^tLIC}BU{HV(D_faA$4BN?Ae?NnJ(VmIRhnf`0#tmAz=Mi`mThZ^hn_TDJGzR+hORCz$2rx zSpdxmEg7Dm0~Oaimn|Iy{15y16S3mYNhgtIqGS9}7}??gE5eOALE4}64cho0SRqK< ziP-7e3SJS6io&XzyG>`pcZoN;#=RG~%Hzz8e0_IMa$t!u##R>w=m!^?rWqvSXdlf= z+&{`B5E%1~P!GDgWa)7~b;#mux8Og3SlHMOJHol_GX8u%pI5#Iz0@J#1n4jp2!;=< d#jWeQ`UhE-{LNdtdfos4002ovPDHLkV1m`+E~)?k delta 442 zcmV;r0Y(1M1%?EWB#|)~3cvsW4!{9w)`B23SOSf9B z6z_3K9&6V!o6Q`+?nNc3=gx(DeBV<%(0!B7S---DY>Cd!f7M6K*( zH9$Yp=~T~tyR6RkD%IfZXa@hb(2MT0-=Ke!RVT!ZGaoACw4?_Dlxuqc5TGsk&OYUp zN6ab&J{a@To9g-{WlJ0ID~dThe$2^^Gd)A0A|3O&*yXh&(k8^ k*m3Li+96`qV2gPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0006XNklIWoH&9s$Ev483U7&#Cjv9^rhhDTv_q}EGIfTZG_j~7?nRm`PGh^*`+d7?&#a@s4 z#l?l4MJD|;GUwfH*WBHHq~`x!ZYQBJPjBCmy|+5%?{+3+D=Cx7*q8lT|8u$|=fV28 ze~eDcCYi$D68Ai|(l1|hxlcDoh{a;j(pw{b7@YP(p3BY$ zw^FHO$;~PMeX=NIB>pdhzEOZTDu6*Eqii;tD){E*O*NNfYzpJ2S4W{4HI-aBzaHFG z_t8p#k@66mSoGD1(7q?{%TIrJheQBHWFg6N`gGz>rSz@xrijLyRdKdhyfpYzm1 z2f1FaTe)1e)W(pefXxHYp$vU)dICe^Ljewr`;~qmB-R;<^oXvL$Fkv1tPP4mE|;u$6X0-V1 zYC%AZEDy=asIE2<{98gxZibW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE-^4L^m3s900DwYL_t(IPkocwP69y?Mf-bP;)4hdn+O5}&o~2`7|wU3F{e!Y!9ew_2?f?{P^UYu7TH%^bk)MJ1`{&V_q?b6?*%}xBR=ALE!Q{#`<;qbkmM{FcmY5KNr6r?qXJ3p|`}SKhx<{&wjhC&h{$R;OuAy|F+PJ?zG>a zlT|0gj58l90~;(z+Q1vBR{CfUn#C&> zwXzxXp91tW?l#l`n{6X7xd&`4_x4H$0)QD