valueEntry : map.get(entryValues.getKey()).entrySet()) {
- valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue());
- allSkipped = false;
- }
- if (!allSkipped) {
- reallyAllSkipped = false;
- valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build());
- }
- }
- if (reallyAllSkipped) {
- // Null = skip the chart
- return null;
- }
- return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build();
- }
- }
-
- /**
- * An extremely simple JSON builder.
- *
- * While this class is neither feature-rich nor the most performant one, it's sufficient enough
- * for its use-case.
- */
- public static class JsonObjectBuilder {
-
- private StringBuilder builder = new StringBuilder();
-
- private boolean hasAtLeastOneField = false;
-
- public JsonObjectBuilder() {
- builder.append("{");
- }
-
- /**
- * Appends a null field to the JSON.
- *
- * @param key The key of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendNull(String key) {
- appendFieldUnescaped(key, "null");
- return this;
- }
-
- /**
- * Appends a string field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String value) {
- if (value == null) {
- throw new IllegalArgumentException("JSON value must not be null");
- }
- appendFieldUnescaped(key, "\"" + escape(value) + "\"");
- return this;
- }
-
- /**
- * Appends an integer field to the JSON.
- *
- * @param key The key of the field.
- * @param value The value of the field.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int value) {
- appendFieldUnescaped(key, String.valueOf(value));
- return this;
- }
-
- /**
- * Appends an object to the JSON.
- *
- * @param key The key of the field.
- * @param object The object.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject object) {
- if (object == null) {
- throw new IllegalArgumentException("JSON object must not be null");
- }
- appendFieldUnescaped(key, object.toString());
- return this;
- }
-
- /**
- * Appends a string array to the JSON.
- *
- * @param key The key of the field.
- * @param values The string array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, String[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values)
- .map(value -> "\"" + escape(value) + "\"")
- .collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an integer array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, int[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends an object array to the JSON.
- *
- * @param key The key of the field.
- * @param values The integer array.
- * @return A reference to this object.
- */
- public JsonObjectBuilder appendField(String key, JsonObject[] values) {
- if (values == null) {
- throw new IllegalArgumentException("JSON values must not be null");
- }
- String escapedValues =
- Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(","));
- appendFieldUnescaped(key, "[" + escapedValues + "]");
- return this;
- }
-
- /**
- * Appends a field to the object.
- *
- * @param key The key of the field.
- * @param escapedValue The escaped value of the field.
- */
- private void appendFieldUnescaped(String key, String escapedValue) {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- if (key == null) {
- throw new IllegalArgumentException("JSON key must not be null");
- }
- if (hasAtLeastOneField) {
- builder.append(",");
- }
- builder.append("\"").append(escape(key)).append("\":").append(escapedValue);
- hasAtLeastOneField = true;
- }
-
- /**
- * Builds the JSON string and invalidates this builder.
- *
- * @return The built JSON string.
- */
- public JsonObject build() {
- if (builder == null) {
- throw new IllegalStateException("JSON has already been built");
- }
- JsonObject object = new JsonObject(builder.append("}").toString());
- builder = null;
- return object;
- }
-
- /**
- * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt.
- *
- *
This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'.
- * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n").
- *
- * @param value The value to escape.
- * @return The escaped value.
- */
- private static String escape(String value) {
- final StringBuilder builder = new StringBuilder();
- for (int i = 0; i < value.length(); i++) {
- char c = value.charAt(i);
- if (c == '"') {
- builder.append("\\\"");
- } else if (c == '\\') {
- builder.append("\\\\");
- } else if (c <= '\u000F') {
- builder.append("\\u000").append(Integer.toHexString(c));
- } else if (c <= '\u001F') {
- builder.append("\\u00").append(Integer.toHexString(c));
- } else {
- builder.append(c);
- }
- }
- return builder.toString();
- }
-
- /**
- * A super simple representation of a JSON object.
- *
- *
This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not
- * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String,
- * JsonObject)}.
- */
- public static class JsonObject {
-
- private final String value;
-
- private JsonObject(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return value;
- }
- }
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BUpdateChecker.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BUpdateChecker.java
deleted file mode 100644
index 3c533c7..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Bungee/BUpdateChecker.java
+++ /dev/null
@@ -1,106 +0,0 @@
-// This claas was created by JaTiTV
-
-// -----------------------------
-// _____ _____ _ _ _____
-// / ____/ ____| | | |_ _|
-// | | | | __| | | | | |
-// | | | | |_ | | | | | |
-// | |___| |__| | |__| |_| |_
-// \_____\_____|\____/|_____|
-// -----------------------------
-
-package de.jatitv.commandguiv2.Bungee;
-
-import net.md_5.bungee.api.ProxyServer;
-import net.md_5.bungee.api.plugin.Plugin;
-import net.t2code.lib.Bungee.Lib.messages.Bsend;
-
-import java.io.IOException;
-import java.io.InputStream;
-import java.net.URL;
-import java.util.Scanner;
-import java.util.concurrent.TimeUnit;
-import java.util.function.Consumer;
-
-public class BUpdateChecker {
-
- public static void sendUpdateMsg(String Prefix, String foundVersion, String update_version) {
- Bsend.console("§4=========== " + Prefix + " §4===========");
- Bsend.console("§6A new version was found!");
- Bsend.console("§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version);
- Bsend.console("§6You can download it here: §e" + BMain.spigot);
- Bsend.console("§6You can find more information on Discord: §e" + BMain.discord);
- Bsend.console("§4=========== " + Prefix + " §4===========");
- }
-
- public static void onUpdateCheckTimer() {
- ProxyServer.getInstance().getScheduler().schedule(BMain.plugin, new Runnable() {
- public void run() {
- (new BUpdateChecker(BMain.plugin, BMain.spigotID)).getVersion((update_version) -> {
- String foundVersion = BMain.plugin.getDescription().getVersion();
- BMain.update_version = update_version;
- if (!foundVersion.replace("_Bungee", "").equalsIgnoreCase(update_version)) {
- sendUpdateMsg(BMain.prefix, foundVersion, update_version);
- }
- });
- }
- }, 0, 20 * 60 * 60L, TimeUnit.SECONDS);
- }
-
- public static void onUpdateCheck() {
- (new BUpdateChecker(BMain.plugin, BMain.spigotID)).getVersion((update_version) -> {
- String foundVersion = BMain.plugin.getDescription().getVersion();
- BMain.update_version = update_version;
- if (foundVersion.replace("_Bungee", "").equalsIgnoreCase(update_version)) {
- Bsend.console(BMain.prefix + " §2No update found.");
- }
- });
- }
-
- private Plugin plugin;
- private int resourceId;
-
- public BUpdateChecker(Plugin plugin, int resourceId) {
- this.plugin = plugin;
- this.resourceId = resourceId;
- }
-
- public void getVersion(Consumer consumer) {
- ProxyServer.getInstance().getScheduler().runAsync(this.plugin, () -> {
- try {
- InputStream inputStream = (new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId)).openStream();
- try {
- Scanner scanner = new Scanner(inputStream);
-
- try {
- if (scanner.hasNext()) {
- consumer.accept(scanner.next());
- }
- } catch (Throwable var8) {
- try {
- scanner.close();
- } catch (Throwable var7) {
- var8.addSuppressed(var7);
- }
- throw var8;
- }
- scanner.close();
- } catch (Throwable var9) {
- if (inputStream != null) {
- try {
- inputStream.close();
- } catch (Throwable var6) {
- var9.addSuppressed(var6);
- }
- }
- throw var9;
- }
- if (inputStream != null) {
- inputStream.close();
- }
- } catch (IOException var10) {
- this.plugin.getLogger().severe(BMain.prefix + "§4 Cannot look for updates: " + var10.getMessage());
- }
- });
- }
-}
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
deleted file mode 100644
index 45516b0..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Commands.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement;
-
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.register.AliasRegister;
-import de.jatitv.commandguiv2.Spigot.gui.OpenGUI;
-import de.jatitv.commandguiv2.Spigot.useItem.UseItem;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.LanguagesCreate;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.system.Permissions;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.Spigot.sound.Sound;
-import de.jatitv.commandguiv2.Spigot.enums.SoundEnum;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-import java.util.Objects;
-
-public class Commands {
- public static void info(CommandSender sender) {
- if (sender instanceof Player) {
- Player player = (Player) sender;
- send.player(player, Util.getPrefix() + "§4======= §8[§4Command§9GUI§8] §4=======");
- send.player(player, Util.getPrefix() + " §2Autor: §6" + String.valueOf(Main.autor).replace("[", "").replace("]", ""));
-
- if (UpdateAPI.PluginVersionen.get(Main.getPlugin().getName()).publicVersion.equalsIgnoreCase(Main.version)) {
- send.player(player, Util.getPrefix() + " §2Version: §6" + Main.version);
- } else {
- UpdateAPI.sendUpdateMsg(Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.version, UpdateAPI.PluginVersionen.get(Main.getPlugin().getName()).publicVersion, player);
- }
-
- 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, 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(Main.getPlugin().getName()).publicVersion.equalsIgnoreCase(Main.version)) {
- send.sender(sender, Util.getPrefix() + " §2Version: §6" + Main.version);
- } else {
- UpdateAPI.sendUpdateMsg(Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.version, UpdateAPI.PluginVersionen.get(Main.getPlugin().getName()).publicVersion);
- }
-
- 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(Util.getPrefix() + "§8-------------------------------");
- send.console(Util.getPrefix() + " §6Plugin reload...");
- send.console(Util.getPrefix() + "§8-------------------------------");
- SelectConfig.onSelect();
- Main.getPlugin().reloadConfig();
-
- CmdExecuter_GUI.arg1.clear();
- CmdExecuter_GUI.arg1.put(SelectConfig.getAdminSubCommand(), "commandgui.admin;commandgui.giveitem.other;commandgui.command.info");
-
- if (!Objects.equals(SelectDatabase.getStorage().toString(), SelectConfig.getStorage())) {
- if (sender instanceof Player) send.sender(sender, "You have changed the storage medium! To apply this change, you must restart the server!");
- send.warning(Main.getPlugin(), "You have changed the storage medium! To apply this change, you must restart the server!");
- }
-
- LanguagesCreate.langCreate();
-
- Obj_Select.onSelect();
- SelectMessages.onSelect(Util.getPrefix());
- SelectConfig.sound(Util.getPrefix());
-
- try {
- AliasRegister.onRegister();
- } catch (Exception e) {
- e.printStackTrace();
- }
- try {
- Permissions.onPermRegister();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- if (SelectConfig.getBungee()) {
- Bukkit.getMessenger().registerOutgoingPluginChannel(Main.getPlugin(), "commandgui:bungee");
-
- }
-
- if (sender instanceof Player) sender.sendMessage(SelectMessages.ReloadEnd);
- 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) {
- if (Bukkit.getPlayer(target.getName()) != null) {
- UseItem.giveUseItem(target);
- send.sender(sender, SelectMessages.Give_Sender.replace("[player]", target.getName()).replace("[item]", SelectConfig.getUseItem_Name()));
- send.player(target, SelectMessages.Give_Receiver.replace("[sender]", sender.getName()).replace("[item]", SelectConfig.getUseItem_Name()));
- Sound.play(target, SoundEnum.Give);
- } else {
- sender.sendMessage(SelectMessages.PlayerNotFond.replace("[player]", target.getName()));
- if (sender instanceof Player) Sound.play((Player) sender, SoundEnum.PlayerNotFound);
- }
- }
-
- public static void itemOn(Player player) {
- UseItem.removeItem(player);
- Integer slot = null;
- if (SelectConfig.getUseItem_InventorySlotEnforce()) {
- slot = SelectConfig.getUseItem_InventorySlot();
- } else {
- slot = Events.useItemSlotHashMap.get(player.getName());
- }
- send.debug(Main.getPlugin(), String.valueOf(slot));
- if (player.getInventory().getItem(slot - 1) == null) {
- SelectDatabase.setItemStatusTrue(player);
- UseItem.giveUseItem(player);
- } else {
- boolean empty = false;
- for (int i = 0; i < 9; i++) {
- if (player.getInventory().getItem(i) == null) {
- empty = true;
- break;
- }
- }
- if (empty) {
- SelectDatabase.setItemStatusTrue(player);
- UseItem.addUseItem(player);
- send.player(player, SelectMessages.ItemON);
- } else {
- send.player(player, SelectMessages.NoInventorySpace);
- Sound.play(player,SoundEnum.NoInventorySpace);
- }
- }
- }
-
- public static void itemOff(Player player) {
- SelectDatabase.setItemStatusFalse(player);
- UseItem.removeItem(player);
- send.player(player, SelectMessages.ItemOFF);
- }
-
- public static void onSetSlot(Player player, Integer setSlot) {
- if (!SelectConfig.getUseItem_AllowSetSlot()) {
- send.player(player, Util.getPrefix() + " §4Function disabled");
- return;
- }
-
- if (setSlot < 1) {
- send.player(player, SelectMessages.ItemSlot_wrongValue);
- return;
- }
- if (setSlot > 9) {
- send.player(player, SelectMessages.ItemSlot_wrongValue);
- return;
- }
-
- if (Events.useItemHashMap.get(player.getName())) {
- if (Objects.equals(Events.useItemSlotHashMap.get(player.getName()), setSlot)) {
- send.player(player, SelectMessages.ItemSlotAlreadySet.replace("[slot]", setSlot.toString()));
- return;
- }
- }
-
- if (SelectConfig.getUseItem_InventorySlotEnforce() || player.getInventory().getItem(setSlot - 1) != null) {
- send.player(player, SelectMessages.ItemSlotNotEmpty.replace("[slot]", setSlot.toString()));
- return;
- }
-
- UseItem.removeItem(player);
- SelectDatabase.setSlot(player, setSlot);
- Events.useItemSlotHashMap.replace(player.getName(), setSlot);
-
- if (Events.useItemHashMap.get(player.getName())) {
- UseItem.giveUseItem(player);
- }
-
- send.player(player, SelectMessages.ItemSlot.replace("[slot]", setSlot.toString()));
- }
-
- public static void gui(Player player) {
- if (Main.guiHashMap.containsKey(SelectConfig.getDefaultGUI())) {
- Gui gui = Main.guiHashMap.get(SelectConfig.getDefaultGUI());
- if (gui.guiEnable || player.hasPermission("commandgui.bypass")) {
- if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command") || player.hasPermission("commandgui.bypass")) {
- OpenGUI.openGUI(player, SelectConfig.getDefaultGUI(), true);
- } else send.player(player, SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui")
- .replace("[perm]", "commandgui.command"));
- } else send.player(player, SelectMessages.GUIIsDisabled.replace("[gui]", gui.guiName));
- }
- }
-
- public static void gui(Player player, String arg) {
- if (Main.guiHashMap.containsKey(arg)) {
- Gui gui = Main.guiHashMap.get(arg);
- if (gui.guiEnable || player.hasPermission("commandgui.bypass")) {
- if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command." + gui.key) || player.hasPermission("commandgui.bypass")) {
- OpenGUI.openGUI(player, arg, true);
- } else send.player(player, SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + gui.key)
- .replace("[perm]", "commandgui.command." + arg.toLowerCase()));
- } else send.player(player, SelectMessages.GUIIsDisabled.replace("[gui]", gui.key));
- } else send.player(player, SelectMessages.guiNotFound);
- }
-}
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
deleted file mode 100644
index e63e4c2..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/Help.java
+++ /dev/null
@@ -1,111 +0,0 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement;
-
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.replace.Replace;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-
-public class Help {
- private static String prefix = Util.getPrefix();
-
- public static void sendHelp(CommandSender sender, String Prefix) {
- Gui gui = Main.guiHashMap.get(SelectConfig.getDefaultGUI());
-
- send.sender(sender, Prefix + " §8----- §4Command§9GUI §chelp §8-----");
- cgui(sender, gui);
- open(sender);
- help(sender);
- gUIItemHelp(sender);
- info(sender);
- give(sender);
- createDefaultGUI(sender);
- reload(sender);
- send.sender(sender, Prefix + " §8-------------------------");
- }
-
-
- private static void cgui(CommandSender sender, Gui gui) {
- if (!sender.hasPermission("commandgui.command")) return;
-
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpCgui.replace("[gui]", Replace.replace(prefix, gui.guiName)));
- } else send.sender(sender, prefix + " " + SelectMessages.HelpCgui.replace("[gui]", Replace.replace(prefix, gui.guiName)));
- }
-
- private static void open(CommandSender sender) {
- if (!sender.hasPermission("commandgui.command")) return;
-
- for (String alias : Main.allAliases) {
- if (Main.guiHashMap.get(alias).guiEnable || sender.hasPermission("commandgui.bypass")) {
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpOpen.replace("[gui]", alias).replace("[guiname]", Replace.replace(prefix, Main.guiHashMap.get(alias).guiName)));
- } else
- send.sender(sender, prefix + " " + SelectMessages.HelpOpen.replace("[gui]", alias).replace("[guiname]", Replace.replace(prefix, Main.guiHashMap.get(alias).guiName)));
- }
- }
- }
-
- private static void help(CommandSender sender) {
- if (!sender.hasPermission("commandgui.command")) return;
-
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpHelp);
- } else send.sender(sender, prefix + " " + SelectMessages.HelpHelp);
- }
-
- private static void info(CommandSender sender) {
- if (!sender.hasPermission("commandgui.command.info")) return;
-
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpInfo);
- } else send.sender(sender, prefix + " " + SelectMessages.HelpInfo);
- }
-
- private static void give(CommandSender sender) {
- if (!sender.hasPermission("commandgui.admin")) return;
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpGive);
- } else send.sender(sender, prefix + " " + SelectMessages.HelpGive);
- }
-
- private static void createDefaultGUI(CommandSender sender) {
- if (!sender.hasPermission("commandgui.admin")) return;
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpCreateDefaultGUI.replace("[directory]", Main.getPath() + "\\GUIs\\default.yml"));
- } else send.sender(sender, prefix + " " + SelectMessages.HelpCreateDefaultGUI.replace("[directory]", Main.getPath() + "\\GUIs\\default.yml"));
- }
-
- private static void reload(CommandSender sender) {
- if (!sender.hasPermission("commandgui.admin")) return;
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpReload);
- } else send.sender(sender, prefix + " " + SelectMessages.HelpReload);
- }
-
-
- public static void gUIItemHelp(CommandSender sender) {
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_on);
- } else send.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_on);
-
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_off);
- } else send.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_off);
-
- if (sender instanceof Player) {
- send.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_Slot);
- } else send.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_Slot);
- }
- public static void sendGUIItemHelp(CommandSender sender) {
- if (sender.hasPermission("commandgui.useitem.toggle")) {
- send.sender(sender, prefix + " §8------ §4Command§9GUI§2Item §chelp §8------");
- gUIItemHelp(sender);
- send.sender(sender, prefix + " §8------------------------------");
- }
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/ConfigCreate.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/ConfigCreate.java
deleted file mode 100644
index f3e3165..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/ConfigCreate.java
+++ /dev/null
@@ -1,190 +0,0 @@
-package de.jatitv.commandguiv2.Spigot.config.config;
-
-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.minecraftVersion.MCVersion;
-import net.t2code.lib.Spigot.Lib.yamlConfiguration.Config;
-import org.bukkit.Material;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-
-public class ConfigCreate {
-
-
- public static void configCreate() {
- long long_ = System.currentTimeMillis();
- if (new File(Main.getPath(), "config.yml").exists()) {
- if (Main.getPlugin().getConfig().getBoolean("Plugin.Debug")) send.console(Util.getPrefix() + " §5DEBUG: §6" + " §4config.yml are created / updated...");
- } else send.console(Util.getPrefix() + " §4config.yml are created...");
-
- File config = new File(Main.getPath(), "config.yml");
- YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
-
- if (!config.exists()) Config.set("ConfigVersion", Util.getConfigVersion(), yamlConfiguration);
-
- Config.set("Plugin.Debug", false, yamlConfiguration);
- Config.set("Plugin.HelpAlias", true, yamlConfiguration);
- Config.set("Plugin.AdminSubCommand", "admin", yamlConfiguration);
- Config.set("Plugin.language", "english", yamlConfiguration);
- Config.set("Plugin.Currency", "$", yamlConfiguration);
- Config.set("Plugin.DefaultGUI", "default", yamlConfiguration);
-
- if (Main.legacy){
- Config.set("Storage.Type", "YML", yamlConfiguration);
- } else Config.set("Storage.Type", "SQLITE", yamlConfiguration);
- Config.set("Storage.MySQL.IP", "localhost", yamlConfiguration);
- Config.set("Storage.MySQL.Port", 3306, yamlConfiguration);
- Config.set("Storage.MySQL.Database", "database", yamlConfiguration);
- Config.set("Storage.MySQL.User", "root", yamlConfiguration);
- Config.set("Storage.MySQL.Password", "password", yamlConfiguration);
- Config.set("Storage.MySQL.SSL", false, yamlConfiguration);
-
- Config.set("BungeeCord.Enable", false, yamlConfiguration);
- Config.set("BungeeCord.ThisServer", "server", yamlConfiguration);
-
- Config.set("UseItem.Enable", true, yamlConfiguration);
- Config.set("UseItem.AllowToggle", true, yamlConfiguration);
- Config.set("UseItem.AllowSetSlot", true, yamlConfiguration);
- Config.set("UseItem.BlockMoveAndDrop", true, yamlConfiguration);
- Config.set("UseItem.OpenGUI", "default", yamlConfiguration);
- Config.set("UseItem.Permission.NeededToUse", true, yamlConfiguration);
- Config.set("UseItem.KeepAtCommandClear", true, yamlConfiguration);
-
- Config.set("UseItem.InventorySlot.Slot", 1, yamlConfiguration);
- Config.set("UseItem.InventorySlot.SlotEnforce", false, yamlConfiguration);
- Config.set("UseItem.InventorySlot.FreeSlot", false, yamlConfiguration);
-
- Config.set("UseItem.Item.Material", "paper", yamlConfiguration);
- if (!(MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12)) {
- Config.set("UseItem.Item.PlayerHead.Enable", false, yamlConfiguration);
- Config.set("UseItem.Item.PlayerHead.Base64.Enable", false, yamlConfiguration);
- Config.set("UseItem.Item.PlayerHead.Base64.Base64Value", "", yamlConfiguration);
- Config.set("UseItem.Item.PlayerHead.PlayerWhoHasOpenedTheGUI", false, yamlConfiguration);
- Config.set("UseItem.Item.PlayerHead.Playername", "", yamlConfiguration);
- }
- Config.set("UseItem.Item.Name", "&bDefault &6GUI", yamlConfiguration);
- Config.set("UseItem.Item.Lore", Arrays.asList("&eThis is an example GUI"), yamlConfiguration);
- Config.set("UseItem.Join.GiveOnEveryJoin", true, yamlConfiguration);
- Config.set("UseItem.Join.GiveOnlyOnFirstJoin", false, yamlConfiguration);
-
- //convert
- if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin")) {
- Config.set("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin", yamlConfiguration);
- Config.set("UseItem.Join.Cursor.ToGUIItem.OnLogin.Enable", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin"), yamlConfiguration);
- }
- if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin")) {
- Config.set("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin", yamlConfiguration);
- Config.set("UseItem.Join.Cursor.ToGUIItem.Spigot.OnOnlyFirstLogin", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin"), yamlConfiguration);
- }
- if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange")) {
- Config.set("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange", yamlConfiguration);
- Config.set("UseItem.Join.Cursor.ToGUIItem.Bungee.OnServerChange", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange"), yamlConfiguration);
- }
-
- Config.set("UseItem.Join.Cursor.ToGUIItem.OnLogin.Enable", true, yamlConfiguration);
- Config.set("UseItem.Join.Cursor.ToGUIItem.Spigot.OnOnlyFirstLogin", true, yamlConfiguration);
- Config.set("UseItem.Join.Cursor.ToGUIItem.Bungee.OnServerChange", false, yamlConfiguration);
-
- Config.set("Toggle.Items.OnOrYes.Item.Base64.Enable", false, yamlConfiguration);
- Config.set("Toggle.Items.OnOrYes.Item.Base64.Base64Value", "", yamlConfiguration);
- if (Main.legacy) {
- Config.set("Toggle.Items.OnOrYes.Item.Material", "WOOL,5", yamlConfiguration);
- } else Config.set("Toggle.Items.OnOrYes.Item.Material", ItemVersion.getGreenWool().getType().toString(), yamlConfiguration);
-
- Config.set("Toggle.Items.OffOrNo.Item.Base64.Enable", false, yamlConfiguration);
- Config.set("Toggle.Items.OffOrNo.Item.Base64.Base64Value", "", yamlConfiguration);
- if (Main.legacy) {
- Config.set("Toggle.Items.OffOrNo.Item.Material", "WOOL,14", yamlConfiguration);
- } else Config.set("Toggle.Items.OffOrNo.Item.Material", ItemVersion.getRedWool().getType().toString(), yamlConfiguration);
-
- Config.set("Toggle.Permission.Commands.True", "luckperms user [player] permission set [perm] true", yamlConfiguration);
- Config.set("Toggle.Permission.Commands.False", "luckperms user [player] permission set [perm] false", yamlConfiguration);
-
- Config.set("Placeholder.True", "&2true", yamlConfiguration);
- Config.set("Placeholder.False", "&4false", yamlConfiguration);
-
- Config.set("Sound.Enable", true, yamlConfiguration);
-
- Config.set("Sound.OpenInventory.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.OpenInventory.Sound", "CHEST_OPEN", yamlConfiguration);
- } else Config.set("Sound.OpenInventory.Sound", "BLOCK_CHEST_OPEN", yamlConfiguration);
-
- Config.set("Sound.Click.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.Click.Sound", "NOTE_STICKS", yamlConfiguration);
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
- Config.set("Sound.Click.Sound", "BLOCK_NOTE_HAT", yamlConfiguration);
- } else Config.set("Sound.Click.Sound", "BLOCK_NOTE_BLOCK_HAT", yamlConfiguration);
-
- Config.set("Sound.NoMoney.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.NoMoney.Sound", "NOTE_PIANO", yamlConfiguration);
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
- Config.set("Sound.NoMoney.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
- } else Config.set("Sound.NoMoney.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
-
- Config.set("Sound.NoInventorySpace.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.NoInventorySpace.Sound", "NOTE_PIANO", yamlConfiguration);
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
- Config.set("Sound.NoInventorySpace.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
- } else Config.set("Sound.NoInventorySpace.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
-
- Config.set("Sound.Give.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.Give.Sound", "LEVEL_UP", yamlConfiguration);
- } else Config.set("Sound.Give.Sound", "ENTITY_PLAYER_LEVELUP", yamlConfiguration);
-
- Config.set("Sound.PlayerNotFound.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8) {
- Config.set("Sound.PlayerNotFound.Sound", "NOTE_PIANO", yamlConfiguration);
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
- Config.set("Sound.PlayerNotFound.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
- } else Config.set("Sound.PlayerNotFound.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
-
- Config.set("Advanced.UseItem.GameMode.Change.Enable", true, yamlConfiguration);
- Config.set("Advanced.UseItem.GameMode.Change.DelayInTicks", 1, yamlConfiguration);
- Config.set("Advanced.UseItem.GameMode.Protection.Enable", false, yamlConfiguration);
- Config.set("Advanced.UseItem.GameMode.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
- Config.set("Advanced.UseItem.GameMode.Protection.Mode", "blacklist", yamlConfiguration);
- Config.set("Advanced.UseItem.GameMode.Protection.List", Arrays.asList("CREATIVE", "Spectator"), yamlConfiguration);
-
- Config.set("Advanced.UseItem.World.Change.Enable", true, yamlConfiguration);
- Config.set("Advanced.UseItem.World.Change.DelayInTicks", 1, yamlConfiguration);
- Config.set("Advanced.UseItem.World.Protection.Enable", false, yamlConfiguration);
- Config.set("Advanced.UseItem.World.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
- Config.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
- Config.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), yamlConfiguration);
-
- if (!yamlConfiguration.contains("Advanced.UseItem.ItemBlockBlacklist")) {
- List materialList = Arrays.asList("BUTTON", "DOOR", "FENCE", "CHEST", "FURNACE", "NOTE_BLOCK", "CRAFTING_TABLE", "WORKBENCH",
- "ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER", "BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE",
- "SMITHING_TABLE", "STONECUTTER", "HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR", "BREWING_STAND", "TRAPDOOR", "BEACON"
- );
-
- List materialBlacklist = new ArrayList<>();
- for (Material material : Material.values()) {
- for (String target : materialList) {
- if (material.toString().contains(target)) materialBlacklist.add(material.toString());
- }
- }
- Config.set("Advanced.UseItem.ItemBlockBlacklist", materialBlacklist, yamlConfiguration);
- }
-
- try {
- yamlConfiguration.save(config);
- } catch (IOException e) {
- e.printStackTrace();
- }
- send.console(Util.getPrefix() + " §2config.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Debug.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Debug.java
deleted file mode 100644
index 1adc922..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Debug.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package de.jatitv.commandguiv2.Spigot.system;
-
-import de.jatitv.commandguiv2.Spigot.Main;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import org.bukkit.Bukkit;
-import org.bukkit.command.CommandSender;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.Plugin;
-
-import java.io.File;
-import java.io.IOException;
-import java.text.SimpleDateFormat;
-import java.util.Arrays;
-import java.util.Calendar;
-import java.util.List;
-
-public class Debug {
-
- private static final Plugin plugin = Main.getPlugin();
-
- public static void debugmsg() {
- send.debug(plugin, "§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.debug(plugin, "§3Bukkit Version: §e" + Bukkit.getBukkitVersion());
- send.debug(plugin, "§3NMS Version: §e" + Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit.", ""));
- send.debug(plugin, "§3Version: §e" + Bukkit.getVersion());
- send.debug(plugin, "§3Java: §e" + System.getProperty("java.version"));
- send.debug(plugin, "§3Worlds: §e" + String.valueOf(Bukkit.getServer().getWorlds()));
- send.debug(plugin, String.valueOf(Arrays.asList(Main.getPlugin().getServer().getPluginManager().getPlugins())));
- send.debug(plugin, "§5----------------------------------");
- if (new File(Main.getPath(), "config.yml").exists()) {
- File f = new File(String.valueOf(Main.getPath()));
- File f2 = new File(String.valueOf(Main.getPath() + "/GUIs/"));
- File f3 = new File(String.valueOf(Main.getPath() + "/languages/"));
- File[] fileArray = f.listFiles();
- File[] fileArray2 = f2.listFiles();
- File[] fileArray3 = f3.listFiles();
- if (fileArray != null) {
- for (File config : fileArray) {
- send.debug(plugin, String.valueOf(config).replace("plugins/CommandGUI/", ""));
- }
- }
- if (fileArray2 != null) {
- for (File config2 : fileArray2) {
- send.debug(plugin, String.valueOf(config2).replace("plugins/CommandGUI/", ""));
- }
- } else send.debug(plugin, "No GUI files available");
-
- if (fileArray3 != null) {
- for (File config3 : fileArray3) {
- send.debug(plugin, String.valueOf(config3).replace("plugins/CommandGUI/", ""));
- }
- } else send.debug(plugin, "No language files available");
-
- }
- send.debug(plugin, "§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java
deleted file mode 100644
index 2a3055e..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Permissions.java
+++ /dev/null
@@ -1,80 +0,0 @@
-package de.jatitv.commandguiv2.Spigot.system;
-
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import net.t2code.lib.Spigot.Lib.register.Register;
-import org.bukkit.permissions.PermissionDefault;
-import org.bukkit.plugin.Plugin;
-
-public class Permissions {
- private static final Plugin plugin = Main.getPlugin();
-
- public static final String key = "commandgui.";
- public static final String command = key + "command";
- public static final String info = key + "command.info";
- public static final String bypass = key + "bypass";
- public static final String useitemToggle = key + "useitem.toggle";
- public static final String useitem = key + "useitem";
- public static final String getGuiItemAtLogin = key + "get.guiitem.at.login";
- public static final String giveItemOther = key + "giveitem.other";
- public static final String updatemsg = key + "updatemsg";
-
- public static final String player = key + "player";
- public static final String admin = key + "admin";
-
- public static final PermissionDefault op = PermissionDefault.OP;
- public static final PermissionDefault notOp = PermissionDefault.NOT_OP;
-
- public static void onPermRegister() {
- Register.permission(command, op, plugin);
- Register.permissionDescription(command, "Required permission to open GUIs via command", plugin);
-
- Register.permission(getGuiItemAtLogin, op, plugin);
- Register.permission(giveItemOther, op, plugin);
- Register.permissionDescription(getGuiItemAtLogin, "Only players with this permission will receive the GUI item", plugin);
-
- Register.permission(useitem, op, plugin);
- Register.permissionDescription(useitem, "Required permission to use the GUI Item", plugin);
-
- Register.permission(useitemToggle, op, plugin);
- Register.permissionDescription(useitemToggle, "Required permission to enable/disable the GUI Item for itself (if the function UseItem/AllowToggle is set to true)", plugin);
-
- Register.permission(updatemsg, op, plugin);
- Register.permissionDescription(updatemsg, "Players with this permission get the update message when joining if an update is available", plugin);
-
- Register.permission(bypass, op, plugin);
- Register.permissionDescription(bypass, "Bypass to open disabled GUIs", plugin);
-
- Register.permission(info, notOp, plugin);
- Register.permissionDescription(info, "Permission to view T2C-CommandGUI info", plugin);
-
- Register.permission(player, op, command, true, plugin);
- Register.permission(player, op, getGuiItemAtLogin, true, plugin);
- Register.permission(player, op, useitem, true, plugin);
- Register.permission(player, op, useitemToggle, true, plugin);
- Register.permissionDescription(player, "All permissions from T2C-CommandGUI for Player", plugin);
-
- Register.permission(admin, op, command, true, plugin);
- Register.permission(admin, op, getGuiItemAtLogin, true, plugin);
- Register.permission(admin, op, giveItemOther, true, plugin);
- Register.permission(admin, op, useitem, true, plugin);
- Register.permission(admin, op, useitemToggle, true, plugin);
- Register.permission(admin, op, updatemsg, true, plugin);
- Register.permission(admin, op, bypass, true, plugin);
- Register.permission(admin, op, info, true, plugin);
- Register.permissionDescription(admin, "All permissions from T2C-CommandGUI", plugin);
-
-
- for (Gui gui : Main.guiHashMap.values()) {
- Register.permission(command + "." + gui.key, op, plugin);
- Register.permission(admin, op, command + "." + gui.key, true, plugin);
- for (Slot slot : gui.slots) {
- Register.permission(slot.permissionToUse, op, plugin);
- Register.permission(admin, op, slot.permissionToUse, true, plugin);
- Register.permission(slot.permissionToSee, op, plugin);
- Register.permission(admin, op, slot.permissionToSee, true, plugin);
- }
- }
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java b/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java
deleted file mode 100644
index 1621064..0000000
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Util.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package de.jatitv.commandguiv2;
-
-import net.t2code.lib.Spigot.system.T2CodeMain;
-
-public class Util {
- private static Integer configVersion = 5;
- private static String requiredT2CodeLibVersion = "12.4";
- 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;
-
- public static String 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 T2CodeMain.getDiscord();
- }
-
- public static Integer getConfigVersion() {
- return configVersion;
- }
-}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/Main.java
similarity index 69%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/Main.java
index ee44894..936df13 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/Main.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/Main.java
@@ -1,16 +1,14 @@
-package de.jatitv.commandguiv2.Spigot;
-//s arg1 = new HashMap();
private static HashMap arg2 = new HashMap() {{
@@ -105,34 +104,9 @@ public class CmdExecuter_GUI implements CommandExecutor, TabCompleter {
public List onTabComplete(CommandSender sender, Command cmd, String s, String[] args) {
List list = new ArrayList<>();
- Tab.tab(list, sender, 0, args, arg1);
- Tab.tab(list, sender, 0, SelectConfig.getAdminSubCommand(), 1, args, arg2);
- Tab.tab(list, sender, 1, "give", 2, args, "commandgui.giveitem.other", true);
-
- // if (args.length == 1) {
- // for (String command : arg1.keySet()) {
- // Boolean passend = true;
- // for (int i = 0; i < args[0].length(); i++) {
- // if (args[0].length() >= command.length()) {
- // passend = false;
- // } else {
- // if (args[0].charAt(i) != command.charAt(i)) {
- // passend = false;
- // }
- // }
- // }
- // if (hasPermission(sender, arg1.get(command)) && passend) {
- // list.add(command);
- // }
- // }
- // }
- // if (args.length > 1) {
- // if (args[0].toLowerCase().equals("admin")){
- // return Tab.tab(sender,1,args,arg2);
- // }
- //
- // }
-
+ T2Ctab.tab(list, sender, 0, args, arg1);
+ T2Ctab.tab(list, sender, 0, SelectConfig.getAdminSubCommand(), 1, args, arg2);
+ T2Ctab.tab(list, sender, 1, "give", 2, args, "commandgui.giveitem.other", true);
return list;
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java
similarity index 85%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java
index 6564104..a2768ec 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_GUIItem.java
@@ -1,9 +1,9 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement;
+package net.t2code.commandguiv2.Spigot.cmdManagement;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
@@ -24,7 +24,7 @@ public class CmdExecuter_GUIItem implements CommandExecutor, TabCompleter {
if (args.length == 0) {
if (SelectConfig.getUseItem_AllowToggle()) {
Help.sendGUIItemHelp(sender);
- } else send.sender(sender, "§4UseItem toggle is disabled!");// todo
+ } else T2Csend.sender(sender, "§4UseItem toggle is disabled!");// todo
} else {
if (args.length == 1 || args.length == 2) {
if (sender instanceof Player) {
@@ -41,17 +41,17 @@ public class CmdExecuter_GUIItem implements CommandExecutor, TabCompleter {
try {
Commands.onSetSlot(player, Integer.valueOf(args[1]));
} catch (Exception e5) {
- send.player(player, SelectMessages.ItemSlot_wrongValue);
+ T2Csend.player(player, SelectMessages.ItemSlot_wrongValue);
}
- } else send.player(player, "§4Use: §7/gui-item slot [slot]");
+ } else T2Csend.player(player, "§4Use: §7/gui-item slot [slot]");
break;
default:
Help.sendHelp(player, prefix);
}
- } else send.sender(sender, "§4UseItem toggle is disabled!");// todo
+ } else T2Csend.sender(sender, "§4UseItem toggle is disabled!");// todo
} else sender.sendMessage(SelectMessages.OnlyForPlayer);
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java
similarity index 84%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java
index 511cd20..4cc106f 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/CmdExecuter_Help.java
@@ -1,6 +1,6 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement;
+package net.t2code.commandguiv2.Spigot.cmdManagement;
-import de.jatitv.commandguiv2.Util;
+import net.t2code.commandguiv2.Util;
import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor;
import org.bukkit.command.CommandSender;
diff --git a/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/Help.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/Help.java
new file mode 100644
index 0000000..6e02be8
--- /dev/null
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/Help.java
@@ -0,0 +1,112 @@
+package net.t2code.commandguiv2.Spigot.cmdManagement;
+
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import org.bukkit.command.CommandSender;
+import org.bukkit.entity.Player;
+
+public class Help {
+ private static String prefix = Util.getPrefix();
+
+ public static void sendHelp(CommandSender sender, String Prefix) {
+ Gui gui = Main.guiHashMap.get(SelectConfig.getDefaultGUI());
+
+ T2Csend.sender(sender, Prefix + " §8----- §4Command§9GUI §chelp §8-----");
+ cgui(sender, gui);
+ open(sender);
+ help(sender);
+ gUIItemHelp(sender);
+ info(sender);
+ give(sender);
+ createDefaultGUI(sender);
+ reload(sender);
+ T2Csend.sender(sender, Prefix + " §8-------------------------");
+ }
+
+
+ private static void cgui(CommandSender sender, Gui gui) {
+ if (!sender.hasPermission("commandgui.command")) return;
+
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpCgui.replace("[gui]", T2Creplace.replace(prefix, gui.guiName)));
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpCgui.replace("[gui]", T2Creplace.replace(prefix, gui.guiName)));
+ }
+
+ private static void open(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.command")) return;
+
+ for (String alias : Main.allAliases) {
+ if (Main.guiHashMap.get(alias).guiEnable || sender.hasPermission("commandgui.bypass")) {
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpOpen.replace("[gui]", alias).replace("[guiname]", T2Creplace.replace(prefix, Main.guiHashMap.get(alias).guiName)));
+ } else
+ T2Csend.sender(sender, prefix + " " + SelectMessages.HelpOpen.replace("[gui]", alias).replace("[guiname]", T2Creplace.replace(prefix, Main.guiHashMap.get(alias).guiName)));
+ }
+ }
+ }
+
+ private static void help(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.command")) return;
+
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpHelp);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpHelp);
+ }
+
+ private static void info(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.command.info")) return;
+
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpInfo);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpInfo);
+ }
+
+ private static void give(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.admin")) return;
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpGive);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpGive);
+ }
+
+ private static void createDefaultGUI(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.admin")) return;
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpCreateDefaultGUI.replace("[directory]", Main.getPath() + "\\GUIs\\default.yml"));
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpCreateDefaultGUI.replace("[directory]", Main.getPath() + "\\GUIs\\default.yml"));
+ }
+
+ private static void reload(CommandSender sender) {
+ if (!sender.hasPermission("commandgui.admin")) return;
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerHelpReload);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.HelpReload);
+ }
+
+
+ public static void gUIItemHelp(CommandSender sender) {
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_on);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_on);
+
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_off);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_off);
+
+ if (sender instanceof Player) {
+ T2Csend.player((Player) sender, prefix + " " + SelectMessages.PlayerGUIItemHelp_Slot);
+ } else T2Csend.sender(sender, prefix + " " + SelectMessages.GUIItemHelp_Slot);
+ }
+
+ public static void sendGUIItemHelp(CommandSender sender) {
+ if (sender.hasPermission("commandgui.useitem.toggle")) {
+ T2Csend.sender(sender, prefix + " §8------ §4Command§9GUI§2Item §chelp §8------");
+ gUIItemHelp(sender);
+ T2Csend.sender(sender, prefix + " §8------------------------------");
+ }
+ }
+}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java
similarity index 74%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java
index 6d7b215..5ec5b06 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/AliasRegister.java
@@ -1,22 +1,21 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement.register;
+package net.t2code.commandguiv2.Spigot.cmdManagement.register;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandMap;
import org.bukkit.plugin.Plugin;
-import java.io.File;
import java.lang.reflect.Field;
public class AliasRegister {
public static void onRegister() {
Plugin plugin = Main.getPlugin();
- send.debug(plugin, Bukkit.getServer().getClass().getPackage().getName());
+ T2Csend.debug(plugin, Bukkit.getServer().getClass().getPackage().getName());
if (Main.allAliases.toString().equals("[]")) {
- send.console(Util.getPrefix() + " §4No GUI files available");
+ T2Csend.console(Util.getPrefix() + " §4No GUI files available");
return;
}
for (String alias : Main.allAliases) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java
similarity index 64%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java
index 5e0d479..4deb3f5 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/cmdManagement/register/RegisterCommand.java
@@ -1,11 +1,11 @@
-package de.jatitv.commandguiv2.Spigot.cmdManagement.register;
+package net.t2code.commandguiv2.Spigot.cmdManagement.register;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.gui.OpenGUI;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.gui.OpenGUI;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.command.Command;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -27,9 +27,9 @@ public class RegisterCommand extends Command {
if (gui.guiEnable || player.hasPermission("commandgui.bypass")) {
if (!gui.commandPermissionEnable || player.hasPermission("commandgui.command." + alias) || player.hasPermission("commandgui.bypass")) {
OpenGUI.openGUI(player, alias, true);
- } else send.player(player,SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + alias)
+ } else T2Csend.player(player, SelectMessages.NoPermissionForCommand.replace("[cmd]", "/commandgui " + alias)
.replace("[perm]", "commandgui.command." + alias));
- } else send.player(player,SelectMessages.GUIIsDisabled.replace("[gui]", gui.guiName));
+ } else T2Csend.player(player,SelectMessages.GUIIsDisabled.replace("[gui]", gui.guiName));
} else sender.sendMessage("§8[§6Command§9GUI§8] §cThis command is only for players!");
return true;
}
diff --git a/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/ConfigCreate.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/ConfigCreate.java
new file mode 100644
index 0000000..a1a9618
--- /dev/null
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/ConfigCreate.java
@@ -0,0 +1,191 @@
+package net.t2code.commandguiv2.Spigot.config.config;
+
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
+import net.t2code.t2codelib.SPIGOT.api.yaml.T2Cconfig;
+import org.bukkit.Material;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+public class ConfigCreate {
+
+ public static void configCreate() {
+ long long_ = System.currentTimeMillis();
+ if (new File(Main.getPath(), "config.yml").exists()) {
+ if (Main.getPlugin().getConfig().getBoolean("Plugin.Debug")) T2Csend.console(Util.getPrefix() + " §5DEBUG: §6" + " §4config.yml are created / updated...");
+ } else T2Csend.console(Util.getPrefix() + " §4config.yml are created...");
+
+ File config = new File(Main.getPath(), "config.yml");
+ YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
+
+ if (!config.exists()) T2Cconfig.set("ConfigVersion", Util.getConfigVersion(), yamlConfiguration);
+
+ T2Cconfig.set("Plugin.Debug", false, yamlConfiguration);
+ T2Cconfig.set("Plugin.updateCheck.onJoin", true, yamlConfiguration);
+ T2Cconfig.set("Plugin.updateCheck.seePreReleaseUpdates", true, yamlConfiguration);
+ T2Cconfig.set("Plugin.updateCheck.timeInterval", 60, yamlConfiguration);
+ T2Cconfig.set("Plugin.HelpAlias", true, yamlConfiguration);
+ T2Cconfig.set("Plugin.AdminSubCommand", "admin", yamlConfiguration);
+ T2Cconfig.set("Plugin.language", "english", yamlConfiguration);
+ T2Cconfig.set("Plugin.Currency", "$", yamlConfiguration);
+ T2Cconfig.set("Plugin.DefaultGUI", "default", yamlConfiguration);
+
+ if (Main.legacy){
+ T2Cconfig.set("Storage.Type", "YML", yamlConfiguration);
+ } else T2Cconfig.set("Storage.Type", "SQLITE", yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.IP", "localhost", yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.Port", 3306, yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.Database", "database", yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.User", "root", yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.Password", "password", yamlConfiguration);
+ T2Cconfig.set("Storage.MySQL.SSL", false, yamlConfiguration);
+
+ T2Cconfig.set("BungeeCord.Enable", false, yamlConfiguration);
+ T2Cconfig.set("BungeeCord.ThisServer", "server", yamlConfiguration);
+
+ T2Cconfig.set("UseItem.Enable", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.AllowToggle", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.AllowSetSlot", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.BlockMoveAndDrop", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.OpenGUI", "default", yamlConfiguration);
+ T2Cconfig.set("UseItem.Permission.NeededToUse", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.KeepAtCommandClear", true, yamlConfiguration);
+
+ T2Cconfig.set("UseItem.InventorySlot.Slot", 1, yamlConfiguration);
+ T2Cconfig.set("UseItem.InventorySlot.SlotEnforce", false, yamlConfiguration);
+ T2Cconfig.set("UseItem.InventorySlot.FreeSlot", false, yamlConfiguration);
+
+ T2Cconfig.set("UseItem.Item.Material", "paper", yamlConfiguration);
+ if (!(T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12())) {
+ T2Cconfig.set("UseItem.Item.PlayerHead.Enable", false, yamlConfiguration);
+ T2Cconfig.set("UseItem.Item.PlayerHead.Base64.Enable", false, yamlConfiguration);
+ T2Cconfig.set("UseItem.Item.PlayerHead.Base64.Base64Value", "", yamlConfiguration);
+ T2Cconfig.set("UseItem.Item.PlayerHead.PlayerWhoHasOpenedTheGUI", false, yamlConfiguration);
+ T2Cconfig.set("UseItem.Item.PlayerHead.Playername", "", yamlConfiguration);
+ }
+ T2Cconfig.set("UseItem.Item.Name", "&bDefault &6GUI", yamlConfiguration);
+ T2Cconfig.set("UseItem.Item.Lore", Arrays.asList("&eThis is an example GUI"), yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.GiveOnEveryJoin", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.GiveOnlyOnFirstJoin", false, yamlConfiguration);
+
+ //convert
+ if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin")) {
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin", yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.OnLogin.Enable", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.OnEveryLogin"), yamlConfiguration);
+ }
+ if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin")) {
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin", yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.Spigot.OnOnlyFirstLogin", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.OnOnlyFirstLogin"), yamlConfiguration);
+ }
+ if (yamlConfiguration.contains("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange")) {
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange", yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.Bungee.OnServerChange", yamlConfiguration.getBoolean("UseItem.Join.Cursor.ToGUIItem.EXPERIMENTELL_ServerChange"), yamlConfiguration);
+ }
+
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.OnLogin.Enable", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.Spigot.OnOnlyFirstLogin", true, yamlConfiguration);
+ T2Cconfig.set("UseItem.Join.Cursor.ToGUIItem.Bungee.OnServerChange", false, yamlConfiguration);
+
+ T2Cconfig.set("Toggle.Items.OnOrYes.Item.Base64.Enable", false, yamlConfiguration);
+ T2Cconfig.set("Toggle.Items.OnOrYes.Item.Base64.Base64Value", "", yamlConfiguration);
+ if (Main.legacy) {
+ T2Cconfig.set("Toggle.Items.OnOrYes.Item.Material", "WOOL,5", yamlConfiguration);
+ } else T2Cconfig.set("Toggle.Items.OnOrYes.Item.Material", T2CitemVersion.getGreenWool().getType().toString(), yamlConfiguration);
+
+ T2Cconfig.set("Toggle.Items.OffOrNo.Item.Base64.Enable", false, yamlConfiguration);
+ T2Cconfig.set("Toggle.Items.OffOrNo.Item.Base64.Base64Value", "", yamlConfiguration);
+ if (Main.legacy) {
+ T2Cconfig.set("Toggle.Items.OffOrNo.Item.Material", "WOOL,14", yamlConfiguration);
+ } else T2Cconfig.set("Toggle.Items.OffOrNo.Item.Material", T2CitemVersion.getRedWool().getType().toString(), yamlConfiguration);
+
+ T2Cconfig.set("Toggle.Permission.Commands.True", "luckperms user [player] permission set [perm] true", yamlConfiguration);
+ T2Cconfig.set("Toggle.Permission.Commands.False", "luckperms user [player] permission set [perm] false", yamlConfiguration);
+
+ T2Cconfig.set("Placeholder.True", "&2true", yamlConfiguration);
+ T2Cconfig.set("Placeholder.False", "&4false", yamlConfiguration);
+
+ T2Cconfig.set("Sound.Enable", true, yamlConfiguration);
+
+ T2Cconfig.set("Sound.OpenInventory.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.OpenInventory.Sound", "CHEST_OPEN", yamlConfiguration);
+ } else T2Cconfig.set("Sound.OpenInventory.Sound", "BLOCK_CHEST_OPEN", yamlConfiguration);
+
+ T2Cconfig.set("Sound.Click.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.Click.Sound", "NOTE_STICKS", yamlConfiguration);
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
+ T2Cconfig.set("Sound.Click.Sound", "BLOCK_NOTE_HAT", yamlConfiguration);
+ } else T2Cconfig.set("Sound.Click.Sound", "BLOCK_NOTE_BLOCK_HAT", yamlConfiguration);
+
+ T2Cconfig.set("Sound.NoMoney.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.NoMoney.Sound", "NOTE_PIANO", yamlConfiguration);
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
+ T2Cconfig.set("Sound.NoMoney.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
+ } else T2Cconfig.set("Sound.NoMoney.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
+
+ T2Cconfig.set("Sound.NoInventorySpace.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.NoInventorySpace.Sound", "NOTE_PIANO", yamlConfiguration);
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
+ T2Cconfig.set("Sound.NoInventorySpace.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
+ } else T2Cconfig.set("Sound.NoInventorySpace.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
+
+ T2Cconfig.set("Sound.Give.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.Give.Sound", "LEVEL_UP", yamlConfiguration);
+ } else T2Cconfig.set("Sound.Give.Sound", "ENTITY_PLAYER_LEVELUP", yamlConfiguration);
+
+ T2Cconfig.set("Sound.PlayerNotFound.Enable", true, yamlConfiguration);
+ if (T2CmcVersion.isMc1_8()) {
+ T2Cconfig.set("Sound.PlayerNotFound.Sound", "NOTE_PIANO", yamlConfiguration);
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
+ T2Cconfig.set("Sound.PlayerNotFound.Sound", "BLOCK_NOTE_HARP", yamlConfiguration);
+ } else T2Cconfig.set("Sound.PlayerNotFound.Sound", "BLOCK_NOTE_BLOCK_HARP", yamlConfiguration);
+
+ T2Cconfig.set("Advanced.UseItem.GameMode.Change.Enable", true, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.GameMode.Change.DelayInTicks", 1, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.GameMode.Protection.Enable", false, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.GameMode.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.GameMode.Protection.Mode", "blacklist", yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.GameMode.Protection.List", Arrays.asList("CREATIVE", "Spectator"), yamlConfiguration);
+
+ T2Cconfig.set("Advanced.UseItem.World.Change.Enable", true, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.World.Change.DelayInTicks", 1, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.World.Protection.Enable", false, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.World.Protection.RemoveItemWhenItIsDisabled", false, yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.World.Protection.Mode", "blacklist", yamlConfiguration);
+ T2Cconfig.set("Advanced.UseItem.World.Protection.List", Arrays.asList("World1", "World2"), yamlConfiguration);
+
+ if (!yamlConfiguration.contains("Advanced.UseItem.ItemBlockBlacklist")) {
+ List materialList = Arrays.asList("BUTTON", "DOOR", "FENCE", "CHEST", "FURNACE", "NOTE_BLOCK", "CRAFTING_TABLE", "WORKBENCH",
+ "ANVIL", "LOOM", "COMPOSTER", "BARREL", "SMOKER", "BLAST_FURNACE", "CARTOGRAPHY_TABLE", "FLETCHING_TABLE", "GRINDSTONE",
+ "SMITHING_TABLE", "STONECUTTER", "HOPPER", "DISPENSER", "DROPPER", "REPEATER", "COMPARATOR", "LEVER", "DAYLIGHT_DETECTOR", "BREWING_STAND", "TRAPDOOR", "BEACON"
+ );
+
+ List materialBlacklist = new ArrayList<>();
+ for (Material material : Material.values()) {
+ for (String target : materialList) {
+ if (material.toString().contains(target)) materialBlacklist.add(material.toString());
+ }
+ }
+ T2Cconfig.set("Advanced.UseItem.ItemBlockBlacklist", materialBlacklist, yamlConfiguration);
+ }
+
+ try {
+ yamlConfiguration.save(config);
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ T2Csend.console(Util.getPrefix() + " §2config.yml were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ }
+}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/SelectConfig.java
similarity index 88%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/SelectConfig.java
index 05c6b79..de14072 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/config/SelectConfig.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/config/SelectConfig.java
@@ -1,12 +1,12 @@
-package de.jatitv.commandguiv2.Spigot.config.config;
+package net.t2code.commandguiv2.Spigot.config.config;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-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.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.Sound;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -21,22 +21,26 @@ public class SelectConfig {
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
if (yamlConfiguration.getInt("ConfigVersion") < Util.getConfigVersion() && new File(Main.getPath(), "config.yml").exists()) {
- send.console(Util.getPrefix() + " §4----------------------");
- send.console(Util.getPrefix() + " ");
- send.console(Util.getPrefix() + " §6New features have been added to CommandGUI. The Config is adapted!");
- send.console(Util.getPrefix() + " ");
- send.console(Util.getPrefix() + " §4----------------------");
+ T2Csend.console(Util.getPrefix() + " §4----------------------");
+ T2Csend.console(Util.getPrefix() + " ");
+ T2Csend.console(Util.getPrefix() + " §6New features have been added to CommandGUI. The Config is adapted!");
+ T2Csend.console(Util.getPrefix() + " ");
+ T2Csend.console(Util.getPrefix() + " §4----------------------");
if (yamlConfiguration.getInt("ConfigVersion") < 5) {
ConfigConverterUnderV5.convert();
}
}
Debug = yamlConfiguration.getBoolean("Plugin.Debug");
+ updateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.updateCheck.onJoin");
+ updateCheckSeePreReleaseUpdates = yamlConfiguration.getBoolean("Plugin.updateCheck.seePreReleaseUpdates");
+ updateCheckTimeInterval = yamlConfiguration.getInt("Plugin.updateCheck.timeInterval");
HelpAlias = yamlConfiguration.getBoolean("Plugin.HelpAlias");
adminSubCommand = yamlConfiguration.getString("Plugin.AdminSubCommand").toLowerCase();
language = yamlConfiguration.getString("Plugin.language");
Currency = yamlConfiguration.getString("Plugin.Currency");
DefaultGUI = yamlConfiguration.getString("Plugin.DefaultGUI");
+
storage = yamlConfiguration.getString("Storage.Type").toUpperCase();
mysqlIp = yamlConfiguration.getString("Storage.MySQL.IP");
@@ -67,7 +71,7 @@ public class SelectConfig {
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(Util.getPrefix(), yamlConfiguration.getString("UseItem.Item.Name"));
+ UseItem_Name = T2Creplace.replace(Util.getPrefix(), yamlConfiguration.getString("UseItem.Item.Name"));
UseItem_Lore = yamlConfiguration.getStringList("UseItem.Item.Lore");
UseItem_GiveOnEveryJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnEveryJoin");
UseItem_GiveOnlyOnFirstJoin = yamlConfiguration.getBoolean("UseItem.Join.GiveOnlyOnFirstJoin");
@@ -133,50 +137,50 @@ public class SelectConfig {
public static void sound(String Prefix) {
String soundOpenInventory;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundOpenInventory = "CHEST_OPEN";
} else {
soundOpenInventory = "BLOCK_CHEST_OPEN";
}
String soundClick;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundClick = "NOTE_STICKS";
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
soundClick = "BLOCK_NOTE_HAT";
} else {
soundClick = "BLOCK_NOTE_BLOCK_HAT";
}
String soundNoMoney;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundNoMoney = "NOTE_PIANO";
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
soundNoMoney = "BLOCK_NOTE_HARP";
} else {
soundNoMoney = "BLOCK_NOTE_BLOCK_HARP";
}
String soundNoInventorySpace;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundNoInventorySpace = "NOTE_PIANO";
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
soundNoInventorySpace = "BLOCK_NOTE_BASS";
} else {
soundNoInventorySpace = "BLOCK_NOTE_BLOCK_GUITAR";
}
String soundGive;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundGive = "LEVEL_UP";
} else {
soundGive = "ENTITY_PLAYER_LEVELUP";
}
String soundPlayerNotFound;
- if (MCVersion.minecraft1_8) {
+ if (T2CmcVersion.isMc1_8()) {
soundPlayerNotFound = "NOTE_PIANO";
- } else if (MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ } else if (T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
soundPlayerNotFound = "BLOCK_NOTE_HARP";
} else {
soundPlayerNotFound = "BLOCK_NOTE_BLOCK_HARP";
@@ -188,7 +192,7 @@ public class SelectConfig {
Sound_OpenInventory = sound_OpenInventory;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8OpenInventory: §6" + Sound_OpenInventory_input) + "§4\n§4\n§4\n");
Sound_OpenInventory = Sound.valueOf(soundOpenInventory);
}
@@ -199,7 +203,7 @@ public class SelectConfig {
Sound_Click = sound_Click;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8Click: §6" + Sound_Click_input) + "§4\n§4\n§4\n");
Sound_Click = Sound.valueOf(soundClick);
}
@@ -210,7 +214,7 @@ public class SelectConfig {
Sound_Click = sound_NoMoney;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8NoMoney: §6" + Sound_NoMoney_input) + "§4\n§4\n§4\n");
Sound_NoMoney = Sound.valueOf(soundNoMoney);
}
@@ -222,7 +226,7 @@ public class SelectConfig {
Sound_NoInventorySpace = sound_NoInventorySpace;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8NoInventorySpace: §6" + Sound_NoInventorySpace_input) + "§4\n§4\n§4\n");
Sound_NoInventorySpace = Sound.valueOf(soundNoInventorySpace);
}
@@ -233,7 +237,7 @@ public class SelectConfig {
Sound_Give = sound_Give;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8Give: §6" + Sound_Give_input) + "§4\n§4\n§4\n");
Sound_Give = Sound.valueOf(soundGive);
}
@@ -244,7 +248,7 @@ public class SelectConfig {
Sound_PlayerNotFound = sound_PlayerNotFound;
}
} catch (Exception e) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", Prefix)
.replace("[sound]", "§8PlayerNotFound: §6" + Sound_PlayerNotFound_input) + "§4\n§4\n§4\n");
Sound_PlayerNotFound = Sound.valueOf(soundPlayerNotFound);
}
@@ -263,6 +267,10 @@ public class SelectConfig {
}
private static Boolean Debug;
+
+ private static Boolean updateCheckOnJoin;
+ private static Boolean updateCheckSeePreReleaseUpdates;
+ private static Integer updateCheckTimeInterval;
private static Boolean HelpAlias;
private static String adminSubCommand;
private static String language;
@@ -369,6 +377,18 @@ public class SelectConfig {
return Debug;
}
+ public static Boolean getUpdateCheckOnJoin() {
+ return updateCheckOnJoin;
+ }
+
+ public static Boolean getUpdateCheckSeePreReleaseUpdates() {
+ return updateCheckSeePreReleaseUpdates;
+ }
+
+ public static Integer getUpdateCheckTimeInterval() {
+ return updateCheckTimeInterval;
+ }
+
public static Boolean getHelpAlias() {
return HelpAlias;
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java
similarity index 77%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java
index 4850320..2ec3d65 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/configConverter/ConfigConverterUnderV5.java
@@ -1,12 +1,12 @@
-package de.jatitv.commandguiv2.Spigot.config.configConverter;
+package net.t2code.commandguiv2.Spigot.config.configConverter;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.functions.CreateFunctions;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionItemEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionVoteEnum;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.functions.CreateFunctions;
+import net.t2code.commandguiv2.Spigot.enums.FunctionItemEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionVoteEnum;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.apache.commons.io.FileUtils;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -22,19 +22,19 @@ public class ConfigConverterUnderV5 {
File newF = new File("plugins/T2C-CommandGUI");
if (oldF.renameTo(newF)) {
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.error(Main.getPlugin(), "");
- send.warning(Main.getPlugin(), "File renamed successfully");
- send.warning(Main.getPlugin(), "The plugin folder has been renamed from 'CommandGUI' to 'T2C-CommandGUI");
- send.error(Main.getPlugin(), "");
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.warning(Main.getPlugin(), "File renamed successfully");
+ T2Csend.warning(Main.getPlugin(), "The plugin folder has been renamed from 'CommandGUI' to 'T2C-CommandGUI");
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
} else {
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.error(Main.getPlugin(), "");
- send.error(Main.getPlugin(), "Failed to rename file");
- send.error(Main.getPlugin(), "An error occurred while renaming the plugin folder from 'CommandGUI' to 'T2C-CommandGUI'! Please report on our Discord: " + Util.getDiscord());
- send.error(Main.getPlugin(), "");
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.error(Main.getPlugin(), "Failed to rename file");
+ T2Csend.error(Main.getPlugin(), "An error occurred while renaming the plugin folder from 'CommandGUI' to 'T2C-CommandGUI'! Please report on our Discord: " + Util.getDiscord());
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
}
}
@@ -49,23 +49,23 @@ public class ConfigConverterUnderV5 {
} catch (IOException e) {
e.printStackTrace();
}
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.error(Main.getPlugin(), "");
- send.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Message.Enable' was added to the function " + config.getName() + "!");
- send.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Message.CustomNoPermMessage' was added to the function " + config.getName() + "!");
- send.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Item.Lore.Enable' was added to the function " + config.getName() + "!");
- send.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Item.Lore.Lore' was added to the function " + config.getName() + "!");
- send.error(Main.getPlugin(), "");
- send.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Message.Enable' was added to the function " + config.getName() + "!");
+ T2Csend.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Message.CustomNoPermMessage' was added to the function " + config.getName() + "!");
+ T2Csend.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Item.Lore.Enable' was added to the function " + config.getName() + "!");
+ T2Csend.warning(Main.getPlugin(), "'Slots.Function.NoPermission.Item.Lore.Lore' was added to the function " + config.getName() + "!");
+ T2Csend.error(Main.getPlugin(), "");
+ T2Csend.error(Main.getPlugin(), "!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
}
public static void convert() {
renameFolder();
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4Config conversion to the new config structure starts!");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4Config conversion to the new config structure starts!");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
File f = new File(Main.getPath() + "/OldConfig/GUIs/Version4");
File[] fileArray = f.listFiles();
@@ -83,7 +83,7 @@ public class ConfigConverterUnderV5 {
String name = yamlConfigurationOld.getString("GUI.Name");
Boolean fillItemEnable = yamlConfigurationOld.getBoolean("GUI.FillItem.Enable");
String fillItem;
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
fillItem = yamlConfigurationOld.getString("GUI.FillItem.GlassPaneColor");
} else fillItem = yamlConfigurationOld.getString("GUI.FillItem.Item");
@@ -162,11 +162,11 @@ public class ConfigConverterUnderV5 {
}
}
}
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4The conversion to the new config structure is completed!");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
- send.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4The conversion to the new config structure is completed!");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7]");
+ T2Csend.console(Util.getPrefix() + " §7[§5ConfigConvert§7] §4----------------------");
}
private static void renameFolder() {
@@ -185,7 +185,7 @@ public class ConfigConverterUnderV5 {
set("GUI.Lines", lines, yamlConfiguration);
set("GUI.Name", name, yamlConfiguration);
set("GUI.FillItem.Enable", fillItemEnable, yamlConfiguration);
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
set("GUI.FillItem.GlassPaneColor", fillItem, yamlConfiguration);
} else set("GUI.FillItem.Item", fillItem, yamlConfiguration);
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/functions/CreateFunctions.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/functions/CreateFunctions.java
similarity index 94%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/functions/CreateFunctions.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/functions/CreateFunctions.java
index 7609bd9..0e93870 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/functions/CreateFunctions.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/functions/CreateFunctions.java
@@ -1,10 +1,10 @@
-package de.jatitv.commandguiv2.Spigot.config.functions;
+package net.t2code.commandguiv2.Spigot.config.functions;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionItemEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionVoteEnum;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.enums.FunctionItemEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionVoteEnum;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
@@ -56,7 +56,7 @@ public class CreateFunctions {
i++;
}
- send.console(Util.getPrefix() + " §4Function GUI file (Functions/" + config.getName() + ") is loaded...");
+ T2Csend.console(Util.getPrefix() + " §4Function GUI file (Functions/" + config.getName() + ") is loaded...");
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
@@ -130,7 +130,7 @@ public class CreateFunctions {
} catch (IOException e) {
e.printStackTrace();
}
- send.console(Util.getPrefix() + " §2Function file (Functions/" + config.getName() + ") was loaded." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.console(Util.getPrefix() + " §2Function file (Functions/" + config.getName() + ") was loaded." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/gui/CreateGUI.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/gui/CreateGUI.java
similarity index 79%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/gui/CreateGUI.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/gui/CreateGUI.java
index 1b930a1..8f25582 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/gui/CreateGUI.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/gui/CreateGUI.java
@@ -1,21 +1,19 @@
-package de.jatitv.commandguiv2.Spigot.config.gui;
+package net.t2code.commandguiv2.Spigot.config.gui;
-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.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
import java.io.IOException;
-import java.util.Arrays;
-import java.util.List;
public class CreateGUI {
public static void configCreate() {
long long_ = System.currentTimeMillis();
- send.console(Util.getPrefix() + " §4Default GUI file (GUIs/default.yml) is loaded...");
+ T2Csend.console(Util.getPrefix() + " §4Default GUI file (GUIs/default.yml) is loaded...");
File config = new File(Main.getPath(), "GUIs/default.yml");
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
@@ -23,7 +21,7 @@ public class CreateGUI {
set("GUI.Lines", 1, yamlConfiguration);
set("GUI.Name", "&5default &9GUI", yamlConfiguration);
set("GUI.FillItem.Enable", true, yamlConfiguration);
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
set("GUI.FillItem.GlassPaneColor", 15, yamlConfiguration);
} else set("GUI.FillItem.Item", "BLACK_STAINED_GLASS_PANE", yamlConfiguration);
@@ -50,7 +48,7 @@ public class CreateGUI {
} catch (IOException e) {
e.printStackTrace();
}
- send.console(Util.getPrefix() + " §2Default GUI file (GUIs/default.yml) was loaded." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.console(Util.getPrefix() + " §2Default GUI file (GUIs/default.yml) was loaded." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
}
private static void set(String path, String value, YamlConfiguration config) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/LanguagesCreate.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/LanguagesCreate.java
similarity index 88%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/LanguagesCreate.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/LanguagesCreate.java
index 0d2263b..820be4c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/LanguagesCreate.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/LanguagesCreate.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.config.languages;
+package net.t2code.commandguiv2.Spigot.config.languages;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.plugin.Plugin;
@@ -13,7 +13,7 @@ public class LanguagesCreate {
private static Plugin plugin = Main.getPlugin();
public static void langCreate() {
- send.debug(plugin,"§4Language files are created / updated...");
+ T2Csend.debug(plugin, "§4Language files are created / updated...");
Long long_ = Long.valueOf(System.currentTimeMillis());
/**
@@ -63,13 +63,13 @@ public class LanguagesCreate {
set("Player.PlayerNotFond", MSG.EN_PlayerNotFond, yamlConfigurationEN);
set("Player.PlayerNoInventorySpace", MSG.EN_PlayerNoInventorySpace, yamlConfigurationEN);
- set("FunctionItem.Add", MSG.EN_FunctionItemAdd,yamlConfigurationEN);
- set("FunctionItem.Remove", MSG.EN_FunctionItemRemove,yamlConfigurationEN);
- set("FunctionItem.RemoveError", MSG.EN_FunctionItemRemoveError,yamlConfigurationEN);
+ set("FunctionItem.Add", MSG.EN_FunctionItemAdd, yamlConfigurationEN);
+ set("FunctionItem.Remove", MSG.EN_FunctionItemRemove, yamlConfigurationEN);
+ set("FunctionItem.RemoveError", MSG.EN_FunctionItemRemoveError, yamlConfigurationEN);
- set("FunctionVote.Add", MSG.EN_FunctionVoteAdd,yamlConfigurationEN);
- set("FunctionVote.Remove", MSG.EN_FunctionVoteRemove,yamlConfigurationEN);
- set("FunctionVote.RemoveError", MSG.EN_FunctionVoteRemoveError,yamlConfigurationEN);
+ set("FunctionVote.Add", MSG.EN_FunctionVoteAdd, yamlConfigurationEN);
+ set("FunctionVote.Remove", MSG.EN_FunctionVoteRemove, yamlConfigurationEN);
+ set("FunctionVote.RemoveError", MSG.EN_FunctionVoteRemoveError, yamlConfigurationEN);
set("Help.CGUI", MSG.EN_Help_CGUI, yamlConfigurationEN);
set("Help.Help", MSG.EN_Help_Help, yamlConfigurationEN);
@@ -96,7 +96,7 @@ public class LanguagesCreate {
try {
yamlConfigurationEN.save(messagesEN);
} catch (IOException e) {
- send.warning(plugin,e.getMessage());
+ T2Csend.warning(plugin, e.getMessage());
e.printStackTrace();
}
@@ -148,13 +148,13 @@ public class LanguagesCreate {
set("Player.PlayerNotFond", MSG.DE_PlayerNotFond, yamlConfigurationDE);
set("Player.PlayerNoInventorySpace", MSG.DE_PlayerNoInventorySpace, yamlConfigurationDE);
- set("FunctionItem.Add", MSG.DE_FunctionItemAdd,yamlConfigurationDE);
- set("FunctionItem.Remove", MSG.DE_FunctionItemRemove,yamlConfigurationDE);
- set("FunctionItem.RemoveError", MSG.DE_FunctionItemRemoveError,yamlConfigurationDE);
+ set("FunctionItem.Add", MSG.DE_FunctionItemAdd, yamlConfigurationDE);
+ set("FunctionItem.Remove", MSG.DE_FunctionItemRemove, yamlConfigurationDE);
+ set("FunctionItem.RemoveError", MSG.DE_FunctionItemRemoveError, yamlConfigurationDE);
- set("FunctionVote.Add", MSG.DE_FunctionVoteAdd,yamlConfigurationDE);
- set("FunctionVote.Remove", MSG.DE_FunctionVoteRemove,yamlConfigurationDE);
- set("FunctionVote.RemoveError", MSG.DE_FunctionVoteRemoveError,yamlConfigurationDE);
+ set("FunctionVote.Add", MSG.DE_FunctionVoteAdd, yamlConfigurationDE);
+ set("FunctionVote.Remove", MSG.DE_FunctionVoteRemove, yamlConfigurationDE);
+ set("FunctionVote.RemoveError", MSG.DE_FunctionVoteRemoveError, yamlConfigurationDE);
set("Help.CGUI", MSG.DE_Help_CGUI, yamlConfigurationDE);
set("Help.Help", MSG.DE_Help_Help, yamlConfigurationDE);
@@ -181,7 +181,7 @@ public class LanguagesCreate {
try {
yamlConfigurationDE.save(messagesDE);
} catch (IOException e) {
- send.warning(plugin,e.getMessage());
+ T2Csend.warning(plugin, e.getMessage());
e.printStackTrace();
}
@@ -234,13 +234,13 @@ public class LanguagesCreate {
set("Player.PlayerNotFond", MSG.NO_PlayerNotFond, yamlConfigurationNO);
set("Player.PlayerNoInventorySpace", MSG.NO_PlayerNoInventorySpace, yamlConfigurationNO);
- set("FunctionItem.Add", MSG.NO_FunctionItemAdd,yamlConfigurationNO);
- set("FunctionItem.Remove", MSG.NO_FunctionItemRemove,yamlConfigurationNO);
- set("FunctionItem.RemoveError", MSG.NO_FunctionItemRemoveError,yamlConfigurationNO);
+ set("FunctionItem.Add", MSG.NO_FunctionItemAdd, yamlConfigurationNO);
+ set("FunctionItem.Remove", MSG.NO_FunctionItemRemove, yamlConfigurationNO);
+ set("FunctionItem.RemoveError", MSG.NO_FunctionItemRemoveError, yamlConfigurationNO);
- set("FunctionVote.Add", MSG.NO_FunctionVoteAdd,yamlConfigurationNO);
- set("FunctionVote.Remove", MSG.NO_FunctionVoteRemove,yamlConfigurationNO);
- set("FunctionVote.RemoveError", MSG.NO_FunctionVoteRemoveError,yamlConfigurationNO);
+ set("FunctionVote.Add", MSG.NO_FunctionVoteAdd, yamlConfigurationNO);
+ set("FunctionVote.Remove", MSG.NO_FunctionVoteRemove, yamlConfigurationNO);
+ set("FunctionVote.RemoveError", MSG.NO_FunctionVoteRemoveError, yamlConfigurationNO);
set("Help.CGUI", MSG.NO_Help_CGUI, yamlConfigurationNO);
set("Help.Help", MSG.NO_Help_Help, yamlConfigurationNO);
@@ -267,12 +267,11 @@ public class LanguagesCreate {
try {
yamlConfigurationNO.save(messagesNO);
} catch (IOException e) {
- send.warning(plugin,e.getMessage());
+ T2Csend.warning(plugin, e.getMessage());
e.printStackTrace();
}
-
- send.console(Util.getPrefix() + " §2Language files were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
+ T2Csend.console(Util.getPrefix() + " §2Language files were successfully created / updated." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
}
private static void set(String path, String value, YamlConfiguration config) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/MSG.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/MSG.java
similarity index 99%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/MSG.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/MSG.java
index 29d22be..b03e341 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/MSG.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/MSG.java
@@ -9,7 +9,7 @@
// \_____\_____|\____/|_____|
// -----------------------------
-package de.jatitv.commandguiv2.Spigot.config.languages;
+package net.t2code.commandguiv2.Spigot.config.languages;
public class MSG {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/SelectMessages.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/SelectMessages.java
similarity index 87%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/SelectMessages.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/SelectMessages.java
index e6f5f6a..f5e5dfe 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/config/languages/SelectMessages.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/config/languages/SelectMessages.java
@@ -1,10 +1,10 @@
-package de.jatitv.commandguiv2.Spigot.config.languages;
+package net.t2code.commandguiv2.Spigot.config.languages;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.replace.Replace;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
@@ -82,20 +82,19 @@ public class SelectMessages {
public static String PlayerGUIItemHelp_Slot;
public static void onSelect(String Prefix) {
-
- send.debug(Main.getPlugin(), "§4Select language...");
+ T2Csend.debug(Main.getPlugin(), "§4Select language...");
long long_ = System.currentTimeMillis();
File msg;
msg = new File(Main.getPath(), "languages/" + SelectConfig.getLanguage() + "_messages.yml");
if (!msg.isFile()) {
- send.console(Prefix);
- send.console(Prefix + " §4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.console(Prefix + " §4The selected §c" + SelectConfig.getLanguage() + " §4language file was not found.");
- send.console(Prefix + " §6The default language §eEnglish §6is used!");
- send.console(Prefix + " §4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
- send.console(Prefix);
+ T2Csend.console(Prefix);
+ T2Csend.console(Prefix + " §4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.console(Prefix + " §4The selected §c" + SelectConfig.getLanguage() + " §4language file was not found.");
+ T2Csend.console(Prefix + " §6The default language §eEnglish §6is used!");
+ T2Csend.console(Prefix + " §4!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.console(Prefix);
msg = new File(Main.getPath(), "languages/" + "english_messages.yml");
selectMSG = "english";
} else selectMSG = SelectConfig.getLanguage();
@@ -171,10 +170,10 @@ public class SelectMessages {
PlayerGUIItemHelp_Slot = select("Help.Player.UseItem_Slot", yamlConfiguration_msg);
- send.console(Prefix + " §2Language successfully selected to: §6" + selectMSG + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.console(Prefix + " §2Language successfully selected to: §6" + selectMSG + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
}
private static String select(String path, YamlConfiguration yamlConfiguration) {
- return Replace.replace(Util.getPrefix(), Objects.requireNonNull(yamlConfiguration.getString(path)));
+ return T2Creplace.replace(Util.getPrefix(), Objects.requireNonNull(yamlConfiguration.getString(path)));
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/MySQL.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/MySQL.java
similarity index 74%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/MySQL.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/MySQL.java
index ad1ed80..75ea6c2 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/MySQL.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/MySQL.java
@@ -1,11 +1,11 @@
-package de.jatitv.commandguiv2.Spigot.database;
+package net.t2code.commandguiv2.Spigot.database;
import com.zaxxer.hikari.HikariConfig;
import com.zaxxer.hikari.HikariDataSource;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import java.sql.*;
import java.time.ZoneId;
@@ -22,7 +22,7 @@ public class MySQL {
long long_ = System.currentTimeMillis();
Calendar now = Calendar.getInstance();
ZoneId timeZone = now.getTimeZone().toZoneId();
- send.debug(Main.getPlugin(), "Server TimeZone is : " + timeZone);
+ T2Csend.debug(Main.getPlugin(), "Server TimeZone is : " + timeZone);
try {
config.setJdbcUrl("jdbc:mysql://" + SelectConfig.getMysqlIp() + ":" + SelectConfig.getMysqlPort() + "/" + SelectConfig.getMysqlDatabase()
+ "?useJDBCCompliantTimezoneShift=true&allowMultiQueries=true&useLegacyDatetimeCode=false&autoReconnect=true&serverTimezone=" + timeZone
@@ -33,23 +33,23 @@ public class MySQL {
config.addDataSourceProperty("prepStmtCacheSize", "250");
config.addDataSourceProperty("prepStmtCacheSqlLimit", "2048");
ds = new HikariDataSource(config);
- send.console(Util.getPrefix() + " §2MYSQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.console(Util.getPrefix() + " §2MYSQL successfully connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
} catch (Exception ex) {
- send.console(Util.getPrefix() + " §4MYSQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
- send.error(Main.getPlugin(), ex.getMessage() + " --- " + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.console(Util.getPrefix() + " §4MYSQL not connected." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
+ T2Csend.error(Main.getPlugin(), ex.getMessage() + " --- " + (System.currentTimeMillis() - long_) + "ms");
}
if (SelectConfig.getDebug() || Main.version.toLowerCase().contains("dev") || Main.version.toLowerCase().contains("beta") || Main.version.toLowerCase().contains("snapshot")) {
try {
- send.error(Main.getPlugin(), "MySQL DEBUG:");
+ T2Csend.error(Main.getPlugin(), "MySQL DEBUG:");
Connection con = ds.getConnection();
DatabaseMetaData dbmd = con.getMetaData();
- send.debugmsg(Main.getPlugin(), "§6Metadata of the database:");
- send.debugmsg(Main.getPlugin(), "§6DB: §e" + dbmd.getDatabaseProductName());
- send.debugmsg(Main.getPlugin(), "§6Version: §e" + dbmd.getDatabaseProductVersion());
- send.debugmsg(Main.getPlugin(), "§6Driver: §e" + dbmd.getDriverName());
- send.debugmsg(Main.getPlugin(), "§6Driver MajorVersion: §e" + dbmd.getDriverMajorVersion() + "." + dbmd.getDriverMinorVersion());
- send.debugmsg(Main.getPlugin(), "§6Driver Version: §e" + dbmd.getDriverVersion());
+ T2Csend.debugmsg(Main.getPlugin(), "§6Metadata of the database:");
+ T2Csend.debugmsg(Main.getPlugin(), "§6DB: §e" + dbmd.getDatabaseProductName());
+ T2Csend.debugmsg(Main.getPlugin(), "§6Version: §e" + dbmd.getDatabaseProductVersion());
+ T2Csend.debugmsg(Main.getPlugin(), "§6Driver: §e" + dbmd.getDriverName());
+ T2Csend.debugmsg(Main.getPlugin(), "§6Driver MajorVersion: §e" + dbmd.getDriverMajorVersion() + "." + dbmd.getDriverMinorVersion());
+ T2Csend.debugmsg(Main.getPlugin(), "§6Driver Version: §e" + dbmd.getDriverVersion());
con.close();
} catch (SQLException e) {
throw new RuntimeException(e);
@@ -65,7 +65,7 @@ public class MySQL {
if (ds == null) {
return;
}
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
Connection con = ds.getConnection();
Statement stmt = con.createStatement();
stmt.execute(query);
@@ -75,7 +75,7 @@ public class MySQL {
public static HashMap> selectAll(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
HashMap> Result = new HashMap<>();
try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
@@ -97,7 +97,7 @@ public class MySQL {
}
public static String select(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
String Ausgabe = "";
try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
@@ -114,7 +114,7 @@ public class MySQL {
}
public static int count(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
int count = 0;
try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
@@ -131,7 +131,7 @@ public class MySQL {
}
public static ArrayList selectRow(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
ArrayList Result = new ArrayList<>();
try (Connection con = ds.getConnection()) {
Statement stmt = con.createStatement();
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SQLITE.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SQLITE.java
similarity index 88%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SQLITE.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SQLITE.java
index 15e9246..559f1a2 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SQLITE.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SQLITE.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.database;
+package net.t2code.commandguiv2.Spigot.database;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.Bukkit;
import java.io.File;
@@ -28,7 +28,7 @@ public class SQLITE {
public static void query(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
try {
Statement stmt = con.createStatement();
stmt.execute(query);
@@ -42,7 +42,7 @@ public class SQLITE {
try {
Statement stmt = con.createStatement();
for (String query : queryList) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
stmt.addBatch(query);
}
stmt.executeBatch();
@@ -54,7 +54,7 @@ public class SQLITE {
public static HashMap> selectAll(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
HashMap> Result = new HashMap<>();
try {
Statement stmt = con.createStatement();
@@ -76,7 +76,7 @@ public class SQLITE {
}
public static String select(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
String Ausgabe = "";
try {
Statement stmt = con.createStatement();
@@ -93,7 +93,7 @@ public class SQLITE {
}
public static int count(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
int count = 0;
try {
Statement stmt = con.createStatement();
@@ -110,7 +110,7 @@ public class SQLITE {
}
public static ArrayList selectRow(String query) {
- send.debug(Main.getPlugin(), query);
+ T2Csend.debug(Main.getPlugin(), query);
ArrayList Result = new ArrayList<>();
try {
Statement stmt = con.createStatement();
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SelectDatabase.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SelectDatabase.java
similarity index 96%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SelectDatabase.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SelectDatabase.java
index bda74d0..c274a7c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/SelectDatabase.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/SelectDatabase.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.database;
+package net.t2code.commandguiv2.Spigot.database;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.enums.StorageEnum;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.enums.StorageEnum;
import org.bukkit.entity.Player;
import java.sql.SQLException;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/YML.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/YML.java
similarity index 84%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/YML.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/YML.java
index eacafab..e6e6f39 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/database/YML.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/database/YML.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.database;
+package net.t2code.commandguiv2.Spigot.database;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.Obj_Select;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
@@ -58,11 +58,11 @@ public class YML {
public static Integer selectSlot(Player player) {
- send.debug(plugin, "yml-1");
+ T2Csend.debug(plugin, "yml-1");
if (!yamlConfigurationStorage.contains(String.valueOf(player.getUniqueId()))) return null;
if (yamlConfigurationStorage.getString(player.getUniqueId() + ".Slot") == null) return null;
- send.debug(plugin, "yml-2");
- send.debug(plugin, String.valueOf(yamlConfigurationStorage.getInt(player.getUniqueId() + ".Slot")));
+ T2Csend.debug(plugin, "yml-2");
+ T2Csend.debug(plugin, String.valueOf(yamlConfigurationStorage.getInt(player.getUniqueId() + ".Slot")));
return yamlConfigurationStorage.getInt(player.getUniqueId() + ".Slot");
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/EcoEnum.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/EcoEnum.java
similarity index 59%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/EcoEnum.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/EcoEnum.java
index b6f8182..58b385f 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/EcoEnum.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/EcoEnum.java
@@ -1,4 +1,4 @@
-package de.jatitv.commandguiv2.Spigot.enums;
+package net.t2code.commandguiv2.Spigot.enums;
public enum EcoEnum {
VAULT, MONEY,
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionItemEnum.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionItemEnum.java
similarity index 52%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionItemEnum.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionItemEnum.java
index 996cb45..1c23c18 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionItemEnum.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionItemEnum.java
@@ -1,5 +1,5 @@
-package de.jatitv.commandguiv2.Spigot.enums;
+package net.t2code.commandguiv2.Spigot.enums;
public enum FunctionItemEnum {
REMOVE, ADD
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionVoteEnum.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionVoteEnum.java
similarity index 52%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionVoteEnum.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionVoteEnum.java
index 41e6243..f546623 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/FunctionVoteEnum.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/FunctionVoteEnum.java
@@ -1,4 +1,4 @@
-package de.jatitv.commandguiv2.Spigot.enums;
+package net.t2code.commandguiv2.Spigot.enums;
public enum FunctionVoteEnum {
REMOVE, ADD
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/SoundEnum.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/SoundEnum.java
similarity index 72%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/SoundEnum.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/SoundEnum.java
index a6e9f08..5c92566 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/SoundEnum.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/SoundEnum.java
@@ -1,4 +1,4 @@
-package de.jatitv.commandguiv2.Spigot.enums;
+package net.t2code.commandguiv2.Spigot.enums;
public enum SoundEnum {
OpenInventory,
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/StorageEnum.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/StorageEnum.java
similarity index 56%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/StorageEnum.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/StorageEnum.java
index 3864e95..c28af21 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/enums/StorageEnum.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/enums/StorageEnum.java
@@ -1,4 +1,4 @@
-package de.jatitv.commandguiv2.Spigot.enums;
+package net.t2code.commandguiv2.Spigot.enums;
public enum StorageEnum {
MYSQL,
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GUIListener.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GUIListener.java
similarity index 70%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GUIListener.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GUIListener.java
index 7bffcbe..0c2e21c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GUIListener.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GUIListener.java
@@ -1,23 +1,23 @@
-package de.jatitv.commandguiv2.Spigot.gui;
+package net.t2code.commandguiv2.Spigot.gui;
-import de.jatitv.commandguiv2.Spigot.listener.ServerChange;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import de.jatitv.commandguiv2.Spigot.listener.Bungee_Sender_Reciver;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.system.Placeholder;
-import de.jatitv.commandguiv2.Spigot.sound.Sound;
-import de.jatitv.commandguiv2.Spigot.enums.SoundEnum;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.eco.Eco;
-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.commandguiv2.Spigot.listener.ServerChange;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.objects.functions.Function;
+import net.t2code.commandguiv2.Spigot.cmdManagement.Commands;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.listener.Bungee_Sender_Reciver;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.system.Placeholder;
+import net.t2code.commandguiv2.Spigot.sound.Sound;
+import net.t2code.commandguiv2.Spigot.enums.SoundEnum;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.eco.T2Ceco;
+import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.configuration.file.YamlConfiguration;
@@ -26,8 +26,8 @@ import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
import org.bukkit.event.inventory.ClickType;
import org.bukkit.event.inventory.InventoryClickEvent;
+import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.java.JavaPlugin;
import org.bukkit.scheduler.BukkitRunnable;
import java.io.File;
@@ -45,8 +45,8 @@ public class GUIListener implements Listener {
if (e.getInventory() == null) return;
if (e.getCurrentItem() == null) return;
for (Gui gui : Main.guiHashMap.values()) {
- if (player.getOpenInventory().getTitle().equals(Replace.replace(prefix, GUICode + gui.guiName))
- || (Main.PaPi && player.getOpenInventory().getTitle().equals(Replace.replace(prefix, player, GUICode + gui.guiName)))) {
+ if (player.getOpenInventory().getTitle().equals(T2Creplace.replace(prefix, GUICode + gui.guiName))
+ || (Main.PaPi && player.getOpenInventory().getTitle().equals(T2Creplace.replace(prefix, player, GUICode + gui.guiName)))) {
e.setCancelled(true);
for (Slot slot : gui.slots) {
execute(e, slot, player, gui);
@@ -62,16 +62,16 @@ public class GUIListener implements Listener {
if (slot.permission && !player.hasPermission(slot.permissionToUse)) {
if (function.noPermMessageEnable) {
if (function.customNoPermMessage == null || function.customNoPermMessage.equals("")) {
- send.player(player, SelectMessages.NoPermissionForItem.replace("[item]", Replace.replace(prefix, function.name))
+ T2Csend.player(player, SelectMessages.NoPermissionForItem.replace("[item]", T2Creplace.replace(prefix, function.name))
.replace("[perm]", slot.permissionToUse));
- } else send.player(player, function.customNoPermMessage.replace("[item]", Replace.replace(prefix, function.name))
+ } else T2Csend.player(player, function.customNoPermMessage.replace("[item]", T2Creplace.replace(prefix, function.name))
.replace("[perm]", slot.permissionToUse));
}
return;
}
- if (e.getCurrentItem().getType() == ItemVersion.getHead() || e.getCurrentItem().getType() == ItemVersion.getGreenWool().getType() ||
- e.getCurrentItem().getType() == ItemVersion.getRedWool().getType() ||
+ if (e.getCurrentItem().getType() == T2CitemVersion.getHead() || e.getCurrentItem().getType() == T2CitemVersion.getGreenWool().getType() ||
+ e.getCurrentItem().getType() == T2CitemVersion.getRedWool().getType() ||
e.getCurrentItem().getType() == Material.valueOf(function.item.toUpperCase().replace(".", "_"))) {
if (!slot.enable) return;
if (function.cost_Enable) {
@@ -120,8 +120,8 @@ public class GUIListener implements Listener {
Bungee_Sender_Reciver.sendToBungee(player, cmd.replace("[player]", player.getName()), slot.commandAsConsole);
}
} else {
- send.console(prefix + " §4To use bungee commands, enable the Bungee option in the config.");
- send.player(player, prefix + " §4To use bungee commands, enable the Bungee option in the config.");
+ T2Csend.console(prefix + " §4To use bungee commands, enable the Bungee option in the config.");
+ T2Csend.player(player, prefix + " §4To use bungee commands, enable the Bungee option in the config.");
}
} else {
for (String cmd : slot.command) {
@@ -149,12 +149,12 @@ public class GUIListener implements Listener {
for (String msg : slot.message) {
if (Main.PaPi) {
if (slot.cost_Enable) {
- send.player(player, Replace.replacePrice(prefix, player, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.getCurrency()));
- } else send.player(player, Replace.replace(prefix, player, Placeholder.replace(msg, player)));
+ T2Csend.player(player, T2Creplace.replacePrice(prefix, player, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.getCurrency()));
+ } else T2Csend.player(player, T2Creplace.replace(prefix, player, Placeholder.replace(msg, player)));
} else {
if (slot.cost_Enable) {
- send.player(player, Replace.replacePrice(prefix, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.getCurrency()));
- } else send.player(player, Replace.replace(prefix, Placeholder.replace(msg, player)));
+ T2Csend.player(player, T2Creplace.replacePrice(prefix, Placeholder.replace(msg, player), slot.price + " " + SelectConfig.getCurrency()));
+ } else T2Csend.player(player, T2Creplace.replace(prefix, Placeholder.replace(msg, player)));
}
}
}
@@ -166,7 +166,7 @@ public class GUIListener implements Listener {
player.closeInventory();
}
}.runTaskLater(plugin, 1L);
- send.player(player, SelectMessages.onServerChange.replace("[server]", slot.serverChangeServer));
+ T2Csend.player(player, SelectMessages.onServerChange.replace("[server]", slot.serverChangeServer));
new BukkitRunnable() {
@Override
public void run() {
@@ -197,7 +197,7 @@ public class GUIListener implements Listener {
yamlConfiguration.set(slot.configOptionPath.replace("/", "."), slot.configListValueLeft);
break;
default:
- send.player(player, "§cCheck the Option §6SetConfig/Option/Premat"); //todo
+ T2Csend.player(player, "§cCheck the Option §6SetConfig/Option/Premat"); //todo
break;
}
@@ -220,7 +220,7 @@ public class GUIListener implements Listener {
yamlConfiguration.set(slot.configOptionPath.replace("/", "."), slot.configListValueRight);
break;
default:
- send.player(player, "§cCheck the Option §6SetConfig/Option/Premat"); //todo
+ T2Csend.player(player, "§cCheck the Option §6SetConfig/Option/Premat"); //todo
break;
}
@@ -281,13 +281,13 @@ public class GUIListener implements Listener {
player.closeInventory();
switch (function.functionVotePointsMode) {
case ADD:
- Eco.votePointsAdd(prefix, player, function.functionVotePointsAmount);
- send.player(player, SelectMessages.functionVoteAdd.replace("[amount]", function.functionVotePointsAmount.toString()));
+ T2Ceco.votePointsAdd(prefix, player, function.functionVotePointsAmount);
+ T2Csend.player(player, SelectMessages.functionVoteAdd.replace("[amount]", function.functionVotePointsAmount.toString()));
break;
case REMOVE:
- if (Eco.votePointsRemove(prefix, player, function.functionVotePointsAmount)) {
- send.player(player, SelectMessages.functionVoteRemove.replace("[amount]", function.functionVotePointsAmount.toString()));
- } else send.player(player, SelectMessages.functionVoteRemoveError.replace("[amount]", function.functionVotePointsAmount.toString()));
+ if (T2Ceco.votePointsRemove(prefix, player, function.functionVotePointsAmount)) {
+ T2Csend.player(player, SelectMessages.functionVoteRemove.replace("[amount]", function.functionVotePointsAmount.toString()));
+ } else T2Csend.player(player, SelectMessages.functionVoteRemoveError.replace("[amount]", function.functionVotePointsAmount.toString()));
break;
}
}
@@ -297,14 +297,14 @@ public class GUIListener implements Listener {
player.closeInventory();
switch (function.functionItemMode) {
case ADD:
- Eco.itemAdd(player, item[0], Integer.parseInt(item[1]));
- send.player(player, SelectMessages.functionItemAdd.replace("[amount]", item[1]).replace("[item]", item[0]));
+ T2Ceco.itemAdd(player, new ItemStack(Material.valueOf(item[0])), Integer.parseInt(item[1]));
+ T2Csend.player(player, SelectMessages.functionItemAdd.replace("[amount]", item[1]).replace("[item]", item[0]));
break;
case REMOVE:
- if (Eco.itemRemove(player, item[0], Integer.parseInt(item[1]))) {
- send.player(player, SelectMessages.functionItemRemove.replace("[amount]", item[1]).replace("[item]", item[0]));
+ if (T2Ceco.itemRemove(player, item[0], Integer.parseInt(item[1]))) {
+ T2Csend.player(player, SelectMessages.functionItemRemove.replace("[amount]", item[1]).replace("[item]", item[0]));
- } else send.player(player, SelectMessages.functionItemRemoveError.replace("[amount]", item[1]));
+ } else T2Csend.player(player, SelectMessages.functionItemRemoveError.replace("[amount]", item[1]));
break;
}
}
@@ -313,50 +313,50 @@ public class GUIListener implements Listener {
switch (function.ecoModule) {
case ITEM:
String[] item = function.ecoItem.split(";");
- if (!Eco.itemRemove(player, item[0], Integer.parseInt(item[1]))) {
+ if (!T2Ceco.itemRemove(player, item[0], Integer.parseInt(item[1]))) {
new BukkitRunnable() {
@Override
public void run() {
player.closeInventory();
}
}.runTaskLater(plugin, 1L);
- send.player(player, SelectMessages.noMoneyItem.replace("[item]", item[0]).replace("[amount]", item[1]));
+ T2Csend.player(player, SelectMessages.noMoneyItem.replace("[item]", item[0]).replace("[amount]", item[1]));
Sound.play(player, SoundEnum.NoMoney);
} else {
- send.player(player, SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, function.name))
+ T2Csend.player(player, SelectMessages.Buy_msg.replace("[itemname]", T2Creplace.replace(prefix, function.name))
.replace("[price]", item[1] + " " + item[0]));
execute(function, slot, player, e, gui);
}
break;
case VOTEPOINTS:
- if (!Eco.votePointsRemove(prefix, player, function.votePoints)) {
+ if (!T2Ceco.votePointsRemove(prefix, player, function.votePoints)) {
new BukkitRunnable() {
@Override
public void run() {
player.closeInventory();
}
}.runTaskLater(plugin, 1L);
- send.player(player, SelectMessages.noMoneyVote.replace("[amount]", function.votePoints.toString()));
+ T2Csend.player(player, SelectMessages.noMoneyVote.replace("[amount]", function.votePoints.toString()));
Sound.play(player, SoundEnum.NoMoney);
} else {
- send.player(player, SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, function.name))
+ T2Csend.player(player, SelectMessages.Buy_msg.replace("[itemname]", T2Creplace.replace(prefix, function.name))
.replace("[price]", function.votePoints + " VotePoints"));
execute(function, slot, player, e, gui);
}
break;
case VAULT:
case MONEY:
- if (!Eco.moneyRemove(prefix, player, function.price)) {
+ if (!T2Ceco.moneyRemove(prefix, player, function.price)) {
new BukkitRunnable() {
@Override
public void run() {
player.closeInventory();
}
}.runTaskLater(plugin, 1L);
- send.player(player, Replace.replacePrice(prefix, SelectMessages.noMoney, String.valueOf(function.price)));
+ T2Csend.player(player, T2Creplace.replacePrice(prefix, SelectMessages.noMoney, String.valueOf(function.price)));
Sound.play(player, SoundEnum.NoMoney);
} else {
- send.player(player, SelectMessages.Buy_msg.replace("[itemname]", Replace.replace(prefix, function.name))
+ T2Csend.player(player, SelectMessages.Buy_msg.replace("[itemname]", T2Creplace.replace(prefix, function.name))
.replace("[price]", function.price + " " + SelectConfig.getCurrency()));
execute(function, slot, player, e, gui);
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GuiBuilder.java
similarity index 75%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GuiBuilder.java
index a4c67ef..d42df99 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/GuiBuilder.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/GuiBuilder.java
@@ -1,17 +1,17 @@
-package de.jatitv.commandguiv2.Spigot.gui;
+package net.t2code.commandguiv2.Spigot.gui;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import de.jatitv.commandguiv2.Spigot.system.Placeholder;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.items.ItemVersion;
-import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
-import net.t2code.lib.Spigot.Lib.replace.Replace;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.objects.functions.Function;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.system.Placeholder;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.Inventory;
@@ -66,21 +66,21 @@ public class GuiBuilder {
private static void setDisplayNameAndLore(ItemMeta itemMeta, Player player, Slot slot) {
Function function = Main.functionHashMap.get(slot.function);
if (Main.PaPi) {
- itemMeta.setDisplayName(Replace.replace(prefix, player, Placeholder.replace(function.name, player)));
+ itemMeta.setDisplayName(T2Creplace.replace(prefix, player, Placeholder.replace(function.name, player)));
if (slot.permission && !player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
- itemMeta.setLore(Replace.replacePrice(prefix, player, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
- } else itemMeta.setLore(Replace.replacePrice(prefix, player, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
+ itemMeta.setLore(T2Creplace.replacePrice(prefix, player, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
+ } else itemMeta.setLore(T2Creplace.replacePrice(prefix, player, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
} else {
- itemMeta.setDisplayName(Replace.replace(prefix, Placeholder.replace(function.name, player)));
+ itemMeta.setDisplayName(T2Creplace.replace(prefix, Placeholder.replace(function.name, player)));
if (slot.permission && !player.hasPermission(slot.permissionToUse) && function.noPermLoreEnable) {
- itemMeta.setLore(Replace.replacePrice(prefix, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
- } else itemMeta.setLore(Replace.replacePrice(prefix, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
+ itemMeta.setLore(T2Creplace.replacePrice(prefix, Placeholder.replace(function.noPermLore, player), function.price + " " + SelectConfig.getCurrency()));
+ } else itemMeta.setLore(T2Creplace.replacePrice(prefix, Placeholder.replace(function.lore, player), function.price + " " + SelectConfig.getCurrency()));
}
}
protected static void base64(String base64Value, Slot slot, Player player, Inventory inventory) {
Function function = Main.functionHashMap.get(slot.function);
- ItemStack item = ItemVersion.getHeadIS();
+ ItemStack item = T2CitemVersion.getHeadIS();
SkullMeta itemMeta = (SkullMeta) item.getItemMeta();
setBase64(itemMeta, base64Value);
setDisplayNameAndLore(itemMeta, player, slot);
@@ -113,7 +113,7 @@ public class GuiBuilder {
protected static void playerHead(Slot slot, Player player, Inventory inventory, String skullName) {
Function function = Main.functionHashMap.get(slot.function);
- ItemStack item = ItemVersion.getHeadIS();
+ ItemStack item = T2CitemVersion.getHeadIS();
SkullMeta itemMeta = (SkullMeta) item.getItemMeta();
setDisplayNameAndLore(itemMeta, player, slot);
itemMeta.setOwner(skullName);
@@ -128,7 +128,7 @@ public class GuiBuilder {
public static void fillItem(Inventory inventory, Gui gui) {
ItemStack glass;
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
glass = new ItemStack(Material.valueOf("STAINED_GLASS_PANE"), 1, Short.parseShort(gui.guiFillItemItem));
} else glass = new ItemStack(Material.valueOf(gui.guiFillItemItem.toUpperCase().replace(".", "_")));
ItemMeta itemMetaglass = glass.getItemMeta();
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/OpenGUI.java
similarity index 77%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/OpenGUI.java
index ccb2962..6d43b22 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/gui/OpenGUI.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/gui/OpenGUI.java
@@ -1,21 +1,21 @@
-package de.jatitv.commandguiv2.Spigot.gui;
+package net.t2code.commandguiv2.Spigot.gui;
-import de.jatitv.commandguiv2.Spigot.system.Permissions;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import de.jatitv.commandguiv2.Spigot.sound.Sound;
-import de.jatitv.commandguiv2.Spigot.enums.SoundEnum;
-import de.jatitv.commandguiv2.Util;
+import net.t2code.commandguiv2.Spigot.system.Permissions;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.functions.Function;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.sound.Sound;
+import net.t2code.commandguiv2.Spigot.enums.SoundEnum;
+import net.t2code.commandguiv2.Util;
import io.github.solyze.plugmangui.inventories.PluginListGUI;
-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.luckyBox.api.LuckyBoxAPI;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -47,7 +47,7 @@ public class OpenGUI {
player.openInventory((new PluginListGUI(54, 1)).getInventory());
} else {
if (player.hasPermission(Permissions.admin)) {
- send.player(player, prefix + " §4PlugManGUI could not be found! §9Please download it here: " +
+ T2Csend.player(player, prefix + " §4PlugManGUI could not be found! §9Please download it here: " +
"§6https://spigotmc.org/resources/plugmangui.87599/");
}
}
@@ -57,21 +57,21 @@ public class OpenGUI {
LuckyBoxAPI.openShop(player);
} else {
if (player.hasPermission(Permissions.admin)) {
- send.player(player, prefix + " §4T2C-LuckyBox could not be found! §9Please download it here: " +
+ T2Csend.player(player, prefix + " §4T2C-LuckyBox could not be found! §9Please download it here: " +
"§6https://www.spigotmc.org/resources/luckybox.98154/");
}
}
return;
}
- if (MCVersion.minecraft1_13) {
+ if (T2CmcVersion.isMc1_13()) {
GUIListener.GUICode = "";
} else GUIListener.GUICode = "§6§8§9§r";
if (gui.guiEnable || player.hasPermission(Permissions.updatemsg)) {
Inventory inventory;
if (Main.PaPi) {
- inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (Replace.replace(prefix, player, GUIListener.GUICode + gui.guiName)));
- } else inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (Replace.replace(prefix, GUIListener.GUICode + gui.guiName)));
+ inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (T2Creplace.replace(prefix, player, GUIListener.GUICode + gui.guiName)));
+ } else inventory = Bukkit.createInventory((InventoryHolder) null, 9 * gui.guiLines, (T2Creplace.replace(prefix, GUIListener.GUICode + gui.guiName)));
if (gui.guiFillItemEnable) {
GuiBuilder.fillItem(inventory, gui);
@@ -80,7 +80,7 @@ public class OpenGUI {
try {
Function function = Main.functionHashMap.get(slot.function);
if (function == null) {
- send.error(Main.getPlugin(), "The Function " + slot.function + " in the GUI " + gui.key + " does not exist!");
+ T2Csend.error(Main.getPlugin(), "The Function " + slot.function + " in the GUI " + gui.key + " does not exist!");
continue;
}
if (slot.permission && !player.hasPermission(slot.permissionToSee)) continue;
@@ -131,8 +131,8 @@ public class OpenGUI {
Sound.play(player, SoundEnum.OpenInventory);
}
player.openInventory(inventory);
- send.debug(plugin, "§6" + player.getName() + " §5Open §6" + Replace.replace(prefix, gui.guiName) + " §5" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
- } else send.player(player, SelectMessages.GUIIsDisabled.replace("[gui]", Replace.replace(prefix, gui.guiName)));
+ T2Csend.debug(plugin, "§6" + player.getName() + " §5Open §6" + T2Creplace.replace(prefix, gui.guiName) + " §5" + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms");
+ } else T2Csend.player(player, SelectMessages.GUIIsDisabled.replace("[gui]", T2Creplace.replace(prefix, gui.guiName)));
}
private static void toggleOn(Function function, Slot slot, Player player, Inventory inventory) {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java
similarity index 73%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java
index ab3517a..40862b8 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/Bungee_Sender_Reciver.java
@@ -1,7 +1,7 @@
-package de.jatitv.commandguiv2.Spigot.listener;
+package net.t2code.commandguiv2.Spigot.listener;
-import de.jatitv.commandguiv2.Spigot.Main;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
@@ -16,12 +16,12 @@ public class Bungee_Sender_Reciver implements PluginMessageListener {
DataOutputStream output = new DataOutputStream(stream);
try {
if (console) {
- output.writeUTF("cgui-Console");
+ output.writeUTF("T2Code-Console");
} else {
if (sender instanceof Player) {
output.writeUTF(sender.getName());
} else {
- output.writeUTF("cgui-Console");
+ output.writeUTF("T2Code-Console");
}
}
output.writeUTF(information);
@@ -30,10 +30,10 @@ public class Bungee_Sender_Reciver implements PluginMessageListener {
}
if (sender instanceof Player) {
Player player = (Player) sender;
- player.sendPluginMessage(Main.getPlugin(), "cgui:bungee", stream.toByteArray());
+ player.sendPluginMessage(Main.getPlugin(), "t2c:bcmd", stream.toByteArray());
}else {
for(Player player : Bukkit.getOnlinePlayers()){
- player.sendPluginMessage(Main.getPlugin(), "cgui:bungee", stream.toByteArray());
+ player.sendPluginMessage(Main.getPlugin(), "t2c:bcmd", stream.toByteArray());
return;
}
}
@@ -42,12 +42,12 @@ public class Bungee_Sender_Reciver implements PluginMessageListener {
@Override
public void onPluginMessageReceived(String channel, Player player, byte[] message) {
DataInputStream stream = new DataInputStream(new ByteArrayInputStream(message));
- send.debug(Main.getPlugin(),"stream: "+stream.toString());
+ T2Csend.debug(Main.getPlugin(),"stream: "+stream.toString());
try {
String subChannel = stream.readUTF();
String input = stream.readUTF();
- send.debug(Main.getPlugin(),"subChannel: " +subChannel);
- send.debug(Main.getPlugin(),"input: " +input);
+ T2Csend.debug(Main.getPlugin(),"subChannel: " +subChannel);
+ T2Csend.debug(Main.getPlugin(),"input: " +input);
switch (subChannel) {
case "join":
Main.bungeejoinplayers.add(input);
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/PluginEvent.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/PluginEvent.java
similarity index 50%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/PluginEvent.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/PluginEvent.java
index 174b4f3..3fd841a 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/PluginEvent.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/PluginEvent.java
@@ -1,11 +1,12 @@
// This claas was created by JaTiTV
-package de.jatitv.commandguiv2.Spigot.listener;
+package net.t2code.commandguiv2.Spigot.listener;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.database.SelectDatabase;
+import net.t2code.commandguiv2.Spigot.system.Permissions;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.Listener;
@@ -18,6 +19,6 @@ public class PluginEvent implements Listener {
public void onJoinEvent(PlayerLoginEvent event) {
Player player = event.getPlayer();
SelectDatabase.nameCheck(player);
- UpdateAPI.join(Main.getPlugin(),prefix, "commandgui.updatemsg", event.getPlayer(), Util.getSpigot(), Util.getDiscord());
+ T2CupdateAPI.join(Main.getPlugin(),prefix, Permissions.updatemsg, event.getPlayer(), Util.getSpigotID(), Util.getDiscord());
}
}
\ No newline at end of file
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/ServerChange.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/ServerChange.java
similarity index 86%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/ServerChange.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/ServerChange.java
index bcac3a0..b855cc3 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/listener/ServerChange.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/listener/ServerChange.java
@@ -1,6 +1,6 @@
-package de.jatitv.commandguiv2.Spigot.listener;
+package net.t2code.commandguiv2.Spigot.listener;
-import de.jatitv.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.Main;
import org.bukkit.entity.Player;
import java.io.ByteArrayOutputStream;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/Obj_Select.java
similarity index 90%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/Obj_Select.java
index ccf166c..848ddc6 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/Obj_Select.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/Obj_Select.java
@@ -1,16 +1,16 @@
-package de.jatitv.commandguiv2.Spigot.objects;
+package net.t2code.commandguiv2.Spigot.objects;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUI;
-import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
-import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import de.jatitv.commandguiv2.Spigot.enums.EcoEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionItemEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionVoteEnum;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUI;
+import net.t2code.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
+import net.t2code.commandguiv2.Spigot.objects.functions.Function;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.enums.EcoEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionItemEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionVoteEnum;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.configuration.file.YamlConfiguration;
import java.io.File;
@@ -51,7 +51,7 @@ public class Obj_Select {
String guiName = yamlConfiguration_gui.getString("GUI.Name");
Boolean guiFillItemEnable = yamlConfiguration_gui.getBoolean("GUI.FillItem.Enable");
String guiFillItemItem;
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
guiFillItemItem = yamlConfiguration_gui.getString("GUI.FillItem.GlassPaneColor");
} else guiFillItemItem = yamlConfiguration_gui.getString("GUI.FillItem.Item");
@@ -65,7 +65,7 @@ public class Obj_Select {
String function = yamlConfiguration_gui.getString("Slots." + slotKey + ".Function");
Function functionCheck = Main.functionHashMap.get(function);
if (functionCheck == null) {
- send.error(Main.getPlugin(), "The Function " + function + " in the GUI " + key + " does not exist!");
+ T2Csend.error(Main.getPlugin(), "The Function " + function + " in the GUI " + key + " does not exist!");
}
Boolean permRequired = yamlConfiguration_gui.getBoolean("Slots." + slotKey + ".Permission.Required");
String permSee = yamlConfiguration_gui.getString("Slots." + slotKey + ".Permission.See");
@@ -133,7 +133,7 @@ public class Obj_Select {
try {
ecoModule = EcoEnum.valueOf(yamlConfiguration.getString("Slots.Function.Cost.EcoModule").toUpperCase());
} catch (Exception ex) {
- send.error(Main.getPlugin(), "The EcoModule " + yamlConfiguration.getString("Slots.Function.Cost.EcoModule").toUpperCase() + " in the function file "
+ T2Csend.error(Main.getPlugin(), "The EcoModule " + yamlConfiguration.getString("Slots.Function.Cost.EcoModule").toUpperCase() + " in the function file "
+ config.getName() + " does not exist. Please use one of the supported modules. (VAULT, ITEM, VOTEPOINTS)");
}
} else ecoModule = EcoEnum.VAULT;
@@ -182,7 +182,7 @@ public class Obj_Select {
try {
functionVotePointsMode = FunctionVoteEnum.valueOf(yamlConfiguration.getString("Slots.Function.FunctionVotePoints.Mode").toUpperCase());
} catch (Exception ex) {
- send.error(Main.getPlugin(), "The VotePoints Mode " + yamlConfiguration.getString("Slots.Function.FunctionVotePoints.Mode").toUpperCase() + " in the function file "
+ T2Csend.error(Main.getPlugin(), "The VotePoints Mode " + yamlConfiguration.getString("Slots.Function.FunctionVotePoints.Mode").toUpperCase() + " in the function file "
+ config.getName() + " does not exist. Please use one of the supported modules. (ADD, REMOVE)");
}
}
@@ -194,7 +194,7 @@ public class Obj_Select {
try {
functionItemMode = FunctionItemEnum.valueOf(yamlConfiguration.getString("Slots.Function.FunctionItem.Mode").toUpperCase());
} catch (Exception ex) {
- send.error(Main.getPlugin(), "The Item Mode " + yamlConfiguration.getString("Slots.Function.FunctionItem.Mode").toUpperCase() + " in the function file "
+ T2Csend.error(Main.getPlugin(), "The Item Mode " + yamlConfiguration.getString("Slots.Function.FunctionItem.Mode").toUpperCase() + " in the function file "
+ config.getName() + " does not exist. Please use one of the supported modules. (ADD, REMOVE)");
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/functions/Function.java
similarity index 97%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/functions/Function.java
index a55d738..7cc2d6d 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/functions/Function.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/functions/Function.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.objects.functions;
+package net.t2code.commandguiv2.Spigot.objects.functions;
-import de.jatitv.commandguiv2.Spigot.enums.EcoEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionItemEnum;
-import de.jatitv.commandguiv2.Spigot.enums.FunctionVoteEnum;
+import net.t2code.commandguiv2.Spigot.enums.EcoEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionItemEnum;
+import net.t2code.commandguiv2.Spigot.enums.FunctionVoteEnum;
import java.util.List;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/guis/Gui.java
similarity index 89%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/guis/Gui.java
index a3ddaaa..a2bc02c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/guis/Gui.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/guis/Gui.java
@@ -1,6 +1,6 @@
-package de.jatitv.commandguiv2.Spigot.objects.guis;
+package net.t2code.commandguiv2.Spigot.objects.guis;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
import java.util.ArrayList;
@@ -11,7 +11,6 @@ public class Gui {
public Boolean guiFillItemEnable;
public String guiFillItemItem;
-
public String key;
public Boolean commandAliasEnable;
public Boolean commandPermissionEnable;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/slots/Slot.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/slots/Slot.java
similarity index 92%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/slots/Slot.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/slots/Slot.java
index 6c4173c..b6811db 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/objects/slots/Slot.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/objects/slots/Slot.java
@@ -1,4 +1,4 @@
-package de.jatitv.commandguiv2.Spigot.objects.slots;
+package net.t2code.commandguiv2.Spigot.objects.slots;
public class Slot {
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/sound/Sound.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/sound/Sound.java
similarity index 79%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/sound/Sound.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/sound/Sound.java
index 995d11f..33fac01 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/sound/Sound.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/sound/Sound.java
@@ -1,14 +1,13 @@
-package de.jatitv.commandguiv2.Spigot.sound;
+package net.t2code.commandguiv2.Spigot.sound;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.objects.functions.Function;
-import de.jatitv.commandguiv2.Spigot.objects.guis.Gui;
-import de.jatitv.commandguiv2.Spigot.objects.slots.Slot;
-import de.jatitv.commandguiv2.Spigot.enums.SoundEnum;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.replace.Replace;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.objects.functions.Function;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.commandguiv2.Spigot.enums.SoundEnum;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.entity.Player;
public class Sound {
@@ -37,7 +36,7 @@ public class Sound {
try {
player.playSound(player.getLocation(), org.bukkit.Sound.valueOf(function.customSound_Sound.toUpperCase().replace(".", "_")), 3, 1);
} catch (Exception e1) {
- send.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", prefix)
+ T2Csend.console("§4\n§4\n§4\n" + SelectMessages.SoundNotFound.replace("[prefix]", prefix)
.replace("[sound]", "§6GUI: §e" + gui.key + " §6Function: §e" + function.key + "§r §6Slot: §e" + (slot.slot + 1) + " §6CustomSound: §9" + function.customSound_Sound));
player.playSound(player.getLocation(), SelectConfig.getSound_Click(), 3, 1);
}
diff --git a/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Debug.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Debug.java
new file mode 100644
index 0000000..49092ca
--- /dev/null
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Debug.java
@@ -0,0 +1,51 @@
+package net.t2code.commandguiv2.Spigot.system;
+
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import org.bukkit.Bukkit;
+import org.bukkit.plugin.Plugin;
+
+import java.io.File;
+import java.util.Arrays;
+
+public class Debug {
+
+ private static final Plugin plugin = Main.getPlugin();
+
+ public static void debugmsg() {
+ T2Csend.debug(plugin, "§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ T2Csend.debug(plugin, "§3Bukkit Version: §e" + Bukkit.getBukkitVersion());
+ T2Csend.debug(plugin, "§3NMS Version: §e" + Bukkit.getServer().getClass().getPackage().getName().replace("org.bukkit.craftbukkit.", ""));
+ T2Csend.debug(plugin, "§3Version: §e" + Bukkit.getVersion());
+ T2Csend.debug(plugin, "§3Java: §e" + System.getProperty("java.version"));
+ T2Csend.debug(plugin, "§3Worlds: §e" + String.valueOf(Bukkit.getServer().getWorlds()));
+ T2Csend.debug(plugin, String.valueOf(Arrays.asList(Main.getPlugin().getServer().getPluginManager().getPlugins())));
+ T2Csend.debug(plugin, "§5----------------------------------");
+ if (new File(Main.getPath(), "config.yml").exists()) {
+ File f = new File(String.valueOf(Main.getPath()));
+ File f2 = new File(String.valueOf(Main.getPath() + "/GUIs/"));
+ File f3 = new File(String.valueOf(Main.getPath() + "/languages/"));
+ File[] fileArray = f.listFiles();
+ File[] fileArray2 = f2.listFiles();
+ File[] fileArray3 = f3.listFiles();
+ if (fileArray != null) {
+ for (File config : fileArray) {
+ T2Csend.debug(plugin, String.valueOf(config).replace("plugins/CommandGUI/", ""));
+ }
+ }
+ if (fileArray2 != null) {
+ for (File config2 : fileArray2) {
+ T2Csend.debug(plugin, String.valueOf(config2).replace("plugins/CommandGUI/", ""));
+ }
+ } else T2Csend.debug(plugin, "No GUI files available");
+
+ if (fileArray3 != null) {
+ for (File config3 : fileArray3) {
+ T2Csend.debug(plugin, String.valueOf(config3).replace("plugins/CommandGUI/", ""));
+ }
+ } else T2Csend.debug(plugin, "No language files available");
+
+ }
+ T2Csend.debug(plugin, "§5!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!");
+ }
+}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Load.java
similarity index 61%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Load.java
index 9a50d23..081d1b7 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Load.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Load.java
@@ -1,32 +1,33 @@
-package de.jatitv.commandguiv2.Spigot.system;
+package net.t2code.commandguiv2.Spigot.system;
-import de.jatitv.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
-import de.jatitv.commandguiv2.Spigot.gui.GUIListener;
-import de.jatitv.commandguiv2.Spigot.listener.Bungee_Sender_Reciver;
-import de.jatitv.commandguiv2.Spigot.useItem.EventsFrom110;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUI;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUIItem;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.CmdExecuter_Help;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.register.AliasRegister;
-import de.jatitv.commandguiv2.Spigot.config.functions.CreateFunctions;
-import de.jatitv.commandguiv2.Spigot.config.gui.CreateGUI;
-import de.jatitv.commandguiv2.Spigot.config.languages.LanguagesCreate;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.database.MySQL;
-import de.jatitv.commandguiv2.Spigot.listener.PluginEvent;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.objects.Obj_Select;
-import de.jatitv.commandguiv2.Spigot.config.config.ConfigCreate;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.database.SQLITE;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.Spigot.enums.StorageEnum;
-import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
-import net.t2code.lib.Spigot.Lib.messages.send;
-import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
-import net.t2code.lib.Spigot.Lib.plugins.PluginCheck;
-import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
+import net.t2code.commandguiv2.Spigot.config.configConverter.ConfigConverterUnderV5;
+import net.t2code.commandguiv2.Spigot.gui.GUIListener;
+import net.t2code.commandguiv2.Spigot.listener.Bungee_Sender_Reciver;
+import net.t2code.commandguiv2.Spigot.useItem.EventsFrom110;
+import net.t2code.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUI;
+import net.t2code.commandguiv2.Spigot.cmdManagement.CmdExecuter_GUIItem;
+import net.t2code.commandguiv2.Spigot.cmdManagement.CmdExecuter_Help;
+import net.t2code.commandguiv2.Spigot.cmdManagement.register.AliasRegister;
+import net.t2code.commandguiv2.Spigot.config.functions.CreateFunctions;
+import net.t2code.commandguiv2.Spigot.config.gui.CreateGUI;
+import net.t2code.commandguiv2.Spigot.config.languages.LanguagesCreate;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.database.MySQL;
+import net.t2code.commandguiv2.Spigot.listener.PluginEvent;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.Obj_Select;
+import net.t2code.commandguiv2.Spigot.config.config.ConfigCreate;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.database.SQLITE;
+import net.t2code.commandguiv2.Spigot.database.SelectDatabase;
+import net.t2code.commandguiv2.Spigot.enums.StorageEnum;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
+import net.t2code.t2codelib.SPIGOT.api.plugins.T2CpluginCheck;
+import net.t2code.t2codelib.SPIGOT.api.update.T2CupdateAPI;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
@@ -39,14 +40,14 @@ public class Load {
public static void onLoad(String prefix, List autor, String version, String spigot, int spigotID, String discord, int bstatsID) {
- Long long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord);
+ long long_ = T2Ctemplate.onLoadHeader(prefix, autor, version, spigot, discord);
try {
Debug.debugmsg();
} catch (Exception e) {
e.printStackTrace();
}
- send.console(prefix + " §8-------------------------------");
+ T2Csend.console(prefix + " §8-------------------------------");
try {
ConfigConverterUnderV5.renameMainFolder();
} catch (Exception e) {
@@ -96,17 +97,17 @@ public class Load {
SelectConfig.setConfigVersion();
if (SelectConfig.getBungee()) {
- if (!Bukkit.getMessenger().isOutgoingChannelRegistered(plugin, "cgui:bungee")) {
- send.debug(plugin, "registerOutgoingPluginChannel §ecgui:bungee");
- Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "cgui:bungee");
+ if (!Bukkit.getMessenger().isOutgoingChannelRegistered(plugin, "t2c:bcmd")) {
+ T2Csend.debug(plugin, "registerOutgoingPluginChannel §et2c:bcmd");
+ Bukkit.getMessenger().registerOutgoingPluginChannel(plugin, "t2c:bcmd");
}
- if (!Bukkit.getMessenger().isIncomingChannelRegistered(plugin, "cgui:onlinepl")) {
- send.debug(plugin, "registerIncomingPluginChannel §ecgui:onlinepl");
- Bukkit.getMessenger().registerIncomingPluginChannel(plugin, "cgui:onlinepl", new Bungee_Sender_Reciver());
+ if (!Bukkit.getMessenger().isIncomingChannelRegistered(plugin, "t2c:cguiopl")) {
+ T2Csend.debug(plugin, "registerIncomingPluginChannel §et2c:cguiopl");
+ Bukkit.getMessenger().registerIncomingPluginChannel(plugin, "t2c:cguiopl", new Bungee_Sender_Reciver());
}
}
- if (PluginCheck.papi()) {
+ if (T2CpluginCheck.papi()) {
new Papi().register();
}
@@ -132,19 +133,19 @@ public class Load {
e.printStackTrace();
}
try {
- CmdExecuter_GUI.arg1.put(SelectConfig.getAdminSubCommand(), Permissions.admin+";"+Permissions.giveItemOther+";"+Permissions.info);
+ CmdExecuter_GUI.arg1.put(SelectConfig.getAdminSubCommand(), Permissions.admin + ";" + Permissions.giveItemOther + ";" + Permissions.info);
} catch (Exception e) {
e.printStackTrace();
}
- send.console(prefix + " §8-------------------------------");
+ T2Csend.console(prefix + " §8-------------------------------");
loadStorage(prefix);
- send.console(prefix + " §8-------------------------------");
+ T2Csend.console(prefix + " §8-------------------------------");
if (Main.PaPi) {
- send.console(prefix + " §2PlaceholderAPI successfully connected!");
+ T2Csend.console(prefix + " §2PlaceholderAPI successfully connected!");
} else {
- send.console(prefix + " §4PlaceholderAPI could not be connected / found!");
+ T2Csend.console(prefix + " §4PlaceholderAPI could not be connected / found!");
}
try {
@@ -155,12 +156,12 @@ public class Load {
if (SelectConfig.getHelpAlias()) {
Main.getPlugin().getCommand("commandguihelp").setExecutor(new CmdExecuter_Help());
- send.debug(plugin, "CommandRegister: commandguihelp");
+ T2Csend.debug(plugin, "CommandRegister: commandguihelp");
}
Main.getPlugin().getCommand("commandgui").setExecutor(new CmdExecuter_GUI());
- send.debug(plugin, "CommandRegister: commandgui");
+ T2Csend.debug(plugin, "CommandRegister: commandgui");
Main.getPlugin().getCommand("commandgui-item").setExecutor(new CmdExecuter_GUIItem());
- send.debug(plugin, "CommandRegister: commandgui-item");
+ T2Csend.debug(plugin, "CommandRegister: commandgui-item");
try {
AliasRegister.onRegister();
@@ -173,28 +174,29 @@ public class Load {
Bukkit.getServer().getPluginManager().registerEvents(new Events(), Main.getPlugin());
- if (!MCVersion.minecraft1_8 && !MCVersion.minecraft1_9) {
+ if (!T2CmcVersion.isMc1_8() && !T2CmcVersion.isMc1_9()) {
Bukkit.getServer().getPluginManager().registerEvents(new EventsFrom110(), plugin);
}
- UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord);
+ T2CupdateAPI.onUpdateCheck(plugin, prefix, Util.getGit(),spigotID,discord
+ ,SelectConfig.getUpdateCheckOnJoin(),SelectConfig.getUpdateCheckSeePreReleaseUpdates(),SelectConfig.getUpdateCheckTimeInterval());
Metrics.Bstats();
Main.addonLoad();
- T2CodeTemplate.onLoadFooter(prefix, long_);
+ T2Ctemplate.onLoadFooter(prefix, long_);
}
private static void loadStorage(String prefix) {
try {
SelectDatabase.setStorage(StorageEnum.valueOf(SelectConfig.getStorage()));
} catch (Exception ignored) {
- send.error(Main.getPlugin(), "The storage medium " + SelectConfig.getStorage() + " is not supported!");
- send.error(Main.getPlugin(), "Storage medium " + StorageEnum.SQLITE + " is used.");
+ T2Csend.error(plugin, "The storage medium " + SelectConfig.getStorage() + " is not supported!");
+ T2Csend.error(plugin, "Storage medium " + StorageEnum.SQLITE + " is used.");
SelectDatabase.setStorage(StorageEnum.SQLITE);
}
switch (SelectDatabase.getStorage()) {
case MYSQL:
- send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
+ T2Csend.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
MySQL.main();
try {
MySQL.query("CREATE TABLE IF NOT EXISTS `gui-item` (" +
@@ -217,11 +219,11 @@ public class Load {
}
break;
case YML:
- send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
+ T2Csend.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
break;
default:
case SQLITE:
- send.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
+ T2Csend.console(prefix + " §2Storage medium §6" + SelectDatabase.getStorage() + " §2is used.");
try {
SQLITE.main();
SQLITE.query("CREATE TABLE IF NOT EXISTS `gui-item` (" +
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Metrics.java
similarity index 99%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Metrics.java
index e6b5fa6..bc8f9e0 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Metrics.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Metrics.java
@@ -1,11 +1,11 @@
// This claas was created by JaTiTV
-package de.jatitv.commandguiv2.Spigot.system;
+package net.t2code.commandguiv2.Spigot.system;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.Util;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.database.SelectDatabase;
+import net.t2code.commandguiv2.Util;
import org.bukkit.Bukkit;
import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Papi.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Papi.java
similarity index 91%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Papi.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Papi.java
index 12a8939..e17bbd5 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Papi.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Papi.java
@@ -1,8 +1,8 @@
// This claas was created by JaTiTV
-package de.jatitv.commandguiv2.Spigot.system;
+package net.t2code.commandguiv2.Spigot.system;
-import de.jatitv.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.Main;
import me.clip.placeholderapi.expansion.PlaceholderExpansion;
import org.bukkit.entity.Player;
diff --git a/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Permissions.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Permissions.java
new file mode 100644
index 0000000..5f33d53
--- /dev/null
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Permissions.java
@@ -0,0 +1,80 @@
+package net.t2code.commandguiv2.Spigot.system;
+
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.objects.guis.Gui;
+import net.t2code.commandguiv2.Spigot.objects.slots.Slot;
+import net.t2code.t2codelib.SPIGOT.api.register.T2Cregister;
+import org.bukkit.permissions.PermissionDefault;
+import org.bukkit.plugin.Plugin;
+
+public class Permissions {
+ private static final Plugin plugin = Main.getPlugin();
+
+ public static final String key = "commandgui.";
+ public static final String command = key + "command";
+ public static final String info = key + "command.info";
+ public static final String bypass = key + "bypass";
+ public static final String useitemToggle = key + "useitem.toggle";
+ public static final String useitem = key + "useitem";
+ public static final String getGuiItemAtLogin = key + "get.guiitem.at.login";
+ public static final String giveItemOther = key + "giveitem.other";
+ public static final String updatemsg = key + "updatemsg";
+
+ public static final String player = key + "player";
+ public static final String admin = key + "admin";
+
+ public static final PermissionDefault op = PermissionDefault.OP;
+ public static final PermissionDefault notOp = PermissionDefault.NOT_OP;
+
+ public static void onPermRegister() {
+ T2Cregister.permission(command, op, plugin);
+ T2Cregister.permissionDescription(command, "Required permission to open GUIs via command", plugin);
+
+ T2Cregister.permission(getGuiItemAtLogin, op, plugin);
+ T2Cregister.permission(giveItemOther, op, plugin);
+ T2Cregister.permissionDescription(getGuiItemAtLogin, "Only players with this permission will receive the GUI item", plugin);
+
+ T2Cregister.permission(useitem, op, plugin);
+ T2Cregister.permissionDescription(useitem, "Required permission to use the GUI Item", plugin);
+
+ T2Cregister.permission(useitemToggle, op, plugin);
+ T2Cregister.permissionDescription(useitemToggle, "Required permission to enable/disable the GUI Item for itself (if the function UseItem/AllowToggle is set to true)", plugin);
+
+ T2Cregister.permission(updatemsg, op, plugin);
+ T2Cregister.permissionDescription(updatemsg, "Players with this permission get the update message when joining if an update is available", plugin);
+
+ T2Cregister.permission(bypass, op, plugin);
+ T2Cregister.permissionDescription(bypass, "Bypass to open disabled GUIs", plugin);
+
+ T2Cregister.permission(info, notOp, plugin);
+ T2Cregister.permissionDescription(info, "Permission to view T2C-CommandGUI info", plugin);
+
+ T2Cregister.permission(player, op, command, true, plugin);
+ T2Cregister.permission(player, op, getGuiItemAtLogin, true, plugin);
+ T2Cregister.permission(player, op, useitem, true, plugin);
+ T2Cregister.permission(player, op, useitemToggle, true, plugin);
+ T2Cregister.permissionDescription(player, "All permissions from T2C-CommandGUI for Player", plugin);
+
+ T2Cregister.permission(admin, op, command, true, plugin);
+ T2Cregister.permission(admin, op, getGuiItemAtLogin, true, plugin);
+ T2Cregister.permission(admin, op, giveItemOther, true, plugin);
+ T2Cregister.permission(admin, op, useitem, true, plugin);
+ T2Cregister.permission(admin, op, useitemToggle, true, plugin);
+ T2Cregister.permission(admin, op, updatemsg, true, plugin);
+ T2Cregister.permission(admin, op, bypass, true, plugin);
+ T2Cregister.permission(admin, op, info, true, plugin);
+ T2Cregister.permissionDescription(admin, "All permissions from T2C-CommandGUI", plugin);
+
+
+ for (Gui gui : Main.guiHashMap.values()) {
+ T2Cregister.permission(command + "." + gui.key, op, plugin);
+ T2Cregister.permission(admin, op, command + "." + gui.key, true, plugin);
+ for (Slot slot : gui.slots) {
+ T2Cregister.permission(slot.permissionToUse, op, plugin);
+ T2Cregister.permission(admin, op, slot.permissionToUse, true, plugin);
+ T2Cregister.permission(slot.permissionToSee, op, plugin);
+ T2Cregister.permission(admin, op, slot.permissionToSee, true, plugin);
+ }
+ }
+ }
+}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Placeholder.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Placeholder.java
similarity index 88%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Placeholder.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Placeholder.java
index fb97030..c1cafb8 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/system/Placeholder.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/system/Placeholder.java
@@ -1,7 +1,7 @@
-package de.jatitv.commandguiv2.Spigot.system;
+package net.t2code.commandguiv2.Spigot.system;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
import org.bukkit.entity.Player;
import java.util.ArrayList;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/Events.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/Events.java
similarity index 92%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/Events.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/Events.java
index 3e3311d..8c307e2 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/Events.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/Events.java
@@ -1,14 +1,14 @@
-package de.jatitv.commandguiv2.Spigot.useItem;
+package net.t2code.commandguiv2.Spigot.useItem;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.gui.OpenGUI;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.api.CGuiAPI;
-import net.t2code.lib.Spigot.Lib.items.ItemVersion;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.cmdManagement.Commands;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.gui.OpenGUI;
+import net.t2code.commandguiv2.Spigot.database.SelectDatabase;
+import net.t2code.commandguiv2.api.CGuiAPI;
+import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.Bukkit;
import org.bukkit.Material;
import org.bukkit.entity.Player;
@@ -44,14 +44,14 @@ public class Events implements Listener {
} else useItemSlotHashMap.put(e.getPlayer().getName(), i);
if (CGuiAPI.JoinDisable) {
- send.debug(Main.getPlugin(), "JoinDisable");
+ T2Csend.debug(Main.getPlugin(), "JoinDisable");
return;
}
if (e.getPlayer().hasPermission("commandgui.get.guiitem.at.login")) {
new BukkitRunnable() {
@Override
public void run() {
- send.debug(Main.getPlugin(), "itemChange: " + e.getPlayer().getName());
+ T2Csend.debug(Main.getPlugin(), "itemChange: " + e.getPlayer().getName());
ItemChange.itemChange(e.getPlayer(), true);
}
}.runTaskLater(Main.getPlugin(), 20L * 1);
@@ -149,7 +149,7 @@ public class Events implements Listener {
if (SelectConfig.getUseItem_Enable()) {
if (SelectConfig.getUseItem_PlayerHead_Enable()) {
- if (e.getItem() != null && p.getItemInHand().getType() == ItemVersion.getHead()) {
+ if (e.getItem() != null && p.getItemInHand().getType() == T2CitemVersion.getHead()) {
if (e.getItem().getItemMeta().getDisplayName().equals(SelectConfig.getUseItem_Name())) {
openGUI(e, p);
}
@@ -181,12 +181,12 @@ public class Events implements Listener {
if (SelectConfig.getUseItemGameModeProtection()) {
if (SelectConfig.getUseItemGameModeMode().equalsIgnoreCase("blacklist") && SelectConfig.getUseItemGameModeList().contains(player.getGameMode().toString())) {
e.setCancelled(true);
- send.player(player, SelectMessages.UseItemDisabledInGameMode);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInGameMode);
return;
}
if (SelectConfig.getUseItemGameModeMode().equalsIgnoreCase("whitelist") && !SelectConfig.getUseItemGameModeList().contains(player.getGameMode().toString())) {
e.setCancelled(true);
- send.player(player, SelectMessages.UseItemDisabledInGameMode);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInGameMode);
return;
}
}
@@ -194,12 +194,12 @@ public class Events implements Listener {
if (SelectConfig.getUseItemWorldProtection()) {
if (SelectConfig.getUseItemWorldMode().equalsIgnoreCase("blacklist") && SelectConfig.getUseItemWorldList().contains(player.getWorld().getName())) {
e.setCancelled(true);
- send.player(player, SelectMessages.UseItemDisabledInWorld);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInWorld);
return;
}
if (SelectConfig.getUseItemWorldMode().equalsIgnoreCase("whitelist") && !SelectConfig.getUseItemWorldList().contains(player.getWorld().getName())) {
e.setCancelled(true);
- send.player(player, SelectMessages.UseItemDisabledInWorld);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInWorld);
return;
}
}
@@ -207,7 +207,7 @@ public class Events implements Listener {
if (!SelectConfig.getUseItem_Permission() || player.hasPermission("commandgui.useitem")) {
OpenGUI.openGUI(player, SelectConfig.getUseItem_OpenGUI(), true);
} else {
- send.player(player,SelectMessages.NoPermissionForUseItem.replace("[perm]", "commandgui.useitem")
+ T2Csend.player(player,SelectMessages.NoPermissionForUseItem.replace("[perm]", "commandgui.useitem")
.replace("[gui]", SelectConfig.getUseItem_OpenGUI()));
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/EventsFrom110.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/EventsFrom110.java
similarity index 91%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/EventsFrom110.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/EventsFrom110.java
index e3d8758..ce15758 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/EventsFrom110.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/EventsFrom110.java
@@ -1,7 +1,6 @@
-package de.jatitv.commandguiv2.Spigot.useItem;
+package net.t2code.commandguiv2.Spigot.useItem;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
import org.bukkit.entity.Player;
import org.bukkit.event.EventHandler;
import org.bukkit.event.EventPriority;
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/ItemChange.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/ItemChange.java
similarity index 72%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/ItemChange.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/ItemChange.java
index bd03182..fc30e17 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/ItemChange.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/ItemChange.java
@@ -1,8 +1,8 @@
-package de.jatitv.commandguiv2.Spigot.useItem;
+package net.t2code.commandguiv2.Spigot.useItem;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.entity.Player;
import org.bukkit.scheduler.BukkitRunnable;
@@ -37,11 +37,11 @@ public class ItemChange {
}
}
}
- send.debug(Main.getPlugin(), "GiveOnlyOnFirstJoin: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "GiveOnlyOnFirstJoin: " + player.getName());
return;
}
if (!SelectConfig.getUseItem_GiveOnEveryJoin()) {
- send.debug(Main.getPlugin(), "!GiveOnEveryJoin: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "!GiveOnEveryJoin: " + player.getName());
return;
}
new BukkitRunnable() {
@@ -51,7 +51,7 @@ public class ItemChange {
if (pln == null) return;
if (!SelectConfig.getUseItem_AllowToggle() || pln) {
if (SelectConfig.getUseItem_InventorySlotEnforce() || player.getInventory().getItem(slot - 1) == null) {
- send.debug(Main.getPlugin(), "Give: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "Give: " + player.getName());
UseItem.giveUseItem(player);
if (setCursor) {
setCursor(player, slot);
@@ -71,41 +71,40 @@ public class ItemChange {
}
}
}.runTaskLater(Main.getPlugin(), 1L * 1);
-
}
private static void setCursor(Player player, int slot) {
- send.debug(Main.getPlugin(), "setCursor 1 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 1 Player: " + player.getName());
if (!SelectConfig.getCursor_ToGUIItem_OnLogin()) {
return;
}
- send.debug(Main.getPlugin(), "setCursor 2 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 2 Player: " + player.getName());
if (SelectConfig.getCursor_ToGUIItem_OnlyOnFirstLogin()) {
if (!player.hasPlayedBefore()) {
player.getInventory().setHeldItemSlot(slot - 1);
- send.debug(Main.getPlugin(), "setCursor 3 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 3 Player: " + player.getName());
}
return;
}
- send.debug(Main.getPlugin(), "setCursor 4 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 4 Player: " + player.getName());
if (!SelectConfig.getBungee()) {
player.getInventory().setHeldItemSlot(slot - 1);
- send.debug(Main.getPlugin(), "setCursor 5 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 5 Player: " + player.getName());
return;
}
- send.debug(Main.getPlugin(), "setCursor 6 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 6 Player: " + player.getName());
if (SelectConfig.getUseItem_ServerChange()) {
player.getInventory().setHeldItemSlot(slot - 1);
- send.debug(Main.getPlugin(), "setCursor 7 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 7 Player: " + player.getName());
return;
}
- send.debug(Main.getPlugin(), "setCursor 8 Player: " + player.getName());
- send.debug(Main.getPlugin(), "setCursor bungeejoinplayers: " + Main.bungeejoinplayers);
- send.debug(Main.getPlugin(), "setCursor Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 8 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor bungeejoinplayers: " + Main.bungeejoinplayers);
+ T2Csend.debug(Main.getPlugin(), "setCursor Player: " + player.getName());
if (Main.bungeejoinplayers.contains(player.getName())) {
player.getInventory().setHeldItemSlot(slot - 1);
- send.debug(Main.getPlugin(), "setCursor 9 Player: " + player.getName());
+ T2Csend.debug(Main.getPlugin(), "setCursor 9 Player: " + player.getName());
Main.bungeejoinplayers.remove(player.getName());
}
}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/UseItem.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/UseItem.java
similarity index 69%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/UseItem.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/UseItem.java
index 86e75c3..dc4cd5a 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/Spigot/useItem/UseItem.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Spigot/useItem/UseItem.java
@@ -1,16 +1,15 @@
-package de.jatitv.commandguiv2.Spigot.useItem;
+package net.t2code.commandguiv2.Spigot.useItem;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-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.minecraftVersion.MCVersion;
-import net.t2code.lib.Spigot.Lib.replace.Replace;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.items.T2CitemVersion;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Creplace;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
+import net.t2code.t2codelib.SPIGOT.api.minecraftVersion.T2CmcVersion;
import org.bukkit.Material;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -32,7 +31,7 @@ public class UseItem {
if (SelectConfig.getUseItem_InventorySlot_FreeSlot()) {
player.getInventory().addItem(itemStack(player));
} else {
- send.debug(Main.getPlugin(), "setUseItem: " + player.getName() + " Slot: " + Integer.parseInt(String.valueOf(slot - 1)));
+ T2Csend.debug(Main.getPlugin(), "setUseItem: " + player.getName() + " Slot: " + Integer.parseInt(String.valueOf(slot - 1)));
player.getInventory().setItem(slot - 1, itemStack(player));
}
}
@@ -47,17 +46,17 @@ public class UseItem {
private static ItemStack itemStack(Player player) {
ItemStack item = null;
if (SelectConfig.getUseItem_PlayerHead_Enable()) {
- if (MCVersion.minecraft1_8 || MCVersion.minecraft1_9 || MCVersion.minecraft1_10 || MCVersion.minecraft1_11 || MCVersion.minecraft1_12) {
- send.player(player, Util.getPrefix() + "§c Playerheads for UseItem are only available from version §61.13§c!");
- send.error(Main.getPlugin(), "Playerheads for UseItem are only available from version 1.13!");
+ if (T2CmcVersion.isMc1_8() || T2CmcVersion.isMc1_9() || T2CmcVersion.isMc1_10() || T2CmcVersion.isMc1_11() || T2CmcVersion.isMc1_12()) {
+ T2Csend.player(player, Util.getPrefix() + "§c Playerheads for UseItem are only available from version §61.13§c!");
+ T2Csend.error(Main.getPlugin(),"Playerheads for UseItem are only available from version 1.13!");
} else {
- item = ItemVersion.getHeadIS();
+ item = T2CitemVersion.getHeadIS();
SkullMeta playerheadmeta = (SkullMeta) item.getItemMeta();
playerheadmeta.setDisplayName(SelectConfig.getUseItem_Name());
if (SelectConfig.getUseItem_Base64_Enable()) {
if (Main.PaPi) {
- playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
- } else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
+ playerheadmeta.setLore(T2Creplace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
+ } else playerheadmeta.setLore(T2Creplace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
GameProfile profile = new GameProfile(UUID.randomUUID(), "");
profile.getProperties().put("textures", new Property("textures", SelectConfig.getUseItem_Base64value()));
Field profileField = null;
@@ -75,8 +74,8 @@ public class UseItem {
} else p = SelectConfig.getUseItem_PlayerName();
playerheadmeta.setOwner(p);
if (Main.PaPi) {
- playerheadmeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
- } else playerheadmeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
+ playerheadmeta.setLore(T2Creplace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
+ } else playerheadmeta.setLore(T2Creplace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
}
item.setItemMeta(playerheadmeta);
}
@@ -85,8 +84,8 @@ public class UseItem {
ItemMeta itemMeta = item.getItemMeta();
itemMeta.setDisplayName(SelectConfig.getUseItem_Name());
if (Main.PaPi) {
- itemMeta.setLore(Replace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
- } else itemMeta.setLore(Replace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
+ itemMeta.setLore(T2Creplace.replace(Util.getPrefix(), player, SelectConfig.getUseItem_Lore()));
+ } else itemMeta.setLore(T2Creplace.replace(Util.getPrefix(), SelectConfig.getUseItem_Lore()));
item.setItemMeta(itemMeta);
item.setAmount(1);
}
@@ -97,13 +96,13 @@ public class UseItem {
if (SelectConfig.getUseItemGameModeProtection()) {
if (SelectConfig.getUseItemGameModeMode().equalsIgnoreCase("blacklist") && SelectConfig.getUseItemGameModeList().contains(player.getGameMode().toString())) {
if (interact) {
- send.player(player, SelectMessages.UseItemDisabledInGameMode);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInGameMode);
} else if (!SelectConfig.getUseItemGameModeRemoveItemWhenItIsDisabled()) removeItem(player);
return true;
}
if (SelectConfig.getUseItemGameModeMode().equalsIgnoreCase("whitelist") && !SelectConfig.getUseItemGameModeList().contains(player.getGameMode().toString())) {
if (interact) {
- send.player(player, SelectMessages.UseItemDisabledInGameMode);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInGameMode);
} else if (!SelectConfig.getUseItemGameModeRemoveItemWhenItIsDisabled()) removeItem(player);
return true;
}
@@ -111,13 +110,13 @@ public class UseItem {
if (SelectConfig.getUseItemWorldProtection()) {
if (SelectConfig.getUseItemWorldMode().equalsIgnoreCase("blacklist") && SelectConfig.getUseItemWorldList().contains(player.getWorld().getName())) {
if (interact) {
- send.player(player, SelectMessages.UseItemDisabledInWorld);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInWorld);
} else if (!SelectConfig.getUseItemWorldRemoveItemWhenItIsDisabled()) removeItem(player);
return true;
}
if (SelectConfig.getUseItemWorldMode().equalsIgnoreCase("whitelist") && !SelectConfig.getUseItemWorldList().contains(player.getWorld().getName())) {
if (interact) {
- send.player(player, SelectMessages.UseItemDisabledInWorld);
+ T2Csend.player(player, SelectMessages.UseItemDisabledInWorld);
} else if (!SelectConfig.getUseItemWorldRemoveItemWhenItIsDisabled()) removeItem(player);
return true;
}
@@ -126,11 +125,11 @@ public class UseItem {
}
public static void removeItem(Player player) {
- send.debug(Main.getPlugin(), "World disabled: " + player.getName() + " " + player.getWorld().toString());
+ T2Csend.debug(Main.getPlugin(), "World disabled: " + player.getName() + " " + player.getWorld().toString());
for (int iam = 0; iam < player.getInventory().getSize() - 5; iam++) {
ItemStack itm = player.getInventory().getItem(iam);
if (itm != null) {
- if (itm.getType() == Material.valueOf(SelectConfig.getUseItem_Material()) || itm.getType() == ItemVersion.getHead()) {
+ if (itm.getType() == Material.valueOf(SelectConfig.getUseItem_Material()) || itm.getType() == T2CitemVersion.getHead()) {
if (itm.getItemMeta().getDisplayName().equals(SelectConfig.getUseItem_Name())) {
player.getInventory().remove(itm);
player.updateInventory();
diff --git a/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Util.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Util.java
new file mode 100644
index 0000000..9f35cc8
--- /dev/null
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/Util.java
@@ -0,0 +1,40 @@
+package net.t2code.commandguiv2;
+
+public class Util {
+
+ public static String getInfoText() {
+ return "";
+ }
+
+ public static String getRequiredT2CodeLibVersion() {
+ return "13.4";
+ }
+
+ public static String getPrefix() {
+ return "§8[§4C§9GUI§8]";
+ }
+
+ public static Integer getSpigotID() {
+ return 90671;
+ }
+
+ public static String getGit() {
+ return "JaTiTV/T2C-CommandGUI";
+ }
+
+ public static Integer getBstatsID() {
+ return 10840;
+ }
+
+ public static String getSpigot() {
+ return "https://www.spigotmc.org/resources/" + getSpigotID();
+ }
+
+ public static String getDiscord() {
+ return net.t2code.t2codelib.Util.getDiscord();
+ }
+
+ public static Integer getConfigVersion() {
+ return 5;
+ }
+}
diff --git a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/api/CGuiAPI.java
similarity index 79%
rename from CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java
rename to CommandGUI V2/src/main/java/net/t2code/commandguiv2/api/CGuiAPI.java
index 45b4bdb..8e69a2c 100644
--- a/CommandGUI V2/src/main/java/de/jatitv/commandguiv2/api/CGuiAPI.java
+++ b/CommandGUI V2/src/main/java/net/t2code/commandguiv2/api/CGuiAPI.java
@@ -1,17 +1,17 @@
-package de.jatitv.commandguiv2.api;
+package net.t2code.commandguiv2.api;
-import de.jatitv.commandguiv2.Spigot.useItem.ItemChange;
-import de.jatitv.commandguiv2.Spigot.useItem.Events;
-import de.jatitv.commandguiv2.Spigot.Main;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.Commands;
-import de.jatitv.commandguiv2.Spigot.cmdManagement.Help;
-import de.jatitv.commandguiv2.Spigot.config.gui.CreateGUI;
-import de.jatitv.commandguiv2.Spigot.config.config.SelectConfig;
-import de.jatitv.commandguiv2.Spigot.config.languages.SelectMessages;
-import de.jatitv.commandguiv2.Spigot.system.Permissions;
-import de.jatitv.commandguiv2.Spigot.database.SelectDatabase;
-import de.jatitv.commandguiv2.Util;
-import net.t2code.lib.Spigot.Lib.messages.send;
+import net.t2code.commandguiv2.Spigot.useItem.ItemChange;
+import net.t2code.commandguiv2.Spigot.useItem.Events;
+import net.t2code.commandguiv2.Spigot.Main;
+import net.t2code.commandguiv2.Spigot.cmdManagement.Commands;
+import net.t2code.commandguiv2.Spigot.cmdManagement.Help;
+import net.t2code.commandguiv2.Spigot.config.gui.CreateGUI;
+import net.t2code.commandguiv2.Spigot.config.config.SelectConfig;
+import net.t2code.commandguiv2.Spigot.config.languages.SelectMessages;
+import net.t2code.commandguiv2.Spigot.system.Permissions;
+import net.t2code.commandguiv2.Spigot.database.SelectDatabase;
+import net.t2code.commandguiv2.Util;
+import net.t2code.t2codelib.SPIGOT.api.messages.T2Csend;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
@@ -39,7 +39,7 @@ public class CGuiAPI {
}
public static void disableItemGiveOnJoin(Boolean disableItemGiveOnJoin) {
- send.debug(Main.getPlugin(), "CGuiAPI: " + disableItemGiveOnJoin);
+ T2Csend.debug(Main.getPlugin(), "CGuiAPI: " + disableItemGiveOnJoin);
JoinDisable = disableItemGiveOnJoin;
}
diff --git a/CommandGUI V2/src/main/resources/bungee.yml b/CommandGUI V2/src/main/resources/bungee.yml
deleted file mode 100644
index 773e342..0000000
--- a/CommandGUI V2/src/main/resources/bungee.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-name: T2C-CommandGUI
-version: ${project.version}
-main: de.jatitv.commandguiv2.Bungee.BMain
-author: JaTiTV
\ No newline at end of file
diff --git a/CommandGUI V2/src/main/resources/plugin.yml b/CommandGUI V2/src/main/resources/plugin.yml
index 6fcacbc..3933886 100644
--- a/CommandGUI V2/src/main/resources/plugin.yml
+++ b/CommandGUI V2/src/main/resources/plugin.yml
@@ -1,6 +1,6 @@
name: T2C-CommandGUI
version: ${project.version}
-main: de.jatitv.commandguiv2.Spigot.Main
+main: net.t2code.commandguiv2.Spigot.Main
api-version: 1.13
prefix: T2C-CommandGUI
authors: [ JaTiTV ]