diff --git a/src/main/generated/data/minecraft/tags/items/music_discs.json b/src/main/generated/data/minecraft/tags/items/music_discs.json new file mode 100644 index 0000000..bd0fd19 --- /dev/null +++ b/src/main/generated/data/minecraft/tags/items/music_discs.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "new_soviet:music_disc_ussr_anthem" + ] +} \ No newline at end of file diff --git a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java b/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java index 6bc1d12..ca58548 100644 --- a/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java +++ b/src/main/java/su/a71/new_soviet/datagen/ItemTagGenerator.java @@ -25,6 +25,6 @@ public class ItemTagGenerator extends FabricTagProvider.ItemTagProvider { .add(NSE_Items.DICE_D20); getOrCreateTagBuilder(ItemTags.MUSIC_DISCS) - .add(NSE_Items.MUSIC_DISC_HEARTBEAT); + .add(NSE_Items.MUSIC_DISC_USSR_ANTHEM); } } \ No newline at end of file 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 68d4dbc..339f5ce 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 @@ -34,7 +34,8 @@ public class NSE_Items extends NSE_BaseRegistration { 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 MUSIC_DISC_USSR_ANTHEM = new MusicDiscItem(1, NSE_Sounds.MUSIC_USSR_ANTHEM, new Item.Settings().maxCount(1), 206); private static final ItemGroup NSE_ITEMS_TAB = FabricItemGroup.builder() .icon(() -> new ItemStack(SICKLE)) @@ -57,5 +58,7 @@ public class NSE_Items extends NSE_BaseRegistration { registerPattern("sickle_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); registerPattern("star_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); registerPattern("grain_pattern", Rarity.UNCOMMON, NSE_ITEMS_TAB); + + registerItem("music_disc_ussr_anthem", () -> MUSIC_DISC_USSR_ANTHEM, NSE_ITEMS_TAB); } } diff --git a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java b/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java index ce116fd..d7e1103 100644 --- a/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java +++ b/src/main/java/su/a71/new_soviet/registration/NSE_Sounds.java @@ -48,4 +48,6 @@ public class NSE_Sounds extends NSE_BaseRegistration { public static final SoundEvent TV_ON_SOUND = registerSoundEvent("tv_on_sound"); public static final SoundEvent TV_OFF_SOUND = registerSoundEvent("tv_off_sound"); public static final SoundEvent TV_BREAK_SOUND = registerSoundEvent("tv_break_sound"); + + public static final SoundEvent MUSIC_USSR_ANTHEM = registerSoundEvent("ussr_anthem"); } \ No newline at end of file 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 874f919..20a369c 100644 --- a/src/main/resources/assets/new_soviet/lang/en_us.json +++ b/src/main/resources/assets/new_soviet/lang/en_us.json @@ -511,8 +511,8 @@ "subtitles.new_soviet.tv_break": "TV screen shattered", "item.new_soviet.antenna": "Antenna", - "item.new_soviet.music_disc_heartbeat": "Music Disc", - "item.new_soviet.music_disc_heartbeat.desc": "Kan Gao - Heartbeat", + "item.new_soviet.music_disc_ussr_anthem": "Music Disc", + "item.new_soviet.music_disc_ussr_anthem.desc": "Alexander Alexandrov - USSR anthem", "advancement.new_soviet.root.name": "A New Era", "advancement.new_soviet.root.desc": "Time to create something great", diff --git a/src/main/resources/assets/new_soviet/lang/rpr.json b/src/main/resources/assets/new_soviet/lang/rpr.json index f98a4cd..4686c70 100644 --- a/src/main/resources/assets/new_soviet/lang/rpr.json +++ b/src/main/resources/assets/new_soviet/lang/rpr.json @@ -132,8 +132,8 @@ "block.new_soviet.herringbone_spruce_planks": "Еловый паркѣтъ «ёлочкой»", "block.new_soviet.cross_spruce_planks": "Еловый паркѣтъ «крѣстиком»", "block.new_soviet.herringbone_dark_oak_parquet": "Паркѣтъ из тѣмнаго дуба «ёлочкой»", - "block.new_soviet.straight_parquet": "Прямой паркѣт", - "block.new_soviet.separated_parquet": "Раздѣлённый паркѣт", + "block.new_soviet.straight_oak_parquet": "Прямой дубовый паркѣт", + "block.new_soviet.separated_oak_parquet": "Раздѣлённый дубовый паркѣт", "block.new_soviet.green_linoleum": "Зѣлёный линолѣум", "block.new_soviet.blue_linoleum": "Синiй линолѣум", "block.new_soviet.red_linoleum": "Червонный линолѣум", @@ -427,10 +427,10 @@ "block.new_soviet.cross_spruce_planks_stairs": "Ступѣнi из еловаго паркѣта «крѣстиком»", "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из паркѣта тѣмнаго дуба «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступѣнi из паркѣта тѣмнаго дуба «ёлочкой»", - "block.new_soviet.straight_parquet_slab": "Плита из прямаго паркѣта", - "block.new_soviet.straight_parquet_stairs": "Ступѣнi из прямаго паркѣта", - "block.new_soviet.separated_parquet_slab": "Плита из раздѣлённаго паркѣта", - "block.new_soviet.separated_parquet_stairs": "Ступѣнi из раздѣлённаго паркѣта", + "block.new_soviet.straight_oak_parquet_slab": "Плита из прямаго дубового паркѣта", + "block.new_soviet.straight_oak_parquet_stairs": "Ступѣнi из прямаго дубового паркѣта", + "block.new_soviet.separated_oak_parquet_slab": "Плита из раздѣлённаго дубового паркѣта", + "block.new_soviet.separated_oak_parquet_stairs": "Ступѣнi из раздѣлённаго дубового паркѣта", "block.new_soviet.green_linoleum_slab": "Плита из зѣлёнаго линолѣума", "block.new_soviet.green_linoleum_stairs": "Ступѣнi из зѣлёнаго линолѣума", "block.new_soviet.blue_linoleum_slab": "Плита из синаго линолѣума", 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 c7505d3..c7d0848 100644 --- a/src/main/resources/assets/new_soviet/lang/ru_ru.json +++ b/src/main/resources/assets/new_soviet/lang/ru_ru.json @@ -132,8 +132,8 @@ "block.new_soviet.herringbone_spruce_planks": "Еловый паркет «ёлочкой»", "block.new_soviet.cross_spruce_planks": "Еловый паркет «крестиком»", "block.new_soviet.herringbone_dark_oak_parquet": "Паркет из тёмного дуба «ёлочкой»", - "block.new_soviet.straight_parquet": "Прямой паркет", - "block.new_soviet.separated_parquet": "Разделённый паркет", + "block.new_soviet.straight_oak_parquet": "Прямой дубовый паркет", + "block.new_soviet.separated_oak_parquet": "Разделённый дубовый паркет", "block.new_soviet.green_linoleum": "Зелёный линолеум", "block.new_soviet.blue_linoleum": "Синий линолеум", "block.new_soviet.red_linoleum": "Красный линолеум", @@ -448,10 +448,10 @@ "block.new_soviet.cross_spruce_planks_stairs": "Ступени из елового паркета «крестиком»", "block.new_soviet.herringbone_dark_oak_parquet_slab": "Плита из тёмно дубового паркета «ёлочкой»", "block.new_soviet.herringbone_dark_oak_parquet_stairs": "Ступени из тёмно дубового паркета «ёлочкой»", - "block.new_soviet.straight_parquet_slab": "Плита из прямого паркета", - "block.new_soviet.straight_parquet_stairs": "Ступени из прямого паркета", - "block.new_soviet.separated_parquet_slab": "Плита из разделённого паркета", - "block.new_soviet.separated_parquet_stairs": "Ступени из разделённого паркета", + "block.new_soviet.straight_oak_parquet_slab": "Плита из прямого дубового паркета", + "block.new_soviet.straight_oak_parquet_stairs": "Ступени из прямого дубового паркета", + "block.new_soviet.separated_oak_parquet_slab": "Плита из разделённого дубового паркета", + "block.new_soviet.separated_oak_parquet_stairs": "Ступени из разделённого дубового паркета", "block.new_soviet.green_linoleum_slab": "Плита из зелёного линолеума", "block.new_soviet.green_linoleum_stairs": "Ступени из зелёного линолеума", "block.new_soviet.blue_linoleum_slab": "Плита из синего линолеума", diff --git a/src/main/resources/assets/new_soviet/models/item/music_disc_ussr_anthem.json b/src/main/resources/assets/new_soviet/models/item/music_disc_ussr_anthem.json new file mode 100644 index 0000000..4f654f7 --- /dev/null +++ b/src/main/resources/assets/new_soviet/models/item/music_disc_ussr_anthem.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/template_music_disc", + "textures": { + "layer0": "new_soviet:item/discs/ussr_anthem" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/new_soviet/sounds.json b/src/main/resources/assets/new_soviet/sounds.json index 7e73e3f..4b78508 100644 --- a/src/main/resources/assets/new_soviet/sounds.json +++ b/src/main/resources/assets/new_soviet/sounds.json @@ -112,10 +112,10 @@ "new_soviet:tv_break" ] }, - "heartbeat_kan_gao": { + "ussr_anthem": { "sounds": [ { - "name": "new_soviet:heartbeat_kan_gao", + "name": "new_soviet:ussr_anthem", "stream": true } ] diff --git a/src/main/resources/assets/new_soviet/sounds/ussr_anthem.ogg b/src/main/resources/assets/new_soviet/sounds/ussr_anthem.ogg new file mode 100644 index 0000000..bc21ee8 Binary files /dev/null and b/src/main/resources/assets/new_soviet/sounds/ussr_anthem.ogg differ diff --git a/src/main/resources/assets/new_soviet/textures/item/discs/ussr_anthem.png b/src/main/resources/assets/new_soviet/textures/item/discs/ussr_anthem.png new file mode 100644 index 0000000..89e1cad Binary files /dev/null and b/src/main/resources/assets/new_soviet/textures/item/discs/ussr_anthem.png differ