From fce54cc0e3a9b155d07a5163b91607a50daf3bdd Mon Sep 17 00:00:00 2001
From: Mike Primm <mike@primmhome.com>
Date: Sun, 15 Dec 2019 14:22:14 -0600
Subject: [PATCH] Add new 1.15 blocks (beehive, bee nest, honey, honeycomb)

---
 DynmapCore/src/main/resources/models_1.txt    |  12 ++++++++
 DynmapCore/src/main/resources/texture_1.txt   |  26 ++++++++++++++++++
 .../textures/block/bee_nest_bottom.png        | Bin 0 -> 220 bytes
 .../textures/block/bee_nest_front.png         | Bin 0 -> 286 bytes
 .../textures/block/bee_nest_front_honey.png   | Bin 0 -> 315 bytes
 .../textures/block/bee_nest_side.png          | Bin 0 -> 243 bytes
 .../minecraft/textures/block/bee_nest_top.png | Bin 0 -> 220 bytes
 .../minecraft/textures/block/beehive_end.png  | Bin 0 -> 216 bytes
 .../textures/block/beehive_front.png          | Bin 0 -> 250 bytes
 .../textures/block/beehive_front_honey.png    | Bin 0 -> 291 bytes
 .../minecraft/textures/block/beehive_side.png | Bin 0 -> 247 bytes
 .../textures/block/honey_block_bottom.png     | Bin 0 -> 268 bytes
 .../textures/block/honey_block_side.png       | Bin 0 -> 271 bytes
 .../textures/block/honey_block_top.png        | Bin 0 -> 273 bytes
 .../textures/block/honeycomb_block.png        | Bin 0 -> 264 bytes
 15 files changed, 38 insertions(+)
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png
 create mode 100644 DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png

diff --git a/DynmapCore/src/main/resources/models_1.txt b/DynmapCore/src/main/resources/models_1.txt
index a63f1c49..b955297e 100644
--- a/DynmapCore/src/main/resources/models_1.txt
+++ b/DynmapCore/src/main/resources/models_1.txt
@@ -1615,3 +1615,15 @@ patchblock:id=bubble_column
 [1.14-]patchrotate:id=bell,data=14,roty=270
 [1.14-]patchblock:id=bell,data=13
 [1.14-]patchrotate:id=bell,data=14,roty=90
+
+# 1.15 blocks
+# Beenest
+[1.15-]boxlist:id=bee_nest,id=beehive,data=0-5,box=0:1:0:1:0:1:0/1/3/3/2/3
+[1.15-]patchblock:id=bee_nest,id=beehive,data=6-11
+[1.15-]patchrotate:id=bee_nest,data=0,roty=180
+[1.15-]patchblock:id=bee_nest,id=beehive,data=12-17
+[1.15-]patchrotate:id=bee_nest,data=0,roty=270
+[1.15-]patchblock:id=bee_nest,id=beehive,data=18-23
+[1.15-]patchrotate:id=bee_nest,data=0,roty=90
+# Honey block
+[1.15-]boxlist:id=honey_block,box=0:1:0:1:0:1:1/1/1/1/1/1,box=0.0625:0.9375:0.0625:0.9375:0.0625:0.9375:0/1/2/2/2/2
diff --git a/DynmapCore/src/main/resources/texture_1.txt b/DynmapCore/src/main/resources/texture_1.txt
index 4fced0b2..ad69ba37 100644
--- a/DynmapCore/src/main/resources/texture_1.txt
+++ b/DynmapCore/src/main/resources/texture_1.txt
@@ -2404,3 +2404,29 @@ block:id=horn_coral,patch0-1=0:horn_coral,transparency=TRANSPARENT
 [1.14-]block:id=campfire,patch0=0:campfire_log,patch1=0:campfire_log_lit,patch2=0:campfire_fire,transparency=TRANSPARENT
 # Bell
 [1.14-]block:id=bell,patch0=0:dark_oak_planks,patch1=0:stone,patch2=0:bell_top,patch3=0:bell_bottom,patch4=0:bell_side,transparency=TRANSPARENT
+
+# 1.15 resources
+[1.15-]texture:id=bee_nest_bottom
+[1.15-]texture:id=bee_nest_top
+[1.15-]texture:id=bee_nest_front
+[1.15-]texture:id=bee_nest_front_honey
+[1.15-]texture:id=bee_nest_side
+[1.15-]texture:id=beehive_end
+[1.15-]texture:id=beehive_front
+[1.15-]texture:id=beehive_front_honey
+[1.15-]texture:id=beehive_side
+[1.15-]texture:id=honey_block_top
+[1.15-]texture:id=honey_block_bottom
+[1.15-]texture:id=honey_block_side
+[1.15-]texture:id=honeycomb_block
+
+# Beenest (facing N, S, W, E)
+[1.15-]block:id=bee_nest,data=0-4,data=6-10,data=12-16,data=18-22,patch0=0:bee_nest_top,patch1=0:bee_nest_bottom,patch2=0:bee_nest_front,patch3=0:bee_nest_side
+[1.15-]block:id=bee_nest,data=5,data=11,data=17,data=23,patch0=0:bee_nest_top,patch1=0:bee_nest_bottom,patch2=0:bee_nest_front_honey,patch3=0:bee_nest_side
+# Beehive (facing N, S, W, E)
+[1.15-]block:id=beehive,data=0-4,data=6-10,data=12-16,data=18-22,patch0=0:beehive_end,patch1=0:beehive_end,patch2=0:beehive_front,patch3=0:beehive_side
+[1.15-]block:id=beehive,data=5,data=11,data=17,data=23,patch0=0:beehive_end,patch1=0:beehive_end,patch2=0:beehive_front_honey,patch3=0:beehive_side
+# Honey block
+[1.15-]block:id=honey_block,patch0=0:honey_block_top,patch1=0:honey_block_bottom,patch2=0:honey_block_side,transparency=TRANSPARENT
+# Honeycomb block
+[1.15-]block:id=honeycomb_block,allfaces=0:honeycomb_block,stdrot=true
diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..9285e6bf16797f589de757e7e4430d8968968cd9
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`i#=T&LoEE0Pw;R1#eXRD;j{k}
zZ=R^BdBmfTbiOA>WX}piUVZttKpu;YYXtf@KPDzATwfs3aC)YJ;S38uW(TGlInLWf
zpXqK8pJ3W}V~5FMgH7BI*bXpp-ef3wpJ2?8Epb3ZNxCi1z>`g3cTa-E0&CIm6T+fw
zHw?_KCmdl~m(jA+j)%EGRV7AZnVcNkjY&pl*qmw>84K$f?qGb8DK}rjN}AzOZrN%F
T^HT?b&Smg)^>bP0l+XkK;QUOG

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..026551a2d139ca9fe6f22ab7c03bff09186b69ea
GIT binary patch
literal 286
zcmV+(0pb3MP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002xNkl<ZILnoi
zF%CgN5QgU-jv$eUPK_uO<lR6-Cn$6pjl>PqB2M7|uhL80L!nsyjepHslU<50+5O*}
z|II)1<bLTn^0=+Cl-rJnchLrxiPm)?&vHE$E=C(tLqYr=G?^D|2gd!Thj$A+Ukn<a
z-K6X9!ZzcU<5(yfwrT+wga}qq9O1B;hAsi_(1lYaI-iCHj6+?RP3N@oqvi6n{FuJZ
z(6d|6QM>_pcPnwbDHCfpUo-d@VP?JK^{AfxCx{@Awd2Z{I6OT>b^y`Zab;i$<h-Am
kJBDU~_gMoZwc}rS0tUU1aCYwkLjV8(07*qoM6N<$g2XI*5C8xG

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_front_honey.png
new file mode 100644
index 0000000000000000000000000000000000000000..06fac14c7aafe837da485c4e09bb19c331e3a12d
GIT binary patch
literal 315
zcmV-B0mS}^P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00033Nkl<ZILnoi
zF$%&!5Jl${-a!Px)>_5FMsfoYJ5dWe8ymqUwY5l2A=swUT96zd7Z9~r`IF2#Sr-$F
zN3xUsv-9_d?&qEnUbkf_@utJbnsftS6J6Ird8g|kFfO{G)F5#8p+>WyZNRACVr1<D
z-{*rSvmJMNO){oCvTF;XG_094%0L5a!6$Mp?AH?(K2LQ9Yt%_@RnY!45U@DOkUEJs
z?bGKUBa0Y~;%LG3(iF56h|J@{Pnnk7aep-dI9=b(*B$%|iD#YhYS<|KCj^2Yn{oKb
zxNuVL**^6IC>AnKvW$6i1?ae&7Bc2r&U5#H{h|RR8Kay1N%D-V@CH2#rH}qSKjZ)a
N002ovPDHLkV1o1Bh^PPn

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..c604de79cfde6ca89834e6a6147a5ba89f0ea9e6
GIT binary patch
literal 243
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`yF6VSLo7}w|EOL5#h#<y{yEz*
z13NRG;N~@bjIm6!6<>Th@k%03kMm!D-$c=aNBp+zOjyC(X{d9;=x4m}iryy2B!eDb
zp2#_kGRu{d*>cVud&U}bFPY&dbKAyN_A~2Gd@?xuz~I2s@|?tG-otx8Jn`U^SbUpL
z*!{RcC0mW3Te+2)x5Nd}$z75iAJy*}D4aZ&+RDLGd~lxRPKhQ3LkYKwEv&`|MD((J
rn3Ge^o+!F;#BqkA{f$@lsuB#7A1v>9(ah)#^aX>btDnm{r-UW|S}9(H

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/bee_nest_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..75aff10341ff80bc9462f807b690bbdde265f118
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`i#=T&LoEE0S8!hW$A5@>lg~fp
z%@cqAI3nqA<a=?R#t)a-+;Mh1izPn%_S2LResuVV!#YPphUvzMNd|>;*cw<i+-%F!
zJ`<gwuaM2Ou`shOF-80UZv(5)CdL={4yG|&GicCsG2^+LFp0;ZO!A<CL%G(v3F=xr
z8xnKY9qeF@xya#NE5Y`_%VURukF5>Q2G!IVye&Um($!*;3Yafkwy`rTF=Hs!-J+(c
SwAB^pTn0~9KbLh*2~7ZBOiiHx

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_end.png
new file mode 100644
index 0000000000000000000000000000000000000000..6bdf368ba30e8470786001f4bce85746a688d06e
GIT binary patch
literal 216
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`^F3W0Lo7}w-!N4D_kZC|&y>Uo
zacly~we=b@%`A>z{)ojJv~?;b&xo23C&Juuv8U%DTY|Cd?6oYh4kz47ObeKoO|@t;
zJoEBJO-bPlnJ)1O&eLYha4cl3Vi5Yo<)hoicqFOEq2*?muENBli4x1?(iIl5OZf1`
z%3gDD;n#?1>@pR&IJa+((#A?&RUVF|)g^@@`U}|k3=J8~8!o-!VR$0Dfa7Vog+9=!
N44$rjF6*2UngHqjNvHq-

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front.png
new file mode 100644
index 0000000000000000000000000000000000000000..3679deb4bed5b1588c11b1899ec89b88e21a5bca
GIT binary patch
literal 250
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`2R&UJLo7}w-!N4D_kZC|&y>Uo
zac!BZeF?{Y{R^;Q`?xW&#8hE#0W*hWldnvULsi4MdVzJ`M*sPf5C1rk^rA+BO`5@|
zQ^rS@+2NeiH{l|S1<4a;{nXu8@Ks@N0`sojyB|#2!6YbFYQXGJ^?>bwh~n(Nb%J*p
zc5o*oGE7onO>SY_q-)@r!XxDD-&(-zu~oM1VPb>!+Gdf5r@22EG#q8B+H_QGg+b*6
yxgFvgTxC1@br&lp@8F*BnQ5I#zfPYHKSSmG9Ht9B&U=BLVeoYIb6Mw<&;$TSI9!SV

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_front_honey.png
new file mode 100644
index 0000000000000000000000000000000000000000..453f6d2530d11f602e986fc960c894ed8d99987e
GIT binary patch
literal 291
zcmV+;0o?wHP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002$Nkl<ZILn<=
zD-Hrd3|+a0;0Sm$2Oz;93CS7~G#U(wCBYCJ;Q$CM8inE%2+n{hc}-r^lrCfuFEjnU
z>AdL_m)%6Jhw3k&w%E`6x;bx02G|*54r-0y7fI$<g6Xg;z@q92_q4q)+Jq9^W~Jh}
zDdlzQD6prE)yHWY0a|GT5MWgTwB_&Qb%;RDaW$}f)G9$;uPxXlBA<=~s4)U2dG=Ts
z39JKZfIu63Xy8wwP*h#+WA();G=gs@p;#WvG-et!%{r3UK^8X+_zH1sDHyI2<EXJK
pWKRb>`)D54f&U9lGw=OA{szJ_bSmBl_qPB5002ovPDHLkV1n~hbMF8E

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/beehive_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..2fcf06430faa76e107827fa97a44cb15519fd222
GIT binary patch
literal 247
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%``#fD7Lo7}w-!N4D_kZC|&y>Uo
zac%2-xDAqP>osJWf7~$GB{d;#2V)D*K{Y-z1zU&b_8iw$XZ~;Bm{^lySYpT1%*!y-
zg>P9Oqe8mkZ&}G^k%yC*fo5!AG=6pG<e>uQ3C^PPdlgI-dJVoNFgyHv@$Oxd_oFVi
zh)0c*440VsnP(`aT)t?!NSXnt*1=Ex>VE}Wjl>4swap@rPP0oSHq6V}Sjnl@FT{3(
tiEkR;h0h#rRu1R6cU-dBWU<MH!QMKpePVLzf1pnoJYD@<);T3K0RUBlTFL+b

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_bottom.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc13bc5b592a5c8f213e445d082c22d3b107c12f
GIT binary patch
literal 268
zcmV+n0rUQeP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004XF*Lt006O%
z3;baP0002PNkl<ZILm#L%?Uz541@!oJifbS*qUc~WxN`!!d|>tfFKBxz$~BhvL1%b
zvYE;6#`|_!iO>C9ke%miJFd^`Qm6X`FX<qNAY0H~ybzfJBqSb}!%kG$lz=~ol=zoP
zB3PqGrAS9kJCwSUI#57?D}yeom*9Qa3CL+y0^c;sDq+@~E+gNC67Ui_vIpRTg-4u4
zX6iozKDy54;z(eOk)551IhngN7Rf&iN&GL2J{HN99TXzDdcg1N&fWtjr_UEcdlp(-
SthAZ{0000<MNUMnLSTXbbZ!g)

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..071ca42e7e23be7543863466b3d8dc3cac0e44a6
GIT binary patch
literal 271
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6<XJY5_^
zEKavhKFfQ^K%}`gmHk+PY*_-ISpr+yiAL6l24!moC#MDCFDJ)L-p0QAV)xrU`(M@G
zGyAaf&8^pUZz}Hay{*1m9<nE3&hyO6jy@dRsznJ0B!$~KoaPAcy0KXxiACV`?hvPi
z=?_#zEQ4ESIGq!2_AzvwCumb>$y6TaH*JZjl72e>18w)s*KG7FH?c3ib$LeY$JELD
zx0tMR>e_uUBehto!@YZ1pg>CS---6kmclMG6=QZP=s&Mhc&^!Lc`Rm4&O83?((4R*
Tg8V~)K4S26^>bP0l+XkK*`;Vt

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honey_block_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..7deb75dcba92bfe9376c6f6a004174c742675807
GIT binary patch
literal 273
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6-hJY5_^
zEc~ZVy2#69$m9I^G+$5Q>kZ7s8yJo62&juCFxuU0boStQ;?WnQt?;AcO7`a%>%9^E
zvsu5|_=c|koEP!h{8ib_=l7ED=`A#vE$SfL_5Azmh3D8A+pRAoZaAp6)i1*JP9SH6
z-TAjkEP;}Zy|FB2Wv#_u+79h^u$u0;VDpLz=bQbU^Z$$MHRf5^{pCBy5&O-5{Uc{T
z_PX88KXN0r0?xm<Ci>*Q`;0>=Y>ZZgGqxx78_eu^&>Vc5E4xg#Xh&`P{=0o&r9DlS
V|NCK8eF^9%22WQ%mvv4FO#sA8Z<7E3

literal 0
HcmV?d00001

diff --git a/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png b/DynmapCore/src/main/resources/texturepacks/standard/assets/minecraft/textures/block/honeycomb_block.png
new file mode 100644
index 0000000000000000000000000000000000000000..d19f7a01ec5712461c9bcb412831ba69a897948c
GIT binary patch
literal 264
zcmV+j0r&oiP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0002bNkl<ZIE{^y
zu?<2o3`8x_Fa)cy029!$0GqG~6*U7;FawQ|!++6z#{mlK>*sQ|&%W6Gxbf$C>weq&
z>#}PR|JTDOz`+y`%ph~f<@gdx%DCl<T#BT0^$l+c6r?qOoO*(cwFC=3bf6bhbDZlu
zz^&38Af${#rl_qnMO#81Gz$)9U9${L$>6PWF%!#sW~C&_K0!)P02zY%;x8YliE>3^
zIuq8Y?GoyPY9@mZlwA2>=98a3U;|ShtTZosp0-^1plcQ%ly5_xyJBxnYnE#YUrxOM
O0000<MNUMnLSTXn4Qwy~

literal 0
HcmV?d00001