Texture, lang & shader update

src/main/java/ru/betterend/blocks/complex/MetalMaterial.java

@@ -74,14 +74,16 @@ public class MetalMaterial {
 		FurnaceRecipe.make("thallasium_ingot_furnace", ore, ingot).build();
 		AlloyingRecipe.Builder.create("thallasium_ingot").setInput(ore, ore).setOutput(ingot, 3).setExpiriense(2.1F).build();
 		
-		GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).build();
-		GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).build();
+		GridRecipe.make(name + "_block", block).setShape("###", "###", "###").addMaterial('#', ingot).setGroup("end_metal_blocks").build();
+		GridRecipe.make(name + "_ingot_from_block", ingot).setOutputCount(9).setList("#").addMaterial('#', block).setGroup("end_metal_ingots").build();
 		
-		GridRecipe.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', block).build();
-		GridRecipe.make(name + "_bars", bars).setOutputCount(16).setShape("###", "###").addMaterial('#', ingot).build();
-		GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).build();
-		GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).build();
-		GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).build();
+		GridRecipe.make(name + "_tile", tile).setOutputCount(4).setShape("##", "##").addMaterial('#', block).setGroup("end_metal_tiles").build();
+		GridRecipe.make(name + "_bars", bars).setOutputCount(16).setShape("###", "###").addMaterial('#', ingot).setGroup("end_metal_bars").build();
+		GridRecipe.make(name + "_plate", plate).setShape("##").addMaterial('#', ingot).setGroup("end_metal_plates").build();
+		GridRecipe.make(name + "_door", door).setOutputCount(3).setOutputCount(16).setShape("##", "##", "##").addMaterial('#', ingot).setGroup("end_metal_doors").build();
+		GridRecipe.make(name + "_trapdoor", trapdoor).setShape("##", "##").addMaterial('#', ingot).setGroup("end_metal_trapdoors").build();
+		GridRecipe.make(name + "_stairs", stairs).setOutputCount(4).setShape("#  ", "## ", "###").addMaterial('#', block).setGroup("end_metal_stairs").build();
+		GridRecipe.make(name + "_slab", slab).setOutputCount(6).setShape("###").addMaterial('#', block).setGroup("end_metal_slabs").build();
 		
 		GridRecipe.make(name + "_axe", axe).setShape("##", "#I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();
 		GridRecipe.make(name + "_hoe", hoe).setShape("##", " I", " I").addMaterial('#', ingot).addMaterial('I', Items.STICK).build();

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

@@ -595,5 +595,10 @@
 	
 	"block.betterend.lumecorn_seed": "Семя люмекорна",
 	"item.betterend.lumecorn_rod": "Стержень люмекорна",
-	"block.betterend.thallasium_chandelier": "Талласиевый канделябр"
+	"block.betterend.thallasium_chandelier": "Талласиевый канделябр",
+	
+	"block.betterend.thallasium_anvil": "Талласиевая наковальня",
+	"block.betterend.thallasium_chain": "Талласиевая цепь",
+	"block.betterend.thallasium_slab": "Талласиевая плита",
+	"block.betterend.thallasium_stairs": "Талласиевые ступени"
 }

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

@@ -1,3 +1,3 @@
 {
-	"defaultMaterial": "betterend:glow_65"
+	"defaultMaterial": "betterend:glow_green"
 }

src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json

@@ -0,0 +1 @@
+{}

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

@@ -0,0 +1,8 @@
+{
+	"layers": [
+		{
+			"vertexSource": "canvas:shaders/material/default.vert",
+			"fragmentSource": "betterend:shaders/material/glow_green.frag"
+		}
+	]
+}

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

@@ -30,8 +30,8 @@
 		},
 		{
 			"__comment": "Box4",
-			"from": [ 2, 6, 1 ],
-			"to": [ 4, 9, 3 ],
+			"from": [ 3, 6, 1 ],
+			"to": [ 5, 9, 3 ],
 			"faces": {
 				"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
 				"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
@@ -43,8 +43,8 @@
 		},
 		{
 			"__comment": "Box4",
-			"from": [ 12, 6, 1 ],
-			"to": [ 14, 9, 3 ],
+			"from": [ 11, 6, 1 ],
+			"to": [ 13, 9, 3 ],
 			"faces": {
 				"down": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
 				"up": { "uv": [ 0, 12, 2, 14 ], "texture": "#texture" },
@@ -56,9 +56,9 @@
 		},
 		{
 			"__comment": "PlaneX6",
-			"from": [ 1, 9, 0 ],
-			"to": [ 1.001, 15, 5.5 ],
-			"rotation": { "origin": [ 1, 9, 0 ], "axis": "y", "angle": 45 },
+			"from": [ 2, 9, 0 ],
+			"to": [ 2.001, 15, 5.5 ],
+			"rotation": { "origin": [ 2, 9, 0 ], "axis": "y", "angle": 45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" },
@@ -67,9 +67,9 @@
 		},
 		{
 			"__comment": "PlaneX6",
-			"from": [ 5, 9, 0 ],
-			"to": [ 5.001, 15, 5.5 ],
-			"rotation": { "origin": [ 5, 9, 0 ], "axis": "y", "angle": -45 },
+			"from": [ 6, 9, 0 ],
+			"to": [ 6.001, 15, 5.5 ],
+			"rotation": { "origin": [ 6, 9, 0 ], "axis": "y", "angle": -45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" },
@@ -78,9 +78,9 @@
 		},
 		{
 			"__comment": "PlaneX6",
-			"from": [ 11, 9, 0 ],
-			"to": [ 11.001, 15, 5.5 ],
-			"rotation": { "origin": [ 11, 9, 0 ], "axis": "y", "angle": 45 },
+			"from": [ 10, 9, 0 ],
+			"to": [ 10.001, 15, 5.5 ],
+			"rotation": { "origin": [ 10, 9, 0 ], "axis": "y", "angle": 45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" },
@@ -89,9 +89,9 @@
 		},
 		{
 			"__comment": "PlaneX6",
-			"from": [ 15, 9, 0 ],
-			"to": [ 15.001, 15, 5.5 ],
-			"rotation": { "origin": [ 15, 9, 0 ], "axis": "y", "angle": -45 },
+			"from": [ 14, 9, 0 ],
+			"to": [ 14.001, 15, 5.5 ],
+			"rotation": { "origin": [ 14, 9, 0 ], "axis": "y", "angle": -45 },
 			"shade": false,
 			"faces": {
 				"west": { "uv": [ 11, 0, 16, 6 ], "texture": "#texture" },

src/main/resources/assets/betterend/shaders/material/glow_green.frag

@@ -0,0 +1,9 @@
+#include frex:shaders/api/fragment.glsl
+#include frex:shaders/lib/math.glsl
+
+void frx_startFragment(inout frx_FragmentData fragData) {
+	float a = abs(fragData.spriteColor.g - fragData.spriteColor.r);
+	float b = abs(fragData.spriteColor.g - fragData.spriteColor.b);
+	float l = frx_luminance(fragData.spriteColor.rgb);
+	fragData.emissivity = ((l > 0.9) || (a > 0.1 && b > 0.1 && fragData.spriteColor.g > 0.5)) ? 1 : 0;
+}