From 55bf037041f86f4d948c1a2f3b6fb3b0b1f909ed Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Thu, 26 Nov 2020 12:14:58 +0300 Subject: [PATCH] Tenanea flowers --- .../java/ru/betterend/registry/EndBlocks.java | 1 + .../betterend/blockstates/tenanea_flowers.json | 16 ++++++++++++++++ .../resources/assets/betterend/lang/en_us.json | 3 ++- .../resources/assets/betterend/lang/ru_ru.json | 3 ++- .../models/block/tenanea_flowers_bottom_1.json | 6 ++++++ .../models/block/tenanea_flowers_bottom_2.json | 6 ++++++ .../models/block/tenanea_flowers_middle_1.json | 6 ++++++ .../models/block/tenanea_flowers_middle_2.json | 6 ++++++ .../models/block/tenanea_flowers_top_1.json | 6 ++++++ .../models/block/tenanea_flowers_top_2.json | 6 ++++++ .../betterend/models/item/tenanea_flowers.json | 6 ++++++ .../textures/block/tenanea_flowers.png | Bin 0 -> 2216 bytes .../textures/block/tenanea_flowers_bottom.png | Bin 0 -> 2273 bytes .../textures/block/tenanea_flowers_top.png | Bin 0 -> 2407 bytes 14 files changed, 63 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/blockstates/tenanea_flowers.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json create mode 100644 src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json create mode 100644 src/main/resources/assets/betterend/models/item/tenanea_flowers.json create mode 100644 src/main/resources/assets/betterend/textures/block/tenanea_flowers.png create mode 100644 src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png create mode 100644 src/main/resources/assets/betterend/textures/block/tenanea_flowers_top.png diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 489690df..a76f17e5 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -122,6 +122,7 @@ public class EndBlocks { public static final Block TENANEA_SAPLING = registerBlock("tenanea_sapling", new BlockTenaneaSapling()); public static final Block TENANEA_LEAVES = registerBlock("tenanea_leaves", new BlockLeaves(TENANEA_SAPLING, MaterialColor.PINK)); + public static final Block TENANEA_FLOWERS = registerBlock("tenanea_flowers", new BlockVine(15)); public static final WoodenMaterial TENANEA = new WoodenMaterial("tenanea", MaterialColor.PINK, MaterialColor.PINK); // Small Plants // diff --git a/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json new file mode 100644 index 00000000..9e9347aa --- /dev/null +++ b/src/main/resources/assets/betterend/blockstates/tenanea_flowers.json @@ -0,0 +1,16 @@ +{ + "variants": { + "shape=top": [ + { "model": "betterend:block/tenanea_flowers_top_1" }, + { "model": "betterend:block/tenanea_flowers_top_2" } + ], + "shape=middle": [ + { "model": "betterend:block/tenanea_flowers_middle_1" }, + { "model": "betterend:block/tenanea_flowers_middle_2" } + ], + "shape=bottom": [ + { "model": "betterend:block/tenanea_flowers_bottom_1" }, + { "model": "betterend:block/tenanea_flowers_bottom_2" } + ] + } +} diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 035f65a2..2735675d 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -331,5 +331,6 @@ "block.betterend.amber_block": "Amber Block", "block.betterend.amber_ore": "Amber Ore", "item.betterend.amber_gem": "Amber Gem", - "item.betterend.raw_amber": "Raw Amber" + "item.betterend.raw_amber": "Raw Amber", + "block.betterend.tenanea_flowers": "Tenanea Flowers" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 021fdef0..fcc3fcb8 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -333,5 +333,6 @@ "block.betterend.amber_block": "Блок янтаря", "block.betterend.amber_ore": "Янтарная руда", "item.betterend.amber_gem": "Огранённый янтарь", - "item.betterend.raw_amber": "Необработанный янтарь" + "item.betterend.raw_amber": "Необработанный янтарь", + "block.betterend.tenanea_flowers": "Цветы тенанеи" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json new file mode 100644 index 00000000..e0bd69bc --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/tenanea_flowers_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json new file mode 100644 index 00000000..ce711252 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_bottom_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers_bottom" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json new file mode 100644 index 00000000..487cf87e --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/tenanea_flowers" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json new file mode 100644 index 00000000..fd254807 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_middle_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json new file mode 100644 index 00000000..2cfede97 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_1.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion", + "textures": { + "texture": "betterend:block/tenanea_flowers_top" + } +} diff --git a/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json new file mode 100644 index 00000000..6b4754e1 --- /dev/null +++ b/src/main/resources/assets/betterend/models/block/tenanea_flowers_top_2.json @@ -0,0 +1,6 @@ +{ + "parent": "betterend:block/cross_no_distortion_inverted", + "textures": { + "texture": "betterend:block/tenanea_flowers_top" + } +} diff --git a/src/main/resources/assets/betterend/models/item/tenanea_flowers.json b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json new file mode 100644 index 00000000..19320d6c --- /dev/null +++ b/src/main/resources/assets/betterend/models/item/tenanea_flowers.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "betterend:block/tenanea_flowers_bottom" + } +} diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers.png new file mode 100644 index 0000000000000000000000000000000000000000..5ce1df8455c81aac9356f47a2b70fc5e9d540c38 GIT binary patch literal 2216 zcmbVO3sBQ`7!PWh;$wQ=lw&F}I5*TZNn1!8DTvfThXoGGKu~9zq$ScOwF$P=skl2g zM5lN%d=5Qzb1(JWrj`S7&IdQ2C@SLXd^4S>QxAvuSOTTDIdz`7JpM_3-|u_;zI>N? zX(@@lL&8D;0O)N@GNen_zVgvMSUQK_drC@|9?ql*0s!>vFCRg`idCTipxDitv&C%F zc!J^`N|NR+jMC$9N@xIxiSsx~DxVQS3u9wBJ#@QjCj_#z9?FU`p(bYnlgB1`T}*~I z#Y}ngDIE>P#ey*&LLzW5A_;mNc1|EXdZ?Y3kk;~J1OnS3V!j@VmmPxHrZg~tcQIg; zG8(2ZjS9qdN-P@HsWhWN6^h{qiX)gBMlk}7Ce%96zd@2W7i}fd4e$GXNq2fEPZXU5 zg1FsorCY7!T{Z;M>2wIHLR2bPLcl^HCz2kR6Cyep42(dzSf|MH94IrA7QR5#LsFz2 zDL9+~T2AnnNh%oPA)N@OMCFv)fixAsISX9&cIPyOFm}elaH1e#u>e-8lF1Z+KbO|w z2%rUV+;k}-e{Ro33+6&6gQPP8U*MvcanmJ_5uJfK^LUXL^7t3z5qKTQ#z`c&7*gb2 zW}dfq3YFH$0wyHL!f3(wvRIDh-9n`7$Zx|KNRiP)DpZBS7zV4N%@{^RMN9igR8630 z2h=3B0!@nKf59pOQxQ>`e}Q?LwHE#_l%@zP?{bh*p;!lLV-P22Yxia{5k^iBNseNS z20bK&s$^N3z_b{yQPVW6Mj0B$aSaBOI7z}P)QY3(XojS4Rj0jyrwU{dJMC%7-oj{T zt3^w}TAZX|OslcL7L=r5N{i9jD4dR_(Wp-QR2M6KM5O)oc>*F43A~+mnRr^NvRZE8 z_EsX2SV7XO(Em|nFw^`iI}5gV4?$9LgXLS7WVKu&*o^slDti=uy~|6VhCe{rcilCv?=%tRnLA4Hxm9nv7r zs@DGQACssPE{!*N8JMfmO<*!JoJ8%C=I&@`L?!@qnQt`2o3;HEyB?<=F93iGP4{+m z-Luq_+?=FexHMs&;`?y3X3T+&<@q}vMLwbAyy03f9U)4&yY|rX}t$f?^P3s1SO{Iwmxf^B|hu?C1tHF&U+PIm^dz1p* zkA6VnH_Jj|y*u|_OPTOznW+Ev|(x)qJ-wP}&~&}&I{*Gzzo z6GJbpE+|=f@a#FUIlX+}h$2lP*kosNZtQC#esd}r$TYG25;Ayv~L;&l9G{<3n(4NGqs1sMd znXAZ&sE@1Btm5xATrS!2w&O6fu5#)Hqxo`k&~RJUJjvOI<$cEL zW)7>kxn`4caO9S@>@x<`!Kl{wb%DD29qra>i|M<|^u%;^CbSyba0rm## zmb3F(2VH*{d0_UPlUIi~#+Dp9TeE#_n5)ITT7fCRpuUkmEd6!&hDSeU*RNo14IMfE zV9J2r6?*n=LuPFbvG&ujqHaLNs2vO3vyjTxl>JK_Q+w1e`HY)v-`?W0_~QQ9zPIb4 zW=B6T2=q<6ntAbR#psM)+v?LOd$sYSH^V1SZOE}zH~H>fn-7!*`|4JgR0`|!H|KiB vu#1kwUTow0{`O$;C~R8Q&4Z2ofhTV~JrmqeoNL@E|4SIhr5HAio$|@w+$AG^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_bottom.png new file mode 100644 index 0000000000000000000000000000000000000000..16334402b5ab4fe90330dcff7d03a8aa44e70d78 GIT binary patch literal 2273 zcmb_e32YQq7~YE9S1VTo2;&s6L}zDa&zXU3ExUyl+_ovD99r!hZ?{8tXQn&T?zSd{ zfLODdB2uSqJc6UWANQj%A>&^GR|NH;{ zn>X`LPS%wEeTMfj7!3V0GhDgw7_V==dcghY8-KF!&|Arvtr`q{2kBd!VePs^gQ3S} zF>jVO%l#_D%YGv($Q&?+{0c-H3=>mB3dFF~mRuKhRhtb&kB0m&H3kV)2*EKm33tl!YaAlF?g4> zet!(DYUyQAQ6#r6(Q00~0`Od*%B2Awq?f^nNl{@+k*vvTk^G1}Vz*=2D2y`zSWOP( z$+9onsGKMZ;&kebp^)U6q9n*cb-W%ZG6%R=4LDE}VInY+#7wq4l4Ptl_HDx!p{rq-w0hgG`qL zg;I^8C@`d8HIrtF!~jk67-zA-9czU~GxLJQV-+|+S)=n^GGD4UQJ>%GXF=v6N33*= z-Ru!a+Du{`&D$^&Z?Rw;PtzC)2*6q`9KqRzC|hCcCkNcJ0Bdg64IMTXlOd|Gd*zWwWI8B`ocTl~ z>?MZfb-O!IUhgx2$~uR|F6#7TiaO^9ivT2jO!GTos_fB%YyhNrVNIXJU-+Z+t8Cfh z)q5-!!OH5rjV+uOz(Yqtg zlny(SoHq5@Ave>=?fDT*9^Ml#`{IvE;pa& zrk$i_UruZtxbU?F?|s;CD*40?;JmN_w0+EfT{HE&YJ68!O8My%llLxf@43(T^9`jU zzQ?`AH_PJ0Ya_d@q<;KC*wD5LUzD&Uf6Et*BO3O1A3M;KT3emvZ9L44>NbWydhFA6 zEd$0&?(Hv{nB4i>{)o6JGZ3%+RRBEBc~+w zy_&N3PSa3=UcGhHA2o9OZlmF>=eNLQY5ke%HxH(mvsr1#(sxJp*-ADyEwdfksnsN| z&B^{%DxdOJU>rWQ<@Mq1=WgXMpR;rH?(Rq5Sk*e8io4f)d)$*IB9$&rPq2|30T=)7)Umrf1xPE{*$k*z-rey14$3 zGk5Xor7GpH9q=hg{G7sz=jf7xnoBEer`P6OxxcF)a^>XBRFYz|`u*PR?Y!p7I>+ey Q`bS7+dX}qhQsIKX0PA!XY5)KL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/tenanea_flowers_top.png b/src/main/resources/assets/betterend/textures/block/tenanea_flowers_top.png new file mode 100644 index 0000000000000000000000000000000000000000..50b0a5337d27bd13783428fcb4aa112fdda301da GIT binary patch literal 2407 zcmb_e3rrJd9IqM_o$?qWOebE>Y4CBqN3Xr>&7we=z$_qiQx`M1-hHJVZLjtYTJSNM zOl5IKjm~Mvf{Cb;fhbOmGx3447+j*xIA6mD>XKn5K5)y>xbI5ooKt7aF8BEEyWjWw zzkc8MU3Fg0^kG9r4$){d!?H5X`S2N|UXcUgeayYbJbVoHX3mi{n%CmgtDk0LO`=9K zaFf$ITbXT{!3mOE%Zri?XajC9L~ArtrUtycPy!Uh28x{?6MFl*gDBz@P3SDWg|K+j zfy0?u;R6K~IaZ;fL@$H-u7$=QJBTi5_MPU$u$>kn}4`3d7Y#)Oe$b!%5Rh*IsQ5kug zRH~Rz=xJ{VZf}^@BZtxi6NU$PFHUL+HKZU=6v8-fsm~QOE($ns0XOg{GQ^T$EX$qwl`afCmIqw#X- zKENxI&nii-zCz{ou^{Q`YGGI;d6v^7N`85QYA7@Yn0W=5P>P@kj3hD2U?oXTZ-D0{ zLdOwAFVq61Ao2?TZ!pD?@MQl1mPDt${6C?hz}Y3An}>;Vy7^*&dp*TLYZeQa<&hQM zBY-Tk35Bj|olcRXDAHhHSQ}=y5dvnQX$E6;6p67Et7mE2NKwGhH{L7>rD_q?@x6K$ zB>{4TQ^y$%Bx9#_HjLC!EXI?x9^(l{hmm?n#It~+8PLa;>vO^>#k-zlRlO1+qYcoa z-Np(S%kUybva}7e5xjs2EGe>jMl^_o9!37Pn=ZK|pG6X3&ULDwgTmr6oieOmd1#6h zfO(;o%ZUWF#PNbEcM~e8bp|3D>UKUOPcP?DFRkAJAn6N=-wTr^yW;14Ahj6g^kwvg zKhJ-eFMF}~G;1IM%`ljOA_a`6)qLt{9@9~F(XJyHg3-f#zQB7U6l9+oU(x#zz2M+I z#Q?6LIQr`Gyqs#E7td3(>wk?0SJ%#7so_tnF!=3>brzO0*aa7FwHe+u;7fSl0Unqt zAKXL-XoiToc7$w<1Y@fe8 z@^NPmqiyS6X)q2IuB_S~y|!c5oTw#5f9fvH-}m_+Ol{hrad~u1gZJ8jM^$gn(k|~j zTVUnWH!ZGNJ^iPLnx3IY_eQ)orz!rpz*vZL735&B(L z#NoGH(DCQ>UAK%i3YXc+FB;kYU~5eCk{hv>Y_nC4KUY)U?L)^|D#uQ?Gzw?h&b9A6 z`Fds1=;S+hcQWs~>n!W`H`xabAAM?KMNhu<%CQ6M$G%y470;um6-2s@QCnKCYevcA zKS|nK_3(=0&YHxfnP;-EByYyLwoAi)zRnxJp0r}bv_~CB8g1H{dAepIWuQJ~dG4We z=>7X!x0Rd;#1Ux ulyG8b%YyzJ2gL0DvikR1hgROXeYudWkLoCkopDe770SxUF*l|aeexHns7CGp literal 0 HcmV?d00001