From 9773f3e68e38a16bf99c66b8a456c178e6e3d381 Mon Sep 17 00:00:00 2001 From: nearfe Date: Sat, 15 Jun 2024 05:55:59 -0300 Subject: [PATCH] aaaaaaaa --- .../battle/practice/board/BoardAdapter.java | 13 +++++- .../practice/listeners/MatchListener.java | 1 - .../practice/listeners/PlayerListener.java | 2 + .../practice/menu/editor/KitEditorMenu.java | 2 +- .../settings/PracticeSettingsImpl.java | 44 +++++++++---------- 5 files changed, 37 insertions(+), 25 deletions(-) diff --git a/src/main/java/land/battle/practice/board/BoardAdapter.java b/src/main/java/land/battle/practice/board/BoardAdapter.java index 2ec1d88..41df2ca 100644 --- a/src/main/java/land/battle/practice/board/BoardAdapter.java +++ b/src/main/java/land/battle/practice/board/BoardAdapter.java @@ -29,9 +29,20 @@ public class BoardAdapter implements AssembleAdapter { @Override public String getTitle(Player player) { - return CC.GOLD + CC.BOLD + (!Practice.getInstance().isHolanda() ? "Battle " + CC.GRAY + "⏐" + CC.WHITE + " Practice" : "Practice"); + final PlayerData playerData = Practice.getInstance().getPlayerManager() + .getPlayerData(player.getUniqueId()); + + switch (playerData.getOptions().getScoreboardStyle()) { + case OLD: + return CC.GOLD + CC.BOLD + (!Practice.getInstance().isHolanda() ? "Battle " + CC.GRAY + "⏐" + CC.WHITE + " Practice" : "Practice"); + case MODERN: + return CC.GOLD + CC.BOLD + " Practice"; + default: + return ""; + } } + @Override public List getLines(Player player) { List lines = new ArrayList<>(); diff --git a/src/main/java/land/battle/practice/listeners/MatchListener.java b/src/main/java/land/battle/practice/listeners/MatchListener.java index b160c3f..581cbf7 100644 --- a/src/main/java/land/battle/practice/listeners/MatchListener.java +++ b/src/main/java/land/battle/practice/listeners/MatchListener.java @@ -386,7 +386,6 @@ public class MatchListener implements Listener { } } - match.broadcast(" "); if (eloMessage != null) { match.broadcast(eloMessage); diff --git a/src/main/java/land/battle/practice/listeners/PlayerListener.java b/src/main/java/land/battle/practice/listeners/PlayerListener.java index 240ccb7..70287d1 100644 --- a/src/main/java/land/battle/practice/listeners/PlayerListener.java +++ b/src/main/java/land/battle/practice/listeners/PlayerListener.java @@ -814,8 +814,10 @@ public class PlayerListener implements Listener { switch (playerData.getOptions().getBodyAnimated()) { case ANIMATED: PlayerUtil.animateDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch()); + break; case STATIC: PlayerUtil.staticDeath(player, !plugin.getMatchManager().getMatch(playerData).isPartyMatch()); + break; } } this.plugin.getMatchManager().removeFighter(player, playerData, true); diff --git a/src/main/java/land/battle/practice/menu/editor/KitEditorMenu.java b/src/main/java/land/battle/practice/menu/editor/KitEditorMenu.java index a9249ad..99a59fe 100644 --- a/src/main/java/land/battle/practice/menu/editor/KitEditorMenu.java +++ b/src/main/java/land/battle/practice/menu/editor/KitEditorMenu.java @@ -62,7 +62,7 @@ public class KitEditorMenu extends Menu { if (integer > 3 && !player.hasPermission("practice.editor.more")) { player.sendMessage(new String[]{ ChatColor.RED + "You do not have permission to create kit #" + integer + ".", - ChatColor.RED + "Purchase the " + ChatColor.AQUA + "Basic" + ChatColor.RED + " rank at " + ChatColor.YELLOW + "store.nodebuff.com" + ChatColor.RED + " to unlock this feature." + ChatColor.RED + "Purchase the " + ChatColor.AQUA + "Basic" + ChatColor.RED + " rank at " + ChatColor.YELLOW + "store.battle.land" + ChatColor.RED + " to unlock this feature." }); return; } diff --git a/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java b/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java index fe999dc..4057d4f 100644 --- a/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java +++ b/src/main/java/land/battle/practice/settings/PracticeSettingsImpl.java @@ -35,12 +35,12 @@ public class PracticeSettingsImpl implements ISettings { final PlayerData data = Practice.getInstance().getPlayerManager().getPlayerData(player.getUniqueId()); buttonList.add(new ItemBuilder(Material.SIGN) - .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Mode") + .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Score") .addLore( "", - CC.GRAY + "Would you like to view", - CC.GRAY + "our sidebar at spawn or", - CC.GRAY + "in a match?", + CC.GRAY + "você gostaria de deixar", + CC.GRAY + "score ativa ou desativada no spawn", + CC.GRAY + "um em uma partida?", " ", (data.getOptions().isScoreboardEnabled() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fEnabled", (!data.getOptions().isScoreboardEnabled() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled" @@ -49,12 +49,12 @@ public class PracticeSettingsImpl implements ISettings { ); buttonList.add(new ItemBuilder(Material.ITEM_FRAME) - .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Style") + .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Estilo de Scoreboard") .addLore( "", - CC.GRAY + "Which style of our board", - CC.GRAY + "would you like to view", - CC.GRAY + "during a match?", + CC.GRAY + "Qual estilo de Scoreboard", + CC.GRAY + "você gostaria de ver", + CC.GRAY + "durante a fight?", " ", (data.getOptions().getScoreboardState().name().equals("PING") ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fPing", (data.getOptions().getScoreboardState().name().equals("ARENA") ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fArena", @@ -81,11 +81,11 @@ public class PracticeSettingsImpl implements ISettings { ); buttonList.add(new ItemBuilder(Material.PAINTING) - .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Sidebar Lines") + .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Linhas da Score") .addLore( "", - CC.GRAY + "Would you like a different view", - CC.GRAY + "on your scoreboard?", + CC.GRAY + "Você gostaria de um estilo diferente", + CC.GRAY + "na sua Scoreboard?", " ", (data.getOptions().getScoreboardStyle() == SidebarOptionsItemState.OLD ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fOld", (data.getOptions().getScoreboardStyle() == SidebarOptionsItemState.MODERN ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fModern" @@ -103,8 +103,8 @@ public class PracticeSettingsImpl implements ISettings { .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Duel Requests") .addLore( "", - CC.GRAY + "Would you like to receive", - CC.GRAY + "duel requests?", + CC.GRAY + "Você gostaria de receber", + CC.GRAY + "duelos?", " ", (data.getOptions().isDuelRequests() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fEnabled", (!data.getOptions().isDuelRequests() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled" @@ -116,8 +116,8 @@ public class PracticeSettingsImpl implements ISettings { .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Party Invites") .addLore( "", - CC.GRAY + "Would you like to receive", - CC.GRAY + "party invites?", + CC.GRAY + "Você gostaria de receber", + CC.GRAY + "convites pra Party?", " ", (data.getOptions().isPartyInvites() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fEnabled", (!data.getOptions().isPartyInvites() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled" @@ -129,8 +129,8 @@ public class PracticeSettingsImpl implements ISettings { .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Allow Spectators") .addLore( "", - CC.GRAY + "Would you like to allow", - CC.GRAY + "spectators in matches?", + CC.GRAY + "Você gostaria de deixar", + CC.GRAY + "espectadores na fight?", " ", (data.getOptions().isSpectators() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fEnabled", (!data.getOptions().isSpectators() ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fDisabled" @@ -141,7 +141,7 @@ public class PracticeSettingsImpl implements ISettings { buttonList.add(new ItemBuilder(Material.BLAZE_ROD) .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Kill Effects") .addLore( - CC.GRAY + "Click to view kill effects.", + CC.GRAY + "Clique para abrir as kill effects.", " ", CC.YELLOW + "[View all kill effects]" @@ -154,7 +154,7 @@ public class PracticeSettingsImpl implements ISettings { buttonList.add(new ItemBuilder(Material.BOOK_AND_QUILL) .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Kill Messages") .addLore( - CC.GRAY + "Click to view kill messages.", + CC.GRAY + "Clique para ver as mensagens de kill.", " ", CC.YELLOW + "[View all kill messages]" @@ -165,11 +165,11 @@ public class PracticeSettingsImpl implements ISettings { ); buttonList.add(new ItemBuilder(Material.SKULL_ITEM) - .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Body animation") + .setDisplayName(Color.MAIN_COLOR + CC.BOLD + "Animações de corpo") .addLore( "", - CC.GRAY + "Would you like a different body", - CC.GRAY + "animation on your gameplay?", + CC.GRAY + "Qual tipo de animação de corpo", + CC.GRAY + "você quer na sua gameplay?", " ", (data.getOptions().getBodyAnimated() == BodyOptionsItemState.ANIMATED ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fAnimated", (data.getOptions().getBodyAnimated() == BodyOptionsItemState.STATIC ? CC.GREEN + CC.BOLD + "■ " : CC.DARK_GRAY + CC.BOLD + "■ ") + "&fStatic"