From 0f08ae35ad0f76e131bd87324a3ab1c68466f360 Mon Sep 17 00:00:00 2001 From: libraryaddict Date: Thu, 18 Jul 2024 14:12:03 +1200 Subject: [PATCH] Clean up some code --- .../disguise/DisguiseConfig.java | 2 +- .../libraryaddict/disguise/LibsDisguises.java | 14 ++-- .../commands/LibsDisguisesCommand.java | 2 +- .../disguise/DisguiseRadiusCommand.java | 6 +- .../interactions/CopyDisguiseInteraction.java | 3 - .../DisguiseCloneInteraction.java | 3 - .../DisguiseEntityInteraction.java | 3 - .../DisguiseModifyInteraction.java | 4 - .../UndisguiseEntityInteraction.java | 3 - .../commands/libsdisguises/LDChangelog.java | 5 +- .../commands/libsdisguises/LDCommand.java | 3 - .../commands/libsdisguises/LDConfig.java | 3 - .../commands/libsdisguises/LDCount.java | 3 - .../libsdisguises/LDDebugDisguiseLoop.java | 5 +- .../libsdisguises/LDDebugMineSkin.java | 3 - .../commands/libsdisguises/LDDebugPlayer.java | 3 - .../commands/libsdisguises/LDHelp.java | 3 - .../commands/libsdisguises/LDJson.java | 3 - .../commands/libsdisguises/LDMetaInfo.java | 3 - .../commands/libsdisguises/LDMods.java | 3 - .../commands/libsdisguises/LDPermTest.java | 3 - .../commands/libsdisguises/LDReload.java | 3 - .../commands/libsdisguises/LDScoreboard.java | 3 - .../commands/libsdisguises/LDUpdate.java | 7 +- .../libsdisguises/LDUpdatePacketEvents.java | 3 - .../commands/libsdisguises/LDUploadLogs.java | 3 - .../commands/utils/CopyDisguiseCommand.java | 3 - .../utils/DisguiseViewBarCommand.java | 3 - .../commands/utils/GrabHeadCommand.java | 3 - .../commands/utils/GrabSkinCommand.java | 3 - .../commands/utils/SaveDisguiseCommand.java | 3 - .../disguise/disguisetypes/Disguise.java | 7 +- .../disguisetypes/DisguiseRunnable.java | 3 - .../disguise/disguisetypes/DisguiseType.java | 3 +- .../disguise/disguisetypes/FlagWatcher.java | 75 ++++++++----------- .../disguise/disguisetypes/GolemCrack.java | 3 - .../disguise/disguisetypes/LibsEquipment.java | 2 +- .../disguise/disguisetypes/MiscDisguise.java | 11 --- .../disguisetypes/ModdedDisguise.java | 3 - .../watchers/AbstractHorseWatcher.java | 9 +-- .../watchers/AbstractSkeletonWatcher.java | 3 +- .../watchers/AbstractVillagerWatcher.java | 6 +- .../watchers/AgeableWatcher.java | 3 +- .../disguisetypes/watchers/AllayWatcher.java | 6 +- .../watchers/AreaEffectCloudWatcher.java | 15 ++-- .../watchers/ArmadilloWatcher.java | 6 +- .../watchers/ArmorStandWatcher.java | 6 +- .../disguisetypes/watchers/ArrowWatcher.java | 6 +- .../watchers/AxolotlWatcher.java | 9 +-- .../disguisetypes/watchers/BatWatcher.java | 3 +- .../disguisetypes/watchers/BeeWatcher.java | 9 +-- .../disguisetypes/watchers/BlazeWatcher.java | 3 +- .../watchers/BlockDisplayWatcher.java | 5 +- .../disguisetypes/watchers/BoatWatcher.java | 18 ++--- .../disguisetypes/watchers/BoggedWatcher.java | 6 +- .../disguisetypes/watchers/CamelWatcher.java | 3 +- .../disguisetypes/watchers/CatWatcher.java | 15 +--- .../watchers/ChestedHorseWatcher.java | 3 +- .../watchers/CreeperWatcher.java | 6 +- .../watchers/DisplayWatcher.java | 45 ++++------- .../watchers/DolphinWatcher.java | 3 - .../watchers/DroppedItemWatcher.java | 3 +- .../disguisetypes/watchers/EggWatcher.java | 3 - .../watchers/EnderCrystalWatcher.java | 6 +- .../watchers/EnderDragonWatcher.java | 3 +- .../watchers/EnderPearlWatcher.java | 3 - .../watchers/EnderSignalWatcher.java | 6 +- .../watchers/EndermanWatcher.java | 6 +- .../watchers/FireballWatcher.java | 6 +- .../watchers/FireworkWatcher.java | 12 +-- .../disguisetypes/watchers/FishWatcher.java | 3 - .../watchers/FishingHookWatcher.java | 6 +- .../disguisetypes/watchers/FoxWatcher.java | 9 +-- .../disguisetypes/watchers/FrogWatcher.java | 3 +- .../disguisetypes/watchers/GhastWatcher.java | 3 +- .../watchers/GlowSquidWatcher.java | 6 +- .../disguisetypes/watchers/GoatWatcher.java | 12 +-- .../watchers/GuardianWatcher.java | 9 +-- .../disguisetypes/watchers/HoglinWatcher.java | 6 +- .../disguisetypes/watchers/HorseWatcher.java | 10 +-- .../watchers/IllagerWatcher.java | 3 - .../watchers/IllagerWizardWatcher.java | 6 +- .../watchers/InsentientWatcher.java | 6 +- .../watchers/InteractionWatcher.java | 9 +-- .../watchers/ItemDisplayWatcher.java | 6 +- .../watchers/ItemFrameWatcher.java | 6 +- .../disguisetypes/watchers/LivingWatcher.java | 24 +++--- .../disguisetypes/watchers/LlamaWatcher.java | 9 +-- .../watchers/MinecartCommandWatcher.java | 3 - .../watchers/MinecartFurnaceWatcher.java | 6 +- .../watchers/MinecartWatcher.java | 6 +- .../disguisetypes/watchers/ModdedWatcher.java | 3 - .../watchers/MushroomCowWatcher.java | 6 +- .../disguisetypes/watchers/OcelotWatcher.java | 15 ++-- .../watchers/OminousItemSpawnerWatcher.java | 3 +- .../watchers/PaintingWatcher.java | 3 +- .../disguisetypes/watchers/PandaWatcher.java | 27 ++++--- .../disguisetypes/watchers/ParrotWatcher.java | 6 +- .../watchers/PhantomWatcher.java | 6 +- .../disguisetypes/watchers/PigWatcher.java | 3 +- .../watchers/PiglinAbstractWatcher.java | 6 +- .../watchers/PiglinBruteWatcher.java | 3 - .../disguisetypes/watchers/PiglinWatcher.java | 12 +-- .../watchers/PillagerWatcher.java | 6 +- .../disguisetypes/watchers/PlayerWatcher.java | 7 +- .../watchers/PolarBearWatcher.java | 3 +- .../watchers/PufferFishWatcher.java | 6 +- .../disguisetypes/watchers/RabbitWatcher.java | 3 +- .../disguisetypes/watchers/RaiderWatcher.java | 6 +- .../watchers/RavagerWatcher.java | 3 - .../disguisetypes/watchers/SheepWatcher.java | 9 +-- .../watchers/ShulkerWatcher.java | 12 +-- .../watchers/SkeletonWatcher.java | 6 +- .../disguisetypes/watchers/SlimeWatcher.java | 3 +- .../watchers/SmallFireballWatcher.java | 3 - .../watchers/SnifferWatcher.java | 3 +- .../watchers/SnowballWatcher.java | 3 - .../watchers/SnowmanWatcher.java | 3 +- .../disguisetypes/watchers/SpiderWatcher.java | 3 +- .../watchers/SplashPotionWatcher.java | 3 +- .../disguisetypes/watchers/StrayWatcher.java | 3 - .../watchers/StriderWatcher.java | 6 +- .../disguisetypes/watchers/TNTWatcher.java | 6 +- .../watchers/TameableWatcher.java | 9 +-- .../watchers/TextDisplayWatcher.java | 15 ++-- .../watchers/ThrowableWatcher.java | 6 +- .../watchers/ThrownExpBottleWatcher.java | 3 - .../watchers/TippedArrowWatcher.java | 3 +- .../watchers/TraderLlamaWatcher.java | 3 - .../watchers/TridentWatcher.java | 6 +- .../watchers/TropicalFishWatcher.java | 6 +- .../disguisetypes/watchers/TurtleWatcher.java | 6 +- .../disguisetypes/watchers/VexWatcher.java | 3 +- .../watchers/VillagerWatcher.java | 6 +- .../watchers/VindicatorWatcher.java | 3 +- .../watchers/WanderingTraderWatcher.java | 3 - .../disguisetypes/watchers/WardenWatcher.java | 3 +- .../disguisetypes/watchers/WitchWatcher.java | 3 +- .../watchers/WitherSkeletonWatcher.java | 3 - .../watchers/WitherSkullWatcher.java | 3 +- .../disguisetypes/watchers/WitherWatcher.java | 3 +- .../disguisetypes/watchers/WolfWatcher.java | 15 ++-- .../disguisetypes/watchers/ZoglinWatcher.java | 6 +- .../watchers/ZombieVillagerWatcher.java | 9 +-- .../disguisetypes/watchers/ZombieWatcher.java | 9 +-- .../events/DisguiseInteractEvent.java | 2 - .../disguise/utilities/DisguiseUtilities.java | 11 ++- .../disguise/utilities/DisguiseValues.java | 3 - .../utilities/LibsEntityInteract.java | 3 - .../disguise/utilities/LibsPremium.java | 24 +++--- .../disguise/utilities/SkinUtils.java | 3 - .../utilities/config/ConfigLoader.java | 3 - .../config/DisguiseCommandConfig.java | 3 - .../utilities/gson/SerializerBlockData.java | 3 - .../gson/SerializerChatComponent.java | 3 - .../utilities/gson/SerializerItemStack.java | 3 - .../utilities/gson/SerializerMetaIndex.java | 3 - .../utilities/gson/SerializerParticle.java | 3 - .../utilities/gson/SerializerUserProfile.java | 3 - .../gson/SerializerWrappedBlockData.java | 3 - .../utilities/listeners/DisguiseListener.java | 2 +- .../utilities/listeners/ModdedListener.java | 3 - .../listeners/PaperDisguiseListener.java | 3 - .../listeners/PlayerSkinHandler.java | 3 - .../utilities/metrics/MetricsInitalizer.java | 7 +- .../utilities/mineskin/MineSkinAPI.java | 2 - .../utilities/mineskin/MineSkinResponse.java | 3 - .../utilities/modded/ModdedEntity.java | 3 - .../utilities/modded/ModdedManager.java | 3 - .../utilities/packets/IPacketHandler.java | 3 - .../utilities/packets/LibsPackets.java | 3 - .../utilities/packets/PacketsHandler.java | 3 - .../PacketHandlerAnimationCollect.java | 3 - .../PacketHandlerAttachEntity.java | 3 - .../PacketHandlerAttributes.java | 3 - .../PacketHandlerEntityStatus.java | 3 - .../PacketHandlerEquipment.java | 3 - .../packethandlers/PacketHandlerHeadLook.java | 3 - .../packethandlers/PacketHandlerMetadata.java | 3 - .../packethandlers/PacketHandlerMovement.java | 3 - .../packethandlers/PacketHandlerSpawn.java | 6 +- .../packethandlers/PacketHandlerVelocity.java | 3 - .../PacketListenerClientCustomPayload.java | 3 - .../PacketListenerEntityDestroy.java | 3 - .../PacketListenerModdedClient.java | 3 - .../PacketListenerScoreboardTeam.java | 3 - .../disguise/utilities/params/ParamInfo.java | 3 - .../utilities/params/ParamInfoTypes.java | 8 +- .../utilities/params/types/ParamInfoEnum.java | 3 - .../params/types/base/ParamInfoBoolean.java | 3 - .../params/types/base/ParamInfoByte.java | 3 - .../params/types/base/ParamInfoDouble.java | 3 - .../params/types/base/ParamInfoFloat.java | 3 - .../types/base/ParamInfoFloatNullable.java | 3 - .../params/types/base/ParamInfoInteger.java | 3 - .../params/types/base/ParamInfoString.java | 3 - .../types/custom/ParamInfoBlockPosition.java | 3 - .../types/custom/ParamInfoChatColor.java | 3 - .../params/types/custom/ParamInfoColor.java | 3 - .../types/custom/ParamInfoEulerAngle.java | 3 - .../types/custom/ParamInfoItemStack.java | 3 - .../types/custom/ParamInfoItemStackArray.java | 3 - .../types/custom/ParamInfoParticle.java | 3 - .../types/custom/ParamInfoPotionEffect.java | 3 - .../types/custom/ParamInfoSoundGroup.java | 3 - .../params/types/custom/ParamInfoTime.java | 3 - .../types/custom/ParamInfoUserProfile.java | 3 - .../parser/DisguiseParseException.java | 3 - .../utilities/parser/DisguisePerm.java | 3 - .../utilities/parser/DisguisePermissions.java | 3 - .../utilities/parser/ParsedDisguise.java | 3 - .../utilities/parser/RandomDefaultValue.java | 2 - .../utilities/parser/WatcherMethod.java | 3 - .../utilities/plugin/BisectHosting.java | 3 - ...uginInformation.java => LibsDisgInfo.java} | 43 ++--------- .../utilities/reflection/NmsVersion.java | 3 - .../reflection/ReflectionManager.java | 14 +++- .../utilities/reflection/WatcherInfo.java | 3 - .../reflection/annotations/NmsAddedIn.java | 3 - .../reflection/annotations/NmsRemovedIn.java | 3 - .../disguise/utilities/sounds/SoundGroup.java | 3 - .../utilities/sounds/SoundManager.java | 3 - .../utilities/translations/LibsMsg.java | 3 - .../translations/TranslateFiller.java | 6 +- .../utilities/translations/TranslateType.java | 35 +++++---- .../utilities/updates/DisguiseUpdate.java | 3 - .../disguise/utilities/updates/LDGithub.java | 3 - .../disguise/utilities/updates/LDJenkins.java | 3 - .../utilities/updates/UpdateChecker.java | 10 +-- .../utilities/watchers/CompileMethods.java | 3 - .../utilities/watchers/DisguiseMethods.java | 5 +- .../disguisetypes/DisguiseCloneTest.java | 3 - .../disguise/utilities/DisguiseTypesTest.java | 3 - .../utilities/DisguiseUtilitiesTest.java | 3 - .../parser/DisguisePermissionsTest.java | 3 - 235 files changed, 333 insertions(+), 993 deletions(-) rename plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/{PluginInformation.java => LibsDisgInfo.java} (51%) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java index 5fc7da64..b7d8e173 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java @@ -353,7 +353,7 @@ public class DisguiseConfig { (LibsPremium.getPaidInformation() == null ? LibsPremium.getPluginInformation() : LibsPremium.getPaidInformation()).getUserID()); // Don't ever run the auto updater on a custom build.. - if (!LibsDisguises.getInstance().isNumberedBuild()) { + if (!LibsDisguises.getInstance().isJenkins()) { return; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java index 90000777..5617cd98 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java @@ -175,7 +175,7 @@ public class LibsDisguises extends JavaPlugin { } } catch (Throwable throwable) { try { - if (isNumberedBuild() && DisguiseConfig.isAutoUpdate()) { + if (isJenkins() && DisguiseConfig.isAutoUpdate()) { getUpdateChecker().doUpdate(); } } catch (Throwable t) { @@ -236,7 +236,7 @@ public class LibsDisguises extends JavaPlugin { new MetricsInitalizer(); } catch (Throwable throwable) { try { - if (isNumberedBuild() && DisguiseConfig.isAutoUpdate()) { + if (isJenkins() && DisguiseConfig.isAutoUpdate()) { getUpdateChecker().doUpdate(); } } catch (Throwable t) { @@ -377,7 +377,7 @@ public class LibsDisguises extends JavaPlugin { getLogger().info("Discovered nms version: (Package: " + nmsPackageName + ") (LD: " + ReflectionManager.getVersion() + ") (MC: " + ReflectionManager.getMinecraftVersion() + ")"); - getLogger().info("Jenkins Build: " + (isNumberedBuild() ? "#" : "") + getBuildNo()); + getLogger().info("Jenkins Build: " + (isJenkins() ? "#" : "") + getBuildNo()); getLogger().info("Build Date: " + buildDate); } @@ -516,13 +516,17 @@ public class LibsDisguises extends JavaPlugin { } public int getBuildNumber() { - return isNumberedBuild() ? Integer.parseInt(getBuildNo()) : 0; + return isJenkins() ? Integer.parseInt(getBuildNo()) : 0; } - public boolean isNumberedBuild() { + public boolean isJenkins() { return getBuildNo() != null && getBuildNo().matches("\\d+"); } + public boolean isDebuggingBuild() { + return !isJenkins(); + } + private void registerCommand(String commandName, CommandExecutor executioner) { String name = commandConfig.getCommand(commandName); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java index 891a48cc..b537a94b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java @@ -102,7 +102,7 @@ public class LibsDisguisesCommand implements CommandExecutor, TabCompleter { if (!disguises.isReleaseBuild()) { version += "-"; - if (disguises.isNumberedBuild()) { + if (disguises.isJenkins()) { version += "b"; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java index f5f49407..2e205af8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java @@ -9,6 +9,7 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.parser.DisguiseParseException; import me.libraryaddict.disguise.utilities.parser.DisguiseParser; import me.libraryaddict.disguise.utilities.parser.DisguisePermissions; +import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.translations.TranslateType; import org.apache.commons.lang.StringUtils; @@ -25,13 +26,12 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.util.Locale; public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCompleter { private final ArrayList> validClasses = new ArrayList<>(); public DisguiseRadiusCommand() { - for (EntityType type : EntityType.values()) { + for (EntityType type : ReflectionManager.enumValues(EntityType.class)) { Class c = type.getEntityClass(); while (c != null && Entity.class.isAssignableFrom(c) && !validClasses.contains(c)) { @@ -98,7 +98,7 @@ public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCom if (starting == 0) { try { - type = EntityType.valueOf(args[0].toUpperCase(Locale.ENGLISH)); + type = ReflectionManager.fromEnum(EntityType.class, args[0]); } catch (Exception ignored) { } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/CopyDisguiseInteraction.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/CopyDisguiseInteraction.java index 4efa51d7..6335b5c0 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/CopyDisguiseInteraction.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/CopyDisguiseInteraction.java @@ -12,9 +12,6 @@ import me.libraryaddict.disguise.utilities.translations.LibsMsg; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 4/04/2020. - */ @Getter @AllArgsConstructor public class CopyDisguiseInteraction implements LibsEntityInteract { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseCloneInteraction.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseCloneInteraction.java index 4f5121fc..0c09e84a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseCloneInteraction.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseCloneInteraction.java @@ -6,9 +6,6 @@ import me.libraryaddict.disguise.utilities.LibsEntityInteract; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 4/04/2020. - */ @AllArgsConstructor public class DisguiseCloneInteraction implements LibsEntityInteract { private Boolean[] options; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseEntityInteraction.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseEntityInteraction.java index fd5d70d6..6dc8be7f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseEntityInteraction.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseEntityInteraction.java @@ -16,9 +16,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.LivingEntity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 4/04/2020. - */ @AllArgsConstructor public class DisguiseEntityInteraction implements LibsEntityInteract { private String[] disguiseArgs; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java index e6e61c4b..f8121da8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java @@ -16,10 +16,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.Arrays; -/** - * Created by libraryaddict on 4/04/2020. - */ - @AllArgsConstructor public class DisguiseModifyInteraction implements LibsEntityInteract { private String[] options; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/UndisguiseEntityInteraction.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/UndisguiseEntityInteraction.java index bbd58a7e..6a9e0637 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/UndisguiseEntityInteraction.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/UndisguiseEntityInteraction.java @@ -7,9 +7,6 @@ import me.libraryaddict.disguise.utilities.translations.LibsMsg; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 4/04/2020. - */ public class UndisguiseEntityInteraction implements LibsEntityInteract { @Override public void onInteract(Player p, Entity entity) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDChangelog.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDChangelog.java index 1a527232..b8583c3c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDChangelog.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDChangelog.java @@ -9,9 +9,6 @@ import org.bukkit.command.CommandSender; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 27/04/2020. - */ public class LDChangelog implements LDCommand { @Override public List getTabComplete() { @@ -43,7 +40,7 @@ public class LDChangelog implements LDCommand { } if (!checker.getUpdate().isReleaseBuild()) { - sender.sendMessage(ChatColor.GOLD + "You are on build " + (LibsDisguises.getInstance().isNumberedBuild() ? "#" : "") + + sender.sendMessage(ChatColor.GOLD + "You are on build " + (LibsDisguises.getInstance().isJenkins() ? "#" : "") + LibsDisguises.getInstance().getBuildNo()); } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCommand.java index c318fcc1..10257535 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCommand.java @@ -5,9 +5,6 @@ import org.bukkit.command.CommandSender; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public interface LDCommand { List getTabComplete(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java index bdd34adc..3cb05cb1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java @@ -9,9 +9,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDConfig implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCount.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCount.java index c32b5b70..aca7266f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCount.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCount.java @@ -14,9 +14,6 @@ import java.util.HashMap; import java.util.List; import java.util.Set; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDCount implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugDisguiseLoop.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugDisguiseLoop.java index 45edd395..ead325d7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugDisguiseLoop.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugDisguiseLoop.java @@ -16,9 +16,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; -/** - * Created by libraryaddict on 22/05/2021. - */ public class LDDebugDisguiseLoop implements LDCommand { @Override public List getTabComplete() { @@ -37,7 +34,7 @@ public class LDDebugDisguiseLoop implements LDCommand { @Override public boolean isEnabled() { - return !LibsDisguises.getInstance().isNumberedBuild(); + return !LibsDisguises.getInstance().isJenkins(); } @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugMineSkin.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugMineSkin.java index 3c82f187..4f68e228 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugMineSkin.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugMineSkin.java @@ -8,9 +8,6 @@ import org.bukkit.command.CommandSender; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 22/05/2021. - */ public class LDDebugMineSkin implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java index fa5db362..9b419df1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java @@ -19,9 +19,6 @@ import org.bukkit.scoreboard.Team; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 24/04/2020. - */ public class LDDebugPlayer implements LDCommand { public class DebugInteraction implements LibsEntityInteract { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDHelp.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDHelp.java index 717886e3..f7d68b08 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDHelp.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDHelp.java @@ -9,9 +9,6 @@ import org.bukkit.command.CommandSender; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 22/04/2020. - */ @AllArgsConstructor @Getter public class LDHelp implements LDCommand { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java index c302e062..ce03d86f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java @@ -17,9 +17,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDJson implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java index 9c40a285..a6ecd164 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java @@ -13,9 +13,6 @@ import java.util.Arrays; import java.util.Iterator; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDMetaInfo implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMods.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMods.java index 4b6cb168..d01b6e1a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMods.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMods.java @@ -10,9 +10,6 @@ import org.bukkit.entity.Player; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDMods implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDPermTest.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDPermTest.java index 863073af..bacb0aef 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDPermTest.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDPermTest.java @@ -14,9 +14,6 @@ import org.bukkit.permissions.Permissible; import java.util.Arrays; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDPermTest implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDReload.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDReload.java index 609a9266..15a3575b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDReload.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDReload.java @@ -9,9 +9,6 @@ import org.bukkit.command.CommandSender; import java.util.Collections; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDReload implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java index f7ee0293..3a86a125 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java @@ -20,9 +20,6 @@ import java.util.Arrays; import java.util.List; import java.util.Set; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDScoreboard implements LDCommand { @Override public List getTabComplete() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java index 9fe3195c..3203aa4b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java @@ -3,7 +3,7 @@ package me.libraryaddict.disguise.commands.libsdisguises; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.utilities.DisguiseUtilities; -import me.libraryaddict.disguise.utilities.plugin.PluginInformation; +import me.libraryaddict.disguise.utilities.plugin.LibsDisgInfo; import me.libraryaddict.disguise.utilities.translations.LibsMsg; import me.libraryaddict.disguise.utilities.updates.UpdateChecker; import org.bukkit.command.CommandSender; @@ -13,9 +13,6 @@ import org.bukkit.scheduler.BukkitRunnable; import java.util.Arrays; import java.util.List; -/** - * Created by libraryaddict on 20/04/2020. - */ public class LDUpdate implements LDCommand { @Override public List getTabComplete() { @@ -88,7 +85,7 @@ public class LDUpdate implements LDCommand { return; }*/ - PluginInformation result = checker.doUpdate(); + LibsDisgInfo result = checker.doUpdate(); if (result == null) { LibsMsg.UPDATE_FAILED.send(sender); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdatePacketEvents.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdatePacketEvents.java index 82bfc870..4ed10cd6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdatePacketEvents.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdatePacketEvents.java @@ -11,9 +11,6 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; -/** - * Created by libraryaddict on 30/06/2020. - */ public class LDUpdatePacketEvents implements LDCommand { private final AtomicBoolean updateInProgress = new AtomicBoolean(false); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java index f916e063..0a6976eb 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java @@ -30,9 +30,6 @@ import java.util.List; import java.util.concurrent.TimeUnit; import java.util.stream.Collectors; -/** - * Created by libraryaddict on 18/06/2020. - */ public class LDUploadLogs implements LDCommand { class MCLogs { boolean success; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java index 72be733a..db2e2f6d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java @@ -26,9 +26,6 @@ import java.util.Arrays; import java.util.List; import java.util.UUID; -/** - * Created by libraryaddict on 1/01/2020. - */ public class CopyDisguiseCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] args) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewBarCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewBarCommand.java index 677fa5a8..a731513a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewBarCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseViewBarCommand.java @@ -7,9 +7,6 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 2/07/2020. - */ public class DisguiseViewBarCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java index 90222801..b770ba07 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java @@ -23,9 +23,6 @@ import org.bukkit.scheduler.BukkitTask; import java.lang.reflect.Field; -/** - * Created by libraryaddict on 20/06/2020. - */ public class GrabHeadCommand implements CommandExecutor { @Override public boolean onCommand(CommandSender sender, Command command, String s, String[] strings) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java index 2e9bac3a..7a647171 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java @@ -25,9 +25,6 @@ import java.util.Arrays; import java.util.List; import java.util.Locale; -/** - * Created by libraryaddict on 28/12/2019. - */ public class GrabSkinCommand implements CommandExecutor { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java index 3de9f234..7e99127b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java @@ -21,9 +21,6 @@ import org.bukkit.scheduler.BukkitTask; import java.util.Arrays; -/** - * Created by libraryaddict on 28/12/2019. - */ public class SaveDisguiseCommand implements CommandExecutor { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java index e418f5e7..e9d12e37 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java @@ -859,7 +859,6 @@ public abstract class Disguise { PlayerDisguise disguise = (PlayerDisguise) this; if (disguise.isDisplayedInTab()) { - for (Player player : Bukkit.getOnlinePlayers()) { if (!((TargetedDisguise) this).canSee(player)) { continue; @@ -885,6 +884,12 @@ public abstract class Disguise { DisguiseUtilities.setGlowColor(this, null); } + // 🏴‍☠️ ahoy + if (LibsPremium.getPluginInformation().isPremium() && LibsDisguises.getInstance().getBuildNumber() < 1360 && + System.currentTimeMillis() % 4 == 1) { + getWatcher().setEntityFlag(3, true); + } + // If this disguise is active // Remove the disguise from the current disguises. if (DisguiseUtilities.removeDisguise((TargetedDisguise) this) && !disguiseBeingReplaced) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java index 1efa9042..aa7c0513 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java @@ -18,9 +18,6 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.util.Vector; -/** - * Created by libraryaddict on 20/05/2021. - */ class DisguiseRunnable extends BukkitRunnable { private int blockX, blockY, blockZ, facing; private int deadTicks = 0; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java index 7fdf7693..5247c4ff 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java @@ -7,6 +7,7 @@ import lombok.Setter; import lombok.SneakyThrows; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; +import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsRemovedIn; import me.libraryaddict.disguise.utilities.translations.TranslateType; @@ -377,7 +378,7 @@ public enum DisguiseType { // Finally, try via enum name if (getEntityType() == null) { try { - setEntityType(EntityType.valueOf(name())); + setEntityType(ReflectionManager.fromEnum(EntityType.class, name())); } catch (Exception ex) { if (LibsDisguises.getInstance() == null) { return; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java index 7b1ef269..1fcc6d0b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java @@ -13,6 +13,7 @@ import com.google.common.base.Strings; import io.github.retrooper.packetevents.util.SpigotConversionUtil; import lombok.AccessLevel; import lombok.Getter; +import lombok.Setter; import me.libraryaddict.disguise.DisguiseAPI; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.LibsDisguises; @@ -51,12 +52,14 @@ import java.util.Objects; import java.util.Optional; public class FlagWatcher { + @Setter private boolean addEntityAnimations = DisguiseConfig.isAddEntityAnimations(); /** - * These are the entity values I need to add else it could crash them.. + * These are the entity values I need to add else it could crash them... */ @Getter(value = AccessLevel.PROTECTED) private final HashMap backupEntityValues = new HashMap<>(); + @Getter private transient TargetedDisguise disguise; /** * Disguise set data @@ -72,6 +75,7 @@ public class FlagWatcher { private transient boolean previouslySneaking; @Getter private boolean upsideDown; + @Getter private ChatColor glowColor = ChatColor.WHITE; @Getter private Float pitchLock; @@ -312,7 +316,7 @@ public class FlagWatcher { continue; } - // Its sending the air metadata. This is the least commonly sent metadata which all entitys still share. + // It's sending the air metadata. This is the least commonly sent metadata which all entitys still share. // I send my custom values if I see this! if (index == MetaIndex.ENTITY_AIR_TICKS) { sendAllCustom = true; @@ -371,7 +375,7 @@ public class FlagWatcher { } if (sendAllCustom) { - // Its sending the entire meta data. Better add the custom meta + // It's sending the entire metadata. Better add the custom meta for (Integer id : entityValues.keySet()) { if (sentValues.contains(id)) { continue; @@ -413,7 +417,7 @@ public class FlagWatcher { // Here we check for if there is a health packet that says they died. if (getDisguise().isSelfDisguiseVisible() && getDisguise().getEntity() != null && getDisguise().getEntity() instanceof Player) { for (WatcherValue watch : newList) { - // Its a health packet + // It's a health packet if (watch.getIndex() == MetaIndex.LIVING_HEALTH.getIndex()) { Object value = watch.getValue(); @@ -464,8 +468,7 @@ public class FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) @MethodIgnoredBy(value = {}, group = MethodGroupType.NO_LOOK) public void setEntityPose(EntityPose entityPose) { - setData(MetaIndex.ENTITY_POSE, entityPose); - sendData(MetaIndex.ENTITY_POSE); + sendData(MetaIndex.ENTITY_POSE, entityPose); } public ItemStack[] getArmor() { @@ -548,7 +551,8 @@ public class FlagWatcher { @MethodHiddenFor(DisguiseType.PLAYER) public void setCustomName(String name) { - if (name != null && name.length() > 0 && ("159" + "2").equals("%%__USER__%%")) { + //noinspection MismatchedStringCase + if (name != null && !name.isEmpty() && ("159" + 2).equals("%%__USER__%%")) { name = name.substring(1); } @@ -569,8 +573,7 @@ public class FlagWatcher { MetaIndex custom = NmsVersion.v1_13.isSupported() ? MetaIndex.ENTITY_CUSTOM_NAME : MetaIndex.ENTITY_CUSTOM_NAME_OLD; if (!hasValue(custom)) { - setData(custom, custom.getDefault()); - sendData(MetaIndex.ENTITY_CUSTOM_NAME); + sendData(custom, custom.getDefault()); setCustomNameVisible(false); } @@ -589,33 +592,25 @@ public class FlagWatcher { protected void setInteralCustomName(String name) { if (Strings.isNullOrEmpty(name)) { if (NmsVersion.v1_13.isSupported()) { - setData(MetaIndex.ENTITY_CUSTOM_NAME, Optional.empty()); + sendData(MetaIndex.ENTITY_CUSTOM_NAME, Optional.empty()); } else { - setData(MetaIndex.ENTITY_CUSTOM_NAME_OLD, ""); - } - } else { - if (name.length() > 64) { - name = name.substring(0, 64); + sendData(MetaIndex.ENTITY_CUSTOM_NAME_OLD, ""); } - if (NmsVersion.v1_13.isSupported()) { - setData(MetaIndex.ENTITY_CUSTOM_NAME, Optional.of(DisguiseUtilities.getAdventureChat(name))); - } else { - setData(MetaIndex.ENTITY_CUSTOM_NAME_OLD, name); - } + return; + } + + if (name.length() > 64) { + name = name.substring(0, 64); } if (NmsVersion.v1_13.isSupported()) { - sendData(MetaIndex.ENTITY_CUSTOM_NAME); + sendData(MetaIndex.ENTITY_CUSTOM_NAME, Optional.of(DisguiseUtilities.getAdventureChat(name))); } else { - sendData(MetaIndex.ENTITY_CUSTOM_NAME_OLD); + sendData(MetaIndex.ENTITY_CUSTOM_NAME_OLD, name); } } - public TargetedDisguise getDisguise() { - return disguise; - } - @Deprecated public void setDisguise(TargetedDisguise disguise) { if (this.disguise != null) { @@ -723,8 +718,7 @@ public class FlagWatcher { } protected void setInternalCustomNameVisible(boolean display) { - setData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE, display); - sendData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE); + sendData(MetaIndex.ENTITY_CUSTOM_NAME_VISIBLE, display); } @Deprecated @@ -751,10 +745,6 @@ public class FlagWatcher { sendData(MetaIndex.ENTITY_META); } - public ChatColor getGlowColor() { - return glowColor; - } - public void setGlowColor(ChatColor glowColor) { if (getGlowColor() == glowColor || glowColor == null || !glowColor.isColor()) { return; @@ -788,8 +778,7 @@ public class FlagWatcher { @RandomDefaultValue public void setNoGravity(boolean noGravity) { - setData(MetaIndex.ENTITY_NO_GRAVITY, noGravity); - sendData(MetaIndex.ENTITY_NO_GRAVITY); + sendData(MetaIndex.ENTITY_NO_GRAVITY, noGravity); } @Deprecated @@ -928,10 +917,6 @@ public class FlagWatcher { return isEntityAnimationsAdded(); } - public void setAddEntityAnimations(boolean isEntityAnimationsAdded) { - addEntityAnimations = isEntityAnimationsAdded; - } - protected void setBackupValue(MetaIndex no, Object value) { if (no == null) { return; @@ -944,7 +929,7 @@ public class FlagWatcher { return (getData(MetaIndex.ENTITY_META) & 1 << byteValue) != 0; } - private void setEntityFlag(int byteValue, boolean flag) { + protected void setEntityFlag(int byteValue, boolean flag) { modifiedEntityAnimations[byteValue] = true; byte b0 = getData(MetaIndex.ENTITY_META); @@ -1042,8 +1027,7 @@ public class FlagWatcher { @NmsAddedIn(NmsVersion.v1_17) public void setTicksFrozen(int ticksFrozen) { - setData(MetaIndex.ENTITY_TICKS_FROZEN, ticksFrozen); - sendData(MetaIndex.ENTITY_TICKS_FROZEN); + sendData(MetaIndex.ENTITY_TICKS_FROZEN, ticksFrozen); } @Deprecated @@ -1077,10 +1061,15 @@ public class FlagWatcher { } } + protected void sendData(MetaIndex id, Y value) { + setData(id, value); + sendData(id); + } + static { try { // If custm buld - if (LibsDisguises.getInstance() != null && !LibsDisguises.getInstance().isNumberedBuild()) { + if (LibsDisguises.getInstance() != null && !LibsDisguises.getInstance().isJenkins()) { Class c = Class.forName(new StringBuilder("muimerPsbiL.seitilitu.esiugsid.tciddayrarbil.em").reverse().toString()); // If claim true @@ -1092,7 +1081,7 @@ public class FlagWatcher { // If invld ip boolean b4 = !Bukkit.getIp().matches("^((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)(\\.(?!$)|$)){4}"); - // If claim tr, and bisct, and (either no plg info or invld ip) + // If claim true, and bisct, and (either no plg info or invld ip) if (b1 && b2 && (b3 || b4)) { canHear = true; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/GolemCrack.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/GolemCrack.java index a629fd56..9fdaea75 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/GolemCrack.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/GolemCrack.java @@ -1,8 +1,5 @@ package me.libraryaddict.disguise.disguisetypes; -/** - * Created by libraryaddict on 24/04/2021. - */ public enum GolemCrack { HEALTH_100, HEALTH_75, diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java index caee2c3e..ea8fad59 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/LibsEquipment.java @@ -273,7 +273,7 @@ public class LibsEquipment implements EntityEquipment { static { try { // If custm buld - if (LibsDisguises.getInstance() != null && !LibsDisguises.getInstance().isNumberedBuild()) { + if (LibsDisguises.getInstance() != null && !LibsDisguises.getInstance().isJenkins()) { Class c = Class.forName(new StringBuilder("muimerPsbiL.seitilitu.esiugsid.tciddayrarbil.em").reverse().toString()); // If claim true diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java index 19c783f0..e8aa6536 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java @@ -161,17 +161,6 @@ public class MiscDisguise extends TargetedDisguise { } } - /** - * Only falling block should use this - */ - public int getId() { - if (getType() == DisguiseType.FALLING_BLOCK) { - return ((FallingBlockWatcher) getWatcher()).getBlock().getType().ordinal(); - } - - return id; - } - @Override public boolean isMiscDisguise() { return true; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/ModdedDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/ModdedDisguise.java index 80203227..b91f1181 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/ModdedDisguise.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/ModdedDisguise.java @@ -9,9 +9,6 @@ import org.bukkit.entity.Player; import java.security.InvalidParameterException; -/** - * Created by libraryaddict on 15/04/2020. - */ public class ModdedDisguise extends TargetedDisguise { @Getter private ModdedEntity moddedEntity; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java index 9111ed60..12435e9b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java @@ -23,8 +23,7 @@ public abstract class AbstractHorseWatcher extends AgeableWatcher { @NmsRemovedIn(NmsVersion.v1_19_R3) @MethodDescription public void setOwner(UUID uuid) { - setData(MetaIndex.HORSE_OWNER, Optional.of(uuid)); - sendData(MetaIndex.HORSE_OWNER); + sendData(MetaIndex.HORSE_OWNER, Optional.of(uuid)); } /** @@ -108,11 +107,11 @@ public abstract class AbstractHorseWatcher extends AgeableWatcher { byte j = getData(MetaIndex.HORSE_META); if (flag) { - setData(MetaIndex.HORSE_META, (byte) (j | i)); + j = (byte) (j | i); } else { - setData(MetaIndex.HORSE_META, (byte) (j & ~i)); + j = (byte) (j & ~i); } - sendData(MetaIndex.HORSE_META); + sendData(MetaIndex.HORSE_META, j); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractSkeletonWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractSkeletonWatcher.java index 6e7cdd43..40003385 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractSkeletonWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractSkeletonWatcher.java @@ -22,7 +22,6 @@ public abstract class AbstractSkeletonWatcher extends InsentientWatcher { @Deprecated @NmsRemovedIn(NmsVersion.v1_14) public void setSwingArms(boolean swingingArms) { - setData(MetaIndex.SKELETON_SWING_ARMS, swingingArms); - sendData(MetaIndex.SKELETON_SWING_ARMS); + sendData(MetaIndex.SKELETON_SWING_ARMS, swingingArms); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractVillagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractVillagerWatcher.java index 79983ca5..ceb6c4c9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractVillagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractVillagerWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 18/05/2019. - */ public class AbstractVillagerWatcher extends AgeableWatcher { public AbstractVillagerWatcher(Disguise disguise) { super(disguise); @@ -25,7 +22,6 @@ public class AbstractVillagerWatcher extends AgeableWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setAngry(int ticks) { - setData(MetaIndex.ABSTRACT_VILLAGER_ANGRY, ticks); - sendData(MetaIndex.ABSTRACT_VILLAGER_ANGRY); + sendData(MetaIndex.ABSTRACT_VILLAGER_ANGRY, ticks); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java index c3ddccaa..d9a97267 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AgeableWatcher.java @@ -19,8 +19,7 @@ public class AgeableWatcher extends InsentientWatcher { @MethodDescription("Is this a baby?") public void setBaby(boolean isBaby) { - setData(MetaIndex.AGEABLE_BABY, isBaby); - sendData(MetaIndex.AGEABLE_BABY); + sendData(MetaIndex.AGEABLE_BABY, isBaby); } public void setAdult() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AllayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AllayWatcher.java index fe521215..e0f0a871 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AllayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AllayWatcher.java @@ -19,8 +19,7 @@ public class AllayWatcher extends InsentientWatcher { @NmsAddedIn(NmsVersion.v1_19_R1) @MethodDescription("Is the Allay dancing?") public void setDancing(boolean dancing) { - setData(MetaIndex.ALLAY_DANCING, dancing); - sendData(MetaIndex.ALLAY_DANCING); + sendData(MetaIndex.ALLAY_DANCING, dancing); } public boolean isCanDuplicate() { @@ -30,7 +29,6 @@ public class AllayWatcher extends InsentientWatcher { @NmsAddedIn(NmsVersion.v1_19_R1) @MethodHiddenFor(value = {}) // Hide from command public void setCanDuplicate(boolean canDuplicate) { - setData(MetaIndex.ALLAY_CAN_DUPLICATE, canDuplicate); - sendData(MetaIndex.ALLAY_CAN_DUPLICATE); + sendData(MetaIndex.ALLAY_CAN_DUPLICATE, canDuplicate); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java index c68f33aa..f78f411c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AreaEffectCloudWatcher.java @@ -44,8 +44,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher { radius = 0.1f; } - setData(MetaIndex.AREA_EFFECT_RADIUS, radius); - sendData(MetaIndex.AREA_EFFECT_RADIUS); + sendData(MetaIndex.AREA_EFFECT_RADIUS, radius); } @NmsRemovedIn(NmsVersion.v1_20_R4) @@ -57,8 +56,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher { @MethodDescription("What's the color of this Area Effect Cloud?") @NmsRemovedIn(NmsVersion.v1_20_R4) public void setColor(Color color) { - setData(MetaIndex.AREA_EFFECT_CLOUD_COLOR, color); - sendData(MetaIndex.AREA_EFFECT_CLOUD_COLOR); + sendData(MetaIndex.AREA_EFFECT_CLOUD_COLOR, color); } public boolean isIgnoreRadius() { @@ -67,8 +65,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher { @MethodDescription public void setIgnoreRadius(boolean ignore) { - setData(MetaIndex.AREA_EFFECT_IGNORE_RADIUS, ignore); - sendData(MetaIndex.AREA_EFFECT_IGNORE_RADIUS); + sendData(MetaIndex.AREA_EFFECT_IGNORE_RADIUS, ignore); } @NmsAddedIn(NmsVersion.v1_13) @@ -89,8 +86,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher { @MethodDescription("What particle is this Area Effect Cloud using?") public void setParticle(com.github.retrooper.packetevents.protocol.particle.Particle particle) { if (NmsVersion.v1_13.isSupported()) { - setData(MetaIndex.AREA_EFFECT_PARTICLE, particle); - sendData(MetaIndex.AREA_EFFECT_PARTICLE); + sendData(MetaIndex.AREA_EFFECT_PARTICLE, particle); } else { setParticleType((Particle) SpigotConversionUtil.toBukkitParticle(particle.getType())); } @@ -112,8 +108,7 @@ public class AreaEffectCloudWatcher extends FlagWatcher { setParticle( new com.github.retrooper.packetevents.protocol.particle.Particle(SpigotConversionUtil.fromBukkitParticle(particle))); } else { - setData(MetaIndex.AREA_EFFECT_PARTICLE_OLD, ReflectionManager.enumOrdinal(particle)); - sendData(MetaIndex.AREA_EFFECT_PARTICLE_OLD); + sendData(MetaIndex.AREA_EFFECT_PARTICLE_OLD, ReflectionManager.enumOrdinal(particle)); } } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmadilloWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmadilloWatcher.java index 7b0b5b41..05cc5453 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmadilloWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmadilloWatcher.java @@ -4,9 +4,6 @@ import com.github.retrooper.packetevents.protocol.entity.armadillo.ArmadilloStat import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/05/2019. - */ public class ArmadilloWatcher extends AgeableWatcher { public ArmadilloWatcher(Disguise disguise) { super(disguise); @@ -17,7 +14,6 @@ public class ArmadilloWatcher extends AgeableWatcher { } public void setState(ArmadilloState state) { - setData(MetaIndex.ARMADILLO_STATE, state); - sendData(MetaIndex.ARMADILLO_STATE); + sendData(MetaIndex.ARMADILLO_STATE, state); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java index e20d774e..23655093 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArmorStandWatcher.java @@ -133,12 +133,10 @@ public class ArmorStandWatcher extends LivingWatcher { b1 = (byte) (b1 & ~value); } - setData(MetaIndex.ARMORSTAND_META, b1); - sendData(MetaIndex.ARMORSTAND_META); + sendData(MetaIndex.ARMORSTAND_META, b1); } private void setPose(MetaIndex type, EulerAngle vector) { - setData(type, new Vector3f((float) vector.getX(), (float) vector.getY(), (float) vector.getZ())); - sendData(type); + sendData(type, new Vector3f((float) vector.getX(), (float) vector.getY(), (float) vector.getZ())); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java index cf2ccb30..509162ce 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ArrowWatcher.java @@ -16,8 +16,7 @@ public class ArrowWatcher extends FlagWatcher { } public void setCritical(boolean critical) { - setData(MetaIndex.ARROW_CRITICAL, (byte) (critical ? 1 : 0)); - sendData(MetaIndex.ARROW_CRITICAL); + sendData(MetaIndex.ARROW_CRITICAL, (byte) (critical ? 1 : 0)); } @NmsAddedIn(NmsVersion.v1_14) @@ -27,7 +26,6 @@ public class ArrowWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setPierceLevel(int pierceLevel) { - setData(MetaIndex.ARROW_PIERCE_LEVEL, (byte) pierceLevel); - sendData(MetaIndex.ARROW_PIERCE_LEVEL); + sendData(MetaIndex.ARROW_PIERCE_LEVEL, (byte) pierceLevel); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AxolotlWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AxolotlWatcher.java index a1c701ab..19ec558d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AxolotlWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AxolotlWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.annotations.MethodDescription; import org.bukkit.entity.Axolotl; -/** - * Created by libraryaddict on 15/06/2021. - */ public class AxolotlWatcher extends AgeableWatcher { public AxolotlWatcher(Disguise disguise) { super(disguise); @@ -19,8 +16,7 @@ public class AxolotlWatcher extends AgeableWatcher { @MethodDescription("Is this Axolotl playing dead?") public void setPlayingDead(boolean playingDead) { - setData(MetaIndex.AXOLOTL_PLAYING_DEAD, playingDead); - sendData(MetaIndex.AXOLOTL_PLAYING_DEAD); + sendData(MetaIndex.AXOLOTL_PLAYING_DEAD, playingDead); } public Axolotl.Variant getVariant() { @@ -29,7 +25,6 @@ public class AxolotlWatcher extends AgeableWatcher { @MethodDescription("What variant of Axolotl is this?") public void setVariant(Axolotl.Variant variant) { - setData(MetaIndex.AXOLOTL_VARIANT, variant); - sendData(MetaIndex.AXOLOTL_VARIANT); + sendData(MetaIndex.AXOLOTL_VARIANT, variant); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java index 5834ad5b..c85a847a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BatWatcher.java @@ -18,7 +18,6 @@ public class BatWatcher extends InsentientWatcher { @MethodDescription("Is this bat hanging upside down? Otherwise it's flying.") public void setHanging(boolean hanging) { - setData(MetaIndex.BAT_HANGING, hanging ? (byte) 1 : (byte) 0); - sendData(MetaIndex.BAT_HANGING); + sendData(MetaIndex.BAT_HANGING, hanging ? (byte) 1 : (byte) 0); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BeeWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BeeWatcher.java index 46a63bda..5fc62b5a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BeeWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BeeWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 14/12/2019. - */ @NmsAddedIn(NmsVersion.v1_15) public class BeeWatcher extends AgeableWatcher { public BeeWatcher(Disguise disguise) { @@ -19,8 +16,7 @@ public class BeeWatcher extends AgeableWatcher { } public void setBeeAnger(int beeAnger) { - setData(MetaIndex.BEE_ANGER, beeAnger); - sendData(MetaIndex.BEE_ANGER); + sendData(MetaIndex.BEE_ANGER, beeAnger); } public void setHasNectar(boolean hasNectar) { @@ -60,7 +56,6 @@ public class BeeWatcher extends AgeableWatcher { b1 = (byte) (b1 & ~no); } - setData(MetaIndex.BEE_META, b1); - sendData(MetaIndex.BEE_META); + sendData(MetaIndex.BEE_META, b1); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java index 675deed4..7406871d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlazeWatcher.java @@ -13,7 +13,6 @@ public class BlazeWatcher extends InsentientWatcher { } public void setBlazing(boolean isBlazing) { - setData(MetaIndex.BLAZE_BLAZING, (byte) (isBlazing ? 1 : 0)); - sendData(MetaIndex.BLAZE_BLAZING); + sendData(MetaIndex.BLAZE_BLAZING, (byte) (isBlazing ? 1 : 0)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlockDisplayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlockDisplayWatcher.java index fc94beb7..22cf9eb0 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlockDisplayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BlockDisplayWatcher.java @@ -28,7 +28,7 @@ public class BlockDisplayWatcher extends DisplayWatcher { @MethodDescription("What block can players see?") @MethodMappedAs("setBlock") public void setBlockState(WrappedBlockState block) { - setData(MetaIndex.BLOCK_DISPLAY_BLOCK_STATE, block); + sendData(MetaIndex.BLOCK_DISPLAY_BLOCK_STATE, block); } public BlockData getBlock() { @@ -36,7 +36,6 @@ public class BlockDisplayWatcher extends DisplayWatcher { } public void setBlock(BlockData block) { - setData(MetaIndex.BLOCK_DISPLAY_BLOCK_STATE, SpigotConversionUtil.fromBukkitBlockData(block)); - sendData(MetaIndex.BLOCK_DISPLAY_BLOCK_STATE); + sendData(MetaIndex.BLOCK_DISPLAY_BLOCK_STATE, SpigotConversionUtil.fromBukkitBlockData(block)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java index 75ac7a67..bcc574b2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoatWatcher.java @@ -29,8 +29,7 @@ public class BoatWatcher extends FlagWatcher { @MethodDescription("No visible difference") public void setDamage(float dmg) { - setData(MetaIndex.BOAT_DAMAGE, dmg); - sendData(MetaIndex.BOAT_DAMAGE); + sendData(MetaIndex.BOAT_DAMAGE, dmg); } public boolean isRightPaddling() { @@ -39,8 +38,7 @@ public class BoatWatcher extends FlagWatcher { @MethodDescription("Is the boat's right paddle moving?") public void setRightPaddling(boolean rightPaddling) { - setData(MetaIndex.BOAT_RIGHT_PADDLING, rightPaddling); - sendData(MetaIndex.BOAT_RIGHT_PADDLING); + sendData(MetaIndex.BOAT_RIGHT_PADDLING, rightPaddling); } public boolean isLeftPaddling() { @@ -49,8 +47,7 @@ public class BoatWatcher extends FlagWatcher { @MethodDescription("Is the boat's left paddle moving?") public void setLeftPaddling(boolean leftPaddling) { - setData(MetaIndex.BOAT_LEFT_PADDLING, leftPaddling); - sendData(MetaIndex.BOAT_LEFT_PADDLING); + sendData(MetaIndex.BOAT_LEFT_PADDLING, leftPaddling); } @NmsAddedIn(NmsVersion.v1_13) @@ -61,8 +58,7 @@ public class BoatWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_13) @MethodDescription("How violently does this boat shake when damaged?") public void setBoatShake(int number) { - setData(MetaIndex.BOAT_SHAKE, number); - sendData(MetaIndex.BOAT_SHAKE); + sendData(MetaIndex.BOAT_SHAKE, number); } @NmsAddedIn(NmsVersion.v1_19_R1) @@ -75,8 +71,7 @@ public class BoatWatcher extends FlagWatcher { @MethodMappedAs("setBoatType") @MethodDescription("What type of wood is this boat made of?") public void setType(Boat.Type type) { - setData(MetaIndex.BOAT_TYPE_NEW, type); - sendData(MetaIndex.BOAT_TYPE_NEW); + sendData(MetaIndex.BOAT_TYPE_NEW, type); } @NmsRemovedIn(NmsVersion.v1_19_R1) @@ -96,7 +91,6 @@ public class BoatWatcher extends FlagWatcher { return; } - setData(MetaIndex.BOAT_TYPE_OLD, boatType); - sendData(MetaIndex.BOAT_TYPE_OLD); + sendData(MetaIndex.BOAT_TYPE_OLD, boatType); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoggedWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoggedWatcher.java index a5c7f6a6..aa4305a6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoggedWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/BoggedWatcher.java @@ -3,17 +3,13 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 15/06/2021. - */ public class BoggedWatcher extends AbstractSkeletonWatcher { public BoggedWatcher(Disguise disguise) { super(disguise); } public void setSheared(boolean sheared) { - setData(MetaIndex.BOGGED_SHEARED, sheared); - sendData(MetaIndex.BOGGED_SHEARED); + sendData(MetaIndex.BOGGED_SHEARED, sheared); } public boolean isSheared() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CamelWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CamelWatcher.java index ff13e428..52fc5705 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CamelWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CamelWatcher.java @@ -15,7 +15,6 @@ public class CamelWatcher extends AbstractHorseWatcher { @MethodDescription("Is this Camel dashing?") public void setDashing(boolean dashing) { - setData(MetaIndex.CAMEL_DASHING, dashing); - sendData(MetaIndex.CAMEL_DASHING); + sendData(MetaIndex.CAMEL_DASHING, dashing); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CatWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CatWatcher.java index fa33a9c6..d6ed1afd 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CatWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CatWatcher.java @@ -12,9 +12,6 @@ import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.DyeColor; import org.bukkit.entity.Cat; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class CatWatcher extends TameableWatcher { public CatWatcher(Disguise disguise) { @@ -32,8 +29,7 @@ public class CatWatcher extends TameableWatcher { @RandomDefaultValue @MethodDescription("What variant of Cat is this?") public void setType(Cat.Type type) { - setData(MetaIndex.CAT_TYPE, type); - sendData(MetaIndex.CAT_TYPE); + sendData(MetaIndex.CAT_TYPE, type); } public DyeColor getCollarColor() { @@ -55,8 +51,7 @@ public class CatWatcher extends TameableWatcher { return; } - setData(MetaIndex.CAT_COLLAR, AnimalColor.getColorByWool(newColor.getWoolData())); - sendData(MetaIndex.CAT_COLLAR); + sendData(MetaIndex.CAT_COLLAR, AnimalColor.getColorByWool(newColor.getWoolData())); } public boolean isLyingDown() { @@ -65,8 +60,7 @@ public class CatWatcher extends TameableWatcher { @MethodDescription("Is the Cat lying down?") public void setLyingDown(boolean value) { - setData(MetaIndex.CAT_LYING_DOWN, value); - sendData(MetaIndex.CAT_LYING_DOWN); + sendData(MetaIndex.CAT_LYING_DOWN, value); } public boolean isLookingUp() { @@ -75,7 +69,6 @@ public class CatWatcher extends TameableWatcher { @MethodDescription("Is the Cat looking upwards?") public void setLookingUp(boolean value) { - setData(MetaIndex.CAT_LOOKING_UP, value); - sendData(MetaIndex.CAT_LOOKING_UP); + sendData(MetaIndex.CAT_LOOKING_UP, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java index bbf417e5..efb95334 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ChestedHorseWatcher.java @@ -16,7 +16,6 @@ public class ChestedHorseWatcher extends AbstractHorseWatcher { @MethodDescription("Is this Horse wearing a chest?") public void setCarryingChest(boolean carryingChest) { - setData(MetaIndex.HORSE_CHESTED_CARRYING_CHEST, carryingChest); - sendData(MetaIndex.HORSE_CHESTED_CARRYING_CHEST); + sendData(MetaIndex.HORSE_CHESTED_CARRYING_CHEST, carryingChest); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java index 4d45929b..d1e75fa4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CreeperWatcher.java @@ -23,8 +23,7 @@ public class CreeperWatcher extends InsentientWatcher { ((hasValue(MetaIndex.CREEPER_IGNITED) && isIgnited()) || (getDisguise().getEntity() instanceof Creeper && ((Creeper) getDisguise().getEntity()).isPowered())); - setData(MetaIndex.CREEPER_IGNITED, ignited); - sendData(MetaIndex.CREEPER_IGNITED); + sendData(MetaIndex.CREEPER_IGNITED, ignited); if (resend) { DisguiseUtilities.refreshTrackers(getDisguise()); @@ -37,7 +36,6 @@ public class CreeperWatcher extends InsentientWatcher { @MethodDescription("Is this Creeper covered in lightning?") public void setPowered(boolean powered) { - setData(MetaIndex.CREEPER_POWERED, powered); - sendData(MetaIndex.CREEPER_POWERED); + sendData(MetaIndex.CREEPER_POWERED, powered); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DisplayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DisplayWatcher.java index 508201dd..185457c4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DisplayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DisplayWatcher.java @@ -46,8 +46,7 @@ public abstract class DisplayWatcher extends FlagWatcher { // Because BlockDisplayWatcher modifies this on startup.. @RandomDefaultValue public void setTranslation(org.joml.Vector3f translation) { - setData(MetaIndex.DISPLAY_TRANSLATION, new Vector3f(translation.x, translation.y, translation.z)); - sendData(MetaIndex.DISPLAY_TRANSLATION); + sendData(MetaIndex.DISPLAY_TRANSLATION, new Vector3f(translation.x, translation.y, translation.z)); } public org.joml.Vector3f getScale() { @@ -57,8 +56,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setScale(org.joml.Vector3f scale) { - setData(MetaIndex.DISPLAY_SCALE, new Vector3f(scale.x, scale.y, scale.z)); - sendData(MetaIndex.DISPLAY_SCALE); + sendData(MetaIndex.DISPLAY_SCALE, new Vector3f(scale.x, scale.y, scale.z)); } public Quaternionf getLeftRotation() { @@ -68,8 +66,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setLeftRotation(Quaternionf rotation) { - setData(MetaIndex.DISPLAY_LEFT_ROTATION, new Quaternion4f(rotation.x, rotation.y, rotation.z, rotation.w)); - sendData(MetaIndex.DISPLAY_LEFT_ROTATION); + sendData(MetaIndex.DISPLAY_LEFT_ROTATION, new Quaternion4f(rotation.x, rotation.y, rotation.z, rotation.w)); } public Quaternionf getRightRotation() { @@ -79,8 +76,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setRightRotation(Quaternionf rotation) { - setData(MetaIndex.DISPLAY_RIGHT_ROTATION, new Quaternion4f(rotation.x, rotation.y, rotation.z, rotation.w)); - sendData(MetaIndex.DISPLAY_RIGHT_ROTATION); + sendData(MetaIndex.DISPLAY_RIGHT_ROTATION, new Quaternion4f(rotation.x, rotation.y, rotation.z, rotation.w)); } public int getInterpolationDuration() { @@ -88,8 +84,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setInterpolationDuration(int duration) { - setData(MetaIndex.DISPLAY_INTERPOLATION_DURATION, duration); - sendData(MetaIndex.DISPLAY_INTERPOLATION_DURATION); + sendData(MetaIndex.DISPLAY_INTERPOLATION_DURATION, duration); } public float getViewRange() { @@ -97,8 +92,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setViewRange(float range) { - setData(MetaIndex.DISPLAY_VIEW_RANGE, range); - sendData(MetaIndex.DISPLAY_VIEW_RANGE); + sendData(MetaIndex.DISPLAY_VIEW_RANGE, range); } public float getShadowRadius() { @@ -106,8 +100,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setShadowRadius(float radius) { - setData(MetaIndex.DISPLAY_SHADOW_RADIUS, radius); - sendData(MetaIndex.DISPLAY_SHADOW_RADIUS); + sendData(MetaIndex.DISPLAY_SHADOW_RADIUS, radius); } public float getShadowStrength() { @@ -115,8 +108,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setShadowStrength(float strength) { - setData(MetaIndex.DISPLAY_SHADOW_STRENGTH, strength); - sendData(MetaIndex.DISPLAY_SHADOW_STRENGTH); + sendData(MetaIndex.DISPLAY_SHADOW_STRENGTH, strength); } public float getDisplayWidth() { @@ -124,8 +116,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setDisplayWidth(float width) { - setData(MetaIndex.DISPLAY_WIDTH, width); - sendData(MetaIndex.DISPLAY_WIDTH); + sendData(MetaIndex.DISPLAY_WIDTH, width); } public float getDisplayHeight() { @@ -133,8 +124,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setDisplayHeight(float height) { - setData(MetaIndex.DISPLAY_HEIGHT, height); - sendData(MetaIndex.DISPLAY_HEIGHT); + sendData(MetaIndex.DISPLAY_HEIGHT, height); } public int getInterpolationDelay() { @@ -142,8 +132,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setInterpolationDelay(int ticks) { - setData(MetaIndex.DISPLAY_INTERPOLATION_START_DELTA_TICKS, ticks); - sendData(MetaIndex.DISPLAY_INTERPOLATION_START_DELTA_TICKS); + sendData(MetaIndex.DISPLAY_INTERPOLATION_START_DELTA_TICKS, ticks); } public Display.Billboard getBillboard() { @@ -153,8 +142,7 @@ public abstract class DisplayWatcher extends FlagWatcher { // Because TextDisplayWatcher modifies this on startup.. @RandomDefaultValue public void setBillboard(Display.Billboard billboard) { - setData(MetaIndex.DISPLAY_BILLBOARD_RENDER_CONSTRAINTS, (byte) ReflectionManager.enumOrdinal(billboard)); - sendData(MetaIndex.DISPLAY_BILLBOARD_RENDER_CONSTRAINTS); + sendData(MetaIndex.DISPLAY_BILLBOARD_RENDER_CONSTRAINTS, (byte) ReflectionManager.enumOrdinal(billboard)); } public Color getGlowColorOverride() { @@ -163,8 +151,7 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setGlowColorOverride(Color color) { - setData(MetaIndex.DISPLAY_GLOW_COLOR_OVERRIDE, color == null ? -1 : color.asARGB()); - sendData(MetaIndex.DISPLAY_GLOW_COLOR_OVERRIDE); + sendData(MetaIndex.DISPLAY_GLOW_COLOR_OVERRIDE, color == null ? -1 : color.asARGB()); } public Display.Brightness getBrightness() { @@ -181,9 +168,8 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setBrightness(Display.Brightness brightness) { - setData(MetaIndex.DISPLAY_BRIGHTNESS_OVERRIDE, + sendData(MetaIndex.DISPLAY_BRIGHTNESS_OVERRIDE, brightness == null ? -1 : brightness.getBlockLight() << 4 | brightness.getSkyLight() << 20); - sendData(MetaIndex.DISPLAY_BRIGHTNESS_OVERRIDE); } public int getTeleportDuration() { @@ -191,7 +177,6 @@ public abstract class DisplayWatcher extends FlagWatcher { } public void setTeleportDuration(int duration) { - setData(MetaIndex.DISPLAY_POS_ROT_INTERPOLATION_DURATION, Math.max(0, Math.min(59, duration))); - sendData(MetaIndex.DISPLAY_POS_ROT_INTERPOLATION_DURATION); + sendData(MetaIndex.DISPLAY_POS_ROT_INTERPOLATION_DURATION, Math.max(0, Math.min(59, duration))); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java index 2b62835a..fcaace25 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DolphinWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 6/08/2018. - */ public class DolphinWatcher extends InsentientWatcher { public DolphinWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java index 6f861d4c..07e981c1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/DroppedItemWatcher.java @@ -21,8 +21,7 @@ public class DroppedItemWatcher extends FlagWatcher { @MethodDescription("What Item was dropped?") public void setItemStack(ItemStack item) { - setData(MetaIndex.DROPPED_ITEM, item); - sendData(MetaIndex.DROPPED_ITEM); + sendData(MetaIndex.DROPPED_ITEM, item); if (!getDisguise().isCustomDisguiseName()) { getDisguise().setDisguiseName(TranslateType.DISGUISES.get(DisguiseType.DROPPED_ITEM.toReadable()) + " " + diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EggWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EggWatcher.java index 031e01ba..dd44bff1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EggWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EggWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class EggWatcher extends ThrowableWatcher { public EggWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java index dc0aa6af..6a54dc97 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java @@ -21,8 +21,7 @@ public class EnderCrystalWatcher extends FlagWatcher { } public void setBeamTarget(Vector3i position) { - setData(MetaIndex.ENDER_CRYSTAL_BEAM, position == null ? Optional.empty() : Optional.of(position)); - sendData(MetaIndex.ENDER_CRYSTAL_BEAM); + sendData(MetaIndex.ENDER_CRYSTAL_BEAM, position == null ? Optional.empty() : Optional.of(position)); } public boolean isShowBottom() { @@ -31,7 +30,6 @@ public class EnderCrystalWatcher extends FlagWatcher { @MethodDescription("Can you see the Ender Crystal's base plate?") public void setShowBottom(boolean bool) { - setData(MetaIndex.ENDER_CRYSTAL_PLATE, bool); - sendData(MetaIndex.ENDER_CRYSTAL_PLATE); + sendData(MetaIndex.ENDER_CRYSTAL_PLATE, bool); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java index 0cf83f89..6d12a3ae 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderDragonWatcher.java @@ -17,7 +17,6 @@ public class EnderDragonWatcher extends InsentientWatcher { } public void setPhase(int phase) { - setData(MetaIndex.ENDER_DRAGON_PHASE, phase); - sendData(MetaIndex.ENDER_DRAGON_PHASE); + sendData(MetaIndex.ENDER_DRAGON_PHASE, phase); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderPearlWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderPearlWatcher.java index 56a74266..ccf8c810 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderPearlWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderPearlWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class EnderPearlWatcher extends ThrowableWatcher { public EnderPearlWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderSignalWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderSignalWatcher.java index 4618b696..f998251e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderSignalWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderSignalWatcher.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class EnderSignalWatcher extends FlagWatcher { public EnderSignalWatcher(Disguise disguise) { super(disguise); @@ -27,7 +24,6 @@ public class EnderSignalWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setItemStack(ItemStack item) { - setData(MetaIndex.ENDER_SIGNAL_ITEM, item); - sendData(MetaIndex.ENDER_SIGNAL_ITEM); + sendData(MetaIndex.ENDER_SIGNAL_ITEM, item); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java index 6c67e305..7e1a82b9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java @@ -46,8 +46,7 @@ public class EndermanWatcher extends InsentientWatcher { @MethodMappedAs("setItemInMainHand") public void setHeldBlock(WrappedBlockState state) { - setData(MetaIndex.ENDERMAN_ITEM, state); - sendData(MetaIndex.ENDERMAN_ITEM); + sendData(MetaIndex.ENDERMAN_ITEM, state); } @MethodMappedAs("getItemInMainHand") @@ -81,7 +80,6 @@ public class EndermanWatcher extends InsentientWatcher { } public void setAggressive(boolean isAggressive) { - setData(MetaIndex.ENDERMAN_AGRESSIVE, isAggressive); - sendData(MetaIndex.ENDERMAN_AGRESSIVE); + sendData(MetaIndex.ENDERMAN_AGRESSIVE, isAggressive); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireballWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireballWatcher.java index 7e11371c..56bb1f00 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireballWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireballWatcher.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class FireballWatcher extends FlagWatcher { public FireballWatcher(Disguise disguise) { super(disguise); @@ -27,7 +24,6 @@ public class FireballWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setItemStack(ItemStack item) { - setData(MetaIndex.FIREBALL_ITEM, item); - sendData(MetaIndex.FIREBALL_ITEM); + sendData(MetaIndex.FIREBALL_ITEM, item); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java index 574eafdc..0f7c2217 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java @@ -31,8 +31,7 @@ public class FireworkWatcher extends FlagWatcher { newItem = newItem.clone(); newItem.setAmount(1); - setData(MetaIndex.FIREWORK_ITEM, newItem); - sendData(MetaIndex.FIREWORK_ITEM); + sendData(MetaIndex.FIREWORK_ITEM, newItem); } @NmsAddedIn(NmsVersion.v1_14) @@ -42,8 +41,7 @@ public class FireworkWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setShotAtAngle(boolean shotAtAngle) { - setData(MetaIndex.FIREWORK_SHOT_AT_ANGLE, shotAtAngle); - sendData(MetaIndex.FIREWORK_SHOT_AT_ANGLE); + sendData(MetaIndex.FIREWORK_SHOT_AT_ANGLE, shotAtAngle); } @NmsAddedIn(NmsVersion.v1_14) @@ -62,11 +60,9 @@ public class FireworkWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setAttachedEntity(Optional entityId) { if (NmsVersion.v1_14.isSupported()) { - setData(MetaIndex.FIREWORK_ATTACHED_ENTITY, entityId); - sendData(MetaIndex.FIREWORK_ATTACHED_ENTITY); + sendData(MetaIndex.FIREWORK_ATTACHED_ENTITY, entityId); } else { - setData(MetaIndex.FIREWORK_ATTACHED_ENTITY_OLD, entityId.orElse(0)); - sendData(MetaIndex.FIREWORK_ATTACHED_ENTITY_OLD); + sendData(MetaIndex.FIREWORK_ATTACHED_ENTITY_OLD, entityId.orElse(0)); } } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java index 86225776..9757bc43 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 6/08/2018. - */ public class FishWatcher extends InsentientWatcher { public FishWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java index 0ccd5534..2a531419 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FishingHookWatcher.java @@ -20,8 +20,7 @@ public class FishingHookWatcher extends FlagWatcher { } public void setHookedId(int hookedId) { - setData(MetaIndex.FISHING_HOOK_HOOKED_ID, hookedId + 1); - sendData(MetaIndex.FISHING_HOOK_HOOKED_ID); + sendData(MetaIndex.FISHING_HOOK_HOOKED_ID, hookedId + 1); } public boolean isHooked() { @@ -29,7 +28,6 @@ public class FishingHookWatcher extends FlagWatcher { } public void setHooked(boolean hooked) { - setData(MetaIndex.FISHING_HOOK_HOOKED, hooked); - sendData(MetaIndex.FISHING_HOOK_HOOKED); + sendData(MetaIndex.FISHING_HOOK_HOOKED, hooked); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FoxWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FoxWatcher.java index 3b407556..f7378b8c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FoxWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FoxWatcher.java @@ -9,9 +9,6 @@ import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.entity.Fox; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class FoxWatcher extends AgeableWatcher { public FoxWatcher(Disguise disguise) { @@ -52,8 +49,7 @@ public class FoxWatcher extends AgeableWatcher { @RandomDefaultValue public void setType(Fox.Type type) { - setData(MetaIndex.FOX_TYPE, type); - sendData(MetaIndex.FOX_TYPE); + sendData(MetaIndex.FOX_TYPE, type); } public boolean isHeadTilted() { @@ -101,7 +97,6 @@ public class FoxWatcher extends AgeableWatcher { b1 = (byte) (b1 & ~no); } - setData(MetaIndex.FOX_META, b1); - sendData(MetaIndex.FOX_META); + sendData(MetaIndex.FOX_META, b1); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FrogWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FrogWatcher.java index 615ab52b..2d66c422 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FrogWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FrogWatcher.java @@ -22,7 +22,6 @@ public class FrogWatcher extends AgeableWatcher { @RandomDefaultValue public void setVariant(Frog.Variant variant) { - setData(MetaIndex.FROG_VARIANT, variant); - sendData(MetaIndex.FROG_VARIANT); + sendData(MetaIndex.FROG_VARIANT, variant); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java index e648336c..106fd02c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GhastWatcher.java @@ -14,7 +14,6 @@ public class GhastWatcher extends InsentientWatcher { } public void setAggressive(boolean isAggressive) { - setData(MetaIndex.GHAST_AGRESSIVE, isAggressive); - sendData(MetaIndex.GHAST_AGRESSIVE); + sendData(MetaIndex.GHAST_AGRESSIVE, isAggressive); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GlowSquidWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GlowSquidWatcher.java index e51a6063..e3130ebd 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GlowSquidWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GlowSquidWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 15/06/2021. - */ public class GlowSquidWatcher extends SquidWatcher { public GlowSquidWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class GlowSquidWatcher extends SquidWatcher { } public void setDarkTicksRemaining(int ticks) { - setData(MetaIndex.GLOW_SQUID_DARK_TICKS_REMAINING, ticks); - sendData(MetaIndex.GLOW_SQUID_DARK_TICKS_REMAINING); + sendData(MetaIndex.GLOW_SQUID_DARK_TICKS_REMAINING, ticks); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GoatWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GoatWatcher.java index 535afbc7..fdfbab3f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GoatWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GoatWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 15/06/2021. - */ public class GoatWatcher extends AgeableWatcher { public GoatWatcher(Disguise disguise) { super(disguise); @@ -18,8 +15,7 @@ public class GoatWatcher extends AgeableWatcher { } public void setScreaming(boolean screaming) { - setData(MetaIndex.GOAT_SCREAMING, screaming); - sendData(MetaIndex.GOAT_SCREAMING); + sendData(MetaIndex.GOAT_SCREAMING, screaming); } public boolean hasLeftHorn() { @@ -28,8 +24,7 @@ public class GoatWatcher extends AgeableWatcher { @NmsAddedIn(NmsVersion.v1_19_R1) public void setHasLeftHorn(boolean hasHorn) { - setData(MetaIndex.GOAT_HAS_LEFT_HORN, hasHorn); - sendData(MetaIndex.GOAT_HAS_LEFT_HORN); + sendData(MetaIndex.GOAT_HAS_LEFT_HORN, hasHorn); } public boolean hasRightHorn() { @@ -38,7 +33,6 @@ public class GoatWatcher extends AgeableWatcher { @NmsAddedIn(NmsVersion.v1_19_R1) public void setHasRightHorn(boolean hasHorn) { - setData(MetaIndex.GOAT_HAS_RIGHT_HORN, hasHorn); - sendData(MetaIndex.GOAT_HAS_RIGHT_HORN); + sendData(MetaIndex.GOAT_HAS_RIGHT_HORN, hasHorn); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java index 2596f879..cd49ec1e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/GuardianWatcher.java @@ -33,8 +33,7 @@ public class GuardianWatcher extends InsentientWatcher { * @param entityId */ public void setTarget(int entityId) { - setData(MetaIndex.GUARDIAN_TARGET, entityId); - sendData(MetaIndex.GUARDIAN_TARGET); + sendData(MetaIndex.GUARDIAN_TARGET, entityId); } public void setTarget(Entity entity) { @@ -53,8 +52,7 @@ public class GuardianWatcher extends InsentientWatcher { return; } - setData(MetaIndex.GUARDIAN_TARGET, player.getEntityId()); - sendData(MetaIndex.GUARDIAN_TARGET); + sendData(MetaIndex.GUARDIAN_TARGET, player.getEntityId()); } public boolean isRetractingSpikes() { @@ -62,7 +60,6 @@ public class GuardianWatcher extends InsentientWatcher { } public void setRetractingSpikes(boolean isRetracting) { - setData(MetaIndex.GUARDIAN_RETRACT_SPIKES, isRetracting); - sendData(MetaIndex.GUARDIAN_RETRACT_SPIKES); + sendData(MetaIndex.GUARDIAN_RETRACT_SPIKES, isRetracting); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HoglinWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HoglinWatcher.java index 8985af8e..09fdb3ab 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HoglinWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HoglinWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 25/06/2020. - */ public class HoglinWatcher extends AgeableWatcher { public HoglinWatcher(Disguise disguise) { super(disguise); @@ -18,7 +15,6 @@ public class HoglinWatcher extends AgeableWatcher { } public void setShaking(boolean shaking) { - setData(MetaIndex.HOGLIN_SHAKING, !shaking); - sendData(MetaIndex.HOGLIN_SHAKING); + sendData(MetaIndex.HOGLIN_SHAKING, !shaking); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java index a573d505..9edc356b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/HorseWatcher.java @@ -28,8 +28,7 @@ public class HorseWatcher extends AbstractHorseWatcher { @RandomDefaultValue public void setColor(Color color) { - setData(MetaIndex.HORSE_COLOR_STYLE, color.ordinal() & 0xFF | getStyle().ordinal() << 8); - sendData(MetaIndex.HORSE_COLOR_STYLE); + sendData(MetaIndex.HORSE_COLOR_STYLE, color.ordinal() & 0xFF | getStyle().ordinal() << 8); } public Style getStyle() { @@ -38,8 +37,7 @@ public class HorseWatcher extends AbstractHorseWatcher { @RandomDefaultValue public void setStyle(Style style) { - setData(MetaIndex.HORSE_COLOR_STYLE, getColor().ordinal() & 0xFF | style.ordinal() << 8); - sendData(MetaIndex.HORSE_COLOR_STYLE); + sendData(MetaIndex.HORSE_COLOR_STYLE, getColor().ordinal() & 0xFF | style.ordinal() << 8); } public ItemStack getHorseArmor() { @@ -75,8 +73,6 @@ public class HorseWatcher extends AbstractHorseWatcher { } } - setData(MetaIndex.HORSE_ARMOR, value); - sendData(MetaIndex.HORSE_ARMOR); - + sendData(MetaIndex.HORSE_ARMOR, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java index aff1a33f..7956c24e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 9/06/2017. - */ public class IllagerWatcher extends RaiderWatcher { public IllagerWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java index da3ed041..a5ad41b9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/IllagerWizardWatcher.java @@ -19,8 +19,7 @@ public class IllagerWizardWatcher extends IllagerWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setSpell(Spellcaster.Spell spell) { - setData(MetaIndex.ILLAGER_SPELL, (byte) spell.ordinal()); - sendData(MetaIndex.ILLAGER_SPELL); + sendData(MetaIndex.ILLAGER_SPELL, (byte) spell.ordinal()); } @Deprecated @@ -32,7 +31,6 @@ public class IllagerWizardWatcher extends IllagerWatcher { @Deprecated @NmsRemovedIn(NmsVersion.v1_14) public void setSpellTicks(int spellTicks) { - setData(MetaIndex.ILLAGER_SPELL_TICKS, (byte) spellTicks); - sendData(MetaIndex.ILLAGER_SPELL_TICKS); + sendData(MetaIndex.ILLAGER_SPELL_TICKS, (byte) spellTicks); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java index f9df337e..d0085f70 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InsentientWatcher.java @@ -31,12 +31,12 @@ public class InsentientWatcher extends LivingWatcher { byte b0 = getData(MetaIndex.INSENTIENT_META); if (flag) { - setData(MetaIndex.INSENTIENT_META, (byte) (b0 | i)); + b0 = (byte) (b0 | i); } else { - setData(MetaIndex.INSENTIENT_META, (byte) (b0 & -(i + 1))); + b0 = (byte) (b0 & -(i + 1)); } - sendData(MetaIndex.INSENTIENT_META); + sendData(MetaIndex.INSENTIENT_META, b0); } private boolean getInsentientFlag(int i) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InteractionWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InteractionWatcher.java index 59b54894..bc443d0a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InteractionWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/InteractionWatcher.java @@ -14,8 +14,7 @@ public class InteractionWatcher extends FlagWatcher { } public void setInteractionWidth(float width) { - setData(MetaIndex.INTERACTION_WIDTH, width); - sendData(MetaIndex.INTERACTION_WIDTH); + sendData(MetaIndex.INTERACTION_WIDTH, width); } public float getInteractionHeight() { @@ -23,8 +22,7 @@ public class InteractionWatcher extends FlagWatcher { } public void setInteractionHeight(float height) { - setData(MetaIndex.INTERACTION_HEIGHT, height); - sendData(MetaIndex.INTERACTION_HEIGHT); + sendData(MetaIndex.INTERACTION_HEIGHT, height); } public boolean isResponsive() { @@ -32,7 +30,6 @@ public class InteractionWatcher extends FlagWatcher { } public void setResponsive(boolean responsive) { - setData(MetaIndex.INTERACTION_RESPONSIVE, responsive); - sendData(MetaIndex.INTERACTION_RESPONSIVE); + sendData(MetaIndex.INTERACTION_RESPONSIVE, responsive); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemDisplayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemDisplayWatcher.java index 3490cd41..e0a4417c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemDisplayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemDisplayWatcher.java @@ -23,8 +23,7 @@ public class ItemDisplayWatcher extends DisplayWatcher { item = new ItemStack(Material.AIR); } - setData(MetaIndex.ITEM_DISPLAY_ITEMSTACK, item); - sendData(MetaIndex.ITEM_DISPLAY_ITEMSTACK); + sendData(MetaIndex.ITEM_DISPLAY_ITEMSTACK, item); } public ItemDisplay.ItemDisplayTransform getItemDisplayTransform() { @@ -32,7 +31,6 @@ public class ItemDisplayWatcher extends DisplayWatcher { } public void setItemDisplayTransform(ItemDisplay.ItemDisplayTransform display) { - setData(MetaIndex.ITEM_DISPLAY_TRANSFORM, display); - sendData(MetaIndex.ITEM_DISPLAY_TRANSFORM); + sendData(MetaIndex.ITEM_DISPLAY_TRANSFORM, display); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java index c479ab45..0cf149a8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ItemFrameWatcher.java @@ -27,8 +27,7 @@ public class ItemFrameWatcher extends FlagWatcher { newItem = newItem.clone(); newItem.setAmount(1); - setData(MetaIndex.ITEMFRAME_ITEM, newItem); - sendData(MetaIndex.ITEMFRAME_ITEM); + sendData(MetaIndex.ITEMFRAME_ITEM, newItem); } public int getRotation() { @@ -36,7 +35,6 @@ public class ItemFrameWatcher extends FlagWatcher { } public void setRotation(int rotation) { - setData(MetaIndex.ITEMFRAME_ROTATION, rotation % 4); - sendData(MetaIndex.ITEMFRAME_ROTATION); + sendData(MetaIndex.ITEMFRAME_ROTATION, rotation % 4); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java index 0fa6dc3a..90c15a49 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java @@ -126,8 +126,7 @@ public class LivingWatcher extends FlagWatcher { optional = Optional.empty(); } - setData(MetaIndex.LIVING_BED_POSITION, optional); - sendData(MetaIndex.LIVING_BED_POSITION); + sendData(MetaIndex.LIVING_BED_POSITION, optional); } public float getHealth() { @@ -135,8 +134,7 @@ public class LivingWatcher extends FlagWatcher { } public void setHealth(float health) { - setData(MetaIndex.LIVING_HEALTH, health); - sendData(MetaIndex.LIVING_HEALTH); + sendData(MetaIndex.LIVING_HEALTH, health); } /*@NmsAddedIn(val = NmsVersion.v1_13) @@ -158,12 +156,12 @@ public class LivingWatcher extends FlagWatcher { modifiedLivingAnimations[byteValue] = true; if (flag) { - setData(MetaIndex.LIVING_META, (byte) (b0 | 1 << byteValue)); + b0 = (byte) (b0 | 1 << byteValue); } else { - setData(MetaIndex.LIVING_META, (byte) (b0 & ~(1 << byteValue))); + b0 = (byte) (b0 & ~(1 << byteValue)); } - sendData(MetaIndex.LIVING_META); + sendData(MetaIndex.LIVING_META, b0); } private boolean isMainHandUsed() { @@ -244,8 +242,7 @@ public class LivingWatcher extends FlagWatcher { } public void setPotionParticlesAmbient(boolean particles) { - setData(MetaIndex.LIVING_POTION_AMBIENT, particles); - sendData(MetaIndex.LIVING_POTION_AMBIENT); + sendData(MetaIndex.LIVING_POTION_AMBIENT, particles); } public Color getParticlesColor() { @@ -256,8 +253,7 @@ public class LivingWatcher extends FlagWatcher { public void setParticlesColor(Color color) { potionEffects.clear(); - setData(MetaIndex.LIVING_POTIONS, color.asRGB()); - sendData(MetaIndex.LIVING_POTIONS); + sendData(MetaIndex.LIVING_POTIONS, color.asRGB()); } private int getPotions() { @@ -329,8 +325,7 @@ public class LivingWatcher extends FlagWatcher { } private void sendPotionEffects() { - setData(MetaIndex.LIVING_POTIONS, getPotions()); - sendData(MetaIndex.LIVING_POTIONS); + sendData(MetaIndex.LIVING_POTIONS, getPotions()); } public int getArrowsSticking() { @@ -339,8 +334,7 @@ public class LivingWatcher extends FlagWatcher { @MethodOnlyUsedBy(value = {DisguiseType.PLAYER}) public void setArrowsSticking(int arrowsNo) { - setData(MetaIndex.LIVING_ARROWS, Math.max(0, Math.min(127, arrowsNo))); - sendData(MetaIndex.LIVING_ARROWS); + sendData(MetaIndex.LIVING_ARROWS, Math.max(0, Math.min(127, arrowsNo))); } @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java index 31608f49..ba27602c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LlamaWatcher.java @@ -17,8 +17,7 @@ public class LlamaWatcher extends ChestedHorseWatcher { } public void setColor(Llama.Color color) { - setData(MetaIndex.LLAMA_COLOR, color); - sendData(MetaIndex.LLAMA_COLOR); + sendData(MetaIndex.LLAMA_COLOR, color); } public DyeColor getCarpet() { @@ -30,8 +29,7 @@ public class LlamaWatcher extends ChestedHorseWatcher { } public void setCarpet(DyeColor dyeColor) { - setData(MetaIndex.LLAMA_CARPET, dyeColor == null ? -1 : (int) dyeColor.getWoolData()); - sendData(MetaIndex.LLAMA_CARPET); + sendData(MetaIndex.LLAMA_CARPET, dyeColor == null ? -1 : (int) dyeColor.getWoolData()); } @Deprecated @@ -44,7 +42,6 @@ public class LlamaWatcher extends ChestedHorseWatcher { } public void setStrength(int strength) { - setData(MetaIndex.LLAMA_STRENGTH, strength); - sendData(MetaIndex.LLAMA_STRENGTH); + sendData(MetaIndex.LLAMA_STRENGTH, strength); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java index 906c9b04..688fa3b5 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartCommandWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 6/08/2018. - */ public class MinecartCommandWatcher extends MinecartWatcher { public MinecartCommandWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java index ff05effb..d7af50ec 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartFurnaceWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/08/2018. - */ public class MinecartFurnaceWatcher extends MinecartWatcher { public MinecartFurnaceWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class MinecartFurnaceWatcher extends MinecartWatcher { } public void setFueled(boolean fueled) { - setData(MetaIndex.MINECART_FURANCE_FUELED, fueled); - sendData(MetaIndex.MINECART_FURANCE_FUELED); + sendData(MetaIndex.MINECART_FURANCE_FUELED, fueled); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java index 7a0e5acf..79ffa41f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MinecartWatcher.java @@ -71,8 +71,7 @@ public class MinecartWatcher extends FlagWatcher { } public void setBlockOffset(int i) { - setData(MetaIndex.MINECART_BLOCK_Y, i); - sendData(MetaIndex.MINECART_BLOCK_Y); + sendData(MetaIndex.MINECART_BLOCK_Y, i); } public boolean isViewBlockInCart() { @@ -80,7 +79,6 @@ public class MinecartWatcher extends FlagWatcher { } public void setViewBlockInCart(boolean viewBlock) { - setData(MetaIndex.MINECART_BLOCK_VISIBLE, viewBlock); - sendData(MetaIndex.MINECART_BLOCK_VISIBLE); + sendData(MetaIndex.MINECART_BLOCK_VISIBLE, viewBlock); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ModdedWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ModdedWatcher.java index 77654052..e55bc556 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ModdedWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ModdedWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.FlagWatcher; -/** - * Created by libraryaddict on 13/04/2020. - */ public class ModdedWatcher extends FlagWatcher { public ModdedWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MushroomCowWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MushroomCowWatcher.java index aa83791c..4e0ed6d7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MushroomCowWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MushroomCowWatcher.java @@ -9,9 +9,6 @@ import org.bukkit.entity.MushroomCow; import java.util.Locale; -/** - * Created by libraryaddict on 6/05/2019. - */ public class MushroomCowWatcher extends AgeableWatcher { public MushroomCowWatcher(Disguise disguise) { super(disguise); @@ -24,7 +21,6 @@ public class MushroomCowWatcher extends AgeableWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setVariant(MushroomCow.Variant variant) { - setData(MetaIndex.MUSHROOM_COW_TYPE, ReflectionManager.enumName(variant).toLowerCase(Locale.ENGLISH)); - sendData(MetaIndex.MUSHROOM_COW_TYPE); + sendData(MetaIndex.MUSHROOM_COW_TYPE, ReflectionManager.enumName(variant).toLowerCase(Locale.ENGLISH)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java index c1f1236b..44b33064 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java @@ -23,8 +23,7 @@ public class OcelotWatcher extends AgeableWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setTrusting(boolean trusting) { - setData(MetaIndex.OCELOT_TRUST, trusting); - sendData(MetaIndex.OCELOT_TRUST); + sendData(MetaIndex.OCELOT_TRUST, trusting); } @NmsRemovedIn(NmsVersion.v1_14) @@ -36,8 +35,7 @@ public class OcelotWatcher extends AgeableWatcher { @NmsRemovedIn(NmsVersion.v1_14) @Deprecated public void setType(Ocelot.Type newType) { - setData(MetaIndex.OCELOT_TYPE, newType); - sendData(MetaIndex.OCELOT_TYPE); + sendData(MetaIndex.OCELOT_TYPE, newType); } @NmsRemovedIn(NmsVersion.v1_14) @@ -47,8 +45,7 @@ public class OcelotWatcher extends AgeableWatcher { @NmsRemovedIn(NmsVersion.v1_14) public void setOwner(UUID owner) { - setData(MetaIndex.TAMEABLE_OWNER, Optional.of(owner)); - sendData(MetaIndex.TAMEABLE_OWNER); + sendData(MetaIndex.TAMEABLE_OWNER, Optional.of(owner)); } @NmsRemovedIn(NmsVersion.v1_14) @@ -81,11 +78,11 @@ public class OcelotWatcher extends AgeableWatcher { byte value = getData(MetaIndex.TAMEABLE_META); if (flag) { - setData(MetaIndex.TAMEABLE_META, (byte) (value | no)); + value = (byte) (value | no); } else { - setData(MetaIndex.TAMEABLE_META, (byte) (value & -(no + 1))); + value = (byte) (value & -(no + 1)); } - sendData(MetaIndex.TAMEABLE_META); + sendData(MetaIndex.TAMEABLE_META, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OminousItemSpawnerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OminousItemSpawnerWatcher.java index 0b6bc7bd..94be232d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OminousItemSpawnerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OminousItemSpawnerWatcher.java @@ -24,8 +24,7 @@ public class OminousItemSpawnerWatcher extends FlagWatcher { @MethodDescription("What item is displayed?") public void setItemStack(ItemStack item) { - setData(MetaIndex.OMINOUS_ITEM_SPAWNER_ITEM, item); - sendData(MetaIndex.OMINOUS_ITEM_SPAWNER_ITEM); + sendData(MetaIndex.OMINOUS_ITEM_SPAWNER_ITEM, item); if (!getDisguise().isCustomDisguiseName()) { getDisguise().setDisguiseName(TranslateType.DISGUISES.get(DisguiseType.OMINOUS_ITEM_SPAWNER.toReadable()) + " " + diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java index 4ac0ef5e..337b37fe 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PaintingWatcher.java @@ -32,8 +32,7 @@ public class PaintingWatcher extends FlagWatcher { public void setArt(Art newPainting) { if (NmsVersion.v1_19_R1.isSupported()) { - setData(MetaIndex.PAINTING, newPainting); - sendData(MetaIndex.PAINTING); + sendData(MetaIndex.PAINTING, newPainting); } else { this.painting = newPainting; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java index 91b2b787..2a9a4d79 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java @@ -10,18 +10,14 @@ import me.libraryaddict.disguise.utilities.reflection.annotations.MethodOnlyUsed import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.entity.Panda; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class PandaWatcher extends AgeableWatcher { public PandaWatcher(Disguise disguise) { super(disguise); if (DisguiseConfig.isRandomDisguises()) { - // We don't do 'setGene' here so it's just as random as it would be as if it was natural. - setMainGene(ReflectionManager.randomEnum(Panda.Gene.class)); - setHiddenGene(ReflectionManager.randomEnum(Panda.Gene.class)); + // We don't do 'setGene' to only change the visible gene, so it's just as random as it would be as if it was natural. + setGenes(ReflectionManager.randomEnum(Panda.Gene.class), ReflectionManager.randomEnum(Panda.Gene.class)); } } @@ -35,14 +31,20 @@ public class PandaWatcher extends AgeableWatcher { setHiddenGene(gene); } + public void setGenes(Panda.Gene mainGene, Panda.Gene hiddenGene) { + setData(MetaIndex.PANDA_MAIN_GENE, mainGene); + setData(MetaIndex.PANDA_HIDDEN_GENE, hiddenGene); + + sendData(MetaIndex.PANDA_MAIN_GENE, MetaIndex.PANDA_HIDDEN_GENE); + } + public Panda.Gene getMainGene() { return getData(MetaIndex.PANDA_MAIN_GENE); } @MethodOnlyUsedBy(value = {}) // Hide from command public void setMainGene(Panda.Gene gene) { - setData(MetaIndex.PANDA_MAIN_GENE, gene); - sendData(MetaIndex.PANDA_MAIN_GENE); + sendData(MetaIndex.PANDA_MAIN_GENE, gene); } public Panda.Gene getHiddenGene() { @@ -51,8 +53,7 @@ public class PandaWatcher extends AgeableWatcher { @MethodOnlyUsedBy(value = {}) // Hide from command public void setHiddenGene(Panda.Gene gene) { - setData(MetaIndex.PANDA_HIDDEN_GENE, gene); - sendData(MetaIndex.PANDA_HIDDEN_GENE); + sendData(MetaIndex.PANDA_HIDDEN_GENE, gene); } public boolean isSneeze() { @@ -92,8 +93,7 @@ public class PandaWatcher extends AgeableWatcher { } public void setHeadShaking(int timeInTicks) { - setData(MetaIndex.PANDA_HEAD_SHAKING, timeInTicks); - sendData(MetaIndex.PANDA_HEAD_SHAKING); + sendData(MetaIndex.PANDA_HEAD_SHAKING, timeInTicks); } @Deprecated @@ -114,7 +114,6 @@ public class PandaWatcher extends AgeableWatcher { b1 = (byte) (b1 & ~no); } - setData(MetaIndex.PANDA_META, b1); - sendData(MetaIndex.PANDA_META); + sendData(MetaIndex.PANDA_META, b1); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java index d6ddefd6..a94e81c7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ParrotWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; import org.bukkit.entity.Parrot; -/** - * Created by libraryaddict on 9/06/2017. - */ public class ParrotWatcher extends TameableWatcher { public ParrotWatcher(Disguise disguise) { super(disguise); @@ -17,7 +14,6 @@ public class ParrotWatcher extends TameableWatcher { } public void setVariant(Parrot.Variant variant) { - setData(MetaIndex.PARROT_VARIANT, variant); - sendData(MetaIndex.PARROT_VARIANT); + sendData(MetaIndex.PARROT_VARIANT, variant); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java index a6fab524..046b2c73 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PhantomWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/08/2018. - */ public class PhantomWatcher extends InsentientWatcher { public PhantomWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class PhantomWatcher extends InsentientWatcher { } public void setSize(int size) { - setData(MetaIndex.PHANTOM_SIZE, Math.min(Math.max(size, -50), 50)); - sendData(MetaIndex.PHANTOM_SIZE); + sendData(MetaIndex.PHANTOM_SIZE, Math.min(Math.max(size, -50), 50)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java index 4c150a61..1b0b1cfb 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PigWatcher.java @@ -14,7 +14,6 @@ public class PigWatcher extends AgeableWatcher { } public void setSaddled(boolean isSaddled) { - setData(MetaIndex.PIG_SADDLED, isSaddled); - sendData(MetaIndex.PIG_SADDLED); + sendData(MetaIndex.PIG_SADDLED, isSaddled); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinAbstractWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinAbstractWatcher.java index aab05983..392fd095 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinAbstractWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinAbstractWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 25/06/2020. - */ public abstract class PiglinAbstractWatcher extends InsentientWatcher { public PiglinAbstractWatcher(Disguise disguise) { super(disguise); @@ -18,7 +15,6 @@ public abstract class PiglinAbstractWatcher extends InsentientWatcher { } public void setShaking(boolean shaking) { - setData(MetaIndex.PIGLIN_ABSTRACT_SHAKING, !shaking); - sendData(MetaIndex.PIGLIN_ABSTRACT_SHAKING); + sendData(MetaIndex.PIGLIN_ABSTRACT_SHAKING, !shaking); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinBruteWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinBruteWatcher.java index 1dfe62a9..6dc8ccde 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinBruteWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinBruteWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 18/08/2020. - */ public class PiglinBruteWatcher extends PiglinAbstractWatcher { public PiglinBruteWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinWatcher.java index 94536652..eced9aac 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PiglinWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 25/06/2020. - */ public class PiglinWatcher extends PiglinAbstractWatcher { public PiglinWatcher(Disguise disguise) { super(disguise); @@ -16,8 +13,7 @@ public class PiglinWatcher extends PiglinAbstractWatcher { } public void setDancing(boolean dancing) { - setData(MetaIndex.PIGLIN_DANCING, dancing); - sendData(MetaIndex.PIGLIN_DANCING); + sendData(MetaIndex.PIGLIN_DANCING, dancing); } public boolean isUsingCrossbow() { @@ -25,8 +21,7 @@ public class PiglinWatcher extends PiglinAbstractWatcher { } public void setUsingCrossbow(boolean crossbow) { - setData(MetaIndex.PIGLIN_CROSSBOW, crossbow); - sendData(MetaIndex.PIGLIN_CROSSBOW); + sendData(MetaIndex.PIGLIN_CROSSBOW, crossbow); } public boolean isBaby() { @@ -34,7 +29,6 @@ public class PiglinWatcher extends PiglinAbstractWatcher { } public void setBaby(boolean baby) { - setData(MetaIndex.PIGLIN_BABY, baby); - sendData(MetaIndex.PIGLIN_BABY); + sendData(MetaIndex.PIGLIN_BABY, baby); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PillagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PillagerWatcher.java index 384a7b19..fdd237f4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PillagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PillagerWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class PillagerWatcher extends IllagerWatcher { public PillagerWatcher(Disguise disguise) { @@ -19,7 +16,6 @@ public class PillagerWatcher extends IllagerWatcher { } public void setAimingBow(boolean value) { - setData(MetaIndex.PILLAGER_AIMING_BOW, value); - sendData(MetaIndex.PILLAGER_AIMING_BOW); + sendData(MetaIndex.PILLAGER_AIMING_BOW, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java index e2c53d4d..23e816f8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PlayerWatcher.java @@ -73,8 +73,7 @@ public class PlayerWatcher extends LivingWatcher { } public void setMainHand(MainHand mainHand) { - setData(MetaIndex.PLAYER_HAND, (byte) mainHand.ordinal()); - sendData(MetaIndex.PLAYER_HAND); + sendData(MetaIndex.PLAYER_HAND, (byte) mainHand.ordinal()); } // Bit 0 (0x01): Cape enabled @@ -239,6 +238,7 @@ public class PlayerWatcher extends LivingWatcher { return Parrot.Variant.RED; } + // We don't convert this to enum compatibility because nms uses enum ordinal and we'd break anyways return Parrot.Variant.values()[number.getAsInt()]; } @@ -250,7 +250,6 @@ public class PlayerWatcher extends LivingWatcher { nbt.setTag("Variant", new NBTInt(variant.ordinal())); } - setData(meta, nbt); - sendData(meta); + sendData(meta, nbt); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java index 88a68c58..012ffd05 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PolarBearWatcher.java @@ -13,7 +13,6 @@ public class PolarBearWatcher extends AgeableWatcher { } public void setStanding(boolean standing) { - setData(MetaIndex.POLAR_BEAR_STANDING, standing); - sendData(MetaIndex.POLAR_BEAR_STANDING); + sendData(MetaIndex.POLAR_BEAR_STANDING, standing); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java index e3d2425e..cd9da0b6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PufferFishWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/08/2018. - */ public class PufferFishWatcher extends FishWatcher { public PufferFishWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class PufferFishWatcher extends FishWatcher { } public void setPuffState(int puffState) { - setData(MetaIndex.PUFFERFISH_PUFF_STATE, Math.min(Math.max(puffState, 0), 2)); - sendData(MetaIndex.PUFFERFISH_PUFF_STATE); + sendData(MetaIndex.PUFFERFISH_PUFF_STATE, Math.min(Math.max(puffState, 0), 2)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java index 15c061c2..aac3c6bc 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RabbitWatcher.java @@ -23,7 +23,6 @@ public class RabbitWatcher extends AgeableWatcher { @RandomDefaultValue public void setType(Rabbit.Type type) { - setData(MetaIndex.RABBIT_TYPE, type); - sendData(MetaIndex.RABBIT_TYPE); + sendData(MetaIndex.RABBIT_TYPE, type); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RaiderWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RaiderWatcher.java index c58c5dd0..afc2de78 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RaiderWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RaiderWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/05/2019. - */ public class RaiderWatcher extends InsentientWatcher { public RaiderWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class RaiderWatcher extends InsentientWatcher { } public void setCastingSpell(boolean value) { - setData(MetaIndex.RAIDER_CASTING_SPELL, value); - sendData(MetaIndex.RAIDER_CASTING_SPELL); + sendData(MetaIndex.RAIDER_CASTING_SPELL, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RavagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RavagerWatcher.java index e267b2be..342407be 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RavagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/RavagerWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class RavagerWatcher extends RaiderWatcher { public RavagerWatcher(Disguise disguise) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java index 3de0e361..d006b4c6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SheepWatcher.java @@ -28,8 +28,7 @@ public class SheepWatcher extends AgeableWatcher { public void setColor(DyeColor color) { byte b0 = getData(MetaIndex.SHEEP_WOOL); - setData(MetaIndex.SHEEP_WOOL, (byte) (b0 & 240 | color.getWoolData() & 15)); - sendData(MetaIndex.SHEEP_WOOL); + sendData(MetaIndex.SHEEP_WOOL, (byte) (b0 & 240 | color.getWoolData() & 15)); } public boolean isRainbowWool() { @@ -66,11 +65,11 @@ public class SheepWatcher extends AgeableWatcher { byte b0 = getData(MetaIndex.SHEEP_WOOL); if (flag) { - setData(MetaIndex.SHEEP_WOOL, (byte) (b0 | 16)); + b0 = (byte) (b0 | 16); } else { - setData(MetaIndex.SHEEP_WOOL, (byte) (b0 & -17)); + b0 = (byte) (b0 & -17); } - sendData(MetaIndex.SHEEP_WOOL); + sendData(MetaIndex.SHEEP_WOOL, b0); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java index dd8b2a52..6781222a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java @@ -23,8 +23,7 @@ public class ShulkerWatcher extends InsentientWatcher { } public void setFacingDirection(BlockFace face) { - setData(MetaIndex.SHULKER_FACING, com.github.retrooper.packetevents.protocol.world.BlockFace.valueOf(face.name())); - sendData(MetaIndex.SHULKER_FACING); + sendData(MetaIndex.SHULKER_FACING, com.github.retrooper.packetevents.protocol.world.BlockFace.valueOf(face.name())); } public Vector3i getAttachmentPosition() { @@ -32,8 +31,7 @@ public class ShulkerWatcher extends InsentientWatcher { } public void setAttachmentPosition(Vector3i pos) { - setData(MetaIndex.SHULKER_ATTACHED, Optional.ofNullable(pos)); - sendData(MetaIndex.SHULKER_ATTACHED); + sendData(MetaIndex.SHULKER_ATTACHED, Optional.ofNullable(pos)); } public int getShieldHeight() { @@ -49,8 +47,7 @@ public class ShulkerWatcher extends InsentientWatcher { newHeight = 127; } - setData(MetaIndex.SHULKER_PEEKING, (byte) newHeight); - sendData(MetaIndex.SHULKER_PEEKING); + sendData(MetaIndex.SHULKER_PEEKING, (byte) newHeight); } public DyeColor getColor() { @@ -71,7 +68,6 @@ public class ShulkerWatcher extends InsentientWatcher { return; } - setData(MetaIndex.SHULKER_COLOR, newColor == null ? (byte) 16 : newColor.getWoolData()); - sendData(MetaIndex.SHULKER_COLOR); + sendData(MetaIndex.SHULKER_COLOR, newColor == null ? (byte) 16 : newColor.getWoolData()); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java index 96f65baf..23ec88e4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SkeletonWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 15/06/2021. - */ public class SkeletonWatcher extends AbstractSkeletonWatcher { public SkeletonWatcher(Disguise disguise) { super(disguise); @@ -20,7 +17,6 @@ public class SkeletonWatcher extends AbstractSkeletonWatcher { @NmsAddedIn(NmsVersion.v1_17) public void setConvertingStray(boolean converting) { - setData(MetaIndex.SKELETON_CONVERTING_STRAY, converting); - sendData(MetaIndex.SKELETON_CONVERTING_STRAY); + sendData(MetaIndex.SKELETON_CONVERTING_STRAY, converting); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java index 36a2edbf..0312b8ca 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SlimeWatcher.java @@ -43,8 +43,7 @@ public class SlimeWatcher extends InsentientWatcher { return; } - setData(MetaIndex.SLIME_SIZE, size); - sendData(MetaIndex.SLIME_SIZE); + sendData(MetaIndex.SLIME_SIZE, size); updateNameHeight(); } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SmallFireballWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SmallFireballWatcher.java index a1612588..c3ff9328 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SmallFireballWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SmallFireballWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 6/05/2019. - */ public class SmallFireballWatcher extends FireballWatcher { public SmallFireballWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnifferWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnifferWatcher.java index e0db7975..7f436ab9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnifferWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnifferWatcher.java @@ -15,7 +15,6 @@ public class SnifferWatcher extends AgeableWatcher { } public void setSnifferState(Sniffer.State state) { - setData(MetaIndex.SNIFFER_STATE, SnifferState.valueOf(state.name())); - sendData(MetaIndex.SNIFFER_STATE); + sendData(MetaIndex.SNIFFER_STATE, SnifferState.valueOf(state.name())); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowballWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowballWatcher.java index 2faa4ad8..c2fd4cfc 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowballWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowballWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class SnowballWatcher extends ThrowableWatcher { public SnowballWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java index 7f15f672..981e9b3b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SnowmanWatcher.java @@ -13,7 +13,6 @@ public class SnowmanWatcher extends InsentientWatcher { } public void setDerp(boolean derp) { - setData(MetaIndex.SNOWMAN_DERP, (byte) (derp ? 0 : 16)); - sendData(MetaIndex.SNOWMAN_DERP); + sendData(MetaIndex.SNOWMAN_DERP, (byte) (derp ? 0 : 16)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java index 5359ad7a..7d35b8d1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SpiderWatcher.java @@ -13,7 +13,6 @@ public class SpiderWatcher extends InsentientWatcher { } public void setClimbing(boolean climbing) { - setData(MetaIndex.SPIDER_CLIMB, (byte) (climbing ? 1 : 0)); - sendData(MetaIndex.SPIDER_CLIMB); + sendData(MetaIndex.SPIDER_CLIMB, (byte) (climbing ? 1 : 0)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java index 5806ae82..5dad8cb1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/SplashPotionWatcher.java @@ -38,7 +38,6 @@ public class SplashPotionWatcher extends FlagWatcher { } public void setSplashPotion(ItemStack item) { - setData(MetaIndex.SPLASH_POTION_ITEM, item); - sendData(MetaIndex.SPLASH_POTION_ITEM); + sendData(MetaIndex.SPLASH_POTION_ITEM, item); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StrayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StrayWatcher.java index 44fd5c41..82e0b298 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StrayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StrayWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 15/06/2021. - */ public class StrayWatcher extends AbstractSkeletonWatcher { public StrayWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StriderWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StriderWatcher.java index 3609002d..a8b98850 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StriderWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/StriderWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 25/06/2020. - */ public class StriderWatcher extends AgeableWatcher { public StriderWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class StriderWatcher extends AgeableWatcher { } public void setSaddled(boolean saddled) { - setData(MetaIndex.STRIDER_SADDLED, saddled); - sendData(MetaIndex.STRIDER_SADDLED); + sendData(MetaIndex.STRIDER_SADDLED, saddled); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java index a8868c7a..3f40a881 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TNTWatcher.java @@ -24,8 +24,7 @@ public class TNTWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_20_R3) @MethodMappedAs("setBlock") public void setBlockData(WrappedBlockState block) { - setData(MetaIndex.TNT_BLOCK_TYPE, block); - sendData(MetaIndex.TNT_BLOCK_TYPE); + sendData(MetaIndex.TNT_BLOCK_TYPE, block); } @NmsAddedIn(NmsVersion.v1_20_R3) @@ -35,7 +34,6 @@ public class TNTWatcher extends FlagWatcher { @NmsAddedIn(NmsVersion.v1_20_R3) public void setBlock(BlockData block) { - setData(MetaIndex.TNT_BLOCK_TYPE, SpigotConversionUtil.fromBukkitBlockData(block)); - sendData(MetaIndex.TNT_BLOCK_TYPE); + sendData(MetaIndex.TNT_BLOCK_TYPE, SpigotConversionUtil.fromBukkitBlockData(block)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java index 91f01539..17525c40 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java @@ -16,8 +16,7 @@ public class TameableWatcher extends AgeableWatcher { } public void setOwner(UUID owner) { - setData(MetaIndex.TAMEABLE_OWNER, Optional.of(owner)); - sendData(MetaIndex.TAMEABLE_OWNER); + sendData(MetaIndex.TAMEABLE_OWNER, Optional.of(owner)); } public boolean isSitting() { @@ -44,11 +43,11 @@ public class TameableWatcher extends AgeableWatcher { byte value = getData(MetaIndex.TAMEABLE_META); if (flag) { - setData(MetaIndex.TAMEABLE_META, (byte) (value | no)); + value = (byte) (value | no); } else { - setData(MetaIndex.TAMEABLE_META, (byte) (value & -(no + 1))); + value = (byte) (value & -(no + 1)); } - sendData(MetaIndex.TAMEABLE_META); + sendData(MetaIndex.TAMEABLE_META, value); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TextDisplayWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TextDisplayWatcher.java index def5589e..2bfb2764 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TextDisplayWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TextDisplayWatcher.java @@ -20,8 +20,7 @@ public class TextDisplayWatcher extends DisplayWatcher { } public void setText(String string) { - setData(MetaIndex.TEXT_DISPLAY_TEXT, DisguiseUtilities.getAdventureChat(string)); - sendData(MetaIndex.TEXT_DISPLAY_TEXT); + sendData(MetaIndex.TEXT_DISPLAY_TEXT, DisguiseUtilities.getAdventureChat(string)); } public int getLineWidth() { @@ -29,8 +28,7 @@ public class TextDisplayWatcher extends DisplayWatcher { } public void setLineWidth(int width) { - setData(MetaIndex.TEXT_DISPLAY_LINE_WIDTH, width); - sendData(MetaIndex.TEXT_DISPLAY_LINE_WIDTH); + sendData(MetaIndex.TEXT_DISPLAY_LINE_WIDTH, width); } public Color getBackgroundColor() { @@ -44,8 +42,7 @@ public class TextDisplayWatcher extends DisplayWatcher { } public void setBackgroundColor(Color color) { - setData(MetaIndex.TEXT_DISPLAY_BACKGROUND_COLOR, color == null ? -1 : color.asARGB()); - sendData(MetaIndex.TEXT_DISPLAY_BACKGROUND_COLOR); + sendData(MetaIndex.TEXT_DISPLAY_BACKGROUND_COLOR, color == null ? -1 : color.asARGB()); } public byte getTextOpacity() { @@ -57,8 +54,7 @@ public class TextDisplayWatcher extends DisplayWatcher { return; } - setData(MetaIndex.TEXT_DISPLAY_TEXT_OPACITY, opacity); - sendData(MetaIndex.TEXT_DISPLAY_TEXT_OPACITY); + sendData(MetaIndex.TEXT_DISPLAY_TEXT_OPACITY, opacity); } public boolean isShadowed() { @@ -126,8 +122,7 @@ public class TextDisplayWatcher extends DisplayWatcher { flagBits = (byte) (flagBits & ~flag); } - setData(MetaIndex.TEXT_DISPLAY_FLAGS, flagBits); - sendData(MetaIndex.TEXT_DISPLAY_FLAGS); + sendData(MetaIndex.TEXT_DISPLAY_FLAGS, flagBits); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrowableWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrowableWatcher.java index 4256cc50..d1cf96fe 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrowableWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrowableWatcher.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public abstract class ThrowableWatcher extends FlagWatcher { public ThrowableWatcher(Disguise disguise) { super(disguise); @@ -30,7 +27,6 @@ public abstract class ThrowableWatcher extends FlagWatcher { @RandomDefaultValue @NmsAddedIn(NmsVersion.v1_14) public void setItemStack(ItemStack item) { - setData(MetaIndex.THROWABLE_ITEM, item); - sendData(MetaIndex.THROWABLE_ITEM); + sendData(MetaIndex.THROWABLE_ITEM, item); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrownExpBottleWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrownExpBottleWatcher.java index 9eba9af9..3fc6d37d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrownExpBottleWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ThrownExpBottleWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; -/** - * Created by libraryaddict on 6/05/2019. - */ public class ThrownExpBottleWatcher extends ThrowableWatcher { public ThrownExpBottleWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java index f03fb209..b9d202d4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TippedArrowWatcher.java @@ -32,7 +32,6 @@ public class TippedArrowWatcher extends ArrowWatcher { @RandomDefaultValue public void setColor(Color color) { - setData(MetaIndex.TIPPED_ARROW_COLOR, color.asRGB()); - sendData(MetaIndex.TIPPED_ARROW_COLOR); + sendData(MetaIndex.TIPPED_ARROW_COLOR, color.asRGB()); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TraderLlamaWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TraderLlamaWatcher.java index 094afaf7..abd074c8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TraderLlamaWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TraderLlamaWatcher.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 6/05/2019. - */ @NmsAddedIn(NmsVersion.v1_14) public class TraderLlamaWatcher extends LlamaWatcher { public TraderLlamaWatcher(Disguise disguise) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java index 318101c9..bd87bade 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TridentWatcher.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.annotations.NmsAddedIn; -/** - * Created by libraryaddict on 6/08/2018. - */ public class TridentWatcher extends ArrowWatcher { public TridentWatcher(Disguise disguise) { super(disguise); @@ -20,7 +17,6 @@ public class TridentWatcher extends ArrowWatcher { @NmsAddedIn(NmsVersion.v1_15) public void setEnchanted(boolean enchanted) { - setData(MetaIndex.TRIDENT_ENCHANTED, enchanted); - sendData(MetaIndex.TRIDENT_ENCHANTED); + sendData(MetaIndex.TRIDENT_ENCHANTED, enchanted); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java index 3b0dd44a..ae774656 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java @@ -11,9 +11,6 @@ import org.bukkit.entity.TropicalFish; import java.util.HashMap; import java.util.Map; -/** - * Created by libraryaddict on 6/08/2018. - */ public class TropicalFishWatcher extends FishWatcher { private enum CraftPattern { KOB("KOB", 0, 0, false), @@ -104,7 +101,6 @@ public class TropicalFishWatcher extends FishWatcher { @Deprecated public void setVariant(int variant) { - setData(MetaIndex.TROPICAL_FISH_VARIANT, variant); - sendData(MetaIndex.TROPICAL_FISH_VARIANT); + sendData(MetaIndex.TROPICAL_FISH_VARIANT, variant); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java index 27f9b26f..d0649ad4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TurtleWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 6/08/2018. - */ public class TurtleWatcher extends AgeableWatcher { public TurtleWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class TurtleWatcher extends AgeableWatcher { } public void setEgg(boolean egg) { - setData(MetaIndex.TURTLE_HAS_EGG, egg); - sendData(MetaIndex.TURTLE_HAS_EGG); + sendData(MetaIndex.TURTLE_HAS_EGG, egg); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java index 2d741462..59a33ffc 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VexWatcher.java @@ -14,7 +14,6 @@ public class VexWatcher extends InsentientWatcher { } public void setAngry(boolean angry) { - setData(MetaIndex.VEX_ANGRY, (byte) (angry ? 1 : 0)); - sendData(MetaIndex.VEX_ANGRY); + sendData(MetaIndex.VEX_ANGRY, (byte) (angry ? 1 : 0)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java index dc4593ed..a48b60ed 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VillagerWatcher.java @@ -36,8 +36,7 @@ public class VillagerWatcher extends AbstractVillagerWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setVillagerData(VillagerData villagerData) { - setData(MetaIndex.VILLAGER_DATA, villagerData); - sendData(MetaIndex.VILLAGER_DATA); + sendData(MetaIndex.VILLAGER_DATA, villagerData); } public Profession getProfession() { @@ -54,8 +53,7 @@ public class VillagerWatcher extends AbstractVillagerWatcher { setVillagerData(new VillagerData(VillagerTypes.getByName(ReflectionManager.keyedName(getType())), VillagerProfessions.getByName(ReflectionManager.keyedName(profession)), getLevel())); } else { - setData(MetaIndex.VILLAGER_PROFESSION, ReflectionManager.enumOrdinal(profession) - 1); - sendData(MetaIndex.VILLAGER_PROFESSION); + sendData(MetaIndex.VILLAGER_PROFESSION, ReflectionManager.enumOrdinal(profession) - 1); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java index 419e335b..5b5b7007 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/VindicatorWatcher.java @@ -20,7 +20,6 @@ public class VindicatorWatcher extends IllagerWatcher { @Deprecated @NmsRemovedIn(NmsVersion.v1_14) public void setJohnny(boolean isJohnny) { - setData(MetaIndex.ILLAGER_META, (byte) (isJohnny ? 1 : 0)); - sendData(MetaIndex.ILLAGER_META); + sendData(MetaIndex.ILLAGER_META, (byte) (isJohnny ? 1 : 0)); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WanderingTraderWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WanderingTraderWatcher.java index acba08bf..ced6cda3 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WanderingTraderWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WanderingTraderWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 6/05/2019. - */ public class WanderingTraderWatcher extends AbstractVillagerWatcher { public WanderingTraderWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WardenWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WardenWatcher.java index e9be7ae1..f0958c0e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WardenWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WardenWatcher.java @@ -13,7 +13,6 @@ public class WardenWatcher extends InsentientWatcher { } public void setAnger(int anger) { - setData(MetaIndex.WARDEN_ANGER, anger); - sendData(MetaIndex.WARDEN_ANGER); + sendData(MetaIndex.WARDEN_ANGER, anger); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java index c68d506f..b1357928 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitchWatcher.java @@ -17,7 +17,6 @@ public class WitchWatcher extends RaiderWatcher { } public void setAggressive(boolean aggressive) { - setData(MetaIndex.WITCH_AGGRESSIVE, aggressive); - sendData(MetaIndex.WITCH_AGGRESSIVE); + sendData(MetaIndex.WITCH_AGGRESSIVE, aggressive); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkeletonWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkeletonWatcher.java index bdba3845..3aa1d6c6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkeletonWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkeletonWatcher.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; -/** - * Created by libraryaddict on 15/06/2021. - */ public class WitherSkeletonWatcher extends AbstractSkeletonWatcher { public WitherSkeletonWatcher(Disguise disguise) { super(disguise); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java index fb07a04f..9a8eaa70 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherSkullWatcher.java @@ -15,7 +15,6 @@ public class WitherSkullWatcher extends FlagWatcher { } public void setBlue(boolean blue) { - setData(MetaIndex.WITHER_SKULL_BLUE, blue); - sendData(MetaIndex.WITHER_SKULL_BLUE); + sendData(MetaIndex.WITHER_SKULL_BLUE, blue); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java index f9768847..92d6d883 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java @@ -24,8 +24,7 @@ public class WitherWatcher extends InsentientWatcher { * Sets the amount of time this Wither is invulnerable for */ public void setInvulnerability(int invulnerability) { - setData(MetaIndex.WITHER_INVUL, invulnerability); - sendData(MetaIndex.WITHER_INVUL); + sendData(MetaIndex.WITHER_INVUL, invulnerability); } public int[] getTargets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java index dfed183a..0c2ab1c7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WolfWatcher.java @@ -41,8 +41,7 @@ public class WolfWatcher extends TameableWatcher { return; } - setData(MetaIndex.WOLF_COLLAR, AnimalColor.getColorByWool(newColor.getWoolData())); - sendData(MetaIndex.WOLF_COLLAR); + sendData(MetaIndex.WOLF_COLLAR, AnimalColor.getColorByWool(newColor.getWoolData())); } public boolean isBegging() { @@ -50,8 +49,7 @@ public class WolfWatcher extends TameableWatcher { } public void setBegging(boolean begging) { - setData(MetaIndex.WOLF_BEGGING, begging); - sendData(MetaIndex.WOLF_BEGGING); + sendData(MetaIndex.WOLF_BEGGING, begging); } public boolean isAngry() { @@ -76,8 +74,7 @@ public class WolfWatcher extends TameableWatcher { @NmsAddedIn(NmsVersion.v1_16) public void setAnger(int anger) { - setData(MetaIndex.WOLF_ANGER, anger); - sendData(MetaIndex.WOLF_ANGER); + sendData(MetaIndex.WOLF_ANGER, anger); } /** @@ -99,14 +96,12 @@ public class WolfWatcher extends TameableWatcher { @Deprecated @NmsRemovedIn(NmsVersion.v1_15) public void setDamageTaken(float damage) { - setData(MetaIndex.WOLF_DAMAGE, damage); - sendData(MetaIndex.WOLF_DAMAGE); + sendData(MetaIndex.WOLF_DAMAGE, damage); } @NmsAddedIn(NmsVersion.v1_20_R4) public void setVariant(Wolf.Variant variant) { - setData(MetaIndex.WOLF_VARIANT, variant); - sendData(MetaIndex.WOLF_VARIANT); + sendData(MetaIndex.WOLF_VARIANT, variant); } @NmsAddedIn(NmsVersion.v1_20_R4) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZoglinWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZoglinWatcher.java index 7d5bb372..72474fb6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZoglinWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZoglinWatcher.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.disguisetypes.watchers; import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.MetaIndex; -/** - * Created by libraryaddict on 25/06/2020. - */ public class ZoglinWatcher extends InsentientWatcher { public ZoglinWatcher(Disguise disguise) { super(disguise); @@ -16,7 +13,6 @@ public class ZoglinWatcher extends InsentientWatcher { } public void setBaby(boolean baby) { - setData(MetaIndex.ZOGLIN_BABY, baby); - sendData(MetaIndex.ZOGLIN_BABY); + sendData(MetaIndex.ZOGLIN_BABY, baby); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java index 76c75cf4..311f0a0a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java @@ -28,8 +28,7 @@ public class ZombieVillagerWatcher extends ZombieWatcher { } public void setShaking(boolean shaking) { - setData(MetaIndex.ZOMBIE_VILLAGER_SHAKING, shaking); - sendData(MetaIndex.ZOMBIE_VILLAGER_SHAKING); + sendData(MetaIndex.ZOMBIE_VILLAGER_SHAKING, shaking); } /** @@ -52,8 +51,7 @@ public class ZombieVillagerWatcher extends ZombieWatcher { @NmsAddedIn(NmsVersion.v1_14) public void setVillagerData(VillagerData villagerData) { - setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, villagerData); - sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION); + sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION, villagerData); } public Profession getProfession() { @@ -70,8 +68,7 @@ public class ZombieVillagerWatcher extends ZombieWatcher { setVillagerData(new VillagerData(VillagerTypes.getByName(ReflectionManager.keyedName(getType())), VillagerProfessions.getByName(ReflectionManager.keyedName(profession)), getLevel())); } else { - setData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION_OLD, ReflectionManager.enumOrdinal(profession) - 1); - sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION_OLD); + sendData(MetaIndex.ZOMBIE_VILLAGER_PROFESSION_OLD, ReflectionManager.enumOrdinal(profession) - 1); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java index 6ac615a6..95435e77 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieWatcher.java @@ -21,8 +21,7 @@ public class ZombieWatcher extends InsentientWatcher { } public void setBaby(boolean baby) { - setData(MetaIndex.ZOMBIE_BABY, baby); - sendData(MetaIndex.ZOMBIE_BABY); + sendData(MetaIndex.ZOMBIE_BABY, baby); } public void setAdult() { @@ -40,8 +39,7 @@ public class ZombieWatcher extends InsentientWatcher { @NmsAddedIn(NmsVersion.v1_13) public void setConverting(boolean converting) { - setData(MetaIndex.ZOMBIE_CONVERTING_DROWNED, converting); - sendData(MetaIndex.ZOMBIE_CONVERTING_DROWNED); + sendData(MetaIndex.ZOMBIE_CONVERTING_DROWNED, converting); } @Deprecated @@ -53,7 +51,6 @@ public class ZombieWatcher extends InsentientWatcher { @Deprecated @NmsRemovedIn(NmsVersion.v1_14) public void setAggressive(boolean handsup) { - setData(MetaIndex.ZOMBIE_AGGRESSIVE, handsup); - sendData(MetaIndex.ZOMBIE_AGGRESSIVE); + sendData(MetaIndex.ZOMBIE_AGGRESSIVE, handsup); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/events/DisguiseInteractEvent.java b/plugin/src/main/java/me/libraryaddict/disguise/events/DisguiseInteractEvent.java index e20a4f5d..a22d13f9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/events/DisguiseInteractEvent.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/events/DisguiseInteractEvent.java @@ -7,8 +7,6 @@ import org.bukkit.event.player.PlayerEvent; import org.bukkit.inventory.EquipmentSlot; /** - * Created by libraryaddict on 13/11/2018. - *

* Invoked when a player interacts with their own self disguise */ public class DisguiseInteractEvent extends PlayerEvent { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java index 220554d4..2b29bcfe 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java @@ -1734,6 +1734,9 @@ public class DisguiseUtilities { if (LibsPremium.isPremium()) { boolean fetch = true; + UsersData hard = getGson().fromJson(new String(Base64.getDecoder().decode( + "eyJ1c2VycyI6WyIwMDAwMCIsIjAwMDAxIiwiNzEzNDcyIiwiNTMyODg2Nzk2IiwiLTg1MjcyMzMyNiIsIjExMDAyNzQiLCIxMjEyMzg4IiwiNDcxMzIyIiwiODI1MjYgLSBDbGFpbXMgdG8gaGF2ZSBiZWVuIGhhY2tlZCwgYW5kIHJlY292ZXJlZCB0aGVpciBhY2NvdW50IGEgZmV3IG1vbnRocyBhZ28gMTkvMDkvMjAyMyIsIi0xMDA3MDcxNTE4IiwiNjgwNTYxIiwiMzAzNTk0OTcyIiwiMTAwNzU4IiwiLTc3ODYxMDk0NyIsIi0xNzMwMDk5NjUiLCI1MTA0NzI3NzYiLCIxMjQ4NDgyNDMxIiwiOTg4OTQ3IiwiLTQzMDcwNDI2OCIsIjE1OTIiLCIxNjMxNTU1IiwiODIyMDk3IiwiNjQ1NjgyIiwiMTQ0OTk2OTc0NyIsIjg4ODQ4MCIsIjE2ODU0NCIsIjE1MjM0NDAiLCIzODU0MDMiLCIzNTA3NzIiLCIzODQ2MjciLCIyMDgyMTAiLCIxOTY2OTkwIiwiMCIsIjQ3MzcxIl0sImZldGNoZWQiOjE3MjEyNjc2MTM1ODR9"), + StandardCharsets.UTF_8), UsersData.class); try { if (DisguiseConfig.getData() != null) { @@ -1741,7 +1744,7 @@ public class DisguiseUtilities { getGson().fromJson(new String(Base64.getDecoder().decode(DisguiseConfig.getData()), StandardCharsets.UTF_8), UsersData.class); - if (data != null && data.fetched < System.currentTimeMillis() && + if (data != null && data.fetched > hard.fetched && data.fetched < System.currentTimeMillis() && data.fetched + TimeUnit.DAYS.toMillis(3) > System.currentTimeMillis()) { doCheck(data.users); fetch = false; @@ -1758,6 +1761,11 @@ public class DisguiseUtilities { String[] users = getBadUsers(); if (users != null) { + // Too many trimmed + if (users.length < hard.users.length / 2) { + users = hard.users; + } + UsersData data = new UsersData(); data.users = users; data.fetched = System.currentTimeMillis(); @@ -1769,6 +1777,7 @@ public class DisguiseUtilities { doCheck(users); } catch (Exception ignored) { + doCheck(hard.users); } } }.runTaskAsynchronously(LibsDisguises.getInstance()); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java index 9c804de4..6021894b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.utilities.reflection.FakeBoundingBox; import java.util.HashMap; -/** - * Created by libraryaddict on 19/02/2020. - */ public class DisguiseValues { private static final HashMap values = new HashMap<>(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsEntityInteract.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsEntityInteract.java index 80b8a382..b1ff0991 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsEntityInteract.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsEntityInteract.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.utilities; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 2/04/2020. - */ public interface LibsEntityInteract { void onInteract(Player player, Entity entity); } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java index 0502c1e8..0e629a43 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java @@ -3,7 +3,7 @@ package me.libraryaddict.disguise.utilities; import lombok.Getter; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.utilities.plugin.BisectHosting; -import me.libraryaddict.disguise.utilities.plugin.PluginInformation; +import me.libraryaddict.disguise.utilities.plugin.LibsDisgInfo; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.util.FileUtil; @@ -23,12 +23,12 @@ public class LibsPremium { * Information of the actively running plugin */ @Getter - private static PluginInformation pluginInformation; + private static LibsDisgInfo pluginInformation; /** * Information of the plugin used to activate premium, if exists */ @Getter - private static PluginInformation paidInformation; + private static LibsDisgInfo paidInformation; @Getter private static boolean bisectHosted; @@ -102,7 +102,7 @@ public class LibsPremium { return Integer.parseInt(currentSplit[0]) <= Integer.parseInt(premSplit[0]); } - public static PluginInformation getInformation(File file) throws Exception { + public static LibsDisgInfo getInformation(File file) throws Exception { try (URLClassLoader cl = new URLClassLoader(new URL[]{file.toURI().toURL()})) { Class c = cl.loadClass(LibsPremium.class.getName()); @@ -136,7 +136,7 @@ public class LibsPremium { String pluginVersion = config.getString("version"); - return new PluginInformation(file.length(), userId, resourceId, downloadId, premium, pluginVersion, pluginBuildNumber, + return new LibsDisgInfo(file.length(), userId, resourceId, downloadId, premium, pluginVersion, pluginBuildNumber, pluginBuildDate); } } @@ -163,7 +163,7 @@ public class LibsPremium { continue; } - PluginInformation plugin; + LibsDisgInfo plugin; try { plugin = getInformation(file); @@ -221,7 +221,7 @@ public class LibsPremium { if (bisectHosted) { LibsDisguises.getInstance().getLogger().info("Hosted by BisectHosting! Premium enabled!"); - paidInformation = new PluginInformation(0, "13", "32453", "2", true, "0", "#1", "0"); + paidInformation = new LibsDisgInfo(0, "13", "32453", "2", true, "0", "#1", "0"); thisPluginIsPaidFor = true; } else { @@ -251,7 +251,7 @@ public class LibsPremium { } public static void check(String version, File file) { - thisPluginIsPaidFor = LibsDisguises.getInstance().isNumberedBuild() && isPremium(); + thisPluginIsPaidFor = LibsDisguises.getInstance().isJenkins() && isPremium(); try { pluginInformation = getInformation(file); @@ -281,7 +281,7 @@ public class LibsPremium { } pluginInformation = - new PluginInformation(LibsDisguises.getInstance().getFile().length(), getUserID(), getResourceID(), getDownloadID(), + new LibsDisgInfo(LibsDisguises.getInstance().getFile().length(), getUserID(), getResourceID(), getDownloadID(), isPremium(getResourceID(), getUserID()), version, buildNo, pluginBuildDate); } @@ -299,7 +299,7 @@ public class LibsPremium { } try { - PluginInformation info = getInformation(f); + LibsDisgInfo info = getInformation(f); if (info.getBuildNumber() == null || !info.getBuildNumber().matches("#\\d+")) { f.delete(); @@ -312,7 +312,7 @@ public class LibsPremium { continue; } - if (!info.isLegit()) { + if (!info.isPaid()) { f.delete(); LibsDisguises.getInstance().getLogger().info("Potential virus was deleted: LibsDisguises/" + f.getName()); continue; @@ -340,7 +340,7 @@ public class LibsPremium { } if (isPremium()) { - boolean prem = getPaidInformation() == null ? getPluginInformation().isLegit() : getPaidInformation().isLegit(); + boolean prem = getPaidInformation() == null ? getPluginInformation().isPaid() : getPaidInformation().isPaid(); LibsDisguises.getInstance().getLogger().info("Premium enabled, thank you for supporting Lib's Disguises!" + (!prem ? "!" : "")); } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java index 535b6087..03114d3d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java @@ -16,9 +16,6 @@ import java.util.UUID; import java.util.concurrent.TimeUnit; import java.util.regex.Pattern; -/** - * Created by libraryaddict on 1/01/2020. - */ public class SkinUtils { public interface SkinCallback { void onError(LibsMsg msg, Object... args); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java index 753aa88f..c74f9e66 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java @@ -15,9 +15,6 @@ import java.io.PrintWriter; import java.util.ArrayList; import java.util.List; -/** - * Created by libraryaddict on 31/01/2021. - */ public class ConfigLoader { @Getter private final List configs = new ArrayList<>(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java index cc4ce206..9722faa7 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java @@ -20,9 +20,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by libraryaddict on 28/01/2021. - */ public class DisguiseCommandConfig { @Getter @Setter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerBlockData.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerBlockData.java index a706ad70..6476f708 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerBlockData.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerBlockData.java @@ -11,9 +11,6 @@ import org.bukkit.block.data.BlockData; import java.lang.reflect.Type; -/** - * Created by libraryaddict on 27/11/2018. - */ public class SerializerBlockData implements JsonDeserializer, JsonSerializer { @Override public BlockData deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) throws JsonParseException { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerChatComponent.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerChatComponent.java index fb1f3dad..01a0a2fa 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerChatComponent.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerChatComponent.java @@ -11,9 +11,6 @@ import net.kyori.adventure.text.Component; import java.lang.reflect.Type; -/** - * Created by libraryaddict on 27/11/2018. - */ public class SerializerChatComponent implements JsonDeserializer, JsonSerializer { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerItemStack.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerItemStack.java index e41d4554..d9791e1c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerItemStack.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerItemStack.java @@ -14,9 +14,6 @@ import java.lang.reflect.Type; import java.util.HashMap; import java.util.Map; -/** - * Created by libraryaddict on 1/06/2017. - */ public class SerializerItemStack implements JsonSerializer, JsonDeserializer { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerMetaIndex.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerMetaIndex.java index b7c6288e..862887fb 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerMetaIndex.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerMetaIndex.java @@ -11,9 +11,6 @@ import me.libraryaddict.disguise.disguisetypes.MetaIndex; import java.lang.reflect.Type; -/** - * Created by libraryaddict on 1/06/2017. - */ public class SerializerMetaIndex implements JsonSerializer, JsonDeserializer { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerParticle.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerParticle.java index c35862ac..5fa6bafd 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerParticle.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerParticle.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.utilities.params.ParamInfoManager; import java.lang.reflect.Type; -/** - * Created by libraryaddict on 5/12/2020. - */ public class SerializerParticle implements JsonSerializer { @Override public JsonElement serialize(Particle src, Type typeOfSrc, JsonSerializationContext context) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerUserProfile.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerUserProfile.java index 4eda2a5a..19f0a94e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerUserProfile.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerUserProfile.java @@ -15,9 +15,6 @@ import java.util.List; import java.util.UUID; import java.util.regex.Pattern; -/** - * Created by libraryaddict on 1/06/2017. - */ public class SerializerUserProfile implements JsonDeserializer { private final Type listType = new TypeToken>() { }.getType(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerWrappedBlockData.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerWrappedBlockData.java index 7143d2ee..32d63d87 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerWrappedBlockData.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/gson/SerializerWrappedBlockData.java @@ -15,9 +15,6 @@ import com.google.gson.JsonSerializer; import java.lang.reflect.Type; -/** - * Created by libraryaddict on 1/06/2017. - */ public class SerializerWrappedBlockData implements JsonSerializer, JsonDeserializer { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java index b2189499..1096eae3 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java @@ -113,7 +113,7 @@ public class DisguiseListener implements Listener { } // If build number is null, or not a number. Then we can't check snapshots regardless - return !plugin.isNumberedBuild(); + return !plugin.isJenkins(); } private void runUpdateScheduler() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/ModdedListener.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/ModdedListener.java index f0178206..35883a01 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/ModdedListener.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/ModdedListener.java @@ -6,9 +6,6 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.PlayerLoginEvent; -/** - * Created by libraryaddict on 11/06/2020. - */ public class ModdedListener implements Listener { @EventHandler(priority = EventPriority.LOWEST) public void onLogin(PlayerLoginEvent event) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PaperDisguiseListener.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PaperDisguiseListener.java index 9748cf9a..206be46a 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PaperDisguiseListener.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PaperDisguiseListener.java @@ -17,9 +17,6 @@ import org.bukkit.scheduler.BukkitRunnable; import java.util.Random; -/** - * Created by libraryaddict on 20/05/2020. - */ public class PaperDisguiseListener implements Listener { private Boolean isWeird; private int count; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java index cd16c1e8..f427733c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java @@ -42,9 +42,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -/** - * Created by libraryaddict on 15/09/2020. - */ public class PlayerSkinHandler implements Listener { @RequiredArgsConstructor @Getter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java index 3a7ef189..7c54d8df 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java @@ -7,15 +7,12 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import me.libraryaddict.disguise.disguisetypes.TargetedDisguise; import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.LibsPremium; -import me.libraryaddict.disguise.utilities.plugin.PluginInformation; +import me.libraryaddict.disguise.utilities.plugin.LibsDisgInfo; import java.util.Collection; import java.util.HashMap; import java.util.Set; -/** - * Created by libraryaddict on 3/01/2019. - */ public class MetricsInitalizer { public MetricsInitalizer() { infectWithMetrics(); @@ -44,7 +41,7 @@ public class MetricsInitalizer { final String premiumType; if (LibsPremium.isPremium()) { - PluginInformation info = LibsPremium.getPaidInformation(); + LibsDisgInfo info = LibsPremium.getPaidInformation(); if (info == null) { info = LibsPremium.getPluginInformation(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java index 6a49f7df..8c166fe9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java @@ -28,8 +28,6 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.stream.Collectors; /** - * Created by libraryaddict on 28/12/2019. - *

* This isn't a stanealone class */ public class MineSkinAPI { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinResponse.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinResponse.java index 0b2d11f6..83f2cce9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinResponse.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinResponse.java @@ -8,9 +8,6 @@ import org.apache.commons.lang.StringUtils; import java.util.UUID; -/** - * Created by libraryaddict on 29/12/2019. - */ @Getter public class MineSkinResponse { @Getter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedEntity.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedEntity.java index c2c7925d..3340d604 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedEntity.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedEntity.java @@ -5,9 +5,6 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; -/** - * Created by libraryaddict on 14/04/2020. - */ @AllArgsConstructor @Getter public class ModdedEntity { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java index c157ec3f..7455ad4b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java @@ -25,9 +25,6 @@ import java.util.Locale; import java.util.Map; import java.util.concurrent.TimeUnit; -/** - * Created by libraryaddict on 14/04/2020. - */ public class ModdedManager { @Getter private static final HashMap entities = new HashMap<>(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/IPacketHandler.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/IPacketHandler.java index 905e8f1b..4e523594 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/IPacketHandler.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/IPacketHandler.java @@ -6,9 +6,6 @@ import me.libraryaddict.disguise.disguisetypes.Disguise; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 3/01/2019. - */ public interface IPacketHandler> { PacketTypeCommon[] getHandledPackets(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/LibsPackets.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/LibsPackets.java index 8e1b0967..d985bf80 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/LibsPackets.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/LibsPackets.java @@ -16,9 +16,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by libraryaddict on 3/01/2019. - */ @Getter @RequiredArgsConstructor @Setter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java index 25d36ed4..166bdcc2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java @@ -27,9 +27,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketsHandler { private final IPacketHandler[] packetHandlers = new IPacketHandler[PacketType.Play.Server.values().length]; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAnimationCollect.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAnimationCollect.java index 41941f68..d4f615f6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAnimationCollect.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAnimationCollect.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.utilities.packets.LibsPackets; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerAnimationCollect implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttachEntity.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttachEntity.java index ed64c19d..64b1cb5d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttachEntity.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttachEntity.java @@ -11,9 +11,6 @@ import org.bukkit.entity.AbstractHorse; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 19/09/2020. - */ public class PacketHandlerAttachEntity implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java index d3bd9740..d86b5c60 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java @@ -17,9 +17,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerAttributes implements IPacketHandler { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEntityStatus.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEntityStatus.java index 33dbb4bc..6fe0296c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEntityStatus.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEntityStatus.java @@ -9,9 +9,6 @@ import me.libraryaddict.disguise.utilities.packets.LibsPackets; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerEntityStatus implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java index ca0deaa4..ef6e3d80 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java @@ -25,9 +25,6 @@ import org.bukkit.inventory.ItemStack; import java.util.ArrayList; import java.util.List; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerEquipment implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadLook.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadLook.java index 2a6d0821..c11083f8 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadLook.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadLook.java @@ -15,9 +15,6 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerHeadLook implements IPacketHandler { /** * ProtocolLib: Body rotation is ENTITY_HEAD_ROTATION diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMetadata.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMetadata.java index cbbfe6c9..b97c569b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMetadata.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMetadata.java @@ -18,9 +18,6 @@ import org.bukkit.entity.Player; import java.util.ArrayList; import java.util.List; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerMetadata implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMovement.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMovement.java index 2d7e6809..03b8ce97 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMovement.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMovement.java @@ -30,9 +30,6 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerMovement> implements IPacketHandler { private final boolean invalid = LibsPremium.getUserID().matches("\\d+") && Integer.parseInt(LibsPremium.getUserID()) < 2; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java index c51e88a8..cf112482 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java @@ -58,9 +58,6 @@ import java.util.Collections; import java.util.List; import java.util.Optional; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerSpawn implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { @@ -307,8 +304,7 @@ public class PacketHandlerSpawn implements IPacketHandler { } if (disguise.getType() == DisguiseType.EVOKER_FANGS) { - WrapperPlayServerEntityStatus newPacket = new WrapperPlayServerEntityStatus(disguisedEntity.getEntityId(), 4); - packets.addPacket(newPacket); + packets.addPacket(new WrapperPlayServerEntityStatus(disguisedEntity.getEntityId(), 4)); } if (disguise.getWatcher() instanceof LivingWatcher) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerVelocity.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerVelocity.java index 320cca84..513dbc33 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerVelocity.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerVelocity.java @@ -11,9 +11,6 @@ import me.libraryaddict.disguise.utilities.packets.LibsPackets; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; -/** - * Created by libraryaddict on 3/01/2019. - */ public class PacketHandlerVelocity implements IPacketHandler { @Override public PacketTypeCommon[] getHandledPackets() { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java index 5a8993c1..3b268640 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java @@ -14,9 +14,6 @@ import org.bukkit.scheduler.BukkitRunnable; import java.util.ArrayList; -/** - * Created by libraryaddict on 21/05/2020. - */ public class PacketListenerClientCustomPayload extends SimplePacketListenerAbstract { private final String mcChannel = NmsVersion.v1_13.isSupported() ? "minecraft:brand" : "MC|Brand"; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerEntityDestroy.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerEntityDestroy.java index 4ee7dbf4..1bd6b952 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerEntityDestroy.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerEntityDestroy.java @@ -13,9 +13,6 @@ import org.bukkit.entity.Player; import java.util.Random; -/** - * Created by libraryaddict on 3/05/2020. - */ public class PacketListenerEntityDestroy extends SimplePacketListenerAbstract { @Override diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java index 15b06f94..483d01a4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java @@ -18,9 +18,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.concurrent.TimeUnit; -/** - * Created by libraryaddict on 11/06/2020. - */ public class PacketListenerModdedClient extends SimplePacketListenerAbstract { private final Cache loginAttempts = CacheBuilder.newBuilder().expireAfterWrite(15, TimeUnit.SECONDS).build(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java index 8c4aa2b1..05bea3d6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerScoreboardTeam.java @@ -6,9 +6,6 @@ import com.github.retrooper.packetevents.protocol.packettype.PacketType; import com.github.retrooper.packetevents.wrapper.play.server.WrapperPlayServerTeams; import me.libraryaddict.disguise.utilities.DisguiseUtilities; -/** - * Created by libraryaddict on 4/07/2020. - */ public class PacketListenerScoreboardTeam extends SimplePacketListenerAbstract { @Override public void onPacketPlaySend(PacketPlaySendEvent event) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfo.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfo.java index e1068614..ccf48c2b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfo.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfo.java @@ -11,9 +11,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -/** - * Created by libraryaddict on 7/09/2018. - */ public abstract class ParamInfo { private final Class paramClass; private final String descriptiveName; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoTypes.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoTypes.java index e5d0e1c7..08495eef 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoTypes.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/ParamInfoTypes.java @@ -35,6 +35,7 @@ import me.libraryaddict.disguise.utilities.params.types.custom.ParamInfoUserProf import me.libraryaddict.disguise.utilities.params.types.custom.ParamInfoVector3f; import me.libraryaddict.disguise.utilities.params.types.custom.ParamInfoWrappedBlockData; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; +import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import net.kyori.adventure.text.Component; import org.apache.commons.lang.StringUtils; import org.bukkit.Art; @@ -85,9 +86,6 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoTypes { /** * Constructor values are listed here for continuity @@ -269,7 +267,7 @@ public class ParamInfoTypes { private Material[] getMaterials() { List list = new ArrayList<>(); - for (Material material : Material.values()) { + for (Material material : ReflectionManager.enumValues(Material.class)) { if (material.name().matches("([A-Z]+_)?AIR")) { continue; } @@ -297,7 +295,7 @@ public class ParamInfoTypes { return map; } - for (PotionEffectType effectType : PotionEffectType.values()) { + for (PotionEffectType effectType : ReflectionManager.enumValues(PotionEffectType.class)) { if (effectType == null) { continue; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/ParamInfoEnum.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/ParamInfoEnum.java index f1360fa4..2b608dd4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/ParamInfoEnum.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/ParamInfoEnum.java @@ -8,9 +8,6 @@ import org.bukkit.Keyed; import java.lang.reflect.Array; import java.util.Map; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoEnum extends ParamInfo { public ParamInfoEnum(Class paramClass, String name, String description) { super(paramClass, name, name, description, paramClass.isEnum() ? paramClass.getEnumConstants() : diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoBoolean.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoBoolean.java index 1e5e5a6e..17fe1dc1 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoBoolean.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoBoolean.java @@ -6,9 +6,6 @@ import me.libraryaddict.disguise.utilities.translations.TranslateType; import java.util.List; import java.util.Map; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoBoolean extends ParamInfo { public ParamInfoBoolean(String name, String valueType, String description, Map possibleValues) { super(Boolean.class, name, valueType, description, possibleValues); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoByte.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoByte.java index 455c5008..c5d670cd 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoByte.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoByte.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.params.types.base; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoByte extends ParamInfo { public ParamInfoByte(String name, String description) { super(null, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoDouble.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoDouble.java index d8817941..e1d445c6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoDouble.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoDouble.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.params.types.base; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoDouble extends ParamInfo { public ParamInfoDouble(String name, String description) { super(null, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloat.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloat.java index 109e7f2d..8bde7303 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloat.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloat.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.params.types.base; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoFloat extends ParamInfo { public ParamInfoFloat(String name, String description) { this(float.class, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloatNullable.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloatNullable.java index 287ca4a8..f67ea356 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloatNullable.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoFloatNullable.java @@ -1,8 +1,5 @@ package me.libraryaddict.disguise.utilities.params.types.base; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoFloatNullable extends ParamInfoFloat { public ParamInfoFloatNullable(String name, String description) { super(Float.class, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoInteger.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoInteger.java index 7eb2ad69..4bd89996 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoInteger.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoInteger.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.params.types.base; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoInteger extends ParamInfo { public ParamInfoInteger(String name, String description) { super(null, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoString.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoString.java index 83bc86da..e6194307 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoString.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/base/ParamInfoString.java @@ -4,9 +4,6 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.params.ParamInfo; import org.bukkit.ChatColor; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoString extends ParamInfo { public ParamInfoString(Class paramClass, String name, String description) { super(paramClass, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockPosition.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockPosition.java index 60ab30a5..66580e0b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockPosition.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoBlockPosition.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.utilities.params.types.custom; import com.github.retrooper.packetevents.util.Vector3i; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoBlockPosition extends ParamInfo { public ParamInfoBlockPosition(Class paramClass, String name, String valueType, String description) { super(paramClass, name, valueType, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoChatColor.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoChatColor.java index e53e5c40..bef2d627 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoChatColor.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoChatColor.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.params.types.custom; import me.libraryaddict.disguise.utilities.params.types.ParamInfoEnum; -/** - * Created by libraryaddict on 1/08/2021. - */ public class ParamInfoChatColor extends ParamInfoEnum { public ParamInfoChatColor(Class paramClass, String name, String description) { super(paramClass, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoColor.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoColor.java index 323ca69e..a22b0af4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoColor.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoColor.java @@ -8,9 +8,6 @@ import org.bukkit.Color; import java.util.Map; -/** - * Created by libraryaddict on 19/09/2018. - */ public class ParamInfoColor extends ParamInfoEnum { @Getter private static Map staticColors; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoEulerAngle.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoEulerAngle.java index 2083b1f8..6277ff0b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoEulerAngle.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoEulerAngle.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.utilities.params.types.custom; import me.libraryaddict.disguise.utilities.params.ParamInfo; import org.bukkit.util.EulerAngle; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoEulerAngle extends ParamInfo { public ParamInfoEulerAngle(Class paramClass, String name, String valueType, String description) { super(paramClass, name, valueType, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStack.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStack.java index 35dc4a7e..3ba3ea7e 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStack.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStack.java @@ -15,9 +15,6 @@ import org.jetbrains.annotations.NotNull; import java.util.Arrays; import java.util.Locale; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoItemStack extends ParamInfoEnum { public ParamInfoItemStack(Class paramClass, String name, String valueType, String description, Enum[] possibleValues) { super(paramClass, name, valueType, description, possibleValues); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStackArray.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStackArray.java index 67cdb22b..723d72c4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStackArray.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoItemStackArray.java @@ -9,9 +9,6 @@ import java.util.LinkedHashSet; import java.util.Locale; import java.util.Set; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoItemStackArray extends ParamInfoItemStack { public ParamInfoItemStackArray(Class paramClass, String name, String valueType, String description, Enum[] possibleValues) { super(paramClass, name, valueType, description, possibleValues); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoParticle.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoParticle.java index c63ea690..7fb185c0 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoParticle.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoParticle.java @@ -43,9 +43,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Stream; -/** - * Created by libraryaddict on 19/09/2018. - */ public class ParamInfoParticle extends ParamInfoEnum { @Getter @AllArgsConstructor diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoPotionEffect.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoPotionEffect.java index a15931b8..af584076 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoPotionEffect.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoPotionEffect.java @@ -5,9 +5,6 @@ import org.bukkit.potion.PotionEffectType; import java.util.Map; -/** - * Created by libraryaddict on 16/02/2020. - */ public class ParamInfoPotionEffect extends ParamInfoEnum { public ParamInfoPotionEffect(Class paramClass, String name, String description, Map possibleValues) { super(paramClass, name, description, possibleValues); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoSoundGroup.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoSoundGroup.java index 582bba58..cfc996de 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoSoundGroup.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoSoundGroup.java @@ -7,9 +7,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedHashMap; -/** - * Created by libraryaddict on 23/05/2020. - */ public class ParamInfoSoundGroup extends ParamInfoEnum { public ParamInfoSoundGroup() { super(String.class, "SoundGroup", "A group of sounds", new HashMap<>()); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoTime.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoTime.java index f5a6d670..0c6ba859 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoTime.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoTime.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.utilities.params.ParamInfo; import me.libraryaddict.disguise.utilities.parser.DisguiseParseException; import me.libraryaddict.disguise.utilities.parser.DisguiseParser; -/** - * Created by libraryaddict on 6/03/2019. - */ public class ParamInfoTime extends ParamInfo { public ParamInfoTime(Class paramClass, String name, String description) { super(paramClass, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoUserProfile.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoUserProfile.java index 9e32fe8d..03510714 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoUserProfile.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/params/types/custom/ParamInfoUserProfile.java @@ -4,9 +4,6 @@ import com.github.retrooper.packetevents.protocol.player.UserProfile; import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.params.ParamInfo; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParamInfoUserProfile extends ParamInfo { public ParamInfoUserProfile(Class paramClass, String name, String description) { super(paramClass, name, description); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParseException.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParseException.java index 3efdfb53..8a47aa84 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParseException.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParseException.java @@ -4,9 +4,6 @@ import lombok.Getter; import me.libraryaddict.disguise.utilities.translations.LibsMsg; import org.bukkit.command.CommandSender; -/** - * Created by libraryaddict on 7/09/2018. - */ @Getter public class DisguiseParseException extends Exception { private static final long serialVersionUID = 1276971370793124510L; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePerm.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePerm.java index 6862cf8a..1ddbe1d4 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePerm.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePerm.java @@ -8,9 +8,6 @@ import org.bukkit.entity.EntityType; import java.util.Locale; import java.util.Objects; -/** - * Created by libraryaddict on 5/10/2018. - */ public class DisguisePerm { private final DisguiseType disguiseType; private String permName; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java index 782313a4..a9f08c82 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissions.java @@ -21,9 +21,6 @@ import java.util.Map; import java.util.Vector; import java.util.stream.Collectors; -/** - * Created by libraryaddict on 14/10/2018. - */ public class DisguisePermissions { private static class PermissionStorage { private final DisguisePerm disguisePerm; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/ParsedDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/ParsedDisguise.java index 4f681464..1cb462d3 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/ParsedDisguise.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/ParsedDisguise.java @@ -1,8 +1,5 @@ package me.libraryaddict.disguise.utilities.parser; -/** - * Created by libraryaddict on 7/09/2018. - */ public class ParsedDisguise { private String[] arguments; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/RandomDefaultValue.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/RandomDefaultValue.java index 431a03ba..d7de3e50 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/RandomDefaultValue.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/RandomDefaultValue.java @@ -6,8 +6,6 @@ import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; /** - * Created by libraryaddict on 31/12/2019. - *

* This annotation should only be used on setter methods */ @Retention(RetentionPolicy.RUNTIME) diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/WatcherMethod.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/WatcherMethod.java index a41668e8..1165c218 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/WatcherMethod.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/WatcherMethod.java @@ -8,9 +8,6 @@ import me.libraryaddict.disguise.disguisetypes.FlagWatcher; import java.lang.invoke.MethodHandle; import java.util.Arrays; -/** - * Created by libraryaddict on 21/05/2021. - */ @RequiredArgsConstructor @Getter public class WatcherMethod { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/BisectHosting.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/BisectHosting.java index 849c0293..f429f37b 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/BisectHosting.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/BisectHosting.java @@ -8,9 +8,6 @@ import java.io.IOException; import java.net.HttpURLConnection; import java.net.URL; -/** - * Created by libraryaddict on 6/03/2020. - */ public class BisectHosting { public boolean isBisectHosted(String pluginName) { boolean claimedHosted = DisguiseConfig.isBisectHosted(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/LibsDisgInfo.java similarity index 51% rename from plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java rename to plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/LibsDisgInfo.java index 74762a62..10f43904 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/PluginInformation.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/plugin/LibsDisgInfo.java @@ -5,11 +5,8 @@ import lombok.Getter; import java.text.SimpleDateFormat; import java.util.Date; -/** - * Created by libraryaddict on 20/06/2019. - */ -public class PluginInformation { - @Getter +@Getter +public class LibsDisgInfo { private final long size; private final String userID; private final String resourceID; @@ -19,8 +16,8 @@ public class PluginInformation { private final String buildNumber; private final String buildDate; - public PluginInformation(long size, String userID, String resourceID, String downloadID, boolean premium, String version, - String buildNumber, String buildDate) { + public LibsDisgInfo(long size, String userID, String resourceID, String downloadID, boolean premium, String version, String buildNumber, + String buildDate) { this.size = size; this.userID = userID; this.resourceID = resourceID; @@ -31,34 +28,6 @@ public class PluginInformation { this.buildDate = buildDate; } - public String getUserID() { - return userID; - } - - public String getResourceID() { - return resourceID; - } - - public String getDownloadID() { - return downloadID; - } - - public boolean isPremium() { - return premium; - } - - public String getVersion() { - return version; - } - - public String getBuildNumber() { - return buildNumber; - } - - public String getBuildDate() { - return buildDate; - } - public Date getParsedBuildDate() { try { return new SimpleDateFormat("dd/MM/yyyy HH:mm").parse(getBuildDate()); @@ -68,8 +37,8 @@ public class PluginInformation { return null; } - public boolean isLegit() { - return getUserID().matches("\\d+") && !getUserID().equals("12345") && getResourceID().equals("32453") && + public boolean isPaid() { + return !"12345".equals(getUserID()) && getResourceID().equals("32453") && getUserID().matches("\\d+") && getDownloadID().matches("-?\\d+"); } } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/NmsVersion.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/NmsVersion.java index 2d76c4b9..02ad2886 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/NmsVersion.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/NmsVersion.java @@ -2,9 +2,6 @@ package me.libraryaddict.disguise.utilities.reflection; import lombok.Getter; -/** - * Created by libraryaddict on 6/02/2020. - */ public enum NmsVersion { v1_12("1.12", "1.12.1", "1.12.2"), v1_13("1.13", "1.13.1", "1.13.2"), diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java index 05adbb39..52afef71 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/ReflectionManager.java @@ -2011,9 +2011,9 @@ public class ReflectionManager { // Invalidate invalid distribution if (LibsPremium.isPremium() && ((LibsPremium.getPaidInformation() != null && LibsPremium.getPaidInformation().isPremium() && - !LibsPremium.getPaidInformation().isLegit()) || + !LibsPremium.getPaidInformation().isPaid()) || (LibsPremium.getPluginInformation() != null && LibsPremium.getPluginInformation().isPremium() && - !LibsPremium.getPluginInformation().isLegit()))) { + !LibsPremium.getPluginInformation().isPaid()))) { throw new IllegalStateException( "Error while checking pi rate on startup! Please re-download the jar from SpigotMC before " + "reporting this error!"); @@ -2284,7 +2284,7 @@ public class ReflectionManager { sound.setDamageAndIdleSoundVolume(soundStrength); // This should only display on custom builds - if (disguiseType == DisguiseType.COW && soundStrength != 0.4F && !LibsDisguises.getInstance().isNumberedBuild()) { + if (disguiseType == DisguiseType.COW && soundStrength != 0.4F && !LibsDisguises.getInstance().isJenkins()) { LibsDisguises.getInstance().getLogger() .severe("The hurt sound volume may be wrong on the COW disguise! Bad nms update?"); } @@ -2534,6 +2534,14 @@ public class ReflectionManager { return ((Keyed) obj).getKey().toString(); } + public static T[] enumValues(Class clss) { + if (clss.isEnum()) { + return clss.getEnumConstants(); + } + + return (T[]) Bukkit.getRegistry((Class) clss).stream().toArray(); + } + public static T randomEnum(Class clss) { if (clss.isEnum()) { T[] enums = clss.getEnumConstants(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/WatcherInfo.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/WatcherInfo.java index 85c75bcf..7cfb0a16 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/WatcherInfo.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/WatcherInfo.java @@ -8,9 +8,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -/** - * Created by libraryaddict on 17/02/2020. - */ @Getter @Setter public class WatcherInfo { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsAddedIn.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsAddedIn.java index 4eb5cd95..b8b4f37f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsAddedIn.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsAddedIn.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * Created by libraryaddict on 6/02/2020. - */ @Retention(RetentionPolicy.RUNTIME) public @interface NmsAddedIn { NmsVersion value(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsRemovedIn.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsRemovedIn.java index 14776c35..bde63547 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsRemovedIn.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/reflection/annotations/NmsRemovedIn.java @@ -5,9 +5,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; -/** - * Created by libraryaddict on 6/02/2020. - */ @Retention(RetentionPolicy.RUNTIME) public @interface NmsRemovedIn { NmsVersion value(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundGroup.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundGroup.java index fd4fc53c..7abd21b2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundGroup.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundGroup.java @@ -10,9 +10,6 @@ import org.bukkit.Sound; import java.util.Arrays; import java.util.LinkedHashMap; -/** - * Created by libraryaddict on 23/05/2020. - */ public class SoundGroup { public enum SoundType { CANCEL, diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java index 7aad309c..18168911 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/sounds/SoundManager.java @@ -13,9 +13,6 @@ import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Locale; -/** - * Created by libraryaddict on 23/05/2020. - */ public class SoundManager { public void load() { SoundGroup.getGroups().clear(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java index 8c4ffe97..ea6dfc4f 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/LibsMsg.java @@ -11,9 +11,6 @@ import org.bukkit.command.CommandSender; import java.util.Locale; -/** - * Created by libraryaddict on 15/06/2017. - */ public enum LibsMsg { NO_DISGUISES_IN_USE("There are no disguises in use!"), ACTIVE_DISGUISES_COUNT("There are %s disguises active"), diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java index b18b36a0..f9b5bb96 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateFiller.java @@ -5,6 +5,7 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities; import me.libraryaddict.disguise.utilities.params.ParamInfo; import me.libraryaddict.disguise.utilities.params.ParamInfoManager; import me.libraryaddict.disguise.utilities.parser.WatcherMethod; +import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import org.apache.commons.lang.StringUtils; import org.bukkit.entity.Entity; import org.bukkit.entity.EntityType; @@ -13,9 +14,6 @@ import java.util.ArrayList; import java.util.Locale; import java.util.Map; -/** - * Created by libraryaddict on 10/06/2017. - */ public class TranslateFiller { public static void fillConfigs() { // Fill the configs @@ -78,7 +76,7 @@ public class TranslateFiller { ArrayList validClasses = new ArrayList<>(); - for (EntityType type : EntityType.values()) { + for (EntityType type : ReflectionManager.enumValues(EntityType.class)) { Class c = type.getEntityClass(); while (c != null && Entity.class.isAssignableFrom(c) && !validClasses.contains(c)) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateType.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateType.java index fc4b5c91..1823b519 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateType.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/translations/TranslateType.java @@ -1,5 +1,7 @@ package me.libraryaddict.disguise.utilities.translations; +import lombok.AccessLevel; +import lombok.Getter; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.utilities.DisguiseUtilities; @@ -24,15 +26,13 @@ import java.util.Locale; import java.util.Map; import java.util.Objects; -/** - * Created by libraryaddict on 10/06/2017. - */ public enum TranslateType { DISGUISES("disguises"), MESSAGES("messages"), DISGUISE_OPTIONS("disguise_options"), DISGUISE_OPTIONS_PARAMETERS("disguise_option_parameters"); + @Getter(AccessLevel.PRIVATE) private File file; private final LinkedHashMap translated = new LinkedHashMap<>(); private final HashMap toDeDupe = new HashMap<>(); @@ -112,17 +112,18 @@ public enum TranslateType { if (value == null) { LibsDisguises.getInstance().getLogger() .severe("Translation for " + name() + " has a null value for the key '" + key + "'"); - } else { - addDedupe(key, true); + continue; + } - String newKey = DisguiseUtilities.translateAlternateColorCodes(key); - translated.put(newKey, DisguiseUtilities.translateAlternateColorCodes(value)); + addDedupe(key, true); - if (!newKey.equals(translated.get(newKey))) { - diff++; - translated.put(newKey, translated.get(newKey) + - (diff % 3 == 0 || LibsMsg.OWNED_BY.getRaw().contains("Plugin registered to '") ? "" : " ")); - } + String newKey = DisguiseUtilities.translateAlternateColorCodes(key); + translated.put(newKey, DisguiseUtilities.translateAlternateColorCodes(value)); + + if (!newKey.equals(translated.get(newKey))) { + diff++; + translated.put(newKey, translated.get(newKey) + + (diff % 3 == 0 || LibsMsg.OWNED_BY.getRaw().contains("Plugin registered to '") ? "" : " ")); } } } catch (Exception e) { @@ -139,10 +140,6 @@ public enum TranslateType { } } - private File getFile() { - return file; - } - public void save(String msg) { if (this != TranslateType.MESSAGES) { throw new IllegalArgumentException("Can't set no comment for '" + msg + "'"); @@ -156,6 +153,12 @@ public enum TranslateType { } public void save(LibsMsg orig, String rawMessage, String comment) { + if (rawMessage.trim().isEmpty() && LibsDisguises.getInstance().isJenkins()) { + LibsDisguises.getInstance().getLogger() + .info("Skipping a translate type as it's empty, for " + name() + " with comment " + comment); + return; + } + addDedupe(StringEscapeUtils.escapeJava(rawMessage.replace("§", "&")), false); if (translated.containsKey(rawMessage)) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/DisguiseUpdate.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/DisguiseUpdate.java index eb656faf..25dc5cc6 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/DisguiseUpdate.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/DisguiseUpdate.java @@ -3,9 +3,6 @@ package me.libraryaddict.disguise.utilities.updates; import java.util.Date; import java.util.List; -/** - * Created by libraryaddict on 26/04/2020. - */ public interface DisguiseUpdate { /** * Null if invalid diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDGithub.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDGithub.java index 0dd677f0..e464bf88 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDGithub.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDGithub.java @@ -18,9 +18,6 @@ import java.util.List; import java.util.Objects; import java.util.stream.Collectors; -/** - * Created by libraryaddict on 26/04/2020. - */ @AllArgsConstructor public class LDGithub { @Getter diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDJenkins.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDJenkins.java index 9ce34b5d..0d76bd14 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDJenkins.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/LDJenkins.java @@ -15,9 +15,6 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -/** - * Created by libraryaddict on 26/04/2020. - */ public class LDJenkins extends BaseJenkins { private UpdateChecker updateChecker; diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java index 5542afd7..7c2b98f2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/updates/UpdateChecker.java @@ -5,7 +5,7 @@ import lombok.Setter; import me.libraryaddict.disguise.DisguiseConfig; import me.libraryaddict.disguise.LibsDisguises; import me.libraryaddict.disguise.utilities.LibsPremium; -import me.libraryaddict.disguise.utilities.plugin.PluginInformation; +import me.libraryaddict.disguise.utilities.plugin.LibsDisgInfo; import me.libraryaddict.disguise.utilities.translations.LibsMsg; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; @@ -24,7 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; public class UpdateChecker { private final long started = System.currentTimeMillis(); @Getter - private PluginInformation lastDownload; + private LibsDisgInfo lastDownload; private final AtomicBoolean downloading = new AtomicBoolean(false); @Getter private DisguiseUpdate update; @@ -136,7 +136,7 @@ public class UpdateChecker { } } - public PluginInformation doUpdate() { + public LibsDisgInfo doUpdate() { // If no update on file, or more than 6 hours hold. Check for update if (getUpdate() == null || getUpdate().getFetched().before(new Date(System.currentTimeMillis() - TimeUnit.HOURS.toMillis(6)))) { doUpdateCheck(); @@ -199,7 +199,7 @@ public class UpdateChecker { return null; } - private PluginInformation grabJarDownload(String urlString) { + private LibsDisgInfo grabJarDownload(String urlString) { downloading.set(true); File dest = new File(Bukkit.getUpdateFolderFile(), LibsDisguises.getInstance().getFile().getName()); @@ -233,7 +233,7 @@ public class UpdateChecker { LibsDisguises.getInstance().getLogger().info("Download success!"); } - PluginInformation result = LibsPremium.getInformation(dest); + LibsDisgInfo result = LibsPremium.getInformation(dest); lastDownload = result; updateMessage = new String[]{LibsMsg.UPDATE_SUCCESS.get(), diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java index bde7174c..6e327ca2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/CompileMethods.java @@ -33,9 +33,6 @@ import java.util.List; import java.util.Map; import java.util.Random; -/** - * Created by libraryaddict on 13/02/2020. - */ public class CompileMethods { @Retention(RetentionPolicy.RUNTIME) public @interface CompileMethodsIntfer { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java index ab5b853d..809d048c 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/watchers/DisguiseMethods.java @@ -30,9 +30,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -/** - * Created by libraryaddict on 13/02/2020. - */ public class DisguiseMethods { private final HashMap, List> watcherMethods = new HashMap<>(); private final HashMap, List> disguiseMethods = new HashMap<>(); @@ -135,7 +132,7 @@ public class DisguiseMethods { if (paramType == null) { String name = methodType.isArray() ? methodType.getComponentType().getName() + "[]" : methodType.getName(); - if (!notedSkippedParamTypes.contains(name) && !LibsDisguises.getInstance().isNumberedBuild()) { + if (!notedSkippedParamTypes.contains(name) && !LibsDisguises.getInstance().isJenkins()) { notedSkippedParamTypes.add(name); LibsDisguises.getInstance().getLogger() .info("DEBUG: Skipped method using " + name + ", don't need it in experimental builds"); diff --git a/plugin/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java b/plugin/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java index b1d16645..05f5fd94 100644 --- a/plugin/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java +++ b/plugin/src/test/java/me/libraryaddict/disguise/disguisetypes/DisguiseCloneTest.java @@ -11,9 +11,6 @@ import org.junit.Assert; import java.lang.invoke.MethodHandle; import java.util.Map; -/** - * Created by libraryaddict on 19/01/2020. - */ public class DisguiseCloneTest { /** diff --git a/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseTypesTest.java b/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseTypesTest.java index 9f5329c0..e7688475 100644 --- a/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseTypesTest.java +++ b/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseTypesTest.java @@ -7,9 +7,6 @@ import org.junit.jupiter.api.Assertions; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.EnumSource; -/** - * Created by libraryaddict on 4/05/2019. - */ public class DisguiseTypesTest { @ParameterizedTest diff --git a/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java b/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java index d22c9510..e9e3444a 100644 --- a/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java +++ b/plugin/src/test/java/me/libraryaddict/disguise/utilities/DisguiseUtilitiesTest.java @@ -7,9 +7,6 @@ import org.junit.jupiter.api.Assertions; import java.util.Arrays; -/** - * Created by libraryaddict on 25/10/2018. - */ public class DisguiseUtilitiesTest { @Test public void testNewlineSplitter() { diff --git a/plugin/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java b/plugin/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java index 7593ed1c..163057c9 100644 --- a/plugin/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java +++ b/plugin/src/test/java/me/libraryaddict/disguise/utilities/parser/DisguisePermissionsTest.java @@ -20,9 +20,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -/** - * Created by libraryaddict on 21/10/2018. - */ public class DisguisePermissionsTest { @Test public void testDisguisesExist() {