Compare commits

...

28 Commits

Author SHA1 Message Date
2f4fe4651e Minor code changes 2022-01-20 18:19:39 +01:00
dd433b26ea 10.7 2022-01-19 01:17:20 +01:00
5725251c18 10.6
Added more features for our bungee plugins.
2022-01-18 14:41:41 +01:00
daed92b022 Update .gitignore 2022-01-18 14:41:25 +01:00
8a76bcb2c7 Create .gitignore 2022-01-18 14:40:53 +01:00
8debd90a6c Minor code changes 2022-01-17 20:23:49 +01:00
a50f779b16 10.4
Minor change for premium plugins from T2Code
2022-01-16 06:56:58 +01:00
ac9972601c PluginCheck - WonderBagShop renamed to LuckyBox 2022-01-13 03:17:41 +01:00
JaTiTV
ad5d7e09ea Merge pull request 'UpdateAPI bug' (#3) from CloseInventory into main
Reviewed-on: #3
2022-01-11 02:59:54 +01:00
JaTiTV
c564cdead1 Merge branch 'main' into CloseInventory 2022-01-11 02:59:43 +01:00
2db5be7d56 UpdateAPI bug
When joining the server, it could happen that an error occurred, because the UpdateChecker had not yet checked the public version.
2022-01-11 02:58:00 +01:00
JaTiTV
9f19d2b039 Merge pull request 'CloseInventory' (#2) from CloseInventory into main
Reviewed-on: #2
2022-01-06 01:59:17 +01:00
3cb557c0e1 Add permissionDescription 2022-01-06 01:55:39 +01:00
da2e9ff6a4 Add BConfig 2022-01-05 21:50:03 +01:00
JaTiTV
68d89e2e9e Merge pull request '9.0' (#1) from CloseInventory into main
Reviewed-on: #1
2021-12-31 17:19:30 +01:00
c171a1674d 9.0 | small code changes 2021-12-31 17:17:27 +01:00
1c962a54d6 code changes 2021-12-31 05:30:39 +01:00
1ce07cce81 add removeColorCode 2021-12-31 05:26:57 +01:00
3c6bb074d8 commands change
- add permission for '/t2c debug createReportLog'
- add '/t2c info'
2021-12-31 05:26:45 +01:00
07293cded4 Recode /<plugin> info 2021-12-31 05:23:57 +01:00
6cbae613a3 customizable time interval for the UpdateChecker 2021-12-31 02:36:03 +01:00
9d0902f611 Code changes 2021-12-31 02:17:24 +01:00
f1a5fa9423 Code changes 2021-12-31 01:35:31 +01:00
5e3a3d290c Update 1.18 Start warning to 1.19 warning 2021-12-31 01:35:09 +01:00
07145453b2 add Player.Inventories.CloseByServerStop Function to Config 2021-12-31 01:34:41 +01:00
f545068330 add 1.19 2021-12-31 01:34:10 +01:00
34e59872c0 Update DEV / Snapshot / Beta Version Startmessage 2021-12-31 01:33:59 +01:00
ed63004ebf Change Version to 9.0_Snapshot_1 2021-12-31 01:32:59 +01:00
49 changed files with 612 additions and 110 deletions

114
.gitignore vendored Normal file
View File

@@ -0,0 +1,114 @@
# User-specific stuff
.idea/
*.iml
*.ipr
*.iws
# IntelliJ
out/
# Compiled class file
*.class
# Log file
*.log
# BlueJ files
*.ctxt
# Package Files #
*.jar
*.war
*.nar
*.ear
*.zip
*.tar.gz
*.rar
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
hs_err_pid*
*~
# temporary files which can be created if a process still has a handle open of a deleted file
.fuse_hidden*
# KDE directory preferences
.directory
# Linux trash folder which might appear on any partition or disk
.Trash-*
# .nfs files are created when an open file is removed but is still being accessed
.nfs*
# General
.DS_Store
.AppleDouble
.LSOverride
# Icon must end with two \r
Icon
# Thumbnails
._*
# Files that might appear in the root of a volume
.DocumentRevisions-V100
.fseventsd
.Spotlight-V100
.TemporaryItems
.Trashes
.VolumeIcon.icns
.com.apple.timemachine.donotpresent
# Directories potentially created on remote AFP share
.AppleDB
.AppleDesktop
Network Trash Folder
Temporary Items
.apdisk
# Windows thumbnail cache files
Thumbs.db
Thumbs.db:encryptable
ehthumbs.db
ehthumbs_vista.db
# Dump file
*.stackdump
# Folder config file
[Dd]esktop.ini
# Recycle Bin used on file shares
$RECYCLE.BIN/
# Windows Installer files
*.cab
*.msi
*.msix
*.msm
*.msp
# Windows shortcuts
*.lnk
target/
target\
pom.xml.tag
pom.xml.releaseBackup
pom.xml.versionsBackup
pom.xml.next
release.properties
dependency-reduced-pom.xml
buildNumber.properties
.mvn/timing.properties
.mvn/wrapper/maven-wrapper.jar
.flattened-pom.xml
# Common working directory
run/

View File

@@ -1,8 +0,0 @@
<component name="ArtifactManager">
<artifact type="jar" name="T2CodeLib_8.1">
<output-path>$PROJECT_DIR$/../../Plugins/T2CodeLib/.jar</output-path>
<root id="archive" name="T2CodeLib_8.1.jar">
<element id="module-output" name="T2CodeLib" />
</root>
</artifact>
</component>

View File

@@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="RemoteRepositoriesConfiguration"> <component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="Builders-Paradise" />
<option name="name" value="Builders-Paradise" />
<option name="url" value="https://repo.t2code.net/repository/Builders-Paradise/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="central" /> <option name="id" value="central" />
<option name="name" value="Central Repository" /> <option name="name" value="Central Repository" />
@@ -26,6 +21,31 @@
<option name="name" value="sonatype" /> <option name="name" value="sonatype" />
<option name="url" value="https://oss.sonatype.org/content/groups/public/" /> <option name="url" value="https://oss.sonatype.org/content/groups/public/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="placeholderapi" />
<option name="name" value="placeholderapi" />
<option name="url" value="http://repo.extendedclip.com/content/repositories/placeholderapi/" />
</remote-repository>
<remote-repository>
<option name="id" value="Builders-Paradise" />
<option name="name" value="Builders-Paradise" />
<option name="url" value="https://repo.t2code.net/repository/Builders-Paradise/" />
</remote-repository>
<remote-repository>
<option name="id" value="T2CodePrivat" />
<option name="name" value="T2CodePrivat" />
<option name="url" value="https://repo.t2code.net/repository/T2CodePrivat/" />
</remote-repository>
<remote-repository>
<option name="id" value="T2Code" />
<option name="name" value="T2Code" />
<option name="url" value="https://repo.t2code.net/repository/T2Code/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="spigot-repo" /> <option name="id" value="spigot-repo" />
<option name="name" value="spigot-repo" /> <option name="name" value="spigot-repo" />
@@ -36,21 +56,11 @@
<option name="name" value="spigotmc-repo" /> <option name="name" value="spigotmc-repo" />
<option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" /> <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="jboss.community" /> <option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" /> <option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" /> <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository> </remote-repository>
<remote-repository>
<option name="id" value="placeholderapi" />
<option name="name" value="placeholderapi" />
<option name="url" value="http://repo.extendedclip.com/content/repositories/placeholderapi/" />
</remote-repository>
<remote-repository> <remote-repository>
<option name="id" value="bungeecord-repo" /> <option name="id" value="bungeecord-repo" />
<option name="name" value="bungeecord-repo" /> <option name="name" value="bungeecord-repo" />

View File

@@ -1,13 +0,0 @@
<component name="libraryTable">
<library name="Maven: net.t2code:bungee:1615">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/t2code/bungee/1615/bungee-1615.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/t2code/bungee/1615/bungee-1615-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/t2code/bungee/1615/bungee-1615-sources.jar!/" />
</SOURCES>
</library>
</component>

View File

@@ -37,6 +37,7 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.28" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.28" level="project" />
<orderEntry type="library" name="Maven: net.t2code:bungee:1615" level="project" /> <orderEntry type="library" name="Maven: net.t2code:bungee:1615" level="project" />
<orderEntry type="library" name="Maven: net.t2code:LuckyBox-API:4.2.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.MilkBowl:VaultAPI:1.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13.1-R0.1-SNAPSHOT" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" /> <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />

11
pom.xml
View File

@@ -6,7 +6,7 @@
<groupId>net.t2code</groupId> <groupId>net.t2code</groupId>
<artifactId>T2CodeLib</artifactId> <artifactId>T2CodeLib</artifactId>
<version>8.1</version> <version>10.8</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>T2CodeLib</name> <name>T2CodeLib</name>
@@ -63,6 +63,10 @@
<id>Builders-Paradise</id> <id>Builders-Paradise</id>
<url>https://repo.t2code.net/repository/Builders-Paradise/</url> <url>https://repo.t2code.net/repository/Builders-Paradise/</url>
</repository> </repository>
<repository>
<id>T2Code</id>
<url>https://repo.t2code.net/repository/T2Code/</url>
</repository>
<repository> <repository>
<id>jitpack.io</id> <id>jitpack.io</id>
<url>https://jitpack.io</url> <url>https://jitpack.io</url>
@@ -85,6 +89,11 @@
<artifactId>bungee</artifactId> <artifactId>bungee</artifactId>
<version>1615</version> <version>1615</version>
</dependency> </dependency>
<dependency>
<groupId>net.t2code</groupId>
<artifactId>LuckyBox-API</artifactId>
<version>4.2.7</version>
</dependency>
<dependency> <dependency>
<groupId>com.github.MilkBowl</groupId> <groupId>com.github.MilkBowl</groupId>
<artifactId>VaultAPI</artifactId> <artifactId>VaultAPI</artifactId>

View File

@@ -12,11 +12,11 @@ public final class BMain extends Plugin {
public static String Version; public static String Version;
public static String Autor; public static String Autor;
public static String Prefix = Util.Prefix; public static String Prefix = Util.getPrefix();
public static Integer SpigotID = Util.SpigotID; public static Integer SpigotID = Util.getSpigotID();
public static Integer BstatsID = Util.BstatsID; public static Integer BstatsID = Util.getBstatsID();
public static String Spigot = Util.Spigot; public static String Spigot = Util.getSpigot();
public static String Discord = Util.Discord; public static String Discord = Util.getDiscord();
@Override @Override

View File

@@ -1,5 +1,12 @@
package net.t2code.lib.Bungee.Lib.messages; 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; import java.util.List;
public class BT2CodeTemplate { public class BT2CodeTemplate {
@@ -15,6 +22,7 @@ public class BT2CodeTemplate {
Bsend.console(prefix + " §8-------------------------------"); Bsend.console(prefix + " §8-------------------------------");
return long_; return long_;
} }
public static void onLoadSeparateStroke(String prefix) { public static void onLoadSeparateStroke(String prefix) {
Bsend.console(prefix + " §8-------------------------------"); Bsend.console(prefix + " §8-------------------------------");
} }
@@ -35,4 +43,16 @@ public class BT2CodeTemplate {
Bsend.console(prefix + "§4============================= " + prefix + " §4============================="); 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=======");
}
} }

View File

@@ -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;
}
}

View File

@@ -1,10 +1,12 @@
package net.t2code.lib.Bungee.Lib.update; 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.ProxyServer;
import net.md_5.bungee.api.plugin.Plugin; import net.md_5.bungee.api.plugin.Plugin;
import net.t2code.lib.Bungee.Lib.messages.Bsend; import net.t2code.lib.Bungee.Lib.messages.Bsend;
import net.t2code.lib.Spigot.Lib.update.UpdateObject; import net.t2code.lib.Spigot.Lib.update.UpdateObject;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.URL; import java.net.URL;
@@ -15,6 +17,7 @@ import java.util.function.Consumer;
public class BUpdateAPI { public class BUpdateAPI {
public static HashMap<String, UpdateObject> bungeePluginVersionen = new HashMap<String, UpdateObject>(); public static HashMap<String, UpdateObject> bungeePluginVersionen = new HashMap<String, UpdateObject>();
public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version) { public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String foundVersion, String update_version) {
Bsend.console("§4=========== " + Prefix + " §4==========="); Bsend.console("§4=========== " + Prefix + " §4===========");
Bsend.console("§6A new version was found!"); 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("§6You can find more information on Discord: §e" + Discord);
Bsend.console("§4=========== " + Prefix + " §4==========="); 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 Boolean noUpdate = true;
private static String pluginVersion; private static String pluginVersion;
public static void onUpdateCheckTimer(Plugin plugin, String Prefix, String Spigot, String Discord, Integer SpigotID) { public static void onUpdateCheckTimer(Plugin plugin, String Prefix, String Spigot, String Discord, Integer SpigotID) {

View File

@@ -0,0 +1,85 @@
package net.t2code.lib.Bungee.Lib.yamlConfiguration;
import net.md_5.bungee.config.Configuration;
import net.t2code.lib.Spigot.Lib.replace.Replace;
import java.util.ArrayList;
import java.util.List;
public class BConfig {
public static void set(String path, String value, Configuration configuration) {
if (!configuration.contains(path)) {
configuration.set(path, value);
}
}
public static void set(String path, Configuration configuration) {
configuration.set(path, null);
}
public static void set(String path, Integer value, Configuration configuration) {
if (!configuration.contains(path)) {
configuration.set(path, value);
}
}
public static void set(String path, Double value, Configuration configuration) {
if (!configuration.contains(path)) {
configuration.set(path, value);
}
}
public static void set(String path, Boolean value, Configuration configuration) {
if (!configuration.contains(path)) {
configuration.set(path, value);
}
}
public static void set(String path, List<String> value, Configuration configuration) {
if (!configuration.contains(path)) {
configuration.set(path, value);
}
}
public static String select(String prefix, String path, Configuration configuration) {
return Replace.replace(prefix, configuration.getString(path));
}
public static Integer selectInt(String path, Configuration configuration) {
return (configuration.getInt(path));
}
public static Boolean selectBoolean(String path, Configuration configuration) {
return (configuration.getBoolean(path));
}
public static Double selectDouble(String path, Configuration configuration) {
return (configuration.getDouble(path));
}
public static List<String> selectList(String path, Configuration configuration) {
return (configuration.getStringList(path));
}
public static List<String> selectList(String prefix, String path, Configuration configuration) {
List<String> output = new ArrayList<>();
List<String> input = configuration.getStringList(path);
for (String st : input) {
output.add(Replace.replace(prefix, st));
}
return output;
}
public static void select(String prefix, List<String> value, String path, Configuration configuration) {
List<String> output = new ArrayList<>();
List<String> input = configuration.getStringList(path);
for (String st : input) {
output.add(Replace.replace(prefix, st));
}
value = output;
}
}

View File

@@ -2,19 +2,23 @@ package net.t2code.lib.Spigot.Lib.messages;
import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.ClickEvent;
import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.chat.TextComponent;
import net.t2code.lib.Spigot.Lib.replace.Replace;
import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
import net.t2code.lib.Spigot.system.Main;
import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import org.bukkit.plugin.Plugin;
import java.util.List; import java.util.List;
import java.util.logging.Level;
public class T2CodeTemplate { public class T2CodeTemplate {
public static Long onLoadHeader(String prefix, List autor, String version, String spigot, String discord) { public static Long onLoadHeader(String prefix, List<String> autor, String version, String spigot, String discord) {
Long long_ = Long.valueOf(System.currentTimeMillis()); return onLoadHeader(prefix, autor, version, spigot, discord, null, null);
}
public static Long onLoadHeader(String prefix, List<String> autor, String version, String spigot, String discord, Boolean isPremium) {
return onLoadHeader(prefix, autor, version, spigot, discord, isPremium, null);
}
public static Long onLoadHeader(String prefix, List<String> autor, String version, String spigot, String discord, Boolean isPremium, Boolean isVerify) {
Long long_ = System.currentTimeMillis();
// send.console(prefix +" §4===================== " + prefix + " §4====================="); // send.console(prefix +" §4===================== " + prefix + " §4=====================");
send.console(prefix + " §4 _______ §7___ §4_____ "); send.console(prefix + " §4 _______ §7___ §4_____ ");
send.console(prefix + " §4 |__ __|§7__ \\ §4/ ____|"); send.console(prefix + " §4 |__ __|§7__ \\ §4/ ____|");
@@ -27,17 +31,33 @@ public class T2CodeTemplate {
send.console(prefix + " §4 §e| §2Version: §6" + version); send.console(prefix + " §4 §e| §2Version: §6" + version);
send.console(prefix + " §4 §e| §2Spigot: §6" + spigot); send.console(prefix + " §4 §e| §2Spigot: §6" + spigot);
send.console(prefix + " §4 §e| §2Discord: §6" + discord); send.console(prefix + " §4 §e| §2Discord: §6" + discord);
if (isPremium != null) {
if (isPremium) {
send.console(prefix + " §4 §e| §6Premium: §2true");
} else send.console(prefix + " §4 §e| §6Premium: §4false");
if (isVerify != null) {
if (isVerify) {
send.console(prefix + " §4 §e| §6Verify: §2true");
} else send.console(prefix + " §4 §e| §6Verify: §4false");
} else send.console(prefix + " §4 §e| §6Verify: §4false");
}
send.console(prefix + " §4 §e-------------------"); send.console(prefix + " §4 §e-------------------");
if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) { if (version.toLowerCase().contains("dev") || version.toLowerCase().contains("snapshot") || version.toLowerCase().contains("beta")) {
send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! Some features may not be working as expected. Please report all bugs here: http://dc.t2code.net"); send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! Some features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!");
send.console(prefix + " §4 §e-------------------"); send.console(prefix + " §4 §e-------------------");
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
//onLoadSeparateStroke(prefix); //onLoadSeparateStroke(prefix);
return long_; return long_;
} }
public static Long onLoadHeader(String prefix) { public static Long onLoadHeader(String prefix) {
Long long_ = Long.valueOf(System.currentTimeMillis()); Long long_ = System.currentTimeMillis();
send.console(prefix + "§4===================== " + prefix + " §4====================="); send.console(prefix + "§4===================== " + prefix + " §4=====================");
return long_; return long_;
} }
@@ -48,17 +68,17 @@ public class T2CodeTemplate {
public static void onLoadFooter(String prefix, Long long_, String version) { public static void onLoadFooter(String prefix, Long long_, String version) {
onLoadSeparateStroke(prefix); onLoadSeparateStroke(prefix);
send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
// send.console(prefix +" §4===================== " + prefix + "§4====================="); // send.console(prefix +" §4===================== " + prefix + "§4=====================");
} }
public static void onLoadFooter(String prefix, Long long_) { public static void onLoadFooter(String prefix, Long long_) {
onLoadSeparateStroke(prefix); onLoadSeparateStroke(prefix);
send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_.longValue()) + "ms"); send.console(prefix + " §2Plugin loaded successfully." + " §7- §e" + (System.currentTimeMillis() - long_) + "ms");
// send.console(prefix +" §4===================== " + prefix + "§4====================="); // send.console(prefix +" §4===================== " + prefix + "§4=====================");
} }
public static void onDisable(String prefix, List autor, String version, String spigot, String discord) { public static void onDisable(String prefix, List<String> autor, String version, String spigot, String discord) {
//send.console(prefix + "§4===================== " + prefix + " §7- §6" + version + " §4====================="); //send.console(prefix + "§4===================== " + prefix + " §7- §6" + version + " §4=====================");
//send.console(prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); //send.console(prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", ""));
//send.console(prefix + " §2Version: §6" + version); //send.console(prefix + " §2Version: §6" + version);
@@ -70,22 +90,42 @@ public class T2CodeTemplate {
send.console(prefix + " §4Plugin successfully disabled."); send.console(prefix + " §4Plugin successfully disabled.");
} }
public static void sendInfo(CommandSender sender, String prefix, String spigot, String discord, List autor, String pluginVersion, String publicVersion) { public static void sendInfo(CommandSender sender, String prefix, String spigot, String discord, List<String> autor, String pluginVersion, String publicVersion, Boolean isPremium) {
send.sender(sender, prefix + "§4======= " + prefix + " §4======="); send.sender(sender, prefix + "§4======= " + prefix + " §4=======");
send.sender(sender, prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", "")); send.sender(sender, prefix + " §2Autor: §6" + String.valueOf(autor).replace("[", "").replace("]", ""));
if (sender instanceof Player) {
TextComponent comp2 = new TextBuilder(prefix + " §2Version: §6" + pluginVersion)
.addHover("§8Click to copy").addClickEvent(ClickEvent.Action.COPY_TO_CLIPBOARD, Replace.removeColorCode(prefix) + " - " + pluginVersion).build();
sender.spigot().sendMessage(comp2);
if (!publicVersion.equalsIgnoreCase(pluginVersion)) {
UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, (Player) sender);
}
TextComponent comp3 = new TextBuilder(prefix + " §2Spigot: §6" + spigot)
.addHover("§8Open Spigot").addClickEvent(ClickEvent.Action.OPEN_URL, spigot).build();
sender.spigot().sendMessage(comp3);
TextComponent comp4 = new TextBuilder(prefix + " §2Discord: §6" + discord)
.addHover("§8Open Discord").addClickEvent(ClickEvent.Action.OPEN_URL, discord).build();
sender.spigot().sendMessage(comp4);
} else {
if (publicVersion.equalsIgnoreCase(pluginVersion)) { if (publicVersion.equalsIgnoreCase(pluginVersion)) {
send.sender(sender, prefix + " §2Version: §6" + pluginVersion); send.sender(sender, prefix + " §2Version: §6" + pluginVersion);
} else { } else {
if (sender instanceof Player) { UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion);
Player player = (Player) sender;
UpdateAPI.sendUpdateMsg(prefix, spigot, discord, pluginVersion, publicVersion, player);
}
} }
send.sender(sender, prefix + " §2Spigot: §6" + spigot); send.sender(sender, prefix + " §2Spigot: §6" + spigot);
send.sender(sender, prefix + " §2Discord: §6" + discord); send.sender(sender, prefix + " §2Discord: §6" + discord);
}
if (isPremium != null) {
if (isPremium) {
send.sender(sender, prefix + " §6Premium: §2true");
} else send.sender(sender, prefix + " §6Premium: §4false");
}
send.sender(sender, prefix + "§4======= " + prefix + " §4======="); send.sender(sender, prefix + "§4======= " + prefix + " §4=======");
} }
public static void sendInfo(CommandSender sender, String prefix, String spigot, String discord, List<String> autor, String pluginVersion, String publicVersion) {
sendInfo(sender, prefix, spigot, discord, autor, pluginVersion, publicVersion, null);
}
} }

View File

@@ -16,6 +16,7 @@ public class MCVersion {
public static boolean minecraft1_16; public static boolean minecraft1_16;
public static boolean minecraft1_17; public static boolean minecraft1_17;
public static boolean minecraft1_18; public static boolean minecraft1_18;
public static boolean minecraft1_19;
public static void onCheck(){ public static void onCheck(){
isVersion = Bukkit.getServer().getVersion(); isVersion = Bukkit.getServer().getVersion();
isBuckitVersion = Bukkit.getServer().getBukkitVersion(); isBuckitVersion = Bukkit.getServer().getBukkitVersion();
@@ -30,5 +31,6 @@ public class MCVersion {
minecraft1_16 = Bukkit.getServer().getClass().getPackage().getName().contains("1_16"); minecraft1_16 = Bukkit.getServer().getClass().getPackage().getName().contains("1_16");
minecraft1_17 = Bukkit.getServer().getClass().getPackage().getName().contains("1_17"); minecraft1_17 = Bukkit.getServer().getClass().getPackage().getName().contains("1_17");
minecraft1_18 = Bukkit.getServer().getClass().getPackage().getName().contains("1_18"); minecraft1_18 = Bukkit.getServer().getClass().getPackage().getName().contains("1_18");
minecraft1_19 = Bukkit.getServer().getClass().getPackage().getName().contains("1_19");
} }
} }

View File

@@ -40,8 +40,8 @@ public class PluginCheck {
public static Boolean plotSquaredGUI(){ public static Boolean plotSquaredGUI(){
return Bukkit.getPluginManager().getPlugin("PlotSquaredGUI") != null; return Bukkit.getPluginManager().getPlugin("PlotSquaredGUI") != null;
} }
public static Boolean wbs(){ public static Boolean luckyBox(){
return Bukkit.getPluginManager().getPlugin("WonderBagShop") != null; return Bukkit.getPluginManager().getPlugin("T2C-LuckyBox") != null;
} }
public static Boolean opSec(){ public static Boolean opSec(){
return Bukkit.getPluginManager().getPlugin("OPSecurity") != null; return Bukkit.getPluginManager().getPlugin("OPSecurity") != null;

View File

@@ -5,9 +5,6 @@ import org.bukkit.permissions.Permission;
import org.bukkit.event.Listener; import org.bukkit.event.Listener;
import org.bukkit.permissions.PermissionDefault; import org.bukkit.permissions.PermissionDefault;
import org.bukkit.plugin.Plugin; import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import java.util.Collections;
public class Register { public class Register {
public static void listener(Listener listener, Plugin plugin) { public static void listener(Listener listener, Plugin plugin) {
@@ -35,4 +32,8 @@ public class Register {
plugin.getServer().getPluginManager().getPermission(permission).setDefault(setDefault); plugin.getServer().getPluginManager().getPermission(permission).setDefault(setDefault);
plugin.getServer().getPluginManager().getPermission(permission).getChildren().put(children, setBoolean); plugin.getServer().getPluginManager().getPermission(permission).getChildren().put(children, setBoolean);
} }
public static void permissionDescription(String permission, String description, Plugin plugin) {
plugin.getServer().getPluginManager().getPermission(permission).setDescription(description);
}
} }

View File

@@ -4,7 +4,6 @@ import me.clip.placeholderapi.PlaceholderAPI;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@@ -63,6 +62,19 @@ public class Replace {
return rp; return rp;
} }
public static String removeColorCode(String value){
String text = value.replace("&", "§");
while(text.contains("§")){
int stelle = text.indexOf("§");
if(text.length() >= stelle+2) {
text = text.substring(0, stelle) + text.substring(stelle + 2);
}else{
text = text.substring(0, stelle) + text.substring(stelle + 1);
}
}
return (text);
}
public static List<String> replacePrice(String prefix,Player player, List<String> Text, String price) { public static List<String> replacePrice(String prefix,Player player, List<String> Text, String price) {
List<String> rp = new ArrayList(); List<String> rp = new ArrayList();

View File

@@ -6,6 +6,7 @@ import net.md_5.bungee.api.chat.TextComponent;
import net.t2code.lib.Spigot.Lib.messages.TextBuilder; import net.t2code.lib.Spigot.Lib.messages.TextBuilder;
import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.system.Main;
import net.t2code.lib.Spigot.system.config.SelectLibConfig; import net.t2code.lib.Spigot.system.config.SelectLibConfig;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -25,18 +26,17 @@ public class UpdateAPI {
public static void join(Plugin plugin, String prefix, String perm, Player player, String spigot, String discord) { public static void join(Plugin plugin, String prefix, String perm, Player player, String spigot, String discord) {
String pluginVersion = plugin.getDescription().getVersion(); String pluginVersion = plugin.getDescription().getVersion();
String publicVersion = UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion;
if (!player.hasPermission(perm) || !player.isOp()) { if (!player.hasPermission(perm) || !player.isOp()) {
return; return;
} }
if (publicVersion == null) { if (UpdateAPI.PluginVersionen.get(plugin.getName()) == null) {
new BukkitRunnable() { new BukkitRunnable() {
@Override @Override
public void run() { public void run() {
join(plugin, prefix, perm, player, spigot, discord); join(plugin, prefix, perm, player, spigot, discord);
} }
}.runTaskLater(plugin, 20L); }.runTaskLater(plugin, 20L);
} else use(plugin, prefix, player, pluginVersion, publicVersion, spigot, discord); } else use(plugin, prefix, player, pluginVersion, UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion, spigot, discord);
} }
private static void use(Plugin plugin, String prefix, Player player, String pluginVersion, String publicVersion, String spigot, String discord) { private static void use(Plugin plugin, String prefix, Player player, String pluginVersion, String publicVersion, String spigot, String discord) {
@@ -54,7 +54,19 @@ public class UpdateAPI {
public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String pluginVersion, String publicVersion) { public static void sendUpdateMsg(String Prefix, String Spigot, String Discord, String pluginVersion, String publicVersion) {
send.console("§4=========== " + Prefix + " §4==========="); send.console("§4=========== " + Prefix + " §4===========");
if (publicVersion.toLowerCase().contains("dev") || publicVersion.toLowerCase().contains("beta") || publicVersion.toLowerCase().contains("snapshot")){
if (publicVersion.toLowerCase().contains("dev")){
send.console("§6A new §4DEV§6 version was found!");
}
if (publicVersion.toLowerCase().contains("beta")){
send.console("§6A new §2BETA§6 version was found!");
}
if (publicVersion.toLowerCase().contains("snapshot")){
send.console("§6A new §eSNAPSHOT§6 version was found!");
}
} else {
send.console("§6A new version was found!"); send.console("§6A new version was found!");
}
send.console("§6Your version: §c" + pluginVersion + " §7- §6Current version: §a" + publicVersion); send.console("§6Your version: §c" + pluginVersion + " §7- §6Current version: §a" + publicVersion);
send.console("§6You can download it here: §e" + Spigot); send.console("§6You can download it here: §e" + Spigot);
send.console("§6You can find more information on Discord: §e" + Discord); send.console("§6You can find more information on Discord: §e" + Discord);
@@ -66,9 +78,27 @@ public class UpdateAPI {
return; return;
} }
send.player(player, Prefix); send.player(player, Prefix);
if (publicVersion.toLowerCase().contains("dev") || publicVersion.toLowerCase().contains("beta") || publicVersion.toLowerCase().contains("snapshot")){
if (publicVersion.toLowerCase().contains("dev")){
TextComponent comp = new TextBuilder(Prefix + " §6A new §4DEV§6 version was found!")
.addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
player.spigot().sendMessage(comp);
}
if (publicVersion.toLowerCase().contains("beta")){
TextComponent comp = new TextBuilder(Prefix + " §6A new §2BETA§6 version was found!")
.addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
player.spigot().sendMessage(comp);
}
if (publicVersion.toLowerCase().contains("snapshot")){
TextComponent comp = new TextBuilder(Prefix + " §6A new §eSNAPSHOT§6 version was found!")
.addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
player.spigot().sendMessage(comp);
}
} else {
TextComponent comp = new TextBuilder(Prefix + " §6A new version was found!") TextComponent comp = new TextBuilder(Prefix + " §6A new version was found!")
.addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build(); .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
player.spigot().sendMessage(comp); player.spigot().sendMessage(comp);
}
TextComponent comp1 = new TextBuilder(Prefix + " §c" + pluginVersion + " §7-> §a" + publicVersion) TextComponent comp1 = new TextBuilder(Prefix + " §c" + pluginVersion + " §7-> §a" + publicVersion)
.addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build(); .addHover("§6You can download it here: §e" + Spigot).addClickEvent(ClickEvent.Action.OPEN_URL, Spigot).build();
player.spigot().sendMessage(comp1); player.spigot().sendMessage(comp1);
@@ -81,9 +111,12 @@ public class UpdateAPI {
private static Boolean noUpdate = true; private static Boolean noUpdate = true;
public static void onUpdateCheck(Plugin plugin, String Prefix, String Spigot, int SpigotID, String Discord) { public static void onUpdateCheck(Plugin plugin, String Prefix, String Spigot, int SpigotID, String Discord) {
onUpdateCheck(plugin, Prefix, Spigot, SpigotID, Discord, 60);
}
public static void onUpdateCheck(Plugin plugin, String Prefix, String Spigot, int SpigotID, String Discord, Integer timeInMin) {
int taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() { int taskID = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
public void run() { public void run() {
(new UpdateAPI((JavaPlugin) plugin, SpigotID)).getVersion((update_version) -> { (new UpdateAPI((JavaPlugin) plugin, SpigotID)).getVersion((update_version) -> {
UpdateObject update = new UpdateObject( UpdateObject update = new UpdateObject(
plugin.getName(), plugin.getName(),
@@ -91,7 +124,6 @@ public class UpdateAPI {
update_version update_version
); );
UpdateAPI.PluginVersionen.put(plugin.getName(), update); UpdateAPI.PluginVersionen.put(plugin.getName(), update);
if (!plugin.getDescription().getVersion().equalsIgnoreCase(update_version)) { if (!plugin.getDescription().getVersion().equalsIgnoreCase(update_version)) {
noUpdate = true; noUpdate = true;
new BukkitRunnable() { new BukkitRunnable() {
@@ -101,7 +133,6 @@ public class UpdateAPI {
} }
}.runTaskLater(plugin, 600L); }.runTaskLater(plugin, 600L);
} else { } else {
if (noUpdate) { if (noUpdate) {
send.console(Prefix + " §2No update found."); send.console(Prefix + " §2No update found.");
noUpdate = false; noUpdate = false;
@@ -109,7 +140,7 @@ public class UpdateAPI {
} }
}, Prefix, plugin.getDescription().getVersion()); }, Prefix, plugin.getDescription().getVersion());
} }
}, 0L, 20 * 60 * 60L); }, 0L, timeInMin * 60 * 20L);
} }
private JavaPlugin plugin; private JavaPlugin plugin;

View File

@@ -4,6 +4,7 @@ import net.md_5.bungee.protocol.packet.Commands;
import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate; import net.t2code.lib.Spigot.Lib.messages.T2CodeTemplate;
import net.t2code.lib.Spigot.Lib.messages.send; import net.t2code.lib.Spigot.Lib.messages.send;
import net.t2code.lib.Spigot.Lib.update.UpdateAPI; import net.t2code.lib.Spigot.Lib.update.UpdateAPI;
import net.t2code.lib.Util;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.Command; import org.bukkit.command.Command;
import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandExecutor;
@@ -22,29 +23,36 @@ import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
public class CmdExecuter implements CommandExecutor, TabCompleter { public class CmdExecuter implements CommandExecutor, TabCompleter {
private static Plugin plugin = Main.plugin;
private static String prefix = Main.prefix;
private static List autor = Main.autor;
private static String version = Main.version;
private static String spigot = Main.spigot;
private static String discord = Main.discord;
@Override @Override
public boolean onCommand(CommandSender sender, Command command, String label, String[] args) { public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {
if (!sender.hasPermission("t2code.admin")){
send.sender(sender,"§4No Permission §8t2code.admin");
return false;
}
if (args.length == 0) { if (args.length == 0) {
T2CodeTemplate.sendInfo(sender, prefix, spigot, discord, autor, version, UpdateAPI.PluginVersionen.get(plugin.getName()).publicVersion); T2CodeTemplate.sendInfo(sender, Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.autor, Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion);
} else { } else {
switch (args[0].toLowerCase()) {
case "info":
case "plugin":
case "pl":
case "version":
case "ver":
T2CodeTemplate.sendInfo(sender, Util.getPrefix(), Util.getSpigot(), Util.getDiscord(), Main.autor, Main.version, UpdateAPI.PluginVersionen.get(Main.plugin.getName()).publicVersion);
return false;
}
if ("debug".equals(args[0].toLowerCase())) { if ("debug".equals(args[0].toLowerCase())) {
if (args.length != 2) { if (args.length != 2) {
send.sender(sender,"§4Use: §7/t2code debug createReportLog"); send.sender(sender, "§4Use: §7/t2code debug createReportLog");
return false; return false;
} }
if ("createreportlog".equals(args[1].toLowerCase())) { if ("createreportlog".equals(args[1].toLowerCase())) {
CreateReportLog.create(sender); CreateReportLog.create(sender);
} else send.sender(sender,"§4Use: §7/t2code debug createReportLog"); } else send.sender(sender, "§4Use: §7/t2code debug createReportLog");
} else send.sender(sender,"§4Use: §7/t2code debug createReportLog"); } else send.sender(sender, "§4Use: §7/t2code debug createReportLog");
} }
return false; return false;
} }
@@ -53,6 +61,7 @@ public class CmdExecuter implements CommandExecutor, TabCompleter {
//TabCompleter //TabCompleter
private static HashMap<String, String> arg1 = new HashMap<String, String>() {{ private static HashMap<String, String> arg1 = new HashMap<String, String>() {{
put("debug", "t2code.admin"); put("debug", "t2code.admin");
put("info", "t2code.admin");
}}; }};
@Override @Override

View File

@@ -5,6 +5,7 @@ import net.t2code.lib.Spigot.Lib.minecraftVersion.MCVersion;
import net.t2code.lib.Spigot.Lib.minecraftVersion.NMSVersion; import net.t2code.lib.Spigot.Lib.minecraftVersion.NMSVersion;
import net.t2code.lib.Spigot.Lib.plugins.PluginCheck; import net.t2code.lib.Spigot.Lib.plugins.PluginCheck;
import net.t2code.lib.Spigot.Lib.vault.Vault; import net.t2code.lib.Spigot.Lib.vault.Vault;
import net.t2code.luckyBox.api.LuckyBoxAPI;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.command.CommandSender; import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
@@ -62,6 +63,15 @@ public class CreateReportLog {
pWriter.println(); pWriter.println();
pWriter.println("T2CodeLib: " + Main.plugin.getDescription().getVersion()); pWriter.println("T2CodeLib: " + Main.plugin.getDescription().getVersion());
pWriter.println(); pWriter.println();
if (PluginCheck.luckyBox()){
pWriter.println("T2C-PremiumPlugins: ");
pWriter.println("T2C-LuckyBox UID: " + LuckyBoxAPI.getUID());
pWriter.println("T2C-LuckyBox RID: " + LuckyBoxAPI.getRID());
pWriter.println("T2C-LuckyBox DID: " + LuckyBoxAPI.getDID());
pWriter.println("T2C-LuckyBox isP: " + LuckyBoxAPI.isP());
pWriter.println("T2C-LuckyBox isV: " + LuckyBoxAPI.isV());
pWriter.println();
}
pWriter.println("Plugins: "); pWriter.println("Plugins: ");
for (Plugin pl : Bukkit.getPluginManager().getPlugins()) { for (Plugin pl : Bukkit.getPluginManager().getPlugins()) {
pWriter.println(" - " + pl.getName() + " - " + pl.getDescription().getVersion() + " - Enabled: " + pl.isEnabled() + " - Autors: " + pl.getDescription().getAuthors() + " - Website: " + pl.getDescription().getWebsite()); pWriter.println(" - " + pl.getName() + " - " + pl.getDescription().getVersion() + " - Enabled: " + pl.isEnabled() + " - Autors: " + pl.getDescription().getAuthors() + " - Website: " + pl.getDescription().getWebsite());

View File

@@ -14,6 +14,6 @@ public class JoinEvent implements Listener {
@EventHandler @EventHandler
public void onJoinEvent(PlayerLoginEvent event) { public void onJoinEvent(PlayerLoginEvent event) {
Player player = event.getPlayer(); Player player = event.getPlayer();
UpdateAPI.join(Main.plugin, Util.Prefix, "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord); UpdateAPI.join(Main.plugin, Util.getPrefix(), "t2code.lib.updatemsg", event.getPlayer(), Main.spigot, Main.discord);
} }
} }

View File

@@ -16,6 +16,7 @@ import net.t2code.lib.Util;
import net.t2code.lib.Spigot.system.config.SelectLibConfig; import net.t2code.lib.Spigot.system.config.SelectLibConfig;
import net.t2code.lib.Spigot.system.languages.SelectLibMsg; import net.t2code.lib.Spigot.system.languages.SelectLibMsg;
import org.bukkit.Bukkit; import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.plugin.java.JavaPlugin; import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
@@ -34,11 +35,11 @@ public final class Main extends JavaPlugin {
public static List<String> autor; public static List<String> autor;
public static String version; public static String version;
public static String prefix = Util.Prefix; public static String prefix = Util.getPrefix();
public static Integer spigotID = Util.SpigotID; public static Integer spigotID = Util.getSpigotID();
public static Integer bstatsID = Util.BstatsID; public static Integer bstatsID = Util.getBstatsID();
public static String spigot = Util.Spigot; public static String spigot = Util.getSpigot();
public static String discord = Util.Discord; public static String discord = Util.getDiscord();
@Override @Override
public void onEnable() { public void onEnable() {
@@ -48,6 +49,16 @@ public final class Main extends JavaPlugin {
version = plugin.getDescription().getVersion(); version = plugin.getDescription().getVersion();
Long long_; Long long_;
long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord); long_ = T2CodeTemplate.onLoadHeader(prefix, autor, version, spigot, discord);
if (Util.getSnapshot()){
send.console(prefix + " §eYou are running §4" + version + " §eof " + prefix + "§e! §4This is a trial version! §eSome features may not be working as expected. Please report all bugs here: http://dc.t2code.net §4UpdateChecker & bStats may be disabled!");
send.console(prefix + " §4 §e-------------------");
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
}
//send.console("§4 _|_|_|_|_| _|_| _|_|_| _| "); //send.console("§4 _|_|_|_|_| _|_| _|_|_| _| ");
//send.console("§4 _| _| _| _| _|_| _|_|_| _|_| "); //send.console("§4 _| _| _| _| _|_| _|_|_| _|_| ");
//send.console("§4 _| _| _| _| _| _| _| _|_|_|_| "); //send.console("§4 _| _| _| _| _| _| _| _|_|_|_| ");
@@ -61,8 +72,13 @@ public final class Main extends JavaPlugin {
} }
NMSVersion.onCheck(); NMSVersion.onCheck();
MCVersion.onCheck(); MCVersion.onCheck();
if (MCVersion.minecraft1_18){ if (MCVersion.minecraft1_19){
send.warning(this, "The 1.18 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net"); send.warning(this, "The 1.19 is a very fresh / new version. If there are any bugs in our plugins, please report them to us via our Discord: http://dc.t2code.net");
try {
Thread.sleep(5000);
} catch (InterruptedException e) {
e.printStackTrace();
}
} }
ItemVersion.scan(); ItemVersion.scan();
send.console(Main.prefix + " §3Server run on: §6" + MCVersion.isVersion + " / " + NMSVersion.isNMS); send.console(Main.prefix + " §3Server run on: §6" + MCVersion.isVersion + " / " + NMSVersion.isNMS);
@@ -91,8 +107,11 @@ public final class Main extends JavaPlugin {
LanguagesCreate.langCreate(); LanguagesCreate.langCreate();
SelectLibConfig.onSelect(); SelectLibConfig.onSelect();
SelectLibMsg.onSelect(prefix); SelectLibMsg.onSelect(prefix);
if (!Util.getSnapshot()){
UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord); UpdateAPI.onUpdateCheck(plugin, prefix, spigot, spigotID, discord);
Metrics.Bstats(plugin, bstatsID); Metrics.Bstats(plugin, bstatsID);
}
Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin); Bukkit.getServer().getPluginManager().registerEvents(new JoinEvent(), plugin);
T2CodeTemplate.onLoadFooter(prefix, long_); T2CodeTemplate.onLoadFooter(prefix, long_);
} }
@@ -100,6 +119,11 @@ public final class Main extends JavaPlugin {
@Override @Override
public void onDisable() { public void onDisable() {
// Plugin shutdown logic // Plugin shutdown logic
if (SelectLibConfig.InventoriesCloseByServerStop){
for (Player player : Bukkit.getOnlinePlayers()){
player.closeInventory();
}
}
Vault.vaultDisable(); Vault.vaultDisable();
T2CodeTemplate.onDisable(prefix, autor, version, spigot, discord); T2CodeTemplate.onDisable(prefix, autor, version, spigot, discord);
} }

View File

@@ -0,0 +1,33 @@
package net.t2code.lib.Spigot.system;
import org.bukkit.Bukkit;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.util.Scanner;
import java.util.function.Consumer;
public class UpdateChecker {
private final JavaPlugin plugin;
private final int resourceId;
public UpdateChecker(JavaPlugin plugin, int resourceId) {
this.plugin = plugin;
this.resourceId = resourceId;
}
public void getVersion(final Consumer<String> consumer) {
Bukkit.getScheduler().runTaskAsynchronously(this.plugin, () -> {
try (InputStream inputStream = new URL("https://api.spigotmc.org/legacy/update.php?resource=" + this.resourceId).openStream(); Scanner scanner = new Scanner(inputStream)) {
if (scanner.hasNext()) {
consumer.accept(scanner.next());
}
} catch (IOException exception) {
plugin.getLogger().info("Unable to check for updates: " + exception.getMessage());
}
});
}
}

View File

@@ -12,6 +12,7 @@ import java.io.IOException;
public class ConfigCreate { public class ConfigCreate {
private static Boolean UpdateCheckOnJoin = true; private static Boolean UpdateCheckOnJoin = true;
private static Integer UpdateCheckTimeInterval = 60;
private static Boolean Debug = false; private static Boolean Debug = false;
private static String language = "english"; private static String language = "english";
@@ -38,11 +39,13 @@ public class ConfigCreate {
File config = new File(Main.getPath(), "config.yml"); File config = new File(Main.getPath(), "config.yml");
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
Config.set("Plugin.UpdateCheckOnJoin", UpdateCheckOnJoin, yamlConfiguration); Config.set("Plugin.UpdateCheck.OnJoin", UpdateCheckOnJoin, yamlConfiguration);
Config.set("Plugin.UpdateCheck.TimeInterval", UpdateCheckTimeInterval, yamlConfiguration);
Config.set("Plugin.language", language, yamlConfiguration); Config.set("Plugin.language", language, yamlConfiguration);
Config.set("BungeeCord.Enable", Bungee, yamlConfiguration); Config.set("BungeeCord.Enable", Bungee, yamlConfiguration);
Config.set("BungeeCord.ThisServer", thisServer, yamlConfiguration); Config.set("BungeeCord.ThisServer", thisServer, yamlConfiguration);
Config.set("Player.Inventories.CloseByServerStop", true, yamlConfiguration);
// Config.set("Storage.MySQL.Enable", mySQL, yamlConfiguration); // Config.set("Storage.MySQL.Enable", mySQL, yamlConfiguration);
// Config.set("Storage.Type", Storage, yamlConfiguration); // Config.set("Storage.Type", Storage, yamlConfiguration);

View File

@@ -9,16 +9,20 @@ public class SelectLibConfig {
public static Boolean UpdateCheckOnJoin; public static Boolean UpdateCheckOnJoin;
public static Integer UpdateCheckTimeInterval;
public static Boolean Debug; public static Boolean Debug;
public static String language; public static String language;
public static Boolean InventoriesCloseByServerStop;
public static void onSelect() { public static void onSelect() {
File config = new File(Main.getPath(), "config.yml"); File config = new File(Main.getPath(), "config.yml");
YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config); YamlConfiguration yamlConfiguration = YamlConfiguration.loadConfiguration(config);
UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheckOnJoin"); UpdateCheckOnJoin = yamlConfiguration.getBoolean("Plugin.UpdateCheck.OnJoin");
UpdateCheckTimeInterval = yamlConfiguration.getInt("Plugin.UpdateCheck.TimeInterval");
Debug = yamlConfiguration.getBoolean("Plugin.Debug"); Debug = yamlConfiguration.getBoolean("Plugin.Debug");
language = yamlConfiguration.getString("Plugin.language"); language = yamlConfiguration.getString("Plugin.language");
InventoriesCloseByServerStop = yamlConfiguration.getBoolean("Player.Inventories.CloseByServerStop");
} }
} }

View File

@@ -1,9 +1,35 @@
package net.t2code.lib; package net.t2code.lib;
public class Util { public class Util {
public static String Prefix = "§8[§4T2Code§5Lib§8]"; private static Boolean Snapshot = false;
public static Integer SpigotID = 96388;
public static Integer BstatsID = 12518; private static String Prefix = "§8[§4T2Code§5Lib§8]";
public static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID; private static Integer SpigotID = 96388;
public static String Discord = "http://dc.t2code.net"; private static Integer BstatsID = 12518;
private static String Spigot = "https://www.spigotmc.org/resources/" + SpigotID;
private static String Discord = "http://dc.t2code.net";
public static String getPrefix() {
return Prefix;
}
public static Integer getSpigotID() {
return SpigotID;
}
public static Integer getBstatsID() {
return BstatsID;
}
public static String getSpigot() {
return Spigot;
}
public static String getDiscord() {
return Discord;
}
public static Boolean getSnapshot(){
return Snapshot;
}
} }

View File

@@ -1,5 +1,5 @@
name: T2CodeLib name: T2CodeLib
version: 8.1 version: 10.8
main: net.t2code.lib.Bungee.BMain main: net.t2code.lib.Bungee.BMain
author: JaTiTV, Jkobs author: JaTiTV, Jkobs
description: Libarie from T2Code Plugins description: Libarie from T2Code Plugins

View File

@@ -1,5 +1,5 @@
name: T2CodeLib name: T2CodeLib
version: 8.1 version: 10.8
main: net.t2code.lib.Spigot.system.Main main: net.t2code.lib.Spigot.system.Main
api-version: 1.13 api-version: 1.13
prefix: T2CodeLib prefix: T2CodeLib