diff --git a/.classpath b/.classpath deleted file mode 100644 index 8fe0193..0000000 --- a/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/.gitignore b/.gitignore index ea8c4bf..567609b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/target +build/ diff --git a/.project b/.project deleted file mode 100644 index 2a90c04..0000000 --- a/.project +++ /dev/null @@ -1,23 +0,0 @@ - - - ScoreKeeper - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.m2e.core.maven2Builder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.m2e.core.maven2Nature - - diff --git a/.settings/org.eclipse.jdt.apt.core.prefs b/.settings/org.eclipse.jdt.apt.core.prefs new file mode 100644 index 0000000..d4313d4 --- /dev/null +++ b/.settings/org.eclipse.jdt.apt.core.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.apt.aptEnabled=false diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index b83fc05..8c965d0 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,10 @@ -#Sun Feb 19 04:11:12 PST 2012 eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.classpath.outputOverlappingAnotherSource=ignore +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=ignore +org.eclipse.jdt.core.compiler.processAnnotations=disabled +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=1.8 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/TODO.md b/TODO.md index 15ae5ec..e420ae1 100644 --- a/TODO.md +++ b/TODO.md @@ -4,14 +4,14 @@ - [ ] Update logger usage to use getLogger() from JavaPlugin - [ ] Remove or modernize any old/deprecated event registration (use @EventHandler and registerEvents) - [ ] Review and update player lookup logic to use getPlayerExact or handle case sensitivity -- [ ] Ensure all commands are properly defined in plugin.yml -- [ ] Initialize Gradle build system -- [ ] Set project metadata in build.gradle -- [ ] Add repositories and dependencies -- [ ] Configure Java version -- [ ] Ensure resource handling for plugin.yml -- [ ] Add Gradle plugins as needed (e.g., Shadow) -- [ ] Update .gitignore for Gradle -- [ ] Remove Maven files -- [ ] Update documentation and scripts -- [ ] Test the Gradle build +- [x] Ensure all commands are properly defined in plugin.yml +- [x] Initialize Gradle build system +- [x] Set project metadata in build.gradle +- [x] Add repositories and dependencies +- [x] Configure Java version +- [x] Ensure resource handling for plugin.yml +- [x] Add Gradle plugins as needed (e.g., Shadow) +- [x] Update .gitignore for Gradle +- [x] Remove Maven files +- [x] Update documentation and scripts +- [x] Test the Gradle build diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..24e7231 --- /dev/null +++ b/build.gradle @@ -0,0 +1,28 @@ +plugins { + id 'java' +} + +group = 'com.majinnaibu.minecraft.plugins.' +version = '0.2-SNAPSHOT' + +description = "ScoreKeeper" + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() + maven { url = 'https://repo.papermc.io/repository/maven-public/' } +} + +dependencies { + compileOnly 'io.papermc.paper:paper-api:1.21.7-R0.1-SNAPSHOT' +} + +tasks.withType(JavaCompile).configureEach { + options.encoding = 'UTF-8' + // options.compilerArgs << "-Xlint:deprecation" +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..b498d24 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..48c0a02 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..17a9170 --- /dev/null +++ b/gradlew @@ -0,0 +1,176 @@ +#!/usr/bin/env sh + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# 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 +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="" + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +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" + which java >/dev/null 2>&1 || 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 + +# 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 +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 + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; 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 + # 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\"" + fi + i=$((i+1)) + 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 +if $JAVACMD --add-opens java.base/java.lang=ALL-UNNAMED -version ; then + DEFAULT_JVM_OPTS="--add-opens java.base/java.lang=ALL-UNNAMED $DEFAULT_JVM_OPTS" +fi + +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..e95643d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,84 @@ +@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=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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= + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +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. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +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. + +goto fail + +:init +@rem Get command-line arguments, handling Windows variants + +if not "%OS%" == "Windows_NT" goto win9xME_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* + +: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 %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="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 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 3b7f7d0..0000000 --- a/pom.xml +++ /dev/null @@ -1,51 +0,0 @@ - - - 4.0.0 - com.majinnaibu.bukkitplugins - ScoreKeeper - jar - 0.2-SNAPSHOT - bukkitplugin - - http://www.github.com/headhunter45/ScoreKeeper - - UTF-8 - - - - scm:git:git://github.com/headhunter45/ScoreKeeper.git - https://github.com/headhunter45/ScoreKeeper - scm:git:git@github.com:headhunter45/ScoreKeeper.git - - - - - majinnaibu-repo - http://repo.majinnaibu.com - - - - bukkit-repo - http://repo.bukkit.org/content/groups/public - - - - - - - org.bukkit - bukkit - 1.1-R6 - jar - compile - - - - diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d1569b5 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'ScoreKeeper' diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java similarity index 76% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java index 953283a..a33138c 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/ScoreKeeperPlugin.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/ScoreKeeperPlugin.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper; +package com.majinnaibu.minecraft.plugins.scorekeeper; import java.util.HashMap; import java.util.logging.Logger; @@ -7,11 +7,11 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.PluginDescriptionFile; import org.bukkit.plugin.java.JavaPlugin; -import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreAddCommand; -import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreArchiveCommand; -import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreGetCommand; -import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreResetCommand; -import com.majinnaibu.bukkitplugins.scorekeeper.commands.ScoreSubtractCommand; +import com.majinnaibu.minecraft.plugins.scorekeeper.commands.ScoreAddCommand; +import com.majinnaibu.minecraft.plugins.scorekeeper.commands.ScoreArchiveCommand; +import com.majinnaibu.minecraft.plugins.scorekeeper.commands.ScoreGetCommand; +import com.majinnaibu.minecraft.plugins.scorekeeper.commands.ScoreResetCommand; +import com.majinnaibu.minecraft.plugins.scorekeeper.commands.ScoreSubtractCommand; public class ScoreKeeperPlugin extends JavaPlugin { private final HashMap _playerScores = new HashMap(); diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java similarity index 90% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java index a275def..b749abd 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreAddCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreAddCommand.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper.commands; +package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin; +import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; public class ScoreAddCommand implements CommandExecutor { private final ScoreKeeperPlugin _plugin; diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java similarity index 84% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java index 1d10ccb..ad2c0cf 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreArchiveCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreArchiveCommand.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper.commands; +package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin; +import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; public class ScoreArchiveCommand implements CommandExecutor { private final ScoreKeeperPlugin _plugin; diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java similarity index 91% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java index 8760191..f87fa32 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreGetCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreGetCommand.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper.commands; +package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin; +import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; public class ScoreGetCommand implements CommandExecutor { private final ScoreKeeperPlugin _plugin; diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java similarity index 90% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java index 169ac40..2e41f3a 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreResetCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreResetCommand.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper.commands; +package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin; +import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; public class ScoreResetCommand implements CommandExecutor { private final ScoreKeeperPlugin _plugin; diff --git a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java similarity index 90% rename from src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java rename to src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java index bd97c0d..1650da0 100644 --- a/src/main/java/com/majinnaibu/bukkitplugins/scorekeeper/commands/ScoreSubtractCommand.java +++ b/src/main/java/com/majinnaibu/minecraft/plugins/scorekeeper/commands/ScoreSubtractCommand.java @@ -1,4 +1,4 @@ -package com.majinnaibu.bukkitplugins.scorekeeper.commands; +package com.majinnaibu.minecraft.plugins.scorekeeper.commands; import org.bukkit.ChatColor; import org.bukkit.command.Command; @@ -6,7 +6,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import com.majinnaibu.bukkitplugins.scorekeeper.ScoreKeeperPlugin; +import com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin; public class ScoreSubtractCommand implements CommandExecutor { private final ScoreKeeperPlugin _plugin; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index c894174..c5a6c40 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,7 @@ name: ScoreKeeper -main: com.majinnaibu.bukkit.plugins.scorekeeper.ScoreKeeperPlugin -version: 0.0a +main: com.majinnaibu.minecraft.plugins.scorekeeper.ScoreKeeperPlugin +version: 0.1.0 +api-version: 1.21 commands: score-get: description: Displays the player's score. diff --git a/tools/bash/build-plugin.sh b/tools/bash/build-plugin.sh new file mode 100755 index 0000000..6b84304 --- /dev/null +++ b/tools/bash/build-plugin.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env bash +set -e + +# Find project root (two directories above this script) +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" + +cd "$PROJECT_ROOT" + +./gradlew build \ No newline at end of file diff --git a/tools/bash/deploy-plugin.sh b/tools/bash/deploy-plugin.sh new file mode 100755 index 0000000..e9472e2 --- /dev/null +++ b/tools/bash/deploy-plugin.sh @@ -0,0 +1,25 @@ +#!/usr/bin/env bash +set -e + +if [[ -z "$MINECRAFT_SERVER_PATH" ]]; then + echo "Error: MINECRAFT_SERVER_PATH environment variable is not set." + exit 1 +fi + +SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +PROJECT_ROOT="$(cd "$SCRIPT_DIR/../.." && pwd)" + +PLUGIN_JAR=$(ls -t "$PROJECT_ROOT"/build/libs/*.jar 2>/dev/null | head -n1) +if [[ ! -f "$PLUGIN_JAR" ]]; then + echo "Error: No plugin jar found in $PROJECT_ROOT/build/libs. Build the plugin first." + exit 1 +fi + +# Optional: Warn if jar is older than any source file +if find "$PROJECT_ROOT/src/main/java" "$PROJECT_ROOT/src/main/resources" -type f -newer "$PLUGIN_JAR" | grep -q .; then + echo "Warning: The built plugin jar is older than some source files. Consider rebuilding." +fi + +mkdir -p "$MINECRAFT_SERVER_PATH/plugins" +cp "$PLUGIN_JAR" "$MINECRAFT_SERVER_PATH/plugins/" +echo "Deployed $PLUGIN_JAR to $MINECRAFT_SERVER_PATH/plugins/" \ No newline at end of file