EpicKnarvik97/Stargate
EpicKnarvik97/Stargate
2
0
Fork 0
Code Issues 7 Pull Requests Projects 1 Releases 27 Wiki Activity

Translates the & character to make sure portal signs are colored on all servers

Browse Source
This commit is contained in:
Kristian Knarvik 2021-11-09 22:47:38 +01:00
parent 1c2cad2ec1
commit 7a03f49fb1
1 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/main/java/net/knarcraft/stargate/portal/PortalSignDrawer.java
View File

@ -81,8 +81,7 @@ public class PortalSignDrawer {
private void drawSign(Sign sign) { private void drawSign(Sign sign) {
//Clear sign //Clear sign
clearSign(sign); clearSign(sign);
setLine(sign, 0, highlightColor + "-" + mainColor + setLine(sign, 0, highlightColor + "-" + mainColor + fixColor(portal.getName()) + highlightColor + "-");
portal.getName() + highlightColor + "-");
if (!portal.getPortalActivator().isActive()) { if (!portal.getPortalActivator().isActive()) {
//Default sign text //Default sign text
@ -123,7 +122,7 @@ public class PortalSignDrawer {
return; return;
} }
clearSign(sign); clearSign(sign);
sign.setLine(0, portal.getName()); sign.setLine(0, fixColor(portal.getName()));
sign.update(); sign.update();
} }
@ -173,10 +172,10 @@ public class PortalSignDrawer {
boolean green = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination); boolean green = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination);
ChatColor nameColor = (green ? freeColor : highlightColor); ChatColor nameColor = (green ? freeColor : highlightColor);
setLine(sign, signLineIndex, nameColor + ">" + (green ? freeColor : mainColor) + setLine(sign, signLineIndex, nameColor + ">" + (green ? freeColor : mainColor) +
portal.getDestinationName() + nameColor + "<"); fixColor(portal.getDestinationName()) + nameColor + "<");
} else { } else {
setLine(sign, signLineIndex, highlightColor + ">" + mainColor + portal.getDestinationName() + setLine(sign, signLineIndex, highlightColor + ">" + mainColor +
highlightColor + "<"); fixColor(portal.getDestinationName()) + highlightColor + "<");
} }
} }
@ -205,9 +204,9 @@ public class PortalSignDrawer {
if (freeGatesGreen) { if (freeGatesGreen) {
Portal destination = PortalHandler.getByName(destinationName, portal.getNetwork()); Portal destination = PortalHandler.getByName(destinationName, portal.getNetwork());
boolean green = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination); boolean green = PermissionHelper.isFree(portal.getActivePlayer(), portal, destination);
setLine(sign, signLineIndex, (green ? freeColor : mainColor) + destinationName); setLine(sign, signLineIndex, (green ? freeColor : mainColor) + fixColor(destinationName));
} else { } else {
setLine(sign, signLineIndex, mainColor + destinationName); setLine(sign, signLineIndex, mainColor + fixColor(destinationName));
} }
} }
@ -218,8 +217,10 @@ public class PortalSignDrawer {
*/ */
private void drawBungeeSign(Sign sign) { private void drawBungeeSign(Sign sign) {
setLine(sign, 1, Stargate.getString("bungeeSign")); setLine(sign, 1, Stargate.getString("bungeeSign"));
setLine(sign, 2, highlightColor + ">" + mainColor + portal.getDestinationName() + highlightColor + "<"); setLine(sign, 2, highlightColor + ">" + mainColor + fixColor(portal.getDestinationName()) +
setLine(sign, 3, highlightColor + "[" + mainColor + portal.getNetwork() + highlightColor + "]"); highlightColor + "<");
setLine(sign, 3, highlightColor + "[" + mainColor + fixColor(portal.getNetwork()) +
highlightColor + "]");
} }
/** /**
@ -233,7 +234,8 @@ public class PortalSignDrawer {
setLine(sign, 1, Stargate.getString("signRightClick")); setLine(sign, 1, Stargate.getString("signRightClick"));
setLine(sign, 2, Stargate.getString("signToUse")); setLine(sign, 2, Stargate.getString("signToUse"));
if (!portal.getOptions().isNoNetwork()) { if (!portal.getOptions().isNoNetwork()) {
setLine(sign, 3, highlightColor + "(" + mainColor + portal.getNetwork() + highlightColor + ")"); setLine(sign, 3, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) +
highlightColor + ")");
} else { } else {
setLine(sign, 3, ""); setLine(sign, 3, "");
} }
@ -247,12 +249,13 @@ public class PortalSignDrawer {
private void drawFixedSign(Sign sign) { private void drawFixedSign(Sign sign) {
String destinationName = portal.getOptions().isRandom() ? Stargate.getString("signRandom") : String destinationName = portal.getOptions().isRandom() ? Stargate.getString("signRandom") :
portal.getDestinationName(); portal.getDestinationName();
setLine(sign, 1, highlightColor + ">" + mainColor + destinationName + highlightColor + "<"); setLine(sign, 1, highlightColor + ">" + mainColor + fixColor(destinationName) + highlightColor + "<");
if (portal.getOptions().isNoNetwork()) { if (portal.getOptions().isNoNetwork()) {
setLine(sign, 2, ""); setLine(sign, 2, "");
} else { } else {
setLine(sign, 2, highlightColor + "(" + mainColor + portal.getNetwork() + highlightColor + ")"); setLine(sign, 2, highlightColor + "(" + mainColor + fixColor(portal.getNetwork()) +
highlightColor + ")");
} }
Portal destination = PortalHandler.getByName(portal.getDestinationName(), portal.getNetwork()); Portal destination = PortalHandler.getByName(portal.getDestinationName(), portal.getNetwork());
if (destination == null && !portal.getOptions().isRandom()) { if (destination == null && !portal.getOptions().isRandom()) {
@ -277,4 +280,14 @@ public class PortalSignDrawer {
Stargate.logInfo(String.format("Gate layout on line %d does not exist [%s]", lineIndex, gateName)); Stargate.logInfo(String.format("Gate layout on line %d does not exist [%s]", lineIndex, gateName));
} }
/**
* Fixes coloring of signs as the & character isn't translated on all servers
*
* @param text <p>The text to fix the coloring of</p>
* @return <p>The text with the coloring fixed</p>
*/
private String fixColor(String text) {
return ChatColor.translateAlternateColorCodes('&', text);
}
} }