From b37e62cc47f40e2bed810526411be6b63797c425 Mon Sep 17 00:00:00 2001 From: Andrew-71 Date: Tue, 31 Oct 2023 21:34:54 +0300 Subject: [PATCH] Add antenna and crude Green TV --- .../su/a71/new_soviet/NewSovietClient.java | 1 + .../advancements/new_soviet/antenna.json | 39 +++++ .../recipes/decorations/brown_tv.json | 32 ++++- .../recipes/decorations/green_tv.json | 100 +++++++++++++ .../recipes/decorations/red_tv.json | 32 ++++- .../advancements/recipes/decorations/tv.json | 32 ++++- .../advancements/recipes/misc/antenna.json | 48 +++++++ .../data/new_soviet/recipes/antenna.json | 21 +++ .../data/new_soviet/recipes/brown_tv.json | 16 ++- .../data/new_soviet/recipes/green_tv.json | 33 +++++ .../data/new_soviet/recipes/red_tv.json | 16 ++- .../generated/data/new_soviet/recipes/tv.json | 16 ++- .../data/new_soviet/tags/blocks/tv.json | 3 +- .../a71/new_soviet/datagen/Advancements.java | 20 ++- .../new_soviet/datagen/BlockTagGenerator.java | 3 +- .../new_soviet/datagen/RecipeGenerator.java | 26 +++- .../new_soviet/registration/NSE_Custom.java | 5 +- .../new_soviet/registration/NSE_Items.java | 4 +- .../new_soviet/blockstates/green_tv.json | 135 ++++++++++++++++++ .../assets/new_soviet/lang/en_us.json | 5 +- .../resources/assets/new_soviet/lang/rpr.json | 1 + .../assets/new_soviet/lang/ru_ru.json | 5 +- .../new_soviet/models/block/tv/green_tv.json | 8 ++ .../models/block/tv/green_tv_broken1.json | 6 + .../models/block/tv/green_tv_broken2.json | 6 + .../models/block/tv/green_tv_broken3.json | 6 + .../models/block/tv/green_tv_on.json | 6 + .../new_soviet/models/item/antenna.json | 6 + .../new_soviet/models/item/green_tv.json | 3 + .../models/item/light_bulb_item.json | 1 - .../block/custom/electronics/tv/blue_tv.png | Bin 0 -> 1360 bytes .../electronics/tv/carpets/carpet_black.png | Bin 266 -> 382 bytes .../electronics/tv/carpets/carpet_blue.png | Bin 520 -> 456 bytes .../electronics/tv/carpets/carpet_brown.png | Bin 687 -> 416 bytes .../electronics/tv/carpets/carpet_cyan.png | Bin 518 -> 380 bytes .../electronics/tv/carpets/carpet_gray.png | Bin 469 -> 390 bytes .../electronics/tv/carpets/carpet_green.png | Bin 569 -> 437 bytes .../tv/carpets/carpet_light_blue.png | Bin 491 -> 363 bytes .../tv/carpets/carpet_light_gray.png | Bin 576 -> 436 bytes .../electronics/tv/carpets/carpet_lime.png | Bin 481 -> 407 bytes .../electronics/tv/carpets/carpet_magenta.png | Bin 557 -> 472 bytes .../electronics/tv/carpets/carpet_orange.png | Bin 434 -> 460 bytes .../electronics/tv/carpets/carpet_pink.png | Bin 490 -> 472 bytes .../electronics/tv/carpets/carpet_purple.png | Bin 459 -> 506 bytes .../electronics/tv/carpets/carpet_red.png | Bin 366 -> 415 bytes .../electronics/tv/carpets/carpet_white.png | Bin 351 -> 368 bytes .../electronics/tv/carpets/carpet_yellow.png | Bin 520 -> 346 bytes .../block/custom/electronics/tv/green_tv.png | Bin 0 -> 1379 bytes .../new_soviet/textures/item/antenna.png | Bin 0 -> 367 bytes 49 files changed, 596 insertions(+), 39 deletions(-) create mode 100644 src/main/generated/data/minecraft/advancements/new_soviet/antenna.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/decorations/green_tv.json create mode 100644 src/main/generated/data/new_soviet/advancements/recipes/misc/antenna.json create mode 100644 src/main/generated/data/new_soviet/recipes/antenna.json create mode 100644 src/main/generated/data/new_soviet/recipes/green_tv.json create mode 100644 src/main/resources/assets/new_soviet/blockstates/green_tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/green_tv.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken1.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken2.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken3.json create mode 100644 src/main/resources/assets/new_soviet/models/block/tv/green_tv_on.json create mode 100644 src/main/resources/assets/new_soviet/models/item/antenna.json create mode 100644 src/main/resources/assets/new_soviet/models/item/green_tv.json create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/blue_tv.png create mode 100644 src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/green_tv.png create mode 100644 src/main/resources/assets/new_soviet/textures/item/antenna.png diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 8199a9a..8918711 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -34,6 +34,7 @@ public class NewSovietClient implements ClientModInitializer { BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.TV, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RED_TV, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.BROWN_TV, RenderLayer.getCutout()); + BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.GREEN_TV, RenderLayer.getCutout()); BlockRenderLayerMap.INSTANCE.putBlock(NSE_Custom.RADIO_RECEIVER, RenderLayer.getCutout()); diff --git a/src/main/generated/data/minecraft/advancements/new_soviet/antenna.json b/src/main/generated/data/minecraft/advancements/new_soviet/antenna.json new file mode 100644 index 0000000..32bc760 --- /dev/null +++ b/src/main/generated/data/minecraft/advancements/new_soviet/antenna.json @@ -0,0 +1,39 @@ +{ + "parent": "minecraft:new_soviet/root", + "criteria": { + "got_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + } + }, + "display": { + "announce_to_chat": true, + "background": "minecraft:textures/gui/advancements/backgrounds/adventure.png", + "description": { + "translate": "advancement.new_soviet.antenna.desc" + }, + "frame": "task", + "hidden": false, + "icon": { + "item": "new_soviet:antenna" + }, + "show_toast": true, + "title": { + "translate": "advancement.new_soviet.antenna.name" + } + }, + "requirements": [ + [ + "got_antenna" + ] + ], + "sends_telemetry_event": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/brown_tv.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/brown_tv.json index 5f6e83f..658b242 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/brown_tv.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/brown_tv.json @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_brown_dye": { "conditions": { "items": [ @@ -25,12 +37,24 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_nugget": { + "has_iron_ingot": { "conditions": { "items": [ { "items": [ - "minecraft:iron_nugget" + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_trapdoor": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_trapdoor" ] } ] @@ -58,7 +82,9 @@ }, "requirements": [ [ - "has_iron_nugget", + "has_iron_ingot", + "has_iron_trapdoor", + "has_antenna", "has_glass_pane", "has_redstone", "has_brown_dye", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/green_tv.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/green_tv.json new file mode 100644 index 0000000..ec81c18 --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/green_tv.json @@ -0,0 +1,100 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_glass_pane": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:glass_pane" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_green_dye": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:green_dye" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_trapdoor": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_trapdoor" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_redstone": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:redstone" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:green_tv" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_ingot", + "has_iron_trapdoor", + "has_antenna", + "has_glass_pane", + "has_redstone", + "has_green_dye", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:green_tv" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/red_tv.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/red_tv.json index 95ba30f..ea5a499 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/red_tv.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/red_tv.json @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_glass_pane": { "conditions": { "items": [ @@ -13,12 +25,24 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_nugget": { + "has_iron_ingot": { "conditions": { "items": [ { "items": [ - "minecraft:iron_nugget" + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_trapdoor": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_trapdoor" ] } ] @@ -58,7 +82,9 @@ }, "requirements": [ [ - "has_iron_nugget", + "has_iron_ingot", + "has_iron_trapdoor", + "has_antenna", "has_glass_pane", "has_redstone", "has_red_dye", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/decorations/tv.json b/src/main/generated/data/new_soviet/advancements/recipes/decorations/tv.json index c4e7b57..2b891fd 100644 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/tv.json +++ b/src/main/generated/data/new_soviet/advancements/recipes/decorations/tv.json @@ -1,6 +1,18 @@ { "parent": "minecraft:recipes/root", "criteria": { + "has_antenna": { + "conditions": { + "items": [ + { + "items": [ + "new_soviet:antenna" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, "has_glass_pane": { "conditions": { "items": [ @@ -13,12 +25,24 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_nugget": { + "has_iron_ingot": { "conditions": { "items": [ { "items": [ - "minecraft:iron_nugget" + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_trapdoor": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_trapdoor" ] } ] @@ -58,7 +82,9 @@ }, "requirements": [ [ - "has_iron_nugget", + "has_iron_ingot", + "has_iron_trapdoor", + "has_antenna", "has_glass_pane", "has_redstone", "has_orange_dye", diff --git a/src/main/generated/data/new_soviet/advancements/recipes/misc/antenna.json b/src/main/generated/data/new_soviet/advancements/recipes/misc/antenna.json new file mode 100644 index 0000000..7feb06f --- /dev/null +++ b/src/main/generated/data/new_soviet/advancements/recipes/misc/antenna.json @@ -0,0 +1,48 @@ +{ + "parent": "minecraft:recipes/root", + "criteria": { + "has_iron_ingot": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_ingot" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_iron_nugget": { + "conditions": { + "items": [ + { + "items": [ + "minecraft:iron_nugget" + ] + } + ] + }, + "trigger": "minecraft:inventory_changed" + }, + "has_the_recipe": { + "conditions": { + "recipe": "new_soviet:antenna" + }, + "trigger": "minecraft:recipe_unlocked" + } + }, + "requirements": [ + [ + "has_iron_ingot", + "has_iron_nugget", + "has_the_recipe" + ] + ], + "rewards": { + "recipes": [ + "new_soviet:antenna" + ] + }, + "sends_telemetry_event": false +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/antenna.json b/src/main/generated/data/new_soviet/recipes/antenna.json new file mode 100644 index 0000000..946ef6e --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/antenna.json @@ -0,0 +1,21 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "I": { + "item": "minecraft:iron_ingot" + }, + "N": { + "item": "minecraft:iron_nugget" + } + }, + "pattern": [ + "N N", + "N N", + " I " + ], + "result": { + "item": "new_soviet:antenna" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/brown_tv.json b/src/main/generated/data/new_soviet/recipes/brown_tv.json index cddca06..b61798b 100644 --- a/src/main/generated/data/new_soviet/recipes/brown_tv.json +++ b/src/main/generated/data/new_soviet/recipes/brown_tv.json @@ -2,23 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { + "A": { + "item": "new_soviet:antenna" + }, "D": { "item": "minecraft:brown_dye" }, "G": { "item": "minecraft:glass_pane" }, - "N": { - "item": "minecraft:iron_nugget" + "I": { + "item": "minecraft:iron_ingot" }, "R": { "item": "minecraft:redstone" + }, + "T": { + "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "N N", - "DGD", - "DRD" + "TAT", + "IGI", + "RDR" ], "result": { "item": "new_soviet:brown_tv" diff --git a/src/main/generated/data/new_soviet/recipes/green_tv.json b/src/main/generated/data/new_soviet/recipes/green_tv.json new file mode 100644 index 0000000..d5d2845 --- /dev/null +++ b/src/main/generated/data/new_soviet/recipes/green_tv.json @@ -0,0 +1,33 @@ +{ + "type": "minecraft:crafting_shaped", + "category": "misc", + "key": { + "A": { + "item": "new_soviet:antenna" + }, + "D": { + "item": "minecraft:green_dye" + }, + "G": { + "item": "minecraft:glass_pane" + }, + "I": { + "item": "minecraft:iron_ingot" + }, + "R": { + "item": "minecraft:redstone" + }, + "T": { + "item": "minecraft:iron_trapdoor" + } + }, + "pattern": [ + "TAT", + "IGI", + "RDR" + ], + "result": { + "item": "new_soviet:green_tv" + }, + "show_notification": true +} \ No newline at end of file diff --git a/src/main/generated/data/new_soviet/recipes/red_tv.json b/src/main/generated/data/new_soviet/recipes/red_tv.json index 0d3d9ff..ee99f3a 100644 --- a/src/main/generated/data/new_soviet/recipes/red_tv.json +++ b/src/main/generated/data/new_soviet/recipes/red_tv.json @@ -2,23 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { + "A": { + "item": "new_soviet:antenna" + }, "D": { "item": "minecraft:red_dye" }, "G": { "item": "minecraft:glass_pane" }, - "N": { - "item": "minecraft:iron_nugget" + "I": { + "item": "minecraft:iron_ingot" }, "R": { "item": "minecraft:redstone" + }, + "T": { + "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "N N", - "DGD", - "DRD" + "TAT", + "IGI", + "RDR" ], "result": { "item": "new_soviet:red_tv" diff --git a/src/main/generated/data/new_soviet/recipes/tv.json b/src/main/generated/data/new_soviet/recipes/tv.json index 03ddb46..586f6c9 100644 --- a/src/main/generated/data/new_soviet/recipes/tv.json +++ b/src/main/generated/data/new_soviet/recipes/tv.json @@ -2,23 +2,29 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { + "A": { + "item": "new_soviet:antenna" + }, "D": { "item": "minecraft:orange_dye" }, "G": { "item": "minecraft:glass_pane" }, - "N": { - "item": "minecraft:iron_nugget" + "I": { + "item": "minecraft:iron_ingot" }, "R": { "item": "minecraft:redstone" + }, + "T": { + "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "N N", - "DGD", - "DRD" + "TAT", + "IGI", + "RDR" ], "result": { "item": "new_soviet:tv" diff --git a/src/main/generated/data/new_soviet/tags/blocks/tv.json b/src/main/generated/data/new_soviet/tags/blocks/tv.json index 9651641..7ce2e05 100644 --- a/src/main/generated/data/new_soviet/tags/blocks/tv.json +++ b/src/main/generated/data/new_soviet/tags/blocks/tv.json @@ -3,6 +3,7 @@ "values": [ "new_soviet:tv", "new_soviet:red_tv", - "new_soviet:brown_tv" + "new_soviet:brown_tv", + "new_soviet:green_tv" ] } \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/Advancements.java b/src/main/java/su/a71/new_soviet/datagen/Advancements.java index 6d2580e..c01424c 100644 --- a/src/main/java/su/a71/new_soviet/datagen/Advancements.java +++ b/src/main/java/su/a71/new_soviet/datagen/Advancements.java @@ -40,7 +40,7 @@ public class Advancements implements Consumer> { false, // Announcement false // Hidden ) - .criterion("got_dirt", InventoryChangedCriterion.Conditions.items(Items.DIRT)) + .criterion("got_dirt", InventoryChangedCriterion.Conditions.items(Items.DIRT)) // Just a basic criterion .build(consumer, NewSoviet.MOD_ID + "/root"); // Make a sickle @@ -95,7 +95,7 @@ public class Advancements implements Consumer> { ItemPredicate.Builder.create().tag(NSE_Tags.Items.DICE))) .build(consumer, NewSoviet.MOD_ID + "/gambler"); -// Throw a die 1000 times + // Throw a die 1000 times Advancement serious_addiction = Advancement.Builder.create() .display( NSE_Items.DICE_D20, @@ -126,5 +126,21 @@ public class Advancements implements Consumer> { .parent(gambler) .criterion("rolled_100_perfect", UsingItemCriterion.Conditions.create(EntityPredicate.Builder.create().type(EntityType.PLAYER).typeSpecific(PlayerPredicate.Builder.create().stat(Stats.CUSTOM.getOrCreateStat(NSE_Stats.ROLL_PERFECT_DICE), NumberRange.IntRange.atLeast(100)).build()), ItemPredicate.Builder.create().tag(NSE_Tags.Items.DICE))) .build(consumer, NewSoviet.MOD_ID + "/lucky_throw"); + + // Craft an antenna + Advancement antenna = Advancement.Builder.create() + .display( + NSE_Items.ANTENNA, + Text.translatable("advancement.new_soviet.antenna.name"), + Text.translatable("advancement.new_soviet.antenna.desc"), + new Identifier("textures/gui/advancements/backgrounds/adventure.png"), + AdvancementFrame.TASK, + true, // Toast + true, // Announcement + false // Hidden + ) + .parent(root) + .criterion("got_antenna", InventoryChangedCriterion.Conditions.items(NSE_Items.ANTENNA)) + .build(consumer, NewSoviet.MOD_ID + "/antenna"); } } diff --git a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java index ac47945..57b5a65 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -427,7 +427,8 @@ public class BlockTagGenerator extends FabricTagProvider.BlockTagProvider { getOrCreateTagBuilder(NSE_Tags.Blocks.TV) .add(NSE_Custom.TV) .add(NSE_Custom.RED_TV) - .add(NSE_Custom.BROWN_TV); + .add(NSE_Custom.BROWN_TV) + .add(NSE_Custom.GREEN_TV); getOrCreateTagBuilder(NSE_Tags.Blocks.SWITCHES) .add(NSE_Custom.SWITCH) diff --git a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java index 2bb3045..1759ccb 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -166,15 +166,21 @@ public class RecipeGenerator extends FabricRecipeProvider { private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern("N N") - .pattern("DGD") - .pattern("DRD") + .pattern("TAT") + .pattern("IGI") + .pattern("RDR") .input('D', dye) - .input('N', Items.IRON_NUGGET) + .input('A', NSE_Items.ANTENNA) + .input('I', Items.IRON_INGOT) + .input('T', Items.IRON_TRAPDOOR) .input('R', Items.REDSTONE) .input('G', Items.GLASS_PANE) - .criterion(RecipeProvider.hasItem(Items.IRON_NUGGET), - RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) + .criterion(RecipeProvider.hasItem(Items.IRON_INGOT), + RecipeProvider.conditionsFromItem(Items.IRON_INGOT)) + .criterion(RecipeProvider.hasItem(Items.IRON_TRAPDOOR), + RecipeProvider.conditionsFromItem(Items.IRON_TRAPDOOR)) + .criterion(RecipeProvider.hasItem(NSE_Items.ANTENNA), + RecipeProvider.conditionsFromItem(NSE_Items.ANTENNA)) .criterion(RecipeProvider.hasItem(Items.GLASS_PANE), RecipeProvider.conditionsFromItem(Items.GLASS_PANE)) .criterion(RecipeProvider.hasItem(Items.REDSTONE), @@ -204,6 +210,7 @@ public class RecipeGenerator extends FabricRecipeProvider { tvRecipe(exporter, NSE_Custom.TV, Items.ORANGE_DYE); tvRecipe(exporter, NSE_Custom.BROWN_TV, Items.BROWN_DYE); tvRecipe(exporter, NSE_Custom.RED_TV, Items.RED_DYE); + tvRecipe(exporter, NSE_Custom.GREEN_TV, Items.GREEN_DYE); // Cracked blocks offerCrackingRecipe(exporter, NSE_Blocks.CRACKED_BRICK_TILES, NSE_Blocks.BRICK_TILES); @@ -542,6 +549,13 @@ public class RecipeGenerator extends FabricRecipeProvider { .criterion(hasItem(Items.GLOWSTONE_DUST), conditionsFromItem(Items.GLOWSTONE_DUST)) .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.MISC, NSE_Items.ANTENNA, 1) + .input('I', Items.IRON_INGOT).input('N', Items.IRON_NUGGET) + .pattern("N N").pattern("N N").pattern(" I ") + .criterion(hasItem(Items.IRON_INGOT), conditionsFromItem(Items.IRON_INGOT)) + .criterion(hasItem(Items.IRON_NUGGET), conditionsFromItem(Items.IRON_NUGGET)) + .offerTo(exporter); + ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, NSE_Custom.LIGHT_BULB_LAMP, 1) .input('X', Items.IRON_INGOT).input('Y', Items.IRON_NUGGET).input('Z', NSE_Items.LIGHT_BULB) .pattern(" X ").pattern(" Y ").pattern(" Z ") diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java index 1ca351c..cf2f750 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Custom.java @@ -35,7 +35,8 @@ public class NSE_Custom extends NSE_BaseRegistration { public static final TVBlock TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_YELLOW)); public static final TVBlock RED_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_RED)); public static final TVBlock BROWN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_BROWN)); - public static final BlockEntityType TV_BLOCK_ENTITY = registerBlockEntity("tv_block_entity", TVBlockEntity::new, TV, RED_TV, BROWN_TV); + public static final TVBlock GREEN_TV = new TVBlock(FabricBlockSettings.create().mapColor(MapColor.TERRACOTTA_GREEN)); + public static final BlockEntityType TV_BLOCK_ENTITY = registerBlockEntity("tv_block_entity", TVBlockEntity::new, TV, RED_TV, BROWN_TV, GREEN_TV); public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock(); @@ -103,6 +104,8 @@ public class NSE_Custom extends NSE_BaseRegistration { registerBlock("tv", () -> TV, NSE_CUSTOM_TAB); registerBlock("red_tv", () -> RED_TV, NSE_CUSTOM_TAB); registerBlock("brown_tv", () -> BROWN_TV, NSE_CUSTOM_TAB); + registerBlock("green_tv", () -> GREEN_TV, NSE_CUSTOM_TAB); + registerBlock("radio_receiver", () -> RADIO_RECEIVER, NSE_CUSTOM_TAB); registerBlock("table_lamp", () -> TABLE_LAMP, NSE_CUSTOM_TAB); registerBlock("golden_table_lamp", () -> GOLDEN_LAMP, NSE_CUSTOM_TAB); diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java index e2c0b74..0569383 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Items.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Items.java @@ -30,10 +30,11 @@ public class NSE_Items extends NSE_BaseRegistration { public static final DiceItem DICE_D20 = new DiceItem(20, "item.new_soviet.dice_d20.tooltip", new Item.Settings().maxCount(6)); public static final Item LIGHT_BULB = new Item(new Item.Settings()); + public static final Item ANTENNA = new Item(new Item.Settings()); public static final Item CIGARETTE_BUTT = new Item(new Item.Settings()); public static final CigaretteItem CIGARETTE = new CigaretteItem(200, NSE_Items.CIGARETTE_BUTT, "item.new_soviet.tooltip.salute", new Item.Settings()); -// public static final MusicDiscItem BATTLE_IS_GOING_AGAIN = new MusicDiscItem(1, NSE_Sounds.MUSIC_LENIN, 123) +// public static final MusicDiscItem BATTLE_IS_GOING_AGAIN = new MusicDiscItem(1, NSE_Sounds.MUSIC_LENIN, 123) TODO: Music pls? private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(SICKLE)) @@ -50,6 +51,7 @@ public class NSE_Items extends NSE_BaseRegistration { registerItem("dice_d4", () -> DICE_D4, NSE_ITEMS_TAB); registerItem("dice_d20", () -> DICE_D20, NSE_ITEMS_TAB); registerItem("light_bulb_item", () -> LIGHT_BULB, NSE_ITEMS_TAB); + registerItem("antenna", () -> ANTENNA, NSE_ITEMS_TAB); registerItem("cigarette", ()-> CIGARETTE, NSE_ITEMS_TAB); registerItem("cigarette_butt", ()-> CIGARETTE_BUTT, NSE_ITEMS_TAB); } diff --git a/src/main/resources/assets/new_soviet/blockstates/green_tv.json b/src/main/resources/assets/new_soviet/blockstates/green_tv.json new file mode 100644 index 0000000..6ed0408 --- /dev/null +++ b/src/main/resources/assets/new_soviet/blockstates/green_tv.json @@ -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 + } + ] + } +} diff --git a/src/main/resources/assets/new_soviet/lang/en_us.json b/src/main/resources/assets/new_soviet/lang/en_us.json index bed62bb..3286c95 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -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" } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/lang/rpr.json b/src/main/resources/assets/new_soviet/lang/rpr.json index 9e4ff32..5904445 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/src/main/resources/assets/new_soviet/lang/rpr.json @@ -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": "Врѣмя совѣршать вѣликое!", diff --git a/src/main/resources/assets/new_soviet/lang/ru_ru.json b/src/main/resources/assets/new_soviet/lang/ru_ru.json index 132ec19..0e08aaf 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -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": "Сделай антенну" } \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/green_tv.json b/src/main/resources/assets/new_soviet/models/block/tv/green_tv.json new file mode 100644 index 0000000..99c157a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/green_tv.json @@ -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" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken1.json b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken1.json new file mode 100644 index 0000000..8f4957a --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken1.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/green_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken2.json b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken2.json new file mode 100644 index 0000000..f6a833c --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken2.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/green_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken2" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken3.json b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken3.json new file mode 100644 index 0000000..0ff28a9 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken3.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/green_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_broken3" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_on.json b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_on.json new file mode 100644 index 0000000..3b23097 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/block/tv/green_tv_on.json @@ -0,0 +1,6 @@ +{ + "parent": "new_soviet:block/tv/green_tv", + "textures": { + "1": "new_soviet:block/custom/electronics/tv/tv_screen_noise" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/antenna.json b/src/main/resources/assets/new_soviet/models/item/antenna.json new file mode 100644 index 0000000..36c3c79 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/antenna.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "new_soviet:item/antenna" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/green_tv.json b/src/main/resources/assets/new_soviet/models/item/green_tv.json new file mode 100644 index 0000000..95264dd --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/green_tv.json @@ -0,0 +1,3 @@ +{ + "parent": "new_soviet:block/tv/green_tv" +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/models/item/light_bulb_item.json b/src/main/resources/assets/new_soviet/models/item/light_bulb_item.json index d12d23a..9c7d35c 100644 --- a/src/main/resources/assets/new_soviet/models/item/light_bulb_item.json +++ b/src/main/resources/assets/new_soviet/models/item/light_bulb_item.json @@ -1,5 +1,4 @@ { - "credit": "Karoter2", "parent": "item/generated", "textures": { "layer0": "new_soviet:item/bulb" diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/blue_tv.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/blue_tv.png new file mode 100644 index 0000000000000000000000000000000000000000..aea59a4d9f5c1c00534cc4efb2e36702022cd003 GIT binary patch literal 1360 zcmV-W1+V&vP)Px)3Q0skRCt{2nN4rpL>R~a8+o-Gzm3#on*{QPlHPg95#yt1YMfFKMJa1HmUYje3*C_hs8>?y^d_#U>ywmPXPc?#1Vx70APM$2>{TVWdMMaLDJ{*oxcG9 zuIIybS#8C1v2+wC!h=0I!6@QdGBo+tEJGCWF=bk_3`hN4X@Dr==yaC>>}A^Nj#rmj zDbVzNX@F#siO2Gjb6qy((WdXi9WZGK@_ZTeJ&L&OYZ}bZL%_LQu*ztAsW+RxkEZVz zwo|{;pwQ1l zbwSy;X{AEr_MN*UASrUHyxH~`h9RHG06-D}r$JDT004gZ{yVLXH}Bma`7AM3z&VDn(DeOM1BM5C@*62mWwg3WRh8YUj4qbX z*jR1<^tVTukXzmOP`g7pQO3}F*@F-<)^Dugc#xLM&$oV;&rulQ=0}@jvV>{`pRvM{ zJ+Hhfe-?#n!1~55`CPPx>9X+VLSc>3=`L5Mf{GfUc}EqstxLuLCj*XV=wo~9F@SU> zF5An`V*A++Vj-~l_6kmebn-|2U7(*XeCr#xa5CWVkWD|IF$A1z=d+r2x=bws0?x61 zW9{4#aF*BeZ7;+C+gpz_YrwpJvsS0FpJzJ&fa}-a$h@Zr0Fo$B4X#qBL|0{MtpPL$ zt@5WqG9mK(d5Vx$e;+H?7!E`>H`UYP{92k`!;qte$rM+qBX6l87DXKH+)`%0uG+e) z5F*CPHHH_*9F{*P`^)!5V;%K(;m$2dSzxk7O_kSSh6Kn9^c($~79_gmZl3uM-oYoI zew=xy_C;f;W2=*=dqiF8wg(E<05#-QBh*ER7zw*}o_F7Se*~oASvHsuF`oRD7C&WY0QJuAWWdq3n;FGpA+WN#Hlo|%GU7P7akd?& zmf=bdLuH2#^|G?;kV3|L@z1V&p5!n?3aMAqMc#@ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png index 91b32b6bcd343b78adb0a4a92411ee9c0df35b66..4b626403465fe6609b7bc00ffec291b02b7492d6 100644 GIT binary patch delta 356 zcmV-q0h|7c0{#M!BYy!!NklTKCaJw{+UIHsUCwm^-VCd(SPUEHz{ym8vmZ(eMxHT z>SBtUS!nBOGA2g%6**i_R10000~Qui+{hmWcK~HlJu^V&%sV{hV1;|UuKelVnd zGo0~|(dTi}BjXJwZ+O(K3>-O+%n+C(b8g|!#FamucU)w;fBwpscU9ki-~IZI!TG9_ zbG6?BMu(ph*&3=oM|khF@t*mdWmiC!;~9aKXvP#@VX_cf}ir# zCry}F$$6pdaOwjGp$%`_g_3I-UD@zlCB7aWYb~nKPk>aC^e{TQ!n9=8H)AF`$ zr|*%4o~e<)PW6{;IwP(T+O?wIe4|jzt~WU~eU9tX&dSy0U-*BlxM}LlDfb=B4t-&p zaZh5Z{L4LgO>TD9ted_!niGjO)e@#-ke^+N;&iBVGYhIsu()^M!@6tQ{UrJD*0b{`FTf+HK WEyCHXUX%P7fWXt$&t;ucLK6UPX3cQ` delta 495 zcmVPx$!bwCyRCt{2)=g^@K^({NZ#J84(;dSW zBEgV)^D21Iqx9q}5WKbTz_T~;<_qvmh`s|+d<`B|@X%5SO~?{AO*2b&J*=5D2-PK< zTJiU}?9LPad1MCU|5htg`A*|;9<_If2WJ5I&ABTx;SJ)!8GliG2Y~bW_u@OMvuN`r zeOoHtRq)GH{`B79HE#ltO;26^c0I)g9kO(~%**GT+YIVkKXVMthwFE^YNaLsVE_3O zl8MEH0m;PD?F5Vy7$-3;6S=Zce8g_F=h7dZz1l?o*XEU~?VDc)f6})k6T33_WMbKk z_87%Sm@r^C{C^6*+0YQyQ*Hug!%K_Pw7-&WG&%rmZQuTF+rOpM5%5gUt*{A;)i+@P z6i49VmcO_|Oc>yq-bMznu2K__CC7Yx@p_p~r+AHK@jpF<`3%qWR{jHff(^Q4$#Jzk zuSls0xcew2YA?6>;yPSheeoa#zPa+K-6tN*R`TSUacB>d`?n5q|K3wtt>WGuk7usZ z;N8p09x+!H=TEs{d7ks2dzb_6MYq`EpY5AktyWFHE{k&=Uy33kA|fIpA|fIpA|fIp lA|fIpA|fIpA|fLHm>*$ry{Pxk#6kc7002ovPDHLkV1mG?@WcQB diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png index 0500545c038246e8c1b77880ec82c02170adcbd5..b41d7745cd3d5883e16f7fa2dbd6f55b53f8bc13 100644 GIT binary patch delta 390 zcmZ3_x`26tay?_Zr;B4q#hkZS^nDIHNU(k|4+|_jIrRz8LdDCb#lo9Y_!v)whWjW^ zQ++T!WT9Y%4u=Sfb^lBUL8h6R*GyJAOt^Do(>m_O4{vy#{k^j8``%@H@5ncFyqJEd zZ*}*p{b{SWBn$OT5;;(0)LnHsXR6NR4>v2hUuCUvkL?v$XJ<35J|O5tV7T+!_e>0n z`X%1Zmin|;VBNQBIX!=QubD^GveX`Kc>GGkbK#PR$cqayAOHIK`L=O`&gvxxjy~Rf z@%z8#i-H!JHIAMeBVuJ_&%E}Wqm*%rW0sj(;jT-kH_Z#aCS#UV!jc!S>*Cq9eD}|p z`}}nnG`~qHZD(d#v^`b-bf0(qkKeimw;1crH&0^HXJ+^6`Z-sDmF=z7GH3D23%eb6 z@4FP8@^@bNHJMWv^DU(!?mhZDZSnQqr>_^qUHl#TtB_qolR;tkjwvG9$3K+@u76Rh dgbUo7C0Uz1$ECf=p@;zpJYD@<);T3K0RZ#7vOoX; delta 664 zcmV;J0%!f81Fr>;BYyw^b5ch_0Itp)=>Px%X-PyuRCt{2*3V0nK^VaCujB5%Z%eF; z1SW_qNXue$>mGC{5<%=HUPS63gm@^VzaYE>dM)<4haeFap`b%_=~xu82*HaaT1c#m zyv@F^&U9FIOo-^E%~pCom)&>f*_|KnJP*@D0?T8=7C zlW}n-j=29U=t(l(Nl;0G!`Ptd!8e-Mcg~Vm5daf|4NM%NyewA+H2T0$HyLX48T5g{ zH=2I$ugw3CCE9@LxlvFa;i00m61ny`dydIr&DcnWxNpd{w_~*OxiM4h(3CqX(FRn? zfqUyyvjvv|)qmPPFF*TKKh&wd-2uQinyJ|WVQc_ceO&A0ygMdQPQJT)*{;_b?%6a$ zl$T{^VF(pw`RWHKWhp+~$H%(GD=*8$V1v@5ozq%~F{ooH-$zODxGmL zC|pW(rKRzrwbr`)Zht_v}?GySUmq; ztwKe+?2!~{=_5xf9T*E6SRFaKjFM5)RmvE)pl>3{cmU^aMGk&P@di$}zZL`nRmw3NUP zuSuIsE@mE%pTX~=QTv6{XT|ih&vuFWv7Wf((!3|YzVGSGf=}N*ukO~5-d$K6?{!H* zUv2l({Z>)SFF$XZru#;H=Klkk>?~?B`L87-4~KvG5fYaAy)l^ak;S^4`Su*P!dVl< zU!TuvpTiYUQvGSsvbg4#2g9S!b6qvv`)bdMmD|_+m=;-@%2dBtt@r>S5v4RNe1LheI%%;B5Q(ArA z^0eNn$g+#Q^^1E%h+-pnUnfp$@{qyndZLJ=h=hl9H+<1w_=hd#Ztz!3nKki=QQlO{* zSA=QJRu88HnZxOYF$*8DoT;y_*Q+sJYr4onta4$ z<}`f29?r3}XsJ9OJHzwy3=E%6b?m>|ZK~<#P*v$Xiz{jqpP)rO*PLG)XE}wW9bKsR z_}fFxrBnXhv9r_fKe%+G-2DG~*LEs@H@BSj>8JRveO5Ckd|&tLlKr!lFJ-%{435XV h)>2f$0e+SLVakp_*Kut7zgG-E;OXk;vd$@?2>?Ks<>vqZ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png index e5e5a1f63a8fcfa200dbd220a0a4e4c6f8878fdb..3c4927aa3563e3de257635f886989a24c3cb2eec 100644 GIT binary patch delta 364 zcmV-y0h9jK1BL^TBYy!+NklD7Xqm)Po5=w2!MH)&Mw}+?51}Fnq zY>+9k2Za|%Vac^+2|U52Iyf*SL5dV&-lu_s?amfakOu7%Ic(P~QN z_wCk6(z&WsU9UfSCNV}&Ng_$w9S)QFo25lZK%VE#MC!VhB!68;BEc9VNs8mRxmFa# z|BrzFTg|e}?bFox2=M3qI)69fuT9PYAE%QNV>&tD^>XR7vrp4z!oKeFdVRk+V4tSW zTI;N}od~%591zE`>bkzk1IC!<-rePZMgIl-K0s>s0{wg-wcmZX2awnY%+iA-y=^v5 zYQJ&+ru*ek6lF!&q%N@l0000< KMNUMnLSTYs8?b8t delta 444 zcmZo;zREm7xt@WsILO_JVcj{ImkbPy{hlt4Ar*7pUNg+QZ6I>&qy141l|89vB=`Je zxmP@`FSe>7MuB~kdG^Nj6AfoOHchyrI7#8Op46h2hbH&)CwVZb$p4hfII$saz5n5I zj)!Z`SJ!`&cREmAZ?-N|YO?WtU7II7{{)ryt+K0Iqgo>Cf3COw?|V(bU3~GOEXfs2 zALf0Z!cd{N^;Od*rVqFB%Pg)wymI_<-tE=q59g(_ChUxPH0N=JO<(S{s5!+)BnoRA z+Ul}(Lqh|vn=<%bo)T4V7|D3!{r3Z@`_BJ;*>-2~8iqe6&y=3a|Gr%N`t{-D*uyEC z^9>)ZZJlyMEULuwrfEXetcCTti6?%0CL{!j`>AK#F4ET1(PmhEm8)Tjkfy3wH>;-V zu62v&=4@K`+VFjHPqOTfPo@tFEEuL++I_!&twG%GQ(XnKz~e|?iPr~GHb4F$vA>S@ z2kV9Sx2w}i8}|3^XHNUKXKz_r;B4q#hka-4*DH(5MX<-KPzOB?}kjNJzuVHuRn14&C%U2oeQ2w z{z{l*A@pdel<<_Eb}Nf3O>3k!P58fi!(G44v1Mu71#OP3n-I5&g<+3f?7H8tv!qf} z^%xB1pILN6bkX;mnpj`u`5&7WPrg(3_x6p&i-aY6+b2!k`64SlwO+4EzpOPSRd4af zfH%g9pS(`q5KX!qp`Lb{@rT#%pDALw)n+31^q2g0n0PN?SH;UUZ)=nKCf&XBZ?Qg0 z{W*rEsS956Kloy-P}cgzaDpA%>$<(~x@@mh|FZbZx$SxFb(ZbER@$Ex%pDGFX4zyU zzI*fS;0JrE*cjH_$$hSQq0UUC{@(Ege>c5WJ>7d!`>(Kx+vDalOum=@IR_sv@Bc0> zuW$A=x9fIU@aL6B^zPo^zx8pO%A56lE8lO(*17-9U+>oHqQ7NVC2#b-R`tFz|LxRj z_gLLUX&*uYYWr_){q@$cymza=^$8zkB^Px$^GQTORCt{2*1c}qFcbygL(5>y>L&^U z12K>}Z|2EM+A;5uDKFQpLl)ORr9#C%9c0mV)1iu;Kq$^Pi4q0sUXqtG=%Ae5(Afe2 z;KKsWj&|1-OlrV20RS#5;aBtHdv=5$kKav~@jk=gJufxE7k}`f0$}5Pmz6N7LB*eN zS&6}yBt8q5uP1-(M;LZ}VL$VsX+JIi0GtvYbKq&$@hh---Uq$?wK@4?KSHMjnABiY zUjV>v_K!JRz@tfsU(I3jW_2Vl1NimZ{(aCX0bCPR`U0+rWISwUc)EM|geLf1+vXNw z8DbLps&fr!i+|eT@{Y^?kLxxG0Aj)Hn@%ghxf0&bW80)nQ78DOZ@sN!ve47ufsQMn z4L%t+dE=V&{Y0yb4{hfVNOpA#IIbgklC@}x+=AyP7>lOF zEs)%u!k4_LM{q&T%LlUrRtoz&3jD3-J|S`Q*!lBmi~7W7Up76*RC~@@Rxc)l~>QNX-A*CmaDSv>T(x;E|duE;d$lXWn9 z)^PJm>}}?6-~ZjbFw^cpRk*1a^I2ijh41~Fk`v;XYAc>>yj|n>-MZmCquoc_NAe5K fZ)3m!4HJK{K7N#|rQ?0;CrHxM)z4*}Q$iB}?_-+@ delta 466 zcmaFO^qP5sayLY~)hdpQAJmjiS zH~(qG_2;L)_rKq%@PGRPuTQVH=rBG~I6nQI9#aadPMy>Bo4-ry)859iPv3d;dGmrx z-~Y9^UFC~pG?6*Xajf|G>i!GahkoYFy_{`T_G^Re;osRWwm*Em%%i+8M{XLpH}amO3ceWa65k*^M?N=0yQ(|T($fbWwTP{)zRg4?A#i_m(x;7fM%cVMs{dx!J~IJNJx~dFy1$+0M?f zIKdfhIN6A8jog7<=kG7O#PlXlFs0SD-_FsxWrL`3PlCijx5FQIynSJsyO7VWqUPlb zlQr*aeIAsD?qdxTz1y|mYJ=x9PpfT@pBrm;?dG@rTXtq;d%?~#`fdMz=x(_6H&oX9 z1lJAkA`c}!t{Hj@M5E@o89v_WYsd8_Ul2Fg8NZ)_vAZt$+``|v3_#%N>gTe~DWM4f D1dZFz diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png index d02c39dfcd4fb6762e66dd6b419a814bd9d26ea4..6878636454cc933a386c033c304bae209e0576eb 100644 GIT binary patch delta 411 zcmX@WvW0nqay?_Ur;B4q#hka-4D${-2(Vu8*K61)5Wv9hFsI>^Y^c}tDJ6LVMnaYj zI$XQ9h-jFG>K)K5VsK&8dU}Xmc}zR@eB#J^G+naI3^v#6C2sD&ctARe|o(Fhs$-bv%d3=p54XD zV9~CawT+j-;?1{=(%TCOWoX5|w;-=ZT#2G7eXL;Rg3S6$Y;YQx}PfzYX z{Hp7$@iExY2gdiUq46{mX{POg!DW}d%O@bWJ!HP=bnOv|p$F6BNR zT#{;9VB=c&`t=NvliOVw9O`A7-M%Itt~X+O_T;+y-n?Q3N&dgB23uVxYom!Q{eDxy zznWY9+ppuisiS6Y@Q%DgUgoVrOa#IrRE86p;@J`A8}vN_n9w$z+QfLX9o`O c!uuYh2Px$`bk7VRCt{2)xT>KaTv$(_r=SZ(uOD@ z8VXeewGga7Xa{496p9%f0@*W&OU0pofV(bET|`~FC=PC zFh4uW^R=%;y(%y6-ecrvD1#>8r+B&g$#OhHy1#h-s-$)8I{)JpFM>3h@{lh0*Jlf>SNt=yF&wt2fvurq%q|<3!*QFA&xc}zm zKqlbpC%ABK#;r_uVIq+Ty?{flR@=MQY&HpcaO1*^!ROZ5556Ag zR^pOr*cOgw*s(1f4~Fa@Tl62q#^vqztzWlQ=8 z9!rO?Ru=)G7!`vH4GXzXmk6rOot9@cG34R@ux8^|)%(m>vAbu=y}p|CTs3lqv*dyx zQ-%XQ*H51^&W?Hik;m`g(#kd3p~_PjLyQ?2_Gqy(%<$%9m{9*uGR=3od{c2krd;+_ zpLd=AO{NQ7vM;x)Jn)cl#w-4#JO{#;=9Z=Ji9h96-uPL};OhLJ;%lZ~-Tqo7a>Z%4 zFN?V2V*KayxoT(soBjX9$?aVAceb+@WY;rDn0@;AV%~%EvI*+k42u;GJu`8*$uXt( zz%!Er8XfOGPhBAxiLGor0PGj?jQCWSGUE!UL^jX z(NF&%&`UFqd~4TTSK9bDk-Iu)eWvvbKf~YFC!OY|EZo-r^=F(5E^x(v{tL6^;k~yT Qr5J#~)78&qol`;+0Br894FCWD delta 456 zcmbQv{E&Hqaym|BAK&{;s!mU8s^^jn z(-o0-u~4ZqrXaz&pqv0tS`6u z+oJn_oqF0->~Gipy(}JM#@L`XH}RsoTMwhhX?BJgTTK>5?Jf)E(K;|W+m{Pp`^<-A%B>gQ$8sWP}c%#zQ)B)LzI zO$Co5Ff4iU2c>H^O9%IDYUlB)CXO&#bms7~vuIU}UyX-R1hJO$5X`NPQu&A%A zWApo1+PI$k*h4)bP0l+XkKgGSxb diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png index ec8587923f4783743f04f314cb28d3e71732b85b..40d89e29d41586061e86a81d04ba059b0fea4b21 100644 GIT binary patch delta 447 zcmZ3>a)Wt-ay{dGPZ!6KiaBquS?4u72(Ud+Epqlv-#%@^gc^q6CnA|^Mf3_B9|{Nj zU=h(6w#edKSEK+hQ-TBX{9n&4wRyAD^*)Y}r@*|Hl2or*)U=EjI(zu4mY()K;|o zP=?#AEep=~mv6PnyS?X*|B7|1y$7P4||n z?)0j6>QjDuKEHP1bDr4wvif)G;->TK8*;kucBGuM*ejP-!oT9R*V8(uPc89lu89}k zIaa-Ib&$`|=FBFUn#p2Emabj5`kTxK=JS)hQ_5qWMXqGadZFf7MRC-<7vw|4xl~n;rXvmLLDzuq3<4qWx6L j{c@ju>bP0l+XkKN8iB2aBQ$3v+t13FF2K_6{3FzsPS0)L{u^derEuz~#;rd_+r*Wz7)6`TciVo=>WrCl zZzRl2+1tviJ2`*-vs>%MyDBH;W?0%6$^>`LsQ$=z-Ouw<%d0aQc4afXTFPTzedg7f zcE#eDx<7M3^{yY`Tt9*x=RJv*e=kxe`tp|M)tP}g8IiN%(mozD>V2i99URXfvA;;@ zx*y|*b*JB+|NiUUH^p>jx%zoK<}=P%;UVzm%IDHGCwJcBIJ{NSE;c4vIrH)4bKmNP zMJo&5yqov&CHqdP31zz&ek^I0)p?xko^@y5p0j6plD+pIJruMq^YzRa-W_`i_C82% z->7Ofn{k=Y!&{o}&-*?kX7#$2PCd-ceB;8S*y+vfd=DP4Ws9w{y*pib!t1EGzIxk} zYI<{+5)PYJ8vmAScz8?TUa4WApuF{~r=ma~dIbueVw1N{J8yID#Lrh>oYpb#wfb#y z`|p#bbM+SXYlLo__UqqUcE^B({gMiv!i#DZ6IXg{y7%bTrL+688#-`;Ki+jr6#mdKI;Vst03lib(EtDd diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png index a7faf3ec3fc1e38c8c551e775010a45809cced82..7412e318624793572d5360e9962742937240932a 100644 GIT binary patch delta 435 zcmdnQe1>^~ay{c@PZ!6KiaBqu8G0Xf5MlpN-xZ-Eu;PMS)zZm%d`%CYJX5RVaxXvb z_ejN}bFutk-#e{7UEO|5uYZd&5YRZf(6-$~^=0V=B#k^68xgOiQeHb!YP`&ak1 z5Aa_IzsYgn#Mh~(N)K0V&N{HZS!2kdN delta 409 zcmX@Zyoq^&ayGG>I%?k zQg9NCsbO%BU$lF2^SZfrWaiWexTlME>nk)pP&(+O8KQmb!i-}NgKn+z)|%S2|9sK$ z|3xRCzN;@+_&%9q zCGs2k)(O|XH(w(3z2f76`q_P7Yfgk5|M=%uN%eEFu54qz!hJ%%4o{!lJEZA&OOCyL zbwGjd-Ls9mSq@$XYW+Uk?MGE8k>!6Cbf;bNpl0>vI^l#>KR5b=5@O1TaS?83{1OQKsveEzm diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png index ce04956bbfc8a876924883f8d27d935aa345ec9d..087c6ad6f2359e69379a518969d6bd925d46cbff 100644 GIT binary patch delta 447 zcmaFGe1my{ay{dGPZ!6KiaBquDdrtE5Mg_;|8j_lLFSq@%8ahe(i_xRr#@k6-g$J2 za?8|qk!O69l|s9?d=?#=ICU$RwuV+E^F(X)v)kNW?OO87KE=B4O}h0*W~o`{j!)XT z^2G_^-EznJS~e=roPDaqPK@Eg#PC(+^Eg$CgBcrC0+#;rKd+ZmFL>z2N?w!iU-#L5 z-+D#2=WpKZ81t8ZcI;^Gv$+v+glq{Lpf6L%)mW&Yk;@ zmTmkwnc>{IdnfN)PkO&;;?B&MAzMnnGcLHkr1;q~BZ+T}BG$P!XXaI3ty`A!ef_uW z=3~NK$?kFS_o^NKHeF%O*?&2+-gAMA`#hD#Tk*9HA2ny#Ez4Qw@_X+8S>I2F?5}_D zTFjubp_aSkseQqg_n#Ve2^UPPWC&oH^!t~B@SJnUlcqN+37@IG`^x9TDUm}rCIUUB zFv;O$zWep?e0KZoyUcEHOb)%Ax4>{jkA|4C)HnXg`5?FbB!XD&0!Ha~t=DQ$7g ms=L^4ktn0EAa)SwUCSi!q`ArExAis#AnZPH@vYj7km6R zDRE=qVwL^=#@6|1<bBJ1b2Z#3_Uqdnv5hwb z)|h+meV;F(Wm-MqPYlOrK^xOI`z)IzA14K3B7pDQfopn2@zk z{+`!YV|dZm^ZevygJ+ZLch<9qI&Z(%aN|PN-uHP`@0_*1bMyRrd&KEl`c&Byzk23v ztzBcp!fv}?GJZN^hxPJ*^KRVvaG^aki+R@jd90a}Hf|01+_+kWaem3Q@7Fue-p;T% z^?vWytoM#PwLUyN!nkDfkK}y@Z1=5?e%ya)t+|A4_U7G1C%isMZ~NIi diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png index 0321d7fa7d0e2fa63464427d3e6e2a360fbab729..32eb9265d1794a8891fe0ac50a68ac77938114ad 100644 GIT binary patch delta 481 zcmV<70UrL#1NsAyBYy$GNklRr>?szhq0Wis?EVD&njq7DO zva(RDW>wlNvCSBJa+!}{9u83t|%|rc%%o8$S3q;?v3P7y)+0iAh-AmrDJ^=8R zcV$p);&{Px0G^GX^2)zqetU&YUE}}$OP#yG?C6qeombBRF&HQAl=u XcVWF1upX`f00000NkvXXu0mjf5jp8R delta 434 zcmeyxe42TJay_4|`nuRm~h`vVQxIW6m)mUC@gY-Tm(lH>ZbR~MRSHA#K+Klps}6At^L z^7BupH~h(;X>xS-&aZ|J=f4*o+mOEcO04qEsP~LF__pmR@vYj&Uw`1=AHC)M&%d|@ zuKHQ$yoy!#>7k8Z=e8_&$pow4)mVezO3PdoKywmxaOFC4`1Agjc- zSaC@ebJkC;Yt>F%Q=XZ1NT}4-pMUXo@v^P9_y30k)GLNEq<4!;ru%G~nJM6K>HD?n zQ#X~K<_M=+?|)(r!d;M-?-<%Ej>D%SV|RIeJMG{_rhtGe_*Nn z!K40hB=?#J^JCkrM2{xdE6p{M@Y-}k&5Y_At_-v8=v z!f%DPOcHFojjTd2}9>DrnAA)q;;=hocZ|K&9wL)WTV_Gx|1k`;~59~W=y zlzm{r+%kznZ~wgK2R;ja`CAv{r@=W<s(#RRewC?%$^&ad<+}b zt?}r36@D_vd27QXUi}Y$9`*d+koQ`5-MPK1GMMF^y*yv<(k*@W^vT0l0k^OH-z6@H c1H7GG-ge{e+2+37AO;}tboFyt=akR{02Fn$mH+?% delta 340 zcmbQw{ElgYaya!O~kgP&MhTtH2%qH#7}B7tNF?PX@9Eb+`q#AKK_$x zIAqDt^L@^@Dv@)BW^IwN$(wpM8qVH!$TClU-pO~D{#|da3wqC0zs^ng*@1%RR|O>A zZkf+$=Aw6-|I>s^LI%xRBJ7H{R>Zt5*X8(Ea-`#-| bym`<4-^9x$)bdw50}yz+`njxgN@xNAq{XJm diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png index 71a1bb0b66e884acbf4bfefdc3ddf97a109455a3..f09771966301e23695b689c9f998085409780c68 100644 GIT binary patch delta 342 zcmV-c0jd7q0`LNmBYy!mNklH zPj3(@D@Z5{3lb-Ar>DL;Nx@M;3H*PPW5;ox-%Dg^f~E?wsY2}9I@+}#lccV#qun=U zjoGrGrPD@OzuyoaxSz9VX*LgG-^;cIYhz<`=c34+&{QFQzJI@-^{v($S)XtF@$Ih6 zUTb#J@|XIV_I*qE46?J*wRQY>dpXN^nq6NdtMx`VclWw|c$#GeWW7|^*3km7wq@A| zEJ@p4Sq$BO&6mH1NfjVTRt1mcb0M9|-Kyab_R+F0X|@%RCH<4zX87-WsBdWQVx__Q zfQQ=YoIl}GfKOu^vE3P_tR?u00000 o0000000000000000095Q5#!TEWh(K?qW}N^07*qoM6N<$g6_el_5c6? delta 325 zcmeysbf0O0ay_tckbywMLrpHZZvkB*Hb1!b z{cnCETBPAIL9UBq;u}q)V=h^d5sUwq8~O@o8C}kF5i7XXa%t=Qw%ye)OTW%BRn)r? zDg213^tQiqna|gfC6~)$GBVHX&U54Vhb zRkgSN8%hRrWvnx^k&fRQw8T5`{|YGq%j|bu@tV@By#Igs{8cA6Ii+}_-}|R8axU&) zn*LJX`yI=!FQU~Jb6y-iTV_{3qqO2;@w9WZt=02FZhtkJ*SGmOBLfDAeWaG R7O5(boTsaw%Q~loCICssl`jAQ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png index b74a3ba5b29d8354ce78ceeddddafd4e7c69718b..e46209d2d8ed55bed10161ed3f503ea0376c4c5c 100644 GIT binary patch delta 320 zcmeBRxy3X=xt>wc)5S5QV$R#E8?%}nWR8EFzjTMHf^A8;V9T1?E}hDroZ5*_+xK<& zU)abmP*T{hA~NahQND*R!QKyjx-Y#?|2e+G5Y<_xbwaT({nan_=1f<`VFF$CUSM4Go-Fot+nf71R#r+5FScW=;Ug^5jyu{md z&wd+|(7^5Iuen!FIO~7)1=ohTbz2Ria((p8*%zBV*xi?(-)yLXvwL zrtjz!aJ{m%qsi?;ufn>s#XlID9wa|ujM-(_RN1Y=)HTah%!<$W?#A8AcgOTBU^M4l z-1F;iS?P+?4?|?Rp8QX{+O~pYiAE zt&_9axo(@eHIL_Gkz^!v1!hZ*L67-mJ1>+t))wXeExM7{b7}lp7!po j&J%3`L0n*B{ZaFy9~+-up4okr0SG)@{an^LB{Ts5({tyI diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/green_tv.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/green_tv.png new file mode 100644 index 0000000000000000000000000000000000000000..915e51e6e27225a0988338a75ceb445451da6c6d GIT binary patch literal 1379 zcmV-p1)TbcP)Px)9Z5t%RCt{2nOkccM-<2ZGAmSeBCU*?%>}uU>g1u|hk{emhhow|A42jqN?XXs z2~A6(U!pC2D6}O{z1UDnN(+uFgN@y+Ev(gc2GmumKCI5{>}q#Ct3Q(f11-erMc>NIFjtxu=Ajj4muPmif zfHiB<0NqX$);tJjlyh6v8IQ7N4Q?xp-uFYSTq+)#zI**h#x0|036|(#==*ZP%7ZP( z;mVpdux2g0o${Rw!Imv}{SZ8eqoByE^v!KmGmZSRSkjre3Qb7;-R;u-z;s<0jB+anjq&97*W=$W zuNq$&I0WYc*Ke!>|Hj{b{O(9T zkH!^jy!YyiETI~q;W(LF_Vnac`P0aB$NJ4?tUyKy)8)$5E17$YZpSW61(igE^5PR@ z8P5|51MnaOKN(|dGdi?T6y(+N(|EeQ1Hm~u-D`OMJeKe63IIYLh}Lg5GgtbC<6!9f z+WD-eoh}QDfT8c>`i<2Wj)2p=o^Jb646wC1NUQ;CZ|W(V=IQnh0Kj#VIZhD(L~DR* zaFsG!bXBI*8Xy-C+NcahQAkcb|00`^Tkklq+fDrR#SxftS)iU4)$}4A=9#!k8F@<$ zF|QwDZRJ9uUKf?FA~+YY+ZQ4B2eKa^s`V}|#Ozi^l~@*-Z&6d_byy++>4oWE zZ}0E8L(T1O8u9riE^qB6l~eknG1ReD<>?+#m$L1Fj5RLfH*w!2IE}dx2vl_8^HFCve!?d-uaOZ>cj=- zxYk*n(Cu&@LPR&tHe;m>mz&&b6;K(SJc%BH2}a`zct$%i9{+11pY!@Ff+nP1p$j2k z+qV4s(Srwg^zb2o=q8zDbdheRO+?gNr4BSZ(5tW};d zTmJLBWBIJp{=BoKDw$W}((j8VU-bSwVgd23OOev)1Bz~YgTY`h7z_r3!C){L3T( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/new_soviet/textures/item/antenna.png b/src/main/resources/assets/new_soviet/textures/item/antenna.png new file mode 100644 index 0000000000000000000000000000000000000000..056fdc650f9038ffabf9d7cb57b26348e5558aa8 GIT binary patch literal 367 zcmV-#0g(QQP)Px$DM>^@R5*>rkiSa9P!z_0ii@BWe1%LmA{|SHLJ=H-TS|wLEvw)pMF=>E7fSFo zf=?hB1QB$IfmZ3qQ%eTHGoJ5!f6fR0F{Wv%dds@xx+1kqmK`m^ z*6IpQ$1{Q;SeeHw3xIa3qc*nI0Wb`MtIKNuZtrg@_p9@6MMuYR5JCWOcyvI!)%pDe z(=?Tok~B>LI6XN-(=-6yKi)`^guVS;098zq3rxo|E_|P%=MhB_KrYtncX3@8;5*Uz zk4UM+%|-*;w()(RUcZZFSve-9B#z@eQ6&Mu=VSuF@nFEv^Gd|mmk|J2x!IIj-4RW- z-4y7$ju3)}FeJQt%<;_mDT%5b6ab~`IsngcT#8#HE=*8NvW)bn^94!*e>Ao=EkpnS N002ovPDHLkV1gw1mVp2O literal 0 HcmV?d00001