diff --git a/CommandGUI V2/pom.xml b/CommandGUI V2/pom.xml index 0ec34a1..b46da70 100644 --- a/CommandGUI V2/pom.xml +++ b/CommandGUI V2/pom.xml @@ -6,7 +6,7 @@ net.t2code CommandGUI_V2 - 2.5.16 + 2.5.17 jar CommandGUI @@ -81,7 +81,7 @@ net.t2code T2CodeLib - 8 + 9.0 net.t2code.minecraft.1_18.r1 diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BConfig.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BConfig.java index 0fd5702..313e625 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BConfig.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BConfig.java @@ -1,10 +1,10 @@ package de.jatitv.commandguiv2.Bungee; +import de.jatitv.commandguiv2.Util; import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.ConfigurationProvider; import net.md_5.bungee.config.YamlConfiguration; import net.t2code.lib.Bungee.Lib.messages.Bsend; -import net.t2code.lib.Util; import java.io.File; import java.io.IOException; @@ -35,7 +35,7 @@ public class BConfig { configuration = ConfigurationProvider.getProvider(YamlConfiguration.class).load(new File(BMain.plugin.getDataFolder(), "config.yml")); BMySQL.Enable = configuration.getBoolean("MySQL.Enable"); } catch (IOException e) { - Bsend.console(Util.Prefix + " Please replace the config: MySQL.Enable: [false,true]"); + Bsend.console(Util.getSpigot() + " Please replace the config: MySQL.Enable: [false,true]"); e.printStackTrace(); } try { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BMain.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BMain.java index 8195df3..bdae350 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BMain.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BMain.java @@ -29,7 +29,7 @@ public final class BMain extends Plugin { plugin = this; autor = plugin.getDescription().getAuthor(); version = plugin.getDescription().getVersion(); - if (pluginNotFound("T2CodeLib", 96388, Util.requiredT2CodeLibVersion)) return; + if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return; Bsend.console(prefix + "§4============================= §8[§4Command§9GUI§5BUNGEE§8] §4============================="); Bsend.console(prefix + "§4 _____ §9_____ _ _ _____ §e ___ "); Bsend.console(prefix + "§4 / ____§9/ ____| | | |_ _|§e |__ \\ "); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java index d43b47c..993f6fb 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/GUI_Listener.java @@ -7,11 +7,11 @@ import de.jatitv.commandguiv2.Spigot.Objekte.Object; import de.jatitv.commandguiv2.Spigot.gui.OpenGUI; import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig; import de.jatitv.commandguiv2.Spigot.Main; +import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.items.ItemVersion; import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.replace.Replace; import net.t2code.lib.Spigot.Lib.vault.Vault; -import net.t2code.lib.Util; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.Sound; @@ -28,7 +28,7 @@ import java.io.IOException; public class GUI_Listener implements Listener { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); public static String GUICode; private static Plugin plugin = Main.plugin; diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java index 46a496d..6366dca 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Listener/PluginEvent.java @@ -5,6 +5,7 @@ package de.jatitv.commandguiv2.Spigot.Listener; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig; import de.jatitv.commandguiv2.Spigot.system.database.Select_Database; +import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import org.bukkit.Bukkit; import org.bukkit.entity.Player; @@ -22,7 +23,7 @@ public class PluginEvent implements Listener { public void onJoinEvent(PlayerLoginEvent event) { Player player = event.getPlayer(); Select_Database.nameCheck(player); - UpdateAPI.join(Main.plugin,prefix, "commandgui.updatemsg", event.getPlayer(), Main.spigot, Main.discord); + UpdateAPI.join(Main.plugin,prefix, "commandgui.updatemsg", event.getPlayer(), Util.getSpigot(), Util.getDiscord()); } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java index 8e04756..9b7ab58 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java @@ -32,10 +32,6 @@ public final class Main extends JavaPlugin { public static String version; public static List autor; - public static Integer spigotID = Util.SpigotID; - public static Integer bstatsID = Util.BstatsID; - public static String spigot = Util.Spigot; - public static String discord = Util.Discord; public static Main plugin; public static List plugins; @@ -57,12 +53,12 @@ public final class Main extends JavaPlugin { plugin = this; autor = plugin.getDescription().getAuthors(); version = plugin.getDescription().getVersion(); - if (pluginNotFound("T2CodeLib", 96388, Util.requiredT2CodeLibVersion)) return; + if (pluginNotFound("T2CodeLib", 96388, Util.getRequiredT2CodeLibVersion())) return; getServer().getMessenger().registerOutgoingPluginChannel(this, "BungeeCord"); if (PluginCheck.papi()) { PaPi = true; } - Load.onLoad(prefix, autor, version, spigot, spigotID, discord, bstatsID); + Load.onLoad(prefix, autor, version, Util.getSpigot(), Util.getSpigotID(), Util.getDiscord(), Util.getBstatsID()); enable = true; } @@ -113,6 +109,6 @@ public final class Main extends JavaPlugin { @Override public void onDisable() { // Plugin shutdown logic - if (enable) T2CodeTemplate.onDisable(prefix, autor, version, spigot, discord); + if (enable) T2CodeTemplate.onDisable(prefix, autor, version, Util.getSpigot(), Util.getDiscord()); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Admin.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Admin.java index c7a7b28..4462f64 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Admin.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Admin.java @@ -18,7 +18,7 @@ import java.util.Iterator; import java.util.List; public class CmdExecuter_Admin implements CommandExecutor, TabCompleter { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUI.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUI.java index 27db4b0..ec8228f 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUI.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUI.java @@ -1,11 +1,10 @@ package de.jatitv.commandguiv2.Spigot.cmdManagement; +import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.system.Debug; import de.jatitv.commandguiv2.Spigot.system.config.DefaultGUICreate; import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages; -import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Util; -import net.t2code.lib.Bungee.Lib.commands.BTab; import net.t2code.lib.Spigot.Lib.commands.Tab; import org.bukkit.Bukkit; import org.bukkit.command.Command; @@ -19,7 +18,7 @@ import java.util.HashMap; import java.util.List; public class CmdExecuter_GUI implements CommandExecutor, TabCompleter { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java index ba8b6b3..0cd6054 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java @@ -1,8 +1,7 @@ package de.jatitv.commandguiv2.Spigot.cmdManagement; -import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages; import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig; -import de.jatitv.commandguiv2.Spigot.Main; +import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages; import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.messages.send; import org.bukkit.command.Command; @@ -16,7 +15,7 @@ import java.util.HashMap; import java.util.List; public class CmdExecuter_GUIItem implements CommandExecutor, TabCompleter { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java index 5d185ed..511cd20 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java @@ -1,13 +1,12 @@ package de.jatitv.commandguiv2.Spigot.cmdManagement; -import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Util; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; public class CmdExecuter_Help implements CommandExecutor { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); @Override public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java index 7717a0b..0a4a57e 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java @@ -7,15 +7,12 @@ import de.jatitv.commandguiv2.Spigot.cmdManagement.register.AliasRegister; import de.jatitv.commandguiv2.Spigot.gui.OpenGUI; import de.jatitv.commandguiv2.Spigot.system.Give_UseItem; import de.jatitv.commandguiv2.Spigot.system.config.config.ConfigCreate; -import de.jatitv.commandguiv2.Spigot.system.config.languages.LanguagesCreate; import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig; +import de.jatitv.commandguiv2.Spigot.system.config.languages.LanguagesCreate; import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages; import de.jatitv.commandguiv2.Spigot.system.database.Select_Database; import de.jatitv.commandguiv2.Util; -import net.md_5.bungee.api.chat.ClickEvent; -import net.md_5.bungee.api.chat.TextComponent; import net.t2code.lib.Spigot.Lib.items.ItemVersion; -import net.t2code.lib.Spigot.Lib.messages.TextBuilder; import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import org.bukkit.Bukkit; @@ -23,78 +20,70 @@ import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; -import org.bukkit.plugin.Plugin; public class Commands { - private static Plugin plugin = Main.plugin; - private static String prefix = Util.Prefix; - private static String autor = String.valueOf(Main.autor); - private static String version = Main.version; - private static String spigot = Util.Spigot; - private static String discord = Util.Discord; - public static void info(CommandSender sender) { if (sender instanceof Player) { Player player = (Player) sender; - send.player(player, prefix + "§4======= §8[§4Command§9GUI§8] §4======="); - send.player(player, prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); + send.player(player, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4======="); + send.player(player, Util.getPrefix() + " §2String.valueOf(Main.autor): §6" + String.valueOf(String.valueOf(Main.autor)).replace("[", "").replace("]", "")); - if (UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion.equalsIgnoreCase(version)) { - send.player(player, prefix + " §2Version: §6" + version); + if (UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion.equalsIgnoreCase(Main.version)) { + send.player(player, Util.getPrefix() + " §2Version: §6" + Main.version); } else { - UpdateAPI.sendUpdateMsg(prefix,spigot,discord,version,UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion,player); + UpdateAPI.sendUpdateMsg(Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion, player); } - send.player(player, prefix + " §2Spigot: §6" + spigot); - send.player(player, prefix + " §2Discord: §6" + discord); - send.player(player, prefix + "§4======= §8[§4Command§9GUI§8] §4======="); + send.player(player, Util.getPrefix() + " §2Spigot: §6" + Util.getSpigot()); + send.player(player, Util.getPrefix() + " §2Discord: §6" + Util.getDiscord()); + send.player(player, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4======="); } else { - send.sender(sender, prefix + "§4======= §8[§4Command§9GUI§8] §4======="); - send.sender(sender, prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); + send.sender(sender, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4======="); + send.sender(sender, Util.getPrefix() + " §2String.valueOf(Main.autor): §6" + String.valueOf(String.valueOf(Main.autor)).replace("[", "").replace("]", "")); - if (UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion.equalsIgnoreCase(version)) { - send.sender(sender,prefix + " §2Version: §6" + version); + if (UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion.equalsIgnoreCase(Main.version)) { + send.sender(sender, Util.getPrefix() + " §2Version: §6" + Main.version); } else { - UpdateAPI.sendUpdateMsg(prefix,spigot,discord,version,UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion); + UpdateAPI.sendUpdateMsg(Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion); } - send.sender(sender, prefix + " §2Spigot: §6" + spigot); - send.sender(sender, prefix + " §2Discord: §6" + discord); - send.sender(sender, prefix + "§4======= §8[§4Command§9GUI§8] §4======="); + send.sender(sender, Util.getPrefix() + " §2Spigot: §6" + Util.getSpigot()); + send.sender(sender, Util.getPrefix() + " §2Discord: §6" + Util.getDiscord()); + send.sender(sender, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4======="); } } public static void reload(CommandSender sender) { if (sender instanceof Player) sender.sendMessage(SelectMessages.ReloadStart); - send.console(prefix + "§8-------------------------------"); - send.console(prefix + " §6Plugin reload..."); - send.console(prefix + "§8-------------------------------"); + send.console(Util.getPrefix() + "§8-------------------------------"); + send.console(Util.getPrefix() + " §6Plugin reload..."); + send.console(Util.getPrefix() + "§8-------------------------------"); CmdExecuter_GUI.arg1.clear(); CmdExecuter_GUI.arg1.put("admin", "commandgui.admin;commandgui.giveitem.other;commandgui.command.info"); ConfigCreate.configCreate(); SelectConfig.onSelect(); - plugin.reloadConfig(); + Main.plugin.reloadConfig(); LanguagesCreate.langCreate(); Obj_Select.onSelect(); - SelectMessages.onSelect(prefix); - SelectConfig.sound(prefix); + SelectMessages.onSelect(Util.getPrefix()); + SelectConfig.sound(Util.getPrefix()); try { AliasRegister.onRegister(); } catch (Exception e) { e.printStackTrace(); } - if (SelectConfig.Bungee){ + if (SelectConfig.Bungee) { Bukkit.getMessenger().registerOutgoingPluginChannel(Main.plugin, "commandgui:bungee"); } if (sender instanceof Player) sender.sendMessage(SelectMessages.ReloadEnd); - send.console(prefix + "§8-------------------------------"); - send.console(prefix + " §2Plugin successfully reloaded."); - send.console(prefix + "§8-------------------------------"); + send.console(Util.getPrefix() + "§8-------------------------------"); + send.console(Util.getPrefix() + " §2Plugin successfully reloaded."); + send.console(Util.getPrefix() + "§8-------------------------------"); } public static void give(CommandSender sender, Player target) { @@ -128,7 +117,7 @@ public class Commands { } } Integer slot = null; - if (SelectConfig.UseItem_InventorySlotEnforce){ + if (SelectConfig.UseItem_InventorySlotEnforce) { slot = SelectConfig.UseItem_InventorySlot; } else { if (Select_Database.selectSlot(player) == null) { @@ -137,7 +126,7 @@ public class Commands { slot = Select_Database.selectSlot(player); } } - send.debug(plugin,String.valueOf(slot)); + send.debug(Main.plugin, String.valueOf(slot)); if (player.getInventory().getItem(slot - 1) == null) { Select_Database.setItemStatusTrue(player); Give_UseItem.onGive(player); @@ -218,7 +207,7 @@ public class Commands { Give_UseItem.onGive(player); } send.player(player, SelectMessages.ItemSlot.replace("[slot]", setSlot.toString())); - } else player.sendMessage(prefix + " §4Function disabled"); + } else player.sendMessage(Util.getPrefix() + " §4Function disabled"); } public static void gui(Player player) { @@ -235,7 +224,8 @@ public class Commands { } else player.sendMessage(SelectMessages.GUIIsDisabled.replace("[gui]", gui.GUI_Name)); } } - public static void gui(Player player, String arg){ + + public static void gui(Player player, String arg) { if (Main.guiHashMap.containsKey(arg)) { Object gui = Main.guiHashMap.get(arg); if (gui.GUI_Enable || player.hasPermission("commandgui.bypass")) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java index 34320a1..05353ad 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java @@ -10,7 +10,7 @@ import net.t2code.lib.Spigot.Lib.replace.Replace; import org.bukkit.command.CommandSender; public class Help { - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); public static void sendHelp(CommandSender sender, String Prefix) { send.sender(sender, Prefix + " §8----- §4Command§9GUI §chelp §8-----"); if (sender.hasPermission("commandgui.command")) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java index b942040..5f42137 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java @@ -18,7 +18,7 @@ public class AliasRegister { File f = new File(Main.getPath() + "/GUIs/"); File[] fileArray = f.listFiles(); if (Main.allAliases.toString().equals("[]")) { - send.console(Util.Prefix + " §4No GUI files available"); + send.console(Util.getSpigot() + " §4No GUI files available"); return; } for (String alias : Main.allAliases) { diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java index fc779f2..29bd6f5 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java @@ -29,7 +29,7 @@ import java.util.UUID; public class OpenGUI { private static Plugin plugin = Main.plugin; - private static String prefix = Util.Prefix; + private static String prefix = Util.getPrefix(); public static void openGUI(Player player, Object gui, String guiString) { Long long_ = Long.valueOf(System.currentTimeMillis()); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java index 52d42db..cdb0213 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Give_UseItem.java @@ -11,7 +11,6 @@ import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion; import net.t2code.lib.Spigot.Lib.replace.Replace; import org.bukkit.Material; -import org.bukkit.entity.Item; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.meta.ItemMeta; @@ -21,7 +20,6 @@ import java.lang.reflect.Field; import java.util.UUID; public class Give_UseItem { - private static String prefix = Util.Prefix; public static void onGive(Player player) { @@ -58,8 +56,8 @@ public class Give_UseItem { playerheadmeta.setDisplayName(SelectConfig.UseItem_Name); if (SelectConfig.UseItem_Base64_Enable) { if (Main.PaPi) { - playerheadmeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore)); - } else playerheadmeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore)); + playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore)); + } else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore)); GameProfile profile = new GameProfile(UUID.randomUUID(), ""); profile.getProperties().put("textures", new Property("textures", SelectConfig.UseItem_Base64value)); Field profileField = null; @@ -77,8 +75,8 @@ public class Give_UseItem { } else p = SelectConfig.UseItem_PlayerName; playerheadmeta.setOwner(p); if (Main.PaPi) { - playerheadmeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore)); - } else playerheadmeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore)); + playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore)); + } else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore)); } item.setItemMeta(playerheadmeta); } @@ -87,8 +85,8 @@ public class Give_UseItem { ItemMeta itemMeta = item.getItemMeta(); itemMeta.setDisplayName(SelectConfig.UseItem_Name); if (Main.PaPi) { - itemMeta.setLore(Replace.replace(prefix, player, SelectConfig.UseItem_Lore)); - } else itemMeta.setLore(Replace.replace(prefix, SelectConfig.UseItem_Lore)); + itemMeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.UseItem_Lore)); + } else itemMeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.UseItem_Lore)); item.setItemMeta(itemMeta); item.setAmount(1); } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java index 06c1fbe..c37a758 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java @@ -5,6 +5,7 @@ package de.jatitv.commandguiv2.Spigot.system; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.system.config.config.SelectConfig; +import de.jatitv.commandguiv2.Util; import org.bukkit.Bukkit; import org.bukkit.configuration.file.YamlConfiguration; import org.bukkit.entity.Player; @@ -31,7 +32,7 @@ import java.util.zip.GZIPOutputStream; public class Metrics { public static void Bstats() { - int pluginId = Main.bstatsID; // <-- Replace with the id of your plugin! + int pluginId = Util.getBstatsID(); // <-- Replace with the id of your plugin! Metrics metrics = new Metrics(Main.plugin, pluginId); metrics.addCustomChart(new Metrics.SimplePie("updatecheckonjoin", () -> String.valueOf(SelectConfig.UpdateCheckOnJoin))); metrics.addCustomChart(new Metrics.SimplePie("storage_type_mysql", () -> SelectConfig.Storage)); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/ConfigCreate.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/ConfigCreate.java index 58e7815..9961b14 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/ConfigCreate.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/ConfigCreate.java @@ -1,7 +1,6 @@ package de.jatitv.commandguiv2.Spigot.system.config.config; import de.jatitv.commandguiv2.Spigot.Main; -import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion; import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config; @@ -15,8 +14,6 @@ import java.util.List; public class ConfigCreate { - private static String prefix = Util.Prefix; - public static Integer ConfigVersion = 2; private static Boolean UpdateCheckOnJoin = true; diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/SelectConfig.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/SelectConfig.java index 5d6c0a1..48a5e44 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/SelectConfig.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/config/SelectConfig.java @@ -3,17 +3,17 @@ package de.jatitv.commandguiv2.Spigot.system.config.config; import de.jatitv.commandguiv2.Spigot.Main; import de.jatitv.commandguiv2.Spigot.system.config.languages.SelectMessages; import de.jatitv.commandguiv2.Spigot.system.database.MySQL; +import de.jatitv.commandguiv2.Util; import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion; import net.t2code.lib.Spigot.Lib.replace.Replace; -import net.t2code.lib.Util; import org.bukkit.Sound; import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; import java.util.List; -public class SelectConfig {private static String prefix = Util.Prefix; +public class SelectConfig { public static Boolean DisableUpdateChecker; public static Boolean UpdateCheckOnJoin; @@ -129,7 +129,7 @@ public class SelectConfig {private static String prefix = Util.Prefix; UseItem_Base64value = yamlConfiguration.getString("UseItem.Item.PlayerHead.Base64.Base64Value"); UseItem_PlayerWhoHasOpenedTheGUI = yamlConfiguration.getBoolean("UseItem.Item.PlayerHead.PlayerWhoHasOpenedTheGUI"); UseItem_PlayerName = yamlConfiguration.getString("UseItem.Item.PlayerHead.PlayerName"); - UseItem_Name = Replace.replace(prefix,yamlConfiguration.getString("UseItem.Item.Name")); + UseItem_Name = Replace.replace(Util.getPrefix(),yamlConfiguration.getString("UseItem.Item.Name")); UseItem_Lore = yamlConfiguration.getList("UseItem.Item.Lore"); UseItem_GiveOnEveryJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnEveryJoin"); UseItem_GiveOnlyOnFirstJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnlyOnFirstJoin"); diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/languages/SelectMessages.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/languages/SelectMessages.java index 394d55b..5d36050 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/languages/SelectMessages.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/config/languages/SelectMessages.java @@ -10,7 +10,7 @@ import org.bukkit.configuration.file.YamlConfiguration; import java.io.File; public class SelectMessages { - private static String prefix = Util.Prefix; + public static String selectMSG; @@ -129,6 +129,6 @@ public class SelectMessages { } private static String select(String path, YamlConfiguration yamlConfiguration){ - return Replace.replace(prefix,yamlConfiguration.getString(path)); + return Replace.replace(Util.getPrefix(),yamlConfiguration.getString(path)); } } diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java index 790067f..d6e9630 100644 --- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java +++ b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java @@ -1,10 +1,34 @@ package de.jatitv.commandguiv2; public class Util { - public static double requiredT2CodeLibVersion = 8; - public static String Prefix = "§8[§4C§9GUI§8]"; - public static Integer SpigotID = 90671; - public static Integer BstatsID = 10840; - public static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID; - public static String Discord = "http://dc.t2code.net"; + private static double requiredT2CodeLibVersion = 8; + private static String Prefix = "§8[§4C§9GUI§8]"; + private static Integer SpigotID = 90671; + private static Integer BstatsID = 10840; + private static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID; + private static String Discord = "http://dc.t2code.net"; + + public static double getRequiredT2CodeLibVersion() { + return requiredT2CodeLibVersion; + } + + public static String getPrefix() { + return Prefix; + } + + public static Integer getSpigotID() { + return SpigotID; + } + + public static Integer getBstatsID() { + return BstatsID; + } + + public static String getSpigot() { + return Spigot; + } + + public static String getDiscord() { + return Discord; + } }