Only change cb_token.

Reviewed-on: https://codeberg.org/Andre601/AdvancedServerList/pulls/258

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
 blank_issues_enabled: false
 contact_links:
   - name: Discord Server
-    about: Ask questions about the plugin in the `#advancedserverlist` channel.
-    url: https://discord.gg/6dazXp6
+    about: Ask questions about the plugin in the `advancedserverlist` category of the M.O.S.S. Discord.
+    url: https://discord.gg/MyPTjpsgGH
   - name: Wiki
     about: Check the Wiki for explanations about the features and examples.
-    url: https://docs.andre601.ch/AdvancedServerList
+    url: https://asl.andre601.ch

.github/assets/MODRINTH.md

@@ -80,7 +80,7 @@ Spanish Video by Ajneb97
 </a>
 
 ## Support
-<a href="https://discord.gg/6dazXp6" target="_blank">
+<a href="https://discord.gg/MyPTjpsgGH" target="_blank">
   <img src="https://wsrv.nl/?url=https://cdn.jsdelivr.net/npm/@intergrav/devins-badges@3/assets/compact-minimal/social/discord-singular_vector.svg&w=64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">

.woodpecker/pr_preview.yml

@@ -39,8 +39,6 @@ steps:
     image: mcs94/gitea-comment
     when:
       - status: ['success']
-    secrets:
-      - bot_token
     settings:
       gitea_address: https://codeberg.org
       gitea_token:
@@ -56,8 +54,6 @@ steps:
     image: mcs94/gitea-comment
     when:
       - status: ['failure']
-    secrets:
-      - bot_token
     settings:
       gitea_address: https://codeberg.org
       gitea_token:

.woodpecker/publish_assets.yml

@@ -6,14 +6,12 @@ steps:
   createFiles:
     image: maven:3.9.6-eclipse-temurin-17
     secrets:
-      - source: cb_token
-        target: codeberg_api_token
-      - source: modrinth_api_token
-        target: modrinth_api_token
-      - source: hangar_api_token
-        target: hangar_api_token
-      - source: discord_webhook_url
-        target: discord_webhook_url
+      - modrinth_api_token
+      - hangar_api_token
+      - discord_webhook_url
+    environment:
+      CODEBERG_API_TOKEN:
+        from_secret: cb_token
     commands:
       # Create the jar files.
       - mvn clean install
@@ -33,7 +31,7 @@ steps:
         - "velocity/target/AdvancedServerList-*.jar"
         - "addons/banplugins/target/AdvancedServerList-*.jar"
       api_key:
-        from_secret: CB_TOKEN
+        from_secret: cb_token
   postOnMastodon:
     image: woodpeckerci/plugin-mastodon-post
     when:
@@ -41,6 +39,6 @@ steps:
     settings:
       server_url: https://blobfox.coffee
       access_token:
-        from_secret: MASTODON_TOKEN
+        from_secret: mastodon_token
       status: '${CI_COMMIT_TAG} of #AdvancedServerList has been released and can be found on Modrinth (https://modrinth.com/plugin/AdvancedServerList), Hangar (https://hangar.papermc.io/Andre_601/AdvancedServerList) and Codeberg (https://codeberg.org/Andre601/AdvancedServerList).'
       visibility: public

README.md

@@ -88,7 +88,7 @@ You can disable this in the global bStats config file located in `/plugins/bstat
 
 ## Support
 
-<a href="https://discord.gg/6dazXp6" target="_blank">
+<a href="https://discord.gg/MyPTjpsgGH" target="_blank">
   <img src="https://cdn.jsdelivr.net/gh/Andre601/devins-badges@13e0142/assets/compact-minimal/social/discord-singular_vector.svg" height="64" alt="discord" title="Join my Discord Server">
 </a>
 <a href="https://app.revolt.chat/invite/74TpERXA" target="_blank">

bungeecord/pom.xml

@@ -165,6 +165,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/BungeeCordCore.java

@@ -36,6 +36,7 @@ import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
 import ch.andre601.advancedserverlist.core.interfaces.core.PluginCore;
 import ch.andre601.advancedserverlist.core.profiles.favicon.FaviconHandler;
 import de.myzelyam.api.vanish.BungeeVanishAPI;
+import net.kyori.adventure.platform.bungeecord.BungeeAudiences;
 import net.md_5.bungee.api.Favicon;
 import net.md_5.bungee.api.config.ServerInfo;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
@@ -52,10 +53,12 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
     
     private AdvancedServerList<Favicon> core;
     private FaviconHandler<Favicon> faviconHandler = null;
+    private BungeeAudiences audiences = null;
     private final PluginLogger logger = new BungeeLogger(this);
     
     @Override
     public void onEnable(){
+        this.audiences = BungeeAudiences.create(this);
         this.core = AdvancedServerList.init(this, BungeePlayerPlaceholders.init(), BungeeServerPlaceholders.init(this));
     }
     
@@ -139,6 +142,10 @@ public class BungeeCordCore extends Plugin implements PluginCore<Favicon>{
         return Favicon.create(image);
     }
     
+    public BungeeAudiences getAudiences(){
+        return audiences;
+    }
+    
     public int getOnlinePlayers(ServerInfo server){
         List<ProxiedPlayer> players = new ArrayList<>(server == null ? getProxy().getPlayers() : server.getPlayers());
         

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/commands/CmdAdvancedServerList.java

@@ -33,16 +33,14 @@ import net.md_5.bungee.api.plugin.Command;
 public class CmdAdvancedServerList extends Command{
     
     private final BungeeCordCore plugin;
-    private final BungeeAudiences audiences;
     
     public CmdAdvancedServerList(BungeeCordCore plugin){
         super("advancedserverlist", "advancedserverlist.command.asl", "asl");
         this.plugin = plugin;
-        this.audiences = BungeeAudiences.create(plugin);
     }
     
     @Override
     public void execute(CommandSender sender, String[] args){
-        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, audiences), args);
+        plugin.getCore().getCommandHandler().handle(new BungeeCmdSender(sender, plugin.getAudiences()), args);
     }
 }

bungeecord/src/main/java/ch/andre601/advancedserverlist/bungeecord/listeners/JoinEvent.java

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.bungeecord.listeners;
 
 import ch.andre601.advancedserverlist.bungeecord.BungeeCordCore;
+import ch.andre601.advancedserverlist.bungeecord.commands.BungeeCmdSender;
 import net.md_5.bungee.api.connection.ProxiedPlayer;
 import net.md_5.bungee.api.event.PostLoginEvent;
 import net.md_5.bungee.api.plugin.Listener;
@@ -34,7 +35,6 @@ import net.md_5.bungee.event.EventHandler;
 import java.net.InetSocketAddress;
 
 public class JoinEvent implements Listener{
-    
     private final BungeeCordCore plugin;
     
     public JoinEvent(BungeeCordCore plugin){
@@ -48,5 +48,14 @@ public class JoinEvent implements Listener{
         ProxiedPlayer player = event.getPlayer();
         
         plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
+        
+        if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
+            if(plugin.getAudiences() == null || plugin.getCore().getUpdateChecker() == null)
+                return;
+            
+            BungeeCmdSender sender = new BungeeCmdSender(player, plugin.getAudiences());
+            
+            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+        }
     }
 }

core/pom.xml

@@ -171,6 +171,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>

core/src/main/java/ch/andre601/advancedserverlist/core/AdvancedServerList.java

@@ -96,6 +96,10 @@ public class AdvancedServerList<F>{
         return parser;
     }
     
+    public UpdateChecker getUpdateChecker(){
+        return updateChecker;
+    }
+    
     public void disable(){
         getPlugin().getPluginLogger().info("Saving playercache.json file...");
         getPlayerHandler().save();

core/src/main/java/ch/andre601/advancedserverlist/core/check/UpdateChecker.java

@@ -27,6 +27,7 @@ package ch.andre601.advancedserverlist.core.check;
 
 import ch.andre601.advancedserverlist.core.AdvancedServerList;
 import ch.andre601.advancedserverlist.core.interfaces.PluginLogger;
+import ch.andre601.advancedserverlist.core.interfaces.commands.CmdSender;
 import com.google.gson.FieldNamingPolicy;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -62,6 +63,8 @@ public class UpdateChecker{
     
     private final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(new UpdateCheckThread());
     
+    private final VersionCache cache = new VersionCache();
+    
     private final AdvancedServerList<?> core;
     private final PluginLogger logger;
     private final String loader;
@@ -74,6 +77,31 @@ public class UpdateChecker{
         startUpdateChecker();
     }
     
+    public void performeCachedUpdateCheck(CmdSender sender){
+        ModrinthVersion version = cache.get(() -> {
+            try{
+                return performUpdateCheck().join();
+            }catch(Exception ex){
+                return null;
+            }
+        });
+        
+        if(version == null)
+            return;
+        
+        int result = version.compare(core.getVersion());
+        if(result == -1){
+            sender.sendPrefixedMsg("<green>A new version of AdvancedServerList is available!");
+            sender.sendPrefixedMsg("<green>Your version: <white>%s", core.getVersion());
+            sender.sendPrefixedMsg("<green>Modrinth: <white>%s", version.versionNumber());
+            sender.sendPrefixedMsg("<click:open_url:'https://modrinth.com/plugin/advancedserverlist/version/%s'><green>[<white>Download Page</white>]</click>", version.id());
+        }else
+        if(result == 1){
+            sender.sendPrefixedMsg("Your version (<white>%s</white>) seems newer than the latest release on Modrinth (<white>%s</white>)", core.getVersion(), version.versionNumber);
+            sender.sendPrefixedMsg("Are you running a dev-build?");
+        }
+    }
+    
     public void disable(){
         executor.shutdown();
         try{
@@ -144,22 +172,22 @@ public class UpdateChecker{
     }
     
     private void printUpdateBanner(ModrinthVersion version){
-        logger.info("==================================================================");
-        logger.info("You are running an outdated version of AdvancedServerList!");
-        logger.info("");
-        logger.info("Your version: %s", core.getVersion());
-        logger.info("Modrinth:     %s", version.versionNumber());
-        logger.info("");
+        logger.warn("==================================================================");
+        logger.warn("You are running an outdated version of AdvancedServerList!");
+        logger.warn("");
+        logger.warn("Your version: %s", core.getVersion());
+        logger.warn("Modrinth:     %s", version.versionNumber());
+        logger.warn("");
         
         if(!version.isRelease()){
-            logger.info("WARNING!");
-            logger.info("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
-            logger.info("");
+            logger.warn("WARNING!");
+            logger.warn("This is a %s version and may contain breaking changes and/or bugs!", version.versionType());
+            logger.warn("");
         }
         
-        logger.info("Download the latest version from here:");
-        logger.info("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
-        logger.info("==================================================================");
+        logger.warn("Download the latest version from here:");
+        logger.warn("https://modrinth.com/plugin/advancedserverlist/version/%s", version.id());
+        logger.warn("==================================================================");
     }
     
     public record ModrinthVersion(String id, String versionNumber, String versionType){

core/src/main/java/ch/andre601/advancedserverlist/core/check/VersionCache.java

@@ -0,0 +1,48 @@
+/*
+ * 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.core.check;
+
+import java.util.function.Supplier;
+
+public class VersionCache{
+    
+    private CachedValue cachedValue = null;
+    
+    public VersionCache(){}
+    
+    public UpdateChecker.ModrinthVersion get(Supplier<UpdateChecker.ModrinthVersion> supplier){
+        if(cachedValue == null || cachedValue.hasExpired())
+            cachedValue = new CachedValue(System.currentTimeMillis(), supplier.get());
+        
+        return cachedValue.version();
+    }
+    
+    private record CachedValue(long timestamp, UpdateChecker.ModrinthVersion version){
+        public boolean hasExpired(){
+            return (timestamp < 0L) || System.currentTimeMillis() - timestamp >= 300_000L;
+        }
+    }
+}

docs/examples/index.md

@@ -10,7 +10,7 @@ icon: octicons/list-unordered-24
 
 This page lists some examples you may want to use for your proxy or server.
 
-Feel free to suggest additional examples on my [Discord Server](https://discord.gg/6dazXp6) in the `#advancedserverlist` channel.
+Feel free to suggest additional examples in the `advancedserverlist` category on the [M.O.S.S. Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" }.
 
 ## Table of Contents
 

docs/getting-started/index.md

@@ -5,7 +5,7 @@ icon: octicons/milestone-24
 # Getting Started
 
 This page will explain how to set up AdvancedServerList and make it work for your server.  
-It tries to be as easy to understand as possible. But if you still have problems, consider joining the [Discord Server](https://discord.gg/6dazXp6){ target="_blank" rel="nofollow" } for help.
+The guide is designed to be as easy to understand as possible. If you still have problems or questions, join the [M.O.S.S Discord Server](https://discord.gg/MyPTjpsgGH){ target="_blank" rel="nofollow" } for more help.
 
 ## 1. Download the plugin { #download-the-plugin }
 

paper/pom.xml

@@ -131,6 +131,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>

paper/src/main/java/ch/andre601/advancedserverlist/paper/listeners/JoinEvent.java

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.paper.listeners;
 
 import ch.andre601.advancedserverlist.paper.PaperCore;
+import ch.andre601.advancedserverlist.paper.commands.PaperCmdSender;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -51,5 +52,14 @@ public class JoinEvent implements Listener{
         
         Player player = event.getPlayer();
         plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getName(), player.getUniqueId());
+        
+        if(player.hasPermission("advancedserverlist.admin")  || player.hasPermission("advancedserverlist.updatecheck")){
+            if(plugin.getCore().getUpdateChecker() == null)
+                return;
+            
+            PaperCmdSender sender = new PaperCmdSender(player);
+            
+            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+        }
     }
 }

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

@@ -42,6 +42,7 @@ permissions:
     default: op
     children:
       - 'advancedserverlist.command.*'
+      - 'advancedserverlist.updatecheck'
   advancedserverlist.command.*:
     description: 'Grants access to all commands'
     default: op
@@ -53,4 +54,7 @@ permissions:
     default: op
   advancedserverlist.command.reload:
     description: 'Grants access to /asl reload'
+    default: op
+  advancedserverlist.updatecheck:
+    description: 'Notifies you of new updates when joining the server'
     default: op

pom.xml

@@ -37,7 +37,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         
-        <plugin.version>4.6.2</plugin.version>
+        <plugin.version>4.6.3</plugin.version>
         <plugin.description>Create multiple Server lists based on conditions.</plugin.description>
         
         <api.version>3.3.0</api.version>

velocity/pom.xml

@@ -128,6 +128,7 @@
                             <artifact>*:*</artifact>
                             <excludes>
                                 <exclude>META-INF/*.SF</exclude>
+                                <exclude>META-INF/*.DSA</exclude>
                                 <exclude>META-INF/*.RSA</exclude>
                             </excludes>
                         </filter>

velocity/src/main/java/ch/andre601/advancedserverlist/velocity/listeners/JoinEvent.java

@@ -26,6 +26,7 @@
 package ch.andre601.advancedserverlist.velocity.listeners;
 
 import ch.andre601.advancedserverlist.velocity.VelocityCore;
+import ch.andre601.advancedserverlist.velocity.commands.VelocityCmdSender;
 import com.velocitypowered.api.event.Subscribe;
 import com.velocitypowered.api.event.connection.PostLoginEvent;
 import com.velocitypowered.api.proxy.Player;
@@ -47,5 +48,14 @@ public class JoinEvent{
         Player player = event.getPlayer();
         
         plugin.getCore().getPlayerHandler().addPlayer(address.getHostString(), player.getUsername(), player.getUniqueId());
+        
+        if(player.hasPermission("advancedserverlist.admin") || player.hasPermission("advancedserverlist.updatecheck")){
+            if(plugin.getCore().getUpdateChecker() == null)
+                return;
+            
+            VelocityCmdSender sender = new VelocityCmdSender(player);
+            
+            plugin.getCore().getUpdateChecker().performeCachedUpdateCheck(sender);
+        }
     }
 }

version-uploader/src/main/java/ch/andre601/advancedserverlist/versionuploader/VersionUploader.java

@@ -121,7 +121,10 @@ public class VersionUploader{
         
         WebhookEmbedBuilder builder = new WebhookEmbedBuilder()
             .setTitle(new WebhookEmbed.EmbedTitle("New Release", null))
-            .setDescription("A new release of AdvancedServerList is available on Modrinth and Hangar for you to download!")
+            .setDescription(String.format(
+                "Version `%s` of AdvancedServerList is now available for download on Modrinth and Hangar!",
+                release.tagName()
+            ))
             .setColor(0x1BD96A);
         
         StringJoiner modrinthText = new StringJoiner("\n");