Fix doors not using custom open sounds when teleporting

quat1024 · Jul 5, 2024 · 96bd6c9 · 96bd6c9
1 parent e233f7e
commit 96bd6c9
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 6 deletions.
diff --git a/...n/java/agency/highlysuspect/dokokashiradoor/client/OffsetEntityTrackingSoundInstance.java b/...n/java/agency/highlysuspect/dokokashiradoor/client/OffsetEntityTrackingSoundInstance.java
@@ -1,6 +1,8 @@
 package agency.highlysuspect.dokokashiradoor.client;
 
 import agency.highlysuspect.dokokashiradoor.Init;
+import agency.highlysuspect.dokokashiradoor.util.DoorUtil;
+import net.minecraft.block.BlockState;
 import net.minecraft.client.sound.MovingSoundInstance;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.PlayerEntity;
@@ -25,11 +27,11 @@ public OffsetEntityTrackingSoundInstance(SoundEvent soundEvent, SoundCategory so
 		updatePos();
 	}
 
-	public static OffsetEntityTrackingSoundInstance doorOpen(PlayerEntity opener, BlockPos doorPos, Vec3d offset, Random random) {
+	public static OffsetEntityTrackingSoundInstance doorOpen(PlayerEntity opener, BlockPos doorPos, BlockState doorState, Vec3d offset, Random random) {
 		Vec3d offset2 = Vec3d.ofCenter(doorPos).subtract(opener.getPos());
 
 		return new OffsetEntityTrackingSoundInstance(
-			SoundEvents.BLOCK_WOODEN_DOOR_OPEN,
+			DoorUtil.getOpenSound(doorState),
 			SoundCategory.BLOCKS,
 			random,
 			1f, //volume

diff --git a/src/main/java/agency/highlysuspect/dokokashiradoor/gateway/Gateway.java b/src/main/java/agency/highlysuspect/dokokashiradoor/gateway/Gateway.java
@@ -18,7 +18,6 @@
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.sound.SoundCategory;
-import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
@@ -194,8 +193,8 @@ public void arrive(World world, Gateway departureGateway, PlayerEntity player) {
 			//On the server, to *other players*, play the door opening sound from both doors.
 			if(world instanceof ServerWorld sworld) {
 				//playSound with a PlayerEntity argument skips that player
-				sworld.playSound(player, departureGateway.doorTopPos, SoundEvents.BLOCK_WOODEN_DOOR_OPEN, SoundCategory.BLOCKS, 1f, world.random.nextFloat() * 0.1f + 0.9f);
-				sworld.playSound(player,             this.doorTopPos, SoundEvents.BLOCK_WOODEN_DOOR_OPEN, SoundCategory.BLOCKS, 1f, world.random.nextFloat() * 0.1f + 0.9f);
+				sworld.playSound(player, departureGateway.doorTopPos, DoorUtil.getOpenSound(departureDoorState), SoundCategory.BLOCKS, 1f, world.random.nextFloat() * 0.1f + 0.9f);
+				sworld.playSound(player,             this.doorTopPos, DoorUtil.getOpenSound(arrivalDoorState), SoundCategory.BLOCKS, 1f, world.random.nextFloat() * 0.1f + 0.9f);
 			}
 		}
 	}

diff --git a/src/main/java/agency/highlysuspect/dokokashiradoor/tp/ClientDoorTp.java b/src/main/java/agency/highlysuspect/dokokashiradoor/tp/ClientDoorTp.java
@@ -58,7 +58,7 @@ public static boolean playerUseDoorClient(World world, BlockPos leftFromPos, Blo
 		destination.arrive(world, thisGateway, player);
 
 		//4. Play the special clientside door-opening sound. This one follows the player around as they teleport.
-		MinecraftClient.getInstance().getSoundManager().play(OffsetEntityTrackingSoundInstance.doorOpen(player, destination.doorTopPos(), null, world.random));
+		MinecraftClient.getInstance().getSoundManager().play(OffsetEntityTrackingSoundInstance.doorOpen(player, destination.doorTopPos(), destination.doorBlock().getDefaultState(), null, world.random));
 
 		//5. Suppress sending a player-use-block packet.
 		//This prevents the door from opening normally on the server.

diff --git a/src/main/java/agency/highlysuspect/dokokashiradoor/util/DoorUtil.java b/src/main/java/agency/highlysuspect/dokokashiradoor/util/DoorUtil.java
@@ -4,6 +4,8 @@
 import net.minecraft.block.BlockState;
 import net.minecraft.block.DoorBlock;
 import net.minecraft.entity.Entity;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.event.GameEvent;
@@ -34,4 +36,12 @@ public static void sneakySwapHinge(World world, BlockPos doorTop, BlockState top
 	public static void sneakySetBlockstate(World world, BlockPos pos, BlockState state) {
 		world.setBlockState(pos, state, Block.NOTIFY_LISTENERS);
 	}
+
+	public static SoundEvent getOpenSound(BlockState state) {
+		if (state.getBlock() instanceof DoorBlock door) {
+			return door.getBlockSetType().doorOpen();
+		}
+
+		return SoundEvents.BLOCK_WOODEN_DOOR_OPEN;
+	}
 }