diff --git a/pom.xml b/pom.xml
index eee19a1..b9116a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
pk.ajneb97
PlayerKits2
- 1.19.1
+ 1.20.1
21
@@ -15,6 +15,10 @@
+
+ papermc
+ https://repo.papermc.io/repository/maven-public/
+
spigot-repo
https://hub.spigotmc.org/nexus/content/repositories/snapshots/
@@ -34,10 +38,16 @@
+
+ io.papermc.paper
+ paper-api
+ 1.21.10-R0.1-SNAPSHOT
+ provided
+
org.spigotmc
spigot-api
- 1.21.9-R0.1-SNAPSHOT
+ 1.21.10-R0.1-SNAPSHOT
provided
diff --git a/src/main/java/pk/ajneb97/MainCommand.java b/src/main/java/pk/ajneb97/MainCommand.java
index 95d7d6d..e0c377f 100644
--- a/src/main/java/pk/ajneb97/MainCommand.java
+++ b/src/main/java/pk/ajneb97/MainCommand.java
@@ -108,21 +108,21 @@ public class MainCommand implements CommandExecutor, TabCompleter {
msgManager.sendMessage(sender,messagesConfig.getString("commandDoesNotExists"),true);
return;
}
- sender.sendMessage(MessagesManager.getColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
- sender.sendMessage(MessagesManager.getColoredMessage(" "));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit &8Opens the GUI."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit claim &8Claims a kit outside the GUI."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit create (optional)original &8Creates a new kit using the items in your inventory."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit edit &8Edits a kit."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit give &8Gives a kit to a player."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit delete &8Deletes a kit."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit reset /* &8Resets kit data for a player."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit preview (optional) &8Previews a kit."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit open &8Opens a specific inventory for a player."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit reload &8Reloads the config."));
- sender.sendMessage(MessagesManager.getColoredMessage("&6/kit verify &8Checks the plugin for errors."));
- sender.sendMessage(MessagesManager.getColoredMessage(" "));
- sender.sendMessage(MessagesManager.getColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit &8Opens the GUI."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit claim &8Claims a kit outside the GUI."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit create (optional)original &8Creates a new kit using the items in your inventory."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit edit &8Edits a kit."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit give &8Gives a kit to a player."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit delete &8Deletes a kit."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit reset /* &8Resets kit data for a player."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit preview (optional) &8Previews a kit."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit open &8Opens a specific inventory for a player."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit reload &8Reloads the config."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit verify &8Checks the plugin for errors."));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
+ sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
}
public void migrate(CommandSender sender,String[] args,FileConfiguration messagesConfig,MessagesManager msgManager){
@@ -149,7 +149,7 @@ public class MainCommand implements CommandExecutor, TabCompleter {
}
if(!plugin.getConfigsManager().reload()){
- sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &cThere was an error reloading the config, check the console."));
+ sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cThere was an error reloading the config, check the console."));
return;
}
msgManager.sendMessage(sender,messagesConfig.getString("commandReload"),true);
diff --git a/src/main/java/pk/ajneb97/PlayerKits2.java b/src/main/java/pk/ajneb97/PlayerKits2.java
index 4d67d7e..17e9c2a 100644
--- a/src/main/java/pk/ajneb97/PlayerKits2.java
+++ b/src/main/java/pk/ajneb97/PlayerKits2.java
@@ -81,8 +81,8 @@ public class PlayerKits2 extends JavaPlugin {
}
Metrics metrics = new Metrics(this,19795);
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&eHas been enabled! &fVersion: "+version));
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&eThanks for using my plugin! &f~Ajneb97"));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&eHas been enabled! &fVersion: "+version));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&eThanks for using my plugin! &f~Ajneb97"));
updateCheckerManager = new UpdateCheckerManager(version);
updateMessage(updateCheckerManager.check());
@@ -90,7 +90,7 @@ public class PlayerKits2 extends JavaPlugin {
public void onDisable(){
this.configsManager.getPlayersConfigManager().saveConfigs();
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&eHas been disabled! &fVersion: "+version));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&eHas been disabled! &fVersion: "+version));
}
public void registerCommands(){
@@ -113,7 +113,7 @@ public class PlayerKits2 extends JavaPlugin {
}
public void setPrefix(){
- prefix = MessagesManager.getColoredMessage("&8[&bPlayerKits&a²&8] ");
+ prefix = MessagesManager.getLegacyColoredMessage("&8[&bPlayerKits&a²&8] ");
}
public void setVersion(){
@@ -215,11 +215,11 @@ public class PlayerKits2 extends JavaPlugin {
if(!result.isError()){
String latestVersion = result.getLatestVersion();
if(latestVersion != null){
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/playerkits-2"));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &fhttps://modrinth.com/plugin/playerkits-2"));
}
}else{
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&cError while checking update."));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&cError while checking update."));
}
}
diff --git a/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java b/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java
index 0423ef9..0347c8e 100644
--- a/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java
+++ b/src/main/java/pk/ajneb97/api/PlayerKitsAPI.java
@@ -14,6 +14,10 @@ public class PlayerKitsAPI {
this.plugin = plugin;
}
+ public static PlayerKits2 getPlugin() {
+ return plugin;
+ }
+
public static String getKitCooldown(Player player, String kitName){
Kit kit = plugin.getKitsManager().getKitByName(kitName);
MessagesManager messagesManager = plugin.getMessagesManager();
diff --git a/src/main/java/pk/ajneb97/configs/MainConfigManager.java b/src/main/java/pk/ajneb97/configs/MainConfigManager.java
index 947372d..a51a679 100644
--- a/src/main/java/pk/ajneb97/configs/MainConfigManager.java
+++ b/src/main/java/pk/ajneb97/configs/MainConfigManager.java
@@ -26,6 +26,7 @@ public class MainConfigManager {
private String newKitDefaultInventory;
private boolean isMySQL;
private boolean updateNotify;
+ private boolean useMiniMessage;
public MainConfigManager(PlayerKits2 plugin){
this.plugin = plugin;
@@ -45,6 +46,7 @@ public class MainConfigManager {
isMySQL = config.getBoolean("mysql_database.enabled");
updateNotify = config.getBoolean("update_notify");
claimKitShortCommand = config.getBoolean("claim_kit_short_command");
+ useMiniMessage = config.getBoolean("use_minimessage");
newKitDefaultSaveModeOriginal = config.getBoolean("new_kit_default_save_mode_original");
}
@@ -64,6 +66,10 @@ public class MainConfigManager {
Path pathConfig = Paths.get(configFile.getRoute());
try{
String text = new String(Files.readAllBytes(pathConfig));
+ if(!text.contains("use_minimessage:")){
+ getConfig().set("use_minimessage",false);
+ configFile.saveConfig();
+ }
if(!text.contains("verifyServerCertificate:")){
getConfig().set("mysql_database.pool.connectionTimeout",5000);
getConfig().set("mysql_database.advanced.verifyServerCertificate",false);
@@ -119,4 +125,8 @@ public class MainConfigManager {
public boolean isNewKitDefaultSaveModeOriginal() {
return newKitDefaultSaveModeOriginal;
}
+
+ public boolean isUseMiniMessage() {
+ return useMiniMessage;
+ }
}
diff --git a/src/main/java/pk/ajneb97/database/MySQLConnection.java b/src/main/java/pk/ajneb97/database/MySQLConnection.java
index 304d0c3..46b6a0e 100644
--- a/src/main/java/pk/ajneb97/database/MySQLConnection.java
+++ b/src/main/java/pk/ajneb97/database/MySQLConnection.java
@@ -30,9 +30,9 @@ public class MySQLConnection {
connection.getHikari().getConnection();
createTables();
loadData();
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(plugin.prefix+" &aSuccessfully connected to the Database."));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &aSuccessfully connected to the Database."));
}catch(Exception e) {
- Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(plugin.prefix+" &cError while connecting to the Database."));
+ Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+" &cError while connecting to the Database."));
}
}
diff --git a/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java b/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java
index 850e10b..871615c 100644
--- a/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java
+++ b/src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java
@@ -1,11 +1,13 @@
package pk.ajneb97.libs.actionbar;
+import net.kyori.adventure.text.minimessage.MiniMessage;
import net.md_5.bungee.api.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
import pk.ajneb97.PlayerKits2;
+import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.managers.MessagesManager;
import pk.ajneb97.utils.OtherUtils;
@@ -18,10 +20,14 @@ public class ActionBarAPI
public static void sendActionBar(Player player, String message) {
if(OtherUtils.isNew()) {
- player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(MessagesManager.getColoredMessage(message)));
+ if(PlayerKitsAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()){
+ player.sendActionBar(MiniMessage.miniMessage().deserialize(message));
+ }else{
+ player.spigot().sendMessage(ChatMessageType.ACTION_BAR, TextComponent.fromLegacyText(MessagesManager.getLegacyColoredMessage(message)));
+ }
return;
}
- message = MessagesManager.getColoredMessage(message);
+ message = MessagesManager.getLegacyColoredMessage(message);
boolean useOldMethods = false;
String nmsver = Bukkit.getServer().getClass().getPackage().getName();
nmsver = nmsver.substring(nmsver.lastIndexOf(".") + 1);
diff --git a/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java b/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java
index 30b90ce..3df89c5 100644
--- a/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java
+++ b/src/main/java/pk/ajneb97/libs/titles/TitleAPI.java
@@ -1,9 +1,12 @@
package pk.ajneb97.libs.titles;
+import net.kyori.adventure.text.minimessage.MiniMessage;
+import net.kyori.adventure.title.Title;
import org.bukkit.Bukkit;
import org.bukkit.ChatColor;
import org.bukkit.entity.Player;
import org.bukkit.event.Listener;
+import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.managers.MessagesManager;
import pk.ajneb97.utils.OtherUtils;
@@ -40,7 +43,14 @@ public class TitleAPI implements Listener {
if(subtitle.isEmpty()) {
subtitle = " ";
}
- player.sendTitle(MessagesManager.getColoredMessage(title), MessagesManager.getColoredMessage(subtitle), fadeIn, stay, fadeOut);
+
+ if(PlayerKitsAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()){
+ player.showTitle(Title.title(
+ MiniMessage.miniMessage().deserialize(title),MiniMessage.miniMessage().deserialize(subtitle)
+ ));
+ }else{
+ player.sendTitle(MessagesManager.getLegacyColoredMessage(title), MessagesManager.getLegacyColoredMessage(subtitle), fadeIn, stay, fadeOut);
+ }
return;
}
try {
diff --git a/src/main/java/pk/ajneb97/listeners/PlayerListener.java b/src/main/java/pk/ajneb97/listeners/PlayerListener.java
index ab4df73..724a0a9 100644
--- a/src/main/java/pk/ajneb97/listeners/PlayerListener.java
+++ b/src/main/java/pk/ajneb97/listeners/PlayerListener.java
@@ -28,8 +28,8 @@ public class PlayerListener implements Listener {
//Update notification
String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion();
if(player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)){
- player.sendMessage(MessagesManager.getColoredMessage(plugin.prefix+"&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
- player.sendMessage(MessagesManager.getColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/playerkits-2"));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(plugin.prefix+"&cThere is a new version available. &e(&7"+latestVersion+"&e)"));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage("&cYou can download it at: &ahttps://modrinth.com/plugin/playerkits-2"));
}
}
diff --git a/src/main/java/pk/ajneb97/managers/InventoryManager.java b/src/main/java/pk/ajneb97/managers/InventoryManager.java
index 190734b..8932849 100644
--- a/src/main/java/pk/ajneb97/managers/InventoryManager.java
+++ b/src/main/java/pk/ajneb97/managers/InventoryManager.java
@@ -1,5 +1,8 @@
package pk.ajneb97.managers;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.command.ConsoleCommandSender;
@@ -86,13 +89,18 @@ public class InventoryManager {
public void openInventory(InventoryPlayer inventoryPlayer){
KitInventory kitInventory = getInventory(inventoryPlayer.getInventoryName());
+ MainConfigManager mainConfigManager = plugin.getConfigsManager().getMainConfigManager();
String title = kitInventory.getTitle();
if(inventoryPlayer.getInventoryName().equals("buy_requirements_inventory") || inventoryPlayer.getInventoryName().equals("preview_inventory")){
title = title.replace("%kit%",inventoryPlayer.getKitName());
}
- Inventory inv = Bukkit.createInventory(null,kitInventory.getSlots(),
- MessagesManager.getColoredMessage(title));
+ Inventory inv;
+ if(mainConfigManager.isUseMiniMessage()){
+ inv = Bukkit.createInventory(null,kitInventory.getSlots(), MiniMessage.miniMessage().deserialize(title));
+ }else{
+ inv = Bukkit.createInventory(null,kitInventory.getSlots(), MessagesManager.getLegacyColoredMessage(title));
+ }
List items = kitInventory.getItems();
KitItemManager kitItemManager = plugin.getKitItemManager();
@@ -283,20 +291,6 @@ public class InventoryManager {
openInventory(inventoryPlayer);
}
- public void clickOnCommandItem(InventoryPlayer inventoryPlayer,String itemCommands){
- String[] sep = itemCommands.split("\\|");
- ConsoleCommandSender sender = Bukkit.getConsoleSender();
- for(String c : sep) {
- if(c.startsWith("msg %player% ")) {
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(c.replace("msg %player% ", "")));
- }else if(c.equals("close_inventory")){
- inventoryPlayer.getPlayer().closeInventory();
- }else{
- Bukkit.dispatchCommand(sender, c.replace("%player%", inventoryPlayer.getPlayer().getName()));
- }
- }
- }
-
public void clickOnActionItem(InventoryPlayer inventoryPlayer,String itemActions) {
String[] sep = itemActions.split("\\|");
@@ -361,6 +355,7 @@ public class InventoryManager {
newStatus = "default";
}
+ boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
if(newStatus.equals(currentStatus) && currentItem != null){
// Name and Lore update
ItemMeta meta = currentItem.getItemMeta();
@@ -368,16 +363,29 @@ public class InventoryManager {
String name = kitItem.getName();
if(name != null){
name = OtherUtils.replaceGlobalVariables(name,player,plugin);
- meta.setDisplayName(MessagesManager.getColoredMessage(name));
+ if(useMiniMessage){
+ meta.displayName(MiniMessage.miniMessage().deserialize(name).decoration(TextDecoration.ITALIC, false));
+ }else{
+ meta.setDisplayName(MessagesManager.getLegacyColoredMessage(name));
+ }
}
List lore = kitItem.getLore();
if(lore != null) {
List loreCopy = new ArrayList<>(lore);
- for(int i=0;i loreComponent = new ArrayList<>();
+ for(int i=0;i lore = new ArrayList<>();
- for(String line : meta.getLore()){
- if(line.equals("%kit_requirements_message%")){
- lore.addAll(replaceRequirementsMessageVariable(kitName,player));
- }else{
- lore.add(line);
+
+ if(plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage()){
+ List newLore = new ArrayList<>();
+ PlainTextComponentSerializer plainSerializer = PlainTextComponentSerializer.plainText();
+ for(Component line : meta.lore()){
+ String plainText = plainSerializer.serialize(line);
+ if(plainText.contains("%kit_requirements_message%")){
+ List message = replaceRequirementsMessageVariable(kitName,player);
+ for(String m : message){
+ newLore.add(MiniMessage.miniMessage().deserialize(m).decoration(TextDecoration.ITALIC, false));
+ }
+ }else{
+ newLore.add(line);
+ }
}
+ meta.lore(newLore);
+ }else{
+ List lore = new ArrayList<>();
+ for(String line : meta.getLore()){
+ if(line.equals("%kit_requirements_message%")){
+ List message = replaceRequirementsMessageVariable(kitName,player);
+ for(String m : message){
+ lore.add(MessagesManager.getLegacyColoredMessage(m));
+ }
+ }else{
+ lore.add(line);
+ }
+ }
+ meta.setLore(lore);
}
- meta.setLore(lore);
item.setItemMeta(meta);
}
}
@@ -88,7 +113,6 @@ public class InventoryRequirementsManager {
line = PlaceholderAPI.setPlaceholders(player, line);
}
- line = MessagesManager.getColoredMessage(line);
requirementsMessage.set(i, line);
}
diff --git a/src/main/java/pk/ajneb97/managers/KitItemManager.java b/src/main/java/pk/ajneb97/managers/KitItemManager.java
index ee32562..6880e30 100644
--- a/src/main/java/pk/ajneb97/managers/KitItemManager.java
+++ b/src/main/java/pk/ajneb97/managers/KitItemManager.java
@@ -1,6 +1,9 @@
package pk.ajneb97.managers;
-import org.bukkit.Bukkit;
+import net.kyori.adventure.text.Component;
+import net.kyori.adventure.text.TextReplacementConfig;
+import net.kyori.adventure.text.format.TextDecoration;
+import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Color;
import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.FileConfiguration;
@@ -43,15 +46,28 @@ public class KitItemManager {
}
ServerVersion serverVersion = PlayerKits2.serverVersion;
+ boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
+
if(item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta();
if(meta.hasDisplayName()) {
- kitItem.setName(meta.getDisplayName().replace("§", "&"));
+ if(useMiniMessage){
+ kitItem.setName(MiniMessage.miniMessage().serialize(meta.displayName()));
+ }else{
+ kitItem.setName(meta.getDisplayName().replace("§", "&"));
+ }
+
}
if(meta.hasLore()) {
- List lore = new ArrayList();
- for(String l : meta.getLore()) {
- lore.add(l.replace("§", "&"));
+ List lore = new ArrayList<>();
+ if(useMiniMessage){
+ for (Component line : meta.lore()) {
+ lore.add(MiniMessage.miniMessage().serialize(line));
+ }
+ }else{
+ for(String l : meta.getLore()) {
+ lore.add(l.replace("§", "&"));
+ }
}
kitItem.setLore(lore);
}
@@ -206,22 +222,37 @@ public class KitItemManager {
item.setDurability(durability);
}
+ boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
+
//MAIN META
ItemMeta meta = item.getItemMeta();
String name = kitItem.getName();
if(name != null){
name = OtherUtils.replaceGlobalVariables(name,player,plugin);
- meta.setDisplayName(MessagesManager.getColoredMessage(name));
+ if(useMiniMessage){
+ meta.displayName(MiniMessage.miniMessage().deserialize(name).decoration(TextDecoration.ITALIC, false));
+ }else{
+ meta.setDisplayName(MessagesManager.getLegacyColoredMessage(name));
+ }
}
List lore = kitItem.getLore();
if(lore != null) {
- List loreCopy = new ArrayList(lore);
- for(int i=0;i loreCopy = new ArrayList<>(lore);
+ if(useMiniMessage){
+ List loreComponent = new ArrayList<>();
+ for(int i=0;i variables){
+ boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
if(item.hasItemMeta()){
ItemMeta meta = item.getItemMeta();
if(meta.hasDisplayName()){
- String newName = meta.getDisplayName();
- for(KitVariable variable : variables){
- newName = newName.replace(variable.getVariable(),variable.getValue());
- }
- meta.setDisplayName(newName);
- }
- if(meta.hasLore()){
- List lore = meta.getLore();
- for(int i=0;i lore = meta.lore();
+ List newLore = new ArrayList<>();
+ for(Component c : lore){
+ Component newComponent = c;
+ for(KitVariable variable : variables){
+ newComponent = newComponent.replaceText(TextReplacementConfig.builder()
+ .matchLiteral(variable.getVariable())
+ .replacement(MiniMessage.miniMessage().deserialize(variable.getValue()))
+ .build());
+ }
+ newLore.add(newComponent);
+ }
+ meta.lore(newLore);
+ }else{
+ List lore = meta.getLore();
+ for(int i=0;i lore = new ArrayList<>();
- lore.add(MessagesManager.getColoredMessage("&7Click to change the action."));
+ lore.add(MessagesManager.getLegacyColoredMessage("&7Click to change the action."));
lore.add("");
- lore.add(MessagesManager.getColoredMessage("&7Current:"));
- lore.add(MessagesManager.getColoredMessage("&f") + kitAction.getAction());
+ lore.add(MessagesManager.getLegacyColoredMessage("&7Current:"));
+ lore.add(MessagesManager.getLegacyColoredMessage("&f") + kitAction.getAction());
ItemStack item = new ItemStack(Material.PAPER);
ItemMeta meta = item.getItemMeta();
- meta.setDisplayName(MessagesManager.getColoredMessage("&6&lEdit Action"));
+ meta.setDisplayName(MessagesManager.getLegacyColoredMessage("&6&lEdit Action"));
meta.setLore(lore);
item.setItemMeta(meta);
inv.setItem(10, item);
@@ -143,8 +143,8 @@ public class InventoryEditActionsEditManager {
public void clickEditAction(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer();
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new action to set."));
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new action to set."));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
player.closeInventory();
inventoryPlayer.setInventoryName("edit_chat_action_slot_" + getType(inventoryPlayer) + "_" + getActionSlot(inventoryPlayer));
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
index f5b449c..0b6f68b 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
@@ -31,7 +31,7 @@ public class InventoryEditActionsManager {
public void openInventory(InventoryPlayer inventoryPlayer,String type) {
inventoryPlayer.setInventoryName("edit_actions_"+type);
- Inventory inv = Bukkit.createInventory(null, 54, MessagesManager.getColoredMessage("&9Editing Kit"));
+ Inventory inv = Bukkit.createInventory(null, 54, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
//Decoration
for(int i=45;i<=52;i++){
@@ -69,18 +69,18 @@ public class InventoryEditActionsManager {
String displayItem = kitAction.getDisplayItem() != null ? "&aYES" : "&cNO";
lore = new ArrayList<>();
- lore.add(MessagesManager.getColoredMessage("&f")+kitAction.getAction());
+ lore.add(MessagesManager.getLegacyColoredMessage("&f")+kitAction.getAction());
lore.add("");
- lore.add(MessagesManager.getColoredMessage("&7Execute before giving kit items? "+executeBeforeItems));
- lore.add(MessagesManager.getColoredMessage("&7Count as item? "+countAsItem));
- lore.add(MessagesManager.getColoredMessage("&7Has display item? "+displayItem));
+ lore.add(MessagesManager.getLegacyColoredMessage("&7Execute before giving kit items? "+executeBeforeItems));
+ lore.add(MessagesManager.getLegacyColoredMessage("&7Count as item? "+countAsItem));
+ lore.add(MessagesManager.getLegacyColoredMessage("&7Has display item? "+displayItem));
lore.add("");
- lore.add(MessagesManager.getColoredMessage("&a&lLEFT CLICK &ato edit"));
- lore.add(MessagesManager.getColoredMessage("&c&lRIGHT CLICK &cto remove"));
+ lore.add(MessagesManager.getLegacyColoredMessage("&a&lLEFT CLICK &ato edit"));
+ lore.add(MessagesManager.getLegacyColoredMessage("&c&lRIGHT CLICK &cto remove"));
ItemStack item = new ItemStack(Material.PAPER);
ItemMeta meta = item.getItemMeta();
- meta.setDisplayName(MessagesManager.getColoredMessage("&7Action &e#"+(slot+1)));
+ meta.setDisplayName(MessagesManager.getLegacyColoredMessage("&7Action &e#"+(slot+1)));
meta.setLore(lore);
item.setItemMeta(meta);
inv.setItem(slot,item);
@@ -109,8 +109,8 @@ public class InventoryEditActionsManager {
public void clickAddAction(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer();
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new action to add."));
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new action to add."));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
player.closeInventory();
String type = inventoryPlayer.getInventoryName().replace("edit_actions_","");
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java
index 6454e5b..bc665e8 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java
@@ -30,7 +30,7 @@ public class InventoryEditDisplayManager {
public void openInventory(InventoryPlayer inventoryPlayer, String type) {
inventoryPlayer.setInventoryName("edit_display_" + type);
- Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getColoredMessage("&9Editing Kit"));
+ Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
//Decoration
ArrayList slots = new ArrayList<>();
@@ -157,7 +157,7 @@ public class InventoryEditDisplayManager {
}
}else if(slot == 26){
saveKitItem(inventoryPlayer);
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&aDisplay item saved."));
+ inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aDisplay item saved."));
}
}
}
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java
index 50dfbcb..9b6caf7 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java
@@ -29,7 +29,7 @@ public class InventoryEditKitItemsManager {
public void openInventory(InventoryPlayer inventoryPlayer){
inventoryPlayer.setInventoryName("edit_items");
- Inventory inv = Bukkit.createInventory(null, 54, MessagesManager.getColoredMessage("&9Editing Kit"));
+ Inventory inv = Bukkit.createInventory(null, 54, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
//Decoration
for(int i=46;i<=52;i++){
@@ -86,7 +86,7 @@ public class InventoryEditKitItemsManager {
public void clickOffHand(InventoryPlayer inventoryPlayer, Inventory inv, ItemStack clickedItem, int clickedSlot){
ServerVersion serverVersion = PlayerKits2.serverVersion;
if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) {
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&cOffhand only works on 1.9+."));
+ inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cOffhand only works on 1.9+."));
return;
}
String offhand = ItemUtils.getTagStringItem(plugin,clickedItem,"playerkits_offhand");
@@ -119,7 +119,7 @@ public class InventoryEditKitItemsManager {
public void setItemOffHand(Inventory inv,ItemStack item,int slot){
List offHandLore = new ArrayList<>();
offHandLore.add(" ");
- offHandLore.add(MessagesManager.getColoredMessage("&c&lRIGHT CLICK &cto remove from offhand"));
+ offHandLore.add(MessagesManager.getLegacyColoredMessage("&c&lRIGHT CLICK &cto remove from offhand"));
ItemMeta meta = item.getItemMeta();
List itemLore = new ArrayList<>();
if(meta.hasLore()){
@@ -191,7 +191,7 @@ public class InventoryEditKitItemsManager {
inventoryEditManager.openInventory(inventoryPlayer);
}else if(slot == 53){
saveKitItems(inventoryPlayer);
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&aKit Items saved."));
+ inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aKit Items saved."));
}
}else if(clickType.isRightClick()){
event.setCancelled(true);
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java
index cf66fda..2485ed7 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java
@@ -77,7 +77,7 @@ public class InventoryEditManager {
public void openInventory(InventoryPlayer inventoryPlayer) {
inventoryPlayer.setInventoryName("edit_main_inventory");
- Inventory inv = Bukkit.createInventory(null, 45, MessagesManager.getColoredMessage("&9Editing Kit"));
+ Inventory inv = Bukkit.createInventory(null, 45, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
Kit kit = plugin.getKitsManager().getKitByName(inventoryPlayer.getKitName());
@@ -217,9 +217,9 @@ public class InventoryEditManager {
for(KitItem kitItem : kit.getItems()){
if(kitItem.getOriginalItem() != null){
ItemStack originalItem = kitItem.getOriginalItem();
- lore.add(MessagesManager.getColoredMessage("&8- &fx"+originalItem.getAmount()+" "+originalItem.getType()));
+ lore.add(MessagesManager.getLegacyColoredMessage("&8- &fx"+originalItem.getAmount()+" "+originalItem.getType()));
}else{
- lore.add(MessagesManager.getColoredMessage("&8- &fx"+kitItem.getAmount()+" "+kitItem.getId()));
+ lore.add(MessagesManager.getLegacyColoredMessage("&8- &fx"+kitItem.getAmount()+" "+kitItem.getId()));
}
max--;
if(max <= 0){
@@ -259,7 +259,7 @@ public class InventoryEditManager {
public List setActionItemLore(ArrayList actions,List lore){
int max = 20;
if(actions.isEmpty()){
- lore.add(MessagesManager.getColoredMessage("&cNONE"));
+ lore.add(MessagesManager.getLegacyColoredMessage("&cNONE"));
}else{
for(KitAction kitAction : actions){
String actionLine = kitAction.getAction();
@@ -281,9 +281,9 @@ public class InventoryEditManager {
for(int i=0;i items = kitInventory.getItems();
KitItemManager kitItemManager = plugin.getKitItemManager();
@@ -57,8 +64,8 @@ public class InventoryEditPositionManager {
ItemMeta meta = item.getItemMeta();
List extraLore = new ArrayList<>();
extraLore.add(" ");
- extraLore.add(MessagesManager.getColoredMessage("&a&lTHIS IS THE CURRENT POSITION OF"));
- extraLore.add(MessagesManager.getColoredMessage("&a&lTHE KIT."));
+ extraLore.add(MessagesManager.getLegacyColoredMessage("&a&lTHIS IS THE CURRENT POSITION OF"));
+ extraLore.add(MessagesManager.getLegacyColoredMessage("&a&lTHE KIT."));
List itemLore = new ArrayList<>();
if(meta.hasLore()){
itemLore = new ArrayList<>(meta.getLore());
@@ -130,7 +137,7 @@ public class InventoryEditPositionManager {
if(item == null || item.getType().equals(Material.AIR)){
//Update position
setPosition(inventoryPlayer,slot);
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&aKit position updated."));
+ inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aKit position updated."));
return;
}
@@ -139,7 +146,7 @@ public class InventoryEditPositionManager {
openInventory(inventoryPlayer,openInventory);
return;
}
- inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&cThis position is occupied."));
+ inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cThis position is occupied."));
}
}
diff --git a/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java b/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java
index 97db440..1cae7bf 100644
--- a/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java
+++ b/src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java
@@ -27,7 +27,7 @@ public class InventoryEditRequirementsManager {
public void openInventory(InventoryPlayer inventoryPlayer) {
inventoryPlayer.setInventoryName("edit_requirements");
- Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getColoredMessage("&9Editing Kit"));
+ Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
//Set Go Back
new InventoryItem(inv, 18, Material.ARROW).name("&eGo Back").ready();
@@ -87,7 +87,7 @@ public class InventoryEditRequirementsManager {
public void clickPrice(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer();
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new price of the kit."));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new price of the kit."));
player.closeInventory();
inventoryPlayer.setInventoryName("edit_chat_price");
@@ -112,7 +112,7 @@ public class InventoryEditRequirementsManager {
return;
}
}catch(Exception e){}
- player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&cYou must use a valid number."));
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cYou must use a valid number."));
}
public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int slot, ClickType clickType) {
diff --git a/src/main/java/pk/ajneb97/utils/ActionUtils.java b/src/main/java/pk/ajneb97/utils/ActionUtils.java
index a1eacea..790c88a 100644
--- a/src/main/java/pk/ajneb97/utils/ActionUtils.java
+++ b/src/main/java/pk/ajneb97/utils/ActionUtils.java
@@ -1,5 +1,6 @@
package pk.ajneb97.utils;
+import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.*;
import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.EntityType;
@@ -8,6 +9,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.meta.FireworkMeta;
import org.bukkit.metadata.FixedMetadataValue;
import pk.ajneb97.PlayerKits2;
+import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.libs.actionbar.ActionBarAPI;
import pk.ajneb97.libs.titles.TitleAPI;
import pk.ajneb97.managers.MessagesManager;
@@ -19,7 +21,11 @@ import java.util.ArrayList;
public class ActionUtils {
public static void message(Player player,String actionLine) {
- player.sendMessage(MessagesManager.getColoredMessage(actionLine));
+ if(PlayerKitsAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()){
+ player.sendMessage(MiniMessage.miniMessage().deserialize(actionLine));
+ }else{
+ player.sendMessage(MessagesManager.getLegacyColoredMessage(actionLine));
+ }
}
public static void consoleCommand(String actionLine){
@@ -42,7 +48,7 @@ public class ActionUtils {
pitch = Float.valueOf(sep[2]);
}catch(Exception e ) {
Bukkit.getConsoleSender().sendMessage(PlayerKits2.prefix+
- MessagesManager.getColoredMessage("&7Sound Name: &c"+sep[0]+" &7is not valid. Change it in the config!"));
+ MessagesManager.getLegacyColoredMessage("&7Sound Name: &c"+sep[0]+" &7is not valid. Change it in the config!"));
return;
}
diff --git a/src/main/java/pk/ajneb97/utils/InventoryItem.java b/src/main/java/pk/ajneb97/utils/InventoryItem.java
index 6e65701..e71440a 100644
--- a/src/main/java/pk/ajneb97/utils/InventoryItem.java
+++ b/src/main/java/pk/ajneb97/utils/InventoryItem.java
@@ -38,13 +38,13 @@ public class InventoryItem {
}
public InventoryItem name(String name) {
- meta.setDisplayName(MessagesManager.getColoredMessage(name));
+ meta.setDisplayName(MessagesManager.getLegacyColoredMessage(name));
return this;
}
public InventoryItem lore(List lore) {
for(int i=0;i