commit f2a5e1b1b8fcaafb5babea632eea539f193bfd34 Author: AXOLOTsh <96595812+AXOLOTsh@users.noreply.github.com> Date: Wed Jun 10 23:47:09 2026 +0300 initial commit diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..55dce6a --- /dev/null +++ b/.gitattributes @@ -0,0 +1,11 @@ +#region Gradle +/gradlew text eol=lf +#endregion + +#region Java +*.jar binary +#endregion + +#region Windows +*.bat text eol=crlf +#endregion diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml new file mode 100644 index 0000000..9940d12 --- /dev/null +++ b/.github/workflows/release.yml @@ -0,0 +1,107 @@ +name: Publish Release + +on: + release: + types: [published] + +env: + # --- GLOBAL OVERRIDES --- + # Modify these variables to override default GitHub context + PROJECT_NAME: ${{ github.event.repository.name }} + RELEASE_TAG: ${{ github.ref_name }} + COMMIT_URL: https://gitea.cheppyjam.ru/${{ github.repository }}/commit # overrode: ${{ github.server_url }} + CHANGELOG_FILE: "changelog.md" + # ------------------------ + +jobs: + build-and-release: + runs-on: ubuntu-latest + permissions: + contents: write + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - name: Set up JDK + uses: actions/setup-java@v4 + with: + java-version: '25' + distribution: 'temurin' + cache: 'gradle' + + - name: Configure Outputs + id: config + run: | + VERSION=${RELEASE_TAG#v} + echo "version=$VERSION" >> $GITHUB_OUTPUT + + echo "RELEASE_BODY<> $GITHUB_ENV + echo "${{ github.event.release.body }}" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + + - name: Generate Changelog + id: changelog + run: | + git fetch --prune --unshallow --tags || git fetch --tags + + echo "# Release Notes" > $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + + if [ ! -z "$RELEASE_BODY" ]; then + echo "$RELEASE_BODY" >> $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + fi + + echo "## Changelog" >> $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + + PREVIOUS_TAG=$(git describe --tags --abbrev=0 HEAD~1 2>/dev/null || echo "") + + if [ -z "$PREVIOUS_TAG" ]; then + LOG_RANGE="${RELEASE_TAG}" + echo "This is the first release." >> $CHANGELOG_FILE + else + LOG_RANGE="${PREVIOUS_TAG}..${RELEASE_TAG}" + fi + + FORMAT_STR="* %s ([\`%h\`]($COMMIT_URL/%H))" + + FEATS=$(git log $LOG_RANGE --grep="^feat" --pretty=format:"$FORMAT_STR" || true) + if [ ! -z "$FEATS" ]; then + echo "### New Features" >> $CHANGELOG_FILE + echo "$FEATS" >> $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + fi + + FIXES=$(git log $LOG_RANGE --grep="^fix" --pretty=format:"$FORMAT_STR" || true) + if [ ! -z "$FIXES" ]; then + echo "### Bug Fixes" >> $CHANGELOG_FILE + echo "$FIXES" >> $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + fi + + MAINTENANCE=$(git log $LOG_RANGE --grep="^chore\|^refactor\|^perf\|^style" --pretty=format:"$FORMAT_STR" || true) + if [ ! -z "$MAINTENANCE" ]; then + echo "### Maintenance" >> $CHANGELOG_FILE + echo "$MAINTENANCE" >> $CHANGELOG_FILE + echo "" >> $CHANGELOG_FILE + fi + + - name: Make gradlew executable + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + - name: Update Release + uses: softprops/action-gh-release@v2 + with: + tag_name: ${{ env.RELEASE_TAG }} + name: "${{ env.PROJECT_NAME }} ${{ env.RELEASE_TAG }}" + body_path: ${{ env.CHANGELOG_FILE }} + files: build/libs/*.jar + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b818f29 --- /dev/null +++ b/.gitignore @@ -0,0 +1,17 @@ +#region Visual Studio Code +.vscode/ +*.code-workspace +#endregion + +#region Java +bin/ +build/ +run/ +#endregion + +#region Gradle +.gradle/ + +!gradle-wrapper.jar +!gradle-wrapper.properties +#endregion \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..5ad6974 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +org.gradle.configuration-cache=true diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..078e6e7 --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,12 @@ +# This file was generated by the Gradle 'init' task. +# https://docs.gradle.org/current/userguide/version_catalogs.html#sec::toml-dependencies-format + +[versions] +commons-math3 = "3.6.1" +guava = "33.5.0-jre" +junit-jupiter = "6.0.1" + +[libraries] +commons-math3 = { module = "org.apache.commons:commons-math3", version.ref = "commons-math3" } +guava = { module = "com.google.guava:guava", version.ref = "guava" } +junit-jupiter = { module = "org.junit.jupiter:junit-jupiter", version.ref = "junit-jupiter" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..b1b8ef5 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..df6a6ad --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,9 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip +networkTimeout=10000 +retries=0 +retryBackOffMs=500 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..b9bb139 --- /dev/null +++ b/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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\n' "$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 + + + +# 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" ) + + 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='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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..24c62d5 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,82 @@ +@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, and ensure extensions are enabled +setlocal EnableExtensions + +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="-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 + +"%COMSPEC%" /c exit 1 + +: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 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute Gradle +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/plugin-utils/build.gradle.kts b/plugin-utils/build.gradle.kts new file mode 100644 index 0000000..5f3b2a5 --- /dev/null +++ b/plugin-utils/build.gradle.kts @@ -0,0 +1,61 @@ +plugins { + id("java-library") + id("maven-publish") +} + +group = "io.github.axolotsh" +version = "1.0-SNAPSHOT" + +repositories { + mavenCentral() + maven("https://repo.papermc.io/repository/maven-public/") + + maven { + name = "axolotsh-repository" + url = uri("https://maven.axolotsh.org/snapshots") + } +} + +dependencies { + implementation("io.github.axolotsh:localizationlib-abstraction:1.0-SNAPSHOT") + + compileOnly("org.projectlombok:lombok:1.18.46") + annotationProcessor("org.projectlombok:lombok:1.18.46") + + implementation("com.google.inject:guice:7.0.0") + + compileOnly("dev.jorel:commandapi-paper-core:11.2.0") + + compileOnly("io.papermc.paper:paper-api:26.1.2.build.+") +} + +java { + toolchain.languageVersion = JavaLanguageVersion.of(25) +} + +publishing { + publications { + create("mavenJava") { + from(components["java"]) + + groupId = project.group.toString() + artifactId = project.name + version = project.version.toString() + } + } + + repositories { + maven { + name = "Reposilite" + + val releasesUrl = "https://maven.axolotsh.org/releases" + val snapshotsUrl = "https://maven.axolotsh.org/snapshots" + url = uri(if (version.toString().endsWith("SNAPSHOT")) snapshotsUrl else releasesUrl) + + credentials { + username = providers.gradleProperty("reposiliteUser").orNull ?: "admin" + password = providers.gradleProperty("reposilitePassword").orNull ?: "password" + } + } + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/BaseJavaPlugin.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/BaseJavaPlugin.java new file mode 100644 index 0000000..32ce105 --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/BaseJavaPlugin.java @@ -0,0 +1,73 @@ +package io.github.axolotsh.pluginutils; + +import java.util.Set; + +import org.bukkit.Server; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.event.Listener; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitScheduler; +import org.slf4j.Logger; + +import com.google.inject.Guice; +import com.google.inject.Inject; +import com.google.inject.Injector; + +import io.github.axolotsh.pluginutils.entities.ICommand; + +public abstract class BaseJavaPlugin extends JavaPlugin { + @Inject + protected JavaPlugin javaPlugin; + + @Inject + protected Server server; + + @Inject + protected PluginManager pluginManager; + + @Inject + protected BukkitScheduler scheduler; + + @Inject + protected FileConfiguration fileConfiguration; + + @Inject + protected Set listeners; + + @Inject + protected Set commands; + + @Inject + protected Logger logger; + + protected Injector createInjector(JavaPluginModule module) { + var injector = Guice.createInjector(module); + + injector.injectMembers(this); + + return injector; + } + + protected void registerListeners() { + for (var listener : listeners) { + pluginManager.registerEvents(listener, this); + logger.trace("Event listener '{}' registered.", listener.getClass().getName()); + } + } + + protected void registerCommands() { + for (var command : commands) { + var commandClassName = command.getClass().getName(); + + var permissions = command.permissions(); + for (var permission : permissions) { + pluginManager.addPermission(permission); + logger.trace("Command '{}' permission '{}' registered.", commandClassName, permission.getName()); + } + + command.command().register(this); + logger.trace("Command '{}' registered.", commandClassName); + } + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/ComponentUtils.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/ComponentUtils.java new file mode 100644 index 0000000..0606c89 --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/ComponentUtils.java @@ -0,0 +1,13 @@ +package io.github.axolotsh.pluginutils; + +import io.github.axolotsh.localizationlib.abstraction.ILocalizationService; +import net.kyori.adventure.text.Component; +import net.kyori.adventure.text.minimessage.MiniMessage; + +public class ComponentUtils { + private static final MiniMessage mm = MiniMessage.miniMessage(); + + public static Component component(ILocalizationService service, String key) { + return mm.deserialize(service.translate(key)); + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/JavaPluginModule.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/JavaPluginModule.java new file mode 100644 index 0000000..5525c7f --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/JavaPluginModule.java @@ -0,0 +1,55 @@ +package io.github.axolotsh.pluginutils; + +import org.bukkit.Server; +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.PluginManager; +import org.bukkit.plugin.java.JavaPlugin; +import org.bukkit.scheduler.BukkitScheduler; +import org.slf4j.Logger; + +import com.google.inject.Provides; +import com.google.inject.Singleton; + +public abstract class JavaPluginModule extends PluginModule { + protected final JavaPlugin javaPlugin; + + protected JavaPluginModule(JavaPlugin javaPlugin) { + this.javaPlugin = javaPlugin; + } + + @Provides + @Singleton + protected JavaPlugin provideJavaPlugin() { + return javaPlugin; + } + + @Provides + @Singleton + protected Server provideServer(JavaPlugin plugin) { + return plugin.getServer(); + } + + @Provides + @Singleton + protected PluginManager providePluginManager(Server server) { + return server.getPluginManager(); + } + + @Provides + @Singleton + protected BukkitScheduler provideScheduler(Server server) { + return server.getScheduler(); + } + + @Provides + @Singleton + protected FileConfiguration provideFileConfiguration(JavaPlugin plugin) { + return plugin.getConfig(); + } + + @Provides + @Singleton + protected Logger provideLogger(JavaPlugin plugin) { + return plugin.getSLF4JLogger(); + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginConfiguration.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginConfiguration.java new file mode 100644 index 0000000..16f8c85 --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginConfiguration.java @@ -0,0 +1,44 @@ +package io.github.axolotsh.pluginutils; + +import org.bukkit.configuration.file.FileConfiguration; +import org.bukkit.plugin.java.JavaPlugin; + +public abstract class PluginConfiguration { + protected final JavaPlugin plugin; + protected final FileConfiguration configuration; + + protected PluginConfiguration(JavaPlugin plugin, FileConfiguration configuration) { + this.plugin = plugin; + this.configuration = configuration; + } + + protected String get(String key, String fallback) { + return getString(key, fallback); + } + + protected String getString(String key, String fallback) { + if (configuration.contains(key)) + return configuration.getString(key); + return fallback; + } + + protected int get(String key, int fallback) { + return getInt(key, fallback); + } + + protected int getInt(String key, int fallback) { + if (configuration.contains(key)) + return configuration.getInt(key); + return fallback; + } + + protected boolean get(String key, boolean fallback) { + return getBoolean(key, fallback); + } + + protected boolean getBoolean(String key, boolean fallback) { + if (configuration.contains(key)) + return configuration.getBoolean(key); + return fallback; + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginModule.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginModule.java new file mode 100644 index 0000000..eb73ba0 --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginModule.java @@ -0,0 +1,18 @@ +package io.github.axolotsh.pluginutils; + +import org.bukkit.event.Listener; + +import com.google.inject.AbstractModule; +import com.google.inject.multibindings.Multibinder; + +import io.github.axolotsh.pluginutils.entities.ICommand; + +public abstract class PluginModule extends AbstractModule { + protected Multibinder createListenersMultibinder() { + return Multibinder.newSetBinder(binder(), Listener.class); + } + + protected Multibinder createCommandsMultibinder() { + return Multibinder.newSetBinder(binder(), ICommand.class); + } +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginUtils.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginUtils.java new file mode 100644 index 0000000..8579dbe --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/PluginUtils.java @@ -0,0 +1,5 @@ +package io.github.axolotsh.pluginutils; + +public class PluginUtils { + +} diff --git a/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/entities/ICommand.java b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/entities/ICommand.java new file mode 100644 index 0000000..fac3bc0 --- /dev/null +++ b/plugin-utils/src/main/java/io/github/axolotsh/pluginutils/entities/ICommand.java @@ -0,0 +1,13 @@ +package io.github.axolotsh.pluginutils.entities; + +import java.util.Collection; + +import org.bukkit.permissions.Permission; + +import dev.jorel.commandapi.CommandAPICommand; + +public interface ICommand { + public Collection permissions(); + + public CommandAPICommand command(); +} diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..f30d6a8 --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,2 @@ +rootProject.name = "PluginUtils" +include("plugin-utils")