diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java index 9f62d28..e2251a2 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/gui/DiscoveryGUI.java @@ -126,12 +126,14 @@ public class DiscoveryGUI extends RPGRegionsGUI { ? new ItemStackBuilder(new HeadDatabaseAPI().getItemHead(fm.replace("hdb-", ""))) .withName(Translations.NEXT_PAGE.get(player)) + .withLore(Translations.NEXT_PAGE_LORE.getList(player)) .addFlags(ItemFlag.HIDE_ATTRIBUTES) .build() : new ItemStackBuilder(XMaterial.matchXMaterial( plugin.getConfig().getString("settings.server.gui.forward.forward")).get().parseItem(true)) .withName(Translations.NEXT_PAGE.get(player)) + .withLore(Translations.NEXT_PAGE_LORE.getList(player)) .addFlags(ItemFlag.HIDE_ATTRIBUTES) .build(); 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 18a3568..1e6f163 100644 --- a/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java +++ b/rpgregions/src/main/java/net/islandearth/rpgregions/translation/Translations.java @@ -3,9 +3,11 @@ package net.islandearth.rpgregions.translation; import me.clip.placeholderapi.PlaceholderAPI; import net.islandearth.languagy.language.Language; import net.islandearth.rpgregions.RPGRegions; +import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.io.File; import java.util.ArrayList; @@ -54,41 +56,41 @@ public enum Translations { public void send(Player player) { String message = RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath()); - player.sendMessage(PlaceholderAPI.setPlaceholders(player, message)); + player.sendMessage(this.setPapi(player, message)); } public void send(Player player, String... values) { String message = RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath()); - message = PlaceholderAPI.setPlaceholders(player, replaceVariables(message, values)); + message = this.setPapi(player, replaceVariables(message, values)); player.sendMessage(message); } public void sendList(Player player) { List messages = RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()); - messages.forEach(message -> player.sendMessage(PlaceholderAPI.setPlaceholders(player, message))); + messages.forEach(message -> player.sendMessage(this.setPapi(player, message))); } public void sendList(Player player, String... values) { List messages = RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()); messages.forEach(message -> { - message = PlaceholderAPI.setPlaceholders(player, replaceVariables(message, values)); + message = this.setPapi(player, replaceVariables(message, values)); player.sendMessage(message); }); } public String get(Player player) { - return PlaceholderAPI.setPlaceholders(player, RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath())); + return this.setPapi(player, RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath())); } public String get(Player player, String... values) { String message = RPGRegions.getAPI().getTranslator().getTranslationFor(player, this.getPath()); message = replaceVariables(message, values); - return PlaceholderAPI.setPlaceholders(player, message); + return this.setPapi(player, message); } public List getList(Player player) { List list = new ArrayList<>(); - RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()).forEach(text -> list.add(PlaceholderAPI.setPlaceholders(player, text))); + RPGRegions.getAPI().getTranslator().getTranslationListFor(player, this.getPath()).forEach(text -> list.add(this.setPapi(player, text))); return list; } @@ -96,7 +98,7 @@ public enum Translations { List messages = new ArrayList<>(); RPGRegions.getAPI().getTranslator() .getTranslationListFor(player, this.getPath()) - .forEach(message -> messages.add(PlaceholderAPI.setPlaceholders(player, replaceVariables(message, values)))); + .forEach(message -> messages.add(this.setPapi(player, replaceVariables(message, values)))); return messages; } @@ -123,6 +125,7 @@ public enum Translations { } } + @NotNull private String replaceVariables(String message, String... values) { String modifiedMessage = message; for (int i = 0; i < 10; i++) { @@ -132,4 +135,13 @@ public enum Translations { return modifiedMessage; } + + @NotNull + private String setPapi(Player player, String message) { + if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) { + return PlaceholderAPI.setPlaceholders(player, message); + } + + return message; + } } diff --git a/src/main/resources/lang/en_gb.yml b/src/main/resources/lang/en_gb.yml index affc67f..a58b9d5 100644 --- a/src/main/resources/lang/en_gb.yml +++ b/src/main/resources/lang/en_gb.yml @@ -10,4 +10,10 @@ 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." \ No newline at end of file +cannot_enter: "&cYou require %0 to enter this area." +previous_page_lore: + - "&fGo to the previous page" +next_page_lore: + - "&fGo to the next page" +exit_lore: + - "&fExit the GUI" \ No newline at end of file