feat: Slider's Wrath music disc

The-Aether-Team · Oct 4, 2024 · 6c267b7 · 6c267b7
1 parent 490f725
commit 6c267b7
Show file tree

Hide file tree

Showing 21 changed files with 53 additions and 21 deletions.
diff --git a/src/generated/resources/.cache/232d7dc54f63e89526c247ba29265b5afad0215c b/src/generated/resources/.cache/232d7dc54f63e89526c247ba29265b5afad0215c
@@ -1,4 +1,4 @@
-// 1.20.2	2024-09-11T19:00:01.8184178	Tags for minecraft:item mod id aether
+// 1.20.2	2024-10-04T11:28:09.0176196	Tags for minecraft:item mod id aether
 688ae9828b941d1f6760e1e9d3126fac6b99608c data/aether/tags/items/accepted_music_discs.json
 b1ab124000a7da5fa5e186c46b51223391f132d9 data/aether/tags/items/accessories.json
 99e752628cab3cfc3a63a53fa4d137f0f7f03936 data/aether/tags/items/accessories_capes.json
@@ -16,7 +16,7 @@ d520be56403df209dca245912dc672e8c5c3bf0e data/aether/tags/items/aether_dirt.json
 f9a76a30f0eda4e77d73593fb077e89632e058ac data/aether/tags/items/angelic_blocks.json
 4c3f53ffa001534a8db6e1a65a1bdefc3fa0142f data/aether/tags/items/book_of_lore_materials.json
 d9dcb253fe96193998f03751892165ee5f5c1924 data/aether/tags/items/boss_doorway_dungeon_blocks.json
-499e32dd1fed37572283bfff6d2f07da393e730f data/aether/tags/items/bronze_dungeon_loot.json
+d6782e9bdc660f763f8e94fed34e24252e78ba41 data/aether/tags/items/bronze_dungeon_loot.json
 ac1d9421f0295d2b3a733f9b307cb39c2a63629d data/aether/tags/items/candy_cane_repairing.json
 c365c56c9363907f546b5d4778b8608912fa27c9 data/aether/tags/items/crafts_skyroot_planks.json
 321cad0c802b794f364a9ba5a34536ecc36271ec data/aether/tags/items/darts.json
@@ -114,7 +114,7 @@ a838c2bd53ede04f2a9ee61012c93d721871dce4 data/minecraft/tags/items/beds.json
 475cdcff955b16a53107d126242e25d0e2e6babb data/minecraft/tags/items/hoes.json
 c158a789ed632738e5986dfbd21ff2bba9511d9b data/minecraft/tags/items/leaves.json
 c365c56c9363907f546b5d4778b8608912fa27c9 data/minecraft/tags/items/logs_that_burn.json
-8e81e268af99d2402f958ec76a49f96c6449e00a data/minecraft/tags/items/music_discs.json
+2ebb4ad4b0e5922d40d7d7f14b844b648dd12efa data/minecraft/tags/items/music_discs.json
 33397c0e49ca28fad45a2f4fc1a5ceb3a01edfbd data/minecraft/tags/items/pickaxes.json
 27f7b6d6102ecf3b0fafa98ae805897f6bfc66ca data/minecraft/tags/items/piglin_loved.json
 6ef8dd4fc2ca5da0387fa62e3cd710a53a035b3d data/minecraft/tags/items/saplings.json

diff --git a/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d b/src/generated/resources/.cache/59eb3dbb5f86130e09b3c62d89b9525ee01cf52d
@@ -1,4 +1,4 @@
-// 1.20.2	2024-02-22T19:23:10.0549326	Loot Tables
+// 1.20.2	2024-10-04T11:28:08.9676193	Loot Tables
 6fd07ff3ea848d0b3b26cbf2b2d5c37dd5dc8b9a data/aether/loot_tables/advancements/enter_aether.json
 a2337d3e3c05d3efabc3f907351bfe480fd09caa data/aether/loot_tables/blocks/aerogel.json
 cb18a05b606bd3951085b27c35172c0e9867f0b0 data/aether/loot_tables/blocks/aerogel_slab.json
@@ -137,7 +137,7 @@ a1b60e449be97bda514ff546733eb09e3259c1cb data/aether/loot_tables/chests/dungeon/
 22900fede72d4f2f6d456e83b7f680ce274e38e4 data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_neptune.json
 9a38be52bb1aeba35899f1f215b2e4d68465e84f data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_reward.json
 ce433ef9d921e6d8773b3429fee5a40a3b87cfdf data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_trash.json
-c7848d2cce1e02df4fbb4838109c3b490514f4a8 data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json
+dae789339a7b4bbd56475cea556c88d594441afd data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json
 a48566c3c74d316e869050234d0fc9445d886bf1 data/aether/loot_tables/chests/dungeon/gold/gold_dungeon_reward.json
 5a34c1b604b4e16c9da78cb4d717be88fc9b44a3 data/aether/loot_tables/chests/dungeon/gold/gold_dungeon_treasure.json
 3e5e72488de4103fd240ba39ba8bfd9aa6d31bf1 data/aether/loot_tables/chests/dungeon/silver/silver_dungeon.json

diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e
@@ -1,2 +1,2 @@
-// 1.20.2	2024-09-22T14:09:39.6093491	Sound Definitions
-68df75176719571ac83da44ec0e45b3824935586 assets/aether/sounds.json
+// 1.20.2	2024-10-04T11:28:09.0246185	Sound Definitions
+e0c5169d8d6bc42400fed2c9f826020300c96b6e assets/aether/sounds.json
diff --git a/src/generated/resources/.cache/93ef46d8e2a70c25df1652217c68bb7a1c161142 b/src/generated/resources/.cache/93ef46d8e2a70c25df1652217c68bb7a1c161142
@@ -1,4 +1,4 @@
-// 1.20.2	2024-08-13T16:38:38.0015958	Item Models: aether
+// 1.20.2	2024-10-04T11:28:08.9816212	Item Models: aether
 88dbeab79e0017737773db746d2e719a21fdb198 assets/aether/models/item/aechor_petal.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/aechor_plant_spawn_egg.json
 63ec6c618a3a23eab4cab9c52d7d3250de9b516e assets/aether/models/item/aerbunny_spawn_egg.json
@@ -253,6 +253,7 @@ efdafb22ff9ce0550d5de3490f93d7e5d246fe4f assets/aether/models/item/mossy_holysto
 9c6ed4e747204a8beb5115b0429c9aa97583606b assets/aether/models/item/music_disc_chinchilla.json
 55d686cff90f5dfc9d48adfcd47b299e5ce4876c assets/aether/models/item/music_disc_high.json
 d3c2062825f3587c291c1e02981aa419d79cce61 assets/aether/models/item/music_disc_klepto.json
+f34a45d3fb142e5ad534332501f991e5585b4630 assets/aether/models/item/music_disc_sliders_wrath.json
 902b04b2a7f9c6e8e1f4ec322698902ab4f714b6 assets/aether/models/item/nature_staff.json
 36c15419034da6a31b0c614a644933fdd9850184 assets/aether/models/item/neptune_boots.json
 49058b98168eade344783960a139e108ae98062a assets/aether/models/item/neptune_boots_amethyst_trim.json

diff --git a/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8 b/src/generated/resources/.cache/c622617f6fabf890a00b9275cd5f643584a8a2c8
@@ -1,2 +1,2 @@
-// 1.20.2	2024-09-29T16:45:56.8019985	Languages: en_us
-db09d6773c09ce441c2fc3993454b1daa3a8d931 assets/aether/lang/en_us.json
+// 1.20.2	2024-10-04T11:28:09.0236189	Languages: en_us
+6b99c031a14d45c7b41dfe57ca17a7f8aa48fa59 assets/aether/lang/en_us.json
diff --git a/src/generated/resources/assets/aether/lang/en_us.json b/src/generated/resources/assets/aether/lang/en_us.json
@@ -645,6 +645,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
@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "aether:item/miscellaneous/music_disc_sliders_wrath"
+  }
+}
diff --git 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/...ated/resources/data/aether/loot_tables/chests/dungeon/bronze/bronze_dungeon_treasure.json b/...ated/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
@@ -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
@@ -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"
   ]
 }
diff --git a/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java b/src/main/java/com/aetherteam/aether/client/AetherSoundEvents.java
@@ -60,6 +60,7 @@ public class AetherSoundEvents {
 	public static final Supplier<SoundEvent> ITEM_MUSIC_DISC_CHINCHILLA = register("item.music_disc.chinchilla");
 	public static final Supplier<SoundEvent> ITEM_MUSIC_DISC_HIGH = register("item.music_disc.high");
 	public static final Supplier<SoundEvent> ITEM_MUSIC_DISC_KLEPTO = register("item.music_disc.klepto");
+	public static final Supplier<SoundEvent> ITEM_MUSIC_DISC_SLIDERS_WRATH = register("item.music_disc.sliders_wrath");
 
 	public static final Supplier<SoundEvent> ENTITY_PHYG_AMBIENT = register("entity.phyg.ambient");
 	public static final Supplier<SoundEvent> ENTITY_PHYG_DEATH = register("entity.phyg.death");

diff --git a/src/main/java/com/aetherteam/aether/data/generators/AetherItemModelData.java b/src/main/java/com/aetherteam/aether/data/generators/AetherItemModelData.java
@@ -191,6 +191,7 @@ protected void registerModels() {
         this.item(AetherItems.MUSIC_DISC_CHINCHILLA.get(), "miscellaneous/");
         this.item(AetherItems.MUSIC_DISC_HIGH.get(), "miscellaneous/");
         this.item(AetherItems.MUSIC_DISC_KLEPTO.get(), "miscellaneous/");
+        this.item(AetherItems.MUSIC_DISC_SLIDERS_WRATH.get(), "miscellaneous/");
 
         this.item(AetherItems.BOOK_OF_LORE.get(), "miscellaneous/");
 

diff --git a/src/main/java/com/aetherteam/aether/data/generators/AetherLanguageData.java b/src/main/java/com/aetherteam/aether/data/generators/AetherLanguageData.java
@@ -329,6 +329,8 @@ protected void addTranslations() {
         this.addDiscDesc(AetherItems.MUSIC_DISC_HIGH, "RENREN - high");
         this.addItem(AetherItems.MUSIC_DISC_KLEPTO, "Blackened Music Disc");
         this.addDiscDesc(AetherItems.MUSIC_DISC_KLEPTO, "sunsette - klepto");
+        this.addItem(AetherItems.MUSIC_DISC_SLIDERS_WRATH, "Carved Music Disc");
+        this.addDiscDesc(AetherItems.MUSIC_DISC_SLIDERS_WRATH, "sunsette - Slider's Wrath");
 
         this.addItem(AetherItems.SKYROOT_BUCKET, "Skyroot Bucket");
         this.addItem(AetherItems.SKYROOT_WATER_BUCKET, "Skyroot Water Bucket");

diff --git a/src/main/java/com/aetherteam/aether/data/generators/AetherSoundData.java b/src/main/java/com/aetherteam/aether/data/generators/AetherSoundData.java
@@ -282,6 +282,9 @@ public void registerSounds() {
         this.add(AetherSoundEvents.ITEM_MUSIC_DISC_KLEPTO,
                 definition().with(sound("aether:item/records/klepto").stream())
         );
+        this.add(AetherSoundEvents.ITEM_MUSIC_DISC_SLIDERS_WRATH,
+                definition().with(sound("aether:item/records/sliders_wrath").stream())
+        );
 
 
         //Entities

diff --git a/src/main/java/com/aetherteam/aether/data/generators/loot/AetherChestLoot.java b/src/main/java/com/aetherteam/aether/data/generators/loot/AetherChestLoot.java
@@ -133,9 +133,10 @@ public void generate(BiConsumer<ResourceLocation, LootTable.Builder> builder) {
         );
         builder.accept(AetherLoot.BRONZE_DUNGEON_TREASURE, LootTable.lootTable()
                 .withPool(LootPool.lootPool().setRolls(UniformGenerator.between(1.0F, 1.0F))
-                        .add(LootItem.lootTableItem(AetherItems.VALKYRIE_LANCE.get()).setWeight(3))
-                        .add(LootItem.lootTableItem(AetherItems.HAMMER_OF_KINGBDOGZ.get()).setWeight(3))
-                        .add(LootItem.lootTableItem(AetherItems.SENTRY_BOOTS.get()).setWeight(3))
+                        .add(LootItem.lootTableItem(AetherItems.VALKYRIE_LANCE.get()).setWeight(1))
+                        .add(LootItem.lootTableItem(AetherItems.HAMMER_OF_KINGBDOGZ.get()).setWeight(1))
+                        .add(LootItem.lootTableItem(AetherItems.SENTRY_BOOTS.get()).setWeight(1))
+                        .add(LootItem.lootTableItem(AetherItems.MUSIC_DISC_SLIDERS_WRATH.get()).setWeight(3))
                 )
         );
         builder.accept(AetherLoot.BRONZE_DUNGEON_NEPTUNE, LootTable.lootTable()

diff --git a/src/main/java/com/aetherteam/aether/data/generators/tags/AetherItemTagData.java b/src/main/java/com/aetherteam/aether/data/generators/tags/AetherItemTagData.java
@@ -141,6 +141,7 @@ public void addTags(HolderLookup.Provider provider) {
                 AetherItems.SWET_CAPE.get(),
                 AetherItems.SHIELD_OF_REPULSION.get(),
                 AetherItems.MUSIC_DISC_AETHER_TUNE.get(),
+                AetherItems.MUSIC_DISC_SLIDERS_WRATH.get(),
                 AetherItems.CLOUD_STAFF.get(),
                 AetherItems.LIGHTNING_KNIFE.get(),
                 AetherItems.PHOENIX_BOW.get(),
@@ -396,7 +397,8 @@ public void addTags(HolderLookup.Provider provider) {
                 AetherItems.MUSIC_DISC_ASCENDING_DAWN.get(),
                 AetherItems.MUSIC_DISC_CHINCHILLA.get(),
                 AetherItems.MUSIC_DISC_HIGH.get(),
-                AetherItems.MUSIC_DISC_KLEPTO.get());
+                AetherItems.MUSIC_DISC_KLEPTO.get(),
+                AetherItems.MUSIC_DISC_SLIDERS_WRATH.get());
         this.tag(ItemTags.BOOKSHELF_BOOKS).add(AetherItems.BOOK_OF_LORE.get());
         this.tag(ItemTags.BEACON_PAYMENT_ITEMS).add(
                 AetherItems.ZANITE_GEMSTONE.get(),

diff --git 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 Supplier<Item> 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), 7000));
 	public static final Supplier<Item> 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 Supplier<Item> 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 Supplier<Item> 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 Supplier<Item> 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 Supplier<Item> 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), 3440));
 
 	public static final Supplier<Item> SKYROOT_BUCKET = ITEMS.register("skyroot_bucket", () -> new SkyrootBucketItem(() -> Fluids.EMPTY, new Item.Properties().stacksTo(16)));
 	public static final Supplier<Item> SKYROOT_WATER_BUCKET = ITEMS.register("skyroot_water_bucket", () -> new SkyrootBucketItem(() -> Fluids.WATER, new Item.Properties().craftRemainder(SKYROOT_BUCKET.get()).stacksTo(1)));

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
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
diff --git a/...esources/assets/aether/textures/item/miscellaneous/music_disc_sliders_wrath.png b/...esources/assets/aether/textures/item/miscellaneous/music_disc_sliders_wrath.png