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

Various fixes and changes, see CHANGELOG

Browse source
This commit is contained in:
Andrew-71 2023-10-19 20:59:58 +03:00
parent 24e07523da
commit 55724bb0a2
140 changed files with 1074 additions and 3141 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{
"variants": {
"checkers=1": {
"model": "new_soviet:block/black_checker"
"model": "new_soviet:block/checkers/black_checker"
},
"checkers=2": {
"model": "new_soviet:block/black_checker2"
"model": "new_soviet:block/checkers/black_checker2"
},
"checkers=3": {
"model": "new_soviet:block/black_checker3"
"model": "new_soviet:block/checkers/black_checker3"
},
"checkers=4": {
"model": "new_soviet:block/black_checker4"
"model": "new_soviet:block/checkers/black_checker4"
}
}
}

118
src/main/resources/assets/new_soviet/blockstates/brown_tv.json
View file

@ -1,11 +1,17 @@
{
"variants": {
"facing=north,lit=false,cracked=false": {
"facing=north,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv", "uvlock": true
},
"facing=north,lit=true,cracked=false": {
"facing=north,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv_on", "uvlock": true
},
"facing=north,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "uvlock": true
},
@ -16,55 +22,113 @@
"model": "new_soviet:block/tv/brown_tv_broken3", "uvlock": true
}
],
"facing=north,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/brown_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"facing=east,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"facing=east,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 90, "uvlock": false
"facing=east,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 90, "uvlock": false
"facing=east,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 90, "uvlock": false
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 90, "uvlock": false
}
],
"facing=east,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false
"facing=south,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false
"facing=south,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 180, "uvlock": false
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 180, "uvlock": false
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=south,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false
"facing=west,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false
"facing=west,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/brown_tv", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2","y": 270, "uvlock": false
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3","y": 270, "uvlock": false
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 270, "uvlock": false
}
],
"facing=west,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/brown_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/brown_tv_broken3", "y": 270, "uvlock": false
}
]
}

110
src/main/resources/assets/new_soviet/blockstates/red_tv.json
View file

@ -1,11 +1,17 @@
{
"variants": {
"facing=north,lit=false,cracked=false": {
"facing=north,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv", "uvlock": true
},
"facing=north,lit=true,cracked=false": {
"facing=north,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv_on", "uvlock": true
},
"facing=north,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "uvlock": true
},
@ -16,15 +22,41 @@
"model": "new_soviet:block/tv/red_tv_broken3", "uvlock": true
}
],
"facing=north,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/red_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"facing=east,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"facing=east,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 90, "uvlock": false
"model": "new_soviet:block/tv/red_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 90, "uvlock": false
}
],
"facing=east,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 90, "uvlock": false
@ -34,37 +66,69 @@
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false
"facing=south,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false
"facing=south,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 180, "uvlock": false
"model": "new_soviet:block/tv/red_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 180, "uvlock": false
"model": "new_soviet:block/tv/red_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=south,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false
"facing=west,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false
"facing=west,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/red_tv", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2","y": 270, "uvlock": false
"model": "new_soviet:block/tv/red_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3","y": 270, "uvlock": false
"model": "new_soviet:block/tv/red_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "y": 270, "uvlock": false
}
],
"facing=west,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/red_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/red_tv_broken3", "y": 270, "uvlock": false
}
]
}

118
src/main/resources/assets/new_soviet/blockstates/tv.json
View file

@ -1,11 +1,17 @@
{
"variants": {
"facing=north,lit=false,cracked=false": {
"facing=north,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv", "uvlock": true
},
"facing=north,lit=true,cracked=false": {
"facing=north,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv_on", "uvlock": true
},
"facing=north,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "uvlock": true
},
@ -16,55 +22,113 @@
"model": "new_soviet:block/tv/tv_broken3", "uvlock": true
}
],
"facing=north,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false": {
"facing=east,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false": {
"facing=east,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 90, "uvlock": false
"facing=east,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv_on", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 90, "uvlock": false
"facing=east,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 90, "uvlock": false
"model": "new_soviet:block/tv/tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 90, "uvlock": false
}
],
"facing=east,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false": {
"model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false
"facing=south,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false
"facing=south,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 180, "uvlock": false
"model": "new_soviet:block/tv/tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 180, "uvlock": false
"model": "new_soviet:block/tv/tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 180, "uvlock": false
}
],
"facing=south,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false": {
"model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false
"facing=west,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false": {
"model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false
"facing=west,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/tv", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1","y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2","y": 270, "uvlock": false
"model": "new_soviet:block/tv/tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3","y": 270, "uvlock": false
"model": "new_soviet:block/tv/tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 270, "uvlock": false
}
],
"facing=west,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/tv_broken3", "y": 270, "uvlock": false
}
]
}

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

@ -1,16 +1,16 @@
{
"variants": {
"checkers=1": {
"model": "new_soviet:block/white_checker"
"model": "new_soviet:block/checkers/white_checker"
},
"checkers=2": {
"model": "new_soviet:block/white_checker2"
"model": "new_soviet:block/checkers/white_checker2"
},
"checkers=3": {
"model": "new_soviet:block/white_checker3"
"model": "new_soviet:block/checkers/white_checker3"
},
"checkers=4": {
"model": "new_soviet:block/white_checker4"
"model": "new_soviet:block/checkers/white_checker4"
}
}
}