Add vintage lamp and improve backend

This commit is contained in:
Andrew-71 2023-09-03 16:20:07 +03:00
parent 9758a0ad31
commit 37e3a8c2db
30 changed files with 300 additions and 72 deletions

View file

@ -0,0 +1,10 @@
{
"variants": {
"inverted=true": {
"model": "new_soviet:block/vintage_lamp"
},
"inverted=false": {
"model": "new_soviet:block/vintage_lamp"
}
}
}

View file

@ -147,7 +147,7 @@
"block.new_soviet.red_tv": "Red TV",
"block.new_soviet.brown_tv": "Brown TV",
"block.new_soviet.radio_receiver": "Radio",
"block.new_soviet.lamp": "Lamp",
"block.new_soviet.table_lamp": "Table Lamp",
"block.new_soviet.ceiling_fan": "Ceiling Fan",
"block.new_soviet.siren": "Siren",
"item.new_soviet.dice_d6": "Dice",
@ -184,7 +184,7 @@
"block.new_soviet.blue_concrete_with_bars": "Blue Concrete With Bars",
"block.new_soviet.red_concrete_with_bars": "Red Concrete With Bars",
"subtitles.new_soviet.light_bulb_broken": "Light bulb breaks",
"block.new_soviet.light_bulb": "Light Bulb Lamp",
"block.new_soviet.light_bulb_lamp": "Light Bulb Lamp",
"item.new_soviet.light_bulb_item": "Light Bulb",
"block.new_soviet.light_bulb_block.energized": "Turn off the power!",
"block.new_soviet.crate": "Crate",
@ -432,5 +432,6 @@
"block.new_soviet.cyan_linoleum_stairs": "Cyan Linoleum Stairs",
"block.new_soviet.metal_plating_slab": "Metal Plating Slab",
"block.new_soviet.metal_plating_stairs": "Metal Plating Stairs",
"subtitles.new_soviet.electric_hit": "Electric shock"
"subtitles.new_soviet.electric_hit": "Electric shock",
"block.new_soviet.vintage_lamp": "Vintage Lamp"
}

View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "new_soviet:block/handrail",
"0": "new_soviet:block/custom/handrail",
"particle": "new_soviet:block/industrial/metal_plating"
},
"elements": [

View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "new_soviet:block/handrail",
"0": "new_soviet:block/custom/handrail",
"particle": "new_soviet:block/industrial/metal_plating"
},
"elements": [

View file

@ -2,7 +2,7 @@
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"0": "new_soviet:block/handrail",
"0": "new_soviet:block/custom/handrail",
"particle": "new_soviet:block/industrial/metal_plating"
},
"elements": [

View file

@ -0,0 +1,89 @@
{
"credit": "Made with Blockbench",
"texture_size": [64, 64],
"textures": {
"1": "new_soviet:block/custom/furniture/vintage_lamp",
"particle": "new_soviet:block/custom/furniture/vintage_lamp"
},
"elements": [
{
"name": "head",
"from": [4.5, 0, 4.5],
"to": [11.5, 2, 11.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
"faces": {
"north": {"uv": [1.75, 7.5, 3.5, 8], "texture": "#1"},
"east": {"uv": [0, 7.5, 1.75, 8], "texture": "#1"},
"south": {"uv": [5.25, 7.5, 7, 8], "texture": "#1"},
"west": {"uv": [3.5, 7.5, 5.25, 8], "texture": "#1"},
"up": {"uv": [3.5, 7.5, 1.75, 5.75], "texture": "#1"},
"down": {"uv": [5.25, 5.75, 3.5, 7.5], "texture": "#1"}
}
},
{
"name": "head",
"from": [6.5, 2, 6.5],
"to": [9.5, 10, 9.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
"faces": {
"north": {"uv": [7.75, 6.5, 8.5, 8.5], "texture": "#1"},
"east": {"uv": [7, 6.5, 7.75, 8.5], "texture": "#1"},
"south": {"uv": [9.25, 6.5, 10, 8.5], "texture": "#1"},
"west": {"uv": [8.5, 6.5, 9.25, 8.5], "texture": "#1"},
"up": {"uv": [8.5, 6.5, 7.75, 5.75], "texture": "#1"},
"down": {"uv": [9.25, 5.75, 8.5, 6.5], "texture": "#1"}
}
},
{
"name": "head",
"from": [7, 10, 7],
"to": [9, 14, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
"faces": {
"north": {"uv": [0.5, 0.5, 1, 1.5], "texture": "#1"},
"east": {"uv": [0, 0.5, 0.5, 1.5], "texture": "#1"},
"south": {"uv": [1.5, 0.5, 2, 1.5], "texture": "#1"},
"west": {"uv": [1, 0.5, 1.5, 1.5], "texture": "#1"},
"up": {"uv": [1, 0.5, 0.5, 0], "texture": "#1"},
"down": {"uv": [1.5, 0, 1, 0.5], "texture": "#1"}
}
},
{
"name": "head",
"from": [3, 14, 3],
"to": [13, 18, 13],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
"faces": {
"north": {"uv": [2.5, 2.5, 5, 3.5], "texture": "#1"},
"east": {"uv": [0, 2.5, 2.5, 3.5], "texture": "#1"},
"south": {"uv": [7.5, 2.5, 10, 3.5], "texture": "#1"},
"west": {"uv": [5, 2.5, 7.5, 3.5], "texture": "#1"},
"up": {"uv": [5, 2.5, 2.5, 0], "texture": "#1"},
"down": {"uv": [7.5, 0, 5, 2.5], "texture": "#1"}
}
},
{
"name": "head",
"from": [4, 18, 4],
"to": [12, 19, 12],
"rotation": {"angle": 0, "axis": "y", "origin": [8, -8, 8]},
"faces": {
"north": {"uv": [2, 5.5, 4, 5.75], "texture": "#1"},
"east": {"uv": [0, 5.5, 2, 5.75], "texture": "#1"},
"south": {"uv": [6, 5.5, 8, 5.75], "texture": "#1"},
"west": {"uv": [4, 5.5, 6, 5.75], "texture": "#1"},
"up": {"uv": [4, 5.5, 2, 3.5], "texture": "#1"},
"down": {"uv": [6, 3.5, 4, 5.5], "texture": "#1"}
}
}
],
"groups": [
{
"name": "head",
"origin": [8, 16, 8],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4]
}
]
}

View file

@ -0,0 +1,4 @@
{
"parent": "new_soviet:block/vintage_lamp"
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 884 B