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

Add concrete with bars functionality and other minor improvements

Browse source
This commit is contained in:
Andrew-71 2023-09-29 13:18:16 +03:00
parent 55c1976583
commit c1d7208ae8
15 changed files with 212 additions and 140 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/main/resources/assets/new_soviet/blockstates/beige_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/beige_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/beige_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

12
src/main/resources/assets/new_soviet/blockstates/blue_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/blue_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/blue_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}

14
src/main/resources/assets/new_soviet/blockstates/green_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/green_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/green_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/green_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

14
src/main/resources/assets/new_soviet/blockstates/red_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/red_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/red_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/red_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

14
src/main/resources/assets/new_soviet/blockstates/white_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/white_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/white_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/white_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

14
src/main/resources/assets/new_soviet/blockstates/yellow_concrete_with_bars.json
View file

@ -1,8 +1,12 @@
{
"variants": {
"facing=north": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": true },
"facing=east": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false }
"facing=north,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "uvlock": false },
"facing=east,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 90, "uvlock": false },
"facing=south,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 180, "uvlock": false },
"facing=west,vertical_direction=up": { "model": "new_soviet:block/yellow_concrete_with_bars", "y": 270, "uvlock": false },
"facing=north,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "uvlock": false },
"facing=east,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 90, "uvlock": false },
"facing=south,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 180, "uvlock": false },
"facing=west,vertical_direction=down": { "model": "new_soviet:block/yellow_concrete_with_bars", "x": 180, "y": 270, "uvlock": false }
}
}
}

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

@ -241,12 +241,17 @@
}
}
],
"display": {
"gui": {
"rotation": [30, 225, 0],
"translation": [-0.5, 1.5, 0]
}
},
"groups": [
{
"name": "group",
"origin": [8, 0, 8],
"color": 0,
"nbt": "{}",
"children": [
0,
1,
@ -261,7 +266,6 @@
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"nbt": "{}",
"children": [9, 10, 11, 12, 13, 14, 15, 16, 17]
}
]

37
src/main/resources/assets/new_soviet/models/block/lamp_post.json
View file

@ -112,42 +112,24 @@
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"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]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, -1.75, 0],
"scale": [0.25, 0.25, 0.25]
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [-2.5, 1.5, 0],
"scale": [0.625, 0.625, 0.625]
"translation": [-3.5, 1, 0],
"scale": [0.8, 0.8, 0.8]
},
"head": {
"rotation": [85, -180, 90],
"translation": [-7, 22.5, 8]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
"translation": [0, 11, 0]
}
},
"groups": [
@ -155,7 +137,6 @@
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4, 5]
},
6,

37
src/main/resources/assets/new_soviet/models/block/lamp_post_2.json
View file

@ -91,42 +91,24 @@
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, -0.5, 0],
"scale": [0.375, 0.375, 0.375]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"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]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, -1, 0],
"scale": [0.25, 0.25, 0.25]
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [-2.5, 1.5, 0],
"scale": [0.625, 0.625, 0.625]
"translation": [-3.5, 1, 0],
"scale": [0.8, 0.8, 0.8]
},
"head": {
"rotation": [75, -180, 90],
"translation": [-7, 22.5, 8]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
"translation": [0, 11, 0]
}
},
"groups": [
@ -134,7 +116,6 @@
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3]
},
4,

36
src/main/resources/assets/new_soviet/models/block/lamp_post_3.json
View file

@ -63,41 +63,24 @@
],
"display": {
"thirdperson_righthand": {
"rotation": [75, 45, 0],
"translation": [0, 1, 0],
"scale": [0.375, 0.375, 0.375]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"rotation": [75, 45, 0],
"translation": [0, 1, 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]
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, -2, 0],
"scale": [0.25, 0.25, 0.25]
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"scale": [0.625, 0.625, 0.625]
"translation": [0, -1, 0],
"scale": [0.8, 0.8, 0.8]
},
"head": {
"rotation": [-90, -180, 0],
"translation": [-7, 22.5, 14.5]
},
"fixed": {
"rotation": [-90, 0, 0],
"translation": [0, 0, -16],
"scale": [2, 2, 2]
"translation": [0, 11, 0]
}
},
"groups": [
@ -105,7 +88,6 @@
"name": "group",
"origin": [0, 0, 0],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2]
},
3,

24
src/main/resources/assets/new_soviet/models/block/lamp_post_4.json
View file

@ -85,12 +85,33 @@
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [-3.5, 1, 0],
"scale": [0.8, 0.8, 0.8]
},
"head": {
"translation": [0, 11, 0]
}
},
"groups": [
{
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"nbt": "{}",
"children": [
0,
1,
@ -101,7 +122,6 @@
"name": "group",
"origin": [8, 8, 8],
"color": 0,
"nbt": "{}",
"children": [5, 6]
}
]

33
src/main/resources/assets/new_soviet/models/block/vintage_lamp.json
View file

@ -77,12 +77,43 @@
}
}
],
"display": {
"thirdperson_righthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"thirdperson_lefthand": {
"translation": [0, 3, 1],
"scale": [0.55, 0.55, 0.55]
},
"firstperson_righthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"firstperson_lefthand": {
"rotation": [0, -90, 25],
"translation": [1.13, 3.2, 1.13],
"scale": [0.68, 0.68, 0.68]
},
"ground": {
"translation": [0, 2, 0],
"scale": [0.5, 0.5, 0.5]
},
"gui": {
"rotation": [30, 225, 0],
"translation": [0, -1, 0],
"scale": [0.7, 0.7, 0.7]
},
"fixed": {
"rotation": [0, 180, 0]
}
},
"groups": [
{
"name": "head",
"origin": [8, 16, 8],
"color": 0,
"nbt": "{}",
"children": [0, 1, 2, 3, 4]
}
]