diff --git a/pom.xml b/pom.xml index 31f485c..efa3489 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 de.simonsator BungeecordPartyAndFriends - 1.0.33 + 1.0.34 BungeecordPartyAndFriends jar BungeecordPartyAndFriends diff --git a/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java b/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java index 5f16903..29757cb 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java +++ b/src/main/java/de/simonsator/partyandfriends/api/TopCommand.java @@ -2,6 +2,7 @@ import de.simonsator.partyandfriends.main.Main; import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer; +import de.simonsator.partyandfriends.utilities.Language; import de.simonsator.partyandfriends.utilities.SubCommand; import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.chat.TextComponent; @@ -22,7 +23,7 @@ protected TopCommand(String[] pCommandNames, String pPermission) { public static boolean isPlayer(CommandSender pCommandSender) { if (!(pCommandSender instanceof ProxiedPlayer)) { - if (Main.getInstance().getLanguage().equalsIgnoreCase("own")) { + if (Main.getInstance().getLanguage() == Language.OWN) { Main.getInstance().loadConfiguration(); pCommandSender.sendMessage( new TextComponent(Main.getInstance().getFriendsPrefix() + "Config and MessagesYML reloaded!")); diff --git a/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java b/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java index df5b39b..1dcbf24 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java +++ b/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/FriendSubCommand.java @@ -8,7 +8,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getInstance; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; public abstract class FriendSubCommand extends SubCommand implements Comparable { @@ -28,7 +28,7 @@ protected boolean isPlayerGiven(OnlinePAFPlayer pPlayer, String[] args) { protected boolean isAFriendOf(OnlinePAFPlayer pPlayer, PAFPlayer pGivenPlayer) { if (!pPlayer.isAFriendOf(pGivenPlayer)) { - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.General.PlayerIsOffline")).replaceAll(Matcher.quoteReplacement(pGivenPlayer.getName())))); pPlayer.sendMessage(new TextComponent(HELP)); return false; diff --git a/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java b/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java index 48e4106..c2fd7f7 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java +++ b/src/main/java/de/simonsator/partyandfriends/api/friends/abstractcommands/RequestReactionsCommands.java @@ -7,7 +7,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getInstance; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; public abstract class RequestReactionsCommands extends FriendSubCommand { @@ -17,7 +17,7 @@ protected RequestReactionsCommands(String[] pCommands, int pPriority, String pHe protected boolean hasNoRequest(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer) { if ((!pPlayer.hasRequestFrom(pQueryPlayer))) { - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.Command.Accept.ErrorNoFriendShipInvitation")).replaceAll(Matcher.quoteReplacement(pQueryPlayer.getName())))); pPlayer.sendMessage(new TextComponent(HELP)); return true; diff --git a/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java b/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java index 40418d8..83a1bbc 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java +++ b/src/main/java/de/simonsator/partyandfriends/api/pafplayers/OnlinePAFPlayer.java @@ -1,7 +1,5 @@ package de.simonsator.partyandfriends.api.pafplayers; -import java.util.ArrayList; - import net.md_5.bungee.api.config.ServerInfo; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.protocol.packet.Chat; @@ -24,7 +22,7 @@ public interface OnlinePAFPlayer extends PAFPlayer { /** * @return Returns the player if he is on this Bungeecord. If he is on - * another Bungeecord (RedisBungee) it returns null. + * another Bungeecord (RedisBungee) it returns null. */ ProxiedPlayer getPlayer(); } diff --git a/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java b/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java index 2eab388..975478d 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java +++ b/src/main/java/de/simonsator/partyandfriends/api/party/PlayerParty.java @@ -3,7 +3,7 @@ import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer; import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer; import de.simonsator.partyandfriends.main.Main; -import de.simonsator.partyandfriends.utilities.CompilePatter; +import de.simonsator.partyandfriends.utilities.PatterCollection; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.protocol.packet.Chat; @@ -13,7 +13,7 @@ import java.util.concurrent.TimeUnit; import java.util.regex.Matcher; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * Objects of this class are the party, where a player is in @@ -88,7 +88,7 @@ public List getAllPlayers() { private void removePlayer(OnlinePAFPlayer pPlayer) { removePlayerSilent(pPlayer); sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() - + CompilePatter.PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.General.PlayerHasLeftTheParty")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); + + PatterCollection.PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.General.PlayerHasLeftTheParty")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); } protected abstract void removePlayerSilent(OnlinePAFPlayer pPlayer); @@ -124,7 +124,7 @@ public void kickPlayer(OnlinePAFPlayer pPlayer) { pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + Main.getInstance().getMessagesYml() .getString("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer"))); this.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() - + PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers")) + + PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers")) .replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); deleteParty(); } @@ -137,10 +137,10 @@ public void kickPlayer(OnlinePAFPlayer pPlayer) { public void invite(final OnlinePAFPlayer pPlayer) { addToInvited(pPlayer); OnlinePAFPlayer lLeader = getLeader(); - pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml() + pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Invite.YouWereInvitedBY")).replaceAll(Matcher.quoteReplacement(lLeader.getDisplayName())))); pPlayer.sendPacket(new Chat("{\"text\":\"" + Main.getInstance().getPartyPrefix() - + PLAYERPATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE")).replaceAll(Matcher.quoteReplacement(lLeader.getName())) + + PLAYER_PATTERN.matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE")).replaceAll(Matcher.quoteReplacement(lLeader.getName())) + "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"" + "/" + Main.getInstance().getPartyCommand().getName() + " join " + lLeader.getName() + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" @@ -153,9 +153,9 @@ public void run() { if (isInvited(pPlayer)) { removeFromInvited(pPlayer); OnlinePAFPlayer lLeader = getLeader(); - pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance() + pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance() .getMessagesYml().getString("Party.Command.Invite.InvitationTimedOutInvited")).replaceAll(Matcher.quoteReplacement(lLeader.getDisplayName())))); - lLeader.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN.matcher(Main.getInstance() + lLeader.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN.matcher(Main.getInstance() .getMessagesYml().getString("Party.Command.Invite.InvitationTimedOutLeader")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); if (isPartyEmpty()) { lLeader.sendMessage( diff --git a/src/main/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java b/src/main/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java index eb7a2b6..10b30a3 100644 --- a/src/main/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java +++ b/src/main/java/de/simonsator/partyandfriends/api/party/abstractcommands/LeaderNeededCommand.java @@ -9,7 +9,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getInstance; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; public abstract class LeaderNeededCommand extends PartySubCommand { @@ -24,14 +24,14 @@ public boolean hasAccess(int pPermissionHeight) { protected boolean checkIsInParty(OnlinePAFPlayer pPlayer, PAFPlayer pSearched, PlayerParty pParty, String[] args) { if (!pSearched.isOnline()) { - pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYERPATTERN + pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYER_PATTERN .matcher(getInstance().getMessagesYml() .getString("Party.Command.General.ErrorGivenPlayerIsNotInTheParty")) .replaceAll(Matcher.quoteReplacement(args[0])))); return false; } if (!pParty.isInParty((OnlinePAFPlayer) pSearched)) { - pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYERPATTERN + pPlayer.sendMessage(new TextComponent(getInstance().getPartyPrefix() + PLAYER_PATTERN .matcher(getInstance().getMessagesYml() .getString("Party.Command.General.ErrorGivenPlayerIsNotInTheParty")) .replaceAll(Matcher.quoteReplacement(args[0])))); diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java index 22dc955..7ec7f0e 100644 --- a/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java +++ b/src/main/java/de/simonsator/partyandfriends/communication/sql/Importer.java @@ -1,9 +1,8 @@ package de.simonsator.partyandfriends.communication.sql; -import de.simonsator.partyandfriends.utilities.StringToArray; - import java.sql.*; import java.util.ArrayList; +import java.util.StringTokenizer; import static de.simonsator.partyandfriends.main.Main.getInstance; @@ -65,7 +64,7 @@ private int[] getRequests(int pID) { rs = (stmt = con.createStatement()).executeQuery( "select FreundschaftsAnfragenID from " + database + ".freunde WHERE ID='" + pID + "' LIMIT 1"); if (rs.next()) - return StringToArray.stringToIntegerArray(rs.getString("FreundschaftsAnfragenID")); + return stringToIntegerArray(rs.getString("FreundschaftsAnfragenID")); } catch (SQLException e) { e.printStackTrace(); } finally { @@ -154,7 +153,7 @@ private int[] getSettings(int pPlayerID) { } private int[] getFriendsArray(int idSender) { - return StringToArray.stringToIntegerArray(getFriends(idSender)); + return stringToIntegerArray(getFriends(idSender)); } private String getFriends(int pID) { @@ -296,4 +295,13 @@ private class PlayerCollection { } } + private static int[] stringToIntegerArray(String string) { + StringTokenizer st = new StringTokenizer(string, "|"); + int stLength = st.countTokens(); + int[] stArray = new int[stLength]; + for (int i = 0; i < stLength; i++) { + stArray[i] = Integer.parseInt(st.nextToken()); + } + return stArray; + } } diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java index dbbd8b5..c65c30c 100644 --- a/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java +++ b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQL.java @@ -1,6 +1,5 @@ package de.simonsator.partyandfriends.communication.sql; -import de.simonsator.partyandfriends.pafplayers.manager.PAFPlayerManagerMySQL; import net.md_5.bungee.api.connection.ProxiedPlayer; import java.sql.*; @@ -8,7 +7,6 @@ import java.util.UUID; import static de.simonsator.partyandfriends.main.Main.getInstance; -import static de.simonsator.partyandfriends.main.Main.getPlayerManager; /** * @author Simonsator @@ -21,18 +19,15 @@ public class MySQL extends SQLCommunication { /** * Connects to the MySQL server * - * @param pHost The MySQL host - * @param pUsername The MySQL user - * @param pPassword The MySQL password - * @param pPort The port of the MySQL server - * @param pDatabase The MySQL database - * @param pTablePrefix The prefix of the tables + * @param pMySQLData The MySQL data */ - public MySQL(String pHost, String pUsername, String pPassword, int pPort, String pDatabase, String pTablePrefix) { - super(pDatabase, "jdbc:mysql://" + pHost + ":" + pPort + "/?user=" + pUsername + "&password=" + pPassword); - this.tablePrefix = pTablePrefix; + public MySQL(MySQLData pMySQLData) { + super(pMySQLData.DATABASE, "jdbc:mysql://" + pMySQLData.HOST + ":" + pMySQLData.PORT + "/?user=" + + pMySQLData.USERNAME + "&password=" + pMySQLData.PASSWORD); + this.tablePrefix = pMySQLData.TABLE_PREFIX; importDatabase(); - (new Importer(pDatabase, "jdbc:mysql://" + pHost + ":" + pPort + "/?user=" + pUsername + "&password=" + pPassword, this)).closeConnection(); + new Importer(pMySQLData.DATABASE, "jdbc:mysql://" + pMySQLData.HOST + ":" + pMySQLData.PORT + "/?user=" + + pMySQLData.USERNAME + "&password=" + pMySQLData.PASSWORD, this); closeConnection(); } @@ -529,39 +524,7 @@ private void removeSetting(int pPlayerID, int pSettingsID) { } } } - - /** - * Saves an offline message in MySQL - * - * @param idSender Sender of the message - * @param idReceiver Receiver of the message - * @param pMessage The message, that should be send - */ - public void offlineMessage(int idSender, int idReceiver, String pMessage) { - Connection con = getConnection(); - PreparedStatement prepStmt = null; - int time = (int) (System.currentTimeMillis() / 1000L); - try { - prepStmt = con.prepareStatement( - "insert into " + this.database + "." + tablePrefix + "friends_messcages values (?, ?, ?, ?)"); - prepStmt.setInt(2, idSender); - prepStmt.setInt(3, idReceiver); - prepStmt.setString(1, pMessage); - prepStmt.setInt(4, time); - prepStmt.executeUpdate(); - - } catch (SQLException e) { - e.printStackTrace(); - } finally { - try { - if (prepStmt != null) - prepStmt.close(); - } catch (SQLException e) { - e.printStackTrace(); - } - } - } - + public boolean isAFriendOf(int pPlayerID1, int pPlayerID2) { Connection con = getConnection(); Statement stmt = null; diff --git a/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQLData.java b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQLData.java new file mode 100644 index 0000000..7b8189e --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/communication/sql/MySQLData.java @@ -0,0 +1,23 @@ +package de.simonsator.partyandfriends.communication.sql; + +/** + * @author Simonsator + * @version 1.0.0 on 19.07.16. + */ +public class MySQLData { + public final String HOST; + public final String USERNAME; + public final String PASSWORD; + public final int PORT; + public final String DATABASE; + public final String TABLE_PREFIX; + + public MySQLData(String host, String username, String password, int port, String database, String table_prefix) { + HOST = host; + USERNAME = username; + PASSWORD = password; + PORT = port; + DATABASE = database; + TABLE_PREFIX = table_prefix; + } +} diff --git a/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java b/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java index 7ac6c67..fcd48e8 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/commands/MSG.java @@ -12,7 +12,7 @@ import static de.simonsator.partyandfriends.main.Main.getInstance; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.*; +import static de.simonsator.partyandfriends.utilities.PatterCollection.*; /** * Will be executed on /msg @@ -98,6 +98,19 @@ boolean messageGiven(OnlinePAFPlayer pPlayer, String[] args, int n) { return true; } + /** + * Delivers a message that was send, while a player was offline + * + * @param pContent Content of the message + * @param pWrittenTo The player which was written to + * @param pSender The name of the sender + */ + public void deliverOfflineMessage(String pContent, OnlinePAFPlayer pWrittenTo, PAFPlayer pSender) { + sendMessage( + SPACE_PATTERN.matcher(pContent).replaceAll(Matcher.quoteReplacement(getInstance().getMessagesYml().getString("Friends.Command.MSG.ColorOfMessage"))), + pWrittenTo, pSender.getDisplayName(), pWrittenTo.getDisplayName()); + } + private boolean isOffline(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer) { if (!pQueryPlayer.isOnline()) { pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() @@ -131,7 +144,7 @@ private void sendMessage(String pContent, OnlinePAFPlayer pPlayer1, OnlinePAFPla } private void sendMessage(String pContent, OnlinePAFPlayer pReceiver, String pSenderName, String pReceiverName) { - pReceiver.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CONTENTPATTERN.matcher(PLAYERPATTERN.matcher(SENDERNAMEPATTERN.matcher(getInstance() + pReceiver.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CONTENT_PATTERN.matcher(PLAYER_PATTERN.matcher(SENDER_NAME_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.Command.MSG.SentMessage")).replaceAll(Matcher.quoteReplacement(pSenderName))).replaceAll(Matcher.quoteReplacement(pReceiverName))).replaceAll(Matcher.quoteReplacement(pContent)))); } diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java index 2304174..9eb70a0 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Accept.java @@ -15,7 +15,7 @@ import static de.simonsator.partyandfriends.main.Main.getInstance; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The command accept @@ -39,17 +39,17 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { return; pPlayer.addFriend(playerQuery); pPlayer.denyRequest(playerQuery); - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.Command.Accept.NowFriends")).replaceAll(Matcher.quoteReplacement(args[1])))); if (!playerQuery.isOnline()) return; OnlinePAFPlayer friend = (OnlinePAFPlayer) playerQuery; - friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.Command.Accept.NowFriends")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); - friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); pPlayer.sendMessage( - new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(friend.getDisplayName())))); } diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Add.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Add.java index 63372f4..1312a18 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Add.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Add.java @@ -10,7 +10,7 @@ import static de.simonsator.partyandfriends.main.Main.getInstance; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The command add @@ -40,11 +40,11 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { return; if (pPlayer.hasRequestFrom(playerQuery)) { pPlayer.sendMessage( - new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.Command.Add.FriendRequestFromReceiver")).replaceAll(Matcher.quoteReplacement(args[1])))); pPlayer .sendPacket(new Chat("{\"text\":\"" + getInstance().getFriendsPrefix() - + PLAYERPATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.HowToAccept")).replaceAll(Matcher.quoteReplacement(args[1])) + + PLAYER_PATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.HowToAccept")).replaceAll(Matcher.quoteReplacement(args[1])) + "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"" + "/" + getInstance().getFriendsCommand().getName() + " accept " + args[1] + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" @@ -56,16 +56,16 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { return; playerQuery.sendFriendRequest(pPlayer); sendRequest(pPlayer, playerQuery); - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.Command.Add.SentAFriendRequest")).replaceAll(Matcher.quoteReplacement(args[1])))); } private void sendRequest(OnlinePAFPlayer pPlayer, PAFPlayer pPlayerQuery) { pPlayerQuery.sendMessage(new TextComponent(getInstance().getFriendsPrefix() - + PLAYERPATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.FriendRequestReceived")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); + + PLAYER_PATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.FriendRequestReceived")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); pPlayerQuery .sendPacket(new Chat("{\"text\":\"" + getInstance().getFriendsPrefix() - + PLAYERPATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.HowToAccept")).replaceAll(Matcher.quoteReplacement(pPlayer.getName())) + + PLAYER_PATTERN.matcher(getInstance().getMessagesYml().getString("Friends.Command.Add.HowToAccept")).replaceAll(Matcher.quoteReplacement(pPlayer.getName())) + "\",\"clickEvent\":{\"action\":\"run_command\",\"value\":\"/" + getInstance().getFriendsCommand().getName() + " accept " + pPlayer.getName() + "\"},\"hoverEvent\":{\"action\":\"show_text\",\"value\":{\"text\":\"\",\"extra\":[{\"text\":\"" @@ -75,7 +75,7 @@ private void sendRequest(OnlinePAFPlayer pPlayer, PAFPlayer pPlayerQuery) { private boolean hasNoRequestFrom(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer) { if (pQueryPlayer.hasRequestFrom(pPlayer)) { pPlayer.sendMessage( - new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.Command.Accept.ErrorAlreadySend")).replaceAll(Matcher.quoteReplacement(pQueryPlayer.getName())))); pPlayer.sendMessage(new TextComponent(HELP)); return false; @@ -87,7 +87,7 @@ private boolean hasNoRequestFrom(OnlinePAFPlayer pPlayer, PAFPlayer pQueryPlayer protected boolean isAFriendOf(OnlinePAFPlayer pPlayer, PAFPlayer pGivenPlayer) { if (pPlayer.isAFriendOf(pGivenPlayer)) { pPlayer.sendMessage( - new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.Command.Add.AlreadyFriends")).replaceAll(Matcher.quoteReplacement(pGivenPlayer.getDisplayName())))); pPlayer.sendMessage(new TextComponent(HELP)); return true; @@ -118,7 +118,7 @@ private boolean doesPlayerExist(OnlinePAFPlayer pPlayer, PAFPlayer pGivenPlayer) private boolean allowsFriendRequests(OnlinePAFPlayer pPlayer, PAFPlayer pGivenPlayer) { if (pGivenPlayer.getSettingsWorth(0) == 0) { pPlayer.sendMessage( - new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance().getMessagesYml() + new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance().getMessagesYml() .getString("Friends.Command.Add.CanNotSendThisPlayer")).replaceAll(Matcher.quoteReplacement(pGivenPlayer.getName())))); pPlayer.sendMessage(new TextComponent(HELP)); return false; diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Deny.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Deny.java index b4f0272..b834834 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Deny.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Deny.java @@ -15,7 +15,7 @@ import static de.simonsator.partyandfriends.main.Main.getInstance; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The command deny @@ -37,7 +37,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { if (hasNoRequest(pPlayer, playerQuery)) return; pPlayer.denyRequest(playerQuery); - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.Command.Deny.HasDenied")).replaceAll(Matcher.quoteReplacement(args[1])))); } diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Jump.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Jump.java index cd77bbf..d9aa673 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Jump.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Jump.java @@ -4,7 +4,7 @@ import de.simonsator.partyandfriends.api.friends.abstractcommands.FriendSubCommand; import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer; import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer; -import de.simonsator.partyandfriends.utilities.CompilePatter; +import de.simonsator.partyandfriends.utilities.PatterCollection; import de.simonsator.partyandfriends.utilities.StandardConnector; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.config.ServerInfo; @@ -57,7 +57,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { connector.connect(pPlayer.getPlayer(), toJoin); pPlayer.sendMessage( new TextComponent( - getInstance().getFriendsPrefix() + CompilePatter.PLAYERPATTERN + getInstance().getFriendsPrefix() + PatterCollection.PLAYER_PATTERN .matcher(getInstance().getMessagesYml() .getString("Friends.Command.Jump.JoinedTheServer")) .replaceAll(Matcher.quoteReplacement(friend.getDisplayName())))); @@ -94,7 +94,7 @@ private boolean isAlreadyOnServer(ProxiedPlayer pPlayer, ServerInfo pToJoin) { private boolean isPlayerOnline(OnlinePAFPlayer pSender, PAFPlayer pQueryPlayer) { if (!pQueryPlayer.isOnline()) { - pSender.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CompilePatter.PLAYERPATTERN + pSender.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PatterCollection.PLAYER_PATTERN .matcher(getInstance().getMessagesYml().getString("Friends.General.PlayerIsOffline")) .replaceAll(Matcher.quoteReplacement(pQueryPlayer.getName())))); pSender.sendMessage(new TextComponent(HELP)); diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Remove.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Remove.java index 8d5085c..140cd33 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Remove.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Remove.java @@ -15,7 +15,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The command remove @@ -37,7 +37,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { if (!isAFriendOf(pPlayer, playerQuery)) return; pPlayer.removeFriend(playerQuery); - pPlayer.sendMessage(new TextComponent(Main.getInstance().getFriendsPrefix() + PLAYERPATTERN.matcher(Main.getInstance() + pPlayer.sendMessage(new TextComponent(Main.getInstance().getFriendsPrefix() + PLAYER_PATTERN.matcher(Main.getInstance() .getMessagesYml().getString("Friends.Command.Remove.Removed")).replaceAll(Matcher.quoteReplacement(args[1])))); } diff --git a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Settings.java b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Settings.java index c99155e..784844e 100644 --- a/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Settings.java +++ b/src/main/java/de/simonsator/partyandfriends/friends/subcommands/Settings.java @@ -1,9 +1,3 @@ -/*** - * The command settings - * - * @author Simonsator - * @version 1.0.0 - */ package de.simonsator.partyandfriends.friends.subcommands; import de.simonsator.partyandfriends.api.friends.abstractcommands.FriendSubCommand; diff --git a/src/main/java/de/simonsator/partyandfriends/main/Main.java b/src/main/java/de/simonsator/partyandfriends/main/Main.java index 8e41de3..7abaf3b 100644 --- a/src/main/java/de/simonsator/partyandfriends/main/Main.java +++ b/src/main/java/de/simonsator/partyandfriends/main/Main.java @@ -2,6 +2,7 @@ import de.simonsator.partyandfriends.api.pafplayers.PAFPlayerManager; import de.simonsator.partyandfriends.api.party.PartyManager; +import de.simonsator.partyandfriends.communication.sql.MySQLData; import de.simonsator.partyandfriends.friends.commands.Friends; import de.simonsator.partyandfriends.friends.commands.MSG; import de.simonsator.partyandfriends.friends.commands.Reply; @@ -12,13 +13,15 @@ import de.simonsator.partyandfriends.party.command.PartyChat; import de.simonsator.partyandfriends.party.command.PartyCommand; import de.simonsator.partyandfriends.party.partymanager.LocalPartyManager; -import de.simonsator.partyandfriends.utilities.Config; -import de.simonsator.partyandfriends.utilities.MessagesYML; +import de.simonsator.partyandfriends.utilities.ConfigLoader; +import de.simonsator.partyandfriends.utilities.Language; +import de.simonsator.partyandfriends.utilities.MessagesLoader; import de.simonsator.partyandfriends.utilities.disable.Disabler; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.config.Configuration; +import java.io.File; import java.io.IOException; /*** @@ -37,11 +40,11 @@ public class Main extends Plugin { /** * The configuration */ - private Configuration config; + private ConfigLoader config; /** * The messages.yml */ - private Configuration messagesYml; + private MessagesLoader messages = null; /** * The party prefix */ @@ -53,7 +56,7 @@ public class Main extends Plugin { /** * The language */ - private String language; + private Language language; /** * The party command object */ @@ -83,8 +86,11 @@ public void onEnable() { loadConfiguration(); switch ("MySQL") { case "MySQL": - playerManager = new PAFPlayerManagerMySQL(getConfig().getString("MySQL.Host"), getConfig().getString("MySQL.Username"), getConfig().getString("MySQL.Password"), - getConfig().getInt("MySQL.Port"), getConfig().getString("MySQL.Database"), getConfig().getString("MySQL.TablePrefix")); + MySQLData mySQLData = new MySQLData(getConfig().getString("MySQL.Host"), + getConfig().getString("MySQL.Username"), getConfig().getString("MySQL.Password"), + getConfig().getInt("MySQL.Port"), getConfig().getString("MySQL.Database"), + getConfig().getString("MySQL.TablePrefix")); + playerManager = new PAFPlayerManagerMySQL(mySQLData); partyManager = new LocalPartyManager(); break; } @@ -102,16 +108,17 @@ public void onDisable() { */ public void loadConfiguration() { try { - config = (Config.loadConfig()); + config = new ConfigLoader(new File(Main.getInstance().getDataFolder(), "config.yml")); } catch (IOException e) { e.printStackTrace(); } - language = (getConfig().getString("General.Language")); - if (getConfig().getString("General.UseOwnLanguageFile").equalsIgnoreCase("true")) { - language = ("own"); - } + language = Language.valueOf(getConfig().getString("General.Language").toUpperCase()); + if (getConfig().getString("General.UseOwnLanguageFile").equalsIgnoreCase("true")) + language = Language.OWN; try { - messagesYml = (MessagesYML.loadMessages(language)); + if (messages == null) + messages = new MessagesLoader(language, new File(getDataFolder(), "messages.yml")); + else messages.reloadConfiguration(); } catch (IOException e) { e.printStackTrace(); } @@ -165,19 +172,19 @@ public Friends getFriendsCommand() { } public Configuration getConfig() { - return config; + return config.getCreatedConfiguration(); } public String getFriendsPrefix() { return friendsPrefix; } - public String getLanguage() { + public Language getLanguage() { return language; } public Configuration getMessagesYml() { - return messagesYml; + return messages.getCreatedConfiguration(); } public PartyCommand getPartyCommand() { diff --git a/src/main/java/de/simonsator/partyandfriends/main/listener/JoinEvent.java b/src/main/java/de/simonsator/partyandfriends/main/listener/JoinEvent.java index 6a91ea6..76a5728 100644 --- a/src/main/java/de/simonsator/partyandfriends/main/listener/JoinEvent.java +++ b/src/main/java/de/simonsator/partyandfriends/main/listener/JoinEvent.java @@ -2,7 +2,7 @@ import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer; import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer; -import de.simonsator.partyandfriends.utilities.CompilePatter; +import de.simonsator.partyandfriends.utilities.PatterCollection; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.event.PostLoginEvent; import net.md_5.bungee.api.plugin.Listener; @@ -67,15 +67,14 @@ private void deliverFriendRequests(OnlinePAFPlayer pPlayer, List pFri + getInstance().getMessagesYml().getString("Friends.General.RequestInfoOnJoinColorComma") + ","; content = content.substring(0, content.length() - 1); - pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + CompilePatter.FRIENDREQUESTPATTERN.matcher(getInstance() + pPlayer.sendMessage(new TextComponent(getInstance().getFriendsPrefix() + PatterCollection.FRIEND_REQUEST_PATTERN.matcher(getInstance() .getMessagesYml().getString("Friends.General.RequestInfoOnJoin")).replaceAll(Matcher.quoteReplacement(content)))); } - private void sendNowOnline(OnlinePAFPlayer pPlayer, List pFriends) { for (PAFPlayer friend : pFriends) { friend.sendMessage(new TextComponent(getInstance().getFriendsPrefix() - + CompilePatter.PLAYERPATTERN.matcher(getInstance().getMessagesYml().getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); + + PatterCollection.PLAYER_PATTERN.matcher(getInstance().getMessagesYml().getString("Friends.General.PlayerIsNowOnline")).replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); } } } diff --git a/src/main/java/de/simonsator/partyandfriends/main/listener/PlayerDisconnectListener.java b/src/main/java/de/simonsator/partyandfriends/main/listener/PlayerDisconnectListener.java index eb73c5e..ce4b03c 100644 --- a/src/main/java/de/simonsator/partyandfriends/main/listener/PlayerDisconnectListener.java +++ b/src/main/java/de/simonsator/partyandfriends/main/listener/PlayerDisconnectListener.java @@ -1,11 +1,6 @@ -/** - * The class with the PlayerDisconnectEvent event. - * - * @author Simonsator - * @version 1.0.0 - */ package de.simonsator.partyandfriends.main.listener; +import de.simonsator.partyandfriends.api.party.PartyManager; import de.simonsator.partyandfriends.main.Main; import de.simonsator.partyandfriends.api.pafplayers.OnlinePAFPlayer; import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer; @@ -18,7 +13,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The class with the PlayerDisconnectEvent event. @@ -36,14 +31,14 @@ public class PlayerDisconnectListener implements Listener { @EventHandler public void onPlayerDisconnect(PlayerDisconnectEvent pEvent) { OnlinePAFPlayer player = getPlayerManager().getPlayer(pEvent.getPlayer()); - PlayerParty party = Main.getPartyManager().getParty(player); + PlayerParty party = PartyManager.getInstance().getParty(player); if (party != null) { party.leaveParty(player); } for (PAFPlayer friend : player.getFriends()) { friend.sendMessage( new TextComponent( - Main.getInstance().getFriendsPrefix() + PLAYERPATTERN + Main.getInstance().getFriendsPrefix() + PLAYER_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Friends.General.PlayerIsNowOffline")) .replaceAll(Matcher.quoteReplacement(player.getDisplayName())))); diff --git a/src/main/java/de/simonsator/partyandfriends/pafplayers/manager/PAFPlayerManagerMySQL.java b/src/main/java/de/simonsator/partyandfriends/pafplayers/manager/PAFPlayerManagerMySQL.java index 78a955e..0ad64db 100644 --- a/src/main/java/de/simonsator/partyandfriends/pafplayers/manager/PAFPlayerManagerMySQL.java +++ b/src/main/java/de/simonsator/partyandfriends/pafplayers/manager/PAFPlayerManagerMySQL.java @@ -4,6 +4,7 @@ import de.simonsator.partyandfriends.api.pafplayers.PAFPlayer; import de.simonsator.partyandfriends.api.pafplayers.PAFPlayerManager; import de.simonsator.partyandfriends.communication.sql.MySQL; +import de.simonsator.partyandfriends.communication.sql.MySQLData; import de.simonsator.partyandfriends.pafplayers.mysql.OnlinePAFPlayerMySQL; import de.simonsator.partyandfriends.pafplayers.mysql.PAFPlayerMySQL; import de.simonsator.partyandfriends.utilities.disable.Deactivated; @@ -16,10 +17,8 @@ public class PAFPlayerManagerMySQL extends PAFPlayerManager implements Deactivated { private static MySQL connection; - public PAFPlayerManagerMySQL(String pHost, String pUser, String pPassword, int pPort, String pDatabase, String pTablePrefix) { - connection = new MySQL(pHost, pUser, pPassword - , pPort, - pDatabase, pTablePrefix); + public PAFPlayerManagerMySQL(MySQLData pMySQLData) { + connection = new MySQL(pMySQLData); Disabler.getInstance().registerDeactivated(this); } diff --git a/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/OnlinePAFPlayerMySQL.java b/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/OnlinePAFPlayerMySQL.java index af7f4a8..fb07b74 100644 --- a/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/OnlinePAFPlayerMySQL.java +++ b/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/OnlinePAFPlayerMySQL.java @@ -7,7 +7,6 @@ import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.protocol.packet.Chat; -import java.util.ArrayList; import java.util.UUID; public class OnlinePAFPlayerMySQL extends PAFPlayerMySQL implements OnlinePAFPlayer { @@ -50,7 +49,7 @@ public void sendMessage(TextComponent pTextComponent) { @Override public ServerInfo getServer() { - return PLAYER.getServer().getInfo(); + return PLAYER.getServer() != null ? PLAYER.getServer().getInfo() : null; } @Override @@ -78,4 +77,5 @@ public void updatePlayerName() { if (!PLAYER.getName().equals(PAFPlayerManagerMySQL.getConnection().getName(ID))) PAFPlayerManagerMySQL.getConnection().updatePlayerName(ID, PLAYER.getName()); } + } diff --git a/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/PAFPlayerMySQL.java b/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/PAFPlayerMySQL.java index d5b2424..61b6517 100644 --- a/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/PAFPlayerMySQL.java +++ b/src/main/java/de/simonsator/partyandfriends/pafplayers/mysql/PAFPlayerMySQL.java @@ -63,12 +63,12 @@ public boolean hasRequestFrom(PAFPlayer pPlayer) { @Override public void denyRequest(PAFPlayer pPlayer) { - PAFPlayerManagerMySQL.getConnection().denyRequest(ID, ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID()); + PAFPlayerManagerMySQL.getConnection().denyRequest(ID, ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID()); } @Override public boolean isAFriendOf(PAFPlayer pPlayer) { - return PAFPlayerManagerMySQL.getConnection().isAFriendOf(ID, ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID()); + return PAFPlayerManagerMySQL.getConnection().isAFriendOf(ID, ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID()); } private List idListToPAFPlayerList(List pList) { @@ -90,7 +90,7 @@ public void sendFriendRequest(PAFPlayer pSender) { @Override public void addFriend(PAFPlayer pPlayer) { - PAFPlayerManagerMySQL.getConnection().addFriend(((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID(), ID); + PAFPlayerManagerMySQL.getConnection().addFriend( ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID(), ID); } @Override @@ -100,7 +100,7 @@ public PAFPlayer getPAFPlayer() { @Override public void removeFriend(PAFPlayer pPlayer) { - PAFPlayerManagerMySQL.getConnection().deleteFriend(((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID(), ID); + PAFPlayerManagerMySQL.getConnection().deleteFriend( ((PAFPlayerMySQL) pPlayer.getPAFPlayer()).getPlayerID(), ID); } @Override diff --git a/src/main/java/de/simonsator/partyandfriends/party/command/PartyChat.java b/src/main/java/de/simonsator/partyandfriends/party/command/PartyChat.java index 5400695..331f30e 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/command/PartyChat.java +++ b/src/main/java/de/simonsator/partyandfriends/party/command/PartyChat.java @@ -18,8 +18,8 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.MESSAGE_CONTENTPATTERN; -import static de.simonsator.partyandfriends.utilities.CompilePatter.SENDERNAMEPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.MESSAGE_CONTENT_PATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.SENDER_NAME_PATTERN; /** * The /p command @@ -61,8 +61,8 @@ public void send(OnlinePAFPlayer pPlayer, String[] args) { text += " " + Main.getInstance().getMessagesYml().getString("Party.Command.Chat.ContentColor") + arg; } party.sendMessage(new TextComponent( - Main.getInstance().getMessagesYml().getString("Party.Command.Chat.Prefix") + MESSAGE_CONTENTPATTERN - .matcher(SENDERNAMEPATTERN + Main.getInstance().getMessagesYml().getString("Party.Command.Chat.Prefix") + MESSAGE_CONTENT_PATTERN + .matcher(SENDER_NAME_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Chat.PartyChatOutput")) .replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName()))) diff --git a/src/main/java/de/simonsator/partyandfriends/party/playerpartys/LocalPlayerParty.java b/src/main/java/de/simonsator/partyandfriends/party/playerpartys/LocalPlayerParty.java index 2548f16..358d3f6 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/playerpartys/LocalPlayerParty.java +++ b/src/main/java/de/simonsator/partyandfriends/party/playerpartys/LocalPlayerParty.java @@ -12,7 +12,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.NEWLEADERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.NEW_LEADER_PATTERN; public class LocalPlayerParty extends PlayerParty { /** @@ -158,7 +158,7 @@ protected void findNewLeader() { OnlinePAFPlayer newLeader = getPlayers().get(0); this.setLeader(newLeader); removePlayerSilent(newLeader); - this.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + NEWLEADERPATTERN.matcher(Main.getInstance().getMessagesYml() + this.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + NEW_LEADER_PATTERN.matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Leave.NewLeaderIs")).replaceAll(Matcher.quoteReplacement(getLeader().getDisplayName())))); } } diff --git a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Info.java b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Info.java index 7a63394..d95e8f6 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Info.java +++ b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Info.java @@ -9,7 +9,7 @@ import java.util.regex.Matcher; -import static de.simonsator.partyandfriends.utilities.CompilePatter.LEADERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.LEADER_PATTERN; /** * This class will be executed on /party list @@ -34,7 +34,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { PlayerParty party = Main.getPartyManager().getParty(pPlayer); if (!isInParty(pPlayer, party)) return; - String leader = LEADERPATTERN + String leader = LEADER_PATTERN .matcher(Main.getInstance().getMessagesYml().getString("Party.Command.Info.Leader")) .replaceAll(Matcher.quoteReplacement(party.getLeader().getDisplayName())); String players = Main.getInstance().getMessagesYml().getString("Party.Command.Info.Players"); diff --git a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Invite.java b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Invite.java index c4096ed..51228be 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Invite.java +++ b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Invite.java @@ -11,8 +11,8 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.MAXPLAYERSINPARTYPATTERN; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.MAX_PLAYERS_IN_PARTY_PATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The /party chat Invite @@ -64,7 +64,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { party.invite(toInvite); pPlayer.sendMessage( new TextComponent( - Main.getInstance().getPartyPrefix() + PLAYERPATTERN + Main.getInstance().getPartyPrefix() + PLAYER_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Invite.InvitedPlayer")) .replaceAll(Matcher.quoteReplacement(toInvite.getDisplayName())))); @@ -100,7 +100,7 @@ private boolean isAlreadyInAParty(OnlinePAFPlayer pPlayer, OnlinePAFPlayer pToIn private boolean isAlreadyInvited(OnlinePAFPlayer pPlayer, OnlinePAFPlayer pToInvite, PlayerParty pParty) { if (pParty.isInvited(pToInvite)) { pPlayer.sendMessage( - new TextComponent(Main.getInstance().getPartyPrefix() + PLAYERPATTERN + new TextComponent(Main.getInstance().getPartyPrefix() + PLAYER_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Invite.AlreadyInYourParty")) .replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); @@ -111,11 +111,11 @@ private boolean isAlreadyInvited(OnlinePAFPlayer pPlayer, OnlinePAFPlayer pToInv private boolean canInvite(OnlinePAFPlayer pPlayer, PlayerParty pParty) { if (!pPlayer.getPlayer() - .hasPermission(Main.getInstance().getConfig().getString("Permissions.NoPlayerLimitForPartys"))) + .hasPermission(Main.getInstance().getConfig().getString("Permissions.NoPlayerLimitForParties"))) if (Main.getInstance().getConfig().getInt("General.MaxPlayersInParty") > 1) if (Main.getInstance().getConfig().getInt("General.MaxPlayersInParty") < pParty.getAllPlayers().size() + pParty.getInviteListSize() + 1) { - pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + MAXPLAYERSINPARTYPATTERN + pPlayer.sendMessage(new TextComponent(Main.getInstance().getPartyPrefix() + MAX_PLAYERS_IN_PARTY_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Invite.MaxPlayersInPartyReached")) .replaceAll(Matcher.quoteReplacement( diff --git a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Join.java b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Join.java index 65efec5..fd34571 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Join.java +++ b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Join.java @@ -11,7 +11,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.PLAYERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.PLAYER_PATTERN; /** * The class which will be executed on /party join @@ -50,7 +50,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { if (party.addPlayer(pPlayer)) party.sendMessage( new TextComponent( - Main.getInstance().getPartyPrefix() + PLAYERPATTERN + Main.getInstance().getPartyPrefix() + PLAYER_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Join.PlayerHasJoined")) .replaceAll(Matcher.quoteReplacement(pPlayer.getDisplayName())))); diff --git a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Leader.java b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Leader.java index 3d29582..4600ef6 100644 --- a/src/main/java/de/simonsator/partyandfriends/party/subcommand/Leader.java +++ b/src/main/java/de/simonsator/partyandfriends/party/subcommand/Leader.java @@ -10,7 +10,7 @@ import java.util.regex.Matcher; import static de.simonsator.partyandfriends.main.Main.getPlayerManager; -import static de.simonsator.partyandfriends.utilities.CompilePatter.NEWLEADERPATTERN; +import static de.simonsator.partyandfriends.utilities.PatterCollection.NEW_LEADER_PATTERN; /** * The class which will be executed on /party leader @@ -42,7 +42,7 @@ public void onCommand(OnlinePAFPlayer pPlayer, String[] args) { party.setLeader((OnlinePAFPlayer) player); party.sendMessage( new TextComponent( - Main.getInstance().getPartyPrefix() + NEWLEADERPATTERN + Main.getInstance().getPartyPrefix() + NEW_LEADER_PATTERN .matcher(Main.getInstance().getMessagesYml() .getString("Party.Command.Leader.NewLeaderIs")) .replaceAll(Matcher.quoteReplacement(player.getDisplayName())))); diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/CompilePatter.java b/src/main/java/de/simonsator/partyandfriends/utilities/CompilePatter.java deleted file mode 100644 index 6f401ea..0000000 --- a/src/main/java/de/simonsator/partyandfriends/utilities/CompilePatter.java +++ /dev/null @@ -1,16 +0,0 @@ -package de.simonsator.partyandfriends.utilities; - -import java.util.regex.Pattern; - -public final class CompilePatter { - public static final Pattern PLAYERPATTERN = Pattern.compile("[PLAYER]", Pattern.LITERAL); - public static final Pattern FRIENDREQUESTPATTERN = Pattern.compile("[FRIENDREQUESTS]", Pattern.LITERAL); - public static final Pattern SENDERNAMEPATTERN = Pattern.compile("[SENDERNAME]", Pattern.LITERAL); - public static final Pattern MESSAGE_CONTENTPATTERN = Pattern.compile("[MESSAGE_CONTENT]", Pattern.LITERAL); - public static final Pattern LEADERPATTERN = Pattern.compile("[LEADER]", Pattern.LITERAL); - public static final Pattern MAXPLAYERSINPARTYPATTERN = Pattern.compile("[MAXPLAYERSINPARTY]", Pattern.LITERAL); - public static final Pattern NEWLEADERPATTERN = Pattern.compile("[NEWLEADER]", Pattern.LITERAL); - public static final Pattern SPACEPATTERN = Pattern.compile(" ", Pattern.LITERAL); - public static final Pattern CONTENTPATTERN = Pattern.compile("[CONTENT]", Pattern.LITERAL); - -} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/Config.java b/src/main/java/de/simonsator/partyandfriends/utilities/Config.java deleted file mode 100644 index 21d2610..0000000 --- a/src/main/java/de/simonsator/partyandfriends/utilities/Config.java +++ /dev/null @@ -1,233 +0,0 @@ -package de.simonsator.partyandfriends.utilities; - -import de.simonsator.partyandfriends.main.Main; -import net.md_5.bungee.config.Configuration; -import net.md_5.bungee.config.ConfigurationProvider; -import net.md_5.bungee.config.YamlConfiguration; - -import java.io.File; -import java.io.IOException; -import java.util.ArrayList; - -/** - * This class loads the config - * - * @author Simonsator - * @version 1.0.0 - */ -public class Config { - /** - * Adds missing lines in the config - * - * @return Returns the config variable - * @throws IOException Can throw a {@link IOException} - */ - public static Configuration loadConfig() throws IOException { - if (!Main.getInstance().getDataFolder().exists()) { - Main.getInstance().getDataFolder().mkdir(); - } - File file = new File(Main.getInstance().getDataFolder().getPath(), "config.yml"); - if (!file.exists()) { - file.createNewFile(); - } - Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(file); - if (config.getString("MySQL.Host").equals("")) { - config.set("MySQL.Host", "localhost"); - } - if (config.getInt("MySQL.Port") == 0) { - config.set("MySQL.Port", 3306); - } - if (config.getString("MySQL.Username").equals("")) { - config.set("MySQL.Username", "root"); - } - if (config.getString("MySQL.Password").equals("")) { - config.set("MySQL.Password", "Password"); - } - if (config.getString("MySQL.Database").equals("")) { - config.set("MySQL.Database", "friends"); - } - if (config.getString("MySQL.TablePrefix").equals("")) { - config.set("MySQL.TablePrefix", "fr_"); - } - if (config.getString("General.Language").equals("")) { - config.set("General.Language", "english"); - } - String ownLanguage = config.getString("General.UseOwnLanguageFile"); - if (ownLanguage.equals("")) { - config.set("General.UseOwnLanguageFile", "false"); - } - if (config.getString("General.OfflineServer").equals("")) { - config.set("General.OfflineServer", "false"); - } - if (config.getStringList("General.PartyDoNotJoinTheseServers").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("lobby"); - list.add("lobby1"); - list.add("lobby2"); - config.set("General.PartyDoNotJoinTheseServers", list); - } - if (config.getString("General.DisableCommandP").equals("")) { - config.set("General.DisableCommandP", "false"); - } - if (config.getString("General.DisableMsg").equals("")) { - config.set("General.DisableMsg", "false"); - } - if (config.getString("General.DisableReply").equals("")) { - config.set("General.DisableReply", "false"); - } - if (config.getInt("General.MaxPlayersInParty") == 0) { - config.set("General.MaxPlayersInParty", 0); - } - if (config.getString("General.DisableCommand.Friends.List").equals("")) { - config.set("General.DisableCommand.Friends.List", "false"); - } - if (config.getString("General.DisableCommand.Friends.MSG").equals("")) { - config.set("General.DisableCommand.Friends.MSG", "false"); - } - if (config.getString("General.DisableCommand.Friends.Settings").equals("")) { - config.set("General.DisableCommand.Friends.Settings", "false"); - } - if (config.getString("General.DisableCommand.Friends.Jump").equals("")) { - config.set("General.DisableCommand.Friends.Jump", "false"); - } - if (config.getString("General.DisableCommand.Party.Chat").equals("")) { - config.set("General.DisableCommand.Party.Chat", "false"); - } - if (config.getString("General.DisableCommand.Party.Info").equals("")) { - config.set("General.DisableCommand.Party.Info", "false"); - } - if (config.getString("General.DisableCommand.Party.Kick").equals("")) { - config.set("General.DisableCommand.Party.Kick", "false"); - } - if (config.getString("General.DisableCommand.Party.Leader").equals("")) { - config.set("General.DisableCommand.Party.Leader", "false"); - } - if (config.getString("Permissions.FriendPermission").equals("")) { - config.set("Permissions.FriendPermission", ""); - } - if (config.getString("Permissions.PartyPermission").equals("")) { - config.set("Permissions.PartyPermission", ""); - } - if (config.getString("Permissions.NoPlayerLimitForPartys").equals("")) { - config.set("Permissions.NoPlayerLimitForPartys", ""); - } - if (config.getString("GUI.ChangedHideModeMessage").equals("")) { - config.set("GUI.ChangedHideModeMessage", "true"); - } - if (config.getList("CommandNames.Friends.TopCommands.Friend").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("friend"); - list.add("friends"); - config.set("CommandNames.Friends.TopCommands.Friend", list); - } - if (config.getList("CommandNames.Friends.Accept").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("accept"); - config.set("CommandNames.Friends.Accept", list); - } - if (config.getList("CommandNames.Friends.Add").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("add"); - config.set("CommandNames.Friends.Add", list); - } - if (config.getList("CommandNames.Friends.Deny").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("deny"); - config.set("CommandNames.Friends.Deny", list); - } - if (config.getList("CommandNames.Friends.Jump").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("jump"); - config.set("CommandNames.Friends.Jump", list); - } - if (config.getList("CommandNames.Friends.List").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("list"); - list.add("info"); - config.set("CommandNames.Friends.List", list); - } - if (config.getList("CommandNames.Friends.Message").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("message"); - list.add("msg"); - config.set("CommandNames.Friends.Message", list); - } - if (config.getList("CommandNames.Friends.Remove").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("remove"); - config.set("CommandNames.Friends.Remove", list); - } - if (config.getList("CommandNames.Friends.Settings").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("setting"); - list.add("settings"); - config.set("CommandNames.Friends.Settings", list); - } - - if (config.getList("CommandNames.Friends.TopCommands.Reply").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("reply"); - list.add("r"); - config.set("CommandNames.Friends.TopCommands.Reply", list); - } - if (config.getList("CommandNames.Friends.TopCommands.MSG").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("msg"); - config.set("CommandNames.Friends.TopCommands.MSG", list); - } - if (config.getList("CommandNames.Party.TopCommands.Party").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("party"); - config.set("CommandNames.Party.TopCommands.Party", list); - } - if (config.getList("CommandNames.Party.TopCommands.PartyChat").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("partychat"); - list.add("p"); - config.set("CommandNames.Party.TopCommands.PartyChat", list); - } - if (config.getList("CommandNames.Party.Join").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("join"); - list.add("j"); - config.set("CommandNames.Party.Join", list); - } - if (config.getList("CommandNames.Party.Invite").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("invite"); - config.set("CommandNames.Party.Invite", list); - } - if (config.getList("CommandNames.Party.Kick").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("kick"); - list.add("k"); - config.set("CommandNames.Party.Kick", list); - } - if (config.getList("CommandNames.Party.Info").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("info"); - list.add("list"); - config.set("CommandNames.Party.Info", list); - } - if (config.getList("CommandNames.Party.Leave").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("leave"); - config.set("CommandNames.Party.Leave", list); - } - if (config.getList("CommandNames.Party.Chat").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("chat"); - list.add("message"); - list.add("msg"); - config.set("CommandNames.Party.Chat", list); - } - if (config.getList("CommandNames.Party.Leader").isEmpty()) { - ArrayList list = new ArrayList<>(); - list.add("leader"); - config.set("CommandNames.Party.Leader", list); - } - ConfigurationProvider.getProvider(YamlConfiguration.class).save(config, file); - return config; - } - -} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/ConfigLoader.java b/src/main/java/de/simonsator/partyandfriends/utilities/ConfigLoader.java new file mode 100644 index 0000000..5d53ea9 --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/utilities/ConfigLoader.java @@ -0,0 +1,76 @@ +package de.simonsator.partyandfriends.utilities; + +import java.io.File; +import java.io.IOException; + +/** + * This class loads the config + * + * @author Simonsator + * @version 1.0.0 + */ +public class ConfigLoader extends ConfigurationCreator { + public ConfigLoader(File file) throws IOException { + super(file); + readFile(); + loadDefaultValues(); + saveFile(); + } + + /** + * Adds missing lines in the config + */ + private void loadDefaultValues() { + set("MySQL.Host", "localhost"); + set("MySQL.Port", 3306); + set("MySQL.Username", "root"); + set("MySQL.Password", "Password"); + set("MySQL.Database", "friends"); + set("MySQL.TablePrefix", "fr_"); + set("General.Language", "english"); + set("General.UseOwnLanguageFile", "false"); + set("General.OfflineServer", "false"); + set("General.PartyDoNotJoinTheseServers", "lobby", "lobby1", "lobby2"); + set("General.DisableCommandP", "false"); + set("General.DisableMsg", "false"); + set("General.DisableReply", "false"); + set("General.MaxPlayersInParty", 0); + set("General.DisableCommand.Friends.List", "false"); + set("General.DisableCommand.Friends.MSG", "false"); + set("General.DisableCommand.Friends.Settings", "false"); + set("General.DisableCommand.Friends.Jump", "false"); + set("General.DisableCommand.Party.Chat", "false"); + set("General.DisableCommand.Party.Info", "false"); + set("General.DisableCommand.Party.Kick", "false"); + set("General.DisableCommand.Party.Leader", "false"); + set("Permissions.FriendPermission", ""); + set("Permissions.PartyPermission", ""); + set("Permissions.NoPlayerLimitForParties", ""); + set("GUI.ChangedHideModeMessage", "true"); + set("CommandNames.Friends.TopCommands.Friend", "friend", "friends"); + set("CommandNames.Friends.Accept", "accept", "approve"); + set("CommandNames.Friends.Add", "add", "addfriend"); + set("CommandNames.Friends.Deny", "deny", "reject"); + set("CommandNames.Friends.Jump", "jump", "jumpto"); + set("CommandNames.Friends.List", "list", "info"); + set("CommandNames.Friends.Message", "message", "msg"); + set("CommandNames.Friends.Remove", "remove", "delete"); + set("CommandNames.Friends.Settings", "setting", "settings"); + set("CommandNames.Friends.TopCommands.Reply", "reply", "r"); + set("CommandNames.Friends.TopCommands.MSG", "msg", "fmsg"); + set("CommandNames.Party.TopCommands.Party", "party", "parties"); + set("CommandNames.Party.TopCommands.PartyChat", "partychat", "p"); + set("CommandNames.Party.Join", "join", "j"); + set("CommandNames.Party.Invite", "invite", "add"); + set("CommandNames.Party.Kick", "kick", "k"); + set("CommandNames.Party.Info", "info", "list"); + set("CommandNames.Party.Leave", "leave", "le"); + set("CommandNames.Party.Chat", "chat", "message", "msg"); + set("CommandNames.Party.Leader", "leader"); + } + + @Override + public void reloadConfiguration() throws IOException { + configuration = (new ConfigLoader(FILE)).getCreatedConfiguration(); + } +} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/ConfigurationCreator.java b/src/main/java/de/simonsator/partyandfriends/utilities/ConfigurationCreator.java new file mode 100644 index 0000000..7071c7f --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/utilities/ConfigurationCreator.java @@ -0,0 +1,52 @@ +package de.simonsator.partyandfriends.utilities; + +import net.md_5.bungee.config.Configuration; +import net.md_5.bungee.config.ConfigurationProvider; +import net.md_5.bungee.config.YamlConfiguration; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; + +/** + * @author Simonsator + * @version 1.0.0 on 22.07.16. + */ +public abstract class ConfigurationCreator { + protected Configuration configuration = new Configuration(); + protected final File FILE; + + protected ConfigurationCreator(File file) { + this.FILE = file; + } + + protected void readFile() throws IOException { + File folder = FILE.getParentFile(); + if (!folder.exists()) + folder.mkdir(); + if (!FILE.exists()) + FILE.createNewFile(); + configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(FILE); + } + + public abstract void reloadConfiguration() throws IOException; + + public Configuration getCreatedConfiguration() { + return configuration; + } + + protected void set(String pKey, Object pText) { + if (configuration.get(pKey) == null) + configuration.set(pKey, pText); + } + + protected void set(String pKey, String... entries) { + set(pKey, new ArrayList<>(Arrays.asList(entries))); + } + + protected void saveFile() throws IOException { + ConfigurationProvider.getProvider(YamlConfiguration.class).save(configuration, FILE); + } + +} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/Language.java b/src/main/java/de/simonsator/partyandfriends/utilities/Language.java new file mode 100644 index 0000000..5feb67f --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/utilities/Language.java @@ -0,0 +1,9 @@ +package de.simonsator.partyandfriends.utilities; + +/** + * @author Simonsator + * @version 1.0.0 on 19.07.16. + */ +public enum Language { + GERMAN, ENGLISH, OWN +} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/MessagesLoader.java b/src/main/java/de/simonsator/partyandfriends/utilities/MessagesLoader.java new file mode 100644 index 0000000..5014b50 --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/utilities/MessagesLoader.java @@ -0,0 +1,330 @@ +package de.simonsator.partyandfriends.utilities; + +import net.md_5.bungee.api.ChatColor; +import net.md_5.bungee.config.Configuration; + +import java.io.File; +import java.io.IOException; +import java.util.LinkedHashMap; + +/** + * This class loads the Messages.yml + * + * @author Simonsator + * @version 1.0.1 + */ +public class MessagesLoader extends ConfigurationCreator { + private final Language LANGUAGE; + + public MessagesLoader(Language pLanguage, File pFile) throws IOException { + super(pFile); + LANGUAGE = pLanguage; + switch (pLanguage) { + case OWN: + if (!pFile.exists()) pFile.createNewFile(); + readFile(); + break; + case GERMAN: + loadGermanMessages(); + break; + default: + break; + } + loadEnglishMessages(); + loadSharedMessages(); + if (pLanguage == Language.OWN) + saveFile(); + process(configuration); + } + + @Override + public void reloadConfiguration() throws IOException { + configuration = (new MessagesLoader(LANGUAGE, FILE)).getCreatedConfiguration(); + } + + private void loadEnglishMessages() { + set("Party.Error.CommandNotFound", "&cThis command doesn't exist!"); + set("Party.CommandUsage.Join", "&8/&5Party join &8- &7Join a party"); + set("Party.CommandUsage.Invite", "&8/&5Party invite &8- &7Invite a player into your party"); + set("Party.CommandUsage.List", "&8/&5Party list &8- &7List all players who are in the party"); + set("Party.CommandUsage.Chat", "&8/&5Party chat &8- &7Send all players in the party a message"); + set("Party.CommandUsage.Leave", "&8/&5Party leave &8- &7Leave the party"); + set("Party.CommandUsage.Kick", "&8/&5Party kick &8- &7Kicks a player out of the party"); + set("Party.CommandUsage.Leader", "&8/&5Party leader &5 &8- &7Makes another player to the party leader"); + set("Party.Command.General.ErrorNoParty", "&5You need to be in a party"); + set("Party.Command.General.ErrorNotPartyLeader", "&cYou are not the party leader."); + set("Party.Command.General.ErrorGivenPlayerIsNotInTheParty", "&cThe player &e[PLAYER] &cis not in the party."); + set("Party.Command.General.ErrorNoPlayer", "&cYou need to give a player."); + set("Party.Command.General.ErrorPlayerNotOnline", "&cThis player is not online."); + set("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers", "&5The party was dissolved because of too less players."); + set("Party.Command.General.PlayerHasLeftTheParty", "&bThe player &6[PLAYER] has left the party."); + set("Party.Command.General.ServerSwitched", "&bThe party has joined the Server &e[SERVER]&b."); + set("Party.Command.Chat.ErrorNoMessage", "&5You need to give a message"); + set("Party.Command.Info.Empty", "empty"); + set("Party.Command.Invite.GivenPlayerEqualsSender", "&7You are not allowed to invite yourself."); + set("Party.Command.Invite.CanNotInviteThisPlayer", "&cYou can't invite this player into your Party."); + set("Party.Command.Invite.AlreadyInAParty", "&cThis player is already in a party."); + set("Party.Command.Invite.AlreadyInYourParty", "&cThe player &e[PLAYER] is already invited into your party."); + set("Party.Command.Invite.MaxPlayersInPartyReached", "&cThe Max size of a party is [MAXPLAYERSINPARTY]"); + set("Party.Command.Invite.InvitedPlayer", "&6[PLAYER] &bwas invited to your party."); + set("Party.Command.Invite.YouWereInvitedBY", "&5You were invited to the party of &6[PLAYER]&5!"); + set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE", + "&5Join the party by using the command &6/Party &6join &6[PLAYER]!"); + set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER", "&aClick here to join the party"); + set("Party.Command.Invite.InvitationTimedOutInvited", "&5The invitation of the Party from &6[PLAYER] &5is timed out!"); + set("Party.Command.Invite.InvitationTimedOutLeader", "&5The player &6[PLAYER] &5has not accepted your invitation!"); + set("Party.Command.Join.PlayerHasNoParty", "&cThis player does not own a party."); + set("Party.Command.Join.AlreadyInAPartyError", + "&cYou are already in a party. Use &6/party leave &cto leave this Party."); + set("Party.Command.Join.PlayerHasJoined", "&bThe player &6[PLAYER] &bjoined the party."); + set("Party.Command.Join.ErrorNoInvitation", "&cYou can't join this party."); + set("Party.Command.Kick.KickedPlayerOutOfThePartyOthers", "&bThe player &6[PLAYER] &bwas kicked out of party party."); + set("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer", "&bYou have been kicked out of party."); + set("Party.Command.Leader.SenderEqualsGivenPlayer", "&7You cannot make yourself to the new party leader"); + set("Party.Command.Leader.NewLeaderIs", "&7The new party leader is &6[NEWLEADER]"); + set("Party.Command.Leave.NewLeaderIs", "&bThe Leader has left the party. The new leader is &e[NEWLEADER]."); + set("Party.Command.Leave.YouLeftTheParty", "&bYou left your party."); + set("Friends.General.CommandNotFound", " &7The command doesn't exist."); + set("Friends.General.PlayerIsOffline", " &7The Player &e[PLAYER] &7is not online or you are not a friend of him"); + set("Friends.General.NotAFriendOfOrOffline", " &7The Player &e[PLAYER] &7is not online or you are not a friend of him"); + set("Friends.General.NoFriendGiven", " &7You need to give a friend"); + set("Friends.General.NoPlayerGiven", " &7You need to give a player"); + set("Friends.General.TooManyArguments", " &7Too many arguments"); + set("Friends.General.PlayerIsNowOffline", " &7Your friend &e[PLAYER] is now &coffline."); + set("Friends.General.PlayerIsNowOnline", " &7The friend &e[PLAYER] &7is now &aonline."); + set("Friends.General.RequestInfoOnJoin", " &7You &7have &7friend &7requests &7from: [FRIENDREQUESTS]"); + set("Friends.General.RequestInfoOnJoinColor", "&e"); + set("Friends.General.RequestInfoOnJoinColorComma", "&7"); + set("Friends.General.DoesNotExist", " &7The given player &7doesn't &7exist"); + set("Friends.General.GivenPlayerEqualsSender", " &7You cannot give you self as player argument."); + set("Friends.GUI.Hide.ShowAllPlayers", " &aNow you can see all players."); + set("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer", " &eNow only friends and people of server team will be shown."); + set("Friends.GUI.Hide.ShowOnlyFriends", " &6Now you can see only Friends."); + set("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer", " &5Now you can see only players from the server team."); + set("Friends.GUI.Hide.ShowNobody", " &cHide all players."); + set("Friends.CommandUsage.List", "&8/&5friend list &8- &7Lists all of your friends"); + set("Friends.CommandUsage.MSG", "&8/&5friend msg [name of the friend] [message]&r &8- &7send a friend a message"); + set("Friends.CommandUsage.ADD", "&8/&5friend add [name of the player]&r &8- &7Add a friend"); + set("Friends.CommandUsage.Accept", "&8/&5friend accept [name of the player]&r &8- &7accept a friend request"); + set("Friends.CommandUsage.Deny", "&8/&5friend deny [name of the player]&r &8- &7deny a friend request"); + set("Friends.CommandUsage.Remove", "&8/&5friend &5remove &5[name &5of &5the &5friend]&r &8- &7removes &7a &7friend"); + set("Friends.CommandUsage.Jump", "&8/&5friend jump [name of the friend]&r &8- &7Jump to a friend"); + set("Friends.CommandUsage.Settings", "&8/&5friend settings &r&8- &7Change the settings"); + set("Friends.Command.Accept.NowFriends", " &7You and &e[PLAYER] are now friends"); + set("Friends.Command.Accept.ErrorNoFriendShipInvitation", " &7You didn't receive a friend request from &e[PLAYER]&7."); + set("Friends.Command.Accept.ErrorSenderEqualsReceiver", " &7You cannot write to yourself."); + set("Friends.Command.Accept.ErrorAlreadySend", " &7You already have sent the player &e[PLAYER] &7a friend request."); + set("Friends.Command.Add.SenderEqualsReceiver", " &7You cannot send yourself a friend request."); + set("Friends.Command.Add.FriendRequestFromReceiver", + " &7The player &e[PLAYER] &7has already send you a friend request."); + set("Friends.Command.Add.FriendRequestReceived", " &7You have received a friend request from &e[PLAYER]&7."); + set("Friends.Command.Add.ClickHere", "&aClick here to accept the friendship request"); + set("Friends.Command.Add.SentAFriendRequest", " &7The player &e[PLAYER] &7was send a friend request"); + set("Friends.Command.Add.CanNotSendThisPlayer", " &7You cannot send the player &e[PLAYER] &7a friend request"); + set("Friends.Command.Add.HowToAccept", " &7Accept the friend request with &6/friend accept [PLAYER]&7."); + set("Friends.Command.Add.AlreadyFriends", " &7You and &e[PLAYER] &7are already friends."); + set("Friends.Command.Deny.HasDenied", " &7You have denied the friend request of &e[PLAYER]."); + set("Friends.Command.Deny.NoFriendRequest", " &7You didn't receive a friend request from &e[PLAYER]&7."); + set("Friends.Command.Settings.NowYouCanGetInvitedByEveryone", " &7Now you can get invited by &aevery &7player into his Party."); + set("Friends.Command.Settings.NowYouCanGetInvitedByFriends", " &7Now you can get invited &conly by your friends into a party."); + set("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests", " &7Now you are &cnot &7gone receive friend requests anymore"); + set("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests", " &7Now you are &agone &7receive friend requests from everyone"); + set("Friends.Command.Settings.NowYouAreNotGoneReceiveMessages", " &7Now you are &cnot &7gone receive messages anymore"); + set("Friends.Command.Settings.NowYouWillBeShowAsOnline", " &7Now you will be shown as &aonline"); + set("Friends.Command.Settings.NowYouWilBeShownAsOffline", " &7Now you will be shown as &coffline"); + set("Friends.Command.Settings.NowNoMessages", " &7Now you are &cnot &7gone receive messages anymore"); + set("Friends.Command.Settings.NowMessages", " &7Now you are &agone &7receive message from everyone"); + set("Friends.Command.Settings.NowYourFriendsCanJump", " &7Now your friends can &ajump &7to you"); + set("Friends.Command.Settings.NowYourFriendsCanNotJump", " &7Now your friends can &cnot &7jump to you"); + set("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests", + " &7At the moment you are &cnot &7gone receive friend request"); + set("Friends.Command.Settings.AtTheMomentYouAreGoneReceiveFriendRequests", + " &7At the moment you are gone receive friend requests from &aeveryone"); + set("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty", + " &7At the moment you can get invited by &aevery &7player into his Party."); + set("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty", + " &7At the moment you can get invited &aonly &7by by your friends into their Party."); + set("Friends.Command.Settings.ChangeThisSettingsHover", "&aClick here to change this setting."); + set("Friends.Command.Settings.ChangeThisSettingWithFriendrequests", " &7Change this setting with &6/friend settings friendrequests"); + set("Friends.Command.Settings.ChangeThisSettingWithParty", " &7Change this setting with &6/friend settings Party"); + set("Friends.Command.Jump.AlreadyOnTheServer", " &7You are already on this server"); + set("Friends.Command.Jump.JoinedTheServer", " &7Now you are on the same server, like the player &e[PLAYER]"); + set("Friends.Command.Jump.CanNotJump", " &7You cannot jump to this person"); + set("Friends.Command.List.NoFriendsAdded", " &7Till now, you don't have added friends."); + set("Friends.Command.List.FriendsList", " &7These are your friends:"); + set("Friends.Command.MSG.CanNotWriteToHim", " &7You cannot write to this player."); + set("Friends.Command.MSG.NoOneEverWroteToYou", " &7No player ever wrote to you."); + set("Friends.Command.MSG.PlayerAndMessageMissing", " &7You need to give a message."); + set("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin", " &7The player will receive the message, when he goes online."); + set("Friends.Command.Remove.Removed", " &7You removed the friend &e[PLAYER]&7."); + } + + private void loadGermanMessages() { + set("Friends.Command.Add.SentAFriendRequest", " &7Dem Spieler &e[PLAYER] &7wurde eine Freundschaftsanfrage gesendet"); + set("Friends.General.CommandNotFound", " &7Das Kommando existiert nicht."); + set("Friends.General.PlayerIsOffline", " &7Der Spieler &e[PLAYER] &7ist nicht Online oder du bist nicht mit ihm befreundet"); + set("Friends.General.NoPlayerGiven", " &7Du musst einen Spieler angeben"); + set("Friends.General.PlayerIsNowOnline", " &e[PLAYER] &7ist jetzt &aOnline"); + set("Friends.General.RequestInfoOnJoin", " &7Freundschaftsanfragen stehen von den folgenden Spielern aus: [FRIENDREQUESTS]"); + set("Friends.General.PlayerIsNowOffline", " &7Der Freund &e[PLAYER] &7ist nun &cOffline."); + set("Friends.GUI.Hide.ShowAllPlayers", " &aDir werden jetzt alle Spieler angezeigt."); + set("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer", " &eDir werden jetzt nur noch Freunde und Leute vom Server angezeigt."); + set("Party.Command.General.PlayerHasLeftTheParty", "&bDer Spieler &6[PLAYER] hat die party verlassen."); + set("Friends.GUI.Hide.ShowOnlyFriends", " &6Dir werden jetzt nur noch deine Freunde angezeigt."); + set("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer", " &5Dir werden jetzt nur noch Spieler vom Server Team angezeigt."); + set("Friends.GUI.Hide.ShowNobody", " &cDir werden jetzt keine Spieler mehr angezeigt."); + set("Friends.CommandUsage.List", "&8/&5friend list&r &8- &7Listet deine Freunde auf"); + set("Friends.CommandUsage.MSG", "&8/&5friend msg [Name des Freundes] [Nachricht]&r &8- &7schickt einem Freund eine Private Nachricht"); + set("Friends.CommandUsage.ADD", "&8/&5friend add [Name des Spielers]&r &8- &7Fügt einen Freund hinzu"); + set("Friends.CommandUsage.Accept", "&8/&5friend accept [Name des Spielers]&r &8- &7Akzeptiert eine Freundschaftsanfrage"); + set("Friends.CommandUsage.Deny", "&8/&5friend deny [Name des Spielers]&r &8- &7Lehnt eine Freundschaftsanfrage ab"); + set("Friends.CommandUsage.Remove", "&8/&5friend remove [Name des Spielers]&r &8- &7Entfernt einen Freund"); + set("Friends.CommandUsage.Jump", "&8/&5friend jump [Name des Freundes]&r&8- &7Zu einem Freund springen"); + set("Friends.CommandUsage.Settings", "&8/&5friend settings &r&8- &7Ändere die Einstellungen"); + set("Friends.Command.Accept.NowFriends", " &7Du bist jetzt mit &e[PLAYER] &7befreundet"); + set("Friends.Command.Accept.ErrorAlreadySend", " &7Du hast dem Spieler &e[PLAYER] &7schon eine Freundschaftsanfrage gesendet."); + set("Friends.Command.Accept.ErrorNoFriendShipInvitation", " &7Du hast keine Freundschaftsanfrage von &e[PLAYER] &7keine erhalten"); + set("Friends.Command.Add.FriendRequestFromReceiver", " &7Der Spieler &e[PLAYER] &7hat dir schon eine Freundschaftsanfrage gesendet."); + set("Friends.Command.Add.HowToAccept", " &7Nimm sie mit &6/friend accept [PLAYER] &7an"); + set("Friends.Command.Add.ClickHere", "&aHier klicken um die Freundschaftsanfrage anzunehmen"); + set("Friends.Command.Add.AlreadyFriends", " &7Du bist schon mit &e[PLAYER] &7befreundet"); + set("Friends.Command.Accept.ErrorSenderEqualsReceiver", " &7Du kannst dir nicht selber eine Freundschaftsanfrage senden"); + set("Friends.General.DoesNotExist", " &7Der gegebene Spieler exestiert nicht"); + set("Friends.Command.Add.CanNotSendThisPlayer", " &7Du kannst dem Spieler &e[PLAYER] &7keine Freundschaftsanfrage senden"); + set("Friends.Command.Deny.HasDenied", " &7Du hast die Anfrage von &e[PLAYER] &7abglehnt"); + set("Friends.Command.Jump.CanNotJump", " &7Du kannst nicht zu dieser Person springen"); + set("Friends.Command.Jump.AlreadyOnTheServer", " &7Du bist bereits auf diesem Server"); + set("Friends.Command.Jump.JoinedTheServer", " &7Du bist jetzt auf dem gleichen Server, wie der Spieler [PLAYER]"); + set("Friends.Command.List.FriendsList", " &7Dies sind deine Freunde:"); + set("Friends.Command.List.NoFriendsAdded", " &7Du hast noch keine Freunde hinzugefügt."); + set("Friends.Command.Remove.Removed", " &7Du hast den Freund &e[PLAYER] &7entfernt"); + set("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests", + " &7Momentan können dir &ckeine &7Freundschaftsanfragen gesendet werden"); + set("Friends.Command.Settings.AtTheMomentYouAreGoneReceiveFriendRequests", + " &7Momentan erhälst du Freundschaftsanfragen von &ajedem"); + set("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty", + " &7Momentan können dir Party Einladungen von &ajedem &7gesendet werden gesendet werden"); + set("Friends.Command.Settings.ChangeThisSettingWithFriendrequests", + " &7Ändere diese Einstellung mit &6/friend settings friendrequests"); + set("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty", + " &7Momentan können dir &cnur &7Party Einladungen von Freunden gesendet werden"); + set("Friends.Command.Settings.ChangeThisSettingWithParty", " &7Ändere diese Einstellung mit &6/friend settings party"); + set("Friends.Command.Settings.ChangeThisSettingsHover", "&aHier klicken um die Einstellung zu ändern."); + set("Friends.Command.Settings.NowYouCanGetInvitedByEveryone", " &7Du kannst jetzt von &ajedem &7Spieler in eine Party eingeladen werden"); + set("Friends.Command.Settings.NowYouCanGetInvitedByFriends", + " &7Du kannst jetzt &cnur &7noch von deinen Freunden in eine Party eingeladen werden"); + set("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests", " &7Du kannst jetzt &ckeine &7Freundschaftsanfragen mehr erhalten"); + set("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests", " &7Du kannst jetzt von &ajedem &7Freundschaftsanfragen erhalten"); + set("Friends.Command.Settings.NowYouWillBeShowAsOnline", " &7Du wirst nun als &aonline &7angezeigt"); + set("Friends.Command.Settings.NowYouWilBeShownAsOffline", " &7Du wirst nun als &coffline &7angezeigt"); + set("Friends.Command.Settings.NowNoMessages", " &7Du kannst jetzt &ckeine &7Nachrichten mehr erhalten"); + set("Friends.Command.Settings.NowMessages", " &7Du kannst jetzt von &ajedem &7Nachrichten erhalten"); + set("Friends.Command.Settings.NowYourFriendsCanJump", " &7Freunde können jetzt zu dir &aspringen"); + set("Friends.Command.Settings.NowYourFriendsCanNotJump", " &7Freunde können jetzt &cnicht &7zu dir springen"); + set("Friends.Command.MSG.CanNotWriteToHim", " &7Du kannst diesem Spieler nicht schreiben."); + set("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin", " &7Der Spieler erhält die Nachricht, sobald er online geht."); + set("Friends.Command.MSG.NoOneEverWroteToYou", " &7Noch kein Spieler hat dich angeschrieben."); + set("Party.General.ErrorNotPartyLeader", "&cDu bist nicht der Party Leader."); + set("Party.Leader.SenderEqualsGivenPlayer", "&7Du kannst dich nicht selber zum neuen Party Leiter machen"); + set("Party.General.ErrorGivenPlayerIsNotInTheParty", "&cDer Spieler [PLAYER] ist nicht in der Party."); + set("Party.CommandUsage.Join", "&8/&5Party join &8- &7Trete einer Party bei"); + set("Party.CommandUsage.Invite", "&8/&5Party invite &8- &7Lade einen Spieler in deine Party ein"); + set("Party.CommandUsage.List", "&8/&5Party list &8- &7Listet alle Spieler in der Party auf"); + set("Party.CommandUsage.Chat", "&8/&5Party chat &8- &7Sendet allen Spieler in der Party eine Nachicht"); + set("Party.CommandUsage.Leave", "&8/&5Party leave &8- &7Verlässt die Party"); + set("Party.CommandUsage.Kick", "&8/&5Party kick &8- &7Kickt einen Spieler aus der Party"); + set("Party.CommandUsage.Leader", "&8/&5Party leader &8- &7Macht einen anderen Spieler zum Leiter"); + set("Party.Error.CommandNotFound", "&cDieser Befehl Existiert nicht!"); + set("Party.Command.General.ErrorNoParty", "&cDu bist in keiner Party."); + set("Party.Command.General.ErrorNotPartyLeader", "&cDu bist nicht der Party Leader."); + set("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers", "&5Die Party wurde wegen zu wenig Mitgliedern aufgelöst."); + set("Party.Command.General.ServerSwitched", "&bDie Party hat den Server &e[SERVER] &bbetreten."); + set("Party.Command.Chat.ErrorNoMessage", "&5Du musst eine Nachricht eingeben"); + set("Party.Command.Info.Empty", "Leer"); + set("Party.Command.Invite.CanNotInviteThisPlayer", "&cDieser Spieler ist nicht online."); + set("Party.Command.Invite.GivenPlayerEqualsSender", "&7Du darfst dich nicht selber einladen."); + set("Party.Command.Invite.AlreadyInAParty", "&cDieser Der Spieler ist bereits in einer Party."); + set("Party.Command.Invite.AlreadyInYourParty", "&cDer Spieler &e[PLAYER] &cist schon in die Party eingeladen."); + set("Party.Command.Invite.MaxPlayersInPartyReached", "&cDie Maximale größe für eine Party ist [MAXPLAYERSINPARTY]"); + set("Party.Command.Invite.InvitedPlayer", "&bDu hast &6[PLAYER] &bin deine Party eingeladen."); + set("Party.Command.Invite.InvitationTimedOutInvited", "&5Die Einladung in die Party von &6[PLAYER] &5ist abgelaufen!"); + set("Party.Command.Invite.InvitationTimedOutLeader", "&5Der Spieler&6 [PLAYER] &5hat die Einladung nicht angenommen!"); + set("Party.Command.Join.PlayerHasNoParty", "&cDieser Spieler hat keine Party."); + set("Party.Command.Join.AlreadyInAPartyError", "&cDu bist bereits in einer Party. Nutze &6/party leave &cum diese Party zu verlassen."); + set("Party.Command.Join.PlayerHasJoined", "&bDer Spieler &6[PLAYER] &bist der Party beigetreten."); + set("Party.Command.Join.ErrorNoInvitation", "&cDu kannst der Party nicht beitreten."); + set("Party.Command.Kick.KickedPlayerOutOfThePartyOthers", "&bDer Spieler &6[PLAYER] &bwurde aus der Party gekickt."); + set("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer", "&bDu wurdest aus der Party gekickt."); + set("Party.Command.Kick.Party.Command.Leader.NewLeaderIs", "&7Der neue Party Leiter ist &6[PLAYER]."); + set("Party.Command.Leader.NewLeaderIs", "&7Der neue Party Leiter ist &6[PLAYER]."); + set("Party.Command.Leave.YouLeftTheParty", "&bDu hast deine Party verlassen."); + set("Party.Command.Leave.NewLeaderIs", "&bDer Leader hat die Party verlassen. Der neue Leader ist &e[NEWLEADER]."); + set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE", "&5Tritt der Party mit &6/Party join [PLAYER] &5bei!"); + set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER", + "&aHier klicken um Party einladung anzunehmen"); + set("Party.Command.Invite.YouWereInvitedBY", + "&5Du wurdest in die Party von &6[PLAYER] &5eingeladen!"); + } + + private void loadSharedMessages() { + set("Friends.General.Prefix", "&8[&5&lFriends&8]"); + set("Party.General.PartyPrefix", "&7[&5Party&7] "); + set("Friends.General.HelpBegin", + "&8&m-------------------&r&8[&5&lFriends&8]&m-------------------"); + set("Friends.General.HelpEnd", "&8&m-----------------------------------------------"); + set("Party.General.HelpBegin", + "&8&m-------------------&r&8[&5&lParty&8]&m-------------------"); + set("Party.General.HelpEnd", "&8&m---------------------------------------------"); + set("Party.Command.Chat.Prefix", "&7[&5PartyChat&7] "); + set("Party.Command.Chat.ContentColor", "&7"); + set("Party.Command.Chat.PartyChatOutput", "&e[SENDERNAME]&5:[MESSAGE_CONTENT]"); + set("Party.Command.Info.PlayersCut", "&7, &b"); + set("Party.Command.Info.Leader", "&3Leader&7: &5[LEADER]"); + set("Party.Command.Info.Players", "&8Players&7: &b"); + set("Friends.Command.MSG.SentMessage", " &e[SENDERNAME]&5-> &e[PLAYER]&7: [CONTENT]"); + set("Friends.Command.Settings.SplitLine", + "&8&m-----------------------------------------------"); + set("Friends.Command.List.OnlineTitle", "(online)"); + set("Friends.Command.List.OnlineColor", "&a"); + set("Friends.Command.List.OfflineTitle", "(offline)"); + set("Friends.Command.List.OfflineColor", "&c"); + set("Friends.Command.List.PlayerSplit", "&7, "); + set("Friends.Command.MSG.ColorOfMessage", " &7"); + } + + private static void process(Configuration pMessagesYML) { + for (String key : pMessagesYML.getKeys()) { + Object entry = pMessagesYML.get(key); + if (entry instanceof LinkedHashMap) + process(pMessagesYML.getSection(key)); + else if (entry instanceof String) { + String stringEntry = (String) entry; + stringEntry = ChatColor.translateAlternateColorCodes('&', stringEntry); + stringEntry = fixColors(stringEntry); + pMessagesYML.set(key, ChatColor.translateAlternateColorCodes('&', stringEntry)); + } + } + } + + private static String fixColors(String pInput) { + String[] split = pInput.split(" "); + StringBuilder composite = new StringBuilder(""); + String colorCode = ""; + for (String input : split) { + if (!input.startsWith("§")) + input = colorCode + input; + int index = input.lastIndexOf('§'); + if (index != -1) + if (input.length() > index) + colorCode = "§" + input.charAt(index + 1); + composite.append(' ').append(input); + } + String composited = composite.toString(); + if (composited.length() > 0) + composited = composited.substring(1); + if (pInput.endsWith(" ")) + composited += (' '); + return composited; + } + +} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/MessagesYML.java b/src/main/java/de/simonsator/partyandfriends/utilities/MessagesYML.java deleted file mode 100644 index 92ca575..0000000 --- a/src/main/java/de/simonsator/partyandfriends/utilities/MessagesYML.java +++ /dev/null @@ -1,626 +0,0 @@ -package de.simonsator.partyandfriends.utilities; - -import de.simonsator.partyandfriends.main.Main; -import net.md_5.bungee.api.ChatColor; -import net.md_5.bungee.config.Configuration; -import net.md_5.bungee.config.ConfigurationProvider; -import net.md_5.bungee.config.YamlConfiguration; - -import java.io.File; -import java.io.IOException; -import java.util.LinkedHashMap; - -/** - * This class loads the Messages.yml - * - * @author Simonsator - * @version 1.0.1 - */ -public class MessagesYML { - /** - * Adds missing lines in the Messages.yml - * - * @param pType The name of the language - * @return Returns the Messages.yml variable - * @throws IOException Can throw a {@link IOException} - */ - public static Configuration loadMessages(String pType) throws IOException { - File file = null; - Configuration messagesYml = new Configuration(); - switch (pType.toLowerCase()) { - case "own": - file = new File(Main.getInstance().getDataFolder().getPath(), "Messages.yml"); - if (!file.exists()) file.createNewFile(); - messagesYml = (ConfigurationProvider.getProvider(YamlConfiguration.class).load(file)); - break; - case "english": - loadEnglishMessages(messagesYml); - break; - default: - loadGermanMessages(messagesYml); - break; - } - loadEnglishMessages(messagesYml); - if ("own".equalsIgnoreCase(pType)) - ConfigurationProvider.getProvider(YamlConfiguration.class).save(messagesYml, file); - process(messagesYml); - return messagesYml; - } - - private static void loadEnglishMessages(Configuration messagesYml) { - if (messagesYml.getString("Party.Error.CommandNotFound").isEmpty()) - messagesYml.set("Party.Error.CommandNotFound", "&cThis command doesn't exist!"); - if (messagesYml.getString("Party.CommandUsage.Join").isEmpty()) - messagesYml.set("Party.CommandUsage.Join", "&8/&5Party join &8- &7Join a party"); - if (messagesYml.getString("Party.CommandUsage.Invite").isEmpty()) - messagesYml.set("Party.CommandUsage.Invite", "&8/&5Party invite &8- &7Invite a player into your party"); - if (messagesYml.getString("Party.CommandUsage.List").isEmpty()) - messagesYml.set("Party.CommandUsage.List", "&8/&5Party list &8- &7List all players who are in the party"); - if (messagesYml.getString("Party.CommandUsage.Chat").isEmpty()) - messagesYml.set("Party.CommandUsage.Chat", "&8/&5Party chat &8- &7Send all players in the party a message"); - if (messagesYml.getString("Party.CommandUsage.Leave").isEmpty()) - messagesYml.set("Party.CommandUsage.Leave", "&8/&5Party leave &8- &7Leave the party"); - if (messagesYml.getString("Party.CommandUsage.Kick").isEmpty()) - messagesYml.set("Party.CommandUsage.Kick", "&8/&5Party kick &8- &7Kicks a player out of the party"); - if (messagesYml.getString("Party.CommandUsage.Leader").isEmpty()) - messagesYml.set("Party.CommandUsage.Leader", "&8/&5Party leader &5 &8- &7Makes another player to the party leader"); - if (messagesYml.getString("Party.Command.General.ErrorNoParty").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNoParty", "&5You need to be in a party"); - if (messagesYml.getString("Party.Command.General.ErrorNotPartyLeader").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNotPartyLeader", "&cYou are not the party leader."); - if (messagesYml.getString("Party.Command.General.ErrorGivenPlayerIsNotInTheParty").isEmpty()) - messagesYml.set("Party.Command.General.ErrorGivenPlayerIsNotInTheParty", "&cThe player &e[PLAYER] &cis not in the party."); - if (messagesYml.getString("Party.Command.General.ErrorNoPlayer").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNoPlayer", "&cYou need to give a player."); - if (messagesYml.getString("Party.Command.General.ErrorPlayerNotOnline").isEmpty()) - messagesYml.set("Party.Command.General.ErrorPlayerNotOnline", "&cThis player is not online."); - if (messagesYml.getString("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers").isEmpty()) - messagesYml.set("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers", "&5The &5party &5was &5dissolved &5because &5of &5too &5less &5players."); - if (messagesYml.getString("Party.Command.General.PlayerHasLeftTheParty").isEmpty()) - messagesYml.set("Party.Command.General.PlayerHasLeftTheParty", "&bThe player &6[PLAYER] has left the party."); - if (messagesYml.getString("Party.Command.General.ServerSwitched").isEmpty()) - messagesYml.set("Party.Command.General.ServerSwitched", "&bThe party has joined the Server &e[SERVER]&b."); - if (messagesYml.getString("Party.Command.Chat.ErrorNoMessage").isEmpty()) - messagesYml.set("Party.Command.Chat.ErrorNoMessage", "&5You need to give a message"); - if (messagesYml.getString("Party.Command.Info.Empty").isEmpty()) - messagesYml.set("Party.Command.Info.Empty", "empty"); - if (messagesYml.getString("Party.Command.Invite.GivenPlayerEqualsSender").isEmpty()) - messagesYml.set("Party.Command.Invite.GivenPlayerEqualsSender", "&7You are not allowed to invite yourself."); - if (messagesYml.getString("Party.Command.Invite.CanNotInviteThisPlayer").isEmpty()) - messagesYml.set("Party.Command.Invite.CanNotInviteThisPlayer", "&cYou can't invite this player into your Party."); - if (messagesYml.getString("Party.Command.Invite.AlreadyInAParty").isEmpty()) - messagesYml.set("Party.Command.Invite.AlreadyInAParty", "&cThis player is already in &ca party."); - if (messagesYml.getString("Party.Command.Invite.AlreadyInYourParty").isEmpty()) - messagesYml.set("Party.Command.Invite.AlreadyInYourParty", "&cThe &cplayer &e[PLAYER] &cis &calready &cinvited &cinto &cyour &cparty."); - if (messagesYml.getString("Party.Command.Invite.MaxPlayersInPartyReached").isEmpty()) - messagesYml.set("Party.Command.Invite.MaxPlayersInPartyReached", "&cThe &cMax &csize &cof &ca &cparty &cis &c[MAXPLAYERSINPARTY]"); - if (messagesYml.getString("Party.Command.Invite.InvitedPlayer").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitedPlayer", "&6[PLAYER] &bwas &binvited &bto &byour &bparty."); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBY").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBY", "&5You &5were &5invited &5to &5the &5party &5of &6[PLAYER]&5!"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE", "&5Join &5the &5party &5by &5using &5the &5command &6/Party &6join &6[PLAYER]!"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER", "Click here to join the party"); - if (messagesYml.getString("Party.Command.Invite.InvitationTimedOutInvited").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitationTimedOutInvited", "&5The invitation of the Party from &6[PLAYER] &5is &5timed &5out!"); - if (messagesYml.getString("Party.Command.Invite.InvitationTimedOutLeader").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitationTimedOutLeader", "&5The player&6 [PLAYER] &5has &5not &5accepted &5your &5invitation!"); - if (messagesYml.getString("Party.Command.Join.PlayerHasNoParty").isEmpty()) - messagesYml.set("Party.Command.Join.PlayerHasNoParty", "&cThis &cplayer &chas &cno &cparty."); - if (messagesYml.getString("Party.Command.Join.AlreadyInAPartyError").isEmpty()) - messagesYml.set("Party.Command.Join.AlreadyInAPartyError", "&cYou &care &calready &cin &ca &cparty. &6use &6/party leave &cto &cleave &this &cParty."); - if (messagesYml.getString("Party.Command.Join.PlayerHasJoined").isEmpty()) - messagesYml.set("Party.Command.Join.PlayerHasJoined", "&bThe player &6[PLAYER] &bjoined the party."); - if (messagesYml.getString("Party.Command.Join.ErrorNoInvitation").isEmpty()) - messagesYml.set("Party.Command.Join.ErrorNoInvitation", "&cYou can't join this party."); - if (messagesYml.getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers").isEmpty()) - messagesYml.set("Party.Command.Kick.KickedPlayerOutOfThePartyOthers", "&bThe &bplayer &6[PLAYER] &bwas &bkicked &bout &bof &bparty &bparty."); - if (messagesYml.getString("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer").isEmpty()) - messagesYml.set("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer", "&bYou &bhave &bbeen &bkicked &bout &bof &bparty."); - if (messagesYml.getString("Party.Command.Leader.SenderEqualsGivenPlayer").isEmpty()) - messagesYml.set("Party.Command.Leader.SenderEqualsGivenPlayer", "&7You &7cannot &7make &7yourself &7to &7the &7new &7party &7leader"); - if (messagesYml.getString("Party.Command.Leader.NewLeaderIs").isEmpty()) - messagesYml.set("Party.Command.Leader.NewLeaderIs", "&7The &7new &7party &7leader &7is &6[NEWLEADER]"); - if (messagesYml.getString("Party.Command.Leave.NewLeaderIs").isEmpty()) - messagesYml.set("Party.Command.Leave.NewLeaderIs", "&bThe &bLeader &bhas &bleft &bthe &bParty. &bThe &bnew &bLeader &bis &e[NEWLEADER]."); - if (messagesYml.getString("Party.Command.Leave.YouLeftTheParty").isEmpty()) - messagesYml.set("Party.Command.Leave.YouLeftTheParty", "&bYou &bleft &byour &bparty."); - if (messagesYml.getString("Friends.General.Prefix").isEmpty()) - messagesYml.set("Friends.General.Prefix", "&8[&5&lFriends&8]"); - if (messagesYml.getString("Friends.General.CommandNotFound").isEmpty()) - messagesYml.set("Friends.General.CommandNotFound", " &7The &7Command &7doesn't &7exist."); - if (messagesYml.getString("Friends.General.PlayerIsOffline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsOffline", " &7The Player &e[PLAYER] &7is &7not &7online &7or &7you &7are &7not &7a &7friend &7of &7him"); - if (messagesYml.getString("Friends.General.NotAFriendOfOrOffline").isEmpty()) - messagesYml.set("Friends.General.NotAFriendOfOrOffline", " &7The Player &e[PLAYER] &7is &7not &7online &7or &7you &7are &7not &7a &7friend &7of &7him"); - if (messagesYml.getString("Friends.General.NoFriendGiven").isEmpty()) - messagesYml.set("Friends.General.NoFriendGiven", " &7You &7need &7to &7give &7a &7friend"); - if (messagesYml.getString("Friends.General.NoPlayerGiven").isEmpty()) - messagesYml.set("Friends.General.NoPlayerGiven", " &7You &7need &7to &7give &7a &7player"); - if (messagesYml.getString("Friends.General.TooManyArguments").isEmpty()) - messagesYml.set("Friends.General.TooManyArguments", "&7 Too many arguments"); - if (messagesYml.getString("Friends.General.PlayerIsNowOffline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsNowOffline", " &7Your friend &e[PLAYER] is now &coffline."); - if (messagesYml.getString("Friends.General.PlayerIsNowOnline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsNowOnline", " &7The friend &e[PLAYER] &7is now &aonline."); - if (messagesYml.getString("Friends.General.RequestInfoOnJoin").isEmpty()) - messagesYml.set("Friends.General.RequestInfoOnJoin", " &7You &7have &7friend &7requests &7from: [FRIENDREQUESTS]"); - if (messagesYml.getString("Friends.General.RequestInfoOnJoinColor").isEmpty()) - messagesYml.set("Friends.General.RequestInfoOnJoinColor", "&e"); - if (messagesYml.getString("Friends.General.RequestInfoOnJoinColorComma").isEmpty()) - messagesYml.set("Friends.General.RequestInfoOnJoinColorComma", "&7"); - if (messagesYml.getString("Friends.General.DoesNotExist").isEmpty()) - messagesYml.set("Friends.General.DoesNotExist", " &7The given player &7doesn't &7exist"); - if (messagesYml.getString("Friends.General.GivenPlayerEqualsSender").isEmpty()) - messagesYml.set("Friends.General.GivenPlayerEqualsSender", " &7You cannot give you self as player argument."); - if (messagesYml.getString("Friends.GUI.Hide.ShowAllPlayers").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowAllPlayers", " &aNow you can see all players."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer", " &eNow only friends and people of server team will be shown."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyFriends").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyFriends", " &6Now you can see only Friends."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer", " &5Now you can see only players from the server &5team."); - if (messagesYml.getString("Friends.GUI.Hide.ShowNobody").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowNobody", " &cHide all players."); - if (messagesYml.getString("Friends.CommandUsage.List").isEmpty()) - messagesYml.set("Friends.CommandUsage.List", "&8/&5friend list &8- &7Lists &7all &7of &7your &7friends"); - if (messagesYml.getString("Friends.CommandUsage.MSG").isEmpty()) - messagesYml.set("Friends.CommandUsage.MSG", "&8/&5friend &5msg &5[name &5of &5the &5friend] &5[message]&r &8- &7send &7a &7friend &7a &7message"); - if (messagesYml.getString("Friends.CommandUsage.ADD").isEmpty()) - messagesYml.set("Friends.CommandUsage.ADD", "&8/&5friend &5add &5[name &5of &5the &5player]&r &8- &7Add &7a &7friend"); - if (messagesYml.getString("Friends.CommandUsage.Accept").isEmpty()) - messagesYml.set("Friends.CommandUsage.Accept", "&8/&5friend &5accept &5[name &5of &5the &5player]&r &8- &7accept &7a &7friend request"); - if (messagesYml.getString("Friends.CommandUsage.Deny").isEmpty()) - messagesYml.set("Friends.CommandUsage.Deny", "&8/&5friend &5deny &5[name &5of &5the &5player]&r &8- &7deny &7a &7friend &7request"); - if (messagesYml.getString("Friends.CommandUsage.Remove").isEmpty()) - messagesYml.set("Friends.CommandUsage.Remove", "&8/&5friend &5remove &5[name &5of &5the &5friend]&r &8- &7removes &7a &7friend"); - if (messagesYml.getString("Friends.CommandUsage.Jump").isEmpty()) - messagesYml.set("Friends.CommandUsage.Jump", "&8/&5friend &5jump [name of the &5friend]&r&8- &7Jump &7to &7a &7friend"); - if (messagesYml.getString("Friends.CommandUsage.Settings").isEmpty()) - messagesYml.set("Friends.CommandUsage.Settings", "&8/&5friend &5settings &r&8- &7Change &7the &7settings"); - if (messagesYml.getString("Friends.Command.Accept.NowFriends").isEmpty()) - messagesYml.set("Friends.Command.Accept.NowFriends", " &7You and &e[PLAYER] &7are &7now &7friends"); - if (messagesYml.getString("Friends.Command.Accept.ErrorNoFriendShipInvitation").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorNoFriendShipInvitation", " &7You didn't receive a &7friend &7request &7from &e[PLAYER]&7."); - if (messagesYml.getString("Friends.Command.Accept.ErrorSenderEqualsReceiver").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorSenderEqualsReceiver", " &7You cannot &7write &7to &7yourself."); - if (messagesYml.getString("Friends.Command.Accept.ErrorAlreadySend").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorAlreadySend", "&7 You already have sent &7the &7player &e[PLAYER] &7a &7friend &7request."); - if (messagesYml.getString("Friends.Command.Add.SenderEqualsReceiver").isEmpty()) - messagesYml.set("Friends.Command.Add.SenderEqualsReceiver", " &7You &7cannot &7send &7yourself &7a &7friend &7request."); - if (messagesYml.getString("Friends.Command.Add.FriendRequestFromReceiver").isEmpty()) - messagesYml.set("Friends.Command.Add.FriendRequestFromReceiver", " &7The player &e[PLAYER] &7has &7already &7send &7you &7a &7friend &7request."); - if (messagesYml.getString("Friends.Command.Add.FriendRequestReceived").isEmpty()) - messagesYml.set("Friends.Command.Add.FriendRequestReceived", "&7 You have received a friend request from &e[PLAYER]&7."); - if (messagesYml.getString("Friends.Command.Add.ClickHere").isEmpty()) - messagesYml.set("Friends.Command.Add.ClickHere", "&aClick here to accept the friendship request"); - if (messagesYml.getString("Friends.Command.Add.SentAFriendRequest").isEmpty()) - messagesYml.set("Friends.Command.Add.SentAFriendRequest", "&7 The player &e[PLAYER]&7 was &7send &7a &7friend &7request"); - if (messagesYml.getString("Friends.Command.Add.CanNotSendThisPlayer").isEmpty()) - messagesYml.set("Friends.Command.Add.CanNotSendThisPlayer", " &7You &7cannot &7send &7the &7player &e[PLAYER] &7a &7friend &7request"); - if (messagesYml.getString("Friends.Command.Add.HowToAccept").isEmpty()) - messagesYml.set("Friends.Command.Add.HowToAccept", " &7Accept the friend request with &6/friend &6accept &6[PLAYER]&7."); - if (messagesYml.getString("Friends.Command.Add.AlreadyFriends").isEmpty()) - messagesYml.set("Friends.Command.Add.AlreadyFriends", "&7 You and &e[PLAYER] &7are &7already &7friends."); - if (messagesYml.getString("Friends.Command.Deny.HasDenied").isEmpty()) - messagesYml.set("Friends.Command.Deny.HasDenied", " &7You have denied the friend request of &e[PLAYER]."); - if (messagesYml.getString("Friends.Command.Deny.NoFriendRequest").isEmpty()) - messagesYml.set("Friends.Command.Deny.NoFriendRequest", " &7You didn't receive a &7friend &7request &7from &e[PLAYER]&7."); - if (messagesYml.getString("Friends.Command.Settings.NowYouCanGetInvitedByEveryone").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouCanGetInvitedByEveryone", " &7Now &7you &7can &7get &7invited &7by &aevery &7player &7into &7his &7Party."); - if (messagesYml.getString("Friends.Command.Settings.NowYouCanGetInvitedByFriends").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouCanGetInvitedByFriends", " &7Now &7you &7can &7get &7invited &conly &7by &7by your friends &7into &7their &7Party."); - if (messagesYml.getString("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests", " &7Now &7you &7are &cnot &7gone &7receive &7friend &7requests &7anymore"); - if (messagesYml.getString("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests", " &7Now &7you &7are &agone &7receive &7friend &7requests &7from &7everyone"); - if (messagesYml.getString("Friends.Command.Settings.NowYouAreNotGoneReceiveMessages").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouAreNotGoneReceiveMessages", " &7Now &7you &7are &cnot &7gone &7receive &7messages &7anymore"); - if (messagesYml.getString("Friends.Command.Settings.NowYouWillBeShowAsOnline").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouWillBeShowAsOnline", " &7Now &7you &7will &7be &7shown &7as &aonline"); - if (messagesYml.getString("Friends.Command.Settings.NowYouWilBeShownAsOffline").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouWilBeShownAsOffline", " &7Now &7you &7will &7be &7shown &7as &coffline"); - if (messagesYml.getString("Friends.Command.Settings.NowNoMessages").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowNoMessages", " &7Now &7you &7are &cnot &7gone &7receive &7messages &7anymore"); - if (messagesYml.getString("Friends.Command.Settings.NowMessages").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowMessages", " &7Now &7you &7are &agone &7receive &7message &7from &7everyone"); - if (messagesYml.getString("Friends.Command.Settings.NowYourFriendsCanJump").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYourFriendsCanJump", " &7Now &7your &7friends &7can &ajump &7to &7you"); - if (messagesYml.getString("Friends.Command.Settings.NowYourFriendsCanNotJump").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYourFriendsCanNotJump", " &7Now &7your &7friends &7can &cnot &7jump &7to &7you"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests", " &7At &7the moment &7you &7are &cnot &7gone &7receive &7friend &7request"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouAreGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouAreGoneReceiveFriendRequests", " &7At &7the moment &7you &7are &7gone &7receive &7friend &7requests &7from &aeveryone"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty").isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty", " &7At &7the moment &7you &7can &7get &7invited &7by &aevery &7player &7into &7his &7Party."); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty").isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty", " &7At &7the moment &7you &7can &7get &7invited &aonly &7by &7by your friends &7into &7their &7Party."); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingsHover").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingsHover", "Click here to change this setting."); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingWithFriendrequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingWithFriendrequests", " &7Change &7this &7setting &7with &6/friend &6settings &6friendrequests"); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingWithParty").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingWithParty", " &7Change &7this &7setting &7with &6/friend &6settings &6Party"); - if (messagesYml.getString("Friends.Command.Jump.AlreadyOnTheServer").isEmpty()) - messagesYml.set("Friends.Command.Jump.AlreadyOnTheServer", " &7You &7are &7already &7on &7this &7server"); - if (messagesYml.getString("Friends.Command.Jump.JoinedTheServer").isEmpty()) - messagesYml.set("Friends.Command.Jump.JoinedTheServer", " &7Now &7you &7are &7on &7the &7same &7server, &7like &7the &7player &e[PLAYER]"); - if (messagesYml.getString("Friends.Command.Jump.CanNotJump").isEmpty()) - messagesYml.set("Friends.Command.Jump.CanNotJump", " &7You &7cannot &7jump to &7this &7person"); - if (messagesYml.getString("Friends.Command.List.NoFriendsAdded").isEmpty()) - messagesYml.set("Friends.Command.List.NoFriendsAdded", " &7Till now, &7you don't &7have &7added &7friends."); - if (messagesYml.getString("Friends.Command.List.FriendsList").isEmpty()) - messagesYml.set("Friends.Command.List.FriendsList", " &7These &7are &7your &7friends:"); - if (messagesYml.getString("Friends.Command.MSG.CanNotWriteToHim").isEmpty()) - messagesYml.set("Friends.Command.MSG.CanNotWriteToHim", " &7You cannot write to this player."); - if (messagesYml.getString("Friends.Command.MSG.NoOneEverWroteToYou").isEmpty()) - messagesYml.set("Friends.Command.MSG.NoOneEverWroteToYou", "&7 No player ever wrote to you."); - if (messagesYml.getString("Friends.Command.MSG.PlayerAndMessageMissing").isEmpty()) - messagesYml.set("Friends.Command.MSG.PlayerAndMessageMissing", " &7You &7need &7to &7give &7a &7message."); - if (messagesYml.getString("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin").isEmpty()) - messagesYml.set("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin", " &7The &7player &7will &7receive &7the &7message, &7when &7he &7goes &7online."); - if (messagesYml.getString("Friends.Command.Remove.Removed").isEmpty()) - messagesYml.set("Friends.Command.Remove.Removed", "&7 You removed the friend &e[PLAYER]&7."); - loadSharedMessages(messagesYml); - } - - private static void loadGermanMessages(Configuration messagesYml) { - if (messagesYml.getString("Friends.Command.Add.SentAFriendRequest").isEmpty()) - messagesYml.set("Friends.Command.Add.SentAFriendRequest", - " &7Dem Spieler &e[PLAYER] &7wurde eine Freundschaftsanfrage gesendet"); - if (messagesYml.getString("Friends.General.CommandNotFound").isEmpty()) - messagesYml.set("Friends.General.CommandNotFound", " &7Das &7Kommando &7existiert &7nicht."); - if (messagesYml.getString("Friends.General.PlayerIsOffline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsOffline", - " &7Der Spieler &e[PLAYER] &7ist &7nicht &7Online &7oder &7du &7bist &7nicht &7mit &7ihm &7befreundet"); - if (messagesYml.getString("Friends.General.NoPlayerGiven").isEmpty()) - messagesYml.set("Friends.General.NoPlayerGiven", " &7Du musst einen Spieler angeben"); - if (messagesYml.getString("Friends.General.PlayerIsNowOnline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsNowOnline", " &e[PLAYER] &7ist &7jetzt &aOnline"); - if (messagesYml.getString("Friends.General.RequestInfoOnJoin").isEmpty()) - messagesYml.set("Friends.General.RequestInfoOnJoin", - " &7Freundschaftsanfragen stehen von den folgenden Spielern aus: [FRIENDREQUESTS]"); - if (messagesYml.getString("Friends.General.PlayerIsNowOffline").isEmpty()) - messagesYml.set("Friends.General.PlayerIsNowOffline", " &7Der Freund &e[PLAYER] &7ist &7nun &cOffline."); - if (messagesYml.getString("Friends.GUI.Hide.ShowAllPlayers").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowAllPlayers", " &aDir &awerden &ajetzt &aalle &aSpieler &aangezeigt."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyFriendsAndPeopleFromTheServer", - " &eDir &ewerden &ejetzt &enur &enoch &eFreunde &eund &eLeute &evom &eServer &eangezeigt."); - if (messagesYml.getString("Party.Command.General.PlayerHasLeftTheParty").isEmpty()) - messagesYml.set("Party.Command.General.PlayerHasLeftTheParty", - "&bDer Spieler &6[PLAYER] hat die party verlassen."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyFriends").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyFriends", - " &6Dir &6werden &6jetzt &6nur &6noch &6deine &6Freunde &6angezeigt."); - if (messagesYml.getString("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowOnlyPeopleFromTheServer", - " &5Dir &5werden &5jetzt &5nur &5noch &5Spieler &5vom &5Server &5Team &5angezeigt."); - if (messagesYml.getString("Friends.GUI.Hide.ShowNobody").isEmpty()) - messagesYml.set("Friends.GUI.Hide.ShowNobody", - " &cDir &cwerden &cjetzt &ckeine &cSpieler &cmehr &cangezeigt."); - if (messagesYml.getString("Friends.CommandUsage.List").isEmpty()) - messagesYml.set("Friends.CommandUsage.List", - "&8/&5friend list&r &8- &7Listet &7deine &7Freunde &7auf"); - if (messagesYml.getString("Friends.CommandUsage.MSG").isEmpty()) - messagesYml.set("Friends.CommandUsage.MSG", "&8/&5friend &5msg &5[Name &5des &5Freundes] &5[Nachricht]&r &8- &7schickt &7einem &7Freund &7eine &7Private Nachricht"); - if (messagesYml.getString("Friends.CommandUsage.ADD").isEmpty()) - messagesYml.set("Friends.CommandUsage.ADD", - "&8/&5friend &5add &5[Name &5des &5Spielers]&r &8- &7Fügt &7einen &7Freund &7hinzu"); - if (messagesYml.getString("Friends.CommandUsage.Accept").isEmpty()) - messagesYml.set("Friends.CommandUsage.Accept", "&8/&5friend &5accept &5[Name &5des &5Spielers]&r &8- &7Akzeptiert &7eine &7Freundschaftsanfrage"); - if (messagesYml.getString("Friends.CommandUsage.Deny").isEmpty()) - messagesYml.set("Friends.CommandUsage.Deny", "&8/&5friend &5deny &5[Name &5des &5Spielers]&r &8- &7Lehnt eine &7Freundschaftsanfrage &7ab"); - if (messagesYml.getString("Friends.CommandUsage.Remove").isEmpty()) - messagesYml.set("Friends.CommandUsage.Remove", - "&8/&5friend &5remove &5[Name &5des &5Spielers]&r &8- &7Entfernt &7einen &7Freund"); - if (messagesYml.getString("Friends.CommandUsage.Jump").isEmpty()) - messagesYml.set("Friends.CommandUsage.Jump", - "&8/&5friend &5jump [Name des Freundes]&r&8- &7Zu &7einem &7Freund &7springen"); - if (messagesYml.getString("Friends.CommandUsage.Settings").isEmpty()) - messagesYml.set("Friends.CommandUsage.Settings", - "&8/&5friend &5settings &r&8- &7Ändere die Einstellungen"); - if (messagesYml.getString("Friends.Command.Accept.NowFriends").isEmpty()) - messagesYml.set("Friends.Command.Accept.NowFriends", " &7Du bist jetzt mit &e[PLAYER] &7befreundet"); - if (messagesYml.getString("Friends.Command.Accept.ErrorAlreadySend").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorAlreadySend", - " &7Du hast dem Spieler &e[PLAYER] &7schon &7eine &7Freundschaftsanfrage &7gesendet."); - if (messagesYml.getString("Friends.Command.Accept.ErrorNoFriendShipInvitation").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorNoFriendShipInvitation", - "&7 Du hast keine Freundschaftsanfrage von &e[PLAYER] &7keine &7erhalten"); - if (messagesYml.getString("Friends.Command.Add.SentAFriendRequest").isEmpty()) - messagesYml.set("Friends.Command.Add.SentAFriendRequest", - "&7 The player &e[PLAYER] &7was &7send &7a &7friend &7request"); - if (messagesYml.getString("Friends.Command.Add.FriendRequestFromReceiver").isEmpty()) - messagesYml.set("Friends.Command.Add.FriendRequestFromReceiver", - " &7Der Spieler &e[PLAYER] &7hat &7dir &7schon &7eine &7Freundschaftsanfrage &7gesendet."); - if (messagesYml.getString("Friends.Command.Add.HowToAccept").isEmpty()) - messagesYml.set("Friends.Command.Add.HowToAccept", " &7Nimm sie mit &6/friend accept [PLAYER] &7an"); - if (messagesYml.getString("Friends.Command.Add.ClickHere").isEmpty()) - messagesYml.set("Friends.Command.Add.ClickHere", "&aHier klicken um die Freundschaftsanfrage anzunehmen"); - if (messagesYml.getString("Friends.Command.Add.AlreadyFriends").isEmpty()) - messagesYml.set("Friends.Command.Add.AlreadyFriends", " &7Du bist schon mit &e[PLAYER] &7befreundet"); - if (messagesYml.getString("Friends.Command.Accept.ErrorSenderEqualsReceiver").isEmpty()) - messagesYml.set("Friends.Command.Accept.ErrorSenderEqualsReceiver", - " &7Du kannst dir nicht selber eine &7Freundschaftsanfrage &7senden"); - if (messagesYml.getString("Friends.General.DoesNotExist").isEmpty()) - messagesYml.set("Friends.General.DoesNotExist", " &7Der gegebene Spieler &7exestiert &7nicht"); - if (messagesYml.getString("Friends.Command.Add.CanNotSendThisPlayer").isEmpty()) - messagesYml.set("Friends.Command.Add.CanNotSendThisPlayer", - " &7Du &7kannst &7dem &7Spieler &e[PLAYER] &7keine &7Freundschaftsanfrage &7senden"); - if (messagesYml.getString("Friends.Command.Deny.HasDenied").isEmpty()) - messagesYml.set("Friends.Command.Deny.HasDenied", " &7Du hast die Anfrage von &e[PLAYER] &7abglehnt"); - if (messagesYml.getString("Friends.Command.Jump.CanNotJump").isEmpty()) - messagesYml.set("Friends.Command.Jump.CanNotJump", " &7Du &7kannst &7nicht zu &7dieser &7Person springen"); - if (messagesYml.getString("Friends.Command.Jump.AlreadyOnTheServer").isEmpty()) - messagesYml.set("Friends.Command.Jump.AlreadyOnTheServer", - " &7Du &7bist &7bereits &7auf &7diesem &7Server"); - if (messagesYml.getString("Friends.Command.Jump.JoinedTheServer").isEmpty()) - messagesYml.set("Friends.Command.Jump.JoinedTheServer", - " &7Du bist jetzt auf dem gleichen Server, wie der Spieler [PLAYER]"); - if (messagesYml.getString("Friends.Command.List.FriendsList").isEmpty()) - messagesYml.set("Friends.Command.List.FriendsList", " &7Dies &7sind &7deine &7Freunde:"); - if (messagesYml.getString("Friends.Command.List.NoFriendsAdded").isEmpty()) - messagesYml.set("Friends.Command.List.NoFriendsAdded", " &7Du hast noch keine Freunde &7hinzugefügt."); - if (messagesYml.getString("Friends.Command.Remove.Removed").isEmpty()) - messagesYml.set("Friends.Command.Remove.Removed", "&7 Du hast den Freund &e[PLAYER] &7entfernt"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests") - .isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouAreNotGoneReceiveFriendRequests", - " &7Momentan &7können &7dir &ckeine &7Freundschaftsanfragen &7gesendet &7werden"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty") - .isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouCanGetInvitedByEverybodyIntoHisParty", - " &7Momentan &7können &7dir &7Party &7Einladungen &7von &ajedem &7gesendet &7werden &7gesendet &7werden"); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingWithFriendrequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingWithFriendrequests", - " &7Ändere &7diese &7Einstellung &7mit &6/friend &6settings &6Freundschaftsanfragen"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty") - .isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty", - " &7Momentan &7können &7dir &cnur &7Party &7Einladungen &7von &7Freunden &7gesendet &7werden"); - if (messagesYml.getString("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty") - .isEmpty()) - messagesYml.set("Friends.Command.Settings.AtTheMomentYouCanNotGetInvitedByEverybodyIntoHisParty", - " &7Momentan &7können &7dir &cnur &7Party &7Einladungen &7von &7Freunden &7gesendet &7werden"); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingWithParty").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingWithParty", - " &7Ändere &7diese &7Einstellung &7mit &6/friend &6settings &6Party"); - if (messagesYml.getString("Friends.Command.Settings.ChangeThisSettingsHover").isEmpty()) - messagesYml.set("Friends.Command.Settings.ChangeThisSettingsHover", - "Hier klicken um die Einstellung zu ändern."); - if (messagesYml.getString("Friends.Command.Settings.NowYouCanGetInvitedByEveryone").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouCanGetInvitedByEveryone", - " &7Du &7kannst &7jetzt &7von &ajedem &7Spieler &7in &7eine &7Party &7eingeladen &7werden"); - if (messagesYml.getString("Friends.Command.Settings.NowYouCanGetInvitedByFriends").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouCanGetInvitedByFriends", - " &7Du &7kannst &7jetzt &cnur &7noch &7von &7deinen &7Freunden &7in &7eine &7Party &7eingeladen &7werden"); - if (messagesYml.getString("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouAreNotGoneReceiveFriendRequests", - " &7Du &7kannst &7jetzt &ckeine &7Freundschaftsanfragen &7mehr &7erhalten"); - if (messagesYml.getString("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouAreGoneReceiveFriendRequests", - " &7Du &7kannst &7jetzt &7von &ajedem &7Freundschaftsanfragen &7erhalten"); - if (messagesYml.getString("Friends.Command.Settings.NowYouWillBeShowAsOnline").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouWillBeShowAsOnline", - " &7Du &7wirst &7nun &7als &aonline &7angezeigt"); - if (messagesYml.getString("Friends.Command.Settings.NowYouWilBeShownAsOffline").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYouWilBeShownAsOffline", - " &7Du &7wirst &7nun &7als &coffline &7angezeigt"); - if (messagesYml.getString("Friends.Command.Settings.NowNoMessages").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowNoMessages", - " &7Du &7kannst &7jetzt &ckeine &7Nachrichten &7mehr &7erhalten"); - if (messagesYml.getString("Friends.Command.Settings.NowMessages").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowMessages", - " &7Du &7kannst &7jetzt &7von &ajedem &7Nachrichten &7erhalten"); - if (messagesYml.getString("Friends.Command.Settings.NowYourFriendsCanJump").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYourFriendsCanJump", - " &7Freunde &7können &7jetzt &7zu &7dir &aspringen"); - if (messagesYml.getString("Friends.Command.Settings.NowYourFriendsCanNotJump").isEmpty()) - messagesYml.set("Friends.Command.Settings.NowYourFriendsCanNotJump", - " &7Freunde &7können &7jetzt &cnicht &7zu &7dir &7springen"); - if (messagesYml.getString("Friends.Command.MSG.CanNotWriteToHim").isEmpty()) - messagesYml.set("Friends.Command.MSG.CanNotWriteToHim", " &7Du kannst diesem Spieler nicht schreiben."); - if (messagesYml.getString("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin").isEmpty()) - messagesYml.set("Friends.Command.MSG.PlayerWillReceiveMessageOnJoin", - " &7Der &7Spieler &7erhält &7die &7Nachricht, &7sobald &7er &7online &7geht."); - if (messagesYml.getString("Friends.Command.MSG.CanNotWriteToHim").isEmpty()) - messagesYml.set("Friends.Command.MSG.CanNotWriteToHim", " &7Du kannst diesem Spieler nicht schreiben."); - if (messagesYml.getString("Friends.Command.MSG.NoOneEverWroteToYou").isEmpty()) - messagesYml.set("Friends.Command.MSG.NoOneEverWroteToYou", " &7Noch kein Spieler hat dich angeschrieben."); - if (messagesYml.getString("Party.General.ErrorNotPartyLeader").isEmpty()) - messagesYml.set("Party.General.ErrorNotPartyLeader", "&cDu &cbist &cnicht &cder &cParty &cLeader."); - if (messagesYml.getString("Party.Leader.SenderEqualsGivenPlayer").isEmpty()) - messagesYml.set("Party.Leader.SenderEqualsGivenPlayer", - "&7Du &7kannst &7dich &7nicht &7selber &7zum &7neuen &7Party &7Leiter &7machen"); - if (messagesYml.getString("Party.General.ErrorGivenPlayerIsNotInTheParty").isEmpty()) - messagesYml.set("Party.General.ErrorGivenPlayerIsNotInTheParty", - "&cDer &cSpieler [PLAYER] &cist &cnicht &cin &cder &cParty."); - if (messagesYml.getString("Party.CommandUsage.Join").isEmpty()) - messagesYml.set("Party.CommandUsage.Join", "&8/&5Party join &8- &7Trete einer Party bei"); - if (messagesYml.getString("Party.CommandUsage.Invite").isEmpty()) - messagesYml.set("Party.CommandUsage.Invite", - "&8/&5Party invite &8- &7Lade &7einen &7Spieler &7in &7deine &7Party &7ein"); - if (messagesYml.getString("Party.CommandUsage.List").isEmpty()) - messagesYml.set("Party.CommandUsage.List", - "&8/&5Party list &8- &7Listet alle Spieler in der Party auf"); - if (messagesYml.getString("Party.CommandUsage.Chat").isEmpty()) - messagesYml.set("Party.CommandUsage.Chat", - "&8/&5Party chat &8- &7Sendet allen Spieler in der Party &7eine &7Nachicht"); - if (messagesYml.getString("Party.CommandUsage.Leave").isEmpty()) - messagesYml.set("Party.CommandUsage.Chat", "&8/&5Party leave &8- &7Verlässt die Party"); - if (messagesYml.getString("Party.CommandUsage.Kick").isEmpty()) - messagesYml.set("Party.CommandUsage.Chat", - "&8/&5Party kick &8- &7Kickt einen Spieler aus der Party"); - if (messagesYml.getString("Party.CommandUsage.Leader").isEmpty()) - messagesYml.set("Party.CommandUsage.Chat", - "&8/&5Party leader &5 &8- &7Macht einen anderen Spieler zum &7Leiter"); - if (messagesYml.getString("Party.Error.CommandNotFound").isEmpty()) - messagesYml.set("Party.Error.CommandNotFound", "&cDieser Befehl Existiert nicht!"); - if (messagesYml.getString("Party.Command.General.ErrorNoParty").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNoParty", "&cDu &cbist &cin &ckeiner &cParty."); - if (messagesYml.getString("Party.Command.General.ErrorNoParty").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNoParty", "&cDu &cbist &cin &ckeiner &cParty."); - if (messagesYml.getString("Party.Command.General.ErrorNotPartyLeader").isEmpty()) - messagesYml.set("Party.Command.General.ErrorNotPartyLeader", "&cDu &cbist &cnicht &cder &cParty &cLeader."); - if (messagesYml.getString("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers").isEmpty()) - messagesYml.set("Party.Command.General.DissolvedPartyCauseOfNotEnoughPlayers", - "&5Die &5Party &5wurde &5wegen &5zu &5wenig &5Mitgliedern &5aufgelöst."); - if (messagesYml.getString("Party.Command.General.ServerSwitched").isEmpty()) - messagesYml.set("Party.Command.General.ServerSwitched", - "&bDie &bParty &bhat &bden &bServer &e[SERVER] &bbetreten."); - if (messagesYml.getString("Party.Command.Chat.ErrorNoMessage").isEmpty()) - messagesYml.set("Party.Command.Chat.ErrorNoMessage", "&5Du musst eine Nachricht eingeben"); - if (messagesYml.getString("Party.Command.Info.Empty").isEmpty()) - messagesYml.set("Party.Command.Info.Empty", "Leer"); - if (messagesYml.getString("Party.Command.Invite.CanNotInviteThisPlayer").isEmpty()) - messagesYml.set("Party.Command.Invite.CanNotInviteThisPlayer", - "&cDieser &cSpieler &cist &cnicht &conline."); - if (messagesYml.getString("Party.Command.Invite.GivenPlayerEqualsSender").isEmpty()) - messagesYml.set("Party.Command.Invite.GivenPlayerEqualsSender", - "&7Du &7darfst &7dich &7nicht &7selber &7einladen."); - if (messagesYml.getString("Party.Command.Invite.AlreadyInAParty").isEmpty()) - messagesYml.set("Party.Command.Invite.AlreadyInAParty", - "&cDieser &cDer &cSpieler &cist &cbereits &cin &ceiner &cParty."); - if (messagesYml.getString("Party.Command.Invite.AlreadyInYourParty").isEmpty()) - messagesYml.set("Party.Command.Invite.AlreadyInYourParty", - "&cDer &cSpieler &e[PLAYER] &cist &cschon &cin &cdie &cParty &ceingeladen."); - if (messagesYml.getString("Party.Command.Invite.MaxPlayersInPartyReached").isEmpty()) - messagesYml.set("Party.Command.Invite.MaxPlayersInPartyReached", - "&cDie &cMaximale &cgröße &cfür &ceine &cParty &cist &c[MAXPLAYERSINPARTY]"); - if (messagesYml.getString("Party.Command.Invite.InvitedPlayer").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitedPlayer", - "&bDu &bhast &6[PLAYER] &bin &bdeine &bParty &beingeladen."); - if (messagesYml.getString("Party.Command.Invite.InvitationTimedOutInvited").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitationTimedOutInvited", - "&5Die Einladung in die Party von &6[PLAYER] &5ist &5abgelaufen!"); - if (messagesYml.getString("Party.Command.Invite.InvitationTimedOutLeader").isEmpty()) - messagesYml.set("Party.Command.Invite.InvitationTimedOutLeader", - "&5Der Spieler&6 [PLAYER] &5hat &5die &5Einladung &5nicht &5angenommen!"); - if (messagesYml.getString("Party.Command.Join.PlayerHasNoParty").isEmpty()) - messagesYml.set("Party.Command.Join.PlayerHasNoParty", "&cDieser &cSpieler &chat &ckeine &cParty."); - if (messagesYml.getString("Party.Command.Join.AlreadyInAPartyError").isEmpty()) - messagesYml.set("Party.Command.Join.AlreadyInAPartyError", - "&cDu &cbist &cbereits &cin &ceiner &cParty. &cNutze &6/party leave &cum &cdiese &cParty &czu &cverlassen."); - if (messagesYml.getString("Party.Command.Join.PlayerHasJoined").isEmpty()) - messagesYml.set("Party.Command.Join.PlayerHasJoined", - "&bDer &bSpieler &6[PLAYER] &bist &bder &bParty &bbeigetreten."); - if (messagesYml.getString("Party.Command.Join.ErrorNoInvitation").isEmpty()) - messagesYml.set("Party.Command.Join.ErrorNoInvitation", "&cDu &ckannst &cder &cParty &cnicht &cbeitreten."); - if (messagesYml.getString("Party.Command.Kick.KickedPlayerOutOfThePartyOthers").isEmpty()) - messagesYml.set("Party.Command.Kick.KickedPlayerOutOfThePartyOthers", - "&bDer &bSpieler &6[PLAYER] &bwurde &baus &bder &bParty &bgekickt."); - if (messagesYml.getString("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer").isEmpty()) - messagesYml.set("Party.Command.Kick.KickedPlayerOutOfThePartyKickedPlayer", - "&bDu &bwurdest &baus &bder &bParty &bgekickt."); - if (messagesYml.getString("Party.Command.Leader.NewLeaderIs").isEmpty()) - messagesYml.set("Party.Command.Kick.Party.Command.Leader.NewLeaderIs", - "&7Der &7neue &7Party &7Leiter &7ist &6[PLAYER]."); - if (messagesYml.getString("Party.Command.Leader.NewLeaderIs").isEmpty()) - messagesYml.set("Party.Command.Leader.NewLeaderIs", "&7Der &7neue &7Party &7Leiter &7ist &6[PLAYER]."); - if (messagesYml.getString("Party.Command.Leave.YouLeftTheParty").isEmpty()) - messagesYml.set("Party.Command.Leave.YouLeftTheParty", "&bDu &bhast &bdeine &bParty &bverlassen."); - if (messagesYml.getString("Party.Command.Leave.NewLeaderIs").isEmpty()) - messagesYml.set("Party.Command.Leave.NewLeaderIs", - "&bDer &bLeader &bhat &bdie &bParty &bverlassen. &bDer &bneue &bLeader &bist &e[NEWLEADER]."); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE", - "&5Tritt &5der &5Party &5mit &6/Party join [PLAYER] &5bei!"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGE", - "&5Tritt &5der &5Party &5mit &6/Party join [PLAYER] &5bei!"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER", - "&aHier klicken um Party einladung anzunehmen"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBYJSONMESSAGEHOVER", - "&aHier klicken um Party einladung anzunehmen"); - if (messagesYml.getString("Party.Command.Invite.YouWereInvitedBY").isEmpty()) - messagesYml.set("Party.Command.Invite.YouWereInvitedBY", - "&5Du &5wurdest &5in &5die &5Party &5von&6 [PLAYER] &5eingeladen!"); - loadSharedMessages(messagesYml); - } - - private static void loadSharedMessages(Configuration messagesYml) { - if (messagesYml.getString("Party.General.PartyPrefix").isEmpty()) - messagesYml.set("Party.General.PartyPrefix", "&7[&5Party&7] "); - if (messagesYml.getString("Friends.General.HelpBegin").isEmpty()) - messagesYml.set("Friends.General.HelpBegin", - "&8&m-------------------&r&8[&5&lFriends&8]&m-------------------"); - if (messagesYml.getString("Friends.General.HelpEnd").isEmpty()) - messagesYml.set("Friends.General.HelpEnd", "&8&m-----------------------------------------------"); - if (messagesYml.getString("Party.General.HelpBegin").isEmpty()) - messagesYml.set("Party.General.HelpBegin", - "&8&m-------------------&r&8[&5&lParty&8]&m-------------------"); - if (messagesYml.getString("Party.General.HelpEnd").isEmpty()) - messagesYml.set("Party.General.HelpEnd", "&8&m---------------------------------------------"); - if (messagesYml.getString("Party.Command.Chat.Prefix").isEmpty()) - messagesYml.set("Party.Command.Chat.Prefix", "&7[&5PartyChat&7] "); - if (messagesYml.getString("Party.Command.Chat.ContentColor").isEmpty()) - messagesYml.set("Party.Command.Chat.ContentColor", "&7"); - if (messagesYml.getString("Party.Command.Chat.PartyChatOutput").isEmpty()) - messagesYml.set("Party.Command.Chat.PartyChatOutput", "&e[SENDERNAME]&5:[MESSAGE_CONTENT]"); - if (messagesYml.getString("Party.Command.Info.PlayersCut").isEmpty()) - messagesYml.set("Party.Command.Info.PlayersCut", "&7, &b"); - if (messagesYml.getString("Party.Command.Info.Leader").isEmpty()) - messagesYml.set("Party.Command.Info.Leader", "&3Leader&7: &5[LEADER]"); - if (messagesYml.getString("Party.Command.Info.Players").isEmpty()) - messagesYml.set("Party.Command.Info.Players", "&8Players&7: &b"); - if (messagesYml.getString("Friends.Command.MSG.SentMessage").isEmpty()) - messagesYml.set("Friends.Command.MSG.SentMessage", " &e[SENDERNAME]&5-> &e[PLAYER]&7: [CONTENT]"); - if (messagesYml.getString("Friends.Command.Settings.SplitLine").isEmpty()) - messagesYml.set("Friends.Command.Settings.SplitLine", - "&8&m-----------------------------------------------"); - if (messagesYml.getString("Friends.Command.List.OnlineTitle").isEmpty()) - messagesYml.set("Friends.Command.List.OnlineTitle", "(online)"); - if (messagesYml.getString("Friends.Command.List.OnlineColor").isEmpty()) - messagesYml.set("Friends.Command.List.OnlineColor", "&a"); - if (messagesYml.getString("Friends.Command.List.OfflineTitle").isEmpty()) - messagesYml.set("Friends.Command.List.OfflineTitle", "(offline)"); - if (messagesYml.getString("Friends.Command.List.OfflineColor").isEmpty()) - messagesYml.set("Friends.Command.List.OfflineColor", "&c"); - if (messagesYml.getString("Friends.Command.List.PlayerSplit").isEmpty()) - messagesYml.set("Friends.Command.List.PlayerSplit", "&7, "); - if (messagesYml.getString("Friends.Command.MSG.ColorOfMessage").isEmpty()) - messagesYml.set("Friends.Command.MSG.ColorOfMessage", " &7"); - } - - private static void process(Configuration pMessagesYML) { - for (String key : pMessagesYML.getKeys()) { - Object entry = pMessagesYML.get(key); - if (entry instanceof LinkedHashMap) - process(pMessagesYML.getSection(key)); - else if (entry instanceof String) { - String stringEntry = (String) entry; - stringEntry = ChatColor.translateAlternateColorCodes('&', stringEntry); - stringEntry = fixColors(stringEntry); - pMessagesYML.set(key, ChatColor.translateAlternateColorCodes('&', stringEntry)); - } - } - } - - private static String fixColors(String pInput) { - String[] split = pInput.split(" "); - StringBuilder composite = new StringBuilder(""); - String colorCode = ""; - for (String input : split) { - if (!input.startsWith("§")) - input = colorCode + input; - int index = input.lastIndexOf('§'); - if (index != -1) - if (input.length() > index) - colorCode = "§" + input.charAt(index + 1); - composite.append(' ').append(input); - } - String composited = composite.toString(); - if (composited.length() > 0) - composited = composited.substring(1); - if (pInput.endsWith(" ")) - composited += (' '); - return composited; - } - -} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/PatterCollection.java b/src/main/java/de/simonsator/partyandfriends/utilities/PatterCollection.java new file mode 100644 index 0000000..c4cc7c3 --- /dev/null +++ b/src/main/java/de/simonsator/partyandfriends/utilities/PatterCollection.java @@ -0,0 +1,16 @@ +package de.simonsator.partyandfriends.utilities; + +import java.util.regex.Pattern; + +public final class PatterCollection { + public static final Pattern PLAYER_PATTERN = Pattern.compile("[PLAYER]", Pattern.LITERAL); + public static final Pattern FRIEND_REQUEST_PATTERN = Pattern.compile("[FRIENDREQUESTS]", Pattern.LITERAL); + public static final Pattern SENDER_NAME_PATTERN = Pattern.compile("[SENDERNAME]", Pattern.LITERAL); + public static final Pattern MESSAGE_CONTENT_PATTERN = Pattern.compile("[MESSAGE_CONTENT]", Pattern.LITERAL); + public static final Pattern LEADER_PATTERN = Pattern.compile("[LEADER]", Pattern.LITERAL); + public static final Pattern MAX_PLAYERS_IN_PARTY_PATTERN = Pattern.compile("[MAXPLAYERSINPARTY]", Pattern.LITERAL); + public static final Pattern NEW_LEADER_PATTERN = Pattern.compile("[NEWLEADER]", Pattern.LITERAL); + public static final Pattern SPACE_PATTERN = Pattern.compile(" ", Pattern.LITERAL); + public static final Pattern CONTENT_PATTERN = Pattern.compile("[CONTENT]", Pattern.LITERAL); + +} diff --git a/src/main/java/de/simonsator/partyandfriends/utilities/StringToArray.java b/src/main/java/de/simonsator/partyandfriends/utilities/StringToArray.java deleted file mode 100644 index d56234e..0000000 --- a/src/main/java/de/simonsator/partyandfriends/utilities/StringToArray.java +++ /dev/null @@ -1,52 +0,0 @@ -/** - * This class converts a String to an Array - * - * @author Simonsator - * @version 1.0.0 - * @see de.simonsator.partyandfriends.utilities.StringToArrayList - */ -package de.simonsator.partyandfriends.utilities; - -import java.util.StringTokenizer; - -/** - * This class converts a String to an Array - * - * @author Simonsator - * @version 1.0.0 - */ -public class StringToArray { - /** - * This method converts a String to an Array. It splits the String every - * time there is a "|". - * - * @param string The String, which should be converted to a String - * @return Return the created Array - */ - public static String[] stringToArray(String string) { - StringTokenizer st = new StringTokenizer(string, "|"); - int stLength = st.countTokens(); - String[] stArray = new String[stLength]; - for (int i = 0; i < stLength; i++) { - stArray[i] = st.nextToken(); - } - return stArray; - } - - /** - * This method converts a String to an int[]. It splits the String every - * time there is a "|". - * - * @param string The String, which should be converted to a String - * @return Return the created int[] Array - */ - public static int[] stringToIntegerArray(String string) { - StringTokenizer st = new StringTokenizer(string, "|"); - int stLength = st.countTokens(); - int[] stArray = new int[stLength]; - for (int i = 0; i < stLength; i++) { - stArray[i] = Integer.parseInt(st.nextToken()); - } - return stArray; - } -} diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 498e680..e8c4210 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -2,4 +2,5 @@ name: PartyAndFriends version: ${project.version} author: Simonsator main: de.simonsator.partyandfriends.main.Main -description: A party and friends plugin \ No newline at end of file +description: A party and friends plugin +softDepends: ['RedisBungee'] \ No newline at end of file