From 3b117f4e61a7dc76878c668246a6f29db255e252 Mon Sep 17 00:00:00 2001 From: Christopher Bohn Date: Thu, 8 Feb 2024 01:24:05 -0800 Subject: [PATCH] Use door matcher for door sounds --- .../griefcraft/modules/doors/DoorsModule.java | 53 ++++++------------- 1 file changed, 15 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/griefcraft/modules/doors/DoorsModule.java b/src/main/java/com/griefcraft/modules/doors/DoorsModule.java index af46e6a..10f8463 100644 --- a/src/main/java/com/griefcraft/modules/doors/DoorsModule.java +++ b/src/main/java/com/griefcraft/modules/doors/DoorsModule.java @@ -203,44 +203,21 @@ private void changeDoorStates(LWCProtectionInteractEvent event, boolean allowDoo door.setBlockData(doorBlockData); // make the correct door sound - switch (door.getType()) { - case OAK_DOOR: - case SPRUCE_DOOR: - case BIRCH_DOOR: - case JUNGLE_DOOR: - case ACACIA_DOOR: - case DARK_OAK_DOOR: - door.getWorld().playSound(door.getLocation(), - doorIsOpen ? Sound.BLOCK_WOODEN_DOOR_CLOSE : Sound.BLOCK_WOODEN_DOOR_OPEN, 1, 1); - break; - case IRON_DOOR: - door.getWorld().playSound(door.getLocation(), - doorIsOpen ? Sound.BLOCK_IRON_DOOR_CLOSE : Sound.BLOCK_IRON_DOOR_OPEN, 1, 1); - break; - case OAK_TRAPDOOR: - case SPRUCE_TRAPDOOR: - case BIRCH_TRAPDOOR: - case JUNGLE_TRAPDOOR: - case ACACIA_TRAPDOOR: - case DARK_OAK_TRAPDOOR: - door.getWorld().playSound(door.getLocation(), - doorIsOpen ? Sound.BLOCK_WOODEN_TRAPDOOR_CLOSE : Sound.BLOCK_WOODEN_TRAPDOOR_OPEN, 1, 1); - break; - case IRON_TRAPDOOR: - door.getWorld().playSound(door.getLocation(), - doorIsOpen ? Sound.BLOCK_IRON_TRAPDOOR_CLOSE : Sound.BLOCK_IRON_TRAPDOOR_OPEN, 1, 1); - break; - case OAK_FENCE_GATE: - case SPRUCE_FENCE_GATE: - case BIRCH_FENCE_GATE: - case JUNGLE_FENCE_GATE: - case ACACIA_FENCE_GATE: - case DARK_OAK_FENCE_GATE: - door.getWorld().playSound(door.getLocation(), - doorIsOpen ? Sound.BLOCK_FENCE_GATE_CLOSE : Sound.BLOCK_FENCE_GATE_OPEN, 1, 1); - break; - default: - break; + if (DoorMatcher.WOODEN_DOORS.contains(door.getType())) { + door.getWorld().playSound(door.getLocation(), + doorIsOpen ? Sound.BLOCK_WOODEN_DOOR_CLOSE : Sound.BLOCK_WOODEN_DOOR_OPEN, 1, 1); + } else if (Material.IRON_DOOR.equals(door.getType())) { + door.getWorld().playSound(door.getLocation(), + doorIsOpen ? Sound.BLOCK_IRON_DOOR_CLOSE : Sound.BLOCK_IRON_DOOR_OPEN, 1, 1); + } else if (DoorMatcher.WOODEN_TRAP_DOORS.contains(door.getType())) { + door.getWorld().playSound(door.getLocation(), + doorIsOpen ? Sound.BLOCK_WOODEN_TRAPDOOR_CLOSE : Sound.BLOCK_WOODEN_TRAPDOOR_OPEN, 1, 1); + } else if (Material.IRON_TRAPDOOR.equals(door.getType())) { + door.getWorld().playSound(door.getLocation(), + doorIsOpen ? Sound.BLOCK_IRON_TRAPDOOR_CLOSE : Sound.BLOCK_IRON_TRAPDOOR_OPEN, 1, 1); + } else if (DoorMatcher.FENCE_GATES.contains(door.getType())) { + door.getWorld().playSound(door.getLocation(), + doorIsOpen ? Sound.BLOCK_FENCE_GATE_CLOSE : Sound.BLOCK_FENCE_GATE_OPEN, 1, 1); } } }