diff --git a/CREDITS.md b/CREDITS.md index a87efc3f..d3288b04 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -45,4 +45,5 @@ In addition, I'd like to thank the following individuals for their contributions - fredzed - deleted_user_3277771 - DiscoveryME -- OGSoundFX \ No newline at end of file +- OGSoundFX +- leosalom \ No newline at end of file diff --git a/src/main/java/electroblob/wizardry/entity/construct/EntityRadiantTotem.java b/src/main/java/electroblob/wizardry/entity/construct/EntityRadiantTotem.java index 75b00cdd..e9259e33 100644 --- a/src/main/java/electroblob/wizardry/entity/construct/EntityRadiantTotem.java +++ b/src/main/java/electroblob/wizardry/entity/construct/EntityRadiantTotem.java @@ -1,7 +1,9 @@ package electroblob.wizardry.entity.construct; +import electroblob.wizardry.Wizardry; import electroblob.wizardry.constants.Constants; import electroblob.wizardry.registry.Spells; +import electroblob.wizardry.registry.WizardrySounds; import electroblob.wizardry.spell.RadiantTotem; import electroblob.wizardry.spell.Spell; import electroblob.wizardry.util.*; @@ -41,8 +43,8 @@ public class EntityRadiantTotem extends EntityScaledConstruct { @Override public void onUpdate(){ - if(this.ticksExisted % 25 == 1){ - // TODO: Sound + if(this.ticksExisted == 1){ + Wizardry.proxy.playMovingSound(this, WizardrySounds.ENTITY_RADIANT_TOTEM_AMBIENT, WizardrySounds.SPELLS, 1, 1, true); } super.onUpdate(); @@ -124,6 +126,12 @@ public class EntityRadiantTotem extends EntityScaledConstruct { } } + @Override + public void despawn(){ + this.playSound(WizardrySounds.ENTITY_RADIANT_TOTEM_VANISH, 1, 1); + super.despawn(); + } + // Usually damage multipliers don't need syncing, but here we're using it for the non-standard purpose of targeting @Override diff --git a/src/main/java/electroblob/wizardry/registry/WizardrySounds.java b/src/main/java/electroblob/wizardry/registry/WizardrySounds.java index 67b87788..dcb80f07 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardrySounds.java +++ b/src/main/java/electroblob/wizardry/registry/WizardrySounds.java @@ -65,6 +65,8 @@ public final class WizardrySounds { 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_RADIANT_TOTEM_AMBIENT = createSound("entity.radiant_totem.ambient"); + public static final SoundEvent ENTITY_RADIANT_TOTEM_VANISH = createSound("entity.radiant_totem.vanish"); 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_ZOMBIE_SPAWNER_SPAWN = createSound("entity.zombie_spawner.spawn"); diff --git a/src/main/resources/assets/ebwizardry/sounds.json b/src/main/resources/assets/ebwizardry/sounds.json index c7707528..345d1770 100644 --- a/src/main/resources/assets/ebwizardry/sounds.json +++ b/src/main/resources/assets/ebwizardry/sounds.json @@ -36,6 +36,8 @@ "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.radiant_totem.ambient": {"category": "spells", "sounds": ["ebwizardry:beam_loop"]}, + "entity.radiant_totem.vanish": {"category": "spells", "sounds": ["ebwizardry:beam_end"]}, "entity.shield.deflect": {"category": "spells", "sounds": ["ebwizardry:effect1", "ebwizardry:effect2"]}, "entity.stormcloud.thunder": {"category": "spells", "sounds": ["ambient/weather/thunder1", "ambient/weather/thunder2", "ambient/weather/thunder3"]}, "entity.stormcloud.attack": {"category": "spells", "sounds": ["ebwizardry:arc1", "ebwizardry:arc2", "ebwizardry:arc3"]}, @@ -265,9 +267,10 @@ "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"]}, - "spell.ray_of_purification.start": {"category": "spells", "sounds": ["ebwizardry:aura_start"]}, - "spell.ray_of_purification.loop": {"category": "spells", "sounds": ["ebwizardry:aura_loop"]}, - "spell.ray_of_purification.end": {"category": "spells", "sounds": ["ebwizardry:aura_end"]}, + "spell.ray_of_purification.start": {"category": "spells", "sounds": ["ebwizardry:beam_start"]}, + "spell.ray_of_purification.loop": {"category": "spells", "sounds": ["ebwizardry:beam_loop"]}, + "spell.ray_of_purification.end": {"category": "spells", "sounds": ["ebwizardry:beam_end"]}, + "spell.radiant_totem": {"category": "spells", "sounds": ["ebwizardry:beam_start"]}, "spell.remove_curse": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, "spell.replenish_hunger": {"category": "spells", "sounds": ["ebwizardry:heal"]}, "spell.resurrection": {"category": "spells", "sounds": ["ebwizardry:buff_large"]}, diff --git a/src/main/resources/assets/ebwizardry/sounds/beam_end.ogg b/src/main/resources/assets/ebwizardry/sounds/beam_end.ogg new file mode 100644 index 00000000..9e64fd4c Binary files /dev/null and b/src/main/resources/assets/ebwizardry/sounds/beam_end.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/beam_loop.ogg b/src/main/resources/assets/ebwizardry/sounds/beam_loop.ogg new file mode 100644 index 00000000..230d616e Binary files /dev/null and b/src/main/resources/assets/ebwizardry/sounds/beam_loop.ogg differ diff --git a/src/main/resources/assets/ebwizardry/sounds/beam_start.ogg b/src/main/resources/assets/ebwizardry/sounds/beam_start.ogg new file mode 100644 index 00000000..4eb74dff Binary files /dev/null and b/src/main/resources/assets/ebwizardry/sounds/beam_start.ogg differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 922361a1..0c3bab1a 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -5,7 +5,7 @@ "version" : "4.3", "mcversion" : "1.12.2", "url" : "https://minecraft.curseforge.com/projects/electroblobs-wizardry", - "credits" : "\nDesigned, coded and textured by Electroblob.\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica, UltraHex, Azim-Palmer, raoulvdberge.\nTranslators: Alsentar (Spanish), MadWrist (Mexican Spanish), VilagVil, kellixon & bigenergy (Russian), Hahdrim (French), lorrampi (Brazilian Portuguese), ZHENGLOC, dragon-evol, Hokorizero, TUsama & Determancer (Chinese - Simplified), shejery & rewi_wire (Korean), Trozuu (Polish), chesterccj305 (Chinese - Traditional), Bombadil (Hungarian).\nSound Effects: OhhWowProductions, fredzed, deleted_user_3277771, DiscoveryME", + "credits" : "\nDesigned, coded and textured by Electroblob.\nCode contributed by: Corail31, 12foo, Shadows-of-Fire, Tora-B, Avatair, Aeronica, UltraHex, Azim-Palmer, raoulvdberge.\nTranslators: Alsentar (Spanish), MadWrist (Mexican Spanish), VilagVil, kellixon & bigenergy (Russian), Hahdrim (French), lorrampi (Brazilian Portuguese), ZHENGLOC, dragon-evol, Hokorizero, TUsama & Determancer (Chinese - Simplified), shejery & rewi_wire (Korean), Trozuu (Polish), chesterccj305 (Chinese - Traditional), Bombadil (Hungarian).\nSound Effects: OhhWowProductions, fredzed, deleted_user_3277771, DiscoveryME, OGSoundFX, leosalom", "authorList" : [ "Electroblob" ],