From 561715af4614d4d01f6e0feb756436f9cde99489 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 10 Nov 2022 10:09:07 +0100 Subject: [PATCH 1/6] 13.3_DEV --- pom.xml | 8 ++++---- .../t2codelib/SPIGOT/api/messages/T2CminiMessage.java | 5 +++-- .../net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java | 1 + 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/pom.xml b/pom.xml index c650669..b8a3786 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 13.2 + 13.3_DEV jar T2CodeLib @@ -86,12 +86,12 @@ BenCodez Repo https://nexus.bencodez.com/repository/maven-public/ - + @@ -145,7 +145,7 @@ net.kyori adventure-platform-bukkit - 4.1.3-SNAPSHOT + 4.1.2 diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java index 97ad915..e654ca2 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/messages/T2CminiMessage.java @@ -16,11 +16,12 @@ public class T2CminiMessage { public static void sendMiniMessage(String msg) { T2CodeLibMain.adventure().console().sendMessage(replace(msg)); } - public static void miniMessage(String msg, Player player){ + + public static void miniMessage(String msg, Player player) { T2CodeLibMain.adventure().player(player).sendMessage(replace(msg)); } - protected static Component replace(String text){ + protected static Component replace(String text) { return MiniMessage.miniMessage().deserialize(T2Creplace.convertColorCode(text)); } } diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java index 73e0900..d5f9cf8 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/T2CodeLibMain.java @@ -159,6 +159,7 @@ public final class T2CodeLibMain extends JavaPlugin { if (adventure == null) { throw new IllegalStateException("Tried to access Adventure when the plugin was disabled!"); } + Bukkit.getConsoleSender().sendMessage(Util.getPrefix() + " Adventure load"); return adventure; } -- 2.34.1 From 8cf5a11e7699578259f9af89f4596df896cd2e46 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 10 Nov 2022 11:40:29 +0100 Subject: [PATCH 2/6] Update T2CupdateObject.java --- .../t2codelib/SPIGOT/api/update/T2CupdateObject.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateObject.java b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateObject.java index 529d7ca..5145de9 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateObject.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/api/update/T2CupdateObject.java @@ -6,18 +6,15 @@ public class T2CupdateObject { public String pluginName; public String pluginVersion; public String publicVersion; - public String changeLog; public Boolean load; public T2CupdateObject(String pluginName, String pluginVersion, - String publicVersion , - String changeLog , + String publicVersion, Boolean load) { this.pluginName = pluginName; this.pluginVersion = pluginVersion; this.publicVersion = publicVersion; - this.changeLog = changeLog; - this.load=load; + this.load = load; } } -- 2.34.1 From 489d6369f7fb7b8081305ef4b695086d6821db9b Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 10 Nov 2022 14:09:12 +0100 Subject: [PATCH 3/6] 13.3 createReportLog Fix --- src/main/java/net/t2code/t2codelib/Util.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/t2code/t2codelib/Util.java b/src/main/java/net/t2code/t2codelib/Util.java index ea6ab55..72b0d99 100644 --- a/src/main/java/net/t2code/t2codelib/Util.java +++ b/src/main/java/net/t2code/t2codelib/Util.java @@ -31,7 +31,7 @@ public class Util { public static List getT2cPlugins() { return Arrays.asList( - "T2CodeLib", + //"T2CodeLib", "T2C-LuckyBox", "WonderBagShop", "CommandGUI", -- 2.34.1 From 76d71dace8da3bae8ae623351f415c2f18c6f72c Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Thu, 10 Nov 2022 14:17:20 +0100 Subject: [PATCH 4/6] Update pom.xml --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b8a3786..79564b8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 13.3_DEV + 13.3 jar T2CodeLib -- 2.34.1 From 1012c8c0081a83f41cab05e048bd0a0915742b78 Mon Sep 17 00:00:00 2001 From: Jkobs <66284145+Minzilein2003@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:28:51 +0100 Subject: [PATCH 5/6] Update CmdExecuter.java --- .../java/net/t2code/lib/Spigot/system/CmdExecuter.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/main/java/net/t2code/lib/Spigot/system/CmdExecuter.java b/src/main/java/net/t2code/lib/Spigot/system/CmdExecuter.java index 21d9d29..2550d52 100644 --- a/src/main/java/net/t2code/lib/Spigot/system/CmdExecuter.java +++ b/src/main/java/net/t2code/lib/Spigot/system/CmdExecuter.java @@ -5,6 +5,7 @@ import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import net.t2code.lib.Spigot.system.config.SelectLibConfig; import net.t2code.lib.Util; +import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -42,7 +43,12 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { return false; } if ("createreportlog".equals(args[1].toLowerCase())) { - CreateReportLog.create(sender); + Bukkit.getScheduler().runTaskAsynchronously(T2CodeMain.getPlugin(), new Runnable() { + @Override + public void run() { + CreateReportLog.create(sender); + } + }); } else send.sender(sender, "§4Use: §7/t2code debug createReportLog"); return false; -- 2.34.1 From 0163eae97b14195fbbf8ff956d1be9e97810d741 Mon Sep 17 00:00:00 2001 From: Jkobs <66284145+Minzilein2003@users.noreply.github.com> Date: Thu, 10 Nov 2022 14:34:32 +0100 Subject: [PATCH 6/6] Update CmdExecuter.java --- .../java/net/t2code/t2codelib/SPIGOT/system/CmdExecuter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/t2code/t2codelib/SPIGOT/system/CmdExecuter.java b/src/main/java/net/t2code/t2codelib/SPIGOT/system/CmdExecuter.java index 8f032ba..05672a9 100644 --- a/src/main/java/net/t2code/t2codelib/SPIGOT/system/CmdExecuter.java +++ b/src/main/java/net/t2code/t2codelib/SPIGOT/system/CmdExecuter.java @@ -5,6 +5,7 @@ import net.t2code.t2codelib.SPIGOT.api.messages.T2Ctemplate; import net.t2code.t2codelib.SPIGOT.system.CreateReportLog; import net.t2code.t2codelib.SPIGOT.system.config.config.SelectLibConfig; import net.t2code.t2codelib.Util; +import org.bukkit.Bukkit; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; @@ -44,13 +45,13 @@ public class CmdExecuter implements CommandExecutor, TabCompleter { return false; } if ("createreportlog".equals(args[1].toLowerCase())) { - Bukkit.getScheduler().runTaskAsynchronously(T2CodeMain.getPlugin(), new Runnable() { + Bukkit.getScheduler().runTaskAsynchronously(T2CodeLibMain.getPlugin(), new Runnable() { @Override public void run() { CreateReportLog.create(sender); } }); - } else send.sender(sender, "§4Use: §7/t2code debug createReportLog"); + } else T2Csend.sender(sender, "§4Use: §7/t2code debug createReportLog"); return false; default: -- 2.34.1