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 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/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. 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 0000000..a4b76b9 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ 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 1c612cb..0000000 --- a/pom.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - 4.0.0 - - net.zerotoil.dev - CyberCore - 1.3.32 - jar - - CyberCore - - Main core for CyberPlugins - - 8 - UTF-8 - - dev.zerotoil.net - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 8 - 8 - - - - org.apache.maven.plugins - maven-shade-plugin - 3.2.4 - - - package - - shade - - - false - - - - - - - *:* - - META-INF/*.* - - - - - - - - - src/main/resources - true - - - - - - - - spigotmc-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - - - sonatype - https://oss.sonatype.org/content/groups/public/ - - - - - jitpack.io - https://jitpack.io - - - - - - - org.spigotmc - spigot-api - 1.20.2-R0.1-SNAPSHOT - provided - - - - org.apache.commons - commons-lang3 - 3.12.0 - compile - - - - org.projectlombok - lombok - 1.18.26 - provided - - - - - io.github.croabeast - BeansLib - 1.4-SNAPSHOT-108 - - - - - org.jetbrains - annotations - 24.0.1 - - - 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" 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..1b8ccff --- /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.takion.logger.TakionLogger; +import me.croabeast.vnc.VNC; +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") && VNC.isBefore("1.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..713e2f9 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/CyberCore.java @@ -0,0 +1,124 @@ +package com.bitaspire.cybercore; + +import com.bitaspire.cybercore.file.FileManager; +import lombok.AccessLevel; +import lombok.Getter; +import me.croabeast.takion.TakionLib; +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 TextLibrary library; + + private final FileManager fileManager; + private final CoreSettings settings; + + @Getter(AccessLevel.NONE) + private final long bootStart; + + public CyberCore(JavaPlugin plugin) { + this.plugin = plugin; + + library = new TextLibrary(this); + fileManager = new FileManager(this); + settings = new CoreSettings(this); + + bootStart = System.currentTimeMillis(); + } + + private void loadTPS() { + library.getScheduler().runTaskTimer(Lag.initialize(), 100L, 1L); + } + + public void loadFiles(boolean header, String... additionalFiles) { + if (header) settings.sendBootHeader(); + fileManager.load(additionalFiles); + } + + public void setColoredSupplier(BooleanSupplier supplier) { + library.load(supplier); + } + + public void loadStart(boolean loadFiles, String... additionalFiles) { + settings.sendBootHeader(); + if (loadFiles) + loadFiles(false, additionalFiles); + setColoredSupplier(null); + 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()); + } + + @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/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..b7b50c9 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/TextLibrary.java @@ -0,0 +1,47 @@ +package com.bitaspire.cybercore; + +import me.croabeast.file.ConfigurableFile; +import me.croabeast.takion.TakionLib; +import me.croabeast.takion.logger.TakionLogger; + +import java.util.function.BooleanSupplier; + +final class TextLibrary extends TakionLib { + + final CyberCore core; + + TextLibrary(CyberCore core) { + super(core.getPlugin()); + this.core = core; + + 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 finalSupplier.getAsBoolean(); + } + }); + setServerLogger(new TakionLogger(this, false) { + @Override + public boolean isColored() { + return finalSupplier.getAsBoolean(); + } + }); + } +} 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..4ea2957 --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/file/FileManager.java @@ -0,0 +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; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class FileManager { + + private final Map files = new HashMap<>(); + + 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 + 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(); + } +} diff --git a/src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java b/src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java new file mode 100644 index 0000000..995d28c --- /dev/null +++ b/src/main/java/com/bitaspire/cybercore/utility/RandomUtils.java @@ -0,0 +1,35 @@ +package com.bitaspire.cybercore.utility; + +import lombok.experimental.UtilityClass; + +import java.util.concurrent.ThreadLocalRandom; + +@UtilityClass +public class RandomUtils { + + private final ThreadLocalRandom 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 ab1ec3f..0000000 --- a/src/main/java/net/zerotoil/dev/cybercore/utilities/TimeUtils.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.zerotoil.dev.cybercore.utilities; - -import lombok.Setter; -import me.croabeast.beanslib.Beans; - -/** - * Basic time utilities for any server. - * - * @author Kihsomray - * @version 1.0 - */ -public class TimeUtils { - - // formatting strings - @Setter private static String secondFormat = "{time} Second(s)"; - @Setter private static String minuteFormat = "{time} Minute(s)"; - @Setter private static String hourFormat = "{time} Hour(s)"; - @Setter private static String dayFormat = "{time} Day(s)"; - @Setter private static String splitterFormat = ", "; - - // fields needed for time formatter - private static String pluralRegex = "\\s*\\([^)]*\\)\\s*"; - @Setter private static char startDelimiter = '('; - @Setter 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 splitterFormat) { - if (string.equalsIgnoreCase("")) return ""; - string = string.replace("{time}", value + "") + splitterFormat; - if (value == 1) return string.replaceAll(pluralRegex, ""); - else return string.replace(startDelimiter + "", "").replace(endDelimiter + "", ""); - } - - - /** - * When there is only one item, what should be replaced? - * - * @param regex a custom regex - */ - public static void pluralRegexFormat(String regex) { - pluralRegex = regex; - } - -}