From d3c279bf5332ed0b770b28be0293e0dc20176f24 Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Tue, 20 Oct 2020 19:27:35 +0300 Subject: [PATCH] Bark fix & lotus leaf texture --- .../ru/betterend/blocks/basis/BlockBark.java | 7 +++++-- .../textures/block/end_lotus_leaf_center.png | Bin 0 -> 1697 bytes .../textures/block/end_lotus_leaf_corner.png | Bin 0 -> 1869 bytes .../textures/block/end_lotus_leaf_side.png | Bin 0 -> 1954 bytes 4 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png create mode 100644 src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png create mode 100644 src/main/resources/assets/betterend/textures/block/end_lotus_leaf_side.png diff --git a/src/main/java/ru/betterend/blocks/basis/BlockBark.java b/src/main/java/ru/betterend/blocks/basis/BlockBark.java index 7d1a086e..a21d8dba 100644 --- a/src/main/java/ru/betterend/blocks/basis/BlockBark.java +++ b/src/main/java/ru/betterend/blocks/basis/BlockBark.java @@ -4,6 +4,7 @@ import java.io.Reader; import net.minecraft.util.Identifier; import net.minecraft.util.registry.Registry; +import ru.betterend.BetterEnd; import ru.betterend.interfaces.Patterned; public class BlockBark extends BlockPillar { @@ -14,13 +15,15 @@ public class BlockBark extends BlockPillar { @Override public String getModelPattern(String block) { Identifier blockId = Registry.BLOCK.getId(this); - return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, blockId, getName(blockId)); + String name = getName(blockId); + return Patterned.createJson(Patterned.BASE_BLOCK_MODEL, BetterEnd.makeID(name), blockId.getPath()); } @Override public String getStatesPattern(Reader data) { Identifier blockId = Registry.BLOCK.getId(this); - return Patterned.createJson(data, blockId, getName(blockId)); + String name = getName(blockId); + return Patterned.createJson(data, BetterEnd.makeID(name), blockId.getPath()); } private String getName(Identifier blockId) { diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_center.png new file mode 100644 index 0000000000000000000000000000000000000000..5336cdd042aeb3f16df441e83e60b754f1c2f4f0 GIT binary patch literal 1697 zcmbVNZA=?w9KZ4+j<-0SY!VaBTbL|(y_dexTMI!7UKfhUnv5}BxZXWSFSK{(-E}RM z#kxf!9~8RTL>FJ8afAe4<_7_{ME5~wrtAyE5hqdOqL49VPB)25jL(&}F=jg5CC@$2 zbIhjP4hwShTX_6)h(m_x(PB|IU&QLBi_h3+(CWuUruOlZ5?z~vo zFjR&h;_ADF~wLmNDIX6Lv5eZHuC@X22lm!ZW0jI{aNLIMO6CeVjKsI!Ur3zT+r9hwnzaecj zT0rYY`+lfV&bAw(_27^Sh#sITF^vc9`=P|GdBxPQVkml8`3E}+#|3LtrcDE!p=d!x ziR1&-oo7L5%1WaRyCqpr;`(+|O6~&iaR%^WX4G(s#Az}}xfvP;uBnlqYSvNSD2Y#OygQ{93NnrSpt4S1S z8}7DKO}JaM1H4JJi@4}?xLts=k-*92@B0)!W=1f7U-+N*AJ!yTL0sh4c?uC?+LVZ* z1rz~#*=FW%Hjfxq(qXWMauu-)Jf2%cBs7~k49A<R(5Pvr@d-j)_&BI|MFqef61UH2q24vW{G}xiO zZK(YcK`ecKUu&=-o#|=S4w03MsYbEV-&tK>KRy!$NWp@uXepOH~Zwho=aePd4?_O z|M*yX&(x94PuoZSV3$5zISp(Vf7agkB>ma!frT?Op;7I*%>3A6<^B>DeV=&k8zk6q zG3f~uZ;svl{qvvy{$2Zq6Bo9hZLo}qZ_6y1v%OUe8 O;&1Qrz4KuI!9M}(j6rPx literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png b/src/main/resources/assets/betterend/textures/block/end_lotus_leaf_corner.png new file mode 100644 index 0000000000000000000000000000000000000000..5145f6888a0224064c5558ce59bed7def7ca058f GIT binary patch literal 1869 zcmbVNeN5bB7%xP|gpAFvc*7WK7jVjY{kXf{weALtW86g!5l)9OQG4xscMW%KX$#jw zW0+HP5w>K^WHXo%l9_2TN5BsfoSPqiVB(ypIHRDLMV2ULW=l3VW9HlY+B5@+m-PC! z{k^~E_dL(9Pj|I6H?AouFF_DwO~CJKh39qFv3eE!ueflPho_rW|6@9Wl-_0?1<0#I zHUue}l0xl9d$5TUl!ToZl`ycI2^FFdWOI$F@jJH=6xnFq$StxK`h`Y%F-? z#bSn`as-h~ChbXwUD2Wh#j-3x(gaQ85P|C{+2BoF);HuBd_Wg8Ni`%zMlD7@taKS( z3@Xi}kWllqvYssyEEr+(DnZ#vE2SJT7+fBjNaWGF(a;T}WcA*VSP!LCK(qo~>Cyzy z&<$i`LoS#oA7Dk4BB_-?gF!AJ>jp0iAmH<2P?TMgL@o?Sk!MK~=RJ%EcQeii&UzwYoN@rs z>84$l)zZ4)exD+AS>?0#XKX7f0_4b7h~sIGAVk6d7g(o=3lS%Yvy6kqoun(m2o&oQ z#Y~ov?IBHqZw?>7p4Cz%LPifsGeX1z9Zxx3xQBAGIO}wXILWXsMx-bhhQ&}(;3A5a z;Gs{X1Rn*2Dn~K&nwokgu4q9;gf(|qZiehIu3yq&>r&bGqYZRsS8)kVn~viJ%j;fD zu$l}+EPGqJLG@OqGeet<0Z6(`^D{7Ai5N*<19eeY>Hjnrv6Oh7?_OT|${N3{^lMi9 zKhm>h6=J*`1#oZ@n3W7+jhIYRh=2Dh{p`ANl!L<=XD#!?6<*}WGms&*28S;bE#8YD z1=RsxUC1*qxA$c8N42-VP*c9I8$CZ>H9BppI5DtxzSQEIS$NT_<45l@$ql8rc~n_SBr6>6i@aHQ>B`4DilzqcarYI9zOO3E;uTg5iaOil8Obd z+*s5wRE{7LiG(#_vnpCOL9r}LkTgNlI7HxjgKY3gT-N8M89YE2G)XliMMh0VKCILk zZVW1&NFlCfXk|TBCRi{c$*TlqCC!x5K)-)-Xgr=l>qc2UjFQrOUt&GfpaLQYbfr!c zKv_MIjd|%{qLA6E)@iZvOhthJF%X9^9SWl|q132iD0)3@I~QHnG?4Ak%Ee6nuvvH*M@HwHynB}wF*q}{U2wlg5$eqHnfoW&R#XJYk*N^J0MbE|P5}?Q91+N25947n%-}prg9u5{ zG|y0JwpTO>zBzpCURG0;2pR3PGZJwL5!_~XF?g7=(>O~~4qS9nHppaW0PDa|QQ#tq z7UyA~NO8Uz5UN~_p?B4kDltX#D8Y{`QC_YFaBvcsnG9i$m7C!vXuQy=R7tEuD`cZ5>sc$A-VY(OvWLmi^Bl zYi^bI&uH6wx~)U4|MSrL&K=)NRd2=HRvh`Zqp)#w%6g{!kG`Mgws+)qy*Yp6c2Mi> zN%S0;(tdc|_U*RT#F5y7;IEgiURW5O?LD7c^ND-u#wo5F2P%ToF{H~$1o|wwZMCoY zhA#JBWRR{OPaU2;6xn6DJ~pzUtnuv9mYqY#^eea3yfcA~MSY=d$+cl*3Jp046gZa?~Id^go=9Ax`!&kkV2Bxn3 zZGY?0?&jaM0%2`o)4SiHH|Kjd6(zrvnm-uJ>Kyf*n|~}nTC+|W9K6|TdGDOX{EGU@ L0-pB8RcrqS|6ru^ literal 0 HcmV?d00001