From 845e4f308204853cff41a1541ed975212c2f39a5 Mon Sep 17 00:00:00 2001 From: SamB440 Date: Sat, 26 Sep 2020 18:36:10 +0100 Subject: [PATCH] Preliminary MiniMessage support --- rpgregions/build.gradle | 3 +++ .../rpgregions/translation/Translations.java | 18 ++++++++++++++---- rpgregions/src/main/resources/lang/en_gb.yml | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/rpgregions/build.gradle b/rpgregions/build.gradle index 06d4b1d..57d973b 100644 --- a/rpgregions/build.gradle +++ b/rpgregions/build.gradle @@ -59,6 +59,8 @@ dependencies { testImplementation 'com.github.seeseemelk:MockBukkit-v1.15:0.3.0-SNAPSHOT' testImplementation 'org.reflections:reflections:0.9.12' + implementation 'net.kyori:adventure-text-minimessage:4.0.0-SNAPSHOT' // minimessage + implementation 'net.kyori:adventure-platform-bukkit:4.0.0-SNAPSHOT' // minimessage implementation 'net.islandearth:languagy-api:2.0.2-SNAPSHOT' // languagy implementation 'co.aikar:acf-paper:0.5.0-SNAPSHOT' // commands implementation 'co.aikar:idb-core:1.0.0-SNAPSHOT' // database @@ -74,6 +76,7 @@ dependencies { exclude group: 'org.spigotmc' } compileOnly ('com.sk89q.worldedit:worldedit-bukkit:7.2.0-SNAPSHOT') { + exclude group: 'com.google' exclude group: 'org.bukkit' exclude group: 'org.spigotmc' } diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java b/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java index c8f2649..d56655d 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java @@ -3,10 +3,14 @@ package net.islandearth.rpgregions.translation; import me.clip.placeholderapi.PlaceholderAPI; import net.islandearth.languagy.api.language.Language; import net.islandearth.rpgregions.RPGRegions; +import net.kyori.adventure.platform.bukkit.BukkitAudiences; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; import java.io.File; @@ -59,25 +63,31 @@ public enum Translations { public void send(Player player) { String message = RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath()); - player.sendMessage(this.setPapi(player, message)); + Component component = MiniMessage.markdown().parse(this.setPapi(player, message)); + BukkitAudiences.create(JavaPlugin.getPlugin(RPGRegions.class)).player(player).sendMessage(component); } public void send(Player player, String... values) { String message = RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath()); message = this.setPapi(player, replaceVariables(message, values)); - player.sendMessage(message); + Component component = MiniMessage.markdown().parse(message); + BukkitAudiences.create(JavaPlugin.getPlugin(RPGRegions.class)).player(player).sendMessage(component); } public void sendList(Player player) { List messages = RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()); - messages.forEach(message -> player.sendMessage(this.setPapi(player, message))); + messages.forEach(message -> { + Component component = MiniMessage.markdown().parse(this.setPapi(player, message)); + BukkitAudiences.create(JavaPlugin.getPlugin(RPGRegions.class)).player(player).sendMessage(component); + }); } public void sendList(Player player, String... values) { List messages = RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()); messages.forEach(message -> { message = this.setPapi(player, replaceVariables(message, values)); - player.sendMessage(message); + Component component = MiniMessage.markdown().parse(message); + BukkitAudiences.create(JavaPlugin.getPlugin(RPGRegions.class)).player(player).sendMessage(component); }); } diff --git a/rpgregions/src/main/resources/lang/en_gb.yml b/rpgregions/src/main/resources/lang/en_gb.yml index 465a977..27cfd35 100644 --- a/rpgregions/src/main/resources/lang/en_gb.yml +++ b/rpgregions/src/main/resources/lang/en_gb.yml @@ -14,7 +14,7 @@ teleport: "&aClick to teleport" cannot_teleport: "&cWe can't teleport you because that world doesn't exist!" unknown_region: "Unknown Realm" exit: "&cExit" -cannot_enter: "&cYou require %0 to enter this area." +cannot_enter: "You require %0 to enter this area." previous_page_lore: - "&fGo to the previous page" next_page_lore: