diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java b/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java index 0eab2a6c..b2c821c6 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java @@ -21,7 +21,6 @@ import io.github.dre2n.dungeonsxl.DungeonsXL; import java.io.File; import java.util.ArrayList; import java.util.List; -import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.inventory.Inventory; import org.bukkit.scheduler.BukkitTask; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java index 75d531e8..4a45cac9 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java @@ -60,11 +60,11 @@ public class DeleteCommand extends BRCommand { if (args.length == 2 && CompatibilityHandler.getInstance().isSpigot() && sender instanceof Player) { ClickEvent onClickConfirm = new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/dungeonsxl delete " + args[1] + " true"); - TextComponent confirm = new TextComponent(ChatColor.GREEN + "[ YES ]"); + TextComponent confirm = new TextComponent(DMessages.MISC_YES.getMessage()); confirm.setClickEvent(onClickConfirm); ClickEvent onClickDeny = new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/dungeonsxl delete " + args[1] + " false"); - TextComponent deny = new TextComponent(ChatColor.DARK_RED + "[ NO ]"); + TextComponent deny = new TextComponent(DMessages.MISC_NO.getMessage()); deny.setClickEvent(onClickDeny); MessageUtil.sendMessage(sender, DMessages.CMD_DELETE_BACKUPS.getMessage()); diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java index 4a38b216..4c388e0e 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.global.DPortal; import java.util.Set; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java index d79cd13d..e663e34c 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.game.Game; import io.github.dre2n.dungeonsxl.player.DGamePlayer; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java index 2b1703e5..acc035ec 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.game.Game; import io.github.dre2n.dungeonsxl.player.DGroup; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java index b0501729..5cf0873d 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import static io.github.dre2n.dungeonsxl.command.DCommands.LEAVE; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.player.DPermissions; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java index 8554f36b..2f4a7388 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.player.DGamePlayer; import io.github.dre2n.dungeonsxl.player.DGroup; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java index 1005a867..63e2b22c 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java @@ -18,7 +18,6 @@ package io.github.dre2n.dungeonsxl.command; import io.github.dre2n.commons.command.BRCommand; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.player.DPermissions; import io.github.dre2n.dungeonsxl.world.DEditWorld; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java index fa3d6757..5295be5e 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java @@ -57,7 +57,7 @@ public class ReloadCommand extends BRCommand { if (!dPlayers.isEmpty() && args.length == 1 && CompatibilityHandler.getInstance().isSpigot() && sender instanceof Player) { MessageUtil.sendMessage(sender, DMessages.CMD_RELOAD_PLAYERS.getMessage()); ClickEvent onClick = new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/dungeonsxl reload -force"); - String message = DefaultFontInfo.center("&a[ OK ]"); + String message = DefaultFontInfo.center(DMessages.MISC_OKAY.getMessage()); TextComponent text = new TextComponent(message); text.setClickEvent(onClick); ((Player) sender).spigot().sendMessage(text); diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java index c29363d3..f0b2643b 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java @@ -147,7 +147,7 @@ public enum DMessages implements Messages { GROUP_CONGRATS("Group_Congrats", "&6Congratulations!"), GROUP_CONGRATS_SUB("Group_CongratsSub", "&l&4Your group &v1 &4won the match!"), GROUP_CREATED("Group_Created", "&4&v1&6 created the group &4&v2&6!"), - GROUP_DEATH("Group_Death", "&4&v1 &6died. &4&v2 have &4&v3 &6lives left."), + GROUP_DEATH("Group_Death", "&4&v1 &6died. &4&v2 &6have &4&v3 &6lives left."), GROUP_DEATH_KICK("Group_DeathKick", "&4&v1 &6was kicked because &4&v2 &6have no lives left."), GROUP_DEFEATED("Group_Defeated", "&4The group &4v1 &6is defeated because it lost its last score point."), GROUP_DISBANDED("Group_Disbanded", "&4&v1&6 disbanded the group &4&v2&6."), @@ -176,6 +176,9 @@ public enum DMessages implements Messages { LOG_NEW_MAP("Log_NewDungeon", "&6Creating new map."), LOG_NEW_PLAYER_DATA("Log_NewPlayerData", "&6A new player data file has been created and saved as &v1."), LOG_WORLD_GENERATION_FINISHED("Log_WorldGenerationFinished", "&6World generation finished!"), + MISC_NO("Misc_No", "&4[ NO ]"), + MISC_OKAY("Misc_Okay", "&a[ OK ]"), + MISC_YES("Misc_Yes", "&a[ YES ]"), PLAYER_BLOCK_INFO("Player_BlockInfo", "&6Block ID: &2&v1"), PLAYER_CHECKPOINT_REACHED("Player_CheckpointReached", "&6Checkpoint reached!"), PLAYER_DEATH("Player_Death", "&4&v1 &6died and has &4&v2 &6lives left."), diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java index f4205019..62253f2d 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java @@ -19,7 +19,6 @@ package io.github.dre2n.dungeonsxl.player; import io.github.dre2n.caliburn.item.UniversalItemStack; import io.github.dre2n.commons.compatibility.CompatibilityHandler; import io.github.dre2n.commons.compatibility.Version; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.util.DeserializationUtil; import java.io.File; import java.util.ArrayList; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java index ad28217f..7ed81a1d 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java @@ -75,7 +75,7 @@ public class DGroup { private int lives = -1; public DGroup(Player player) { - this("Group_" + DungeonsXL.getDGroups().size(), player); + this(DungeonsXL.getMainConfig().getGroupColorPriority().get(DungeonsXL.getDGroups().size()).toString(), player); } public DGroup(String name, Player player) { @@ -91,7 +91,7 @@ public class DGroup { @Deprecated public DGroup(Player player, String identifier, boolean multiFloor) { - this("Group_" + DungeonsXL.getDGroups().size(), player, identifier, multiFloor); + this(DungeonsXL.getMainConfig().getGroupColorPriority().get(DungeonsXL.getDGroups().size()).toString(), player, identifier, multiFloor); } @Deprecated @@ -134,7 +134,7 @@ public class DGroup { } public DGroup(Player player, Dungeon dungeon) { - this("Group_" + DungeonsXL.getDGroups().size(), player, dungeon); + this(DungeonsXL.getMainConfig().getGroupColorPriority().get(DungeonsXL.getDGroups().size()).toString(), player, dungeon); } public DGroup(String name, Player player, Dungeon dungeon) { diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java index 724eaeeb..fd8b122e 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java @@ -21,8 +21,6 @@ import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.config.MainConfig; import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.global.DPortal; -import io.github.dre2n.dungeonsxl.global.GlobalProtection; import io.github.dre2n.dungeonsxl.mob.DMob; import io.github.dre2n.dungeonsxl.trigger.UseItemTrigger; import io.github.dre2n.dungeonsxl.util.ParsingUtil; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java index 57ac17a7..3bc71ad1 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java @@ -17,7 +17,6 @@ package io.github.dre2n.dungeonsxl.requirement; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.event.requirement.RequirementRegistrationEvent; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java index e391126c..fb9dab02 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java @@ -17,7 +17,6 @@ package io.github.dre2n.dungeonsxl.sign; import io.github.dre2n.commons.util.NumberUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java index 91cae5e5..ed97e2a0 100644 --- a/core/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java @@ -17,7 +17,6 @@ package io.github.dre2n.dungeonsxl.world.block; import io.github.dre2n.commons.util.messageutil.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessages; import io.github.dre2n.dungeonsxl.player.DGamePlayer; import io.github.dre2n.dungeonsxl.player.DGroup;