Structures, texture changes

src/main/resources/assets/betterend/blockstates/chorus_log.json

@@ -1,16 +1,16 @@
 {
     "variants": {
-        "axis=x": {
-            "model": "betterend:block/chorus_log", 
-            "x": 90, 
-            "y": 90
-        }, 
-        "axis=y": {
-            "model": "betterend:block/chorus_log"
-        }, 
-        "axis=z": {
-            "model": "betterend:block/chorus_log", 
-            "x": 90
-        }
+        "axis=x": [
+			{ "model": "betterend:block/chorus_log", "x": 90, "y": 90 },
+			{ "model": "betterend:block/chorus_log_2", "x": 90, "y": 90 }
+		], 
+        "axis=y": [
+			{ "model": "betterend:block/chorus_log" },
+			{ "model": "betterend:block/chorus_log_2" }
+		], 
+        "axis=z": [
+			{ "model": "betterend:block/chorus_log", "x": 90 },
+			{ "model": "betterend:block/chorus_log_2", "x": 90 }
+		]
     }
 }

src/main/resources/assets/betterend/materialmaps/block/chorus_bark.json

@@ -0,0 +1,3 @@
+{
+	"defaultMaterial": "betterend:glow_20_half"
+}

src/main/resources/assets/betterend/materialmaps/block/chorus_log.json

@@ -0,0 +1,14 @@
+{
+	"defaultMap": {
+		"spriteMap": [
+			{
+				"sprite": "betterend:block/chorus_log_side_glow_1",
+				"material": "betterend:glow_all_half"
+			},
+			{
+				"sprite": "betterend:block/chorus_log_side_glow_2",
+				"material": "betterend:glow_all_half"
+			}
+		]
+	}
+}

src/main/resources/assets/betterend/materials/glow_20_half.json

@@ -0,0 +1,10 @@
+{
+	"layers": [
+		{
+			"vertexSource": "canvas:shaders/material/default.vert",
+			"fragmentSource": "betterend:shaders/material/glow_20_half.frag",
+			"disableAo": true,
+			"disableDiffuse": true
+		}
+	]
+}

src/main/resources/assets/betterend/models/block/chorus_log.json

@@ -1,12 +1,34 @@
 {
     "parent": "block/cube", 
     "textures": {
-        "down": "betterend:block/chorus_log_top", 
-        "east": "betterend:block/chorus_log_side", 
-        "north": "betterend:block/chorus_log_side", 
-        "particle": "betterend:block/chorus_log_side", 
-        "south": "betterend:block/chorus_log_side", 
-        "up": "betterend:block/chorus_log_top", 
-        "west": "betterend:block/chorus_log_side"
-    }
+        "top": "betterend:block/chorus_log_top",
+        "side": "betterend:block/chorus_log_side_1",
+        "glow": "betterend:block/chorus_log_side_glow_1",
+        "particle": "#side"
+    },
+	"elements": [ 	 
+		{
+			"from": [ 0, 0, 0 ],
+			"to": [ 16, 16, 16 ],
+			"faces": {
+				"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "down" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
+			}
+		},
+		{
+			"from": [ 0, 0, 0 ],
+			"to": [ 16, 16, 16 ],
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "north" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "south" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "west" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "east" }
+			}
+		}
+	]
 }

src/main/resources/assets/betterend/models/block/chorus_log_2.json

@@ -0,0 +1,34 @@
+{
+    "parent": "block/cube", 
+    "textures": {
+        "top": "betterend:block/chorus_log_top",
+        "side": "betterend:block/chorus_log_side_2",
+        "glow": "betterend:block/chorus_log_side_glow_2",
+        "particle": "#side"
+    },
+	"elements": [ 	 
+		{
+			"from": [ 0, 0, 0 ],
+			"to": [ 16, 16, 16 ],
+			"faces": {
+				"down": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "down" },
+				"up": { "uv": [ 0, 0, 16, 16 ], "texture": "#top", "cullface": "up" },
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "north" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "south" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "west" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side", "cullface": "east" }
+			}
+		},
+		{
+			"from": [ 0, 0, 0 ],
+			"to": [ 16, 16, 16 ],
+			"shade": false,
+			"faces": {
+				"north": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "north" },
+				"south": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "south" },
+				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "west" },
+				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#glow", "cullface": "east" }
+			}
+		}
+	]
+}

src/main/resources/assets/betterend/shaders/material/glow_20_half.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 glow = frx_luminance(fragData.spriteColor.rgb) - 0.2;
+	glow = clamp(glow * 3, 0, 0.5);
+	fragData.emissivity = glow;
+}

src/main/resources/assets/betterend/textures/block/chorus_log_side.png.mcmeta

@@ -0,0 +1,14 @@
+{
+  "animation": {
+    "interpolate": false,
+    "frametime": 2,
+    "frames": [
+      0,
+      1,
+      2,
+      3,
+      4,
+      5
+    ]
+  }
+}

src/main/resources/assets/betterend/textures/block/chorus_log_side_glow_1.png.mcmeta

@@ -0,0 +1,12 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 25,
+    "frames": [
+      0,
+      1,
+      2,
+      3
+    ]
+  }
+}

src/main/resources/assets/betterend/textures/block/chorus_log_side_glow_2.png.mcmeta

@@ -0,0 +1,12 @@
+{
+  "animation": {
+    "interpolate": true,
+    "frametime": 25,
+    "frames": [
+      0,
+      1,
+      2,
+      3
+    ]
+  }
+}