build: update MineDown dependencies, close #568

WiIIiam278 · Mar 31, 2024 · 6658154 · 6658154
1 parent a95c3e0
commit 6658154
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/bukkit/build.gradle b/bukkit/build.gradle
@@ -9,7 +9,7 @@ dependencies {
 
     compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT'
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
+    compileOnly 'net.william278:minedown:1.8.2'
     compileOnly 'net.william278:DesertWell:2.0.4'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
     compileOnly 'me.clip:placeholderapi:2.11.5'
@@ -19,7 +19,7 @@ dependencies {
     compileOnly 'org.projectlombok:lombok:1.18.32'
 
     testImplementation 'com.github.seeseemelk:MockBukkit-v1.17:1.13.0'
-    testImplementation 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
+    testImplementation 'net.william278:minedown:1.8.2'
     testImplementation 'net.kyori:adventure-platform-bukkit:4.3.2'
     testImplementation 'org.apache.commons:commons-text:1.11.0'
     testImplementation "redis.clients:jedis:${jedis_version}"

diff --git a/common/build.gradle b/common/build.gradle
@@ -3,12 +3,12 @@ plugins {
 }
 
 dependencies {
+    api 'net.william278:minedown:1.8.2'
+    api 'net.william278:paginedown:1.1.2'
+    api 'net.william278:DesertWell:2.0.4'
     api 'commons-io:commons-io:2.15.1'
     api 'org.apache.commons:commons-text:1.11.0'
-    api 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
     api 'com.google.code.gson:gson:2.10.1'
-    api 'net.william278:PagineDown:1.1'
-    api 'net.william278:DesertWell:2.0.4'
     api 'com.github.Exlll.ConfigLib:configlib-yaml:v4.5.0'
     api('com.zaxxer:HikariCP:5.1.0') {
         exclude module: 'slf4j-api'

diff --git a/common/src/main/java/net/william278/huskhomes/config/Locales.java b/common/src/main/java/net/william278/huskhomes/config/Locales.java
@@ -157,7 +157,7 @@ public static String escapeText(@NotNull String string) {
 
             value.append(c);
         }
-        return value.toString().replace("__", "_\\_");
+        return value.toString();
     }
 
     @NotNull

diff --git a/common/src/main/java/net/william278/huskhomes/user/OnlineUser.java b/common/src/main/java/net/william278/huskhomes/user/OnlineUser.java
@@ -20,7 +20,6 @@
 package net.william278.huskhomes.user;
 
 import de.themoep.minedown.adventure.MineDown;
-import de.themoep.minedown.adventure.MineDownParser;
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.key.InvalidKeyException;
 import net.kyori.adventure.key.Key;
@@ -95,7 +94,7 @@ protected OnlineUser(@NotNull UUID uuid, @NotNull String username, @NotNull Husk
      * @param subTitle whether to send the title as a subtitle ({@code true} for a subtitle, {@code false} for a title)
      */
     public void sendTitle(@NotNull MineDown mineDown, boolean subTitle) {
-        final Component message = mineDown.disable(MineDownParser.Option.SIMPLE_FORMATTING).replace().toComponent();
+        final Component message = mineDown.toComponent();
         getAudience().showTitle(Title.title(
                 subTitle ? Component.empty() : message,
                 subTitle ? message : Component.empty()
@@ -108,9 +107,7 @@ public void sendTitle(@NotNull MineDown mineDown, boolean subTitle) {
      * @param mineDown the parsed {@link MineDown} to send
      */
     public void sendActionBar(@NotNull MineDown mineDown) {
-        getAudience().sendActionBar(mineDown
-                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
-                .replace().toComponent());
+        getAudience().sendActionBar(mineDown.toComponent());
     }
 
 
@@ -120,9 +117,7 @@ public void sendActionBar(@NotNull MineDown mineDown) {
      * @param mineDown the parsed {@link MineDown} to send
      */
     public void sendMessage(@NotNull MineDown mineDown) {
-        getAudience().sendMessage(mineDown
-                .disable(MineDownParser.Option.SIMPLE_FORMATTING)
-                .replace().toComponent());
+        getAudience().sendMessage(mineDown.toComponent());
     }
 
     /**

diff --git a/paper/build.gradle b/paper/build.gradle
@@ -9,7 +9,7 @@ dependencies {
     compileOnly 'io.papermc.paper:paper-api:1.19.4-R0.1-SNAPSHOT'
     compileOnly 'org.bstats:bstats-bukkit:3.0.2'
     compileOnly 'org.jetbrains:annotations:24.1.0'
-    compileOnly 'de.themoep:minedown-adventure:1.7.2-SNAPSHOT'
+    compileOnly 'net.william278:minedown:1.8.2'
     compileOnly 'net.william278:DesertWell:2.0.4'
     compileOnly 'me.lucko:commodore:2.2'
     compileOnly 'com.github.MilkBowl:VaultAPI:1.7.1'
-Original file line number
+Diff line change
@@ Expand Up / @@ -157,7 +157,7 @@ public static String escapeText(@NotNull String string) { @@
                 value.append(c);
             }
-            return value.toString().replace("__", "_\\_");
+            return value.toString();
         }
         @NotNull
@@ Expand Down @@