diff --git a/CHANGELOG b/CHANGELOG index 2f3ae7a..6d30463 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -48,8 +48,4 @@ This version focuses on QOL and bug fixes * Technical changes * Simplified recipe data generation * Deleted various unused files - code, textures and models - * Bumped Fabric API, loader and mappings versions - -### Changelog 0.3 -> 0.4 -* Added a new antenna item to improve radio electronics recipes -* Changed texture of dirt road \ No newline at end of file + * Bumped Fabric API, loader and mappings versions \ No newline at end of file diff --git a/TODO.md b/TODO.md index 64effb9..6a7d529 100644 --- a/TODO.md +++ b/TODO.md @@ -25,15 +25,9 @@ TODO -- === VERSION SPECIFIC === ## 0.3 Goals left - QOL -* All missing recipes ~+- -* Better feedback - particles, noises ~+- -* Fix post lamps hit-boxes ~+- - -## 0.4 -* Implement antenna everywhere -* Add patterns -* Implement new concrete -* TV rework #3 (new colours, second static, ...?) -* More landmines, land mine base item, create integration for it -* Rework cigarette (code and some functionality) +* All missing recipes +* Better feedback - particles, noises +* Fix post lamps hit-boxes * Missing warning stripes +* Rework cigarette (code and some functionality) +* More landmines, land mine base item, create integration for it diff --git a/src/client/java/su/a71/new_soviet/NewSovietClient.java b/src/client/java/su/a71/new_soviet/NewSovietClient.java index 8918711..8199a9a 100644 --- a/src/client/java/su/a71/new_soviet/NewSovietClient.java +++ b/src/client/java/su/a71/new_soviet/NewSovietClient.java @@ -34,7 +34,6 @@ 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 deleted file mode 100644 index 32bc760..0000000 --- a/src/main/generated/data/minecraft/advancements/new_soviet/antenna.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "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 658b242..5f6e83f 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,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_antenna": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:antenna" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_brown_dye": { "conditions": { "items": [ @@ -37,24 +25,12 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_ingot": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_trapdoor": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_trapdoor" + "minecraft:iron_nugget" ] } ] @@ -82,9 +58,7 @@ }, "requirements": [ [ - "has_iron_ingot", - "has_iron_trapdoor", - "has_antenna", + "has_iron_nugget", "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 deleted file mode 100644 index ec81c18..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/decorations/green_tv.json +++ /dev/null @@ -1,100 +0,0 @@ -{ - "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 ea5a499..95ba30f 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,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_antenna": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:antenna" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_glass_pane": { "conditions": { "items": [ @@ -25,24 +13,12 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_ingot": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_trapdoor": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_trapdoor" + "minecraft:iron_nugget" ] } ] @@ -82,9 +58,7 @@ }, "requirements": [ [ - "has_iron_ingot", - "has_iron_trapdoor", - "has_antenna", + "has_iron_nugget", "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 2b891fd..c4e7b57 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,18 +1,6 @@ { "parent": "minecraft:recipes/root", "criteria": { - "has_antenna": { - "conditions": { - "items": [ - { - "items": [ - "new_soviet:antenna" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, "has_glass_pane": { "conditions": { "items": [ @@ -25,24 +13,12 @@ }, "trigger": "minecraft:inventory_changed" }, - "has_iron_ingot": { + "has_iron_nugget": { "conditions": { "items": [ { "items": [ - "minecraft:iron_ingot" - ] - } - ] - }, - "trigger": "minecraft:inventory_changed" - }, - "has_iron_trapdoor": { - "conditions": { - "items": [ - { - "items": [ - "minecraft:iron_trapdoor" + "minecraft:iron_nugget" ] } ] @@ -82,9 +58,7 @@ }, "requirements": [ [ - "has_iron_ingot", - "has_iron_trapdoor", - "has_antenna", + "has_iron_nugget", "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 deleted file mode 100644 index 7feb06f..0000000 --- a/src/main/generated/data/new_soviet/advancements/recipes/misc/antenna.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "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 deleted file mode 100644 index 946ef6e..0000000 --- a/src/main/generated/data/new_soviet/recipes/antenna.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "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 b61798b..cddca06 100644 --- a/src/main/generated/data/new_soviet/recipes/brown_tv.json +++ b/src/main/generated/data/new_soviet/recipes/brown_tv.json @@ -2,29 +2,23 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": { - "item": "new_soviet:antenna" - }, "D": { "item": "minecraft:brown_dye" }, "G": { "item": "minecraft:glass_pane" }, - "I": { - "item": "minecraft:iron_ingot" + "N": { + "item": "minecraft:iron_nugget" }, "R": { "item": "minecraft:redstone" - }, - "T": { - "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "TAT", - "IGI", - "RDR" + "N N", + "DGD", + "DRD" ], "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 deleted file mode 100644 index d5d2845..0000000 --- a/src/main/generated/data/new_soviet/recipes/green_tv.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "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 ee99f3a..0d3d9ff 100644 --- a/src/main/generated/data/new_soviet/recipes/red_tv.json +++ b/src/main/generated/data/new_soviet/recipes/red_tv.json @@ -2,29 +2,23 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": { - "item": "new_soviet:antenna" - }, "D": { "item": "minecraft:red_dye" }, "G": { "item": "minecraft:glass_pane" }, - "I": { - "item": "minecraft:iron_ingot" + "N": { + "item": "minecraft:iron_nugget" }, "R": { "item": "minecraft:redstone" - }, - "T": { - "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "TAT", - "IGI", - "RDR" + "N N", + "DGD", + "DRD" ], "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 586f6c9..03ddb46 100644 --- a/src/main/generated/data/new_soviet/recipes/tv.json +++ b/src/main/generated/data/new_soviet/recipes/tv.json @@ -2,29 +2,23 @@ "type": "minecraft:crafting_shaped", "category": "misc", "key": { - "A": { - "item": "new_soviet:antenna" - }, "D": { "item": "minecraft:orange_dye" }, "G": { "item": "minecraft:glass_pane" }, - "I": { - "item": "minecraft:iron_ingot" + "N": { + "item": "minecraft:iron_nugget" }, "R": { "item": "minecraft:redstone" - }, - "T": { - "item": "minecraft:iron_trapdoor" } }, "pattern": [ - "TAT", - "IGI", - "RDR" + "N N", + "DGD", + "DRD" ], "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 7ce2e05..9651641 100644 --- a/src/main/generated/data/new_soviet/tags/blocks/tv.json +++ b/src/main/generated/data/new_soviet/tags/blocks/tv.json @@ -3,7 +3,6 @@ "values": [ "new_soviet:tv", "new_soviet:red_tv", - "new_soviet:brown_tv", - "new_soviet:green_tv" + "new_soviet:brown_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 c01424c..6d2580e 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)) // Just a basic criterion + .criterion("got_dirt", InventoryChangedCriterion.Conditions.items(Items.DIRT)) .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,21 +126,5 @@ 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 57b5a65..ac47945 100644 --- a/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/BlockTagGenerator.java @@ -427,8 +427,7 @@ 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.GREEN_TV); + .add(NSE_Custom.BROWN_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 1759ccb..2bb3045 100644 --- a/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/RecipeGenerator.java @@ -166,21 +166,15 @@ public class RecipeGenerator extends FabricRecipeProvider { private void tvRecipe(Consumer exporter, ItemConvertible output, ItemConvertible dye) { ShapedRecipeJsonBuilder.create(RecipeCategory.DECORATIONS, output, 1) - .pattern("TAT") - .pattern("IGI") - .pattern("RDR") + .pattern("N N") + .pattern("DGD") + .pattern("DRD") .input('D', dye) - .input('A', NSE_Items.ANTENNA) - .input('I', Items.IRON_INGOT) - .input('T', Items.IRON_TRAPDOOR) + .input('N', Items.IRON_NUGGET) .input('R', Items.REDSTONE) .input('G', Items.GLASS_PANE) - .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.IRON_NUGGET), + RecipeProvider.conditionsFromItem(Items.IRON_NUGGET)) .criterion(RecipeProvider.hasItem(Items.GLASS_PANE), RecipeProvider.conditionsFromItem(Items.GLASS_PANE)) .criterion(RecipeProvider.hasItem(Items.REDSTONE), @@ -210,7 +204,6 @@ 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); @@ -549,13 +542,6 @@ 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 cf2f750..1ca351c 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,8 +35,7 @@ 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 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 BlockEntityType TV_BLOCK_ENTITY = registerBlockEntity("tv_block_entity", TVBlockEntity::new, TV, RED_TV, BROWN_TV); public static final RadioReceiverBlock RADIO_RECEIVER = new RadioReceiverBlock(); @@ -104,8 +103,6 @@ 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 0569383..e2c0b74 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,11 +30,10 @@ 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) TODO: Music pls? +// public static final MusicDiscItem BATTLE_IS_GOING_AGAIN = new MusicDiscItem(1, NSE_Sounds.MUSIC_LENIN, 123) private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(SICKLE)) @@ -51,7 +50,6 @@ 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 deleted file mode 100644 index 6ed0408..0000000 --- a/src/main/resources/assets/new_soviet/blockstates/green_tv.json +++ /dev/null @@ -1,135 +0,0 @@ -{ - "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 3286c95..bed62bb 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -487,7 +487,6 @@ "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", @@ -500,7 +499,5 @@ "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.antenna.name": "Establishing a connection", - "advancement.new_soviet.antenna.desc": "Craft an antenna" + "advancement.new_soviet.lucky_throw.desc": "Roll a perfect die 100 times" } \ 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 5904445..9e4ff32 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/src/main/resources/assets/new_soviet/lang/rpr.json @@ -487,7 +487,6 @@ "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 0e08aaf..132ec19 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -487,7 +487,6 @@ "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": "Время совершать великое!", @@ -500,7 +499,5 @@ "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.antenna.name": "Устанавливаем соединение...", - "advancement.new_soviet.antenna.desc": "Сделай антенну" + "advancement.new_soviet.lucky_throw.desc": "Кинуть кубик 100 раз и получить максимально число" } \ 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 deleted file mode 100644 index 99c157a..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv/green_tv.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "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 deleted file mode 100644 index 8f4957a..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken1.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index f6a833c..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken2.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 0ff28a9..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_broken3.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 3b23097..0000000 --- a/src/main/resources/assets/new_soviet/models/block/tv/green_tv_on.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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 deleted file mode 100644 index 36c3c79..0000000 --- a/src/main/resources/assets/new_soviet/models/item/antenna.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "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/dice_d20.json b/src/main/resources/assets/new_soviet/models/item/dice_d20.json index 356ad80..18a9957 100644 --- a/src/main/resources/assets/new_soviet/models/item/dice_d20.json +++ b/src/main/resources/assets/new_soviet/models/item/dice_d20.json @@ -3,4 +3,5 @@ "textures": { "layer0": "new_soviet:item/dice/dice_d20" } -} \ 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 deleted file mode 100644 index 95264dd..0000000 --- a/src/main/resources/assets/new_soviet/models/item/green_tv.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "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 9c7d35c..d12d23a 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,4 +1,5 @@ { + "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 deleted file mode 100644 index aea59a4..0000000 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/blue_tv.png and /dev/null differ 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 4b62640..91b32b6 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_black.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png index ff94b0a..ec7dd88 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_blue.png differ 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 b41d774..0500545 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_brown.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png index bc990ec..de672ee 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_cyan.png differ 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 3c4927a..e5e5a1f 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_gray.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png index 7bcf7d2..73bf772 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_green.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png index 9cbbb99..5c6f245 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_blue.png differ 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 6878636..d02c39d 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_light_gray.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png index 8b54ea3..48c06e8 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_lime.png differ 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 40d89e2..ec85879 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_magenta.png differ 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 7412e31..a7faf3e 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_orange.png differ 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 087c6ad..ce04956 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_pink.png differ 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 32eb926..0321d7f 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_purple.png differ diff --git a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png index 6222c2b..4c2736c 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_red.png differ 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 f097719..71a1bb0 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_white.png differ 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 e46209d..b74a3ba 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/carpets/carpet_yellow.png differ 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 deleted file mode 100644 index 915e51e..0000000 Binary files a/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/green_tv.png and /dev/null differ diff --git a/src/main/resources/assets/new_soviet/textures/block/floor/dirt_road.png b/src/main/resources/assets/new_soviet/textures/block/floor/dirt_road.png index 55e3c82..ec151a8 100644 Binary files a/src/main/resources/assets/new_soviet/textures/block/floor/dirt_road.png and b/src/main/resources/assets/new_soviet/textures/block/floor/dirt_road.png differ diff --git a/src/main/resources/assets/new_soviet/textures/item/antenna.png b/src/main/resources/assets/new_soviet/textures/item/antenna.png deleted file mode 100644 index 056fdc6..0000000 Binary files a/src/main/resources/assets/new_soviet/textures/item/antenna.png and /dev/null differ