diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a51af --- /dev/null +++ b/.gitattributes @@ -0,0 +1,6 @@ +# +# https://help.github.com/articles/dealing-with-line-endings/ +# +# These are explicitly windows files and should use crlf +*.bat text eol=crlf + diff --git a/.gitignore b/.gitignore index 8a5d20c..457ce33 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,12 @@ hs_err_pid* .project .settings/ bin/ + +# IntelliJ junk +.idea/ + +# Ignore Gradle project-specific cache directory +.gradle + +# Ignore Gradle build output directory +build diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..7f5a414 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'java-library' +} + +group 'me.jamestmartin' +version '0.1.0' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() + + maven { + url = 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' + + content { + includeGroup 'org.bukkit' + includeGroup 'org.spigotmc' + } + } + + maven { url = 'https://oss.sonatype.org/content/repositories/snapshots' } + + maven { + name = "Towny" + url = "https://maven.pkg.github.com/TownyAdvanced/Towny" + credentials { + username = project.findProperty("gpr.user") ?: System.getenv("USERNAME") + password = project.findProperty("gpr.key") ?: System.getenv("PASSWORD") + } + } +} + +dependencies { + compileOnly 'org.spigotmc:spigot-api:1.15.2-R0.1-SNAPSHOT' + compileOnly 'com.palmergames.bukkit.towny:Towny:0.95.2.13' +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..f3d88b1 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..1b16c34 --- /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-6.1.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 0000000..2fe81a7 --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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. +# + +############################################################################## +## +## 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='"-Xmx64m" "-Xms64m"' + +# 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 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 + # 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=`expr $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 +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9618d8d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 + +@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="-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%" == "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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..2519a30 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'wasteland' diff --git a/src/me/jtmar/wasteland/Database.java b/src/main/java/me/jamestmartin/wasteland/Database.java similarity index 99% rename from src/me/jtmar/wasteland/Database.java rename to src/main/java/me/jamestmartin/wasteland/Database.java index 9a4270b..30b6a2b 100644 --- a/src/me/jtmar/wasteland/Database.java +++ b/src/main/java/me/jamestmartin/wasteland/Database.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland; +package me.jamestmartin.wasteland; import java.io.File; import java.io.IOException; diff --git a/src/me/jtmar/wasteland/Wasteland.java b/src/main/java/me/jamestmartin/wasteland/Wasteland.java similarity index 82% rename from src/me/jtmar/wasteland/Wasteland.java rename to src/main/java/me/jamestmartin/wasteland/Wasteland.java index 0f00d02..2c4d301 100644 --- a/src/me/jtmar/wasteland/Wasteland.java +++ b/src/main/java/me/jamestmartin/wasteland/Wasteland.java @@ -1,25 +1,24 @@ -package me.jtmar.wasteland; +package me.jamestmartin.wasteland; import java.io.File; import java.io.IOException; import java.sql.SQLException; import java.util.logging.Level; +import me.jamestmartin.wasteland.commands.CommandOfficial; +import me.jamestmartin.wasteland.commands.CommandRank; +import me.jamestmartin.wasteland.commands.CommandRanks; +import me.jamestmartin.wasteland.commands.CommandSetKills; +import me.jamestmartin.wasteland.config.WastelandConfig; +import me.jamestmartin.wasteland.listeners.ChatListener; +import me.jamestmartin.wasteland.listeners.RankListener; +import me.jamestmartin.wasteland.towny.TownyDependency; +import me.jamestmartin.wasteland.towny.TownyDisabled; +import me.jamestmartin.wasteland.towny.TownyPrefix; import org.bukkit.entity.Player; import org.bukkit.plugin.PluginManager; import org.bukkit.plugin.java.JavaPlugin; -import me.jtmar.wasteland.commands.CommandRank; -import me.jtmar.wasteland.commands.CommandRanks; -import me.jtmar.wasteland.commands.CommandOfficial; -import me.jtmar.wasteland.commands.CommandSetKills; -import me.jtmar.wasteland.config.WastelandConfig; -import me.jtmar.wasteland.listeners.ChatListener; -import me.jtmar.wasteland.listeners.RankListener; -import me.jtmar.wasteland.towny.TownyDependency; -import me.jtmar.wasteland.towny.TownyDisabled; -import me.jtmar.wasteland.towny.TownyPrefix; - public class Wasteland extends JavaPlugin { private static Wasteland instance; diff --git a/src/me/jtmar/wasteland/commands/CommandOfficial.java b/src/main/java/me/jamestmartin/wasteland/commands/CommandOfficial.java similarity index 91% rename from src/me/jtmar/wasteland/commands/CommandOfficial.java rename to src/main/java/me/jamestmartin/wasteland/commands/CommandOfficial.java index 10d9a55..fe15617 100644 --- a/src/me/jtmar/wasteland/commands/CommandOfficial.java +++ b/src/main/java/me/jamestmartin/wasteland/commands/CommandOfficial.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.commands; +package me.jamestmartin.wasteland.commands; import java.util.Optional; @@ -8,8 +8,8 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.ranks.Rank; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.ranks.Rank; public class CommandOfficial implements CommandExecutor { @Override diff --git a/src/me/jtmar/wasteland/commands/CommandRank.java b/src/main/java/me/jamestmartin/wasteland/commands/CommandRank.java similarity index 95% rename from src/me/jtmar/wasteland/commands/CommandRank.java rename to src/main/java/me/jamestmartin/wasteland/commands/CommandRank.java index ee204e9..0e32882 100644 --- a/src/me/jtmar/wasteland/commands/CommandRank.java +++ b/src/main/java/me/jamestmartin/wasteland/commands/CommandRank.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.commands; +package me.jamestmartin.wasteland.commands; import java.sql.SQLException; import java.util.Optional; @@ -9,8 +9,8 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.ranks.EnlistedRank; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.ranks.EnlistedRank; public class CommandRank implements CommandExecutor { @Override diff --git a/src/me/jtmar/wasteland/commands/CommandRanks.java b/src/main/java/me/jamestmartin/wasteland/commands/CommandRanks.java similarity index 81% rename from src/me/jtmar/wasteland/commands/CommandRanks.java rename to src/main/java/me/jamestmartin/wasteland/commands/CommandRanks.java index b644b4e..2f7a49b 100644 --- a/src/me/jtmar/wasteland/commands/CommandRanks.java +++ b/src/main/java/me/jamestmartin/wasteland/commands/CommandRanks.java @@ -1,13 +1,13 @@ -package me.jtmar.wasteland.commands; +package me.jamestmartin.wasteland.commands; import org.bukkit.command.Command; import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.config.WastelandConfig; -import me.jtmar.wasteland.ranks.EnlistedRank; -import me.jtmar.wasteland.ranks.Rank; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.config.WastelandConfig; +import me.jamestmartin.wasteland.ranks.EnlistedRank; +import me.jamestmartin.wasteland.ranks.Rank; public class CommandRanks implements CommandExecutor { private String makeElement(Rank rank) { diff --git a/src/me/jtmar/wasteland/commands/CommandSetKills.java b/src/main/java/me/jamestmartin/wasteland/commands/CommandSetKills.java similarity index 96% rename from src/me/jtmar/wasteland/commands/CommandSetKills.java rename to src/main/java/me/jamestmartin/wasteland/commands/CommandSetKills.java index 8d40d60..2ee1464 100644 --- a/src/me/jtmar/wasteland/commands/CommandSetKills.java +++ b/src/main/java/me/jamestmartin/wasteland/commands/CommandSetKills.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.commands; +package me.jamestmartin.wasteland.commands; import java.sql.SQLException; import java.util.logging.Level; @@ -8,7 +8,7 @@ import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import me.jtmar.wasteland.Wasteland; +import me.jamestmartin.wasteland.Wasteland; public class CommandSetKills implements CommandExecutor { @Override diff --git a/src/me/jtmar/wasteland/config/WastelandConfig.java b/src/main/java/me/jamestmartin/wasteland/config/WastelandConfig.java similarity index 96% rename from src/me/jtmar/wasteland/config/WastelandConfig.java rename to src/main/java/me/jamestmartin/wasteland/config/WastelandConfig.java index 691de4a..78115fa 100644 --- a/src/me/jtmar/wasteland/config/WastelandConfig.java +++ b/src/main/java/me/jamestmartin/wasteland/config/WastelandConfig.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.config; +package me.jamestmartin.wasteland.config; import java.util.ArrayList; import java.util.Collection; @@ -7,8 +7,8 @@ import java.util.Set; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; -import me.jtmar.wasteland.ranks.EnlistedRank; -import me.jtmar.wasteland.ranks.Rank; +import me.jamestmartin.wasteland.ranks.EnlistedRank; +import me.jamestmartin.wasteland.ranks.Rank; public class WastelandConfig { private final String databaseFile; diff --git a/src/me/jtmar/wasteland/listeners/ChatListener.java b/src/main/java/me/jamestmartin/wasteland/listeners/ChatListener.java similarity index 87% rename from src/me/jtmar/wasteland/listeners/ChatListener.java rename to src/main/java/me/jamestmartin/wasteland/listeners/ChatListener.java index d480eab..9da93bb 100644 --- a/src/me/jtmar/wasteland/listeners/ChatListener.java +++ b/src/main/java/me/jamestmartin/wasteland/listeners/ChatListener.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.listeners; +package me.jamestmartin.wasteland.listeners; import java.util.Optional; @@ -8,9 +8,9 @@ import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.Listener; import org.bukkit.event.player.AsyncPlayerChatEvent; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.ranks.EnlistedRank; -import me.jtmar.wasteland.ranks.Rank; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.ranks.EnlistedRank; +import me.jamestmartin.wasteland.ranks.Rank; public class ChatListener implements Listener { @EventHandler(priority = EventPriority.HIGHEST) diff --git a/src/me/jtmar/wasteland/listeners/RankListener.java b/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java similarity index 96% rename from src/me/jtmar/wasteland/listeners/RankListener.java rename to src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java index 43a9eca..873331c 100644 --- a/src/me/jtmar/wasteland/listeners/RankListener.java +++ b/src/main/java/me/jamestmartin/wasteland/listeners/RankListener.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.listeners; +package me.jamestmartin.wasteland.listeners; import java.sql.SQLException; import java.util.HashMap; @@ -17,8 +17,8 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.permissions.PermissionAttachment; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.ranks.EnlistedRank; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.ranks.EnlistedRank; public class RankListener implements Listener, AutoCloseable { private Map attachments = new HashMap<>(); diff --git a/src/me/jtmar/wasteland/ranks/EnlistedRank.java b/src/main/java/me/jamestmartin/wasteland/ranks/EnlistedRank.java similarity index 97% rename from src/me/jtmar/wasteland/ranks/EnlistedRank.java rename to src/main/java/me/jamestmartin/wasteland/ranks/EnlistedRank.java index ad77154..9c205c0 100644 --- a/src/me/jtmar/wasteland/ranks/EnlistedRank.java +++ b/src/main/java/me/jamestmartin/wasteland/ranks/EnlistedRank.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.ranks; +package me.jamestmartin.wasteland.ranks; import java.util.Collection; import java.util.Comparator; @@ -11,7 +11,7 @@ import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; import org.bukkit.permissions.PermissionDefault; -import me.jtmar.wasteland.Wasteland; +import me.jamestmartin.wasteland.Wasteland; public class EnlistedRank extends Rank { private final Optional kills; diff --git a/src/me/jtmar/wasteland/ranks/Rank.java b/src/main/java/me/jamestmartin/wasteland/ranks/Rank.java similarity index 97% rename from src/me/jtmar/wasteland/ranks/Rank.java rename to src/main/java/me/jamestmartin/wasteland/ranks/Rank.java index 1427be6..0808a71 100644 --- a/src/me/jtmar/wasteland/ranks/Rank.java +++ b/src/main/java/me/jamestmartin/wasteland/ranks/Rank.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.ranks; +package me.jamestmartin.wasteland.ranks; import java.util.Collection; import java.util.Comparator; @@ -6,15 +6,14 @@ import java.util.HashMap; import java.util.Map; import java.util.Optional; +import me.jamestmartin.wasteland.Wasteland; +import me.jamestmartin.wasteland.config.WastelandConfig; import org.bukkit.ChatColor; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; import org.bukkit.permissions.Permission; import org.bukkit.permissions.PermissionDefault; -import me.jtmar.wasteland.Wasteland; -import me.jtmar.wasteland.config.WastelandConfig; - public class Rank { private final String id, abbreviation, name; private final Optional description; diff --git a/src/me/jtmar/wasteland/towny/TownyDependency.java b/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java similarity index 96% rename from src/me/jtmar/wasteland/towny/TownyDependency.java rename to src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java index 6ac2037..2bc84ef 100644 --- a/src/me/jtmar/wasteland/towny/TownyDependency.java +++ b/src/main/java/me/jamestmartin/wasteland/towny/TownyDependency.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.towny; +package me.jamestmartin.wasteland.towny; import java.util.Optional; diff --git a/src/me/jtmar/wasteland/towny/TownyDisabled.java b/src/main/java/me/jamestmartin/wasteland/towny/TownyDisabled.java similarity index 83% rename from src/me/jtmar/wasteland/towny/TownyDisabled.java rename to src/main/java/me/jamestmartin/wasteland/towny/TownyDisabled.java index f47cad6..e4afa0e 100644 --- a/src/me/jtmar/wasteland/towny/TownyDisabled.java +++ b/src/main/java/me/jamestmartin/wasteland/towny/TownyDisabled.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.towny; +package me.jamestmartin.wasteland.towny; import java.util.Optional; diff --git a/src/me/jtmar/wasteland/towny/TownyPrefix.java b/src/main/java/me/jamestmartin/wasteland/towny/TownyPrefix.java similarity index 78% rename from src/me/jtmar/wasteland/towny/TownyPrefix.java rename to src/main/java/me/jamestmartin/wasteland/towny/TownyPrefix.java index 8263127..ba47248 100644 --- a/src/me/jtmar/wasteland/towny/TownyPrefix.java +++ b/src/main/java/me/jamestmartin/wasteland/towny/TownyPrefix.java @@ -1,4 +1,4 @@ -package me.jtmar.wasteland.towny; +package me.jamestmartin.wasteland.towny; import java.util.Optional; diff --git a/src/config.yml b/src/main/resources/config.yml similarity index 100% rename from src/config.yml rename to src/main/resources/config.yml diff --git a/src/plugin.yml b/src/main/resources/plugin.yml similarity index 93% rename from src/plugin.yml rename to src/main/resources/plugin.yml index f0f69b0..da6ef55 100644 --- a/src/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,8 +1,8 @@ name: Wasteland author: HuskFodder -main: me.jtmar.wasteland.Wasteland -version: 0.0.0 -api-version: 1.14 +main: me.jamestmartin.wasteland.Wasteland +version: 0.1.0 +api-version: 1.15 softdepend: [Towny]