Improve resource pack system to use proper intervals of versioned packs

Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/MinecraftVersion.java

@@ -1,16 +1,23 @@
 package mineplex.core.common;
 
+import com.google.common.base.Preconditions;
+
+/**
+ * Used to declare specific milestone versions
+ */
 public enum MinecraftVersion 
 {
-	ALL("Any"),
+	Version1_9("1.9", 48),
-	Version1_9("1.9"),
+	Version1_8("1.8", Integer.MIN_VALUE), //Any player will at minimum be 1.8, we can't handle anything below that
-	Version1_8("1.8"),
 	;
-	private final String _friendlyName;
 	
-	MinecraftVersion(String friendlyName)
+	private final String _friendlyName;
+	private final int _minimum;
+
+	MinecraftVersion(String friendlyName, int minimum)
 	{
 		_friendlyName = friendlyName;
+		_minimum = minimum;
 	}
 
 	public String friendlyName()
@@ -18,8 +25,25 @@ public enum MinecraftVersion
 		return _friendlyName;
 	}
 	
+	public boolean atOrAbove(MinecraftVersion other)
+	{
+		Preconditions.checkNotNull(other);
+		
+		return ordinal() <= other.ordinal();
+	}
+
 	public static MinecraftVersion fromInt(int version)
 	{
-		return version <= 47 ? Version1_8 : Version1_9;
+		MinecraftVersion v = null;
+		for (MinecraftVersion test : values())
+		{
+			if (version >= test._minimum)
+			{
+				v = test;
+				break;
+			}
+		}
+		
+		return v;
 	}
 }

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilPlayer.java

@@ -143,11 +143,6 @@ public class UtilPlayer
 		return entry.trackedPlayers.contains(ep);
 	}
 
-	public static boolean is1_9(Player player)
-	{
-		return ((CraftPlayer) player).getHandle().playerConnection.networkManager.getVersion() > 47;
-	}
-
 	private static class Vector3D
 	{
 
@@ -926,10 +921,9 @@ public class UtilPlayer
 
 	public static MinecraftVersion getVersion(Player player)
 	{
-		if (is1_9(player))
+		int version = ((CraftPlayer) player).getHandle().playerConnection.networkManager.getVersion();
-			return MinecraftVersion.Version1_9;
 		
-		return MinecraftVersion.Version1_8;
+		return MinecraftVersion.fromInt(version);
 	}
 
 	/**

Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java

@@ -14,6 +14,7 @@ import org.bukkit.event.player.PlayerJoinEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
 import mineplex.core.common.DummyEntity;
+import mineplex.core.common.MinecraftVersion;
 import net.minecraft.server.v1_8_R3.DataWatcher;
 import net.minecraft.server.v1_8_R3.Entity;
 import net.minecraft.server.v1_8_R3.EntityLiving;
@@ -69,7 +70,7 @@ public class UtilTextTop
 
 		runnable.runTaskLater(UtilServer.getPlugin(), 20);
 
-		if (UtilPlayer.is1_9(player))
+		if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))
 		{
 			sendBossBar(player, healthPercent, text);
 
@@ -128,7 +129,7 @@ public class UtilTextTop
 
 	private static void deleteOld(Player player)
 	{
-		if (UtilPlayer.is1_9(player))
+		if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))
 		{
 			PacketPlayOutBossBar bossBar = new PacketPlayOutBossBar();
 
@@ -156,7 +157,7 @@ public class UtilTextTop
 	@EventHandler
 	public void onPlayerJoin(PlayerJoinEvent event)
 	{
-		if (UtilPlayer.is1_9(event.getPlayer()))
+		if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(event.getPlayer())))
 		{
 			deleteOld(event.getPlayer());
 		}

Plugins/Mineplex.Core/pom.xml

@@ -31,11 +31,6 @@
             <artifactId>mineplex-serverdata</artifactId>
             <version>${project.version}</version>
         </dependency>
-		<dependency>
-			<groupId>${project.groupId}</groupId>
-			<artifactId>mineplex-questmanager</artifactId>
-			<version>${project.version}</version>
-		</dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-dbcp2</artifactId>

Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java

@@ -477,7 +477,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler
 
 						UtilPlayer.sendPacket(owner, spawnPacket);
 
-						if (UtilPlayer.is1_9(owner))
+						if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(owner)))
 						{
 							UtilPlayer.sendPacket(owner, new PacketPlayOutNewAttachEntity(entityId, new int[]
 									{
@@ -507,7 +507,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler
 
 					UtilPlayer.sendPacket(owner, spawnPacket);
 
-					if (UtilPlayer.is1_9(owner))
+					if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(owner)))
 					{
 						UtilPlayer.sendPacket(owner, new PacketPlayOutNewAttachEntity(entityIds[1], new int[]
 								{

Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java

@@ -54,6 +54,7 @@ import mineplex.core.bonuses.gui.SpinGui;
 import mineplex.core.bonuses.gui.buttons.PowerPlayClubButton;
 import mineplex.core.bonuses.redis.VoteHandler;
 import mineplex.core.bonuses.redis.VotifierCommand;
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.Pair;
 import mineplex.core.common.currency.GlobalCurrency;
 import mineplex.core.common.util.C;
@@ -1034,7 +1035,7 @@ public class BonusManager extends MiniClientPlugin<BonusClientData> implements I
 		if (client.getHologram() == null)
 		{
 			double yAdd = 2.3;
-			if(!UtilPlayer.is1_9(player))
+			if (!MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))
 			{
 				yAdd = 2.45;
 			}

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/morph/MorphDinnerbone.java

@@ -144,9 +144,6 @@ public class MorphDinnerbone extends MorphGadget implements IPacketHandler
 			case Version1_8:
 				summonForEntity18(receiver, player);
 				break;
-			case ALL:
-				// do nothing
-				break;
 		}
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/reindeer/OutfitReindeerAntlers.java

@@ -16,6 +16,7 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.EulerAngle;
 import org.bukkit.util.Vector;
 
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.Pair;
 import mineplex.core.common.util.UtilAlg;
 import mineplex.core.common.util.UtilPlayer;
@@ -111,7 +112,7 @@ public class OutfitReindeerAntlers extends OutfitReindeer implements IPacketHand
 	{
 		Player player = packetInfo.getPlayer();
 
-		if (UtilPlayer.is1_9(player))
+		if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))
 		{
 			return;
 		}

Plugins/Mineplex.Core/src/mineplex/core/game/MineplexGameManager.java

@@ -23,6 +23,7 @@ import mineplex.core.account.CoreClient;
 import mineplex.core.account.CoreClientManager;
 import mineplex.core.achievement.Achievement;
 import mineplex.core.achievement.AchievementManager;
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.currency.GlobalCurrency;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
@@ -358,7 +359,7 @@ public class MineplexGameManager extends MiniClientPlugin<Map<GameKit, PlayerKit
 	public void handle(PacketInfo packetInfo)
 	{
 		// Only need to handle this for 1.9+
-		if (!UtilPlayer.is1_9(packetInfo.getPlayer()))
+		if (!MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(packetInfo.getPlayer())))
 		{
 			return;
 		}

Plugins/Mineplex.Core/src/mineplex/core/hologram/Hologram.java

@@ -14,6 +14,7 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.util.Vector;
 
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.util.UtilEnt;
 import mineplex.core.common.util.UtilPlayer;
 import net.minecraft.server.v1_8_R3.DataWatcher;
@@ -518,7 +519,7 @@ public class Hologram {
 					_playersTracking.add(player);
 					itel.remove();
 
-					UtilPlayer.sendPacket(player, UtilPlayer.is1_9(player) ? _packets1_9 : _packets1_8);
+					UtilPlayer.sendPacket(player, (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? _packets1_9 : _packets1_8);
 				}
 			}
 
@@ -582,7 +583,7 @@ public class Hologram {
 
 				for (Player player : canSee)
 				{
-					if (UtilPlayer.is1_9(player))
+					if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))
 					{
 						for (Packet packet : packets1_9)
 						{
@@ -731,7 +732,7 @@ public class Hologram {
 
 			for (Player player : _playersTracking)
 			{
-				List<Packet> packets = UtilPlayer.is1_9(player) ? packets1_9 : packets1_8;
+				List<Packet> packets = (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? packets1_9 : packets1_8;
 
 				for (Packet packet : packets)
 				{
@@ -790,7 +791,7 @@ public class Hologram {
 
 		for (Player player : _playersTracking)
 		{
-			UtilPlayer.sendPacket(player, UtilPlayer.is1_9(player) ? _packets1_9 : _packets1_8);
+			UtilPlayer.sendPacket(player, (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? _packets1_9 : _packets1_8);
 		}
 	}
 
@@ -805,7 +806,7 @@ public class Hologram {
 	{
 		checkSpawnPackets();
 
-		return UtilPlayer.is1_9(player) ? _packets1_9 : _packets1_8;
+		return (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? _packets1_9 : _packets1_8;
 	}
 
 	/**

Plugins/Mineplex.Core/src/mineplex/core/resourcepack/ResourcePackManager.java

@@ -28,18 +28,18 @@ 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.UpdateType;
 import mineplex.core.updater.event.UpdateEvent;
 import mineplex.serverdata.commands.CommandCallback;
-import mineplex.serverdata.commands.ServerCommand;
 import mineplex.serverdata.commands.ServerCommandManager;
 
-public class ResourcePackManager extends MiniPlugin implements CommandCallback
+public class ResourcePackManager extends MiniPlugin implements CommandCallback<RedisUnloadResPack>
 {
 	private Pair<MinecraftVersion, String>[] _resourcePackUrls;
 	private boolean _resourcePackRequired;
-	private NautHashMap<String, Boolean> _resourcePackUsers = new NautHashMap<String, Boolean>();
+	private NautHashMap<String, Boolean> _resourcePackUsers = new NautHashMap<>();
-	private NautHashMap<String, Long> _resourcePackNoResponse = new NautHashMap<String, Long>();
+	private NautHashMap<String, Long> _resourcePackNoResponse = new NautHashMap<>();
-	private Portal _portal;
+	private final Portal _portal;
 
 	public ResourcePackManager(JavaPlugin plugin, Portal portal)
 	{
@@ -57,16 +57,31 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback
 		if (_resourcePackUrls == null || _resourcePackUrls.length == 0)
 			return;
 		
+		int lastOrdinal = -1;
+		String pack = null;
+		
 		for (Pair<MinecraftVersion, String> entry : _resourcePackUrls)
 		{
-			if (entry.getLeft() == version || entry.getLeft() == MinecraftVersion.ALL)
+			if (lastOrdinal != -1 && entry.getLeft().ordinal() > lastOrdinal)
 			{
-				player.setResourcePack(entry.getRight());
+				continue;
-				return;
+			}
+			
+			if (version.atOrAbove(entry.getLeft()))
+			{
+				lastOrdinal = entry.getLeft().ordinal();
+				pack = entry.getRight();
 			}
 		}
 		
-		player.setResourcePack(_resourcePackUrls[0].getRight());
+		if (pack != null)
+		{
+			player.setResourcePack(pack);
+		}
+		else
+		{
+			player.setResourcePack(_resourcePackUrls[0].getRight());
+		}
 	}
 
 	@EventHandler
@@ -92,6 +107,11 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback
 	@EventHandler
 	public void onSecond(UpdateEvent event)
 	{
+		if (event.getType() != UpdateType.SEC)
+		{
+			return;
+		}
+		
 		Iterator<Entry<String, Long>> itel = _resourcePackNoResponse.entrySet().iterator();
 
 		while (itel.hasNext())
@@ -240,26 +260,21 @@ public class ResourcePackManager extends MiniPlugin implements CommandCallback
 	}
 
 	@Override
-	public void run(ServerCommand command)
+	public void run(RedisUnloadResPack command)
 	{
-		if (command instanceof RedisUnloadResPack)
+		Player player = Bukkit.getPlayerExact(command.getPlayer());
+		
+		if (player == null)
 		{
-			RedisUnloadResPack redisCommand = (RedisUnloadResPack) command;
+			return;
-
-			Player player = Bukkit.getPlayerExact(redisCommand.getPlayer());
-
-			if (player == null)
-			{
-				return;
-			}
-
-			if (_resourcePackUsers.containsKey(player.getName()))
-			{
-				return;
-			}
-
-			//player.setResourcePack("http://file.mineplex.com/ResReset.zip");
-			player.setResourcePack("http://198.20.72.74/ResReset.zip");
 		}
+		
+		if (_resourcePackUsers.containsKey(player.getName()))
+		{
+			return;
+		}
+		
+		//player.setResourcePack("http://file.mineplex.com/ResReset.zip");
+		player.setResourcePack("http://198.20.72.74/ResReset.zip");
 	}
 }

Plugins/Mineplex.Core/src/mineplex/core/resourcepack/redis/RedisUnloadResPack.java

@@ -4,11 +4,10 @@ import mineplex.serverdata.commands.ServerCommand;
 
 public class RedisUnloadResPack extends ServerCommand
 {
-	private String _player;
+	private final String _player;
 
 	public RedisUnloadResPack(String player)
 	{
-
 		_player = player;
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/titles/Titles.java

@@ -252,8 +252,6 @@ public class Titles extends MiniDbClientPlugin<TitleData> implements IPacketHand
 			case Version1_8:
 				giveBook19(player, open);
 				break;
-			case ALL:
-				break;
 		}
 	}
 
@@ -771,9 +769,6 @@ public class Titles extends MiniDbClientPlugin<TitleData> implements IPacketHand
 			case Version1_8:
 				summonForEntity18(receiver, player);
 				break;
-			case ALL:
-				// do nothing
-				break;
 		}
 	}
 
@@ -960,9 +955,6 @@ public class Titles extends MiniDbClientPlugin<TitleData> implements IPacketHand
 			case Version1_8:
 				updateArmorStand18(owner, receiver, newName, entityId);
 				break;
-			case ALL:
-				// do nothing
-				break;
 		}
 	}
 

Plugins/Mineplex.Core/src/mineplex/core/updater/FileUpdater.java

@@ -24,7 +24,6 @@ import mineplex.core.account.permissions.Permission;
 import mineplex.core.account.permissions.PermissionGroup;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
-import mineplex.core.common.util.NautHashMap;
 import mineplex.core.common.util.UtilServer;
 import mineplex.core.portal.GenericServer;
 import mineplex.core.portal.Intent;

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/GameType.java

@@ -106,7 +106,7 @@ public enum GameType implements Voteable
 	Christmas(Christmas.class, GameDisplay.Christmas, new Pair[] 
 			{
 				//Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResChristmas.zip")
-				Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResChristmas.zip")
+				Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResChristmas.zip")
 			}, true),
 	ChristmasNew(ChristmasNew.class, GameDisplay.ChristmasNew, new Pair[]
 			{
@@ -124,7 +124,7 @@ public enum GameType implements Voteable
 	Draw(Draw.class, GameDisplay.Draw, new Pair[]
 			{
 				//Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResDrawMyThing.zip")
-				Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResDrawMyThing.zip")
+				Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResDrawMyThing.zip")
 			}, true),
 	ElytraRings(ElytraRings.class, GameDisplay.ElytraRings),
 	Evolution(Evolution.class, GameDisplay.Evolution),
@@ -132,7 +132,7 @@ public enum GameType implements Voteable
 	Halloween(Halloween.class, GameDisplay.Halloween, new Pair[] 
 			{
 				//Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResHalloween.zip")
-				Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResHalloween.zip")
+				Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResHalloween.zip")
 			}, true),
 	Halloween2016(Halloween2016.class, GameDisplay.Halloween2016),
 	HideSeek(HideSeek.class, GameDisplay.HideSeek),
@@ -177,7 +177,7 @@ public enum GameType implements Voteable
 	Wizards(Wizards.class, GameDisplay.Wizards, new Pair[] 
 			{
 				//Pair.create(MinecraftVersion.ALL, "http://file.mineplex.com/ResWizards.zip")
-				Pair.create(MinecraftVersion.ALL, "http://198.20.72.74/ResWizards.zip")
+				Pair.create(MinecraftVersion.Version1_8, "http://198.20.72.74/ResWizards.zip")
 			}, true),
 	ZombieSurvival(ZombieSurvival.class, GameDisplay.ZombieSurvival),
 	Build(Build.class, GameDisplay.Build),

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java

@@ -67,6 +67,7 @@ import com.mineplex.anticheat.checks.combat.KillauraTypeA;
 
 import mineplex.core.Managers;
 import mineplex.core.antihack.AntiHack;
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.UtilAlg;
@@ -266,7 +267,7 @@ public class HideSeek extends TeamGame
 
 				final Player player = packetInfo.getPlayer();
 
-				Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), () -> UtilPlayer.sendPacket(player, blockForm.getBlockPackets(UtilPlayer.is1_9(player))));
+				Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), () -> UtilPlayer.sendPacket(player, blockForm.getBlockPackets(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player)))));
 				break;
 			}
 		}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java

@@ -30,6 +30,7 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
+import mineplex.core.common.MinecraftVersion;
 import mineplex.core.common.util.C;
 import mineplex.core.common.util.F;
 import mineplex.core.common.util.MapUtil;
@@ -116,7 +117,7 @@ public class BlockForm extends Form
 		packet1.uuid = UUID.randomUUID();
 		packets[0] = packet1;
 
-		if (UtilPlayer.is1_9(Player))
+		if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player)))
 		{
 			packets[2] = new PacketPlayOutNewAttachEntity(_fakeSilverfishId, new int[]
 					{
@@ -291,7 +292,7 @@ public class BlockForm extends Form
 							_sawDiff = new Vector();
 						}
 
-						UtilPlayer.sendPacket(Player, packet[UtilPlayer.is1_9(Player) ? 1 : 0]);
+						UtilPlayer.sendPacket(Player, packet[(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player))) ? 1 : 0]);
 					}
 
 					for (Player player : UtilServer.getPlayers())
@@ -334,7 +335,7 @@ public class BlockForm extends Form
 			{
 				for (EntityPlayer entity : tracker.trackedPlayers)
 				{
-					UtilPlayer.sendPacket(entity.getBukkitEntity(), getBlockPackets(UtilPlayer.is1_9(entity.getBukkitEntity())));
+					UtilPlayer.sendPacket(entity.getBukkitEntity(), getBlockPackets(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(entity.getBukkitEntity()))));
 				}
 			}
 		}
@@ -384,7 +385,7 @@ public class BlockForm extends Form
 
 			if (packet != null)
 			{
-				if (!UtilPlayer.is1_9(Player) && packet[0] instanceof PacketPlayOutRelEntityMove)
+				if (!MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player)) && packet[0] instanceof PacketPlayOutRelEntityMove)
 				{
 					PacketPlayOutRelEntityMove relPacket = (PacketPlayOutRelEntityMove) packet[0];
 					_sawDiff.subtract(new Vector(relPacket.b / 32D, relPacket.c / 32D, relPacket.d / 32D));
@@ -394,7 +395,7 @@ public class BlockForm extends Form
 					_sawDiff = new Vector();
 				}
 
-				UtilPlayer.sendPacket(Player, packet[UtilPlayer.is1_9(Player) ? 1 : 0]);
+				UtilPlayer.sendPacket(Player, packet[(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player))) ? 1 : 0]);
 			}
 		}
 	}

Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/modules/VersionModule.java

@@ -21,8 +21,7 @@ import mineplex.core.portal.Portal;
  */
 public class VersionModule extends Module
 {
-
+	private final MinecraftVersion _minecraftVersion;
-	private MinecraftVersion _minecraftVersion;
 	
 	public VersionModule(MinecraftVersion minecraftVersion)
 	{

Plugins/pom.xml

@@ -46,7 +46,6 @@
         <module>mavericks-review-hub</module>
         <module>mineplex-game-gemhunters</module>
         <module>mineplex-google-sheets</module>
-        <module>mineplex-questmanager</module>
     </modules>
 
     <repositories>