From 5725251c18edeed74c29ba88cddab369e5799160 Mon Sep 17 00:00:00 2001 From: JaTiTV Date: Tue, 18 Jan 2022 14:41:41 +0100 Subject: [PATCH] 10.6 Added more features for our bungee plugins. --- .idea/artifacts/T2CodeLib_10_5.xml | 8 -- pom.xml | 2 +- .../Bungee/Lib/messages/BT2CodeTemplate.java | 20 +++++ .../lib/Bungee/Lib/plugins/BPluginCheck.java | 78 ++++++++++++++++++ .../lib/Bungee/Lib/update/BUpdateAPI.java | 11 +++ .../lib/Spigot/Lib/replace/Replace.java | 1 - target/classes/bungee.yml | 2 +- .../Bungee/Lib/messages/BT2CodeTemplate.class | Bin 2492 -> 3468 bytes .../lib/Bungee/Lib/update/BUpdateAPI$1.class | Bin 3802 -> 3802 bytes .../lib/Bungee/Lib/update/BUpdateAPI.class | Bin 6356 -> 6881 bytes .../lib/Spigot/Lib/replace/Replace.class | Bin 4961 -> 4961 bytes target/classes/plugin.yml | 2 +- 12 files changed, 112 insertions(+), 12 deletions(-) delete mode 100644 .idea/artifacts/T2CodeLib_10_5.xml create mode 100644 src/main/java/net/t2code/lib/Bungee/Lib/plugins/BPluginCheck.java diff --git a/.idea/artifacts/T2CodeLib_10_5.xml b/.idea/artifacts/T2CodeLib_10_5.xml deleted file mode 100644 index 137a23c..0000000 --- a/.idea/artifacts/T2CodeLib_10_5.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - $PROJECT_DIR$/../../Plugins/T2CodeLib/.jar - - - - - \ No newline at end of file diff --git a/pom.xml b/pom.xml index 62b5578..63d1984 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ net.t2code T2CodeLib - 10.5 + 10.6 jar T2CodeLib diff --git a/src/main/java/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.java b/src/main/java/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.java index 2e64c77..f7428a9 100644 --- a/src/main/java/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.java +++ b/src/main/java/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.java @@ -1,5 +1,12 @@ package net.t2code.lib.Bungee.Lib.messages; +import net.md_5.bungee.api.CommandSender; +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.chat.ClickEvent; +import net.md_5.bungee.api.chat.TextComponent; +import net.md_5.bungee.api.connection.ProxiedPlayer; +import net.t2code.lib.Bungee.Lib.update.BUpdateAPI; + import java.util.List; public class BT2CodeTemplate { @@ -15,6 +22,7 @@ public class BT2CodeTemplate { Bsend.console(prefix + " §8-------------------------------"); return long_; } + public static void onLoadSeparateStroke(String prefix) { Bsend.console(prefix + " §8-------------------------------"); } @@ -35,4 +43,16 @@ public class BT2CodeTemplate { Bsend.console(prefix + "§4============================= " + prefix + " §4============================="); } + public static void sendInfo(CommandSender sender, String prefix, String spigot, String discord, String autor, String pluginVersion, String publicVersion) { + Bsend.sender(sender, prefix + "§4======= " + prefix + " §4======="); + Bsend.sender(sender, prefix + " §2Autor: §6" + autor); + if (publicVersion.equalsIgnoreCase(pluginVersion)) { + Bsend.sender(sender, prefix + " §2Version: §6" + pluginVersion); + } else { + BUpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, sender); + } + Bsend.sender(sender, prefix + " §2Spigot: §6" + spigot); + Bsend.sender(sender, prefix + " §2Discord: §6" + discord); + Bsend.sender(sender, prefix + "§4======= " + prefix + " §4======="); + } } diff --git a/src/main/java/net/t2code/lib/Bungee/Lib/plugins/BPluginCheck.java b/src/main/java/net/t2code/lib/Bungee/Lib/plugins/BPluginCheck.java new file mode 100644 index 0000000..c99a5e7 --- /dev/null +++ b/src/main/java/net/t2code/lib/Bungee/Lib/plugins/BPluginCheck.java @@ -0,0 +1,78 @@ +package net.t2code.lib.Bungee.Lib.plugins; + +import net.md_5.bungee.api.ProxyServer; +import net.md_5.bungee.api.plugin.Plugin; +import net.t2code.lib.Bungee.BMain; +import net.t2code.lib.Spigot.system.Main; + +import java.util.logging.Level; + +public class BPluginCheck { + public static Boolean pluginCheck(String pluginName){ + return (ProxyServer.getInstance().getPluginManager().getPlugin(pluginName) != null); + } + public static Plugin pluginInfos(String pluginName){ + return (ProxyServer.getInstance().getPluginManager().getPlugin(pluginName)); + } + public static Boolean papi(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("PlaceholderAPI") != null; + } + public static Boolean vault(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("Vault") != null; + } + public static Boolean plotSquared(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("PlotSquared") != null; + } + public static Boolean plugManGUI(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("PlugManGUI") != null; + } + public static Boolean cmi(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("CMI") != null; + } + + + /** + * T2Code Plugins + * @return + */ + public static Boolean cgui(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("CommandGUI") != null; + } + public static Boolean plotSquaredGUI(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("PlotSquaredGUI") != null; + } + public static Boolean luckyBox(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("T2C-LuckyBox") != null; + } + public static Boolean opSec(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("OPSecurity") != null; + } + public static Boolean papiTest(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("PaPiTest") != null; + } + public static Boolean booster(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("Booster") != null; + } + public static Boolean antiMapCopy(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("AAntiMapCopy") != null; + } + public static Boolean loreEditor(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("LoreEditor") != null; + } + public static Boolean t2cAlias(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("T2C-Alias") != null; + } + public static Boolean t2cWarp(){ + return ProxyServer.getInstance().getPluginManager().getPlugin("T2C-Warp") != null; + } + + public static Boolean pluginNotFound(Plugin plugin, String prefix, String pl, Integer spigotID) { + if (ProxyServer.getInstance().getPluginManager().getPlugin(pl) == null) { + plugin.getLogger().log(Level.SEVERE, "Plugin can not be loaded!"); + ProxyServer.getInstance().getConsole().sendMessage(prefix + " §e" + pl + " §4could not be found. Please download it here: " + + "§6https://spigotmc.org/resources/" + pl + "." + spigotID + " §4to be able to use this plugin."); + BMain.plugin.getProxy().getPluginManager().getPlugin(plugin.getDescription().getName()).onDisable(); + return true; + } else return false; + } +} diff --git a/src/main/java/net/t2code/lib/Bungee/Lib/update/BUpdateAPI.java b/src/main/java/net/t2code/lib/Bungee/Lib/update/BUpdateAPI.java index 275d96c..5b75996 100644 --- a/src/main/java/net/t2code/lib/Bungee/Lib/update/BUpdateAPI.java +++ b/src/main/java/net/t2code/lib/Bungee/Lib/update/BUpdateAPI.java @@ -1,10 +1,12 @@ package net.t2code.lib.Bungee.Lib.update; +import net.md_5.bungee.api.CommandSender; import net.md_5.bungee.api.ProxyServer; import net.md_5.bungee.api.plugin.Plugin; import net.t2code.lib.Bungee.Lib.messages.Bsend; import net.t2code.lib.Spigot.Lib.update.UpdateObject; + import java.io.IOException; import java.io.InputStream; import java.net.URL; @@ -15,6 +17,7 @@ import java.util.function.Consumer; public class BUpdateAPI { public static HashMap bungeePluginVersionen = new HashMap(); + public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version) { Bsend.console("§4=========== " + Prefix + " §4==========="); Bsend.console("§6A new version was found!"); @@ -23,6 +26,14 @@ public class BUpdateAPI { Bsend.console("§6You can find more information on Discord: §e" + Discord); Bsend.console("§4=========== " + Prefix + " §4==========="); } + public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version, CommandSender sender) { + Bsend.sender(sender,"§4=========== " + Prefix + " §4==========="); + Bsend.sender(sender,"§6A new version was found!"); + Bsend.sender(sender,"§6Your version: §c" + foundVersion + " §7- §6Current version: §a" + update_version); + Bsend.sender(sender,"§6You can download it here: §e" + Spigot); + Bsend.sender(sender,"§6You can find more information on Discord: §e" + Discord); + Bsend.sender(sender,"§4=========== " + Prefix + " §4==========="); + } private static Boolean noUpdate = true; private static String pluginVersion; public static void onUpdateCheckTimer(Plugin plugin, String Prefix, String Spigot, String Discord, Integer SpigotID) { diff --git a/src/main/java/net/t2code/lib/Spigot/Lib/replace/Replace.java b/src/main/java/net/t2code/lib/Spigot/Lib/replace/Replace.java index fe7766e..6e2fd20 100644 --- a/src/main/java/net/t2code/lib/Spigot/Lib/replace/Replace.java +++ b/src/main/java/net/t2code/lib/Spigot/Lib/replace/Replace.java @@ -4,7 +4,6 @@ import me.clip.placeholderapi.PlaceholderAPI; import org.bukkit.entity.Player; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; diff --git a/target/classes/bungee.yml b/target/classes/bungee.yml index 81cb48e..fb7db01 100644 --- a/target/classes/bungee.yml +++ b/target/classes/bungee.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 10.5 +version: 10.6 main: net.t2code.lib.Bungee.BMain author: JaTiTV, Jkobs description: Libarie from T2Code Plugins \ No newline at end of file diff --git a/target/classes/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.class b/target/classes/net/t2code/lib/Bungee/Lib/messages/BT2CodeTemplate.class index f85fcd0cf08839ae454441d22cc03ad40952a1d0..e8e9f88420832501b575a61385d31d49603a7730 100644 GIT binary patch delta 1220 zcma)6OHWfl6#k~~)=Hq2V#U-7$fJc+Nkv4_DDhDR0f8zMfm?d1mG-vu;d4=qOI>*r z6F0_{Y)lBzP@={}O{~Fg`~m(F6XTgF7KkR&q%+?+^UZf2b8_F?AJ<#fe!cwwz>mAj zmb^A(!bOH1pBDYS<)7Px0dlxEJQg%!(25}pGZ-?m5|Psk-L3tKob@Fl(}#WGoD!8~ zpOlLE`jUx+q(nvpOC8qPU2Q=Nd>FA}6k`n4@jl3a%P4 zZp8#b3|{pG+tZXwMWn3kJ3S`$Q$qoUojiKk9>_!)?yDztA@BbaIo1|5;u=FI2{)-O zUDfN4TAjvc;&K6HF3Ip@d*uYwCB2RQj?u<#M5TmN@mw^f1m$!lmQ=W%3&&%#8}>+6 znw=kzQlnBhE~}sQEkl#g(CYvOFzCfPMV5~&M!Viq09z)Y!Sp%_uwsU=wM>A7Fj;2I zB0`=iwa4%^&$$gS(OOMw4O(EsAnb@?7apP(&*8uu)Crvv6ci{x#vJV&MG5iX1zab@ z(<{);IcNpCK}bicOPEKTQZ^$&`V^T?&k&n#st=4VFVDduZr4+^y_<5bTaRUif~3fK z&6w!rd>bhP`-tzxaqLHks+b{i;fHazMj`EVwihF3o zQ+V(SUVKBlQ1nygK&hfws#IO7R9&i6T|&8PGt$VEYh~lqHzR2jJ?~&2FQ7K>U4g@P zfffP!39P`iic5b8!re-4r>=75G&uDuxcm$aTUcG3MF;B&i>UIpcR2MzM;SrADCA#qiM@1vg zmzzMJi?J+SqJD^;^7$!>{_*)KivDQ@;?u=nxriJg{t89hBxJxX!Ukx5LbgzkZvT+aqJmQva9LF~&xX3D+ET|^a=OJ>XG5J#>E3%U8tyQj?R)r)(@a*1 zb6UBkjXTi@Suye)*~~Nk<-Fl{${CX4cQZ$ioO`VFX!bED z)}iWGFaEafXMhw-ss#qQVu)M)j|WEhWYjvQl^lZ5F$lK~!mWdF>wwzU4yRJN6n+7R CGder~ diff --git a/target/classes/net/t2code/lib/Bungee/Lib/update/BUpdateAPI$1.class b/target/classes/net/t2code/lib/Bungee/Lib/update/BUpdateAPI$1.class index 4a849b1016ea0a6d64f1d47ddb194e307f93165b..0a22dca72be0cf1af70efe8cb5703e27639e148e 100644 GIT binary patch delta 81 zcmca5drNl1Gag2b$pR47>pTw8B7==7|a+F8O#~V87vs;8LTIJ@=XK)+m{cL delta 81 zcmca5drNl1Gag3S$8>I j1Inv2I5B82_%diRL;%$%GUzarGw3qZGZ;+vcUNHY0*Mkq>HVFzyyeuF4nemQCqcby3%S}YwOb0Vl{sE&Ll+tXqI=*JLjHr zzH{$)?t5zXsq?&(ZybLFz+4gP^EUg+rs7mRYU$I3ZHi>Y)yEB<3odhj{|ic8ALJ}r+5RamWif_J*jSfg+? zuF;d6?$Y-Qs11qk#LQH3%gmL_FLlwW_c;yDwF(okR-bYzBMGcGaAO`4_<+JjY|>@2 zN_6Q3a-y5Ub;g<2tL54AQrM!f72N`IT_UqAxowMpe@4|R4=HR@_z$g<`vYMNTeH;bw)8qC_Crv9T+Y^w5J_6+VU?db%4A-Hw|jb_$g0ge>(- zd|Y?Alf|8Shg%oE8@na6LN7icP`Nu)sh@Y3gzv$pB=#tL+LW%{9jevqLrUz`-JuHi z4%}y;e^%cYYIOE1d=8)2&xU3d9l-q(2Nk}EFX?Gsn|n9DqVNE|s&De*;z9j@7pvHX zK7~Ujr?)n_Woa^#NvtK6oE(+g0~1Qe@G6;ZsA?6Mu4xay)!x5X#r@(1eX{t~@P9p=#%mJ)Q+OS3^gmG| zMWqlPe8Q*jOFYf9ZBC_<>86c|OeUF;A}DZE4sVgEg7q*ZbL4-{A5IDg% zAHD&PHix=Lk7sSpot*n!7vR-=8Fny|L-QS({t`_%kaJ4r2IYyH5~0)$JCLDm}$4x*@i0OKO# zbNc>Bi5HIsBh!z9LO&dtHivR#K~)Z=HT=&ZYW*X2W2+rw*Lx%7*?1qb`*5bCsW=cvP$y%_1J7x|8epLfd-?au!QKhF1tZR|8_ zHYj!!vvWAVdJqlm)zLsrZF~Ul4wa$t5EdQ7#V*>;fXr{&3_@ElW{YFyQeYa;|XrD;3Pb0U}R}*XaB}oTs?qg)ipi-kCN>=Hcxq>+rz9=la1FNCjcD7`~3Mf z{q`*KZC*@HrERI|eCTMYay)~dF+IpQ!!FZiIl&nw{hYcg_@2QpsO5P+RN^yZ!gs>) z-NMsw!TyH^k!T;`NC){*eHbfqNRmDSSeL_w`oJJk?a{yhHrEHE!5lJs5Uw%G2an-; z9}Xf~@0iz*9E7TuQ70;MxFzbGDA=YlD)1P}qJbQ4GfTKQ>X;?L6ItVN3!W9G(jD!r ze|ZjfEfc zmtZMnjGRtTuEQp5Mz)8Wbt`VeE^geT)VoQ4aA}O6qBvUkiMxym+L>ZGQ(Qq$8`G?$ zrov5LxcDotOiN5F2?c>ekPlG` zdoB(o5aG(d;l;wrS$4tzr@FmAzczo771r7<%@2ZumpB?=^vif2rEQq?hK0GPB23so$sZ9A4nGpnHvw9*@;m?l delta 2226 zcmZve33OCN7KXp-<-N}9m!?UB(2*@Uc#b555J8ZrgNRWB1jH!VXwWvaKnx+I6GYT$ zol!t>FE`xdhP#G92Z#zfj@vlujC-7MnZaO~4vb?Yww{cqK+O5Qv0 zl`7}CAGbaRj930Hr_~o3L#54FmnsfW4A;vF2k4>xu>Qt3AvA{ZE(bC}kMmCr9Hgkw zt&wtfWR=52s$KeVuH?zNSmWvj;2;o?jar;baZ#%4r@9Q zn;E(xILMmmGK*vM%HX(?V_oVwPT{nr(n~wq8dJ3k6sopJSk7^o%L)30;ANp2=DD26 zNjhaMkIh%OP08iS%9d1nL!893-(D+@=uqvjOg<0hAzxkVq~ zj16~ko6YSmcW|d(;>-2z|TRP-=i zHXB^J^&#Q?qn$(?vh>(&cG<$#?)LBs)qQngxnKQTKOX%q@*ju)@{P^^T)ySI?x*|P zs)QdLVe@~NS9wtmwALKO)aGP5ol4v6QtYR%C>o@#STvv%!@NaRY~YmX(ilMsObsY{ zW#!`$9MM@KJ7RG>o%EMCOLOJ*kMfvAY}2b_>oVI#Hw;_G82d7S5z;w_u@7??L^Fd~ zO`ONYI$m&L4NrKeM*4$D%F{h5lFyU=D3afko)Re_9G>PGlS_0fWMwc)H&c;iTv;y@ z6J?orpnP;i50eT8aL5LJvxOr<%l$`&c@-z~HY;66?dYD$0Dc?k0*^o`l{v~ITL?D+tz(GQJ5)rDs+#_;v zJkOuSE(jhAle?d}xq_>Bffr@Ym1}u8#rbkKN}lqH(OWql>5POwS7pY(N12DpUN7`g zmE}Trrz++p{vz;D>=kUvEcQ;=&tFA$^R}0GS)^Pqyb|@9j*_*|@m(N$9}>^LUK$d; zgcCg!7M+~U5G&ir>@3MF@g5drIjuU-OH(2q=%Kkf7!PJyx{gS>5z<>&?qfaiYRfEt zyB@dNj$3g%%Xx8YTV6Lzq5@AbARfqafpHP%xMf^|+l(QUH`JR%nTryVzb?zgS*{#i zbZrmos)HN2@fW2*y>)JGeOI2i^iQnlUKtG3{W1&rEDv=_jTO?pQ{|nhVH$NZmolHE z%!^n;tIV*93#EH=`@THGP*F`5wKxPQcG&$+%awY0Wh%{fu zr1W1Svjw(ZfaeJGakR?58EfSBy&;k%M5@H8PpWAX{ac={QF`NVA_ax&0{+h1(jlGFpzrXm=++A5_xOj` zHGR9grf+xG^m)Bvx~9+TA3y&TxdS(|)BM?5Wz%%H&Dp!e&9?E`oMH1X?`uqALCFx> zfp3>E3hw3N8F$G&vGy|T8MuQ2NwMY!W<^81&yZYSW;{W-5ZHkIu*}N45SGjk71s~= zFz3ox?}mX@mgvs;=H7_BueYbUi(v7QyZ}h_$9(c@(aK~p(fbKpF4bP)mKXjhpP6ty zyLjMP+a=^@-w>Y@%>$1SAoD5erBiOz#%^v5Y-Uq8$~-B#a&pgDe<4*Yo%e<4eSFDR cG8@8Qi|%`N$Zw~?5!*zW&F4q?55PzKC)m!qO8@`> diff --git a/target/classes/net/t2code/lib/Spigot/Lib/replace/Replace.class b/target/classes/net/t2code/lib/Spigot/Lib/replace/Replace.class index ef6627528ae7b6bfe75e0c10080e533dd5905f02..696f7b2ce09c3897efe80323a7d8dd7e9cba019f 100644 GIT binary patch delta 285 zcmWlU$x6du6otR+)HF>xD2PT4LMlp~Hi>aS>wq{=rz%ukv{pe76rte8f(su&egq#w z2)>P*;(LfkE?mwJ_dDnO-LM;eMz+;wV*9~y7$nOyE-{YzvO7+Z0{u)dzyd|Hno0d3 zdKhLLpNJ9m80Av>iZN~oQqS?Ma;TFM8DV)Qg-!`5lgPNr3@v79OLv&#h52+p>smo1 zBqmf!qN%bd$0cs{zGs<7R?M^e>sRPyU8WoAxv36YQrk4y;hJ6Z;e7`Ox;Rw$k*H(s s6Sb;wC)MVZC(g`!?#HQ%KUakd)~K7;{9CS}e>PS4Kea`LhA9=2KUZ)ryZ`_I delta 285 zcmWNM%Syvw6okL*lr&A+QblOgDkK%}x@a2jcf^XQ^#ZkzK1xw8JL;#oqo^{zRI>`o5+52(v09Thet%(eA`_oPmUo<3{xR*Hd8&nzyLmz zj8bNdD&sVyn-sZaqUSlDH5)2YBE=M0rd6MzpwXClPFSGDA|2^2OT4n&J5IY+F;b;M zpis<;VyjwQ<4*2@b)MKTFYcee!yvmF-4o}&7!KqPNjRcS)qHwC#Zx8D2su}~CUqgI qOYY@6T=C4c`N;e_b@gwA)L@IcdCR_M68+f}bW4}pY?GKU7yko#WG?&w diff --git a/target/classes/plugin.yml b/target/classes/plugin.yml index 6e1d449..10354ae 100644 --- a/target/classes/plugin.yml +++ b/target/classes/plugin.yml @@ -1,5 +1,5 @@ name: T2CodeLib -version: 10.5 +version: 10.6 main: net.t2code.lib.Spigot.system.Main api-version: 1.13 prefix: T2CodeLib