diff --git a/common/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java b/common/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java index 20594557..08a19965 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/AntarchySoundEvents.java @@ -126,6 +126,8 @@ public final class AntarchySoundEvents { public static Supplier TORETERROR_HURT = (Supplier) UNBOUND; public static Supplier TORETERROR_DEATH = (Supplier) UNBOUND; public static Supplier TORETERROR_BOMBER_FIRE = (Supplier) UNBOUND; + public static Supplier TORETERROR_JUMP_UP = (Supplier) UNBOUND; + public static Supplier TORETERROR_JUMP_LAND = (Supplier) UNBOUND; public static Supplier STINKY_FLY = (Supplier) UNBOUND; public static Supplier CREEPING_HORROR_GROWL = (Supplier) UNBOUND; public static Supplier CREEPING_HORROR_HURT = (Supplier) UNBOUND; @@ -257,6 +259,8 @@ public final class AntarchySoundEvents { Supplier toreterrorHurt, Supplier toreterrorDeath, Supplier toreterrorBomberFire, + Supplier toreterrorJumpUp, + Supplier toreterrorJumpLand, Supplier stinkyFly, Supplier creepingHorrorGrowl, Supplier creepingHorrorHurt, @@ -384,6 +388,8 @@ public final class AntarchySoundEvents { TORETERROR_HURT = toreterrorHurt; TORETERROR_DEATH = toreterrorDeath; TORETERROR_BOMBER_FIRE = toreterrorBomberFire; + TORETERROR_JUMP_UP = toreterrorJumpUp; + TORETERROR_JUMP_LAND = toreterrorJumpLand; STINKY_FLY = stinkyFly; CREEPING_HORROR_GROWL = creepingHorrorGrowl; CREEPING_HORROR_HURT = creepingHorrorHurt; diff --git a/common/src/main/java/com/craisinlord/antarchy/content/entity/ToreterrorEntity.java b/common/src/main/java/com/craisinlord/antarchy/content/entity/ToreterrorEntity.java index 6f3bc1ab..9ff71f9b 100644 --- a/common/src/main/java/com/craisinlord/antarchy/content/entity/ToreterrorEntity.java +++ b/common/src/main/java/com/craisinlord/antarchy/content/entity/ToreterrorEntity.java @@ -453,6 +453,7 @@ public class ToreterrorEntity extends Monster implements GeoEntity { if (this.jumpLaunched && this.jumpAirborne && !this.shockwaveApplied) { if (this.onGround()) { this.shockwaveApplied = true; + this.playSound(AntarchySoundEvents.TORETERROR_JUMP_LAND.get(), 1.2F, 0.9F + this.random.nextFloat() * 0.15F); this.applyJumpShockwave(); this.jumpShakeTicks = JUMP_SHAKE_TICKS; this.entityData.set(JUMP_SHAKING, true); @@ -852,6 +853,7 @@ public class ToreterrorEntity extends Monster implements GeoEntity { ToreterrorEntity.this.jumpLaunched = false; ToreterrorEntity.this.jumpAirborne = false; ToreterrorEntity.this.shockwaveApplied = false; + ToreterrorEntity.this.playSound(AntarchySoundEvents.TORETERROR_JUMP_UP.get(), 1.2F, 0.9F + ToreterrorEntity.this.random.nextFloat() * 0.15F); } @Override diff --git a/common/src/main/resources/assets/antarchy/lang/en_us.json b/common/src/main/resources/assets/antarchy/lang/en_us.json index 43015e4f..515df46b 100644 --- a/common/src/main/resources/assets/antarchy/lang/en_us.json +++ b/common/src/main/resources/assets/antarchy/lang/en_us.json @@ -661,6 +661,8 @@ "subtitles.antarchy.toreterror_hurt": "Toreterror hurts", "subtitles.antarchy.toreterror_death": "Toreterror dies", "subtitles.antarchy.toreterror_bomber_fire": "Toreterror launches bombers", + "subtitles.antarchy.toreterror_jump_up": "Toreterror jumps", + "subtitles.antarchy.toreterror_jump_land": "Toreterror lands", "subtitles.antarchy.creeping_horror_growl": "Creeping Horror growls", "subtitles.antarchy.creeping_horror_hurt": "Creeping Horror hurts", "subtitles.antarchy.creeping_horror_bite": "Creeping Horror bites", diff --git a/common/src/main/resources/assets/antarchy/sounds.json b/common/src/main/resources/assets/antarchy/sounds.json index a2dfd7df..5316cdc8 100644 --- a/common/src/main/resources/assets/antarchy/sounds.json +++ b/common/src/main/resources/assets/antarchy/sounds.json @@ -513,6 +513,28 @@ } ] }, + "toreterror_jump_up": { + "subtitle": "subtitles.antarchy.toreterror_jump_up", + "sounds": [ + { + "name": "antarchy:mob/toreterror/jump_up1" + }, + { + "name": "antarchy:mob/toreterror/jump_up2" + } + ] + }, + "toreterror_jump_land": { + "subtitle": "subtitles.antarchy.toreterror_jump_land", + "sounds": [ + { + "name": "antarchy:mob/toreterror/jump_land1" + }, + { + "name": "antarchy:mob/toreterror/jump_land2" + } + ] + }, "creeping_horror_growl": { "subtitle": "subtitles.antarchy.creeping_horror_growl", "sounds": [ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up1.mp3 b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up1.mp3 deleted file mode 100644 index 3232ca89..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up1.mp3 and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up2.mp3 b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up2.mp3 deleted file mode 100644 index f0cca377..00000000 Binary files a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump up2.mp3 and /dev/null differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land1.ogg new file mode 100644 index 00000000..55a6aacc Binary files /dev/null and b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land1.ogg differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land2.ogg new file mode 100644 index 00000000..dcea190a Binary files /dev/null and b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_land2.ogg differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up1.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up1.ogg new file mode 100644 index 00000000..d2ec4575 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up1.ogg differ diff --git a/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up2.ogg b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up2.ogg new file mode 100644 index 00000000..17dc6058 Binary files /dev/null and b/common/src/main/resources/assets/antarchy/sounds/mob/toreterror/jump_up2.ogg differ diff --git a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java index 0e15ad89..efd88de3 100644 --- a/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java +++ b/fabric/src/main/java/com/craisinlord/antarchy/fabric/AntarchyFabricContent.java @@ -401,6 +401,8 @@ public final class AntarchyFabricContent { public static final DeferredHolder TORETERROR_HURT = registerSoundEvent("toreterror_hurt"); public static final DeferredHolder TORETERROR_DEATH = registerSoundEvent("toreterror_death"); public static final DeferredHolder TORETERROR_BOMBER_FIRE = registerSoundEvent("toreterror_bomber_fire"); + public static final DeferredHolder TORETERROR_JUMP_UP = registerSoundEvent("toreterror_jump_up"); + public static final DeferredHolder TORETERROR_JUMP_LAND = registerSoundEvent("toreterror_jump_land"); public static final DeferredHolder STINKY_FLY_SOUND = registerSoundEvent("stinky_fly"); public static final DeferredHolder CREEPING_HORROR_GROWL = registerSoundEvent("creeping_horror_growl"); public static final DeferredHolder CREEPING_HORROR_HURT = registerSoundEvent("creeping_horror_hurt"); @@ -2499,6 +2501,8 @@ public final class AntarchyFabricContent { TORETERROR_HURT, TORETERROR_DEATH, TORETERROR_BOMBER_FIRE, + TORETERROR_JUMP_UP, + TORETERROR_JUMP_LAND, STINKY_FLY_SOUND, CREEPING_HORROR_GROWL, CREEPING_HORROR_HURT, diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java index a7834edb..155812b3 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/AntarchyNeoforge.java @@ -141,6 +141,8 @@ public class AntarchyNeoforge { AntarchyNeoforgeSounds.TORETERROR_HURT, AntarchyNeoforgeSounds.TORETERROR_DEATH, AntarchyNeoforgeSounds.TORETERROR_BOMBER_FIRE, + AntarchyNeoforgeSounds.TORETERROR_JUMP_UP, + AntarchyNeoforgeSounds.TORETERROR_JUMP_LAND, AntarchyNeoforgeSounds.STINKY_FLY, AntarchyNeoforgeSounds.CREEPING_HORROR_GROWL, AntarchyNeoforgeSounds.CREEPING_HORROR_HURT, diff --git a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java index f42d866b..a98d76a8 100644 --- a/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java +++ b/neoforge/src/main/java/com/craisinlord/antarchy/neoforge/registry/AntarchyNeoforgeSounds.java @@ -128,6 +128,8 @@ public final class AntarchyNeoforgeSounds { public static final DeferredHolder TORETERROR_HURT = registerSoundEvent("toreterror_hurt"); public static final DeferredHolder TORETERROR_DEATH = registerSoundEvent("toreterror_death"); public static final DeferredHolder TORETERROR_BOMBER_FIRE = registerSoundEvent("toreterror_bomber_fire"); + public static final DeferredHolder TORETERROR_JUMP_UP = registerSoundEvent("toreterror_jump_up"); + public static final DeferredHolder TORETERROR_JUMP_LAND = registerSoundEvent("toreterror_jump_land"); public static final DeferredHolder STINKY_FLY = registerSoundEvent("stinky_fly"); public static final DeferredHolder CREEPING_HORROR_GROWL = registerSoundEvent("creeping_horror_growl"); public static final DeferredHolder CREEPING_HORROR_HURT = registerSoundEvent("creeping_horror_hurt");