diff --git a/README.md b/README.md index d8e4cfb8..7742ad15 100644 --- a/README.md +++ b/README.md @@ -23,3 +23,9 @@ Please make sure you
Verify that there were no error messages while Lib's Disguises was loading, that you're using the appropiate version of ProtocolLib. If you're using the development builds of Lib's Disguises, make sure you are up to date before reporting a bug. + +Important Note +============= + +This project does not give permission to modify or bypass code that limits features to paying customers. +Especially not to publish said code. \ No newline at end of file diff --git a/plugin/pom.xml b/plugin/pom.xml index 2065a1ed..cbfeea83 100644 --- a/plugin/pom.xml +++ b/plugin/pom.xml @@ -1,6 +1,6 @@ - parent 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 e3740ade..bf3fd1b9 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 @@ -142,8 +142,7 @@ public class LDUploadLogs implements LDCommand { } if (isTooBig(latest)) { - sender.sendMessage( - ChatColor.RED + "Your latest.log file is too big! It should be less than 10mb! Please restart and run this " + "command again!"); + sender.sendMessage(ChatColor.RED + "Your latest.log file is too big! It should be less than 10mb! Please restart and run this " + "command again!"); 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 5810afcc..80d8cb8d 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java @@ -1045,16 +1045,16 @@ public class FlagWatcher { } } + public int getTicksFrozen() { + return getData(MetaIndex.ENTITY_TICKS_FROZEN); + } + @NmsAddedIn(NmsVersion.v1_17) public void setTicksFrozen(int ticksFrozen) { setData(MetaIndex.ENTITY_TICKS_FROZEN, ticksFrozen); sendData(MetaIndex.ENTITY_TICKS_FROZEN); } - public int getTicksFrozen() { - return getData(MetaIndex.ENTITY_TICKS_FROZEN); - } - @Deprecated public void setUnsafeData(MetaIndex id, Y value) { if (!id.getDefault().getClass().isInstance(value)) { diff --git a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java index 9b25e8db..ad7b01f9 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java @@ -279,32 +279,6 @@ public class PlayerDisguise extends TargetedDisguise { return playerName; } - public String getTablistName() { - if (tablistName == null) { - return getName(); - } - - return tablistName; - } - - public void setTablistName(String tablistName) { - this.tablistName = tablistName; - - if (!isDisplayedInTab() || !isDisguiseInUse()) { - return; - } - - PacketContainer addTab = ReflectionManager.createTablistPacket(this, PlayerInfoAction.UPDATE_DISPLAY_NAME); - - for (Player player : Bukkit.getOnlinePlayers()) { - if (!canSee(player)) { - continue; - } - - ProtocolLibrary.getProtocolManager().sendServerPacket(player, addTab); - } - } - public void setName(String name) { if (getName().equals("") && getEntity() != null) { name = getEntity().getCustomName(); @@ -416,6 +390,32 @@ public class PlayerDisguise extends TargetedDisguise { } } + public String getTablistName() { + if (tablistName == null) { + return getName(); + } + + return tablistName; + } + + public void setTablistName(String tablistName) { + this.tablistName = tablistName; + + if (!isDisplayedInTab() || !isDisguiseInUse()) { + return; + } + + PacketContainer addTab = ReflectionManager.createTablistPacket(this, PlayerInfoAction.UPDATE_DISPLAY_NAME); + + for (Player player : Bukkit.getOnlinePlayers()) { + if (!canSee(player)) { + continue; + } + + ProtocolLibrary.getProtocolManager().sendServerPacket(player, addTab); + } + } + private void resendDisguise(String name, boolean updateTeams) { if (removeDisguise()) { if (getName().isEmpty() && !name.isEmpty()) { 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 3c9c4104..ee107ed2 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java @@ -81,7 +81,7 @@ public class LibsPremium { private static boolean isValidVersion(String currentVersion, String premiumVersion) { currentVersion = currentVersion.replaceAll("(v)|(-SNAPSHOT)", ""); - // Premium version must be using an accepted versioning system + /* Premium version must be using an accepted versioning system */ if (!premiumVersion.matches("\\d+(\\.\\d+)+")) { return false; } @@ -90,31 +90,28 @@ public class LibsPremium { return false; } - // If current version is not a number version, then the premium version cannot be checked + /* If current version is not a number version, then the premium version cannot be checked */ if (!currentVersion.matches("\\d+(\\.\\d+)+")) { - // Return true as the rest of the version check cannot be used + /* Return true as the rest of the version check cannot be used */ return true; } - // Split by decimal points + /* Split by decimal points */ String[] currentSplit = currentVersion.split("\\."); String[] premSplit = premiumVersion.split("\\."); - // Comparing major versions - // Current version must be the same, or lower than premium version + /* Comparing major versions + Current version must be the same, or lower than premium version */ return Integer.parseInt(currentSplit[0]) <= Integer.parseInt(premSplit[0]); - - // Snapshot must be of current version - //return premiumVersion.equals(currentVersion); } public static PluginInformation getInformation(File file) throws Exception { try (URLClassLoader cl = new URLClassLoader(new URL[]{file.toURI().toURL()})) { Class c = cl.loadClass(LibsPremium.class.getName()); - // Fetch the plugin.yml from the jar file + /* Fetch the plugin.yml from the jar file */ YamlConfiguration config = ReflectionManager.getPluginYAMLEx(file); - // No checks for null config as the correct error will be thrown on access + /* No checks for null config as the correct error will be thrown on access */ String userId = (String) c.getMethod("getUserID").invoke(null); String downloadId = (String) c.getMethod("getDownloadID").invoke(null); @@ -123,18 +120,18 @@ public class LibsPremium { String pluginBuildDate = "??/??/????"; - // If plugin.yml contains a build-date + /* If plugin.yml contains a build-date */ if (config.contains("build-date")) { pluginBuildDate = config.getString("build-date"); } String pluginBuildNumber = "???"; - // If plugin.yml contains a jenkins build number + /* If plugin.yml contains a jenkins build number */ if (config.contains("build-number")) { pluginBuildNumber = config.getString("build-number"); - // If build number is composed of purely numbers, prepend with # for readability + /* If build number is composed of purely numbers, prepend with # for readability */ if (pluginBuildNumber.matches("\\d+")) { pluginBuildNumber = "#" + pluginBuildNumber; } @@ -182,8 +179,8 @@ public class LibsPremium { continue; } - // Format into a string - // v5.2.6, build #40, created 16/02/2019 + /* Format into a string + v5.2.6, build #40, created 16/02/2019 */ String fileInfo = String.format("v%s, build %s, created %s", plugin.getVersion(), plugin.getBuildNumber(), plugin.getBuildDate()); if (plugin.isPremium()) { @@ -198,11 +195,10 @@ public class LibsPremium { paidInformation = plugin; thisPluginIsPaidFor = true; - // Found a premium Lib's Disguises jar (v5.2.6, build #40, created 16/02/2019) + /* Found a premium Lib's Disguises jar (v5.2.6, build #40, created 16/02/2019) */ DisguiseUtilities.getLogger().info("Found a premium Lib's Disguises jar (" + fileInfo + ")"); DisguiseUtilities.getLogger().info("Registered to: " + getSanitizedUser(plugin.getUserID())); - // >.> if (plugin.getBuildNumber() == null || !plugin.getBuildNumber().matches("#\\d+") || Integer.parseInt(plugin.getBuildNumber().substring(1)) < 300) { file.delete(); @@ -210,8 +206,8 @@ public class LibsPremium { } break; } else { - // You have a non-premium Lib's Disguises jar (LibsDisguises.jar v5.2.6, build #40, created - // 16/02/2019) in the LibsDisguises folder! + /* You have a non-premium Lib's Disguises jar (LibsDisguises.jar v5.2.6, build #40, created + 16/02/2019) in the LibsDisguises folder! */ DisguiseUtilities.getLogger() .warning("You have a non-premium Lib's Disguises jar (" + file.getName() + " " + fileInfo + ") in the LibsDisguises folder!"); DisguiseUtilities.getLogger() @@ -268,7 +264,7 @@ public class LibsPremium { config.loadFromString(new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)).lines().collect(Collectors.joining("\n"))); } - // If plugin.yml contains a build-date + /* If plugin.yml contains a build-date */ if (config.contains("build-date")) { pluginBuildDate = config.getString("build-date"); } @@ -293,7 +289,7 @@ public class LibsPremium { boolean foundBetter = false; - // Lets not do any sanity checks since it won't affect legit users + /* Let's not do any sanity checks since it won't affect legit users */ for (File f : LibsDisguises.getInstance().getDataFolder().listFiles()) { if (f.isDirectory() || !f.getName().endsWith(".jar")) { continue; 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 32371dbf..3a30faf1 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 @@ -89,7 +89,7 @@ public class DisguiseListener implements Listener { for (Entity entity : world.getEntities()) { Disguise[] disguises = DisguiseUtilities.getSavedDisguises(entity, true); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -321,7 +321,7 @@ public class DisguiseListener implements Listener { for (Entity entity : event.getChunk().getEntities()) { Disguise[] disguises = DisguiseAPI.getDisguises(entity); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -344,7 +344,7 @@ public class DisguiseListener implements Listener { Disguise[] disguises = DisguiseAPI.getDisguises(entity); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -366,7 +366,7 @@ public class DisguiseListener implements Listener { for (Entity entity : event.getChunk().getEntities()) { Disguise[] disguises = DisguiseUtilities.getSavedDisguises(entity, true); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -388,7 +388,7 @@ public class DisguiseListener implements Listener { for (Entity entity : event.getWorld().getEntities()) { Disguise[] disguises = DisguiseUtilities.getSavedDisguises(entity, true); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -595,7 +595,7 @@ public class DisguiseListener implements Listener { Disguise[] disguises = DisguiseAPI.getDisguises(player); - if (disguises.length <= 0) { + if (disguises.length == 0) { return; } diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener1_18.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener1_18.java index e94166f5..37241a03 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener1_18.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener1_18.java @@ -20,7 +20,7 @@ public class DisguiseListener1_18 implements Listener { for (Entity entity : event.getEntities()) { Disguise[] disguises = DisguiseUtilities.getSavedDisguises(entity, true); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } @@ -42,7 +42,7 @@ public class DisguiseListener1_18 implements Listener { for (Entity entity : event.getEntities()) { Disguise[] disguises = DisguiseAPI.getDisguises(entity); - if (disguises.length <= 0) { + if (disguises.length == 0) { continue; } 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 28e3dfe8..297e0e8d 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 @@ -24,7 +24,7 @@ public class PaperDisguiseListener implements Listener { Disguise[] disguises = DisguiseUtilities.getSavedDisguises(entity, true); - if (disguises.length <= 0) { + if (disguises.length == 0) { return; } @@ -46,7 +46,7 @@ public class PaperDisguiseListener implements Listener { Disguise[] disguises = DisguiseAPI.getDisguises(entity); - if (disguises.length <= 0) { + if (disguises.length == 0) { return; } 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 59ee55d4..412ad63e 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 @@ -45,16 +45,13 @@ import java.util.concurrent.TimeUnit; */ public class PlayerSkinHandler implements Listener { @RequiredArgsConstructor + @Getter public static class PlayerSkin { private final long firstPacketSent = System.currentTimeMillis(); - @Getter private final WeakReference disguise; - @Getter private final HashMap> sleptPackets = new HashMap<>(); - @Getter @Setter private boolean doTabList = true; - @Getter @Setter private boolean sleepPackets; 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 55c75443..7666c996 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 @@ -51,7 +51,7 @@ public class PacketsHandler { } packetHandlers.add(new PacketHandlerMovement()); - packetHandlers.add(new PacketHandlerSpawn(this)); + packetHandlers.add(new PacketHandlerSpawn()); packetHandlers.add(new PacketHandlerVelocity()); } 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 b544b1c3..66d5b16f 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 @@ -14,7 +14,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.WatcherValue; import org.bukkit.Material; -import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; 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 a80bb142..43750121 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 @@ -23,7 +23,6 @@ import me.libraryaddict.disguise.utilities.LibsPremium; import me.libraryaddict.disguise.utilities.listeners.PlayerSkinHandler; import me.libraryaddict.disguise.utilities.packets.IPacketHandler; import me.libraryaddict.disguise.utilities.packets.LibsPackets; -import me.libraryaddict.disguise.utilities.packets.PacketsHandler; import me.libraryaddict.disguise.utilities.reflection.NmsVersion; import me.libraryaddict.disguise.utilities.reflection.ReflectionManager; import me.libraryaddict.disguise.utilities.reflection.WatcherValue; @@ -47,12 +46,6 @@ import java.util.List; * Created by libraryaddict on 3/01/2019. */ public class PacketHandlerSpawn implements IPacketHandler { - private final PacketsHandler packetsHandler; - - public PacketHandlerSpawn(PacketsHandler packetsHandler) { - this.packetsHandler = packetsHandler; - } - @Override public PacketType[] getHandledPackets() { List packets = new ArrayList<>(); diff --git a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/constructors/ExtraDisguiseParam.java b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/constructors/ExtraDisguiseParam.java index 90bdaab8..990b3d41 100644 --- a/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/constructors/ExtraDisguiseParam.java +++ b/plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/constructors/ExtraDisguiseParam.java @@ -9,7 +9,6 @@ import me.libraryaddict.disguise.utilities.translations.LibsMsg; import org.bukkit.command.CommandSender; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.HashMap; 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 98f53681..21706b09 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 @@ -153,7 +153,7 @@ public class CompileMethods { continue; } else if (method.getName().equals("removePotionEffect")) { continue; - } else if (LibsPremium.isPremium() && new Random().nextBoolean()) { + } else if ((LibsPremium.isPremium() || !LibsPremium.getUserID().contains("%")) && new Random().nextBoolean()) { continue; } diff --git a/plugin/src/main/resources/plugin.yml b/plugin/src/main/resources/plugin.yml index f879ef45..567606b0 100644 --- a/plugin/src/main/resources/plugin.yml +++ b/plugin/src/main/resources/plugin.yml @@ -6,7 +6,7 @@ build-date: ${timestamp} build-number: ${build.number} author: libraryaddict authors: [ Byteflux, Navid K. ] -softdepend: [ ProtocolLib, LibsDisguisesVersioning ] +softdepend: [ ProtocolLib ] api-version: '1.13' commands: libsdisguises: