Add antenna and crude Green TV

This commit is contained in:
Andrew-71 2023-10-31 21:34:54 +03:00
parent 4873b24911
commit b37e62cc47
49 changed files with 596 additions and 39 deletions

View file

@ -0,0 +1,135 @@
{
"variants": {
"facing=north,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv", "uvlock": true
},
"facing=north,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv_on", "uvlock": true
},
"facing=north,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv_on", "uvlock": true
},
"facing=north,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv", "uvlock": true
},
"facing=north,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "uvlock": true
}
],
"facing=north,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "uvlock": true
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "uvlock": true
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "uvlock": true
}
],
"facing=east,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv_on", "y": 90, "uvlock": false
},
"facing=east,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv", "y": 90, "uvlock": false
},
"facing=east,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 90, "uvlock": false
}
],
"facing=east,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 90, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 90, "uvlock": false
}
],
"facing=south,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv_on", "y": 180, "uvlock": false
},
"facing=south,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv", "y": 180, "uvlock": false
},
"facing=south,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=south,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 180, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 180, "uvlock": false
}
],
"facing=west,lit=false,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false,inverted=false": {
"model": "new_soviet:block/tv/green_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv_on", "y": 270, "uvlock": false
},
"facing=west,lit=true,cracked=false,inverted=true": {
"model": "new_soviet:block/tv/green_tv", "y": 270, "uvlock": false
},
"facing=west,lit=false,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 270, "uvlock": false
}
],
"facing=west,lit=true,cracked=true": [{
"model": "new_soviet:block/tv/green_tv_broken1", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken2", "y": 270, "uvlock": false
},
{
"model": "new_soviet:block/tv/green_tv_broken3", "y": 270, "uvlock": false
}
]
}
}

View file

@ -487,6 +487,7 @@
"subtitles.new_soviet.tv_on": "TV turned on",
"subtitles.new_soviet.tv_off": "TV turned off",
"subtitles.new_soviet.tv_break": "TV screen shattered",
"item.new_soviet.antenna": "Antenna",
"advancement.new_soviet.root.name": "A New Era",
"advancement.new_soviet.root.desc": "Time to create something great",
@ -499,5 +500,7 @@
"advancement.new_soviet.serious_addiction.name": "Serious addiction",
"advancement.new_soviet.serious_addiction.desc": "Throw a die 1000 times, and then reevaluate your life choices",
"advancement.new_soviet.lucky_throw.name": "Lucky throw",
"advancement.new_soviet.lucky_throw.desc": "Roll a perfect die 100 times"
"advancement.new_soviet.lucky_throw.desc": "Roll a perfect die 100 times",
"advancement.new_soviet.antenna.name": "Establishing a connection",
"advancement.new_soviet.antenna.desc": "Craft an antenna"
}

View file

@ -487,6 +487,7 @@
"subtitles.new_soviet.tv_on": "Включается тѣлѣвизоръ",
"subtitles.new_soviet.tv_off": "Выключается тѣлѣвизоръ",
"subtitles.new_soviet.tv_break": "Разбитъ экранъ тѣлѣвизора",
"item.new_soviet.antenna": "Антенна",
"advancement.new_soviet.root.name": "Новыя эра!",
"advancement.new_soviet.root.desc": "Врѣмя совѣршать вѣликое!",

View file

@ -487,6 +487,7 @@
"subtitles.new_soviet.tv_on": "Включается телевизор",
"subtitles.new_soviet.tv_off": "Выключается телевизор",
"subtitles.new_soviet.tv_break": "Разбит экран телевизора",
"item.new_soviet.antenna": "Антенна",
"advancement.new_soviet.root.name": "Новая эра!",
"advancement.new_soviet.root.desc": "Время совершать великое!",
@ -499,5 +500,7 @@
"advancement.new_soviet.serious_addiction.name": "Серьезная зависимость",
"advancement.new_soviet.serious_addiction.desc": "Бросьте кубик 1000 раз, а затем переоцените свои жизненные выборы",
"advancement.new_soviet.lucky_throw.name": "Счастливый бросок",
"advancement.new_soviet.lucky_throw.desc": "Кинуть кубик 100 раз и получить максимально число"
"advancement.new_soviet.lucky_throw.desc": "Кинуть кубик 100 раз и получить максимально число",
"advancement.new_soviet.antenna.name": "Устанавливаем соединение...",
"advancement.new_soviet.antenna.desc": "Сделай антенну"
}

View file

@ -0,0 +1,8 @@
{
"parent": "new_soviet:block/tv/tv",
"textures": {
"0": "new_soviet:block/custom/electronics/tv/green_tv",
"1": "new_soviet:block/custom/electronics/tv/tv_screen_normal",
"2": "new_soviet:block/custom/electronics/tv/carpets/carpet_null"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/green_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/green_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/green_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "new_soviet:block/tv/green_tv",
"textures": {
"1": "new_soviet:block/custom/electronics/tv/tv_screen_noise"
}
}

View file

@ -0,0 +1,6 @@
{
"parent": "item/generated",
"textures": {
"layer0": "new_soviet:item/antenna"
}
}

View file

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

View file

@ -1,5 +1,4 @@
{
"credit": "Karoter2",
"parent": "item/generated",
"textures": {
"layer0": "new_soviet:item/bulb"

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 266 B

After

Width:  |  Height:  |  Size: 382 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 456 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 687 B

After

Width:  |  Height:  |  Size: 416 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 518 B

After

Width:  |  Height:  |  Size: 380 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 469 B

After

Width:  |  Height:  |  Size: 390 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 569 B

After

Width:  |  Height:  |  Size: 437 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 491 B

After

Width:  |  Height:  |  Size: 363 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 576 B

After

Width:  |  Height:  |  Size: 436 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 481 B

After

Width:  |  Height:  |  Size: 407 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 557 B

After

Width:  |  Height:  |  Size: 472 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 434 B

After

Width:  |  Height:  |  Size: 460 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 490 B

After

Width:  |  Height:  |  Size: 472 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

After

Width:  |  Height:  |  Size: 506 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 366 B

After

Width:  |  Height:  |  Size: 415 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 351 B

After

Width:  |  Height:  |  Size: 368 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 520 B

After

Width:  |  Height:  |  Size: 346 B

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 367 B