Neon oasis (WIP)

src/main/resources/assets/betterend/lang/en_us.json

@@ -808,5 +808,12 @@
 	"item.betterend.bolux_mushroom_cooked": "Cooked Bolux Mushroom",
 	
 	"block.betterend.silk_moth_hive": "Silk Moth Hive",
-	"item.betterend.silk_moth_matrix": "Silk Moth Matrix"
+	"item.betterend.silk_moth_matrix": "Silk Moth Matrix",
+	
+	"biome.betterend.neon_oasis": "Neon Oasis",
+	"block.betterend.cave_pumpkin": "Cave Pumpkin",
+	"block.betterend.cave_pumpkin_seed": "Cave Pumpkin Seed",
+	"block.betterend.magnula": "Magnula",
+	"block.betterend.neon_cactus": "Neon Cactus",
+	"item.betterend.cave_pumpkin_pie": "Cave Pumpkin Pie"
 }

src/main/resources/assets/betterend/lang/ru_ru.json

@@ -828,5 +828,12 @@
 	"item.betterend.bolux_mushroom_cooked": "Приготовленный болюкс",
 	
 	"block.betterend.silk_moth_hive": "Улей шелковичной моли",
-	"item.betterend.silk_moth_matrix": "Матрица шелковичной моли"
+	"item.betterend.silk_moth_matrix": "Матрица шелковичной моли",
+	
+	"biome.betterend.neon_oasis": "Неоновый оазис",
+	"block.betterend.cave_pumpkin": "Пещерная тыква",
+	"block.betterend.cave_pumpkin_seed": "Семена пещерной тыквы",
+	"block.betterend.magnula": "Магнула",
+	"block.betterend.neon_cactus": "Неоновый кактус",
+	"item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы"
 }

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

@@ -1,3 +1,3 @@
 {
-	"defaultMaterial": "betterend:glow_50"
+	"defaultMaterial": "betterend:glow_80_cyan"
 }

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

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

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

@@ -8,10 +8,11 @@
 	"elements": [ 	 
 		{
 			"__comment": "Box1",
-			"from": [ 2, 0, 2 ],
-			"to": [ 14, 16, 14 ],
+			"from": [ 2, -2, 2 ],
+			"to": [ 14, 14, 14 ],
 			"shade": false,
 			"faces": {
+				"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
 				"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
 				"north": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
 				"south": { "uv": [ 2, 0, 14, 16 ], "texture": "#side" },
@@ -21,9 +22,9 @@
 		},
 		{
 			"__comment": "PlaneX2",
-			"from": [ 0, 0, 0 ],
-			"to": [ 0.001, 16, 22.5 ],
-			"rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 },
+			"from": [ 0, -2, 0 ],
+			"to": [ 0.001, 14, 22.5 ],
+			"rotation": { "origin": [ 0, -2, 0 ], "axis": "y", "angle": 45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
@@ -32,27 +33,14 @@
 		},
 		{
 			"__comment": "PlaneX2",
-			"from": [ 16, 0, 0 ],
-			"to": [ 16.001, 16, 22.5 ],
-			"rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 },
+			"from": [ 16, -2, 0 ],
+			"to": [ 16.001, 14, 22.5 ],
+			"rotation": { "origin": [ 16, -2, 0 ], "axis": "y", "angle": -45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
 				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }
 			}
-		},
-		{
-			"__comment": "Box1",
-			"from": [ 2, -2, 2 ],
-			"to": [ 14, 0, 14 ],
-			"shade": false,
-			"faces": {
-				"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
-				"north": { "uv": [ 2, 0, 14, 2 ], "texture": "#side" },
-				"south": { "uv": [ 2, 0, 14, 2 ], "texture": "#side" },
-				"west": { "uv": [ 2, 0, 14, 2 ], "texture": "#side" },
-				"east": { "uv": [ 2, 0, 14, 2 ], "texture": "#side" }
-			}
 		}
 	]
 }

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

@@ -8,10 +8,11 @@
 	"elements": [ 	 
 		{
 			"__comment": "Box1",
-			"from": [ 4, 0, 4 ],
-			"to": [ 12, 16, 12 ],
+			"from": [ 4, -4, 4 ],
+			"to": [ 12, 12, 12 ],
 			"shade": false,
 			"faces": {
+				"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
 				"up": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
 				"north": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
 				"south": { "uv": [ 4, 0, 12, 16 ], "texture": "#side" },
@@ -21,9 +22,9 @@
 		},
 		{
 			"__comment": "PlaneX2",
-			"from": [ 0, 0, 0 ],
-			"to": [ 0.001, 16, 22.5 ],
-			"rotation": { "origin": [ 0, 0, 0 ], "axis": "y", "angle": 45 },
+			"from": [ 0, -4, 0 ],
+			"to": [ 0.001, 12, 22.5 ],
+			"rotation": { "origin": [ 0, -4, 0 ], "axis": "y", "angle": 45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
@@ -32,27 +33,14 @@
 		},
 		{
 			"__comment": "PlaneX2",
-			"from": [ 16, 0, 0 ],
-			"to": [ 16.001, 16, 22.5 ],
-			"rotation": { "origin": [ 16, 0, 0 ], "axis": "y", "angle": -45 },
+			"from": [ 16, -4, 0 ],
+			"to": [ 16.001, 12, 22.5 ],
+			"rotation": { "origin": [ 16, -4, 0 ], "axis": "y", "angle": -45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" },
 				"east": { "uv": [ 0, 0, 16, 16 ], "texture": "#side" }
 			}
-		},
-		{
-			"__comment": "Box1",
-			"from": [ 4, -4, 4 ],
-			"to": [ 12, 0, 12 ],
-			"shade": false,
-			"faces": {
-				"down": { "uv": [ 4, 4, 12, 12 ], "texture": "#top" },
-				"north": { "uv": [ 4, 0, 12, 4 ], "texture": "#side" },
-				"south": { "uv": [ 4, 0, 12, 4 ], "texture": "#side" },
-				"west": { "uv": [ 4, 0, 12, 4 ], "texture": "#side" },
-				"east": { "uv": [ 4, 0, 12, 4 ], "texture": "#side" }
-			}
 		}
 	]
 }

src/main/resources/assets/betterend/shaders/material/glow_80_cyan.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.r < 0.6 && (fragData.spriteColor.b > 0.3 || fragData.spriteColor.g > 0.3)) ? 1.0 : 0;
+}