Ethyl/New-Soviet-Era
Ethyl/New-Soviet-Era
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Lightbulb and fixes

Browse source
This commit is contained in:
Andrew-71 2023-08-06 17:37:19 +03:00
parent ea5af6ca06
commit d99e8fd54c
16 changed files with 338 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/main/resources/assets/new_soviet/blockstates/light_bulb.json Normal file
View file

@ -0,0 +1,16 @@
{
"variants": {
"lit=true,cracked=true": {
"model": "new_soviet:block/light_bulb_broken"
},
"lit=true,cracked=false": {
"model": "new_soviet:block/light_bulb_on"
},
"lit=false,cracked=false": {
"model": "new_soviet:block/light_bulb_off"
},
"lit=false,cracked=true": {
"model": "new_soviet:block/light_bulb_broken"
}
}
}

4
src/main/resources/assets/new_soviet/lang/en_us.json
View file

@ -148,5 +148,7 @@
"block.new_soviet.white_concrete_with_bars": "White Concrete With Bars",
"block.new_soviet.green_concrete_with_bars": "Green Concrete With Bars",
"block.new_soviet.blue_concrete_with_bars": "Blue Concrete With Bars",
"block.new_soviet.red_concrete_with_bars": "Red 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"
}

84
src/main/resources/assets/new_soviet/models/block/light_bulb_broken.json Normal file
View file

@ -0,0 +1,84 @@
{
"credit": "Made by Feulim (karoter2)",
"textures": {
"0": "new_soviet:block/custom/furniture/light_bulb_off",
"particle": "new_soviet:block/custom/furniture/light_bulb_off"
},
"elements": [
{
"from": [7, 6, 7],
"to": [9, 8, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [7, 0, 5, 2], "texture": "#0"},
"east": {"uv": [5, 0, 7, 2], "texture": "#0"},
"south": {"uv": [7, 0, 5, 2], "texture": "#0"},
"west": {"uv": [5, 0, 7, 2], "texture": "#0"},
"up": {"uv": [7, 4, 5, 2], "texture": "#0"},
"down": {"uv": [16, 14, 14, 16], "texture": "#0"}
}
},
{
"from": [8, 5, 7.5],
"to": [8, 16, 8.5],
"rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 0, 11], "texture": "#0"},
"east": {"uv": [0, 0, 1, 11], "texture": "#0"},
"south": {"uv": [0, 0, 0, 11], "texture": "#0"},
"west": {"uv": [0, 0, 1, 11], "texture": "#0"},
"up": {"uv": [0, 0, 0, 1], "texture": "#0"},
"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
}
},
{
"from": [8, 5, 7.5],
"to": [8, 16, 8.5],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 0, 11], "texture": "#0"},
"east": {"uv": [1, 0, 2, 11], "texture": "#0"},
"south": {"uv": [0, 0, 0, 11], "texture": "#0"},
"west": {"uv": [1, 0, 2, 11], "texture": "#0"},
"up": {"uv": [0, 1, 0, 0], "texture": "#0"},
"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
}
},
{
"from": [7, 15.5, 7],
"to": [9, 16.5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [9, 0, 7, 1], "texture": "#0"},
"east": {"uv": [7, 0, 9, 1], "texture": "#0"},
"south": {"uv": [9, 0, 7, 1], "texture": "#0"},
"west": {"uv": [7, 0, 9, 1], "texture": "#0"},
"up": {"uv": [16, 16, 14, 14], "texture": "#0"},
"down": {"uv": [5, 9, 3, 11], "texture": "#0"}
}
},
{
"name": "cube_outline",
"from": [9, 8, 9],
"to": [7, 6, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [7, 0, 5, 2], "rotation": 180, "texture": "#0"},
"east": {"uv": [5, 0, 7, 2], "rotation": 180, "texture": "#0"},
"south": {"uv": [7, 0, 5, 2], "rotation": 180, "texture": "#0"},
"west": {"uv": [5, 0, 7, 2], "rotation": 180, "texture": "#0"},
"up": {"uv": [16, 14, 14, 16], "rotation": 180, "texture": "#0"},
"down": {"uv": [7, 4, 5, 2], "rotation": 180, "texture": "#0"}
}
}
],
"groups": [
{
"name": "group",
"origin": [16, 8, 16],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4]
}
]
}

7
src/main/resources/assets/new_soviet/models/block/light_bulb_off.json Normal file
View file

@ -0,0 +1,7 @@
{
"parent": "new_soviet:block/light_bulb_on",
"textures": {
"0": "new_soviet:block/custom/furniture/light_bulb_off",
"particle": "new_soviet:block/custom/furniture/light_bulb_off"
}
}

83
src/main/resources/assets/new_soviet/models/block/light_bulb_on.json Normal file
View file

@ -0,0 +1,83 @@
{
"credit": "Made by Feulim (karoter2)",
"textures": {
"0": "new_soviet:block/custom/furniture/light_bulb_on",
"particle": "new_soviet:block/custom/furniture/light_bulb_on"
},
"elements": [
{
"from": [6.5, 3, 6.5],
"to": [9.5, 6, 9.5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [2, 3, 5, 0], "texture": "#0"},
"east": {"uv": [2, 3, 5, 0], "texture": "#0"},
"south": {"uv": [2, 3, 5, 0], "texture": "#0"},
"west": {"uv": [2, 3, 5, 0], "texture": "#0"},
"up": {"uv": [5, 6, 2, 3], "texture": "#0"},
"down": {"uv": [5, 6, 2, 9], "texture": "#0"}
}
},
{
"from": [7, 6, 7],
"to": [9, 8, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [7, 0, 5, 2], "texture": "#0"},
"east": {"uv": [5, 0, 7, 2], "texture": "#0"},
"south": {"uv": [7, 0, 5, 2], "texture": "#0"},
"west": {"uv": [5, 0, 7, 2], "texture": "#0"},
"up": {"uv": [7, 4, 5, 2], "texture": "#0"},
"down": {"uv": [16, 14, 14, 16], "texture": "#0"}
}
},
{
"from": [8, 5, 7.5],
"to": [8, 16, 8.5],
"rotation": {"angle": -45, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 0, 11], "texture": "#0"},
"east": {"uv": [0, 0, 1, 11], "texture": "#0"},
"south": {"uv": [0, 0, 0, 11], "texture": "#0"},
"west": {"uv": [0, 0, 1, 11], "texture": "#0"},
"up": {"uv": [0, 0, 0, 1], "texture": "#0"},
"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
}
},
{
"from": [8, 5, 7.5],
"to": [8, 16, 8.5],
"rotation": {"angle": 45, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 0, 11], "texture": "#0"},
"east": {"uv": [1, 0, 2, 11], "texture": "#0"},
"south": {"uv": [0, 0, 0, 11], "texture": "#0"},
"west": {"uv": [1, 0, 2, 11], "texture": "#0"},
"up": {"uv": [0, 1, 0, 0], "texture": "#0"},
"down": {"uv": [0, 0, 0, 1], "texture": "#0"}
}
},
{
"from": [7, 15.5, 7],
"to": [9, 16.5, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [9, 0, 7, 1], "texture": "#0"},
"east": {"uv": [7, 0, 9, 1], "texture": "#0"},
"south": {"uv": [9, 0, 7, 1], "texture": "#0"},
"west": {"uv": [7, 0, 9, 1], "texture": "#0"},
"up": {"uv": [16, 16, 14, 14], "texture": "#0"},
"down": {"uv": [5, 9, 3, 11], "texture": "#0"}
}
}
],
"groups": [
{
"name": "group",
"origin": [16, 8, 16],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4]
}
]
}

3
src/main/resources/assets/new_soviet/models/item/light_bulb.json Normal file
View file

@ -0,0 +1,3 @@
{
"parent": "new_soviet:block/light_bulb_off"
}

6
src/main/resources/assets/new_soviet/sounds.json
View file

@ -10,6 +10,12 @@
"sounds": [
"new_soviet:siren"
]
},
"light_bulb_broken_sound": {
"subtitle": "subtitles.new_soviet.light_bulb_broken",
"sounds": [
"new_soviet:light_bulb_broken"
]
}
}

1
src/main/resources/assets/new_soviet/sounds/LICENSE Normal file
View file

@ -0,0 +1 @@
File light_bulb_broken.ogg is converted .mp3 file made by Mike Koenig, which is licensed under CC Attribution 3.0 (https://creativecommons.org/licenses/by/3.0/). Original file is available at https://soundbible.com/105-Light-Bulb-Breaking.html

BIN
src/main/resources/assets/new_soviet/sounds/light_bulb_broken.ogg Normal file
View file

Binary file not shown.

BIN
src/main/resources/assets/new_soviet/textures/block/custom/furniture/light_bulb_off.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 276 B

BIN
src/main/resources/assets/new_soviet/textures/block/custom/furniture/light_bulb_on.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 306 B