Fix issue when Color codes did not work in opened Panels and Titles (#…

…110) These text element colors were not translated correctly. Now it should work.
BentoBoxWorld · May 4, 2019 · d60f20e · d60f20e
1 parent c702dd4
commit d60f20e
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 12 deletions.
diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java
@@ -1,6 +1,7 @@
 package world.bentobox.challenges.panel.admin;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.enchantments.Enchantment;
@@ -275,7 +276,7 @@ private PanelItem createMenuButton(MenuType menuType)
 	private PanelItem createChallengeIcon(Challenge challenge)
 	{
 		return new PanelItemBuilder().
-			name(challenge.getFriendlyName()).
+			name(ChatColor.translateAlternateColorCodes('&', challenge.getFriendlyName())).
 			description(GuiUtils.stringSplit(
 				challenge.getDescription(),
 				this.addon.getChallengesSettings().getLoreLineLength())).

diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ListChallengesGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ListChallengesGUI.java
@@ -1,6 +1,7 @@
 package world.bentobox.challenges.panel.admin;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import java.util.List;
@@ -133,7 +134,7 @@ else if (this.pageIndex > (challengeList.size() / MAX_ELEMENTS))
 	private PanelItem createChallengeIcon(Challenge challenge)
 	{
 		PanelItemBuilder itemBuilder = new PanelItemBuilder().
-			name(challenge.getFriendlyName()).
+			name(ChatColor.translateAlternateColorCodes('&', challenge.getFriendlyName())).
 			description(GuiUtils.stringSplit(this.generateChallengeDescription(challenge, this.user.getPlayer()),
 				this.addon.getChallengesSettings().getLoreLineLength())).
 			icon(challenge.getIcon()).

diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ListLevelsGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ListLevelsGUI.java
@@ -1,6 +1,7 @@
 package world.bentobox.challenges.panel.admin;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import java.util.List;
@@ -133,7 +134,7 @@ else if (this.pageIndex > (levelList.size() / MAX_ELEMENTS))
 	private PanelItem createLevelIcon(ChallengeLevel challengeLevel)
 	{
 		PanelItemBuilder itemBuilder = new PanelItemBuilder().
-			name(challengeLevel.getFriendlyName()).
+			name(ChatColor.translateAlternateColorCodes('&', challengeLevel.getFriendlyName())).
 			description(GuiUtils.stringSplit(
 				this.generateLevelDescription(challengeLevel, this.user.getPlayer()),
 				this.addon.getChallengesSettings().getLoreLineLength())).

diff --git a/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java b/src/main/java/world/bentobox/challenges/panel/user/ChallengesGUI.java
@@ -1,6 +1,7 @@
 package world.bentobox.challenges.panel.user;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.inventory.ItemStack;
@@ -349,7 +350,9 @@ private PanelItem getChallengeButton(Challenge challenge)
 	{
 		return new PanelItemBuilder().
 			icon(challenge.getIcon()).
-			name(challenge.getFriendlyName().isEmpty() ? challenge.getUniqueId() : challenge.getFriendlyName()).
+			name(challenge.getFriendlyName().isEmpty() ?
+				challenge.getUniqueId() :
+				ChatColor.translateAlternateColorCodes('&', challenge.getFriendlyName())).
 			description(GuiUtils.stringSplit(this.generateChallengeDescription(challenge, this.user.getPlayer()),
 				this.addon.getChallengesSettings().getLoreLineLength())).
 			clickHandler((panel, user1, clickType, slot) -> {
@@ -440,7 +443,7 @@ else if (level.isUnlocked())
 
 		return new PanelItemBuilder().
 			icon(icon).
-			name(name).
+			name(ChatColor.translateAlternateColorCodes('&', name)).
 			description(description).
 			glow(glow).
 			clickHandler(clickHandler).

diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectChallengeGUI.java
@@ -1,6 +1,7 @@
 package world.bentobox.challenges.panel.util;
 
 
+import org.bukkit.ChatColor;
 import org.bukkit.Material;
 import org.bukkit.event.inventory.ClickType;
 import java.util.*;
@@ -144,7 +145,7 @@ private PanelItem createChallengeButton(Challenge challenge)
 
 
 		return new PanelItemBuilder().
-			name(challenge.getFriendlyName()).
+			name(ChatColor.translateAlternateColorCodes('&', challenge.getFriendlyName())).
 			description(GuiUtils.stringSplit(description, this.lineLength)).
 			icon(challenge.getIcon()).
 			clickHandler((panel, user1, clickType, slot) -> {

diff --git a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java
@@ -4,10 +4,7 @@
 package world.bentobox.challenges.tasks;
 
 
-import org.bukkit.GameMode;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.World;
+import org.bukkit.*;
 import org.bukkit.block.Block;
 import org.bukkit.block.BlockFace;
 import org.bukkit.entity.EntityType;
@@ -1027,7 +1024,7 @@ private String parseChallenge(String inputMessage, Challenge challenge)
             outputMessage = outputMessage.replace("[rewardText]", challenge.getRewardText());
         }
 
-        return outputMessage;
+        return ChatColor.translateAlternateColorCodes('&', outputMessage);
     }
 
 
@@ -1047,7 +1044,7 @@ private String parseLevel(String inputMessage, ChallengeLevel level)
             outputMessage = outputMessage.replace("[rewardText]", level.getRewardText());
         }
 
-        return outputMessage;
+        return ChatColor.translateAlternateColorCodes('&', outputMessage);
     }