diff --git a/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java b/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
index 631c05202..223b31351 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/MiniPlugin.java
@@ -7,6 +7,9 @@ import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTime.TimeUnit;
+import mineplex.core.lifetimes.Lifetime;
+import mineplex.core.lifetimes.Lifetimed;
+import mineplex.core.lifetimes.SimpleLifetime;
import mineplex.core.thread.ThreadPool;
import org.bukkit.Bukkit;
@@ -27,12 +30,16 @@ import org.bukkit.scheduler.BukkitTask;
*
* This way, we can reflectively create them during {@link #require} when they do not exist, leading to much cleaner code
*/
-public abstract class MiniPlugin implements Listener
+public abstract class MiniPlugin implements Listener, Lifetimed
{
+ // As MiniPlugins can technically be disabled at any time, each
+ // has its own unique Lifetime. If MiniPlugins are declared
+ // to never be able to be disabled, then a "Singleton" Lifetime
+ // could be shared between all of them.
+ private final SimpleLifetime _lifetime = new SimpleLifetime();
protected String _moduleName = "Default";
protected JavaPlugin _plugin;
- protected NautHashMap _commands;
-
+
protected long _initializedTime;
public MiniPlugin(String moduleName)
@@ -47,8 +54,7 @@ public abstract class MiniPlugin implements Listener
_initializedTime = System.currentTimeMillis();
- _commands = new NautHashMap<>();
-
+ _lifetime.start();
onEnable();
registerEvents(this);
@@ -146,7 +152,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
});
}
@@ -163,7 +170,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
}, time);
}
@@ -180,7 +188,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
}, time, period);
}
@@ -197,7 +206,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
});
}
@@ -214,7 +224,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
}, delay);
}
@@ -236,7 +247,8 @@ public abstract class MiniPlugin implements Listener
}
catch (Throwable t)
{
- throw new RuntimeException(exception);
+ exception.initCause(t);
+ throw new RuntimeException("Exception while executing MiniPlugin task", exception);
}
}, delay, period);
}
@@ -250,4 +262,10 @@ public abstract class MiniPlugin implements Listener
{
return Managers.require(clazz);
}
+
+ @Override
+ public Lifetime getLifetime()
+ {
+ return _lifetime;
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClient.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClient.java
index 7afa65772..379dc217d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClient.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClient.java
@@ -68,12 +68,6 @@ public class CoreClient
return _accountId;
}
- public void Delete()
- {
- _name = null;
- _player = null;
- }
-
public void setAccountId(int accountId)
{
_accountId = accountId;
@@ -214,4 +208,16 @@ public class CoreClient
return getDisguisedAs();
return getName();
}
+
+ @Override
+ public String toString()
+ {
+ return "CoreClient{" +
+ "_accountId=" + _accountId +
+ ", _name='" + _name + '\'' +
+ ", _uuid=" + _uuid +
+ ", _player=" + _player +
+ ", _rank=" + _rank +
+ '}';
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
index d6414e463..13828828f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/CoreClientManager.java
@@ -8,6 +8,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Set;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicInteger;
@@ -26,6 +27,7 @@ import org.bukkit.event.player.PlayerLoginEvent;
import org.bukkit.event.player.PlayerQuitEvent;
import org.bukkit.plugin.java.JavaPlugin;
+import com.google.common.collect.Sets;
import com.google.gson.Gson;
import mineplex.cache.player.PlayerCache;
@@ -65,17 +67,19 @@ public class CoreClientManager extends MiniPlugin
private final Rank WHITELIST_BYPASS;
- public CoreClientManager(JavaPlugin plugin, String webServer)
+ private final Set _reservedSlots = Sets.newConcurrentHashSet();
+
+ public CoreClientManager(JavaPlugin plugin)
{
- this(plugin, webServer, Rank.MODERATOR);
+ this(plugin, Rank.MODERATOR);
}
- public CoreClientManager(JavaPlugin plugin, String webServer, Rank whitelistBypass)
+ public CoreClientManager(JavaPlugin plugin, Rank whitelistBypass)
{
super("Client Manager", plugin);
_plugin = plugin;
- _repository = new AccountRepository(plugin, webServer);
+ _repository = new AccountRepository();
WHITELIST_BYPASS = whitelistBypass;
}
@@ -102,11 +106,6 @@ public class CoreClientManager extends MiniPlugin
oldClient = _clientList.put(uuid, newClient);
}
- if (oldClient != null)
- {
- oldClient.Delete();
- }
-
return newClient;
}
@@ -259,7 +258,9 @@ public class CoreClientManager extends MiniPlugin
if (uuid == null)
{
- uuid = UtilGameProfile.getProfileByName(playerName, false, profile -> {}).get().getId();
+ uuid = UtilGameProfile.getProfileByName(playerName, false, profile ->
+ {
+ }).get().getId();
}
String response = "";
@@ -481,8 +482,10 @@ public class CoreClientManager extends MiniPlugin
client.SetPlayer(event.getPlayer());
+ _reservedSlots.remove(event.getPlayer().getUniqueId());
+
// Reserved Slot Check
- if (Bukkit.getOnlinePlayers().size() >= Bukkit.getServer().getMaxPlayers())
+ if (Bukkit.getOnlinePlayers().size() + _reservedSlots.size() >= Bukkit.getServer().getMaxPlayers())
{
if (client.GetRank().has(event.getPlayer(), Rank.ULTRA, false))
{
@@ -495,6 +498,16 @@ public class CoreClientManager extends MiniPlugin
}
}
+ public void reserveFor(UUID player)
+ {
+ this._reservedSlots.add(player);
+ }
+
+ public void unreserve(UUID uuid)
+ {
+ _reservedSlots.remove(uuid);
+ }
+
@EventHandler
public void Kick(PlayerKickEvent event)
{
@@ -689,4 +702,4 @@ public class CoreClientManager extends MiniPlugin
return client.GetRank().has(rank);
}
-}
\ No newline at end of file
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/command/TestRank.java b/Plugins/Mineplex.Core/src/mineplex/core/account/command/TestRank.java
index 9387b2cf2..e4ab7147e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/command/TestRank.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/command/TestRank.java
@@ -7,6 +7,7 @@ import mineplex.core.common.Rank;
import mineplex.core.common.util.C;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
@@ -27,10 +28,8 @@ public class TestRank extends CommandBase
UtilPlayer.message(caller, F.main("Permissions", "This requires Permission Rank [" + Rank.SNR_MODERATOR.getTag(false, true) + C.cGray + "]."));
return;
}
-
- boolean testServer = Plugin.getPlugin().getConfig().getString("serverstatus.group").equalsIgnoreCase("Testing");
- if (!testServer)
+ if (!UtilServer.isTestServer())
{
UtilPlayer.message(caller, F.main(Plugin.getName(), F.elem("This command can only be used on test servers!")));
return;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
index 2db750b6c..ac5d9bba0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/account/repository/AccountRepository.java
@@ -4,7 +4,6 @@ import java.sql.Connection;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;
-import java.sql.Timestamp;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
@@ -13,45 +12,39 @@ import java.util.stream.Collectors;
import org.apache.commons.dbcp2.BasicDataSource;
import org.bukkit.Bukkit;
-import com.google.gson.reflect.TypeToken;
import org.bukkit.plugin.java.JavaPlugin;
+import com.google.gson.reflect.TypeToken;
+
import mineplex.cache.player.PlayerCache;
import mineplex.core.account.ILoginProcessor;
import mineplex.core.account.repository.token.LoginToken;
import mineplex.core.account.repository.token.RankUpdateToken;
import mineplex.core.common.Rank;
import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilServer;
import mineplex.core.database.MinecraftRepository;
-import mineplex.core.server.remotecall.JsonWebCall;
import mineplex.serverdata.database.DBPool;
-import mineplex.serverdata.database.DatabaseRunnable;
import mineplex.serverdata.database.ResultSetCallable;
-import mineplex.serverdata.database.column.ColumnBoolean;
-import mineplex.serverdata.database.column.ColumnTimestamp;
import mineplex.serverdata.database.column.ColumnVarChar;
public class AccountRepository extends MinecraftRepository
-{
+{
private static String CREATE_ACCOUNT_TABLE = "CREATE TABLE IF NOT EXISTS accounts (id INT NOT NULL AUTO_INCREMENT, uuid VARCHAR(100), name VARCHAR(40), gems INT, rank VARCHAR(40), rankPerm BOOL, rankExpire LONG, lastLogin LONG, totalPlayTime LONG, PRIMARY KEY (id), UNIQUE INDEX uuidIndex (uuid), UNIQUE INDEX nameIndex (name), INDEX rankIndex (rank));";
- private static String ACCOUNT_LOGIN_NEW = "INSERT INTO accounts (uuid, name, lastLogin) values(?, ?, now());";
+ private static String ACCOUNT_LOGIN_NEW = "INSERT INTO accounts (uuid, name, lastLogin) values(?, ?, now());";
private static String UPDATE_ACCOUNT_RANK = "UPDATE accounts SET rank=?, rankPerm=false, rankExpire=now() + INTERVAL 1 MONTH WHERE uuid = ?;";
private static String UPDATE_ACCOUNT_RANK_DONOR = "UPDATE accounts SET rank=?, donorRank=?, rankPerm=false, rankExpire=now() + INTERVAL 1 MONTH WHERE uuid = ?;";
private static String UPDATE_ACCOUNT_RANK_PERM = "UPDATE accounts SET rank=?, rankPerm=true WHERE uuid = ?;";
private static String UPDATE_ACCOUNT_RANK_DONOR_PERM = "UPDATE accounts SET rank=?, donorRank=?, rankPerm=true WHERE uuid = ?;";
-
+
private static String SELECT_ACCOUNT_UUID_BY_NAME = "SELECT uuid FROM accounts WHERE name = ? ORDER BY lastLogin DESC;";
private static String SELECT_ACCOUNT_ID_BY_UUID = "SELECT id FROM accounts WHERE accounts.uuid = ? LIMIT 1";
-
- private String _webAddress;
-
- public AccountRepository(JavaPlugin plugin, String webAddress)
+
+ public AccountRepository()
{
super(DBPool.getAccount());
-
- _webAddress = webAddress;
}
-
+
public int login(final List loginProcessors, final UUID uuid, final String name) throws SQLException
{
// First we try to grab the account id from cache - this saves an extra trip to database
@@ -105,7 +98,7 @@ public class AccountRepository extends MinecraftRepository
statement.execute(loginString);
System.out.println("EXECUTE COMPLETE - " + accountId);
-
+
statement.getUpdateCount();
statement.getMoreResults();
@@ -126,20 +119,21 @@ public class AccountRepository extends MinecraftRepository
}
}
}
-
-
+
+
return accountId;
}
public void getAccountId(UUID uuid, Callback callback)
{
- executeQuery(SELECT_ACCOUNT_ID_BY_UUID, resultSet -> {
+ executeQuery(SELECT_ACCOUNT_ID_BY_UUID, resultSet ->
+ {
int accountId = -1;
while (resultSet.next()) accountId = resultSet.getInt(1);
callback.run(accountId);
}, new ColumnVarChar("uuid", 100, uuid.toString()));
}
-
+
public String GetClient(String name, UUID uuid, String ipAddress)
{
LoginToken token = new LoginToken();
@@ -147,18 +141,18 @@ public class AccountRepository extends MinecraftRepository
token.Uuid = uuid.toString();
token.IpAddress = ipAddress;
- return new JsonWebCall(_webAddress + "PlayerAccount/Login").ExecuteReturnStream(token);
+ return handleSyncMSSQLCallStream("PlayerAccount/Login", token);
}
-
+
public String getClientByUUID(UUID uuid)
{
- return new JsonWebCall(_webAddress + "PlayerAccount/GetAccountByUUID").ExecuteReturnStream(uuid.toString());
+ return handleSyncMSSQLCallStream("PlayerAccount/GetAccountByUUID", uuid.toString());
}
public UUID getClientUUID(String name)
{
final List uuids = new ArrayList();
-
+
executeQuery(SELECT_ACCOUNT_UUID_BY_NAME, new ResultSetCallable()
{
@Override
@@ -170,20 +164,20 @@ public class AccountRepository extends MinecraftRepository
}
}
}, new ColumnVarChar("name", 100, name));
-
+
if (uuids.size() > 0)
return uuids.get(0);
else
return null;
}
-
+
public void saveRank(final Callback callback, final String name, final UUID uuid, final Rank rank, final boolean perm)
{
final RankUpdateToken token = new RankUpdateToken();
token.Name = name;
token.Rank = rank.toString();
token.Perm = perm;
-
+
final Consumer extraCallback = response ->
{
if (rank == Rank.ULTRA || rank == Rank.HERO || rank == Rank.LEGEND || rank == Rank.TITAN)
@@ -208,36 +202,23 @@ public class AccountRepository extends MinecraftRepository
executeUpdate(UPDATE_ACCOUNT_RANK, new ColumnVarChar("rank", 100, rank.toString()), new ColumnVarChar("uuid", 100, uuid.toString()));
}
- Bukkit.getServer().getScheduler().runTask(getPlugin(), new Runnable()
+ UtilServer.runSync(() ->
{
- @Override
- public void run()
- {
- if (callback != null)
- callback.run(response);
- }
+ if (callback != null)
+ callback.run(response);
});
};
handleMSSQLCall("PlayerAccount/RankUpdate", String.format("Error saving %s's rank: ", token.Name), token, Rank.class, extraCallback);
}
-
+
public void matchPlayerName(final Callback> callback, final String userName)
{
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- List tokenList = new JsonWebCall(_webAddress + "PlayerAccount/GetMatches").Execute(new TypeToken>(){}.getType(), userName);
- callback.run(tokenList);
- }
- });
-
- asyncThread.start();
+ handleMSSQLCall("PlayerAccount/GetMatches", userName, new TypeToken>(){}.getType(), callback::run);
}
public String getClientByName(String playerName)
{
- return new JsonWebCall(_webAddress + "PlayerAccount/GetAccount").ExecuteReturnStream(playerName);
+ return handleSyncMSSQLCallStream("PlayerAccount/GetAccount", playerName);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/banwave/BanWaveRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/banwave/BanWaveRepository.java
index baf39fe4e..6e987061f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/banwave/BanWaveRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/banwave/BanWaveRepository.java
@@ -3,11 +3,12 @@ package mineplex.core.antihack.banwave;
import mineplex.core.common.util.Callback;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnLong;
import mineplex.serverdata.database.column.ColumnVarChar;
-public class BanWaveRepository extends MinecraftRepository
+public class BanWaveRepository extends RepositoryBase
{
private static final String INITIALIZE_PENDING_TABLE = "CREATE TABLE IF NOT EXISTS banwavePending (" +
"accountId INT(11) NOT NULL, " +
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AnticheatDatabase.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AnticheatDatabase.java
index d366a548a..e89dd893c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AnticheatDatabase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AnticheatDatabase.java
@@ -6,8 +6,9 @@ import java.sql.SQLException;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
-public class AnticheatDatabase extends MinecraftRepository
+public class AnticheatDatabase extends RepositoryBase
{
/*
CREATE TABLE IF NOT EXISTS anticheat_ban_metadata (id INT NOT NULL AUTO_INCREMENT, accountId INT, banId CHAR(10) NOT NULL, data MEDIUMTEXT NOT NULL, PRIMARY KEY(id));
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AntihackLogger.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AntihackLogger.java
index b5dafd513..3c3cc03ef 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AntihackLogger.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/AntihackLogger.java
@@ -60,7 +60,6 @@ public class AntihackLogger extends MiniPlugin
registerMetadata(new PlayerInfoMetadata());
}
- @EventHandler
public void addCommands()
{
if (UtilServer.isTestServer())
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/builtin/PartyInfoMetadata.java b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/builtin/PartyInfoMetadata.java
index 9ffba8361..5b56687d8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/builtin/PartyInfoMetadata.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/antihack/logging/builtin/PartyInfoMetadata.java
@@ -28,14 +28,14 @@ public class PartyInfoMetadata extends AnticheatMetadata
@Override
public JsonElement build(UUID player)
{
- Party party = require(PartyManager.class).getPlayerParties().get(player);
+ Party party = require(PartyManager.class).getPartyByPlayer(player);
if (party != null)
{
JsonObject partyData = new JsonObject();
- partyData.addProperty(KEY_OWNER, party.getOwner());
+ partyData.addProperty(KEY_OWNER, party.getOwnerName());
JsonArray members = new JsonArray();
- party.getMembers().forEach(m -> members.add(new JsonPrimitive(m)));
+ party.getMembers().forEach(m -> members.add(new JsonPrimitive(m.getName())));
partyData.add(KEY_MEMBERS, members);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/PlayerInputActionMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/PlayerInputActionMenu.java
index 2976e2b00..8d3dc55bf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/PlayerInputActionMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/PlayerInputActionMenu.java
@@ -34,13 +34,11 @@ public abstract class PlayerInputActionMenu implements Listener
protected Inventory _currentInventory;
protected String _itemName = "";
protected boolean _searching;
- protected Party _party;
- public PlayerInputActionMenu(MiniPlugin plugin, Player player, Party party)
+ public PlayerInputActionMenu(MiniPlugin plugin, Player player)
{
_player = player;
_plugin = plugin;
- _party = party;
player.closeInventory();
_plugin.registerEvents(this);
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/player/PlayerNameMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/player/PlayerNameMenu.java
index ab4999c54..dd6762645 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/player/PlayerNameMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/anvilMenu/player/PlayerNameMenu.java
@@ -11,8 +11,6 @@ import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
-import static net.minecraft.server.v1_8_R3.PotionBrewer.n;
-
/**
* A wrapped menu that handles looking for players specifically.
*/
@@ -21,9 +19,9 @@ public abstract class PlayerNameMenu extends PlayerInputActionMenu
protected CoreClientManager _clientManager;
- public PlayerNameMenu(MiniPlugin plugin, CoreClientManager clientManager, Player player, Party party)
+ public PlayerNameMenu(MiniPlugin plugin, CoreClientManager clientManager, Player player)
{
- super(plugin, player, party);
+ super(plugin, player);
_clientManager = clientManager;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java
index 163648792..bcb93096c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/benefit/BenefitManagerRepository.java
@@ -5,12 +5,13 @@ import java.sql.SQLException;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
import org.bukkit.plugin.java.JavaPlugin;
-public class BenefitManagerRepository extends MinecraftRepository
+public class BenefitManagerRepository extends RepositoryBase
{
private static String CREATE_BENEFIT_TABLE = "CREATE TABLE IF NOT EXISTS rankBenefits (id INT NOT NULL AUTO_INCREMENT, accountId INT, benefit VARCHAR(100), PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id));";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
index 125fcead9..241544a1d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusRepository.java
@@ -12,6 +12,7 @@ import mineplex.core.common.Pair;
import mineplex.core.common.util.Callback;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.core.donation.DonationManager;
import mineplex.core.recharge.Recharge;
@@ -28,7 +29,7 @@ import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
-public class BonusRepository extends MinecraftRepository
+public class BonusRepository extends RepositoryBase
{
private static String CREATE_BONUS_TABLE = "CREATE TABLE IF NOT EXISTS bonus (accountId INT NOT NULL AUTO_INCREMENT, dailytime TIMESTAMP NULL DEFAULT NULL, ranktime DATE NULL DEFAULT NULL, PRIMARY KEY (accountId), FOREIGN KEY (accountId) REFERENCES accounts(id));";
private BonusManager _manager;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java
index a8674e464..c2f02d7d3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/boosters/tips/BoosterThankRepository.java
@@ -3,13 +3,14 @@ package mineplex.core.boosters.tips;
import mineplex.core.database.MinecraftRepository;
import mineplex.database.routines.CheckAmplifierThank;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import org.bukkit.plugin.java.JavaPlugin;
/**
* @author Shaun Bennett
*/
-public class BoosterThankRepository extends MinecraftRepository
+public class BoosterThankRepository extends RepositoryBase
{
public BoosterThankRepository(JavaPlugin plugin)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/botspam/repository/BotSpamRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/botspam/repository/BotSpamRepository.java
index 2d9c227c8..cdaede58c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/botspam/repository/BotSpamRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/botspam/repository/BotSpamRepository.java
@@ -9,11 +9,12 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.serverdata.database.DBPool;
import mineplex.core.botspam.SpamText;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
-public class BotSpamRepository extends MinecraftRepository
+public class BotSpamRepository extends RepositoryBase
{
private static final String GET_SPAM_TEXT = "SELECT * FROM botSpam";
private static final String ADD_SPAM_TEXT = "INSERT INTO botSpam (text, createdBy, enabledBy) VALUES (?, ?, ?)";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/command/ICommand.java b/Plugins/Mineplex.Core/src/mineplex/core/command/ICommand.java
index 463a7631f..becbdfee5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/command/ICommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/command/ICommand.java
@@ -5,10 +5,11 @@ import java.util.List;
import mineplex.core.common.Rank;
+import mineplex.core.lifetimes.Component;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
-public interface ICommand
+public interface ICommand extends Component
{
void SetCommandCenter(CommandCenter commandCenter);
void Execute(Player caller, String[] args);
@@ -21,4 +22,16 @@ public interface ICommand
Rank[] GetSpecificRanks();
List onTabComplete(CommandSender sender, String commandLabel, String[] args);
+
+ @Override
+ default void activate()
+ {
+ CommandCenter.Instance.addCommand(this);
+ }
+
+ @Override
+ default void deactivate()
+ {
+ CommandCenter.Instance.removeCommand(this);
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java
index 0e4844cf3..abba4f955 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/communities/storage/CommunityRepository.java
@@ -23,11 +23,12 @@ import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.data.DataRepository;
import mineplex.serverdata.data.PlayerStatus;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnBoolean;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
-public class CommunityRepository extends MinecraftRepository
+public class CommunityRepository extends RepositoryBase
{
private static final String GET_ALL_COMMUNITIES = "SELECT * FROM communities WHERE region=?;";
private static final String GET_COMMUNITY_BY_ID = "SELECT * FROM communities WHERE id=?;";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenBalloons.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenBalloons.java
index ed816cf42..e34616825 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenBalloons.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/button/open/OpenBalloons.java
@@ -1,9 +1,11 @@
package mineplex.core.cosmetic.ui.button.open;
-import mineplex.core.cosmetic.ui.page.BalloonsPage;
+import org.bukkit.entity.Player;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
import mineplex.core.cosmetic.ui.page.Menu;
import mineplex.core.gadget.types.Gadget;
-import org.bukkit.entity.Player;
public class OpenBalloons extends OpenPageButton
{
@@ -16,7 +18,8 @@ public class OpenBalloons extends OpenPageButton
@Override
protected void leftClick(Player player)
{
- getMenu().getShop().openPageForPlayer(player, new BalloonsPage(getMenu().getPlugin(), getMenu().getShop(), getMenu().getClientManager(), getMenu().getDonationManager(), "Win Effects", player));
+ UtilPlayer.message(player, F.main("Balloons", "Coming Soon!"));
+ //getMenu().getShop().openPageForPlayer(player, new BalloonsPage(getMenu().getPlugin(), getMenu().getShop(), getMenu().getClientManager(), getMenu().getDonationManager(), "Balloons", player));
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
index 4d7b0276c..fd0b3cf08 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/BalloonsPage.java
@@ -31,7 +31,7 @@ public class BalloonsPage extends GadgetPage
{
addGadget(gadget, slot);
- if (getPlugin().getGadgetManager().getActive(getPlayer(), GadgetType.BALLOON) == gadget)
+ if (gadget.isActive(getPlayer()))
addGlow(slot);
slot++;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
index ef27ea645..2c77e6441 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/cosmetic/ui/page/Menu.java
@@ -14,9 +14,11 @@ import mineplex.core.common.currency.GlobalCurrency;
import mineplex.core.common.util.C;
import mineplex.core.common.util.LineFormat;
import mineplex.core.common.util.UtilText;
+import mineplex.core.common.util.UtilUI;
import mineplex.core.cosmetic.CosmeticManager;
import mineplex.core.cosmetic.ui.CosmeticShop;
import mineplex.core.cosmetic.ui.button.open.OpenArrowTrails;
+import mineplex.core.cosmetic.ui.button.open.OpenBalloons;
import mineplex.core.cosmetic.ui.button.open.OpenCostumes;
import mineplex.core.cosmetic.ui.button.open.OpenDeathAnimations;
import mineplex.core.cosmetic.ui.button.open.OpenDoubleJump;
@@ -40,6 +42,11 @@ import mineplex.core.shop.page.ShopPageBase;
public class Menu extends ShopPageBase
{
+
+ private static final String VISIBILITY_HUB = "Usable in Lobbies";
+ private static final String VISIBILITY_EVERYWHERE = "Visible Everywhere";
+ private static final String VISIBILITY_GAMES = "Visible in Games";
+
public Menu(CosmeticManager plugin, CosmeticShop shop, CoreClientManager clientManager, DonationManager donationManager, Player player)
{
super(plugin, shop, clientManager, donationManager, "Inventory", player);
@@ -62,11 +69,11 @@ public class Menu extends ShopPageBase
addItem(4, shards);
// Cosmetic Items
-// int[] slots = UtilUI.getIndicesFor(12, 2);
- int particleSlot = 10;//slots[0];
- int arrowSlot = 12;//slots[1];
- int jumpSlot = 14;//slots[2];
- int deathSlot = 16;//slots[3];
+ int[] slots = UtilUI.getIndicesFor(15, 1, 5, 1);
+ /*int particleSlot = 9;//slots[0];
+ int arrowSlot = 11;//slots[1];
+ int jumpSlot = 13;//slots[2];
+ int deathSlot = 15;//slots[3];
int gadgetSlot = 27;//slots[4];
int morphSlot = 29;//slots[5];
int mountSlot = 31;//slots[6];
@@ -76,7 +83,12 @@ public class Menu extends ShopPageBase
int musicSlot = 47;//slots[10];
int tauntSlot = 49;//slots[11];
int winEffectSlot = 51;
- int gameModifierSlot = 53;
+ int gameModifierSlot = 53;*/
+ int particleSlot = slots[0], arrowSlot = slots[1], jumpSlot = slots[2],
+ deathSlot = slots[3], gadgetSlot = slots[4], morphSlot = slots[5],
+ mountSlot = slots[6], petSlot = slots[7], hatSlot = slots[8],
+ costumeSlot = slots[9], musicSlot = slots[10], tauntSlot = slots[11],
+ winEffectSlot = slots[12], gameModifierSlot = slots[13], balloonsSlot = slots[14];
EnumMap ownedCount = new EnumMap(GadgetType.class);
EnumMap maxCount = new EnumMap(GadgetType.class);
@@ -133,74 +145,79 @@ public class Menu extends ShopPageBase
Creature petActive = getPlugin().getPetManager().getPet(getPlayer());
GadgetType type = GadgetType.PARTICLE;
- String[] lore = getLore(ownedCount.get(type), maxCount.get(type), "Show everyone how cool you are with swirly particles that follow you when you walk!", "Visible Everywhere", enabled.get(type));
+ String[] lore = getLore(ownedCount.get(type), maxCount.get(type), "Show everyone how cool you are with swirly particles that follow you when you walk!", VISIBILITY_EVERYWHERE, enabled.get(type));
addButton(particleSlot, new ShopItem(Material.NETHER_STAR, "Particle Effects", lore, 1, false), new OpenParticles(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(particleSlot);
type = GadgetType.ARROW_TRAIL;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Your arrows will now leave particle trails as they soar through the air.", "Visible in Games", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Your arrows will now leave particle trails as they soar through the air.", VISIBILITY_GAMES, enabled.get(type));
addButton(arrowSlot, new ShopItem(Material.ARROW, "Arrow Effects", lore, 1, false), new OpenArrowTrails(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(arrowSlot);
type = GadgetType.DOUBLE_JUMP;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Demonstrate your parkour prowess with sweet particles when you double jump.", "Visible Everywhere", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Demonstrate your parkour prowess with sweet particles when you double jump.", VISIBILITY_EVERYWHERE, enabled.get(type));
addButton(jumpSlot, new ShopItem(Material.GOLD_BOOTS, "Double Jump Effects", lore, 1, false), new OpenDoubleJump(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(jumpSlot);
type = GadgetType.DEATH;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Your death will now be mourned with a wonderful particle tribute.", "Visible in Games", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Your death will now be mourned with a wonderful particle tribute.", VISIBILITY_GAMES, enabled.get(type));
addButton(deathSlot, new ShopItem(Material.SKULL_ITEM, "Death Animations", lore, 1, false), new OpenDeathAnimations(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(deathSlot);
type = GadgetType.ITEM;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "All sorts of zany contraptions to use on your friends and foes.", "Usable in Lobbies", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "All sorts of zany contraptions to use on your friends and foes.", VISIBILITY_HUB, enabled.get(type));
addButton(gadgetSlot, new ShopItem(Material.MELON_BLOCK, "Gadgets", lore, 1, false), new OpenGadgets(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(gadgetSlot);
type = GadgetType.MORPH;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Have you ever wanted to be a tiger? Well, you can't be a tiger! That's silly! But you can be many other things!", "Usable in Lobbies", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Have you ever wanted to be a tiger? Well, you can't be a tiger! That's silly! But you can be many other things!", VISIBILITY_HUB, enabled.get(type));
addButton(morphSlot, new ShopItem(Material.LEATHER, "Morphs", lore, 1, false), new OpenMorphs(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(morphSlot);
- lore = getLore(mountOwned, mountMax, "Why walk when you can ride? Summon fancy mounts to help you move in style.", "Usable in Lobbies", mountActive == null ? null : mountActive.getName());
+ lore = getLore(mountOwned, mountMax, "Why walk when you can ride? Summon fancy mounts to help you move in style.", VISIBILITY_HUB, mountActive == null ? null : mountActive.getName());
addButton(mountSlot, new ShopItem(Material.IRON_BARDING, "Mounts", lore, 1, false), new OpenMounts(this, mountActive));
if (mountActive != null) addGlow(mountSlot);
- lore = getLore(petOwned, petMax, "Life on a server can get lonely sometimes. Summon an adorable pet to follow you around and cheer you up!", "Usable in Lobbies", petActive == null ? null : petActive.getCustomName());
+ lore = getLore(petOwned, petMax, "Life on a server can get lonely sometimes. Summon an adorable pet to follow you around and cheer you up!", VISIBILITY_HUB, petActive == null ? null : petActive.getCustomName());
addButton(petSlot, new ShopItem(Material.BONE, "Pets", lore, 1, false), new OpenPets(this));
if (petActive != null) addGlow(petSlot);
type = GadgetType.HAT;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Hats are in this year. Wear them on your head to impress the ladies.", "Usable in Lobbies", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Hats are in this year. Wear them on your head to impress the ladies.", VISIBILITY_HUB, enabled.get(type));
addButton(hatSlot, new ShopItem(Material.GOLD_HELMET, "Hats", lore, 1, false), new OpenHats(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(hatSlot);
type = GadgetType.COSTUME;
- // Fixes more than 8 costumes being counted, even without the WindUp
- lore = getLore((ownedCount.get(type) > 8) ? 8 : ownedCount.get(type), /*maxCount.get(type)*/ 8, "Sometimes going out calls for special clothes! Gain bonus effects for matching outfit.", "Usable in Lobbies", enabled.get(type));
+ // -4 Fixes more than the real costumes being counted (Happens because of the hub games costumes
+ lore = getLore(ownedCount.get(type) - 4, maxCount.get(type) - 4, "Sometimes going out calls for special clothes! Gain bonus effects for matching outfit.", VISIBILITY_HUB, enabled.get(type));
addButton(costumeSlot, new ShopItem(Material.DIAMOND_CHESTPLATE, "Costumes", lore, 1, false), new OpenCostumes(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(costumeSlot);
type = GadgetType.MUSIC_DISC;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "I JUST WANT TO DANCE WITH YOU!", "Usable in Lobbies", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "I JUST WANT TO DANCE WITH YOU!", VISIBILITY_HUB, enabled.get(type));
addButton(musicSlot, new ShopItem(Material.GREEN_RECORD, "Music", lore, 1, false), new OpenMusic(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(musicSlot);
type = GadgetType.TAUNT;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Taunt your enemies or just show off. Use /taunt to have a good time!", "Visible in Games", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Taunt your enemies or just show off. Use /taunt to have a good time!", VISIBILITY_GAMES, enabled.get(type));
addButton(tauntSlot, new ShopItem(Material.NAME_TAG, "Taunts", lore, 1, false), new OpenTaunts(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(tauntSlot);
type = GadgetType.WIN_EFFECT;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Winning a game with your friends all good and dandy, but then being able to also show off awesome effects is even more fun!", "Usable in Lobbies", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Winning a game with your friends all good and dandy, but then being able to also show off awesome effects is even more fun!", VISIBILITY_GAMES, enabled.get(type));
addButton(winEffectSlot, new ShopItem(Material.CAKE, "Win Effects", lore, 1, false), new OpenWinEffect(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(winEffectSlot);
type = GadgetType.GAME_MODIFIER;
- lore = getLore(ownedCount.get(type), maxCount.get(type), "Cosmetic effects which changes appearances of objects in game", "Visible in Games", enabled.get(type));
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Cosmetic effects which changes appearances of objects in game", VISIBILITY_GAMES, enabled.get(type));
addButton(gameModifierSlot, new ShopItem(Material.TORCH, "Game Modifiers", lore, 1, false), new OpenGameModifiers(this, enabled.get(type)));
if (enabled.containsKey(type)) addGlow(gameModifierSlot);
+
+ type = GadgetType.BALLOON;
+ lore = getLore(ownedCount.get(type), maxCount.get(type), "Coming Soon...", VISIBILITY_HUB, enabled.get(type));
+ addButton(balloonsSlot, new ShopItem(Material.LEASH, "Balloons", lore, 1, false), new OpenBalloons(this, enabled.get(type)));
+ if (enabled.containsKey(type)) addGlow(balloonsSlot);
}
private String[] getLore(int ownedCount, int maxCount, String info, String visibility, Gadget enabled)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/customdata/repository/CustomDataRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/customdata/repository/CustomDataRepository.java
index a26974964..2a0a1d4be 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/customdata/repository/CustomDataRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/customdata/repository/CustomDataRepository.java
@@ -14,6 +14,7 @@ import mineplex.core.customdata.CustomData;
import mineplex.core.customdata.CustomDataManager;
import mineplex.core.customdata.PlayerCustomData;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
@@ -22,7 +23,7 @@ import mineplex.serverdata.database.column.ColumnVarChar;
* Created by William (WilliamTiger).
* 16/12/15
*/
-public class CustomDataRepository extends MinecraftRepository
+public class CustomDataRepository extends RepositoryBase
{
private static final String SELECT_KEYS = "SELECT id, name FROM customData;";
private static final String INSERT_KEY = "INSERT INTO customData (name) VALUES (?);";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java b/Plugins/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java
new file mode 100644
index 000000000..45f4b7b03
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/database/BasicMSSQLProvider.java
@@ -0,0 +1,131 @@
+package mineplex.core.database;
+
+import java.lang.reflect.Type;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.function.Consumer;
+
+import org.bukkit.scheduler.BukkitTask;
+
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.server.remotecall.JsonWebCall;
+import mineplex.core.thread.ThreadPool;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.utils.UtilScheduler;
+import mineplex.serverdata.database.DatabaseRunnable;
+
+@Deprecated
+public class BasicMSSQLProvider implements MSSQLProvider
+{
+ private final String _webAddress = UtilServer.getWebServerURL();
+
+ // Queue for failed processes
+ private final Object QUEUE_LOCK = new Object();
+ private Set _failedQueue = new HashSet<>();
+
+ private final BukkitTask _task;
+ private volatile boolean _shutdown = false;
+
+ public BasicMSSQLProvider()
+ {
+ _task = UtilScheduler.runEvery(UpdateType.MIN_01, this::processDatabaseQueue);
+ }
+
+ public T handleSyncMSSQLCall(String uri, Object param, Type responseType)
+ {
+ return new JsonWebCall(_webAddress + uri).Execute(responseType, param);
+ }
+
+ public String handleSyncMSSQLCallStream(String uri, Object param)
+ {
+ return new JsonWebCall(_webAddress + uri).ExecuteReturnStream(param);
+ }
+
+ public void handleMSSQLCall(String uri, String error, Object param, Class responseType, Consumer consumer)
+ {
+ handleDatabaseCall(new DatabaseRunnable(() ->
+ {
+ new JsonWebCall(_webAddress + uri).Execute(responseType, consumer::accept, param);
+ }, error));
+ }
+
+ public void handleMSSQLCall(String uri, Object param, Class responseType, Consumer consumer)
+ {
+ handleDatabaseCall(new DatabaseRunnable(() ->
+ {
+ new JsonWebCall(_webAddress + uri).Execute(responseType, consumer::accept, param);
+ }, "Handling MSSQL Call " + uri));
+ }
+
+ public void handleMSSQLCall(String uri, Object param, Type responseType, Consumer consumer)
+ {
+ handleDatabaseCall(new DatabaseRunnable(() ->
+ {
+ T t = new JsonWebCall(_webAddress + uri).Execute(responseType, param);
+ consumer.accept(t);
+ }, "Handling MSSQL Call " + uri));
+ }
+
+ public void handleMSSQLCall(String uri, Object param)
+ {
+ handleDatabaseCall(new DatabaseRunnable(() ->
+ {
+ new JsonWebCall(_webAddress + uri).Execute(param);
+ }, "Handling MSSQL Call " + uri));
+ }
+
+ @Override
+ public void deregister()
+ {
+ _shutdown = true;
+ }
+
+ private void handleDatabaseCall(DatabaseRunnable databaseRunnable)
+ {
+ ThreadPool.ASYNC.submit(() ->
+ {
+ try
+ {
+ databaseRunnable.run();
+ }
+ catch (Exception exception)
+ {
+ processFailedDatabaseCall(databaseRunnable, exception);
+ }
+ });
+ }
+
+ private void processFailedDatabaseCall(DatabaseRunnable databaseRunnable, Exception exception)
+ {
+ System.err.println(databaseRunnable.getErrorMessage());
+ exception.printStackTrace();
+
+ if (databaseRunnable.getFailedCounts() < 4)
+ {
+ databaseRunnable.incrementFailCount();
+
+ synchronized (QUEUE_LOCK)
+ {
+ _failedQueue.add(databaseRunnable);
+ }
+ }
+ }
+
+ private void processDatabaseQueue()
+ {
+ Set clone;
+
+ synchronized (QUEUE_LOCK)
+ {
+ clone = new HashSet<>(_failedQueue);
+ _failedQueue.clear();
+ }
+
+ clone.forEach(this::handleDatabaseCall);
+
+ if (_shutdown && _failedQueue.isEmpty())
+ {
+ _task.cancel();
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/database/MSSQLProvider.java b/Plugins/Mineplex.Core/src/mineplex/core/database/MSSQLProvider.java
new file mode 100644
index 000000000..e3f5c35a9
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/database/MSSQLProvider.java
@@ -0,0 +1,22 @@
+package mineplex.core.database;
+
+import java.lang.reflect.Type;
+import java.util.function.Consumer;
+
+@Deprecated
+public interface MSSQLProvider
+{
+ T handleSyncMSSQLCall(String uri, Object param, Type responseType);
+
+ String handleSyncMSSQLCallStream(String uri, Object param);
+
+ void handleMSSQLCall(String uri, String error, Object param, Class responseType, Consumer consumer);
+
+ void handleMSSQLCall(String uri, Object param, Class responseType, Consumer consumer);
+
+ void handleMSSQLCall(String uri, Object param, Type responseType, Consumer consumer);
+
+ void handleMSSQLCall(String uri, Object param);
+
+ void deregister();
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/database/MinecraftRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/database/MinecraftRepository.java
index 22523a1a8..60a8d39c3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/database/MinecraftRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/database/MinecraftRepository.java
@@ -1,136 +1,69 @@
package mineplex.core.database;
-import java.util.HashSet;
-import java.util.Set;
+import javax.sql.DataSource;
+import java.lang.reflect.Type;
+import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
-import javax.rmi.CORBA.Util;
-import javax.sql.DataSource;
-
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.server.remotecall.AsyncJsonWebCall;
-import mineplex.core.server.remotecall.JsonWebCall;
-import mineplex.core.thread.ThreadPool;
-import mineplex.core.utils.UtilScheduler;
-import mineplex.serverdata.database.DBPool;
-import mineplex.serverdata.database.DatabaseRunnable;
-import mineplex.serverdata.database.RepositoryBase;
-import mineplex.core.updater.UpdateType;
-
+import org.bukkit.event.Listener;
import org.jooq.DSLContext;
import org.jooq.SQLDialect;
import org.jooq.impl.DSL;
-import org.bukkit.event.Listener;
-import org.bukkit.plugin.java.JavaPlugin;
+import mineplex.core.common.util.UtilServer;
+import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
+/**
+ * Do not extend this class unless you are doing MSSQL calls (which you shouldn't be)
+ *
+ * @deprecated don't use mssql thx
+ */
+@Deprecated
public abstract class MinecraftRepository extends RepositoryBase implements Listener
{
- // Queue for failed processes
- private final Object QUEUE_LOCK = new Object();
- private Set _failedQueue = new HashSet<>();
+ private static AtomicReference PROVIDER = new AtomicReference<>(new BasicMSSQLProvider());
- protected JavaPlugin _plugin; // Plugin responsible for this repository
+ public static void setMSSQLProvider(MSSQLProvider provider)
+ {
+ MSSQLProvider oldProvider = PROVIDER.getAndSet(provider);
+ oldProvider.deregister();
+ }
- private final String _webAddress = UtilServer.getWebServerURL();
-
- /**
- * Constructor
- *
- * @param dataSource - the {@link DataSource} responsible for providing the connection pool to this repository.
- */
public MinecraftRepository(DataSource dataSource)
{
super(dataSource);
- _plugin = UtilServer.getPlugin();
-
UtilServer.RegisterEvents(this);
-
- UtilScheduler.runEvery(UpdateType.MIN_01, this::processDatabaseQueue);
}
- protected DSLContext jooq()
+ protected T handleSyncMSSQLCall(String uri, Object param, Type responseType)
{
- return DSL.using(DBPool.getAccount(), SQLDialect.MYSQL);
+ return PROVIDER.get().handleSyncMSSQLCall(uri, param, responseType);
+ }
+
+ protected String handleSyncMSSQLCallStream(String uri, Object param)
+ {
+ return PROVIDER.get().handleSyncMSSQLCallStream(uri, param);
}
- /**
- * One day, the stars will align, and we can get rid of this
- */
- @Deprecated
protected void handleMSSQLCall(String uri, String error, Object param, Class responseType, Consumer consumer)
{
- handleDatabaseCall(new DatabaseRunnable(() ->
- {
- new JsonWebCall(_webAddress + uri).Execute(responseType, consumer::accept, param);
- }, error));
+ PROVIDER.get().handleMSSQLCall(uri, error, param, responseType, consumer);
}
- /**
- * One day, the stars will align, and we can get rid of this
- */
- @Deprecated
- protected void handleAsyncMSSQLCall(String uri, Object param, Class responseType, Consumer consumer)
+ protected void handleMSSQLCall(String uri, Object param, Class responseType, Consumer consumer)
{
- new AsyncJsonWebCall(_webAddress + uri).Execute(responseType, consumer::accept, param);
+ PROVIDER.get().handleMSSQLCall(uri, param, responseType, consumer);
+ }
+
+ protected void handleMSSQLCall(String uri, Object param, Type responseType, Consumer consumer)
+ {
+ PROVIDER.get().handleMSSQLCall(uri, param, responseType, consumer);
}
- /**
- * One day, the stars will align, and we can get rid of this
- */
- @Deprecated
protected void handleAsyncMSSQLCall(String uri, Object param)
{
- new AsyncJsonWebCall(_webAddress + uri).Execute(param);
- }
-
- private void handleDatabaseCall(DatabaseRunnable databaseRunnable)
- {
- ThreadPool.ASYNC.submit(() ->
- {
- try
- {
- databaseRunnable.run();
- }
- catch (Exception exception)
- {
- processFailedDatabaseCall(databaseRunnable, exception);
- }
- });
- }
-
- private void processFailedDatabaseCall(DatabaseRunnable databaseRunnable, Exception exception)
- {
- System.err.println(databaseRunnable.getErrorMessage());
- exception.printStackTrace();
-
- if (databaseRunnable.getFailedCounts() < 4)
- {
- databaseRunnable.incrementFailCount();
-
- synchronized (QUEUE_LOCK)
- {
- _failedQueue.add(databaseRunnable);
- }
- }
- }
-
- private void processDatabaseQueue()
- {
- Set clone;
-
- synchronized (QUEUE_LOCK)
- {
- clone = new HashSet<>(_failedQueue);
- _failedQueue.clear();
- }
-
- clone.forEach(this::handleDatabaseCall);
- }
-
- public JavaPlugin getPlugin()
- {
- return _plugin;
+ PROVIDER.get().handleMSSQLCall(uri, param);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
index 6363d018b..834d6cb10 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/donation/repository/DonationRepository.java
@@ -11,13 +11,8 @@ import mineplex.core.database.MinecraftRepository;
import mineplex.core.donation.repository.token.GemRewardToken;
import mineplex.core.donation.repository.token.PurchaseToken;
import mineplex.core.donation.repository.token.UnknownPurchaseToken;
-import mineplex.core.server.remotecall.AsyncJsonWebCall;
-import mineplex.core.server.remotecall.JsonWebCall;
import mineplex.core.server.util.TransactionResponse;
import mineplex.serverdata.database.DBPool;
-import mineplex.serverdata.database.DatabaseRunnable;
-
-import org.bukkit.plugin.java.JavaPlugin;
public class DonationRepository extends MinecraftRepository
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java
index 7f622784e..5d8617a4a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/elo/EloRepository.java
@@ -9,10 +9,12 @@ import java.util.LinkedList;
import java.util.List;
import mineplex.core.common.util.Callback;
+import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTime;
import mineplex.core.common.util.UtilTime.TimeUnit;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnLong;
@@ -22,7 +24,7 @@ import org.bukkit.scheduler.BukkitRunnable;
import com.google.common.collect.Lists;
-public class EloRepository extends MinecraftRepository
+public class EloRepository extends RepositoryBase
{
private static String INSERT_ELO = "INSERT INTO eloRating (accountId, gameType, elo) VALUES (?, ?, ?);";
@@ -43,7 +45,7 @@ public class EloRepository extends MinecraftRepository
public boolean saveElo(int accountId, int gameType, int oldElo, int elo) throws SQLException
{
List ret = Lists.newArrayList();
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> {
+ UtilServer.runAsync(() -> {
boolean updateSucceeded = false;
// If we're increasing in elo we verify the server version matches the database version (prevent d/c and double wins with concurrent matches)
@@ -60,7 +62,7 @@ public class EloRepository extends MinecraftRepository
updateSucceeded = true;
}
}
-
+
ret.add(updateSucceeded);
});
@@ -86,14 +88,14 @@ public class EloRepository extends MinecraftRepository
public void getStrikeExpiry(int accountId, Callback call)
{
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> executeQuery(GRAB_STRIKE_EXPIRY, resultSet -> {
+ UtilServer.runAsync(() -> executeQuery(GRAB_STRIKE_EXPIRY, resultSet -> {
boolean called = false;
while (resultSet.next())
{
called = true;
call.run(resultSet.getLong(1));
}
-
+
if (!called)
{
call.run(0L);
@@ -103,21 +105,21 @@ public class EloRepository extends MinecraftRepository
public void getBanExpiryAsync(int accountId, Callback call)
{
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> executeQuery(GRAB_BAN_EXPIRY, resultSet -> {
+ UtilServer.runAsync(() -> executeQuery(GRAB_BAN_EXPIRY, resultSet -> {
boolean called = false;
while (resultSet.next())
{
called = true;
call.run(resultSet.getLong(1));
}
-
+
if (!called)
{
call.run(0L);
}
}, new ColumnInt("accountId", accountId)));
}
-
+
public long getBanExpiry(int accountId)
{
List expiry = new ArrayList();
@@ -127,23 +129,23 @@ public class EloRepository extends MinecraftRepository
expiry.add(resultSet.getLong(1));
}
}, new ColumnInt("accountId", accountId));
-
+
if (expiry.isEmpty())
expiry.add(System.currentTimeMillis() - 5000);
-
+
return expiry.get(0);
}
public void getStrikes(int accountId, Callback call)
{
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> executeQuery(GRAB_STRIKES, resultSet -> {
+ UtilServer.runAsync(() -> executeQuery(GRAB_STRIKES, resultSet -> {
boolean called = false;
while (resultSet.next())
{
called = true;
call.run(resultSet.getInt(1));
}
-
+
if (!called)
{
call.run(0);
@@ -188,14 +190,14 @@ public class EloRepository extends MinecraftRepository
long banEnd = System.currentTimeMillis() + UtilTime.convert(minutes, TimeUnit.MINUTES, TimeUnit.MILLISECONDS);
long strikesExpire = System.currentTimeMillis() + UtilTime.convert(1, TimeUnit.DAYS, TimeUnit.MILLISECONDS);
int newStrikes = Math.min(strikes + 1, 8);
-
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> executeUpdate(UPDATE_BAN, new ColumnInt("accountId", accountId), new ColumnInt("strikes", newStrikes), new ColumnLong("strikesExpire", strikesExpire), new ColumnLong("banEnd", banEnd)));
+
+ UtilServer.runAsync(() -> executeUpdate(UPDATE_BAN, new ColumnInt("accountId", accountId), new ColumnInt("strikes", newStrikes), new ColumnLong("strikesExpire", strikesExpire), new ColumnLong("banEnd", banEnd)));
});
}
public void resetStrikes(int accountId)
{
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> executeUpdate(DELETE_STRIKES, new ColumnInt("accountId", accountId)));
+ UtilServer.runAsync(() -> executeUpdate(DELETE_STRIKES, new ColumnInt("accountId", accountId)));
}
public void getTopElo(int limit, Callback> callback)
@@ -255,6 +257,6 @@ public class EloRepository extends MinecraftRepository
}
}
}
- }.runTaskAsynchronously(_plugin);
+ }.runTaskAsynchronously(UtilServer.getPlugin());
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/facebook/FacebookRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/facebook/FacebookRepository.java
index 1a9f32c25..19674d595 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/facebook/FacebookRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/facebook/FacebookRepository.java
@@ -8,11 +8,12 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.common.util.Callback;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
-public class FacebookRepository extends MinecraftRepository
+public class FacebookRepository extends RepositoryBase
{
private static final String GET_CODE = "SELECT code, activated FROM facebook WHERE code = ?";
private static final String ACTIVATE_CODE = "UPDATE facebook SET activated = 1, accountId = ?, activationTime = NOW() WHERE code = ?";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java
index 12432b50e..c2bc5b608 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/data/FriendRepository.java
@@ -15,6 +15,7 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.common.util.NautHashMap;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnVarChar;
import mineplex.core.friend.FriendStatusType;
@@ -24,7 +25,7 @@ import mineplex.serverdata.data.PlayerStatus;
import mineplex.serverdata.redis.RedisDataRepository;
import mineplex.serverdata.servers.ServerManager;
-public class FriendRepository extends MinecraftRepository
+public class FriendRepository extends RepositoryBase
{
private static String CREATE_FRIEND_TABLE = "CREATE TABLE IF NOT EXISTS accountFriend (id INT NOT NULL AUTO_INCREMENT, uuidSource VARCHAR(100), uuidTarget VARCHAR(100), status VARCHAR(100), PRIMARY KEY (id), UNIQUE INDEX uuidIndex (uuidSource, uuidTarget));";
private static String RETRIEVE_MULTIPLE_FRIEND_RECORDS = "SELECT uuidSource, tA.Name, status, tA.lastLogin, now(), uuidTarget FROM accountFriend INNER Join accounts AS fA ON fA.uuid = uuidSource INNER JOIN accounts AS tA ON tA.uuid = uuidTarget WHERE uuidSource IN ";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
index 0fa3e4051..c94c5ff98 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/friend/ui/FriendsGUI.java
@@ -34,6 +34,7 @@ import mineplex.core.friend.data.FriendData;
import mineplex.core.friend.data.FriendStatus;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.itemstack.ItemLayout;
+import mineplex.core.portal.Intent;
import mineplex.core.shop.item.IButton;
public class FriendsGUI implements Listener
@@ -302,7 +303,7 @@ public class FriendsGUI implements Listener
@Override
public void onClick(Player player, ClickType clickType)
{
- _plugin.getPortal().sendPlayerToServer(player, serverName);
+ _plugin.getPortal().sendPlayerToServer(player, serverName, Intent.PLAYER_REQUEST);
}
});
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
index bb0c257d6..ced422b4f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/GadgetManager.java
@@ -57,6 +57,7 @@ import mineplex.core.gadget.gadgets.arrowtrail.shadow.ArrowTrailShadow;
import mineplex.core.gadget.gadgets.arrowtrail.titan.ArrowTrailTitan;
import mineplex.core.gadget.gadgets.arrowtrail.vampire.ArrowTrailBlood;
import mineplex.core.gadget.gadgets.arrowtrail.wisdom.ArrowTrailEnchant;
+import mineplex.core.gadget.gadgets.balloons.BalloonType;
import mineplex.core.gadget.gadgets.death.candycane.DeathCandyCane;
import mineplex.core.gadget.gadgets.death.christmas.DeathPresentDanger;
import mineplex.core.gadget.gadgets.death.cupidslove.DeathCupidsBrokenHeart;
@@ -198,6 +199,7 @@ import mineplex.core.gadget.set.suits.SetFreezeSuit;
import mineplex.core.gadget.set.suits.SetRaveSuit;
import mineplex.core.gadget.set.suits.SetSpaceSuit;
import mineplex.core.gadget.types.ArrowEffectGadget;
+import mineplex.core.gadget.types.BalloonGadget;
import mineplex.core.gadget.types.DeathEffectGadget;
import mineplex.core.gadget.types.DoubleJumpEffectGadget;
import mineplex.core.gadget.types.Gadget;
@@ -502,7 +504,7 @@ public class GadgetManager extends MiniPlugin
// Game Modifiers
// MineStrike
- addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.P250_Muertos, -2));
+ /*addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.P250_Muertos, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.CZ75_Auto_Tigris, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.Desert_Eagle_Blaze, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.Nova_Koi, -2));
@@ -513,6 +515,7 @@ public class GadgetManager extends MiniPlugin
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.AWP_Asiimov, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.Knife_M9_Bayonette_Fade, -2));
+ addGadget(new GameModifierMineStrikeSkin(this, ));
//Blue only
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.P2000_Fire_Elemental, -2));
@@ -523,7 +526,11 @@ public class GadgetManager extends MiniPlugin
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.Glock_18_Fade, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.Galil_AR_Eco, -2));
addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.AK_47_Vulcan, -2));
- addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.SG553_Pulse, -2));
+ addGadget(new GameModifierMineStrikeSkin(this, MineStrikeSkin.SG553_Pulse, -2));*/
+ for (MineStrikeSkin mineStrikeSkin : MineStrikeSkin.values())
+ {
+ addGadget(new GameModifierMineStrikeSkin(this, mineStrikeSkin, -2));
+ }
// Survival Games
@@ -532,8 +539,12 @@ public class GadgetManager extends MiniPlugin
addGadget(new KitGameModifier(this, kitModifier));
}*/
+ // ONLY NEXT WEEK!
// Balloons
- //addGadget(new BabyCowBalloon(this));
+ /*for (BalloonType balloonType : BalloonType.values())
+ {
+ addGadget(new BalloonItem(this, balloonType));
+ }*/
// TAUNTS!!!
addGadget(new EternalTaunt(this));
@@ -709,6 +720,20 @@ public class GadgetManager extends MiniPlugin
}
return null;
}
+
+ public BalloonGadget getBalloonGadget(BalloonType balloonType)
+ {
+ for (Gadget gadget : getGadgets(GadgetType.BALLOON))
+ {
+ if (gadget instanceof BalloonGadget)
+ {
+ BalloonGadget balloonGadget = (BalloonGadget) gadget;
+ if (balloonGadget.getBalloonType().equals(balloonType))
+ return balloonGadget;
+ }
+ }
+ return null;
+ }
// Disallows two armor gadgets in same slot.
public void removeOutfit(Player player, ArmorSlot slot)
@@ -1322,4 +1347,5 @@ public class GadgetManager extends MiniPlugin
taunt.start(player);
}
+
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/UnlockCosmeticsCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/UnlockCosmeticsCommand.java
index 18afaab78..0da39bfe2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/UnlockCosmeticsCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/commands/UnlockCosmeticsCommand.java
@@ -22,7 +22,7 @@ public class UnlockCosmeticsCommand extends CommandBase
public UnlockCosmeticsCommand(GadgetManager plugin)
{
- super(plugin, Rank.JNR_DEV, "unlockCosmetics");
+ super(plugin, Rank.SNR_MODERATOR, "unlockCosmetics");
_plugin = plugin;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BabyCowBalloon.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BabyCowBalloon.java
deleted file mode 100644
index 4b1e7e23f..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BabyCowBalloon.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package mineplex.core.gadget.gadgets.balloons;
-
-import mineplex.core.common.util.UtilEnt;
-import mineplex.core.gadget.GadgetManager;
-import mineplex.core.gadget.types.BalloonGadget;
-import org.bukkit.Location;
-import org.bukkit.Material;
-import org.bukkit.entity.*;
-
-public class BabyCowBalloon extends BalloonGadget
-{
-
- private ArmorStand _entityStand, _playerStand;
- private Entity _balloonEntity;
-
- public BabyCowBalloon(GadgetManager manager)
- {
- super(manager, "Baby Cow Balloon", new String[]{"placeholder"}, 0, Material.MONSTER_EGG, UtilEnt.getEntityEggData(EntityType.COW));
- }
-
- @Override
- public void enableCustom(Player player, boolean message)
- {
- if (!canSpawnBalloon(player))
- {
- // TODO MESSAGE
- return;
- }
- addPlayerBalloon(player);
- _entityStand = player.getWorld().spawn(player.getLocation(), ArmorStand.class);
- _entityStand.setGravity(false);
- _entityStand.setVisible(false);
- Cow babyCow = player.getWorld().spawn(player.getLocation(), Cow.class);
- babyCow.setBaby();
- _balloonEntity = babyCow;
- _entityStand.setPassenger(babyCow);
- Location balloonLocation = player.getLocation().add(_random.nextDouble(), getNewHeight(player), _random.nextDouble());
- _entityStand.teleport(balloonLocation);
- babyCow.setLeashHolder(player);
- // TODO UPDATE BALLOONS
- }
-
- @Override
- public void disableCustom(Player player, boolean message)
- {
- _entityStand.remove();
- _balloonEntity.remove();
- removePlayerBalloon(player);
- // TODO UPDATE PLAYER HEIGHT
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonItem.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonItem.java
new file mode 100644
index 000000000..24c92c722
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonItem.java
@@ -0,0 +1,92 @@
+package mineplex.core.gadget.gadgets.balloons;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Zombie;
+import org.bukkit.potion.PotionEffect;
+import org.bukkit.potion.PotionEffectType;
+
+import mineplex.core.common.util.UtilEnt;
+import mineplex.core.gadget.GadgetManager;
+import mineplex.core.gadget.types.BalloonGadget;
+
+public class BalloonItem extends BalloonGadget
+{
+
+ private BalloonType _balloonType;
+ private Map> _entities = new HashMap<>();
+
+ public BalloonItem(GadgetManager manager, BalloonType balloonType)
+ {
+ super(manager, balloonType.getName(), balloonType.getLore(), balloonType.getCost(),
+ balloonType.getDisplayItem().getType(),
+ balloonType.getDisplayItem().getData().getData(), balloonType,
+ balloonType.getEntityType());
+ setDisplayItem(balloonType.getDisplayItem());
+ _balloonType = balloonType;
+ }
+
+ @Override
+ public Entity[] spawnEntity(Player player)
+ {
+ Entity[] ents = new Entity[2];
+ if (_balloonType.getEntityType().equals(EntityType.ARMOR_STAND))
+ {
+ Zombie zombie = player.getWorld().spawn(player.getLocation(), Zombie.class);
+ zombie.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 1, false, false));
+ zombie.getEquipment().setHelmet(_balloonType.getDisplayItem());
+ UtilEnt.silence(zombie, true);
+ UtilEnt.vegetate(zombie);
+ addEntity(player, zombie);
+
+ ents[0] = zombie;
+
+ return ents;
+ }
+ else if (_balloonType.equals(BalloonType.BABY_ZOMBIE))
+ {
+ Zombie zombie = player.getWorld().spawn(player.getLocation(), Zombie.class);
+ zombie.setBaby(true);
+ UtilEnt.vegetate(zombie);
+ addEntity(player, zombie);
+ ents[0] = zombie;
+ return ents;
+ }
+
+
+ Entity entity = player.getWorld().spawnEntity(player.getLocation(), _balloonType.getEntityType());
+ if (_balloonType.isBaby() && entity instanceof Ageable)
+ ((Ageable) entity).setBaby();
+ UtilEnt.vegetate(entity);
+ addEntity(player, entity);
+ ents[0] = entity;
+ return ents;
+ }
+
+ private void addEntity(Player player, Entity entity)
+ {
+ _entities.computeIfAbsent(player.getUniqueId(), list -> new ArrayList<>());
+ List entities = _entities.get(player.getUniqueId());
+ entities.add(entity);
+ _entities.put(player.getUniqueId(), entities);
+ }
+
+ @Override
+ public void removeEntities(Player player)
+ {
+ for (Entity entity : _entities.get(player.getUniqueId()))
+ {
+ entity.remove();
+ }
+ _entities.remove(player.getUniqueId());
+ }
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonType.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonType.java
new file mode 100644
index 000000000..1fbf94fc2
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/balloons/BalloonType.java
@@ -0,0 +1,95 @@
+package mineplex.core.gadget.gadgets.balloons;
+
+import org.bukkit.Material;
+import org.bukkit.entity.EntityType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.LineFormat;
+import mineplex.core.common.util.UtilText;
+
+public enum BalloonType
+{
+
+ // BABY
+ BABY_COW (EntityType.COW, true, "Baby Cow Balloon", 0, new ItemStack(Material.COOKED_BEEF)),
+ BABY_PIG (EntityType.PIG, true, "Baby Pig Balloon", 0, new ItemStack(Material.GRILLED_PORK)),
+ BABY_ZOMBIE (EntityType.ZOMBIE, true, "Baby Zombie Balloon", 0, new ItemStack(Material.ROTTEN_FLESH)),
+ BABY_MUSHROOM(EntityType.MUSHROOM_COW, true, "Baby Mushroom Cow Balloon", 0, new ItemStack(Material.MUSHROOM_SOUP)),
+ BABY_OCELOT (EntityType.OCELOT, true, "Baby Ocelot Balloon", 0, new ItemStack(Material.COOKED_FISH)),
+ BABY_WOLF (EntityType.WOLF, true, "Baby Wolf Balloon", 0, new ItemStack(Material.BONE)),
+ BABY_SHEEP (EntityType.SHEEP, true, "Baby Sheep Balloon", 0, new ItemStack(Material.WOOL)),
+ BABY_VILLAGER(EntityType.VILLAGER, true, "Baby Villager Balloon", 0, new ItemStack(Material.EMERALD)),
+ BABY_SLIME (EntityType.SLIME, true, "Baby Slime Balloon", 0, new ItemStack(Material.SLIME_BALL)),
+
+ // NOT BABY
+ SQUID (EntityType.SQUID, "Squid Balloon", 0, new ItemStack(Material.INK_SACK)),
+ BAT (EntityType.BAT, "Bat Balloon", 0, new ItemStack(Material.JACK_O_LANTERN)),
+ SILVERFISH(EntityType.SILVERFISH, "Silverfish Balloon", 0, new ItemStack(Material.getMaterial(97))),
+ GUARDIAN (EntityType.GUARDIAN, "Guardian Balloon", 0, new ItemStack(Material.PRISMARINE_SHARD)),
+
+ // BLOCK
+ /*DRAGON_EGG (new ItemStack(Material.DRAGON_EGG), false, "Dragon Egg Balloon", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE), 0),
+ DIAMOND_BLOCK(new ItemStack(Material.DIAMOND_BLOCK), false, "Diamond Block Balloon", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE), 0),
+ IRON_BLOCK (new ItemStack(Material.IRON_BLOCK), false, "Iron Block Balloon", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE), 0),
+ GOLD_BLOCK (new ItemStack(Material.GOLD_BLOCK), false, "Gold Block Balloon", UtilText.splitLinesToArray(new String[]{"Placeholder"}, LineFormat.LORE), 0),*/
+ EMERALD_BLOCK(new ItemStack(Material.EMERALD_BLOCK), false, "Emerald Block Balloon", 0);
+
+ private EntityType _entityType;
+ private boolean _isBaby;
+ private String _name;
+ private String[] _lore;
+ private int _cost;
+ private ItemStack _displayItem;
+
+ BalloonType(EntityType entityType, String name, int cost, ItemStack displayItem)
+ {
+ this(entityType, false, name, cost, displayItem);
+ }
+
+ BalloonType(EntityType entityType, boolean isBaby, String name, int cost, ItemStack displayItem)
+ {
+ _entityType = entityType;
+ _isBaby = isBaby;
+ _name = name;
+ _cost = cost;
+ _displayItem = displayItem;
+ }
+
+ BalloonType(ItemStack block, boolean isBaby, String name, int cost)
+ {
+ this(EntityType.ARMOR_STAND, isBaby, name, cost, block);
+ }
+
+ public EntityType getEntityType()
+ {
+ return _entityType;
+ }
+
+ public boolean isBaby()
+ {
+ return _isBaby;
+ }
+
+ public String getName()
+ {
+ return _name;
+ }
+
+ public String[] getLore()
+ {
+ return UtilText.splitLinesToArray(new String[]{C.cGray + "A floating " + getName() + " that appears above your head!",
+ "",
+ C.cWhite + "Click to activate, click again to remove. You can have up to 10 balloons active at a time."}, LineFormat.LORE);
+ }
+
+ public int getCost()
+ {
+ return _cost;
+ }
+
+ public ItemStack getDisplayItem()
+ {
+ return _displayItem;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java
index a9f2ebcaf..e54903c2d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/GameModifierMineStrikeSkin.java
@@ -51,7 +51,7 @@ public class GameModifierMineStrikeSkin extends GameModifierGadget
*/
public GameModifierMineStrikeSkin(GadgetManager manager, MineStrikeSkin skin, int cost)
{
- this(manager, skin, new String[]{""}, cost);
+ this(manager, skin, new String[]{skin.getWeaponName()}, cost);
}
/**
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java
index 1b118c120..14b21a559 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/gamemodifiers/minestrike/MineStrikeSkin.java
@@ -5,25 +5,33 @@ import org.bukkit.Material;
public enum MineStrikeSkin
{
- P250_Muertos( "P250", "P250 Muertos", Material.INK_SACK, (byte) 3),
- CZ75_Auto_Tigris( "CZ75-Auto", "CZ75-Auto Tigris", Material.CLAY_BRICK, (byte) 0),
- Desert_Eagle_Blaze( "Desert Eagle", "Desert Eagle Blaze", Material.NETHER_STALK, (byte) 0),
- Nova_Koi( "Nova", "Nova Koi", Material.INK_SACK, (byte) 14),
- XM1014_Tranquility( "XM1014", "XM1014 Tranquility", Material.DIAMOND, (byte) 0),
- PP_Bizon_Streak( "PP Bizon", "PP-Bizon Streak", Material.INK_SACK, (byte) 4),
- P90_Asiimov( "P90", "P90 Asiimov", Material.INK_SACK, (byte) 0),
- SSG_08_Blood_in_the_Water( "SSG 08", "SSG 08 Blood in the Water", Material.INK_SACK, (byte) 12),
- AWP_Asiimov( "AWP", "AWP Asiimov", Material.SULPHUR, (byte) 0),
- P2000_Fire_Elemental( "P2000", "P2000 Fire Elemental", Material.INK_SACK, (byte) 6),
- FAMAS_Pulse( "FAMAS", "FAMAS Pulse", Material.CLAY_BALL, (byte) 0),
- M4A4_Howl( "M4A4", "M4A4 Howl", Material.INK_SACK, (byte) 11),
- Steyr_AUG_Torque( "Steyr AUG", "Steyr AUG Torque", Material.BLAZE_ROD, (byte) 0),
- Glock_18_Fade( "Glock 18", "Glock 18 Fade", Material.INK_SACK, (byte) 9),
- Galil_AR_Eco( "Galil AR", "Galil AR Eco", Material.INK_SACK, (byte) 10),
- AK_47_Vulcan( "AK-47", "AK-47 Vulcan", Material.INK_SACK, (byte) 7),
- SG553_Pulse( "SG553", "SG553 Pulse", Material.INK_SACK, (byte) 5),
+ P250_Muertos( "P250", "P250 Muertos", Material.INK_SACK, (byte) 3),
+ CZ75_Auto_Tigris( "CZ75-Auto", "CZ75-Auto Tigris", Material.CLAY_BRICK, (byte) 0),
+ Desert_Eagle_Blaze( "Desert Eagle", "Desert Eagle Blaze", Material.NETHER_STALK, (byte) 0),
+ Desert_Eagle_Golden_Gun( "Desert Eagle", "Golden Gun", Material.GLOWSTONE_DUST, (byte) 0),
+ Nova_Koi( "Nova", "Nova Koi", Material.INK_SACK, (byte) 14),
+ XM1014_Tranquility( "XM1014", "XM1014 Tranquility", Material.DIAMOND, (byte) 0),
+ XM1014_Pig_Gun( "XM1014", "XM1014 Pig Gun", Material.LEATHER, (byte) 0),
+ PP_Bizon_Streak( "PP Bizon", "PP-Bizon Streak", Material.INK_SACK, (byte) 4),
+ P90_Asiimov( "P90", "P90 Asiimov", Material.INK_SACK, (byte) 0),
+ SSG_08_Blood_in_the_Water( "SSG 08", "SSG 08 Blood in the Water", Material.INK_SACK, (byte) 12),
+ AWP_Asiimov( "AWP", "AWP Asiimov", Material.SULPHUR, (byte) 0),
+ P2000_Fire_Elemental( "P2000", "P2000 Fire Elemental", Material.INK_SACK, (byte) 6),
+ FAMAS_Pulse( "FAMAS", "FAMAS Pulse", Material.CLAY_BALL, (byte) 0),
+ M4A4_Howl( "M4A4", "M4A4 Howl", Material.INK_SACK, (byte) 11),
+ //M4A4_Enderman( "M4A4", "Enderman M4", )
+ Steyr_AUG_Torque( "Steyr AUG", "Steyr AUG Torque", Material.BLAZE_ROD, (byte) 0),
+ Glock_18_Fade( "Glock 18", "Glock 18 Fade", Material.INK_SACK, (byte) 9),
+ Galil_AR_Eco( "Galil AR", "Galil AR Eco", Material.INK_SACK, (byte) 10),
+ AK_47_Vulcan( "AK-47", "AK-47 Vulcan", Material.INK_SACK, (byte) 7),
+ AK_47_Guardian( "AK-47", "Guardian AK", Material.PRISMARINE_SHARD, (byte) 0),
+ SG553_Pulse( "SG553", "SG553 Pulse", Material.INK_SACK, (byte) 5),
+
- Knife_M9_Bayonette_Fade( "Knife", "M9 Bayonette Fade", Material.DIAMOND_SWORD, (byte) 0);
+ Knife_M9_Bayonette_Fade( "Knife", "M9 Bayonette Fade", Material.DIAMOND_SWORD, (byte) 0),
+ Knife_Counter_Terrorist_Sword("Knife", "Counter Terrorist Sword", Material.STICK, (byte) 0),
+ Knife_Terrorist_Sword( "Knife", "Terrorist Sword", Material.FEATHER, (byte) 0),
+ Knife_M9_Bayonette_Glass( "Knife", "Glass M9 Bayonette", Material.QUARTZ, (byte) 0);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFootball.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFootball.java
index a405ea02c..06a4178ff 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFootball.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/item/ItemFootball.java
@@ -51,7 +51,7 @@ public class ItemFootball extends ItemGadget
FallingBlock ball = player.getWorld().spawnFallingBlock(player.getLocation().add(0, 1, 0), Material.SKULL, (byte) 3);
Bat bat = player.getWorld().spawn(player.getLocation(), Bat.class);
- UtilEnt.Vegetate(bat);
+ UtilEnt.vegetate(bat);
UtilEnt.ghost(bat, true, true);
UtilEnt.silence(bat, true);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java
index 49aaa7bbe..821a9daff 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/wineffect/WinEffectHalloween.java
@@ -134,7 +134,7 @@ public class WinEffectHalloween extends WinEffectGadget
skeleton.setCustomNameVisible(true);
skeleton.getEquipment().setHelmet(new ItemStack(Material.JACK_O_LANTERN));
UtilEnt.ghost(skeleton, true, false);
- UtilEnt.Vegetate(skeleton);
+ UtilEnt.vegetate(skeleton);
for (int i = 0; i < 15; i++)
{
playFirework(skeleton.getLocation().clone().add(0, 2, 0), i, true);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
index 721282b33..980c43fd2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/types/BalloonGadget.java
@@ -1,64 +1,138 @@
package mineplex.core.gadget.types;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
-import mineplex.core.gadget.GadgetManager;
import org.bukkit.Material;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.gadget.GadgetManager;
+import mineplex.core.gadget.gadgets.balloons.BalloonType;
+import mineplex.core.gadget.util.BalloonData;
+import mineplex.core.updater.UpdateType;
+import mineplex.core.updater.event.UpdateEvent;
public abstract class BalloonGadget extends Gadget
{
- protected static final Map> PLAYER_BALLOONS = new HashMap<>();
+ private static final Map> PLAYER_BALLOONS = new HashMap<>();
- protected final Random _random;
+ private EntityType _balloon;
+ private BalloonType _balloonType;
- public BalloonGadget(GadgetManager manager, String name, String[] desc, int cost, Material material, byte data, String... altNames)
+ public BalloonGadget(GadgetManager manager, String name, String[] desc, int cost, Material material, byte data, BalloonType balloonType, EntityType balloon, String... altNames)
{
super(manager, GadgetType.BALLOON, name, desc, cost, material, data, 1, altNames);
- _random = new Random();
+ _balloon = balloon;
+ _balloonType = balloonType;
}
- protected boolean canSpawnBalloon(Player player)
+ @Override
+ public void enableCustom(Player player, boolean message)
+ {
+ boolean add = addPlayerBalloon(player);
+ if (add)
+ {
+ _active.add(player);
+ if (message)
+ {
+ UtilPlayer.message(player, F.main("Gadget", "You spawned a " + F.elem(getName()) + "!"));
+ }
+ }
+ else
+ {
+ Manager.removeActive(player, this);
+ UtilPlayer.message(player, F.main("Gadget", "You cannot have more than " + F.count("10") + " balloons!"));
+ }
+ }
+
+ @Override
+ public void disableCustom(Player player, boolean message)
+ {
+ if (!_active.remove(player))
+ return;
+
+ removePlayerBalloon(player);
+ if (message)
+ UtilPlayer.message(player, F.main("Gadget", "You despawned a " + F.elem(getName())) + "!");
+ }
+
+ private boolean addPlayerBalloon(Player player)
+ {
+ if (!canSpawnBalloon(player))
+ return false;
+
+ PLAYER_BALLOONS.computeIfAbsent(player.getUniqueId(), map -> new HashMap<>());
+ BalloonData balloonData;
+ Entity[] ents = spawnEntity(player);
+ if (ents[1] == null)
+ balloonData = new BalloonData(player, ents[0]);
+ else if (!_balloon.equals(EntityType.ARMOR_STAND))
+ balloonData = new BalloonData(player, ents[0], ents[1]);
+ else
+ {
+ balloonData = new BalloonData(player, ents[0]);
+ balloonData.setLeash(ents[1]);
+ }
+ PLAYER_BALLOONS.get(player.getUniqueId()).put(_balloon, balloonData);
+
+ return true;
+ }
+
+ private void removePlayerBalloon(Player player)
{
if (PLAYER_BALLOONS.containsKey(player.getUniqueId()))
{
- List balloonGadgets = PLAYER_BALLOONS.get(player.getUniqueId());
+ if (PLAYER_BALLOONS.get(player.getUniqueId()).containsKey(_balloon))
+ {
+ removeEntities(player);
+ PLAYER_BALLOONS.get(player.getUniqueId()).remove(_balloon);
+ }
+ }
+ }
+
+ protected abstract Entity[] spawnEntity(Player player);
+
+ protected abstract void removeEntities(Player player);
+
+ @EventHandler
+ public void onUpdate(UpdateEvent event)
+ {
+ if (event.getType() != UpdateType.TICK)
+ return;
+
+ for (Map.Entry> entry : PLAYER_BALLOONS.entrySet())
+ {
+ for (BalloonData balloonData : entry.getValue().values())
+ {
+ balloonData.update();
+ }
+ }
+ }
+
+ private boolean canSpawnBalloon(Player player)
+ {
+ if (PLAYER_BALLOONS.containsKey(player.getUniqueId()))
+ {
+ Map balloonGadgets = PLAYER_BALLOONS.get(player.getUniqueId());
return balloonGadgets.size() < 10;
}
return true;
}
- protected void addPlayerBalloon(Player player)
+ public BalloonType getBalloonType()
{
- if (canSpawnBalloon(player))
- {
- PLAYER_BALLOONS.computeIfAbsent(player.getUniqueId(), list -> new ArrayList<>());
- List balloonGadgets = PLAYER_BALLOONS.get(player.getUniqueId());
- balloonGadgets.add(this);
- PLAYER_BALLOONS.put(player.getUniqueId(), balloonGadgets);
- }
+ return _balloonType;
}
- protected void removePlayerBalloon(Player player)
+ public static int getBalloons(Player player)
{
- List balloonGadgets = PLAYER_BALLOONS.computeIfPresent(player.getUniqueId(), (uuid, list) -> list);
- if (balloonGadgets.contains(this))
- {
- balloonGadgets.remove(this);
- }
- if (balloonGadgets.size() >= 1)
- PLAYER_BALLOONS.put(player.getUniqueId(), balloonGadgets);
- else
- PLAYER_BALLOONS.remove(player.getUniqueId());
+ return ((PLAYER_BALLOONS.containsKey(player.getUniqueId())) ? PLAYER_BALLOONS.get(player.getUniqueId()).size() : 0);
}
-
- protected double getNewHeight(Player player)
- {
- List balloonGadgets = PLAYER_BALLOONS.computeIfPresent(player.getUniqueId(), (uuid, list) -> list);
- if (balloonGadgets != null)
- return balloonGadgets.size() * _random.nextDouble() * (_random.nextInt(1) + 2);
- return 3;
- }
-
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/util/BalloonData.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/util/BalloonData.java
new file mode 100644
index 000000000..da817f426
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/util/BalloonData.java
@@ -0,0 +1,133 @@
+package mineplex.core.gadget.util;
+
+import org.bukkit.Location;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.util.Vector;
+
+import mineplex.core.common.util.UtilAlg;
+import mineplex.core.common.util.UtilMath;
+
+public class BalloonData
+{
+
+ /**
+ * Makes the balloons fly around the player
+ * Copied from {@link mineplex.core.gadget.gadgets.particle.ParticleFairyData}
+ */
+
+ private Player _player;
+ private Entity _balloon, _passenger, _leash;
+ private Location _balloonLoc, _target;
+ private Vector _direction;
+ private double _speed;
+ private long _idleTime;
+
+ public BalloonData(Player player, Entity balloon)
+ {
+ _player = player;
+ _balloon = balloon;
+ _balloonLoc = player.getEyeLocation();
+ _target = getNewTarget();
+ _speed = 0.2;
+ _idleTime = 0;
+ _direction = new Vector(1, 0, 0);
+ ((LivingEntity) _balloon).setLeashHolder(_player);
+ }
+
+ // This exists for a possible widder balloon that could be added later
+ public BalloonData(Player player, Entity balloon, Entity passenger)
+ {
+ _player = player;
+ _balloon = balloon;
+ _passenger = passenger;
+ _balloonLoc = player.getEyeLocation();
+ _target = getNewTarget();
+ _speed = 0.2;
+ _idleTime = 0;
+ _direction = new Vector(1, 0, 0);
+ ((LivingEntity) _balloon).setLeashHolder(_player);
+ }
+
+ public void update()
+ {
+ if (_leash == null)
+ {
+ if (!((LivingEntity) _balloon).isLeashed())
+ ((LivingEntity) _balloon).setLeashHolder(_player);
+ }
+ else
+ {
+ if (!((LivingEntity) _leash).isLeashed())
+ ((LivingEntity) _leash).setLeashHolder(_player);
+ }
+
+ //Update Target
+ if (UtilMath.offset(_player.getEyeLocation(), _target) > 3 || UtilMath.offset(_balloonLoc, _target) < 1)
+ _target = getNewTarget();
+
+ //Pause?
+ if (Math.random() > 0.98)
+ _idleTime = System.currentTimeMillis() + (long)(Math.random() * 3000);
+
+ //Speed
+ if (UtilMath.offset(_player.getEyeLocation(), _balloonLoc) < 3)
+ {
+ if (_idleTime > System.currentTimeMillis())
+ {
+ _speed = Math.max(0, _speed - 0.005);
+ }
+ else
+ {
+ _speed = Math.min(0.15, _speed + 0.005);
+ }
+ }
+ else
+ {
+ _idleTime = 0;
+
+ _speed = Math.min(0.15 + UtilMath.offset(_player.getEyeLocation(), _balloonLoc) * 0.05, _speed + 0.02);
+ }
+
+
+ //Modify Direction
+ _direction.add(UtilAlg.getTrajectory(_balloonLoc, _target).multiply(0.15));
+ if (_direction.length() < 1)
+ _speed = _speed * _direction.length();
+ UtilAlg.Normalize(_direction);
+
+ //Move
+ if (UtilMath.offset(_balloonLoc, _target) > 0.1)
+ _balloonLoc.add(_direction.clone().multiply(_speed));
+
+ _balloon.teleport(_balloonLoc);
+ _balloon.setVelocity(new Vector(0, .25, 0));
+ if (_passenger != null)
+ {
+ _passenger.teleport(_balloonLoc);
+ _balloon.setPassenger(_passenger);
+ }
+ if (_leash != null)
+ {
+ _leash.teleport(_balloon.getLocation().add(0, 1.5, 0));
+ }
+ }
+
+ private Location getNewTarget()
+ {
+ return _player.getEyeLocation().add(Math.random() * 6 - 3, Math.random() * 7.5, Math.random() * 6 - 3);
+ }
+
+ public Entity getBalloon()
+ {
+ return _balloon;
+ }
+
+ public void setLeash(Entity leashedEntity)
+ {
+ _leash = leashedEntity;
+ ((LivingEntity) _leash).setLeashHolder(_player);
+ }
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
index 585e37864..cc5ba27d4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/game/GameDisplay.java
@@ -96,6 +96,8 @@ public enum GameDisplay
Basketball("Hoops", Material.SLIME_BALL, (byte)0, GameCategory.EXTRA, 63, false),
QuiverPayload("One in the Quiver Payload", Material.ARROW, (byte)0, GameCategory.ARCADE, 64, false),
+
+ StrikeGames("Strike Games", Material.DIAMOND_LEGGINGS, (byte) 0, GameCategory.SURVIVAL, 66, false),
Event("Mineplex Event", Material.CAKE, (byte)0, GameCategory.EVENT, 999, false),
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/giveaway/GiveawayRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/giveaway/GiveawayRepository.java
index 01b07bc7e..a88efc3fd 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/giveaway/GiveawayRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/giveaway/GiveawayRepository.java
@@ -12,12 +12,13 @@ import mineplex.core.database.MinecraftRepository;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
import mineplex.serverdata.Region;
-public class GiveawayRepository extends MinecraftRepository
+public class GiveawayRepository extends RepositoryBase
{
private static final String INSERT_GIVEAWAY = "INSERT INTO Account.accountGiveaway (giveawayId, accountId, cooldownId, region, serverName, time, uuid) VALUES (?, ?, ?, ?, ?, now(), ?)";
private static final String LOAD_GIVEAWAY = "SELECT id, name, prettyName, header, message, max, notifyNetwork, notifyCooldown, canWinTwice FROM Account.giveaway WHERE enabled = TRUE";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/ignore/data/IgnoreRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/ignore/data/IgnoreRepository.java
index 14ea9c2e5..d69fa55b1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/ignore/data/IgnoreRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/ignore/data/IgnoreRepository.java
@@ -5,12 +5,13 @@ import java.sql.SQLException;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnVarChar;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin;
-public class IgnoreRepository extends MinecraftRepository
+public class IgnoreRepository extends RepositoryBase
{
private static String ADD_IGNORE_RECORD = "INSERT INTO accountIgnore (uuidIgnorer, uuidIgnored) SELECT fA.uuid AS uuidIgnorer, tA.uuid AS uuidIgnored FROM accounts as fA LEFT JOIN accounts AS tA ON tA.name = ? WHERE fA.name = ?;";
private static String DELETE_IGNORE_RECORD = "DELETE aF FROM accountIgnore AS aF INNER JOIN accounts as fA ON aF.uuidIgnorer = fA.uuid INNER JOIN accounts AS tA ON aF.uuidIgnored = tA.uuid WHERE fA.name = ? AND tA.name = ?;";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java
index fbb8243b7..adebcf4cf 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/incognito/repository/IncognitoRepository.java
@@ -3,9 +3,10 @@ package mineplex.core.incognito.repository;
import mineplex.core.database.MinecraftRepository;
import mineplex.core.incognito.IncognitoManager;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
-public class IncognitoRepository extends MinecraftRepository
+public class IncognitoRepository extends RepositoryBase
{
private static final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS incognitoStaff (accountId INT NOT NULL, status TINYINT(1) DEFAULT '0', PRIMARY KEY (accountId));";
private static final String INSERT_STATUS = "INSERT INTO incognitoStaff (accountId, status) VALUES (?, ?);";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
index b679ab62c..6bf7de0f5 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/inventory/data/InventoryRepository.java
@@ -10,13 +10,14 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.common.util.NautHashMap;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
import mineplex.core.inventory.ClientInventory;
import mineplex.core.inventory.ClientItem;
-public class InventoryRepository extends MinecraftRepository
+public class InventoryRepository extends RepositoryBase
{
private static String CREATE_INVENTORY_TABLE = "CREATE TABLE IF NOT EXISTS items (id INT NOT NULL AUTO_INCREMENT, name VARCHAR(100), rarity INT, PRIMARY KEY (id), INDEX mameIndex (name));";
private static String CREATE_INVENTORY_RELATION_TABLE = "CREATE TABLE IF NOT EXISTS accountInventory (id INT NOT NULL AUTO_INCREMENT, accountId INT NOT NULL, itemId INT NOT NULL, count INT NOT NULL, PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id), FOREIGN KEY (itemId) REFERENCES items(id), UNIQUE INDEX accountItemIndex (accountId, itemId));";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/StatEventsRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/StatEventsRepository.java
index c4b129df4..3acf6a2f8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/StatEventsRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/leaderboard/StatEventsRepository.java
@@ -2,6 +2,7 @@ package mineplex.core.leaderboard;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
@@ -15,7 +16,7 @@ import org.bukkit.plugin.java.JavaPlugin;
* @author MrTwiggy
*
*/
-public class StatEventsRepository extends MinecraftRepository
+public class StatEventsRepository extends RepositoryBase
{
// Insert or update stat events query
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Component.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Component.java
new file mode 100644
index 000000000..cee7da78f
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Component.java
@@ -0,0 +1,21 @@
+package mineplex.core.lifetimes;
+
+/**
+ * A Component defines behavior that can exist within a Lifetime. Components
+ * should have no impact upon the game while not active.
+ */
+public interface Component
+{
+ /**
+ * Activates the Component, performing any sort of required initialization.
+ * Components may be activated and deactivated multiple times, however a component
+ * will not be activated more than once without subsequent calls to deactivate.
+ */
+ void activate();
+
+ /**
+ * Deactivates the Component, disabling any sort of functionality it provides
+ * and performing clean up. A Component may be subsequently reactivated.
+ */
+ void deactivate();
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetime.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetime.java
new file mode 100644
index 000000000..1cb578bc0
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetime.java
@@ -0,0 +1,29 @@
+package mineplex.core.lifetimes;
+
+/**
+ * A Lifetime represents a duration for which a collection of Components
+ * will be active. While Lifetime does contain a method for registering
+ * instantiated Components, individual Lifetimes may have unique
+ * strategies for creating Components and activating them. Lifetime
+ * doesn't provide any guarantee of Component activation or deactivation
+ * order. Implementations of Lifetime, however, may.
+ *
+ * Lifetime doesn't provide mechanisms for beginning or ending a Lifetime.
+ * This is provided by the various implementations of Lifetime, as it varies
+ * between the implementations and is functionality that most consumers of
+ * Lifetimes will not need.
+ */
+public interface Lifetime
+{
+ /**
+ * Registers the provided component with this Lifetime. If the Lifetime
+ * is currently active, then the Component will be immediately activated.
+ * @param component the component to register
+ */
+ void register(Component component);
+ /**
+ * Gets whether the Lifetime is currently active.
+ * @return true if the Lifetime is active
+ */
+ boolean isActive();
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetimed.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetimed.java
new file mode 100644
index 000000000..fa08dd533
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/Lifetimed.java
@@ -0,0 +1,19 @@
+package mineplex.core.lifetimes;
+
+/**
+ * Represents an object that is associated with a specific lifetime.
+ * Multiple Lifetimed objects may be associated with the same Lifetime.
+ * As a roughly generalized explanation, any time functionality should
+ * be enabled(whether its a command, listener, etc.) it should be registered
+ * as a Component of a Lifetime. Any object wishing to enable functionality
+ * that is associated with this Lifetimed object should do so with the Lifetime
+ * returned by {@link #getLifetime()}.
+ */
+public interface Lifetimed
+{
+ /**
+ * Gets the Lifetime associated with this Lifetimed object.
+ * @return non-null Lifetime
+ */
+ Lifetime getLifetime();
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/ListenerComponent.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/ListenerComponent.java
new file mode 100644
index 000000000..d6b664fb4
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/ListenerComponent.java
@@ -0,0 +1,54 @@
+package mineplex.core.lifetimes;
+
+import mineplex.core.common.util.UtilServer;
+import org.apache.commons.lang.Validate;
+import org.bukkit.Bukkit;
+import org.bukkit.event.HandlerList;
+import org.bukkit.event.Listener;
+
+/**
+ * A convenience class for Components that are a Listener. ListenerComponent
+ * can either be used as a wrapper class for a specific Listener, or can be
+ * extended by another Component to provide event registration.
+ */
+public class ListenerComponent implements Component, Listener
+{
+ private final Listener _listener;
+
+ /**
+ * Creates a ListenerComponent that registers the provided Listener when
+ * activated and unregisters it when deactivated. The newly created
+ * ListenerComponent will not be registered as a Listener. When a
+ * ListenerComponent is created with this constructor, it is effectively
+ * a wrapper to bind a Listener to a specific lifetime.
+ *
+ * @param listener non-null listener to wrap
+ * @throws IllegalArgumentException if listener is null
+ */
+ public ListenerComponent(Listener listener) throws IllegalArgumentException
+ {
+ Validate.notNull(listener);
+ _listener = listener;
+ }
+
+ /**
+ * Creates a ListenerComponent that registers itself when activated and
+ * unregisters itself when deactivated.
+ */
+ public ListenerComponent()
+ {
+ _listener = this;
+ }
+
+ @Override
+ public void activate()
+ {
+ Bukkit.getPluginManager().registerEvents(_listener, UtilServer.getPlugin());
+ }
+
+ @Override
+ public void deactivate()
+ {
+ HandlerList.unregisterAll(_listener);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedComponent.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedComponent.java
new file mode 100644
index 000000000..417bf56b1
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedComponent.java
@@ -0,0 +1,7 @@
+package mineplex.core.lifetimes;
+
+public interface PhasedComponent extends Component
+{
+
+ void setPhase(T phase);
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedLifetime.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedLifetime.java
new file mode 100644
index 000000000..b9760e761
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/PhasedLifetime.java
@@ -0,0 +1,289 @@
+package mineplex.core.lifetimes;
+
+import com.google.common.base.Preconditions;
+import mineplex.core.common.util.UtilServer;
+import org.apache.commons.lang.Validate;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+/**
+ * A PhasedLifetime is a lifetime that is composed of several
+ * smaller lifetimes, referred to as phases. This class is provided
+ * in order to support a system in which Components may exist within multiple
+ * Lifetimes. PhasedLifetime is not thread-safe.
+ *
+ * Registering a Component will register it for the entirety of this Lifetime,
+ * unless registered with {@link #register(Component, Iterable)}. Special behavior
+ * is provided for instances of {@link PhasedComponent}. See {@link #register(Component,
+ * Iterable)} for more information. Components registered using {@link
+ * #register(Component)} are registered for the entire duration of the Lifetime.
+ */
+public class PhasedLifetime implements Lifetime
+{
+ private final Map> _phases = new HashMap<>();
+ private final List _global = new ArrayList<>();
+ private boolean _active = false;
+ private T _current;
+
+ /**
+ * Registers the Component for all phases within the provided Iterable,
+ * and creates a Lifetime that is active during all those phases, and
+ * therefore identical to when the provided Component is active. If a change
+ * occurs from a Phase that the Component is active in to another phase that
+ * the component is active in, it will not be disabled. When this
+ * Lifetime ends, all Lifetimes created by this Lifetime also end, as all
+ * phases are considered over.
+ *
+ * If the Component is an instance of PhasedComponent, then any phase change
+ * in which one of the phases is within the provided Iterable of phases will
+ * result in an invocation of {@link PhasedComponent#setPhase(Object)}. This
+ * should not be used as a mechanism to detect when the component is being
+ * disabled, but rather as a means to provide specific behavior when that
+ * phase change occurs. If a phase change drastically changes the behavior
+ * of a Component such that not all functionality is active for some phases
+ * that a Component is registered for, you should consider refactoring that
+ * Component into two separate Components.
+ *
+ * As an example, assume that we have a PhasedLifetime with phases A-F,
+ * and a PhasedComponent is registered for phases A, B, and E. The chain
+ * of events would be as followed(italic indicates an event call to the
+ * PhasedComponent, an activation, or deactivation).
+ *
+ * - Lifetime started with a value of A
+ * - Component is activated
+ * - setPhase is called with a value of A
+ * - Phase is set to B
+ * - setPhase is called with a value of B
+ * - Phase is set to C
+ * - setPhase is called with a value of C
+ * - Component is deactivated
+ * - Phase is set to D
+ * - Phase is set to E
+ * - Component is activated
+ * - setPhase is called with a value of E
+ * - Phase is set to F
+ * - setPhase is called with a value of F
+ * - Component is deactivated
+ * - Lifetime ends
+ *
+ *
+ * If phases contains no elements, then the Component will not be
+ * registered.
+ * @param component non-null Component being registered
+ * @param phases non-null Iterable of phases to register the Component for
+ * @return a Lifetime corresponding to when the Component is active
+ * @throws IllegalArgumentException if component or phases is null
+ */
+ public Lifetime register(Component component, Iterable phases) throws IllegalArgumentException {
+ Validate.notNull(component, "Component cannot be null");
+ Validate.notNull(phases, "Phases cannot be null");
+ RegisteredComponent rComponent = new RegisteredComponent(component);
+ for (T phase : phases)
+ {
+ _phases.computeIfAbsent(phase, (p) -> new ArrayList<>()).add(rComponent);
+ if (Objects.equals(phase, _current))
+ {
+ rComponent.start();
+ if (component instanceof PhasedComponent)
+ {
+ ((PhasedComponent) component).setPhase(phase);
+ }
+ }
+ }
+ return rComponent;
+ }
+
+ /**
+ * Starts the Lifetime, activating all components that are active for
+ * the entire lifetime, and then activating all components that are part
+ * of the provided phase.
+ * @param phase non-null phase to start
+ * @throws IllegalArgumentException if phase is null
+ * @throws IllegalStateException if the Lifetime is currently active
+ */
+ public void start(T phase) throws IllegalArgumentException, IllegalStateException
+ {
+ Validate.notNull(phase, "phase cannot be null");
+ Preconditions.checkState(!_active, "Lifetime already started");
+ _active = true;
+ _global.forEach(PhasedLifetime::active);
+ setPhase(phase);
+ }
+
+ /**
+ * Ends the Lifetime, deactivating all components in the current phase
+ * and then deactivating all components that are active for the entire Lifetime.
+ * A Lifetime may be subsequently reactivated after it has ended.
+ * @throws IllegalStateException if the lifetime isn't active
+ */
+ public void end() throws IllegalStateException
+ {
+ Preconditions.checkState(_active, "Lifetime not active");
+ List toDisable = _phases.get(getPhase());
+ if (toDisable != null)
+ {
+ toDisable.forEach(RegisteredComponent::end);
+ }
+ _global.forEach(PhasedLifetime::deactive);
+ _active = false;
+ _current = null;
+ }
+
+ /**
+ * Sets the current phase to the provided value, activating components
+ * that are active in the phase and not currently active, and deactiving
+ * components that were previously active and are not registered for the
+ * provided phase.
+ * @param phase non-null
+ * @throws IllegalStateException if the Lifetime isn't active
+ * @throws IllegalArgumentException if the phase equals the current phase
+ * or is null
+ */
+ public void setPhase(T phase) throws IllegalStateException, IllegalArgumentException
+ {
+ Preconditions.checkState(_active, "Lifetime not active");
+ Validate.isTrue(!Objects.equals(phase, _current), "Can't set the phase to the current phase");
+ Validate.notNull(phase, "the phase cannot be null");
+ T oldPhase = getPhase();
+ _current = phase;
+ List old = _phases.get(oldPhase);
+ List nextPhase = _phases.get(phase);
+
+ for (Component c : _global)
+ {
+ if (c instanceof PhasedComponent)
+ {
+ ((PhasedComponent) c).setPhase(phase);
+ }
+ }
+ // Disable components that were active in the last phase but not in the next phase.
+ if (old != null)
+ {
+ List toDisable = new ArrayList<>();
+ toDisable.addAll(old);
+ // Components that are in the next phase shouldn't be disabled.
+ if (nextPhase != null)
+ {
+ toDisable.removeAll(nextPhase);
+ }
+
+ // Ensure that all old ones get a setPhase call before disabling them.
+ for (RegisteredComponent r : toDisable)
+ {
+ if (r.getComponent() instanceof PhasedComponent)
+ {
+ ((PhasedComponent) r.getComponent()).setPhase(phase);
+ }
+ }
+ toDisable.forEach(RegisteredComponent::end);
+ }
+ if (nextPhase != null)
+ {
+ // New but not old
+ List toActivate = new ArrayList<>();
+ toActivate.addAll(nextPhase);
+ // Ensure that all components from last phase don't end up getting activated again.
+ if (old != null)
+ {
+ toActivate.removeAll(old);
+ }
+ // Start all the new ones
+ toActivate.forEach(RegisteredComponent::start);
+ // Give every remaining component a call to setPhase
+ for (RegisteredComponent r : nextPhase)
+ {
+ if (r.getComponent() instanceof PhasedComponent)
+ {
+ ((PhasedComponent) r.getComponent()).setPhase(phase);
+ }
+ }
+ }
+ }
+
+ private static void active(Component component)
+ {
+ try
+ {
+ component.activate();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ UtilServer.getPlugin().getLogger().severe("Failed to activate component: " + component);
+ }
+ }
+ private static void deactive(Component component)
+ {
+ try
+ {
+ component.deactivate();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ UtilServer.getPlugin().getLogger().severe("Failed to deactivate component: " + component);
+ }
+ }
+ /**
+ * Gets the current Phase. If this PhasedLifetime isn't active then
+ * the current phase is null.
+ * @return the current phase, null if not active
+ */
+ public T getPhase()
+ {
+ return _current;
+ }
+
+ /**
+ * {@inheritDoc}
+ * If the Component is an instance of PhasedComponent, it will receive
+ * notifications of phase changes prior to any components registered
+ * with specific phases. Global components will also be deactivated last.
+ * @param component the component to register
+ */
+ @Override
+ public void register(Component component)
+ {
+ _global.add(component);
+ if (this.isActive())
+ {
+ component.activate();
+ }
+ }
+
+ @Override
+ public boolean isActive()
+ {
+ return _active;
+ }
+
+ private static class RegisteredComponent extends SimpleLifetime implements Lifetime {
+ private Component _component;
+
+ public RegisteredComponent(Component component)
+ {
+ this._component = component;
+ }
+
+ public Component getComponent()
+ {
+ return _component;
+ }
+
+ @Override
+ public void start() throws IllegalStateException
+ {
+ PhasedLifetime.active(_component);
+ super.start();
+ }
+
+ @Override
+ public void end() throws IllegalStateException
+ {
+ super.end();
+ PhasedLifetime.deactive(_component);
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/SimpleLifetime.java b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/SimpleLifetime.java
new file mode 100644
index 000000000..28dcfe45e
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/lifetimes/SimpleLifetime.java
@@ -0,0 +1,96 @@
+package mineplex.core.lifetimes;
+
+import mineplex.core.common.util.UtilServer;
+import org.apache.commons.lang3.Validate;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ListIterator;
+
+/**
+ * A Lifetime that is not thread-safe and is essentially a list of Components.
+ * All components are activated in the order that they are registered. All
+ * components are deactivated in the reverse order that they are registered.
+ * Components may not be registered during invocations of start or end. If a
+ * Component throws an exception during activation it will be logged, however the
+ * Component will still only be disabled once all other Components are disabled.
+ */
+public class SimpleLifetime implements Lifetime
+{
+ protected final List _components = new ArrayList<>();
+ protected boolean _active = false;
+ @Override
+ public void register(Component component)
+ {
+ this._components.add(component);
+ if (this.isActive())
+ {
+ try
+ {
+ component.activate();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ UtilServer.getPlugin().getLogger().severe("Failed to active component: " + component);
+ }
+ }
+ }
+
+ @Override
+ public boolean isActive()
+ {
+ return _active;
+ }
+
+ /**
+ * Starts the SimpleLifetime, activating all components in the order that
+ * they were registered. A SimpleLifetime may be started multiple times,
+ * so long that every invocation of start after the first is preceded by
+ * an invocation of {@link #end()}. If a Component throws an exception
+ * during activation the exception will be logged, however no specific
+ * error-handling mechanism is provided. The Component will still be
+ * considered active and will be deactivated with all other Components.
+ * @throws IllegalStateException if currently active
+ */
+ public void start() throws IllegalStateException
+ {
+ Validate.isTrue(!_active);
+ _active = true;
+ for (Component component : _components)
+ {
+ try
+ {
+ component.activate();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ UtilServer.getPlugin().getLogger().severe("Failed to active component: " + component);
+ }
+ }
+ }
+
+ /**
+ * Deactivates all components in the reverse order that they were registered.
+ * Any exception thrown by a Component while being deactivated will be logged,
+ * however no exception handling mechanism is provided.
+ * @throws IllegalStateException if not currently active
+ */
+ public void end() throws IllegalStateException
+ {
+ Validate.isTrue(_active);
+ _active = false;
+ ListIterator reverseIterator = _components.listIterator(_components.size());
+ while (reverseIterator.hasPrevious())
+ {
+ Component component = reverseIterator.previous();
+ try
+ {
+ component.deactivate();
+ } catch (Exception e)
+ {
+ e.printStackTrace();
+ UtilServer.getPlugin().getLogger().severe("Failed to deactivate component: " + component);
+ }
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mavericks/DisplaySlot.java b/Plugins/Mineplex.Core/src/mineplex/core/mavericks/DisplaySlot.java
index 8e38983f6..35f605f3f 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mavericks/DisplaySlot.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mavericks/DisplaySlot.java
@@ -86,7 +86,7 @@ public class DisplaySlot
}
else
{
- UtilEnt.Vegetate(e, true);
+ UtilEnt.vegetate(e, true);
UtilEnt.ghost(e, true, false);
}
_pastedEntities.add(e);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenAnvilInput.java b/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenAnvilInput.java
new file mode 100644
index 000000000..393f5d60e
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenAnvilInput.java
@@ -0,0 +1,28 @@
+package mineplex.core.menu.builtin;
+
+import java.util.function.Supplier;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.menu.Button;
+import mineplex.core.menu.Menu;
+
+public abstract class ButtonOpenAnvilInput extends Button
+{
+ private final Supplier> _menuSupplier;
+
+ public ButtonOpenAnvilInput(T plugin, ItemStack item, Supplier> menu)
+ {
+ super(item, plugin);
+ _menuSupplier = menu;
+ }
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ _menuSupplier.get().open(player);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenInventory.java b/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenInventory.java
new file mode 100644
index 000000000..8c01dc846
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/menu/builtin/ButtonOpenInventory.java
@@ -0,0 +1,28 @@
+package mineplex.core.menu.builtin;
+
+import java.util.function.Supplier;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.menu.Button;
+import mineplex.core.menu.Menu;
+
+public class ButtonOpenInventory extends Button
+{
+ private final Supplier> _menuSupplier;
+
+ public ButtonOpenInventory(ItemStack item, T plugin, Supplier> menu)
+ {
+ super(item, plugin);
+ _menuSupplier = menu;
+ }
+
+ @Override
+ public void onClick(Player player, ClickType clickType)
+ {
+ _menuSupplier.get().open(player);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
index 1203bad95..a1d664e60 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/mount/DragonData.java
@@ -44,7 +44,7 @@ public class DragonData extends MountData
//Spawn Dragon
Dragon = rider.getWorld().spawn(rider.getLocation(), EnderDragon.class);
- UtilEnt.Vegetate(Dragon);
+ UtilEnt.vegetate(Dragon);
UtilEnt.ghost(Dragon, true, false);
rider.getWorld().playSound(rider.getLocation(), Sound.ENDERDRAGON_GROWL, 20f, 1f);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
index 73c160a68..4e76af53b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/npc/NpcManager.java
@@ -341,7 +341,7 @@ public class NpcManager extends MiniPlugin
if (npc.getDatabaseRecord().getRadius() == 0)
{
- UtilEnt.Vegetate(entity);
+ UtilEnt.vegetate(entity);
UtilEnt.silence(entity, true);
UtilEnt.ghost(entity, true, false);
@@ -604,7 +604,7 @@ public class NpcManager extends MiniPlugin
if (npc.getDatabaseRecord().getRadius() == 0)
{
- UtilEnt.Vegetate(entity);
+ UtilEnt.vegetate(entity);
UtilEnt.ghost(entity, true, false);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/InviteData.java b/Plugins/Mineplex.Core/src/mineplex/core/party/InviteData.java
index b401da6d1..b0ebe12d6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/InviteData.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/InviteData.java
@@ -1,27 +1,59 @@
package mineplex.core.party;
+import java.util.UUID;
+
/**
* Serializable invite data
*/
public class InviteData
{
+ private final String _inviterName;
+ private final UUID _inviterUUID;
+ private final UUID _partyUUID;
+ private final String _serverName;
- private String _invitedTo;
- private String _serverFrom;
-
- public InviteData(String invitedTo, String serverFrom)
+ public InviteData(String inviterName, UUID inviterUUID, UUID partyUUID, String serverName)
{
- _invitedTo = invitedTo;
- _serverFrom = serverFrom;
+ _inviterName = inviterName;
+ _inviterUUID = inviterUUID;
+ _partyUUID = partyUUID;
+ _serverName = serverName;
}
- public String getInvitedTo()
+ public String getInviterName()
{
- return _invitedTo;
+ return _inviterName;
}
- public String getServerFrom()
+ public UUID getInviterUUID()
{
- return _serverFrom;
+ return _inviterUUID;
+ }
+
+ public UUID getPartyUUID()
+ {
+ return _partyUUID;
+ }
+
+ public String getServerName()
+ {
+ return _serverName;
+ }
+
+ @Override
+ public boolean equals(Object o)
+ {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+
+ InviteData that = (InviteData) o;
+
+ return _partyUUID.equals(that._partyUUID);
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return _partyUUID.hashCode();
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java b/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
index 1826241a7..57da4496a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/Lang.java
@@ -16,7 +16,6 @@ public enum Lang
SUCCESS_SERVER_CONNECT("Sending you and your party to {0}..."),
INVITE_SUCCESS_PLAYER("Successfully invited {0} to the party."),
SUCCESS_INVITE("{0} has invited {1} to the party."),
- INVITE_RECEIVED("You have been invited to {0}''s party! You have 60 seconds to reply."),
INVITE_ACCEPT("{0} has joined the party."),
INVITE_DENY("{0} declined your invite."),
INVITE_EXPIRED("{0} did not respond in time."),
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java b/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
index 743cbb1ab..522fff3fa 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/Party.java
@@ -1,163 +1,114 @@
package mineplex.core.party;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.party.constants.PartyRemoveReason;
-import mineplex.core.party.event.PartyTransferOwnerEvent;
-import mineplex.core.party.event.PartyTransferOwnerEvent.TransferReason;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
+import org.bukkit.event.Listener;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import com.google.common.collect.Lists;
+import com.mojang.authlib.GameProfile;
+
+import mineplex.core.Managers;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.party.constants.PartyRemoveReason;
+import mineplex.core.party.rediscommands.PartyTransferRequest;
+import mineplex.core.utils.UtilGameProfile;
/**
* The main object for Parites.
*/
-public class Party
+public class Party implements Listener
{
-
- /**
- * This is controls whether or not the owner is currently in the menu, and kicking members
- */
- private transient boolean _ownerKickMode = false;
-
- /**
- * Asserts if this party has already been put into teams in order to prevent the Arcade from reassigning teams
- */
- private transient boolean _alreadyTeamed = false;
-
/**
* The maximum amount of players a party can have.
*/
private static final int PARTY_MAX_SIZE = 16;
- /**
- * Partners that have already been placed
- */
- private transient final List _teamed;
+ private final PartyManager _partyManager = Managers.require(PartyManager.class);
/**
- * The current leader of this party
+ * The unique ID assigned to this party
*/
- private String _owner;
+ private UUID _uniqueId = UUID.randomUUID();
/**
- * The names of all current party members
+ * Metadata related to the current owner of this party, stored in serializable form for transferring
*/
- private List _members;
+ private GameProfile _owner;
- /**
- * The UUIDS of all current party members
- */
- private List _membersByUUID;
-
- /**
- * All current pending invites
- */
- private Map _invites;
+ private List _members = Lists.newArrayList();
/**
* This party's max size
*/
- private int _size;
+ private int _size = PARTY_MAX_SIZE;
- /**
- * Team preferences
- */
- private Map> _preferences;
+ private List _pendingUnrankedMembers = new ArrayList<>();
+ private List _pendingMembers = new ArrayList<>();
- /**
- * Empty constructor for GSON
- */
- public Party()
+ public Party(PartyTransferRequest request)
{
- _teamed = Lists.newArrayList();
+ _uniqueId = request.getPartyUUID();
+ _owner = request.getOwnerGameProfile();
+
+ _pendingMembers.addAll(request.getAllMembers());
+ _pendingUnrankedMembers.addAll(request.getUnrankedMembers());
+
+
+ _partyManager.runSyncLater(() ->
+ {
+ // No one joined :(
+ for (UUID uuid : _pendingUnrankedMembers)
+ {
+ _partyManager.getClientManager().unreserve(uuid);
+ }
+ for (UUID uuid : _pendingMembers)
+ {
+ _partyManager.removePendingJoin(uuid);
+ }
+ // No one joined :(
+ if (_pendingMembers.size() == request.getAllMembers().size())
+ {
+ _partyManager.removeParty(Party.this);
+ }
+ }, 20 * 10L);
}
/**
- * Creates a new fresh party instance
+ * Creates a new party instance
*
* @param owner The owner / leader of the party.
*/
- public Party(String owner)
+ public Party(Player owner)
{
- _owner = owner;
- _members = Lists.newArrayList();
- _invites = Maps.newHashMap();
+ _owner = UtilGameProfile.getGameProfile(owner);
_members.add(owner);
- _teamed = Lists.newArrayList();
- _membersByUUID = Lists.newArrayList();
- _preferences = Maps.newHashMap();
- _membersByUUID.add(Bukkit.getPlayerExact(owner).getUniqueId());
}
- public String getOwner()
+ public String getOwnerName()
+ {
+ return _owner.getName();
+ }
+
+ public GameProfile getOwner()
{
return _owner;
}
- /**
- * Get the current members by their IGN
- *
- * @return The list of named party members
- */
- public List getMembers()
+ public Optional getOwnerAsPlayer()
{
- return _members;
+ return Optional.ofNullable(Bukkit.getPlayer(_owner.getId()));
}
- public Map getInvites()
+ public UUID getUniqueId()
{
- return _invites;
- }
-
- /**
- * An alternate method to get the owner of the party.
- * While this does not have any difference to using {@code getOwner}, it may serve a purpose in the future, should we wish to allow
- * donators to name their party something custom.
- *
- * @return This party's name
- */
- public String getName()
- {
- return _owner;
- }
-
- /**
- * Gets the players preferred teammate for a game
- *
- * @param player The player's UUID
- * @return His team preference
- */
- public String getPartner(UUID player, String game)
- {
- Map prefs = _preferences.get(player);
- if (prefs == null)
- {
- prefs = Maps.newHashMap();
- _preferences.put(player, prefs);
- return null;
- }
- return prefs.get(game);
- }
-
- /**
- * Set a player's partner preference
- *
- * @param player The player
- * @param game The name of the game
- * @param partner The name of his partner
- */
- public void setPartner(Player player, String game, String partner)
- {
- Map prefs = _preferences.getOrDefault(player.getUniqueId(), Maps.newHashMap());
- prefs.put(game, partner);
- _preferences.put(player.getUniqueId(), prefs);
+ return this._uniqueId;
}
/**
@@ -167,9 +118,7 @@ public class Party
*/
public void sendMessage(String message)
{
- // Todo actually figure out why one of the members is no longer online
- // probably some desync between players and something
- _members.stream().map(Bukkit::getPlayer).filter(Objects::nonNull).forEach(player -> player.sendMessage(message));
+ getMembers().forEach(player -> player.sendMessage(message));
}
public int getSize()
@@ -177,161 +126,66 @@ public class Party
return _size;
}
- /**
- * Set's this party's size cap base off the current players rank
- *
- */
- public void setSize()
- {
- _size = PARTY_MAX_SIZE;
- }
-
- /**
- * Called when a player is added to the party.
- *
- * @param player The name of the player
- */
- public void onPlayerAdd(String player)
- {
- _invites.remove(player);
- if(_members.contains(player))
- {
- return;
- }
- _members.add(player);
- Lang.ADD_MEMBER.send(this, player);
- getMembers().forEach(s ->
- {
- Player player1 = Bukkit.getPlayer(s);
- player1.playSound(player1.getLocation(), Sound.NOTE_PLING, 1.0F, 10.0F);
- });
- }
-
- /**
- * Called when a member of the party is removed
- *
- * @param player The name of the player
- * @param reason The reason for his removal.
- */
- public void onPlayerRemove(String player, PartyRemoveReason reason)
- {
- if(reason == PartyRemoveReason.DISBANDED)
- {
- Player bukkitPlayer = Bukkit.getPlayerExact(player);
- Lang.DISBANDED.send(bukkitPlayer);
- bukkitPlayer.closeInventory();
- return;
- }
-
- if(_members.size() <= 0)
- {
- return;
- }
-
- if(reason == PartyRemoveReason.LEFT)
- {
- if(player.equalsIgnoreCase(_owner) && _members.size() > 1)
- {
- _owner = _members.get(0);
- Lang.TRANSFER_OWNER.send(this, player, _owner);
- PartyTransferOwnerEvent event = new PartyTransferOwnerEvent(this, _owner, player, TransferReason.LEFT);
- UtilServer.getServer().getPluginManager().callEvent(event);
- return;
- }
- Lang.REMOVE_PLAYER.send(this, player);
- return;
- }
-
- if(reason == PartyRemoveReason.OTHER)
- {
- return;
- }
-
- if(reason == PartyRemoveReason.KICKED)
- {
- Lang.REMOVE_PLAYER_KICK.send(this, player);
- }
- }
-
- /**
- * Gets the current state of whether or not the owner is kicking people in the UI.
- *
- * @return true if the owner is kicking people
- */
- public boolean isOwnerKickMode()
- {
- return _ownerKickMode;
- }
-
- /**
- * Set's the current state of kicking players
- *
- * @param ownerKickMode true if the owner is kicking people
- */
- public void setOwnerKickMode(boolean ownerKickMode)
- {
- _ownerKickMode = ownerKickMode;
- }
-
/**
* Set's the new owner for this party instance
*
* @param owner The new owner's name
*/
- public void setOwner(String owner)
+ public void setOwner(Player owner)
{
- _owner = owner;
+ _owner = UtilGameProfile.getGameProfile(owner);
}
- /**
- * Get a list of all members in the party by their UUID
- *
- * @return A list of members by UUID
- */
- public List getMembersByUUID()
+ public boolean isMember(Player player)
{
- return _membersByUUID;
+ return _members.contains(player);
}
- public boolean alreadyTeamed()
+ public void addMember(Player player)
{
- return _alreadyTeamed;
- }
-
- public void setAlreadyTeamed(boolean alreadyTeamed)
- {
- _alreadyTeamed = alreadyTeamed;
- }
-
- /**
- * Check to see if this party contains a certain player name
- * This is case-insensitive
- *
- * @param name The players name
- * @return true If the player is in the party
- */
- public boolean contains(String name)
- {
- for (UUID member : _membersByUUID)
+ if (_members.contains(player))
{
- if (Bukkit.getPlayer(member).getName().equalsIgnoreCase(name))
- {
- return true;
- }
+ return;
}
- return false;
+ _members.add(player);
+ _pendingMembers.remove(player.getUniqueId());
+ _pendingUnrankedMembers.remove(player.getUniqueId());
+ Lang.ADD_MEMBER.send(this, player.getName());
+ getMembers().forEach(player1 -> player1.playSound(player1.getLocation(), Sound.NOTE_PLING, 1.0F, 10.0F));
}
- public boolean isAlreadyTeamed(UUID uuid)
+ public List getMembers()
{
- return _teamed.contains(uuid);
+ return Collections.unmodifiableList(_members);
}
- public void setTeamed(Player... players)
+ public boolean isOwner(Player caller)
{
- for (Player player : players)
+ return caller.getUniqueId().equals(this._owner.getId());
+ }
+
+ public void clear()
+ {
+ _owner = null;
+ _members.clear();
+ UtilServer.Unregister(this);
+ }
+
+ public void removeMember(Player player)
+ {
+ _members.remove(player);
+
+ if (_members.size() <= 0)
{
- _teamed.add(player.getUniqueId());
+ return;
+ }
+
+ System.out.println("Removing member: " + player.getName() + " "+ player.getUniqueId() + " owner is " + _owner.getId());
+
+ if (player.getUniqueId().equals(_owner.getId()) && _members.size() > 0)
+ {
+ _owner = UtilGameProfile.getGameProfile(_members.get(0));
+ Lang.TRANSFER_OWNER.send(this, player.getName(), _owner.getName());
}
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java
deleted file mode 100644
index 9f88df666..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyEventListener.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package mineplex.core.party;
-
-import mineplex.core.common.Rank;
-import mineplex.core.menu.Menu;
-import mineplex.core.party.constants.PartyRemoveReason;
-import mineplex.core.party.event.PartyMemberKickGUIEvent;
-import mineplex.core.party.event.PartySendToServerEvent;
-import mineplex.core.party.event.PartyTransferOwnerEvent;
-import mineplex.core.portal.ServerTransferEvent;
-import mineplex.serverdata.data.MinecraftServer;
-import org.bukkit.Bukkit;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.player.PlayerInteractEvent;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.event.player.PlayerQuitEvent;
-
-/**
- * Event handler for Parties
- */
-public class PartyEventListener implements Listener
-{
-
- private final PartyManager _plugin;
-
- public PartyEventListener(PartyManager plugin)
- {
- _plugin = plugin;
- _plugin.getPluginManager().registerEvents(this, plugin.getPlugin());
- }
-
- @EventHandler
- public void onJoin(PlayerJoinEvent event)
- {
- Player player = event.getPlayer();
-
- String partyName = _plugin.getInviteManager().getPartyWaiting(player.getUniqueId());
-
- if (partyName == null)
- {
- return;
- }
-
- Party party = _plugin.getParty(partyName);
-
- Player bukkitPlayer = Bukkit.getPlayerExact(partyName);
-
- if (party == null)
- {
- party = new Party(partyName);
-
- if (bukkitPlayer != null && _plugin.getClientManager().Get(bukkitPlayer).GetRank().has(Rank.ULTRA))
- {
- party.setSize();
- } else
- {
- party.setSize();
- }
-
- _plugin.addParty(party);
- }
-
- _plugin.getInviteManager().cancelTask(player.getUniqueId());
-
- _plugin.getMethodManager().addToParty(Bukkit.getPlayerExact(partyName), party);
-
- _plugin.getMethodManager().addToParty(player, party);
-
- _plugin.getInviteManager().removeFromWaiting(player.getUniqueId());
-
- }
-
- @EventHandler
- public void onQuit(PlayerQuitEvent event)
- {
- Player player = event.getPlayer();
-
- Party party = _plugin.getParty(player);
-
- _plugin.getInviteManager().removeAll(player.getUniqueId());
-
- if (party == null)
- {
- return;
- }
-
- PartyRemoveReason reason = PartyRemoveReason.LEFT;
-
- if(_plugin.getJoinManager().isTransferring(player))
- {
- reason = PartyRemoveReason.OTHER;
- }
-
- _plugin.getMethodManager().removeFromParty(player, reason);
- }
-
-
- @EventHandler
- public void onTransferOwner(PartyTransferOwnerEvent event)
- {
- _plugin.getMethodManager().transferOwner(event.getNewOwner(), event.getOldOwner());
- }
-
- @EventHandler
- public void onKick(PartyMemberKickGUIEvent event)
- {
- Player clicked = Bukkit.getPlayerExact(event.getPlayerClicked());
- Lang.REMOVED.send(clicked);
- _plugin.getMethodManager().removeFromParty(clicked, PartyRemoveReason.KICKED);
- Menu.get(event.getOwner().getUniqueId()).resetAndUpdate();
- }
-
- @EventHandler
- public void onTransfer(ServerTransferEvent event)
- {
- Player player = event.getPlayer();
- Party party = _plugin.getParty(player);
-
- if (party == null)
- {
- return;
- }
-
- if(event.isDraggedByParty())
- {
- return;
- }
-
- event.setParty(party);
- event.setCancel(true);
-
- if (!party.getOwner().equalsIgnoreCase(player.getName()))
- {
- Lang.NOT_OWNER_SERVER.send(player);
- return;
- }
-
- String server = event.getServer();
- if(server.equalsIgnoreCase("Lobby"))
- {
- return;
- }
-
- _plugin.getJoinManager().requestServerJoin(event.getServer(), party);
- }
-
- @EventHandler
- public void onSend(PartySendToServerEvent event)
- {
- Party party = event.getParty();
- MinecraftServer server = event.getMinecraftServer();
- _plugin.getRedisManager().sendPartyInfo(server.getName(), party);
- }
-
- @EventHandler
- public void onClick(PlayerInteractEvent event)
- {
- if(event.hasItem() && event.getItem().getType() == Material.NAME_TAG)
- {
- event.setCancelled(true);
- event.getPlayer().chat("/party");
- }
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
index 13d20aca5..a63ea6ff9 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/PartyManager.java
@@ -1,38 +1,56 @@
package mineplex.core.party;
-import com.google.common.collect.Maps;
-import mineplex.core.MiniPlugin;
-import mineplex.core.account.CoreClientManager;
-import mineplex.core.common.util.C;
-import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.party.command.PartyCommand;
-import mineplex.core.party.manager.PartyInviteManager;
-import mineplex.core.party.manager.PartyJoinManager;
-import mineplex.core.party.manager.PartyMethodManager;
-import mineplex.core.party.manager.PartyRedisManager;
-import mineplex.core.portal.Portal;
-import mineplex.core.preferences.PreferencesManager;
-import mineplex.serverdata.Region;
-import mineplex.serverdata.Utility;
-import mineplex.serverdata.servers.ServerManager;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
-
import java.io.File;
+import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
+import org.bukkit.Bukkit;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.bukkit.scheduler.BukkitTask;
+
+import com.google.common.collect.Maps;
+
+import mineplex.core.MiniPlugin;
+import mineplex.core.account.CoreClientManager;
+import mineplex.core.common.jsonchat.ChildJsonMessage;
+import mineplex.core.common.jsonchat.ClickEvent;
+import mineplex.core.common.jsonchat.HoverEvent;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.menu.Menu;
+import mineplex.core.party.command.PartyCommand;
+import mineplex.core.party.constants.PartyRemoveReason;
+import mineplex.core.party.manager.PartyInviteManager;
+import mineplex.core.party.manager.PartyJoinManager;
+import mineplex.core.party.manager.PartyRedisManager;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteAccept;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteCommand;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteDeny;
+import mineplex.core.portal.Portal;
+import mineplex.core.preferences.Preference;
+import mineplex.core.preferences.PreferencesManager;
+import mineplex.serverdata.Region;
+import mineplex.serverdata.commands.ServerCommandManager;
+
public class PartyManager extends MiniPlugin
{
-
/**
* The item given to a player in his hotbar to manage the Parties via the new UI.
*/
- public static final ItemStack INTERFACE_ITEM = new ItemBuilder(Material.NAME_TAG).setTitle(C.cGreen + "Parties").build();
+ public static final ItemStack INTERFACE_ITEM = new ItemBuilder(Material.NAME_TAG)
+ .setTitle(C.cGreen + "Parties")
+ .build();
+
/**
- * The slow to which it goes in.
+ * The slot to which it goes in.
*/
public static final int INTERFACE_SLOT = 5;
@@ -43,66 +61,71 @@ public class PartyManager extends MiniPlugin
private final PartyRedisManager _redisManager;
private final PartyInviteManager _inviteManager;
private final PartyJoinManager _joinManager;
- private final PartyMethodManager _methodManager;
/**
* This local instance's name
*/
private final String _serverName;
- /**
- * A map of player's in parties server wide.
- */
- private final Map _players = Maps.newHashMap();
+ private final Map _partiesById = new HashMap<>();
+ private final Map _partiesByPlayer = new HashMap<>();
- /**
- * A map of owner (name) -> party server wide
- */
- private final Map _parties = Maps.newHashMap();
private final Region _region;
+ /**
+ * Maps UUID of player to UUID of party that they're supposed to join
+ */
+ private final Map _pendingJoinMap = new HashMap<>();
- public PartyManager(JavaPlugin plugin, Portal portal, CoreClientManager clientManager, PreferencesManager preferenceManager)
+
+ public PartyManager()
{
- super("Parties", plugin);
- _portal = portal;
- _clientManager = clientManager;
- _preferencesManager = preferenceManager;
+ super("Parties");
+ _portal = require(Portal.class);
+ _clientManager = require(CoreClientManager.class);
+ _preferencesManager = require(PreferencesManager.class);
- _serverName = _plugin.getConfig().getString("serverstatus.name");
+ _serverName = UtilServer.getServerName();
- _redisManager = new PartyRedisManager(this, _serverName,
- Utility.generatePool(ServerManager.getMasterConnection()),
- Utility.generatePool(ServerManager.getSlaveConnection()));
+ _redisManager = new PartyRedisManager(this, _serverName);
- _inviteManager = new PartyInviteManager(this, _redisManager);
+ _inviteManager = new PartyInviteManager(this);
_joinManager = new PartyJoinManager(this);
- _methodManager = new PartyMethodManager(this);
- addCommand(new PartyCommand(this));
- new PartyEventListener(this);
_region = !new File("eu.dat").exists() ? Region.US : Region.EU;
}
- public Party getParty(String party)
+ @Deprecated
+ public void putIntoPendingJoin(UUID player, UUID party)
{
- return _parties.get(party);
+ _pendingJoinMap.put(player, party);
}
- public Party getParty(Player player)
+ @Override
+ public void addCommands()
{
- return _players.get(player.getUniqueId());
+ addCommand(new PartyCommand(this));
+ }
+
+ public Party getPartyByPlayer(UUID playerId)
+ {
+ return _partiesByPlayer.get(playerId);
+ }
+
+ public Party getPartyById(UUID playerId)
+ {
+ return _partiesById.get(playerId);
+ }
+
+ public Party getPartyByPlayer(Player player)
+ {
+ return _partiesByPlayer.get(player.getUniqueId());
}
public void addParty(Party party)
{
- _parties.put(party.getName(), party);
- }
-
- public void removeParty(Party party)
- {
- _parties.remove(party.getName());
+ _partiesById.put(party.getUniqueId(), party);
}
public Portal getPortal()
@@ -135,29 +158,425 @@ public class PartyManager extends MiniPlugin
return _serverName;
}
- public PartyJoinManager getJoinManager()
- {
- return _joinManager;
- }
-
- public PartyMethodManager getMethodManager()
- {
- return _methodManager;
- }
-
- public Map getPlayerParties()
- {
- return _players;
- }
-
- public Map getParties()
- {
- return _parties;
- }
-
public Region getRegion()
{
return _region;
}
+ public void denyInviteBySender(Player caller, String senderName)
+ {
+ PartyInviteManager inviteManager = getInviteManager();
+
+ if (!inviteManager.hasInviteFrom(caller, senderName))
+ {
+ UtilPlayer.message(caller, F.main("Party", "You do not have a pending invite to " + F.elem(senderName) + "'s party."));
+ return;
+ }
+
+ InviteData invite = inviteManager.getInviteBySender(caller.getName(), senderName);
+
+ inviteManager.removeInvite(caller, senderName);
+
+ if (invite.getServerName().equals(_serverName))
+ {
+ Player senderPlayer = Bukkit.getPlayerExact(senderName);
+ if (senderPlayer == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "You have denied your invite to " + F.elem(senderName) + "'s party, but it seems that " + F.elem(senderName) + " is no longer in this server"));
+ return;
+ }
+
+ Party partyBySender = getPartyByPlayer(senderPlayer);
+
+ if (partyBySender == null)
+ {
+ // todo send cancelled invitation msg when party is disbanded
+ UtilPlayer.message(caller, F.main("Party", "You have denied your invite to " + F.elem(senderPlayer.getName()) + "'s party, but it seems that " + F.elem(senderPlayer.getName()) + " has disbanded his party as well"));
+ return;
+ }
+
+ UtilPlayer.message(caller, F.main("Party", "You have denied your invite to " + F.elem(senderPlayer.getName()) + "'s party"));
+ UtilPlayer.message(senderPlayer, F.main("Party", F.elem(caller.getName()) + " has denied your invite"));
+ }
+ else
+ {
+ Player senderPlayer = Bukkit.getPlayerExact(senderName);
+ if (senderPlayer != null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "You have denied your invite to " + F.elem(senderPlayer.getName()) + "'s party, but it seems that " + F.elem(senderPlayer.getName()) + " has joined you in this server"));
+ return;
+ }
+
+ UtilPlayer.message(caller, F.main("Party", "You have denied your invite to " + F.elem(senderName) + "'s party"));
+
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteDeny(
+ caller.getName(),
+ caller.getUniqueId(),
+ invite.getInviterName(),
+ invite.getInviterUUID(),
+ invite.getPartyUUID()
+ ));
+ }
+ }
+
+ public void acceptInviteBySender(Player caller, String senderName)
+ {
+ if (getPartyByPlayer(caller) != null)
+ {
+ caller.sendMessage(F.main("Party", "Please leave your party before accepting another invite!"));
+ return;
+ }
+
+ PartyInviteManager inviteManager = getInviteManager();
+
+ if (!inviteManager.hasInviteFrom(caller, senderName))
+ {
+ UtilPlayer.message(caller, F.main("Party", "You do not have a pending invite to " + F.elem(senderName) + "'s party."));
+ return;
+ }
+
+ InviteData invite = inviteManager.getInviteBySender(caller.getName(), senderName);
+
+ inviteManager.removeInvite(caller, senderName);
+
+ if (invite.getServerName().equals(_serverName))
+ {
+ Player senderPlayer = Bukkit.getPlayerExact(senderName);
+ if (senderPlayer == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "It seems that " + F.elem(senderName) + " is no longer in this server"));
+ return;
+ }
+
+ Party partyBySender = getPartyByPlayer(senderPlayer);
+
+ if (partyBySender == null)
+ {
+ // todo send cancelled invitation msg when party is disbanded
+ UtilPlayer.message(caller, F.main("Party", "It seems that " + F.elem(senderName) + " has disbanded his party. Shucks!"));
+ return;
+ }
+ addToParty(caller, partyBySender);
+ }
+ else
+ {
+ Player senderPlayer = Bukkit.getPlayerExact(senderName);
+ if (senderPlayer != null)
+ {
+ // todo maybe auto create party (if there are no new desync issues)
+ UtilPlayer.message(caller, F.main("Party", "Strange. It seems that " + F.elem(senderName) + " has preemptively joined you in this server. They'll need to resend an invitation"));
+ return;
+ }
+
+ UtilPlayer.message(caller, F.main("Party", "Please wait while I attempt to locate " + F.elem(invite.getInviterName()) + "..."));
+
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteAccept(
+ caller.getName(),
+ caller.getUniqueId(),
+ invite.getInviterName(),
+ invite.getInviterUUID(),
+ invite.getPartyUUID()
+ ));
+
+ runSyncLater(() ->
+ {
+ if (!caller.isOnline())
+ {
+ return;
+ }
+
+ UtilPlayer.message(caller, F.main("Party", "Uh oh. It looks like " + F.elem(invite.getInviterName()) + " has left the network - I couldn't find them!"));
+ }, 20 * 5L);
+ }
+ }
+
+ /**
+ * @param caller The player who initiated the request
+ * @param target The player's target
+ */
+ public void invite(Player caller, String target)
+ {
+ if (target.equalsIgnoreCase(caller.getName()))
+ {
+ caller.sendMessage(F.main("Party", "You cannot invite yourself!"));
+ return;
+ }
+
+ Player possible = Bukkit.getPlayerExact(target);
+
+ Party party = getPartyByPlayer(caller);
+
+ // preemptively create party - it might be a slight inconvenience but it saves a lot of untangling work
+ if (party == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "You don't seem to have a party, so I've created a new one for you!"));
+ party = new Party(caller);
+ _partiesById.put(party.getUniqueId(), party);
+ addToParty(caller, party);
+ }
+
+ if (!party.getOwnerName().equalsIgnoreCase(caller.getName()))
+ {
+ party.sendMessage(F.main("Party", F.elem(caller.getName()) + " has suggested " + F.elem(target) + " be invited"));
+ party.getOwnerAsPlayer().ifPresent(owner ->
+ {
+ ChildJsonMessage message = new ChildJsonMessage("").extra(F.main("Party", "Click "));
+ message.add(F.link("Invite " + target))
+ .hover(HoverEvent.SHOW_TEXT, C.cGreen + "Clicking this will invite " + C.cYellow + target + C.cGreen + " to the party")
+ .click(ClickEvent.RUN_COMMAND, "/party gui invite " + target);
+ message.add(C.mBody + " to invite them");
+ message.sendToPlayer(owner);
+ });
+ return;
+ }
+ if (party.getMembers().size() >= party.getSize())
+ {
+ Lang.PARTY_FULL.send(caller);
+ return;
+ }
+ if (possible != null && party.isMember(possible))
+ {
+ Lang.ALREADY_MEMBER.send(caller, target);
+ return;
+ }
+ if (getInviteManager().getInviteBySender(target, caller.getName()) != null)
+ {
+ Lang.ALREADY_INVITED.send(caller, target);
+ return;
+ }
+ if (possible != null && !getPreferencesManager().get(possible).isActive(Preference.PARTY_REQUESTS))
+ {
+ UtilPlayer.message(caller, F.main("Party", F.name(target) + " is not accepting invites at this time."));
+ return;
+ }
+
+ //Same Server
+ if (possible != null)
+ {
+ Lang.SUCCESS_INVITE.send(party, caller.getName(), target);
+ getInviteManager().inviteTo(possible.getName(), possible.getUniqueId(), caller.getName(), caller.getUniqueId(), party.getUniqueId(), getServerName());
+ }
+ else
+ {
+ findAndInvite(caller, target, party);
+ }
+ }
+
+ /**
+ * Initiates inviting a player who is no on the same server
+ */
+ private void findAndInvite(Player caller, String target, Party destParty)
+ {
+ Map pendingInvites = getRedisManager().getPendingFindResponse().computeIfAbsent(caller.getUniqueId(), key -> new HashMap<>());
+ if (!pendingInvites.containsKey(target))
+ {
+ caller.sendMessage(F.main("Party", "Attempting to invite " + F.elem(target) + "..."));
+ pendingInvites.put(target, runSyncLater(new BukkitRunnable()
+ {
+ @Override
+ public void run()
+ {
+ if (!pendingInvites.containsKey(target))
+ {
+ return;
+ }
+ pendingInvites.remove(target);
+ if (!caller.isOnline())
+ {
+ return;
+ }
+
+ Player targetPlayer = Bukkit.getPlayerExact(target);
+ if (targetPlayer != null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Huh. We couldn't find " + F.elem(target) + ", but it seems they've joined you in your server"));
+ return;
+ }
+
+ caller.sendMessage(F.main("Party", "Could not locate " + F.elem(target) + "."));
+ }
+ }, 20L * 5));
+
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteCommand(caller, target, destParty));
+ }
+ else
+ {
+ caller.sendMessage(F.main("Party", "Please wait until the previous invite has completed"));
+ }
+ }
+
+ public Party getPendingParty(Player player)
+ {
+ UUID partyUUID = _pendingJoinMap.get(player.getUniqueId());
+ if (partyUUID == null) return null;
+ for (Party party : _partiesById.values())
+ {
+ if (party.getUniqueId().equals(partyUUID))
+ return party;
+ }
+ return null;
+ }
+
+ public boolean hasPendingJoin(Player player)
+ {
+ return _pendingJoinMap.containsKey(player.getUniqueId());
+ }
+
+ public void removePendingJoin(Player player)
+ {
+ _pendingJoinMap.remove(player.getUniqueId());
+ }
+
+ public void removePendingJoin(UUID player)
+ {
+ _pendingJoinMap.remove(player);
+ }
+
+ /**
+ * Kicks a player from the callers party
+ *
+ * @param caller The player who initiated the request
+ * @param target The player's target
+ */
+ public void kickPlayer(Player caller, String target)
+ {
+ Party party = getPartyByPlayer(caller);
+
+ if (party == null)
+ {
+ Lang.NO_PARTY.send(caller);
+ return;
+ }
+
+ if (!party.isOwner(caller))
+ {
+ Lang.NOT_OWNER.send(caller);
+ return;
+ }
+
+ Player playerTarget = Bukkit.getPlayerExact(target);
+
+ if (playerTarget == null)
+ {
+ Lang.NOT_MEMBER.send(caller, target);
+ return;
+ }
+
+ if (!party.isMember(playerTarget))
+ {
+ Lang.NOT_MEMBER.send(caller, target);
+ return;
+ }
+
+ removeFromParty(playerTarget, PartyRemoveReason.KICKED);
+ }
+
+ public void addToParty(Player player, Party party)
+ {
+ _partiesByPlayer.put(player.getUniqueId(), party);
+ party.addMember(player);
+ }
+
+ /**
+ * Leaves the players current party if he is in one
+ *
+ * @param caller The player who wishes to leave his party
+ */
+ public void leaveParty(Player caller)
+ {
+ Party party = getPartyByPlayer(caller);
+
+ if (party == null)
+ {
+ Lang.NO_PARTY.send(caller);
+ return;
+ }
+
+ removeFromParty(caller, PartyRemoveReason.LEFT);
+ Lang.LEFT.send(caller);
+ }
+
+ public void removeFromParty(Player player, PartyRemoveReason reason)
+ {
+ Party party = _partiesByPlayer.remove(player.getUniqueId());
+
+ if (party == null)
+ {
+ return;
+ }
+
+ if (player.getOpenInventory() != null)
+ {
+ if (Menu.get(player.getUniqueId()) != null)
+ {
+ player.closeInventory();
+ Menu.remove(player.getUniqueId());
+ }
+ }
+
+ switch (reason)
+ {
+ case KICKED:
+ Lang.REMOVE_PLAYER_KICK.send(party, player.getName());
+ break;
+ case LEFT:
+ Lang.REMOVE_PLAYER.send(party, player.getName());
+ break;
+ case OTHER:
+ break;
+ case DISBANDED:
+ break;
+ case DISBANDED_BY_OWNER:
+ break;
+ }
+
+ party.removeMember(player);
+
+ if (party.getMembers().size() == 0)
+ {
+ removeParty(party);
+ }
+ }
+
+ /**
+ * Disbands a player's current party
+ *
+ * @param caller The player who wishes to disband his party
+ */
+ public void disband(Player caller)
+ {
+ Party party = getPartyByPlayer(caller);
+
+ if (party == null)
+ {
+ Lang.NO_PARTY.send(caller);
+ return;
+ }
+
+ if (!party.isOwner(caller))
+ {
+ Lang.NOT_OWNER.send(caller);
+ return;
+ }
+
+ caller.sendMessage(F.main("Party", "You have disbanded your party."));
+ Lang.DISBANDED_BY_OWNER.send(party);
+ removeParty(party);
+ }
+
+ public void removeParty(Party party)
+ {
+ _joinManager.removePendingJoin(party);
+ _partiesById.remove(party.getUniqueId());
+ _partiesByPlayer.entrySet().removeIf(ent -> ent.getValue().equals(party));
+ party.clear();
+ }
+
+ public void giveItemIfNotExists(Player player)
+ {
+ if (!UtilItem.isSimilar(player.getInventory().getItem(INTERFACE_SLOT), INTERFACE_ITEM, UtilItem.ItemAttribute.NAME, UtilItem.ItemAttribute.MATERIAL))
+ {
+ player.getInventory().setItem(PartyManager.INTERFACE_SLOT, PartyManager.INTERFACE_ITEM);
+ }
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCLICommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCLICommand.java
new file mode 100644
index 000000000..a5cdc12e6
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCLICommand.java
@@ -0,0 +1,159 @@
+package mineplex.core.party.command;
+
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.command.cli.PartyAcceptCommand;
+import mineplex.core.party.command.cli.PartyDenyCommand;
+import mineplex.core.party.command.cli.PartyDisbandCommand;
+import mineplex.core.party.command.cli.PartyHelpCommand;
+import mineplex.core.party.command.cli.PartyInviteCommand;
+import mineplex.core.party.command.cli.PartyInvitesCommand;
+import mineplex.core.party.command.cli.PartyKickCommand;
+import mineplex.core.party.command.cli.PartyLeaveCommand;
+import mineplex.core.party.command.cli.PartyTransferOwnerCommand;
+
+public class PartyCLICommand extends MultiCommandBase
+{
+ public PartyCLICommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "cli", "c");
+
+ AddCommand(new PartyAcceptCommand(plugin));
+ AddCommand(new PartyDenyCommand(plugin));
+ AddCommand(new PartyDisbandCommand(plugin));
+ AddCommand(new PartyInviteCommand(plugin));
+ AddCommand(new PartyInvitesCommand(plugin));
+ AddCommand(new PartyKickCommand(plugin));
+ AddCommand(new PartyLeaveCommand(plugin));
+ AddCommand(new PartyTransferOwnerCommand(plugin));
+ AddCommand(new PartyHelpCommand(plugin));
+ }
+
+ @Override
+ protected void Help(Player caller, String[] args)
+ {
+ Party party = Plugin.getPartyByPlayer(caller);
+
+ if (args.length > 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "That is not a valid command! Try " + F.elem("/party help") + "!"));
+ return;
+ }
+
+ if (party == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "You're not in a party! Try " + F.elem("/party help") + "!"));
+ return;
+ }
+
+ ComponentBuilder builder = new ComponentBuilder("")
+ .append("[", ComponentBuilder.FormatRetention.NONE)
+ .bold(true)
+ .color(ChatColor.AQUA)
+ .append("?", ComponentBuilder.FormatRetention.NONE)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to view Party Help").create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z help"))
+ .append("]", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .append("===========", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .strikethrough(true)
+ .append("[", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .append("Your Party", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.WHITE)
+ .bold(true)
+ .append("]", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .append("==============", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .strikethrough(true)
+ .append("\n\n", ComponentBuilder.FormatRetention.NONE);
+
+ builder.append("Leader")
+ .color(party.getOwnerAsPlayer() == null ? ChatColor.GRAY : ChatColor.LIGHT_PURPLE)
+ .bold(true)
+ .append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append(party.getOwnerName())
+ .append("\n");
+
+ for (Player member : party.getMembers())
+ {
+ if (member.getUniqueId().equals(party.getOwner().getId()))
+ continue;
+
+ builder.append("Member")
+ .color(ChatColor.DARK_PURPLE)
+ .bold(true)
+ .append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append(member.getName());
+
+ if (party.isOwner(caller))
+ {
+ builder.append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append("✕", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.RED)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Kick " + member.getName() + " from your party").color(ChatColor.RED).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z cli kick " + member.getName()))
+ .append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append("⬆", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.GOLD)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Transfer party to " + member.getName()).color(ChatColor.GOLD).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z cli tr " + member.getName()));
+ }
+
+ builder.append("\n", ComponentBuilder.FormatRetention.NONE);
+ }
+
+ builder.append("\n", ComponentBuilder.FormatRetention.NONE);
+
+ builder.append("Toggle GUI")
+ .color(ChatColor.GREEN)
+ .bold(true)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Switch to the chest GUI instead of chat").color(ChatColor.GREEN).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z t"))
+ .append(" - ", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.GRAY)
+ .append("Leave")
+ .color(ChatColor.RED)
+ .bold(true)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Leave your party").color(ChatColor.RED).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z cli leave"));
+
+ if (party.isOwner(caller))
+ {
+ builder
+ .append(" - ")
+ .color(ChatColor.GRAY)
+ .append("Disband")
+ .color(ChatColor.DARK_RED)
+ .bold(true)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Disband your party").color(ChatColor.DARK_RED).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/z cli disband"));
+ }
+
+ builder.append("\n", ComponentBuilder.FormatRetention.NONE)
+ .append("======================================")
+ .color(ChatColor.AQUA)
+ .bold(true)
+ .strikethrough(true);
+
+ caller.spigot().sendMessage(builder.create());
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCommand.java
index 152a4eeaf..b86ec8059 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCommand.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyCommand.java
@@ -1,95 +1,54 @@
package mineplex.core.party.command;
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.party.Party;
-import mineplex.core.party.PartyManager;
-import mineplex.core.party.ui.menus.PartyInvitesMenu;
-import mineplex.core.party.ui.menus.PartyMainMenu;
-import mineplex.core.party.ui.menus.PartyOwnerMenu;
-import mineplex.core.party.ui.menus.PartyViewMenu;
+import java.util.Arrays;
+
import org.bukkit.entity.Player;
+import mineplex.core.Managers;
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+import mineplex.core.preferences.Preference;
+import mineplex.core.preferences.PreferencesManager;
+
/**
* Command handler for party commands
*/
-public class PartyCommand extends CommandBase
+public class PartyCommand extends MultiCommandBase
{
-
- private final String[] HELP = {
- F.main("Party", "Party Commands (Click the command!)"),
- help("", "Brings up the Party GUI"),
- help("", "Send an invitation to a player."),
- help("leave", "Leave your current party."),
- C.cBlue + "Party> " + C.cWhite + "# " + C.cGray + "- Send a message to your party.",
- C.cGreenB + "All party functions have been moved to the GUI!",
- C.cGreenB + "Click the NameTag in your hotbar to get started!"
- };
+ private final PreferencesManager _preferencesManager = Managers.require(PreferencesManager.class);
public PartyCommand(PartyManager plugin)
{
- super(plugin, Rank.ALL, "party", "z", "partyaccept", "partydeny", "openinvitesmenu", "partyinvite");
+ super(plugin, Rank.ALL, "party", "z");
+
+ AddCommand(new PartyGuiCommand(plugin));
+ AddCommand(new PartyCLICommand(plugin));
+ AddCommand(new PartyToggleCommand(plugin));
}
@Override
- public void Execute(Player caller, String[] args)
+ protected void Help(Player caller, String[] args)
{
- if (args.length == 0)
+ if (args.length > 0)
{
- if(_aliasUsed.equalsIgnoreCase("openinvitesmenu"))
+ if (!args[0].equalsIgnoreCase("cli") && !args[0].equalsIgnoreCase("gui"))
{
- new PartyInvitesMenu(Plugin).open(caller);
- return;
+ String[] newArgs = new String[args.length + 1];
+ System.arraycopy(args, 0, newArgs, 1, args.length);
+ newArgs[0] = _preferencesManager.get(caller).isActive(Preference.PARTY_DISPLAY_INVENTORY_UI) ? "gui" : "cli";
+ args = newArgs;
}
- Party party = Plugin.getParty(caller);
- if (party == null)
- {
- new PartyMainMenu(Plugin).open(caller);
- return;
- }
- if (party.getOwner().equalsIgnoreCase(caller.getName()))
- {
- new PartyOwnerMenu(party, Plugin).open(caller);
- return;
- }
- new PartyViewMenu(party, Plugin).open(caller);
- return;
}
-
- if(args.length == 1)
+ else
{
- String arg = args[0];
- if (_aliasUsed.equalsIgnoreCase("partyaccept"))
- {
- Plugin.getMethodManager().respondToInvite(caller, arg, true);
- return;
- }
- if (_aliasUsed.equalsIgnoreCase("partydeny"))
- {
- Plugin.getMethodManager().respondToInvite(caller, arg, false);
- return;
- }
- if(_aliasUsed.equalsIgnoreCase("partyinvite"))
- {
- Plugin.getMethodManager().invite(caller, arg);
- return;
- }
- if(arg.equalsIgnoreCase("leave")) {
- Plugin.getMethodManager().leaveParty(caller);
- return;
- }
- Plugin.getMethodManager().invite(caller, arg);
- return;
+ String[] newArgs = new String[1];
+ newArgs[0] = _preferencesManager.get(caller).isActive(Preference.PARTY_DISPLAY_INVENTORY_UI) ? "gui" : "cli";
+ args = newArgs;
}
- caller.sendMessage(HELP);
+ Execute(caller, args);
}
-
- private String help(String command, String description)
- {
- return C.cBlue + "Party> " + C.cWhite + "/party " + command + C.cGray + " - " + description;
- }
-
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyGuiCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyGuiCommand.java
new file mode 100644
index 000000000..a22589667
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyGuiCommand.java
@@ -0,0 +1,56 @@
+package mineplex.core.party.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.MultiCommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.command.gui.PartyGUIAcceptInviteCommand;
+import mineplex.core.party.command.gui.PartyGUIDenyInviteCommand;
+import mineplex.core.party.command.gui.PartyGUIInviteCommand;
+import mineplex.core.party.command.gui.PartyGUILeaveCommand;
+import mineplex.core.party.command.gui.PartyOpenInviteMenuCommand;
+import mineplex.core.party.ui.menus.PartyMainMenu;
+import mineplex.core.party.ui.menus.PartyOwnerMenu;
+import mineplex.core.party.ui.menus.PartyViewMenu;
+
+public class PartyGuiCommand extends MultiCommandBase
+{
+ public PartyGuiCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "gui", "g");
+
+ AddCommand(new PartyOpenInviteMenuCommand(plugin));
+ AddCommand(new PartyGUIAcceptInviteCommand(plugin));
+ AddCommand(new PartyGUIDenyInviteCommand(plugin));
+ AddCommand(new PartyGUIInviteCommand(plugin));
+ AddCommand(new PartyGUILeaveCommand(plugin));
+ }
+
+ // a hacky method for a hacky original system
+ @Override
+ protected void Help(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ Party party = Plugin.getPartyByPlayer(caller);
+ if (party == null)
+ {
+ new PartyMainMenu(Plugin).open(caller);
+ }
+ else if (party.getOwnerName().equalsIgnoreCase(caller.getName()))
+ {
+ new PartyOwnerMenu(party, Plugin).open(caller);
+ }
+ else
+ {
+ new PartyViewMenu(party, Plugin).open(caller);
+ }
+ }
+ else if (args.length == 1)
+ {
+ Plugin.invite(caller, args[0]);
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyToggleCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyToggleCommand.java
new file mode 100644
index 000000000..ff61eef79
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/PartyToggleCommand.java
@@ -0,0 +1,37 @@
+package mineplex.core.party.command;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.Managers;
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+import mineplex.core.preferences.Preference;
+import mineplex.core.preferences.PreferencesManager;
+
+public class PartyToggleCommand extends CommandBase
+{
+ private final PreferencesManager _preferencesManager = Managers.require(PreferencesManager.class);
+
+ public PartyToggleCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "toggle", "t");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ _preferencesManager.get(caller).toggle(Preference.PARTY_DISPLAY_INVENTORY_UI);
+ if (_preferencesManager.get(caller).isActive(Preference.PARTY_DISPLAY_INVENTORY_UI))
+ {
+ UtilPlayer.message(caller, F.main("Party", "The Party GUI is now " + C.cGreen + "enabled" + C.mBody + "!"));
+ }
+ else
+ {
+ UtilPlayer.message(caller, F.main("Party", "The Party GUI is now " + C.cRed + "disabled" + C.mBody + "!"));
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/TeamPreferenceCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/TeamPreferenceCommand.java
deleted file mode 100644
index ad27de3fa..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/command/TeamPreferenceCommand.java
+++ /dev/null
@@ -1,167 +0,0 @@
-package mineplex.core.party.command;
-
-import com.google.common.collect.Maps;
-import mineplex.core.command.CommandBase;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilPlayer;
-import mineplex.core.game.GameDisplay;
-import mineplex.core.party.Lang;
-import mineplex.core.party.Party;
-import mineplex.core.party.PartyManager;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Unused for now.
- */
-public class TeamPreferenceCommand extends CommandBase
-{
-
- private static final String[] ARGS = {
- "teampref",
- "teamprefs",
- "teamp",
- "tprefs",
- "teampreferences"
- };
-
- private final String ACCEPT = "accept";
- private final String DENY = "deny";
-
- private final String ACCEPT_COMMAND = "/teamprefs accept ";
- private final String DENY_COMMAND = "/teamprefs deny ";
-
- private final String HEADER = "Partners";
-
- //Player, Partner, GameName
- private Map> INVITES = Maps.newHashMap();
-
- public TeamPreferenceCommand(PartyManager plugin)
- {
- super(plugin, Rank.ALL, ARGS);
- }
-
- @Override
- public void Execute(Player player, String[] args)
- {
- if (args.length < 2)
- {
- Lang.PARTNER_USAGE.sendHeader(player, HEADER);
- return;
- }
-
- String arg = args[0];
-
- if (arg.equalsIgnoreCase(ACCEPT) || arg.equalsIgnoreCase(DENY))
- {
- Party party = Plugin.getParty(player);
-
- if (party == null)
- {
- Lang.NO_PARTY.send(player);
- return;
- }
-
- String inviter = args[1];
- boolean accept = arg.equalsIgnoreCase(ACCEPT);
- Player inviterPlayer = Bukkit.getPlayerExact(inviter);
-
- if (inviterPlayer == null)
- {
- Lang.PARTNER_NOT_ONLINE.sendHeader(player, HEADER, inviter);
- return;
- }
-
- Map sent = INVITES.get(inviterPlayer.getUniqueId());
-
- if (sent == null || sent.isEmpty())
- {
- Lang.PARTNER_PLAYER_NOT_REQUESTED.sendHeader(player, HEADER, inviter);
- return;
- }
-
- if (sent.get(player.getName()) == null)
- {
- Lang.PARTNER_PLAYER_NOT_REQUESTED.sendHeader(player, HEADER, inviter);
- return;
- }
-
- String gameName = sent.remove(player.getName());
-
- if (!accept)
- {
- Lang.PARTNER_REQUEST_DENIED_PLAYER.send(player, inviterPlayer.getName(), gameName);
- Lang.PARTNER_REQUEST_DENIED_SENDER.send(inviterPlayer, player.getName(), gameName);
- return;
- }
-
- Lang.PARTNER_REQUEST_ACCEPT_PLAYER.send(player, inviterPlayer.getName(), gameName);
- Lang.PARTNER_REQUEST_ACCEPT_SENDER.send(inviterPlayer, player.getName(), gameName);
- party.setPartner(player, gameName, inviterPlayer.getName());
- party.setPartner(inviterPlayer, gameName, player.getName());
- return;
- }
-
- Player target = Bukkit.getPlayerExact(arg);
- String gameName = "";
- String[] game = new String[args.length - 2];
- System.arraycopy(args, 2, game, 0, game.length);
-
- for (String s : game)
- {
- gameName += s + " ";
- }
-
- gameName = gameName.trim();
-
- GameDisplay gameDisplay = GameDisplay.matchName(gameName);
-
- if (gameDisplay == null)
- {
- Lang.PARTNER_NO_GAME.sendHeader(player, HEADER, gameName);
- return;
- }
-
- gameName = gameDisplay.getName();
-
- if (alreadyInvited(player, gameName, target.getName()))
- {
- Lang.PARTNER_ALREADY_INVITED.sendHeader(player, HEADER, target.getName(), gameName);
- return;
- }
-
- sendRequest(player, gameName, target);
- }
-
- private void sendRequest(Player player, String game, Player partner)
- {
- invite(player, game, partner);
- String gameName = C.cGreen + (game);
- String playerName = C.cGreen + (player.getName());
- String partnerName = C.cGreen + (partner.getName());
- String acceptCommand = ACCEPT_COMMAND + player.getName();
- String declineCommand = DENY_COMMAND + player.getName();
- String acceptText = Lang.PARTNER_HOVER_TEXT_ACCEPT.toString(playerName, gameName);
- String declineText = Lang.PARTNER_HOVER_TEXT_DENY.toString(playerName, gameName);
- Lang.PARTNER_REQUEST_SENT.sendHeader(player, HEADER, partnerName, gameName);
- Lang.PARTNER_REQUEST_RECEIVED.sendHeader(partner, HEADER, playerName, gameName);
- UtilPlayer.sendAcceptOrDeny(partner, HEADER, acceptCommand, acceptText, declineCommand, declineText, null, null);
- }
-
- private boolean alreadyInvited(Player player, String game, String partner)
- {
- Map sent = INVITES.get(player.getUniqueId());
- return !(sent == null || sent.isEmpty()) && sent.get(partner).equalsIgnoreCase(game);
- }
-
- private void invite(Player player, String game, Player partner)
- {
- Map sent = INVITES.getOrDefault(player.getUniqueId(), Maps.newHashMap());
- sent.put(partner.getName(), game);
- INVITES.put(player.getUniqueId(), sent);
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyAcceptCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyAcceptCommand.java
new file mode 100644
index 000000000..4e6da0969
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyAcceptCommand.java
@@ -0,0 +1,30 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+
+public class PartyAcceptCommand extends CommandBase
+{
+ public PartyAcceptCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "accept", "a");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify whose invite you're accepting!"));
+ return;
+ }
+
+ Plugin.acceptInviteBySender(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyBlockCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyBlockCommand.java
new file mode 100644
index 000000000..902dada8c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyBlockCommand.java
@@ -0,0 +1,21 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.PartyManager;
+
+public class PartyBlockCommand extends CommandBase
+{
+ public PartyBlockCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "block", "b");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDenyCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDenyCommand.java
new file mode 100644
index 000000000..051f03a36
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDenyCommand.java
@@ -0,0 +1,28 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyDenyCommand extends CommandBase
+{
+ public PartyDenyCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "deny", "d");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify whose invite you're denying!"));
+ return;
+ }
+ Plugin.denyInviteBySender(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDisbandCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDisbandCommand.java
new file mode 100644
index 000000000..0d1265b58
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyDisbandCommand.java
@@ -0,0 +1,21 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.PartyManager;
+
+public class PartyDisbandCommand extends CommandBase
+{
+ public PartyDisbandCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "disband", "db");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ Plugin.disband(caller);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyHelpCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyHelpCommand.java
new file mode 100644
index 000000000..31626f8ac
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyHelpCommand.java
@@ -0,0 +1,34 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyHelpCommand extends CommandBase
+{
+ public PartyHelpCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "help", "h");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Parties Help"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [help/h]") + " - Shows this help dialog"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [invite/i] [player]") + " - Invite [player] to your party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [invites/is] (page)") + " - List your current pending invitations"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [kick/k] [player]") + " - Kick [player] from your party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [accept/a] [player]") + " - Accept your invitation to [player]'s party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [deny/d] [player]") + " - Deny your invitation to [player]'s party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [leave/l]") + " - Leave your current party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [disband/db]") + " - Disband your current party"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [transfer/tr] [player]") + " - Transfers ownership of the party to another player"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [gui/g]") + " - Opens the party GUI"));
+ UtilPlayer.message(caller, F.main("Party", F.elem("/party [toggle/t]") + " - Toggles between the GUI and the chat"));
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInviteCommand.java
new file mode 100644
index 000000000..4fbaceb44
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInviteCommand.java
@@ -0,0 +1,28 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyInviteCommand extends CommandBase
+{
+ public PartyInviteCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "invite", "i");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify who to invite!"));
+ return;
+ }
+ Plugin.invite(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInvitesCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInvitesCommand.java
new file mode 100644
index 000000000..09dd58e77
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyInvitesCommand.java
@@ -0,0 +1,200 @@
+package mineplex.core.party.command.cli;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.UUID;
+
+import net.md_5.bungee.api.ChatColor;
+import net.md_5.bungee.api.chat.BaseComponent;
+import net.md_5.bungee.api.chat.ClickEvent;
+import net.md_5.bungee.api.chat.ComponentBuilder;
+import net.md_5.bungee.api.chat.HoverEvent;
+
+import org.apache.commons.lang.StringUtils;
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.C;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.InviteData;
+import mineplex.core.party.PartyManager;
+
+public class PartyInvitesCommand extends CommandBase
+{
+ private static int boostCount = 0;
+
+ public PartyInvitesCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "invites", "is");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 2 && args[0].equals("boost"))
+ {
+ boostCount = Integer.parseInt(args[1]);
+ return;
+ }
+
+ List invites = Plugin.getInviteManager().getAllInvites(caller);
+
+ invites.sort(Comparator.comparing(InviteData::getInviterName));
+
+ if (boostCount != 0)
+ {
+ invites = new ArrayList<>();
+
+ for (int i = 0; i < boostCount; i++)
+ {
+ invites.add(new InviteData("Player" + i, UUID.randomUUID(), UUID.randomUUID(), "Server" + i));
+ }
+ }
+
+ if (invites == null || invites.isEmpty())
+ {
+ UtilPlayer.message(caller, F.main("Party", "You have no pending invites!"));
+ return;
+ }
+
+ int totalPages = (int) Math.ceil(invites.size() / 8.0);
+ int page = 0;
+
+ if (args.length != 0)
+ {
+ try
+ {
+ page = Integer.parseInt(args[0]);
+ }
+ catch (NumberFormatException ex)
+ {
+ UtilPlayer.message(caller, F.main("Party", F.elem(args[0]) + " is not a number!"));
+ return;
+ }
+ page = page - 1;
+
+ if (page < 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Page numbers must be greater than zero!"));
+ return;
+ }
+ else if (page >= totalPages)
+ {
+ UtilPlayer.message(caller, F.main("Party", "You only have " + F.elem(totalPages) + " pages of invites, that number is too big!"));
+ return;
+ }
+ }
+
+ String header = "[" +
+ ChatColor.RESET + C.cWhite + C.Bold + "Party Invites (" + (page + 1) + "/" + totalPages + ")" +
+ ChatColor.RESET + C.cAqua + C.Strike + "]";
+
+ int headerChars = ChatColor.stripColor(header).length();
+
+ int numEqualsInHeader = (50 - headerChars) / 2;
+ header = C.cAqua + C.Strike + StringUtils.repeat("=", numEqualsInHeader) + header + StringUtils.repeat("=", numEqualsInHeader);
+
+ caller.sendMessage(header);
+
+ int start = page * 8;
+
+ List subList = start < invites.size() ? invites.subList(start, Math.min(invites.size(), start + 8)) : Collections.emptyList();
+
+ for (InviteData data : subList)
+ {
+ BaseComponent[] hover = new ComponentBuilder("")
+ .append("Server: ")
+ .color(ChatColor.YELLOW)
+ .append(data.getServerName(), ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.WHITE)
+ .create();
+
+ ComponentBuilder builder = new ComponentBuilder("")
+ .append("Accept")
+ .color(ChatColor.GREEN)
+ .bold(true)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to accept this invite").color(ChatColor.GREEN).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/party cli a " + data.getInviterName()))
+ .append(" - ", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.WHITE)
+ .append("Deny")
+ .color(ChatColor.RED)
+ .bold(true)
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new ComponentBuilder("Click to deny this invite").color(ChatColor.RED).create()))
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/party cli d " + data.getInviterName()))
+ .append(" - ", ComponentBuilder.FormatRetention.NONE)
+ .color(ChatColor.WHITE)
+ .append(data.getInviterName() + " invited you to their party")
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, hover))
+ .color(ChatColor.GRAY);
+
+ caller.spigot().sendMessage(builder.create());
+ }
+
+ int chars = ChatColor.stripColor(header).length();
+
+ int numEquals = (chars - 5) / 2; // 5 chars: " < > "
+
+ ComponentBuilder pageSwitch = new ComponentBuilder("")
+ .append(StringUtils.repeat("=", numEquals) + "[")
+ .strikethrough(true)
+ .color(ChatColor.AQUA)
+ .append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append("<", ComponentBuilder.FormatRetention.NONE)
+ .bold(true);
+
+ if (page > 0)
+ {
+ BaseComponent[] prev = new ComponentBuilder("")
+ .append("Go to page " + page)
+ .color(ChatColor.GREEN)
+ .create();
+
+ pageSwitch
+ .color(ChatColor.GREEN)
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/party is " + (page)))
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, prev));
+
+ }
+ else
+ {
+ pageSwitch
+ .color(ChatColor.GRAY);
+ }
+
+ pageSwitch.append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append(">", ComponentBuilder.FormatRetention.NONE)
+ .bold(true);
+
+ if (page + 1 < totalPages)
+ {
+ BaseComponent[] next = new ComponentBuilder("")
+ .append("Go to page " + (page + 2))
+ .color(ChatColor.GREEN)
+ .create();
+
+ pageSwitch
+ .color(ChatColor.GREEN)
+ .event(new ClickEvent(ClickEvent.Action.RUN_COMMAND, "/party is " + (page + 2)))
+ .event(new HoverEvent(HoverEvent.Action.SHOW_TEXT, next));
+
+ }
+ else
+ {
+ pageSwitch
+ .color(ChatColor.GRAY);
+ }
+
+ pageSwitch
+ .append(" ", ComponentBuilder.FormatRetention.NONE)
+ .append("]" + StringUtils.repeat("=", numEquals), ComponentBuilder.FormatRetention.NONE)
+ .strikethrough(true)
+ .color(ChatColor.AQUA);
+
+ caller.spigot().sendMessage(pageSwitch.create());
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyKickCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyKickCommand.java
new file mode 100644
index 000000000..7eda98171
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyKickCommand.java
@@ -0,0 +1,29 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+
+public class PartyKickCommand extends CommandBase
+{
+ public PartyKickCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "kick", "k");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ Party party = Plugin.getPartyByPlayer(caller);
+ if (party != null)
+ {
+ if (party.getOwnerName().equals(caller.getName()))
+ {
+ Plugin.kickPlayer(caller, args[0]);
+ }
+ }
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyLeaveCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyLeaveCommand.java
new file mode 100644
index 000000000..90b9f305c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyLeaveCommand.java
@@ -0,0 +1,21 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.PartyManager;
+
+public class PartyLeaveCommand extends CommandBase
+{
+ public PartyLeaveCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "leave", "l");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ Plugin.leaveParty(caller);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyTransferOwnerCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyTransferOwnerCommand.java
new file mode 100644
index 000000000..e91242635
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/cli/PartyTransferOwnerCommand.java
@@ -0,0 +1,60 @@
+package mineplex.core.party.command.cli;
+
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.Lang;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+
+public class PartyTransferOwnerCommand extends CommandBase
+{
+ public PartyTransferOwnerCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "transfer", "tr");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ Party playerParty = Plugin.getPartyByPlayer(caller);
+
+ if (playerParty == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You're not in a party!"));
+ return;
+ }
+
+ if (!playerParty.getOwner().getId().equals(caller.getUniqueId()))
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You're not the owner of the party!"));
+ return;
+ }
+
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify who you're transferring the party to!"));
+ return;
+ }
+
+ Player player = Bukkit.getPlayer(args[0]);
+ if (player == null)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Could not find " + F.elem(args[0]) + "!"));
+ return;
+ }
+
+ if (!playerParty.isMember(player))
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. " + F.elem(player.getName())+ " is not in your party!"));
+ return;
+ }
+
+ playerParty.setOwner(player);
+ Lang.TRANSFER_OWNER.send(playerParty, caller.getName(), player.getName());
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIAcceptInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIAcceptInviteCommand.java
new file mode 100644
index 000000000..5a182b060
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIAcceptInviteCommand.java
@@ -0,0 +1,29 @@
+package mineplex.core.party.command.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyGUIAcceptInviteCommand extends CommandBase
+{
+ public PartyGUIAcceptInviteCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "partyaccept", "accept", "a");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify whose invite you're accepting!"));
+ return;
+ }
+
+ Plugin.acceptInviteBySender(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIDenyInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIDenyInviteCommand.java
new file mode 100644
index 000000000..f77d078a0
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIDenyInviteCommand.java
@@ -0,0 +1,28 @@
+package mineplex.core.party.command.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyGUIDenyInviteCommand extends CommandBase
+{
+ public PartyGUIDenyInviteCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "partydeny", "deny", "d");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify whose invite you're denying!"));
+ return;
+ }
+ Plugin.denyInviteBySender(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIInviteCommand.java
new file mode 100644
index 000000000..0fbed629a
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUIInviteCommand.java
@@ -0,0 +1,29 @@
+package mineplex.core.party.command.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+
+public class PartyGUIInviteCommand extends CommandBase
+{
+ public PartyGUIInviteCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "partyinvite", "invite", "i");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ if (args.length == 0)
+ {
+ UtilPlayer.message(caller, F.main("Party", "Oops. You didn't specify who to invite!"));
+ return;
+ }
+ Plugin.invite(caller, args[0]);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUILeaveCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUILeaveCommand.java
new file mode 100644
index 000000000..e4858300b
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyGUILeaveCommand.java
@@ -0,0 +1,23 @@
+package mineplex.core.party.command.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.PartyManager;
+
+public class PartyGUILeaveCommand extends CommandBase
+{
+ public PartyGUILeaveCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "leave", "l");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ Plugin.leaveParty(caller);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyOpenInviteMenuCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyOpenInviteMenuCommand.java
new file mode 100644
index 000000000..0064e920c
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/command/gui/PartyOpenInviteMenuCommand.java
@@ -0,0 +1,22 @@
+package mineplex.core.party.command.gui;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.command.CommandBase;
+import mineplex.core.common.Rank;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.ui.menus.PartyInvitesMenu;
+
+public class PartyOpenInviteMenuCommand extends CommandBase
+{
+ public PartyOpenInviteMenuCommand(PartyManager plugin)
+ {
+ super(plugin, Rank.ALL, "openinvitesmenu", "invitesmenu", "im", "invites", "is");
+ }
+
+ @Override
+ public void Execute(Player caller, String[] args)
+ {
+ new PartyInvitesMenu(Plugin).open(caller);
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/constants/InviteResponse.java b/Plugins/Mineplex.Core/src/mineplex/core/party/constants/InviteResponse.java
deleted file mode 100644
index 30212e51d..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/constants/InviteResponse.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mineplex.core.party.constants;
-
-import mineplex.core.common.util.F;
-
-/**
- *
- */
-public enum InviteResponse
-{
-
- ACCEPTED("{0} has joined the party!"),
- DENIED("{0} has declined joining your party."),
- EXPIRED("{0} did not respond in time.");
-
- private String _message;
-
- InviteResponse(String message)
- {
- _message = message;
- }
-
- public String format(String target)
- {
- return _message.replace("{0}", F.name(target));
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/constants/JoinResponseReason.java b/Plugins/Mineplex.Core/src/mineplex/core/party/constants/JoinResponseReason.java
deleted file mode 100644
index 56cd100e2..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/constants/JoinResponseReason.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package mineplex.core.party.constants;
-
-import mineplex.core.common.util.F;
-
-/**
- *
- */
-public enum JoinResponseReason
-{
-
- CANNOT_JOIN_FULL(F.main("Party", "Your party cannot join full servers!")),
- SUCCESS("");
-
- private String _message;
-
- JoinResponseReason(String message)
- {
- _message = message;
- }
-
- public String getMessage()
- {
- return _message;
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyDataReceivedEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyDataReceivedEvent.java
deleted file mode 100644
index d4d25f699..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyDataReceivedEvent.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package mineplex.core.party.event;
-
-import mineplex.core.party.Party;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * An event called when a server receives a PartyPacket containing the information about a party
- */
-public class PartyDataReceivedEvent extends Event
-{
- private static final HandlerList HANDLER_LIST = new HandlerList();
-
- private final Party _party;
-
- public PartyDataReceivedEvent(Party party)
- {
- _party = party;
- }
-
- public Party getParty()
- {
- return _party;
- }
-
- @Override
- public HandlerList getHandlers()
- {
- return HANDLER_LIST;
- }
-
- public static HandlerList getHandlerList()
- {
- return HANDLER_LIST;
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyMemberKickGUIEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyMemberKickGUIEvent.java
deleted file mode 100644
index 885567240..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyMemberKickGUIEvent.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package mineplex.core.party.event;
-
-import mineplex.core.party.Party;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * This event is called when an owner clicks a PartyMemberIcon while having Kick mode activated.
- */
-public class PartyMemberKickGUIEvent extends Event
-{
- private static final HandlerList HANDLER_LIST = new HandlerList();
-
- private final Party _party;
- private final String _playerClicked;
- private final Player _owner;
-
- public PartyMemberKickGUIEvent(Party party, String playerClicked, Player owner)
- {
- _party = party;
- _playerClicked = playerClicked;
- _owner = owner;
- }
-
- public String getPlayerClicked()
- {
- return _playerClicked;
- }
-
- public Player getOwner()
- {
- return _owner;
- }
-
- public Party getParty()
- {
- return _party;
- }
-
- @Override
- public HandlerList getHandlers()
- {
- return HANDLER_LIST;
- }
-
- public static HandlerList getHandlerList()
- {
- return HANDLER_LIST;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySendToServerEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySendToServerEvent.java
deleted file mode 100644
index 604db6eb7..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartySendToServerEvent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package mineplex.core.party.event;
-
-import mineplex.core.party.Party;
-import mineplex.serverdata.data.MinecraftServer;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- *
- */
-public class PartySendToServerEvent extends Event
-{
- private static final HandlerList HANDLER_LIST = new HandlerList();
-
- private final Party _party;
- private final MinecraftServer _minecraftServer;
-
- public PartySendToServerEvent(Party party, MinecraftServer minecraftServer)
- {
- _party = party;
- _minecraftServer = minecraftServer;
- }
-
- public Party getParty()
- {
- return _party;
- }
-
- @Override
- public HandlerList getHandlers()
- {
- return HANDLER_LIST;
- }
-
- public static HandlerList getHandlerList()
- {
- return HANDLER_LIST;
- }
-
- public MinecraftServer getMinecraftServer()
- {
- return _minecraftServer;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyTransferOwnerEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyTransferOwnerEvent.java
deleted file mode 100644
index c21abd883..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/event/PartyTransferOwnerEvent.java
+++ /dev/null
@@ -1,65 +0,0 @@
-package mineplex.core.party.event;
-
-import mineplex.core.party.Party;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * An event called when an owner leaves a party
- */
-public class PartyTransferOwnerEvent extends Event
-{
-
- public enum TransferReason
- {
- LEFT,
- TRANSFER;
- }
-
- private static final HandlerList HANDLER_LIST = new HandlerList();
-
- private final Party _party;
- private final String _newOwner;
- private final String _oldOwner;
- private final TransferReason _reason;
-
- public PartyTransferOwnerEvent(Party party, String newOwner, String oldOwner, TransferReason reason)
- {
- _party = party;
- _newOwner = newOwner;
- _oldOwner = oldOwner;
- _reason = reason;
- }
-
- public String getNewOwner()
- {
- return _newOwner;
- }
-
- public String getOldOwner()
- {
- return _oldOwner;
- }
-
- public TransferReason getReason()
- {
- return _reason;
- }
-
- public Party getParty()
- {
- return _party;
- }
-
- @Override
- public HandlerList getHandlers()
- {
- return HANDLER_LIST;
- }
-
- public static HandlerList getHandlerList()
- {
- return HANDLER_LIST;
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java
index bfff39b40..8ecc3ee0d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyInviteManager.java
@@ -1,173 +1,155 @@
package mineplex.core.party.manager;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-import mineplex.core.common.Rank;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.party.InviteData;
-import mineplex.core.party.Lang;
-import mineplex.core.party.Party;
-import mineplex.core.party.PartyManager;
-import mineplex.core.party.constants.InviteResponse;
-import mineplex.core.party.redis.RedisMessageType;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+
import net.md_5.bungee.api.ChatColor;
import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.ClickEvent.Action;
import net.md_5.bungee.api.chat.HoverEvent;
import net.md_5.bungee.api.chat.TextComponent;
+
import org.bukkit.Bukkit;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import org.bukkit.scheduler.BukkitTask;
+import org.spigotmc.CaseInsensitiveMap;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
+import mineplex.core.party.InviteData;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
/**
- *
+ * This class manages invites to parties
*/
public class PartyInviteManager
{
+ // Map of Player Name (invitee) to invites (inviter)
+ private final Map> _activeInvites = new CaseInsensitiveMap<>();
- private final Map> _activeInvites = Maps.newHashMap();
- private final Map _invitedBy = Maps.newHashMap();
- private final Map _awaitingJoin = Maps.newHashMap();
- private final Map _players = Maps.newHashMap();
- private final Map _tasks = Maps.newHashMap();
+ private final Map _tasks = new HashMap<>();
private final PartyManager _plugin;
- private final PartyRedisManager _partyRedisManager;
- public PartyInviteManager(PartyManager plugin, PartyRedisManager partyRedisManager)
+ public PartyInviteManager(PartyManager plugin)
{
_plugin = plugin;
- _partyRedisManager = partyRedisManager;
}
- /**
- * Responds to an invite, regardless of the server
- *
- * @param player The player calling
- * @param party The party
- * @param accept Whether or not the player accepted the invite
- */
- public void respondToInvite(Player player, String party, boolean accept)
+ public InviteData getInviteBySender(String invitee, String sender)
{
- Player possible = Bukkit.getPlayerExact(party);
+ Set map = _activeInvites.get(invitee);
- InviteData data = remove(party, player.getUniqueId());
+ if (map == null) return null;
- _players.remove(player.getUniqueId());
- cancelTask(player.getUniqueId());
-
- if(possible != null)
+ for (InviteData inviteData : map)
{
- Party newParty = _plugin.getParty(party);
- if(!accept)
+ if (inviteData.getInviterName().equalsIgnoreCase(sender))
{
- String message = C.mHead + "Party> " + C.mBody + InviteResponse.DENIED.format(player.getName());
- if (newParty == null)
- {
- possible.sendMessage(message);
- return;
- }
- newParty.sendMessage(message);
- return;
+ return inviteData;
}
- if (newParty == null)
+ }
+
+ return null;
+ }
+
+ /**
+ * Checks if a caller has an invite by a sender's name
+ *
+ * @param caller
+ * @param sender
+ * @return
+ */
+ public boolean hasInviteFrom(Player caller, String sender)
+ {
+ return getInviteBySender(caller.getName(), sender) != null;
+ }
+
+ /**
+ * Checks if a caller has an invite by a party id
+ *
+ * @param caller
+ * @param partyId
+ * @return
+ */
+ public boolean hasInviteTo(String caller, UUID partyId)
+ {
+ Set map = _activeInvites.get(caller);
+
+ if (map == null) return false;
+
+ for (InviteData inviteData : map)
+ {
+ if (inviteData.getPartyUUID().equals(partyId))
{
- newParty = new Party(possible.getName());
- if(_plugin.getClientManager().Get(possible).GetRank().has(Rank.ULTRA))
- {
- newParty.setSize();
- } else
- {
- newParty.setSize();
- }
- _plugin.addParty(newParty);
- _plugin.getMethodManager().addToParty(possible.getUniqueId(), newParty);
+ return true;
}
- _plugin.getMethodManager().addToParty(player.getUniqueId(), newParty);
- return;
}
- String serverFrom = data.getServerFrom();
-
- if(accept)
- {
- _plugin.getPortal().sendPlayerToServer(player, serverFrom);
- }
-
- _partyRedisManager.publish(serverFrom, RedisMessageType.INVITE_PLAYER_RESPONSE, party,
- player.getName(), player.getUniqueId().toString(), accept ? InviteResponse.ACCEPTED.name() : InviteResponse.DENIED.name());
+ return false;
}
/**
- * Handles a received response via redis
+ * Remove a player's invite to a party by id
*
- * @param sender The player sending the request
- * @param target The player target
- * @param serverFrom The server initiating the request
+ * @param caller
+ * @param partyId
+ * @return
*/
- public void handleInviteRequest(String sender, String target, String serverFrom)
+ public InviteData removeInviteTo(String caller, UUID partyId)
{
- Player player = Bukkit.getPlayerExact(target);
- if (player == null)
+ Set map = _activeInvites.get(caller);
+
+ if (map == null) return null;
+
+ Iterator itr = map.iterator();
+
+ while (itr.hasNext())
{
- //Shouldn't happen, as a "findPLayer" packet will be sent out first.
- return;
+ InviteData ent = itr.next();
+ if (ent.getPartyUUID().equals(partyId))
+ {
+ itr.remove();
+ return ent;
+ }
}
- _players.put(player.getUniqueId(), player.getName());
- inviteTo(player.getUniqueId(), sender, sender, serverFrom);
- Lang.INVITE_RECEIVED.send(player, sender);
- sendAcceptOrDeny(player, sender);
- player.playSound(player.getLocation(), Sound.NOTE_PLING, 1.0F, 1.0F);
+
+ return null;
}
/**
- * Handles the response returned via redis when an invite is handled cross server
- *
- * @param sender The player sender
- * @param target The player target
- * @param targetUUID The player targets UUID
- * @param response The response to this invite
+ * Remove a player's invite to a certain party
*/
- public void handleInviteResponse(String sender, String target, UUID targetUUID, InviteResponse response)
+ public InviteData removeInvite(Player invitee, String inviter)
{
- remove(sender, targetUUID);
- Player player = Bukkit.getPlayer(sender);
- if (player == null)
- {
- return;
- }
- String message = F.main("Party", response.format(target));
+ Set map = _activeInvites.get(invitee.getName());
- Party party = _plugin.getParty(sender);
- String partyName = sender;
- if(party != null)
+ if (map == null) return null;
+
+ Iterator itr = map.iterator();
+
+ while (itr.hasNext())
{
- partyName = party.getName();
+ InviteData ent = itr.next();
+ if (ent.getInviterName().equalsIgnoreCase(inviter))
+ {
+ itr.remove();
+ return ent;
+ }
}
- switch (response)
- {
- case ACCEPTED:
- addToPendingJoin(targetUUID, partyName);
- break;
- case EXPIRED:
- case DENIED:
- if (party == null)
- {
- player.sendMessage(message);
- return;
- }
- party.sendMessage(message);
- break;
- }
+ return null;
}
/**
@@ -175,202 +157,109 @@ public class PartyInviteManager
*
* @param player The player's UUID
*/
- public void removeAll(UUID player)
+ public void removeAll(Player player)
{
- _players.remove(player);
- _invitedBy.remove(player);
- _activeInvites.remove(player);
- }
-
- /**
- * Get the name of the party who is awaiting this player to join
- *
- * @param player The player's UUID
- * @return The name of the awaiting party.
- */
- public String getPartyWaiting(UUID player)
- {
- return _awaitingJoin.get(player);
- }
-
- /**
- * Remove the party reference that invited this player
- *
- * @param player The player's UUID
- */
- public void removeFromWaiting(UUID player)
- {
- _awaitingJoin.remove(player);
- }
-
- /**
- * Add a player to the active invites map
- *
- * @param player The player who has been invited
- * @param party The party name
- */
- public void inviteTo(UUID player, String invitedBy, String party, String server)
- {
- addToInvite(player, invitedBy, party, server);
- _tasks.put(player, new BukkitRunnable()
- {
- @Override
- public void run()
- {
- if (!isInvitedTo(player, party))
- {
- cancel();
- return;
- }
- InviteData data = remove(party, player);
- Player possible = Bukkit.getPlayer(player);
- String playerName = _players.remove(player);
- if (possible != null)
- {
- playerName = possible.getName();
- possible.sendMessage(F.main("Party", "Your invite to " + F.name(party) + "'s party has expired"));
- }
- sendExpired(data.getServerFrom(), party, playerName, player);
- }
- }.runTaskLater(_plugin.getPlugin(), 20 * 60));
- }
-
- /**
- * Checks to see if a player is invited to a specific party
- *
- * @param player The player who we want to check against
- * @param party The name of the party to check
- * @return true if the player has an invite to the specific party
- */
- public boolean isInvitedTo(UUID player, String party)
- {
- if (!_activeInvites.containsKey(player))
- {
- return false;
- }
- List dataList = _activeInvites.get(player);
- for (InviteData data : dataList)
- {
- if (data.getInvitedTo().equalsIgnoreCase(party))
- {
- return true;
- }
- }
- return false;
- }
-
- /**
- * Remove a player's invite to a certain party
- *
- * @param party The name of the party
- * @param invited The UUID of the player
- */
- public InviteData remove(String party, UUID invited)
- {
- List data = _activeInvites.get(invited);
- InviteData temp = null;
- for (InviteData inviteData : data)
- {
- if (inviteData.getInvitedTo().equalsIgnoreCase(party))
- {
- temp = inviteData;
- break;
- }
- }
- if (temp != null)
- {
- data.remove(temp);
- }
- _activeInvites.put(invited, data);
- return temp;
- }
-
- /**
- * Stop the player's expired task from running
- *
- * @param player The UUID of the player
- */
- public void cancelTask(UUID player)
- {
- BukkitTask task = _tasks.remove(player);
- if(task != null)
- {
- task.cancel();
- }
+ _activeInvites.remove(player.getName());
}
/**
* Retrieves all invites currently pending for a specific player
+ *
* @param player The player
* @return All his current pending invites
*/
- public Collection getAllInvites(Player player)
+ public List getAllInvites(Player player)
{
- return _activeInvites.get(player.getUniqueId());
+ return new ArrayList<>(_activeInvites.getOrDefault(player.getName(), Collections.emptySet()));
}
/**
- * Send an "ExpiredPartyInvite" redis message
+ * Add a playerUUID to the active invites map
*
- * @param server The server to
- * @param party The party who initiated the request (can also be a player's name)
- * @param playerName The name of the invited player
- * @param player The invited player's UUID
+ * @param inviterName
+ * @param inviterUUID
*/
- private void sendExpired(String server, String party, String playerName, UUID player)
+ public void inviteTo(String targetName, UUID targetUUID, String inviterName, UUID inviterUUID, UUID partyId, String server)
{
- _plugin.getRedisManager().publish(server, RedisMessageType.INVITE_PLAYER_RESPONSE, party, playerName, player.toString(), InviteResponse.EXPIRED.name());
- }
+ Set map = _activeInvites.computeIfAbsent(targetName, key -> new HashSet<>());
+ InviteData inviteData = new InviteData(inviterName, inviterUUID, partyId, server);
- /**
- * Marks this player as having an accepted invite
- * This is used to control the creation of single player parties, and makes sure a party is created ONLY if a player joins the server successfully.
- *
- * @param player The UUID of the player
- * @param party The name of the party
- */
- private void addToPendingJoin(UUID player, String party)
- {
- _awaitingJoin.put(player, party);
- }
-
- /**
- * Add a pending invite for a player
- *
- * @param invited The invited players UUUD
- * @param invitedBy The person who invited him
- * @param party The name of the party invited to
- * @param server The server the request is from
- */
- private void addToInvite(UUID invited, String invitedBy, String party, String server)
- {
- List inviteDatas = _activeInvites.get(invited);
- if (inviteDatas == null)
+ if (map.add(inviteData))
{
- inviteDatas = Lists.newArrayList();
+ _tasks.put(targetUUID, _plugin.runSyncLater(new BukkitRunnable()
+ {
+ @Override
+ public void run()
+ {
+ if (!hasInviteTo(targetName, partyId))
+ {
+ cancel();
+ return;
+ }
+ InviteData data = removeInviteTo(targetName, partyId);
+ Player possible = Bukkit.getPlayer(targetUUID);
+ if (possible != null)
+ {
+ Party curParty = _plugin.getPartyById(partyId);
+ if (curParty != null)
+ {
+ possible.sendMessage(F.main("Party", "Your invite to " + F.name(inviterName) + "'s party has expired"));
+ }
+ else
+ {
+ UtilPlayer.message(possible, F.main("Party", "Your invite to " + F.name(inviterName) + "'s party has expired. Fortunately, that party no longer exists"));
+ }
+ }
+ }
+ }, 20 * 60));
+ }
+
+ Player player = Bukkit.getPlayer(targetUUID);
+ if (player != null)
+ {
+ Party party = _plugin.getPartyByPlayer(player);
+ if (party == null)
+ {
+ if (server.equals(UtilServer.getServerName()))
+ {
+ UtilPlayer.message(player, F.main("Party", "You have been invited to " + F.elem(inviterName) + "'s party! You have 60 seconds to reply"));
+ }
+ else
+ {
+ UtilPlayer.message(player, F.main("Party", "You have been invited to " + F.elem(inviterName) + "'s party! You have 60 seconds to reply. If you accept, you will be be sent to " + F.elem(server)));
+ }
+ }
+ else
+ {
+ if (server.equals(UtilServer.getServerName()))
+ {
+ UtilPlayer.message(player, F.main("Party", "You have been invited to " + F.elem(inviterName) + "'s party! You have 60 seconds to reply. If you accept, you will leave your current party"));
+ }
+ else
+ {
+ UtilPlayer.message(player, F.main("Party", "You have been invited to " + F.elem(inviterName) + "'s party! You have 60 seconds to reply. If you accept, you will leave your current party and you will be be sent to " + F.elem(server)));
+ }
+ }
+ sendAcceptOrDeny(player, inviterName);
}
- InviteData inviteData = new InviteData(party, server);
- inviteDatas.add(inviteData);
- _invitedBy.put(invited, invitedBy);
- _activeInvites.put(invited, inviteDatas);
}
/**
* Sends a Text Componoent clickable message to a player for easier quick responses to invites
*
* @param player The player who received the invite
- * @param arg The name of the inviting party
+ * @param arg The name of the inviting party
*/
- public void sendAcceptOrDeny(Player player, String arg)
+ private void sendAcceptOrDeny(Player player, String arg)
{
TextComponent textComponent = new TextComponent(F.main("Party", "Reply: "));
TextComponent accept = new TextComponent("ACCEPT");
accept.setColor(ChatColor.GREEN);
accept.setBold(true);
- accept.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/partyaccept " + arg));
+ accept.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/party cli a " + arg));
accept.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[]{
- new TextComponent("Click to join " + F.name(arg) + "'s party")
+ new TextComponent("Click to join " + F.name(arg) + ChatColor.WHITE + "'s party")
}));
textComponent.addExtra(accept);
@@ -379,9 +268,9 @@ public class PartyInviteManager
TextComponent deny = new TextComponent("DENY");
deny.setColor(ChatColor.RED);
deny.setBold(true);
- deny.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/partydeny " + arg));
+ deny.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/party cli d " + arg));
deny.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[]{
- new TextComponent("Click to decline joining " + F.name(arg) + "'s party")
+ new TextComponent("Click to decline joining " + F.name(arg) + ChatColor.WHITE + "'s party")
}));
textComponent.addExtra(deny);
@@ -390,13 +279,14 @@ public class PartyInviteManager
TextComponent view = new TextComponent("VIEW");
view.setColor(ChatColor.YELLOW);
view.setBold(true);
- view.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/openinvitesmenu"));
+ view.setClickEvent(new ClickEvent(Action.RUN_COMMAND, "/party cli is"));
view.setHoverEvent(new HoverEvent(HoverEvent.Action.SHOW_TEXT, new TextComponent[]{
- new TextComponent("Click to view all pending invites.")
+ new TextComponent("Click to view all pending invites")
}));
textComponent.addExtra(view);
player.spigot().sendMessage(textComponent);
+ player.playSound(player.getLocation(), Sound.NOTE_PLING, 1.0F, 10.0F);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyJoinManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyJoinManager.java
index 88a7ef29c..4ff377c66 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyJoinManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyJoinManager.java
@@ -1,137 +1,356 @@
package mineplex.core.party.manager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.event.Listener;
+import org.bukkit.event.player.PlayerCommandPreprocessEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerInteractEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.scheduler.BukkitTask;
+
import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import mineplex.core.command.CommandCenter;
import mineplex.core.common.Rank;
import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilItem;
+import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilServer;
+import mineplex.core.party.Lang;
import mineplex.core.party.Party;
import mineplex.core.party.PartyManager;
-import mineplex.core.party.constants.JoinResponseReason;
-import mineplex.core.party.redis.RedisMessageType;
-import mineplex.serverdata.servers.ServerManager;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
+import mineplex.core.party.constants.PartyRemoveReason;
+import mineplex.core.party.rediscommands.PartyTransferRequest;
+import mineplex.core.party.rediscommands.PartyTransferResponse;
+import mineplex.core.portal.Intent;
+import mineplex.core.portal.events.GenericServerTransferEvent;
+import mineplex.core.portal.events.ServerTransferEvent;
+import mineplex.core.utils.UtilGameProfile;
+import mineplex.serverdata.commands.ServerCommandManager;
+import mineplex.serverdata.data.MinecraftServer;
/**
* Manages allocating slots for parties to join
*/
-public class PartyJoinManager
+public class PartyJoinManager implements Listener
{
-
private final PartyManager _plugin;
- private final int _maxPLayers;
- private final List _transferring;
+ private final int _maxPlayers;
+
+ private final Map _pendingTransfers = new ConcurrentHashMap<>();
public PartyJoinManager(PartyManager plugin)
{
_plugin = plugin;
- _maxPLayers = plugin.getPlugin().getServer().getMaxPlayers();
- _transferring = Lists.newArrayList();
- }
+ _maxPlayers = plugin.getPlugin().getServer().getMaxPlayers();
- /**
- * Scans through the party to check if all players are some form of VIP
- * If the party contains even 1 non-vip, the party cannot be sent to a full server
- *
- * @param party The party
- * @return true if the party contains all VIP's false if it contains even 1 non-vip
- */
- public boolean canJoinFullServer(Party party)
- {
- List players = party.getMembersByUUID().stream().map(Bukkit::getPlayer).collect(Collectors.toList());
- for (Player player : players)
+ UtilServer.RegisterEvents(this);
+
+ ServerCommandManager.getInstance().registerCommandType(PartyTransferRequest.class, command ->
{
- Rank rank = _plugin.getClientManager().Get(player).GetRank();
- if (rank == Rank.ALL)
+ if (!command.isSentToThisServer())
+ return;
+
+ _plugin.runSync(() ->
{
- return false;
- }
- }
- return true;
+ int currentPlayers = UtilServer.getPlayersCollection().size();
+ if (currentPlayers + command.getUnrankedMembers().size() > _maxPlayers && !command.isCanJoinFullServers())
+ {
+ ServerCommandManager.getInstance().publishCommand(new PartyTransferResponse(command, PartyTransferResponse.Result.NOT_ENOUGH_ROOM));
+ return;
+ }
+
+ for (UUID uuid : command.getUnrankedMembers())
+ {
+ _plugin.getClientManager().reserveFor(uuid);
+ }
+
+ Party newParty = new Party(command);
+
+ _plugin.addParty(newParty);
+
+ for (UUID uuid : command.getAllMembers())
+ {
+ _plugin.putIntoPendingJoin(uuid, newParty.getUniqueId());
+ }
+
+ ServerCommandManager.getInstance().publishCommand(new PartyTransferResponse(command, PartyTransferResponse.Result.SUCCESS));
+ });
+ });
+
+ ServerCommandManager.getInstance().registerCommandType(PartyTransferResponse.class, command ->
+ {
+ if (!command.getOrigin().wasSentFromThisServer())
+ return;
+
+ _plugin.runSync(() ->
+ {
+ BukkitTask task = _pendingTransfers.get(command.getOrigin().getPartyUUID());
+ if (task == null)
+ {
+ return;
+ }
+
+ task.cancel();
+
+ Party party = _plugin.getPartyById(command.getOrigin().getPartyUUID());
+
+ switch (command.getResult())
+ {
+ case NOT_ENOUGH_ROOM:
+ _pendingTransfers.remove(command.getOrigin().getPartyUUID());
+ party.sendMessage(F.main("Party", "Sorry, there wasn't enough room for your party in " + F.elem(command.getFromServer()) + "."));
+ break;
+ case SUCCESS:
+ party.sendMessage(F.main("Party", "Success! I've reserved some room for you in " + F.elem(command.getFromServer()) + "."));
+ party.sendMessage(F.main("Party", "You will be transferred shortly."));
+ List members = new ArrayList<>(party.getMembers());
+
+ // Clear the party first.
+ // We've already got a duplicate on the remote server so let's get rid of this one ASAP
+ party.clear();
+ _plugin.removeParty(party);
+
+
+ for (Player player : members)
+ {
+ _plugin.getPortal().sendPlayer(player, command.getFromServer());
+ }
+ break;
+ case UNKNOWN:
+ _pendingTransfers.remove(command.getOrigin().getPartyUUID());
+ party.sendMessage(F.main("Party", "Uh... something went wrong?"));
+ break;
+ }
+ });
+ });
}
/**
* Initiates a request to join a server for a specific party
*
* @param server The desired server
- * @param party The requesting party
+ * @param party The requesting party
*/
- public void requestServerJoin(String server, Party party)
+ private void requestServerJoin(String server, Party party)
{
- boolean canJoinFull = canJoinFullServer(party);
- _plugin.getRedisManager().publish(server, RedisMessageType.PREJOIN_SERVER_REQUEST,
- _plugin.getServerName(), party.getOwner(), "" + party.getMembers().size(), "" + canJoinFull);
- }
-
- /**
- * Manages a received request
- *
- * @param serverFrom The server who initiated the request
- * @param partySize The size of the party
- * @param initiator The player who sent the request
- * @param canJoinFull true if the party contains all donators or staff (full joining able players)
- */
- public void handleJoinRequest(String serverFrom, int partySize, String initiator, boolean canJoinFull)
- {
- int currentPlayers = UtilServer.getPlayers().length;
- if (currentPlayers >= _maxPLayers || (currentPlayers + partySize) >= _maxPLayers)
- {
- //Max number of people on.
- if (!canJoinFull)
- {
- _plugin.getRedisManager().publish(serverFrom, RedisMessageType.PREJOIN_SERVER_RESPONSE, initiator, JoinResponseReason.CANNOT_JOIN_FULL.name(), _plugin.getServerName());
- return;
- }
- }
- ServerManager.getServerRepository(_plugin.getRegion()).getServerStatus(_plugin.getServerName()).incrementPlayerCount(partySize);
- _plugin.getRedisManager().publish(serverFrom, RedisMessageType.PREJOIN_SERVER_RESPONSE, initiator, JoinResponseReason.SUCCESS.name(), _plugin.getServerName());
-
- }
-
- /**
- * Manages a received response
- *
- * @param playerSender The player who sent the request
- * @param server The server responding
- * @param reason The reason for the response
- */
- public void handleJoinResponse(String playerSender, String server, JoinResponseReason reason)
- {
- Player player = Bukkit.getPlayer(playerSender);
- if (player == null)
+ if (_pendingTransfers.containsKey(party.getUniqueId()))
{
+ party.sendMessage(F.main("Party", "Please wait until your current transfer is complete"));
return;
}
- Party party = _plugin.getParty(player);
+
+ List unranked = new ArrayList<>();
+ List all = new ArrayList<>();
+ for (Player player : party.getMembers())
+ {
+ if (_plugin.getClientManager().Get(player).GetRank() == Rank.ALL)
+ {
+ unranked.add(player.getUniqueId());
+ }
+ all.add(player.getUniqueId());
+ }
+
+ _pendingTransfers.put(party.getUniqueId(), _plugin.runSyncLater(() ->
+ {
+ _pendingTransfers.remove(party.getUniqueId());
+
+ if (party.getMembers().size() == 0)
+ {
+ return;
+ }
+
+ party.sendMessage(F.main("Party", "Aww, the destination server didn't respond :("));
+ }, 20 * 5L));
+
+ System.out.println("Sending transfer request to " + server + " for " + party.getUniqueId() + " " + party.getMembers());
+
+ party.sendMessage(F.main("Party", "Please wait while I check whether " + F.elem(server) + " has enough room for this party."));
+ ServerCommandManager.getInstance().publishCommand(new PartyTransferRequest(party.getUniqueId(), UtilGameProfile.getGameProfile(party.getOwnerAsPlayer().get()), all, unranked, unranked.size() == 0, server));
+ }
+
+ @EventHandler
+ public void onTransferToGenericServer(GenericServerTransferEvent event)
+ {
+ Player player = event.getPlayer();
+ Party party = _plugin.getPartyByPlayer(player);
+
if (party == null)
{
return;
}
- if (reason != JoinResponseReason.SUCCESS)
+
+ // If the server wants to kick the player, let's not stop it
+ if (event.getIntent() == Intent.KICK || event.getIntent() == Intent.FORCE_TRANSFER)
{
- party.sendMessage(reason.getMessage());
+ _plugin.removeFromParty(event.getPlayer(), PartyRemoveReason.KICKED);
+
return;
}
- party.sendMessage(F.main("Party", "Transferring servers..."));
- _plugin.getRedisManager().sendPartyInfo(server, party);
- _transferring.addAll(party.getMembersByUUID());
+
+ event.setCancelled(true);
+
+ if (!party.getOwnerName().equalsIgnoreCase(player.getName()))
+ {
+ Lang.NOT_OWNER_SERVER.send(player);
+ return;
+ }
+
+ MinecraftServer best = null;
+ int lowest = Integer.MAX_VALUE;
+ List serverList = Lists.newArrayList(_plugin.getPortal().getRepository().getServersByGroup(event.getServer().getName()));
+ for (MinecraftServer server : serverList)
+ {
+ int playercount = server.getPlayerCount();
+ if (playercount < 20)
+ {
+ continue;
+ }
+ if (playercount < lowest)
+ {
+ lowest = playercount;
+ if (best == null)
+ {
+ best = server;
+ }
+ }
+ }
+ if (best == null)
+ {
+ best = serverList.get(new Random().nextInt(serverList.size()));
+ }
+
+ party.sendMessage(F.main("Party", F.elem(player.getName()) + " is moving the party to " + F.elem(best.getName())));
+
+ requestServerJoin(best.getName(), party);
}
- /**
- * Retrieve whether or not the player is currently transferring servers
- * We wont need this information again, so calling a remove works fine.
- *
- * @param player The player
- * @return true if the player is transferring servers
- */
- public boolean isTransferring(Player player)
+ @EventHandler
+ public void onTransfer(ServerTransferEvent event)
{
- return _transferring.remove(player.getUniqueId());
+ Player player = event.getPlayer();
+ Party party = _plugin.getPartyByPlayer(player);
+
+ if (party == null)
+ {
+ return;
+ }
+
+ // If the server wants to kick the player, let's not stop it
+ if (event.getIntent() == Intent.KICK || event.getIntent() == Intent.FORCE_TRANSFER)
+ {
+ _plugin.removeFromParty(event.getPlayer(), PartyRemoveReason.KICKED);
+
+ return;
+ }
+
+ if (_pendingTransfers.containsKey(party.getUniqueId()))
+ {
+ return;
+ }
+
+ event.setCancelled(true);
+
+ if (event.getServer().toUpperCase().startsWith("CLANS-"))
+ {
+ party.sendMessage(F.main("Party", "You cannot join a Clans server while in a party!"));
+ return;
+ }
+
+ if (!party.getOwnerName().equalsIgnoreCase(player.getName()))
+ {
+ Lang.NOT_OWNER_SERVER.send(player);
+ return;
+ }
+
+ party.sendMessage(F.main("Party", F.elem(player.getName()) + " is moving the party to " + F.elem(event.getServer())));
+
+ requestServerJoin(event.getServer(), party);
}
+ public void removePendingJoin(Party party)
+ {
+ _pendingTransfers.remove(party.getUniqueId());
+ }
+
+ @EventHandler
+ public void onJoin(PlayerJoinEvent event)
+ {
+ Player player = event.getPlayer();
+
+ if (_plugin.hasPendingJoin(player))
+ {
+ Party pendingParty = _plugin.getPendingParty(player);
+ _plugin.removePendingJoin(player);
+
+ if (pendingParty == null)
+ {
+ UtilPlayer.message(player, F.main("Party", "Uh oh. It seems that in the time it took for you to join this server, your inviter has disbanded their party"));
+ return;
+ }
+
+ if (pendingParty.getOwner().getId().equals(event.getPlayer().getUniqueId()))
+ {
+ UtilPlayer.message(player, F.main("Party", "Welcome back! Your party is just as you've left it!"));
+ }
+ else
+ {
+ UtilPlayer.message(player, F.main("Party", "Welcome! Adding you to " + F.elem(pendingParty.getOwnerName()) + "'s party!"));
+ }
+
+ _plugin.addToParty(player, pendingParty);
+ }
+ }
+
+ @EventHandler
+ public void onQuit(PlayerQuitEvent event)
+ {
+ Player player = event.getPlayer();
+
+ Party party = _plugin.getPartyByPlayer(player);
+
+ _plugin.getInviteManager().removeAll(player);
+
+ if (party == null)
+ {
+ return;
+ }
+
+ PartyRemoveReason reason = PartyRemoveReason.LEFT;
+
+ _plugin.removeFromParty(player, reason);
+ }
+
+ @EventHandler(priority = EventPriority.LOWEST)
+ public void onInteract(PlayerInteractEntityEvent event)
+ {
+ if (UtilItem.isSimilar(event.getPlayer().getItemInHand(), PartyManager.INTERFACE_ITEM, UtilItem.ItemAttribute.NAME))
+ {
+ event.setCancelled(true);
+ event.getPlayer().updateInventory();
+ CommandCenter.getCommands().get("party").Execute(event.getPlayer(), new String[0]);
+ }
+ }
+
+ @EventHandler(priority = EventPriority.LOWEST)
+ public void onClick(PlayerInteractEvent event)
+ {
+ if (UtilItem.isSimilar(event.getItem(), PartyManager.INTERFACE_ITEM, UtilItem.ItemAttribute.NAME))
+ {
+ event.setCancelled(true);
+ CommandCenter.getCommands().get("party").Execute(event.getPlayer(), new String[0]);
+ }
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java
deleted file mode 100644
index 2e213a6f5..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyMethodManager.java
+++ /dev/null
@@ -1,347 +0,0 @@
-package mineplex.core.party.manager;
-
-import com.google.common.collect.Lists;
-import mineplex.core.common.util.F;
-import mineplex.core.menu.Menu;
-import mineplex.core.party.Lang;
-import mineplex.core.party.Party;
-import mineplex.core.party.PartyManager;
-import mineplex.core.party.constants.PartyRemoveReason;
-import mineplex.core.preferences.Preference;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * Contains all methods used by the internal UI system
- */
-public class PartyMethodManager
-{
-
- private PartyManager _plugin;
-
- public PartyMethodManager(PartyManager plugin)
- {
- _plugin = plugin;
- }
-
- /**
- * Invite a player to either a new party or existing one
- *
- * @param caller The player who initiated the request
- * @param target The player's target
- */
- public void invite(Player caller, String target)
- {
- Player possible = Bukkit.getPlayer(target);
- Party party = _plugin.getParty(caller);
-
- if(target.equalsIgnoreCase(caller.getName()))
- {
- caller.sendMessage(F.main("Party", "You cannot invite yourself!"));
- return;
- }
-
- if(party != null)
- {
- if(!party.getOwner().equalsIgnoreCase(caller.getName()))
- {
- Lang.NOT_OWNER.send(caller);
- return;
- }
- if(possible != null && _plugin.getInviteManager().isInvitedTo(possible.getUniqueId(), party.getName()))
- {
- Lang.ALREADY_INVITED.send(caller, target);
- return;
- }
- if(party.getMembers().contains(target))
- {
- Lang.ALREADY_MEMBER.send(caller, target);
- return;
- }
- if(_plugin.getParty(target) != null)
- {
- Lang.PLAYER_IN_DIFFERENT_PARTY.send(caller, target);
- return;
- }
- if(party.getMembers().size() >= party.getSize())
- {
- Lang.PARTY_FULL.send(caller);
- return;
- }
- }
-
- //Same Server
- if (possible != null)
- {
- if(!_plugin.getPreferencesManager().get(possible).isActive(Preference.PARTY_REQUESTS))
- {
- caller.sendMessage(F.main("Party> ", F.name(target) + " is not accepting invites at this time."));
- return;
- }
-
- if (party == null)
- {
- if(_plugin.getParty(target) != null)
- {
- Lang.PLAYER_IN_DIFFERENT_PARTY.send(caller, target);
- return;
- }
- if(_plugin.getInviteManager().isInvitedTo(possible.getUniqueId(), caller.getName()))
- {
- Lang.ALREADY_INVITED.send(caller, target);
- return;
- }
- Lang.INVITE_SUCCESS_PLAYER.send(caller, possible.getName());
- } else
- {
- Lang.SUCCESS_INVITE.send(party, caller.getName(), target);
- }
-
- UUID uuid = possible.getUniqueId();
-
- Lang.INVITE_RECEIVED.send(possible, caller.getName(), caller.getName());
-
- _plugin.getInviteManager().inviteTo(uuid, caller.getName(), caller.getName(), _plugin.getServerName());
-
- _plugin.getInviteManager().sendAcceptOrDeny(possible, caller.getName());
- return;
- }
- //Only perform this when I actually need to.
- boolean can = Bukkit.getMaxPlayers() >= _plugin.getPlugin().getServer().getOnlinePlayers().size();
- if(!can)
- {
- Lang.SERVER_FULL.send(caller);
- return;
- }
-
- //Not on the same server
- _plugin.getRedisManager().findAndInvite(target, caller.getName());
- }
-
- /**
- * Responds to a pending invite
- *
- * @param caller The player who initiated the request
- * @param target The player's target
- * @param accept true If the player has accepted the invite
- */
- public void respondToInvite(Player caller, String target, boolean accept)
- {
- if(_plugin.getParty(caller) != null)
- {
- Lang.ALREADY_IN.send(caller);
- caller.sendMessage(F.main("Party", "Please leave your party before joining!"));
- return;
- }
-
- PartyInviteManager inviteManager = _plugin.getInviteManager();
-
- if (!inviteManager.isInvitedTo(caller.getUniqueId(), target))
- {
- //He isn't invited to this party.
- Lang.NOT_INVITED.send(caller, target);
- return;
- }
- if(!accept)
- {
- caller.sendMessage(F.main("Party", "You have denied the invite to " + F.name(target)) + "'s party.");
- }
-
- inviteManager.respondToInvite(caller, target, accept);
- }
-
- /**
- * Kicks a player from the callers party
- *
- * @param caller The player who initiated the request
- * @param target The player's target
- */
- public void forceRemove(Player caller, String target)
- {
- Party party = _plugin.getParty(caller);
-
- if (party == null)
- {
- Lang.NO_PARTY.send(caller);
- return;
- }
-
- if (!party.getOwner().equalsIgnoreCase(caller.getName()))
- {
- Lang.NOT_OWNER.send(caller);
- return;
- }
-
- Player playerTarget = Bukkit.getPlayerExact(target);
-
- if (playerTarget == null)
- {
- Lang.NOT_MEMBER.send(caller, target);
- return;
- }
-
- Party targetParty = _plugin.getParty(playerTarget);
-
- if (targetParty == null ||!party.getMembers().contains(target))
- {
- Lang.NOT_MEMBER.send(caller, target);
- return;
- }
-
- removeFromParty(playerTarget.getUniqueId(), PartyRemoveReason.KICKED);
-
- Lang.REMOVE_PLAYER_KICK.send(targetParty);
- }
-
- /**
- * Leaves the players current party if he is in one
- *
- * @param caller The player who wishes to leave his party
- */
- public void leaveParty(Player caller)
- {
- Party party = _plugin.getParty(caller);
-
- if (party == null)
- {
- Lang.NO_PARTY.send(caller);
- return;
- }
-
- removeFromParty(caller.getUniqueId(), PartyRemoveReason.LEFT);
- Lang.LEFT.send(caller);
- }
-
- /**
- * Disbands a players current party, assuming he is the leader
- *
- * @param caller The player who wishes to disband his party
- */
- public void disband(Player caller)
- {
- Party party = _plugin.getParty(caller);
-
- if (party == null)
- {
- Lang.NO_PARTY.send(caller);
- return;
- }
-
- if (!party.getOwner().equalsIgnoreCase(caller.getName()))
- {
- Lang.NOT_OWNER.send(caller);
- return;
- }
- caller.sendMessage(F.main("Party", "You have disbanded your party."));
- disbandParty(party);
- }
-
- public void addToParty(UUID uuid, Party party)
- {
- _plugin.getPlayerParties().put(uuid, party);
- Player player = Bukkit.getPlayer(uuid);
- party.onPlayerAdd(player.getName());
- if(!party.getMembersByUUID().contains(uuid))
- {
- party.getMembersByUUID().add(uuid);
- }
- }
-
- public void addToPartyOnTransfer(UUID uuid, Party party)
- {
- _plugin.getPlayerParties().put(uuid, party);
- }
-
- public void addToParty(Player player, Party party)
- {
- addToParty(player.getUniqueId(), party);
- }
-
- public void removeForTransfer(UUID uuid)
- {
- Party party = _plugin.getPlayerParties().remove(uuid);
- if(party == null)
- {
- return;
- }
- String player = Bukkit.getPlayer(uuid).getName();
- party.onPlayerRemove(player, PartyRemoveReason.OTHER);
- }
-
- public void removeFromParty(UUID uuid, PartyRemoveReason reason)
- {
- Party party = _plugin.getPlayerParties().remove(uuid);
- if(party == null)
- {
- return;
- }
-
- Player player = Bukkit.getPlayer(uuid);
-
- if(player.getOpenInventory() != null)
- {
- if (Menu.get(player.getUniqueId()) != null)
- {
- player.closeInventory();
- Menu.remove(player.getUniqueId());
- }
- }
-
- if(reason == PartyRemoveReason.DISBANDED_BY_OWNER)
- {
- return;
- }
- party.getMembers().remove(player.getName());
- party.getMembersByUUID().remove(uuid);
- party.onPlayerRemove(player.getName(), reason);
-
- int size = party.getMembers().size();
- if(size <= 1)
- {
- if(size == 0)
- {
- _plugin.removeParty(party);
- return;
- }
- _plugin.getPlayerParties().remove(Bukkit.getPlayerExact(party.getMembers().get(0)).getUniqueId());
- party.onPlayerRemove(party.getMembers().get(0), PartyRemoveReason.DISBANDED);
- _plugin.removeParty(party);
- }
- }
-
- public void removeFromParty(Player player, PartyRemoveReason reason)
- {
- removeFromParty(player.getUniqueId(), reason);
- }
-
- public void disbandParty(Party party)
- {
- List members = Lists.newArrayList(party.getMembersByUUID());
- Lang.DISBANDED_BY_OWNER.send(party);
- members.forEach(player -> removeFromParty(player, PartyRemoveReason.DISBANDED_BY_OWNER));
- party.getMembers().clear();
- party.getMembersByUUID().clear();
- _plugin.removeParty(party);
- }
-
- public void transferOwner(String newOwner, String oldOwner)
- {
- Party party = _plugin.getParties().remove(oldOwner);
-
- if(party == null)
- {
- return;
- }
-
- _plugin.getParties().put(newOwner, party);
- party.setOwner(newOwner);
- party.getMembers().remove(oldOwner);
- party.getMembers().add(oldOwner);
- UUID uuid = Bukkit.getPlayerExact(oldOwner).getUniqueId();
- party.getMembersByUUID().remove(uuid);
- party.getMembersByUUID().add(uuid);
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java
index 9e0c9529d..4b782736d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/manager/PartyRedisManager.java
@@ -1,296 +1,205 @@
package mineplex.core.party.manager;
-import com.google.common.collect.Maps;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-import mineplex.core.common.util.F;
-import mineplex.core.party.Lang;
-import mineplex.core.party.Party;
-import mineplex.core.party.PartyManager;
-import mineplex.core.party.constants.InviteResponse;
-import mineplex.core.party.constants.JoinResponseReason;
-import mineplex.core.party.event.PartyDataReceivedEvent;
-import mineplex.core.party.redis.PartyRedisListener;
-import mineplex.core.party.redis.RedisMessageType;
-import mineplex.core.preferences.Preference;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.scheduler.BukkitTask;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-
-import java.util.List;
+import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
-import static mineplex.core.party.redis.RedisMessageType.INVITE_PLAYER_REQUEST;
-import static mineplex.core.party.redis.RedisMessageType.PARTY_INFO;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitTask;
+
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteAccept;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteCommand;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteDeny;
+import mineplex.core.party.rediscommands.PartyCrossServerInviteResponse;
+import mineplex.core.portal.Portal;
+import mineplex.core.preferences.Preference;
+import mineplex.serverdata.commands.ServerCommandManager;
-/**
- * Redis system for Parties
- */
public class PartyRedisManager
{
- protected final Gson GSON = new GsonBuilder().create();
-
- protected static final String CHANNEL_BASE = "party-pubsub";
- protected static final String FIND_PLAYERS_CHANNEL = "party-player-finder";
- private final Map TASKS = Maps.newHashMap();
+ private final Map> _pendingFindResponse = new HashMap<>();
private final PartyManager _plugin;
- private final JedisPool _writePool;
- private final String _channel;
private final String _serverName;
- public PartyRedisManager(PartyManager plugin, String serverName, JedisPool writePool, JedisPool readPool)
+ public PartyRedisManager(PartyManager plugin, String serverName)
{
_plugin = plugin;
_serverName = serverName;
- _writePool = writePool;
- _channel = CHANNEL_BASE + "-" + serverName;
- plugin.runAsync(() -> {
- try (Jedis jedis = readPool.getResource())
- {
- jedis.subscribe(new PartyRedisListener(this), _channel, FIND_PLAYERS_CHANNEL);
- }
- });
- }
-
- /**
- * Send a message to a specific server
- *
- * @param server The destination server
- * @param messageType The message to send
- * @param args The arguments accompanying the request
- */
- public void publish(String server, RedisMessageType messageType, String... args)
- {
- _plugin.runAsync(() -> {
- try (Jedis jedis = _writePool.getResource())
- {
- jedis.publish(CHANNEL_BASE + "-" + server, messageType.name() + "@" + messageType.format(args));
- }
- });
- }
-
- /**
- * Handle a message received on this server
- *
- * @param messageType The type of message received
- * @param message The contents of the request
- */
- public void handle(RedisMessageType messageType, String message)
- {
- if (messageType == PARTY_INFO)
+ ServerCommandManager.getInstance().registerCommandType(PartyCrossServerInviteCommand.class, command ->
{
- handlePartyInfo(message);
- return;
- }
- String[] contents = message.split(",");
- if (contents.length < 3)
- {
- return;
- }
- String first = contents[0];
- String second = contents[1];
- String third = contents[2];
- Bukkit.getScheduler().runTask(_plugin.getPlugin(), () -> {
- switch (messageType)
+ _plugin.runSync(() ->
{
- case INVITE_PLAYER_REQUEST:
- _plugin.getInviteManager().handleInviteRequest(second, third, first);
- break;
+ Player player = Bukkit.getPlayerExact(command.getTarget());
- case INVITE_PLAYER_RESPONSE:
- _plugin.getInviteManager().handleInviteResponse(first, second, UUID.fromString(third), InviteResponse.valueOf(contents[3].toUpperCase()));
- break;
-
- case PLAYER_FIND_REQUEST:
- Player player = Bukkit.getPlayerExact(second);
-
- if (player == null)
- {
- return;
- }
-
- if(_plugin.getParty(player) != null)
- {
- publish(first, RedisMessageType.INVITE_PLAYER_ALREADY_IN_PARTY, _serverName, player.getName(), player.getUniqueId().toString(), third);
- return;
- }
-
- if(!_plugin.getPreferencesManager().get(player).isActive(Preference.PARTY_REQUESTS))
- {
- publish(first, RedisMessageType.INVITE_PLAYER_NOT_ACCEPTING_INVITES, _serverName, player.getName(), player.getUniqueId().toString(), third);
- return;
- }
-
- publish(first, RedisMessageType.PLAYER_FIND_RESPONSE, _serverName, player.getName(), player.getUniqueId().toString(), third);
- break;
-
- case INVITE_PLAYER_ALREADY_IN_PARTY:
- handleAlreadyIn(second, contents);
- break;
-
- case INVITE_PLAYER_NOT_ACCEPTING_INVITES:
- handleNotAccepting(second, contents);
- break;
-
- case PLAYER_FIND_RESPONSE:
- UUID uuid = UUID.fromString(third);
- cancelTask(second);
-
- Player inviter = Bukkit.getPlayerExact(contents[3]);
- if (_plugin.getInviteManager().isInvitedTo(uuid, inviter.getName()))
- {
- Lang.ALREADY_INVITED.send(inviter, second);
- return;
- }
- if (_plugin.getParty(inviter) == null)
- {
- Lang.INVITE_SUCCESS_PLAYER.send(inviter, second);
- } else
- {
- Lang.SUCCESS_INVITE.send(_plugin.getParty(inviter), inviter.getName(), second);
- }
- _plugin.getInviteManager().inviteTo(uuid, inviter.getName(), inviter.getName(), _plugin.getServerName());
- publish(first, INVITE_PLAYER_REQUEST, _serverName, inviter.getName(), second);
- break;
-
- case PREJOIN_SERVER_REQUEST:
- _plugin.getJoinManager().handleJoinRequest(first, Integer.valueOf(third), second, Boolean.valueOf(contents[3]));
- break;
-
- case PREJOIN_SERVER_RESPONSE:
- _plugin.getJoinManager().handleJoinResponse(first, third, JoinResponseReason.valueOf(second.toUpperCase()));
- break;
- }
- });
-
- }
-
- private void handleNotAccepting(String second, String[] contents)
- {
- cancelTask(second);
-
- Player inviter = Bukkit.getPlayerExact(contents[3]);
- inviter.sendMessage(F.main("Party", F.name(second) + " is not accepting invites at this time."));
- }
-
- private void handleAlreadyIn(String second, String[] contents)
- {
- cancelTask(second);
- Player inviter = Bukkit.getPlayerExact(contents[3]);
- Lang.ALREADY_IN.send(inviter, second);
- }
-
- /**
- * Initiates inviting a player who is no on the same server
- *
- * @param player The player target
- * @param sender The sending player
- */
- public void findAndInvite(String player, String sender)
- {
- Bukkit.getPlayerExact(sender).sendMessage(F.main("Party", "Locating " + F.elem(player) + "..."));
- TASKS.put(player, new BukkitRunnable()
- {
- @Override
- public void run()
- {
- if(!TASKS.containsKey(player))
+ if (player == null || !player.isOnline())
{
- cancel();
return;
}
- TASKS.remove(player);
- Player senderPlayer = Bukkit.getPlayerExact(sender);
- if (senderPlayer == null)
- {
- cancel();
- return;
- }
- if (Bukkit.getPlayerExact(player) != null)
- {
- cancel();
- return;
- }
- senderPlayer.sendMessage(F.main("Party", "Could not locate " + F.elem(player) + "."));
- }
- }.runTaskLater(_plugin.getPlugin(), 20L * 5));
- _plugin.runAsync(() -> {
- try (Jedis jedis = _writePool.getResource())
+ if (!_plugin.getPreferencesManager().get(player).isActive(Preference.PARTY_REQUESTS))
+ {
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteResponse(PartyCrossServerInviteResponse.Result.TARGET_NOT_ACCEPTING_INVITES, command, player));
+ return;
+ }
+
+ _plugin.getInviteManager().inviteTo(player.getName(), player.getUniqueId(), command.getRequesterName(), command.getRequesterUUID(), command.getPartyUUID(), command.getFromServer());
+
+ if (_plugin.getPartyByPlayer(player) != null)
+ {
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteResponse(PartyCrossServerInviteResponse.Result.SUCCESS_IN_PARTY, command, player));
+ }
+ else
+ {
+ ServerCommandManager.getInstance().publishCommand(new PartyCrossServerInviteResponse(PartyCrossServerInviteResponse.Result.SUCCESS, command, player));
+ }
+ });
+ });
+
+ ServerCommandManager.getInstance().registerCommandType(PartyCrossServerInviteResponse.class, command ->
+ {
+ if (!command.getOrigin().wasSentFromThisServer())
+ return;
+
+ _plugin.runSync(() ->
{
- jedis.publish(FIND_PLAYERS_CHANNEL, RedisMessageType.PLAYER_FIND_REQUEST.format(_serverName, player, sender));
- }
+ Map pendingTasks = _pendingFindResponse.get(command.getOrigin().getRequesterUUID());
+
+ if (pendingTasks == null)
+ return;
+
+ BukkitTask alertTask = pendingTasks.remove(command.getOrigin().getTarget());
+
+ if (alertTask == null)
+ return;
+
+ alertTask.cancel();
+
+ Player caller = Bukkit.getPlayer(command.getOrigin().getRequesterUUID());
+
+ if (caller == null || !caller.isOnline())
+ return;
+
+ switch (command.getResult())
+ {
+ case TARGET_NOT_ACCEPTING_INVITES:
+ UtilPlayer.message(caller, F.main("Party", "The player " + F.elem(command.getOrigin().getTarget()) + " is not accepting invites!"));
+ break;
+ case SUCCESS_IN_PARTY:
+ {
+ Party party = _plugin.getPartyByPlayer(command.getOrigin().getRequesterUUID());
+ if (party == null)
+ {
+ // todo wat do
+ return;
+ }
+ if (!party.getOwnerName().equals(command.getOrigin().getRequesterName()))
+ {
+ //todo wat do
+ }
+
+ _plugin.getInviteManager().inviteTo(command.getTargetName(), command.getTargetUUID(), command.getOrigin().getRequesterName(), command.getOrigin().getRequesterUUID(), command.getOrigin().getPartyUUID(), _plugin.getServerName());
+ party.sendMessage(F.main("Party", F.elem(command.getOrigin().getRequesterName()) + " has invited " + F.elem(command.getTargetName()) + " to the party"));
+ break;
+ }
+ case SUCCESS:
+ {
+ Party party = _plugin.getPartyByPlayer(command.getOrigin().getRequesterUUID());
+ if (party == null)
+ {
+ // todo wat do
+ return;
+ }
+ if (!party.getOwnerName().equals(command.getOrigin().getRequesterName()))
+ {
+ //todo wat do
+ }
+
+ _plugin.getInviteManager().inviteTo(command.getTargetName(), command.getTargetUUID(), command.getOrigin().getRequesterName(), command.getOrigin().getRequesterUUID(), command.getOrigin().getPartyUUID(), _plugin.getServerName());
+ party.sendMessage(F.main("Party", F.elem(command.getOrigin().getRequesterName()) + " has invited " + F.elem(command.getTargetName()) + " to the party"));
+ break;
+ }
+ case UNKNOWN:
+ UtilPlayer.message(caller, F.main("Party", "Uh oh, something went wrong while inviting " + F.elem(command.getTargetName())));
+ break;
+ }
+ });
+ });
+
+ ServerCommandManager.getInstance().registerCommandType(PartyCrossServerInviteAccept.class, command ->
+ {
+ _plugin.runSync(() ->
+ {
+ Player apparentSender = Bukkit.getPlayer(command.getInviterUUID());
+ if (apparentSender != null && apparentSender.isOnline())
+ {
+ _plugin.getInviteManager().removeInviteTo(command.getPlayerName(), command.getPartyUUID());
+
+ Party partyOfSender = _plugin.getPartyByPlayer(apparentSender);
+ if (partyOfSender == null)
+ {
+ //todo wat do
+ return;
+ }
+ if (!partyOfSender.getUniqueId().equals(command.getPartyUUID()))
+ {
+ //todo wat do
+ return;
+ }
+
+ if (!partyOfSender.getOwnerName().equals(command.getInviterName()))
+ {
+ // todo ignore for now but wat do
+ }
+
+ // we good
+ _plugin.putIntoPendingJoin(command.getPlayerUUID(), partyOfSender.getUniqueId());
+ Portal.transferPlayer(command.getPlayerName(), _serverName);
+ }
+ });
+ });
+
+ ServerCommandManager.getInstance().registerCommandType(PartyCrossServerInviteDeny.class, command ->
+ {
+ _plugin.runSync(() ->
+ {
+ Player apparentSender = Bukkit.getPlayer(command.getInviterUUID());
+ if (apparentSender != null && apparentSender.isOnline())
+ {
+ _plugin.getInviteManager().removeInviteTo(command.getPlayerName(), command.getPartyUUID());
+
+ Party partyOfSender = _plugin.getPartyByPlayer(apparentSender);
+ if (partyOfSender == null)
+ {
+ UtilPlayer.message(apparentSender, F.main("Party", F.elem(command.getPlayerName()) + " has denied your invite, but it seems you don't have a party anymore"));
+ return;
+ }
+ if (!partyOfSender.getUniqueId().equals(command.getPartyUUID()))
+ {
+ UtilPlayer.message(apparentSender, F.main("Party", F.elem(command.getPlayerName()) + " has denied your invite, but it seems that you've made a new party in the meantime"));
+ return;
+ }
+
+ if (!partyOfSender.getOwnerName().equals(command.getInviterName()))
+ {
+ UtilPlayer.message(apparentSender, F.main("Party", F.elem(command.getPlayerName()) + " has denied your invite, but it seems that you are not the owner of the party anymore"));
+ return;
+ }
+
+ UtilPlayer.message(apparentSender, F.main("Party", F.elem(command.getPlayerName()) + " has denied your invite"));
+ }
+ });
});
}
- /**
- * Serializes and sends a party to another server
- *
- * @param server The destination server
- * @param party The party to be sent
- */
- public void sendPartyInfo(String server, Party party)
+ public Map> getPendingFindResponse()
{
- publish(server, PARTY_INFO, GSON.toJson(party));
- List members = party.getMembersByUUID();
- party.getMembersByUUID().forEach(uuid -> _plugin.getMethodManager().removeForTransfer(uuid));
- members.stream().map(Bukkit::getPlayer).forEach(player1 ->
- {
- player1.leaveVehicle();
- player1.eject();
- _plugin.getPortal().sendPlayer(player1, server);
- });
- _plugin.removeParty(party);
- }
-
- /**
- * Deserialize and store a received party's information
- * @param json
- */
- public void handlePartyInfo(String json)
- {
- new BukkitRunnable()
- {
- @Override
- public void run()
- {
- Party party = GSON.fromJson(json, Party.class);
- _plugin.addParty(party);
- party.getMembersByUUID().forEach(s -> _plugin.getMethodManager().addToPartyOnTransfer(s, party));
- Bukkit.getServer().getPluginManager().callEvent(new PartyDataReceivedEvent(party));
- }
- }.runTaskLater(_plugin.getPlugin(), 10L);
- }
-
- /**
- * @return This servers name
- */
- public String getServerName()
- {
- return _serverName;
- }
-
- /**
- * @return The channel constant for finding players
- */
- public String getFinder()
- {
- return FIND_PLAYERS_CHANNEL;
- }
-
- public void cancelTask(String player)
- {
- BukkitTask task = TASKS.remove(player);
-
- if (task != null)
- {
- task.cancel();
- }
+ return _pendingFindResponse;
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/redis/PartyRedisListener.java b/Plugins/Mineplex.Core/src/mineplex/core/party/redis/PartyRedisListener.java
deleted file mode 100644
index f4c3b4d20..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/redis/PartyRedisListener.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package mineplex.core.party.redis;
-
-import mineplex.core.party.manager.PartyRedisManager;
-import redis.clients.jedis.JedisPubSub;
-
-/**
- * Handles incoming messages into the Party Redis System
- */
-public class PartyRedisListener extends JedisPubSub
-{
-
- private final PartyRedisManager _redisManager;
-
- public PartyRedisListener(PartyRedisManager redisManager)
- {
- _redisManager = redisManager;
- }
-
- @Override
- public void onMessage(String channel, String message)
- {
- if(channel.equalsIgnoreCase(_redisManager.getFinder()))
- {
- _redisManager.handle(RedisMessageType.PLAYER_FIND_REQUEST, message);
- return;
- }
- RedisMessageType type = RedisMessageType.valueOf(message.split("@")[0].toUpperCase());
- _redisManager.handle(type, message.split("@")[1]);
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/redis/RedisMessageType.java b/Plugins/Mineplex.Core/src/mineplex/core/party/redis/RedisMessageType.java
deleted file mode 100644
index 533f62c75..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/redis/RedisMessageType.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package mineplex.core.party.redis;
-
-/**
- * Messages sent within the redis messaging system
- * And their corresponding arguments
- */
-public enum RedisMessageType
-{
-
- //Message: SERVER_FROM,PLAYER_TARGET,PLAYER_SENDER
- PLAYER_FIND_REQUEST(1, "{0},{1},{2}"),
- //Message: SERVER_ON,PLAYER_TARGET_NAME,PLAYER_TARGET_UUID,PLAYER_SENDER
- PLAYER_FIND_RESPONSE(2, "{0},{1},{2},{3}"),
-
- //Message: SERVER_FROM,PLAYER_SENDER,PLAYER_TARGET
- INVITE_PLAYER_REQUEST(3, "{0},{1},{2}"),
- //Message: PLAYER_SENDER,PLAYER_TARGET_NAME,PLAYER_TARGET_UUID,RESPONSE
- INVITE_PLAYER_RESPONSE(4, "{0},{1},{2},{3}"),
- //Message: PLAYER_SENDER,PLAYER_TARGET_NAME,PLAYER_TARGET_UUID,RESPONSE
- INVITE_PLAYER_ALREADY_IN_PARTY(5, "{0},{1},{2},{3}"),
- //Message: PLAYER_SENDER,PLAYER_TARGET_NAME,PLAYER_TARGET_UUID,RESPONSE
- INVITE_PLAYER_NOT_ACCEPTING_INVITES(5, "{0},{1},{2},{3}"),
-
- //Message: SERVER_FROM,PLAYER_INITIATING,PARTY_SIZE,_CAN_JOIN_FULL
- PREJOIN_SERVER_REQUEST(6, "{0},{1},{2},{3}"),
- //Message: PLAYER_INITIATING,REASON,SERVER
- PREJOIN_SERVER_RESPONSE(7, "{0},{1},{2}"),
-
- //Message: JSON Party
- PARTY_INFO(8, "{0}"),
- TEST_CONN(9, "{0}")
- ;
-
- private int _id;
- private String _contents;
-
- RedisMessageType(int id, String contents)
- {
- _id = id;
- _contents = contents;
- }
-
- public int getId()
- {
- return _id;
- }
-
- /**
- * Format this message
- * @param args The contents to be sent with this message
- * @return A formatted message
- */
- public String format(String... args)
- {
- String message = _contents;
- for(int i = 0; i < args.length; i++)
- {
- message = message.replace("{" + i + "}", args[i]);
- }
- return message;
- }
-
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteAccept.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteAccept.java
new file mode 100644
index 000000000..b6c7e80dc
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteAccept.java
@@ -0,0 +1,50 @@
+package mineplex.core.party.rediscommands;
+
+import java.util.UUID;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyCrossServerInviteAccept extends ServerCommand
+{
+ private final String _playerName;
+ private final UUID _playerUUID;
+
+ private final String _inviterName;
+ private final UUID _inviterUUID;
+
+ private final UUID _partyUUID;
+
+ public PartyCrossServerInviteAccept(String playerName, UUID playerUUID, String inviterName, UUID inviterUUID, UUID partyUUID)
+ {
+ _playerName = playerName;
+ _playerUUID = playerUUID;
+ _inviterName = inviterName;
+ _inviterUUID = inviterUUID;
+ _partyUUID = partyUUID;
+ }
+
+ public String getPlayerName()
+ {
+ return _playerName;
+ }
+
+ public UUID getPlayerUUID()
+ {
+ return _playerUUID;
+ }
+
+ public String getInviterName()
+ {
+ return _inviterName;
+ }
+
+ public UUID getInviterUUID()
+ {
+ return _inviterUUID;
+ }
+
+ public UUID getPartyUUID()
+ {
+ return _partyUUID;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteCommand.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteCommand.java
new file mode 100644
index 000000000..d35bc1a0b
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteCommand.java
@@ -0,0 +1,44 @@
+package mineplex.core.party.rediscommands;
+
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
+
+import mineplex.core.party.Party;
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyCrossServerInviteCommand extends ServerCommand
+{
+ private final String _requesterName;
+ private final UUID _requesterUUID;
+ private final String _target;
+ private final UUID _partyUUID;
+
+ public PartyCrossServerInviteCommand(Player caller, String target, Party destParty)
+ {
+ _target = target;
+ _requesterName = caller.getName();
+ _requesterUUID = caller.getUniqueId();
+ _partyUUID = destParty.getUniqueId();
+ }
+
+ public String getTarget()
+ {
+ return _target;
+ }
+
+ public String getRequesterName()
+ {
+ return _requesterName;
+ }
+
+ public UUID getRequesterUUID()
+ {
+ return _requesterUUID;
+ }
+
+ public UUID getPartyUUID()
+ {
+ return _partyUUID;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteDeny.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteDeny.java
new file mode 100644
index 000000000..cfc37736b
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteDeny.java
@@ -0,0 +1,50 @@
+package mineplex.core.party.rediscommands;
+
+import java.util.UUID;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyCrossServerInviteDeny extends ServerCommand
+{
+ private final String _playerName;
+ private final UUID _playerUUID;
+
+ private final String _inviterName;
+ private final UUID _inviterUUID;
+
+ private final UUID _partyUUID;
+
+ public PartyCrossServerInviteDeny(String playerName, UUID playerUUID, String inviterName, UUID inviterUUID, UUID partyUUID)
+ {
+ _playerName = playerName;
+ _playerUUID = playerUUID;
+ _inviterName = inviterName;
+ _inviterUUID = inviterUUID;
+ _partyUUID = partyUUID;
+ }
+
+ public String getPlayerName()
+ {
+ return _playerName;
+ }
+
+ public UUID getPlayerUUID()
+ {
+ return _playerUUID;
+ }
+
+ public String getInviterName()
+ {
+ return _inviterName;
+ }
+
+ public UUID getInviterUUID()
+ {
+ return _inviterUUID;
+ }
+
+ public UUID getPartyUUID()
+ {
+ return _partyUUID;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteResponse.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteResponse.java
new file mode 100644
index 000000000..bfc49a223
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyCrossServerInviteResponse.java
@@ -0,0 +1,58 @@
+package mineplex.core.party.rediscommands;
+
+import java.util.UUID;
+
+import org.bukkit.entity.Player;
+
+import com.google.gson.annotations.SerializedName;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyCrossServerInviteResponse extends ServerCommand
+{
+ private final Result _result;
+ private final PartyCrossServerInviteCommand _origin;
+
+ private final String _targetName;
+ private final UUID _targetUUID;
+
+ public PartyCrossServerInviteResponse(Result result, PartyCrossServerInviteCommand origin, Player target)
+ {
+ _result = result;
+ _origin = origin;
+
+ _targetName = target.getName();
+ _targetUUID = target.getUniqueId();
+ }
+
+ public Result getResult()
+ {
+ return _result == null ? Result.UNKNOWN : _result;
+ }
+
+ public PartyCrossServerInviteCommand getOrigin()
+ {
+ return _origin;
+ }
+
+ public String getTargetName()
+ {
+ return _targetName;
+ }
+
+ public UUID getTargetUUID()
+ {
+ return _targetUUID;
+ }
+
+ public enum Result
+ {
+ @SerializedName("success-in-party")
+ SUCCESS_IN_PARTY,
+ @SerializedName("not-accepting-invites")
+ TARGET_NOT_ACCEPTING_INVITES,
+ @SerializedName("success")
+ SUCCESS,
+ UNKNOWN
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferRequest.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferRequest.java
new file mode 100644
index 000000000..b647deef4
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferRequest.java
@@ -0,0 +1,53 @@
+package mineplex.core.party.rediscommands;
+
+import java.util.List;
+import java.util.UUID;
+
+import com.mojang.authlib.GameProfile;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyTransferRequest extends ServerCommand
+{
+ private final UUID _partyUUID;
+ private final List _allMembers;
+ private final List _unrankedMembers;
+ private final boolean _canJoinFullServers;
+
+ private final GameProfile _ownerGameProfile;
+
+ public PartyTransferRequest(UUID partyUUID, GameProfile ownerGameProfile, List allMembers, List unrankedMembers, boolean canJoinFullServers, String destServer)
+ {
+ super(destServer);
+ _partyUUID = partyUUID;
+ _ownerGameProfile = ownerGameProfile;
+ _allMembers = allMembers;
+ _unrankedMembers = unrankedMembers;
+ _canJoinFullServers = canJoinFullServers;
+ }
+
+ public UUID getPartyUUID()
+ {
+ return _partyUUID;
+ }
+
+ public List getAllMembers()
+ {
+ return _allMembers;
+ }
+
+ public List getUnrankedMembers()
+ {
+ return _unrankedMembers;
+ }
+
+ public boolean isCanJoinFullServers()
+ {
+ return _canJoinFullServers;
+ }
+
+ public GameProfile getOwnerGameProfile()
+ {
+ return _ownerGameProfile;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferResponse.java b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferResponse.java
new file mode 100644
index 000000000..ee881e537
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/rediscommands/PartyTransferResponse.java
@@ -0,0 +1,36 @@
+package mineplex.core.party.rediscommands;
+
+import com.google.gson.annotations.SerializedName;
+
+import mineplex.serverdata.commands.ServerCommand;
+
+public class PartyTransferResponse extends ServerCommand
+{
+ private final PartyTransferRequest _origin;
+ private final Result _result;
+
+ public PartyTransferResponse(PartyTransferRequest origin, Result result)
+ {
+ _origin = origin;
+ _result = result;
+ }
+
+ public PartyTransferRequest getOrigin()
+ {
+ return _origin;
+ }
+
+ public Result getResult()
+ {
+ return _result;
+ }
+
+ public enum Result
+ {
+ @SerializedName("not-enough-room")
+ NOT_ENOUGH_ROOM,
+ @SerializedName("success")
+ SUCCESS,
+ UNKNOWN
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/PartyMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/PartyMenu.java
index e66709c56..3c009de31 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/PartyMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/PartyMenu.java
@@ -13,15 +13,8 @@ import org.bukkit.Material;
*/
public abstract class PartyMenu extends Menu
{
-
- protected static final Button PURCHASE_MORE_SLOTS = new IconButton(new ItemBuilder(Material.REDSTONE_BLOCK)
- .setTitle(C.cRed + C.Bold + "Locked!")
- .setLore(" ", C.cGray + "Purchase a rank @ mineplex.com/shop", C.cGray + "Purchasing a rank increases your", C.cGray + "party size to allow 10 people!")
- .build());
-
public PartyMenu(String name, PartyManager plugin)
{
super(name, plugin);
}
-
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/PartyMemberIcon.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/PartyMemberIcon.java
index 5be48d2c9..fd15e6a97 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/PartyMemberIcon.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/PartyMemberIcon.java
@@ -1,36 +1,52 @@
package mineplex.core.party.ui.button;
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.UtilServer;
-import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.party.Party;
-import mineplex.core.party.event.PartyMemberKickGUIEvent;
-import mineplex.core.party.ui.button.tools.PartyButton;
-import org.bukkit.ChatColor;
+import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
+import com.mojang.authlib.GameProfile;
+
+import mineplex.core.Managers;
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.menu.Menu;
+import mineplex.core.party.Lang;
+import mineplex.core.party.Party;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.constants.PartyRemoveReason;
+import mineplex.core.party.ui.button.tools.PartyButton;
+import mineplex.core.utils.UtilGameProfile;
+
/**
* The button representing a Party member.
*/
public class PartyMemberIcon extends PartyButton
{
+ private final String _name;
private ItemStack _itemStack;
- public PartyMemberIcon(String player, Party party, boolean owner)
+ public PartyMemberIcon(GameProfile playerProfile, Party party, boolean owner, boolean isOwnerView)
{
super(null, party, null);
ItemBuilder builder = new ItemBuilder(Material.SKULL_ITEM, 1, (byte) 3)
- .setTitle(C.cYellow + player)
- .setPlayerHead(player);
- if(owner)
+ .setTitle(C.cYellow + playerProfile.getName());
+ if (owner)
{
builder.addLore(" ", C.cGreenB + "Leader");
}
+
+ if (!owner && isOwnerView)
+ {
+ builder.addLore(" ", C.cRed + "Shift-Right-Click to kick");
+ }
_itemStack = builder.build();
+
+ UtilGameProfile.setGameProfile(playerProfile, _itemStack);
+
+ _name = playerProfile.getName();
}
@Override
@@ -39,29 +55,23 @@ public class PartyMemberIcon extends PartyButton
return _itemStack;
}
- /**
- * Called when a player clicks one of the member icons
- *
- * @param clicker The player who clicked
- * @param clicked The itemstack he clicked
- */
- public void onClick(Player clicker, ItemStack clicked)
- {
- if (!getParty().isOwnerKickMode())
- {
- return;
- }
- if(!getParty().getOwner().equalsIgnoreCase(clicker.getName()))
- {
- return;
- }
- String name = ChatColor.stripColor(clicked.getItemMeta().getDisplayName());
- UtilServer.getPluginManager().callEvent(new PartyMemberKickGUIEvent(getParty(), name, clicker));
- }
-
@Override
public void onClick(Player player, ClickType clickType)
{
+ if (!getParty().getOwnerName().equalsIgnoreCase(player.getName()))
+ {
+ return;
+ }
+ if (clickType == ClickType.SHIFT_RIGHT)
+ {
+ Player target = Bukkit.getPlayerExact(_name);
+ if (target != null && !getParty().isOwner(target) && target != player && getParty().isMember(target))
+ {
+ Lang.REMOVED.send(target);
+ Managers.require(PartyManager.class).removeFromParty(target, PartyRemoveReason.KICKED);
+ Menu.get(player.getUniqueId()).resetAndUpdate();
+ }
+ }
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/LeavePartyButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/LeavePartyButton.java
index 174a46ab6..1b746ecc0 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/LeavePartyButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/LeavePartyButton.java
@@ -32,7 +32,7 @@ public class LeavePartyButton extends Button
{
return;
}
- getPlugin().getMethodManager().leaveParty(player);
+ getPlugin().leaveParty(player);
player.closeInventory();
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/DenyAllButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/DenyAllButton.java
index 7ae041d6f..7afa2d395 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/DenyAllButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/DenyAllButton.java
@@ -1,15 +1,16 @@
package mineplex.core.party.ui.button.tools.invite;
-import mineplex.core.common.util.C;
-import mineplex.core.menu.Button;
-import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.party.PartyManager;
-import mineplex.core.party.ui.menus.PartyInvitesMenu;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.inventory.ItemStack;
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemBuilder;
+import mineplex.core.menu.Button;
+import mineplex.core.party.PartyManager;
+import mineplex.core.party.ui.menus.PartyInvitesMenu;
+
/**
* Deny's all invites currently pending
*/
@@ -17,9 +18,9 @@ public class DenyAllButton extends Button
{
private static final ItemStack ITEM = new ItemBuilder(Material.REDSTONE_BLOCK)
- .setTitle(C.cRed + "Delete all Invites")
- .setLore(" ", C.cGray + "This will remove all pending invites.")
- .build();
+ .setTitle(C.cRed + "Delete all Invites")
+ .setLore(" ", C.cGray + "This will remove all pending invites.")
+ .build();
public DenyAllButton(PartyManager plugin)
{
@@ -29,7 +30,7 @@ public class DenyAllButton extends Button
@Override
public void onClick(Player player, ClickType clickType)
{
- getPlugin().getInviteManager().getAllInvites(player).forEach(inviteData -> getPlugin().getMethodManager().respondToInvite(player, inviteData.getInvitedTo(), false));
+ getPlugin().getInviteManager().getAllInvites(player).forEach(inviteData -> getPlugin().denyInviteBySender(player, inviteData.getInviterName()));
new PartyInvitesMenu(getPlugin()).open(player);
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/InviteButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/InviteButton.java
index 01478575f..2dfe161e8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/InviteButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/InviteButton.java
@@ -1,12 +1,13 @@
package mineplex.core.party.ui.button.tools.invite;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+
import mineplex.core.common.util.C;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.menu.Button;
import mineplex.core.party.PartyManager;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
/**
* Represents an invitation, to which a player can accept or deny
@@ -19,23 +20,24 @@ public class InviteButton extends Button
public InviteButton(String name, PartyManager plugin)
{
super(new ItemBuilder(Material.SKULL_ITEM)
- .setTitle(C.cYellow + name)
- .setLore(" ", C.cYellow + "Right-Click " + C.cGray + "to deny the invite", C.cYellow + "Left-Click " + C.cGray + "to accept the invite")
- .setData((short) 3)
- .setPlayerHead(name)
- .build(), plugin);
+ .setTitle(C.cYellow + name)
+ .setLore(" ", C.cYellow + "Right-Click " + C.cGray + "to deny the invite", C.cYellow + "Left-Click " + C.cGray + "to accept the invite")
+ .setData((short) 3)
+ .setPlayerHead(name)
+ .build(), plugin);
_name = name;
}
@Override
public void onClick(Player player, ClickType clickType)
{
- if(clickType == ClickType.LEFT)
+ if (clickType == ClickType.LEFT)
{
- getPlugin().getMethodManager().respondToInvite(player, _name, true);
- } else if(clickType == ClickType.RIGHT)
+ getPlugin().acceptInviteBySender(player, _name);
+ }
+ else if (clickType == ClickType.RIGHT)
{
- getPlugin().getMethodManager().respondToInvite(player, _name, false);
+ getPlugin().denyInviteBySender(player, _name);
}
player.closeInventory();
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/NextPageButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/NextPageButton.java
index 386cf1962..0412c987d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/NextPageButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/NextPageButton.java
@@ -42,7 +42,7 @@ public class NextPageButton extends Button
List data = _menu.getDataForPage(_menu.getCurrentPage());
for(int i = 0; i < data.size(); i++)
{
- _menu.setButton(i + _menu.getStartingSlot(), new InviteButton(data.get(i).getInvitedTo(), getPlugin()));
+ _menu.setButton(i + _menu.getStartingSlot(), new InviteButton(data.get(i).getInviterName(), getPlugin()));
}
_menu.update();
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/PrevPageButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/PrevPageButton.java
index e0bf5d315..91d91806b 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/PrevPageButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/invite/PrevPageButton.java
@@ -41,7 +41,7 @@ public class PrevPageButton extends Button
List data = _menu.getDataForPage(_menu.getCurrentPage());
for(int i = 0; i < data.size(); i++)
{
- _menu.setButton(i + _menu.getStartingSlot(), new InviteButton(data.get(i).getInvitedTo(), getPlugin()));
+ _menu.setButton(i + _menu.getStartingSlot(), new InviteButton(data.get(i).getInviterName(), getPlugin()));
}
_menu.update();
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/AddPlayerButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/AddPlayerButton.java
index 72bad2bed..ec2a4e0c6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/AddPlayerButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/AddPlayerButton.java
@@ -19,7 +19,7 @@ public class AddPlayerButton extends PartyButton
private static final ItemStack ITEM = new ItemBuilder(Material.SIGN)
.setTitle(C.cYellow + "Invite a Player")
- .setLore(" ", C.cGray + "Brings up the Inviting Anvil!", C.cGray + "Simply type a player's name", C.cGray + "and click the paper to invite him")
+ .setLore(" ", C.cGray + "Brings up the Inviting Anvil!", C.cGray + "Simply type a player's name", C.cGray + "and click the paper to invite them")
.build();
public AddPlayerButton(PartyManager plugin, Party party)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/DisbandPartyButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/DisbandPartyButton.java
index ce2afa915..5105dd77a 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/DisbandPartyButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/DisbandPartyButton.java
@@ -32,7 +32,7 @@ public class DisbandPartyButton extends Button
{
return;
}
- getPlugin().getMethodManager().disband(player);
+ getPlugin().disband(player);
player.closeInventory();
}
}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/KickPlayerButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/KickPlayerButton.java
deleted file mode 100644
index 48069adf2..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/KickPlayerButton.java
+++ /dev/null
@@ -1,56 +0,0 @@
-package mineplex.core.party.ui.button.tools.owner;
-
-import mineplex.core.common.util.C;
-import mineplex.core.common.util.F;
-import mineplex.core.itemstack.ItemBuilder;
-import mineplex.core.party.Party;
-import mineplex.core.party.ui.PartyMenu;
-import mineplex.core.party.ui.button.tools.PartyButton;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemStack;
-
-/**
- * Toggles {@code {@link Party#isOwnerKickMode()}}
- */
-public class KickPlayerButton extends PartyButton
-{
-
- private static final ItemStack ITEM_OFF = new ItemBuilder(Material.IRON_AXE)
- .setTitle(C.cYellow + "Kick Players")
- .setLore(" ", F.elem("Right-Click") + " to enter " + C.cGreen + "Kick Mode",
- C.cGray + "While activated, click on a player's head", C.cGray + "to remove them from the party")
- .build();
-
- private static final ItemStack ITEM_ON = new ItemBuilder(Material.IRON_AXE)
- .setTitle(C.cYellow + "Kick Players")
- .setLore(" ", F.elem("Right-Click") + " to leave " + C.cRed + "Kick Mode",
- C.cGray + "While activated, click on a player's head", C.cGray + "to remove them from the party")
- .setGlow(true)
- .build();
-
-
- public KickPlayerButton(Party party)
- {
- super(ITEM_OFF, party, null);
- }
-
- @Override
- public void onClick(Player player, ClickType clickType)
- {
- if(clickType != ClickType.RIGHT)
- {
- return;
- }
- getParty().setOwnerKickMode(!getParty().isOwnerKickMode());
- if (getParty().isOwnerKickMode())
- {
- setItemStack(ITEM_ON);
- } else
- {
- setItemStack(ITEM_OFF);
- }
- PartyMenu.get(player.getUniqueId()).update();
- }
-}
\ No newline at end of file
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
index 5c2fed842..676263b1d 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/button/tools/owner/SelectServerButton.java
@@ -1,15 +1,16 @@
package mineplex.core.party.ui.button.tools.owner;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.event.inventory.ClickType;
+import org.bukkit.inventory.ItemStack;
+
import mineplex.core.common.util.C;
import mineplex.core.common.util.UtilServer;
import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.party.Party;
import mineplex.core.party.event.PartySelectServerEvent;
import mineplex.core.party.ui.button.tools.PartyButton;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.ClickType;
-import org.bukkit.inventory.ItemStack;
/**
* Opens the server selection menu
@@ -18,9 +19,9 @@ public class SelectServerButton extends PartyButton
{
private static final ItemStack ITEM = new ItemBuilder(Material.COMPASS)
- .setTitle(C.cYellow + "Select Server")
- .setLore(" ", C.cGray + "Brings up the Server Selection GUI")
- .build();
+ .setTitle(C.cYellow + "Select Server")
+ .setLore(" ", C.cGray + "Brings up the Server Selection GUI")
+ .build();
public SelectServerButton(Party party)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyInvitesMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyInvitesMenu.java
index fbba8908a..ae7cf1252 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyInvitesMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyInvitesMenu.java
@@ -20,6 +20,8 @@ import org.bukkit.Material;
import org.bukkit.Sound;
import org.bukkit.entity.Player;
+import java.util.Comparator;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
@@ -69,7 +71,7 @@ public class PartyInvitesMenu extends PartyMenu
buttons[BACK_BUTTON_SLOT] = new BackButton(getPlugin());
- List all = (List) getPlugin().getInviteManager().getAllInvites(player);
+ List all = getPlugin().getInviteManager().getAllInvites(player);
if (all == null || all.isEmpty())
{
@@ -81,6 +83,8 @@ public class PartyInvitesMenu extends PartyMenu
return pane(buttons);
}
+ all.sort(Comparator.comparing(InviteData::getInviterName));
+
buttons[DENY_ALL_BUTTON_SLOW] = new DenyAllButton(getPlugin());
if (_filterBy == null || _filterBy.isEmpty())
@@ -94,7 +98,7 @@ public class PartyInvitesMenu extends PartyMenu
if (showFiltered)
{
- all = all.stream().filter(inviteData -> inviteData.getInvitedTo().contains(_filterBy)).collect(Collectors.toList());
+ all = all.stream().filter(inviteData -> inviteData.getInviterName().contains(_filterBy)).collect(Collectors.toList());
}
if (showFiltered && all.isEmpty())
@@ -125,7 +129,7 @@ public class PartyInvitesMenu extends PartyMenu
buttons[NEXT_PAGE_SLOT] = new NextPageButton(this, getPlugin());
_pagesNeeded = pagesNeeded;
- _pagesOfData = Maps.newHashMap();
+ _pagesOfData = new HashMap<>();
int page = 0;
@@ -150,7 +154,7 @@ public class PartyInvitesMenu extends PartyMenu
{
for (int i = 0; i < all.size(); i++)
{
- String to = all.get(i).getInvitedTo();
+ String to = all.get(i).getInviterName();
buttons[STARTING_SLOT + i] = new InviteButton(to, getPlugin());
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyMainMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyMainMenu.java
index 055203db3..d12dc6851 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyMainMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyMainMenu.java
@@ -1,22 +1,24 @@
package mineplex.core.party.ui.menus;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
+import mineplex.core.common.util.C;
+import mineplex.core.itemstack.ItemBuilder;
import mineplex.core.menu.Button;
+import mineplex.core.menu.Menu;
+import mineplex.core.menu.builtin.ButtonOpenInventory;
import mineplex.core.party.PartyManager;
-import mineplex.core.party.ui.PartyMenu;
import mineplex.core.party.ui.button.tools.main.InvitePlayerButton;
import mineplex.core.party.ui.button.tools.main.ViewInvitesButton;
-import org.bukkit.entity.Player;
-/**
- * The main GUI for parties.
- */
-public class PartyMainMenu extends PartyMenu
+public class PartyMainMenu extends Menu
{
-
- private final int INV_SIZE = 9;
-
- private final int INVITE_PLAYER_BUTTON_SLOT = 3;
- private final int VIEW_INVITES_BUTTON_SLOT = 5;
+ private static final ItemStack VIEW_INVITES_ITEM = new ItemBuilder(Material.BOOK)
+ .setTitle(C.cYellow + "View Invites")
+ .setLore(" ", C.cGray + "Manage invites to parties.")
+ .build();
public PartyMainMenu(PartyManager plugin)
{
@@ -26,10 +28,10 @@ public class PartyMainMenu extends PartyMenu
@Override
protected Button[] setUp(Player player)
{
- Button[] buttons = new Button[INV_SIZE];
+ Button[] buttons = new Button[9];
- buttons[INVITE_PLAYER_BUTTON_SLOT] = new InvitePlayerButton(getPlugin());
- buttons[VIEW_INVITES_BUTTON_SLOT] = new ViewInvitesButton(getPlugin());
+ buttons[3] = new InvitePlayerButton(getPlugin());
+ buttons[5] = new ButtonOpenInventory<>(VIEW_INVITES_ITEM, getPlugin(), () -> new PartyInvitesMenu(getPlugin()));
return buttons;
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyOwnerMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyOwnerMenu.java
index 563cfaef4..0b1c4c071 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyOwnerMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyOwnerMenu.java
@@ -1,5 +1,10 @@
package mineplex.core.party.ui.menus;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
import mineplex.core.menu.Button;
import mineplex.core.party.Party;
import mineplex.core.party.PartyManager;
@@ -8,14 +13,9 @@ import mineplex.core.party.ui.button.PartyMemberIcon;
import mineplex.core.party.ui.button.tools.LeavePartyButton;
import mineplex.core.party.ui.button.tools.owner.AddPlayerButton;
import mineplex.core.party.ui.button.tools.owner.DisbandPartyButton;
-import mineplex.core.party.ui.button.tools.owner.KickPlayerButton;
import mineplex.core.party.ui.button.tools.owner.SelectServerButton;
import mineplex.core.party.ui.button.tools.owner.TransferOwnerButton;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.UUID;
+import mineplex.core.utils.UtilGameProfile;
/**
* The display menu for managing parties by the owner
@@ -31,7 +31,6 @@ public class PartyOwnerMenu extends PartyMenu
private final int SKIP_TO_SLOT = 29;
private final int SKIP_TO_SLOT_2 = 38;
private final int ADD_PLAYER_BUTTON_SLOT = 1;
- private final int KICK_PLAYER_BUTTON_SLOT = 4;
private final int TRANSFER_OWNER_BUTTON_SLOT = 7;
private final int SELECT_SERVER_BUTTON_SLOT = 46;
private final int LEAVE_PARTY_BUTTON_SLOT = 49;
@@ -43,11 +42,6 @@ public class PartyOwnerMenu extends PartyMenu
{
super("Manage Party", plugin);
_party = party;
- //We want this disabled by default
- if(_party.isOwnerKickMode())
- {
- _party.setOwnerKickMode(false);
- }
}
@Override
@@ -56,8 +50,6 @@ public class PartyOwnerMenu extends PartyMenu
Button[] buttons = new Button[INV_SIZE];
//Tools
buttons[ADD_PLAYER_BUTTON_SLOT] = new AddPlayerButton(getPlugin(), _party);
- //Kick player
- buttons[KICK_PLAYER_BUTTON_SLOT] = new KickPlayerButton(_party);
//Transfer ownership
buttons[TRANSFER_OWNER_BUTTON_SLOT] = new TransferOwnerButton(_party, getPlugin());
//Go to server
@@ -67,23 +59,24 @@ public class PartyOwnerMenu extends PartyMenu
//Disband
buttons[DISBAND_PARTY_BUTTON_SLOW] = new DisbandPartyButton(getPlugin());
- List members = _party.getMembers();
- members.remove(_party.getOwner());
- buttons[OWNER_HEAD_SLOT] = new PartyMemberIcon(_party.getOwner(), _party, true);
+ List members = new ArrayList<>(_party.getMembers());
+ _party.getOwnerAsPlayer().ifPresent(members::remove);
+ buttons[OWNER_HEAD_SLOT] = new PartyMemberIcon(_party.getOwner(), _party, true, true);
int slot = STARTING_SLOT;
//Players
- for (String member: members)
+ for (Player member : members)
{
if (slot == CUT_OFF_SLOT)
{
slot = SKIP_TO_SLOT;
- } else if (slot == CUT_OFF_SLOT_2)
+ }
+ else if (slot == CUT_OFF_SLOT_2)
{
slot = SKIP_TO_SLOT_2;
}
- buttons[slot++] = new PartyMemberIcon(Bukkit.getPlayerExact(member).getName(), _party, false);
+ buttons[slot++] = new PartyMemberIcon(UtilGameProfile.getGameProfile(member), _party, false, true);
}
return pane(buttons);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyViewMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyViewMenu.java
index f907b7875..3037c42a1 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyViewMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/PartyViewMenu.java
@@ -1,5 +1,10 @@
package mineplex.core.party.ui.menus;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.bukkit.entity.Player;
+
import mineplex.core.menu.Button;
import mineplex.core.party.Party;
import mineplex.core.party.PartyManager;
@@ -7,11 +12,7 @@ import mineplex.core.party.ui.PartyMenu;
import mineplex.core.party.ui.button.PartyMemberIcon;
import mineplex.core.party.ui.button.tools.LeavePartyButton;
import mineplex.core.party.ui.button.tools.view.SuggestPlayerButton;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-import java.util.List;
-import java.util.UUID;
+import mineplex.core.utils.UtilGameProfile;
/**
* The menu a player see's when he is a member, and not an owner, of a party.
@@ -33,7 +34,7 @@ public class PartyViewMenu extends PartyMenu
public PartyViewMenu(Party party, PartyManager plugin)
{
- super(party.getName() + "'s Party", plugin);
+ super(party.getOwnerName() + "'s Party", plugin);
_party = party;
}
@@ -46,23 +47,24 @@ public class PartyViewMenu extends PartyMenu
//Suggest Player
buttons[SUGGEST_PLAYER_BUTTON_SLOT] = new SuggestPlayerButton(_party, getPlugin());
- List members = _party.getMembers();
- members.remove(_party.getOwner());
- buttons[OWNER_HEAD_SLOT] = new PartyMemberIcon(_party.getOwner(), _party, true);
+ List members = new ArrayList<>(_party.getMembers());
+ _party.getOwnerAsPlayer().ifPresent(members::remove);
+ buttons[OWNER_HEAD_SLOT] = new PartyMemberIcon(_party.getOwner(), _party, true, false);
int slot = STARTING_SLOT;
//Players
- for (String member : members)
+ for (Player member : members)
{
if (slot == CUT_OFF_SLOT)
{
slot = SKIP_TO_SLOT;
- } else if (slot == CUT_OFF_SLOT_2)
+ }
+ else if (slot == CUT_OFF_SLOT_2)
{
slot = SKIP_TO_SLOT_2;
}
- buttons[slot++] = new PartyMemberIcon(Bukkit.getPlayer(member).getName(), _party, false);
+ buttons[slot++] = new PartyMemberIcon(UtilGameProfile.getGameProfile(member), _party, false, false);
}
return pane(buttons);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/InviteFilterMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/InviteFilterMenu.java
index 24de3bc87..36c0fd03e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/InviteFilterMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/InviteFilterMenu.java
@@ -14,7 +14,7 @@ public class InviteFilterMenu extends PlayerInputActionMenu
public InviteFilterMenu(PartyManager partyManager, Player player, Party party)
{
- super(partyManager, player, party);
+ super(partyManager, player);
}
@Override
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyInvitePlayerMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyInvitePlayerMenu.java
index 4e30ebc07..c269ed6dc 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyInvitePlayerMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyInvitePlayerMenu.java
@@ -14,17 +14,19 @@ public class PartyInvitePlayerMenu extends PlayerNameMenu
{
private PartyManager _partyManager;
+ private Party _party;
public PartyInvitePlayerMenu(PartyManager partyManager, Player player, Party party)
{
- super(partyManager, partyManager.getClientManager(), player, party);
+ super(partyManager, partyManager.getClientManager(), player);
_partyManager = partyManager;
+ this._party = party;
}
@Override
public void onSuccess(String name)
{
- _partyManager.getMethodManager().invite(_player, name);
+ _partyManager.invite(_player, name);
_player.playSound(_player.getLocation(), Sound.NOTE_PLING, 1, 1.6f);
_player.closeInventory();
if (_party == null)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyTransferOwnerMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyTransferOwnerMenu.java
index 91305bfdc..a1156970e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyTransferOwnerMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PartyTransferOwnerMenu.java
@@ -1,10 +1,14 @@
package mineplex.core.party.ui.menus.input;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
import mineplex.core.anvilMenu.player.PlayerNameMenu;
+import mineplex.core.common.util.F;
+import mineplex.core.common.util.UtilPlayer;
import mineplex.core.party.Lang;
import mineplex.core.party.Party;
import mineplex.core.party.PartyManager;
-import org.bukkit.entity.Player;
/**
*
@@ -13,23 +17,32 @@ public class PartyTransferOwnerMenu extends PlayerNameMenu
{
private PartyManager _partyManager;
+ private Party _party;
public PartyTransferOwnerMenu(PartyManager partyManager, Player player, Party party)
{
- super(partyManager, partyManager.getClientManager(), player, party);
+ super(partyManager, partyManager.getClientManager(), player);
_partyManager = partyManager;
+ this._party = party;
}
@Override
public void onSuccess(String name)
{
- if(!_party.contains(name))
+ Player player = Bukkit.getPlayer(name);
+ if (player == null)
+ {
+ UtilPlayer.message(_player, F.main("Party", "Could not find " + F.elem(name) + "!"));
+ return;
+ }
+ if (!_party.isMember(player))
{
Lang.NOT_MEMBER.send(_player, name);
return;
}
- _partyManager.getMethodManager().transferOwner(name, _player.getName());
+
+ _party.setOwner(player);
Lang.TRANSFER_OWNER.send(_party, _player.getName(), name);
_player.closeInventory();
_player.chat("/party");
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PlayerSuggestPlayerMenu.java b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PlayerSuggestPlayerMenu.java
index d6fb40f38..bcc8f95f3 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PlayerSuggestPlayerMenu.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/party/ui/menus/input/PlayerSuggestPlayerMenu.java
@@ -17,35 +17,42 @@ import org.bukkit.entity.Player;
*/
public class PlayerSuggestPlayerMenu extends PlayerNameMenu
{
+ private Party _party;
public PlayerSuggestPlayerMenu(PartyManager partyManager, Player player, Party party)
{
- super(partyManager, partyManager.getClientManager(), player, party);
+ super(partyManager, partyManager.getClientManager(), player);
+ this._party = party;
}
@Override
public void onSuccess(String name)
{
- if(_party == null || _party.getOwner() == null)
+ if(_party == null || _party.getOwnerName() == null)
{
Lang.NO_PARTY.send(_player);
return;
}
- if(_party.contains(name))
+ Player target = Bukkit.getPlayer(name);
+
+ if (target != null)
{
- Lang.ALREADY_MEMBER.send(_player, name);
- return;
+ if (_party.isMember(target))
+ {
+ Lang.ALREADY_MEMBER.send(_player, name);
+ return;
+ }
}
- Player player = Bukkit.getPlayerExact(_party.getOwner());
+ Player player = Bukkit.getPlayerExact(_party.getOwnerName());
_party.sendMessage(C.mHead + "Party> " + F.name(_player.getName()) + " has suggested " + F.name(name) + " be invited.");
ChildJsonMessage message = new ChildJsonMessage("").extra(F.main("Party", "Click "));
message.add(F.link("Invite " + name))
.hover(HoverEvent.SHOW_TEXT, C.cGreen + "Clicking this will invite " + C.cYellow + name + C.cGreen + " to the party")
- .click(ClickEvent.RUN_COMMAND, "/partyinvite " + name);
+ .click(ClickEvent.RUN_COMMAND, "/party gui invite " + name);
message.add(C.mBody + " to invite them");
message.sendToPlayer(player);
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/FlyingPetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/FlyingPetManager.java
index c736ea1f5..1779e723c 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/FlyingPetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/FlyingPetManager.java
@@ -12,7 +12,7 @@ public class FlyingPetManager
{
/**
- * Makes the Fkying pets fly around the player
+ * Makes the Flying pets fly around the player
* Copied from {@link mineplex.core.gadget.gadgets.particle.ParticleFairyData}
*/
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
index 842779688..c88da63c7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/PetManager.java
@@ -8,7 +8,6 @@ import java.util.Map.Entry;
import java.util.UUID;
import net.minecraft.server.v1_8_R3.EntityCreature;
-import net.minecraft.server.v1_8_R3.NBTTagCompound;
import net.minecraft.server.v1_8_R3.NavigationAbstract;
import org.bukkit.Bukkit;
@@ -19,7 +18,6 @@ import org.bukkit.SkullType;
import org.bukkit.Sound;
import org.bukkit.block.Block;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftCreature;
-import org.bukkit.craftbukkit.v1_8_R3.entity.CraftEntity;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPigZombie;
import org.bukkit.entity.Ageable;
import org.bukkit.entity.Blaze;
@@ -53,8 +51,8 @@ import mineplex.core.account.event.ClientWebResponseEvent;
import mineplex.core.blockrestore.BlockRestore;
import mineplex.core.common.Rank;
import mineplex.core.common.shape.ShapeWings;
-import mineplex.core.common.util.F;
import mineplex.core.common.skin.SkinData;
+import mineplex.core.common.util.F;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilAction;
import mineplex.core.common.util.UtilAlg;
@@ -70,7 +68,6 @@ import mineplex.core.disguise.disguises.DisguiseGuardian;
import mineplex.core.disguise.disguises.DisguiseWither;
import mineplex.core.disguise.disguises.DisguiseZombie;
import mineplex.core.donation.DonationManager;
-import mineplex.core.events.AddConditionEvent;
import mineplex.core.inventory.InventoryManager;
import mineplex.core.itemstack.ItemStackFactory;
import mineplex.core.pet.repository.PetRepository;
@@ -104,13 +101,13 @@ public class PetManager extends MiniClientPlugin
private ShapeWings _wingsEdge = new ShapeWings(ParticleType.RED_DUST.particleName, new org.bukkit.util.Vector(0.1,0.1,0.1), 1, 0, true, ShapeWings.DEFAULT_ROTATION, ShapeWings.SMALL_ANGEL_WING_PATTERN);
public PetManager(JavaPlugin plugin, CoreClientManager clientManager, DonationManager donationManager
- , InventoryManager inventoryManager, DisguiseManager disguiseManager, mineplex.core.creature.Creature creatureModule, BlockRestore restore, String webAddress)
+ , InventoryManager inventoryManager, DisguiseManager disguiseManager, mineplex.core.creature.Creature creatureModule, BlockRestore restore)
{
super("Pet Manager", plugin);
_creatureModule = creatureModule;
_disguiseManager = disguiseManager;
- _repository = new PetRepository(plugin, webAddress);
+ _repository = new PetRepository();
_blockRestore = restore;
_donationManager = donationManager;
_clientManager = clientManager;
@@ -221,7 +218,7 @@ public class PetManager extends MiniClientPlugin
witherDisguise.setInvulTime(530);
Creature silverfish = (Creature) _creatureModule.SpawnEntity(location, EntityType.SILVERFISH);
- UtilEnt.Vegetate(silverfish, true);
+ UtilEnt.vegetate(silverfish, true);
UtilEnt.silence(silverfish, true);
silverfish.addPotionEffect(new PotionEffect(PotionEffectType.INVISIBILITY, Integer.MAX_VALUE, 0));
pet.setPassenger(silverfish);
@@ -316,10 +313,6 @@ public class PetManager extends MiniClientPlugin
}
else if (pet instanceof Blaze)
{
-
- AddConditionEvent event = new AddConditionEvent("Pet", pet, pet, AddConditionEvent.CoreConditionType.SILENCE, 0, -1, true, Material.SNOW_BALL, (byte) 0, false, false);
- Bukkit.getPluginManager().callEvent(event);
-
DisguiseZombie disguiseZombie = new DisguiseZombie(pet);
disguiseZombie.setBaby(true);
disguiseZombie.setHelmet(new ItemStack(Material.SKULL_ITEM, 1, (short) SkullType.WITHER.ordinal()));
@@ -335,6 +328,7 @@ public class PetManager extends MiniClientPlugin
_disguiseManager.disguise(disguiseZombie);
FlyingPetManager flyingPetManager = new FlyingPetManager(player, pet);
_flyingPets.put(pet, flyingPetManager);
+ UtilEnt.silence(pet, true);
}
else if (petType.equals(PetType.GINGERBREAD_MAN))
{
@@ -345,18 +339,13 @@ public class PetManager extends MiniClientPlugin
zombie.getEquipment().setLeggings(ItemStackFactory.Instance.createColoredLeatherArmor(2, Color.fromRGB(203, 122, 56)));
zombie.getEquipment().setBoots(ItemStackFactory.Instance.createColoredLeatherArmor(3, Color.fromRGB(203, 122, 56)));
+ UtilEnt.silence(zombie, true);
+
if (Get(player).getPets().get(entityType) != null && Get(player).getPets().get(entityType).length() > 0)
{
zombie.setCustomName(Get(player).getPets().get(entityType));
zombie.setCustomNameVisible(true);
}
-
- // Makes it silent
- net.minecraft.server.v1_8_R3.Entity nmsEntity = ((CraftEntity) zombie).getHandle();
- NBTTagCompound tag = new NBTTagCompound();
- nmsEntity.c(tag);
- tag.setByte("Silent", (byte) 1);
- nmsEntity.f(tag);
}
_activePetOwnerTypes.put(player.getName(), petType);
@@ -369,7 +358,7 @@ public class PetManager extends MiniClientPlugin
((Ageable)pet).setAgeLock(true);
}
- UtilEnt.Vegetate(pet);
+ UtilEnt.vegetate(pet);
}
public Creature getPet(Player player)
@@ -635,4 +624,9 @@ public class PetManager extends MiniClientPlugin
return _activePetOwners.values();
}
+ public mineplex.core.creature.Creature getCreatureModule()
+ {
+ return _creatureModule;
+ }
+
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
index 2454ff60a..c373aef52 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/pet/repository/PetRepository.java
@@ -1,46 +1,23 @@
package mineplex.core.pet.repository;
-import java.util.List;
-
-import org.bukkit.plugin.java.JavaPlugin;
-
-import com.google.gson.reflect.TypeToken;
-
import mineplex.core.database.MinecraftRepository;
import mineplex.core.pet.repository.token.PetChangeToken;
-import mineplex.core.pet.repository.token.PetExtraToken;
-import mineplex.core.server.remotecall.AsyncJsonWebCall;
-import mineplex.core.server.remotecall.JsonWebCall;
import mineplex.serverdata.database.DBPool;
public class PetRepository extends MinecraftRepository
{
- private String _webAddress;
-
- public PetRepository(JavaPlugin plugin, String webAddress)
+ public PetRepository()
{
super(DBPool.getAccount());
-
- _webAddress = webAddress;
}
public void AddPet(final PetChangeToken token)
{
- new AsyncJsonWebCall(_webAddress + "Pets/AddPet").Execute(token);
- }
-
- public void RemovePet(final PetChangeToken token)
- {
- new AsyncJsonWebCall(_webAddress + "Pets/RemovePet").Execute(token);
- }
-
- public List GetPetExtras(List petExtraTokens)
- {
- return new JsonWebCall(_webAddress + "Pets/GetPetExtras").Execute(new TypeToken>(){}.getType(), petExtraTokens);
+ handleAsyncMSSQLCall("Pets/AddPet", token);
}
public void UpdatePet(final PetChangeToken token)
{
- new AsyncJsonWebCall(_webAddress + "Pets/UpdatePet").Execute(token);
+ handleAsyncMSSQLCall("Pets/UpdatePet", token);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/poll/PollRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/poll/PollRepository.java
index 850d006c9..b65345cf4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/poll/PollRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/poll/PollRepository.java
@@ -10,6 +10,7 @@ import mineplex.core.database.MinecraftRepository;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.ResultSetCallable;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
@@ -17,7 +18,7 @@ import mineplex.serverdata.database.column.ColumnVarChar;
/**
* Created by Shaun on 8/16/2014.
*/
-public class PollRepository extends MinecraftRepository
+public class PollRepository extends RepositoryBase
{
private static String CREATE_POLL_TABLE = "CREATE TABLE IF NOT EXISTS polls (id INT NOT NULL AUTO_INCREMENT, enabled BIT(1), question VARCHAR(256) NOT NULL, answerA VARCHAR(256) NOT NULL, answerB VARCHAR(256), answerC VARCHAR(256), answerD VARCHAR(256), coinReward INT NOT NULL, displayType INT DEFAULT 0 NOT NULL, PRIMARY KEY (id));";
private static String CREATE_RELATION_TABLE = "CREATE TABLE IF NOT EXISTS accountPolls (id INT NOT NULL AUTO_INCREMENT, accountId INT NOT NULL, pollId INT NOT NULL, value TINYINT(1) NOT NULL, PRIMARY KEY (id), FOREIGN KEY (accountId) REFERENCES accounts(id), FOREIGN KEY (pollId) REFERENCES polls(id), UNIQUE INDEX accountPollIndex (accountId, pollId));";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/GenericServer.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/GenericServer.java
new file mode 100644
index 000000000..02cb2da42
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/GenericServer.java
@@ -0,0 +1,28 @@
+package mineplex.core.portal;
+
+/**
+ * Groups of servers with no specific id
+ */
+public enum GenericServer
+{
+ /**
+ * The Hubs, such as Lobby-1
+ */
+ HUB("Lobby"),
+ /**
+ * The Clans Hubs, such as ClansHub-1
+ */
+ CLANS_HUB("ClansHub");
+
+ private final String _name;
+
+ GenericServer(String name)
+ {
+ this._name = name;
+ }
+
+ public String getName()
+ {
+ return _name;
+ }
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Intent.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Intent.java
new file mode 100644
index 000000000..5bf35f346
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Intent.java
@@ -0,0 +1,20 @@
+package mineplex.core.portal;
+
+/**
+ * The intention for transferring a player. Different intents will cause different behaviours to occur
+ */
+public enum Intent
+{
+ /**
+ * Requested by a player (i.e. /server)
+ */
+ PLAYER_REQUEST,
+ /**
+ * Forcibly kicked by the server (i.e. MPS kick)
+ */
+ KICK,
+ /**
+ * A transfer was initiated from a remote server (i.e. /send)
+ */
+ FORCE_TRANSFER
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
index c02952384..47300a0e7 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/Portal.java
@@ -1,6 +1,20 @@
package mineplex.core.portal;
-import com.google.common.collect.Lists;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.UUID;
+
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Sound;
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.player.PlayerJoinEvent;
+
import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
@@ -8,189 +22,140 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.Callback;
import mineplex.core.common.util.F;
import mineplex.core.common.util.UtilPlayer;
+import mineplex.core.common.util.UtilServer;
import mineplex.core.common.util.UtilTabTitle;
-import mineplex.core.party.Party;
-import mineplex.core.party.event.PartySendToServerEvent;
-import mineplex.core.portal.Commands.SendCommand;
-import mineplex.core.portal.Commands.ServerCommand;
+import mineplex.core.portal.commands.SendCommand;
+import mineplex.core.portal.commands.ServerCommand;
+import mineplex.core.portal.events.GenericServerTransferEvent;
+import mineplex.core.portal.events.ServerTransferEvent;
import mineplex.serverdata.Region;
import mineplex.serverdata.commands.ServerCommandManager;
-import mineplex.serverdata.commands.ServerTransfer;
import mineplex.serverdata.commands.TransferCommand;
+import mineplex.serverdata.commands.TransferUUIDCommand;
import mineplex.serverdata.data.MinecraftServer;
import mineplex.serverdata.servers.ServerManager;
import mineplex.serverdata.servers.ServerRepository;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Sound;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.player.PlayerJoinEvent;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Random;
public class Portal extends MiniPlugin
{
// The singleton instance of Portal
private static Portal instance;
- public static Portal getInstance() { return instance; }
-
- private ServerRepository _repository;
- private CoreClientManager _clientManager;
- private HashSet _connectingPlayers = new HashSet();
-
- private Region _region;
- private String _serverName;
-
- public Portal(JavaPlugin plugin, CoreClientManager clientManager, String serverName)
+
+ public static Portal getInstance()
{
- super("Portal", plugin);
+ return instance;
+ }
+
+ private final CoreClientManager _clientManager = require(CoreClientManager.class);
+
+ private final ServerRepository _repository;
+ private final Set _connectingPlayers = Collections.synchronizedSet(new HashSet<>());
+
+ public Portal()
+ {
+ super("Portal");
instance = this;
- _clientManager = clientManager;
- _region = plugin.getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU;
- _serverName = serverName;
- _repository = ServerManager.getServerRepository(_region);
-
+ _repository = ServerManager.getServerRepository(getPlugin().getConfig().getBoolean("serverstatus.us") ? Region.US : Region.EU);
+
Bukkit.getMessenger().registerOutgoingPluginChannel(getPlugin(), "BungeeCord");
-
- // Register the server command type for future use
- ServerCommandManager.getInstance().registerCommandType("TransferCommand", TransferCommand.class, new TransferHandler());
+
+ ServerCommandManager.getInstance().registerCommandType(TransferCommand.class, command ->
+ {
+ Player player = Bukkit.getPlayerExact(command.getPlayerName());
+
+ if (player != null && player.isOnline())
+ {
+ sendPlayerToServer(player, command.getTargetServer(), Intent.FORCE_TRANSFER);
+ }
+ });
+ ServerCommandManager.getInstance().registerCommandType(TransferUUIDCommand.class, command ->
+ {
+ Player player = Bukkit.getPlayer(command.getPlayerUUID());
+
+ if (player != null && player.isOnline())
+ {
+ sendPlayerToServer(player, command.getTargetServer(), Intent.FORCE_TRANSFER);
+ }
+ });
}
- @EventHandler
- public void join(PlayerJoinEvent event)
+ public void sendAllPlayersToGenericServer(GenericServer hub, Intent kick)
{
- Player player = event.getPlayer();
- //Player List
- String serverName = _plugin.getConfig().getString("serverstatus.name");
- UtilTabTitle.setHeaderAndFooter(player, C.Bold + "Mineplex Network " + C.cGreen + serverName, "Visit " + C.cGreen + "www.mineplex.com" + ChatColor.RESET + " for News, Forums and Shop");
}
-
- public void sendAllPlayers(String serverName)
- {
- for (Player player : Bukkit.getOnlinePlayers())
- {
- sendPlayerToServer(player, serverName);
- }
- }
-
- public void sendPlayerToServer(Player player, String serverName)
- {
- sendPlayerToServer(player, serverName, false);
- }
-
- public void sendPlayerToServer(final Player player, final String serverName, boolean draggedByParty)
+
+ public void sendPlayerToGenericServer(Player player, GenericServer genericServer, Intent intent)
{
if (_connectingPlayers.contains(player.getName()))
return;
- ServerTransferEvent event = new ServerTransferEvent(player, serverName, draggedByParty);
- Bukkit.getPluginManager().callEvent(event);
+ GenericServerTransferEvent event = new GenericServerTransferEvent(player, genericServer, intent);
+ UtilServer.CallEvent(event);
- final boolean override = serverName.equalsIgnoreCase("Lobby") || serverName.equalsIgnoreCase("ClansHub");
- final Rank playerRank = _clientManager.Get(player).GetRank();
-
- if (event.getParty() != null && override)
- {
- Party party = event.getParty();
- if(!party.getOwner().equalsIgnoreCase(player.getName()))
- {
- return;
- }
- sendParty(party);
- return;
- }
-
- if (event.getParty() != null && serverName.toUpperCase().startsWith("CLANS-"))
- {
- event.getParty().sendMessage(F.main(getName(), "You cannot join Clans while in a party!"));
- return;
- }
-
- if (override)
- {
- sendPlayer(player, serverName);
- return;
- }
-
- if (event.isCancel())
+ if (event.isCancelled())
{
return;
}
- runAsync(() -> {
+ sendPlayer(player, genericServer.getName());
+ }
+
+ public void sendPlayerToServer(Player player, String serverName, Intent intent)
+ {
+ if (_connectingPlayers.contains(player.getName()))
+ return;
+
+ ServerTransferEvent event = new ServerTransferEvent(player, serverName, intent);
+ UtilServer.CallEvent(event);
+
+ if (event.isCancelled())
+ {
+ return;
+ }
+
+ Rank playerRank = _clientManager.Get(player).GetRank();
+
+ runAsync(() ->
+ {
final MinecraftServer server = _repository.getServerStatus(serverName);
if (server == null)
return;
- Bukkit.getServer().getScheduler().runTask(_plugin, () -> {
+ runSync(() ->
+ {
if (server.getPlayerCount() < server.getMaxPlayerCount() || playerRank.has(Rank.ULTRA))
{
sendPlayer(player, serverName);
}
else
+ {
UtilPlayer.message(player, F.main(getName(), C.cGold + serverName + C.cRed + " is full!"));
+ }
});
});
}
- private void sendParty(Party party)
- {
- ServerRepository repository = ServerManager.getServerRepository(_region);
- MinecraftServer best = null;
- List serverList = Lists.newArrayList(repository.getServersByGroup("Lobby"));
- int lowest = Integer.MAX_VALUE;
- for (MinecraftServer server : serverList)
- {
- int playercount = server.getPlayerCount();
- if (playercount < 20)
- {
- continue;
- }
- if (playercount < lowest)
- {
- lowest = playercount;
- if (best == null)
- {
- best = server;
- }
- }
- }
- if (best == null)
- {
- //Well, fuck.
- best = serverList.get(new Random().nextInt(serverList.size()));
- }
-
- PartySendToServerEvent serverEvent = new PartySendToServerEvent(party, best);
- getPluginManager().callEvent(serverEvent);
- }
-
public static void transferPlayer(String playerName, String serverName)
- {
- ServerTransfer serverTransfer = new ServerTransfer(playerName, serverName);
- TransferCommand transferCommand = new TransferCommand(serverTransfer);
- transferCommand.publish();
+ {
+ new TransferCommand(playerName, serverName).publish();
}
-
+
+ public static void transferPlayer(UUID playerUUID, String serverName)
+ {
+ new TransferUUIDCommand(playerUUID, serverName).publish();
+ }
+
public void doesServerExist(final String serverName, final Callback callback)
{
if (callback == null)
return;
-
- Bukkit.getScheduler().runTaskAsynchronously(getPlugin(), () -> {
- final boolean serverExists = ServerManager.getServerRepository(_region).serverExists(serverName);
- Bukkit.getScheduler().runTask(getPlugin(), () -> callback.run(serverExists));
+ runAsync(() ->
+ {
+ boolean result = _repository.serverExists(serverName);
+ runSync(() -> callback.run(result));
});
}
@@ -200,7 +165,7 @@ public class Portal extends MiniPlugin
addCommand(new SendCommand(this));
}
- public void sendToHub(Player player, String message)
+ public void sendToHub(Player player, String message, Intent intent)
{
if (message != null)
{
@@ -210,42 +175,50 @@ public class Portal extends MiniPlugin
}
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
- sendPlayerToServer(player, "Lobby");
+ sendPlayerToGenericServer(player, GenericServer.HUB, intent);
}
-
+
+ /**
+ * Directly sends a player to the provided server name, bypassing all validation
+ *
+ * @param player The player to send
+ * @param serverName The destination server
+ */
public void sendPlayer(final Player player, String serverName)
{
ByteArrayOutputStream b = new ByteArrayOutputStream();
DataOutputStream out = new DataOutputStream(b);
-
- try
+
+ try
{
- out.writeUTF("Connect");
- out.writeUTF(serverName);
+ out.writeUTF("Connect");
+ out.writeUTF(serverName);
}
- catch (IOException e)
+ catch (IOException ignored)
{
- // Can never happen
}
- finally
- {
- try
- {
- out.close();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- }
- }
-
+
player.sendPluginMessage(getPlugin(), "BungeeCord", b.toByteArray());
_connectingPlayers.add(player.getName());
-
+
getScheduler().scheduleSyncDelayedTask(getPlugin(), () -> _connectingPlayers.remove(player.getName()), 20L);
-
- UtilPlayer.message(player, F.main(getName(), "You have been sent from " + C.cGold + _serverName + C.cGray + " to " + C.cGold + serverName));
+
+ UtilPlayer.message(player, F.main(getName(), "You have been sent from " + C.cGold + UtilServer.getServerName() + C.cGray + " to " + C.cGold + serverName));
}
+ @EventHandler
+ private void setTabHeaderAndFooterOnJoin(PlayerJoinEvent event)
+ {
+ UtilTabTitle.setHeaderAndFooter(
+ event.getPlayer(),
+ C.Bold + "Mineplex Network " + C.cGreen + UtilServer.getServerName(),
+ "Visit " + C.cGreen + "www.mineplex.com" + ChatColor.RESET + " for News, Forums and Shop"
+ );
+ }
+
+ public ServerRepository getRepository()
+ {
+ return _repository;
+ }
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java
deleted file mode 100644
index 8a19c65c0..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/ServerTransferEvent.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package mineplex.core.portal;
-
-import mineplex.core.party.Party;
-import org.bukkit.entity.Player;
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-public class ServerTransferEvent extends Event
-{
-
- private static final HandlerList _handlers = new HandlerList();
- private Player _player;
- private String _server;
- private Party _party;
- private boolean _draggedByParty;
- private boolean _cancel;
-
- public ServerTransferEvent(Player player, String server, boolean draggedByParty)
- {
- _player = player;
- _server = server;
- _draggedByParty = draggedByParty;
- }
-
- public boolean isDraggedByParty()
- {
- return _draggedByParty;
- }
-
- public void setDraggedByParty(boolean draggedByParty)
- {
- _draggedByParty = draggedByParty;
- }
-
- public HandlerList getHandlers()
- {
- return _handlers;
- }
-
- public static HandlerList getHandlerList()
- {
- return _handlers;
- }
-
- public Player getPlayer()
- {
- return _player;
- }
-
- public String getServer()
- {
- return _server;
- }
-
- public boolean isCancel()
- {
- return _cancel;
- }
-
- public void setCancel(boolean cancel)
- {
- _cancel = cancel;
- }
-
- public Party getParty()
- {
- return _party;
- }
-
- public void setParty(Party party)
- {
- _party = party;
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/TransferHandler.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/TransferHandler.java
deleted file mode 100644
index 991d1e677..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/portal/TransferHandler.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package mineplex.core.portal;
-
-import mineplex.serverdata.commands.CommandCallback;
-import mineplex.serverdata.commands.ServerCommand;
-import mineplex.serverdata.commands.ServerTransfer;
-import mineplex.serverdata.commands.TransferCommand;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
-public class TransferHandler implements CommandCallback
-{
- public void run(ServerCommand command)
- {
- if (command instanceof TransferCommand)
- {
- TransferCommand transferCommand = (TransferCommand) command;
- ServerTransfer transfer = transferCommand.getTransfer();
-
- Player player = Bukkit.getPlayerExact(transfer.getPlayerName());
-
- if (player != null && player.isOnline())
- {
- Portal.getInstance().sendPlayerToServer(player, transfer.getServerName());
- }
- }
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/events/GenericServerTransferEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/events/GenericServerTransferEvent.java
new file mode 100644
index 000000000..b0b130e38
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/events/GenericServerTransferEvent.java
@@ -0,0 +1,65 @@
+package mineplex.core.portal.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.core.portal.GenericServer;
+import mineplex.core.portal.Intent;
+
+public class GenericServerTransferEvent extends Event implements Cancellable
+{
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private Player _player;
+ private GenericServer _server;
+ private boolean _cancel = false;
+
+ private Intent _intent;
+
+ public GenericServerTransferEvent(Player player, GenericServer server, Intent intent)
+ {
+ _player = player;
+ _server = server;
+ _intent = intent;
+ }
+
+ public Player getPlayer()
+ {
+ return _player;
+ }
+
+ public GenericServer getServer()
+ {
+ return _server;
+ }
+
+ public Intent getIntent()
+ {
+ return _intent;
+ }
+
+ @Override
+ public boolean isCancelled()
+ {
+ return this._cancel;
+ }
+
+ @Override
+ public void setCancelled(boolean b)
+ {
+ this._cancel = b;
+ }
+
+ public HandlerList getHandlers()
+ {
+ return HANDLER_LIST;
+ }
+
+ public static HandlerList getHandlerList()
+ {
+ return HANDLER_LIST;
+ }
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/portal/events/ServerTransferEvent.java b/Plugins/Mineplex.Core/src/mineplex/core/portal/events/ServerTransferEvent.java
new file mode 100644
index 000000000..cdc3d41e0
--- /dev/null
+++ b/Plugins/Mineplex.Core/src/mineplex/core/portal/events/ServerTransferEvent.java
@@ -0,0 +1,64 @@
+package mineplex.core.portal.events;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.Event;
+import org.bukkit.event.HandlerList;
+
+import mineplex.core.portal.Intent;
+
+public class ServerTransferEvent extends Event implements Cancellable
+{
+ private static final HandlerList HANDLER_LIST = new HandlerList();
+
+ private Player _player;
+ private String _server;
+ private boolean _cancel = false;
+
+ private Intent _intent;
+
+ public ServerTransferEvent(Player player, String server, Intent intent)
+ {
+ _player = player;
+ _server = server;
+ _intent = intent;
+ }
+
+ public Player getPlayer()
+ {
+ return _player;
+ }
+
+ public String getServer()
+ {
+ return _server;
+ }
+
+ public Intent getIntent()
+ {
+ return _intent;
+ }
+
+ @Override
+ public boolean isCancelled()
+ {
+ return this._cancel;
+ }
+
+ @Override
+ public void setCancelled(boolean b)
+ {
+ this._cancel = b;
+ }
+
+ public HandlerList getHandlers()
+ {
+ return HANDLER_LIST;
+ }
+
+ public static HandlerList getHandlerList()
+ {
+ return HANDLER_LIST;
+ }
+
+}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java
index aef708f46..fbeb15eb2 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/Preference.java
@@ -24,7 +24,9 @@ public enum Preference
SHOW_PLAYERS(true, PreferenceCategory.USER, Material.EYE_OF_ENDER, "Hub Player Visibility"),
SHOW_CHAT(true, PreferenceCategory.USER, Material.PAPER, "Player Chat"),
PRIVATE_MESSAGING(true, PreferenceCategory.USER, Material.MAP, "Private Messaging"),
- PARTY_REQUESTS(true, PreferenceCategory.USER, Material.SKULL_ITEM, "Party Requests"),
+
+ // TIM WHY DID YOU MAKE THE ID ORDINAL YOU DHAJDHJGHADJHGFAJHFSJDHAJDHSJHJA
+ PARTY_REQUESTS(true, PreferenceCategory.SOCIAL, Material.SKULL_ITEM, "Party Requests"),
INVISIBILITY(false, PreferenceCategory.EXCLUSIVE, Material.NETHER_STAR, "Hub Invisibility & Flight"),
FORCE_FIELD(false, PreferenceCategory.EXCLUSIVE, Material.SLIME_BALL, "Hub Forcefield"),
@@ -41,8 +43,10 @@ public enum Preference
AUTO_JOIN_NEXT_GAME(true, PreferenceCategory.GAME_PLAY, Material.DIAMOND_SWORD, "Auto Join Next Game", "Feel like playing again?", "Enable this, and when you're out", "a 15 second timer will start", "when it ends, it'll send you", "to another game!"),
DISABLE_WARNING(true, PreferenceCategory.GAME_PLAY, Material.BARRIER, "Disable Automatic Warning", "Know what you're doing?", "Disable this to not receive", "a message warning you about Auto-Join"),
COUNTDOWN_ON_CLICK(false, PreferenceCategory.GAME_PLAY, Material.WATCH, "Countdown to Join", "See that fancy text when you're out?", "If you click it, and this is enabled", "a 15 second time will countdown", "until you are sent to a new game"),
-
+
COMMUNITY_INVITES(true, PreferenceCategory.SOCIAL, Material.BOOK, "Show Community Invites"),
+
+ PARTY_DISPLAY_INVENTORY_UI(true, PreferenceCategory.SOCIAL, Material.CHEST, "Display Parties GUI")
;
private static final Map PREFERENCE_MAP = Maps.newHashMap();
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
index c3f280d65..a1b7c422e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/preferences/PreferencesRepository.java
@@ -3,13 +3,14 @@ package mineplex.core.preferences;
import mineplex.core.database.MinecraftRepository;
import mineplex.core.progression.util.SQLStatement;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import java.sql.Connection;
import java.sql.PreparedStatement;
import java.sql.SQLException;
-public class PreferencesRepository extends MinecraftRepository
+public class PreferencesRepository extends RepositoryBase
{
private static String UPSERT_ACCOUNT = "INSERT INTO `preferences` VALUES(?, ?, ?) ON DUPLICATE KEY UPDATE `value`= ?";
@@ -91,7 +92,7 @@ public class PreferencesRepository extends MinecraftRepository
public void async(Runnable runnable)
{
- getPlugin().getServer().getScheduler().runTaskAsynchronously(getPlugin(), runnable);
+ _manager.runAsync(runnable);
}
/**
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/progression/KitProgressionRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/progression/KitProgressionRepository.java
index 6eb391bfb..8683a5cfa 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/progression/KitProgressionRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/progression/KitProgressionRepository.java
@@ -1,9 +1,12 @@
package mineplex.core.progression;
+import mineplex.core.common.util.UtilServer;
import mineplex.core.database.MinecraftRepository;
import mineplex.core.progression.data.PlayerKit;
import mineplex.core.progression.util.SQLStatement;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
+
import org.bukkit.Bukkit;
import java.sql.Connection;
@@ -15,7 +18,7 @@ import java.util.UUID;
/**
* Handles all things database related.
*/
-public class KitProgressionRepository extends MinecraftRepository
+public class KitProgressionRepository extends RepositoryBase
{
private final String CREATE_TABLE = "CREATE TABLE IF NOT EXISTS `kitProgression` (" +
@@ -72,7 +75,7 @@ public class KitProgressionRepository extends MinecraftRepository
if (effect == -1)
{
//Something went wrong uh oh
- this.getPlugin().getLogger().severe("Inserting new Kit Data for " + playerKit.getUuid() + " failed!");
+ _kitProgressionManager.getPlugin().getLogger().severe("Inserting new Kit Data for " + playerKit.getUuid() + " failed!");
}
} catch (SQLException e)
{
@@ -117,7 +120,7 @@ public class KitProgressionRepository extends MinecraftRepository
int effect = executeUpdate(statement);
if (effect == -1)
{
- this.getPlugin().getLogger().severe("Updating default value for" + playerKit.getUuid().toString() + "'s kit failed!");
+ _kitProgressionManager.getPlugin().getLogger().severe("Updating default value for" + playerKit.getUuid().toString() + "'s kit failed!");
}
} catch (SQLException e)
{
@@ -236,7 +239,7 @@ public class KitProgressionRepository extends MinecraftRepository
private void async(Runnable runnable)
{
- Bukkit.getScheduler().runTaskAsynchronously(_plugin, runnable);
+ UtilServer.runAsync(runnable);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
index 560cd293d..f72bd4747 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/Punish.java
@@ -46,13 +46,13 @@ public class Punish extends MiniPlugin
private PunishRepository _repository;
private CoreClientManager _clientManager;
- public Punish(JavaPlugin plugin, String webServerAddress, CoreClientManager clientManager)
+ public Punish(JavaPlugin plugin, CoreClientManager clientManager)
{
super("Punish", plugin);
_punishClients = new HashMap();
_clientManager = clientManager;
- _repository = new PunishRepository(webServerAddress);
+ _repository = new PunishRepository();
ServerCommandManager.getInstance().registerCommandType("PunishCommand", mineplex.serverdata.commands.PunishCommand.class, new PunishmentHandler(this));
}
@@ -416,11 +416,6 @@ public class Punish extends MiniPlugin
}, punishmentId, target, reason, client.getName());
}
- public void RemoveBan(String name, String reason)
- {
- _repository.RemoveBan(name, reason);
- }
-
public CoreClientManager GetClients()
{
return _clientManager;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishRepository.java
index 3ed3d380d..01fe48342 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/punish/PunishRepository.java
@@ -3,25 +3,24 @@ package mineplex.core.punish;
import java.util.List;
import com.google.gson.reflect.TypeToken;
+
import mineplex.core.common.util.Callback;
+import mineplex.core.database.MinecraftRepository;
import mineplex.core.punish.Tokens.PunishClientToken;
import mineplex.core.punish.Tokens.PunishToken;
import mineplex.core.punish.Tokens.RemovePunishToken;
-import mineplex.core.server.remotecall.AsyncJsonWebCall;
-import mineplex.core.server.remotecall.JsonWebCall;
+import mineplex.serverdata.database.DBPool;
-public class PunishRepository
+public class PunishRepository extends MinecraftRepository
{
- private String _webAddress;
-
- public PunishRepository(String webServerAddress)
+ public PunishRepository()
{
- _webAddress = webServerAddress;
+ super(DBPool.getAccount());
}
-
+
public void Punish(Callback callback, String target, String category, PunishmentSentence punishment, String reason, double duration, String admin, int severity)
{
- PunishToken token = new PunishToken();
+ PunishToken token = new PunishToken();
token.Target = target;
token.Category = category;
token.Sentence = punishment.toString();
@@ -30,7 +29,7 @@ public class PunishRepository
token.Admin = admin;
token.Severity = severity;
- new AsyncJsonWebCall(_webAddress + "PlayerAccount/Punish").Execute(String.class, callback, token);
+ handleMSSQLCall("PlayerAccount/Punish", token, String.class, callback::run);
}
public void RemovePunishment(Callback callback, int id, String target, String reason, String admin)
@@ -41,34 +40,16 @@ public class PunishRepository
token.Reason = reason;
token.Admin = admin;
- new AsyncJsonWebCall(_webAddress + "PlayerAccount/RemovePunishment").Execute(String.class, callback, token);
+ handleMSSQLCall("PlayerAccount/RemovePunishment", token, String.class, callback::run);
}
-
- public void LoadPunishClient(String target, Callback callback)
+
+ public void LoadPunishClient(String target, Callback callback)
{
- new AsyncJsonWebCall(_webAddress + "PlayerAccount/GetPunishClient").Execute(PunishClientToken.class, callback, target);
+ handleMSSQLCall("PlayerAccount/GetPunishClient", target, PunishClientToken.class, callback::run);
}
-
+
public void MatchPlayerName(final Callback> callback, final String userName)
{
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- List tokenList = new JsonWebCall(_webAddress + "PlayerAccount/GetMatches").Execute(new TypeToken>(){}.getType(), userName);
- callback.run(tokenList);
- }
- });
-
- asyncThread.start();
- }
-
- public void RemoveBan(String name, String reason)
- {
- RemovePunishToken token = new RemovePunishToken();
- token.Target = name;
- token.Reason = reason;
-
- new JsonWebCall(_webAddress + "PlayerAccount/RemoveBan").Execute(String.class, token);
+ handleMSSQLCall("PlayerAccount/GetMatches", userName, new TypeToken>(){}.getType(), callback::run);
}
}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/eternal/EternalGiveawayRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/eternal/EternalGiveawayRepository.java
index ab8ce45f3..867d5d5c6 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/eternal/EternalGiveawayRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/eternal/EternalGiveawayRepository.java
@@ -9,10 +9,11 @@ import org.bukkit.plugin.java.JavaPlugin;
import mineplex.core.database.MinecraftRepository;
import mineplex.serverdata.Region;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
-public class EternalGiveawayRepository extends MinecraftRepository
+public class EternalGiveawayRepository extends RepositoryBase
{
private static final String ADD_ETERNAL = "INSERT INTO eternalGiveaway (accountId, region, serverName) VALUES (?, ?, ?)";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/titangiveaway/TitanGiveawayRepository.java b/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/titangiveaway/TitanGiveawayRepository.java
index e50c6be44..bc8201eae 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/titangiveaway/TitanGiveawayRepository.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/rankGiveaway/titangiveaway/TitanGiveawayRepository.java
@@ -8,11 +8,12 @@ import mineplex.core.database.MinecraftRepository;
import org.bukkit.plugin.java.JavaPlugin;
import mineplex.serverdata.database.DBPool;
+import mineplex.serverdata.database.RepositoryBase;
import mineplex.serverdata.database.column.ColumnInt;
import mineplex.serverdata.database.column.ColumnVarChar;
import mineplex.serverdata.Region;
-public class TitanGiveawayRepository extends MinecraftRepository
+public class TitanGiveawayRepository extends RepositoryBase
{
private static final String ADD_TITAN = "INSERT INTO titanGiveaway (accountId, region, serverName) VALUES (?, ?, ?)";
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
index 2ba415206..8afb55087 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java
@@ -24,6 +24,8 @@ import mineplex.core.common.util.C;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.common.util.UtilPlayer;
import mineplex.core.common.util.UtilTime;
+import mineplex.core.portal.GenericServer;
+import mineplex.core.portal.Intent;
import mineplex.core.portal.Portal;
import mineplex.core.resourcepack.redis.RedisUnloadResPack;
import mineplex.core.updater.event.UpdateEvent;
@@ -187,7 +189,7 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback
private void returnHubNoResPack(Player player)
{
player.playSound(player.getLocation(), Sound.ENDERDRAGON_GROWL, 10f, 1f);
- _portal.sendPlayerToServer(player, "Lobby");
+ _portal.sendPlayerToGenericServer(player, GenericServer.HUB, Intent.KICK);
}
private void returnHubNoResPack(Player player, String message)
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
index 0157d87df..dcf425ea8 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardManager.java
@@ -308,6 +308,20 @@ public class RewardManager
addHat(Type.OMEGA, HatType.PRESENT, rarity, 5);
addHat(Type.OMEGA, HatType.SNOWMAN, rarity, 5);
+ /*addBalloon(Type.OMEGA,BalloonType.BABY_COW, rarity, 10, 100);
+ addBalloon(Type.OMEGA, BalloonType.BABY_PIG, rarity, 10, 100);
+ addBalloon(Type.OMEGA, BalloonType.BABY_SHEEP, rarity, 15, 100);*/
+
+ // Minestrike Skins
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.P2000_Fire_Elemental, rarity, 100, 500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.M4A4_Howl, rarity, 100, 500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Steyr_AUG_Torque, rarity, 100, 500);
+
+ // Balloons
+ /*addBalloon(Type.NORMAL, BalloonType.BABY_COW, rarity, 10, 100);
+ addBalloon(Type.NORMAL, BalloonType.BABY_PIG, rarity, 10, 100);
+ addBalloon(Type.NORMAL, BalloonType.BABY_SHEEP, rarity, 15, 100);*/
+
// INFUSED CHESTS
addHat(Type.INFUSED_CHESTS, HatType.PRESENT, rarity, 40, 100);
addHat(Type.INFUSED_CHESTS, HatType.SNOWMAN, rarity, 38, 100);
@@ -375,7 +389,7 @@ public class RewardManager
addGadget(Type.NORMAL, getGadget(ParticlePartyTime.class), rarity, 12);
//Game Modifiers MineStrike
- addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AWP_Asiimov, rarity, 200);
+ /*addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AWP_Asiimov, rarity, 200);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.P90_Asiimov, rarity, 200);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.SSG_08_Blood_in_the_Water, rarity, 50);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.Galil_AR_Eco, rarity, 20);
@@ -386,7 +400,17 @@ public class RewardManager
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.PP_Bizon_Streak, rarity, 40);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.CZ75_Auto_Tigris, rarity, 100);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.Steyr_AUG_Torque, rarity, 30);
- addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.XM1014_Tranquility, rarity, 30);
+ addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.XM1014_Tranquility, rarity, 30);*/
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.SSG_08_Blood_in_the_Water, rarity, 150, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Galil_AR_Eco, rarity, 150, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Nova_Koi, rarity, 100, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Knife_M9_Bayonette_Fade, rarity, 30, 2500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.PP_Bizon_Streak, rarity, 150, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.CZ75_Auto_Tigris, rarity, 100, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.XM1014_Tranquility, rarity, 100, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Desert_Eagle_Golden_Gun, rarity, 30, 2500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.P90_Asiimov, rarity, 100, 1000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.SG553_Pulse, rarity, 100, 1000);
// VALENTINES
@@ -472,6 +496,23 @@ public class RewardManager
addGadget(Type.OMEGA, getGadget(ParticleCandyCane.class), rarity, 25);
+ /*addBalloon(Type.OMEGA, BalloonType.BABY_ZOMBIE, rarity, 25, 500);
+ addBalloon(Type.OMEGA, BalloonType.BABY_MUSHROOM, rarity, 50, 500);
+ addBalloon(Type.OMEGA, BalloonType.BABY_OCELOT, rarity, 50, 500);
+ addBalloon(Type.OMEGA, BalloonType.BABY_WOLF, rarity, 75, 500);
+ addBalloon(Type.OMEGA, BalloonType.BABY_VILLAGER, rarity, 25, 500);
+ addBalloon(Type.OMEGA, BalloonType.BABY_SLIME, rarity, 25, 500);
+ addBalloon(Type.OMEGA, BalloonType.BAT, rarity, 50, 500);*/
+
+ // Balloons
+ /*addBalloon(Type.NORMAL, BalloonType.BABY_ZOMBIE, rarity, 25, 500);
+ addBalloon(Type.NORMAL, BalloonType.BABY_MUSHROOM, rarity, 50, 500);
+ addBalloon(Type.NORMAL, BalloonType.BABY_OCELOT, rarity, 50, 500);
+ addBalloon(Type.NORMAL, BalloonType.BABY_WOLF, rarity, 75, 500);
+ addBalloon(Type.NORMAL, BalloonType.BABY_VILLAGER, rarity, 25, 500);
+ addBalloon(Type.NORMAL, BalloonType.BABY_SLIME, rarity, 25, 500);
+ addBalloon(Type.NORMAL, BalloonType.BAT, rarity, 50, 500);*/
+
// HAUNTED CHEST
addGadget(Type.HAUNTED, getGadget(DoubleJumpHalloween.class), rarity, 10);
addHat(Type.HAUNTED, HatType.PUMPKIN, rarity, 10);
@@ -551,7 +592,7 @@ public class RewardManager
addGadget(Type.NORMAL, getGadget(WinEffectRiseOfTheElderGuardian.class), rarity, 4);
//GameModifier MineStrike
- addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AWP_Asiimov, rarity, 8);
+ /*addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AWP_Asiimov, rarity, 8);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.P90_Asiimov, rarity, 8);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.Desert_Eagle_Blaze, rarity, 10);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.Glock_18_Fade, rarity, 20);
@@ -560,7 +601,18 @@ public class RewardManager
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.P250_Muertos, rarity, 20);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.FAMAS_Pulse, rarity, 33);
addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.SG553_Pulse, rarity, 33);
- addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AK_47_Vulcan, rarity, 5);
+ addMineStrikeSkin(Type.NORMAL, MineStrikeSkin.AK_47_Vulcan, rarity, 5);*/
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Desert_Eagle_Blaze, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Glock_18_Fade, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.P250_Muertos, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.AK_47_Vulcan, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Knife_Counter_Terrorist_Sword, rarity, 50, 6500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Knife_Terrorist_Sword, rarity, 50, 6500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.Knife_M9_Bayonette_Glass, rarity, 50, 6500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.AK_47_Guardian, rarity, 10, 7500);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.AWP_Asiimov, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.FAMAS_Pulse, rarity, 100, 5000);
+ addMineStrikeSkin(Type.MINESTRIKE, MineStrikeSkin.XM1014_Pig_Gun, rarity, 10, 7500);
//WINTER
@@ -650,6 +702,25 @@ public class RewardManager
addHat(Type.OMEGA, HatType.GRINCH, rarity, 25);
+ /*addBalloon(Type.OMEGA, BalloonType.SQUID, rarity, 10, 5000);
+ addBalloon(Type.OMEGA, BalloonType.SILVERFISH, rarity, 30, 5000);
+ addBalloon(Type.OMEGA, BalloonType.GUARDIAN, rarity, 30, 5000);
+ addBalloon(Type.OMEGA, BalloonType.DRAGON_EGG, rarity, 10, 5000);
+ addBalloon(Type.OMEGA, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000);
+ addBalloon(Type.OMEGA, BalloonType.IRON_BLOCK, rarity, 20, 5000);
+ addBalloon(Type.OMEGA, BalloonType.GOLD_BLOCK, rarity, 30, 5000);
+ addBalloon(Type.OMEGA, BalloonType.EMERALD_BLOCK, rarity, 15, 5000);*/
+
+ // Balloon
+ /*addBalloon(Type.NORMAL, BalloonType.SQUID, rarity, 10, 5000);
+ addBalloon(Type.NORMAL, BalloonType.SILVERFISH, rarity, 30, 5000);
+ addBalloon(Type.NORMAL, BalloonType.GUARDIAN, rarity, 30, 5000);
+ addBalloon(Type.NORMAL, BalloonType.DRAGON_EGG, rarity, 10, 5000);
+ addBalloon(Type.NORMAL, BalloonType.DIAMOND_BLOCK, rarity, 10, 5000);
+ addBalloon(Type.NORMAL, BalloonType.IRON_BLOCK, rarity, 20, 5000);
+ addBalloon(Type.NORMAL, BalloonType.GOLD_BLOCK, rarity, 30, 5000);
+ addBalloon(Type.NORMAL, BalloonType.EMERALD_BLOCK, rarity, 15, 5000);*/
+
// HAUNTED
addPetReward(Type.HAUNTED, PetType.RABBIT, rarity, 100);
addGadget(Type.HAUNTED, getGadget(MorphGrimReaper.class), rarity, 25);
@@ -782,6 +853,17 @@ public class RewardManager
Gadget gadget = _gadgetManager.getHatGadget(hatType);
return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
}
+
+ /*public UnknownPackageReward addBalloon(Type type, BalloonType balloonType, RewardRarity rarity, int weight)
+ {
+ return addBalloon(type, balloonType, rarity, weight, getShards(rarity));
+ }
+
+ public UnknownPackageReward addBalloon(Type type, BalloonType balloonType, RewardRarity rarity, int weight, int shards)
+ {
+ Gadget gadget = _gadgetManager.getBalloonGadget(balloonType);
+ return addGadget(type, gadget, gadget.getDisplayName(), rarity, weight, shards);
+ }*/
public InventoryReward addInventoryReward(RewardPool.Type type, ItemGadget gadget, RewardRarity rarity, int weight)
{
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardPool.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardPool.java
index 61306a0b7..0b046295e 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardPool.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/RewardPool.java
@@ -63,7 +63,7 @@ public class RewardPool
MYTHICAL(true),
THANKFUL(false),
GINGERBREAD(false, 1),
- MINESTRIKE(false, 1),
+ MINESTRIKE(true, 2),
CARL_SPINNER(true);
private boolean _useDuplicates;
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java
index 339fc0bf5..4e3cdf4f4 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/reward/rewards/RankReward.java
@@ -2,6 +2,10 @@ package mineplex.core.reward.rewards;
import java.util.Random;
+import org.bukkit.Material;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.Rank;
import mineplex.core.reward.RankRewardData;
@@ -10,10 +14,6 @@ import mineplex.core.reward.RewardData;
import mineplex.core.reward.RewardRarity;
import mineplex.core.reward.RewardType;
-import org.bukkit.Material;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
public class RankReward extends Reward
{
private Random _random;
@@ -35,9 +35,10 @@ public class RankReward extends Reward
else if (_clientManager.Get(player).GetRank() == Rank.ULTRA) rank = Rank.HERO;
else if (_clientManager.Get(player).GetRank() == Rank.HERO) rank = Rank.LEGEND;
else if ((rewardType == RewardType.MYTHICAL_CHEST || rewardType == RewardType.TRICK_OR_TREAT_CHEST || rewardType == RewardType.THANKFUL_CHEST) && _clientManager.Get(player).GetRank() == Rank.LEGEND) rank = Rank.TITAN;
+ else if ((rewardType == RewardType.MYTHICAL_CHEST || rewardType == RewardType.TRICK_OR_TREAT_CHEST || rewardType == RewardType.THANKFUL_CHEST) && _clientManager.Get(player).GetRank() == Rank.TITAN) rank = Rank.ETERNAL;
if (rewardType == RewardType.MYTHICAL_CHEST && _random.nextDouble() < 0.01) // 1 Percent
- rank = Rank.TITAN;
+ rank = Rank.ETERNAL;
if (rank == null)
return new RewardData(null, getRarity().getColor() + "Rank Upgrade Error", new ItemStack(Material.PAPER), getRarity());
@@ -55,6 +56,7 @@ public class RankReward extends Reward
if (_clientManager.Get(player).GetRank() == Rank.ALL) rank = Rank.ULTRA;
else if (_clientManager.Get(player).GetRank() == Rank.ULTRA) rank = Rank.HERO;
else if (_clientManager.Get(player).GetRank() == Rank.HERO) rank = Rank.LEGEND;
+ else if (_clientManager.Get(player).GetRank() == Rank.LEGEND) rank = Rank.TITAN;
if (rank == null)
return new RewardData(null, getRarity().getColor() + "Rank Upgrade Error", new ItemStack(Material.PAPER), getRarity());
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/server/remotecall/AsyncJsonWebCall.java b/Plugins/Mineplex.Core/src/mineplex/core/server/remotecall/AsyncJsonWebCall.java
deleted file mode 100644
index 3c2676c69..000000000
--- a/Plugins/Mineplex.Core/src/mineplex/core/server/remotecall/AsyncJsonWebCall.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package mineplex.core.server.remotecall;
-
-import mineplex.core.common.util.Callback;
-
-public class AsyncJsonWebCall extends JsonWebCall
-{
- public AsyncJsonWebCall(String url)
- {
- super(url);
- }
-
- public void Execute()
- {
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- AsyncJsonWebCall.super.Execute();
- }
- });
-
- asyncThread.start();
- }
-
- public void Execute(final Object argument)
- {
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- AsyncJsonWebCall.super.Execute(argument);
- }
- });
-
- asyncThread.start();
- }
-
- public void Execute(final Class callbackClass, final Callback callback)
- {
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- AsyncJsonWebCall.super.Execute(callbackClass, callback);
- }
- });
-
- asyncThread.start();
- }
-
- public void Execute(final Class callbackClass, final Callback callback, final Object argument)
- {
- Thread asyncThread = new Thread(new Runnable()
- {
- public void run()
- {
- AsyncJsonWebCall.super.Execute(callbackClass, callback, argument);
- }
- });
-
- asyncThread.start();
- }
-}
diff --git a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
index e9d26ad8e..6ee09a020 100644
--- a/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
+++ b/Plugins/Mineplex.Core/src/mineplex/core/shop/ShopBase.java
@@ -1,13 +1,15 @@
package mineplex.core.shop;
-import mineplex.core.MiniPlugin;
import mineplex.core.account.CoreClientManager;
import mineplex.core.common.util.NautHashMap;
import mineplex.core.donation.DonationManager;
+import mineplex.core.lifetimes.Lifetimed;
+import mineplex.core.lifetimes.ListenerComponent;
import mineplex.core.npc.event.NpcDamageByEntityEvent;
import mineplex.core.npc.event.NpcInteractEntityEvent;
import mineplex.core.shop.page.ShopPageBase;
import net.minecraft.server.v1_8_R3.EntityPlayer;
+import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.craftbukkit.v1_8_R3.entity.CraftPlayer;
import org.bukkit.craftbukkit.v1_8_R3.event.CraftEventFactory;
@@ -16,7 +18,6 @@ import org.bukkit.entity.LivingEntity;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
-import org.bukkit.event.Listener;
import org.bukkit.event.inventory.InventoryClickEvent;
import org.bukkit.event.inventory.InventoryCloseEvent;
import org.bukkit.event.inventory.InventoryDragEvent;
@@ -29,7 +30,7 @@ import java.util.Map;
import java.util.Set;
import java.util.UUID;
-public abstract class ShopBase implements Listener
+public abstract class ShopBase extends ListenerComponent
{
private NautHashMap _errorThrottling;
private NautHashMap _purchaseBlock;
@@ -52,7 +53,7 @@ public abstract class ShopBase implements Listene
_errorThrottling = new NautHashMap();
_purchaseBlock = new NautHashMap();
- _plugin.registerEvents(this);
+ _plugin.getLifetime().register(this);
}
@EventHandler(priority = EventPriority.LOWEST)
@@ -150,14 +151,7 @@ public abstract class ShopBase implements Listene
{
if (_playerPageMap.containsKey(event.getPlayer().getUniqueId()) && _playerPageMap.get(event.getPlayer().getUniqueId()).getTitle() != null && _playerPageMap.get(event.getPlayer().getUniqueId()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
{
- _playerPageMap.get(event.getPlayer().getUniqueId()).playerClosed();
- _playerPageMap.get(event.getPlayer().getUniqueId()).dispose();
-
- _playerPageMap.remove(event.getPlayer().getUniqueId());
-
- closeShopForPlayer((Player) event.getPlayer());
-
- _openedShop.remove(event.getPlayer().getUniqueId());
+ removePlayer((Player) event.getPlayer());
}
}
@@ -169,17 +163,39 @@ public abstract class ShopBase implements Listene
if (_playerPageMap.containsKey(event.getPlayer().getUniqueId()) && _playerPageMap.get(event.getPlayer().getUniqueId()).getTitle() != null && _playerPageMap.get(event.getPlayer().getUniqueId()).getTitle().equalsIgnoreCase(event.getInventory().getTitle()))
{
- _playerPageMap.get(event.getPlayer().getUniqueId()).playerClosed();
- _playerPageMap.get(event.getPlayer().getUniqueId()).dispose();
-
- _playerPageMap.remove(event.getPlayer().getUniqueId());
-
- closeShopForPlayer((Player) event.getPlayer());
-
- _openedShop.remove(event.getPlayer().getUniqueId());
+ removePlayer((Player) event.getPlayer());
}
}
-
+
+ protected void removePlayer(Player player)
+ {
+ _playerPageMap.get(player.getUniqueId()).playerClosed();
+ _playerPageMap.get(player.getUniqueId()).dispose();
+
+ _playerPageMap.remove(player.getUniqueId());
+
+ closeShopForPlayer(player);
+
+ _openedShop.remove(player.getUniqueId());
+ }
+
+ @Override
+ public void deactivate()
+ {
+ super.deactivate();
+ _playerPageMap.entrySet().stream().map(Map.Entry::getKey).map(Bukkit::getPlayer).forEach(p -> {
+ if (_playerPageMap.get(p.getName()).getTitle().equals(p.getOpenInventory().getTitle()))
+ {
+ p.closeInventory();
+ }
+ removePlayer(p);
+ });
+ _playerPageMap.clear();
+ _openedShop.clear();
+ _purchaseBlock.clear();
+ _errorThrottling.clear();
+ }
+
protected boolean canOpenShop(Player player)
{
return true;
@@ -194,15 +210,8 @@ public abstract class ShopBase