diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..94f643f --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1,3 @@ +# These are supported funding model platforms + +patreon: Peaches_MLG diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..6948df1 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,12 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "daily" + target-branch: "master" diff --git a/.github/workflows/dependabot-approve.yml b/.github/workflows/dependabot-approve.yml new file mode 100644 index 0000000..7ebd32c --- /dev/null +++ b/.github/workflows/dependabot-approve.yml @@ -0,0 +1,29 @@ +name: Dependabot approve & merge +on: pull_request_target + +permissions: + pull-requests: write + contents: write + +jobs: + dependabot: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Dependabot metadata + id: metadata + uses: dependabot/fetch-metadata@v1.1.1 + with: + github-token: "${{ secrets.GITHUB_TOKEN }}" + + - name: Approve a PR + run: gh pr review --approve "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: Enable auto-merge for Dependabot PRs + run: gh pr merge --auto --squash "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..ae9ee62 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,55 @@ +# This workflow will build a Java project with Gradle +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle + +name: Java CI with Gradle +on: [ push, pull_request ] + +jobs: + build: + runs-on: ubuntu-latest + if: "!contains(github.event.commits[0].message, '[ci-skip]')" + steps: + - uses: actions/checkout@v4 + - uses: gradle/wrapper-validation-action@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + distribution: temurin + java-version: 17 + cache: gradle + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Test with Gradle + run: ./gradlew test + - name: Build with Gradle + run: ./gradlew build + - name: Upload artifacts + uses: actions/upload-artifact@v4 + with: + name: "IridiumMobCoins" + path: "build/libs/IridiumMobCoins-*.jar" + upload: + needs: build + runs-on: ubuntu-latest + if: "contains(github.event.commits[0].message, 'Version Increment')" + steps: + - uses: actions/checkout@v4.2.2 + - uses: thecodemonkey/action-get-gradle-version@master + id: version + with: + file: "build.gradle.kts" + - uses: actions/download-artifact@v4 + with: + name: "IridiumMobCoins" + path: "./" + - name: Publish to Nexus + uses: sonatype-nexus-community/nexus-repo-github-action@master + with: + serverUrl: "https://nexus.iridiumdevelopment.net/" + username: "${{ secrets.NEXUS_USERNAME }}" + password: "${{ secrets.NEXUS_PASSWORD }}" + format: "maven2" + repository: "maven-releases" + coordinates: "groupId=com.iridium artifactId=IridiumMobCoins version=${{steps.version.outputs.version}} generate-pom=on" + assets: "extension=jar" + filename: "IridiumMobCoins-*.jar" diff --git a/build.gradle.kts b/build.gradle.kts index b38af1f..2059fbc 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,44 +1,44 @@ plugins { java `maven-publish` - id("com.github.johnrengelman.shadow") version "6.1.0" + id("com.gradleup.shadow") version "9.1.0" } group = "com.iridium" -version = "1.0.0" +version = "1.0.6" description = "IridiumMobCoins" repositories { maven("https://repo.mvdw-software.com/content/groups/public/") maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/") - maven("https://repo.extendedclip.com/content/repositories/placeholderapi/") + maven("https://repo.extendedclip.com/releases/") maven("https://ci.ender.zone/plugin/repository/everything/") maven("https://jitpack.io") - maven("https://nexus.savagelabs.net/repository/maven-releases/") - maven("https://papermc.io/repo/repository/maven-public/") + maven("https://nexus.iridiumdevelopment.net/repository/maven-releases/") + maven("https://repo.papermc.io/repository/maven-public/") maven("https://repo.rosewooddev.io/repository/public/") - maven("https://repo.jeff-media.de/maven2/") + maven("https://repo.jeff-media.com/public/") } dependencies { // Dependencies that we want to shade in - implementation("org.jetbrains", "annotations", "16.0.1") - implementation("com.iridium", "IridiumCore", "1.2.5") - implementation("org.bstats", "bstats-bukkit", "2.2.1") - implementation("com.github.j256", "ormlite-core", "master-SNAPSHOT") - implementation("com.j256.ormlite", "ormlite-jdbc", "5.3") - implementation("de.jeff_media", "SpigotUpdateChecker", "1.2.4") + implementation("com.iridium", "IridiumCore", "2.0.9") + implementation("org.bstats", "bstats-bukkit", "3.1.0") + implementation("org.apache.commons", "commons-text", "1.13.1") + implementation("com.j256.ormlite", "ormlite-core", "6.1") + implementation("com.j256.ormlite", "ormlite-jdbc", "6.1") + implementation("de.jeff_media", "SpigotUpdateChecker", "1.3.2") // Other dependencies that are not required or already available at runtime - compileOnly("org.projectlombok", "lombok", "1.18.20") + compileOnly("org.projectlombok", "lombok", "1.18.38") compileOnly("org.spigotmc", "spigot-api", "1.17-R0.1-SNAPSHOT") - compileOnly("me.clip", "placeholderapi", "2.9.2") + compileOnly("me.clip", "placeholderapi", "2.11.6") compileOnly("be.maximvdw", "MVdWPlaceholderAPI", "2.1.1-SNAPSHOT") { exclude("org.spigotmc") } // Enable lombok annotation processing - annotationProcessor("org.projectlombok", "lombok", "1.18.20") + annotationProcessor("org.projectlombok", "lombok", "1.18.38") } tasks { @@ -49,14 +49,25 @@ tasks { } shadowJar { + fun relocate(origin: String) = + relocate(origin, "com.iridium.iridiummobcoins.dependencies${origin.substring(origin.lastIndexOf('.'))}") + // Remove the archive classifier suffix archiveClassifier.set("") // Relocate dependencies - relocate("com.fasterxml.jackson", "com.iridium.iridiumskyblock.dependencies.fasterxml") - relocate("com.j256.ormlite", "com.iridium.iridiumskyblock.dependencies.ormlite") - relocate("org.bstats", "com.iridium.iridiumskyblock.dependencies.bstats") - relocate("de.jeff_media", "com.iridium.iridiumskyblock.dependencies") + relocate("com.iridium.iridiumcore") + relocate("com.j256.ormlite") + relocate("de.jeff_media") + + // Relocate IridiumCore dependencies + relocate("de.tr7zw.changeme.nbtapi") + relocate("com.iridium.iridiumcolorapi") + relocate("org.yaml.snakeyaml") + relocate("io.papermc.lib") + relocate("com.cryptomorin.xseries") + relocate("com.fasterxml.jackson") + relocate("org.apache.commons") // Remove unnecessary files from the jar minimize() @@ -65,6 +76,8 @@ tasks { // Set UTF-8 as the encoding compileJava { options.encoding = "UTF-8" + sourceCompatibility = JavaVersion.VERSION_1_8.toString() + targetCompatibility = JavaVersion.VERSION_1_8.toString() } // Process Placeholders for the plugin.yml @@ -78,13 +91,6 @@ tasks { } } -java { - toolchain { - languageVersion.set(JavaLanguageVersion.of(8)) - vendor.set(JvmVendorSpec.ADOPTOPENJDK) - } -} - // Maven publishing publishing { publications.create("maven") { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e708b1c..d64cd49 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f371643..a80b22c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 4f906e0..1aa94a4 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ -#!/usr/bin/env sh +#!/bin/sh # -# Copyright 2015 the original author or authors. +# 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. @@ -17,67 +17,99 @@ # ############################################################################## -## -## Gradle start up script for UN*X -## +# +# 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/subprojects/plugins/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 -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +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 -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# 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"' +# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +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 - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +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 @@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar 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" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + 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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +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 -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -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" = "true" -o "$msys" = "true" ] ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi +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 - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + 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 - i=`expr $i + 1` + # 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 - case $i in - 0) set -- ;; - 1) set -- "$args0" ;; - 2) set -- "$args0" "$args1" ;; - 3) set -- "$args0" "$args1" "$args2" ;; - 4) set -- "$args0" "$args1" "$args2" "$args3" ;; - 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=`save "$@"` -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" +# 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, 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 index ac1b06f..7101f8e 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -14,7 +14,7 @@ @rem limitations under the License. @rem -@if "%DEBUG%" == "" @echo off +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -25,7 +25,8 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto execute +if %ERRORLEVEL% equ 0 goto execute -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe if exist "%JAVA_EXE%" goto execute -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. +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 @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +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! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +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 diff --git a/src/main/java/com/iridium/iridiummobcoins/IridiumMobCoins.java b/src/main/java/com/iridium/iridiummobcoins/IridiumMobCoins.java index 6c08060..0240e7f 100644 --- a/src/main/java/com/iridium/iridiummobcoins/IridiumMobCoins.java +++ b/src/main/java/com/iridium/iridiummobcoins/IridiumMobCoins.java @@ -10,12 +10,8 @@ import com.iridium.iridiummobcoins.managers.DatabaseManager; import com.iridium.iridiummobcoins.placeholders.ClipPlaceholderAPI; import com.iridium.iridiummobcoins.placeholders.MVDWPlaceholderAPI; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; import lombok.Getter; import org.bukkit.Bukkit; -import org.bukkit.World; import org.bukkit.plugin.Plugin; import java.sql.SQLException; @@ -33,7 +29,6 @@ public class IridiumMobCoins extends IridiumCore { private SQL sql; private Shop shop; private Inventories inventories; - private List enabledWorldList; @Override public void onEnable() { @@ -61,7 +56,6 @@ public void onEnable() { getLogger().info("Successfully registered placeholders with PlaceholderAPI."); } } - enabledWorldList = configuration.enabledWorlds.stream().map(Bukkit::getWorld).filter(Objects::nonNull).collect(Collectors.toList()); Bukkit.getScheduler().runTaskTimerAsynchronously(this, () -> getDatabaseManager().saveUsers(), 60 * 20, 60 * 20); diff --git a/src/main/java/com/iridium/iridiummobcoins/commands/Command.java b/src/main/java/com/iridium/iridiummobcoins/commands/Command.java index bb24e14..a1da8b4 100644 --- a/src/main/java/com/iridium/iridiummobcoins/commands/Command.java +++ b/src/main/java/com/iridium/iridiummobcoins/commands/Command.java @@ -1,6 +1,6 @@ package com.iridium.iridiummobcoins.commands; -import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnore; +import com.fasterxml.jackson.annotation.JsonIgnore; import org.bukkit.command.CommandSender; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/com/iridium/iridiummobcoins/commands/GiveCommand.java b/src/main/java/com/iridium/iridiummobcoins/commands/GiveCommand.java index ca44817..1ff1d4e 100644 --- a/src/main/java/com/iridium/iridiummobcoins/commands/GiveCommand.java +++ b/src/main/java/com/iridium/iridiummobcoins/commands/GiveCommand.java @@ -44,7 +44,7 @@ public void execute(CommandSender sender, String[] args) { return; } OfflinePlayer offlinePlayer = Bukkit.getServer().getOfflinePlayer(args[1]); - if (offlinePlayer.hasPlayedBefore()) { + if (offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) { User user = IridiumMobCoins.getInstance().getDatabaseManager().getUser(offlinePlayer.getUniqueId()); user.setMobcoins(Math.max(user.getMobcoins() + amount, 0)); sender.sendMessage(StringUtils.color(IridiumMobCoins.getInstance().getMessages().gavePlayerMobCoins diff --git a/src/main/java/com/iridium/iridiummobcoins/commands/RemoveCommand.java b/src/main/java/com/iridium/iridiummobcoins/commands/RemoveCommand.java index 8239be3..d6c8999 100644 --- a/src/main/java/com/iridium/iridiummobcoins/commands/RemoveCommand.java +++ b/src/main/java/com/iridium/iridiummobcoins/commands/RemoveCommand.java @@ -44,7 +44,7 @@ public void execute(CommandSender sender, String[] args) { return; } OfflinePlayer offlinePlayer = Bukkit.getServer().getOfflinePlayer(args[1]); - if (offlinePlayer.hasPlayedBefore()) { + if (offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) { User user = IridiumMobCoins.getInstance().getDatabaseManager().getUser(offlinePlayer.getUniqueId()); user.setMobcoins(Math.max(user.getMobcoins() - amount, 0)); sender.sendMessage(StringUtils.color(IridiumMobCoins.getInstance().getMessages().removePlayerMobCoins diff --git a/src/main/java/com/iridium/iridiummobcoins/commands/SetCommand.java b/src/main/java/com/iridium/iridiummobcoins/commands/SetCommand.java index 69243e7..0eff907 100644 --- a/src/main/java/com/iridium/iridiummobcoins/commands/SetCommand.java +++ b/src/main/java/com/iridium/iridiummobcoins/commands/SetCommand.java @@ -44,7 +44,7 @@ public void execute(CommandSender sender, String[] args) { return; } OfflinePlayer offlinePlayer = Bukkit.getServer().getOfflinePlayer(args[1]); - if (offlinePlayer.hasPlayedBefore()) { + if (offlinePlayer.hasPlayedBefore() || offlinePlayer.isOnline()) { User user = IridiumMobCoins.getInstance().getDatabaseManager().getUser(offlinePlayer.getUniqueId()); user.setMobcoins(Math.max(amount, 0)); sender.sendMessage(StringUtils.color(IridiumMobCoins.getInstance().getMessages().setPlayerMobCoins diff --git a/src/main/java/com/iridium/iridiummobcoins/configs/Configuration.java b/src/main/java/com/iridium/iridiummobcoins/configs/Configuration.java index dbe1a7a..040f6ad 100644 --- a/src/main/java/com/iridium/iridiummobcoins/configs/Configuration.java +++ b/src/main/java/com/iridium/iridiummobcoins/configs/Configuration.java @@ -1,8 +1,8 @@ package com.iridium.iridiummobcoins.configs; +import com.cryptomorin.xseries.XSound; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.google.common.collect.ImmutableMap; -import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties; -import com.iridium.iridiumcore.dependencies.xseries.XSound; import com.iridium.iridiumcore.utils.NumberFormatter; import java.util.Collections; import java.util.List; @@ -14,12 +14,16 @@ public class Configuration { public String prefix = "&lIridiumMobCoins &8»"; public String placeholderDefaultValue = "N/A"; public XSound inventoryOpenSound = XSound.BLOCK_NOTE_BLOCK_PLING; - public List enabledWorlds = Collections.singletonList("world"); + public List disabledWorlds = Collections.singletonList("Disabled_World"); public Map mobCoinDropChances = ImmutableMap.builder() .put(EntityType.ZOMBIE, 1.00) .put(EntityType.SKELETON, 1.00) .put(EntityType.CREEPER, 5.00) .put(EntityType.ENDERMAN, 5.00) .build(); + public Map mobCoinDropAmounts = ImmutableMap.builder() + .put(EntityType.CREEPER, 3) + .put(EntityType.ENDERMAN, 5) + .build(); public NumberFormatter numberFormatter = new NumberFormatter(); } diff --git a/src/main/java/com/iridium/iridiummobcoins/configs/Inventories.java b/src/main/java/com/iridium/iridiummobcoins/configs/Inventories.java index c66ebec..ebf8ca6 100644 --- a/src/main/java/com/iridium/iridiummobcoins/configs/Inventories.java +++ b/src/main/java/com/iridium/iridiummobcoins/configs/Inventories.java @@ -1,9 +1,9 @@ package com.iridium.iridiummobcoins.configs; +import com.cryptomorin.xseries.XMaterial; import com.google.common.collect.ImmutableMap; import com.iridium.iridiumcore.Background; import com.iridium.iridiumcore.Item; -import com.iridium.iridiumcore.dependencies.xseries.XMaterial; import com.iridium.iridiummobcoins.NoItemGUI; import java.util.Arrays; diff --git a/src/main/java/com/iridium/iridiummobcoins/configs/Messages.java b/src/main/java/com/iridium/iridiummobcoins/configs/Messages.java index 6c79b64..e15d215 100644 --- a/src/main/java/com/iridium/iridiummobcoins/configs/Messages.java +++ b/src/main/java/com/iridium/iridiummobcoins/configs/Messages.java @@ -1,6 +1,6 @@ package com.iridium.iridiummobcoins.configs; -import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class Messages { diff --git a/src/main/java/com/iridium/iridiummobcoins/configs/SQL.java b/src/main/java/com/iridium/iridiummobcoins/configs/SQL.java index a2befa1..647139f 100644 --- a/src/main/java/com/iridium/iridiummobcoins/configs/SQL.java +++ b/src/main/java/com/iridium/iridiummobcoins/configs/SQL.java @@ -1,6 +1,6 @@ package com.iridium.iridiummobcoins.configs; -import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public class SQL { diff --git a/src/main/java/com/iridium/iridiummobcoins/configs/Shop.java b/src/main/java/com/iridium/iridiummobcoins/configs/Shop.java index 49130a2..6ad08e6 100644 --- a/src/main/java/com/iridium/iridiummobcoins/configs/Shop.java +++ b/src/main/java/com/iridium/iridiummobcoins/configs/Shop.java @@ -1,9 +1,9 @@ package com.iridium.iridiummobcoins.configs; +import com.cryptomorin.xseries.XMaterial; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.google.common.collect.ImmutableMap; import com.iridium.iridiumcore.Item; -import com.iridium.iridiumcore.dependencies.fasterxml.annotation.JsonIgnoreProperties; -import com.iridium.iridiumcore.dependencies.xseries.XMaterial; import com.iridium.iridiummobcoins.ShopItem; import java.util.Arrays; diff --git a/src/main/java/com/iridium/iridiummobcoins/gui/MobCoinsGUI.java b/src/main/java/com/iridium/iridiummobcoins/gui/MobCoinsGUI.java index 6d8a275..b507f6c 100644 --- a/src/main/java/com/iridium/iridiummobcoins/gui/MobCoinsGUI.java +++ b/src/main/java/com/iridium/iridiummobcoins/gui/MobCoinsGUI.java @@ -1,6 +1,6 @@ package com.iridium.iridiummobcoins.gui; -import com.iridium.iridiumcore.GUI; +import com.iridium.iridiumcore.gui.GUI; import com.iridium.iridiumcore.utils.InventoryUtils; import com.iridium.iridiumcore.utils.ItemStackUtils; import com.iridium.iridiumcore.utils.Placeholder; diff --git a/src/main/java/com/iridium/iridiummobcoins/listeners/EntityDeathListener.java b/src/main/java/com/iridium/iridiummobcoins/listeners/EntityDeathListener.java index bc23a84..cbc9e6a 100644 --- a/src/main/java/com/iridium/iridiummobcoins/listeners/EntityDeathListener.java +++ b/src/main/java/com/iridium/iridiummobcoins/listeners/EntityDeathListener.java @@ -3,7 +3,7 @@ import com.iridium.iridiumcore.utils.StringUtils; import com.iridium.iridiummobcoins.IridiumMobCoins; import com.iridium.iridiummobcoins.database.User; -import org.apache.commons.lang.WordUtils; +import org.apache.commons.text.WordUtils; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; @@ -16,19 +16,24 @@ public class EntityDeathListener implements Listener { @EventHandler public void onEntityDeath(EntityDeathEvent event) { - if (!IridiumMobCoins.getInstance().getEnabledWorldList().contains(event.getEntity().getWorld())) return; + if (IridiumMobCoins.getInstance().getConfiguration().disabledWorlds.contains(event.getEntity().getWorld().getName())) return; Player killer = event.getEntity().getKiller(); Map mobCoinDropChances = IridiumMobCoins.getInstance().getConfiguration().mobCoinDropChances; if (killer != null && mobCoinDropChances.containsKey(event.getEntityType())) { double random = Math.floor(Math.random() * 100) + 1; if (random <= mobCoinDropChances.get(event.getEntityType())) { - killer.sendMessage(StringUtils.color(IridiumMobCoins.getInstance().getMessages().receivedMobCoinFromKillingMob + int amount = IridiumMobCoins.getInstance().getConfiguration().mobCoinDropAmounts.getOrDefault(event.getEntityType(), 1); + User user = IridiumMobCoins.getInstance().getDatabaseManager().getUser(killer.getUniqueId()); + user.setMobcoins(user.getMobcoins() + amount); + + String message = StringUtils.color(IridiumMobCoins.getInstance().getMessages().receivedMobCoinFromKillingMob .replace("%prefix%", IridiumMobCoins.getInstance().getConfiguration().prefix) .replace("%entity%", WordUtils.capitalizeFully(event.getEntityType().name().toLowerCase().replace("_", " "))) - .replace("%amount%", "1") - )); - User user = IridiumMobCoins.getInstance().getDatabaseManager().getUser(killer.getUniqueId()); - user.setMobcoins(user.getMobcoins() + 1); + .replace("%amount%", String.valueOf(amount)) + ); + if (!message.isEmpty()) { + killer.sendMessage(message); + } } } } diff --git a/src/main/java/com/iridium/iridiummobcoins/listeners/InventoryClickListener.java b/src/main/java/com/iridium/iridiummobcoins/listeners/InventoryClickListener.java index afd813c..649495d 100644 --- a/src/main/java/com/iridium/iridiummobcoins/listeners/InventoryClickListener.java +++ b/src/main/java/com/iridium/iridiummobcoins/listeners/InventoryClickListener.java @@ -1,6 +1,6 @@ package com.iridium.iridiummobcoins.listeners; -import com.iridium.iridiumcore.GUI; +import com.iridium.iridiumcore.gui.GUI; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent;