From 591d86586b7c173295a1d98050798f7bd810f9d1 Mon Sep 17 00:00:00 2001
From: Forstride <forstride@gmail.com>
Date: Sun, 21 May 2017 00:55:43 -0400
Subject: [PATCH] Fixed flower band crafting recipes

---
 .../common/block/BlockBOPSapling.java           |   4 ++--
 .../biomesoplenty/common/init/ModCrafting.java  |   3 ++-
 .../biomesoplenty/textures/blocks/algae.png     | Bin 705 -> 707 bytes
 .../textures/blocks/berrybush_berry.png         | Bin 351 -> 351 bytes
 .../biomesoplenty/textures/items/berrybush.png  | Bin 687 -> 685 bytes
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java
index 1c1423a21..0dd935bd4 100644
--- a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java
+++ b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java
@@ -198,7 +198,7 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable, IP
             	return new GeneratorBasicTree.Builder().log(BOPWoods.CHERRY).leaves(BOPTrees.WHITE_CHERRY).updateNeighbours(true).create();
             case MAPLE:
                 return new GeneratorBasicTree.Builder().log(BlockPlanks.EnumType.OAK).leaves(BOPTrees.MAPLE).minHeight(5).maxHeight(10).updateNeighbours(true).create();
-            case HELLBARK: //Not implemented
+            case HELLBARK:
                 return new GeneratorTwigletTree.Builder().scatterYMethod(ScatterYMethod.NETHER_SURFACE).minHeight(2).maxHeight(2).log(BlockBOPLog.paging.getVariantState(BOPWoods.HELLBARK)).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.HELLBARK)).create();
             case FLOWERING:
                 return new GeneratorBasicTree.Builder().altLeaves(BOPTrees.FLOWERING).updateNeighbours(true).create();
@@ -206,7 +206,7 @@ public class BlockBOPSapling extends BlockBOPDecoration implements IGrowable, IP
             	return new GeneratorBasicTree.Builder().minHeight(4).maxHeight(7).log(BOPWoods.JACARANDA).leaves(BOPTrees.JACARANDA).updateNeighbours(true).create();
             case SACRED_OAK:
                 return new GeneratorBigTree.Builder().log(BOPWoods.SACRED_OAK).leaves(BOPTrees.SACRED_OAK).minHeight(35).maxHeight(45).trunkWidth(2).foliageDensity(1.25D).updateNeighbours(true).create();
-            case MANGROVE: //Not implemented
+            case MANGROVE:
                 return new GeneratorMangroveTree.Builder().log(BOPWoods.MANGROVE).leaves(BOPTrees.MANGROVE).create();
             case PALM:
                 return new GeneratorPalmTree.Builder().log(BOPWoods.PALM).leaves(BlockBOPLeaves.paging.getVariantState(BOPTrees.PALM).withProperty(BlockOldLeaf.CHECK_DECAY, Boolean.valueOf(false))).updateNeighbours(true).create();
diff --git a/src/main/java/biomesoplenty/common/init/ModCrafting.java b/src/main/java/biomesoplenty/common/init/ModCrafting.java
index c8e068121..c578c4f4a 100644
--- a/src/main/java/biomesoplenty/common/init/ModCrafting.java
+++ b/src/main/java/biomesoplenty/common/init/ModCrafting.java
@@ -148,7 +148,8 @@ public class ModCrafting
         // Flower Bands
         GameRegistry.addShapedRecipe(new ItemStack(BOPItems.dull_flower_band), "CCC", "C C", "CCC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER));
         GameRegistry.addShapedRecipe(new ItemStack(BOPItems.plain_flower_band), "CDC", "D D", "CDC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER), 'D', BlockBOPFlower.paging.getVariantItem(BOPFlowers.ORANGE_COSMOS));
-        GameRegistry.addShapedRecipe(new ItemStack(BOPItems.exotic_flower_band), "CDC", "V V", "CDC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER),'D', BlockBOPFlower.paging.getVariantItem(BOPFlowers.ORANGE_COSMOS), 'V', BlockBOPFlower.paging.getVariantItem(BOPFlowers.VIOLET));
+        GameRegistry.addShapedRecipe(new ItemStack(BOPItems.lush_flower_band), "CDC", "V V", "CDC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER),'D', BlockBOPFlower.paging.getVariantItem(BOPFlowers.ORANGE_COSMOS), 'V', BlockBOPFlower.paging.getVariantItem(BOPFlowers.VIOLET));
+        GameRegistry.addShapedRecipe(new ItemStack(BOPItems.exotic_flower_band), "CDT", "V V", "TDC", 'C', BlockBOPFlower.paging.getVariantItem(BOPFlowers.CLOVER),'D', BlockBOPFlower.paging.getVariantItem(BOPFlowers.ORANGE_COSMOS), 'V', BlockBOPFlower.paging.getVariantItem(BOPFlowers.VIOLET), 'T', BlockBOPFlower.paging.getVariantItem(BOPFlowers.PINK_DAFFODIL));
         
         /*** Biome Finder ***/
         
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/algae.png b/src/main/resources/assets/biomesoplenty/textures/blocks/algae.png
index c529724260d99610d8d7e85f446c34be25f93365..8bc4959e926d94312d0ae2b3a5c2ce62e585b5ab 100644
GIT binary patch
delta 659
zcmV;E0&M-k1;Yi9Jbxts001QcRrgZH0000PbVXQnQ*UN;cVTj60B~VxZgehgWpp4k
zE-)@JHbiN!^#A|@KuJVFR5(vnQdv(^VGzB4gpfc20mN7hP`cUncA?T1>_WAWfL4k@
za0`(KA5`LlJA#@9C7Ku?d{E;WjsB)SwCTQ$_ne#W8XxA)H-Bg5J9B34r-{gaw(>D1
z^?F_FbUKW4pXa65>uJE6&8F6BwXE81x2stJZ1Z>4aON2VD8Pk_KhhT7Xf(7+rDA!4
z=m7ThpBWb73=aYnUjDO4{KA*h^r%+~`9T-|u1{Nf7nfqONDKx7_|#!YR=*~Uqp4u+
zdx~SV+igwD8GrI>wVIZB8x_S`E|)nw&d7mi#UOxWV6f#6QGrs*$^SYd$=5Sno+<!-
z$-v<eqk+o7;s?4=0X|uSO(jaDl9vCL<V9RkU1R$JcEmaTCL-!@@RK^2HJn)l4?Azn
z87uf0>pLeUQHWT%rB88-m{PsBT%zA|SOqY2$3+!Ko_~0`qh;ey#GeJJ0DIvtvu{rj
zR7-?K_jIXNt5zJm>zBFbA&#c+cxB;LjP*<cJhkg%GH~BXd9It&M#>z^ROuGf`0scm
z^w2Hom*(EAN1+k`VURrg)X&AK_kcZwA9-jqkInH&0J$)LiUgN)@Bck*C~<5#DI2xE
z+in5I9e;oXN$dgL(8+#%S~7=mnST-H2*@8>w+WO@T$z;M0~g8p(r_4B7?R@~CnT^R
zmLvIbL9FkESQIHlWqj?Z^w0In<kcw|IXl7zd`MuQx@IRhkQflx4Yv#?2W2=jOw7IQ
tAvU%+Cbn}n8O@GLU#yR@W6LRj0SPpZVziPnDGUGr002ovPDHLkV1i<AFf0H7

delta 657
zcmV;C0&e}o1;GW7Jbxwt001Td_)c@H0000QbVXQnQ*UN;cVTj608n9RZgehAMN}Ym
zGcGkQF)>H;LN@>a0zFAYK~y+TRZ>|`lR*@nKSD?#fdFExL|VHbwWYPt7HpwaFi}GS
z!JsS>i6o*JQCtu~4Q`J<n7G6>8a2_x-_wUSbYHG>&X@U&4}bT&Gv}T;_sso9iO7Gk
z@-`;LVo}v<HSVvxACX3*p@5akWmTzEY;L_?SM~;R>-)G))*1pJ;K21SV>VtYmDJwe
zo}CGz1JrMPO_PW<G6X=}_%T6z^}}&y@Qp)$&?U9ySDU}jNG6jZhJXO_!pops{g}{8
z%fZ^`QC_QBt$!*tuk95I1-1HTQjBUYm*d^BMh!yewE!#wLtK6n6*#4xi{DPj%CFNL
zo*@8V*Ellv%Rf))WYrL8Ob7T(Yc*5IX0z(rrz8(9>Y13Xv7I10Vtql^&EMc>^y!dJ
z76}<Kr|&uS+QNq(9F@dw#IDV}i`&Aq3PNDRZ4(d>0Do@wk^B9e(X9Rx@rMI+fVuFO
zdDnUfnjs>h+X2bv^Y%XZWKf15g?Kf%Nj;B|&mzFVEkBFF+aB8U-*oAcbuHkyCOB{v
zy6cm%XV%>8N729TWC0)omO+L?^B&MSe6NpjZ1V`Y6o6d>KqG>~ldt|gZ8&i+d1%}4
zfpG>9L4Of*KsR)9EgqKii@1zD4)Y4AA2{a_I6E}gD+71D6z5CBqAk@X2WNXExD%Fr
zQ{94nU^_%oWH&0^)BB})xLJDVozii#gAMqQpzd675o}4ci1(6DT9d8Po^B`RTka#)
rHPI!GvkvJT@06xk6Zh^VkNgG0kd+|B`E|Dd015yANkvXXu0mjfnhZ4O

diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png b/src/main/resources/assets/biomesoplenty/textures/blocks/berrybush_berry.png
index adf81296a8d8a5ea9d0b14d2fb51e316a6ce6334..97cf9aa7ded1d4d9937f423d8fe43c899810cdae 100644
GIT binary patch
delta 173
zcmV;e08;<o0^b6VJPN!301mtXmArCEkw!~@5Pqtw3#2f`v0)4Wu;%je|C^MRfm~EM
zY#6KHOgT9qg(;5BWnd!AQ5#61N}yw0E<;fS!`N(!^)UL6&1EPY5T<Du1lwr<DO52O
z4mJ#me{5cYVXT5M3`$Uhyo4bD!ywINi4H&}ZZCl_RzVOhj<fwgp*s9O$P1+j_CO(%
b5CJ<Bl@-%is{w=-00000NkvXXu0mjf7>z>=

delta 173
zcmV;e08;<o0^b6VJPN)501mzZ>O!%=kw!~@FiuMYQdq>XU`#<DpZ`yFb^mWtRt9p>
z<gj3@f-~jhfE1=UHkW~kFh^}5g(`u8akvas5e#FoDb~a2KQ@=4aKM<BVGwMm0i;mH
zP&n8yIR5cOD^@`m1}7*2UcwN7VUXssL<b-fPqYFtRzVOhj<fwgp*s9O$P1+j_CO(%
b5CJ<B?e)|!tH!Mm00000NkvXXu0mjfweUu(

diff --git a/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png b/src/main/resources/assets/biomesoplenty/textures/items/berrybush.png
index 6094936d3c908a031958c45f5e285e3fb3c10687..6ddc323f5a74183f7a035cc5173e049a0756eeca 100644
GIT binary patch
delta 552
zcmV+@0@wYo1+4{;SPH%X01mzZ>O!%=kzy!+4oO5oR5(w4Qrk`wQ52mwr8Co+Y9%qI
zrFKdg+K#0yCPFP%6Aad9i3&xL0^w#1DoC)JdLzbn9yAdj{RIEX?^vF-Pf96i*vVwh
zWv|;g$2eV;-%%7lM{xc71#mw0!A0dLit>*r#=k{mt#94@)omz#(gcOJi}KGXN(T{t
zl)mV_>Yq#fNpf!-X&QU);@NZ_RL;H%3pn3$(YTY7IoBr+FQV|#?Gka3|J-W_nHORF
z3j!qPOpK~ABL#0AT-$TxPeKy$6EH2(D%HIOOTcKg@YnN@c^MY<(Jc+|H*HYFU$eXF
zY+xe^cm`}bipQm4L^YPaM#M>MCM4um{<;Pe!@ohx^S85-jby`177}$6!%a(+XnSPU
z?s1lQWWwLDWnD-ZA=q``J+%<Kr<I24A*9qi-L!>xX{IR7xSv|I1e{(z5rz4aPs|=A
zx?v=e1Ur-90T_SrlrPrPN}X@zI6{73Un3Q>+hMWKF)i}`>1y!Cx#LJYBa&QIj)j25
z=Aj1~$irhJAJoZ6SEdJ$oL2{^_In-@i(p!c)k1RT1ixFYB7R>-x;%AWu2OoHLjm=x
z&gNdTg2Q%0BJ8i+LSk0grpvRyo!VKP6mWa<E)KS9Sg$x21VsDNa8}hPQ&_HzV`H|6
q-REVAGFQ#u;e-cOM(5LI82<qTKuFbyYUhan0000<MNUMnLSTXl7zHT+

delta 554
zcmV+_0@eMk1+N8=SPH-Z01m(bYSxJfkzy!+5J^NqR5(w4Qrk`wQ52mwwKLP1YBe#W
zrFKdg+K#0yCPFP%6AV_gM1{(&NQ7z(DoF5>dLzbn9v~4P{RIEX?^vF-PfDq2*vVwh
zWv|;g$N0Z0zoIC9iQw9g^Wc2+ql?N>6y<{`#=b{nt#94<*=;C()&zyNi}GO<rM(D$
zN?-L}_4md8B)K<^G>v|6u{f0nm9wwH0?xm8(YT$HIoHScFQD+r?Gka3|J-W_nHOQ8
z)k1R4#E2R*Qt;Nn)g4FvBqR|(0n;L_Qr&xE0W&lB8wB{{dC0sBi~7iO4e(nwDB?e}
zyXtIUBMEp0Y&wd^rD0e#mcB*ANo+b;B+mSG4JL+vgO=xSWhEQQhE^;j>L!MomMGEo
z@S5G@Eb-8UzhTR|kT629?Z8{G5WB0D2J0cD)I8m^g?MGUD9*T_TCxP3UOf?o`IC>$
z9woYAB$5PMlimRsf6=5b*3(LzZ{;{bepg>36|<XRvClCr^8Oj=()BaPk$6TVxuP5k
z0gKIp_cf4*$3{M=laU6d&LKIk4p8m)JR}yuv=pm_<jx6xw^l{`o{n^R@~m8?^eTq}
z>Q|l3on{65?S@3yeR>m#S!J6pPXl*qYiUBj?baRaZPu_}I4=l@_NC#ps!yb_S{uX0
sY!TbbWr;FZ&EUbf2USMr(`6X{09_zSt;7sjk^lez07*qoM6N<$f;JNldjJ3c