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 0000000..aea59a4 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/blue_tv.png 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 91b32b6..4b62640 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 ec7dd88..ff94b0a 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 0500545..b41d774 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 de672ee..bc990ec 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 e5e5a1f..3c4927a 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 73bf772..7bcf7d2 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 5c6f245..9cbbb99 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 d02c39d..6878636 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 48c06e8..8b54ea3 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 ec85879..40d89e2 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 a7faf3e..7412e31 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 ce04956..087c6ad 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 0321d7f..32eb926 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 4c2736c..6222c2b 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 71a1bb0..f097719 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 b74a3ba..e46209d 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 new file mode 100644 index 0000000..915e51e Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/block/custom/electronics/tv/green_tv.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 new file mode 100644 index 0000000..056fdc6 Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/antenna.png differ