From b14fe60711107ebe21eb8ba9bea75bb89fe5cd32 Mon Sep 17 00:00:00 2001
From: Matt Caughey <Catcwe316@comcast.net>
Date: Thu, 28 Jan 2016 15:20:45 -0500
Subject: [PATCH] Fixed pine saplings, tweaked wisteria more

---
 .../common/block/BlockBOPSapling.java         |   2 +-
 .../biomesoplenty/models/block/wisteria.json  |  46 ++++++++++++++++--
 .../textures/blocks/wisteria.png              | Bin 353 -> 367 bytes
 .../textures/blocks/wisteria_bottom.png       | Bin 0 -> 318 bytes
 .../biomesoplenty/textures/items/wisteria.png | Bin 357 -> 358 bytes
 5 files changed, 44 insertions(+), 4 deletions(-)
 create mode 100644 src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png

diff --git a/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java b/src/main/java/biomesoplenty/common/block/BlockBOPSapling.java
index 3cace0b5e..fa3663aa0 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 {
             case WILLOW:
             	return new GeneratorBayouTree.Builder().log(BOPWoods.WILLOW).leaves(BOPTrees.WILLOW).minHeight(6).maxHeight(12).minLeavesRadius(1).leavesGradient(2).create();
             case PINE:
-            	return new GeneratorPineTree.Builder().minHeight(6).maxHeight(20).create();
+            	return new GeneratorPineTree.Builder().minHeight(6).maxHeight(18).log(BOPWoods.PINE).leaves(BOPTrees.PINE).create();
             case MAHOGANY: //Not implemented
                 return new WorldGenTrees(true);
             default:
diff --git a/src/main/resources/assets/biomesoplenty/models/block/wisteria.json b/src/main/resources/assets/biomesoplenty/models/block/wisteria.json
index 4e41f4892..3be848d85 100644
--- a/src/main/resources/assets/biomesoplenty/models/block/wisteria.json
+++ b/src/main/resources/assets/biomesoplenty/models/block/wisteria.json
@@ -1,6 +1,46 @@
 {
-    "parent": "block/crop",
+    "ambientocclusion": false,
     "textures": {
-        "crop": "biomesoplenty:blocks/wisteria"
-    }
+    	"cross": "biomesoplenty:blocks/wisteria",
+		"cross_bottom": "biomesoplenty:blocks/wisteria_bottom",
+        "particle": "biomesoplenty:blocks/wisteria"
+    },
+    "elements": [
+        {   "from": [ 0.8, 0, 8 ],
+            "to": [ 15.2, 16, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "shade": false,
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+            }
+        },
+        {   "from": [ 8, 0, 0.8 ],
+            "to": [ 8, 16, 15.2 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "shade": false,
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" },
+                "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross" }
+            }
+        },
+        {   "from": [ 0.8, -16, 8 ],
+            "to": [ 15.2, 0, 8 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "shade": false,
+            "faces": {
+                "north": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" },
+                "south": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" }
+            }
+        },
+        {   "from": [ 8, -16, 0.8 ],
+            "to": [ 8, 0, 15.2 ],
+            "rotation": { "origin": [ 8, 8, 8 ], "axis": "y", "angle": 45, "rescale": true },
+            "shade": false,
+            "faces": {
+                "west": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" },
+                "east": { "uv": [ 0, 0, 16, 16 ], "texture": "#cross_bottom" }
+            }
+        }
+    ]
 }
\ No newline at end of file
diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria.png
index 9d55f4ce995dfc98a5bd6f2f4ec830a765c27c2e..d12c0a44cc4c12edba71e0f82b799869f07aa16b 100644
GIT binary patch
delta 281
zcmV+!0p|YU0`CHlJPN`901m<d6(~x8kwzzf?MXyIR5(v<lEDqaKnw)00jl6ZM@Z02
z{)kqPcv1pS-f1Q<mgd-8g5-F;-u3xTwDWXYj@LuQ@7Ki1k39oTvq5pcyt*(AVEPU<
z!#7NtQ$$UqL7mzfkfcVq&tu*g$j{q*rK>9-hD?(}YH$uAqXm~4L1qOGh1Z;1U4f5(
zCz$0BQWH5)4N)HmnojkEk*5Z`AzYDwoUGZk?PZOITpMUoV9n`pU^tCv%>4=w2&fgq
zkB=rtrtTX+NNVt|n)kTX0J2R&Oix2{;LQLcO@wcw#vZs2$UxxZfjP+@c=rv)K!_;+
f2d@9m^YR4}VxuEL^LB{<0000<MNUKnu0mjf)scS%

delta 266
zcmV+l0rmdx0^tIXJPN-601m$aI0aKAkwzzf-$_J4R5(v{khu-QKoCWz4~ih63OXPr
zrV&I!A(kMc1c$^lv*@k#%<Mt%HOD`8?08()vcK#q&i6yD@8#3XvmF(0lv3h$dNpPU
zb_(g$z*+G|Hc&C;KzHc8!f?3l6Cg=sR-6N=@a}!Eeu4{nkWHTJ0|1Wsxg29#NJ5x(
zJ`14&_RQ6kp#TyQy@Bvvr>-$$q9Ra~LjW2sqDR{Vh%BNq8x9O-H<%%;{kdx7sf}5X
zJUcgsc+p@63aOf{J%&YojozP_xr}D$!I}Ar8Kz6%H)?k7F)T9vnSLno1&f}_mhW8M
QLI3~&07*qoM6N<$f~l%_VE_OC

diff --git a/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png b/src/main/resources/assets/biomesoplenty/textures/blocks/wisteria_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..8d94ce5236dee8d0fc66d8addb231d071e55a773
GIT binary patch
literal 318
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b
z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}?$J50z
z#KM2>goB(+jy$g08CQQuaBnhu9Gm0%A%j!S_O{Ox&itRdg+**^jDC979r6j?`k=B_
z^v=2dTXN>|SJnhGe>%vJvqR?HR{OWl(mt(mwDwu@qU>JW1BD6vYz~6T=f8HD7;a-*
z;K`SE_PdVS&d|j&UTlqSA8P&`e0VNpqDtOT4&hIw{5(uId|1}M^bzxXBoHof-PV9(
zf^_Bouj~)Xe6E>hx+X+4=WX7yDC1GItt87&Q;oGVYRp%><V~!4{ar1^Dh22d22WQ%
Jmvv4FO#ll7bZP(q

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/biomesoplenty/textures/items/wisteria.png b/src/main/resources/assets/biomesoplenty/textures/items/wisteria.png
index 782d32b0fba5734dc8de66539eb66db482502094..0b346bd36e9a1c7d6394bb09a3c4e02a5a6aae4a 100644
GIT binary patch
delta 271
zcmV+q0r39i0_FmcJPN@801m+cxRGn^kwzzf<Vi$9R5(wikTD9vKoCV2du_xMSa^UG
z-ass^gm?uj1J>J%R}m~df~B>WS$Tm!%$kuD7LS>o{QqY+X|YRxk#f$Xyl(GuzdQ@|
z`&)I0z<6yReE@ZzS5-(Qj#wV1{br2xLf;1lp^b=j1A2lu>p7trFbKaHFcX3<G)h2v
z#X!$yg)#qmgSI)9<Mvz`sGMcwJA?rUWMs1{FqctS;{}Ass6gO$-VD}k=A8*aPXIy)
z^G0C}A_-x(o>bRnfj0_k^kcM@nF6GVutwW?CzTmnqj!6(@z*3w^D)99VbOd@P9G;X
V+D@dJ_eKB!002ovPDHLkV1iy|b(a7D

delta 270
zcmV+p0rCFk0_6gbJPN`901m<d6(~x8kwzzf<4Ht8R5(wikRcAjKoCXu4g}RhAm9w7
zIBYeNARwt;PcR&W1j!MQXfCtlHTjcSI-~;eGPBeF|Liu+x9KlZ&Uup8?OpEYXQ6(7
zs}2zuFWqAZpzf}#Dx?xeEDp`E86&;W_mM$pBVyfvo*>S8PG|-U!fyu5grEzJ5>PRD
z(6d=#%zxgXTOP~4?JEP7vy6O)FaUv!Y*q#4G74+FfDjoK2;9z_!J75#WJ1srfDppG
zQCNdWLTEOrx;6{EQCOoNqpi#oAWeid+Ri(v%-9;e+hdKtCSjUS5e^B9=3{dD0EK7X
UZ{X85`~Uy|07*qoM6N<$g7}GdYybcN