From 2d14acaa16b8057287d46869847b143cb244f793 Mon Sep 17 00:00:00 2001 From: AlexTheCoder Date: Sat, 21 Jul 2018 14:08:29 -0400 Subject: [PATCH] Redo MinecraftVersion atOrAbove checking --- .../src/mineplex/core/common/MinecraftVersion.java | 3 ++- .../src/mineplex/core/common/util/UtilTextTop.java | 6 +++--- .../Mineplex.Core/src/mineplex/core/CustomTagFix.java | 4 ++-- .../src/mineplex/core/bonuses/BonusManager.java | 2 +- .../gadgets/outfit/reindeer/OutfitReindeerAntlers.java | 2 +- .../src/mineplex/core/game/MineplexGameManager.java | 2 +- .../src/mineplex/core/hologram/Hologram.java | 10 +++++----- .../game/arcade/game/games/hideseek/HideSeek.java | 2 +- .../arcade/game/games/hideseek/forms/BlockForm.java | 10 +++++----- 9 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/MinecraftVersion.java b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/MinecraftVersion.java index 606630c36..9872a833f 100644 --- a/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/MinecraftVersion.java +++ b/Plugins/Mineplex.Core.Common.Base/src/mineplex/core/common/MinecraftVersion.java @@ -7,6 +7,7 @@ import com.google.common.base.Preconditions; */ public enum MinecraftVersion { + Version1_13("1.13", 393), Version1_9("1.9", 48), Version1_8("1.8", Integer.MIN_VALUE), //Any player will at minimum be 1.8, we can't handle anything below that ; @@ -46,4 +47,4 @@ public enum MinecraftVersion return v; } -} +} \ No newline at end of file diff --git a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java index 2a28485a3..f5a47a811 100644 --- a/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java +++ b/Plugins/Mineplex.Core.Common/src/mineplex/core/common/util/UtilTextTop.java @@ -70,7 +70,7 @@ public class UtilTextTop runnable.runTaskLater(UtilServer.getPlugin(), 20); - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) + if (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) { sendBossBar(player, healthPercent, text); @@ -129,7 +129,7 @@ public class UtilTextTop private static void deleteOld(Player player) { - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) + if (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) { PacketPlayOutBossBar bossBar = new PacketPlayOutBossBar(); @@ -157,7 +157,7 @@ public class UtilTextTop @EventHandler public void onPlayerJoin(PlayerJoinEvent event) { - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(event.getPlayer()))) + if (UtilPlayer.getVersion(event.getPlayer()).atOrAbove(MinecraftVersion.Version1_9)) { deleteOld(event.getPlayer()); } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java index b142d2adc..d7e17daa8 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/CustomTagFix.java @@ -477,7 +477,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler UtilPlayer.sendPacket(owner, spawnPacket); - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(owner))) + if (UtilPlayer.getVersion(owner).atOrAbove(MinecraftVersion.Version1_9)) { UtilPlayer.sendPacket(owner, new PacketPlayOutNewAttachEntity(entityId, new int[] { @@ -507,7 +507,7 @@ public class CustomTagFix extends MiniPlugin implements IPacketHandler UtilPlayer.sendPacket(owner, spawnPacket); - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(owner))) + if (UtilPlayer.getVersion(owner).atOrAbove(MinecraftVersion.Version1_9)) { UtilPlayer.sendPacket(owner, new PacketPlayOutNewAttachEntity(entityIds[1], new int[] { diff --git a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java index 41c505cd8..ee6743d1e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/bonuses/BonusManager.java @@ -1035,7 +1035,7 @@ public class BonusManager extends MiniClientPlugin implements I if (client.getHologram() == null) { double yAdd = 2.3; - if (!MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) + if (!UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) { yAdd = 2.45; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/reindeer/OutfitReindeerAntlers.java b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/reindeer/OutfitReindeerAntlers.java index 08559df0e..f057c5528 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/reindeer/OutfitReindeerAntlers.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/gadget/gadgets/outfit/reindeer/OutfitReindeerAntlers.java @@ -112,7 +112,7 @@ public class OutfitReindeerAntlers extends OutfitReindeer implements IPacketHand { Player player = packetInfo.getPlayer(); - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) + if (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) { return; } diff --git a/Plugins/Mineplex.Core/src/mineplex/core/game/MineplexGameManager.java b/Plugins/Mineplex.Core/src/mineplex/core/game/MineplexGameManager.java index 7f304a383..7aa5be99e 100644 --- a/Plugins/Mineplex.Core/src/mineplex/core/game/MineplexGameManager.java +++ b/Plugins/Mineplex.Core/src/mineplex/core/game/MineplexGameManager.java @@ -359,7 +359,7 @@ public class MineplexGameManager extends MiniClientPlugin packets = (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? packets1_9 : packets1_8; + List packets = (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) ? packets1_9 : packets1_8; for (Packet packet : packets) { @@ -791,7 +791,7 @@ public class Hologram { for (Player player : _playersTracking) { - UtilPlayer.sendPacket(player, (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? _packets1_9 : _packets1_8); + UtilPlayer.sendPacket(player, (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) ? _packets1_9 : _packets1_8); } } @@ -806,7 +806,7 @@ public class Hologram { { checkSpawnPackets(); - return (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))) ? _packets1_9 : _packets1_8; + return (UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)) ? _packets1_9 : _packets1_8; } /** diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java index 100050f71..3586a0a9d 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/HideSeek.java @@ -267,7 +267,7 @@ public class HideSeek extends TeamGame final Player player = packetInfo.getPlayer(); - Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), () -> UtilPlayer.sendPacket(player, blockForm.getBlockPackets(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(player))))); + Bukkit.getScheduler().scheduleSyncDelayedTask(Manager.getPlugin(), () -> UtilPlayer.sendPacket(player, blockForm.getBlockPackets(UtilPlayer.getVersion(player).atOrAbove(MinecraftVersion.Version1_9)))); break; } } diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java index cc8c4031f..b5510f60c 100644 --- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java +++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/hideseek/forms/BlockForm.java @@ -117,7 +117,7 @@ public class BlockForm extends Form packet1.uuid = UUID.randomUUID(); packets[0] = packet1; - if (MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player))) + if (UtilPlayer.getVersion(Player).atOrAbove(MinecraftVersion.Version1_9)) { packets[2] = new PacketPlayOutNewAttachEntity(_fakeSilverfishId, new int[] { @@ -292,7 +292,7 @@ public class BlockForm extends Form _sawDiff = new Vector(); } - UtilPlayer.sendPacket(Player, packet[(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player))) ? 1 : 0]); + UtilPlayer.sendPacket(Player, packet[(UtilPlayer.getVersion(Player).atOrAbove(MinecraftVersion.Version1_9)) ? 1 : 0]); } for (Player player : UtilServer.getPlayers()) @@ -335,7 +335,7 @@ public class BlockForm extends Form { for (EntityPlayer entity : tracker.trackedPlayers) { - UtilPlayer.sendPacket(entity.getBukkitEntity(), getBlockPackets(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(entity.getBukkitEntity())))); + UtilPlayer.sendPacket(entity.getBukkitEntity(), getBlockPackets(UtilPlayer.getVersion(entity.getBukkitEntity()).atOrAbove(MinecraftVersion.Version1_9))); } } } @@ -385,7 +385,7 @@ public class BlockForm extends Form if (packet != null) { - if (!MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player)) && packet[0] instanceof PacketPlayOutRelEntityMove) + if (!UtilPlayer.getVersion(Player).atOrAbove(MinecraftVersion.Version1_9) && packet[0] instanceof PacketPlayOutRelEntityMove) { PacketPlayOutRelEntityMove relPacket = (PacketPlayOutRelEntityMove) packet[0]; _sawDiff.subtract(new Vector(relPacket.b / 32D, relPacket.c / 32D, relPacket.d / 32D)); @@ -395,7 +395,7 @@ public class BlockForm extends Form _sawDiff = new Vector(); } - UtilPlayer.sendPacket(Player, packet[(MinecraftVersion.Version1_9.atOrAbove(UtilPlayer.getVersion(Player))) ? 1 : 0]); + UtilPlayer.sendPacket(Player, packet[(UtilPlayer.getVersion(Player).atOrAbove(MinecraftVersion.Version1_9)) ? 1 : 0]); } } }