Merge remote-tracking branch 'upstream/master'

# Conflicts: # pom.xml
SlimefunGuguProject · Oct 29, 2024 · bfe0a32 · bfe0a32
2 parents 2ed9971 + b2e76b9
commit bfe0a32
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 17 deletions.
diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.github.schntgaispock.slimehud</groupId>
     <artifactId>SlimeHUD</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.1</version>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -12,6 +12,11 @@
     </properties>
 
     <repositories>
+        <repository>
+            <id>placeholderapi</id>
+            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
+        </repository>
+
         <repository>
             <id>paper-repo</id>
             <url>https://repo.destroystokyo.com/repository/maven-public/</url>
@@ -26,11 +31,6 @@
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
         </repository>
-
-        <repository>
-            <id>placeholderapi</id>
-            <url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
-        </repository>
     </repositories>
 
     <build>
@@ -49,10 +49,22 @@
         </resources>
 
         <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.12.1</version>
+
+                <configuration>
+                    <excludes>
+                        <exclude>**/package-info.java</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.3.0</version>
+                <version>3.5.1</version>
                 <configuration>
                     <minimizeJar>true</minimizeJar>
                     <relocations>
@@ -125,13 +137,7 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
             <version>1.18.34</version>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.annotation</groupId>
-            <artifactId>javax.annotation-api</artifactId>
-            <version>1.3.2</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -143,7 +149,7 @@
         <dependency>
             <groupId>org.bstats</groupId>
             <artifactId>bstats-bukkit</artifactId>
-            <version>3.0.0</version>
+            <version>3.0.2</version>
             <scope>compile</scope>
         </dependency>
 
@@ -157,7 +163,7 @@
         <dependency>
             <groupId>net.guizhanss</groupId>
             <artifactId>GuizhanLibPlugin</artifactId>
-            <version>1.7.0</version>
+            <version>2.1.0</version>
             <scope>provided</scope>
         </dependency>
     </dependencies>

diff --git a/src/main/java/io/github/schntgaispock/slimehud/waila/HudController.java b/src/main/java/io/github/schntgaispock/slimehud/waila/HudController.java
@@ -233,7 +233,13 @@ public String processRequest(@Nonnull HudRequest request) {
             return "";
         } else {
             String ret = handler.apply(request);
-            return ret == null ? "" : ret;
+            if (ret == null) return "";
+            if (ret.startsWith("&7| ")) {
+                ret = ret.replaceFirst("&7\\| ", "&7");
+            } else if (ret.startsWith("§7| ")) {
+                ret = ret.replaceFirst("§7\\| ", "&7");
+            }
+            return ret;
         }
     }