Melhorias diversas

.github/workflows/maven.yml

@@ -1,7 +1,7 @@
 # This workflow automatically tests new commits and pull requests as they come in.
 # Note that this does not upload any artifacts, you will need to compile mcMMO manually
 # if you wish to create the actual jar.
-name: Compile and test
+name: Maven Build and Upload
 
 on:
   # We run our tests whenever the pom or a source file was touched.
@@ -29,24 +29,25 @@ jobs:
 
     # 1. Check out the current working tree
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4.1.1
 
     # 2. Setup Java 17 JDK (Adopt)
     - name: Java 17 setup
-      uses: actions/setup-java@v2
+      uses: actions/setup-java@v4.2.0
       with:
         distribution: 'adopt'
         java-package: jdk
         java-version: '17'
-
-    # 3. Setup local Maven package cache to speed up building
-    - name: Cache Maven packages
-      uses: actions/cache@v2
-      with:
-        path: ~/.m2
-        key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
-        restore-keys: ${{ runner.os }}-m2
+        check-latest: true
+        cache: 'maven'
 
     # 4. Build via Maven 
     - name: Build via Maven
       run: mvn verify -B --file pom.xml -DdisableXmlReport=true
+
+    # 5. Upload via Github Actions
+    - name: Upload
+      uses: actions/upload-artifact@v4.3.1
+      with:
+        name: mcMMO
+        path: target/mcMMO-*.jar

pom.xml

@@ -1,4 +1,6 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.gmail.nossr50.mcMMO</groupId>
     <artifactId>mcMMO</artifactId>
@@ -37,7 +39,7 @@
         </snapshotRepository>
     </distributionManagement>
     <build>
-        <finalName>${project.artifactId}</finalName>
+        <finalName>${project.artifactId}-${project.version}</finalName>
         <sourceDirectory>${basedir}/src/main/java</sourceDirectory>
         <resources>
             <resource>
@@ -117,6 +119,7 @@
                 <artifactId>maven-assembly-plugin</artifactId>
                 <version>3.7.1</version>
                 <configuration>
+                    <finalName>${project.name}-${project.version}</finalName>
                     <descriptors>
                         <descriptor>src/main/assembly/package.xml</descriptor>
                     </descriptors>
@@ -171,11 +174,13 @@
                         </relocation>
                         <relocation>
                             <pattern>co.aikar.commands</pattern>
-                            <shadedPattern>com.gmail.nossr50.mcmmo.acf</shadedPattern> <!-- Replace this -->
+                            <shadedPattern>com.gmail.nossr50.mcmmo.acf</shadedPattern> <!-- Replace
+                            this -->
                         </relocation>
                         <relocation>
                             <pattern>co.aikar.locales</pattern>
-                            <shadedPattern>com.gmail.nossr50.mcmmo.locales</shadedPattern> <!-- Replace this -->
+                            <shadedPattern>com.gmail.nossr50.mcmmo.locales</shadedPattern> <!--
+                            Replace this -->
                         </relocation>
                         <relocation>
                             <pattern>org.apache.commons.logging</pattern>
@@ -449,7 +454,8 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>33.2.0-jre</version> <!-- At this time Spigot is including 29.0 Guava classes that we are using -->
+            <version>33.2.0-jre</version> <!-- At this time Spigot is including 29.0 Guava classes that we are
+            using -->
             <scope>compile</scope>
         </dependency>
         <dependency>

src/main/assembly/package.xml

@@ -6,9 +6,9 @@
 	</formats>
 	<files>
 		<file>
-			<source>${project.build.directory}/${artifactId}.jar</source>
+			<source>${project.build.directory}/${artifactId}-${project.version}.jar</source>
 			<outputDirectory>/</outputDirectory>
-			<destName>mcMMO.jar</destName>
+			<destName>mcMMO-${project.version}.jar</destName>
 		</file>
 	</files>
 </assembly>

src/main/java/com/gmail/nossr50/commands/CommandManager.java

@@ -136,7 +136,7 @@ public void validateLoadedData(@NotNull Player player) {
     public void validatePlayerParty(@NotNull Player player) {
         McMMOPlayer mmoPlayer = UserManager.getPlayer(player);
 
-        if (!pluginRef.getPartyConfig().isPartyEnabled() || mmoPlayer.getParty() == null) {
+        if (!pluginRef.getPartyConfig().isPartyEnabled() || mmoPlayer == null || mmoPlayer.getParty() == null) {
             throw new ConditionFailedException(LocaleLoader.getString("Commands.Party.None"));
         }
     }

src/main/java/com/gmail/nossr50/commands/McconvertCommand.java

@@ -6,12 +6,10 @@
 import com.gmail.nossr50.datatypes.database.DatabaseType;
 import com.gmail.nossr50.datatypes.experience.FormulaType;
 import com.gmail.nossr50.mcMMO;
-import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -21,7 +19,7 @@
 public class McconvertCommand implements TabExecutor {
     private static final List<String> FORMULA_TYPES;
     private static final List<String> DATABASE_TYPES;
-    private static final List<String> SUBCOMMANDS = ImmutableList.of("database", "experience");
+    private static final List<String> SUBCOMMANDS = List.of("database", "experience");
 
     private final CommandExecutor databaseConvertCommand = new ConvertDatabaseCommand();
     private final CommandExecutor experienceConvertCommand = new ConvertExperienceCommand();
@@ -48,8 +46,8 @@ public class McconvertCommand implements TabExecutor {
         Collections.sort(formulaTypes);
         Collections.sort(databaseTypes);
 
-        FORMULA_TYPES = ImmutableList.copyOf(formulaTypes);
-        DATABASE_TYPES = ImmutableList.copyOf(databaseTypes);
+        FORMULA_TYPES = List.copyOf(formulaTypes);
+        DATABASE_TYPES = List.copyOf(databaseTypes);
 
     }
 
@@ -70,20 +68,23 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
         switch (args.length) {
-            case 1:
-                return StringUtil.copyPartialMatches(args[0], SUBCOMMANDS, new ArrayList<>(SUBCOMMANDS.size()));
-            case 2:
+            case 1 -> {
+                return SUBCOMMANDS.stream().filter(s -> s.startsWith(args[0])).toList();
+            }
+            case 2 -> {
                 if (args[0].equalsIgnoreCase("database") || args[0].equalsIgnoreCase("db")) {
-                    return StringUtil.copyPartialMatches(args[0], DATABASE_TYPES, new ArrayList<>(DATABASE_TYPES.size()));
+                    return DATABASE_TYPES.stream().filter(s -> s.startsWith(args[1])).toList();
                 }
 
                 if (args[0].equalsIgnoreCase("experience") || args[0].equalsIgnoreCase("xp") || args[0].equalsIgnoreCase("exp")) {
-                    return StringUtil.copyPartialMatches(args[0], FORMULA_TYPES, new ArrayList<>(FORMULA_TYPES.size()));
+                    return FORMULA_TYPES.stream().filter(s -> s.startsWith(args[1])).toList();
                 }
 
-                return ImmutableList.of();
-            default:
-                return ImmutableList.of();
+                return List.of();
+            }
+            default -> {
+                return List.of();
+            }
         }
     }
 }

src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java

@@ -2,9 +2,7 @@
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
 import com.gmail.nossr50.locale.LocaleLoader;
-import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
@@ -16,12 +14,13 @@
 public class McnotifyCommand implements TabExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
+        if (!(sender instanceof Player player)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
             return true;
         }
 
         if (args.length == 0) {
-            McMMOPlayer mcMMOPlayer = UserManager.getPlayer((Player) sender);
+            McMMOPlayer mcMMOPlayer = UserManager.getPlayer(player);
 
             //Not Loaded yet
             if (mcMMOPlayer == null) {
@@ -38,6 +37,6 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
-        return ImmutableList.of();
+        return List.of();
     }
 }

src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java

@@ -4,22 +4,21 @@
 import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.scoreboards.ScoreboardManager;
-import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.util.StringUtil;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public class McscoreboardCommand implements TabExecutor {
-    private static final List<String> FIRST_ARGS = ImmutableList.of("keep", "time", "clear");
+    private static final List<String> FIRST_ARGS = List.of("keep", "time", "clear");
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
-        if (CommandUtils.noConsoleUsage(sender)) {
+        if (!(sender instanceof Player)) {
+            sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
             return true;
         }
 
@@ -82,9 +81,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
         if (args.length == 1) {
-            return StringUtil.copyPartialMatches(args[0], FIRST_ARGS, new ArrayList<>(FIRST_ARGS.size()));
+            return FIRST_ARGS.stream().filter(s -> s.startsWith(args[0])).toList();
         }
-        return ImmutableList.of();
+        return List.of();
     }
 
     private boolean help(CommandSender sender) {

src/main/java/com/gmail/nossr50/commands/ToggleCommand.java

@@ -1,29 +1,32 @@
 package com.gmail.nossr50.commands;
 
 import com.gmail.nossr50.datatypes.player.McMMOPlayer;
+import com.gmail.nossr50.locale.LocaleLoader;
 import com.gmail.nossr50.util.commands.CommandUtils;
 import com.gmail.nossr50.util.player.UserManager;
-import com.google.common.collect.ImmutableList;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabExecutor;
-import org.bukkit.util.StringUtil;
+import org.bukkit.entity.Player;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.ArrayList;
 import java.util.List;
 
 public abstract class ToggleCommand implements TabExecutor {
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, String[] args) {
         switch (args.length) {
             case 0:
-                if (CommandUtils.noConsoleUsage(sender)) {
+                if (!(sender instanceof Player)) {
+                    sender.sendMessage(LocaleLoader.getString("Commands.NoConsole"));
                     return true;
                 }
 
                 if (!hasSelfPermission(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
+                    String commandPermissionMessage = command.getPermissionMessage();
+                    if (commandPermissionMessage != null) {
+                        sender.sendMessage(commandPermissionMessage);
+                    }
                     return true;
                 }
 
@@ -36,7 +39,10 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
 
             case 1:
                 if (!hasOtherPermission(sender)) {
-                    sender.sendMessage(command.getPermissionMessage());
+                    String commandPermissionMessage = command.getPermissionMessage();
+                    if (commandPermissionMessage != null) {
+                        sender.sendMessage(commandPermissionMessage);
+                    }
                     return true;
                 }
 
@@ -63,10 +69,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
     @Override
     public List<String> onTabComplete(@NotNull CommandSender sender, @NotNull Command command, @NotNull String alias, String[] args) {
         if (args.length == 1) {
-            List<String> playerNames = CommandUtils.getOnlinePlayerNames(sender);
-            return StringUtil.copyPartialMatches(args[0], playerNames, new ArrayList<>(playerNames.size()));
+            return CommandUtils.getOnlinePlayerNames(sender).stream().filter(s -> s.startsWith(args[0])).toList();
         }
-        return ImmutableList.of();
+        return List.of();
     }
 
     protected abstract boolean hasOtherPermission(CommandSender sender);