From ad4a054a6385bfefd05ed1cfcb0c540028b60fdb Mon Sep 17 00:00:00 2001 From: Zeanon Date: Tue, 18 Apr 2023 11:46:58 +0200 Subject: [PATCH 1/2] Added new Buttons to Loader Detonator not nescessary since detection works differently --- .../steamwar/bausystem/features/loader/LoaderButton.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java index e5e74171..6825a247 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java @@ -46,6 +46,9 @@ public enum LoaderButton { switch (block.getType()) { case LEVER: return LoaderButton.SWITCH; + case CRIMSON_BUTTON: + case MANGROVE_BUTTON: + case WARPED_BUTTON: case ACACIA_BUTTON: case BIRCH_BUTTON: case DARK_OAK_BUTTON: @@ -53,8 +56,13 @@ public enum LoaderButton { case OAK_BUTTON: case SPRUCE_BUTTON: return LoaderButton.WOOD_BUTTON; + case POLISHED_BLACKSTONE_BUTTON: case STONE_BUTTON: return LoaderButton.STONE_BUTTON; + case CRIMSON_PRESSURE_PLATE: + case MANGROVE_PRESSURE_PLATE: + case WARPED_PRESSURE_PLATE: + // case POLISHED_BLACKSTONE_PRESSURE_PLATE: case ACACIA_PRESSURE_PLATE: case BIRCH_PRESSURE_PLATE: case DARK_OAK_PRESSURE_PLATE: -- 2.39.2 From 377bcb92fb845a29f9ce9698064c86bdbd4e97b0 Mon Sep 17 00:00:00 2001 From: Zeanon Date: Tue, 18 Apr 2023 11:55:30 +0200 Subject: [PATCH 2/2] Generalized LoaderButton assignment --- .../features/loader/LoaderButton.java | 42 ++++++------------- 1 file changed, 13 insertions(+), 29 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java index 6825a247..4a1d5159 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/features/loader/LoaderButton.java @@ -24,6 +24,7 @@ import lombok.Getter; import lombok.RequiredArgsConstructor; import org.bukkit.block.Block; + @AllArgsConstructor @RequiredArgsConstructor @Getter @@ -46,42 +47,25 @@ public enum LoaderButton { switch (block.getType()) { case LEVER: return LoaderButton.SWITCH; - case CRIMSON_BUTTON: - case MANGROVE_BUTTON: - case WARPED_BUTTON: - case ACACIA_BUTTON: - case BIRCH_BUTTON: - case DARK_OAK_BUTTON: - case JUNGLE_BUTTON: - case OAK_BUTTON: - case SPRUCE_BUTTON: - return LoaderButton.WOOD_BUTTON; - case POLISHED_BLACKSTONE_BUTTON: - case STONE_BUTTON: - return LoaderButton.STONE_BUTTON; - case CRIMSON_PRESSURE_PLATE: - case MANGROVE_PRESSURE_PLATE: - case WARPED_PRESSURE_PLATE: - // case POLISHED_BLACKSTONE_PRESSURE_PLATE: - case ACACIA_PRESSURE_PLATE: - case BIRCH_PRESSURE_PLATE: - case DARK_OAK_PRESSURE_PLATE: - case JUNGLE_PRESSURE_PLATE: - case OAK_PRESSURE_PLATE: - case SPRUCE_PRESSURE_PLATE: - case STONE_PRESSURE_PLATE: - return LoaderButton.PRESSURE_PLATE; - case HEAVY_WEIGHTED_PRESSURE_PLATE: - case LIGHT_WEIGHTED_PRESSURE_PLATE: - return LoaderButton.WEIGHTED_PRESSURE_PLATE; case TRIPWIRE: return LoaderButton.TRIPWIRE; case NOTE_BLOCK: return LoaderButton.NOTEBLOCK; case DAYLIGHT_DETECTOR: return LoaderButton.DAYLIGHTSENSOR; + case HEAVY_WEIGHTED_PRESSURE_PLATE: + case LIGHT_WEIGHTED_PRESSURE_PLATE: + return LoaderButton.WEIGHTED_PRESSURE_PLATE; default: - return LoaderButton.INVALID; + if (block.getType().name().contains("STONE_BUTTON")) { + return LoaderButton.STONE_BUTTON; + } else if (block.getType().name().contains("BUTTON")) { + return LoaderButton.WOOD_BUTTON; + } else if (block.getType().name().contains("PRESSURE_PLATE")) { + return LoaderButton.PRESSURE_PLATE; + } else { + return LoaderButton.INVALID; + } } } } -- 2.39.2