diff --git a/src/generated/resources/assets/aether/lang/en_us.json b/src/generated/resources/assets/aether/lang/en_us.json index 41cbdb871a..86da8bbe15 100644 --- a/src/generated/resources/assets/aether/lang/en_us.json +++ b/src/generated/resources/assets/aether/lang/en_us.json @@ -642,6 +642,8 @@ "item.aether.music_disc_high.desc": "RENREN - high", "item.aether.music_disc_klepto": "Blackened Music Disc", "item.aether.music_disc_klepto.desc": "sunsette - klepto", + "item.aether.music_disc_sliders_wrath": "Carved Music Disc", + "item.aether.music_disc_sliders_wrath.desc": "sunsette - Slider's Wrath", "item.aether.nature_staff": "Nature Staff", "item.aether.neptune_boots": "Neptune Boots", "item.aether.neptune_chestplate": "Neptune Chestplate", diff --git a/src/generated/resources/assets/aether/models/item/music_disc_sliders_wrath.json b/src/generated/resources/assets/aether/models/item/music_disc_sliders_wrath.json new file mode 100644 index 0000000000..b88871d172 --- /dev/null +++ b/src/generated/resources/assets/aether/models/item/music_disc_sliders_wrath.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "aether:item/miscellaneous/music_disc_sliders_wrath" + } +} \ No newline at end of file diff --git a/src/generated/resources/assets/aether/sounds.json b/src/generated/resources/assets/aether/sounds.json index 8e1fb52f1f..4f0fd76530 100644 --- a/src/generated/resources/assets/aether/sounds.json +++ b/src/generated/resources/assets/aether/sounds.json @@ -922,6 +922,14 @@ } ] }, + "item.music_disc.sliders_wrath": { + "sounds": [ + { + "name": "aether:item/records/sliders_wrath", + "stream": true + } + ] + }, "item.swet_ball.use": { "sounds": [ "mob/slime/big1", diff --git a/src/generated/resources/data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json b/src/generated/resources/data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json index 8eee2b69b7..708f22e088 100644 --- a/src/generated/resources/data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json +++ b/src/generated/resources/data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json @@ -6,17 +6,19 @@ "entries": [ { "type": "minecraft:item", - "name": "aether:valkyrie_lance", - "weight": 3 + "name": "aether:valkyrie_lance" }, { "type": "minecraft:item", - "name": "aether:hammer_of_kingbdogz", - "weight": 3 + "name": "aether:hammer_of_kingbdogz" + }, + { + "type": "minecraft:item", + "name": "aether:sentry_boots" }, { "type": "minecraft:item", - "name": "aether:sentry_boots", + "name": "aether:music_disc_sliders_wrath", "weight": 3 } ], diff --git a/src/generated/resources/data/aether/tags/items/bronze_dungeon_loot.json b/src/generated/resources/data/aether/tags/items/bronze_dungeon_loot.json index 681aeb52c7..2d6f3131a2 100644 --- a/src/generated/resources/data/aether/tags/items/bronze_dungeon_loot.json +++ b/src/generated/resources/data/aether/tags/items/bronze_dungeon_loot.json @@ -13,6 +13,7 @@ "aether:swet_cape", "aether:shield_of_repulsion", "aether:music_disc_aether_tune", + "aether:music_disc_sliders_wrath", "aether:cloud_staff", "aether:lightning_knife", "aether:phoenix_bow", diff --git a/src/generated/resources/data/minecraft/tags/items/music_discs.json b/src/generated/resources/data/minecraft/tags/items/music_discs.json index 01871145c4..d206e77b6f 100644 --- a/src/generated/resources/data/minecraft/tags/items/music_discs.json +++ b/src/generated/resources/data/minecraft/tags/items/music_discs.json @@ -4,6 +4,7 @@ "aether:music_disc_ascending_dawn", "aether:music_disc_chinchilla", "aether:music_disc_high", - "aether:music_disc_klepto" + "aether:music_disc_klepto", + "aether:music_disc_sliders_wrath" ] } \ No newline at end of file diff --git a/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java b/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java index d47197763d..50128ad681 100644 --- a/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java +++ b/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java @@ -58,6 +58,7 @@ public class AetherSoundEvents { public static final RegistryObject ITEM_MUSIC_DISC_CHINCHILLA = register("item.music_disc.chinchilla"); public static final RegistryObject ITEM_MUSIC_DISC_HIGH = register("item.music_disc.high"); public static final RegistryObject ITEM_MUSIC_DISC_KLEPTO = register("item.music_disc.klepto"); + public static final RegistryObject ITEM_MUSIC_DISC_SLIDERS_WRATH = register("item.music_disc.sliders_wrath"); public static final RegistryObject ENTITY_PHYG_AMBIENT = register("entity.phyg.ambient"); public static final RegistryObject ENTITY_PHYG_DEATH = register("entity.phyg.death"); diff --git a/src/main/java/com/aetherteam/aether/item/AetherItems.java b/src/main/java/com/aetherteam/aether/item/AetherItems.java index fdb50652de..56d507d6cf 100644 --- a/src/main/java/com/aetherteam/aether/item/AetherItems.java +++ b/src/main/java/com/aetherteam/aether/item/AetherItems.java @@ -239,7 +239,8 @@ public class AetherItems { public static final RegistryObject MUSIC_DISC_ASCENDING_DAWN = ITEMS.register("music_disc_ascending_dawn", () -> new RecordItem(2, AetherSoundEvents.ITEM_MUSIC_DISC_ASCENDING_DAWN, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES), 7000)); public static final RegistryObject MUSIC_DISC_CHINCHILLA = ITEMS.register("music_disc_chinchilla", () -> new RecordItem(3, AetherSoundEvents.ITEM_MUSIC_DISC_CHINCHILLA, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 3260)); public static final RegistryObject MUSIC_DISC_HIGH = ITEMS.register("music_disc_high", () -> new RecordItem(4, AetherSoundEvents.ITEM_MUSIC_DISC_HIGH, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 3720)); - public static final RegistryObject MUSIC_DISC_KLEPTO = ITEMS.register("music_disc_klepto", () -> new RecordItem(5, AetherSoundEvents.ITEM_MUSIC_DISC_KLEPTO, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 3820)); + public static final RegistryObject MUSIC_DISC_KLEPTO = ITEMS.register("music_disc_klepto", () -> new RecordItem(5, AetherSoundEvents.ITEM_MUSIC_DISC_KLEPTO, new Item.Properties().stacksTo(1).rarity(Rarity.RARE), 3840)); + public static final RegistryObject MUSIC_DISC_SLIDERS_WRATH = ITEMS.register("music_disc_sliders_wrath", () -> new RecordItem(6, AetherSoundEvents.ITEM_MUSIC_DISC_SLIDERS_WRATH, new Item.Properties().stacksTo(1).rarity(Rarity.RARE).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES), 3440)); public static final RegistryObject SKYROOT_BUCKET = ITEMS.register("skyroot_bucket", () -> new SkyrootBucketItem(() -> Fluids.EMPTY, new Item.Properties().stacksTo(16).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES))); public static final RegistryObject SKYROOT_WATER_BUCKET = ITEMS.register("skyroot_water_bucket", () -> new SkyrootBucketItem(() -> Fluids.WATER, new Item.Properties().craftRemainder(SKYROOT_BUCKET.get()).stacksTo(1).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES))); diff --git a/src/main/resources/assets/aether/sounds/item/records/sliders_wrath.ogg b/src/main/resources/assets/aether/sounds/item/records/sliders_wrath.ogg new file mode 100644 index 0000000000..2fb4c114c8 Binary files /dev/null and b/src/main/resources/assets/aether/sounds/item/records/sliders_wrath.ogg differ diff --git a/src/main/resources/assets/aether/sounds/music/boss/slider_fight.ogg b/src/main/resources/assets/aether/sounds/music/boss/slider_fight.ogg index 2fb4c114c8..1e401bb75c 100644 Binary files a/src/main/resources/assets/aether/sounds/music/boss/slider_fight.ogg and b/src/main/resources/assets/aether/sounds/music/boss/slider_fight.ogg differ diff --git a/src/main/resources/assets/aether/textures/item/miscellaneous/music_disc_sliders_wrath.png b/src/main/resources/assets/aether/textures/item/miscellaneous/music_disc_sliders_wrath.png new file mode 100644 index 0000000000..add365f608 Binary files /dev/null and b/src/main/resources/assets/aether/textures/item/miscellaneous/music_disc_sliders_wrath.png differ