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 b0dfeefd..cf43a785 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_1.png and b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_1.png differ diff --git a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_2.png b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_2.png index 6d47e982..e4b4789c 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_2.png and b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_2.png differ 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 b35de946..b94bd4e8 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_3.png and b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_3.png differ 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 cae9bdfe..d630d233 100644 Binary files a/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_4.png and b/src/main/resources/assets/betterend/textures/block/cave_bush_leaves_4.png differ