From f926412c11ae8522f1747602210a6b53b15ee2ab Mon Sep 17 00:00:00 2001 From: paulevsGitch Date: Sun, 14 Mar 2021 06:55:39 +0300 Subject: [PATCH] Cave bush textures --- .../java/ru/betterend/registry/EndBlocks.java | 2 +- .../betterend/materialmaps/block/cave_bush.json | 2 +- .../materials/waving_glow_80_blue.json | 8 ++++++++ .../shaders/material/glow_80_blue.frag | 6 ++++++ .../textures/block/cave_bush_leaves_1.png | Bin 283 -> 237 bytes .../textures/block/cave_bush_leaves_2.png | Bin 334 -> 271 bytes .../textures/block/cave_bush_leaves_3.png | Bin 319 -> 278 bytes .../textures/block/cave_bush_leaves_4.png | Bin 299 -> 275 bytes 8 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 src/main/resources/assets/betterend/materials/waving_glow_80_blue.json create mode 100644 src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag diff --git a/src/main/java/ru/betterend/registry/EndBlocks.java b/src/main/java/ru/betterend/registry/EndBlocks.java index e3ef0248..b0a4cc23 100644 --- a/src/main/java/ru/betterend/registry/EndBlocks.java +++ b/src/main/java/ru/betterend/registry/EndBlocks.java @@ -46,6 +46,7 @@ import ru.betterend.blocks.EnderBlock; import ru.betterend.blocks.EndstoneDustBlock; import ru.betterend.blocks.EternalPedestal; import ru.betterend.blocks.EternalRunedFlavolite; +import ru.betterend.blocks.FilaluxLanternBlock; import ru.betterend.blocks.GlowingHymenophoreBlock; import ru.betterend.blocks.GlowingMossBlock; import ru.betterend.blocks.GlowingPillarLuminophorBlock; @@ -64,7 +65,6 @@ import ru.betterend.blocks.LacugroveSaplingBlock; import ru.betterend.blocks.LanceleafBlock; import ru.betterend.blocks.LanceleafSeedBlock; import ru.betterend.blocks.LargeAmaranitaBlock; -import ru.betterend.blocks.FilaluxLanternBlock; import ru.betterend.blocks.LumecornBlock; import ru.betterend.blocks.LumecornSeedBlock; import ru.betterend.blocks.MengerSpongeBlock; diff --git a/src/main/resources/assets/betterend/materialmaps/block/cave_bush.json b/src/main/resources/assets/betterend/materialmaps/block/cave_bush.json index a9fa165f..e1736ac5 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/cave_bush.json +++ b/src/main/resources/assets/betterend/materialmaps/block/cave_bush.json @@ -1,3 +1,3 @@ { - "defaultMaterial": "betterend:waving_glow_50_blue" + "defaultMaterial": "betterend:waving_glow_80_blue" } diff --git a/src/main/resources/assets/betterend/materials/waving_glow_80_blue.json b/src/main/resources/assets/betterend/materials/waving_glow_80_blue.json new file mode 100644 index 00000000..478d4ac3 --- /dev/null +++ b/src/main/resources/assets/betterend/materials/waving_glow_80_blue.json @@ -0,0 +1,8 @@ +{ + "layers": [ + { + "vertexSource": "betterend:shaders/material/wave.vert", + "fragmentSource": "betterend:shaders/material/glow_80_blue.frag" + } + ] +} diff --git a/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag b/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag new file mode 100644 index 00000000..85726ede --- /dev/null +++ b/src/main/resources/assets/betterend/shaders/material/glow_80_blue.frag @@ -0,0 +1,6 @@ +#include frex:shaders/api/fragment.glsl +#include frex:shaders/lib/math.glsl + +void frx_startFragment(inout frx_FragmentData fragData) { + fragData.emissivity = (fragData.spriteColor.b > 0.8) ? 1.0 : 0; +} diff --git a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_1.png b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_1.png index b0dfeefda2545a3495cc2c975f8af2c24fff8074..cf43a7852667b82b497f14f8420b93e91457ad5d 100644 GIT binary patch delta 220 zcmbQu^p{Jt(R6cDj>?C7bHayUHx3vIVCg!0C1pHDF6Tf delta 267 zcmV+m0rdXu0h0znK#Q;3SSjkaFEN)QWg zU?q3}!QRHg&O_J=Ucn2-{fmFd{u#5dWJvNeFO%47arDP*@7M9hFQc{HCR=~b4-VUX zhCk*o2K!l^%^>;(arXOk=kMjIw-9tmeIeu^S7W9GI75J9w13Qr#TY9Dz=DItXpu-{ zZKoojPzl&plK@Ushcgya0&Rye!;0;h)QHamk< Rs{jB107*qoL=Bjda<+J@NMnV257y6S^e@}X|GqguHPbPbz@_`do z^5V`KsY@bC&!`nIBe_!m zECPzw2HGLuCHIJ^W{8x9K)2)`X-m1>PTUiVx2T07dVM>=R^zR$F_5nIe&(-NbVQT%bJ(=>G&m$dN#E$TJ}K2SGvth)`5u QRsaA107*qoM6N<$f{?M20RR91 diff --git a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_3.png b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_3.png index b35de9467ccd2f76d610c9ff93ae5af4c9b81091..b94bd4e8522505f8698aaf069a1c1e9cb902a774 100644 GIT binary patch delta 261 zcmdnbG>vJ3WIZzj1A~Sxe=v|@EDmyaVpw-h<|UA$65tc!3Z%=$Os2>l$tMl}{lA}mm1XG?X4fM+Eai1kOMW?OOLlhge16-EPqS(XgY&|USDud*T3cqVm1B^L zcy&FZpojZm(G$fro)wzy*Veo~*#5cw{{HuWto|9TW#N%+JiHO;C1)~8Gi-<001BJ|6u?C0R~A#K~#9!eUc##0znK#D+mxY1}qmqkq}6@ z0g42NA>c6x93G1$;R-9!7_PuIK;X*$34hYw{7LpTj;Sf(_M3<+s07# zt+AfFb44s4!E0-nLo5bs5r}?Cob}M2=(WEL5rVQP7@-EWK7S{k0A~nb#>g6L##|%- z7Cz975rssa-rnJ5E+L@M695^)&Eun|r-pMRfD7Cqv}T?FB8XvvGjqbmz^IM@rfi!1 zg$e;1;|c1TW@`dLZq7bu8_GQqe~U%V*z_r;}xMaTdE002ovPDHLkV1o7Q Bgt`C# diff --git a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_4.png b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_4.png index cae9bdfeb78bbb200f044c5c74f3b042842ea410..d630d233f141540d37ff761ca235a95421b24a12 100644 GIT binary patch delta 258 zcmZ3@G?{6FWIZzj1A~Sxe=v|@EDmyaVpw-h<|UA$65tc!3Z%=$Os2>j7sn8Zsk;5q zVy=oDP9Fo!bN+qaJLCCcmq~kh8mgS;FpEx%V*N661B`MvSgwFe6$)*L>3@cXh2 zqL1wV+-80ucmKeejZbzf9DboR|9gr3|Gf5`NAdz4%&+e)D{%(8h{4m<&t;ucLK6V< Cb$QkR delta 283 zcmV+$0p$LZ0;>X$8Gi-<001BJ|6u?C0P;yhK~#9!eUdQ>0znK#Q;3SSjkaFEN)QEa zU?teu2=+D>b{@i3@CugJ-bnknfAKFdna#qIA<56YWFoiGMlXYv9=kI=bf$9Z&GkB5 zD{S=%ew)J>>|?SQf#?^+S9}`c2Gk*jqM#~&qjIo9QSa7fy zEfR_B+X(~|dIGjpB!Cmu;k3m(fp3Q~;b2e*&fV*+%jZW)06}S>e*|V6p%J002ovPDHLkV1h5rd-?zX