get rid of abstraction in ExpressionResult + better command output

Create action for auto-publishing to Modrinth

.github/workflows/release.yml

@@ -1,4 +1,9 @@
-name: Build Jars
+#
+# Big thank you to @Kir-Antipov for providing this workflow file.
+# Check out his mc-publish action here: https://github.com/Kir-Antipov/mc-publish
+#
+
+name: Publish Assets
 
 on:
   release:
@@ -6,18 +11,52 @@ on:
 
 jobs:
   build:
+    strategy:
+      matrix:
+        include:
+          - platforms: |
+              bungeecord
+              waterfall
+            directory: bungeecord
+            name: BungeeCord, Waterfall
+          - platforms: paper
+            directory: paper
+            name: Paper
+          - platforms: spigot
+            directory: spigot
+            name: Spigot
+          - platforms: velocity
+            directory: velocity
+            name: Velocity
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - name: Set up JDK 1.11
+    - name: Set up JDK 1.16
       uses: actions/setup-java@v3
       with:
         distribution: 'temurin'
         java-version: '16'
     - name: Build jar
       run: mvn clean install
-    - name: Upload jar
-      uses: AButler/upload-release-assets@v2.0
+    - name: Obtain GitHub Release version
+      id: github-release
+      run: |
+        version=$(echo ${{ github.event.release.tag_name }} | cut -d'v' -f2)
+        echo "::set-output name=version::$version"
+    - name: Upload ${{ matrix.name }} to GitHub and Modrinth
+      uses: Kir-Antipov/mc-publish@v3.1
       with:
-        files: 'bungeecord/target/AdvancedServerList-*.jar;paper/target/AdvancedServerList-*.jar;spigot/target/AdvancedServerList-*.jar;velocity/target/AdvancedServerList-*.jar'
-        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        name: v${{ steps.github-release.outputs.version }} - ${{ matrix.name }}
+        version: ${{ steps.github-release.outputs.version }}
+        version-type: release
+        files: ${{ matrix.directory }}/target/AdvancedServerList-*.jar
+        files-secondary: ""
+        loaders: ${{ matrix.platforms }}
+        game-versions: |
+          1.19
+          1.19.1
+          1.19.2
+        java: 16
+        modrinth-id: xss83sOY
+        modrinth-token: ${{ secrets.MODRINTH_TOKEN }}
+        github-toke: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -47,9 +47,11 @@ You can disable this in the `config.yml` by setting `send_statistics` to `false`
 ## Screenshots
 Here are screenshots showing the plugin in action. Do you have your own screenshots that you would like to share? Let me know and I may add them here with proper credit.
 
-![showcase]
+![basic_example]
 
-![features]
+![full_example]
+
+![favicons_example]
 
 <!-- Links -->
 [profiles]: https://github.com/Andre601/AdvancedServerList/wiki/Profiles
@@ -59,7 +61,7 @@ Here are screenshots showing the plugin in action. Do you have your own screensh
 
 [placeholderapi]: https://www.spigotmc.org/resources/6245/
 
-[modrinth]: https://modrinth.com/mod/advancedserverlist
+[modrinth]: https://modrinth.com/plugin/advancedserverlist
 [spigot]: https://www.spigotmc.org/resources/102910/
 [hangar]: https://hangar.benndorf.dev/Andre_601/AdvancedServerList
 
@@ -69,8 +71,9 @@ Here are screenshots showing the plugin in action. Do you have your own screensh
 [bstats-velocity]: https://bstats.org/plugin/velocity/AdvancedServerList/15587
 
 <!-- images -->
-[showcase]: https://cdn.discordapp.com/attachments/417019799365746690/990379003250626580/unknown.png
-[features]: https://cdn.discordapp.com/attachments/990389158944055366/1004042735973568522/2022-08-02_17.03.40.jpg
+[basic_example]: https://raw.githubusercontent.com/Andre601/AdvancedServerList/master/.github/assets/basic_example.jpg
+[full_example]: https://raw.githubusercontent.com/Andre601/AdvancedServerList/master/.github/assets/full_example.jpg
+[favicons_example]: https://raw.githubusercontent.com/Andre601/AdvancedServerList/master/.github/assets/version_1.5.0.jpg
 
 <!-- Badges -->
 [platform]: https://img.shields.io/badge/Platforms-Spigot%20%7C%20Paper%20%7C%20BungeeCord%20%7C%20Velocity-blue?style=for-the-badge&logo=data:image/svg%2bxml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAyNCAyNCIgd2lkdGg9IjI0IiBoZWlnaHQ9IjI0IiBmaWxsPSJ3aGl0ZSI+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMTEuMDYzIDEuNDU2YTEuNzUgMS43NSAwIDAxMS44NzQgMGw4LjM4MyA1LjMxNmExLjc1IDEuNzUgMCAwMTAgMi45NTZsLTguMzgzIDUuMzE2YTEuNzUgMS43NSAwIDAxLTEuODc0IDBMMi42OCA5LjcyOGExLjc1IDEuNzUgMCAwMTAtMi45NTZsOC4zODMtNS4zMTZ6bTEuMDcxIDEuMjY3YS4yNS4yNSAwIDAwLS4yNjggMEwzLjQ4MyA4LjAzOWEuMjUuMjUgMCAwMDAgLjQyMmw4LjM4MyA1LjMxNmEuMjUuMjUgMCAwMC4yNjggMGw4LjM4My01LjMxNmEuMjUuMjUgMCAwMDAtLjQyMmwtOC4zODMtNS4zMTZ6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTIuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PHBhdGggZmlsbC1ydWxlPSJldmVub2RkIiBkPSJNMS44NjcgMTYuMzI0YS43NS43NSAwIDAxMS4wMzUtLjIzMmw4Ljk2NCA1LjY4NWEuMjUuMjUgMCAwMC4yNjggMGw4Ljk2NC01LjY4NWEuNzUuNzUgMCAwMS44MDQgMS4yNjdsLTguOTY1IDUuNjg1YTEuNzUgMS43NSAwIDAxLTEuODc0IDBsLTguOTY1LTUuNjg1YS43NS43NSAwIDAxLS4yMzEtMS4wMzV6Ij48L3BhdGg+PC9zdmc+

core/src/main/java/ch/andre601/advancedserverlist/core/commands/CommandHandler.java

@@ -37,41 +37,45 @@ public class CommandHandler{
     }
     
     public void handle(CmdSender sender, String[] args){
+        String errorPrefix = "<grey>[<gradient:dark_red:red>AdvancedServerList</gradient>]";
+        String prefix = "<grey>[<gradient:aqua:white>AdvancedServerList</gradient>]";
+        
         if(args.length == 0 || args[0].equalsIgnoreCase("help")){
             if(sender.hasPermission("advancedserverlist.command.help")){
-                sender.sendMsg("AdvancedServerList Commands");
+                sender.sendMsg("%s - Commands", prefix);
                 sender.sendMsg();
-                sender.sendMsg("<aqua>/asl help <grey>- Shows this help.");
+                sender.sendMsg("<gradient:aqua:white>/asl help</gradient> <grey>- Shows this Help");
                 sender.sendMsg();
-                sender.sendMsg("<aqua>/asl reload <grey>- Reloads the config and profiles.");
+                sender.sendMsg("<gradient:aqua:white>/asl reload</gradient> <grey>- Reloads the plugin");
             }else{
-                sender.sendMsg("<red>You do not have the permissions to execute this command!");
+                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
             }
         }else
         if(args[0].equalsIgnoreCase("reload")){
             if(sender.hasPermission("advancedserverlist.command.reload")){
-                sender.sendMsg("<grey>Reloading config.yml...");
+                sender.sendMsg("%s Reloading plugin...", prefix);
+                
                 if(core.getFileHandler().reloadConfig()){
-                    sender.sendMsg("<green>Successfully reloaded <grey>config.yml</grey>!");
+                    sender.sendMsg("%s <green>Reloaded <grey>config.yml</grey>!", prefix);
                 }else{
-                    sender.sendMsg("<red>Error while reloading the config.yml.");
+                    sender.sendMsg("%s <red>Error while reloading the <grey>config.yml</grey>!", errorPrefix);
                 }
                 
-                sender.sendMsg("<grey>Reloading Profiles...");
                 if(core.getFileHandler().reloadProfiles()){
-                    sender.sendMsg("<green>Successfully loaded <grey>%d</grey> Profiles!", core.getFileHandler().getProfiles().size());
+                    sender.sendMsg("%s <green>Loaded <grey>%s Profile(s)</grey>!", prefix, core.getFileHandler().getProfiles());
                 }else{
-                    sender.sendMsg("<red>Error while reloading Profiles. No profiles have been loaded.");
+                    sender.sendMsg("%s <red>Cannot load Profiles!", errorPrefix);
                 }
                 
-                sender.sendMsg("<grey>Clearing Favicon cache...");
                 core.clearFaviconCache();
-                sender.sendMsg("<green>Successfully cleared Favicon cache!");
+                sender.sendMsg("%s <green>Successfully cleared Favicon cache!", prefix);
                 
-                sender.sendMsg("<green>Reload complete!");
+                sender.sendMsg("%s <green>Reload complete!", prefix);
+            }else{
+                sender.sendMsg("%s <red>You do not have permissions to execute this command!", errorPrefix);
             }
         }else{
-            sender.sendMsg("<red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", args[0]);
+            sender.sendMsg("%s <red>Unknown subcommand <grey>%s</grey>. Use <grey>/asl help</grey> for a list of commands.", prefix, args[0]);
         }
     }
 }

core/src/main/java/ch/andre601/advancedserverlist/core/file/FileHandler.java

@@ -43,8 +43,6 @@ import java.util.List;
 
 public class FileHandler{
     
-    private final FilenameFilter profileFilter = (dir, name) -> name.endsWith(".yml");
-    
     private final AdvancedServerList plugin;
     private final PluginLogger logger;
     
@@ -119,7 +117,7 @@ public class FileHandler{
     public boolean reloadProfiles(){
         profiles.clear();
         
-        File[] files = profilesFolder.toFile().listFiles(profileFilter);
+        File[] files = profilesFolder.toFile().listFiles(((dir, name) -> name.endsWith(".yml")));
         if(files == null || files.length == 0){
             logger.warn("Cannot load files from profiles folder! No valid YAML files present.");
             return false;

core/src/main/java/ch/andre601/advancedserverlist/core/profiles/conditions/Expression.java

@@ -191,32 +191,20 @@ public class Expression{
     }
     
     public enum ExpressionResult{
-        VALID{
-            @Override
-            public String getMessage(){
-                return null;
-            }
-        },
+        VALID(null),
         
-        INVALID_NO_EXPRESSION{
-            @Override
-            public String getMessage(){
-                return "Received empty condition which isn't allowed!";
-            }
-        },
-        INVALID_DOUBLE_OPERATOR{
-            @Override
-            public String getMessage(){
-                return "Condition contained two operands.";
-            }
-        },
-        INVALID_EMPTY_PARTS{
-            @Override
-            public String getMessage(){
-                return "Received condition with either left or right part being empty.";
-            }
-        };
+        INVALID_NO_EXPRESSION  ("Received empty condition which isn't allowed!"),
+        INVALID_DOUBLE_OPERATOR("Condition contained two operands."),
+        INVALID_EMPTY_PARTS    ("Received condition with either left or right part being empty.");
         
-        public abstract String getMessage();
+        private final String message;
+        
+        ExpressionResult(String message){
+            this.message = message;
+        }
+        
+        public String getMessage(){
+            return message;
+        }
     }
 }