From 63a2fc1c59c6280d347dd75df29bc58b563ba62b Mon Sep 17 00:00:00 2001 From: CroaBeast Date: Fri, 18 Jul 2025 00:00:16 -0500 Subject: [PATCH 1/8] Reworking CyberCore --- pom.xml | 107 ++- .../com/bitaspire/cybercore/CoreSettings.java | 116 +++ .../com/bitaspire/cybercore/CyberCore.java | 69 ++ .../bitaspire/cybercore/FileManagerImpl.java | 76 ++ .../java/com/bitaspire/cybercore/Lag.java | 55 ++ .../com/bitaspire/cybercore/TextLibrary.java | 39 + .../bitaspire/cybercore/file/FileManager.java | 18 + .../bitaspire/cybercore/util/RandomUtils.java | 36 + .../zerotoil/dev/cybercore/CoreSettings.java | 100 --- .../net/zerotoil/dev/cybercore/CyberCore.java | 465 ---------- .../zerotoil/dev/cybercore/TextSettings.java | 40 - .../dev/cybercore/addons/Metrics.java | 838 ------------------ .../dev/cybercore/files/FileManager.java | 54 -- .../dev/cybercore/files/YAMLFile.java | 69 -- .../files/configupdater/ConfigUpdater.java | 243 ----- .../files/configupdater/KeyBuilder.java | 116 --- .../zerotoil/dev/cybercore/objects/Lag.java | 88 -- .../dev/cybercore/utilities/GeneralUtils.java | 102 --- .../dev/cybercore/utilities/PlayerUtils.java | 71 -- .../dev/cybercore/utilities/TimeUtils.java | 153 ---- 20 files changed, 485 insertions(+), 2370 deletions(-) create mode 100644 src/main/java/com/bitaspire/cybercore/CoreSettings.java create mode 100644 src/main/java/com/bitaspire/cybercore/CyberCore.java create mode 100644 src/main/java/com/bitaspire/cybercore/FileManagerImpl.java create mode 100644 src/main/java/com/bitaspire/cybercore/Lag.java create mode 100644 src/main/java/com/bitaspire/cybercore/TextLibrary.java create mode 100644 src/main/java/com/bitaspire/cybercore/file/FileManager.java create mode 100644 src/main/java/com/bitaspire/cybercore/util/RandomUtils.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/CoreSettings.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/CyberCore.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/TextSettings.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/addons/Metrics.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/files/FileManager.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/files/YAMLFile.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/files/configupdater/ConfigUpdater.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/files/configupdater/KeyBuilder.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/objects/Lag.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/utilities/GeneralUtils.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/utilities/PlayerUtils.java delete mode 100644 src/main/java/net/zerotoil/dev/cybercore/utilities/TimeUtils.java diff --git a/pom.xml b/pom.xml index 08d44da..93c55ec 100644 --- a/pom.xml +++ b/pom.xml @@ -4,18 +4,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - net.zerotoil.dev + com.bitaspire CyberCore - 1.3.31 + 1.0 jar CyberCore - Main core for CyberPlugins + - 8 + 21 UTF-8 + dev.zerotoil.net @@ -23,16 +24,35 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.13.0 - 8 - 8 + 1.8 + 1.8 + + -Xlint:-options + + + + org.apache.maven.plugins + maven-source-plugin + 3.3.1 + + + attach-sources + prepare-package + + jar + + + + + org.apache.maven.plugins maven-shade-plugin - 3.2.4 + 3.5.3 package @@ -44,18 +64,37 @@ + *:* - META-INF/*.* + META-INF/** + + + org.apache.maven.plugins + maven-javadoc-plugin + 3.5.0 + + -Xdoclint:none + + + + attach-javadocs + + jar + + + + + src/main/resources @@ -77,48 +116,54 @@ https://oss.sonatype.org/content/groups/public/ - + - jitpack.io - https://jitpack.io + croabeast-repo + https://croabeast.github.io/repo/ - - org.spigotmc - spigot-api - 1.20.2-R0.1-SNAPSHOT + org.jetbrains + annotations + 26.0.2 provided - org.apache.commons - commons-lang3 - 3.12.0 - compile + org.projectlombok + lombok + 1.18.38 + provided + - org.projectlombok - lombok - 1.18.26 + org.spigotmc + spigot + 1.16.5-R0.1-SNAPSHOT provided - - io.github.croabeast - BeansLib - 1.4-SNAPSHOT-108 + me.croabeast + Takion-shaded + 1.2 + compile + + + * + * + + - - org.jetbrains - annotations - 24.0.1 + org.apache.commons + commons-lang3 + 3.18.0 + compile diff --git a/src/main/java/com/bitaspire/cybercore/CoreSettings.java b/src/main/java/com/bitaspire/cybercore/CoreSettings.java new file mode 100644 index 0000000..1c18762 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/CoreSettings.java @@ -0,0 +1,116 @@ +package com.bitaspire.cybercore; + +import lombok.Setter; +import me.croabeast.common.util.ServerInfoUtils; +import me.croabeast.takion.logger.TakionLogger; +import org.apache.commons.lang.SystemUtils; +import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +public class CoreSettings { + + private final CyberCore core; + @Setter + private char bootColor = '8'; + + private String[] bootLogo = new String[]{ + "&8╭━━━╮&7╱╱╱&8╭╮&7╱╱╱╱╱╱&8╭━━━╮", + "&8┃╭━╮┃&7╱╱╱&8┃┃&7╱╱╱╱╱╱&8┃╭━╮┃", + "&8┃┃&7╱&8╰╋╮&7╱&8╭┫╰━┳━━┳━┫┃&7╱&8╰╋━━┳━┳━━╮", + "&8┃┃&7╱&8╭┫┃&7╱&8┃┃╭╮┃┃━┫╭┫┃&7╱&8╭┫╭╮┃╭┫┃━┫", + "&8┃╰━╯┃╰━╯┃╰╯┃┃━┫┃┃╰━╯┃╰╯┃┃┃┃━┫", + "&8╰━━━┻━╮╭┻━━┻━━┻╯╰━━━┻━━┻╯╰━━╯", + "&7╱╱╱╱&8╭━╯┃ &7Author: &fKihsomray", + "&7╱╱╱╱&8╰━━╯ &7Version: &7" + }; + + private String[] legacyBootLogo = new String[]{ + "&8_________ _________ __________", + "&8\\_ ___ \\ \\_ ___ \\ \\______ \\", + "&8/ \\ \\/ / \\ \\/ | _/", + "&8\\ \\____\\ \\____ | | \\", + "&8 \\______ / \\______ / |____|_ /", + "&8 \\/ \\/ \\/" + }; + + CoreSettings(CyberCore core) { + this.core = core; + } + + @NotNull + public String getBootColor() { + return "§" + bootColor; + } + + public void setBootLogo(@NotNull String... array) { + this.bootLogo = array; + } + + public void setLegacyBootLogo(@NotNull String... array) { + this.legacyBootLogo = array; + } + + private boolean useLegacy() { + return SystemUtils.OS_NAME.contains("Windows") && ServerInfoUtils.SERVER_VERSION < 12; + } + + private String[] getBaseLogo() { + return useLegacy() ? legacyBootLogo : bootLogo; + } + + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated + public String[] getArrayLogo(boolean applyColor) { + return getLogo(applyColor); + } + + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated + public String getStringLogo(boolean applyColor) { + return getLogoAsString(applyColor); + } + + @NotNull + public String[] getLogo(boolean applyColor) { + final String[] logo = getBaseLogo(); + if (!applyColor) return logo; + + for (int i = 0; i < logo.length; i++) + logo[i] = core.getLibrary().colorize(logo[i]); + + return logo; + } + + @NotNull + public String getLogoAsString(boolean applyColor) { + StringBuilder builder = new StringBuilder(); + + for (final String s : getLogo(applyColor)) + builder.append(s).append("\n"); + + if (builder.length() > 2) + builder = new StringBuilder(builder.substring(2)); + + return builder.toString(); + } + + @NotNull + public String getBootBar() { + StringBuilder builder = new StringBuilder(); + + for (int i = 0; i < 48; i++) { + if (i == 0 && !useLegacy()) builder.append(getBootColor()); + builder.append(useLegacy() ? "-" : "―"); + } + + return builder.toString(); + } + + public void sendBootHeader() { + TakionLogger logger = core.getLibrary().getServerLogger(); + + logger.log(getBootBar()); + logger.log(getLogo(true)); + logger.log(getBootBar(), "&7"); + } +} diff --git a/src/main/java/com/bitaspire/cybercore/CyberCore.java b/src/main/java/com/bitaspire/cybercore/CyberCore.java new file mode 100644 index 0000000..9b249d9 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/CyberCore.java @@ -0,0 +1,69 @@ +package com.bitaspire.cybercore; + +import lombok.AccessLevel; +import lombok.Getter; +import me.croabeast.takion.TakionLib; +import com.bitaspire.cybercore.file.FileManager; +import org.bukkit.Bukkit; +import org.bukkit.plugin.PluginDescriptionFile; +import org.bukkit.plugin.java.JavaPlugin; +import org.jetbrains.annotations.ApiStatus; + +@Getter +public final class CyberCore { + + private final JavaPlugin plugin; + private final TakionLib library; + + private final FileManager fileManager; + private final CoreSettings settings; + + @Getter(AccessLevel.NONE) + private final long bootStart; + + public CyberCore(JavaPlugin plugin) { + this.plugin = plugin; + + fileManager = new FileManagerImpl(this); + library = new TextLibrary(this); + settings = new CoreSettings(this); + + bootStart = System.currentTimeMillis(); + } + + private void loadTPS() { + Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, Lag.initialize(), 100L, 1L); + } + + public void loadFiles(boolean header, String... additionalFiles) { + if (header) settings.sendBootHeader(); + fileManager.loadAll(additionalFiles); + } + + public void loadStart(boolean loadFiles, String additionalFiles) { + settings.sendBootHeader(); + if (loadFiles) loadFiles(false, additionalFiles); + loadTPS(); + } + + public void loadStart(String additionalFiles) { + loadStart(true, additionalFiles); + } + + public void loadFinish() { + final PluginDescriptionFile desc = plugin.getDescription(); + + library.getServerLogger().log( + "&7Loaded " + settings.getBootColor() + desc.getPrefix() + + " v" + desc.getVersion() + "&7 in &a" + + (System.currentTimeMillis() - bootStart) + "ms&7." + ); + library.getServerLogger().log(settings.getBootBar()); + } + + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated + public void logger(String... lines) { + library.getServerLogger().log(lines); + } +} diff --git a/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java b/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java new file mode 100644 index 0000000..e53f928 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java @@ -0,0 +1,76 @@ +package com.bitaspire.cybercore; + +import me.croabeast.file.ConfigurableFile; +import me.croabeast.takion.TakionLib; +import me.croabeast.takion.logger.LogLevel; +import com.bitaspire.cybercore.file.FileManager; +import org.jetbrains.annotations.NotNull; + +import java.util.HashMap; +import java.util.Map; + +final class FileManagerImpl implements FileManager { + + private final Map files = new HashMap<>(); + + private final CyberCore core; + private final TakionLib lib; + + FileManagerImpl(CyberCore core) { + this.core = core; + this.lib = core.getLibrary(); + } + + @Override + public void load(String name, boolean send) { + ConfigurableFile file; + try { + (file = new ConfigurableFile(core.getPlugin(), name) { + @Override + public boolean isUpdatable() { + return FileManagerImpl.this.get("config").get("config.auto-update." + name, false); + } + }).saveDefaults(); + files.put(name, file); + if (send) + lib.getServerLogger().log("&7Loaded file &e" + name + ".yml&7 file."); + } catch (Exception e) { + if (send) + lib.getServerLogger().log(LogLevel.ERROR, + "&cError while generating " + name + ".yml file", + e.getLocalizedMessage() + ); + } + } + + @Override + public void loadAll(boolean send, boolean useDefaults, String... additions) { + if (!files.isEmpty()) files.clear(); + + if (send) + lib.getServerLogger().log(core.getSettings().getBootColor() + "Loading YAML files..."); + + long startTime = System.currentTimeMillis(); + + if (useDefaults) { + load("config", send); + load("lang", send); + } + + for (String string : additions) load(string, send); + + if (send) + lib.getServerLogger().log( + "&7Loaded &e" + files.size() + "&7 files in &a" + + (System.currentTimeMillis() - startTime) + "ms&7.", "&7" + ); + } + + @NotNull + public ConfigurableFile get(String name) throws NullPointerException { + if (!files.containsKey(name)) + throw new NullPointerException("Name " + name + " wasn't found"); + + return files.get(name); + } +} diff --git a/src/main/java/com/bitaspire/cybercore/Lag.java b/src/main/java/com/bitaspire/cybercore/Lag.java new file mode 100644 index 0000000..e7e087a --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/Lag.java @@ -0,0 +1,55 @@ +package com.bitaspire.cybercore; + +import lombok.Getter; +import me.croabeast.common.reflect.Craft; + +@Getter +public class Lag implements Runnable { + + private static Lag instance = null; + + private final long[] ticks = new long[600]; + private int tickCount = 0; + + private Lag() {} + + public double getTPS(int ticks) { + if (tickCount < ticks) return 20; + + int target = (tickCount - 1 - ticks) % this.ticks.length; + long elapsed = System.currentTimeMillis() - this.ticks[target]; + + return Math.min(ticks / (elapsed / 1000.0D), 20.0); + } + + public double getTPS() { + return getTPS(100); + } + + public double getNewTPS() { + try { + double[] tps = Craft.Server.INSTANCE.callAsReflector("getServer").get("recentTps"); + return tps[0] > 20 ? 20 : tps[0]; + } catch (Exception e) { + return getTPS(); + } + } + + public double getLowerTPS() { + return Math.min(getTPS(), getNewTPS()); + } + + public long getElapsed(int tickId) { + return System.currentTimeMillis() - (ticks[tickId % this.ticks.length]); + } + + @Override + public void run() { + ticks[tickCount % ticks.length] = System.currentTimeMillis(); + tickCount += 1; + } + + public static Lag initialize() { + return instance == null ? (instance = new Lag()) : instance; + } +} diff --git a/src/main/java/com/bitaspire/cybercore/TextLibrary.java b/src/main/java/com/bitaspire/cybercore/TextLibrary.java new file mode 100644 index 0000000..a31e87f --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/TextLibrary.java @@ -0,0 +1,39 @@ +package com.bitaspire.cybercore; + +import me.croabeast.takion.TakionLib; +import me.croabeast.takion.logger.TakionLogger; +import org.bukkit.configuration.ConfigurationSection; +import org.jetbrains.annotations.NotNull; + +import java.util.TreeMap; + +final class TextLibrary extends TakionLib { + + private final CyberCore core; + + TextLibrary(CyberCore core) { + super(core.getPlugin()); + this.core = core; + + setLangPrefix("&8&lCCR &8» &r"); + setLangPrefixKey("{p}"); + + setLogger(new TakionLogger(this) { + @Override + public boolean isColored() { + return core.getFileManager().get("config").get("config.console-color", true); + } + }); + setServerLogger(new TakionLogger(this, false) { + @Override + public boolean isColored() { + return core.getFileManager().get("config").get("config.console-color", true); + } + }); + } + + @NotNull + public TreeMap getLoadedWebhooks() { + return loadMapFromConfiguration(core.getFileManager().get("lang").getSection("webhooks")); + } +} diff --git a/src/main/java/com/bitaspire/cybercore/file/FileManager.java b/src/main/java/com/bitaspire/cybercore/file/FileManager.java new file mode 100644 index 0000000..b8a6889 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/file/FileManager.java @@ -0,0 +1,18 @@ +package com.bitaspire.cybercore.file; + +import me.croabeast.file.ConfigurableFile; +import org.jetbrains.annotations.NotNull; + +public interface FileManager { + + void load(String name, boolean send); + + void loadAll(boolean send, boolean useDefaults, String... additions); + + default void loadAll(String... additions) { + loadAll(true, true, additions); + } + + @NotNull + ConfigurableFile get(String name) throws NullPointerException; +} diff --git a/src/main/java/com/bitaspire/cybercore/util/RandomUtils.java b/src/main/java/com/bitaspire/cybercore/util/RandomUtils.java new file mode 100644 index 0000000..93ed60a --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/util/RandomUtils.java @@ -0,0 +1,36 @@ +package com.bitaspire.cybercore.util; + +import lombok.experimental.UtilityClass; + +import java.util.Random; +import java.util.concurrent.ThreadLocalRandom; + +@UtilityClass +public class RandomUtils { + + private final Random CURRENT_RANDOM = ThreadLocalRandom.current(); + + public double randomDouble() { + return CURRENT_RANDOM.nextDouble(); + } + + public double randomDouble(double bound) { + return CURRENT_RANDOM.nextDouble(bound); + } + + public int randomInt() { + return CURRENT_RANDOM.nextInt(); + } + + public int randomInt(int bound) { + return CURRENT_RANDOM.nextInt(bound); + } + + public long randomLong() { + return CURRENT_RANDOM.nextLong(); + } + + public long randomLong(long bound) { + return CURRENT_RANDOM.nextLong(bound); + } +} diff --git a/src/main/java/net/zerotoil/dev/cybercore/CoreSettings.java b/src/main/java/net/zerotoil/dev/cybercore/CoreSettings.java deleted file mode 100644 index 5b2f720..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/CoreSettings.java +++ /dev/null @@ -1,100 +0,0 @@ -package net.zerotoil.dev.cybercore; - -import lombok.Getter; -import me.croabeast.beanslib.utility.LibUtils; -import org.apache.commons.lang3.SystemUtils; -import org.bukkit.ChatColor; - -public class CoreSettings { - - private final CyberCore main; - - @Getter - private String bootColor = ChatColor.translateAlternateColorCodes('&', "&8"); - - private String[] bootLogo = new String[]{ - "&8╭━━━╮&7╱╱╱&8╭╮&7╱╱╱╱╱╱&8╭━━━╮", - "&8┃╭━╮┃&7╱╱╱&8┃┃&7╱╱╱╱╱╱&8┃╭━╮┃", - "&8┃┃&7╱&8╰╋╮&7╱&8╭┫╰━┳━━┳━┫┃&7╱&8╰╋━━┳━┳━━╮", - "&8┃┃&7╱&8╭┫┃&7╱&8┃┃╭╮┃┃━┫╭┫┃&7╱&8╭┫╭╮┃╭┫┃━┫", - "&8┃╰━╯┃╰━╯┃╰╯┃┃━┫┃┃╰━╯┃╰╯┃┃┃┃━┫", - "&8╰━━━┻━╮╭┻━━┻━━┻╯╰━━━┻━━┻╯╰━━╯", - "&7╱╱╱╱&8╭━╯┃ &7Author: &fKihsomray", - "&7╱╱╱╱&8╰━━╯ &7Version: &7" - }; - - private String[] legacyBootLogo = new String[]{ - "&8_________ _________ __________", - "&8\\_ ___ \\ \\_ ___ \\ \\______ \\", - "&8/ \\ \\/ / \\ \\/ | _/", - "&8\\ \\____\\ \\____ | | \\", - "&8 \\______ / \\______ / |____|_ /", - "&8 \\/ \\/ \\/" - }; - - - public CoreSettings(CyberCore main) { - this.main = main; - } - - public void setBootColor(char chatColorChar) { - this.bootColor = ChatColor.translateAlternateColorCodes('&', "&" + chatColorChar); - } - - public void setBootLogo(String... logo) { - bootLogo = logo; - } - - public void setLegacyBootLogo(String... logo) { - legacyBootLogo = logo; - } - - private boolean isLegacyLogo() { - return SystemUtils.OS_NAME.contains("Windows") && LibUtils.majorJavaVersion() < 12; - } - - private String[] getLogo() { - return isLegacyLogo() ? legacyBootLogo : bootLogo; - } - - public String getStringLogo(boolean applyColor) { - StringBuilder builder = new StringBuilder(); - - for (String s : getLogo()) builder.append(s).append("\n"); - - if (builder.length() > 2) - builder = new StringBuilder(builder.substring(2)); - - if (applyColor) return main.textSettings().colorize(null, null, builder.toString()); - return builder.toString(); - } - - public String[] getArrayLogo(boolean applyColor) { - if (!applyColor) return getLogo(); - - String[] string = new String[getLogo().length]; - - for (int i = 0; i < getLogo().length; i++) - string[i] = main.textSettings().colorize(null, null, getLogo()[i]); - - return string; - } - - public String getBootBar() { - StringBuilder builder = new StringBuilder(); - - for (int i = 0; i < 48; i++) { - if (i == 0 && !isLegacyLogo()) builder.append(getBootColor()); - builder.append(isLegacyLogo() ? "-" : "―"); - } - - return builder + ""; - } - - public void sendBootHeader() { - main.logger(getBootBar()); - main.logger(getArrayLogo(true)); - main.logger(getBootBar(), "&7"); - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/CyberCore.java b/src/main/java/net/zerotoil/dev/cybercore/CyberCore.java deleted file mode 100644 index d5f7ba8..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/CyberCore.java +++ /dev/null @@ -1,465 +0,0 @@ -package net.zerotoil.dev.cybercore; - -import me.croabeast.beanslib.Beans; -import me.croabeast.beanslib.key.ValueReplacer; -import me.croabeast.beanslib.message.MessageSender; -import me.croabeast.beanslib.utility.LibUtils; -import me.croabeast.beanslib.utility.TextUtils; -import net.zerotoil.dev.cybercore.files.FileManager; -import net.zerotoil.dev.cybercore.objects.Lag; -import net.zerotoil.dev.cybercore.utilities.PlayerUtils; -import org.bukkit.Bukkit; -import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; -import org.bukkit.plugin.java.JavaPlugin; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.util.Arrays; -import java.util.List; -import java.util.stream.Collectors; - -public final class CyberCore { - - private final JavaPlugin plugin; - private TextSettings textUtilities; - private final CoreSettings settings; - - private final long bootStart; - - private FileManager files; - - /** - * Initialize your plugin with the core API. - * This should be your first step. - * - * After this you can adjust the settings by - * using coreSettings(). Be sure to set the boot - * color, author, version, boot logos. - * - * Be sure to call the method loadStart() whilst - * mentioning any additional files you want to - * load. Default files: config.yml & lang.yml. - * - * @param plugin Main instance - */ - public CyberCore(JavaPlugin plugin) { - this.plugin = plugin; - textUtilities = new TextSettings(this); - settings = new CoreSettings(this); - bootStart = System.currentTimeMillis(); - } - - /** - * Fully loads the core, displays boot message, - * and loads any additional files. - * - * Default files: config.yml & lang.yml. - * - * @param additionalFiles Additional files to load - */ - public void loadStart(String... additionalFiles) { - loadStart(true, additionalFiles); - } - - /** - * Fully loads the core, displays boot message, - * and loads any additional files. - * - * Default files: config.yml & lang.yml. - * - * @param loadFiles Should files be loaded - * @param additionalFiles Additional files to load - */ - public void loadStart(boolean loadFiles, String... additionalFiles) { - settings.sendBootHeader(); - if (loadFiles) loadFiles(false, additionalFiles); - loadTPS(); - } - - /** - * Loads files into cache for easy access. - * - * Default files: config.yml & lang.yml. - * - * @param bootHeader Should boot header be displayed - * @param additionalFiles Additional files to load - */ - public void loadFiles(boolean bootHeader, String... additionalFiles) { - if (bootHeader) settings.sendBootHeader(); - files = new FileManager(this); - files.load(additionalFiles); - } - - private void loadTPS() { - Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, new Lag(), 100L, 1L); - } - - /** - * Displays the finishing message to the load of - * you plugin. - */ - public void loadFinish() { - logger("&7Loaded " + themeColor() + plugin.getDescription().getPrefix() + " v" + - plugin.getDescription().getVersion() + "&7 in &a" + - (System.currentTimeMillis() - bootStart) + "ms&7."); - logger(settings.getBootBar()); - } - - /** - * Reloads BeansLib in the background. - */ - public void reload() { - textUtilities = new TextSettings(this); - } - - /** - * Gets instance of plugin attached to the core. - * - * @return Plugin that's attached to core - */ - public JavaPlugin getPlugin() { - return plugin; - } - - /** - * Gets the text settings. - * - * @return Text settings - */ - public TextSettings textSettings() { - return textUtilities; - } - - /** - * Gets the core settings. - * - * @return Core settings - */ - public CoreSettings coreSettings() { - return settings; - } - - /** - * Gets the file Manager. - * - * @return File manager - */ - public FileManager files() { - return files; - } - - /** - * Gets the major version of the server. - * - * @return Major version of the server - */ - @Deprecated - public static int getMajorVersion() { - return (int) getMainVersion(); - } - - /** - * Gets the major version of the server. - * - * @return Major version of the server - */ - public static double getMainVersion() { - return LibUtils.getMainVersion(); - } - - /** - * Gets full version of the server. - * - * @return Full version of the server - */ - public static String getServerVersion() { - return getFork().split(" ")[1]; - } - - /** - * Gets if the server is legacy. - * - * @return True if legacy - */ - public static boolean isLegacy() { - return getMajorVersion() > 12; - } - - /** - * Gets the fork of the server. - * - * @return Fork of the server - */ - public static String getFork() { - return LibUtils.serverFork(); - } - - /** - * Logs a message with correct prefix. - * - * @param message Message to log - */ - public void logger(String... message) { - textUtilities.doLog(message); - } - - /** - * Gets the boot color code character. - * - * @return Boot color code - */ - public String themeColor() { - return settings.getBootColor(); - } - - /** - * Gets the author(s) of the plugin. - * - * @return Author(s) of the plugin - */ - public String getAuthors() { - return plugin.getDescription().getAuthors().toString().replace("[", "").replace("]", ""); - } - - /** - * Send a message to a player or console - * if the player is null. The player's - * placeholders and chat colors will be - * applied in the process. - * - * @param sender Sender to send to - * @param messageKey Message in lang.yml - * @return true always - */ - public boolean sendMessage(@Nullable CommandSender sender, @NotNull String messageKey) { - return sendMessage(sender, messageKey, null); - } - - /** - * Send a message to a player or console - * if the player is null. The player's - * placeholders and chat colors will be - * applied in the process. - * - * Additional placeholders may be parsed - * if included in the placeholders field. - * - * @param sender Sender to send to - * @param messageKey Message in lang.yml - * @param placeholders Array of placeholders - * @param replacements Array of replacements for placeholders - * @return true always - */ - public boolean sendMessage(@Nullable CommandSender sender, @NotNull String messageKey, @Nullable String[] placeholders, @Nullable String... replacements) { - return sendMessage( - sender, - "lang", - "messages." + messageKey, - placeholders, - replacements - ); - } - - /** - * Send a message to a player or console - * if the player is null. The player's - * placeholders and chat colors will be - * applied in the process. - * - * Additional placeholders may be parsed - * if included in the placeholders field. - * - * @param sender Sender to send to - * @param file YAML file in question - * @param path Path in YAML file - * @param placeholders Array of placeholders - * @param replacements Array of replacements for placeholders - * @return true always - */ - public boolean sendMessage(@Nullable CommandSender sender, @NotNull String file, @NotNull String path, @Nullable String[] placeholders, @Nullable String... replacements) { - if (placeholders != null) placeholders = Arrays.copyOf(placeholders, placeholders.length); - if (replacements != null) replacements = Arrays.copyOf(replacements, replacements.length); - - // Split path into file and path - final String[] split = path.split("\\.", 2); - - // Overloaded method - return sendMessage( - sender, - TextUtils.toList(files.getConfig(file).getConfigurationSection(split[0]), split.length == 2 ? split[1] : null), - placeholders, - replacements - ); - } - - /** - * Send a message to a player or console - * if the player is null. The player's - * placeholders and chat colors will be - * applied in the process. - * - * Additional placeholders may be parsed - * if included in the placeholders field. - * - * @param sender Sender to send to - * @param placeholders Array of placeholders - * @param replacements Array of replacements for placeholders - * @return true always - */ - public boolean sendMessage(@Nullable CommandSender sender, @NotNull List messageList, @Nullable String[] placeholders, @Nullable String... replacements) { - if (placeholders != null) placeholders = Arrays.copyOf(placeholders, placeholders.length); - if (replacements != null) replacements = Arrays.copyOf(replacements, replacements.length); - - // Replace all actionbar placeholders with the correct ones - final List stringList = messageList - .stream() - .map(s -> s.replaceAll("(?i)\\[actionbar]", "[action-bar]")) - .collect(Collectors.toList()); - - try { - - // Message sender - final MessageSender ms = new MessageSender().setTargets(sender); - - // Placeholders and replacements - final String[] keys = PlayerUtils.applyPlaceholderBraces(placeholders); - - // Add all keys and values - if (keys != null && keys.length > 0) ms.addKeysValues(keys, replacements); - - // Send the message - ms.setLogger(false).setCaseSensitive(false).send(stringList); - - } catch (final Exception e) { - - // Log the error - Beans.doLog("Something went wrong sending the message: " + messageList); - } - - return true; - } - - /** - * Gets a message from lang.yml. The - * player's placeholders and chat colors - * will be applied in the process. - * - * @param sender Sender in question - * @param messageKey Message in lang.yml - * @return true always - */ - public String getMessage(@Nullable CommandSender sender, @NotNull String messageKey) { - return getMessage(sender, messageKey, null); - } - - /** - * Gets a message from lang.yml. The - * player's placeholders and chat colors - * will be applied in the process. - * - * Additional placeholders may be parsed - * if included in the placeholders field. - * - * @param sender Player in question - * @param messageKey Message in lang.yml - * @param placeholders Array of placeholders - * @param replacements Array of replacements for placeholders - * @return Message from lang - */ - public String getMessage(@Nullable CommandSender sender, @NotNull String messageKey, @Nullable String[] placeholders, @Nullable String... replacements) { - return getMessage(sender, "lang", "messages." + messageKey, placeholders, replacements); - } - - /** - * Gets a message from lang.yml. The - * player's placeholders and chat colors - * will be applied in the process. - * - * Additional placeholders may be parsed - * if included in the placeholders field. - * - * @param sender Sender to send to - * @param file YAML file in question - * @param path Path in YAML file - * @param placeholders Array of placeholders - * @param replacements Array of replacements for placeholders - * @return Message from lang - */ - public String getMessage(@Nullable CommandSender sender, @NotNull String file, @NotNull String path, @Nullable String[] placeholders, @Nullable String... replacements) { - return getLangValue( - sender, - file, - path, - PlayerUtils.applyPlaceholderBraces(placeholders), - replacements - ); - } - - /** - * Gets a value from a loaded yaml file - * with colors and placeholders parsed. - * - * @param sender Sender to send to - * @param file YAML file in question - * @param path Path in YAML file - * @param placeholders Array of placeholders - * @param replacements Array of placeholder replacements - * @return String within the file - */ - public String getLangValue(@Nullable CommandSender sender, @NotNull String file, @NotNull String path, @Nullable String[] placeholders, @Nullable String[] replacements) { - return ValueReplacer.forEach(placeholders, replacements, getLangValue(sender, file, path)); - } - - /** - * Gets a value from a loaded yaml file with - * colors applied. - * - * @param sender Sender to send to - * @param file YAML file in question - * @param path Path in YAML file - * @return String within the file - */ - public String getLangValue(@Nullable CommandSender sender, @NotNull String file, @NotNull String path) { - - final Player player = sender instanceof Player ? (Player) sender : null; - return textUtilities.colorize(player, player, getLangValue(file, path)); - - } - - /** - * Gets a raw value from a loaded yaml file. - * - * @param file YAML file in question - * @param path Path in YAML file - * @return String within the file - */ - public String getLangValue(@NotNull String file, @NotNull String path) { - return files.getConfig(file).getString(path); - } - - /** - * Used to check if server can run this plugin. - * Will return true if possible to run. - * - * @param minVersion Minimum version - * @param maxVersion Maximum version - * @param pluginPrefix Plugin prefix - * @param pluginVersion Plugin version - * @return True if within bounds - */ - public static boolean restrictVersions(int minVersion, int maxVersion, @NotNull String pluginPrefix, String pluginVersion) { - if (getMajorVersion() < minVersion) - Bukkit.getLogger().severe(pluginPrefix + " v" + pluginVersion + " does not support 1." + getMajorVersion() + ".x and older!"); - else if (getMajorVersion() > maxVersion) - Bukkit.getLogger().severe(pluginPrefix + " v" + pluginVersion + " does not support 1." + getMajorVersion() + ".x and newer. Please update!"); - else return true; - return false; - - } - - public String getPreviousVersion() { - return files.getConfig("plugin-data").getString("version.previous", plugin.getDescription().getVersion()); - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/TextSettings.java b/src/main/java/net/zerotoil/dev/cybercore/TextSettings.java deleted file mode 100644 index 0f538bc..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/TextSettings.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.zerotoil.dev.cybercore; - -import me.croabeast.beanslib.BeansLib; -import net.zerotoil.dev.cybercore.files.YAMLFile; -import org.bukkit.configuration.ConfigurationSection; - -public class TextSettings extends BeansLib { - - private final CyberCore core; - - public TextSettings(CyberCore core) { - super(core.getPlugin()); - this.core = core; - - setLangPrefixKey("{p}").setLangPrefix("&8&lCCR &8» &r"); - - setColoredConsole(new YAMLFile(core, core.getPlugin(), "config.yml").getConfig().getBoolean("config.console-color", true)); - setWebhookSection(new YAMLFile(core, core.getPlugin(), "lang.yml").getConfig().getConfigurationSection("webhooks")); - } - - @Deprecated - public TextSettings setPrefix(String prefix) { - return (TextSettings) setLangPrefix(prefix); - } - - @Deprecated - public TextSettings setPrefixKey(String key) { - return (TextSettings) setLangPrefixKey(key); - } - - @Deprecated - public String langPrefix() { - return getLangPrefix(); - } - - @Deprecated - public String langPrefixKey() { - return getLangPrefixKey(); - } -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/addons/Metrics.java b/src/main/java/net/zerotoil/dev/cybercore/addons/Metrics.java deleted file mode 100644 index c575332..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/addons/Metrics.java +++ /dev/null @@ -1,838 +0,0 @@ -package net.zerotoil.dev.cybercore.addons; - -import org.bukkit.Bukkit; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.entity.Player; -import org.bukkit.plugin.Plugin; -import org.bukkit.plugin.java.JavaPlugin; - -import javax.net.ssl.HttpsURLConnection; -import java.io.*; -import java.lang.reflect.Method; -import java.net.URL; -import java.nio.charset.StandardCharsets; -import java.util.*; -import java.util.concurrent.Callable; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; -import java.util.function.BiConsumer; -import java.util.function.Consumer; -import java.util.function.Supplier; -import java.util.logging.Level; -import java.util.stream.Collectors; -import java.util.zip.GZIPOutputStream; - -public class Metrics { - - private final Plugin plugin; - - private final MetricsBase metricsBase; - - /** - * Creates a new Metrics instance. - * - * @param plugin Your plugin instance. - * @param serviceId The id of the service. It can be found at What is my plugin id? - */ - public Metrics(JavaPlugin plugin, int serviceId) { - this.plugin = plugin; - // Get the config file - File bStatsFolder = new File(plugin.getDataFolder().getParentFile(), "bStats"); - File configFile = new File(bStatsFolder, "config.yml"); - YamlConfiguration config = YamlConfiguration.loadConfiguration(configFile); - if (!config.isSet("serverUuid")) { - config.addDefault("enabled", true); - config.addDefault("serverUuid", UUID.randomUUID().toString()); - config.addDefault("logFailedRequests", false); - config.addDefault("logSentData", false); - config.addDefault("logResponseStatusText", false); - // Inform the server owners about bStats - config - .options() - .header( - "bStats (https://bStats.org) collects some basic information for plugin authors, like how\n" - + "many people use their plugin and their total player count. It's recommended to keep bStats\n" - + "enabled, but if you're not comfortable with this, you can turn this setting off. There is no\n" - + "performance penalty associated with having metrics enabled, and data sent to bStats is fully\n" - + "anonymous.") - .copyDefaults(true); - try { - config.save(configFile); - } catch (IOException ignored) { - } - } - // Load the data - boolean enabled = config.getBoolean("enabled", true); - String serverUUID = config.getString("serverUuid"); - boolean logErrors = config.getBoolean("logFailedRequests", false); - boolean logSentData = config.getBoolean("logSentData", false); - boolean logResponseStatusText = config.getBoolean("logResponseStatusText", false); - metricsBase = - new MetricsBase( - "bukkit", - serverUUID, - serviceId, - enabled, - this::appendPlatformData, - this::appendServiceData, - submitDataTask -> Bukkit.getScheduler().runTask(plugin, submitDataTask), - plugin::isEnabled, - (message, error) -> this.plugin.getLogger().log(Level.WARNING, message, error), - (message) -> this.plugin.getLogger().log(Level.INFO, message), - logErrors, - logSentData, - logResponseStatusText); - } - - /** - * Adds a custom chart. - * - * @param chart The chart to add. - */ - public void addCustomChart(CustomChart chart) { - metricsBase.addCustomChart(chart); - } - - private void appendPlatformData(JsonObjectBuilder builder) { - builder.appendField("playerAmount", getPlayerAmount()); - builder.appendField("onlineMode", Bukkit.getOnlineMode() ? 1 : 0); - builder.appendField("bukkitVersion", Bukkit.getVersion()); - builder.appendField("bukkitName", Bukkit.getName()); - builder.appendField("javaVersion", System.getProperty("java.version")); - builder.appendField("osName", System.getProperty("os.name")); - builder.appendField("osArch", System.getProperty("os.arch")); - builder.appendField("osVersion", System.getProperty("os.version")); - builder.appendField("coreCount", Runtime.getRuntime().availableProcessors()); - } - - private void appendServiceData(JsonObjectBuilder builder) { - builder.appendField("pluginVersion", plugin.getDescription().getVersion().replace("-SNAPSHOT", "b")); - } - - private int getPlayerAmount() { - try { - // Around MC 1.8 the return type was changed from an array to a collection, - // This fixes java.lang.NoSuchMethodError: - // org.bukkit.Bukkit.getOnlinePlayers()Ljava/util/Collection; - Method onlinePlayersMethod = Class.forName("org.bukkit.Server").getMethod("getOnlinePlayers"); - return onlinePlayersMethod.getReturnType().equals(Collection.class) - ? ((Collection) onlinePlayersMethod.invoke(Bukkit.getServer())).size() - : ((Player[]) onlinePlayersMethod.invoke(Bukkit.getServer())).length; - } catch (Exception e) { - // Just use the new method if the reflection failed - return Bukkit.getOnlinePlayers().size(); - } - } - - public static class MetricsBase { - - /** The version of the Metrics class. */ - public static final String METRICS_VERSION = "2.2.1"; - - private static final ScheduledExecutorService scheduler = - Executors.newScheduledThreadPool(1, task -> new Thread(task, "bStats-Metrics")); - - private static final String REPORT_URL = "https://bStats.org/api/v2/data/%s"; - - private final String platform; - - private final String serverUuid; - - private final int serviceId; - - private final Consumer appendPlatformDataConsumer; - - private final Consumer appendServiceDataConsumer; - - private final Consumer submitTaskConsumer; - - private final Supplier checkServiceEnabledSupplier; - - private final BiConsumer errorLogger; - - private final Consumer infoLogger; - - private final boolean logErrors; - - private final boolean logSentData; - - private final boolean logResponseStatusText; - - private final Set customCharts = new HashSet<>(); - - private final boolean enabled; - - /** - * Creates a new MetricsBase class instance. - * - * @param platform The platform of the service. - * @param serviceId The id of the service. - * @param serverUuid The server uuid. - * @param enabled Whether or not data sending is enabled. - * @param appendPlatformDataConsumer A consumer that receives a {@code JsonObjectBuilder} and - * appends all platform-specific data. - * @param appendServiceDataConsumer A consumer that receives a {@code JsonObjectBuilder} and - * appends all service-specific data. - * @param submitTaskConsumer A consumer that takes a runnable with the submit task. This can be - * used to delegate the data collection to a another thread to prevent errors caused by - * concurrency. Can be {@code null}. - * @param checkServiceEnabledSupplier A supplier to check if the service is still enabled. - * @param errorLogger A consumer that accepts log message and an error. - * @param infoLogger A consumer that accepts info log messages. - * @param logErrors Whether or not errors should be logged. - * @param logSentData Whether or not the sent data should be logged. - * @param logResponseStatusText Whether or not the response status text should be logged. - */ - public MetricsBase( - String platform, - String serverUuid, - int serviceId, - boolean enabled, - Consumer appendPlatformDataConsumer, - Consumer appendServiceDataConsumer, - Consumer submitTaskConsumer, - Supplier checkServiceEnabledSupplier, - BiConsumer errorLogger, - Consumer infoLogger, - boolean logErrors, - boolean logSentData, - boolean logResponseStatusText) { - this.platform = platform; - this.serverUuid = serverUuid; - this.serviceId = serviceId; - this.enabled = enabled; - this.appendPlatformDataConsumer = appendPlatformDataConsumer; - this.appendServiceDataConsumer = appendServiceDataConsumer; - this.submitTaskConsumer = submitTaskConsumer; - this.checkServiceEnabledSupplier = checkServiceEnabledSupplier; - this.errorLogger = errorLogger; - this.infoLogger = infoLogger; - this.logErrors = logErrors; - this.logSentData = logSentData; - this.logResponseStatusText = logResponseStatusText; - checkRelocation(); - if (enabled) { - startSubmitting(); - } - } - - public void addCustomChart(CustomChart chart) { - this.customCharts.add(chart); - } - - private void startSubmitting() { - final Runnable submitTask = - () -> { - if (!enabled || !checkServiceEnabledSupplier.get()) { - // Submitting data or service is disabled - scheduler.shutdown(); - return; - } - if (submitTaskConsumer != null) { - submitTaskConsumer.accept(this::submitData); - } else { - this.submitData(); - } - }; - // Many servers tend to restart at a fixed time at xx:00 which causes an uneven distribution - // of requests on the - // bStats backend. To circumvent this problem, we introduce some randomness into the initial - // and second delay. - // WARNING: You must not modify and part of this Metrics class, including the submit delay or - // frequency! - // WARNING: Modifying this code will get your plugin banned on bStats. Just don't do it! - long initialDelay = (long) (1000 * 60 * (3 + Math.random() * 3)); - long secondDelay = (long) (1000 * 60 * (Math.random() * 30)); - scheduler.schedule(submitTask, initialDelay, TimeUnit.MILLISECONDS); - scheduler.scheduleAtFixedRate( - submitTask, initialDelay + secondDelay, 1000 * 60 * 30, TimeUnit.MILLISECONDS); - } - - private void submitData() { - final JsonObjectBuilder baseJsonBuilder = new JsonObjectBuilder(); - appendPlatformDataConsumer.accept(baseJsonBuilder); - final JsonObjectBuilder serviceJsonBuilder = new JsonObjectBuilder(); - appendServiceDataConsumer.accept(serviceJsonBuilder); - JsonObjectBuilder.JsonObject[] chartData = - customCharts.stream() - .map(customChart -> customChart.getRequestJsonObject(errorLogger, logErrors)) - .filter(Objects::nonNull) - .toArray(JsonObjectBuilder.JsonObject[]::new); - serviceJsonBuilder.appendField("id", serviceId); - serviceJsonBuilder.appendField("customCharts", chartData); - baseJsonBuilder.appendField("service", serviceJsonBuilder.build()); - baseJsonBuilder.appendField("serverUUID", serverUuid); - baseJsonBuilder.appendField("metricsVersion", METRICS_VERSION); - JsonObjectBuilder.JsonObject data = baseJsonBuilder.build(); - scheduler.execute( - () -> { - try { - // Send the data - sendData(data); - } catch (Exception e) { - // Something went wrong! :( - if (logErrors) { - errorLogger.accept("Could not submit bStats metrics data", e); - } - } - }); - } - - private void sendData(JsonObjectBuilder.JsonObject data) throws Exception { - if (logSentData) { - infoLogger.accept("Sent bStats metrics data: " + data.toString()); - } - String url = String.format(REPORT_URL, platform); - HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection(); - // Compress the data to save bandwidth - byte[] compressedData = compress(data.toString()); - connection.setRequestMethod("POST"); - connection.addRequestProperty("Accept", "application/json"); - connection.addRequestProperty("Connection", "close"); - connection.addRequestProperty("Content-Encoding", "gzip"); - connection.addRequestProperty("Content-Length", String.valueOf(compressedData.length)); - connection.setRequestProperty("Content-Type", "application/json"); - connection.setRequestProperty("User-Agent", "Metrics-Service/1"); - connection.setDoOutput(true); - try (DataOutputStream outputStream = new DataOutputStream(connection.getOutputStream())) { - outputStream.write(compressedData); - } - StringBuilder builder = new StringBuilder(); - try (BufferedReader bufferedReader = - new BufferedReader(new InputStreamReader(connection.getInputStream()))) { - String line; - while ((line = bufferedReader.readLine()) != null) { - builder.append(line); - } - } - if (logResponseStatusText) { - infoLogger.accept("Sent data to bStats and received response: " + builder); - } - } - - /** Checks that the class was properly relocated. */ - private void checkRelocation() { - // You can use the property to disable the check in your test environment - if (System.getProperty("bstats.relocatecheck") == null - || !System.getProperty("bstats.relocatecheck").equals("false")) { - // Maven's Relocate is clever and changes strings, too. So we have to use this little - // "trick" ... :D - final String defaultPackage = - new String(new byte[] {'o', 'r', 'g', '.', 'b', 's', 't', 'a', 't', 's'}); - final String examplePackage = - new String(new byte[] {'y', 'o', 'u', 'r', '.', 'p', 'a', 'c', 'k', 'a', 'g', 'e'}); - // We want to make sure no one just copy & pastes the example and uses the wrong package - // names - if (MetricsBase.class.getPackage().getName().startsWith(defaultPackage) - || MetricsBase.class.getPackage().getName().startsWith(examplePackage)) { - throw new IllegalStateException("bStats Metrics class has not been relocated correctly!"); - } - } - } - - /** - * Gzips the given string. - * - * @param str The string to gzip. - * @return The gzipped string. - */ - private static byte[] compress(final String str) throws IOException { - if (str == null) { - return null; - } - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); - try (GZIPOutputStream gzip = new GZIPOutputStream(outputStream)) { - gzip.write(str.getBytes(StandardCharsets.UTF_8)); - } - return outputStream.toByteArray(); - } - } - - public static class AdvancedBarChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public AdvancedBarChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue().length == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class SimpleBarChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SimpleBarChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - for (Map.Entry entry : map.entrySet()) { - valuesBuilder.appendField(entry.getKey(), new int[] {entry.getValue()}); - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class MultiLineChart extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public MultiLineChart(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue() == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public static class AdvancedPie extends CustomChart { - - private final Callable> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public AdvancedPie(String chartId, Callable> callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean allSkipped = true; - for (Map.Entry entry : map.entrySet()) { - if (entry.getValue() == 0) { - // Skip this invalid - continue; - } - allSkipped = false; - valuesBuilder.appendField(entry.getKey(), entry.getValue()); - } - if (allSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - public abstract static class CustomChart { - - private final String chartId; - - protected CustomChart(String chartId) { - if (chartId == null) { - throw new IllegalArgumentException("chartId must not be null"); - } - this.chartId = chartId; - } - - public JsonObjectBuilder.JsonObject getRequestJsonObject( - BiConsumer errorLogger, boolean logErrors) { - JsonObjectBuilder builder = new JsonObjectBuilder(); - builder.appendField("chartId", chartId); - try { - JsonObjectBuilder.JsonObject data = getChartData(); - if (data == null) { - // If the data is null we don't send the chart. - return null; - } - builder.appendField("data", data); - } catch (Throwable t) { - if (logErrors) { - errorLogger.accept("Failed to get data for custom chart with id " + chartId, t); - } - return null; - } - return builder.build(); - } - - protected abstract JsonObjectBuilder.JsonObject getChartData() throws Exception; - } - - public static class SingleLineChart extends CustomChart { - - private final Callable callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SingleLineChart(String chartId, Callable callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - int value = callable.call(); - if (value == 0) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("value", value).build(); - } - } - - public static class SimplePie extends CustomChart { - - private final Callable callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public SimplePie(String chartId, Callable callable) { - super(chartId); - this.callable = callable; - } - - @Override - protected JsonObjectBuilder.JsonObject getChartData() throws Exception { - String value = callable.call(); - if (value == null || value.isEmpty()) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("value", value).build(); - } - } - - public static class DrilldownPie extends CustomChart { - - private final Callable>> callable; - - /** - * Class constructor. - * - * @param chartId The id of the chart. - * @param callable The callable which is used to request the chart data. - */ - public DrilldownPie(String chartId, Callable>> callable) { - super(chartId); - this.callable = callable; - } - - @Override - public JsonObjectBuilder.JsonObject getChartData() throws Exception { - JsonObjectBuilder valuesBuilder = new JsonObjectBuilder(); - Map> map = callable.call(); - if (map == null || map.isEmpty()) { - // Null = skip the chart - return null; - } - boolean reallyAllSkipped = true; - for (Map.Entry> entryValues : map.entrySet()) { - JsonObjectBuilder valueBuilder = new JsonObjectBuilder(); - boolean allSkipped = true; - for (Map.Entry valueEntry : map.get(entryValues.getKey()).entrySet()) { - valueBuilder.appendField(valueEntry.getKey(), valueEntry.getValue()); - allSkipped = false; - } - if (!allSkipped) { - reallyAllSkipped = false; - valuesBuilder.appendField(entryValues.getKey(), valueBuilder.build()); - } - } - if (reallyAllSkipped) { - // Null = skip the chart - return null; - } - return new JsonObjectBuilder().appendField("values", valuesBuilder.build()).build(); - } - } - - /** - * An extremely simple JSON builder. - * - *

While this class is neither feature-rich nor the most performant one, it's sufficient enough - * for its use-case. - */ - public static class JsonObjectBuilder { - - private StringBuilder builder = new StringBuilder(); - - private boolean hasAtLeastOneField = false; - - public JsonObjectBuilder() { - builder.append("{"); - } - - /** - * Appends a null field to the JSON. - * - * @param key The key of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendNull(String key) { - appendFieldUnescaped(key, "null"); - return this; - } - - /** - * Appends a string field to the JSON. - * - * @param key The key of the field. - * @param value The value of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, String value) { - if (value == null) { - throw new IllegalArgumentException("JSON value must not be null"); - } - appendFieldUnescaped(key, "\"" + escape(value) + "\""); - return this; - } - - /** - * Appends an integer field to the JSON. - * - * @param key The key of the field. - * @param value The value of the field. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, int value) { - appendFieldUnescaped(key, String.valueOf(value)); - return this; - } - - /** - * Appends an object to the JSON. - * - * @param key The key of the field. - * @param object The object. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, JsonObject object) { - if (object == null) { - throw new IllegalArgumentException("JSON object must not be null"); - } - appendFieldUnescaped(key, object.toString()); - return this; - } - - /** - * Appends a string array to the JSON. - * - * @param key The key of the field. - * @param values The string array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, String[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values) - .map(value -> "\"" + escape(value) + "\"") - .collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends an integer array to the JSON. - * - * @param key The key of the field. - * @param values The integer array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, int[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values).mapToObj(String::valueOf).collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends an object array to the JSON. - * - * @param key The key of the field. - * @param values The integer array. - * @return A reference to this object. - */ - public JsonObjectBuilder appendField(String key, JsonObject[] values) { - if (values == null) { - throw new IllegalArgumentException("JSON values must not be null"); - } - String escapedValues = - Arrays.stream(values).map(JsonObject::toString).collect(Collectors.joining(",")); - appendFieldUnescaped(key, "[" + escapedValues + "]"); - return this; - } - - /** - * Appends a field to the object. - * - * @param key The key of the field. - * @param escapedValue The escaped value of the field. - */ - private void appendFieldUnescaped(String key, String escapedValue) { - if (builder == null) { - throw new IllegalStateException("JSON has already been built"); - } - if (key == null) { - throw new IllegalArgumentException("JSON key must not be null"); - } - if (hasAtLeastOneField) { - builder.append(","); - } - builder.append("\"").append(escape(key)).append("\":").append(escapedValue); - hasAtLeastOneField = true; - } - - /** - * Builds the JSON string and invalidates this builder. - * - * @return The built JSON string. - */ - public JsonObject build() { - if (builder == null) { - throw new IllegalStateException("JSON has already been built"); - } - JsonObject object = new JsonObject(builder.append("}").toString()); - builder = null; - return object; - } - - /** - * Escapes the given string like stated in https://www.ietf.org/rfc/rfc4627.txt. - * - *

This method escapes only the necessary characters '"', '\'. and '\u0000' - '\u001F'. - * Compact escapes are not used (e.g., '\n' is escaped as "\u000a" and not as "\n"). - * - * @param value The value to escape. - * @return The escaped value. - */ - private static String escape(String value) { - final StringBuilder builder = new StringBuilder(); - for (int i = 0; i < value.length(); i++) { - char c = value.charAt(i); - if (c == '"') { - builder.append("\\\""); - } else if (c == '\\') { - builder.append("\\\\"); - } else if (c <= '\u000F') { - builder.append("\\u000").append(Integer.toHexString(c)); - } else if (c <= '\u001F') { - builder.append("\\u00").append(Integer.toHexString(c)); - } else { - builder.append(c); - } - } - return builder.toString(); - } - - /** - * A super simple representation of a JSON object. - * - *

This class only exists to make methods of the {@link JsonObjectBuilder} type-safe and not - * allow a raw string inputs for methods like {@link JsonObjectBuilder#appendField(String, - * JsonObject)}. - */ - public static class JsonObject { - - private final String value; - - private JsonObject(String value) { - this.value = value; - } - - @Override - public String toString() { - return value; - } - } - } -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/files/FileManager.java b/src/main/java/net/zerotoil/dev/cybercore/files/FileManager.java deleted file mode 100644 index 91247f6..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/files/FileManager.java +++ /dev/null @@ -1,54 +0,0 @@ -package net.zerotoil.dev.cybercore.files; - -import net.zerotoil.dev.cybercore.CyberCore; -import org.bukkit.configuration.Configuration; - -import java.util.HashMap; - -public class FileManager { - - private final CyberCore main; - private final HashMap files = new HashMap<>(); - - public FileManager(CyberCore main) { - this.main = main; - } - - public void load(String... additionalFiles) { - load(true, true, additionalFiles); - } - - public void load(boolean sendMessages, boolean defaultFiles, String... fileNames) { - if (!files.isEmpty()) files.clear(); - if (sendMessages) main.logger(main.themeColor() + "Loading YAML files..."); - long startTime = System.currentTimeMillis(); - - if (defaultFiles) { - addFile("config", sendMessages); - addFile("lang", sendMessages); - } - - for (String string : fileNames) addFile(string, sendMessages); - - if (sendMessages) main.logger("&7Loaded &e" + files.size() + "&7 files in &a" + (System.currentTimeMillis() - startTime) + "ms&7.", "&7"); - } - - public void addFile(String file, boolean sendMessages) { - files.put(file, new YAMLFile(main, main.getPlugin(), file + ".yml")); - files.get(file).reloadConfig(); - if (sendMessages) main.logger("&7Loaded file &e" + file + ".yml&7."); - } - - - public HashMap getFiles() { - return this.files; - } - public YAMLFile get(String file){ - return files.get(file); - } - public Configuration getConfig(String file) { - return files.get(file).getConfig(); - } - - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/files/YAMLFile.java b/src/main/java/net/zerotoil/dev/cybercore/files/YAMLFile.java deleted file mode 100644 index 11dcfe9..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/files/YAMLFile.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.zerotoil.dev.cybercore.files; - -import net.zerotoil.dev.cybercore.CyberCore; -import net.zerotoil.dev.cybercore.files.configupdater.ConfigUpdater; -import org.bukkit.plugin.java.JavaPlugin; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; - -import java.io.IOException; -import java.util.Collections; - -public class YAMLFile { - - private final CyberCore main; - private final JavaPlugin plugin; - private java.io.File configFile; - private FileConfiguration dataConfig; - private final String location; - private final String name; - - public YAMLFile(CyberCore main, JavaPlugin plugin, String location) { - this.main = main; - this.plugin = plugin; - this.location = location; - this.name = location.replace(".yml", ""); - saveDefaultConfig(); - dataConfig = YamlConfiguration.loadConfiguration(getFile()); - } - - private java.io.File getFile() { - return new java.io.File(plugin.getDataFolder(), location); - } - - public FileConfiguration getConfig() { - return dataConfig; - } - - public void saveConfig() throws IOException { - if (!((this.dataConfig == null) || (this.configFile == null))) { - this.getConfig().save(this.configFile); - } - } - - public void updateConfig() { - try { - ConfigUpdater.update(plugin, location, getFile(), Collections.emptyList()); - if (main.isLegacy()) ConfigUpdater.update(plugin, location, getFile(), Collections.emptyList()); - } catch (IOException e) { - e.printStackTrace(); - } - reloadConfig(); - } - - public void reloadConfig() { - dataConfig = YamlConfiguration.loadConfiguration(getFile()); - } - - public void saveDefaultConfig() { - if (configFile == null) { - configFile = getFile(); - } - - if (configFile.exists()) { - return; - } - plugin.saveResource(location, false); - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/ConfigUpdater.java b/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/ConfigUpdater.java deleted file mode 100644 index e450ba9..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/ConfigUpdater.java +++ /dev/null @@ -1,243 +0,0 @@ -package net.zerotoil.dev.cybercore.files.configupdater; - -import com.google.common.base.Preconditions; -import org.bukkit.Bukkit; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.configuration.file.FileConfiguration; -import org.bukkit.configuration.file.YamlConfiguration; -import org.bukkit.plugin.Plugin; - -import java.io.*; -import java.nio.charset.StandardCharsets; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; - -public class ConfigUpdater { - - //Used for separating keys in the keyBuilder inside parseComments method - private static final char SEPARATOR = '.'; - - public static void update(Plugin plugin, String resourceName, File toUpdate, List ignoredSections) throws IOException { - Preconditions.checkArgument(toUpdate.exists(), "The toUpdate file doesn't exist!"); - - FileConfiguration defaultConfig = YamlConfiguration.loadConfiguration(new InputStreamReader(plugin.getResource(resourceName), StandardCharsets.UTF_8)); - FileConfiguration currentConfig = YamlConfiguration.loadConfiguration(toUpdate); - Map comments = parseComments(plugin, resourceName, defaultConfig); - Map ignoredSectionsValues = parseIgnoredSections(toUpdate, currentConfig, comments, ignoredSections == null ? Collections.emptyList() : ignoredSections); - - // will write updated config file "contents" to a string - StringWriter writer = new StringWriter(); - write(defaultConfig, currentConfig, new BufferedWriter(writer), comments, ignoredSectionsValues); - String value = replace(writer.toString()); // config contents - - Path toUpdatePath = toUpdate.toPath(); - if (!value.equals(new String(Files.readAllBytes(toUpdatePath), StandardCharsets.UTF_8))) { // if updated contents are not the same as current file contents, update - Files.write(toUpdatePath, value.getBytes(StandardCharsets.UTF_8)); - } - } - - private static int getVersion() { - return Integer.parseInt(Bukkit.getBukkitVersion().split("-")[0].split("\\.")[1]); - } - - private static String replace(String string) { - if (getVersion() < 13) - return string.replace("\\xe2", "").replace("\\u20ac", "-").replace("\\u2022", "-") - .replace("\\u017e", "-").replace("\\xbc", "").replace("\\xc2", ">") - .replace("\\xbb", ">").replace("\\", "").replace("- -", "--") - .replace("---------------------------------------------------------", "-----------------------------------------------"); - return string; - } - - private static void write(FileConfiguration defaultConfig, FileConfiguration currentConfig, BufferedWriter writer, Map comments, Map ignoredSectionsValues) throws IOException { - //Used for converting objects to yaml, then cleared - FileConfiguration parserConfig = new YamlConfiguration(); - - keyLoop: for (String fullKey : defaultConfig.getKeys(true)) { - String indents = KeyBuilder.getIndents(fullKey, SEPARATOR); - - if (ignoredSectionsValues.isEmpty()) { - writeCommentIfExists(comments, writer, fullKey, indents); - } else { - for (Map.Entry entry : ignoredSectionsValues.entrySet()) { - if (entry.getKey().equals(fullKey)) { - writer.write(replace(entry.getValue()) + "\n"); - continue keyLoop; - } else if (KeyBuilder.isSubKeyOf(entry.getKey(), fullKey, SEPARATOR)) { - continue keyLoop; - } else { - writeCommentIfExists(comments, writer, fullKey, indents); - } - } - } - - Object currentValue = currentConfig.get(fullKey); - - if (currentValue == null) - currentValue = defaultConfig.get(fullKey); - - String[] splitFullKey = fullKey.split("[" + SEPARATOR + "]"); - String trailingKey = splitFullKey[splitFullKey.length - 1]; - - if (currentValue instanceof ConfigurationSection) { - writer.write(indents + trailingKey + ":"); - - if (!((ConfigurationSection) currentValue).getKeys(false).isEmpty()) - writer.write("\n"); - else - writer.write(" {}\n"); - - continue; - } - - parserConfig.set(trailingKey, currentValue); - String yaml = parserConfig.saveToString(); - yaml = yaml.substring(0, yaml.length() - 1).replace("\n", "\n" + indents); - String toWrite = indents + yaml + "\n"; - parserConfig.set(trailingKey, null); - writer.write(toWrite); - } - - String danglingComments = comments.get(null); - - if (danglingComments != null) - writer.write(danglingComments); - - writer.close(); - } - - //Returns a map of key comment pairs. If a key doesn't have any comments it won't be included in the map. - private static Map parseComments(Plugin plugin, String resourceName, FileConfiguration defaultConfig) throws IOException { - BufferedReader reader = new BufferedReader(new InputStreamReader(plugin.getResource(resourceName))); - Map comments = new LinkedHashMap<>(); - StringBuilder commentBuilder = new StringBuilder(); - KeyBuilder keyBuilder = new KeyBuilder(defaultConfig, SEPARATOR); - - String line; - while ((line = reader.readLine()) != null) { - String trimmedLine = line.trim(); - - //Only getting comments for keys. A list/array element comment(s) not supported - if (trimmedLine.startsWith("-")) { - continue; - } - - if (trimmedLine.isEmpty() || trimmedLine.startsWith("#")) {//Is blank line or is comment - commentBuilder.append(trimmedLine).append("\n"); - } else {//is a valid yaml key - keyBuilder.parseLine(trimmedLine); - String key = keyBuilder.toString(); - - //If there is a comment associated with the key it is added to comments map and the commentBuilder is reset - if (commentBuilder.length() > 0) { - comments.put(key, commentBuilder.toString()); - commentBuilder.setLength(0); - } - - //Remove the last key from keyBuilder if current path isn't a config section or if it is empty to prepare for the next key - if (!keyBuilder.isConfigSectionWithKeys()) { - keyBuilder.removeLastKey(); - } - } - } - - reader.close(); - - if (commentBuilder.length() > 0) - comments.put(null, commentBuilder.toString()); - - return comments; - } - - private static Map parseIgnoredSections(File toUpdate, FileConfiguration currentConfig, Map comments, List ignoredSections) throws IOException { - BufferedReader reader = new BufferedReader(new FileReader(toUpdate)); - Map ignoredSectionsValues = new LinkedHashMap<>(ignoredSections.size()); - KeyBuilder keyBuilder = new KeyBuilder(currentConfig, SEPARATOR); - StringBuilder valueBuilder = new StringBuilder(); - - String currentIgnoredSection = null; - String line; - while ((line = reader.readLine()) != null) { - String trimmedLine = line.trim(); - - if (trimmedLine.isEmpty() || trimmedLine.startsWith("#") || trimmedLine.startsWith("-")) - continue; - - keyBuilder.parseLine(trimmedLine); - String fullKey = keyBuilder.toString(); - - //If building the value for an ignored section and this line is no longer a part of the ignored section, - // write the valueBuilder, reset it, and set the current ignored section to null - if (currentIgnoredSection != null && !KeyBuilder.isSubKeyOf(currentIgnoredSection, fullKey, SEPARATOR)) { - ignoredSectionsValues.put(currentIgnoredSection, valueBuilder.toString()); - valueBuilder.setLength(0); - currentIgnoredSection = null; - } - - for (String ignoredSection : ignoredSections) { - boolean isIgnoredParent = ignoredSection.equals(fullKey); - - if (isIgnoredParent || keyBuilder.isSubKeyOf(ignoredSection)) { - if (valueBuilder.length() > 0) - valueBuilder.append("\n"); - - String comment = comments.get(fullKey); - - if (comment != null) { - String indents = KeyBuilder.getIndents(fullKey, SEPARATOR); - valueBuilder.append(indents).append(comment.replace("\n", "\n" + indents));//Should end with new line (\n) - valueBuilder.setLength(valueBuilder.length() - indents.length());//Get rid of trailing \n and spaces - } - - valueBuilder.append(line); - - //Set the current ignored section for future iterations of while loop - //Don't set currentIgnoredSection to any ignoredSection sub-keys - if (isIgnoredParent) - currentIgnoredSection = fullKey; - - break; - } - } - } - - reader.close(); - - if (valueBuilder.length() > 0) - ignoredSectionsValues.put(currentIgnoredSection, valueBuilder.toString()); - - return ignoredSectionsValues; - } - - private static void writeCommentIfExists(Map comments, BufferedWriter writer, String fullKey, String indents) throws IOException { - String comment = comments.get(fullKey); - - //Comments always end with new line (\n) - if (comment != null) - //Replaces all '\n' with '\n' + indents except for the last one - writer.write(indents + comment.substring(0, comment.length() - 1).replace("\n", "\n" + indents) + "\n"); - } - - //Input: 'key1.key2' Result: 'key1' - private static void removeLastKey(StringBuilder keyBuilder) { - if (keyBuilder.length() == 0) - return; - - String keyString = keyBuilder.toString(); - //Must be enclosed in brackets in case a regex special character is the separator - String[] split = keyString.split("[" + SEPARATOR + "]"); - //Makes sure begin index isn't < 0 (error). Occurs when there is only one key in the path - int minIndex = Math.max(0, keyBuilder.length() - split[split.length - 1].length() - 1); - keyBuilder.replace(minIndex, keyBuilder.length(), ""); - } - - private static void appendNewLine(StringBuilder builder) { - if (builder.length() > 0) - builder.append("\n"); - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/KeyBuilder.java b/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/KeyBuilder.java deleted file mode 100644 index c901c8d..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/files/configupdater/KeyBuilder.java +++ /dev/null @@ -1,116 +0,0 @@ -package net.zerotoil.dev.cybercore.files.configupdater; - -import org.bukkit.configuration.file.FileConfiguration; - -public class KeyBuilder implements Cloneable { - - private final FileConfiguration config; - private final char separator; - private final StringBuilder builder; - - public KeyBuilder(FileConfiguration config, char separator) { - this.config = config; - this.separator = separator; - this.builder = new StringBuilder(); - } - - private KeyBuilder(KeyBuilder keyBuilder) { - this.config = keyBuilder.config; - this.separator = keyBuilder.separator; - this.builder = new StringBuilder(keyBuilder.toString()); - } - - public void parseLine(String line) { - line = line.trim(); - String[] currentSplitLine = line.split(":"); - - //Checks keyBuilder path against config to see if the path is valid. - //If the path doesn't exist in the config it keeps removing last key in keyBuilder. - while (builder.length() > 0 && !config.contains(builder.toString() + separator + currentSplitLine[0])) { - removeLastKey(); - } - - //Add the separator if there is already a key inside keyBuilder - //If currentSplitLine[0] is 'key2' and keyBuilder contains 'key1' the result will be 'key1.' if '.' is the separator - if (builder.length() > 0) - builder.append(separator); - - //Appends the current key to keyBuilder - //If keyBuilder is 'key1.' and currentSplitLine[0] is 'key2' the resulting keyBuilder will be 'key1.key2' if separator is '.' - builder.append(currentSplitLine[0]); - } - - public String getLastKey() { - if (builder.length() == 0) - return ""; - - return builder.toString().split("[" + separator + "]")[0]; - } - - public boolean isEmpty() { - return builder.length() == 0; - } - - //Checks to see if the full key path represented by this instance is a sub-key of the key parameter - public boolean isSubKeyOf(String parentKey) { - return isSubKeyOf(parentKey, builder.toString(), separator); - } - - //Checks to see if subKey is a sub-key of the key path this instance represents - public boolean isSubKey(String subKey) { - return isSubKeyOf(builder.toString(), subKey, separator); - } - - public static boolean isSubKeyOf(String parentKey, String subKey, char separator) { - if (parentKey.isEmpty()) - return false; - - return subKey.startsWith(parentKey) - && subKey.substring(parentKey.length()).startsWith(String.valueOf(separator)); - } - - public static String getIndents(String key, char separator) { - String[] splitKey = key.split("[" + separator + "]"); - StringBuilder builder = new StringBuilder(); - - for (int i = 1; i < splitKey.length; i++) { - builder.append(" "); - } - - return builder.toString(); - } - - public boolean isConfigSection() { - String key = builder.toString(); - return config.isConfigurationSection(key); - } - - public boolean isConfigSectionWithKeys() { - String key = builder.toString(); - return config.isConfigurationSection(key) && !config.getConfigurationSection(key).getKeys(false).isEmpty(); - } - - //Input: 'key1.key2' Result: 'key1' - public void removeLastKey() { - if (builder.length() == 0) - return; - - String keyString = builder.toString(); - //Must be enclosed in brackets in case a regex special character is the separator - String[] split = keyString.split("[" + separator + "]"); - //Makes sure begin index isn't < 0 (error). Occurs when there is only one key in the path - int minIndex = Math.max(0, builder.length() - split[split.length - 1].length() - 1); - builder.replace(minIndex, builder.length(), ""); - } - - @Override - public String toString() { - return builder.toString(); - } - - @Override - protected KeyBuilder clone() { - return new KeyBuilder(this); - } -} - diff --git a/src/main/java/net/zerotoil/dev/cybercore/objects/Lag.java b/src/main/java/net/zerotoil/dev/cybercore/objects/Lag.java deleted file mode 100644 index e10a041..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/objects/Lag.java +++ /dev/null @@ -1,88 +0,0 @@ -package net.zerotoil.dev.cybercore.objects; - -import org.bukkit.Bukkit; - -import java.lang.reflect.Field; -import java.lang.reflect.InvocationTargetException; - -public class Lag implements Runnable { - - public static int TICK_COUNT = 0; - public static long[] TICKS = new long[600]; - public static long LAST_TICK = 0L; - - public static double getTPS() { - return getTPS(100); - } - - public static double getTPS(int ticks) { - try { - if (TICK_COUNT < ticks) - return 20.0D; - - int target = (TICK_COUNT - 1 - ticks) % TICKS.length; - long elapsed = System.currentTimeMillis() - TICKS[target]; - - double tps = ticks / (elapsed / 1000.0D); - return Math.min(tps, 20.0); - } catch (Exception e) { - return 20.0; - } - } - - public static double getNewTPS() { - - if (!Bukkit.getServer().getVersion().contains("1.16.5")) return getTPS(); - - String name1 = Bukkit.getServer().getClass().getPackage().getName(); - String version = name1.substring(name1.lastIndexOf('.') + 1); - - Class mcsclass; - - Object si = null; - Field tpsField = null; - - try { - mcsclass = Class.forName("net.minecraft.server." + version + "." + "MinecraftServer"); - - si = mcsclass.getMethod("getServer").invoke(null); - - tpsField = si.getClass().getField("recentTps"); - - } catch (ClassNotFoundException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NoSuchMethodException | SecurityException | NoSuchFieldException e) { - e.printStackTrace(); - } - - double[] tps = null; - - try { - tps = ((double[]) tpsField.get(si)); - - } catch (IllegalArgumentException e) { - e.printStackTrace(); - } catch (IllegalAccessException e) { - e.printStackTrace(); - } - - if (tps[0] > 20) return 20; - return tps[0]; - } - - public static double getLowerTPS() { - return Math.min(getTPS(), getNewTPS()); - } - - public static long getElapsed(int tickID) - { - long time = TICKS[(tickID % TICKS.length)]; - return System.currentTimeMillis() - time; - } - - public void run() - { - TICKS[(TICK_COUNT% TICKS.length)] = System.currentTimeMillis(); - - TICK_COUNT += 1; - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/utilities/GeneralUtils.java b/src/main/java/net/zerotoil/dev/cybercore/utilities/GeneralUtils.java deleted file mode 100644 index 2af1a17..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/utilities/GeneralUtils.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.zerotoil.dev.cybercore.utilities; - -import me.croabeast.beanslib.utility.ArrayUtils; -import me.croabeast.beanslib.utility.LibUtils; -import me.croabeast.beanslib.utility.TextUtils; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; - -import java.lang.reflect.Array; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.concurrent.ThreadLocalRandom; - -public class GeneralUtils { - - /** - * Combines two arrays into a new array of the same type. - * - * @author Kihsomray - * @since 1.3 - * - * @param array First array - * @param additionalArrays Any additional arrays - * @param Type of array (must be same) - * @return New array of combined values - */ - @Deprecated - @SafeVarargs - public static T[] combineArrays(@NotNull T[] array, @Nullable T[]... additionalArrays) { - return ArrayUtils.combineArrays(array, additionalArrays); - } - - /** - * Gets a random double. - * - * @return Randomly generated double - */ - public static double randomDouble() { - return ThreadLocalRandom.current().nextDouble(); - } - - /** - * Gets a random double within a bound. - * - * @param bound Bounds to generate within - * @return Randomly generated double - */ - public static double randomDouble(double bound) { - return ThreadLocalRandom.current().nextDouble(bound); - } - - /** - * Gets a random integer. - * - * @return Randomly generated integer - */ - public static int randomInt() { - return ThreadLocalRandom.current().nextInt(); - } - - /** - * Gets a random integer within a bound. - * - * @param bound Bounds to generate within - * @return Randomly generated integer - */ - public static int randomInt(int bound) { - return ThreadLocalRandom.current().nextInt(bound); - } - - /** - * Gets a random long. - * - * @return Randomly generated long - */ - public static long randomLong() { - return ThreadLocalRandom.current().nextLong(); - } - - /** - * Gets a random long within a bound. - * - * @param bound Bounds to generate within - * @return Randomly generated long - */ - public static long randomLong(long bound) { - return ThreadLocalRandom.current().nextLong(bound); - } - - /** - * Version of Java that is currently running. - * - * @return Current version of java - * @deprecated See {@link LibUtils#majorJavaVersion()} - */ - @Deprecated - public static int getJavaVersion() { - return LibUtils.majorJavaVersion(); - } -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/utilities/PlayerUtils.java b/src/main/java/net/zerotoil/dev/cybercore/utilities/PlayerUtils.java deleted file mode 100644 index f5632b7..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/utilities/PlayerUtils.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.zerotoil.dev.cybercore.utilities; - -import org.bukkit.entity.Player; -import org.jetbrains.annotations.Nullable; - -public class PlayerUtils { - - private final static String[] plPlaceholders = new String[]{ - "player", - "playerDisplayName", - "playerUUID" - }; - - /** - * Get the player's placeholders. - * - * @return Array of placeholders - */ - public static String[] getPlPlaceholders() { - return plPlaceholders; - } - - /** - * Get the player's placeholder replacements. - * - * @return Array of placeholder replacements - */ - public static String[] getPlReplacements(Player player) { - return new String[] { - player.getName(), - player.getDisplayName(), - player.getUniqueId().toString() - }; - } - - /** - * replace placeholders within a message - * with corresponding replacements. - * - * Use BeansLIB's replace placeholders instead. - * - * @param string String to replace placeholders - * @param placeholders Array of placeholders - * @param replacements Array of replacements - * @return Replacements/placeholders applied to string - */ - @Deprecated - public static String replacePlaceholders(String string, String[] placeholders, String... replacements) { - if (replacements.length < placeholders.length) throw new IllegalArgumentException(); - - for (int i = 0; i < placeholders.length; i++) { - string = string.replace("{" + placeholders[i] + "}", replacements[i]); - } - - return string; - } - - /** - * Apply curly brackets (braces) around all - * placeholders within the string array. - * - * @param placeholders Array of placeholder values - * @return same array with placeholder applied - */ - public static String[] applyPlaceholderBraces(@Nullable String[] placeholders) { - if (placeholders == null) return null; - for (int i = 0; i < placeholders.length; i++) placeholders[i] = "{" + placeholders[i] + "}"; - return placeholders; - } - -} diff --git a/src/main/java/net/zerotoil/dev/cybercore/utilities/TimeUtils.java b/src/main/java/net/zerotoil/dev/cybercore/utilities/TimeUtils.java deleted file mode 100644 index 5a60460..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/utilities/TimeUtils.java +++ /dev/null @@ -1,153 +0,0 @@ -package net.zerotoil.dev.cybercore.utilities; - -import me.croabeast.beanslib.Beans; -import me.croabeast.beanslib.BeansLib; - -/** - * Basic time utilities for any server. - * - * @author Kihsomray - * @version 1.0 - */ -public class TimeUtils { - - // formatting strings - private static String secondFormat = "{time} Second(s)"; - private static String minuteFormat = "{time} Minute(s)"; - private static String hourFormat = "{time} Hour(s)"; - private static String dayFormat = "{time} Day(s)"; - private static String splitterFormat = ", "; - - // fields needed for time formatter - private static String pluralRegex = "\\s*\\([^)]*\\)\\s*"; - private static char startDelimiter = '('; - private static char endDelimiter = ')'; - - private static String colorize(String input) { - return Beans.colorize(input); - } - - /** - * Takes in seconds and returns a very nicely formatted string - * that can contain seconds, minutes, hours and days. - * - * @param seconds Amount of seconds to format - * @return Formatted string with seconds, minutes, hours and days - */ - public static String formatTime(long seconds) { - - // if time 0, return right away - if (seconds <= 0) return colorize(checkPluralFormat(0, secondFormat)); - - String formattedTime = ""; - long daysTotal, hoursTotal, minutesTotal; - - // gets day time - daysTotal = getFixedTime(seconds, 86400); - seconds = seconds - (daysTotal * 86400); - if (daysTotal > 0) formattedTime += (checkPluralFormat(daysTotal, dayFormat) + splitterFormat); - - // gets hour time - hoursTotal = getFixedTime(seconds, 3600); - seconds = seconds - (hoursTotal * 3600); - if (hoursTotal > 0) formattedTime += checkPluralFormat(hoursTotal, hourFormat) + splitterFormat; - - // gets minute time - minutesTotal = getFixedTime(seconds, 60); - seconds = seconds - (minutesTotal * 60); - if (minutesTotal > 0) formattedTime += checkPluralFormat(minutesTotal, minuteFormat) + splitterFormat; - - // gets second time - if (seconds > 0) formattedTime += checkPluralFormat(seconds, secondFormat + splitterFormat); - - // returns final string - return colorize(formattedTime.substring(0, formattedTime.length() - splitterFormat.length())); - - } - - // gets proper time for a time format - private static long getFixedTime(long seconds, long formatter) { - long tempSeconds = seconds % formatter; - return (seconds - tempSeconds) / formatter; - } - - // checks plural formatting and applies it - private static String checkPluralFormat(long value, String string) { - string = string.replace("{time}", value + ""); - if (value == 1) return string.replaceAll(pluralRegex, ""); - else return string.replace(startDelimiter + "", "").replace(endDelimiter + "", ""); - } - - /** - * Change the days in time formatter, placeholders: {time}. - * - * @param format string to use as days - */ - public static void setDayFormat(String format) { - dayFormat = format; - } - - /** - * Change the hours in time formatter, placeholders: {time}. - * - * @param format string to use as hours - */ - public static void setHourFormat(String format) { - hourFormat = format; - } - - /** - * Change the minutes in time formatter, placeholders: {time}. - * - * @param format string to use as minutes - */ - public static void setMinuteFormat(String format) { - minuteFormat = format; - } - - /** - * Change the seconds in time formatter, placeholders: {time}. - * - * @param format string to use as seconds - */ - public static void setSecondFormat(String format) { - secondFormat = format; - } - - /** - * Change the splitter in time formatter. - * - * @param format string to use as splitter - */ - public static void setSplitterFormat(String format) { - splitterFormat = format; - } - - /** - * When there is only one item, what should be replaced? - * - * @param regex a custom regex - */ - public static void pluralRegexFormat(String regex) { - pluralRegex = regex; - } - - /** - * Start delimiter for time formatter. - * - * @param delimiter Delimiter of your choice - */ - public static void setStartDelimiter(char delimiter) { - startDelimiter = delimiter; - } - - /** - * End delimiter for time formatter. - * - * @param delimiter Delimiter of your choice - */ - public static void setEndDelimiter(char delimiter) { - endDelimiter = delimiter; - } - -} From 36026b98aa8098e44a2c8d7ce98de8314b140bd0 Mon Sep 17 00:00:00 2001 From: CroaBeast Date: Fri, 18 Jul 2025 00:15:02 -0500 Subject: [PATCH 2/8] Reworking CyberCore --- pom.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pom.xml b/pom.xml index 93c55ec..8a50241 100644 --- a/pom.xml +++ b/pom.xml @@ -66,6 +66,13 @@ + + + me.croabeast + com.bitaspire + + + *:* From 7bf4392cb546f17ee3bd488193420847564b2092 Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Fri, 18 Jul 2025 00:22:37 -0500 Subject: [PATCH 3/8] Create README.md (1.0.0) --- README.md | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 0000000..bd3c91c --- /dev/null +++ b/README.md @@ -0,0 +1,78 @@ +# CyberCore Rework Highlights + +Welcome to the major rework of CyberCore! This update modernizes and streamlines the core, focusing on maintainability, modularity, and better dependency management. + +## 🚩 Critical Points & Major Package Changes + +- **Main Package Renamed:** + All sources have moved from `net.zerotoil.dev.cybercore` to `com.bitaspire.cybercore`. All class paths, imports, and usage should update accordingly. + +- **Group/Artifact Metadata:** + - Maven groupId is now `com.bitaspire`. + - Project version reset from `1.3.31` to `1.0`. + - Java compatibility moved to 21 in properties, but source/target remains 1.8. + +- **Build & Dependency Overhaul:** + - BeansLib replaced by **Takion-shaded** as the main utility library. + - **Metrics** is now managed as a dependency instead of a bundled, precompiled class. + - **Config Updater** functionality is now in a separate dependency, not within CyberCore. + - JetBrains Annotations, Lombok, Commons Lang, and Spigot dependencies updated and streamlined. + - New Maven repository: `https://croabeast.github.io/repo/`. + +## 🔥 Deleted, Replaced, or Moved Classes + +### **Removed/Externalized** +- **Metrics class:** + The enormous `net.zerotoil.dev.cybercore.addons.Metrics` is **completely removed**. Metrics are now handled by a managed dependency. +- **ConfigUpdater and related config updater classes:** + No longer maintained in this repo—these are handled by an external library. +- **PlayerUtils:** + Removed. Placeholder management is now covered by `TakionLib`'s `PlaceholderManager`. +- **TimeUtils:** + Removed. All time utilities are provided by `TakionLib`'s time package. + +### **Refactored and Renamed** +- **CyberCore:** + - Moved: `net.zerotoil.dev.cybercore.CyberCore` → `com.bitaspire.cybercore.CyberCore` + - Modernized: Now uses new internal structure, simplified boot, and load logic. +- **CoreSettings:** + - Moved: `net.zerotoil.dev.cybercore.CoreSettings` → `com.bitaspire.cybercore.CoreSettings` + - Refactored for TakionLib compatibility. +- **Lag:** + - Moved: `net.zerotoil.dev.cybercore.objects.Lag` → `com.bitaspire.cybercore.Lag` + - Refactored for simpler TPS tracking and reflection via TakionLib. +- **TextSettings → TextLibrary:** + - Replaced: `net.zerotoil.dev.cybercore.TextSettings` → `com.bitaspire.cybercore.TextLibrary` + - Now extends TakionLib for language and logger features. +- **FileManager/YAMLFile:** + - Replaced: `net.zerotoil.dev.cybercore.files.FileManager` and `YAMLFile` with `com.bitaspire.cybercore.file.FileManager` and `FileManagerImpl`, built around TakionLib and its ConfigurableFile. +- **GeneralUtils → RandomUtils:** + - Only random value generators retained, now in `com.bitaspire.cybercore.util.RandomUtils`. + +### **Deleted** +- `net.zerotoil.dev.cybercore.files.configupdater.*` +- `net.zerotoil.dev.cybercore.utilities.PlayerUtils` +- `net.zerotoil.dev.cybercore.utilities.TimeUtils` +- `net.zerotoil.dev.cybercore.utilities.GeneralUtils` +- `net.zerotoil.dev.cybercore.files.YAMLFile` (all file operations are now via TakionLib) + +## 🧩 Dependency Strategy + +- **TakionLib** is the new backbone for all file, reflection, logger, time, and placeholder utilities. +- **Metrics** and **ConfigUpdater** are now **external dependencies**, no longer requiring you to maintain or update their code in CyberCore itself. + +## 🚀 Why This Rocks + +- **Lighter, faster, easier to maintain:** No more duplicated utility code; everything not unique to CyberCore is a proper dependency. +- **Modernized API:** Cleaner, more modular classes make integration and extension much easier for plugin developers. +- **Future-proof:** With TakionLib, you get regular updates and improvements for all core utilities. +- **Cleaner boot & logging:** Startup banners and logs use TakionLib’s logging layer, with better color/config support. + +--- + +## ⚡ Migration Tips + +- Adjust all imports to the new `com.bitaspire.cybercore` base package. +- Replace direct usage of removed utilities with their TakionLib counterparts. +- Any custom config update logic should now be implemented via the external config updater dependency. +- Metrics integration should use the new dependency approach as documented in TakionLib. From b253578835f76be8cd4299f15eb97a28a9c7306e Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Tue, 12 May 2026 11:06:27 -0500 Subject: [PATCH 4/8] chore: bump version to 2.0.0 --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8a50241..a57d37c 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ com.bitaspire CyberCore - 1.0 + 2.0.0 jar CyberCore From 00af2b4dfcafceda3558bd68f2582d11e9b007b7 Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Tue, 12 May 2026 11:06:54 -0500 Subject: [PATCH 5/8] chore: migrate CyberCore build to Gradle --- .gitignore | 114 +++------- build.gradle.kts | 136 ++++++++++++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 +++++++++++++++++++++++ gradlew.bat | 94 +++++++++ pom.xml | 176 ---------------- settings.gradle.kts | 1 + 8 files changed, 519 insertions(+), 261 deletions(-) create mode 100644 build.gradle.kts create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat delete mode 100644 pom.xml create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore index 4788b4b..505f65c 100644 --- a/.gitignore +++ b/.gitignore @@ -1,13 +1,4 @@ -# User-specific stuff -.idea/ - -*.iml -*.ipr -*.iws - -# IntelliJ -out/ - +### Java template # Compiled class file *.class @@ -17,6 +8,9 @@ out/ # BlueJ files *.ctxt +# Mobile Tools for Java (J2ME) +.mtj.tmp/ + # Package Files # *.jar *.war @@ -28,86 +22,36 @@ out/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* +replay_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* +### Example user template template +### Example user template -# 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/ +# IntelliJ project files +.idea +*.iml +out +gen +### Gradle template +.gradle +**/build/ +!src/**/build/ -# Windows Installer files -*.cab -*.msi -*.msix -*.msm -*.msp +# Ignore Gradle GUI config +gradle-app.setting -# Windows shortcuts -*.lnk +# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored) +!gradle-wrapper.jar -target/ +# Avoid ignore Gradle wrappper properties +!gradle-wrapper.properties -pom.xml.tag -pom.xml.releaseBackup -pom.xml.versionsBackup -pom.xml.next +# Cache of project +.gradletasknamecache -release.properties -dependency-reduced-pom.xml -buildNumber.properties -.mvn/timing.properties -.mvn/wrapper/maven-wrapper.jar -.flattened-pom.xml +# Eclipse Gradle plugin generated files +# Eclipse Core +.project +# JDT-specific (Eclipse Java Development Tools) +.classpath -# Common working directory -run/ diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..a1a2f66 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,136 @@ +import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar + +plugins { + id("java-library") + id("com.gradleup.shadow") version "9.4.1" +} + +group = "com.bitaspire" +version = "2.0.0" + +repositories { + mavenCentral() + mavenLocal() + + flatDir { dirs("libraries") } + + maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") + maven("https://croabeast.github.io/repo/") + maven("https://oss.sonatype.org/content/groups/public/") +} + +dependencies { + compileOnly("org.jetbrains:annotations:26.0.2-1") + annotationProcessor("org.jetbrains:annotations:26.0.2-1") + + compileOnly("org.projectlombok:lombok:1.18.42") + annotationProcessor("org.projectlombok:lombok:1.18.42") + + compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT") + + implementation("me.croabeast.takion:shaded:1.6.0:all") + implementation("commons-lang:commons-lang:2.6") + implementation("org.bstats:bstats-bukkit:3.0.2") +} + +java { + withSourcesJar() + withJavadocJar() +} + +tasks.withType().configureEach { + isFailOnError = false + + (options as StandardJavadocDocletOptions).apply { + addStringOption("Xdoclint:none", "-quiet") + encoding = "UTF-8" + charSet = "UTF-8" + docEncoding = "UTF-8" + + if (JavaVersion.current().isCompatibleWith(JavaVersion.VERSION_1_9)) + addBooleanOption("html5", true) + } +} + +tasks.withType().configureEach { + options.encoding = "UTF-8" + sourceCompatibility = "1.8" + targetCompatibility = "1.8" + options.compilerArgs.add("-Xlint:-options") +} + +tasks.withType().configureEach { + archiveClassifier.set("") + + relocate("com.github.stefvanschie.inventoryframework", "com.bitaspire.libs.inventory") + relocate("me.croabeast", "com.bitaspire.libs") + relocate("com.mojang", "com.bitaspire.libs.mojang") + + exclude( + "META-INF/**", + "kotlin/**", + "org/intellij/**", + "com/google/**", + "google/**", + "org/checkerframework/**", + "org/jetbrains/**" + ) +} + +tasks.build { + dependsOn("shadowJar") +} + +val buildTakionShadowJar by tasks.registering(Exec::class) { + group = "build" + description = "Builds the local Takion shaded jar with the all classifier used by CyberCore." + + if (org.gradle.internal.os.OperatingSystem.current().isWindows) { + commandLine("cmd", "/c", "gradlew.bat", ":shaded:allShadowJar") + } else { + commandLine("./gradlew", ":shaded:allShadowJar") + } +} + +val workspaceDir: File = rootDir.parentFile +val cyberCoreConsumers = listOf( + workspaceDir.resolve("CyberLevels/libraries"), + workspaceDir.resolve("CyberLogin/libraries"), + workspaceDir.resolve("CyberStatistics/libraries"), + workspaceDir.resolve("CyberTokens/libraries"), + workspaceDir.resolve("XenoEventEngine/libraries"), + workspaceDir.resolve("XenoLevels/libraries"), + workspaceDir.resolve("XenoRegionReset/libraries"), + workspaceDir.resolve("XenoStatistics/libraries"), + workspaceDir.resolve("XenoTokens/libraries") +) + +val syncCyberCoreToLocalConsumers by tasks.registering { + group = "distribution" + description = "Copies the CyberCore jar to local consumer libraries folders." + + val shadowJarTask = tasks.named("shadowJar") + val cyberCoreJar = shadowJarTask.flatMap { it.archiveFile } + + dependsOn("jar", "shadowJar") + inputs.file(cyberCoreJar) + outputs.files(cyberCoreConsumers.map { it.resolve("CyberCore-2.0.0.jar") }) + + doLast { + val sourceJar = cyberCoreJar.get().asFile + + cyberCoreConsumers.forEach { targetDir -> + targetDir.mkdirs() + + copy { + from(sourceJar) + into(targetDir) + rename { "CyberCore-2.0.0.jar" } + } + } + } +} + +tasks.named("build") { + dependsOn(syncCyberCoreToLocalConsumers) +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..d95bf61 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..640d686 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS=-Dfile.encoding=UTF-8 "-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index a57d37c..0000000 --- a/pom.xml +++ /dev/null @@ -1,176 +0,0 @@ - - - 4.0.0 - - com.bitaspire - CyberCore - 2.0.0 - jar - - CyberCore - Main core for CyberPlugins - - - 21 - UTF-8 - - - dev.zerotoil.net - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.13.0 - - 1.8 - 1.8 - - -Xlint:-options - - - - - - org.apache.maven.plugins - maven-source-plugin - 3.3.1 - - - attach-sources - prepare-package - - jar - - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.5.3 - - - package - - shade - - - false - - - - - - - - me.croabeast - com.bitaspire - - - - - - *:* - - META-INF/** - - - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - 3.5.0 - - -Xdoclint:none - - - - attach-javadocs - - jar - - - - - - - - - src/main/resources - true - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - - - croabeast-repo - https://croabeast.github.io/repo/ - - - - - - org.jetbrains - annotations - 26.0.2 - provided - - - - org.projectlombok - lombok - 1.18.38 - provided - - - - - org.spigotmc - spigot - 1.16.5-R0.1-SNAPSHOT - provided - - - - me.croabeast - Takion-shaded - 1.2 - compile - - - * - * - - - - - - org.apache.commons - commons-lang3 - 3.18.0 - compile - - - diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..4ac7ca9 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1 @@ +rootProject.name = "CyberCore" From d2f7b74bf918110c14306a05f03f6661edfdaf52 Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Tue, 12 May 2026 11:08:01 -0500 Subject: [PATCH 6/8] refactor: update CyberCore bootstrap API --- .../com/bitaspire/cybercore/CoreSettings.java | 4 +- .../com/bitaspire/cybercore/CyberCore.java | 73 +++++++++++++++--- .../bitaspire/cybercore/FileManagerImpl.java | 76 ------------------- .../com/bitaspire/cybercore/TextLibrary.java | 30 +++++--- .../bitaspire/cybercore/file/FileManager.java | 73 ++++++++++++++++-- 5 files changed, 152 insertions(+), 104 deletions(-) delete mode 100644 src/main/java/com/bitaspire/cybercore/FileManagerImpl.java diff --git a/src/main/java/com/bitaspire/cybercore/CoreSettings.java b/src/main/java/com/bitaspire/cybercore/CoreSettings.java index 1c18762..1b8ccff 100644 --- a/src/main/java/com/bitaspire/cybercore/CoreSettings.java +++ b/src/main/java/com/bitaspire/cybercore/CoreSettings.java @@ -1,8 +1,8 @@ package com.bitaspire.cybercore; import lombok.Setter; -import me.croabeast.common.util.ServerInfoUtils; import me.croabeast.takion.logger.TakionLogger; +import me.croabeast.vnc.VNC; import org.apache.commons.lang.SystemUtils; import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.NotNull; @@ -51,7 +51,7 @@ public void setLegacyBootLogo(@NotNull String... array) { } private boolean useLegacy() { - return SystemUtils.OS_NAME.contains("Windows") && ServerInfoUtils.SERVER_VERSION < 12; + return SystemUtils.OS_NAME.contains("Windows") && VNC.isBefore("1.12"); } private String[] getBaseLogo() { diff --git a/src/main/java/com/bitaspire/cybercore/CyberCore.java b/src/main/java/com/bitaspire/cybercore/CyberCore.java index 9b249d9..713e2f9 100644 --- a/src/main/java/com/bitaspire/cybercore/CyberCore.java +++ b/src/main/java/com/bitaspire/cybercore/CyberCore.java @@ -1,19 +1,24 @@ package com.bitaspire.cybercore; +import com.bitaspire.cybercore.file.FileManager; import lombok.AccessLevel; import lombok.Getter; import me.croabeast.takion.TakionLib; -import com.bitaspire.cybercore.file.FileManager; -import org.bukkit.Bukkit; +import me.croabeast.vnc.VNC; +import org.bukkit.plugin.Plugin; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.ApiStatus; +import org.jetbrains.annotations.NotNull; + +import java.util.Objects; +import java.util.function.BooleanSupplier; @Getter public final class CyberCore { private final JavaPlugin plugin; - private final TakionLib library; + private final TextLibrary library; private final FileManager fileManager; private final CoreSettings settings; @@ -24,29 +29,35 @@ public final class CyberCore { public CyberCore(JavaPlugin plugin) { this.plugin = plugin; - fileManager = new FileManagerImpl(this); library = new TextLibrary(this); + fileManager = new FileManager(this); settings = new CoreSettings(this); bootStart = System.currentTimeMillis(); } private void loadTPS() { - Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(plugin, Lag.initialize(), 100L, 1L); + library.getScheduler().runTaskTimer(Lag.initialize(), 100L, 1L); } public void loadFiles(boolean header, String... additionalFiles) { if (header) settings.sendBootHeader(); - fileManager.loadAll(additionalFiles); + fileManager.load(additionalFiles); } - public void loadStart(boolean loadFiles, String additionalFiles) { + public void setColoredSupplier(BooleanSupplier supplier) { + library.load(supplier); + } + + public void loadStart(boolean loadFiles, String... additionalFiles) { settings.sendBootHeader(); - if (loadFiles) loadFiles(false, additionalFiles); + if (loadFiles) + loadFiles(false, additionalFiles); + setColoredSupplier(null); loadTPS(); } - public void loadStart(String additionalFiles) { + public void loadStart(String... additionalFiles) { loadStart(true, additionalFiles); } @@ -61,9 +72,53 @@ public void loadFinish() { library.getServerLogger().log(settings.getBootBar()); } + @NotNull + public TakionLib getLibrary() { + return library; + } + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") @Deprecated public void logger(String... lines) { library.getServerLogger().log(lines); } + + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated + public static double getMainVersion() { + return VNC.SERVER_VERSION; + } + + @ApiStatus.ScheduledForRemoval(inVersion = "2.0") + @Deprecated + public static int getMajorVersion() { + return (int) getMainVersion(); + } + + public static boolean restrictVersions(String minVersion, String maxVersion, String pluginPrefix, String pluginVersion) { + int minCompare = VNC.compare(VNC.SERVER_MINECRAFT_VERSION, minVersion); + int maxCompare = VNC.compare(VNC.SERVER_MINECRAFT_VERSION, maxVersion); + + if (minCompare >= 0 && maxCompare <= 0) + return false; + + TakionLib.getLib().getServerLogger().log( + pluginPrefix + " v" + pluginVersion + + " does not support " + + VNC.SERVER_CLASSIC_VERSION + " and " + + (minCompare < 0 ? + "older!" : + "newer. Please update!") + ); + return true; + } + + public static boolean restrictVersions(int minVersion, int maxVersion, String pluginPrefix, String pluginVersion) { + return restrictVersions("1." + minVersion, "1." + maxVersion, pluginPrefix, pluginVersion); + } + + public static boolean restrictVersions(int minVersion, int maxVersion, Plugin plugin) { + String prefix = Objects.requireNonNull(plugin).getDescription().getPrefix(); + return restrictVersions(minVersion, maxVersion, prefix == null ? plugin.getName() : prefix, plugin.getDescription().getVersion()); + } } diff --git a/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java b/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java deleted file mode 100644 index e53f928..0000000 --- a/src/main/java/com/bitaspire/cybercore/FileManagerImpl.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.bitaspire.cybercore; - -import me.croabeast.file.ConfigurableFile; -import me.croabeast.takion.TakionLib; -import me.croabeast.takion.logger.LogLevel; -import com.bitaspire.cybercore.file.FileManager; -import org.jetbrains.annotations.NotNull; - -import java.util.HashMap; -import java.util.Map; - -final class FileManagerImpl implements FileManager { - - private final Map files = new HashMap<>(); - - private final CyberCore core; - private final TakionLib lib; - - FileManagerImpl(CyberCore core) { - this.core = core; - this.lib = core.getLibrary(); - } - - @Override - public void load(String name, boolean send) { - ConfigurableFile file; - try { - (file = new ConfigurableFile(core.getPlugin(), name) { - @Override - public boolean isUpdatable() { - return FileManagerImpl.this.get("config").get("config.auto-update." + name, false); - } - }).saveDefaults(); - files.put(name, file); - if (send) - lib.getServerLogger().log("&7Loaded file &e" + name + ".yml&7 file."); - } catch (Exception e) { - if (send) - lib.getServerLogger().log(LogLevel.ERROR, - "&cError while generating " + name + ".yml file", - e.getLocalizedMessage() - ); - } - } - - @Override - public void loadAll(boolean send, boolean useDefaults, String... additions) { - if (!files.isEmpty()) files.clear(); - - if (send) - lib.getServerLogger().log(core.getSettings().getBootColor() + "Loading YAML files..."); - - long startTime = System.currentTimeMillis(); - - if (useDefaults) { - load("config", send); - load("lang", send); - } - - for (String string : additions) load(string, send); - - if (send) - lib.getServerLogger().log( - "&7Loaded &e" + files.size() + "&7 files in &a" + - (System.currentTimeMillis() - startTime) + "ms&7.", "&7" - ); - } - - @NotNull - public ConfigurableFile get(String name) throws NullPointerException { - if (!files.containsKey(name)) - throw new NullPointerException("Name " + name + " wasn't found"); - - return files.get(name); - } -} diff --git a/src/main/java/com/bitaspire/cybercore/TextLibrary.java b/src/main/java/com/bitaspire/cybercore/TextLibrary.java index a31e87f..b7b50c9 100644 --- a/src/main/java/com/bitaspire/cybercore/TextLibrary.java +++ b/src/main/java/com/bitaspire/cybercore/TextLibrary.java @@ -1,15 +1,14 @@ package com.bitaspire.cybercore; +import me.croabeast.file.ConfigurableFile; import me.croabeast.takion.TakionLib; import me.croabeast.takion.logger.TakionLogger; -import org.bukkit.configuration.ConfigurationSection; -import org.jetbrains.annotations.NotNull; -import java.util.TreeMap; +import java.util.function.BooleanSupplier; final class TextLibrary extends TakionLib { - private final CyberCore core; + final CyberCore core; TextLibrary(CyberCore core) { super(core.getPlugin()); @@ -18,22 +17,31 @@ final class TextLibrary extends TakionLib { setLangPrefix("&8&lCCR &8» &r"); setLangPrefixKey("{p}"); + getChannelManager().identify("action_bar").addPrefix("actionbar"); + getChannelManager().identify("action_bar").addPrefix("action-bar"); + } + + void load(BooleanSupplier supplier) { + BooleanSupplier colored; + try { + ConfigurableFile file = core.getFileManager().get("config"); + colored = () -> file.get("config.console-color", true); + } catch (NullPointerException e) { + colored = supplier != null ? supplier : () -> true; + } + + BooleanSupplier finalSupplier = colored; setLogger(new TakionLogger(this) { @Override public boolean isColored() { - return core.getFileManager().get("config").get("config.console-color", true); + return finalSupplier.getAsBoolean(); } }); setServerLogger(new TakionLogger(this, false) { @Override public boolean isColored() { - return core.getFileManager().get("config").get("config.console-color", true); + return finalSupplier.getAsBoolean(); } }); } - - @NotNull - public TreeMap getLoadedWebhooks() { - return loadMapFromConfiguration(core.getFileManager().get("lang").getSection("webhooks")); - } } diff --git a/src/main/java/com/bitaspire/cybercore/file/FileManager.java b/src/main/java/com/bitaspire/cybercore/file/FileManager.java index b8a6889..4ea2957 100644 --- a/src/main/java/com/bitaspire/cybercore/file/FileManager.java +++ b/src/main/java/com/bitaspire/cybercore/file/FileManager.java @@ -1,18 +1,79 @@ package com.bitaspire.cybercore.file; +import com.bitaspire.cybercore.CyberCore; import me.croabeast.file.ConfigurableFile; +import me.croabeast.takion.logger.LogLevel; +import org.bukkit.configuration.file.FileConfiguration; import org.jetbrains.annotations.NotNull; -public interface FileManager { +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; - void load(String name, boolean send); +public class FileManager { - void loadAll(boolean send, boolean useDefaults, String... additions); + private final Map files = new HashMap<>(); - default void loadAll(String... additions) { - loadAll(true, true, additions); + private final CyberCore core; + + public FileManager(CyberCore core) { + this.core = core; + } + + public void load(String name, boolean send) { + ConfigurableFile file; + try { + (file = new ConfigurableFile(core.getPlugin(), name) { + @Override + public boolean isUpdatable() { + return FileManager.this.get("config").get("config.auto-update." + name, false); + } + }).saveDefaults(); + files.put(name, file); + if (send) + core.getLibrary().getServerLogger().log("&7Loaded file &e" + name + ".yml&7 file."); + } catch (Exception e) { + if (send) + core.getLibrary().getServerLogger().log(LogLevel.ERROR, + "&cError while generating " + name + ".yml file", + e.getLocalizedMessage() + ); + } + } + + public void load(boolean send, boolean useDefaults, String... additions) { + if (!files.isEmpty()) files.clear(); + + if (send) + core.getLibrary().getServerLogger().log(core.getSettings().getBootColor() + "Loading YAML files..."); + + long startTime = System.currentTimeMillis(); + + if (useDefaults) { + load("config", send); + load("lang", send); + } + + for (String string : additions) load(string, send); + + if (send) + core.getLibrary().getServerLogger().log( + "&7Loaded &e" + files.size() + "&7 files in &a" + + (System.currentTimeMillis() - startTime) + "ms&7.", "&7" + ); + } + + public void load(String... additions) { + load(true, true, additions); } @NotNull - ConfigurableFile get(String name) throws NullPointerException; + public ConfigurableFile get(String name) { + return Objects.requireNonNull(files.get(name), "Name " + name + " wasn't found"); + } + + @NotNull + public FileConfiguration getConfig(String name) { + return get(name).getConfiguration(); + } } From 4a8b9b2e90db94d8d4695c74291d07bfd171030d Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Tue, 12 May 2026 11:08:24 -0500 Subject: [PATCH 7/8] refactor: move random utilities package --- .../bitaspire/cybercore/{util => utility}/RandomUtils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename src/main/java/com/bitaspire/cybercore/{util => utility}/RandomUtils.java (83%) diff --git a/src/main/java/com/bitaspire/cybercore/util/RandomUtils.java b/src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java similarity index 83% rename from src/main/java/com/bitaspire/cybercore/util/RandomUtils.java rename to src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java index 93ed60a..995d28c 100644 --- a/src/main/java/com/bitaspire/cybercore/util/RandomUtils.java +++ b/src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java @@ -1,14 +1,13 @@ -package com.bitaspire.cybercore.util; +package com.bitaspire.cybercore.utility; import lombok.experimental.UtilityClass; -import java.util.Random; import java.util.concurrent.ThreadLocalRandom; @UtilityClass public class RandomUtils { - private final Random CURRENT_RANDOM = ThreadLocalRandom.current(); + private final ThreadLocalRandom CURRENT_RANDOM = ThreadLocalRandom.current(); public double randomDouble() { return CURRENT_RANDOM.nextDouble(); From 26a66405dca70cfbe7486f63dde614fadd41a67e Mon Sep 17 00:00:00 2001 From: CroaBeast <66433837+CroaBeast@users.noreply.github.com> Date: Tue, 12 May 2026 13:22:16 -0500 Subject: [PATCH 8/8] chore: add CyberCore release workflows --- .github/workflows/package.yml | 74 +++++++++++ .github/workflows/release.yml | 232 ++++++++++++++++++++++++++++++++++ 2 files changed, 306 insertions(+) create mode 100644 .github/workflows/package.yml create mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml new file mode 100644 index 0000000..282ab27 --- /dev/null +++ b/.github/workflows/package.yml @@ -0,0 +1,74 @@ +name: Package CyberCore + +on: + push: + branches: [ "main", "master" ] + pull_request: + branches: [ "main", "master" ] + workflow_dispatch: + +permissions: + contents: read + +env: + PROJECT_NAME: CyberCore + BUILD_ARGS: clean shadowJar + JAR_SEARCH_DIR: build/libs + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + + - name: Set up Java + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: "21" + + - name: Set up Gradle + uses: gradle/actions/setup-gradle@v4 + + - name: Build with Gradle + run: | + chmod +x ./gradlew + ./gradlew --no-daemon $BUILD_ARGS + + - name: Prepare jar + id: artifact + shell: bash + run: | + VERSION=$(./gradlew --no-daemon -q properties --property version | awk -F': ' '$1 == "version" { print $2; exit }') + EXPECTED_JAR="${JAR_SEARCH_DIR}/${PROJECT_NAME}-${VERSION}.jar" + JAR_SOURCE="" + + if [ -f "$EXPECTED_JAR" ]; then + JAR_SOURCE="$EXPECTED_JAR" + else + mapfile -t JARS < <(find "$JAR_SEARCH_DIR" -maxdepth 1 -type f -name "*.jar" ! -name "*-sources.jar" ! -name "*-javadoc.jar" ! -name "*-all.jar" | sort) + JAR_SOURCE="${JARS[0]:-}" + fi + + if [ -z "$JAR_SOURCE" ] || [ ! -f "$JAR_SOURCE" ]; then + echo "Could not find final jar in $JAR_SEARCH_DIR." + find "$JAR_SEARCH_DIR" -maxdepth 1 -type f -name "*.jar" -print || true + exit 1 + fi + + mkdir -p release-artifact + JAR_PATH="release-artifact/${PROJECT_NAME}-${VERSION}.jar" + cp "$JAR_SOURCE" "$JAR_PATH" + + echo "version=$VERSION" >> "$GITHUB_OUTPUT" + echo "path=$JAR_PATH" >> "$GITHUB_OUTPUT" + + - name: Upload jar + uses: actions/upload-artifact@v4 + with: + name: ${{ env.PROJECT_NAME }}-${{ steps.artifact.outputs.version }} + path: ${{ steps.artifact.outputs.path }} + if-no-files-found: error + retention-days: 7 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..2e9e9f7 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,232 @@ +name: Release CyberCore + +on: + workflow_run: + workflows: [ "Package CyberCore" ] + types: [ completed ] + branches: [ "main", "master" ] + +permissions: + actions: read + contents: write + pull-requests: read + +concurrency: + group: cybercore-release-${{ github.event.workflow_run.head_branch }} + cancel-in-progress: false + +env: + PROJECT_NAME: CyberCore + HEAD_SHA: ${{ github.event.workflow_run.head_sha }} + GH_TOKEN: ${{ github.token }} + +jobs: + release: + if: github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'pull_request' + runs-on: ubuntu-latest + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + ref: ${{ github.event.workflow_run.head_sha }} + fetch-depth: 0 + + - name: Download build artifact + shell: bash + run: | + gh run download "${{ github.event.workflow_run.id }}" \ + --repo "$GITHUB_REPOSITORY" \ + --dir release-assets + + mapfile -t JARS < <(find release-assets -type f -name "${PROJECT_NAME}-*.jar" ! -name "*-sources.jar" ! -name "*-javadoc.jar" ! -name "*-all.jar" | sort) + RELEASE_JAR="${JARS[0]:-}" + + if [ -z "$RELEASE_JAR" ] || [ ! -f "$RELEASE_JAR" ]; then + echo "Could not find ${PROJECT_NAME} jar in downloaded artifacts." + find release-assets -type f -print + exit 1 + fi + + BASENAME=$(basename "$RELEASE_JAR" .jar) + PREFIX="${PROJECT_NAME}-" + VERSION="${BASENAME#$PREFIX}" + + echo "RELEASE_JAR=$RELEASE_JAR" >> "$GITHUB_ENV" + echo "VERSION=$VERSION" >> "$GITHUB_ENV" + echo "TAG=$VERSION" >> "$GITHUB_ENV" + + - name: Generate release notes + shell: bash + run: | + set -euo pipefail + + OWNER="${GITHUB_REPOSITORY%/*}" + REPO="${GITHUB_REPOSITORY#*/}" + + git fetch --tags --force + + if gh release view "$TAG" --repo "$GITHUB_REPOSITORY" >/dev/null 2>&1; then + gh release delete "$TAG" \ + --repo "$GITHUB_REPOSITORY" \ + --cleanup-tag \ + --yes + elif git ls-remote --exit-code --tags origin "refs/tags/$TAG" >/dev/null 2>&1; then + gh api \ + --method DELETE \ + "repos/$GITHUB_REPOSITORY/git/refs/tags/$TAG" || true + fi + + BUMP_SUBJECT="chore: bump version to $VERSION" + LOG_FILE=$(mktemp) + git log --format='%H%x09%s' "$HEAD_SHA" > "$LOG_FILE" + BUMP_COMMIT=$(awk -F '\t' -v subject="$BUMP_SUBJECT" '$2 == subject { print $1; exit }' "$LOG_FILE") + + if [ -n "$BUMP_COMMIT" ]; then + if BUMP_PARENT=$(git rev-parse "$BUMP_COMMIT^" 2>/dev/null); then + RANGE="$BUMP_PARENT..$HEAD_SHA" + CHANGELOG_BASE="$BUMP_PARENT" + else + RANGE="$HEAD_SHA" + CHANGELOG_BASE="$BUMP_COMMIT" + fi + else + RELEASE_TAGS=$(gh release list \ + --repo "$GITHUB_REPOSITORY" \ + --exclude-drafts \ + --limit 100 \ + --json tagName \ + --jq ".[].tagName | select(. != \"$TAG\")") + + PREVIOUS_TAG=$(awk 'NF { print; exit }' <<< "$RELEASE_TAGS") + + if [ -z "$PREVIOUS_TAG" ]; then + echo "Could not find '$BUMP_SUBJECT' or a previous release tag." + echo "Refusing to generate release notes from the full repository history." + exit 1 + fi + + RANGE="$PREVIOUS_TAG..$HEAD_SHA" + CHANGELOG_BASE="$PREVIOUS_TAG" + fi + + FULL_CHANGELOG="https://github.com/$GITHUB_REPOSITORY/compare/$CHANGELOG_BASE...$TAG" + + QUERY=' + query($owner:String!, $repo:String!, $oid:GitObjectID!) { + repository(owner:$owner, name:$repo) { + object(oid:$oid) { + ... on Commit { + messageHeadline + abbreviatedOid + author { + name + user { + login + } + } + associatedPullRequests(first: 1) { + nodes { + number + title + author { + login + } + } + } + } + } + } + }' + + declare -A SEEN_PULL_REQUESTS + CONTRIBUTORS=$(mktemp) + PREVIOUS_CONTRIBUTORS=$(mktemp) + + if [ -n "${CHANGELOG_BASE:-}" ] && git rev-parse "$CHANGELOG_BASE" >/dev/null 2>&1; then + git log --format='%aN' "$CHANGELOG_BASE" | sort -fu > "$PREVIOUS_CONTRIBUTORS" + fi + + { + echo "## What's Changed" + echo + } > release-notes.md + + HAS_CHANGES=false + while read -r SHA; do + [ -z "$SHA" ] && continue + HAS_CHANGES=true + + DATA=$(gh api graphql \ + -f query="$QUERY" \ + -f owner="$OWNER" \ + -f repo="$REPO" \ + -F oid="$SHA") + + PR_NUMBER=$(echo "$DATA" | jq -r '.data.repository.object.associatedPullRequests.nodes[0].number // empty') + PR_TITLE=$(echo "$DATA" | jq -r '.data.repository.object.associatedPullRequests.nodes[0].title // empty') + PR_AUTHOR=$(echo "$DATA" | jq -r '.data.repository.object.associatedPullRequests.nodes[0].author.login // empty') + + COMMIT_TITLE=$(echo "$DATA" | jq -r '.data.repository.object.messageHeadline') + COMMIT_AUTHOR_LOGIN=$(echo "$DATA" | jq -r '.data.repository.object.author.user.login // empty') + COMMIT_AUTHOR_NAME=$(echo "$DATA" | jq -r '.data.repository.object.author.name // "unknown"') + SHORT_SHA=$(echo "$DATA" | jq -r '.data.repository.object.abbreviatedOid') + + if [ -n "$PR_NUMBER" ]; then + if [ -z "${SEEN_PULL_REQUESTS[$PR_NUMBER]+x}" ]; then + echo "- $PR_TITLE by @$PR_AUTHOR in #$PR_NUMBER" >> release-notes.md + [ -n "$PR_AUTHOR" ] && echo "$PR_AUTHOR" >> "$CONTRIBUTORS" + SEEN_PULL_REQUESTS[$PR_NUMBER]=1 + fi + else + if [ -n "$COMMIT_AUTHOR_LOGIN" ]; then + echo "- $COMMIT_TITLE by @$COMMIT_AUTHOR_LOGIN ($SHORT_SHA)" >> release-notes.md + echo "$COMMIT_AUTHOR_LOGIN" >> "$CONTRIBUTORS" + else + echo "- $COMMIT_TITLE by $COMMIT_AUTHOR_NAME ($SHORT_SHA)" >> release-notes.md + fi + fi + done < <(git rev-list --reverse "$RANGE") + + if [ "$HAS_CHANGES" = false ]; then + echo "- No code changes detected for this release." >> release-notes.md + fi + + if [ -s "$CONTRIBUTORS" ]; then + NEW_CONTRIBUTORS=$(mktemp) + sort -u "$CONTRIBUTORS" \ + | grep -Fvxif "$PREVIOUS_CONTRIBUTORS" \ + > "$NEW_CONTRIBUTORS" || true + + if [ -s "$NEW_CONTRIBUTORS" ]; then + { + echo + echo "## New Contributors" + echo + sed 's/^/- @/' "$NEW_CONTRIBUTORS" + } >> release-notes.md + fi + + { + echo + echo "## Contributors" + echo + sort -u "$CONTRIBUTORS" | sed 's/^/- @/' + } >> release-notes.md + fi + + { + echo + echo "**Full Changelog**: $FULL_CHANGELOG" + } >> release-notes.md + + - name: Publish GitHub prerelease + shell: bash + run: | + gh release create "$TAG" "$RELEASE_JAR" \ + --repo "$GITHUB_REPOSITORY" \ + --title "$VERSION" \ + --notes-file release-notes.md \ + --target "$HEAD_SHA" \ + --prerelease \ + --latest=false