From f77ead15c467097c7f0decd8a4fdae263a38cf60 Mon Sep 17 00:00:00 2001 From: EpicKnarvik97 Date: Sat, 1 Jun 2024 20:13:20 +0200 Subject: [PATCH] Uses optional legacy method when getting sign lines --- .../stargate/portal/PortalSignDrawer.java | 4 ++-- .../portal/property/gate/GateHandler.java | 2 +- .../knarcraft/stargate/utility/SignHelper.java | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java index 7e96e61..4583457 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java @@ -13,7 +13,6 @@ import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.block.Sign; -import org.bukkit.block.sign.Side; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -184,7 +183,8 @@ public class PortalSignDrawer { */ private void updateSign(@NotNull Sign sign, @NotNull String[] lines) { boolean updateNecessary = false; - String[] oldLines = sign.getSide(Side.FRONT).getLines(); + + String[] oldLines = SignHelper.getLines(sign); for (int i = 0; i < 4; i++) { if (!oldLines[i].equals(lines[i])) { updateNecessary = true; diff --git a/src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java b/src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java index 3a754fa..110a9ab 100644 --- a/src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java +++ b/src/main/java/net/knarcraft/stargate/portal/property/gate/GateHandler.java @@ -210,7 +210,7 @@ public class GateHandler { Stargate.logSevere(String.format(failString, "Gates must have exactly 2 control points.")); return false; } - + if (gate.getLayout().getExit() == null) { Stargate.logSevere(String.format(failString, "Gates must have one specified exit point")); return false; diff --git a/src/main/java/net/knarcraft/stargate/utility/SignHelper.java b/src/main/java/net/knarcraft/stargate/utility/SignHelper.java index 566cc46..c885a34 100644 --- a/src/main/java/net/knarcraft/stargate/utility/SignHelper.java +++ b/src/main/java/net/knarcraft/stargate/utility/SignHelper.java @@ -17,6 +17,23 @@ public final class SignHelper { } + /** + * Gets the lines of the given sign + * + * @param sign

The sign to get lines from

+ * @return

The lines of the sign

+ */ + @NotNull + public static String[] getLines(@NotNull Sign sign) { + if (HAS_SIGN_SIDES) { + return sign.getSide(Side.FRONT).getLines(); + } else { + // Note: This is depreciated, but is currently necessary for pre-1.19.4 support + //noinspection deprecation + return sign.getLines(); + } + } + /** * Gets the dye color of the given sign *