Superior hum

enjarai · Nov 16, 2023 · 6b9c9ad · 6b9c9ad
1 parent eac7572
commit 6b9c9ad
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/dev/enjarai/minitardis/ModSounds.java b/src/main/java/dev/enjarai/minitardis/ModSounds.java
@@ -7,6 +7,7 @@ public class ModSounds {
     public static SoundEvent TARDIS_TAKEOFF = createSound("tardis_takeoff");
     public static SoundEvent TARDIS_LANDING = createSound("tardis_landing");
     public static SoundEvent TARDIS_FLY_LOOP = createSound("tardis_fly_loop");
+    public static SoundEvent CORAL_HUM = createSound("coral_hum");
 
     private static SoundEvent createSound(String path) {
         return SoundEvent.of(MiniTardis.id(path));

diff --git a/src/main/java/dev/enjarai/minitardis/component/Tardis.java b/src/main/java/dev/enjarai/minitardis/component/Tardis.java
@@ -3,6 +3,7 @@
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.codecs.RecordCodecBuilder;
 import dev.enjarai.minitardis.MiniTardis;
+import dev.enjarai.minitardis.ModSounds;
 import dev.enjarai.minitardis.block.InteriorDoorBlock;
 import dev.enjarai.minitardis.block.ModBlocks;
 import dev.enjarai.minitardis.block.TardisExteriorBlock;
@@ -12,6 +13,7 @@
 import net.minecraft.block.FacingBlock;
 import net.minecraft.block.enums.DoubleBlockHalf;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.network.packet.s2c.play.PositionFlag;
 import net.minecraft.registry.RegistryKey;
 import net.minecraft.registry.RegistryKeys;
@@ -105,7 +107,9 @@ public void tick() {
         }
 
         // Interior hum
-        state.playForInterior(this, SoundEvents.ENTITY_GUARDIAN_AMBIENT, SoundCategory.AMBIENT, 0.3f, 0f);
+        if (world.getTime() % (20 * 12) == 0) {
+            state.playForInterior(this, ModSounds.CORAL_HUM, SoundCategory.AMBIENT, 0.3f, 1);
+        }
     }
 
     public ServerWorld getInteriorWorld() {
@@ -196,6 +200,11 @@ public void teleportEntityIn(Entity entity) {
 
             var entityPos = Vec3d.ofBottomCenter(targetPos);
             entity.teleport(world, entityPos.getX(), entityPos.getY(), entityPos.getZ(), Set.of(), yaw, 0);
+
+            // Play a loop of hum to the player the moment they enter to ensure a seamless experience™
+            if (entity instanceof PlayerEntity player) {
+                world.playSoundFromEntity(null, player, ModSounds.CORAL_HUM, SoundCategory.AMBIENT, 0.3f, 1);
+            }
         }
     }