Compare commits

..

10 Commits

Author SHA1 Message Date
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
22 changed files with 163 additions and 29 deletions

View File

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

View File

@@ -6,7 +6,7 @@
<groupId>net.t2code</groupId> <groupId>net.t2code</groupId>
<artifactId>T2CodeLib</artifactId> <artifactId>T2CodeLib</artifactId>
<version>9.0</version> <version>10.4</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>T2CodeLib</name> <name>T2CodeLib</name>

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

@@ -14,8 +14,12 @@ import java.util.List;
import java.util.logging.Level; 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);
}
public static Long onLoadHeader(String prefix, List<String> autor, String version, String spigot, String discord, Boolean isPremium) {
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/ ____|");
@@ -28,6 +32,11 @@ 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");
}
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 §4UpdateChecker & bStats may be disabled!"); 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!");
@@ -43,7 +52,7 @@ public class T2CodeTemplate {
} }
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_;
} }
@@ -54,17 +63,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);
@@ -76,7 +85,7 @@ 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) { if (sender instanceof Player) {
@@ -103,6 +112,15 @@ public class T2CodeTemplate {
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

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

@@ -26,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) {
@@ -55,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);
@@ -67,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);

View File

@@ -21,7 +21,6 @@ import org.bukkit.plugin.java.JavaPlugin;
import java.io.File; import java.io.File;
import java.util.List; import java.util.List;
import java.util.Objects;
public final class Main extends JavaPlugin { public final class Main extends JavaPlugin {
@@ -108,9 +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_);
} }

View File

@@ -1,7 +1,7 @@
package net.t2code.lib; package net.t2code.lib;
public class Util { public class Util {
private static Boolean Snapshot = true; private static Boolean Snapshot = false;
private static String Prefix = "§8[§4T2Code§5Lib§8]"; private static String Prefix = "§8[§4T2Code§5Lib§8]";
private static Integer SpigotID = 96388; private static Integer SpigotID = 96388;

View File

@@ -1,5 +1,5 @@
name: T2CodeLib name: T2CodeLib
version: 9.0 version: 10.4
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: 9.0 version: 10.4
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