Make the addon more generic and work on Paper too

.woodpecker/publish_assets.yml

@@ -29,6 +29,6 @@ steps:
         - "bungeecord/target/AdvancedServerList-*.jar"
         - "paper/target/AdvancedServerList-*.jar"
         - "velocity/target/AdvancedServerList-*.jar"
-        - "advancedban-addon/target/AdvancedServerList-*.jar"
+        - "addons/banplugins/target/AdvancedServerList-*.jar"
       api_key:
         from_secret: CB_TOKEN

addons/banplugins/pom.xml

@@ -34,7 +34,7 @@
         <version>parent</version>
     </parent>
     
-    <artifactId>advancedban</artifactId>
+    <artifactId>banplugins</artifactId>
     <packaging>jar</packaging>
     <version>${plugin.version}</version>
 
@@ -49,9 +49,14 @@
             <id>sonatype</id>
             <url>https://oss.sonatype.org/content/repositories/snapshots/</url>
         </repository>
+        <repository>
+            <id>papermc</id>
+            <url>https://papermc.io/repo/repository/maven-public/</url>
+        </repository>
     </repositories>
     
     <dependencies>
+        <!-- Proxy/Server -->
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-api</artifactId>
@@ -66,6 +71,14 @@
             <type>javadoc</type>
             <scope>provided</scope>
         </dependency>
+        <dependency>
+            <groupId>io.papermc.paper</groupId>
+            <artifactId>paper-api</artifactId>
+            <version>1.20-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        
+        <!-- Plugin APIs -->
         <dependency>
             <groupId>com.github.DevLeoko</groupId>
             <artifactId>AdvancedBan</artifactId>

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPlugins.java

@@ -23,28 +23,33 @@
  *
  */
 
-package ch.andre601.advancedserverlist.advancedban;
+package ch.andre601.advancedserverlist.banplugins.bungeecord;
 
-import ch.andre601.advancedserverlist.advancedban.placeholders.AdvancedBanPlaceholders;
-import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
-import net.md_5.bungee.api.plugin.Plugin;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
 
-public class AdvancedBanAddon extends Plugin{
+import java.util.HashMap;
+import java.util.Map;
+
+public enum BungeeCordBanPlugins{
     
-    @Override
-    public void onEnable(){
-        if(getProxy().getPluginManager().getPlugin("AdvancedServerList") == null){
-            getLogger().warning("Unable to find AdvancedServerList! This Plugin requires it to work!");
-            return;
+    ADVANCED_BANS("AdvancedBans", new AdvancedBanPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    BungeeCordBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(BungeeCordBanPlugins bungeeCordBanPlugins : BungeeCordBanPlugins.values()){
+            content.put(bungeeCordBanPlugins.plugin, bungeeCordBanPlugins.placeholderProvider);
         }
         
-        if(getProxy().getPluginManager().getPlugin("AdvancedBan") == null){
-            getLogger().warning("Unable to find AdvancedBan! This Plugin requires it to work!");
-            return;
-        }
-        
-        getLogger().info("Registering AdvancedServerList Placeholders...");
-        AdvancedServerListAPI.get().addPlaceholderProvider(new AdvancedBanPlaceholders());
-        getLogger().info("Successfully registered AdvancedBan Placeholders for AdvancedServerList.");
+        return content;
     }
 }

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/bungeecord/BungeeCordBanPluginsAddon.java

@@ -0,0 +1,68 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.bungeecord;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import net.md_5.bungee.api.plugin.Plugin;
+
+import java.util.Map;
+
+public class BungeeCordBanPluginsAddon extends Plugin{
+    
+    @Override
+    public void onEnable(){
+        if(getProxy().getPluginManager().getPlugin("AdvancedServerList") == null){
+            getLogger().warning("AdvancedServerList is not enabled. This plugin requires it to function!");
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            getLogger().warning("No compatible Ban plugin was found to register placeholders for.");
+        }else{
+            getLogger().info("Loaded " + loadedPlaceholders + " Placeholders for AdvancedServerList!");
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = BungeeCordBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(getProxy().getPluginManager().getPlugin(entry.getKey()) != null){
+                getLogger().info("Registering Placeholders for " + entry.getKey() + "...");
+                api.addPlaceholderProvider(entry.getValue());
+                getLogger().info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/paper/PaperBanPlugins.java

@@ -0,0 +1,55 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.paper;
+
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import ch.andre601.advancedserverlist.banplugins.placeholders.AdvancedBanPlaceholders;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public enum PaperBanPlugins{
+    
+    ADVANCED_BANS("AdvancedBans", new AdvancedBanPlaceholders());
+    
+    private final String plugin;
+    private final PlaceholderProvider placeholderProvider;
+    
+    PaperBanPlugins(String plugin, PlaceholderProvider placeholderProvider){
+        this.plugin = plugin;
+        this.placeholderProvider = placeholderProvider;
+    }
+    
+    public static Map<String, PlaceholderProvider> getBanPlugins(){
+        Map<String, PlaceholderProvider> content = new HashMap<>();
+        
+        for(PaperBanPlugins paperBanPlugins : PaperBanPlugins.values()){
+            content.put(paperBanPlugins.plugin, paperBanPlugins.placeholderProvider);
+        }
+        
+        return content;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/paper/PaperBanPluginsAddon.java

@@ -0,0 +1,71 @@
+/*
+ * MIT License
+ *
+ * Copyright (c) 2022-2024 Andre_601
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+package ch.andre601.advancedserverlist.banplugins.paper;
+
+import ch.andre601.advancedserverlist.api.AdvancedServerListAPI;
+import ch.andre601.advancedserverlist.api.PlaceholderProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.Map;
+
+public class PaperBanPluginsAddon extends JavaPlugin{
+    
+    @Override
+    public void onEnable(){
+        if(!getServer().getPluginManager().isPluginEnabled("AdvancedServerList")){
+            getLogger().warning("AdvancedServerList is not enabled. This plugin requires it to function!");
+            getServer().getPluginManager().disablePlugin(this);
+            return;
+        }
+        
+        int loadedPlaceholders = loadPlaceholderProviders();
+        if(loadedPlaceholders == 0){
+            getLogger().warning("No compatible Ban plugin was found to register placeholders for. Disabling plugin...");
+            
+            getServer().getPluginManager().disablePlugin(this);
+        }else{
+            getLogger().info("Loaded " + loadedPlaceholders + " Placeholders for AdvancedServerList!");
+        }
+    }
+    
+    private int loadPlaceholderProviders(){
+        int loaded = 0;
+        Map<String, PlaceholderProvider> banPlugins = PaperBanPlugins.getBanPlugins();
+        AdvancedServerListAPI api = AdvancedServerListAPI.get();
+        
+        for(Map.Entry<String, PlaceholderProvider> entry : banPlugins.entrySet()){
+            if(getServer().getPluginManager().isPluginEnabled(entry.getKey())){
+                getLogger().info("Registering Placeholders for " + entry.getKey() + "...");
+                api.addPlaceholderProvider(entry.getValue());
+                getLogger().info("Placeholder successfully registered!");
+                
+                loaded++;
+            }
+        }
+        
+        return loaded;
+    }
+}

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/placeholders/AdvancedBanPlaceholders.java

@@ -23,9 +23,9 @@
  *
  */
 
-package ch.andre601.advancedserverlist.advancedban.placeholders;
+package ch.andre601.advancedserverlist.banplugins.placeholders;
 
-import ch.andre601.advancedserverlist.advancedban.ban.AdvancedBanProvider;
+import ch.andre601.advancedserverlist.banplugins.providers.AdvancedBanProvider;
 import ch.andre601.advancedserverlist.api.PlaceholderProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
 import ch.andre601.advancedserverlist.api.objects.GenericServer;

addons/banplugins/src/main/java/ch/andre601/advancedserverlist/banplugins/providers/AdvancedBanProvider.java

@@ -23,7 +23,7 @@
  *
  */
 
-package ch.andre601.advancedserverlist.advancedban.ban;
+package ch.andre601.advancedserverlist.banplugins.providers;
 
 import ch.andre601.advancedserverlist.api.ban.PunishmentProvider;
 import ch.andre601.advancedserverlist.api.objects.GenericPlayer;
@@ -103,7 +103,7 @@ public class AdvancedBanProvider implements PunishmentProvider{
     }
     
     public String getBanDuration(GenericPlayer player, boolean fromStart){
-        Punishment ban = getMute(player);
+        Punishment ban = getBan(player);
         if(ban == null)
             return null;
         

addons/banplugins/src/main/resources/bungee.yml

@@ -7,4 +7,4 @@ softDepends:
   - AdvancedServerList
   - AdvancedBan
 
-main: 'ch.andre601.advancedserverlist.advancedban.AdvancedBanAddon'
+main: 'ch.andre601.advancedserverlist.banplugins.bungeecord.BungeeCordBanPluginsAddon'

addons/banplugins/src/main/resources/paper-plugin.yml

@@ -0,0 +1,17 @@
+name: 'ASLAdvancedBanAddon'
+author: 'Andre_601'
+version: '${plugin.version}'
+description: '${plugin.description}'
+
+main: 'ch.andre601.advancedserverlist.banplugins.paper.AdvancedBanPlaceholders'
+
+api-version: '1.19'
+
+dependencies: 
+  server: 
+    AdvancedServerList:
+      required: false
+      load: BEFORE
+    AdvancedBans:
+      required: false
+      load: BEFORE

pom.xml

@@ -41,7 +41,7 @@
         <plugin.version>4.0.0</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
-        <api.version>43e5e3b2f1</api.version>
+        <api.version>v3.2.0</api.version>
         
         <maven.compiler.source>16</maven.compiler.source>
         <maven.compiler.target>16</maven.compiler.target>
@@ -60,6 +60,6 @@
         <module>paper</module>
         <module>velocity</module>
         <module>version-uploader</module>
-        <module>addons/advancedban</module>
+        <module>addons/banplugins</module>
     </modules>
 </project>