From 30f7f53c7f8c759ecd60e16e202c26ad8cbcb315 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sat, 31 Oct 2020 21:46:45 +0300 Subject: [PATCH] Dragon Tree --- .../blocks/BlockDragonTreeSapling.java | 16 +++++++++++++ .../java/ru/betterend/registry/EndBlocks.java | 5 +++++ .../assets/betterend/lang/en_us.json | 21 +++++++++++++++++- .../assets/betterend/lang/ru_ru.json | 21 +++++++++++++++++- .../textures/block/dragon_tree_leaves.png | Bin 0 -> 1906 bytes .../textures/block/dragon_tree_log_side.png | Bin 0 -> 338 bytes .../textures/block/dragon_tree_log_top.png | Bin 0 -> 2161 bytes .../textures/block/dragon_tree_planks.png | Bin 0 -> 2161 bytes .../block/dragon_tree_stripped_log_side.png | Bin 0 -> 2319 bytes .../block/dragon_tree_stripped_log_top.png | Bin 0 -> 2237 bytes 10 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_leaves.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_log_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_log_top.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_planks.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_stripped_log_side.png create mode 100644 src/main/resources/assets/betterend/textures/block/dragon_tree_stripped_log_top.png diff --git a/src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java b/src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java new file mode 100644 index 00000000..72d0581f --- /dev/null +++ b/src/main/java/ru/betterend/blocks/BlockDragonTreeSapling.java @@ -0,0 +1,16 @@ +package ru.betterend.blocks; + +import net.minecraft.world.gen.feature.Feature; +import ru.betterend.blocks.basis.BlockFeatureSapling; +import ru.betterend.registry.EndFeatures; + +public class BlockDragonTreeSapling extends BlockFeatureSapling { + public BlockDragonTreeSapling() { + super(); + } + + @Override + protected Feature getFeature() { + return EndFeatures.PYTHADENDRON_TREE.getFeature(); + } +} diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index 1ea32ada..805d2c43 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -15,6 +15,7 @@ import ru.betterend.blocks.BlockBlueVineLantern; import ru.betterend.blocks.BlockBlueVineSeed; import ru.betterend.blocks.BlockBubbleCoral; import ru.betterend.blocks.BlockChorusGrass; +import ru.betterend.blocks.BlockDragonTreeSapling; import ru.betterend.blocks.BlockEndLily; import ru.betterend.blocks.BlockEndLilySeed; import ru.betterend.blocks.BlockEndLotusFlower; @@ -98,6 +99,10 @@ public class EndBlocks { public static final Block LACUGROVE_LEAVES = registerBlock("lacugrove_leaves", new BlockLeaves(MaterialColor.CYAN)); public static final WoodenMaterial LACUGROVE = new WoodenMaterial("lacugrove", MaterialColor.BROWN, MaterialColor.YELLOW); + public static final Block DRAGON_TREE_SAPLING = registerBlock("dragon_tree_sapling", new BlockDragonTreeSapling()); + public static final Block DRAGON_TREE_LEAVES = registerBlock("dragon_tree_leaves", new BlockLeaves(MaterialColor.MAGENTA)); + public static final WoodenMaterial DRAGON_TREE = new WoodenMaterial("dragon_tree", MaterialColor.BLACK, MaterialColor.MAGENTA); + // Small Plants // public static final Block UMBRELLA_MOSS = registerBlock("umbrella_moss", new BlockUmbrellaMoss()); public static final Block UMBRELLA_MOSS_TALL = registerBlock("umbrella_moss_tall", new BlockUmbrellaMossTall()); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index 95fb4ab6..ce947185 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -233,5 +233,24 @@ "block.betterend.lacugrove_sapling": "Lacugrove Sapling", "biome.betterend.megalake_grove": "Megalake Grove", - "biome.betterend.painted_mountains": "Painted Mountains" + "biome.betterend.painted_mountains": "Painted Mountains", + + "block.betterend.dragon_tree_bark": "Dragon Tree Bark", + "block.betterend.dragon_tree_barrel": "Dragon Tree Barrel", + "block.betterend.dragon_tree_button": "Dragon Tree Button", + "block.betterend.dragon_tree_chest": "Dragon Tree Chest", + "block.betterend.dragon_tree_crafting_table": "Dragon Tree Crafting Table", + "block.betterend.dragon_tree_door": "Dragon Tree Door", + "block.betterend.dragon_tree_fence": "Dragon Tree Fence", + "block.betterend.dragon_tree_gate": "Dragon Tree Gate", + "block.betterend.dragon_tree_ladder": "Dragon Tree Ladder", + "block.betterend.dragon_tree_log": "Dragon Tree Log", + "block.betterend.dragon_tree_planks": "Dragon Tree Planks", + "block.betterend.dragon_tree_plate": "Dragon Tree Plate", + "block.betterend.dragon_tree_sign": "Dragon Tree Sign", + "block.betterend.dragon_tree_slab": "Dragon Tree Slab", + "block.betterend.dragon_tree_stairs": "Dragon Tree Stairs", + "block.betterend.dragon_tree_stripped_bark": "Dragon Tree Stripped Bark", + "block.betterend.dragon_tree_stripped_log": "Dragon Tree Stripped Log", + "block.betterend.dragon_tree_trapdoor": "Dragon Tree Trapdoor" } \ 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 0e1f903f..5e7d9781 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -235,5 +235,24 @@ "block.betterend.lacugrove_sapling": "Саженец оземангра", "biome.betterend.megalake_grove": "Мегаозёрная роща", - "biome.betterend.painted_mountains": "Окрашенные горы" + "biome.betterend.painted_mountains": "Окрашенные горы", + + "block.betterend.dragon_tree_bark": "Кора драконова древа", + "block.betterend.dragon_tree_barrel": "Бочка из драконова древа", + "block.betterend.dragon_tree_button": "Кнопка из драконова древа", + "block.betterend.dragon_tree_chest": "Сундук из драконова древа", + "block.betterend.dragon_tree_crafting_table": "Верстак из драконова древа", + "block.betterend.dragon_tree_door": "Дверь из драконова древа", + "block.betterend.dragon_tree_fence": "Забор из драконова древа", + "block.betterend.dragon_tree_gate": "Калитка из драконова древа", + "block.betterend.dragon_tree_ladder": "Лестница из драконова древа", + "block.betterend.dragon_tree_log": "Бревно драконова древа", + "block.betterend.dragon_tree_planks": "Доски из драконова древа", + "block.betterend.dragon_tree_plate": "Нажимная плита из драконова древа", + "block.betterend.dragon_tree_sign": "Табличка из драконова древа", + "block.betterend.dragon_tree_slab": "", + "block.betterend.dragon_tree_stairs": "", + "block.betterend.dragon_tree_stripped_bark": "", + "block.betterend.dragon_tree_stripped_log": "", + "block.betterend.dragon_tree_trapdoor": "" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_leaves.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_leaves.png new file mode 100644 index 0000000000000000000000000000000000000000..a9544b51c9069de6a8bd01e57169ac0e7057209d GIT binary patch literal 1906 zcmbVN3v3f*94{h@z!Dr|4oKv7z&0N3-SxR1>jtzNty#xt2MmeA_3mqXTifgIZnWdI zFa(OM#0797L>&;w00oI*3J8P|9P1`;W(x$7$6S#4K;93%>)OT`ROFKHzVEy5_x=9w z|E(x4nw->cXg`TWl4LR(EW$ic9DQFB-otPGK?u_;UgJzoBI!R!9K9qTZb*|zUc5z@ zl=7wKLY!pWGJ;}kK<0OQ1++wxljrvmWI5m=8*tDb9sKjYgD^x>I(UZ4jGDcA;G~W7 zSYVx3R6@=xC$$uumkZ_iae=@McmndfT^)QltUV=3{#_8xpEvNM==e8Y7k5zMKK&z;|eVldtgBtOWARYp&%wp*y&&= z&wFtM@%el*pF+m44g}L`wFoLl&*^>8sa2@XU2gcreNsAy6YNRbJgw~}>5g;OK~T)+)HJSSkW1Xl2p*_?ns zmDcS}pgBH&uAouOwx^=Gk}5AiEP!JwSrX*W6(o*`E9P}FJi|Gef3PEQoUq1=>sdhX z3|qo5u6Uq|<1CO~F9s$X%9=rYD8|Q)76rxb00Y4T9V|!Xs1!q`3amtq;YtiwX~&`p z97TJeW+4?Qf+wC0%uuww>OY|riQ5_0O$d&n-Gl=mUXLRx&1}X^9*!qGBrq9tu%N1p zrYW4tCP`GG)<~6iB&FLsp7GjNhmJ=lv-xEff*q zdVZcnkZ?WYVpuan30_u+DI85D+(>gmysBbFVFeYjm5YX=*@F|LnBY2?6e9~LIQE%- zZqM}4`kX)@{g-g}z&OUv`v?|HbO>I2mW)CK{SmPmdrU$8Ze{fBFO?gI3++H$Ci;-D zNpv#c5!x3k^r?!b=2D5|g;6HM#FFe#(5fp>nVOoXn!fjYpYIb&N$r;!p@CtSWqf||!1P6*IMcUhZ7c}%8Z6(nOx2wcHt)Ww?F5(X zdE*weuM4f8fBgb?JkWnr)77=h9aCpD+8Xyl?`>#q&IGbZ(n9+W$FrnIf4SIq)~T6o zNL%BBLnpBGJ05{ z&b_n&cSkh2cOG8+)9e1O393QEf;Flsy_c@tO?-E(V{{O?|Mg`&2QO5FpEkxgE{zj?Tfk zexLrp{d<%4Kh6!SHKwjGyKQsuod#L5=BuO-d&V_2WBH=$31yZ8%{!bR^Uk%U8L6vo zww`|Zn<>J zsf%T4bw?j8Tzsar_MB_=x^kN$c*Sp8Givo#)7d?iVMDO-i_*Y=CM@lGq;}t|FC!P0 fm2OvBAHH^W&7CVBO!#q!_*XRL7a2aAG^gfItT4J+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_side.png new file mode 100644 index 0000000000000000000000000000000000000000..a7ef25d70878bac8bcb248fdd8be53f0382fbd66 GIT binary patch literal 338 zcmV-Y0j>UtP)ri*u|*^ZH_S!QyE|~; zecmTHi-zk~^AIPN>3GJ&(>(zJrdTk#xaH(HCR?UFzdjOo&iVdrHV!D9Aq2=w!gM^t ztPI261S>h+Xn?3ATc(IQy3qiqcJrH=1gDnJsiiChQ2{{2QB@_X1=bmo#T@I**DX22 z-ejvNw32hxzeYrMwpCS$h}$Zvg+cAE(~40QlEs`gYeXy`Marmu1He%`=I#B3)00bT zVI5UL)X}K73A@o?gSxBDH!D;v{;5P?e6zx;Dlw~^Y?*Gg`EY%+ew66L-AkemcQ1)P k+`T0FaQ{xCFTa)e31TJ`g#=(kKL7v#07*qoM6N<$f~bX(2LJ#7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_log_top.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_log_top.png new file mode 100644 index 0000000000000000000000000000000000000000..9952a7311b3935f446f01e10d511c25c1216c9e7 GIT binary patch literal 2161 zcmbVOeQeZZ94>?qz$^~Oj38=P2q4hw$9?o#cZ0DTZpw{ioNNk$Z{NOmS9W(TZO7dv zhJ>gH0pd`G4v_H?1;TKe!3e`3MD!1t><=;shRjHeh#;6~rjdwm?~9=W376~l^Lu{J z@2hXuR#!cnH)g^Zf*|rLEBrP1m~U^RhU5L)%@GeijMgh&GzsFN0(%=qv~GKhAV#*U z!8)rhFi(P7%mEZlMvi1m$7q5mo|V)AtVb3pqp%wHQP;bVQ>3c+s9JY`4d`VkqE<8+ zXhBm|5H{6AQK4p)ki|&}6U2}O$Yd-UH>ISHO7Tkg+`i3FWC~){`>0aeAz2rwCd)Jf zk#2{FhMbEh1<}EISdn+lBzcw-7*=37C(Uva>yexynfX!Jo1uiH8vopkFMQ>rB9^5~ z43kJC90{jGGr|lfiXy}E4A0XTL7R-BPtUX)^*@Yp{G2R+I<_Bidc4bC2(E zfKwX?XUvl;_o#OU!bMdmUom1$AUz>cvxXG%pN zAXUaq3&bI+^!q3rwnJ4FNkm@R1D!n00?|!#$mOI(FYBefGLYRU#Cwrf%-Z`k*kBho zYp-B?ClonWfdF@`D@40wypu&Qq=5jSOXNKqLQ2+tzMyE- zGczMH2ZS?cQMDvJj*14c)Z3;mMfNHo=%zg=q|jI>q-74swCoNEE(kf~ak+{adpa;h zdhqVb6_TAuVFivBWT%^EkqnTAalt4_|&f1~SSZ0D)z>mJ!3k#Jk6H_ta0mQU@mLIYP%zrUmHo!<{_JkZ{~edUec+TPuN^{*v;^gx{9*cVf+^;O^Z9oS~9{#n!3oGae{$uDz-%agz9Rn3py zJHD&7WB8V(t8Pu~C~BU#bm9`Rq)>YPLdn)6ySKc0uB$LuySu-t>?|D7dU)l` zwiiC!5MB7_p?2zt;?^(2@ARc)Z^=tv!j@0R zU3sdgcVJmHvE%W^>5YqjIzI5Q{@uAnhqs*g`1;|_5f}2uem=Eh@A+{fo;lNEe-u=f LSNRXld1duKCOYQ5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_planks.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_planks.png new file mode 100644 index 0000000000000000000000000000000000000000..cc44e18d619ef03ce2b7135df77319c5f44ce330 GIT binary patch literal 2161 zcmb_e32YQq7#0yF0QXbPFwE3zUVH!^qn=Z+0i$Ih>hx zx0OR6L923UB7qjdp;3Vl0pmpopurHVpn?$zcqG`U5gRogsEBX2+m#|9A#Qed-pqXO z`@jGHzj<$4XVy&3A5=VuAc*|xs&Fkn7rMuQzW8_D`hN;?UB2_s=)%hZ9#H>IG zwW`HJvs-GSu%!V8WoqIB#R-EC2!63tW8LyYd2-U9=r-HW5>cY@^YFsIm#mEOWClr3woH$FQP? zk?d*I%pS>PMTOg#09jtA>avlt$6hrDg@J=Yl$Z6gG>5-@lw~EKC~^FKEHANaH#B0% zs?yvW%5zaKCvl?0`g=jKYh>Vn{{+iWQVdH2IA>J@am1KTrm{X?s*vmV#oyFNz>W10b`sA3Ktcv7(<2`eYsnoU8yr?3o`nV58ey zcYe3eWdmZ4f1(Ol2^03s$|UQ zlR=Q@c}Ocf2+&XwL^`JUMLMV;Z-7-4E(W}=p)($ls#F_yuQ~gQ%tnu7M@f~;*g^u( zwR?zyZl94%WpAt3smCov&dyII5GK7z^Sh(lhT^1vg(k&u?QX?i%#HNhpy}r71+Sm= zi-7Ki;PLY;j-$=y8NsP=>nw zd~VI1-9rDJ&o%GY|C$fuuASXhW3F{!=Gj&2EN*A!7GAvFVQ$yJ7rA{0>9|xD-c=UN zn>LLg`ZQICCq>IoYR??0eVZ*@)h24?XC6>PcCd8DN7;lmq#-CnkmT6wzm z?7gd(eOlA8b@Pduru}V;ujpqkU*H)2%f~nWvKKD-M!ZyV>9-bG{@BXmGou&WxwQO^ z2Sa0KwV#W;Hg}(Vs%_)J)xM<1w%KnZ?^}F)M`Hf5=?(Os;^Y@P-rISibI;nX9}OEk zXY7;5cD}U!uykedsP?0sr$0IRQ==e!-EURH0njzFwTd9xM!q~i5}yXj>p$GFd{{`^ zeF~j^N;^O0?gQWDKh*hF$2(p2tevG3?V^h-+J0R8*|-aH=j{7%(f%!476z^?sj45- z)iLBmo{t#aI{sYWVkI@B>7IhKpO@}kyQA{w{JP6r>B+Co4PQ6w_~zZmr|mj8&i}=> zX#a&no*%lpgzXnC8S~06dFWJleCyDSFU~o6WGUV6+3&^n!R@g_8#?nw6mB2Yf8i7N zcNG*Ae=uUm?`3yg%)9*8KyZH0npgJ}*{P%c*5x0sdDmRDjOcvxk4?MhPkGM$Q&3%5 L6W%j<(TcwT?Pb}t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/dragon_tree_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/dragon_tree_stripped_log_side.png new file mode 100644 index 0000000000000000000000000000000000000000..2359746dbe4f387b60c3104fda77c2e75f470ec9 GIT binary patch literal 2319 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