feat: 小版本更新

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/workflows/codeql-analysis.yml

@@ -38,11 +38,11 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
         # If you wish to specify custom queries, you can do so here or in a config file.
@@ -53,7 +53,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
+      uses: github/codeql-action/autobuild@v3
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -67,4 +67,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v3

.github/workflows/deploy.yml

@@ -16,9 +16,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'

.github/workflows/maven.yml

@@ -14,9 +14,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: "Set up JDK"
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'adopt'
@@ -37,7 +37,8 @@ jobs:
           cp -vrf asset/*.jar artifacts
 
       - name: "Upload artifact"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: Artifact
           path: artifacts
+          include-hidden-files: true

README-en.md

@@ -49,6 +49,8 @@ For development dependencies, please see  [Dependencies](https://github.com/Carm
 - Support PlaceholderAPI variables!
 - Support [Hex Color](https://www.hexcolortool.com/)! (Version 1.16 and above)  `&(#Color)`
     - Example: LightSlateBlue `&(#8470FF)` 、 DarkSlateBlue `&(#483D8B)`
+- Support Gradient Color! (Version 1.16 and above)  `&<#Color1>Message&<#Color2>`
+    - Example: `&<#8470FF>Hello World!&<#483D8B>`
 
 ## Notice
 

README.md

@@ -45,6 +45,9 @@ README LANGUAGES [ [**中文**](README.md) | [English](README-en.md)  ]
 - 支持[Hex颜色](https://www.hexcolortool.com/)！(1.16以上版本) `[自 v1.2.3 版本起]`
     - 格式： `&(#颜色代码)`
     - 示例： LightSlateBlue `&(#8470FF)` 、 DarkSlateBlue `&(#483D8B)`
+- 支持渐变色！(1.16以上版本) `[自 v1.2.3 版本起]`
+    - 格式： `&<#颜色代码1>消息内容&<#颜色代码2>`
+    - 示例： `&<#8470FF>Hello World!&<#483D8B>`
 
 ## 注意事项
 

pom.xml

@@ -13,13 +13,13 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.encoding>UTF-8</maven.compiler.encoding>
 
-        <deps.easyplugin.version>1.5.8</deps.easyplugin.version>
+        <deps.easyplugin.version>1.5.12</deps.easyplugin.version>
-        <deps.mineconfig.version>2.8.6</deps.mineconfig.version>
+        <deps.mineconfig.version>2.9.3</deps.mineconfig.version>
     </properties>
 
     <groupId>cc.carm.plugin</groupId>
     <artifactId>userprefix</artifactId>
-    <version>3.2.3</version>
+    <version>3.2.6</version>
 
     <name>UserPrefix</name>
     <description>轻便、高效、实时的用户前缀系统。</description>
@@ -81,6 +81,12 @@
             <url>https://repo.lucko.me/</url>
         </repository>
 
+        <repository>
+            <id>minecraft-libraries</id>
+            <name>Minecraft Libraries</name>
+            <url>https://libraries.minecraft.net/</url>
+        </repository>
+
         <repository>
             <id>EasyPlugin</id>
             <url>https://raw.githubusercontent.com/CarmJos/EasyPlugin/repo/</url>
@@ -152,6 +158,31 @@
             <version>${deps.mineconfig.version}</version>
             <scope>compile</scope>
             <optional>true</optional>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.cryptomorin.xseries</groupId>
+                    <artifactId>XSeries</artifactId>
+                </exclusion>
+                <exclusion>
+                    <groupId>com.github.cryptomorin</groupId>
+                    <artifactId>XSeries</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>com.github.cryptomorin</groupId>
+            <artifactId>XSeries</artifactId>
+            <version>13.0.0</version>
+            <scope>compile</scope>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>com.mojang</groupId>
+            <artifactId>authlib</artifactId>
+            <version>6.0.54</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -164,7 +195,7 @@
         <dependency>
             <groupId>me.clip</groupId>
             <artifactId>placeholderapi</artifactId>
-            <version>2.10.9</version>
+            <version>2.11.6</version>
             <scope>provided</scope>
         </dependency>
 
@@ -178,14 +209,14 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.1.0</version>
             <scope>compile</scope>
         </dependency>
 
         <dependency>
             <groupId>org.jetbrains</groupId>
             <artifactId>annotations</artifactId>
-            <version>23.0.0</version>
+            <version>26.0.2</version>
             <scope>provided</scope>
         </dependency>
 
@@ -202,7 +233,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-clean-plugin</artifactId>
-                <version>2.5</version>
+                <version>3.4.0</version>
                 <configuration>
                     <filesets>
                         <fileset>
@@ -225,7 +256,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <source>${project.jdk.version}</source>
                     <target>${project.jdk.version}</target>
@@ -236,12 +267,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.4.2</version>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.3.1</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -254,7 +285,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -300,7 +331,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>3.2.0</version>
+                <version>3.11.2</version>
                 <configuration>
                     <classifier>javadoc</classifier>
                     <links>
@@ -327,7 +358,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.1</version>
+                <version>3.5.2</version>
                 <configuration>
                     <useSystemClassLoader>false</useSystemClassLoader>
                 </configuration>

renovate.json

@@ -0,0 +1,13 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base","mergeConfidence:all-badges"
+  ],
+   "packageRules": [
+    {
+      "description": "Automerge non-major updates",
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ]
+}

src/main/java/cc/carm/plugin/userprefix/command/admin/ListCommand.java

@@ -22,7 +22,7 @@ public class ListCommand extends SubCommand<AdminCommand> {
             PluginMessages.LIST.VALUE.send(sender,
                     value.getWeight(), value.getIdentifier(),
                     value.getName(), value.getPermission(),
-                    value.getContent(), sender.getName()
+                    value.getContent(sender), sender.getName()
             );
         }
         return null;

src/main/java/cc/carm/plugin/userprefix/conf/prefix/PrefixConfig.java

@@ -1,9 +1,10 @@
 package cc.carm.plugin.userprefix.conf.prefix;
 
 import cc.carm.lib.easyplugin.gui.configuration.GUIActionConfiguration;
-import cc.carm.lib.easyplugin.utils.ColorParser;
+import cc.carm.lib.easyplugin.utils.MessageUtils;
 import cc.carm.lib.mineconfiguration.bukkit.value.item.PreparedItem;
 import cc.carm.plugin.userprefix.manager.ServiceManager;
+import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.jetbrains.annotations.Contract;
@@ -57,8 +58,8 @@ public class PrefixConfig {
     }
 
     @NotNull
-    public String getContent() {
+    public String getContent(CommandSender viewer) {
-        return ColorParser.parse(content);
+        return MessageUtils.setPlaceholders(viewer, content);
     }
 
     public int getWeight() {

src/main/java/cc/carm/plugin/userprefix/hooker/UserPrefixExpansion.java

@@ -43,6 +43,10 @@ public class UserPrefixExpansion extends EasyPlaceholder {
         return handlePlayer((player, args) -> handler.apply(UserPrefixAPI.getUserManager().getPrefix(player)));
     }
 
+    public PlaceholderHandler handlePrefix(BiFunction<PrefixConfig, Player, Object> handler) {
+        return handlePlayer((player, args) -> handler.apply(UserPrefixAPI.getUserManager().getPrefix(player), player));
+    }
+
     /**
      * This is required or else PlaceholderAPI will unregister the Expansion on reload
      */

src/main/java/cc/carm/plugin/userprefix/manager/UserManager.java

@@ -80,7 +80,7 @@ public class UserManager {
         PrefixConfig playerPrefix = getPrefix(player);
         boolean descOrder = PluginConfig.FUNCTIONS.NAME_PREFIX.ORDER_DESC.getNotNull();
 
-        tag.setPrefix(playerPrefix.getContent());
+        tag.setPrefix(playerPrefix.getContent(player));
         tag.setOrder(descOrder ? 999 - playerPrefix.getWeight() : playerPrefix.getWeight());
 
         Main.debugging("为玩家 " + player.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
@@ -90,7 +90,7 @@ public class UserManager {
             UserNameTag onlinePlayerTag = getNameTag(onlinePlayer);
 
             if (onlinePlayerTag != null) {
-                onlinePlayerTag.setPrefix(player, playerPrefix.getContent());
+                onlinePlayerTag.setPrefix(player, playerPrefix.getContent(onlinePlayer));
                 onlinePlayerTag.setOrder(player, descOrder ? 999 - playerPrefix.getWeight() : playerPrefix.getWeight());
                 Main.debugging("为玩家 " + onlinePlayer.getName() + " 设置了 " + player.getName() + "的前缀为 #" + playerPrefix.getWeight() + " " + playerPrefix.getName());
 
@@ -98,7 +98,7 @@ public class UserManager {
 
             if (loadOthers) {
                 PrefixConfig onlinePlayerPrefix = getPrefix(onlinePlayer);
-                tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent());
+                tag.setPrefix(onlinePlayer, onlinePlayerPrefix.getContent(player));
                 tag.setOrder(onlinePlayer, descOrder ? 999 - onlinePlayerPrefix.getWeight() : onlinePlayerPrefix.getWeight());
                 Main.debugging("为玩家 " + player.getName() + " 设置了 " + onlinePlayer.getName() + "的前缀为 #" + onlinePlayerPrefix.getWeight() + " " + onlinePlayerPrefix.getName());
             }

src/main/java/cc/carm/plugin/userprefix/ui/PrefixSelectGUI.java

@@ -107,7 +107,7 @@ public class PrefixSelectGUI extends AutoPagedGUI {
     }
 
     public static void open(Player player) {
-        player.closeInventory(); // 防止冲突
+//        player.closeInventory(); // 防止冲突
         PluginConfig.SOUNDS.GUI_OPEN.playTo(player);
         new PrefixSelectGUI(player).openGUI(player);
         openingUsers.add(player);

src/main/resources/i18n/es_ES/ejemplo-prefijo.yml

@@ -22,7 +22,7 @@ permission: "yc.vip"
 # Acciones al seleccionar [Innecesario]
 #  Por favor, compruebe https://github.com/CarmJos/UserPrefix/tree/master/.documentation/ACTIONS.md
 actions:
-  - "[CONSOLE] say %player_name% PRO seleccionado ！"
+  - "[CONSOLE] say %player_name% Has seleccionado La etiqueta PRO！"
 
 item:
   # itemHasPermission  [Necesario]
@@ -32,14 +32,14 @@ item:
     name: "&b&lVIP Prefix"
     lore:
       - ""
-      - "&a➥ Pulse para utilizar"
+      - "&a➥ Pulsa para utilizar"
 
   # itemUsing [Innecesario]
   # Este elemento se mostrará cuando se seleccione el prefijo.
   # Si no existe tal configuración, se mostrará automáticamente "itemHasPermission".
   using:
     material: DIAMOND
-    name: "&b&lVIP Prefix"
+    name: "&b&lPrefix VIP"
     enchants:
       PROTECTION_ENVIRONMENTAL: 1 #Añade un encantamiento para que parezca que está seleccionado
     lore:
@@ -55,4 +55,4 @@ item:
     name: "&b&lVIP &c(¡Cómpralo!)"
     lore:
       - ""
-      - "&e✯ Comprar el VIP para utilizarlo!"
+      - "&e✯ Necesitas Comprar el VIP para utilizarlo!"