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

Stop putting lamp posts in my games

Browse source
This commit is contained in:
Andrew-71 2023-09-04 17:24:07 +03:00
parent be4d1b5af8
commit 466408a67d
20 changed files with 631 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/main/resources/assets/new_soviet/blockstates/golden_table_lamp.json Normal file
View file

@ -0,0 +1,8 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/golden_table_lamp", "uvlock": true },
"facing=east": { "model": "new_soviet:block/golden_table_lamp", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/golden_table_lamp", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/golden_table_lamp", "y": 270, "uvlock": false }
}
}

10
src/main/resources/assets/new_soviet/blockstates/lamp_post_base.json Normal file
View file

@ -0,0 +1,10 @@
{
"variants": {
"attached=false": {
"model": "new_soviet:block/lamp_post_base"
},
"attached=true": {
"model": "new_soviet:block/lamp_post_base_attached"
}
}
}

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

@ -433,5 +433,7 @@
"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",
"block.new_soviet.vintage_lamp": "Vintage Lamp"
"block.new_soviet.vintage_lamp": "Vintage Lamp",
"block.new_soviet.golden_table_lamp": "Golden Lamp",
"block.new_soviet.lamp_post_base": "Lamp Post Base"
}

270
src/main/resources/assets/new_soviet/models/block/golden_table_lamp.json Normal file
View file

@ -0,0 +1,270 @@
{
"credit": "Made with Blockbench",
"texture_size": [32, 32],
"textures": {
"0": "new_soviet:block/custom/furniture/golden_table_lamp",
"particle": "new_soviet:block/custom/furniture/golden_table_lamp"
},
"elements": [
{
"from": [5, 0, 5],
"to": [11, 2, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [3, 5, 6, 6], "texture": "#0"},
"east": {"uv": [0, 5, 3, 6], "texture": "#0"},
"south": {"uv": [9, 5, 12, 6], "texture": "#0"},
"west": {"uv": [6, 5, 9, 6], "texture": "#0"},
"up": {"uv": [6, 5, 3, 2], "texture": "#0"},
"down": {"uv": [9, 2, 6, 5], "texture": "#0"}
}
},
{
"from": [7, 2, 7],
"to": [9, 4, 9],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [10, 12, 11, 13], "texture": "#0"},
"east": {"uv": [9, 12, 10, 13], "texture": "#0"},
"south": {"uv": [12, 12, 13, 13], "texture": "#0"},
"west": {"uv": [11, 12, 12, 13], "texture": "#0"},
"up": {"uv": [11, 12, 10, 11], "texture": "#0"},
"down": {"uv": [12, 11, 11, 12], "texture": "#0"}
}
},
{
"from": [6, 4, 6],
"to": [10, 5, 10],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [10, 8.5, 12, 9], "texture": "#0"},
"east": {"uv": [8, 8.5, 10, 9], "texture": "#0"},
"south": {"uv": [14, 8.5, 16, 9], "texture": "#0"},
"west": {"uv": [12, 8.5, 14, 9], "texture": "#0"},
"up": {"uv": [12, 8.5, 10, 6.5], "texture": "#0"},
"down": {"uv": [14, 6.5, 12, 8.5], "texture": "#0"}
}
},
{
"from": [8, 5, 7],
"to": [8, 11, 11],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [8, 9, 8, 12], "texture": "#0"},
"east": {"uv": [6, 9, 8, 12], "texture": "#0"},
"south": {"uv": [10, 9, 10, 12], "texture": "#0"},
"west": {"uv": [8, 9, 10, 12], "texture": "#0"},
"up": {"uv": [8, 9, 8, 7], "texture": "#0"},
"down": {"uv": [8, 7, 8, 9], "texture": "#0"}
}
},
{
"from": [2, 10, 8],
"to": [14, 11, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 6, 6, 6.5], "texture": "#0"},
"east": {"uv": [0, 6, 0, 6.5], "texture": "#0"},
"south": {"uv": [6, 6, 12, 6.5], "texture": "#0"},
"west": {"uv": [6, 6, 6, 6.5], "texture": "#0"},
"up": {"uv": [6, 6, 0, 6], "texture": "#0"},
"down": {"uv": [12, 6, 6, 6], "texture": "#0"}
}
},
{
"from": [14, 10, 5],
"to": [14, 11, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1.5, 4.5, 1.5, 5], "texture": "#0"},
"east": {"uv": [0, 4.5, 1.5, 5], "texture": "#0"},
"south": {"uv": [3, 4.5, 3, 5], "texture": "#0"},
"west": {"uv": [1.5, 4.5, 3, 5], "texture": "#0"},
"up": {"uv": [1.5, 4.5, 1.5, 3], "texture": "#0"},
"down": {"uv": [1.5, 3, 1.5, 4.5], "texture": "#0"}
}
},
{
"from": [2, 10, 5],
"to": [2, 11, 8],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1.5, 4.5, 1.5, 5], "texture": "#0"},
"east": {"uv": [3, 4.5, 1.5, 5], "texture": "#0"},
"south": {"uv": [3, 4.5, 3, 5], "texture": "#0"},
"west": {"uv": [1.5, 4.5, 0, 5], "texture": "#0"},
"up": {"uv": [1.5, 4.5, 1.5, 3], "texture": "#0"},
"down": {"uv": [1.5, 3, 1.5, 4.5], "texture": "#0"}
}
},
{
"from": [13, 10, 5],
"to": [14, 11, 5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1, 0, 1.5, 0.5], "texture": "#0"},
"east": {"uv": [1, 0, 1, 0.5], "texture": "#0"},
"south": {"uv": [1.5, 0, 2, 0.5], "texture": "#0"},
"west": {"uv": [1.5, 0, 1.5, 0.5], "texture": "#0"},
"up": {"uv": [1.5, 0, 1, 0], "texture": "#0"},
"down": {"uv": [2, 0, 1.5, 0], "texture": "#0"}
}
},
{
"from": [2, 10, 5],
"to": [3, 11, 5],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [1.5, 0, 1, 0.5], "texture": "#0"},
"east": {"uv": [1.5, 0, 1.5, 0.5], "texture": "#0"},
"south": {"uv": [2, 0, 1.5, 0.5], "texture": "#0"},
"west": {"uv": [1, 0, 1, 0.5], "texture": "#0"},
"up": {"uv": [1, 0, 1.5, 0], "texture": "#0"},
"down": {"uv": [1.5, 0, 2, 0], "texture": "#0"}
}
},
{
"from": [13, 9, 3],
"to": [13, 13, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [11, 2, 11, 4], "texture": "#0"},
"east": {"uv": [9, 2, 11, 4], "texture": "#0"},
"south": {"uv": [13, 2, 13, 4], "texture": "#0"},
"west": {"uv": [11, 2, 13, 4], "texture": "#0"},
"up": {"uv": [11, 2, 11, 0], "texture": "#0"},
"down": {"uv": [11, 0, 11, 2], "texture": "#0"}
}
},
{
"from": [3, 9, 3],
"to": [3, 13, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [11, 2, 11, 4], "texture": "#0"},
"east": {"uv": [9, 2, 11, 4], "texture": "#0"},
"south": {"uv": [13, 2, 13, 4], "texture": "#0"},
"west": {"uv": [11, 2, 13, 4], "texture": "#0"},
"up": {"uv": [11, 2, 11, 0], "texture": "#0"},
"down": {"uv": [11, 0, 11, 2], "texture": "#0"}
}
},
{
"from": [3, 13, 3],
"to": [13, 13, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [2, 2, 7, 2], "texture": "#0"},
"east": {"uv": [0, 2, 2, 2], "texture": "#0"},
"south": {"uv": [9, 2, 14, 2], "texture": "#0"},
"west": {"uv": [7, 2, 9, 2], "texture": "#0"},
"up": {"uv": [7, 2, 2, 0], "texture": "#0"},
"down": {"uv": [12, 0, 7, 2], "texture": "#0"}
}
},
{
"from": [3, 9, 7],
"to": [13, 13, 7],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 6.5, 5, 8.5], "texture": "#0"},
"east": {"uv": [0, 6.5, 0, 8.5], "texture": "#0"},
"south": {"uv": [5, 6.5, 10, 8.5], "texture": "#0"},
"west": {"uv": [5, 6.5, 5, 8.5], "texture": "#0"},
"up": {"uv": [5, 6.5, 0, 6.5], "texture": "#0"},
"down": {"uv": [10, 6.5, 5, 6.5], "texture": "#0"}
}
},
{
"from": [3, 9, 3],
"to": [13, 13, 3],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 6.5, 5, 8.5], "texture": "#0"},
"east": {"uv": [0, 6.5, 0, 8.5], "texture": "#0"},
"south": {"uv": [5, 6.5, 10, 8.5], "texture": "#0"},
"west": {"uv": [5, 6.5, 5, 8.5], "texture": "#0"},
"up": {"uv": [5, 6.5, 0, 6.5], "texture": "#0"},
"down": {"uv": [10, 6.5, 5, 6.5], "texture": "#0"}
}
},
{
"from": [4, 4, 3.2],
"to": [5, 13, 3.2],
"rotation": {"angle": 0, "axis": "y", "origin": [8, 0, 8]},
"faces": {
"north": {"uv": [0, 0, 0.5, 4.5], "texture": "#0"},
"east": {"uv": [0, 0, 0, 4.5], "texture": "#0"},
"south": {"uv": [0.5, 0, 1, 4.5], "texture": "#0"},
"west": {"uv": [0.5, 0, 0.5, 4.5], "texture": "#0"},
"up": {"uv": [0.5, 0, 0, 0], "texture": "#0"},
"down": {"uv": [1, 0, 0.5, 0], "texture": "#0"}
}
},
{
"from": [9, 10, 4],
"to": [11, 12, 6],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]},
"faces": {
"north": {"uv": [11, 10, 12, 11], "texture": "#0"},
"east": {"uv": [10, 10, 11, 11], "texture": "#0"},
"south": {"uv": [13, 10, 14, 11], "texture": "#0"},
"west": {"uv": [12, 10, 13, 11], "texture": "#0"},
"up": {"uv": [12, 10, 11, 9], "texture": "#0"},
"down": {"uv": [13, 9, 12, 10], "texture": "#0"}
}
},
{
"from": [6, 9.5, 3.5],
"to": [9, 12.5, 6.5],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]},
"faces": {
"north": {"uv": [1.5, 10, 3, 11.5], "texture": "#0"},
"east": {"uv": [0, 10, 1.5, 11.5], "texture": "#0"},
"south": {"uv": [4.5, 10, 6, 11.5], "texture": "#0"},
"west": {"uv": [3, 10, 4.5, 11.5], "texture": "#0"},
"up": {"uv": [3, 10, 1.5, 8.5], "texture": "#0"},
"down": {"uv": [4.5, 8.5, 3, 10], "texture": "#0"}
}
},
{
"from": [11, 12, 4.5],
"to": [11, 13, 5.5],
"rotation": {"angle": 0, "axis": "y", "origin": [6, 0, 6]},
"faces": {
"north": {"uv": [1.5, 0.5, 1.5, 1], "texture": "#0"},
"east": {"uv": [1, 0.5, 1.5, 1], "texture": "#0"},
"south": {"uv": [2, 0.5, 2, 1], "texture": "#0"},
"west": {"uv": [1.5, 0.5, 2, 1], "texture": "#0"},
"up": {"uv": [1.5, 0.5, 1.5, 0], "texture": "#0"},
"down": {"uv": [1.5, 0, 1.5, 0.5], "texture": "#0"}
}
}
],
"groups": [
{
"name": "group",
"origin": [8, 0, 8],
"color": 0,
"nbt": "{}",
"children": [
0,
1,
2,
3,
4,
5,
6,
7,
8,
{
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"nbt": "{}",
"children": [9, 10, 11, 12, 13, 14, 15, 16, 17]
}
]
}
]
}

80
src/main/resources/assets/new_soviet/models/block/lamp_post_base.json Normal file
View file

@ -0,0 +1,80 @@
{
"credit": "Made with Blockbench",
"texture_size": [48, 48],
"textures": {
"0": "new_soviet:block/custom/lamp_post",
"particle": "new_soviet:block/custom/lamp_post"
},
"elements": [
{
"from": [7, 5, 7],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [0.66667, 10.01066, 1.33334, 13.67733], "texture": "#0"},
"east": {"uv": [0, 10.01066, 0.66667, 13.67733], "texture": "#0"},
"south": {"uv": [2, 10.01066, 2.66667, 13.67733], "texture": "#0"},
"west": {"uv": [1.33333, 10.01066, 2, 13.67733], "texture": "#0"},
"up": {"uv": [1.32267, 0.656, 0.67733, 0.01067], "texture": "#0"}
}
},
{
"from": [6, 0, 6],
"to": [10, 5, 10],
"faces": {
"north": {"uv": [9.344, 7.01067, 10.656, 8.656], "texture": "#0"},
"east": {"uv": [8.01067, 7.01067, 9.32267, 8.656], "texture": "#0"},
"south": {"uv": [12.01067, 7.01067, 13.32267, 8.656], "texture": "#0"},
"west": {"uv": [10.67733, 7.01067, 11.98933, 8.656], "texture": "#0"},
"up": {"uv": [10.656, 6.98933, 9.344, 5.67733], "texture": "#0"},
"down": {"uv": [11.98933, 5.67733, 10.67733, 6.98933], "texture": "#0"}
}
},
{
"from": [6.5, 9, 6.5],
"to": [9.5, 11, 9.5],
"faces": {
"north": {"uv": [3.67733, 11.67733, 4.656, 12.32267], "texture": "#0"},
"east": {"uv": [2.67733, 11.67733, 3.656, 12.32267], "texture": "#0"},
"south": {"uv": [5.67733, 11.67733, 6.656, 12.32267], "texture": "#0"},
"west": {"uv": [4.67733, 11.67733, 5.656, 12.32267], "texture": "#0"},
"up": {"uv": [4.656, 11.656, 3.67733, 10.67733], "texture": "#0"},
"down": {"uv": [5.656, 10.67733, 4.67733, 11.656], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, -1, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
}
}
}

57
src/main/resources/assets/new_soviet/models/block/lamp_post_base_attached.json Normal file
View file

@ -0,0 +1,57 @@
{
"credit": "Made with Blockbench",
"texture_size": [48, 48],
"textures": {
"0": "new_soviet:block/custom/lamp_post",
"particle": "new_soviet:block/custom/lamp_post"
},
"elements": [
{
"from": [7, 0, 7],
"to": [9, 16, 9],
"faces": {
"north": {"uv": [0.66667, 4.67733, 1.33334, 10.01066], "texture": "#0"},
"east": {"uv": [0, 4.67733, 0.66667, 10.01066], "texture": "#0"},
"south": {"uv": [2, 4.67733, 2.66667, 10.01066], "texture": "#0"},
"west": {"uv": [1.33333, 4.67733, 2, 10.01066], "texture": "#0"},
"up": {"uv": [1.32267, 0.656, 0.67733, 0.01067], "texture": "#0"},
"down": {"uv": [1.98933, 0.01067, 1.344, 0.656], "texture": "#0"}
}
}
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
},
"firstperson_righthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"firstperson_lefthand": {
"rotation": [0, 45, 0],
"translation": [1.75, 2, 0],
"scale": [0.4, 0.4, 0.4]
},
"ground": {
"translation": [0, -1, 0],
"scale": [0.25, 0.25, 0.25]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
}
}
}

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

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

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

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

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 789 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 991 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 875 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.2 KiB

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 830 B