From 6c640447eda6443ca4bf499f1f279180a54332fe Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Thu, 22 Oct 2020 13:57:43 +0300
Subject: [PATCH] Shaders & textures

---
 .../materialmaps/block/cave_bush (2).json        |   3 ---
 .../block/flavolite_runed_eternal.json           |   3 +++
 .../assets/betterend/materials/glow_purple.json  |   8 ++++++++
 .../betterend/shaders/material/glow_purple.frag  |   8 ++++++++
 .../block/end_lotus_stripped_log_side.png        | Bin 0 -> 2666 bytes
 .../block/end_lotus_stripped_log_top.png         | Bin 0 -> 2588 bytes
 6 files changed, 19 insertions(+), 3 deletions(-)
 delete mode 100644 src/main/resources/assets/betterend/materialmaps/block/cave_bush (2).json
 create mode 100644 src/main/resources/assets/betterend/materialmaps/block/flavolite_runed_eternal.json
 create mode 100644 src/main/resources/assets/betterend/materials/glow_purple.json
 create mode 100644 src/main/resources/assets/betterend/shaders/material/glow_purple.frag
 create mode 100644 src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_side.png
 create mode 100644 src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png

diff --git a/src/main/resources/assets/betterend/materialmaps/block/cave_bush (2).json b/src/main/resources/assets/betterend/materialmaps/block/cave_bush (2).json
deleted file mode 100644
index 83329294..00000000
--- a/src/main/resources/assets/betterend/materialmaps/block/cave_bush (2).json	
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-	"defaultMaterial": "betterend:waving_floor_glow_50_blue"
-}
diff --git a/src/main/resources/assets/betterend/materialmaps/block/flavolite_runed_eternal.json b/src/main/resources/assets/betterend/materialmaps/block/flavolite_runed_eternal.json
new file mode 100644
index 00000000..5d23c84f
--- /dev/null
+++ b/src/main/resources/assets/betterend/materialmaps/block/flavolite_runed_eternal.json
@@ -0,0 +1,3 @@
+{
+	"defaultMaterial": "betterend:glow_purple"
+}
diff --git a/src/main/resources/assets/betterend/materials/glow_purple.json b/src/main/resources/assets/betterend/materials/glow_purple.json
new file mode 100644
index 00000000..c1d4195d
--- /dev/null
+++ b/src/main/resources/assets/betterend/materials/glow_purple.json
@@ -0,0 +1,8 @@
+{
+	"layers": [
+		{
+			"vertexSource": "canvas:shaders/material/default.vert",
+			"fragmentSource": "betterend:shaders/material/glow_purple.frag"
+		}
+	]
+}
diff --git a/src/main/resources/assets/betterend/shaders/material/glow_purple.frag b/src/main/resources/assets/betterend/shaders/material/glow_purple.frag
new file mode 100644
index 00000000..27e8e7eb
--- /dev/null
+++ b/src/main/resources/assets/betterend/shaders/material/glow_purple.frag
@@ -0,0 +1,8 @@
+#include frex:shaders/api/fragment.glsl
+#include frex:shaders/lib/math.glsl
+
+void frx_startFragment(inout frx_FragmentData fragData) {
+	float p = (fragData.spriteColor.r + fragData.spriteColor.b) * 0.5;
+	float d = abs(p - fragData.spriteColor.g);
+	fragData.emissivity = (d > 0.3 && p > 0.5) ? 1 : 0;
+}
diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_side.png b/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..ead0e974495b3df926c8949bc91fe61ba3500850
GIT binary patch
literal 2666
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
M!j!<K!a0ln2H=jLaR2}S

literal 0
HcmV?d00001

diff --git a/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png b/src/main/resources/assets/betterend/textures/block/end_lotus_stripped_log_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..99f09dc4d300dce3ff21221ab80e25ede979498e
GIT binary patch
literal 2588
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
Rv-AJ0vV2roXX&Kbe*uz9iT(fp

literal 0
HcmV?d00001