Skip to content

Commit

Permalink
feat: Slider's Wrath music disc
Browse files Browse the repository at this point in the history
  • Loading branch information
bconlon1 committed Oct 4, 2024
1 parent 64693c1 commit 6e5aa51
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 7 deletions.
2 changes: 2 additions & 0 deletions src/generated/resources/assets/aether/lang/en_us.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"parent": "minecraft:item/generated",
"textures": {
"layer0": "aether:item/miscellaneous/music_disc_sliders_wrath"
}
}
8 changes: 8 additions & 0 deletions src/generated/resources/assets/aether/sounds.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
}
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ public class AetherSoundEvents {
public static final RegistryObject<SoundEvent> ITEM_MUSIC_DISC_CHINCHILLA = register("item.music_disc.chinchilla");
public static final RegistryObject<SoundEvent> ITEM_MUSIC_DISC_HIGH = register("item.music_disc.high");
public static final RegistryObject<SoundEvent> ITEM_MUSIC_DISC_KLEPTO = register("item.music_disc.klepto");
public static final RegistryObject<SoundEvent> ITEM_MUSIC_DISC_SLIDERS_WRATH = register("item.music_disc.sliders_wrath");

public static final RegistryObject<SoundEvent> ENTITY_PHYG_AMBIENT = register("entity.phyg.ambient");
public static final RegistryObject<SoundEvent> ENTITY_PHYG_DEATH = register("entity.phyg.death");
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/com/aetherteam/aether/item/AetherItems.java
Original file line number Diff line number Diff line change
Expand Up @@ -239,7 +239,8 @@ public class AetherItems {
public static final RegistryObject<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).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES), 7000));
public static final RegistryObject<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 RegistryObject<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 RegistryObject<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 RegistryObject<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 RegistryObject<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).tab(AetherCreativeTabs.AETHER_EQUIPMENT_AND_UTILITIES), 3440));

public static final RegistryObject<Item> 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<Item> 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)));
Expand Down
Binary file not shown.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 6e5aa51

Please sign in to comment.