diff --git a/README.md b/README.md index cbae225..a306860 100644 --- a/README.md +++ b/README.md @@ -521,10 +521,12 @@ portalInfoServer=Server: %server% # Changes #### \[Version 0.11.5.4] Unified Legacy Fork + - Fix for a problem which could cause activators to generate at invalid locations. - Minor documentation clarification. #### \[Version 0.11.5.3] Unified Legacy Fork + - Hotfix for an issue wherein the gate folder failed to populate on fresh installs. #### \[Version 0.11.5.2] Unified Legacy Fork diff --git a/pom.xml b/pom.xml index 5a48643..b09658f 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ org.spigotmc spigot-api - 1.19.4-R0.1-SNAPSHOT + 1.20-R0.1-SNAPSHOT provided diff --git a/src/main/java/net/knarcraft/stargate/container/SignData.java b/src/main/java/net/knarcraft/stargate/container/SignData.java index 1b4bd31..f806ba4 100644 --- a/src/main/java/net/knarcraft/stargate/container/SignData.java +++ b/src/main/java/net/knarcraft/stargate/container/SignData.java @@ -4,6 +4,7 @@ import net.knarcraft.knarlib.util.ColorHelper; import net.md_5.bungee.api.ChatColor; import org.bukkit.DyeColor; import org.bukkit.block.Sign; +import org.bukkit.block.sign.Side; /** * A class that keeps track of the sign colors for a given sign @@ -26,7 +27,7 @@ public class SignData { this.sign = sign; this.mainSignColor = mainSignColor; this.highlightSignColor = highlightSignColor; - this.dyedColor = sign.getColor(); + this.dyedColor = sign.getSide(Side.FRONT).getColor(); } /** diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java b/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java index 4ecdc5a..3ce9b56 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalHandler.java @@ -172,7 +172,7 @@ public class PortalHandler { portalLocation.setButtonVector(controlVector); } } - + //If our gate has been found, look no further if (gate != null) { break; diff --git a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java index 3dabc9e..3357daa 100644 --- a/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java +++ b/src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java @@ -11,6 +11,7 @@ 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 java.util.Map; @@ -175,7 +176,7 @@ public class PortalSignDrawer { */ private void clearSign(Sign sign) { for (int index = 0; index <= 3; index++) { - sign.setLine(index, ""); + sign.getSide(Side.FRONT).setLine(index, ""); } } @@ -188,7 +189,7 @@ public class PortalSignDrawer { return; } clearSign(sign); - sign.setLine(0, translateAllColorCodes(portal.getName())); + sign.getSide(Side.FRONT).setLine(0, translateAllColorCodes(portal.getName())); sign.update(); } @@ -256,7 +257,7 @@ public class PortalSignDrawer { */ public void setLine(SignData signData, int index, String text) { ChatColor mainColor = signData.getMainSignColor(); - signData.getSign().setLine(index, mainColor + text); + signData.getSign().getSide(Side.FRONT).setLine(index, mainColor + text); } /** @@ -357,7 +358,7 @@ public class PortalSignDrawer { if (!(blockState instanceof Sign sign)) { return; } - sign.setLine(3, errorColor + Stargate.getString("signInvalidGate")); + sign.getSide(Side.FRONT).setLine(3, errorColor + Stargate.getString("signInvalidGate")); sign.update(); Stargate.logInfo(String.format("Gate layout on line %d does not exist [%s]", lineIndex, gateName));