diff --git a/pom.xml b/pom.xml index 7798513..436efc6 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ - -#${env.BUILD_NUMBER} + -#${env.BUILD_NUMBER} diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditLevelGUI.java index 175c2a3..6f5a3f7 100644 --- 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 @@ public class EditLevelGUI extends CommonGUI 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 index 6771147..1c21908 100644 --- 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 @@ public class ListChallengesGUI extends CommonGUI 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 index 83a0cf5..b7fbc94 100644 --- 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 @@ public class ListLevelsGUI extends CommonGUI 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 index 776f2df..29d52ff 100644 --- 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; @@ -350,7 +351,9 @@ public class ChallengesGUI extends CommonGUI { 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) -> { @@ -474,7 +477,7 @@ public class ChallengesGUI extends CommonGUI 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 index d47082c..b348663 100644 --- 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 @@ public class SelectChallengeGUI 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 index b53384d..cf7e060 100644 --- a/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java +++ b/src/main/java/world/bentobox/challenges/tasks/TryToComplete.java @@ -4,9 +4,8 @@ package world.bentobox.challenges.tasks; -import org.bukkit.GameMode; -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.Entity; @@ -1250,7 +1249,7 @@ public class TryToComplete outputMessage = outputMessage.replace("[rewardText]", challenge.getRewardText()); } - return outputMessage; + return ChatColor.translateAlternateColorCodes('&', outputMessage); } @@ -1270,7 +1269,7 @@ public class TryToComplete outputMessage = outputMessage.replace("[rewardText]", level.getRewardText()); } - return outputMessage; + return ChatColor.translateAlternateColorCodes('&', outputMessage); } diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 6b38ad0..22706b0 100755 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -319,13 +319,13 @@ challenges: admin: hit-things: 'Hit things to add them to the list of things required. Right click when done.' you-added: 'You added one [thing] to the challenge' - challenge-created: '[challenge] created!' - you-completed-challenge: '&2You completed the [value] challenge!' - you-repeated-challenge: '&2You repeated the [value] challenge!' - you-repeated-challenge-multiple: '&2You repeated the [value] challenge [count] times!' - you-completed-level: '&2You completed the [value] level!' - name-has-completed-challenge: '&5[name] has completed the [value] challenge!' - name-has-completed-level: '&5[name] has completed the [value] level!' + challenge-created: '[challenge]&r created!' + you-completed-challenge: '&2You completed the [value] &r&2challenge!' + you-repeated-challenge: '&2You repeated the [value] &r&2challenge!' + you-repeated-challenge-multiple: '&2You repeated the [value] &r&2challenge [count] times!' + you-completed-level: '&2You completed the [value] &r&2level!' + name-has-completed-challenge: '&5[name] has completed the [value] &r&5challenge!' + name-has-completed-level: '&5[name] has completed the [value] &r&5level!' import-levels: 'Start importing Levels' import-challenges: 'Start importing Challenges' no-levels: 'Warning: No levels defined in challenges.yml'