From 3f3b02105019d13f1b050d50579c82d193c868cd Mon Sep 17 00:00:00 2001 From: ApacheZy Date: Sun, 7 Mar 2021 13:02:36 +0800 Subject: [PATCH] Fix some other places where LangUtils is not applied. --- .../bentobox/challenges/panel/admin/EditChallengeGUI.java | 8 +++++--- .../bentobox/challenges/panel/admin/ManageBlocksGUI.java | 4 ++-- .../challenges/panel/admin/ManageEntitiesGUI.java | 4 ++-- .../bentobox/challenges/panel/util/SelectBlocksGUI.java | 6 +++--- .../bentobox/challenges/panel/util/SelectEntityGUI.java | 6 +++--- 5 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java index 2dab206..f27497f 100644 --- a/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/admin/EditChallengeGUI.java @@ -8,6 +8,7 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.EntityType; @@ -437,11 +438,12 @@ public class EditChallengeGUI extends CommonGUI description.add(this.user.getTranslation("challenges.gui.descriptions.admin.environment")); description.add((this.challenge.getEnvironment().contains(World.Environment.NORMAL) ? "&2" : "&c") + - this.user.getTranslation("challenges.gui.descriptions.normal")); + // If color code is removed from here, users can use color code in language files. + ChatColor.stripColor(this.user.getTranslation("challenges.gui.descriptions.normal"))); description.add((this.challenge.getEnvironment().contains(World.Environment.NETHER) ? "&2" : "&c") + - this.user.getTranslation("challenges.gui.descriptions.nether")); + ChatColor.stripColor(this.user.getTranslation("challenges.gui.descriptions.nether"))); description.add((this.challenge.getEnvironment().contains(World.Environment.THE_END) ? "&2" : "&c") + - this.user.getTranslation("challenges.gui.descriptions.the-end")); + ChatColor.stripColor(this.user.getTranslation("challenges.gui.descriptions.the-end"))); icon = new ItemStack(Material.DROPPER); clickHandler = (panel, user, clickType, slot) -> { diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ManageBlocksGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ManageBlocksGUI.java index eab6371..0b7ba76 100644 --- a/src/main/java/world/bentobox/challenges/panel/admin/ManageBlocksGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/admin/ManageBlocksGUI.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.World; @@ -16,6 +15,7 @@ import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.hooks.LangUtilsHook; import world.bentobox.challenges.ChallengesAddon; import world.bentobox.challenges.panel.CommonGUI; import world.bentobox.challenges.panel.util.NumberGUI; @@ -166,7 +166,7 @@ public class ManageBlocksGUI extends CommonGUI private PanelItem createElementButton(Material material) { return new PanelItemBuilder(). - name(WordUtils.capitalize(material.name().toLowerCase().replace("_", " "))). + name(LangUtilsHook.getMaterialName(material, user)). icon(GuiUtils.getMaterialItem(material, this.materialMap.get(material))). description(this.selectedMaterials.contains(material) ? this.user.getTranslation("challenges.gui.descriptions.admin.selected") : ""). diff --git a/src/main/java/world/bentobox/challenges/panel/admin/ManageEntitiesGUI.java b/src/main/java/world/bentobox/challenges/panel/admin/ManageEntitiesGUI.java index ed29747..71a792e 100644 --- a/src/main/java/world/bentobox/challenges/panel/admin/ManageEntitiesGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/admin/ManageEntitiesGUI.java @@ -8,7 +8,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.entity.EntityType; @@ -17,6 +16,7 @@ import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.hooks.LangUtilsHook; import world.bentobox.challenges.ChallengesAddon; import world.bentobox.challenges.panel.CommonGUI; import world.bentobox.challenges.panel.util.NumberGUI; @@ -175,7 +175,7 @@ public class ManageEntitiesGUI extends CommonGUI private PanelItem createEntityButton(EntityType entity) { return new PanelItemBuilder(). - name(WordUtils.capitalize(entity.name().toLowerCase().replace("_", " "))). + name(LangUtilsHook.getEntityName(entity, user)). description(this.selectedEntities.contains(entity) ? this.user.getTranslation("challenges.gui.descriptions.admin.selected") : ""). icon(this.asEggs ? diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java index d3ffdcb..52fe31f 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/SelectBlocksGUI.java @@ -7,7 +7,6 @@ import java.util.List; import java.util.Set; import java.util.function.BiConsumer; -import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; @@ -15,6 +14,7 @@ import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.hooks.LangUtilsHook; import world.bentobox.challenges.utils.GuiUtils; @@ -158,7 +158,7 @@ public class SelectBlocksGUI if (!this.selectedMaterials.isEmpty()) { description.add(this.user.getTranslation("challenges.gui.descriptions.admin.selected") + ":"); - this.selectedMaterials.forEach(material -> description.add(" - " + material.name())); + this.selectedMaterials.forEach(material -> description.add(" - " + LangUtilsHook.getMaterialName(material, user))); } panelBuilder.item(5, @@ -218,7 +218,7 @@ public class SelectBlocksGUI ItemStack itemStack = GuiUtils.getMaterialItem(material); return new PanelItemBuilder(). - name(WordUtils.capitalize(material.name().toLowerCase().replace("_", " "))). + name(LangUtilsHook.getMaterialName(material, user)). description(this.selectedMaterials.contains(material) ? this.user.getTranslation("challenges.gui.descriptions.admin.selected") : ""). icon(itemStack). diff --git a/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java b/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java index 4104f8a..ba0c761 100644 --- a/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java +++ b/src/main/java/world/bentobox/challenges/panel/util/SelectEntityGUI.java @@ -9,7 +9,6 @@ import java.util.List; import java.util.Set; import java.util.function.BiConsumer; -import org.apache.commons.lang.WordUtils; import org.bukkit.Material; import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; @@ -18,6 +17,7 @@ import world.bentobox.bentobox.api.panels.PanelItem; import world.bentobox.bentobox.api.panels.builders.PanelBuilder; import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder; import world.bentobox.bentobox.api.user.User; +import world.bentobox.bentobox.hooks.LangUtilsHook; import world.bentobox.challenges.utils.GuiUtils; @@ -101,7 +101,7 @@ public class SelectEntityGUI if (!this.selectedEntities.isEmpty()) { description.add(this.user.getTranslation("challenges.gui.descriptions.admin.selected") + ":"); - this.selectedEntities.forEach(entity -> description.add(" - " + entity.name())); + this.selectedEntities.forEach(entity -> description.add(" - " + LangUtilsHook.getEntityName(entity, user))); } panelBuilder.item(5, @@ -178,7 +178,7 @@ public class SelectEntityGUI ItemStack itemStack = this.asEggs ? GuiUtils.getEntityEgg(entity) : GuiUtils.getEntityHead(entity); return new PanelItemBuilder(). - name(WordUtils.capitalize(entity.name().toLowerCase().replace("_", " "))). + name(LangUtilsHook.getEntityName(entity, user)). icon(itemStack). description(this.selectedEntities.contains(entity) ? this.user.getTranslation("challenges.gui.descriptions.admin.selected") : "").