Various improvements to sounds

- Added several new sounds, mostly for ice spells
- Added automatic registering of sound events
- Finally fixed the frost ray and wall of frost sounds
- Removed a few unused sound files

CREDITS.md

@@ -45,3 +45,4 @@ In addition, I'd like to thank the following individuals for their contributions
 - fredzed
 - deleted_user_3277771
 - DiscoveryME
+- OGSoundFX

src/main/java/electroblob/wizardry/entity/construct/EntityForcefield.java

@@ -91,6 +91,10 @@ public class EntityForcefield extends EntityMagicConstruct implements ICustomHit
 
 		super.onUpdate();
 
+		if(ticksExisted == 1 && world.isRemote){
+			Wizardry.proxy.playMovingSound(this, WizardrySounds.ENTITY_FORCEFIELD_AMBIENT, WizardrySounds.SPELLS, 0.5f, 1, true);
+		}
+
 		// New forcefield repulsion system:
 		// Searches for all entities near the forcefield and determines where they will be next tick.
 		// If they will be inside the forcefield next tick, sets their position and velocity such that they appear to

src/main/java/electroblob/wizardry/entity/construct/EntityIceSpike.java

@@ -57,7 +57,7 @@ public class EntityIceSpike extends EntityMagicConstruct {
 					this.facing.getZOffset() * extensionSpeed);
 		}
 
-		if(lifetime - this.ticksExisted == 30) this.playSound(WizardrySounds.ENTITY_ICE_SPIKE_EXTEND, 1, 2);
+		if(lifetime - this.ticksExisted == 30) this.playSound(WizardrySounds.ENTITY_ICE_SPIKE_EXTEND, 1, 2.5f);
 
 		if(!this.world.isRemote){
 			for(Object entity : this.world.getEntitiesWithinAABBExcludingEntity(this, this.getEntityBoundingBox())){

src/main/java/electroblob/wizardry/registry/WizardrySounds.java

@@ -1,8 +1,6 @@
 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;
@@ -10,6 +8,9 @@ import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Class responsible for defining, storing and registering all of wizardry's sound events.
  * 
@@ -25,6 +26,8 @@ public final class WizardrySounds {
 	 * @see electroblob.wizardry.util.CustomSoundCategory */
 	public static SoundCategory SPELLS;
 
+	private static final List<SoundEvent> sounds = new ArrayList<>();
+	
 	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");
@@ -50,6 +53,7 @@ public final class WizardrySounds {
 	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_AMBIENT = 		createSound("entity.forcefield.ambient");
 	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");
@@ -153,141 +157,20 @@ public final class WizardrySounds {
 		return createSound(Wizardry.MODID, name);
 	}
 
-	/** Creates a sound with the given name, to be read from {@code assets/[modID]/sounds.json}. */
+	/** Creates a sound with the given name, to be read from {@code assets/[modID]/sounds.json}. The sound will be
+	 * registered automatically later. */
 	public static SoundEvent createSound(String modID, String name){
 		// All the setRegistryName methods delegate to this one, it doesn't matter which you use.
-		return new SoundEvent(new ResourceLocation(modID, name)).setRegistryName(name);
+		SoundEvent sound = new SoundEvent(new ResourceLocation(modID, name)).setRegistryName(name);
+		sounds.add(sound);
+		return sound;
 	}
 
 	// 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().registerAll(sounds.toArray(new SoundEvent[0]));
-		event.getRegistry().register(BLOCK_ARCANE_WORKBENCH_SPELLBIND);
-		event.getRegistry().register(BLOCK_PEDESTAL_ACTIVATE);
-		event.getRegistry().register(BLOCK_PEDESTAL_CONQUER);
-		event.getRegistry().register(BLOCK_LECTERN_LOCATE_SPELL);
-		event.getRegistry().register(BLOCK_RECEPTACLE_IGNITE);
-
-		event.getRegistry().register(ITEM_WAND_SWITCH_SPELL);
-		event.getRegistry().register(ITEM_WAND_LEVELUP);
-		event.getRegistry().register(ITEM_WAND_MELEE);
-		event.getRegistry().register(ITEM_WAND_CHARGEUP);
-		event.getRegistry().register(ITEM_ARMOUR_EQUIP_SILK);
-		event.getRegistry().register(ITEM_PURIFYING_ELIXIR_DRINK);
-		event.getRegistry().register(ITEM_MANA_FLASK_USE);
-		event.getRegistry().register(ITEM_MANA_FLASK_RECHARGE);
-
-		event.getRegistry().register(ENTITY_BLACK_HOLE_AMBIENT);
-		event.getRegistry().register(ENTITY_BLACK_HOLE_VANISH);
-		event.getRegistry().register(ENTITY_BLACK_HOLE_BREAK_BLOCK);
-		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_ZOMBIE_SPAWNER_SPAWN);
-
-		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_REMNANT_AMBIENT);
-		event.getRegistry().register(ENTITY_REMNANT_HURT);
-		event.getRegistry().register(ENTITY_REMNANT_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);
-		event.getRegistry().register(MISC_SPELL_FAIL);
-
-		for(Spell spell : Spell.getAllSpells()){
-			event.getRegistry().registerAll(spell.getSounds());
-		}
-
-		for(Forfeit forfeit : Forfeit.getForfeits()){
-			event.getRegistry().register(forfeit.getSound());
-		}
 	}
+
 }

src/main/java/electroblob/wizardry/spell/FireBreath.java

@@ -27,6 +27,7 @@ public class FireBreath extends SpellRay {
 		this.particleJitter(0.3);
 		this.particleSpacing(0.25);
 		addProperties(DAMAGE, BURN_DURATION);
+		this.soundValues(3f, 1, 0);
 	}
 
 	@Override

src/main/java/electroblob/wizardry/spell/FlameRay.java

@@ -25,7 +25,7 @@ public class FlameRay extends SpellRay {
 		this.particleVelocity(1);
 		this.particleSpacing(0.5);
 		addProperties(DAMAGE, BURN_DURATION);
-		this.soundValues(1.5f, 1, 0);
+		this.soundValues(2.5f, 1, 0);
 	}
 
 	// The following three methods serve as a good example of how to implement continuous spell sounds (hint: it's easy)

src/main/java/electroblob/wizardry/spell/IceAge.java

@@ -23,7 +23,7 @@ public class IceAge extends Spell {
 
 	public IceAge(){
 		super("ice_age", SpellActions.POINT_DOWN, false);
-		this.soundValues(0.7f, 1.0f, 0);
+		this.soundValues(1.5f, 1.0f, 0);
 		addProperties(EFFECT_RADIUS, EFFECT_DURATION);
 	}
 

src/main/resources/assets/ebwizardry/sounds.json

@@ -23,7 +23,8 @@
 	"entity.entrapment.ambient": 		{"category": "spells", "sounds": ["portal/portal"]},
 	"entity.entrapment.vanish": 		{"category": "spells", "sounds": ["portal/trigger"]},
 	"entity.fire_ring.ambient": 		{"category": "spells", "sounds": ["fire/fire"]},
-	"entity.fire_sigil.trigger": 		{"category": "spells", "sounds": ["mob/ghast/fireball4"]},
+	"entity.fire_sigil.trigger": 		{"category": "spells", "sounds": ["ebwizardry:combust"]},
+	"entity.forcefield.ambient": 		{"category": "spells", "sounds": ["ebwizardry:forcefield"]},
 	"entity.forcefield.deflect": 		{"category": "spells", "sounds": ["ebwizardry:effect1", "ebwizardry:effect2"]},
 	"entity.frost_sigil.trigger": 		{"category": "spells", "sounds": ["ebwizardry:freeze"]},
 	"entity.hammer.attack": 			{"category": "spells", "sounds": ["ebwizardry:arc1", "ebwizardry:arc2", "ebwizardry:arc3"]},
@@ -31,7 +32,7 @@
 	"entity.hammer.throw": 				{"category": "spells", "sounds": ["random/bow"]},
 	"entity.hammer.land": 				{"category": "spells", "sounds": ["random/anvil_land"]},
 	"entity.heal_aura.ambient": 		{"category": "spells", "sounds": ["ebwizardry:sparkle"]},
-	"entity.ice_spike.extend": 			{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"entity.ice_spike.extend": 			{"category": "spells", "sounds": ["ebwizardry:slice"]},
 	"entity.lightning_sigil.trigger": 	{"category": "spells", "sounds": ["ebwizardry:arc1", "ebwizardry:arc2", "ebwizardry:arc3"]},
 	"entity.meteor.falling": 			{"category": "spells", "sounds": ["ebwizardry:flames_loop"]},
 	"entity.shield.deflect": 			{"category": "spells", "sounds": ["ebwizardry:effect1", "ebwizardry:effect2"]},
@@ -82,7 +83,7 @@
 	"entity.firebolt.hit": 				{"category": "spells", "sounds": ["liquid/lavapop"]},
 	"entity.firebomb.throw": 			{"category": "spells", "sounds": ["random/bow"]},
 	"entity.firebomb.smash": 			{"category": "spells", "sounds": ["random/glass1", "random/glass2", "random/glass3"]},
-	"entity.firebomb.fire": 			{"category": "spells", "sounds": ["mob/ghast/fireball4"]},
+	"entity.firebomb.fire": 			{"category": "spells", "sounds": ["ebwizardry:combust"]},
 	"entity.force_arrow.hit": 			{"category": "spells", "sounds": ["fireworks/blast1"]},
 	"entity.force_orb.hit": 			{"category": "spells", "sounds": ["damage/hit1", "damage/hit2", "damage/hit3"]},
 	"entity.force_orb.hit_block": 		{"category": "spells", "sounds": ["fireworks/blast1"]},
@@ -124,14 +125,14 @@
 	"spell.banish": 					{"category": "spells", "sounds": ["mob/endermen/portal", "mob/endermen/portal2"]},
 	"spell.black_hole": 				{"category": "spells", "sounds": ["mob/evocation_illager/prepare_attack1", "mob/evocation_illager/prepare_attack2"]},
 	"spell.blink": 						{"category": "spells", "sounds": ["mob/endermen/portal", "mob/endermen/portal2"]},
-	"spell.blizzard": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.blizzard": 					{"category": "spells", "sounds": ["ebwizardry:ice_age"]},
 	"spell.bubble.shoot": 				{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.bubble.splash": 				{"category": "spells", "sounds": ["liquid/swim1", "liquid/swim2", "liquid/swim3", "liquid/swim4"], "volume": 2},
 	"spell.chain_lightning": 			{"category": "spells", "sounds": ["ebwizardry:arc1", "ebwizardry:arc2", "ebwizardry:arc3"]},
 	"spell.charge":  					{"category": "spells", "sounds": ["ebwizardry:shockwave"]},
 	"spell.clairvoyance": 				{"category": "spells", "sounds": ["ebwizardry:conjure"]},
 	"spell.cobwebs": 					{"category": "spells", "sounds": ["random/fizz"]},
-	"spell.combustion_rune": 			{"category": "spells", "sounds": ["fire/ignite"]},
+	"spell.combustion_rune": 			{"category": "spells", "sounds": ["ebwizardry:combust"]},
 	"spell.containment": 				{"category": "spells", "sounds": ["mob/guardian/curse"]},
 	"spell.conjure_armour": 			{"category": "spells", "sounds": ["ebwizardry:conjure"]},
 	"spell.conjure_block": 				{"category": "spells", "sounds": ["ebwizardry:conjure"]},
@@ -182,9 +183,9 @@
 	"spell.freeze": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.freezing_weapon": 			{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.frost_axe": 					{"category": "spells", "sounds": ["ebwizardry:buff"]},
-	"spell.frost_ray.start": 			{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.frost_ray.start": 			{"category": "spells", "sounds": ["ebwizardry:frost_start"]},
-	"spell.frost_ray.loop": 			{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.frost_ray.loop": 			{"category": "spells", "sounds": ["ebwizardry:frost_loop"]},
-	"spell.frost_ray.end": 				{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.frost_ray.end": 				{"category": "spells", "sounds": ["ebwizardry:frost_end"]},
 	"spell.frost_sigil": 				{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.frost_step": 				{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.glide": 						{"category": "spells", "sounds": [{"name": "item/elytra/elytra_loop", "volume": 0.6}]},
@@ -205,13 +206,13 @@
 	"spell.heal_ally": 					{"category": "spells", "sounds": ["ebwizardry:heal"]},
 	"spell.healing_aura": 				{"category": "spells", "sounds": ["ebwizardry:conjure_large"]},
 	"spell.homing_spark": 				{"category": "spells", "sounds": ["ebwizardry:conjure"]},
-	"spell.iceball": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.iceball": 					{"category": "spells", "sounds": ["ebwizardry:whoosh1", "ebwizardry:whoosh2"]},
-	"spell.ice_age": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.ice_age": 					{"category": "spells", "sounds": ["ebwizardry:ice_age"]},
-	"spell.ice_charge": 				{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.ice_charge": 				{"category": "spells", "sounds": ["ebwizardry:whoosh1", "ebwizardry:whoosh2"]},
 	"spell.ice_lance": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.ice_shard": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.ice_shroud": 				{"category": "spells", "sounds": ["ebwizardry:buff"]},
-	"spell.ice_spikes": 				{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.ice_spikes": 				{"category": "spells", "sounds": ["ebwizardry:whoosh1", "ebwizardry:whoosh2"]},
 	"spell.ice_statue.shoot": 			{"category": "spells", "sounds": ["ebwizardry:ice"]},
 	"spell.ice_statue.freeze": 			{"category": "spells", "sounds": ["ebwizardry:freeze"]},
 	"spell.ignite": 					{"category": "spells", "sounds": ["fire/ignite"]},
@@ -242,7 +243,7 @@
 	"spell.lightning_web.start": 		{"category": "spells", "sounds": ["ebwizardry:lightning_ray_start"]},
 	"spell.lightning_web.loop": 		{"category": "spells", "sounds": ["ebwizardry:lightning_ray_loop"]},
 	"spell.lightning_web.end": 			{"category": "spells", "sounds": ["ebwizardry:lightning_ray_end"]},
-	"spell.magic_missile": 				{"category": "spells", "sounds": ["ebwizardry:magic1"]},
+	"spell.magic_missile": 				{"category": "spells", "sounds": ["ebwizardry:magic"]},
 	"spell.metamorphosis": 				{"category": "spells", "sounds": ["mob/illusion_illager/prepare_mirror"]},
 	"spell.meteor": 					{"category": "spells", "sounds": ["mob/illusion_illager/prepare_blind"]},
 	"spell.mind_control": 				{"category": "spells", "sounds": ["mob/guardian/elder_death"]},
@@ -257,7 +258,7 @@
 	"spell.plague_of_darkness": 		{"category": "spells", "sounds": ["mob/wither/death"]},
 	"spell.pocket_furnace": 			{"category": "spells", "sounds": ["block/furnace/fire_crackle1", "block/furnace/fire_crackle2", "block/furnace/fire_crackle3", "block/furnace/fire_crackle4", "block/furnace/fire_crackle5"]},
 	"spell.pocket_workbench": 			{"category": "spells", "sounds": ["ebwizardry:conjure"]},
-	"spell.poison": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.poison": 					{"category": "spells", "sounds": ["ebwizardry:whoosh1", "ebwizardry:whoosh2"]},
 	"spell.poison_bomb": 				{"category": "spells", "sounds": ["random/bow"]},
 	"spell.possession.possess": 		{"category": "spells", "sounds": ["mob/evocation_illager/prepare_attack1", "mob/evocation_illager/prepare_attack2"]},
 	"spell.possession.end": 			{"category": "spells", "sounds": ["mob/guardian/elder_idle1", "mob/guardian/elder_idle2", "mob/guardian/elder_idle3", "mob/guardian/elder_idle4"]},
@@ -268,7 +269,7 @@
 	"spell.replenish_hunger": 			{"category": "spells", "sounds": ["ebwizardry:heal"]},
 	"spell.resurrection": 				{"category": "spells", "sounds": ["ebwizardry:buff_large"]},
 	"spell.reversal": 					{"category": "spells", "sounds": ["mob/wither/hurt1", "mob/wither/hurt2", "mob/wither/hurt3", "mob/wither/hurt4"]},
-	"spell.ring_of_fire": 				{"category": "spells", "sounds": ["mob/ghast/fireball4"]},
+	"spell.ring_of_fire": 				{"category": "spells", "sounds": ["ebwizardry:combust"]},
 	"spell.satiety": 					{"category": "spells", "sounds": ["ebwizardry:buff_large"]},
 	"spell.shadow_ward.start": 			{"category": "spells", "sounds": ["ebwizardry:dark_aura_start"]},
 	"spell.shadow_ward.loop": 			{"category": "spells", "sounds": ["ebwizardry:dark_aura_loop"]},
@@ -313,15 +314,15 @@
 	"spell.telekinesis": 				{"category": "spells", "sounds": ["ebwizardry:conjure"]},
 	"spell.thunderbolt": 				{"category": "spells", "sounds": ["mob/evocation_illager/cast1", "mob/evocation_illager/cast2"]},
 	"spell.thunderstorm": 				{"category": "spells", "sounds": ["ebwizardry:arc1", "ebwizardry:arc2", "ebwizardry:arc3"]},
-	"spell.tornado": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"spell.tornado": 					{"category": "spells", "sounds": ["ebwizardry:zoom1", "ebwizardry:zoom2", "ebwizardry:zoom3"]},
 	"spell.transience": 				{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.transportation": 			{"category": "spells", "sounds": ["portal/trigger"]},
 	"spell.transportation.travel": 		{"category": "spells", "sounds": ["portal/travel"]},
 	"spell.vanishing_box": 				{"category": "spells", "sounds": ["block/enderchest/open"]},
 	"spell.vex_swarm":		 			{"category": "spells", "sounds": ["mob/evocation_illager/prepare_summon"]},
-	"spell.wall_of_frost.start": 		{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.wall_of_frost.start": 		{"category": "spells", "sounds": ["ebwizardry:frost_start"]},
-	"spell.wall_of_frost.loop": 		{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.wall_of_frost.loop": 		{"category": "spells", "sounds": ["ebwizardry:frost_loop"]},
-	"spell.wall_of_frost.end": 			{"category": "spells", "sounds": ["ebwizardry:frostray"]},
+	"spell.wall_of_frost.end": 			{"category": "spells", "sounds": ["ebwizardry:frost_end"]},
 	"spell.ward": 						{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.water_breathing": 			{"category": "spells", "sounds": ["ebwizardry:buff"]},
 	"spell.whirlwind": 					{"category": "spells", "sounds": ["ebwizardry:ice"]},
@@ -341,7 +342,7 @@
 	"forfeit.freeze_self":				{"category": "spells", "sounds": ["ebwizardry:freeze"]},
 	"forfeit.freeze_self_2":			{"category": "spells", "sounds": ["ebwizardry:freeze"]},
 	"forfeit.ice_spikes":				{"category": "spells", "sounds": []},
-	"forfeit.blizzard":					{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"forfeit.blizzard":					{"category": "spells", "sounds": ["ebwizardry:ice_age"]},
 	"forfeit.ice_wraiths":				{"category": "spells", "sounds": ["mob/wither/idle1", "mob/wither/idle2", "mob/wither/idle3", "mob/wither/idle4"]},
 	"forfeit.hailstorm":				{"category": "spells", "sounds": ["mob/illusion_illager/prepare_blind"]},
 	"forfeit.ice_giant":				{"category": "spells", "sounds": ["mob/evocation_illager/prepare_summon"]},
@@ -360,7 +361,7 @@
 	"forfeit.snares":					{"category": "spells", "sounds": ["dig/grass1", "dig/grass2", "dig/grass3", "dig/grass4"]},
 	"forfeit.squid":					{"category": "spells", "sounds": ["liquid/swim1", "liquid/swim2", "liquid/swim3", "liquid/swim4"], "volume": 2},
 	"forfeit.uproot_plants":			{"category": "spells", "sounds": []},
-	"forfeit.poison_self":				{"category": "spells", "sounds": ["ebwizardry:ice"]},
+	"forfeit.poison_self":				{"category": "spells", "sounds": ["random/fizz"]},
 	"forfeit.flood":					{"category": "spells", "sounds": ["item/bucket/empty1", "item/bucket/empty2", "item/bucket/empty3"]},
 	"forfeit.bury_self":				{"category": "spells", "sounds": ["ebwizardry:rumble"]},
 	"forfeit.spill_inventory":			{"category": "spells", "sounds": ["ebwizardry:effect1", "ebwizardry:effect2"]},

src/main/resources/assets/ebwizardry/texts/handbook_en_gb.json

@@ -740,7 +740,7 @@
 
 				"Sound Effects:",
 
-				"- OhhWowProductions\n- fredzed\n- deleted_user_3277771\n- DiscoveryME",
+				"- OhhWowProductions\n- fredzed\n- deleted_user_3277771\n- DiscoveryME\n- OGSoundFX",
 
 				"For more information, check out the @https://github.com/Electroblob77/Wizardry/wiki wiki@.",
 

src/main/resources/assets/ebwizardry/texts/handbook_en_us.json

@@ -740,7 +740,7 @@
 
 				"Sound Effects:",
 
-				"- OhhWowProductions\n- fredzed\n- deleted_user_3277771\n- DiscoveryME",
+				"- OhhWowProductions\n- fredzed\n- deleted_user_3277771\n- DiscoveryME\n- OGSoundFX",
 
 				"For more information, check out the @https://github.com/Electroblob77/Wizardry/wiki wiki@.",