diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java index c87199a1..cb3afdc7 100644 --- a/src/main/java/ru/betterend/registry/EndItems.java +++ b/src/main/java/ru/betterend/registry/EndItems.java @@ -80,7 +80,10 @@ public class EndItems { public final static Item SILK_MOTH_MATRIX = registerItem("silk_moth_matrix"); // Music Discs - public final static Item MUSIC_DISC_STRANGE_AND_ALIEN = registerDisc("music_disc_strange_and_alien", 0, EndSounds.STRANGE_AND_ALIEN); + public final static Item MUSIC_DISC_STRANGE_AND_ALIEN = registerDisc("music_disc_strange_and_alien", 0, EndSounds.RECORD_STRANGE_AND_ALIEN); + public final static Item MUSIC_DISC_GRASPING_AT_STARS = registerDisc("music_disc_grasping_at_stars", 0, EndSounds.RECORD_GRASPING_AT_STARS); + public final static Item MUSIC_DISC_ENDSEEKER = registerDisc("music_disc_endseeker", 0, EndSounds.RECORD_ENDSEEKER); + public final static Item MUSIC_DISC_EO_DRACONA = registerDisc("music_disc_eo_dracona", 0, EndSounds.RECORD_EO_DRACONA); // Armor // public static final Item AETERNIUM_HELMET = registerItem("aeternium_helmet", new EndArmorItem(EndArmorMaterial.AETERNIUM, EquipmentSlot.HEAD, makeItemSettings().fireResistant())); diff --git a/src/main/java/ru/betterend/registry/EndSounds.java b/src/main/java/ru/betterend/registry/EndSounds.java index a91c77fd..c0ecf7eb 100644 --- a/src/main/java/ru/betterend/registry/EndSounds.java +++ b/src/main/java/ru/betterend/registry/EndSounds.java @@ -31,7 +31,10 @@ public class EndSounds { public static final SoundEvent ENTITY_SHADOW_WALKER_DEATH = register("entity", "shadow_walker_death"); // Records - public static final SoundEvent STRANGE_AND_ALIEN = register("record", "strange_and_alien"); + public static final SoundEvent RECORD_STRANGE_AND_ALIEN = register("record", "strange_and_alien"); + public static final SoundEvent RECORD_GRASPING_AT_STARS = register("record", "grasping_at_stars"); + public static final SoundEvent RECORD_ENDSEEKER = register("record", "endseeker"); + public static final SoundEvent RECORD_EO_DRACONA = register("record", "eo_dracona"); public static void register() {} diff --git a/src/main/java/ru/betterend/util/LootTableUtil.java b/src/main/java/ru/betterend/util/LootTableUtil.java index c3867a2c..8c2f8f92 100644 --- a/src/main/java/ru/betterend/util/LootTableUtil.java +++ b/src/main/java/ru/betterend/util/LootTableUtil.java @@ -19,7 +19,15 @@ public class LootTableUtil { builder.setRolls(RandomValueBounds.between(0, 5)); builder.withCondition(LootItemRandomChanceCondition.randomChance(0.5f).build()); builder.withEntry(LootItem.lootTableItem(Items.GHAST_TEAR).build()); + supplier.withPool(builder); + + builder = FabricLootPoolBuilder.builder(); + builder.setRolls(RandomValueBounds.between(0, 5)); + builder.withCondition(LootItemRandomChanceCondition.randomChance(0.05f).build()); builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_STRANGE_AND_ALIEN).build()); + builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_GRASPING_AT_STARS).build()); + builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_ENDSEEKER).build()); + builder.withEntry(LootItem.lootTableItem(EndItems.MUSIC_DISC_EO_DRACONA).build()); supplier.withPool(builder); } }); diff --git a/src/main/resources/assets/betterend/lang/en_us.json b/src/main/resources/assets/betterend/lang/en_us.json index f655f026..89c9cea9 100644 --- a/src/main/resources/assets/betterend/lang/en_us.json +++ b/src/main/resources/assets/betterend/lang/en_us.json @@ -821,6 +821,12 @@ "item.betterend.music_disc_strange_and_alien": "§bMusic Disc§r", "item.betterend.music_disc_strange_and_alien.desc": "§5Firel§r - §fStrange And Alien§r", + "item.betterend.music_disc_grasping_at_stars": "§bMusic Disc§r", + "item.betterend.music_disc_grasping_at_stars.desc": "§5Firel§r - §fGrasping At Stars§r", + "item.betterend.music_disc_endseeker": "§bMusic Disc§r", + "item.betterend.music_disc_endseeker.desc": "§5Firel§r - §fEndseeker§r", + "item.betterend.music_disc_eo_dracona": "§bMusic Disc§r", + "item.betterend.music_disc_eo_dracona.desc": "§5Firel§r - §fEo Dracona§r", "block.betterend.hydralux_petal_block_amber": "Amber Petal Block", "block.betterend.hydralux_petal_block_beige": "Beige Petal Block", diff --git a/src/main/resources/assets/betterend/lang/ru_ru.json b/src/main/resources/assets/betterend/lang/ru_ru.json index 76a94f8a..84f80be2 100644 --- a/src/main/resources/assets/betterend/lang/ru_ru.json +++ b/src/main/resources/assets/betterend/lang/ru_ru.json @@ -840,6 +840,9 @@ "item.betterend.cave_pumpkin_pie": "Пирог из пещерной тыквы", "item.betterend.music_disc_strange_and_alien": "§bПластинка§r", + "item.betterend.music_disc_grasping_at_stars": "§bПластинка§r", + "item.betterend.music_disc_endseeker": "§bПластинка§r", + "item.betterend.music_disc_eo_dracona": "§bПластинка§r", "block.betterend.hydralux_petal_block_amber": "Янтарный блок лепестков", "block.betterend.hydralux_petal_block_beige": "Бежевый блок лепестков", diff --git a/src/main/resources/assets/betterend/sounds.json b/src/main/resources/assets/betterend/sounds.json index 97194840..b85d3dab 100644 --- a/src/main/resources/assets/betterend/sounds.json +++ b/src/main/resources/assets/betterend/sounds.json @@ -277,5 +277,32 @@ "stream": false } ] + }, + "betterend.record.grasping_at_stars": { + "category": "record", + "sounds": [ + { + "name": "betterend:records/firel-grasping_at_stars", + "stream": false + } + ] + }, + "betterend.record.endseeker": { + "category": "record", + "sounds": [ + { + "name": "betterend:records/firel-endseeker", + "stream": false + } + ] + }, + "betterend.record.eo_dracona": { + "category": "record", + "sounds": [ + { + "name": "betterend:records/firel-eo_dracona", + "stream": false + } + ] } } diff --git a/src/main/resources/assets/betterend/sounds/records/firel-endseeker.ogg b/src/main/resources/assets/betterend/sounds/records/firel-endseeker.ogg new file mode 100644 index 00000000..5dd20bc8 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/records/firel-endseeker.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/records/firel-eo_dracona.ogg b/src/main/resources/assets/betterend/sounds/records/firel-eo_dracona.ogg new file mode 100644 index 00000000..4b26bcda Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/records/firel-eo_dracona.ogg differ diff --git a/src/main/resources/assets/betterend/sounds/records/firel-grasping_at_stars.ogg b/src/main/resources/assets/betterend/sounds/records/firel-grasping_at_stars.ogg new file mode 100644 index 00000000..c81a8069 Binary files /dev/null and b/src/main/resources/assets/betterend/sounds/records/firel-grasping_at_stars.ogg differ diff --git a/src/main/resources/assets/betterend/textures/item/music_disc_endseeker.png b/src/main/resources/assets/betterend/textures/item/music_disc_endseeker.png new file mode 100644 index 00000000..8c4ab480 Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/music_disc_endseeker.png differ diff --git a/src/main/resources/assets/betterend/textures/item/music_disc_eo_dracona.png b/src/main/resources/assets/betterend/textures/item/music_disc_eo_dracona.png new file mode 100644 index 00000000..a4a91c3f Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/music_disc_eo_dracona.png differ diff --git a/src/main/resources/assets/betterend/textures/item/music_disc_grasping_at_stars.png b/src/main/resources/assets/betterend/textures/item/music_disc_grasping_at_stars.png new file mode 100644 index 00000000..7d607c5b Binary files /dev/null and b/src/main/resources/assets/betterend/textures/item/music_disc_grasping_at_stars.png differ