diff --git a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java b/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java index 0f8a3fbf..29d2e49e 100644 --- a/src/main/java/ru/betterend/blocks/complex/MetalMaterial.java +++ b/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(); diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 76f0b583..a1b1774c 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/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": "Талласиевые ступени" } \ No newline at end of file diff --git a/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json b/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json index fde436df..73a05561 100644 --- a/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json +++ b/src/main/resources/assets/betterend/materialmaps/block/thallasium_chandelier.json @@ -1,3 +1,3 @@ { - "defaultMaterial": "betterend:glow_65" + "defaultMaterial": "betterend:glow_green" } diff --git a/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json new file mode 100644 index 00000000..69a88e3b --- /dev/null +++ b/src/main/resources/assets/betterend/materialmaps/item/thallasium_chandelier.json @@ -0,0 +1 @@ +{} diff --git a/src/main/resources/assets/betterend/materials/glow_green.json b/src/main/resources/assets/betterend/materials/glow_green.json new file mode 100644 index 00000000..382bc183 --- /dev/null +++ b/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" + } + ] +} diff --git a/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json b/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json index 83efb04a..b3a77432 100644 --- a/src/main/resources/assets/betterend/models/block/thallasium_chandelier_wall.json +++ b/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" }, diff --git a/src/main/resources/assets/betterend/shaders/material/glow_green.frag b/src/main/resources/assets/betterend/shaders/material/glow_green.frag new file mode 100644 index 00000000..67bfbc03 --- /dev/null +++ b/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; +} diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png b/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png index fba8e1a8..9036f5ca 100644 Binary files a/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png and b/src/main/resources/assets/betterend/textures/block/thallasium_bars_top.png differ diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png index a31edede..04fc62d3 100644 Binary files a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png and b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier.png differ diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_ceil.png b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_ceil.png index 96ea3c60..0ab69d74 100644 Binary files a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_ceil.png and b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_ceil.png differ diff --git a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall.png b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall.png index 31e50d27..7eb380ca 100644 Binary files a/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall.png and b/src/main/resources/assets/betterend/textures/block/thallasium_chandelier_wall.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_axe.png b/src/main/resources/assets/betterend/textures/item/thallasium_axe.png index 4c4cbb5f..db344530 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_axe.png and b/src/main/resources/assets/betterend/textures/item/thallasium_axe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png b/src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png new file mode 100644 index 00000000..77827afc Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/thallasium_chandelier_item.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_door.png b/src/main/resources/assets/betterend/textures/item/thallasium_door.png index 914279d1..b06c0796 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_door.png and b/src/main/resources/assets/betterend/textures/item/thallasium_door.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_hoe.png b/src/main/resources/assets/betterend/textures/item/thallasium_hoe.png index ce263374..3a058e6c 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_hoe.png and b/src/main/resources/assets/betterend/textures/item/thallasium_hoe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png index 7a2f2209..537321d8 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png and b/src/main/resources/assets/betterend/textures/item/thallasium_pickaxe.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_shovel.png b/src/main/resources/assets/betterend/textures/item/thallasium_shovel.png index 798b288c..2eff7ba1 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_shovel.png and b/src/main/resources/assets/betterend/textures/item/thallasium_shovel.png differ diff --git a/src/main/resources/assets/betterend/textures/item/thallasium_sword.png b/src/main/resources/assets/betterend/textures/item/thallasium_sword.png index 544cb1b2..0683e273 100644 Binary files a/src/main/resources/assets/betterend/textures/item/thallasium_sword.png and b/src/main/resources/assets/betterend/textures/item/thallasium_sword.png differ