fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

That's one heck of a commit you've got there...

Browse Source 
I may have got a bit behind with version control. A lot behind, in fact. Maybe I'll go back and split this sometime - then again, I probably won't. But hey, at least it's here!
This commit is contained in:
Electroblob77
2019-08-18 00:04:18 +01:00
parent 2680d02304
commit f37812be3e
1564 changed files with 47652 additions and 12984 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/registry/WizardrySounds.java
+232 -41
View File
@@ -1,7 +1,10 @@
package electroblob.wizardry.registry;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.misc.Forfeit;
import electroblob.wizardry.spell.Spell;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.SoundEvent;
import net.minecraftforge.event.RegistryEvent;
import net.minecraftforge.fml.common.Mod;
@@ -16,27 +19,118 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@Mod.EventBusSubscriber
public final class WizardrySounds {
// Anything with LOOP in its name is intended to be played in a continuous loop.
public static final SoundEvent SPELL_SPARK = createSound("arc");
public static final SoundEvent SPELL_CONJURATION = createSound("aura");
public static final SoundEvent SPELL_SHOCKWAVE = createSound("boom");
public static final SoundEvent SPELL_LOOP_CRACKLE = createSound("crackle");
public static final SoundEvent SPELL_SUMMONING = createSound("darkaura");
public static final SoundEvent SPELL_DEFLECTION = createSound("effect");
public static final SoundEvent SPELL_LIGHTNING = createSound("electricitya");
public static final SoundEvent SPELL_LOOP_LIGHTNING = createSound("electricityb");
public static final SoundEvent SPELL_LOOP_FIRE = createSound("flameray");
public static final SoundEvent SPELL_FREEZE = createSound("freeze");
public static final SoundEvent SPELL_LOOP_ICE = createSound("frostray");
public static final SoundEvent SPELL_HEAL = createSound("heal");
public static final SoundEvent SPELL_ICE = createSound("ice");
public static final SoundEvent SPELL_CONJURATION_LARGE = createSound("largeaura");
public static final SoundEvent SPELL_MAGIC = createSound("magic");
public static final SoundEvent SPELL_LOOP_SPARKLE = createSound("sparkle");
public static final SoundEvent SPELL_LOOP_WIND = createSound("wind");
public static final SoundEvent SPELL_EARTHQUAKE = createSound("rumble");
public static final SoundEvent SPELL_FORCE = createSound("force");
public static final SoundEvent SELECT_SPELL = createSound("select");
private WizardrySounds(){} // No instances!
/** Sound category for all spell-related sounds. This includes inanimate magical entities, but not minions.
* @see electroblob.wizardry.util.CustomSoundCategory */
public static SoundCategory SPELLS;
public static final SoundEvent BLOCK_ARCANE_WORKBENCH_SPELLBIND = createSound("block.arcane_workbench.bind_spell");
public static final SoundEvent BLOCK_PEDESTAL_ACTIVATE = createSound("block.pedestal.activate");
public static final SoundEvent BLOCK_PEDESTAL_CONQUER = createSound("block.pedestal.conquer");
public static final SoundEvent ITEM_WAND_SWITCH_SPELL = createSound("item.wand.switch_spell");
public static final SoundEvent ITEM_WAND_LEVELUP = createSound("item.wand.levelup");
public static final SoundEvent ITEM_WAND_MELEE = createSound("item.wand.melee");
public static final SoundEvent ITEM_ARMOUR_EQUIP_SILK = createSound("item.armour.equip_silk");
public static final SoundEvent ITEM_PURIFYING_ELIXIR_DRINK = createSound("item.purifying_elixir.drink");
public static final SoundEvent ENTITY_BLACK_HOLE_AMBIENT = createSound("entity.black_hole.ambient");
public static final SoundEvent ENTITY_BLACK_HOLE_VANISH = createSound("entity.black_hole.vanish");
public static final SoundEvent ENTITY_BUBBLE_POP = createSound("entity.bubble.pop");
public static final SoundEvent ENTITY_BLIZZARD_AMBIENT = createSound("entity.blizzard.ambient");
public static final SoundEvent ENTITY_DECAY_AMBIENT = createSound("entity.decay.ambient");
public static final SoundEvent ENTITY_ENTRAPMENT_AMBIENT = createSound("entity.entrapment.ambient");
public static final SoundEvent ENTITY_ENTRAPMENT_VANISH = createSound("entity.entrapment.vanish");
public static final SoundEvent ENTITY_FIRE_RING_AMBIENT = createSound("entity.fire_ring.ambient");
public static final SoundEvent ENTITY_FIRE_SIGIL_TRIGGER = createSound("entity.fire_sigil.trigger");
public static final SoundEvent ENTITY_FORCEFIELD_DEFLECT = createSound("entity.forcefield.deflect");
public static final SoundEvent ENTITY_FROST_SIGIL_TRIGGER = createSound("entity.frost_sigil.trigger");
public static final SoundEvent ENTITY_HAMMER_ATTACK = createSound("entity.hammer.attack");
public static final SoundEvent ENTITY_HAMMER_EXPLODE = createSound("entity.hammer.explode");
public static final SoundEvent ENTITY_HAMMER_THROW = createSound("entity.hammer.throw");
public static final SoundEvent ENTITY_HAMMER_LAND = createSound("entity.hammer.land");
public static final SoundEvent ENTITY_HEAL_AURA_AMBIENT = createSound("entity.heal_aura.ambient");
public static final SoundEvent ENTITY_ICE_SPIKE_EXTEND = createSound("entity.ice_spike.extend");
public static final SoundEvent ENTITY_LIGHTNING_SIGIL_TRIGGER = createSound("entity.lightning_sigil.trigger");
public static final SoundEvent ENTITY_METEOR_FALLING = createSound("entity.meteor.falling");
public static final SoundEvent ENTITY_SHIELD_DEFLECT = createSound("entity.shield.deflect");
public static final SoundEvent ENTITY_TORNADO_AMBIENT = createSound("entity.tornado.ambient");
public static final SoundEvent ENTITY_EVIL_WIZARD_AMBIENT = createSound("entity.evil_wizard.ambient");
public static final SoundEvent ENTITY_EVIL_WIZARD_HURT = createSound("entity.evil_wizard.hurt");
public static final SoundEvent ENTITY_EVIL_WIZARD_DEATH = createSound("entity.evil_wizard.death");
public static final SoundEvent ENTITY_ICE_GIANT_ATTACK = createSound("entity.ice_giant.attack");
public static final SoundEvent ENTITY_ICE_GIANT_DESPAWN = createSound("entity.ice_giant.despawn");
public static final SoundEvent ENTITY_ICE_WRAITH_AMBIENT = createSound("entity.ice_wraith.ambient");
public static final SoundEvent ENTITY_MAGIC_SLIME_ATTACK = createSound("entity.magic_slime.attack");
public static final SoundEvent ENTITY_MAGIC_SLIME_EXPLODE = createSound("entity.magic_slime.explode");
public static final SoundEvent ENTITY_MAGIC_SLIME_SPLAT = createSound("entity.magic_slime.splat");
public static final SoundEvent ENTITY_PHOENIX_AMBIENT = createSound("entity.phoenix.ambient");
public static final SoundEvent ENTITY_PHOENIX_BURN = createSound("entity.phoenix.burn");
public static final SoundEvent ENTITY_PHOENIX_FLAP = createSound("entity.phoenix.flap");
public static final SoundEvent ENTITY_PHOENIX_HURT = createSound("entity.phoenix.hurt");
public static final SoundEvent ENTITY_PHOENIX_DEATH = createSound("entity.phoenix.death");
public static final SoundEvent ENTITY_SHADOW_WRAITH_AMBIENT = createSound("entity.shadow_wraith.ambient");
public static final SoundEvent ENTITY_SHADOW_WRAITH_NOISE = createSound("entity.shadow_wraith.noise");
public static final SoundEvent ENTITY_SHADOW_WRAITH_HURT = createSound("entity.shadow_wraith.hurt");
public static final SoundEvent ENTITY_SHADOW_WRAITH_DEATH = createSound("entity.shadow_wraith.death");
public static final SoundEvent ENTITY_SPIRIT_HORSE_VANISH = createSound("entity.spirit_horse.vanish");
public static final SoundEvent ENTITY_SPIRIT_WOLF_VANISH = createSound("entity.spirit_wolf.vanish");
public static final SoundEvent ENTITY_STORM_ELEMENTAL_AMBIENT = createSound("entity.storm_elemental.ambient");
public static final SoundEvent ENTITY_STORM_ELEMENTAL_BURN = createSound("entity.storm_elemental.burn");
public static final SoundEvent ENTITY_STORM_ELEMENTAL_WIND = createSound("entity.storm_elemental.wind");
public static final SoundEvent ENTITY_STORM_ELEMENTAL_HURT = createSound("entity.storm_elemental.hurt");
public static final SoundEvent ENTITY_STORM_ELEMENTAL_DEATH = createSound("entity.storm_elemental.death");
public static final SoundEvent ENTITY_WIZARD_YES = createSound("entity.wizard.yes");
public static final SoundEvent ENTITY_WIZARD_NO = createSound("entity.wizard.no");
public static final SoundEvent ENTITY_WIZARD_AMBIENT = createSound("entity.wizard.ambient");
public static final SoundEvent ENTITY_WIZARD_TRADING = createSound("entity.wizard.trading");
public static final SoundEvent ENTITY_WIZARD_HURT = createSound("entity.wizard.hurt");
public static final SoundEvent ENTITY_WIZARD_DEATH = createSound("entity.wizard.death");
public static final SoundEvent ENTITY_DARKNESS_ORB_HIT = createSound("entity.darkness_orb.hit");
public static final SoundEvent ENTITY_DART_HIT = createSound("entity.dart.hit");
public static final SoundEvent ENTITY_DART_HIT_BLOCK = createSound("entity.dart.hit_block");
public static final SoundEvent ENTITY_FIREBOLT_HIT = createSound("entity.firebolt.hit");
public static final SoundEvent ENTITY_FIREBOMB_THROW = createSound("entity.firebomb.throw");
public static final SoundEvent ENTITY_FIREBOMB_SMASH = createSound("entity.firebomb.smash");
public static final SoundEvent ENTITY_FIREBOMB_FIRE = createSound("entity.firebomb.fire");
public static final SoundEvent ENTITY_FORCE_ARROW_HIT = createSound("entity.force_arrow.hit");
public static final SoundEvent ENTITY_FORCE_ORB_HIT = createSound("entity.force_orb.hit");
public static final SoundEvent ENTITY_FORCE_ORB_HIT_BLOCK = createSound("entity.force_orb.hit_block");
public static final SoundEvent ENTITY_ICEBALL_HIT = createSound("entity.iceball.hit");
public static final SoundEvent ENTITY_ICE_CHARGE_SMASH = createSound("entity.ice_charge.smash");
public static final SoundEvent ENTITY_ICE_CHARGE_ICE = createSound("entity.ice_charge.ice");
public static final SoundEvent ENTITY_ICE_LANCE_SMASH = createSound("entity.ice_lance.smash");
public static final SoundEvent ENTITY_ICE_LANCE_HIT = createSound("entity.ice_lance.hit");
public static final SoundEvent ENTITY_ICE_SHARD_SMASH = createSound("entity.ice_shard.smash");
public static final SoundEvent ENTITY_ICE_SHARD_HIT = createSound("entity.ice_shard.hit");
public static final SoundEvent ENTITY_LIGHTNING_ARROW_HIT = createSound("entity.lightning_arrow.hit");
public static final SoundEvent ENTITY_LIGHTNING_DISC_HIT = createSound("entity.lightning_disc.hit");
// public static final SoundEvent ENTITY_MAGIC_FIREBALL_HIT = createSound("entity.magic_fireball.hit");
public static final SoundEvent ENTITY_MAGIC_MISSILE_HIT = createSound("entity.magic_missile.hit");
public static final SoundEvent ENTITY_POISON_BOMB_THROW = createSound("entity.poison_bomb.throw");
public static final SoundEvent ENTITY_POISON_BOMB_SMASH = createSound("entity.poison_bomb.smash");
public static final SoundEvent ENTITY_POISON_BOMB_POISON = createSound("entity.poison_bomb.poison");
public static final SoundEvent ENTITY_SMOKE_BOMB_THROW = createSound("entity.smoke_bomb.throw");
public static final SoundEvent ENTITY_SMOKE_BOMB_SMASH = createSound("entity.smoke_bomb.smash");
public static final SoundEvent ENTITY_SMOKE_BOMB_SMOKE = createSound("entity.smoke_bomb.smoke");
public static final SoundEvent ENTITY_HOMING_SPARK_HIT = createSound("entity.homing_spark.hit");
public static final SoundEvent ENTITY_SPARK_BOMB_THROW = createSound("entity.spark_bomb.throw");
public static final SoundEvent ENTITY_SPARK_BOMB_HIT = createSound("entity.spark_bomb.hit");
public static final SoundEvent ENTITY_SPARK_BOMB_HIT_BLOCK = createSound("entity.spark_bomb.hit_block");
public static final SoundEvent ENTITY_SPARK_BOMB_CHAIN = createSound("entity.spark_bomb.chain");
public static final SoundEvent ENTITY_THUNDERBOLT_HIT = createSound("entity.thunderbolt.hit");
public static final SoundEvent SPELL_STATIC_AURA_RETALIATE = createSound("spell.static_aura.retaliate");
public static final SoundEvent SPELL_CURSE_OF_SOULBINDING_RETALIATE = createSound("spell.curse_of_soulbinding.retaliate");
public static final SoundEvent SPELL_TRANSPORTATION_TRAVEL = createSound("spell.transportation.travel");
public static final SoundEvent MISC_DISCOVER_SPELL = createSound("misc.discover_spell");
public static final SoundEvent MISC_BOOK_OPEN = createSound("misc.book_open");
public static final SoundEvent MISC_PAGE_TURN = createSound("misc.page_turn");
public static final SoundEvent MISC_FREEZE = createSound("misc.freeze");
/** Trick borrowed from the Twilight Forest, makes things neater. */
public static SoundEvent createSound(String name){
@@ -44,27 +138,124 @@ public final class WizardrySounds {
return new SoundEvent(new ResourceLocation(Wizardry.MODID, name)).setRegistryName(name);
}
// For some reason, sound events seem to work even when they aren't registered, without even so much as a warning.
@SubscribeEvent
public static void register(RegistryEvent.Register<SoundEvent> event){
event.getRegistry().register(SPELL_SPARK);
event.getRegistry().register(SPELL_CONJURATION);
event.getRegistry().register(SPELL_SHOCKWAVE);
event.getRegistry().register(SPELL_LOOP_CRACKLE);
event.getRegistry().register(SPELL_SUMMONING);
event.getRegistry().register(SPELL_DEFLECTION);
event.getRegistry().register(SPELL_LIGHTNING);
event.getRegistry().register(SPELL_LOOP_LIGHTNING);
event.getRegistry().register(SPELL_LOOP_FIRE);
event.getRegistry().register(SPELL_FREEZE);
event.getRegistry().register(SPELL_LOOP_ICE);
event.getRegistry().register(SPELL_HEAL);
event.getRegistry().register(SPELL_ICE);
event.getRegistry().register(SPELL_CONJURATION_LARGE);
event.getRegistry().register(SPELL_MAGIC);
event.getRegistry().register(SPELL_LOOP_SPARKLE);
event.getRegistry().register(SPELL_LOOP_WIND);
event.getRegistry().register(SPELL_EARTHQUAKE);
event.getRegistry().register(SPELL_FORCE);
event.getRegistry().register(SELECT_SPELL);
event.getRegistry().register(BLOCK_ARCANE_WORKBENCH_SPELLBIND);
event.getRegistry().register(BLOCK_PEDESTAL_ACTIVATE);
event.getRegistry().register(BLOCK_PEDESTAL_CONQUER);
event.getRegistry().register(ITEM_WAND_SWITCH_SPELL);
event.getRegistry().register(ITEM_WAND_LEVELUP);
event.getRegistry().register(ITEM_WAND_MELEE);
event.getRegistry().register(ITEM_ARMOUR_EQUIP_SILK);
event.getRegistry().register(ITEM_PURIFYING_ELIXIR_DRINK);
event.getRegistry().register(ENTITY_BLACK_HOLE_AMBIENT);
event.getRegistry().register(ENTITY_BLACK_HOLE_VANISH);
event.getRegistry().register(ENTITY_BUBBLE_POP);
event.getRegistry().register(ENTITY_BLIZZARD_AMBIENT);
event.getRegistry().register(ENTITY_DECAY_AMBIENT);
event.getRegistry().register(ENTITY_ENTRAPMENT_AMBIENT);
event.getRegistry().register(ENTITY_ENTRAPMENT_VANISH);
event.getRegistry().register(ENTITY_FIRE_RING_AMBIENT);
event.getRegistry().register(ENTITY_FIRE_SIGIL_TRIGGER);
event.getRegistry().register(ENTITY_FORCEFIELD_DEFLECT);
event.getRegistry().register(ENTITY_FROST_SIGIL_TRIGGER);
event.getRegistry().register(ENTITY_HAMMER_ATTACK);
event.getRegistry().register(ENTITY_HAMMER_EXPLODE);
event.getRegistry().register(ENTITY_HAMMER_THROW);
event.getRegistry().register(ENTITY_HAMMER_LAND);
event.getRegistry().register(ENTITY_HEAL_AURA_AMBIENT);
event.getRegistry().register(ENTITY_ICE_SPIKE_EXTEND);
event.getRegistry().register(ENTITY_LIGHTNING_SIGIL_TRIGGER);
event.getRegistry().register(ENTITY_METEOR_FALLING);
event.getRegistry().register(ENTITY_SHIELD_DEFLECT);
event.getRegistry().register(ENTITY_TORNADO_AMBIENT);
event.getRegistry().register(ENTITY_EVIL_WIZARD_AMBIENT);
event.getRegistry().register(ENTITY_EVIL_WIZARD_HURT);
event.getRegistry().register(ENTITY_EVIL_WIZARD_DEATH);
event.getRegistry().register(ENTITY_ICE_GIANT_ATTACK);
event.getRegistry().register(ENTITY_ICE_GIANT_DESPAWN);
event.getRegistry().register(ENTITY_ICE_WRAITH_AMBIENT);
event.getRegistry().register(ENTITY_MAGIC_SLIME_ATTACK);
event.getRegistry().register(ENTITY_MAGIC_SLIME_EXPLODE);
event.getRegistry().register(ENTITY_MAGIC_SLIME_SPLAT);
event.getRegistry().register(ENTITY_PHOENIX_AMBIENT);
event.getRegistry().register(ENTITY_PHOENIX_BURN);
event.getRegistry().register(ENTITY_PHOENIX_FLAP);
event.getRegistry().register(ENTITY_PHOENIX_HURT);
event.getRegistry().register(ENTITY_PHOENIX_DEATH);
event.getRegistry().register(ENTITY_SHADOW_WRAITH_AMBIENT);
event.getRegistry().register(ENTITY_SHADOW_WRAITH_NOISE);
event.getRegistry().register(ENTITY_SHADOW_WRAITH_HURT);
event.getRegistry().register(ENTITY_SHADOW_WRAITH_DEATH);
event.getRegistry().register(ENTITY_SPIRIT_HORSE_VANISH);
event.getRegistry().register(ENTITY_SPIRIT_WOLF_VANISH);
event.getRegistry().register(ENTITY_STORM_ELEMENTAL_AMBIENT);
event.getRegistry().register(ENTITY_STORM_ELEMENTAL_BURN);
event.getRegistry().register(ENTITY_STORM_ELEMENTAL_WIND);
event.getRegistry().register(ENTITY_STORM_ELEMENTAL_HURT);
event.getRegistry().register(ENTITY_STORM_ELEMENTAL_DEATH);
event.getRegistry().register(ENTITY_WIZARD_YES);
event.getRegistry().register(ENTITY_WIZARD_NO);
event.getRegistry().register(ENTITY_WIZARD_AMBIENT);
event.getRegistry().register(ENTITY_WIZARD_TRADING);
event.getRegistry().register(ENTITY_WIZARD_HURT);
event.getRegistry().register(ENTITY_WIZARD_DEATH);
event.getRegistry().register(ENTITY_DARKNESS_ORB_HIT);
event.getRegistry().register(ENTITY_DART_HIT);
event.getRegistry().register(ENTITY_DART_HIT_BLOCK);
event.getRegistry().register(ENTITY_FIREBOLT_HIT);
event.getRegistry().register(ENTITY_FIREBOMB_THROW);
event.getRegistry().register(ENTITY_FIREBOMB_SMASH);
event.getRegistry().register(ENTITY_FIREBOMB_FIRE);
event.getRegistry().register(ENTITY_FORCE_ARROW_HIT);
event.getRegistry().register(ENTITY_FORCE_ORB_HIT);
event.getRegistry().register(ENTITY_FORCE_ORB_HIT_BLOCK);
event.getRegistry().register(ENTITY_ICEBALL_HIT);
event.getRegistry().register(ENTITY_ICE_CHARGE_SMASH);
event.getRegistry().register(ENTITY_ICE_CHARGE_ICE);
event.getRegistry().register(ENTITY_ICE_LANCE_SMASH);
event.getRegistry().register(ENTITY_ICE_LANCE_HIT);
event.getRegistry().register(ENTITY_ICE_SHARD_SMASH);
event.getRegistry().register(ENTITY_ICE_SHARD_HIT);
event.getRegistry().register(ENTITY_LIGHTNING_ARROW_HIT);
event.getRegistry().register(ENTITY_LIGHTNING_DISC_HIT);
// event.getRegistry().register(ENTITY_MAGIC_FIREBALL_HIT);
event.getRegistry().register(ENTITY_MAGIC_MISSILE_HIT);
event.getRegistry().register(ENTITY_POISON_BOMB_THROW);
event.getRegistry().register(ENTITY_POISON_BOMB_SMASH);
event.getRegistry().register(ENTITY_POISON_BOMB_POISON);
event.getRegistry().register(ENTITY_SMOKE_BOMB_THROW);
event.getRegistry().register(ENTITY_SMOKE_BOMB_SMASH);
event.getRegistry().register(ENTITY_SMOKE_BOMB_SMOKE);
event.getRegistry().register(ENTITY_HOMING_SPARK_HIT);
event.getRegistry().register(ENTITY_SPARK_BOMB_THROW);
event.getRegistry().register(ENTITY_SPARK_BOMB_HIT);
event.getRegistry().register(ENTITY_SPARK_BOMB_HIT_BLOCK);
event.getRegistry().register(ENTITY_SPARK_BOMB_CHAIN);
event.getRegistry().register(ENTITY_THUNDERBOLT_HIT);
event.getRegistry().register(SPELL_STATIC_AURA_RETALIATE);
event.getRegistry().register(SPELL_CURSE_OF_SOULBINDING_RETALIATE);
event.getRegistry().register(SPELL_TRANSPORTATION_TRAVEL);
event.getRegistry().register(MISC_DISCOVER_SPELL);
event.getRegistry().register(MISC_BOOK_OPEN);
event.getRegistry().register(MISC_PAGE_TURN);
event.getRegistry().register(MISC_FREEZE);
for(Spell spell : Spell.getSpells(Spell.allSpells)){
event.getRegistry().registerAll(spell.getSounds());
}
for(Forfeit forfeit : Forfeit.getForfeits()){
event.getRegistry().register(forfeit.getSound());
}
}
}