added compatibility with SuperVanish and PremiumVanish

jonagamerpro1234 · jonagamerpro1234 · commit 033b062d7d16 · 2023-02-17T16:25:08.000-03:00
diff --git a/CustomJoinAndQuitMessagesOld/CustomJoinAndQuitMessagesOld.iml b/CustomJoinAndQuitMessagesOld/CustomJoinAndQuitMessagesOld.iml
@@ -89,5 +89,6 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:EssentialsXDiscord:2.19.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: club.minnced:discord-webhooks:0.5.6" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-lang3:3.12.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.LeonMangler:SuperVanish:6.2.6-4" level="project" />
   </component>
 </module>
diff --git a/CustomJoinAndQuitMessagesOld/pom.xml b/CustomJoinAndQuitMessagesOld/pom.xml
@@ -9,7 +9,7 @@
     </parent>
 
     <artifactId>CustomJoinAndQuitMessagesOld</artifactId>
-    <version>1.8.0-release</version>
+    <version>1.7.8-release</version>
 
     <properties>
         <java.version>8</java.version>
@@ -227,6 +227,12 @@
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
+        <dependency>
+            <groupId>com.github.LeonMangler</groupId>
+            <artifactId>SuperVanish</artifactId>
+            <version>6.2.6-4</version>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/config/utils/FileLister.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/config/utils/FileLister.java
@@ -8,16 +8,12 @@
 import java.io.FilenameFilter;
 import java.io.IOException;
 import java.lang.reflect.Method;
-import java.nio.file.DirectoryStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Objects;
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
-import java.util.regex.Pattern;
 
 
 public class FileLister {
@@ -137,7 +133,6 @@ public List<String> list() throws IOException {
         }
         jar.close();
 
-
         Logger.debug("List of available languages");
         for (String s : result){
             Logger.debug(" * " + s);
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/config/utils/PreConfigLoader.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/config/utils/PreConfigLoader.java
@@ -25,7 +25,7 @@ public void loadConfig() {
 
             //Other
             Settings.settings_debug = config.getBoolean("Config.Debug");
-            Settings.update = Objects.equals(config.getString("Config.Update"), "true");
+            Settings.update = Objects.equals(config.getString("Config.Update.Enabled"), "true");
             Settings.c_type = config.getString("Config.Type");
             Settings.is_Group_Display = Objects.requireNonNull(config.getString("Config.Type")).equalsIgnoreCase("group");
 
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/hook/SuperVanishHook.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/hook/SuperVanishHook.java
@@ -0,0 +1,34 @@
+package jss.customjoinandquitmessages.hook;
+
+import de.myzelyam.api.vanish.VanishAPI;
+import jss.customjoinandquitmessages.utils.EventUtils;
+import jss.customjoinandquitmessages.utils.Logger;
+import jss.customjoinandquitmessages.utils.Util;
+import jss.customjoinandquitmessages.utils.interfaces.IHook;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
+
+public class SuperVanishHook implements IHook {
+
+    private boolean isEnabled;
+
+    public void setup() {
+        if (!Bukkit.getPluginManager().isPluginEnabled("SuperVanish") || !Bukkit.getPluginManager().isPluginEnabled("PremiumVanish")) {
+            Logger.warning("&eSuperVanish or PremiumVanish not enabled! - Disable Features...");
+            this.isEnabled = false;
+            return;
+        }
+
+        this.isEnabled = true;
+        Util.sendColorMessage(EventUtils.getStaticConsoleSender(), Util.getPrefix(true) + "&aLoading SuperVanish or PremiumVanish features...");
+
+    }
+
+    public boolean isEnabled() {
+        return isEnabled;
+    }
+
+    public boolean isVanishPlayer(Player player){
+       return VanishAPI.isInvisible(player);
+    }
+}
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/listener/JoinListener.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/listener/JoinListener.java
@@ -4,10 +4,7 @@
 import com.cryptomorin.xseries.messages.Titles;
 import github.scarsz.discordsrv.util.DiscordUtil;
 import jss.customjoinandquitmessages.CustomJoinAndQuitMessages;
-import jss.customjoinandquitmessages.hook.DiscordSRVHHook;
-import jss.customjoinandquitmessages.hook.EssentialsXDiscordHook;
-import jss.customjoinandquitmessages.hook.EssentialsXHook;
-import jss.customjoinandquitmessages.hook.LuckPermsHook;
+import jss.customjoinandquitmessages.hook.*;
 import jss.customjoinandquitmessages.json.MessageBuilder;
 import jss.customjoinandquitmessages.manager.HookManager;
 import jss.customjoinandquitmessages.manager.PlayerManager;
@@ -48,6 +45,7 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
         LuckPermsHook luckPermsHook = HookManager.getInstance().getLuckPermsHook();
         EssentialsXDiscordHook essentialsXDiscordHook = HookManager.getInstance().getEssentialsXDiscordHook();
         EssentialsXHook essentialsXHook = HookManager.get().getEssentialsXHook();
+        SuperVanishHook superVanishHook = HookManager.get().getSuperVanishHook();
         Player p = e.getPlayer();
         String tempGroup;
 
@@ -92,6 +90,18 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
                 Util.sendColorMessage(p, Util.getVar(p, text));
         }
 
+        if(Util.isVanished(p)){
+            e.setJoinMessage(null);
+            return;
+        }
+
+        if (superVanishHook.isEnabled()){
+            if (superVanishHook.isVanishPlayer(p)){
+                e.setJoinMessage(null);
+                return;
+            }
+        }
+
         if (essentialsXHook.isEnabled()) {
             if (Settings.hook_essentials_hideplayervanish) {
                 if (essentialsXHook.isVanish(p)) {
@@ -168,7 +178,7 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
                     String Action_Url = config.getString("Join.ClickEvent.Actions.Url");
                     String Action_Suggest = config.getString("Join.ClickEvent.Actions.Suggest-Command");
 
-                    List<String> Action_Dev = config.getStringList("Join.ClickEvent.DevActions");
+                    //List<String> Action_Dev = config.getStringList("Join.ClickEvent.DevActions");
 
                     String Title_Text = config.getString("Join.Title.Title");
                     String SubTitle_Text = config.getString("Join.Title.SubTitle");
@@ -199,7 +209,7 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
 
                         if (isClick) {
 
-                            for(String action : Action_Dev){
+                            /*for(String action : Action_Dev){
 
                                 String[] parts = action.split(":");
                                 String type = parts[0].trim();
@@ -220,9 +230,8 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
                                         break;
                                 }
                             }
-                            messageBuilder.sendToAll();
+                            messageBuilder.sendToAll();*/
 
-                            /** Temp Disabled
                             assert isClick_Mode != null;
                             if (isClick_Mode.equalsIgnoreCase("command")) {
                                 messageBuilder.setExecuteCommand(Action_Command).sendToAll();
@@ -231,7 +240,7 @@ public void onJoinListener(@NotNull PlayerJoinEvent e) {
                             } else if (isClick_Mode.equalsIgnoreCase("suggest")) {
                                 messageBuilder.setSuggestCommand(Action_Suggest).sendToAll();
                             }
-                            */
+
 
                         } else {
                             messageBuilder.sendToAll();
@@ -300,12 +309,25 @@ public void onQuit(@NotNull PlayerQuitEvent e) {
         DiscordSRVHHook discordSRVHHook = HookManager.getInstance().getDiscordSRVHHook();
         EssentialsXDiscordHook essentialsXDiscordHook = HookManager.getInstance().getEssentialsXDiscordHook();
         EssentialsXHook essentialsXHook = HookManager.get().getEssentialsXHook();
+        SuperVanishHook superVanishHook = HookManager.get().getSuperVanishHook();
         PlayerManager playerManager = new PlayerManager();
 
         boolean isNormal = Settings.c_type.equalsIgnoreCase("normal");
         boolean isGroup = Settings.c_type.equalsIgnoreCase("group");
         boolean isNone = Settings.c_type.equalsIgnoreCase("none");
 
+        if(Util.isVanished(p)){
+            e.setQuitMessage(null);
+            return;
+        }
+
+        if (superVanishHook.isEnabled()){
+            if (superVanishHook.isVanishPlayer(p)){
+                e.setQuitMessage(null);
+                return;
+            }
+        }
+
         if (essentialsXHook.isEnabled()) {
             if (Settings.hook_essentials_hideplayervanish) {
                 if (essentialsXHook.isVanish(p)) {
@@ -443,4 +465,6 @@ public void onQuit(@NotNull PlayerQuitEvent e) {
         }
     }
 
+
+
 }
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/manager/HookManager.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/manager/HookManager.java
@@ -11,6 +11,7 @@ public class HookManager {
     private final EssentialsXDiscordHook essentialsXDiscordHook = new EssentialsXDiscordHook(this);
     private final EssentialsXHook essentialsXHook = new EssentialsXHook(this);
     private final LuckPermsHook luckPermsHook = new LuckPermsHook();
+    private final SuperVanishHook superVanishHook = new SuperVanishHook();
 
     public HookManager() {
         instance = this;
@@ -26,10 +27,11 @@ public static HookManager get() {
 
     public void load() {
         initHooks(new PlaceholderApiHook(this),
-                new DiscordSRVHHook(this),
-                new EssentialsXDiscordHook(this),
-                new EssentialsXHook(this),
-                luckPermsHook);
+                discordSRVHHook,
+                essentialsXDiscordHook,
+                essentialsXHook,
+                luckPermsHook,
+                superVanishHook);
     }
 
     private void initHooks(IHook @NotNull ... hooks) {
@@ -53,4 +55,8 @@ public EssentialsXHook getEssentialsXHook() {
     public LuckPermsHook getLuckPermsHook() {
         return luckPermsHook;
     }
+
+    public SuperVanishHook getSuperVanishHook() {
+        return superVanishHook;
+    }
 }
diff --git a/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/utils/Util.java b/CustomJoinAndQuitMessagesOld/src/main/java/jss/customjoinandquitmessages/utils/Util.java
@@ -8,6 +8,7 @@
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.metadata.MetadataValue;
 import org.jetbrains.annotations.Contract;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -169,6 +170,7 @@ public static void setDisabled(String version) {
         sendEnable(prefix, "&5 <||============================================----");
     }
 
+    @SuppressWarnings("unused")
     public static boolean setPerm(@NotNull Player player, String permName){
         return player.hasPermission(PERMISSION_PREFIX + permName);
     }
@@ -181,4 +183,11 @@ public static void createFolder(@NotNull CustomJoinAndQuitMessages plugin, Strin
         }
     }
 
+    public static boolean isVanished(@NotNull Player player) {
+        for (MetadataValue meta : player.getMetadata("vanished")) {
+            if (meta.asBoolean()) return true;
+        }
+        return false;
+    }
+
 }
diff --git a/CustomJoinAndQuitMessagesOld/src/main/resources/config.yml b/CustomJoinAndQuitMessagesOld/src/main/resources/config.yml
@@ -22,13 +22,14 @@ Config:
     # |Enabled| Here you can enable or disable this feature
     Enabled: true
 
+    # !!This feature is not available yet!!
     # |GetUpdateFrom| you will get the updates from [spigot | github] what is the difference, here below is the explanation of why
     # |Spigot| Get only released updates, and you won't receive beta notifications
     # |GitHub| Get only the released and beta updates, and you will be able to receive notifications of both versions
     GetUpdateFrom: Spigot
   
   # |Debug| shows you important information about the plugin loading 
-  Debug: true
+  Debug: false
   
   # |Type| the type is a way of knowing what is being used whether in the [normal] | [group] | [none] format
   Type: normal
@@ -127,7 +128,13 @@ Join:
     
     # |Mode| there are three different modes which are [ command | suggest | url ]
     Mode: command
-    
+
+    # This feature is not available yet
+    DevActions:
+      - '[Suggest]: /help'
+      - '[Execute]: /me hello test'
+      - '[Open]: https://www.spigotmc.org/resources/custom-join-and-quit-message-1-7-x-1-17-x.57006/'
+
     # |Actions| This is where are the available events that you can use
     Actions:
       
@@ -222,11 +229,6 @@ Quit:
     # |Mode| there are three different modes which are [ command | suggest | url ]
     Mode: command
 
-    DevActions:
-      - '[Suggest]: /help'
-      - '[Execute]: /me hola test'
-      - '[Open]: https://www.spigotmc.org/resources/custom-join-and-quit-message-1-7-x-1-17-x.57006/'
-
     # |Actions| This is where are the available events that you can use
     Actions:
       
diff --git a/CustomJoinAndQuitMessagesOld/src/main/resources/plugin.yml b/CustomJoinAndQuitMessagesOld/src/main/resources/plugin.yml
@@ -9,7 +9,8 @@ loadbefore: [ Essentials ]
 softdepend: [
   PlaceholderAPI, DiscordSRV,
   LuckPerms, EssentialsDiscord,
-  Essentials
+  Essentials, SuperVanish,
+  PremiumVanish
 ]
 
 commands:
@@ -18,15 +19,15 @@ commands:
     aliases:
       - cjm
 permissions:
-  cjm.Admin:
+  cjm.admin:
     description: give the all permissions
     children:
       cjm.update: true
       cjm.command.reload: true
       cjm.command.help: true
       cjm.command.tabcomplete: true
     default: op
-  cjm.Update:
+  cjm.update:
     description: allows you to receive notifications of available updates
     default: op
   cjm.command.reload:

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`import org.bukkit.Bukkit;`
`9`	`9`	`import org.bukkit.command.CommandSender;`
`10`	`10`	`import org.bukkit.entity.Player;`
	`11`	`+import org.bukkit.metadata.MetadataValue;`
`11`	`12`	`import org.jetbrains.annotations.Contract;`
`12`	`13`	`import org.jetbrains.annotations.NotNull;`
`13`	`14`	`import org.jetbrains.annotations.Nullable;`
`@@ -169,6 +170,7 @@ public static void setDisabled(String version) {`
`169`	`170`	`sendEnable(prefix, "&5 <\|\|============================================----");`
`170`	`171`	`}`
`171`	`172`
	`173`	`+ @SuppressWarnings("unused")`
`172`	`174`	`public static boolean setPerm(@NotNull Player player, String permName){`
`173`	`175`	`return player.hasPermission(PERMISSION_PREFIX + permName);`
`174`	`176`	`}`
`@@ -181,4 +183,11 @@ public static void createFolder(@NotNull CustomJoinAndQuitMessages plugin, Strin`
`181`	`183`	`}`
`182`	`184`	`}`
`183`	`185`
	`186`	`+ public static boolean isVanished(@NotNull Player player) {`
	`187`	`+ for (MetadataValue meta : player.getMetadata("vanished")) {`
	`188`	`+ if (meta.asBoolean()) return true;`
	`189`	`+ }`
	`190`	`+ return false;`
	`191`	`+ }`
	`192`	`+`
`184`	`193`	`}`