bunchy7s/PlayerKitsF
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

1.20.1

Browse source
This commit is contained in:
Ajneb97 2025-11-03 16:57:39 -03:00
parent 4540a86bfc
commit 6e515f2ea7
25 changed files with 304 additions and 145 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
pom.xml
View file

@ -6,7 +6,7 @@
<groupId>pk.ajneb97</groupId> <groupId>pk.ajneb97</groupId>
<artifactId>PlayerKits2</artifactId> <artifactId>PlayerKits2</artifactId>
<version>1.19.1</version> <version>1.20.1</version>
<properties> <properties>
<maven.compiler.source>21</maven.compiler.source> <maven.compiler.source>21</maven.compiler.source>
@ -15,6 +15,10 @@
</properties> </properties>
<repositories> <repositories>
<repository>
<id>papermc</id>
<url>https://repo.papermc.io/repository/maven-public/</url>
</repository>
<repository> <repository>
<id>spigot-repo</id> <id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url> <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@ -34,10 +38,16 @@
</repositories> </repositories>
<dependencies> <dependencies>
<dependency>
<groupId>io.papermc.paper</groupId>
<artifactId>paper-api</artifactId>
<version>1.21.10-R0.1-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency> <dependency>
<groupId>org.spigotmc</groupId> <groupId>org.spigotmc</groupId>
<artifactId>spigot-api</artifactId> <artifactId>spigot-api</artifactId>
<version>1.21.9-R0.1-SNAPSHOT</version> <version>1.21.10-R0.1-SNAPSHOT</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>

32
src/main/java/pk/ajneb97/MainCommand.java
View file

@ -108,21 +108,21 @@ public class MainCommand implements CommandExecutor, TabCompleter {
msgManager.sendMessage(sender,messagesConfig.getString("commandDoesNotExists"),true); msgManager.sendMessage(sender,messagesConfig.getString("commandDoesNotExists"),true);
return; return;
} }
sender.sendMessage(MessagesManager.getColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
sender.sendMessage(MessagesManager.getColoredMessage(" ")); sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit &8Opens the GUI.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit &8Opens the GUI."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit claim <kit> &8Claims a kit outside the GUI.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit claim <kit> &8Claims a kit outside the GUI."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit create <kit> (optional)original &8Creates a new kit using the items in your inventory.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit create <kit> (optional)original &8Creates a new kit using the items in your inventory."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit edit <kit> &8Edits a kit.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit edit <kit> &8Edits a kit."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit give <kit> <player> &8Gives a kit to a player.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit give <kit> <player> &8Gives a kit to a player."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit delete <kit> &8Deletes a kit.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit delete <kit> &8Deletes a kit."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit reset <kit> <player>/* &8Resets kit data for a player.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit reset <kit> <player>/* &8Resets kit data for a player."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit preview <kit> (optional)<player> &8Previews a kit.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit preview <kit> (optional)<player> &8Previews a kit."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit open <inventory> <player> &8Opens a specific inventory for a player.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit open <inventory> <player> &8Opens a specific inventory for a player."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit reload &8Reloads the config.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit reload &8Reloads the config."));
sender.sendMessage(MessagesManager.getColoredMessage("&6/kit verify &8Checks the plugin for errors.")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&6/kit verify &8Checks the plugin for errors."));
sender.sendMessage(MessagesManager.getColoredMessage(" ")); sender.sendMessage(MessagesManager.getLegacyColoredMessage(" "));
sender.sendMessage(MessagesManager.getColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]")); sender.sendMessage(MessagesManager.getLegacyColoredMessage("&7[ [ &8[&bPlayerKits&a²&8] &7] ]"));
} }
public void migrate(CommandSender sender,String[] args,FileConfiguration messagesConfig,MessagesManager msgManager){ 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()){ 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; return;
} }
msgManager.sendMessage(sender,messagesConfig.getString("commandReload"),true); msgManager.sendMessage(sender,messagesConfig.getString("commandReload"),true);

14
src/main/java/pk/ajneb97/PlayerKits2.java
View file

@ -81,8 +81,8 @@ public class PlayerKits2 extends JavaPlugin {
} }
Metrics metrics = new Metrics(this,19795); Metrics metrics = new Metrics(this,19795);
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&eHas been enabled! &fVersion: "+version)); Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(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+"&eThanks for using my plugin! &f~Ajneb97"));
updateCheckerManager = new UpdateCheckerManager(version); updateCheckerManager = new UpdateCheckerManager(version);
updateMessage(updateCheckerManager.check()); updateMessage(updateCheckerManager.check());
@ -90,7 +90,7 @@ public class PlayerKits2 extends JavaPlugin {
public void onDisable(){ public void onDisable(){
this.configsManager.getPlayersConfigManager().saveConfigs(); 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(){ public void registerCommands(){
@ -113,7 +113,7 @@ public class PlayerKits2 extends JavaPlugin {
} }
public void setPrefix(){ public void setPrefix(){
prefix = MessagesManager.getColoredMessage("&8[&bPlayerKits&a²&8] "); prefix = MessagesManager.getLegacyColoredMessage("&8[&bPlayerKits&a²&8] ");
} }
public void setVersion(){ public void setVersion(){
@ -215,11 +215,11 @@ public class PlayerKits2 extends JavaPlugin {
if(!result.isError()){ if(!result.isError()){
String latestVersion = result.getLatestVersion(); String latestVersion = result.getLatestVersion();
if(latestVersion != null){ if(latestVersion != null){
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage("&cThere is a new version available. &e(&7"+latestVersion+"&e)")); Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage("&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("&cYou can download it at: &fhttps://modrinth.com/plugin/playerkits-2"));
} }
}else{ }else{
Bukkit.getConsoleSender().sendMessage(MessagesManager.getColoredMessage(prefix+"&cError while checking update.")); Bukkit.getConsoleSender().sendMessage(MessagesManager.getLegacyColoredMessage(prefix+"&cError while checking update."));
} }
} }

4
src/main/java/pk/ajneb97/api/PlayerKitsAPI.java
View file

@ -14,6 +14,10 @@ public class PlayerKitsAPI {
this.plugin = plugin; this.plugin = plugin;
} }
public static PlayerKits2 getPlugin() {
return plugin;
}
public static String getKitCooldown(Player player, String kitName){ public static String getKitCooldown(Player player, String kitName){
Kit kit = plugin.getKitsManager().getKitByName(kitName); Kit kit = plugin.getKitsManager().getKitByName(kitName);
MessagesManager messagesManager = plugin.getMessagesManager(); MessagesManager messagesManager = plugin.getMessagesManager();

10
src/main/java/pk/ajneb97/configs/MainConfigManager.java
View file

@ -26,6 +26,7 @@ public class MainConfigManager {
private String newKitDefaultInventory; private String newKitDefaultInventory;
private boolean isMySQL; private boolean isMySQL;
private boolean updateNotify; private boolean updateNotify;
private boolean useMiniMessage;
public MainConfigManager(PlayerKits2 plugin){ public MainConfigManager(PlayerKits2 plugin){
this.plugin = plugin; this.plugin = plugin;
@ -45,6 +46,7 @@ public class MainConfigManager {
isMySQL = config.getBoolean("mysql_database.enabled"); isMySQL = config.getBoolean("mysql_database.enabled");
updateNotify = config.getBoolean("update_notify"); updateNotify = config.getBoolean("update_notify");
claimKitShortCommand = config.getBoolean("claim_kit_short_command"); claimKitShortCommand = config.getBoolean("claim_kit_short_command");
useMiniMessage = config.getBoolean("use_minimessage");
newKitDefaultSaveModeOriginal = config.getBoolean("new_kit_default_save_mode_original"); newKitDefaultSaveModeOriginal = config.getBoolean("new_kit_default_save_mode_original");
} }
@ -64,6 +66,10 @@ public class MainConfigManager {
Path pathConfig = Paths.get(configFile.getRoute()); Path pathConfig = Paths.get(configFile.getRoute());
try{ try{
String text = new String(Files.readAllBytes(pathConfig)); String text = new String(Files.readAllBytes(pathConfig));
if(!text.contains("use_minimessage:")){
getConfig().set("use_minimessage",false);
configFile.saveConfig();
}
if(!text.contains("verifyServerCertificate:")){ if(!text.contains("verifyServerCertificate:")){
getConfig().set("mysql_database.pool.connectionTimeout",5000); getConfig().set("mysql_database.pool.connectionTimeout",5000);
getConfig().set("mysql_database.advanced.verifyServerCertificate",false); getConfig().set("mysql_database.advanced.verifyServerCertificate",false);
@ -119,4 +125,8 @@ public class MainConfigManager {
public boolean isNewKitDefaultSaveModeOriginal() { public boolean isNewKitDefaultSaveModeOriginal() {
return newKitDefaultSaveModeOriginal; return newKitDefaultSaveModeOriginal;
} }
public boolean isUseMiniMessage() {
return useMiniMessage;
}
} }

4
src/main/java/pk/ajneb97/database/MySQLConnection.java
View file

@ -30,9 +30,9 @@ public class MySQLConnection {
connection.getHikari().getConnection(); connection.getHikari().getConnection();
createTables(); createTables();
loadData(); 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) { }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."));
} }
} }

10
src/main/java/pk/ajneb97/libs/actionbar/ActionBarAPI.java
View file

@ -1,11 +1,13 @@
package pk.ajneb97.libs.actionbar; 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.ChatMessageType;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import pk.ajneb97.PlayerKits2; import pk.ajneb97.PlayerKits2;
import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.managers.MessagesManager; import pk.ajneb97.managers.MessagesManager;
import pk.ajneb97.utils.OtherUtils; import pk.ajneb97.utils.OtherUtils;
@ -18,10 +20,14 @@ public class ActionBarAPI
public static void sendActionBar(Player player, String message) { public static void sendActionBar(Player player, String message) {
if(OtherUtils.isNew()) { 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; return;
} }
message = MessagesManager.getColoredMessage(message); message = MessagesManager.getLegacyColoredMessage(message);
boolean useOldMethods = false; boolean useOldMethods = false;
String nmsver = Bukkit.getServer().getClass().getPackage().getName(); String nmsver = Bukkit.getServer().getClass().getPackage().getName();
nmsver = nmsver.substring(nmsver.lastIndexOf(".") + 1); nmsver = nmsver.substring(nmsver.lastIndexOf(".") + 1);

12
src/main/java/pk/ajneb97/libs/titles/TitleAPI.java
View file

@ -1,9 +1,12 @@
package pk.ajneb97.libs.titles; 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.Bukkit;
import org.bukkit.ChatColor; import org.bukkit.ChatColor;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.managers.MessagesManager; import pk.ajneb97.managers.MessagesManager;
import pk.ajneb97.utils.OtherUtils; import pk.ajneb97.utils.OtherUtils;
@ -40,7 +43,14 @@ public class TitleAPI implements Listener {
if(subtitle.isEmpty()) { if(subtitle.isEmpty()) {
subtitle = " "; 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; return;
} }
try { try {

4
src/main/java/pk/ajneb97/listeners/PlayerListener.java
View file

@ -28,8 +28,8 @@ public class PlayerListener implements Listener {
//Update notification //Update notification
String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion(); String latestVersion = plugin.getUpdateCheckerManager().getLatestVersion();
if(player.isOp() && plugin.getConfigsManager().getMainConfigManager().isUpdateNotify() && !plugin.version.equals(latestVersion)){ 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.getLegacyColoredMessage(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("&cYou can download it at: &ahttps://modrinth.com/plugin/playerkits-2"));
} }
} }

44
src/main/java/pk/ajneb97/managers/InventoryManager.java
View file

@ -1,5 +1,8 @@
package pk.ajneb97.managers; 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.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
@ -86,13 +89,18 @@ public class InventoryManager {
public void openInventory(InventoryPlayer inventoryPlayer){ public void openInventory(InventoryPlayer inventoryPlayer){
KitInventory kitInventory = getInventory(inventoryPlayer.getInventoryName()); KitInventory kitInventory = getInventory(inventoryPlayer.getInventoryName());
MainConfigManager mainConfigManager = plugin.getConfigsManager().getMainConfigManager();
String title = kitInventory.getTitle(); String title = kitInventory.getTitle();
if(inventoryPlayer.getInventoryName().equals("buy_requirements_inventory") || inventoryPlayer.getInventoryName().equals("preview_inventory")){ if(inventoryPlayer.getInventoryName().equals("buy_requirements_inventory") || inventoryPlayer.getInventoryName().equals("preview_inventory")){
title = title.replace("%kit%",inventoryPlayer.getKitName()); title = title.replace("%kit%",inventoryPlayer.getKitName());
} }
Inventory inv = Bukkit.createInventory(null,kitInventory.getSlots(), Inventory inv;
MessagesManager.getColoredMessage(title)); if(mainConfigManager.isUseMiniMessage()){
inv = Bukkit.createInventory(null,kitInventory.getSlots(), MiniMessage.miniMessage().deserialize(title));
}else{
inv = Bukkit.createInventory(null,kitInventory.getSlots(), MessagesManager.getLegacyColoredMessage(title));
}
List<ItemKitInventory> items = kitInventory.getItems(); List<ItemKitInventory> items = kitInventory.getItems();
KitItemManager kitItemManager = plugin.getKitItemManager(); KitItemManager kitItemManager = plugin.getKitItemManager();
@ -283,20 +291,6 @@ public class InventoryManager {
openInventory(inventoryPlayer); 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) { public void clickOnActionItem(InventoryPlayer inventoryPlayer,String itemActions) {
String[] sep = itemActions.split("\\|"); String[] sep = itemActions.split("\\|");
@ -361,6 +355,7 @@ public class InventoryManager {
newStatus = "default"; newStatus = "default";
} }
boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
if(newStatus.equals(currentStatus) && currentItem != null){ if(newStatus.equals(currentStatus) && currentItem != null){
// Name and Lore update // Name and Lore update
ItemMeta meta = currentItem.getItemMeta(); ItemMeta meta = currentItem.getItemMeta();
@ -368,17 +363,30 @@ public class InventoryManager {
String name = kitItem.getName(); String name = kitItem.getName();
if(name != null){ if(name != null){
name = OtherUtils.replaceGlobalVariables(name,player,plugin); 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<String> lore = kitItem.getLore(); List<String> lore = kitItem.getLore();
if(lore != null) { if(lore != null) {
List<String> loreCopy = new ArrayList<>(lore); List<String> loreCopy = new ArrayList<>(lore);
if(useMiniMessage){
List<Component> loreComponent = new ArrayList<>();
for(int i=0;i<loreCopy.size();i++) { for(int i=0;i<loreCopy.size();i++) {
String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin); String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin);
loreCopy.set(i, MessagesManager.getColoredMessage(line)); loreComponent.add(MiniMessage.miniMessage().deserialize(line).decoration(TextDecoration.ITALIC, false));
}
meta.lore(loreComponent);
}else{
for(int i=0;i<loreCopy.size();i++) {
String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin);
loreCopy.set(i, MessagesManager.getLegacyColoredMessage(line));
} }
meta.setLore(loreCopy); meta.setLore(loreCopy);
} }
}
currentItem.setItemMeta(meta); currentItem.setItemMeta(meta);
kitItemManager.replaceVariables(currentItem,variablesToReplace); kitItemManager.replaceVariables(currentItem,variablesToReplace);

28
src/main/java/pk/ajneb97/managers/InventoryRequirementsManager.java
View file

@ -1,6 +1,10 @@
package pk.ajneb97.managers; package pk.ajneb97.managers;
import me.clip.placeholderapi.PlaceholderAPI; import me.clip.placeholderapi.PlaceholderAPI;
import net.kyori.adventure.text.Component;
import net.kyori.adventure.text.format.TextDecoration;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.kyori.adventure.text.serializer.plain.PlainTextComponentSerializer;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
@ -30,15 +34,36 @@ public class InventoryRequirementsManager {
if(!meta.hasLore()){ if(!meta.hasLore()){
return; return;
} }
if(plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage()){
List<Component> newLore = new ArrayList<>();
PlainTextComponentSerializer plainSerializer = PlainTextComponentSerializer.plainText();
for(Component line : meta.lore()){
String plainText = plainSerializer.serialize(line);
if(plainText.contains("%kit_requirements_message%")){
List<String> 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<String> lore = new ArrayList<>(); List<String> lore = new ArrayList<>();
for(String line : meta.getLore()){ for(String line : meta.getLore()){
if(line.equals("%kit_requirements_message%")){ if(line.equals("%kit_requirements_message%")){
lore.addAll(replaceRequirementsMessageVariable(kitName,player)); List<String> message = replaceRequirementsMessageVariable(kitName,player);
for(String m : message){
lore.add(MessagesManager.getLegacyColoredMessage(m));
}
}else{ }else{
lore.add(line); lore.add(line);
} }
} }
meta.setLore(lore); meta.setLore(lore);
}
item.setItemMeta(meta); item.setItemMeta(meta);
} }
} }
@ -88,7 +113,6 @@ public class InventoryRequirementsManager {
line = PlaceholderAPI.setPlaceholders(player, line); line = PlaceholderAPI.setPlaceholders(player, line);
} }
line = MessagesManager.getColoredMessage(line);
requirementsMessage.set(i, line); requirementsMessage.set(i, line);
} }

76
src/main/java/pk/ajneb97/managers/KitItemManager.java
View file

@ -1,6 +1,9 @@
package pk.ajneb97.managers; 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.Color;
import org.bukkit.NamespacedKey; import org.bukkit.NamespacedKey;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
@ -43,16 +46,29 @@ public class KitItemManager {
} }
ServerVersion serverVersion = PlayerKits2.serverVersion; ServerVersion serverVersion = PlayerKits2.serverVersion;
boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
if(item.hasItemMeta()) { if(item.hasItemMeta()) {
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if(meta.hasDisplayName()) { if(meta.hasDisplayName()) {
if(useMiniMessage){
kitItem.setName(MiniMessage.miniMessage().serialize(meta.displayName()));
}else{
kitItem.setName(meta.getDisplayName().replace("§", "&")); kitItem.setName(meta.getDisplayName().replace("§", "&"));
} }
}
if(meta.hasLore()) { if(meta.hasLore()) {
List<String> lore = new ArrayList<String>(); List<String> lore = new ArrayList<>();
if(useMiniMessage){
for (Component line : meta.lore()) {
lore.add(MiniMessage.miniMessage().serialize(line));
}
}else{
for(String l : meta.getLore()) { for(String l : meta.getLore()) {
lore.add(l.replace("§", "&")); lore.add(l.replace("§", "&"));
} }
}
kitItem.setLore(lore); kitItem.setLore(lore);
} }
if(meta.hasEnchants()) { if(meta.hasEnchants()) {
@ -206,23 +222,38 @@ public class KitItemManager {
item.setDurability(durability); item.setDurability(durability);
} }
boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
//MAIN META //MAIN META
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
String name = kitItem.getName(); String name = kitItem.getName();
if(name != null){ if(name != null){
name = OtherUtils.replaceGlobalVariables(name,player,plugin); 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<String> lore = kitItem.getLore(); List<String> lore = kitItem.getLore();
if(lore != null) { if(lore != null) {
List<String> loreCopy = new ArrayList<String>(lore); List<String> loreCopy = new ArrayList<>(lore);
if(useMiniMessage){
List<Component> loreComponent = new ArrayList<>();
for(int i=0;i<loreCopy.size();i++) { for(int i=0;i<loreCopy.size();i++) {
String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin); String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin);
loreCopy.set(i, MessagesManager.getColoredMessage(line)); loreComponent.add(MiniMessage.miniMessage().deserialize(line).decoration(TextDecoration.ITALIC, false));
}
meta.lore(loreComponent);
}else{
for(int i=0;i<loreCopy.size();i++) {
String line = OtherUtils.replaceGlobalVariables(loreCopy.get(i),player,plugin);
loreCopy.set(i, MessagesManager.getLegacyColoredMessage(line));
} }
meta.setLore(loreCopy); meta.setLore(loreCopy);
} }
}
int customModelData = kitItem.getCustomModelData(); int customModelData = kitItem.getCustomModelData();
if(customModelData != 0) { if(customModelData != 0) {
@ -783,24 +814,55 @@ public class KitItemManager {
} }
public void replaceVariables(ItemStack item, ArrayList<KitVariable> variables){ public void replaceVariables(ItemStack item, ArrayList<KitVariable> variables){
boolean useMiniMessage = plugin.getConfigsManager().getMainConfigManager().isUseMiniMessage();
if(item.hasItemMeta()){ if(item.hasItemMeta()){
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
if(meta.hasDisplayName()){ if(meta.hasDisplayName()){
if(useMiniMessage){
Component name = meta.displayName();
Component newName = name;
for(KitVariable variable : variables){
newName = newName.replaceText(TextReplacementConfig.builder()
.matchLiteral(variable.getVariable())
.replacement(MiniMessage.miniMessage().deserialize(variable.getValue()))
.build());
}
meta.displayName(newName);
}else{
String newName = meta.getDisplayName(); String newName = meta.getDisplayName();
for(KitVariable variable : variables){ for(KitVariable variable : variables){
newName = newName.replace(variable.getVariable(),variable.getValue()); newName = newName.replace(variable.getVariable(),variable.getValue());
} }
meta.setDisplayName(newName); meta.setDisplayName(MessagesManager.getLegacyColoredMessage(newName));
} }
}
if(meta.hasLore()){ if(meta.hasLore()){
if(useMiniMessage){
List<Component> lore = meta.lore();
List<Component> 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<String> lore = meta.getLore(); List<String> lore = meta.getLore();
for(int i=0;i<lore.size();i++){ for(int i=0;i<lore.size();i++){
for(KitVariable variable : variables){ for(KitVariable variable : variables){
lore.set(i,lore.get(i).replace(variable.getVariable(),variable.getValue())); String line = lore.get(i).replace(variable.getVariable(),variable.getValue());
lore.set(i,MessagesManager.getLegacyColoredMessage(line));
} }
} }
meta.setLore(lore); meta.setLore(lore);
} }
}
item.setItemMeta(meta); item.setItemMeta(meta);
} }
} }

17
src/main/java/pk/ajneb97/managers/MessagesManager.java
View file

@ -1,7 +1,10 @@
package pk.ajneb97.managers; package pk.ajneb97.managers;
import net.kyori.adventure.text.minimessage.MiniMessage;
import net.md_5.bungee.api.ChatColor; import net.md_5.bungee.api.ChatColor;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import pk.ajneb97.PlayerKits2;
import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.utils.OtherUtils; import pk.ajneb97.utils.OtherUtils;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@ -85,15 +88,23 @@ public class MessagesManager {
public void sendMessage(CommandSender sender, String message, boolean prefix){ public void sendMessage(CommandSender sender, String message, boolean prefix){
if(!message.isEmpty()){ if(!message.isEmpty()){
if(PlayerKitsAPI.getPlugin().getConfigsManager().getMainConfigManager().isUseMiniMessage()){
if(prefix){ if(prefix){
sender.sendMessage(getColoredMessage(this.prefix+message)); sender.sendMessage(MiniMessage.miniMessage().deserialize(this.prefix+message));
}else{ }else{
sender.sendMessage(getColoredMessage(message)); sender.sendMessage(MiniMessage.miniMessage().deserialize(message));
}
}else{
if(prefix){
sender.sendMessage(getLegacyColoredMessage(this.prefix+message));
}else{
sender.sendMessage(getLegacyColoredMessage(message));
}
} }
} }
} }
public static String getColoredMessage(String message) { public static String getLegacyColoredMessage(String message) {
if(OtherUtils.isNew()) { if(OtherUtils.isNew()) {
Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}"); Pattern pattern = Pattern.compile("#[a-fA-F0-9]{6}");
Matcher match = pattern.matcher(message); Matcher match = pattern.matcher(message);

16
src/main/java/pk/ajneb97/managers/MigrationManager.java
View file

@ -29,7 +29,7 @@ public class MigrationManager {
migrateKits(sender); migrateKits(sender);
migratePlayers(sender); migratePlayers(sender);
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &aMigration completed.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aMigration completed."));
} }
}.runTaskAsynchronously(plugin); }.runTaskAsynchronously(plugin);
} }
@ -38,7 +38,7 @@ public class MigrationManager {
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits"); File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits");
File configFile = new File(bStatsFolder, "kits.yml"); File configFile = new File(bStatsFolder, "kits.yml");
if(!configFile.exists()){ if(!configFile.exists()){
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &cPlayerKits1 kits.yml file not found.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 kits.yml file not found."));
return; return;
} }
@ -99,15 +99,15 @@ public class MigrationManager {
kitsConfigManager.saveConfig(kit); kitsConfigManager.saveConfig(kit);
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &aKit &7"+kitName+" &amigrated.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aKit &7"+kitName+" &amigrated."));
}catch(Exception e){ }catch(Exception e){
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &cError while trying to migrate kit &7"+kitName+"&c, check console.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate kit &7"+kitName+"&c, check console."));
e.printStackTrace(); e.printStackTrace();
} }
} }
}else{ }else{
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &cNo kits found.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cNo kits found."));
return; return;
} }
@ -119,7 +119,7 @@ public class MigrationManager {
File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits"); File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "PlayerKits");
File configFile = new File(bStatsFolder, "players.yml"); File configFile = new File(bStatsFolder, "players.yml");
if(!configFile.exists()){ if(!configFile.exists()){
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &cPlayerKits1 players.yml file not found.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &cPlayerKits1 players.yml file not found."));
return; return;
} }
@ -146,9 +146,9 @@ public class MigrationManager {
playersConfigManager.saveConfig(playerData); playersConfigManager.saveConfig(playerData);
sender.sendMessage(PlayerKits2.prefix+MessagesManager.getColoredMessage(" &aPlayer &7"+name+" &amigrated.")); sender.sendMessage(PlayerKits2.prefix+MessagesManager.getLegacyColoredMessage(" &aPlayer &7"+name+" &amigrated."));
} catch (Exception e) { } catch (Exception e) {
sender.sendMessage(PlayerKits2.prefix + MessagesManager.getColoredMessage(" &cError while trying to migrate player data with uuid &7" + uuid + "&c, check console.")); sender.sendMessage(PlayerKits2.prefix + MessagesManager.getLegacyColoredMessage(" &cError while trying to migrate player data with uuid &7" + uuid + "&c, check console."));
e.printStackTrace(); e.printStackTrace();
} }
} }

12
src/main/java/pk/ajneb97/managers/VerifyManager.java
View file

@ -25,18 +25,18 @@ public class VerifyManager {
} }
public void sendVerification(Player player) { public void sendVerification(Player player) {
player.sendMessage(MessagesManager.getColoredMessage("&f&l- - - - - - - - &b&lPLAYERKITS 2 VERIFY &f&l- - - - - - - -")); player.sendMessage(MessagesManager.getLegacyColoredMessage("&f&l- - - - - - - - &b&lPLAYERKITS 2 VERIFY &f&l- - - - - - - -"));
player.sendMessage(MessagesManager.getColoredMessage("")); player.sendMessage(MessagesManager.getLegacyColoredMessage(""));
if(errors.isEmpty()) { if(errors.isEmpty()) {
player.sendMessage(MessagesManager.getColoredMessage("&aThere are no errors in the plugin ;)")); player.sendMessage(MessagesManager.getLegacyColoredMessage("&aThere are no errors in the plugin ;)"));
}else { }else {
player.sendMessage(MessagesManager.getColoredMessage("&e&oHover on the errors to see more information.")); player.sendMessage(MessagesManager.getLegacyColoredMessage("&e&oHover on the errors to see more information."));
for(PKBaseError error : errors) { for(PKBaseError error : errors) {
error.sendMessage(player); error.sendMessage(player);
} }
} }
player.sendMessage(MessagesManager.getColoredMessage("")); player.sendMessage(MessagesManager.getLegacyColoredMessage(""));
player.sendMessage(MessagesManager.getColoredMessage("&f&l- - - - - - - - &b&lPLAYERKITS 2 VERIFY &f&l- - - - - - - -")); player.sendMessage(MessagesManager.getLegacyColoredMessage("&f&l- - - - - - - - &b&lPLAYERKITS 2 VERIFY &f&l- - - - - - - -"));
} }
public void verify() { public void verify() {

14
src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsEditManager.java
View file

@ -30,7 +30,7 @@ public class InventoryEditActionsEditManager {
public void openInventory(InventoryPlayer inventoryPlayer, String type, int actionSlot) { public void openInventory(InventoryPlayer inventoryPlayer, String type, int actionSlot) {
inventoryPlayer.setInventoryName("edit_action_slot_" + type + "_" + actionSlot); inventoryPlayer.setInventoryName("edit_action_slot_" + type + "_" + actionSlot);
Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getColoredMessage("&9Editing Kit")); Inventory inv = Bukkit.createInventory(null, 27, MessagesManager.getLegacyColoredMessage("&9Editing Kit"));
//Set Go Back //Set Go Back
new InventoryItem(inv, 18, Material.ARROW).name("&eGo Back").ready(); new InventoryItem(inv, 18, Material.ARROW).name("&eGo Back").ready();
@ -40,13 +40,13 @@ public class InventoryEditActionsEditManager {
//Set Edit Action //Set Edit Action
List<String> lore = new ArrayList<>(); List<String> 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("");
lore.add(MessagesManager.getColoredMessage("&7Current:")); lore.add(MessagesManager.getLegacyColoredMessage("&7Current:"));
lore.add(MessagesManager.getColoredMessage("&f") + kitAction.getAction()); lore.add(MessagesManager.getLegacyColoredMessage("&f") + kitAction.getAction());
ItemStack item = new ItemStack(Material.PAPER); ItemStack item = new ItemStack(Material.PAPER);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName(MessagesManager.getColoredMessage("&6&lEdit Action")); meta.setDisplayName(MessagesManager.getLegacyColoredMessage("&6&lEdit Action"));
meta.setLore(lore); meta.setLore(lore);
item.setItemMeta(meta); item.setItemMeta(meta);
inv.setItem(10, item); inv.setItem(10, item);
@ -143,8 +143,8 @@ public class InventoryEditActionsEditManager {
public void clickEditAction(InventoryPlayer inventoryPlayer){ public void clickEditAction(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer(); Player player = inventoryPlayer.getPlayer();
player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new action to set.")); player.sendMessage(MessagesManager.getLegacyColoredMessage(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+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
player.closeInventory(); player.closeInventory();
inventoryPlayer.setInventoryName("edit_chat_action_slot_" + getType(inventoryPlayer) + "_" + getActionSlot(inventoryPlayer)); inventoryPlayer.setInventoryName("edit_chat_action_slot_" + getType(inventoryPlayer) + "_" + getActionSlot(inventoryPlayer));

20
src/main/java/pk/ajneb97/managers/edit/InventoryEditActionsManager.java
View file

@ -31,7 +31,7 @@ public class InventoryEditActionsManager {
public void openInventory(InventoryPlayer inventoryPlayer,String type) { public void openInventory(InventoryPlayer inventoryPlayer,String type) {
inventoryPlayer.setInventoryName("edit_actions_"+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 //Decoration
for(int i=45;i<=52;i++){ for(int i=45;i<=52;i++){
@ -69,18 +69,18 @@ public class InventoryEditActionsManager {
String displayItem = kitAction.getDisplayItem() != null ? "&aYES" : "&cNO"; String displayItem = kitAction.getDisplayItem() != null ? "&aYES" : "&cNO";
lore = new ArrayList<>(); lore = new ArrayList<>();
lore.add(MessagesManager.getColoredMessage("&f")+kitAction.getAction()); lore.add(MessagesManager.getLegacyColoredMessage("&f")+kitAction.getAction());
lore.add(""); lore.add("");
lore.add(MessagesManager.getColoredMessage("&7Execute before giving kit items? "+executeBeforeItems)); lore.add(MessagesManager.getLegacyColoredMessage("&7Execute before giving kit items? "+executeBeforeItems));
lore.add(MessagesManager.getColoredMessage("&7Count as item? "+countAsItem)); lore.add(MessagesManager.getLegacyColoredMessage("&7Count as item? "+countAsItem));
lore.add(MessagesManager.getColoredMessage("&7Has display item? "+displayItem)); lore.add(MessagesManager.getLegacyColoredMessage("&7Has display item? "+displayItem));
lore.add(""); lore.add("");
lore.add(MessagesManager.getColoredMessage("&a&lLEFT CLICK &ato edit")); lore.add(MessagesManager.getLegacyColoredMessage("&a&lLEFT CLICK &ato edit"));
lore.add(MessagesManager.getColoredMessage("&c&lRIGHT CLICK &cto remove")); lore.add(MessagesManager.getLegacyColoredMessage("&c&lRIGHT CLICK &cto remove"));
ItemStack item = new ItemStack(Material.PAPER); ItemStack item = new ItemStack(Material.PAPER);
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
meta.setDisplayName(MessagesManager.getColoredMessage("&7Action &e#"+(slot+1))); meta.setDisplayName(MessagesManager.getLegacyColoredMessage("&7Action &e#"+(slot+1)));
meta.setLore(lore); meta.setLore(lore);
item.setItemMeta(meta); item.setItemMeta(meta);
inv.setItem(slot,item); inv.setItem(slot,item);
@ -109,8 +109,8 @@ public class InventoryEditActionsManager {
public void clickAddAction(InventoryPlayer inventoryPlayer){ public void clickAddAction(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer(); Player player = inventoryPlayer.getPlayer();
player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new action to add.")); player.sendMessage(MessagesManager.getLegacyColoredMessage(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+"&fCheck all actions on the wiki: &bhttps://ajneb97.gitbook.io/playerkits-2/actions"));
player.closeInventory(); player.closeInventory();
String type = inventoryPlayer.getInventoryName().replace("edit_actions_",""); String type = inventoryPlayer.getInventoryName().replace("edit_actions_","");

4
src/main/java/pk/ajneb97/managers/edit/InventoryEditDisplayManager.java
View file

@ -30,7 +30,7 @@ public class InventoryEditDisplayManager {
public void openInventory(InventoryPlayer inventoryPlayer, String type) { public void openInventory(InventoryPlayer inventoryPlayer, String type) {
inventoryPlayer.setInventoryName("edit_display_" + 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 //Decoration
ArrayList<Integer> slots = new ArrayList<>(); ArrayList<Integer> slots = new ArrayList<>();
@ -157,7 +157,7 @@ public class InventoryEditDisplayManager {
} }
}else if(slot == 26){ }else if(slot == 26){
saveKitItem(inventoryPlayer); saveKitItem(inventoryPlayer);
inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&aDisplay item saved.")); inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aDisplay item saved."));
} }
} }
} }

8
src/main/java/pk/ajneb97/managers/edit/InventoryEditKitItemsManager.java
View file

@ -29,7 +29,7 @@ public class InventoryEditKitItemsManager {
public void openInventory(InventoryPlayer inventoryPlayer){ public void openInventory(InventoryPlayer inventoryPlayer){
inventoryPlayer.setInventoryName("edit_items"); 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 //Decoration
for(int i=46;i<=52;i++){ 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){ public void clickOffHand(InventoryPlayer inventoryPlayer, Inventory inv, ItemStack clickedItem, int clickedSlot){
ServerVersion serverVersion = PlayerKits2.serverVersion; ServerVersion serverVersion = PlayerKits2.serverVersion;
if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_9_R1)) { 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; return;
} }
String offhand = ItemUtils.getTagStringItem(plugin,clickedItem,"playerkits_offhand"); String offhand = ItemUtils.getTagStringItem(plugin,clickedItem,"playerkits_offhand");
@ -119,7 +119,7 @@ public class InventoryEditKitItemsManager {
public void setItemOffHand(Inventory inv,ItemStack item,int slot){ public void setItemOffHand(Inventory inv,ItemStack item,int slot){
List<String> offHandLore = new ArrayList<>(); List<String> offHandLore = new ArrayList<>();
offHandLore.add(" "); 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(); ItemMeta meta = item.getItemMeta();
List<String> itemLore = new ArrayList<>(); List<String> itemLore = new ArrayList<>();
if(meta.hasLore()){ if(meta.hasLore()){
@ -191,7 +191,7 @@ public class InventoryEditKitItemsManager {
inventoryEditManager.openInventory(inventoryPlayer); inventoryEditManager.openInventory(inventoryPlayer);
}else if(slot == 53){ }else if(slot == 53){
saveKitItems(inventoryPlayer); 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()){ }else if(clickType.isRightClick()){
event.setCancelled(true); event.setCancelled(true);

16
src/main/java/pk/ajneb97/managers/edit/InventoryEditManager.java
View file

@ -77,7 +77,7 @@ public class InventoryEditManager {
public void openInventory(InventoryPlayer inventoryPlayer) { public void openInventory(InventoryPlayer inventoryPlayer) {
inventoryPlayer.setInventoryName("edit_main_inventory"); 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()); Kit kit = plugin.getKitsManager().getKitByName(inventoryPlayer.getKitName());
@ -217,9 +217,9 @@ public class InventoryEditManager {
for(KitItem kitItem : kit.getItems()){ for(KitItem kitItem : kit.getItems()){
if(kitItem.getOriginalItem() != null){ if(kitItem.getOriginalItem() != null){
ItemStack originalItem = kitItem.getOriginalItem(); 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{ }else{
lore.add(MessagesManager.getColoredMessage("&8- &fx"+kitItem.getAmount()+" "+kitItem.getId())); lore.add(MessagesManager.getLegacyColoredMessage("&8- &fx"+kitItem.getAmount()+" "+kitItem.getId()));
} }
max--; max--;
if(max <= 0){ if(max <= 0){
@ -259,7 +259,7 @@ public class InventoryEditManager {
public List<String> setActionItemLore(ArrayList<KitAction> actions,List<String> lore){ public List<String> setActionItemLore(ArrayList<KitAction> actions,List<String> lore){
int max = 20; int max = 20;
if(actions.isEmpty()){ if(actions.isEmpty()){
lore.add(MessagesManager.getColoredMessage("&cNONE")); lore.add(MessagesManager.getLegacyColoredMessage("&cNONE"));
}else{ }else{
for(KitAction kitAction : actions){ for(KitAction kitAction : actions){
String actionLine = kitAction.getAction(); String actionLine = kitAction.getAction();
@ -281,9 +281,9 @@ public class InventoryEditManager {
for(int i=0;i<separatedActionLine.size();i++){ for(int i=0;i<separatedActionLine.size();i++){
if(i == 0){ if(i == 0){
lore.add(MessagesManager.getColoredMessage("&8- &f")+separatedActionLine.get(i)); lore.add(MessagesManager.getLegacyColoredMessage("&8- &f")+separatedActionLine.get(i));
}else{ }else{
lore.add(MessagesManager.getColoredMessage("&f")+separatedActionLine.get(i)); lore.add(MessagesManager.getLegacyColoredMessage("&f")+separatedActionLine.get(i));
} }
} }
@ -319,7 +319,7 @@ public class InventoryEditManager {
public void clickCooldown(InventoryPlayer inventoryPlayer){ public void clickCooldown(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer(); Player player = inventoryPlayer.getPlayer();
player.sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&7Write the new cooldown of the kit (in seconds).")); player.sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&7Write the new cooldown of the kit (in seconds)."));
player.closeInventory(); player.closeInventory();
inventoryPlayer.setInventoryName("edit_chat_cooldown"); inventoryPlayer.setInventoryName("edit_chat_cooldown");
@ -339,7 +339,7 @@ public class InventoryEditManager {
return; return;
} }
}catch(Exception e){} }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) { public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int slot, ClickType clickType) {

19
src/main/java/pk/ajneb97/managers/edit/InventoryEditPositionManager.java
View file

@ -1,5 +1,6 @@
package pk.ajneb97.managers.edit; package pk.ajneb97.managers.edit;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.event.inventory.ClickType; import org.bukkit.event.inventory.ClickType;
@ -9,6 +10,7 @@ import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.inventory.meta.ItemMeta;
import org.bukkit.scheduler.BukkitRunnable; import org.bukkit.scheduler.BukkitRunnable;
import pk.ajneb97.PlayerKits2; import pk.ajneb97.PlayerKits2;
import pk.ajneb97.configs.MainConfigManager;
import pk.ajneb97.managers.*; import pk.ajneb97.managers.*;
import pk.ajneb97.model.Kit; import pk.ajneb97.model.Kit;
import pk.ajneb97.model.internal.KitVariable; import pk.ajneb97.model.internal.KitVariable;
@ -34,8 +36,13 @@ public class InventoryEditPositionManager {
public void openInventory(InventoryPlayer inventoryPlayer,String positionInventory) { public void openInventory(InventoryPlayer inventoryPlayer,String positionInventory) {
KitInventory kitInventory = plugin.getInventoryManager().getInventory(positionInventory); KitInventory kitInventory = plugin.getInventoryManager().getInventory(positionInventory);
Inventory inv = Bukkit.createInventory(null,kitInventory.getSlots(), Inventory inv;
MessagesManager.getColoredMessage(kitInventory.getTitle())); MainConfigManager mainConfigManager = plugin.getConfigsManager().getMainConfigManager();
if(mainConfigManager.isUseMiniMessage()){
inv = Bukkit.createInventory(null,kitInventory.getSlots(), MiniMessage.miniMessage().deserialize(kitInventory.getTitle()));
}else{
inv = Bukkit.createInventory(null,kitInventory.getSlots(), MessagesManager.getLegacyColoredMessage(kitInventory.getTitle()));
}
List<ItemKitInventory> items = kitInventory.getItems(); List<ItemKitInventory> items = kitInventory.getItems();
KitItemManager kitItemManager = plugin.getKitItemManager(); KitItemManager kitItemManager = plugin.getKitItemManager();
@ -57,8 +64,8 @@ public class InventoryEditPositionManager {
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
List<String> extraLore = new ArrayList<>(); List<String> extraLore = new ArrayList<>();
extraLore.add(" "); extraLore.add(" ");
extraLore.add(MessagesManager.getColoredMessage("&a&lTHIS IS THE CURRENT POSITION OF")); extraLore.add(MessagesManager.getLegacyColoredMessage("&a&lTHIS IS THE CURRENT POSITION OF"));
extraLore.add(MessagesManager.getColoredMessage("&a&lTHE KIT.")); extraLore.add(MessagesManager.getLegacyColoredMessage("&a&lTHE KIT."));
List<String> itemLore = new ArrayList<>(); List<String> itemLore = new ArrayList<>();
if(meta.hasLore()){ if(meta.hasLore()){
itemLore = new ArrayList<>(meta.getLore()); itemLore = new ArrayList<>(meta.getLore());
@ -130,7 +137,7 @@ public class InventoryEditPositionManager {
if(item == null || item.getType().equals(Material.AIR)){ if(item == null || item.getType().equals(Material.AIR)){
//Update position //Update position
setPosition(inventoryPlayer,slot); setPosition(inventoryPlayer,slot);
inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&aKit position updated.")); inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&aKit position updated."));
return; return;
} }
@ -139,7 +146,7 @@ public class InventoryEditPositionManager {
openInventory(inventoryPlayer,openInventory); openInventory(inventoryPlayer,openInventory);
return; return;
} }
inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(PlayerKits2.prefix+"&cThis position is occupied.")); inventoryPlayer.getPlayer().sendMessage(MessagesManager.getLegacyColoredMessage(PlayerKits2.prefix+"&cThis position is occupied."));
} }
} }

6
src/main/java/pk/ajneb97/managers/edit/InventoryEditRequirementsManager.java
View file

@ -27,7 +27,7 @@ public class InventoryEditRequirementsManager {
public void openInventory(InventoryPlayer inventoryPlayer) { public void openInventory(InventoryPlayer inventoryPlayer) {
inventoryPlayer.setInventoryName("edit_requirements"); 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 //Set Go Back
new InventoryItem(inv, 18, Material.ARROW).name("&eGo Back").ready(); new InventoryItem(inv, 18, Material.ARROW).name("&eGo Back").ready();
@ -87,7 +87,7 @@ public class InventoryEditRequirementsManager {
public void clickPrice(InventoryPlayer inventoryPlayer){ public void clickPrice(InventoryPlayer inventoryPlayer){
Player player = inventoryPlayer.getPlayer(); 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(); player.closeInventory();
inventoryPlayer.setInventoryName("edit_chat_price"); inventoryPlayer.setInventoryName("edit_chat_price");
@ -112,7 +112,7 @@ public class InventoryEditRequirementsManager {
return; return;
} }
}catch(Exception e){} }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) { public void clickInventory(InventoryPlayer inventoryPlayer, ItemStack item, int slot, ClickType clickType) {

10
src/main/java/pk/ajneb97/utils/ActionUtils.java
View file

@ -1,5 +1,6 @@
package pk.ajneb97.utils; package pk.ajneb97.utils;
import net.kyori.adventure.text.minimessage.MiniMessage;
import org.bukkit.*; import org.bukkit.*;
import org.bukkit.command.ConsoleCommandSender; import org.bukkit.command.ConsoleCommandSender;
import org.bukkit.entity.EntityType; import org.bukkit.entity.EntityType;
@ -8,6 +9,7 @@ import org.bukkit.entity.Player;
import org.bukkit.inventory.meta.FireworkMeta; import org.bukkit.inventory.meta.FireworkMeta;
import org.bukkit.metadata.FixedMetadataValue; import org.bukkit.metadata.FixedMetadataValue;
import pk.ajneb97.PlayerKits2; import pk.ajneb97.PlayerKits2;
import pk.ajneb97.api.PlayerKitsAPI;
import pk.ajneb97.libs.actionbar.ActionBarAPI; import pk.ajneb97.libs.actionbar.ActionBarAPI;
import pk.ajneb97.libs.titles.TitleAPI; import pk.ajneb97.libs.titles.TitleAPI;
import pk.ajneb97.managers.MessagesManager; import pk.ajneb97.managers.MessagesManager;
@ -19,7 +21,11 @@ import java.util.ArrayList;
public class ActionUtils { public class ActionUtils {
public static void message(Player player,String actionLine) { 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){ public static void consoleCommand(String actionLine){
@ -42,7 +48,7 @@ public class ActionUtils {
pitch = Float.valueOf(sep[2]); pitch = Float.valueOf(sep[2]);
}catch(Exception e ) { }catch(Exception e ) {
Bukkit.getConsoleSender().sendMessage(PlayerKits2.prefix+ 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; return;
} }

4
src/main/java/pk/ajneb97/utils/InventoryItem.java
View file

@ -38,13 +38,13 @@ public class InventoryItem {
} }
public InventoryItem name(String name) { public InventoryItem name(String name) {
meta.setDisplayName(MessagesManager.getColoredMessage(name)); meta.setDisplayName(MessagesManager.getLegacyColoredMessage(name));
return this; return this;
} }
public InventoryItem lore(List<String> lore) { public InventoryItem lore(List<String> lore) {
for(int i=0;i<lore.size();i++) { for(int i=0;i<lore.size();i++) {
lore.set(i, MessagesManager.getColoredMessage(lore.get(i))); lore.set(i, MessagesManager.getLegacyColoredMessage(lore.get(i)));
} }
meta.setLore(lore); meta.setLore(lore);
return this; return this;

1
src/main/resources/config.yml
View file

@ -43,6 +43,7 @@ new_kit_default_values:
- HIDE_ATTRIBUTES - HIDE_ATTRIBUTES
player_data_save_time: 300 player_data_save_time: 300
update_notify: true update_notify: true
use_minimessage: false
mysql_database: mysql_database:
enabled: false enabled: false
host: localhost host: localhost