diff --git a/Changelog.txt b/Changelog.txt index f243d12e7..e79cd9cc2 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -9,6 +9,8 @@ Key: Version 2.2.0 Salvage config entries are no longer case sensitive + mcMMO has changed from using maven to gradle! + mcMMO is now a gradle project (this makes it much easier for us to support older versions of MC and other APIs) Fixed a bug where Fishing was not rewarding vanilla XP orbs Version 2.1.11 @@ -439,7 +441,7 @@ Version 1.4.08 = Fixed bug which prevented players from gaining Acrobatics XP when the setting 'Prevent_XP_After_Teleport' was set to false = Fixed bug where cooldown donor perks were reducing more than expected = Fixed bug where disabling hardcore mode for specific skills didn't work - = Fixed bug which caused the backup cleanup to delete old backups while it should have kept those + = Fixed bug which caused the net.shatteredlands.shatt.backup cleanup to delete old backups while it should have kept those = Fixed bug where party chat broke if the display name contained special characters = Fixed bug where `/addlevels all` and `/skillreset all` didn't work = Fixed bug which made it possible to gain XP by taming the same horse multiple times, if a player "untamed" that horse @@ -787,7 +789,7 @@ Version 1.4.00 ! Changed Excavation to have individual XP values for each block type, rather than a base XP value. ! Changed the way party teleportation works. When using /ptp, the target player needs to confirm the teleport before it takes place. (Configurable) ! Changed BeastLore: Now also displays offline player names - ! Changed backup task to include ALL config files + ! Changed net.shatteredlands.shatt.backup task to include ALL config files ! Deprecated most functions in ExperienceAPI, replaced them with identical versions that use a String for the SkillName rather than the SkillType enum values ! Changed Super Breaker & Giga Drill Breaker to be an enchantment-based boost, rather than an instabreak. Option exists in hidden.yml to change this to an potion-based buff. ! Changed locales to fall back on English when translated strings cannot be found. @@ -1010,7 +1012,7 @@ Version 1.3.07 + Added permission nodes for Treasure & Magic Hunter for Fishing + Added a permission node for Farmer's Diet + Added config options for enabling/disabling specific double drops - + Added automatic zip backup of flatfile database & config files + + Added automatic zip net.shatteredlands.shatt.backup of flatfile database & config files + Added config options to enable/disable specific skills for PVP & PVE = Fixed bug where Tree Feller was looking at the wrong blocks for determining how much to take down. = Fixed bug where Green Terra consumed seeds even on Mossy Stone Brick @@ -1596,7 +1598,7 @@ Fixed bug with randomly receiving Taming XP mcmmo.users file moved into /plugins/mcMMO/FlatFileStuff/ Leaderboard files now moved into /plugins/mcMMO/FlatFileStuff/Leaderboards Locale files now have the prefix locale_ instead of messages_ -Locale files are now located inside com/gmail/nossr50/locale/ instead of com/gmail/nossr50/ +Locale files are now located inside com/com.gmail/com.gmail.nossr50/locale/ instead of com/com.gmail/com.gmail.nossr50/ Updated the code that handles permissions (this may mean 3.1.6 will finally play well!) Some more source code organization Fixed warnings for compiler diff --git a/README.md b/README.md index 06675f851..05ce76758 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ The goal of mcMMO is to take core Minecraft game mechanics and expand them into mcMMO is currently developed by a team of individuals from all over the world. ### Project Lead & Founder -[![nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/nossr50) +[![com.gmail.nossr50](http://www.gravatar.com/avatar/f2ee41eedfd645fb4a3a2c8f6cb1b18c.png)](https://github.com/com.gmail.nossr50) ### Former Lead [![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin) diff --git a/mcMMO-core/.gradle/4.10/fileChanges/last-build.bin b/mcMMO-core/.gradle/4.10/fileChanges/last-build.bin new file mode 100644 index 000000000..f76dd238a Binary files /dev/null and b/mcMMO-core/.gradle/4.10/fileChanges/last-build.bin differ diff --git a/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.bin b/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.bin new file mode 100644 index 000000000..48554928e Binary files /dev/null and b/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.bin differ diff --git a/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.lock b/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.lock new file mode 100644 index 000000000..b4da80d31 Binary files /dev/null and b/mcMMO-core/.gradle/4.10/fileHashes/fileHashes.lock differ diff --git a/mcMMO-core/.gradle/4.10/gc.properties b/mcMMO-core/.gradle/4.10/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.bin b/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.bin new file mode 100644 index 000000000..7333c1fd2 Binary files /dev/null and b/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.bin differ diff --git a/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.lock b/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.lock new file mode 100644 index 000000000..2596ecbcf Binary files /dev/null and b/mcMMO-core/.gradle/4.10/taskHistory/taskHistory.lock differ diff --git a/mcMMO-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/mcMMO-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock new file mode 100644 index 000000000..de613c70f Binary files /dev/null and b/mcMMO-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock differ diff --git a/mcMMO-core/.gradle/buildOutputCleanup/cache.properties b/mcMMO-core/.gradle/buildOutputCleanup/cache.properties new file mode 100644 index 000000000..024d45a53 --- /dev/null +++ b/mcMMO-core/.gradle/buildOutputCleanup/cache.properties @@ -0,0 +1,2 @@ +#Wed Feb 06 17:16:15 PST 2019 +gradle.version=4.10 diff --git a/mcMMO-core/.gradle/buildOutputCleanup/outputFiles.bin b/mcMMO-core/.gradle/buildOutputCleanup/outputFiles.bin new file mode 100644 index 000000000..a42f27358 Binary files /dev/null and b/mcMMO-core/.gradle/buildOutputCleanup/outputFiles.bin differ diff --git a/mcMMO-core/.gradle/vcs-1/gc.properties b/mcMMO-core/.gradle/vcs-1/gc.properties new file mode 100644 index 000000000..e69de29bb diff --git a/mcMMO-core/build.gradle b/mcMMO-core/build.gradle new file mode 100644 index 000000000..676bc49c3 --- /dev/null +++ b/mcMMO-core/build.gradle @@ -0,0 +1,16 @@ +plugins { + id 'java' +} + +group 'com.com.gmail.com.gmail.nossr50.mcmmo' +version '2.2.0-SNAPSHOT' + +sourceCompatibility = 1.8 + +repositories { + mavenCentral() +} + +dependencies { + testCompile group: 'junit', name: 'junit', version: '4.12' +} diff --git a/mcMMO-core/gradle/wrapper/gradle-wrapper.properties b/mcMMO-core/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 000000000..d85420f18 --- /dev/null +++ b/mcMMO-core/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Wed Feb 06 17:16:30 PST 2019 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip diff --git a/mcMMO-core/gradlew b/mcMMO-core/gradlew new file mode 100644 index 000000000..cccdd3d51 --- /dev/null +++ b/mcMMO-core/gradlew @@ -0,0 +1,172 @@ +#!/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 +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/mcMMO-core/gradlew.bat b/mcMMO-core/gradlew.bat new file mode 100644 index 000000000..f9553162f --- /dev/null +++ b/mcMMO-core/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/mcMMO-core/settings.gradle b/mcMMO-core/settings.gradle new file mode 100644 index 000000000..07184bc3d --- /dev/null +++ b/mcMMO-core/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'mcMMO' + diff --git a/src/main/java/META-INF/MANIFEST.MF b/mcMMO-core/src/main/java/META-INF/MANIFEST.MF similarity index 100% rename from src/main/java/META-INF/MANIFEST.MF rename to mcMMO-core/src/main/java/META-INF/MANIFEST.MF diff --git a/src/main/java/com/gmail/nossr50/api/AbilityAPI.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/AbilityAPI.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java diff --git a/src/main/java/com/gmail/nossr50/api/ChatAPI.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/ChatAPI.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java diff --git a/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/ExperienceAPI.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java diff --git a/src/main/java/com/gmail/nossr50/api/PartyAPI.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/PartyAPI.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java diff --git a/src/main/java/com/gmail/nossr50/api/SkillAPI.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/SkillAPI.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java diff --git a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java diff --git a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java diff --git a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java diff --git a/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java diff --git a/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java diff --git a/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/chat/AdminChatManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/chat/ChatManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java diff --git a/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java similarity index 100% rename from src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java diff --git a/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/chat/PartyChatManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java diff --git a/src/main/java/com/gmail/nossr50/commands/MHDCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/MHDCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McImportCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McImportCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McabilityCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McconvertCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McgodCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McgodCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java similarity index 98% rename from src/main/java/com/gmail/nossr50/commands/McmmoCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java index 0dbe2838c..db9a15486 100644 --- a/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java @@ -26,7 +26,7 @@ public class McmmoCommand implements CommandExecutor { if (Config.getInstance().getDonateMessageEnabled()) { sender.sendMessage(LocaleLoader.getString("MOTD.Donate")); - sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "nossr50@gmail.com" + ChatColor.GOLD + " Paypal"); + sender.sendMessage(ChatColor.GOLD + " - " + ChatColor.GREEN + "com.gmail.nossr50@com.gmail.com" + ChatColor.GOLD + " Paypal"); } if (Permissions.showversion(sender)) { diff --git a/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/ToggleCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/XprateCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/XprateCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java diff --git a/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MmoInfoCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/RepairCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SalvageCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SkillGuideCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SmeltingCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/SwordsCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/TamingCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/UnarmedCommand.java diff --git a/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java b/mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java similarity index 100% rename from src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/WoodcuttingCommand.java diff --git a/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/AdvancedConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/AdvancedConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/AutoUpdateConfigLoader.java diff --git a/src/main/java/com/gmail/nossr50/config/Config.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/Config.java similarity index 98% rename from src/main/java/com/gmail/nossr50/config/Config.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/Config.java index ddbd86cd8..61de136d5 100644 --- a/src/main/java/com/gmail/nossr50/config/Config.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/config/Config.java @@ -1,11 +1,11 @@ package com.gmail.nossr50.config; -import com.gmail.nossr50.database.SQLDatabaseManager.PoolIdentifier; import com.gmail.nossr50.datatypes.MobHealthbarType; import com.gmail.nossr50.datatypes.party.PartyFeature; import com.gmail.nossr50.datatypes.skills.PrimarySkillType; import com.gmail.nossr50.datatypes.skills.SuperAbilityType; import com.gmail.nossr50.util.StringUtils; +import com.gmail.nossr50.database.SQLDatabaseManager; import org.bukkit.Material; import org.bukkit.block.data.BlockData; import org.bukkit.configuration.ConfigurationSection; @@ -47,7 +47,7 @@ public class Config extends AutoUpdateConfigLoader { } /* MySQL Settings */ - for (PoolIdentifier identifier : PoolIdentifier.values()) { + for (SQLDatabaseManager.PoolIdentifier identifier : SQLDatabaseManager.PoolIdentifier.values()) { if (getMySQLMaxConnections(identifier) <= 0) { reason.add("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()) + " should be greater than 0!"); } @@ -341,8 +341,8 @@ public class Config extends AutoUpdateConfigLoader { public int getMySQLServerPort() { return config.getInt("MySQL.Server.Port", 3306); } public String getMySQLServerName() { return config.getString("MySQL.Server.Address", "localhost"); } public String getMySQLUserPassword() { return getStringIncludingInts("MySQL.Database.User_Password"); } - public int getMySQLMaxConnections(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()), 30); } - public int getMySQLMaxPoolSize(PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); } + public int getMySQLMaxConnections(SQLDatabaseManager.PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxConnections." + StringUtils.getCapitalized(identifier.toString()), 30); } + public int getMySQLMaxPoolSize(SQLDatabaseManager.PoolIdentifier identifier) { return config.getInt("MySQL.Database.MaxPoolSize." + StringUtils.getCapitalized(identifier.toString()), 10); } public boolean getMySQLSSL() { return config.getBoolean("MySQL.Server.SSL", true); } private String getStringIncludingInts(String key) { diff --git a/src/main/java/com/gmail/nossr50/config/ConfigLoader.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/ConfigLoader.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/ConfigLoader.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/ConfigLoader.java diff --git a/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/CoreSkillsConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/HiddenConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/HiddenConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/HiddenConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/HiddenConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/RankConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/RankConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/RankConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/RankConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/SoundConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/SoundConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/SoundConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/SoundConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/WorldBlacklist.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/WorldBlacklist.java diff --git a/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/experience/ExperienceConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ArmorConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/BlockConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomArmorConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomBlockConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomEntityConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/CustomToolConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/EntityConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/mods/ToolConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/party/ItemWeightConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/alchemy/PotionConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/repair/RepairConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfigManager.java diff --git a/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/config/treasure/TreasureConfig.java diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/database/DatabaseManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManager.java diff --git a/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java similarity index 100% rename from src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/database/DatabaseManagerFactory.java diff --git a/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/database/FlatfileDatabaseManager.java diff --git a/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/database/SQLDatabaseManager.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/LimitedSizeList.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/MobHealthbarType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/chat/ChatMode.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/DatabaseType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/PlayerStat.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/database/UpgradeType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/FormulaType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/SkillXpGain.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainReason.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/experience/XPGainSource.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/interactions/NotificationType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/CustomBaseComponent.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java similarity index 97% rename from src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java index 4f4886aeb..f09a0e88d 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOUrl.java @@ -3,7 +3,7 @@ package com.gmail.nossr50.datatypes.json; public class McMMOUrl { public static final String urlWebsite = "https://www.mcmmo.org"; public static final String urlDiscord = "https://discord.gg/bJ7pFS9"; - public static final String urlPatreon = "https://www.patreon.com/nossr50"; + public static final String urlPatreon = "https://www.patreon.com/com.gmail.nossr50"; public static final String urlWiki = "https://www.mcmmo.org/wiki/"; public static final String urlSpigot = "http://spigot.mcmmo.org"; public static final String urlTranslate = "https://www.mcmmo.org/translate/"; diff --git a/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/json/McMMOWebLinks.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/meta/OldName.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomBlock.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomEntity.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/mods/CustomTool.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ItemShareType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/Party.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/Party.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/Party.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/Party.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyFeature.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyLeader.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/PartyTeleportRecord.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/party/ShareMode.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/McMMOPlayer.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/PlayerProfile.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/player/UniqueDataType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ItemType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/MaterialType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ModConfigType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/PrimarySkillType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillFlags.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SubSkillType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/SuperAbilityType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/ToolType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/AlchemyPotion.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/alchemy/PotionStage.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/ChildSkill.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/CoreSkill.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Localized.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Skill.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/interfaces/Toolable.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/progression/Progression.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/AbstractSubSkill.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java similarity index 95% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java index d692747b8..db6ba2cc7 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/AcrobaticsSubSkill.java @@ -48,7 +48,7 @@ public abstract class AcrobaticsSubSkill extends AbstractSubSkill { */ @Override public String getTips() { - return LocaleLoader.getString("JSON."+StringUtils.getCapitalized(getPrimarySkill().toString())+".SubSkill."+getConfigKeyName()+".Details.Tips"); + return LocaleLoader.getString("JSON."+ StringUtils.getCapitalized(getPrimarySkill().toString())+".SubSkill."+getConfigKeyName()+".Details.Tips"); } /** diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java similarity index 99% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java index 0355c8821..69ebde4c5 100644 --- a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/acrobatics/Roll.java @@ -68,7 +68,7 @@ public class Roll extends AcrobaticsSubSkill { return false; switch (entityDamageEvent.getCause()) { - case FALL: + case DamageCause.FALL: //Grab the player McMMOPlayer mcMMOPlayer = EventUtils.getMcMMOPlayer(entityDamageEvent.getEntity()); diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/InteractType.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Interaction.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/Rank.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkill.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/skills/subskills/interfaces/SubSkillProperties.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/EnchantmentTreasure.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ExcavationTreasure.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/FishingTreasure.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/HylianTreasure.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Rarity.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/ShakeTreasure.java diff --git a/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java b/mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java similarity index 100% rename from src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/datatypes/treasure/Treasure.java diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOAdminChatEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOChatEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/chat/McMMOPartyChatEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerExperienceEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelChangeEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelDownEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerLevelUpEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/experience/McMMOPlayerXpGainEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockBreakEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBlockDamageEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeBrewEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageByEntityEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityDamageEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakeEntityTameEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerAnimationEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/fake/FakePlayerFishEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerDeathPenaltyEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerPreDeathPenaltyEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerStatLossEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/hardcore/McMMOPlayerVampirismEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/items/McMMOItemSpawnEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyAllianceChangeEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyChangeEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyLevelUpEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyTeleportEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/party/McMMOPartyXpGainEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardMakeboardEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardObjectiveEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/McMMOScoreboardRevertEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardEventReason.java diff --git a/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/scoreboard/ScoreboardObjectiveEventReason.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerNotificationEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/McMMOPlayerSkillEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityActivateEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityDeactivateEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/abilities/McMMOPlayerAbilityEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerBrewEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/alchemy/McMMOPlayerCatalysisEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerFishingTreasureEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerMagicHunterEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/fishing/McMMOPlayerShakeEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/repair/McMMOPlayerRepairCheckEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/salvage/McMMOPlayerSalvageCheckEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/secondaryabilities/SubSkillRandomCheckEvent.java diff --git a/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java b/mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java similarity index 100% rename from src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/events/skills/unarmed/McMMOPlayerDisarmEvent.java diff --git a/src/main/java/com/gmail/nossr50/listeners/BlockListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/BlockListener.java similarity index 100% rename from src/main/java/com/gmail/nossr50/listeners/BlockListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/BlockListener.java diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/EntityListener.java similarity index 95% rename from src/main/java/com/gmail/nossr50/listeners/EntityListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 78be30273..40917d634 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -432,22 +432,22 @@ public class EntityListener implements Listener { TamingManager tamingManager = UserManager.getPlayer(player).getTamingManager(); switch (cause) { - case CONTACT: - case FIRE: - case LAVA: + case DamageCause.CONTACT: + case DamageCause.FIRE: + case DamageCause.LAVA: if (tamingManager.canUseEnvironmentallyAware()) { tamingManager.processEnvironmentallyAware(wolf, event.getDamage()); } return; - case FALL: + case DamageCause.FALL: if (tamingManager.canUseEnvironmentallyAware()) { event.setCancelled(true); } return; - case ENTITY_ATTACK: - case PROJECTILE: + case DamageCause.ENTITY_ATTACK: + case DamageCause.PROJECTILE: if (tamingManager.canUseThickFur()) { event.setDamage(Taming.processThickFur(wolf, event.getDamage())); @@ -457,23 +457,23 @@ public class EntityListener implements Listener { } return; - case FIRE_TICK: + case DamageCause.FIRE_TICK: if (tamingManager.canUseThickFur()) { Taming.processThickFurFire(wolf); } return; - case MAGIC: - case POISON: - case WITHER: + case DamageCause.MAGIC: + case DamageCause.POISON: + case DamageCause.WITHER: if (tamingManager.canUseHolyHound()) { Taming.processHolyHound(wolf, event.getDamage()); } return; - case BLOCK_EXPLOSION: - case ENTITY_EXPLOSION: - case LIGHTNING: + case DamageCause.BLOCK_EXPLOSION: + case DamageCause.ENTITY_EXPLOSION: + case DamageCause.LIGHTNING: if (tamingManager.canUseShockProof()) { event.setDamage(Taming.processShockProof(wolf, event.getDamage())); @@ -559,9 +559,9 @@ public class EntityListener implements Listener { LivingEntity entity = event.getEntity(); switch (event.getSpawnReason()) { - case NETHER_PORTAL: - case SPAWNER: - case SPAWNER_EGG: + case SpawnReason.NETHER_PORTAL: + case SpawnReason.SPAWNER: + case SpawnReason.SPAWNER_EGG: entity.setMetadata(mcMMO.entityMetadataKey, mcMMO.metadataValue); Entity passenger = entity.getPassenger(); @@ -571,7 +571,7 @@ public class EntityListener implements Listener { } return; - case BREEDING: + case SpawnReason.BREEDING: entity.setMetadata(mcMMO.bredMetadataKey, mcMMO.metadataValue); return; @@ -727,25 +727,25 @@ public class EntityListener implements Listener { * if we find something is giving too much of a bonus */ switch (player.getInventory().getItemInMainHand().getType()) { - case BAKED_POTATO: /* + case Material.BAKED_POTATO: /* * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ * 1000 */ - case BEETROOT: - case BREAD: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */ - case CARROT: /* + case Material.BEETROOT: + case Material.BREAD: /* RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ 1000 */ + case Material.CARROT: /* * RESTORES 2 HUNGER - RESTORES 4 1/2 HUNGER @ * 1000 */ - case GOLDEN_CARROT: /* + case Material.GOLDEN_CARROT: /* * RESTORES 3 HUNGER - RESTORES 5 1/2 HUNGER @ * 1000 */ - case MUSHROOM_STEW: /* + case Material.MUSHROOM_STEW: /* * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ * 1000 */ - case PUMPKIN_PIE: /* + case Material.PUMPKIN_PIE: /* * RESTORES 4 HUNGER - RESTORES 6 1/2 HUNGER @ * 1000 */ @@ -754,19 +754,19 @@ public class EntityListener implements Listener { } return; - case COOKIE: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ - case MELON_SLICE: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ - case POISONOUS_POTATO: /* + case Material.COOKIE: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ + case Material.MELON_SLICE: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ + case Material.POISONOUS_POTATO: /* * RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER * @ 1000 */ - case POTATO: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ + case Material.POTATO: /* RESTORES 1/2 HUNGER - RESTORES 2 HUNGER @ 1000 */ if (Permissions.isSubSkillEnabled(player, SubSkillType.HERBALISM_FARMERS_DIET)) { event.setFoodLevel(UserManager.getPlayer(player).getHerbalismManager().farmersDiet(newFoodLevel)); } return; - case COOKED_SALMON: /* + case Material.COOKED_SALMON: /* * RESTORES 2 1/2 HUNGER - RESTORES 5 HUNGER @ * 1000 */ @@ -775,7 +775,7 @@ public class EntityListener implements Listener { } return; - case SALMON: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ + case Material.SALMON: /* RESTORES 1 HUNGER - RESTORES 2 1/2 HUNGER @ 1000 */ if (Permissions.isSubSkillEnabled(player, SubSkillType.FISHING_FISHERMANS_DIET)) { event.setFoodLevel(UserManager.getPlayer(player).getFishingManager().handleFishermanDiet(Fishing.fishermansDietRankLevel2, newFoodLevel)); } diff --git a/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/listeners/InteractionManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InteractionManager.java diff --git a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java similarity index 99% rename from src/main/java/com/gmail/nossr50/listeners/InventoryListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java index ea1ab8433..7b7baeb1b 100644 --- a/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/InventoryListener.java @@ -231,11 +231,11 @@ public class InventoryListener implements Listener { if (click.isShiftClick()) { switch (slot) { - case FUEL: + case SlotType.FUEL: AlchemyPotionBrewer.scheduleCheck(player, stand); return; - case CONTAINER: - case QUICKBAR: + case SlotType.CONTAINER: + case SlotType.QUICKBAR: if (!AlchemyPotionBrewer.isValidIngredient(player, clicked)) { return; } diff --git a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java similarity index 97% rename from src/main/java/com/gmail/nossr50/listeners/PlayerListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java index 263b2598e..b6cc4a06d 100644 --- a/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/PlayerListener.java @@ -251,7 +251,7 @@ public class PlayerListener implements Listener { FishingManager fishingManager = UserManager.getPlayer(player).getFishingManager(); switch (event.getState()) { - case CAUGHT_FISH: + case State.CAUGHT_FISH: //TODO Update to new API once available! Waiting for case CAUGHT_TREASURE: Item fishingCatch = (Item) event.getCaught(); @@ -270,7 +270,7 @@ public class PlayerListener implements Listener { } return; - case IN_GROUND: + case State.IN_GROUND: Block block = player.getTargetBlock(null, 100); if (fishingManager.canIceFish(block)) { @@ -325,21 +325,21 @@ public class PlayerListener implements Listener { //event.setExpToDrop(event.getExpToDrop()); //Redundant? switch (event.getState()) { - case FISHING: + case State.FISHING: if (fishingManager.canMasterAngler()) { fishingManager.masterAngler(event.getHook()); fishingManager.setFishingTarget(); } return; - case CAUGHT_FISH: + case State.CAUGHT_FISH: if(fishingManager.exploitPrevention(event.getHook().getBoundingBox())) return; fishingManager.handleFishing((Item) caught); fishingManager.setFishingTarget(); return; - case CAUGHT_ENTITY: + case State.CAUGHT_ENTITY: if (fishingManager.canShake(caught)) { fishingManager.shakeCheck((LivingEntity) caught); fishingManager.setFishingTarget(); @@ -514,7 +514,7 @@ public class PlayerListener implements Listener { ItemStack heldItem = player.getInventory().getItemInMainHand(); switch (event.getAction()) { - case RIGHT_CLICK_BLOCK: + case Action.RIGHT_CLICK_BLOCK: Material type = block.getType(); if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) { @@ -554,7 +554,7 @@ public class PlayerListener implements Listener { break; - case LEFT_CLICK_BLOCK: + case Action.LEFT_CLICK_BLOCK: type = block.getType(); if (!Config.getInstance().getAbilitiesOnlyActivateWhenSneaking() || player.isSneaking()) { @@ -615,7 +615,7 @@ public class PlayerListener implements Listener { ItemStack heldItem = player.getInventory().getItemInMainHand(); switch (event.getAction()) { - case RIGHT_CLICK_BLOCK: + case Action.RIGHT_CLICK_BLOCK: if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { break; } @@ -646,12 +646,12 @@ public class PlayerListener implements Listener { if (heldItem.getType() == Material.BONE_MEAL) { switch (blockState.getType()) { - case BEETROOTS: - case CARROT: - case COCOA: - case WHEAT: - case NETHER_WART_BLOCK: - case POTATO: + case Material.BEETROOTS: + case Material.CARROT: + case Material.COCOA: + case Material.WHEAT: + case Material.NETHER_WART_BLOCK: + case Material.POTATO: mcMMO.getPlaceStore().setFalse(blockState); } } @@ -673,7 +673,7 @@ public class PlayerListener implements Listener { } break; - case RIGHT_CLICK_AIR: + case Action.RIGHT_CLICK_AIR: if(player.getInventory().getItemInOffHand().getType() != Material.AIR && !player.isInsideVehicle() && !player.isSneaking()) { break; } @@ -700,8 +700,8 @@ public class PlayerListener implements Listener { break; - case LEFT_CLICK_AIR: - case LEFT_CLICK_BLOCK: + case Action.LEFT_CLICK_AIR: + case Action.LEFT_CLICK_BLOCK: if (!player.isSneaking()) { break; diff --git a/src/main/java/com/gmail/nossr50/listeners/SelfListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/SelfListener.java similarity index 100% rename from src/main/java/com/gmail/nossr50/listeners/SelfListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/SelfListener.java diff --git a/src/main/java/com/gmail/nossr50/listeners/WorldListener.java b/mcMMO-core/src/main/java/com/gmail/nossr50/listeners/WorldListener.java similarity index 100% rename from src/main/java/com/gmail/nossr50/listeners/WorldListener.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/listeners/WorldListener.java diff --git a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java b/mcMMO-core/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java similarity index 98% rename from src/main/java/com/gmail/nossr50/locale/LocaleLoader.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java index c48fd66bc..0262b4e81 100644 --- a/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/locale/LocaleLoader.java @@ -10,7 +10,7 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; public final class LocaleLoader { - private static final String BUNDLE_ROOT = "com.gmail.nossr50.locale.locale"; + private static final String BUNDLE_ROOT = "com.com.gmail.com.gmail.nossr50.locale.locale"; private static ResourceBundle bundle = null; private static ResourceBundle enBundle = null; diff --git a/src/main/java/com/gmail/nossr50/mcMMO.java b/mcMMO-core/src/main/java/com/gmail/nossr50/mcMMO.java similarity index 98% rename from src/main/java/com/gmail/nossr50/mcMMO.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/mcMMO.java index 3969ca0e5..8b426c025 100644 --- a/src/main/java/com/gmail/nossr50/mcMMO.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/mcMMO.java @@ -61,14 +61,14 @@ import java.util.List; public class mcMMO extends JavaPlugin { /* Managers */ - private static ChunkManager placeStore; - private static RepairableManager repairableManager; + private static ChunkManager placeStore; + private static RepairableManager repairableManager; private static SalvageableManager salvageableManager; - private static ModManager modManager; - private static DatabaseManager databaseManager; - private static FormulaManager formulaManager; - private static HolidayManager holidayManager; - private static UpgradeManager upgradeManager; + private static ModManager modManager; + private static DatabaseManager databaseManager; + private static FormulaManager formulaManager; + private static HolidayManager holidayManager; + private static UpgradeManager upgradeManager; /* Blacklist */ private static WorldBlacklist worldBlacklist; diff --git a/src/main/java/com/gmail/nossr50/party/PartyManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/party/PartyManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/party/PartyManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/party/PartyManager.java index 4bdcefe9b..011cb15d7 100644 --- a/src/main/java/com/gmail/nossr50/party/PartyManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/party/PartyManager.java @@ -12,7 +12,6 @@ import com.gmail.nossr50.datatypes.player.McMMOPlayer; import com.gmail.nossr50.datatypes.player.PlayerProfile; import com.gmail.nossr50.events.party.McMMOPartyAllianceChangeEvent; import com.gmail.nossr50.events.party.McMMOPartyChangeEvent; -import com.gmail.nossr50.events.party.McMMOPartyChangeEvent.EventReason; import com.gmail.nossr50.locale.LocaleLoader; import com.gmail.nossr50.mcMMO; import com.gmail.nossr50.util.Misc; @@ -79,13 +78,13 @@ public final class PartyManager { if (mcMMOPlayer.inParty()) { Party oldParty = mcMMOPlayer.getParty(); - if (!handlePartyChangeEvent(player, oldParty.getName(), newPartyName, EventReason.CHANGED_PARTIES)) { + if (!handlePartyChangeEvent(player, oldParty.getName(), newPartyName, McMMOPartyChangeEvent.EventReason.CHANGED_PARTIES)) { return false; } removeFromParty(mcMMOPlayer); } - else return handlePartyChangeEvent(player, null, newPartyName, EventReason.JOINED_PARTY); + else return handlePartyChangeEvent(player, null, newPartyName, McMMOPartyChangeEvent.EventReason.JOINED_PARTY); return true; } @@ -724,7 +723,7 @@ public final class PartyManager { * @param reason The reason for changing parties * @return true if the change event was successful, false otherwise */ - public static boolean handlePartyChangeEvent(Player player, String oldPartyName, String newPartyName, EventReason reason) { + public static boolean handlePartyChangeEvent(Player player, String oldPartyName, String newPartyName, McMMOPartyChangeEvent.EventReason reason) { McMMOPartyChangeEvent event = new McMMOPartyChangeEvent(player, oldPartyName, newPartyName, reason); mcMMO.p.getServer().getPluginManager().callEvent(event); diff --git a/src/main/java/com/gmail/nossr50/party/ShareHandler.java b/mcMMO-core/src/main/java/com/gmail/nossr50/party/ShareHandler.java similarity index 100% rename from src/main/java/com/gmail/nossr50/party/ShareHandler.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/party/ShareHandler.java diff --git a/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/CheckDateTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/MobHealthDisplayUpdaterTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/PistonTrackerTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/SaveTimerTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/StickyPistonTrackerTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java similarity index 91% rename from src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java index 822683030..ac7cdcab7 100644 --- a/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/backups/CleanBackupsTask.java @@ -11,7 +11,7 @@ import java.util.*; import java.util.concurrent.TimeUnit; public class CleanBackupsTask extends BukkitRunnable { - private static final String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "backup" + File.separator; + private static final String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "net.shatteredlands.shatt.backup" + File.separator; private static final File BACKUP_DIR = new File(BACKUP_DIRECTORY); @Override @@ -26,7 +26,7 @@ public class CleanBackupsTask extends BukkitRunnable { return; } - // Check files in backup folder from oldest to newest + // Check files in net.shatteredlands.shatt.backup folder from oldest to newest for (File file : BACKUP_DIR.listFiles()) { if (!file.isFile() || file.isDirectory()) { continue; @@ -65,7 +65,7 @@ public class CleanBackupsTask extends BukkitRunnable { } if (!savedWeeks.contains(weekOfYear) && Config.getInstance().getKeepWeeklyPastMonth()) { - // Keep one backup of each week + // Keep one net.shatteredlands.shatt.backup of each week savedWeeks.add(weekOfYear); continue; } @@ -79,7 +79,7 @@ public class CleanBackupsTask extends BukkitRunnable { return; } - mcMMO.p.getLogger().info("Cleaned backup files. Deleted " + amountDeleted + " of " + amountTotal + " files."); + mcMMO.p.getLogger().info("Cleaned net.shatteredlands.shatt.backup files. Deleted " + amountDeleted + " of " + amountTotal + " files."); for (File file : toDelete) { if (file.delete()) { diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McScoreboardKeepTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandAsyncTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/McrankCommandDisplayTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandAsyncTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/commands/MctopCommandDisplayTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/DatabaseConversionTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/FormulaConversionTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UUIDUpdateAsyncTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/database/UserPurgeTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/ChimaeraWingWarmup.java diff --git a/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/items/TeleportationWarmup.java diff --git a/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyAutoKickTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/party/PartyChatTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/ClearRegisteredXPGainTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileLoadingTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerProfileSaveTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PlayerUpdateInventoryTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/player/PowerLevelUpdatingTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityCooldownTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AbilityDisableTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewCheckTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AlchemyBrewTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AprilTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/AwardCombatXpTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedContainer.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/BleedTimerTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ExperienceBarHideTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/HerbalismBlockUpdaterTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/SkillUnlockNotificationTask.java diff --git a/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java b/mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java similarity index 100% rename from src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/runnables/skills/ToolLowerTask.java diff --git a/src/main/java/com/gmail/nossr50/skills/SkillManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/SkillManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/SkillManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/SkillManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/Acrobatics.java diff --git a/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/acrobatics/AcrobaticsManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/Alchemy.java diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/alchemy/AlchemyPotionBrewer.java diff --git a/src/main/java/com/gmail/nossr50/skills/archery/Archery.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/Archery.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/archery/Archery.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/Archery.java diff --git a/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/ArcheryManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/archery/TrackedEntity.java diff --git a/src/main/java/com/gmail/nossr50/skills/axes/Axes.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/Axes.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/axes/Axes.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/Axes.java diff --git a/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/axes/AxesManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/ChildConfig.java diff --git a/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/child/FamilyTree.java diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java similarity index 92% rename from src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java index 86580a944..1f369d942 100644 --- a/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/Excavation.java @@ -13,7 +13,7 @@ import java.util.List; public class Excavation { /** - * Get the list of possible {@link ExcavationTreasure|ExcavationTreasures} obtained from a given block. + * Get the list of possible {@link ExcavationTreasure |ExcavationTreasures} obtained from a given block. * * @param blockState The {@link BlockState} of the block to check. * @return the list of treasures that could be found diff --git a/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/excavation/ExcavationManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/Fishing.java diff --git a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java index f35477434..8c0bb6db0 100644 --- a/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/fishing/FishingManager.java @@ -284,18 +284,18 @@ public class FishingManager extends SkillManager { // Extra processing depending on the mob and drop type switch (target.getType()) { - case PLAYER: + case EntityType.PLAYER: Player targetPlayer = (Player) target; switch (drop.getType()) { - case PLAYER_HEAD: + case Material.PLAYER_HEAD: drop.setDurability((short) 3); SkullMeta skullMeta = (SkullMeta) drop.getItemMeta(); skullMeta.setOwningPlayer(targetPlayer); drop.setItemMeta(skullMeta); break; - case BEDROCK: + case Material.BEDROCK: if (TreasureConfig.getInstance().getInventoryStealEnabled()) { PlayerInventory inventory = targetPlayer.getInventory(); int length = inventory.getContents().length; @@ -323,7 +323,7 @@ public class FishingManager extends SkillManager { } break; - case SHEEP: + case EntityType.SHEEP: Sheep sheep = (Sheep) target; if (drop.getType().name().endsWith("WOOL")) { diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java similarity index 93% rename from src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java index bae27e8fd..9e4fc4a88 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/Herbalism.java @@ -20,20 +20,20 @@ public class Herbalism { */ protected static boolean convertGreenTerraBlocks(BlockState blockState) { switch (blockState.getType()) { - case COBBLESTONE_WALL: + case Material.COBBLESTONE_WALL: blockState.setType(Material.MOSSY_COBBLESTONE_WALL); return true; - case STONE_BRICKS: + case Material.STONE_BRICKS: blockState.setType(Material.MOSSY_STONE_BRICKS); return true; - case DIRT : - case GRASS_PATH : + case Material.DIRT : + case Material.GRASS_PATH : blockState.setType(Material.GRASS_BLOCK); return true; - case COBBLESTONE : + case Material.COBBLESTONE : blockState.setType(Material.MOSSY_COBBLESTONE); return true; @@ -118,9 +118,9 @@ public class Herbalism { */ protected static boolean convertShroomThumb(BlockState blockState) { switch (blockState.getType()) { - case DIRT : - case GRASS_BLOCK: - case GRASS_PATH : + case Material.DIRT : + case Material.GRASS_BLOCK: + case Material.GRASS_PATH : blockState.setType(Material.MYCELIUM); return true; diff --git a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java similarity index 97% rename from src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java index 6a248020b..7897d2189 100644 --- a/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/herbalism/HerbalismManager.java @@ -283,27 +283,27 @@ public class HerbalismManager extends SkillManager { Material seed = null; switch (blockState.getType()) { - case CARROTS: + case Material.CARROTS: seed = Material.CARROT; break; - case WHEAT: + case Material.WHEAT: seed = Material.WHEAT_SEEDS; break; - case NETHER_WART: + case Material.NETHER_WART: seed = Material.NETHER_WART; break; - case POTATOES: + case Material.POTATOES: seed = Material.POTATO; break; - case BEETROOTS: + case Material.BEETROOTS: seed = Material.BEETROOT_SEEDS; break; - case COCOA: + case Material.COCOA: seed = Material.COCOA_BEANS; break; @@ -338,9 +338,9 @@ public class HerbalismManager extends SkillManager { switch (blockState.getType()) { - case POTATOES: - case CARROTS: - case WHEAT: + case Material.POTATOES: + case Material.CARROTS: + case Material.WHEAT: if (greenTerra) { crops.setAge(3); @@ -350,8 +350,8 @@ public class HerbalismManager extends SkillManager { } break; - case BEETROOTS: - case NETHER_WART: + case Material.BEETROOTS: + case Material.NETHER_WART: if (greenTerra || greenThumbStage > 2) { crops.setAge(2); @@ -364,7 +364,7 @@ public class HerbalismManager extends SkillManager { } break; - case COCOA: + case Material.COCOA: if (greenTerra || getGreenThumbStage() > 1) { crops.setAge(1); diff --git a/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/BlastMining.java diff --git a/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/Mining.java new file mode 100644 index 000000000..a54e0dfd6 --- /dev/null +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/Mining.java @@ -0,0 +1,167 @@ +package com.gmail.nossr50.skills.mining; + +import com.gmail.nossr50.config.experience.ExperienceConfig; +import com.gmail.nossr50.datatypes.skills.PrimarySkillType; +import com.gmail.nossr50.mcMMO; +import com.gmail.nossr50.util.Misc; +import org.bukkit.Material; +import org.bukkit.block.BlockState; +import org.bukkit.inventory.ItemStack; + +public class Mining { + + /** + * Calculate XP gain for Mining. + * + * @param blockState The {@link BlockState} to check ability activation for + */ + public static int getBlockXp(BlockState blockState) { + int xp = ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, blockState.getType()); + + if (xp == 0 && mcMMO.getModManager().isCustomMiningBlock(blockState)) { + xp = mcMMO.getModManager().getBlock(blockState).getXpGain(); + } + + return xp; + } + + /** + * Handle double drops when using Silk Touch. + * + * @param blockState The {@link BlockState} to check ability activation for + */ + protected static void handleSilkTouchDrops(BlockState blockState) { + Material blockType = blockState.getType(); + + switch (blockType) { + case Material.END_STONE: + case Material.TERRACOTTA: + case Material.CLAY: + case Material.IRON_ORE: + case Material.MOSSY_COBBLESTONE: + case Material.NETHERRACK: + case Material.OBSIDIAN: + case Material.SANDSTONE: + case Material.BLACK_GLAZED_TERRACOTTA: + case Material.BLACK_TERRACOTTA: + case Material.BLUE_GLAZED_TERRACOTTA: + case Material.BLUE_TERRACOTTA: + case Material.BROWN_GLAZED_TERRACOTTA: + case Material.BROWN_TERRACOTTA: + case Material.CYAN_GLAZED_TERRACOTTA: + case Material.CYAN_TERRACOTTA: + case Material.GRAY_GLAZED_TERRACOTTA: + case Material.GRAY_TERRACOTTA: + case Material.GREEN_GLAZED_TERRACOTTA: + case Material.GREEN_TERRACOTTA: + case Material.LIGHT_BLUE_GLAZED_TERRACOTTA: + case Material.LIGHT_BLUE_TERRACOTTA: + case Material.LIGHT_GRAY_GLAZED_TERRACOTTA: + case Material.LIGHT_GRAY_TERRACOTTA: + case Material.LIME_GLAZED_TERRACOTTA: + case Material.LIME_TERRACOTTA: + case Material.MAGENTA_GLAZED_TERRACOTTA: + case Material.MAGENTA_TERRACOTTA: + case Material.ORANGE_GLAZED_TERRACOTTA: + case Material.ORANGE_TERRACOTTA: + case Material.PINK_GLAZED_TERRACOTTA: + case Material.PINK_TERRACOTTA: + case Material.PURPLE_GLAZED_TERRACOTTA: + case Material.PURPLE_TERRACOTTA: + case Material.RED_GLAZED_TERRACOTTA: + case Material.RED_TERRACOTTA: + case Material.WHITE_GLAZED_TERRACOTTA: + case Material.WHITE_TERRACOTTA: + case Material.YELLOW_GLAZED_TERRACOTTA: + case Material.YELLOW_TERRACOTTA: + handleMiningDrops(blockState); + return; + + case Material.COAL_ORE: + case Material.DIAMOND_ORE: + case Material.EMERALD_ORE: + case Material.GLOWSTONE: + case Material.LAPIS_ORE: + case Material.PACKED_ICE: + case Material.NETHER_QUARTZ_ORE: + case Material.REDSTONE_ORE: + case Material.STONE: + case Material.PRISMARINE: + Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); + return; + + default: + if (mcMMO.getModManager().isCustomMiningBlock(blockState)) { + Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); + } + return; + } + } + + /** + * Handle double drops from Mining & Blast Mining. + * + * @param blockState The {@link BlockState} to check ability activation for + */ + protected static void handleMiningDrops(BlockState blockState) { + switch (blockState.getType()) { + case Material.COAL_ORE: + case Material.DIAMOND_ORE: + case Material.EMERALD_ORE: + case Material.END_STONE: + case Material.GLOWSTONE: + case Material.GOLD_ORE: + case Material.TERRACOTTA: + case Material.IRON_ORE: + case Material.LAPIS_ORE: + case Material.MOSSY_COBBLESTONE: + case Material.NETHERRACK: + case Material.OBSIDIAN: + case Material.PACKED_ICE: + case Material.REDSTONE_ORE: + case Material.SANDSTONE: + case Material.BLACK_GLAZED_TERRACOTTA: + case Material.BLACK_TERRACOTTA: + case Material.BLUE_GLAZED_TERRACOTTA: + case Material.BLUE_TERRACOTTA: + case Material.BROWN_GLAZED_TERRACOTTA: + case Material.BROWN_TERRACOTTA: + case Material.CYAN_GLAZED_TERRACOTTA: + case Material.CYAN_TERRACOTTA: + case Material.GRAY_GLAZED_TERRACOTTA: + case Material.GRAY_TERRACOTTA: + case Material.GREEN_GLAZED_TERRACOTTA: + case Material.GREEN_TERRACOTTA: + case Material.LIGHT_BLUE_GLAZED_TERRACOTTA: + case Material.LIGHT_BLUE_TERRACOTTA: + case Material.LIGHT_GRAY_GLAZED_TERRACOTTA: + case Material.LIGHT_GRAY_TERRACOTTA: + case Material.LIME_GLAZED_TERRACOTTA: + case Material.LIME_TERRACOTTA: + case Material.MAGENTA_GLAZED_TERRACOTTA: + case Material.MAGENTA_TERRACOTTA: + case Material.ORANGE_GLAZED_TERRACOTTA: + case Material.ORANGE_TERRACOTTA: + case Material.PINK_GLAZED_TERRACOTTA: + case Material.PINK_TERRACOTTA: + case Material.PURPLE_GLAZED_TERRACOTTA: + case Material.PURPLE_TERRACOTTA: + case Material.RED_GLAZED_TERRACOTTA: + case Material.RED_TERRACOTTA: + case Material.WHITE_GLAZED_TERRACOTTA: + case Material.WHITE_TERRACOTTA: + case Material.YELLOW_GLAZED_TERRACOTTA: + case Material.YELLOW_TERRACOTTA: + case Material.STONE: + case Material.NETHER_QUARTZ_ORE: + Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops()); + return; + + default: + if (mcMMO.getModManager().isCustomMiningBlock(blockState)) { + Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops()); + } + return; + } + } +} diff --git a/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/mining/MiningManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/ArcaneForging.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Repair.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/Repair.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/Repair.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/Repair.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/RepairManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/Repairable.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableFactory.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/RepairableManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairable.java diff --git a/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/repair/repairables/SimpleRepairableManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/Salvage.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/SalvageManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/Salvageable.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableFactory.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SalvageableManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageable.java diff --git a/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/salvage/salvageables/SimpleSalvageableManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/Smelting.java diff --git a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java similarity index 98% rename from src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java index 6cc041e02..a98b12deb 100644 --- a/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/smelting/SmeltingManager.java @@ -56,11 +56,11 @@ public class SmeltingManager extends SkillManager { ItemStack item = null; switch (blockState.getType()) { - case IRON_ORE: + case Material.IRON_ORE: item = new ItemStack(Material.IRON_INGOT); break; - case GOLD_ORE: + case Material.GOLD_ORE: item = new ItemStack(Material.GOLD_INGOT); break; diff --git a/src/main/java/com/gmail/nossr50/skills/swords/Swords.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/Swords.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/swords/Swords.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/Swords.java diff --git a/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/swords/SwordsManager.java diff --git a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/Taming.java similarity index 94% rename from src/main/java/com/gmail/nossr50/skills/taming/Taming.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/Taming.java index 1313c4c46..6b1295af5 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/Taming.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/Taming.java @@ -44,13 +44,13 @@ public class Taming { protected static String getCallOfTheWildFailureMessage(EntityType type) { switch (type) { - case OCELOT: + case EntityType.OCELOT: return "Taming.Summon.Fail.Ocelot"; - case WOLF: + case EntityType.WOLF: return "Taming.Summon.Fail.Wolf"; - case HORSE: + case EntityType.HORSE: return "Taming.Summon.Fail.Horse"; default: diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java index d6c21e6b1..3d5738caf 100644 --- a/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TamingManager.java @@ -298,16 +298,16 @@ public class TamingManager extends SkillManager { addToTracker(entity); switch (type) { - case OCELOT: + case EntityType.OCELOT: ((Ocelot) entity).setCatType(Ocelot.Type.values()[1 + Misc.getRandom().nextInt(3)]); break; - case WOLF: + case EntityType.WOLF: entity.setMaxHealth(20.0); entity.setHealth(entity.getMaxHealth()); break; - case HORSE: + case EntityType.HORSE: Horse horse = (Horse) entity; entity.setMaxHealth(15.0 + (Misc.getRandom().nextDouble() * 15)); diff --git a/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/taming/TrackedTamingEntity.java diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/Unarmed.java diff --git a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java similarity index 99% rename from src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java index b3c081497..77c3ec2f4 100644 --- a/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/unarmed/UnarmedManager.java @@ -77,7 +77,7 @@ public class UnarmedManager extends SkillManager { BlockData data = blockState.getBlockData(); switch (blockState.getType()) { - case STONE_BRICKS: + case Material.STONE_BRICKS: if (!Unarmed.blockCrackerSmoothBrick) { return false; } diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java similarity index 100% rename from src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/Woodcutting.java diff --git a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java similarity index 98% rename from src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java index fc65fb450..45ebb26fe 100644 --- a/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/skills/woodcutting/WoodcuttingManager.java @@ -57,8 +57,8 @@ public class WoodcuttingManager extends SkillManager { int xp = Woodcutting.getExperienceFromLog(blockState, ExperienceGainMethod.DEFAULT); switch (blockState.getType()) { - case BROWN_MUSHROOM_BLOCK: - case RED_MUSHROOM_BLOCK: + case Material.BROWN_MUSHROOM_BLOCK: + case Material.RED_MUSHROOM_BLOCK: break; default: diff --git a/src/main/java/com/gmail/nossr50/util/BlockUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/BlockUtils.java similarity index 51% rename from src/main/java/com/gmail/nossr50/util/BlockUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/BlockUtils.java index 6066e3da2..b0f1261fd 100644 --- a/src/main/java/com/gmail/nossr50/util/BlockUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/BlockUtils.java @@ -37,90 +37,90 @@ public final class BlockUtils { */ public static boolean canActivateAbilities(BlockState blockState) { switch (blockState.getType()) { - case BLACK_BED: - case BLUE_BED: - case BROWN_BED: - case CYAN_BED: - case GRAY_BED: - case GREEN_BED: - case LIGHT_BLUE_BED: - case LIGHT_GRAY_BED: - case LIME_BED: - case MAGENTA_BED: - case ORANGE_BED: - case PINK_BED: - case PURPLE_BED: - case RED_BED: - case WHITE_BED: - case YELLOW_BED: - case BREWING_STAND : - case BOOKSHELF : - case CAKE: - case CHEST : - case DISPENSER : - case ENCHANTING_TABLE: - case ENDER_CHEST : - case OAK_FENCE_GATE: - case ACACIA_FENCE_GATE : - case DARK_OAK_FENCE_GATE : - case SPRUCE_FENCE_GATE : - case BIRCH_FENCE_GATE : - case JUNGLE_FENCE_GATE : - case FURNACE : - case JUKEBOX : - case LEVER : - case NOTE_BLOCK : - case STONE_BUTTON : - case OAK_BUTTON: - case BIRCH_BUTTON: - case ACACIA_BUTTON: - case DARK_OAK_BUTTON: - case JUNGLE_BUTTON: - case SPRUCE_BUTTON: - case ACACIA_TRAPDOOR: - case BIRCH_TRAPDOOR: - case DARK_OAK_TRAPDOOR: - case JUNGLE_TRAPDOOR: - case OAK_TRAPDOOR: - case SPRUCE_TRAPDOOR: - case WALL_SIGN : - case CRAFTING_TABLE: - case BEACON : - case ANVIL : - case DROPPER : - case HOPPER : - case TRAPPED_CHEST : - case IRON_DOOR : - case IRON_TRAPDOOR : - case OAK_DOOR: - case ACACIA_DOOR : - case SPRUCE_DOOR : - case BIRCH_DOOR : - case JUNGLE_DOOR : - case DARK_OAK_DOOR : - case OAK_FENCE: - case ACACIA_FENCE : - case DARK_OAK_FENCE : - case BIRCH_FENCE : - case JUNGLE_FENCE : - case SPRUCE_FENCE : - case ARMOR_STAND : - case BLACK_SHULKER_BOX : - case BLUE_SHULKER_BOX : - case BROWN_SHULKER_BOX : - case CYAN_SHULKER_BOX : - case GRAY_SHULKER_BOX : - case GREEN_SHULKER_BOX : - case LIGHT_BLUE_SHULKER_BOX : - case LIME_SHULKER_BOX : - case MAGENTA_SHULKER_BOX : - case ORANGE_SHULKER_BOX : - case PINK_SHULKER_BOX : - case PURPLE_SHULKER_BOX : - case RED_SHULKER_BOX : - case LIGHT_GRAY_SHULKER_BOX: - case WHITE_SHULKER_BOX : - case YELLOW_SHULKER_BOX : + case Material.BLACK_BED: + case Material.BLUE_BED: + case Material.BROWN_BED: + case Material.CYAN_BED: + case Material.GRAY_BED: + case Material.GREEN_BED: + case Material.LIGHT_BLUE_BED: + case Material.LIGHT_GRAY_BED: + case Material.LIME_BED: + case Material.MAGENTA_BED: + case Material.ORANGE_BED: + case Material.PINK_BED: + case Material.PURPLE_BED: + case Material.RED_BED: + case Material.WHITE_BED: + case Material.YELLOW_BED: + case Material.BREWING_STAND : + case Material.BOOKSHELF : + case Material.CAKE: + case Material.CHEST : + case Material.DISPENSER : + case Material.ENCHANTING_TABLE: + case Material.ENDER_CHEST : + case Material.OAK_FENCE_GATE: + case Material.ACACIA_FENCE_GATE : + case Material.DARK_OAK_FENCE_GATE : + case Material.SPRUCE_FENCE_GATE : + case Material.BIRCH_FENCE_GATE : + case Material.JUNGLE_FENCE_GATE : + case Material.FURNACE : + case Material.JUKEBOX : + case Material.LEVER : + case Material.NOTE_BLOCK : + case Material.STONE_BUTTON : + case Material.OAK_BUTTON: + case Material.BIRCH_BUTTON: + case Material.ACACIA_BUTTON: + case Material.DARK_OAK_BUTTON: + case Material.JUNGLE_BUTTON: + case Material.SPRUCE_BUTTON: + case Material.ACACIA_TRAPDOOR: + case Material.BIRCH_TRAPDOOR: + case Material.DARK_OAK_TRAPDOOR: + case Material.JUNGLE_TRAPDOOR: + case Material.OAK_TRAPDOOR: + case Material.SPRUCE_TRAPDOOR: + case Material.WALL_SIGN : + case Material.CRAFTING_TABLE: + case Material.BEACON : + case Material.ANVIL : + case Material.DROPPER : + case Material.HOPPER : + case Material.TRAPPED_CHEST : + case Material.IRON_DOOR : + case Material.IRON_TRAPDOOR : + case Material.OAK_DOOR: + case Material.ACACIA_DOOR : + case Material.SPRUCE_DOOR : + case Material.BIRCH_DOOR : + case Material.JUNGLE_DOOR : + case Material.DARK_OAK_DOOR : + case Material.OAK_FENCE: + case Material.ACACIA_FENCE : + case Material.DARK_OAK_FENCE : + case Material.BIRCH_FENCE : + case Material.JUNGLE_FENCE : + case Material.SPRUCE_FENCE : + case Material.ARMOR_STAND : + case Material.BLACK_SHULKER_BOX : + case Material.BLUE_SHULKER_BOX : + case Material.BROWN_SHULKER_BOX : + case Material.CYAN_SHULKER_BOX : + case Material.GRAY_SHULKER_BOX : + case Material.GREEN_SHULKER_BOX : + case Material.LIGHT_BLUE_SHULKER_BOX : + case Material.LIME_SHULKER_BOX : + case Material.MAGENTA_SHULKER_BOX : + case Material.ORANGE_SHULKER_BOX : + case Material.PINK_SHULKER_BOX : + case Material.PURPLE_SHULKER_BOX : + case Material.RED_SHULKER_BOX : + case Material.LIGHT_GRAY_SHULKER_BOX: + case Material.WHITE_SHULKER_BOX : + case Material.YELLOW_SHULKER_BOX : return false; default : @@ -139,114 +139,114 @@ public final class BlockUtils { */ public static boolean canActivateTools(BlockState blockState) { switch (blockState.getType()) { - case BLACK_BED: - case BLUE_BED: - case BROWN_BED: - case CYAN_BED: - case GRAY_BED: - case GREEN_BED: - case LIGHT_BLUE_BED: - case LIGHT_GRAY_BED: - case LIME_BED: - case MAGENTA_BED: - case ORANGE_BED: - case PINK_BED: - case PURPLE_BED: - case RED_BED: - case WHITE_BED: - case YELLOW_BED: - case BREWING_STAND : - case BOOKSHELF : - case CAKE: - case CHEST : - case DISPENSER : - case ENCHANTING_TABLE: - case ENDER_CHEST : - case OAK_FENCE_GATE: - case ACACIA_FENCE_GATE : - case DARK_OAK_FENCE_GATE : - case SPRUCE_FENCE_GATE : - case BIRCH_FENCE_GATE : - case JUNGLE_FENCE_GATE : - case FURNACE : - case JUKEBOX : - case LEVER : - case NOTE_BLOCK : - case STONE_BUTTON : - case OAK_BUTTON: - case BIRCH_BUTTON: - case ACACIA_BUTTON: - case DARK_OAK_BUTTON: - case JUNGLE_BUTTON: - case SPRUCE_BUTTON: - case ACACIA_TRAPDOOR: - case BIRCH_TRAPDOOR: - case DARK_OAK_TRAPDOOR: - case JUNGLE_TRAPDOOR: - case OAK_TRAPDOOR: - case SPRUCE_TRAPDOOR: - case WALL_SIGN : - case CRAFTING_TABLE: - case BEACON : - case ANVIL : - case DROPPER : - case HOPPER : - case TRAPPED_CHEST : - case IRON_DOOR : - case IRON_TRAPDOOR : - case OAK_DOOR: - case ACACIA_DOOR : - case SPRUCE_DOOR : - case BIRCH_DOOR : - case JUNGLE_DOOR : - case DARK_OAK_DOOR : - case OAK_FENCE: - case ACACIA_FENCE : - case DARK_OAK_FENCE : - case BIRCH_FENCE : - case JUNGLE_FENCE : - case SPRUCE_FENCE : - case ARMOR_STAND : - case BLACK_SHULKER_BOX : - case BLUE_SHULKER_BOX : - case BROWN_SHULKER_BOX : - case CYAN_SHULKER_BOX : - case GRAY_SHULKER_BOX : - case GREEN_SHULKER_BOX : - case LIGHT_BLUE_SHULKER_BOX : - case LIME_SHULKER_BOX : - case MAGENTA_SHULKER_BOX : - case ORANGE_SHULKER_BOX : - case PINK_SHULKER_BOX : - case PURPLE_SHULKER_BOX : - case RED_SHULKER_BOX : - case LIGHT_GRAY_SHULKER_BOX: - case WHITE_SHULKER_BOX : - case YELLOW_SHULKER_BOX : - case STRIPPED_ACACIA_LOG: - case STRIPPED_ACACIA_WOOD: - case STRIPPED_BIRCH_LOG: - case STRIPPED_BIRCH_WOOD: - case STRIPPED_DARK_OAK_LOG: - case STRIPPED_DARK_OAK_WOOD: - case STRIPPED_JUNGLE_LOG: - case STRIPPED_JUNGLE_WOOD: - case STRIPPED_OAK_LOG: - case STRIPPED_OAK_WOOD: - case STRIPPED_SPRUCE_LOG: - case STRIPPED_SPRUCE_WOOD: - case ACACIA_LOG: - case ACACIA_WOOD: - case BIRCH_LOG: - case BIRCH_WOOD: - case DARK_OAK_LOG: - case DARK_OAK_WOOD: - case JUNGLE_LOG: - case JUNGLE_WOOD: - case OAK_LOG: - case OAK_WOOD: - case SPRUCE_LOG: - case SPRUCE_WOOD: + case Material.BLACK_BED: + case Material.BLUE_BED: + case Material.BROWN_BED: + case Material.CYAN_BED: + case Material.GRAY_BED: + case Material.GREEN_BED: + case Material.LIGHT_BLUE_BED: + case Material.LIGHT_GRAY_BED: + case Material.LIME_BED: + case Material.MAGENTA_BED: + case Material.ORANGE_BED: + case Material.PINK_BED: + case Material.PURPLE_BED: + case Material.RED_BED: + case Material.WHITE_BED: + case Material.YELLOW_BED: + case Material.BREWING_STAND : + case Material.BOOKSHELF : + case Material.CAKE: + case Material.CHEST : + case Material.DISPENSER : + case Material.ENCHANTING_TABLE: + case Material.ENDER_CHEST : + case Material.OAK_FENCE_GATE: + case Material.ACACIA_FENCE_GATE : + case Material.DARK_OAK_FENCE_GATE : + case Material.SPRUCE_FENCE_GATE : + case Material.BIRCH_FENCE_GATE : + case Material.JUNGLE_FENCE_GATE : + case Material.FURNACE : + case Material.JUKEBOX : + case Material.LEVER : + case Material.NOTE_BLOCK : + case Material.STONE_BUTTON : + case Material.OAK_BUTTON: + case Material.BIRCH_BUTTON: + case Material.ACACIA_BUTTON: + case Material.DARK_OAK_BUTTON: + case Material.JUNGLE_BUTTON: + case Material.SPRUCE_BUTTON: + case Material.ACACIA_TRAPDOOR: + case Material.BIRCH_TRAPDOOR: + case Material.DARK_OAK_TRAPDOOR: + case Material.JUNGLE_TRAPDOOR: + case Material.OAK_TRAPDOOR: + case Material.SPRUCE_TRAPDOOR: + case Material.WALL_SIGN : + case Material.CRAFTING_TABLE: + case Material.BEACON : + case Material.ANVIL : + case Material.DROPPER : + case Material.HOPPER : + case Material.TRAPPED_CHEST : + case Material.IRON_DOOR : + case Material.IRON_TRAPDOOR : + case Material.OAK_DOOR: + case Material.ACACIA_DOOR : + case Material.SPRUCE_DOOR : + case Material.BIRCH_DOOR : + case Material.JUNGLE_DOOR : + case Material.DARK_OAK_DOOR : + case Material.OAK_FENCE: + case Material.ACACIA_FENCE : + case Material.DARK_OAK_FENCE : + case Material.BIRCH_FENCE : + case Material.JUNGLE_FENCE : + case Material.SPRUCE_FENCE : + case Material.ARMOR_STAND : + case Material.BLACK_SHULKER_BOX : + case Material.BLUE_SHULKER_BOX : + case Material.BROWN_SHULKER_BOX : + case Material.CYAN_SHULKER_BOX : + case Material.GRAY_SHULKER_BOX : + case Material.GREEN_SHULKER_BOX : + case Material.LIGHT_BLUE_SHULKER_BOX : + case Material.LIME_SHULKER_BOX : + case Material.MAGENTA_SHULKER_BOX : + case Material.ORANGE_SHULKER_BOX : + case Material.PINK_SHULKER_BOX : + case Material.PURPLE_SHULKER_BOX : + case Material.RED_SHULKER_BOX : + case Material.LIGHT_GRAY_SHULKER_BOX: + case Material.WHITE_SHULKER_BOX : + case Material.YELLOW_SHULKER_BOX : + case Material.STRIPPED_ACACIA_LOG: + case Material.STRIPPED_ACACIA_WOOD: + case Material.STRIPPED_BIRCH_LOG: + case Material.STRIPPED_BIRCH_WOOD: + case Material.STRIPPED_DARK_OAK_LOG: + case Material.STRIPPED_DARK_OAK_WOOD: + case Material.STRIPPED_JUNGLE_LOG: + case Material.STRIPPED_JUNGLE_WOOD: + case Material.STRIPPED_OAK_LOG: + case Material.STRIPPED_OAK_WOOD: + case Material.STRIPPED_SPRUCE_LOG: + case Material.STRIPPED_SPRUCE_WOOD: + case Material.ACACIA_LOG: + case Material.ACACIA_WOOD: + case Material.BIRCH_LOG: + case Material.BIRCH_WOOD: + case Material.DARK_OAK_LOG: + case Material.DARK_OAK_WOOD: + case Material.JUNGLE_LOG: + case Material.JUNGLE_WOOD: + case Material.OAK_LOG: + case Material.OAK_WOOD: + case Material.SPRUCE_LOG: + case Material.SPRUCE_WOOD: return false; default : @@ -274,15 +274,15 @@ public final class BlockUtils { */ public static boolean canMakeMossy(BlockState blockState) { switch (blockState.getType()) { - case COBBLESTONE : - case DIRT : - case GRASS_PATH : + case Material.COBBLESTONE : + case Material.DIRT : + case Material.GRASS_PATH : return true; - case STONE_BRICKS: + case Material.STONE_BRICKS: return true; - case COBBLESTONE_WALL: + case Material.COBBLESTONE_WALL: return true; default : @@ -356,12 +356,12 @@ public final class BlockUtils { */ public static boolean isLeaves(BlockState blockState) { switch (blockState.getType()) { - case OAK_LEAVES: - case ACACIA_LEAVES: - case BIRCH_LEAVES: - case DARK_OAK_LEAVES: - case JUNGLE_LEAVES: - case SPRUCE_LEAVES: + case Material.OAK_LEAVES: + case Material.ACACIA_LEAVES: + case Material.BIRCH_LEAVES: + case Material.DARK_OAK_LEAVES: + case Material.JUNGLE_LEAVES: + case Material.SPRUCE_LEAVES: return true; default : @@ -378,8 +378,8 @@ public final class BlockUtils { */ public static boolean affectedByFluxMining(BlockState blockState) { switch (blockState.getType()) { - case IRON_ORE : - case GOLD_ORE : + case Material.IRON_ORE : + case Material.GOLD_ORE : return true; default : @@ -397,10 +397,10 @@ public final class BlockUtils { */ public static boolean canActivateHerbalism(BlockState blockState) { switch (blockState.getType()) { - case DIRT : - case GRASS : - case GRASS_PATH : - case FARMLAND: + case Material.DIRT : + case Material.GRASS : + case Material.GRASS_PATH : + case Material.FARMLAND: return false; default : @@ -418,7 +418,7 @@ public final class BlockUtils { */ public static boolean affectedByBlockCracker(BlockState blockState) { switch (blockState.getType()) { - case STONE_BRICKS: + case Material.STONE_BRICKS: return true; default : @@ -435,9 +435,9 @@ public final class BlockUtils { */ public static boolean canMakeShroomy(BlockState blockState) { switch (blockState.getType()) { - case DIRT : - case GRASS : - case GRASS_PATH : + case Material.DIRT : + case Material.GRASS : + case Material.GRASS_PATH : return true; default : diff --git a/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/ChimaeraWing.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/ChimaeraWing.java diff --git a/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/EnchantmentUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/EventUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/EventUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/EventUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/EventUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/HardcoreManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/HardcoreManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/HardcoreManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/HardcoreManager.java diff --git a/src/main/java/com/gmail/nossr50/util/HolidayManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/HolidayManager.java similarity index 94% rename from src/main/java/com/gmail/nossr50/util/HolidayManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/HolidayManager.java index e1d88462c..b858a83ea 100644 --- a/src/main/java/com/gmail/nossr50/util/HolidayManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/HolidayManager.java @@ -60,30 +60,30 @@ public final class HolidayManager { public static FakeSkillType getByStatistic(Statistic statistic) { switch (statistic) { - case DAMAGE_TAKEN: + case Statistic.DAMAGE_TAKEN: return FakeSkillType.MACHO; - case JUMP: + case Statistic.JUMP: return FakeSkillType.JUMPING; - case DROP: + case Statistic.DROP: return FakeSkillType.THROWING; - case MINE_BLOCK: - case BREAK_ITEM: + case Statistic.MINE_BLOCK: + case Statistic.BREAK_ITEM: return FakeSkillType.WRECKING; - case CRAFT_ITEM: + case Statistic.CRAFT_ITEM: return FakeSkillType.CRAFTING; - case WALK_ONE_CM: + case Statistic.WALK_ONE_CM: return FakeSkillType.WALKING; - case SWIM_ONE_CM: + case Statistic.SWIM_ONE_CM: return FakeSkillType.SWIMMING; - case FALL_ONE_CM: + case Statistic.FALL_ONE_CM: return FakeSkillType.FALLING; - case CLIMB_ONE_CM: + case Statistic.CLIMB_ONE_CM: return FakeSkillType.CLIMBING; - case FLY_ONE_CM: + case Statistic.FLY_ONE_CM: return FakeSkillType.FLYING; - case WALK_UNDER_WATER_ONE_CM: + case Statistic.WALK_UNDER_WATER_ONE_CM: return FakeSkillType.DIVING; - case PIG_ONE_CM: + case Statistic.PIG_ONE_CM: return FakeSkillType.PIGGY; default: return FakeSkillType.UNKNOWN; @@ -334,20 +334,20 @@ public final class HolidayManager { int modifier; switch (statistic) { - case DAMAGE_TAKEN: + case Statistic.DAMAGE_TAKEN: modifier = 500; break; - case JUMP: + case Statistic.JUMP: modifier = 500; break; - case DROP: + case Statistic.DROP: modifier = 200; break; - case MINE_BLOCK: - case BREAK_ITEM: + case Statistic.MINE_BLOCK: + case Statistic.BREAK_ITEM: modifier = 500; break; - case CRAFT_ITEM: + case Statistic.CRAFT_ITEM: modifier = 100; break; default: diff --git a/src/main/java/com/gmail/nossr50/util/ItemUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/ItemUtils.java similarity index 62% rename from src/main/java/com/gmail/nossr50/util/ItemUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/ItemUtils.java index 2ee2f1936..072e2d83a 100644 --- a/src/main/java/com/gmail/nossr50/util/ItemUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/ItemUtils.java @@ -24,7 +24,7 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case BOW: + case Material.BOW: return true; default: @@ -42,11 +42,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_SWORD: - case GOLDEN_SWORD: - case IRON_SWORD: - case STONE_SWORD: - case WOODEN_SWORD: + case Material.DIAMOND_SWORD: + case Material.GOLDEN_SWORD: + case Material.IRON_SWORD: + case Material.STONE_SWORD: + case Material.WOODEN_SWORD: return true; default: @@ -64,11 +64,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_HOE: - case GOLDEN_HOE: - case IRON_HOE: - case STONE_HOE: - case WOODEN_HOE: + case Material.DIAMOND_HOE: + case Material.GOLDEN_HOE: + case Material.IRON_HOE: + case Material.STONE_HOE: + case Material.WOODEN_HOE: return true; default: @@ -86,11 +86,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_SHOVEL: - case GOLDEN_SHOVEL: - case IRON_SHOVEL: - case STONE_SHOVEL: - case WOODEN_SHOVEL: + case Material.DIAMOND_SHOVEL: + case Material.GOLDEN_SHOVEL: + case Material.IRON_SHOVEL: + case Material.STONE_SHOVEL: + case Material.WOODEN_SHOVEL: return true; default: @@ -108,11 +108,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_AXE: - case GOLDEN_AXE: - case IRON_AXE: - case STONE_AXE: - case WOODEN_AXE: + case Material.DIAMOND_AXE: + case Material.GOLDEN_AXE: + case Material.IRON_AXE: + case Material.STONE_AXE: + case Material.WOODEN_AXE: return true; default: @@ -130,11 +130,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_PICKAXE: - case GOLDEN_PICKAXE: - case IRON_PICKAXE: - case STONE_PICKAXE: - case WOODEN_PICKAXE: + case Material.DIAMOND_PICKAXE: + case Material.GOLDEN_PICKAXE: + case Material.IRON_PICKAXE: + case Material.STONE_PICKAXE: + case Material.WOODEN_PICKAXE: return true; default: @@ -166,11 +166,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_HELMET: - case GOLDEN_HELMET: - case IRON_HELMET: - case CHAINMAIL_HELMET: - case LEATHER_HELMET: + case Material.DIAMOND_HELMET: + case Material.GOLDEN_HELMET: + case Material.IRON_HELMET: + case Material.CHAINMAIL_HELMET: + case Material.LEATHER_HELMET: return true; default: @@ -188,11 +188,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_CHESTPLATE: - case GOLDEN_CHESTPLATE: - case IRON_CHESTPLATE: - case CHAINMAIL_CHESTPLATE: - case LEATHER_CHESTPLATE: + case Material.DIAMOND_CHESTPLATE: + case Material.GOLDEN_CHESTPLATE: + case Material.IRON_CHESTPLATE: + case Material.CHAINMAIL_CHESTPLATE: + case Material.LEATHER_CHESTPLATE: return true; default: @@ -210,11 +210,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_LEGGINGS: - case GOLDEN_LEGGINGS: - case IRON_LEGGINGS: - case CHAINMAIL_LEGGINGS: - case LEATHER_LEGGINGS: + case Material.DIAMOND_LEGGINGS: + case Material.GOLDEN_LEGGINGS: + case Material.IRON_LEGGINGS: + case Material.CHAINMAIL_LEGGINGS: + case Material.LEATHER_LEGGINGS: return true; default: @@ -232,11 +232,11 @@ public final class ItemUtils { Material type = item.getType(); switch (type) { - case DIAMOND_BOOTS: - case GOLDEN_BOOTS: - case IRON_BOOTS: - case CHAINMAIL_BOOTS: - case LEATHER_BOOTS: + case Material.DIAMOND_BOOTS: + case Material.GOLDEN_BOOTS: + case Material.IRON_BOOTS: + case Material.CHAINMAIL_BOOTS: + case Material.LEATHER_BOOTS: return true; default: @@ -272,10 +272,10 @@ public final class ItemUtils { */ public static boolean isLeatherArmor(ItemStack item) { switch (item.getType()) { - case LEATHER_BOOTS: - case LEATHER_CHESTPLATE: - case LEATHER_HELMET: - case LEATHER_LEGGINGS: + case Material.LEATHER_BOOTS: + case Material.LEATHER_CHESTPLATE: + case Material.LEATHER_HELMET: + case Material.LEATHER_LEGGINGS: return true; default: @@ -291,10 +291,10 @@ public final class ItemUtils { */ public static boolean isGoldArmor(ItemStack item) { switch (item.getType()) { - case GOLDEN_BOOTS: - case GOLDEN_CHESTPLATE: - case GOLDEN_HELMET: - case GOLDEN_LEGGINGS: + case Material.GOLDEN_BOOTS: + case Material.GOLDEN_CHESTPLATE: + case Material.GOLDEN_HELMET: + case Material.GOLDEN_LEGGINGS: return true; default: @@ -310,10 +310,10 @@ public final class ItemUtils { */ public static boolean isIronArmor(ItemStack item) { switch (item.getType()) { - case IRON_BOOTS: - case IRON_CHESTPLATE: - case IRON_HELMET: - case IRON_LEGGINGS: + case Material.IRON_BOOTS: + case Material.IRON_CHESTPLATE: + case Material.IRON_HELMET: + case Material.IRON_LEGGINGS: return true; default: @@ -329,10 +329,10 @@ public final class ItemUtils { */ public static boolean isDiamondArmor(ItemStack item) { switch (item.getType()) { - case DIAMOND_BOOTS: - case DIAMOND_CHESTPLATE: - case DIAMOND_HELMET: - case DIAMOND_LEGGINGS: + case Material.DIAMOND_BOOTS: + case Material.DIAMOND_CHESTPLATE: + case Material.DIAMOND_HELMET: + case Material.DIAMOND_LEGGINGS: return true; default: @@ -348,10 +348,10 @@ public final class ItemUtils { */ public static boolean isChainmailArmor(ItemStack item) { switch (item.getType()) { - case CHAINMAIL_BOOTS: - case CHAINMAIL_CHESTPLATE: - case CHAINMAIL_HELMET: - case CHAINMAIL_LEGGINGS: + case Material.CHAINMAIL_BOOTS: + case Material.CHAINMAIL_CHESTPLATE: + case Material.CHAINMAIL_HELMET: + case Material.CHAINMAIL_LEGGINGS: return true; default: @@ -377,11 +377,11 @@ public final class ItemUtils { */ public static boolean isStoneTool(ItemStack item) { switch (item.getType()) { - case STONE_AXE: - case STONE_HOE: - case STONE_PICKAXE: - case STONE_SHOVEL: - case STONE_SWORD: + case Material.STONE_AXE: + case Material.STONE_HOE: + case Material.STONE_PICKAXE: + case Material.STONE_SHOVEL: + case Material.STONE_SWORD: return true; default: @@ -397,11 +397,11 @@ public final class ItemUtils { */ public static boolean isWoodTool(ItemStack item) { switch (item.getType()) { - case WOODEN_AXE: - case WOODEN_HOE: - case WOODEN_PICKAXE: - case WOODEN_SHOVEL: - case WOODEN_SWORD: + case Material.WOODEN_AXE: + case Material.WOODEN_HOE: + case Material.WOODEN_PICKAXE: + case Material.WOODEN_SHOVEL: + case Material.WOODEN_SWORD: return true; default: @@ -417,9 +417,9 @@ public final class ItemUtils { */ public static boolean isStringTool(ItemStack item) { switch (item.getType()) { - case BOW: - case CARROT_ON_A_STICK: - case FISHING_ROD: + case Material.BOW: + case Material.CARROT_ON_A_STICK: + case Material.FISHING_ROD: return true; default: @@ -435,11 +435,11 @@ public final class ItemUtils { */ public static boolean isGoldTool(ItemStack item) { switch (item.getType()) { - case GOLDEN_AXE: - case GOLDEN_HOE: - case GOLDEN_PICKAXE: - case GOLDEN_SHOVEL: - case GOLDEN_SWORD: + case Material.GOLDEN_AXE: + case Material.GOLDEN_HOE: + case Material.GOLDEN_PICKAXE: + case Material.GOLDEN_SHOVEL: + case Material.GOLDEN_SWORD: return true; default: @@ -455,14 +455,14 @@ public final class ItemUtils { */ public static boolean isIronTool(ItemStack item) { switch (item.getType()) { - case BUCKET: - case FLINT_AND_STEEL: - case IRON_AXE: - case IRON_HOE: - case IRON_PICKAXE: - case IRON_SHOVEL: - case IRON_SWORD: - case SHEARS: + case Material.BUCKET: + case Material.FLINT_AND_STEEL: + case Material.IRON_AXE: + case Material.IRON_HOE: + case Material.IRON_PICKAXE: + case Material.IRON_SHOVEL: + case Material.IRON_SWORD: + case Material.SHEARS: return true; default: @@ -478,11 +478,11 @@ public final class ItemUtils { */ public static boolean isDiamondTool(ItemStack item) { switch (item.getType()) { - case DIAMOND_AXE: - case DIAMOND_HOE: - case DIAMOND_PICKAXE: - case DIAMOND_SHOVEL: - case DIAMOND_SWORD: + case Material.DIAMOND_AXE: + case Material.DIAMOND_HOE: + case Material.DIAMOND_PICKAXE: + case Material.DIAMOND_SHOVEL: + case Material.DIAMOND_SWORD: return true; default: @@ -498,12 +498,12 @@ public final class ItemUtils { */ public static boolean isEnchantable(ItemStack item) { switch (item.getType()) { - case ENCHANTED_BOOK: - case SHEARS: - case FISHING_ROD: - case CARROT_ON_A_STICK: - case FLINT_AND_STEEL: - case TRIDENT: + case Material.ENCHANTED_BOOK: + case Material.SHEARS: + case Material.FISHING_ROD: + case Material.CARROT_ON_A_STICK: + case Material.FLINT_AND_STEEL: + case Material.TRIDENT: return true; default: @@ -553,21 +553,21 @@ public final class ItemUtils { */ public static boolean isMiningDrop(ItemStack item) { switch (item.getType()) { - case COAL: - case COAL_ORE: - case DIAMOND: - case DIAMOND_ORE: - case EMERALD: - case EMERALD_ORE: - case GOLD_ORE: - case IRON_ORE: - case LAPIS_ORE: - case REDSTONE_ORE: // Should we also have Glowing Redstone Ore here? - case REDSTONE: - case GLOWSTONE_DUST: // Should we also have Glowstone here? - case QUARTZ: - case NETHER_QUARTZ_ORE: - case LAPIS_LAZULI: + case Material.COAL: + case Material.COAL_ORE: + case Material.DIAMOND: + case Material.DIAMOND_ORE: + case Material.EMERALD: + case Material.EMERALD_ORE: + case Material.GOLD_ORE: + case Material.IRON_ORE: + case Material.LAPIS_ORE: + case Material.REDSTONE_ORE: // Should we also have Glowing Redstone Ore here? + case Material.REDSTONE: + case Material.GLOWSTONE_DUST: // Should we also have Glowstone here? + case Material.QUARTZ: + case Material.NETHER_QUARTZ_ORE: + case Material.LAPIS_LAZULI: return true; default: @@ -583,29 +583,29 @@ public final class ItemUtils { */ public static boolean isHerbalismDrop(ItemStack item) { switch (item.getType()) { - case WHEAT: - case WHEAT_SEEDS: - case CARROT: - case CHORUS_FRUIT: - case CHORUS_FLOWER: - case POTATO: - case BEETROOT: - case BEETROOT_SEEDS: - case NETHER_WART: - case BROWN_MUSHROOM: - case RED_MUSHROOM: - case ROSE_RED: - case DANDELION_YELLOW: - case CACTUS: - case SUGAR_CANE: - case MELON: - case MELON_SEEDS: - case PUMPKIN: - case PUMPKIN_SEEDS: - case LILY_PAD: - case VINE: - case TALL_GRASS: - case COCOA_BEANS: + case Material.WHEAT: + case Material.WHEAT_SEEDS: + case Material.CARROT: + case Material.CHORUS_FRUIT: + case Material.CHORUS_FLOWER: + case Material.POTATO: + case Material.BEETROOT: + case Material.BEETROOT_SEEDS: + case Material.NETHER_WART: + case Material.BROWN_MUSHROOM: + case Material.RED_MUSHROOM: + case Material.ROSE_RED: + case Material.DANDELION_YELLOW: + case Material.CACTUS: + case Material.SUGAR_CANE: + case Material.MELON: + case Material.MELON_SEEDS: + case Material.PUMPKIN: + case Material.PUMPKIN_SEEDS: + case Material.LILY_PAD: + case Material.VINE: + case Material.TALL_GRASS: + case Material.COCOA_BEANS: return true; default: @@ -621,48 +621,48 @@ public final class ItemUtils { */ public static boolean isMobDrop(ItemStack item) { switch (item.getType()) { - case STRING: - case FEATHER: - case CHICKEN: - case COOKED_CHICKEN: - case LEATHER: - case BEEF: - case COOKED_BEEF: - case PORKCHOP: - case COOKED_PORKCHOP: - case WHITE_WOOL: - case BLACK_WOOL: - case BLUE_WOOL: - case BROWN_WOOL: - case CYAN_WOOL: - case GRAY_WOOL: - case GREEN_WOOL: - case LIGHT_BLUE_WOOL: - case LIGHT_GRAY_WOOL: - case LIME_WOOL: - case MAGENTA_WOOL: - case ORANGE_WOOL: - case PINK_WOOL: - case PURPLE_WOOL: - case RED_WOOL: - case YELLOW_WOOL: - case IRON_INGOT: - case SNOWBALL: - case BLAZE_ROD: - case SPIDER_EYE: - case GUNPOWDER: - case ENDER_PEARL: - case GHAST_TEAR: - case MAGMA_CREAM: - case BONE: - case ARROW: - case SLIME_BALL: - case NETHER_STAR: - case ROTTEN_FLESH: - case GOLD_NUGGET: - case EGG: - case ROSE_RED: - case COAL: + case Material.STRING: + case Material.FEATHER: + case Material.CHICKEN: + case Material.COOKED_CHICKEN: + case Material.LEATHER: + case Material.BEEF: + case Material.COOKED_BEEF: + case Material.PORKCHOP: + case Material.COOKED_PORKCHOP: + case Material.WHITE_WOOL: + case Material.BLACK_WOOL: + case Material.BLUE_WOOL: + case Material.BROWN_WOOL: + case Material.CYAN_WOOL: + case Material.GRAY_WOOL: + case Material.GREEN_WOOL: + case Material.LIGHT_BLUE_WOOL: + case Material.LIGHT_GRAY_WOOL: + case Material.LIME_WOOL: + case Material.MAGENTA_WOOL: + case Material.ORANGE_WOOL: + case Material.PINK_WOOL: + case Material.PURPLE_WOOL: + case Material.RED_WOOL: + case Material.YELLOW_WOOL: + case Material.IRON_INGOT: + case Material.SNOWBALL: + case Material.BLAZE_ROD: + case Material.SPIDER_EYE: + case Material.GUNPOWDER: + case Material.ENDER_PEARL: + case Material.GHAST_TEAR: + case Material.MAGMA_CREAM: + case Material.BONE: + case Material.ARROW: + case Material.SLIME_BALL: + case Material.NETHER_STAR: + case Material.ROTTEN_FLESH: + case Material.GOLD_NUGGET: + case Material.EGG: + case Material.ROSE_RED: + case Material.COAL: return true; default: @@ -678,31 +678,31 @@ public final class ItemUtils { */ public static boolean isWoodcuttingDrop(ItemStack item) { switch (item.getType()) { - case ACACIA_LOG: - case BIRCH_LOG: - case DARK_OAK_LOG: - case JUNGLE_LOG: - case OAK_LOG: - case SPRUCE_LOG: - case STRIPPED_ACACIA_LOG: - case STRIPPED_BIRCH_LOG: - case STRIPPED_DARK_OAK_LOG: - case STRIPPED_JUNGLE_LOG: - case STRIPPED_OAK_LOG: - case STRIPPED_SPRUCE_LOG: - case ACACIA_SAPLING: - case SPRUCE_SAPLING: - case BIRCH_SAPLING: - case DARK_OAK_SAPLING: - case JUNGLE_SAPLING: - case OAK_SAPLING: - case ACACIA_LEAVES: - case BIRCH_LEAVES: - case DARK_OAK_LEAVES: - case JUNGLE_LEAVES: - case OAK_LEAVES: - case SPRUCE_LEAVES: - case APPLE: + case Material.ACACIA_LOG: + case Material.BIRCH_LOG: + case Material.DARK_OAK_LOG: + case Material.JUNGLE_LOG: + case Material.OAK_LOG: + case Material.SPRUCE_LOG: + case Material.STRIPPED_ACACIA_LOG: + case Material.STRIPPED_BIRCH_LOG: + case Material.STRIPPED_DARK_OAK_LOG: + case Material.STRIPPED_JUNGLE_LOG: + case Material.STRIPPED_OAK_LOG: + case Material.STRIPPED_SPRUCE_LOG: + case Material.ACACIA_SAPLING: + case Material.SPRUCE_SAPLING: + case Material.BIRCH_SAPLING: + case Material.DARK_OAK_SAPLING: + case Material.JUNGLE_SAPLING: + case Material.OAK_SAPLING: + case Material.ACACIA_LEAVES: + case Material.BIRCH_LEAVES: + case Material.DARK_OAK_LEAVES: + case Material.JUNGLE_LEAVES: + case Material.OAK_LEAVES: + case Material.SPRUCE_LEAVES: + case Material.APPLE: return true; default: diff --git a/src/main/java/com/gmail/nossr50/util/LogFilter.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/LogFilter.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/LogFilter.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/LogFilter.java diff --git a/src/main/java/com/gmail/nossr50/util/MaterialUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/MaterialUtils.java similarity index 54% rename from src/main/java/com/gmail/nossr50/util/MaterialUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/MaterialUtils.java index 8951a098a..203e815c8 100644 --- a/src/main/java/com/gmail/nossr50/util/MaterialUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/MaterialUtils.java @@ -8,14 +8,14 @@ public final class MaterialUtils { protected static boolean isOre(Material data) { switch (data) { - case COAL_ORE: - case DIAMOND_ORE: - case NETHER_QUARTZ_ORE: - case GOLD_ORE: - case IRON_ORE: - case LAPIS_ORE: - case REDSTONE_ORE: - case EMERALD_ORE: + case Material.COAL_ORE: + case Material.DIAMOND_ORE: + case Material.NETHER_QUARTZ_ORE: + case Material.GOLD_ORE: + case Material.IRON_ORE: + case Material.LAPIS_ORE: + case Material.REDSTONE_ORE: + case Material.EMERALD_ORE: return true; default: return mcMMO.getModManager().isCustomOre(data); diff --git a/src/main/java/com/gmail/nossr50/util/Misc.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/Misc.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/Misc.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/Misc.java diff --git a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java similarity index 98% rename from src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java index 9c40f8aa6..9f8015833 100644 --- a/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/MobHealthbarUtils.java @@ -155,8 +155,8 @@ public final class MobHealthbarUtils { */ private static boolean isBoss(LivingEntity livingEntity) { switch (livingEntity.getType()) { - case ENDER_DRAGON: - case WITHER: + case EntityType.ENDER_DRAGON: + case EntityType.WITHER: return true; default: diff --git a/src/main/java/com/gmail/nossr50/util/ModManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/ModManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/ModManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/ModManager.java diff --git a/src/main/java/com/gmail/nossr50/util/Motd.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/Motd.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/Motd.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/Motd.java diff --git a/src/main/java/com/gmail/nossr50/util/Permissions.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/Permissions.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/Permissions.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/Permissions.java diff --git a/src/main/java/com/gmail/nossr50/util/StringUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/StringUtils.java similarity index 93% rename from src/main/java/com/gmail/nossr50/util/StringUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/StringUtils.java index 31d1e77d4..b03a60a31 100644 --- a/src/main/java/com/gmail/nossr50/util/StringUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/util/StringUtils.java @@ -42,13 +42,13 @@ public class StringUtils { public static String getFriendlyConfigBlockDataString(BlockData data) { switch(data.getMaterial()){ - case CHORUS_FLOWER: - case COCOA: - case WHEAT: - case BEETROOTS: - case CARROTS: - case POTATOES: - case NETHER_WART: { + case Material.CHORUS_FLOWER: + case Material.COCOA: + case Material.WHEAT: + case Material.BEETROOTS: + case Material.CARROTS: + case Material.POTATOES: + case Material.NETHER_WART: { if (data instanceof Ageable) { Ageable ageData = (Ageable) data; if (ageData.getAge() == ageData.getMaximumAge()) { diff --git a/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/TextComponentFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/TextComponentFactory.java diff --git a/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/adapter/BiomeAdapter.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletManagerFactory.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStore.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/ChunkletStoreFactory.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/HashChunkletManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/NullChunkletManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveChunkletStore.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/PrimitiveExChunkletStore.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkManagerFactory.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStore.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/ChunkStoreFactory.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleChunkBuffer.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/McMMOSimpleRegionFile.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/NullChunkManager.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/PrimitiveChunkStore.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionMain.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionXDirectory.java diff --git a/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java old mode 100755 new mode 100644 similarity index 100% rename from src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/blockmeta/conversion/BlockStoreConversionZDirectory.java diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandRegistrationManager.java diff --git a/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/commands/CommandUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarManager.java diff --git a/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/ExperienceBarWrapper.java diff --git a/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/experience/FormulaManager.java diff --git a/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/player/NotificationManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/player/NotificationManager.java diff --git a/src/main/java/com/gmail/nossr50/util/player/UserManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/player/UserManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/player/UserManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/player/UserManager.java diff --git a/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidActivationException.java diff --git a/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/InvalidStaticChance.java diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceExecution.java diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkill.java diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceSkillStatic.java diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceStatic.java diff --git a/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/random/RandomChanceUtil.java diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ObjectiveType.java diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardManager.java diff --git a/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/scoreboards/ScoreboardWrapper.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/CombatUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/ParticleEffectUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/PerksUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/RankUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/RankUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillActivationType.java diff --git a/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/skills/SkillUtils.java diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundManager.java diff --git a/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/sounds/SoundType.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/sounds/SoundType.java diff --git a/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/upgrade/UpgradeManager.java diff --git a/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java b/mcMMO-core/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java similarity index 100% rename from src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/util/uuid/UUIDFetcher.java diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java b/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java similarity index 100% rename from src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardFlags.java diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java b/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java similarity index 97% rename from src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java index 25cd6291a..973f4b2b6 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardManager.java @@ -65,7 +65,7 @@ public class WorldGuardManager { } private WorldGuardPlugin getWorldGuard() { - Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard"); + Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard"); // WorldGuard may not be loaded if (plugin == null || !(plugin instanceof WorldGuardPlugin)) { diff --git a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java b/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java similarity index 95% rename from src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java rename to mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java index fd191669b..c6b110b05 100644 --- a/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java +++ b/mcMMO-core/src/main/java/com/gmail/nossr50/worldguard/WorldGuardUtils.java @@ -37,7 +37,7 @@ public class WorldGuardUtils { if(isLoaded) return worldGuardPluginRef; - Plugin plugin = getServer().getPluginManager().getPlugin("WorldGuard"); + Plugin plugin = Bukkit.getServer().getPluginManager().getPlugin("WorldGuard"); if(plugin instanceof WorldGuardPlugin) { diff --git a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java b/mcMMO-core/src/main/java/net/shatteredlands/shatt/ZipLibrary.java similarity index 96% rename from src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java rename to mcMMO-core/src/main/java/net/shatteredlands/shatt/ZipLibrary.java index c990d336e..ceea33a9b 100644 --- a/src/main/java/net/shatteredlands/shatt/backup/ZipLibrary.java +++ b/mcMMO-core/src/main/java/net/shatteredlands/shatt/ZipLibrary.java @@ -1,4 +1,4 @@ -package net.shatteredlands.shatt.backup; +package net.shatteredlands.shatt; import com.gmail.nossr50.config.Config; import com.gmail.nossr50.mcMMO; @@ -16,7 +16,7 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipOutputStream; public class ZipLibrary { - private static String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "backup" + File.separator; + private static String BACKUP_DIRECTORY = mcMMO.getMainDirectory() + "net/shatteredlands/shatt/backup" + File.separator; private static File BACKUP_DIR = new File(BACKUP_DIRECTORY); private static File FLAT_FILE_DIRECTORY = new File(mcMMO.getFlatFileDirectory()); private static File MOD_FILE_DIRECTORY = new File(mcMMO.getModDirectory()); @@ -41,7 +41,7 @@ public class ZipLibrary { mcMMO.p.getLogger().severe(e.toString()); } - // Generate the proper date for the backup filename + // Generate the proper date for the net.shatteredlands.shatt.backup filename Date date = new Date(); SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH-mm-ss"); File fileZip = new File(BACKUP_DIRECTORY + File.separator + dateFormat.format(date) + ".zip"); diff --git a/src/util/java/mcMMO/PotionConfigGenerator.java b/mcMMO-core/src/main/java/util/java/mcMMO/PotionConfigGenerator.java similarity index 99% rename from src/util/java/mcMMO/PotionConfigGenerator.java rename to mcMMO-core/src/main/java/util/java/mcMMO/PotionConfigGenerator.java index 0323b531e..f50e6b4f2 100644 --- a/src/util/java/mcMMO/PotionConfigGenerator.java +++ b/mcMMO-core/src/main/java/util/java/mcMMO/PotionConfigGenerator.java @@ -1,4 +1,4 @@ -package com.gmail.nossr50; +package util.java.mcMMO; import org.bukkit.Material; import org.bukkit.potion.PotionData; diff --git a/src/main/resources/.jenkins b/mcMMO-core/src/main/resources/.jenkins similarity index 100% rename from src/main/resources/.jenkins rename to mcMMO-core/src/main/resources/.jenkins diff --git a/src/main/resources/advanced.yml b/mcMMO-core/src/main/resources/advanced.yml similarity index 100% rename from src/main/resources/advanced.yml rename to mcMMO-core/src/main/resources/advanced.yml diff --git a/src/main/resources/child.yml b/mcMMO-core/src/main/resources/child.yml similarity index 100% rename from src/main/resources/child.yml rename to mcMMO-core/src/main/resources/child.yml diff --git a/src/main/resources/config.yml b/mcMMO-core/src/main/resources/config.yml similarity index 100% rename from src/main/resources/config.yml rename to mcMMO-core/src/main/resources/config.yml diff --git a/src/main/resources/coreskills.yml b/mcMMO-core/src/main/resources/coreskills.yml similarity index 100% rename from src/main/resources/coreskills.yml rename to mcMMO-core/src/main/resources/coreskills.yml diff --git a/src/main/resources/experience.yml b/mcMMO-core/src/main/resources/experience.yml similarity index 100% rename from src/main/resources/experience.yml rename to mcMMO-core/src/main/resources/experience.yml diff --git a/src/main/resources/hidden.yml b/mcMMO-core/src/main/resources/hidden.yml similarity index 100% rename from src/main/resources/hidden.yml rename to mcMMO-core/src/main/resources/hidden.yml diff --git a/src/main/resources/itemweights.yml b/mcMMO-core/src/main/resources/itemweights.yml similarity index 100% rename from src/main/resources/itemweights.yml rename to mcMMO-core/src/main/resources/itemweights.yml diff --git a/src/main/resources/locale/locale_cs_CZ.properties b/mcMMO-core/src/main/resources/locale/locale_cs_CZ.properties similarity index 97% rename from src/main/resources/locale/locale_cs_CZ.properties rename to mcMMO-core/src/main/resources/locale/locale_cs_CZ.properties index 5136fdad2..79daa5e53 100644 --- a/src/main/resources/locale/locale_cs_CZ.properties +++ b/mcMMO-core/src/main/resources/locale/locale_cs_CZ.properties @@ -346,7 +346,7 @@ Combat.Gore=[[GREEN]]**PRUNIK** Combat.StruckByGore=**BYL JSI PROBODNUT** Combat.TargetDazed=C\u00edl byl [[DARK_RED]]Omr\u00e1\u010den Combat.TouchedFuzzy=[[DARK_RED]]Nejasne dotcen. Mas zavrat. -mcMMO.Description=[[DARK_AQUA]]O [[YELLOW]]mcMMO[[DARK_AQUA]] Projekt:,[[GOLD]]mcMMO je [[RED]]open source[[GOLD]] RPG m\u00f3d vytvo\u0159en\u00fd v \u00fanoru 2011,[[GOLD]]autorem [[BLUE]]nossr50[[GOLD]]. C\u00edl projektu je poskytnout kvalitu RPG.,[[DARK_AQUA]]Tipy:,[[GOLD]] - [[GREEN]]Pou\u017eij [[RED]]/mcmmo help[[GREEN]] pro zobrazen\u00ed dostupn\u00fdch p\u0159\u00edkaz\u016f,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] pro zobrazen\u00ed detailn\u00edch informac\u00ed o skillu,[[DARK_AQUA]]V\u00fdvoj\u00e1\u0159i:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Majitel),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Vedouc\u00ed projektu),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[DARK_AQUA]]U\u017eite\u010dn\u00e9 odkazy:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Nahla\u0161ov\u00e1n\u00ed Chyb,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]O [[YELLOW]]mcMMO[[DARK_AQUA]] Projekt:,[[GOLD]]mcMMO je [[RED]]open source[[GOLD]] RPG m\u00f3d vytvo\u0159en\u00fd v \u00fanoru 2011,[[GOLD]]autorem [[BLUE]]com.gmail.nossr50[[GOLD]]. C\u00edl projektu je poskytnout kvalitu RPG.,[[DARK_AQUA]]Tipy:,[[GOLD]] - [[GREEN]]Pou\u017eij [[RED]]/mcmmo help[[GREEN]] pro zobrazen\u00ed dostupn\u00fdch p\u0159\u00edkaz\u016f,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] pro zobrazen\u00ed detailn\u00edch informac\u00ed o skillu,[[DARK_AQUA]]V\u00fdvoj\u00e1\u0159i:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Majitel),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Vedouc\u00ed projektu),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](V\u00fdvoj\u00e1\u0159),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](V\u00fdvoj\u00e1\u0159),[[DARK_AQUA]]U\u017eite\u010dn\u00e9 odkazy:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Nahla\u0161ov\u00e1n\u00ed Chyb,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Bylo v\u00e1m ud\u011bleno {0} \u00farovn\u00ed ve v\u0161ech dovednostech! Commands.addlevels.AwardAll.2=V\u0161echny schopnosti byly zm\u011bn\u011bny na {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]Tvoje dovednost {1} je nyn\u00ed {0}! diff --git a/src/main/resources/locale/locale_cy.properties b/mcMMO-core/src/main/resources/locale/locale_cy.properties similarity index 100% rename from src/main/resources/locale/locale_cy.properties rename to mcMMO-core/src/main/resources/locale/locale_cy.properties diff --git a/src/main/resources/locale/locale_da.properties b/mcMMO-core/src/main/resources/locale/locale_da.properties similarity index 100% rename from src/main/resources/locale/locale_da.properties rename to mcMMO-core/src/main/resources/locale/locale_da.properties diff --git a/src/main/resources/locale/locale_de.properties b/mcMMO-core/src/main/resources/locale/locale_de.properties similarity index 98% rename from src/main/resources/locale/locale_de.properties rename to mcMMO-core/src/main/resources/locale/locale_de.properties index f15725c74..722c69880 100644 --- a/src/main/resources/locale/locale_de.properties +++ b/mcMMO-core/src/main/resources/locale/locale_de.properties @@ -451,7 +451,7 @@ Combat.TouchedFuzzy=[[DARK_RED]]Ungl\u00fccklich ber\u00fchrt. Schwindelgef\u00f #COMMANDS ##generic -mcMMO.Description=[[DARK_AQUA]]\u00DCber das [[YELLOW]]mcMMO[[DARK_AQUA]] Projekt: [[GOLD]]mcMMO ist ein [[RED]]open source[[GOLD]] RPG mod der im Februar 2011,[[GOLD]]von [[BLUE]]nossr50[[GOLD]] erstellt wurde. Ziel ist es eine gute RPG Erfahrung zu vermitteln.,[[DARK_AQUA]]Tipps:,[[GOLD]] - [[GREEN]]Benutz [[RED]]/mcmmo help[[GREEN]] um Befehle zu sehen,[[GOLD]] - [[GREEN]]Tippe [[RED]]/SKILLNAME[[GREEN]] um detaillierte Skillinformationen zu sehen,[[DARK_AQUA]]Entwickler:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Gr\u00FCnder),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Projektleitung),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]lumis31 [[BLUE]](Deutsche \u00DCbersetzung), [[DARK_AQUA]]N\u00FCtzliche Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]\u00DCber das [[YELLOW]]mcMMO[[DARK_AQUA]] Projekt: [[GOLD]]mcMMO ist ein [[RED]]open source[[GOLD]] RPG mod der im Februar 2011,[[GOLD]]von [[BLUE]]com.gmail.nossr50[[GOLD]] erstellt wurde. Ziel ist es eine gute RPG Erfahrung zu vermitteln.,[[DARK_AQUA]]Tipps:,[[GOLD]] - [[GREEN]]Benutz [[RED]]/mcmmo help[[GREEN]] um Befehle zu sehen,[[GOLD]] - [[GREEN]]Tippe [[RED]]/SKILLNAME[[GREEN]] um detaillierte Skillinformationen zu sehen,[[DARK_AQUA]]Entwickler:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Gr\u00FCnder),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Projektleitung),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Entwickler),[[GOLD]] - [[GREEN]]lumis31 [[BLUE]](Deutsche \u00DCbersetzung), [[DARK_AQUA]]N\u00FCtzliche Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Dir wurden {0} Level in allen Skills gutgeschrieben! Commands.addlevels.AwardAll.2=Alle Skills wurden um {0} ge\u00E4ndert. Commands.addlevels.AwardSkill.1=[[GREEN]]Dir wurden {0} Level in {1} gutgeschrieben! diff --git a/src/main/resources/locale/locale_en_US.properties b/mcMMO-core/src/main/resources/locale/locale_en_US.properties similarity index 98% rename from src/main/resources/locale/locale_en_US.properties rename to mcMMO-core/src/main/resources/locale/locale_en_US.properties index 6df1f5c84..f978e815d 100644 --- a/src/main/resources/locale/locale_en_US.properties +++ b/mcMMO-core/src/main/resources/locale/locale_en_US.properties @@ -32,7 +32,7 @@ JSON.Unarmed=Unarmed JSON.Woodcutting=Woodcutting JSON.URL.Website=The official mcMMO Website! JSON.URL.Discord=The official mcMMO Discord server! -JSON.URL.Patreon=Support nossr50 and his work for mcMMO on Patreon! +JSON.URL.Patreon=Support com.gmail.nossr50 and his work for mcMMO on Patreon! JSON.URL.Spigot=The official mcMMO Spigot Resource Page! JSON.URL.Translation=Translate mcMMO into other languages! JSON.URL.Wiki=The official mcMMO wiki! @@ -533,7 +533,7 @@ Combat.TargetDazed=Target was [[DARK_RED]]Dazed Combat.TouchedFuzzy=[[DARK_RED]]Touched Fuzzy. Felt Dizzy. #COMMANDS ##generic -mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]https://discord.gg/EJGVanb [[GOLD]] Official Discord +mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]com.gmail.nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]https://discord.gg/EJGVanb [[GOLD]] Official Discord Commands.addlevels.AwardAll.1=[[GREEN]]You were awarded {0} levels in all skills! Commands.addlevels.AwardAll.2=All skills have been modified for {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]You were awarded {0} levels in {1}! @@ -1054,4 +1054,4 @@ Profile.Loading.Failure=[[RED]]mcMMO still cannot load your data. You may want t Profile.Loading.AdminFailureNotice=[[DARK_RED]][A][[RED]] mcMMO was unable to load the player data for [[YELLOW]]{0}[[RED]]. [[LIGHT_PURPLE]]Please inspect your database setup. #Holiday Holiday.AprilFools.Levelup=[[GOLD]]{0} is now level [[GREEN]]{1}[[GOLD]]! -Holiday.Anniversary=[[BLUE]]Happy {0} Year Anniversary!\n[[BLUE]]In honor of all of nossr50's work and all the devs, here's a firework show! \ No newline at end of file +Holiday.Anniversary=[[BLUE]]Happy {0} Year Anniversary!\n[[BLUE]]In honor of all of com.gmail.nossr50's work and all the devs, here's a firework show! \ No newline at end of file diff --git a/src/main/resources/locale/locale_es.properties b/mcMMO-core/src/main/resources/locale/locale_es.properties similarity index 98% rename from src/main/resources/locale/locale_es.properties rename to mcMMO-core/src/main/resources/locale/locale_es.properties index 38a2aae5f..afdbffff4 100644 --- a/src/main/resources/locale/locale_es.properties +++ b/mcMMO-core/src/main/resources/locale/locale_es.properties @@ -350,7 +350,7 @@ Combat.Gore=[[GREEN]]**MORDISCO** Combat.StruckByGore=**FUISTE MORDISQUEADO** Combat.TargetDazed=El objetivo fue [[DARK_RED]]aturdido Combat.TouchedFuzzy=[[DARK_RED]]Est\u00e1s confuso. Te sientes mareado. -mcMMO.Description=[[DARK_AQUA]]Sobre el proyecto[[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO es un mod RPG de[[RED]codigo abierto[[GOLD]] creado en Febrero de 2011, [[GOLD]]por [[BLUE]]nossr50[[GOLD]]. La meta es proveer una experiencia igual a la de los RPG.,[[DARK_AQUA]]Consejos:,[[GOLD]] - [[GREEN]]Usa [[RED]]/mcmmo help[[GREEN]] para ver los comandos,[[GOLD]] - [[GREEN]]Teclea [[RED]]/SKILLNAME[[GREEN]]para ver informacion detalada de las habilidades,[[DARK_AQUA]]Desarrolladores:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Reporte de fallos,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]Sobre el proyecto[[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO es un mod RPG de[[RED]codigo abierto[[GOLD]] creado en Febrero de 2011, [[GOLD]]por [[BLUE]]com.gmail.nossr50[[GOLD]]. La meta es proveer una experiencia igual a la de los RPG.,[[DARK_AQUA]]Consejos:,[[GOLD]] - [[GREEN]]Usa [[RED]]/mcmmo help[[GREEN]] para ver los comandos,[[GOLD]] - [[GREEN]]Teclea [[RED]]/SKILLNAME[[GREEN]]para ver informacion detalada de las habilidades,[[DARK_AQUA]]Desarrolladores:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Reporte de fallos,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Fuistes recompensado con {0} niveles en todas las habilidades! Commands.addlevels.AwardAll.2=Todas las Skins han sido mofificadas por {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]Fuistes recompensado con {0} niveles en {1}! diff --git a/src/main/resources/locale/locale_fi.properties b/mcMMO-core/src/main/resources/locale/locale_fi.properties similarity index 100% rename from src/main/resources/locale/locale_fi.properties rename to mcMMO-core/src/main/resources/locale/locale_fi.properties diff --git a/src/main/resources/locale/locale_fr.properties b/mcMMO-core/src/main/resources/locale/locale_fr.properties similarity index 99% rename from src/main/resources/locale/locale_fr.properties rename to mcMMO-core/src/main/resources/locale/locale_fr.properties index 886a7d0ed..230bab883 100644 --- a/src/main/resources/locale/locale_fr.properties +++ b/mcMMO-core/src/main/resources/locale/locale_fr.properties @@ -396,7 +396,7 @@ Combat.Gore=[[GREEN]]**SANG** Combat.StruckByGore=**FRAPP\u00c9 JUSQU\'AU SANG** Combat.TargetDazed=La cible a \u00e9t\u00e9 [[DARK_RED]]\u00c9tourdi Combat.TouchedFuzzy=[[DARK_RED]]Vous voyez flou. Vous vous sentez \u00e9tourdi. -mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]com.gmail.nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Vous avez \u00e9t\u00e9 r\u00e9compens\u00e9 de {0} niveau(x) dans tous les talents ! Commands.addlevels.AwardAll.2=Tous les talents ont \u00e9t\u00e9 modifi\u00e9s pour {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]Vous avez re\u00e7u {0} niveau dans {1}! diff --git a/src/main/resources/locale/locale_hu_HU.properties b/mcMMO-core/src/main/resources/locale/locale_hu_HU.properties similarity index 100% rename from src/main/resources/locale/locale_hu_HU.properties rename to mcMMO-core/src/main/resources/locale/locale_hu_HU.properties diff --git a/src/main/resources/locale/locale_it.properties b/mcMMO-core/src/main/resources/locale/locale_it.properties similarity index 98% rename from src/main/resources/locale/locale_it.properties rename to mcMMO-core/src/main/resources/locale/locale_it.properties index bbc2d063e..7c939b768 100644 --- a/src/main/resources/locale/locale_it.properties +++ b/mcMMO-core/src/main/resources/locale/locale_it.properties @@ -419,7 +419,7 @@ Combat.TouchedFuzzy=Urto Stordino. Vado nel Pallone. #COMMANDS ##generic -mcMMO.Description=[[DARK_AQUA]]Riguardo il [[DARK_AQUA]]Progetto [[YELLOW]]mcMMO:,[[GOLD]]mcMMO \u00E8 una mod GdR [[RED]]open source[[GOLD]] creata nel Febbraio 2011,[[GOLD]]da [[BLUE]]nossr50[[GOLD]]. L'obiettivo \u00E8 quello di fornire un'esperienza GdR di qualit\u00E0.,[[DARK_AQUA]]Suggerimenti:,[[GOLD]] - [[GREEN]]Usa [[RED]]/mcmmo help[[GREEN]] per vedere i comandi,[[GOLD]] - [[GREEN]]Digita [[RED]]/NOMEABILIT\u00C0[[GREEN]] per vedere informazioni dettagliate su un'abilit\u00E0,[[DARK_AQUA]]Sviluppatori:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Fondatore),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Capo Progetto),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Sviluppatore),[[DARK_AQUA]]Link Utili:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Segnalazione Bug,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]Riguardo il [[DARK_AQUA]]Progetto [[YELLOW]]mcMMO:,[[GOLD]]mcMMO \u00E8 una mod GdR [[RED]]open source[[GOLD]] creata nel Febbraio 2011,[[GOLD]]da [[BLUE]]com.gmail.nossr50[[GOLD]]. L'obiettivo \u00E8 quello di fornire un'esperienza GdR di qualit\u00E0.,[[DARK_AQUA]]Suggerimenti:,[[GOLD]] - [[GREEN]]Usa [[RED]]/mcmmo help[[GREEN]] per vedere i comandi,[[GOLD]] - [[GREEN]]Digita [[RED]]/NOMEABILIT\u00C0[[GREEN]] per vedere informazioni dettagliate su un'abilit\u00E0,[[DARK_AQUA]]Sviluppatori:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Fondatore),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Capo Progetto),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Sviluppatore),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Sviluppatore),[[DARK_AQUA]]Link Utili:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Segnalazione Bug,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Ti sono stati aggiudicati {0} livelli in tutte le abilit\u00E0! Commands.addlevels.AwardAll.2=Tutte le abilit\u00E0 sono state modificate per {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]Ti sono stati aggiudicati {0} livelli in {1}! diff --git a/src/main/resources/locale/locale_ja_JP.properties b/mcMMO-core/src/main/resources/locale/locale_ja_JP.properties similarity index 100% rename from src/main/resources/locale/locale_ja_JP.properties rename to mcMMO-core/src/main/resources/locale/locale_ja_JP.properties diff --git a/src/main/resources/locale/locale_ko.properties b/mcMMO-core/src/main/resources/locale/locale_ko.properties similarity index 98% rename from src/main/resources/locale/locale_ko.properties rename to mcMMO-core/src/main/resources/locale/locale_ko.properties index fc24f4701..a974ee7f2 100644 --- a/src/main/resources/locale/locale_ko.properties +++ b/mcMMO-core/src/main/resources/locale/locale_ko.properties @@ -436,7 +436,7 @@ Combat.TouchedFuzzy=[[DARK_RED]]\uD63C\uB780\uC774 \uC77C\uC5B4\uB0AC\uC2B5\uB2C #COMMANDS ##generic -mcMMO.Description=mcMMO[[DARK_AQUA]] \uD504\uB85C\uC81D\uD2B8\uC5D0 \uB300\uD574\uC11C:,[[GOLD]]mcMMO\uB294 \uD55C [[RED]]\uC624\uD508 \uC18C\uC2A4[[GOLD]] RPG \uBAA8\uB4DC\uB85C 2011\uB144 2\uC6D4\uC5D0 [[BLUE]]nossr50[[GOLD]]\uB2D8\uC774 \uB9CC\uB4E4\uC5C8\uC2B5\uB2C8\uB2E4. \uBAA9\uD45C\uB294 \uC9C8\uC88B\uC740 RPG \uACBD\uD5D8\uC744 \uC81C\uACF5\uD558\uB294 \uAC83 \uC785\uB2C8\uB2E4.,[[DARK_AQUA]]\uD301:,[[GOLD]] - [[RED]]/mcmmo help[[GREEN]] \uBA85\uB839\uC5B4\uB4E4\uC744 \uBD05\uB2C8\uB2E4,[[GOLD]] - [[GREEN]]\uD0C0\uC785 [[RED]]/\uC2A4\uD0AC\uC774\uB984[[GREEN]] \uC790\uC138\uD55C \uC2A4\uD0AC \uC815\uBCF4\uB97C \uBD05\uB2C8\uB2E4,[[DARK_AQUA]]\uAC1C\uBC1C\uC790\uB4E4:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](\uC81C\uC791\uC790),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\uD504\uB85C\uC81D\uD2B8 \uC8FC\uC7A5),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\uAC1C\uBC1C\uC790),[[DARK_AQUA]]\uC720\uC6A9\uD55C \uB9C1\uD06C:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \uBC84\uADF8 \uBCF4\uACE0,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \uCC44\uD305, +mcMMO.Description=mcMMO[[DARK_AQUA]] \uD504\uB85C\uC81D\uD2B8\uC5D0 \uB300\uD574\uC11C:,[[GOLD]]mcMMO\uB294 \uD55C [[RED]]\uC624\uD508 \uC18C\uC2A4[[GOLD]] RPG \uBAA8\uB4DC\uB85C 2011\uB144 2\uC6D4\uC5D0 [[BLUE]]com.gmail.nossr50[[GOLD]]\uB2D8\uC774 \uB9CC\uB4E4\uC5C8\uC2B5\uB2C8\uB2E4. \uBAA9\uD45C\uB294 \uC9C8\uC88B\uC740 RPG \uACBD\uD5D8\uC744 \uC81C\uACF5\uD558\uB294 \uAC83 \uC785\uB2C8\uB2E4.,[[DARK_AQUA]]\uD301:,[[GOLD]] - [[RED]]/mcmmo help[[GREEN]] \uBA85\uB839\uC5B4\uB4E4\uC744 \uBD05\uB2C8\uB2E4,[[GOLD]] - [[GREEN]]\uD0C0\uC785 [[RED]]/\uC2A4\uD0AC\uC774\uB984[[GREEN]] \uC790\uC138\uD55C \uC2A4\uD0AC \uC815\uBCF4\uB97C \uBD05\uB2C8\uB2E4,[[DARK_AQUA]]\uAC1C\uBC1C\uC790\uB4E4:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](\uC81C\uC791\uC790),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\uD504\uB85C\uC81D\uD2B8 \uC8FC\uC7A5),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\uAC1C\uBC1C\uC790),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\uAC1C\uBC1C\uC790),[[DARK_AQUA]]\uC720\uC6A9\uD55C \uB9C1\uD06C:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \uBC84\uADF8 \uBCF4\uACE0,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \uCC44\uD305, Commands.addlevels.AwardAll.1=[[GREEN]]\uB2F9\uC2E0\uC740 \uBAA8\uB4E0 \uC2A4\uD0AC\uC5D0 {0} \uB808\uBCA8\uC744 \uC9C0\uAE09\uD588\uC2B5\uB2C8\uB2E4! Commands.addlevels.AwardAll.2=\uBAA8\uB4E0 \uC2A4\uD0AC\uC774 {0}\uB85C \uBCC0\uACBD\uB418\uC5C8\uC2B5\uB2C8\uB2E4 Commands.addlevels.AwardSkill.1=[[GREEN]]\uB2F9\uC2E0\uC740 {0} \uB808\uBCA8\uC744 {1}\uC5D0 \uC9C0\uAE09\uD558\uC600\uC2B5\uB2C8\uB2E4! diff --git a/src/main/resources/locale/locale_nl.properties b/mcMMO-core/src/main/resources/locale/locale_nl.properties similarity index 100% rename from src/main/resources/locale/locale_nl.properties rename to mcMMO-core/src/main/resources/locale/locale_nl.properties diff --git a/src/main/resources/locale/locale_pl.properties b/mcMMO-core/src/main/resources/locale/locale_pl.properties similarity index 97% rename from src/main/resources/locale/locale_pl.properties rename to mcMMO-core/src/main/resources/locale/locale_pl.properties index ea44c55fc..22a0f5fed 100644 --- a/src/main/resources/locale/locale_pl.properties +++ b/mcMMO-core/src/main/resources/locale/locale_pl.properties @@ -334,7 +334,7 @@ Combat.Gore=[[GREEN]]**KRWOTOK** Combat.StruckByGore=**WYKRWAWIASZ SI\u0118** Combat.TargetDazed=Cel zostal [[DARK_RED]]oszolomiony. Combat.TouchedFuzzy=[[DARK_RED]]Zostales oszolomiony. -mcMMO.Description=[[DARK_AQUA]]O [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO jest [[RED]]open source[[GOLD]] modem RPG stworzonym w lutym 2011 r.,[[GOLD]]przez [[BLUE]]nossr50[[GOLD]]. Celem jest wprowadzenie doswiadczen RPG.,[[DARK_AQUA]]Porady:,[[GOLD]] - [[GREEN]]Uzywaj [[RED]]/mcmmo help[[GREEN]] by zobaczyc komendy,[[GOLD]] - [[GREEN]]Pisz [[RED]]/NAZWA_UMIEJETNOSCI[[GREEN]] by zobaczyc informacje na jej temat,[[DARK_AQUA]]Programisci:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Zalozyciel),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Manager projektu),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Przydatne linki:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Zglaszanie bled\u00f3w,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]O [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO jest [[RED]]open source[[GOLD]] modem RPG stworzonym w lutym 2011 r.,[[GOLD]]przez [[BLUE]]com.gmail.nossr50[[GOLD]]. Celem jest wprowadzenie doswiadczen RPG.,[[DARK_AQUA]]Porady:,[[GOLD]] - [[GREEN]]Uzywaj [[RED]]/mcmmo help[[GREEN]] by zobaczyc komendy,[[GOLD]] - [[GREEN]]Pisz [[RED]]/NAZWA_UMIEJETNOSCI[[GREEN]] by zobaczyc informacje na jej temat,[[DARK_AQUA]]Programisci:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Zalozyciel),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Manager projektu),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Przydatne linki:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Zglaszanie bled\u00f3w,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]Otrzyma\u0142e\u015b {0} poziom\u00f3w we wszystkich dziedzinach! Commands.addlevels.AwardAll.2=Wszystkie dziedziny zosta\u0142y zmienione na poziom {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]Zdoby\u0142e\u015b {0} poziom\u00f3w w dziedzinie {1}! diff --git a/src/main/resources/locale/locale_pt_BR.properties b/mcMMO-core/src/main/resources/locale/locale_pt_BR.properties similarity index 100% rename from src/main/resources/locale/locale_pt_BR.properties rename to mcMMO-core/src/main/resources/locale/locale_pt_BR.properties diff --git a/src/main/resources/locale/locale_ru.properties b/mcMMO-core/src/main/resources/locale/locale_ru.properties similarity index 98% rename from src/main/resources/locale/locale_ru.properties rename to mcMMO-core/src/main/resources/locale/locale_ru.properties index b6e69dc81..82da31f19 100644 --- a/src/main/resources/locale/locale_ru.properties +++ b/mcMMO-core/src/main/resources/locale/locale_ru.properties @@ -354,7 +354,7 @@ Combat.Gore=[[GREEN]]**\u0423\u041a\u0423\u0428\u0415\u041d** Combat.StruckByGore=**\u0412\u042b \u0411\u042b\u041b\u0418 \u0423\u041a\u0423\u0428\u0415\u041d\u042b** Combat.TargetDazed=\u0412\u0430\u0448\u0430 \u0446\u0435\u043b\u044c [[DARK_RED]]\u0428\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0430 Combat.TouchedFuzzy=[[DARK_RED]]\u0412\u044b \u0438\u0441\u0442\u0435\u043a\u0430\u0435\u0442\u0435 \u043a\u0440\u043e\u0432\u044c\u044e. \u041a\u0440\u0443\u0436\u0438\u0442\u0441\u044f \u0433\u043e\u043b\u043e\u0432\u0430. -mcMMO.Description=[[DARK_AQUA]]\u041e \u043f\u0440\u043e\u044d\u043a\u0442\u0435 [[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO \u044d\u0442\u043e [[RED]]\u043e\u0442\u043a\u0440\u044b\u0442\u044b\u0439[[GOLD]] RPG \u043c\u043e\u0434, \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0439 \u0432 \u0444\u0435\u0432\u0440\u0430\u043b\u0435 2011,[[GOLD]]\u043a\u043e\u043c\u043c\u0430\u043d\u0434\u043e\u0439 [[BLUE]]nossr50[[GOLD]]. \u0415\u0433\u043e \u0446\u0435\u043b\u044c\u044e \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e RPG \u043e\u043f\u044b\u0442\u0430 \u0432 \u0438\u0433\u0440\u0435.,[[DARK_AQUA]]\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0438:,[[GOLD]] - [[GREEN]]\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 [[RED]]/mcmmo help[[GREEN]] \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u043a\u043e\u043c\u043c\u0430\u043d\u0434\u044b,[[GOLD]] - [[GREEN]]\u041d\u0430\u043f\u0435\u0447\u0430\u0442\u0430\u0439\u0442\u0435 [[RED]]/SKILLNAME[[GREEN]] \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u044c\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u043d\u0430\u0432\u044b\u043a\u0435,[[DARK_AQUA]]\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](\u041e\u0441\u043d\u043e\u0432\u0430\u0442\u0435\u043b\u044c),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u041b\u0438\u0434\u0435\u0440 \u041f\u0440\u043e\u044d\u043a\u0442\u0430),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]]\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[DARK_AQUA]]\u041f\u043e\u043b\u0435\u0437\u043d\u044b\u0435 \u0441\u0441\u044b\u043b\u043a\u0438:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u041e\u0442\u0447\u0435\u0442\u044b \u043e \u0431\u0430\u0433\u0430\u0445,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \u0447\u0430\u0442, +mcMMO.Description=[[DARK_AQUA]]\u041e \u043f\u0440\u043e\u044d\u043a\u0442\u0435 [[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO \u044d\u0442\u043e [[RED]]\u043e\u0442\u043a\u0440\u044b\u0442\u044b\u0439[[GOLD]] RPG \u043c\u043e\u0434, \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0439 \u0432 \u0444\u0435\u0432\u0440\u0430\u043b\u0435 2011,[[GOLD]]\u043a\u043e\u043c\u043c\u0430\u043d\u0434\u043e\u0439 [[BLUE]]com.gmail.nossr50[[GOLD]]. \u0415\u0433\u043e \u0446\u0435\u043b\u044c\u044e \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e RPG \u043e\u043f\u044b\u0442\u0430 \u0432 \u0438\u0433\u0440\u0435.,[[DARK_AQUA]]\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0438:,[[GOLD]] - [[GREEN]]\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 [[RED]]/mcmmo help[[GREEN]] \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u043a\u043e\u043c\u043c\u0430\u043d\u0434\u044b,[[GOLD]] - [[GREEN]]\u041d\u0430\u043f\u0435\u0447\u0430\u0442\u0430\u0439\u0442\u0435 [[RED]]/SKILLNAME[[GREEN]] \u0447\u0442\u043e\u0431\u044b \u0443\u0432\u0438\u0434\u0435\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u044c\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e \u043d\u0430\u0432\u044b\u043a\u0435,[[DARK_AQUA]]\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a\u0438:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](\u041e\u0441\u043d\u043e\u0432\u0430\u0442\u0435\u043b\u044c),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u041b\u0438\u0434\u0435\u0440 \u041f\u0440\u043e\u044d\u043a\u0442\u0430),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]]\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u0420\u0430\u0437\u0440\u0430\u0431\u043e\u0442\u0447\u0438\u043a),[[DARK_AQUA]]\u041f\u043e\u043b\u0435\u0437\u043d\u044b\u0435 \u0441\u0441\u044b\u043b\u043a\u0438:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u041e\u0442\u0447\u0435\u0442\u044b \u043e \u0431\u0430\u0433\u0430\u0445,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \u0447\u0430\u0442, Commands.addlevels.AwardAll.1=[[GREEN]]\u0412\u044b \u0431\u044b\u043b\u0438 \u043d\u0430\u0433\u0440\u0430\u0436\u0434\u0435\u043d\u044b {0} \u043e\u0447\u043a\u0430\u043c\u0438 \u043e\u043f\u044b\u0442\u0430 \u0432\u043e \u0432\u0441\u0435\u0445 \u043d\u0430\u0432\u044b\u043a\u0430\u0445! Commands.addlevels.AwardAll.2=\u0412\u0441\u0435 \u043d\u0430\u0432\u044b\u043a\u0438 \u0431\u044b\u043b\u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b \u043d\u0430 {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]\u0412\u044b \u0431\u044b\u043b\u0438 \u043d\u0430\u0433\u0440\u0430\u0436\u0434\u0435\u043d\u044b {0} \u0443\u0440\u043e\u0432\u043d\u044f\u043c\u0438 \u0432 {1}! diff --git a/src/main/resources/locale/locale_sv.properties b/mcMMO-core/src/main/resources/locale/locale_sv.properties similarity index 100% rename from src/main/resources/locale/locale_sv.properties rename to mcMMO-core/src/main/resources/locale/locale_sv.properties diff --git a/src/main/resources/locale/locale_th_TH.properties b/mcMMO-core/src/main/resources/locale/locale_th_TH.properties similarity index 99% rename from src/main/resources/locale/locale_th_TH.properties rename to mcMMO-core/src/main/resources/locale/locale_th_TH.properties index 402daeb04..83b273567 100644 --- a/src/main/resources/locale/locale_th_TH.properties +++ b/mcMMO-core/src/main/resources/locale/locale_th_TH.properties @@ -345,7 +345,7 @@ Combat.Gore=[[GREEN]]**\u0e43\u0e0a\u0e49\u0e17\u0e31\u0e01\u0e29\u0e30 GORED** Combat.StruckByGore=**\u0e04\u0e38\u0e13\u0e16\u0e39\u0e01\u0e17\u0e31\u0e01\u0e29\u0e30 Gored** Combat.TargetDazed=\u0e40\u0e1b\u0e49\u0e32\u0e2b\u0e21\u0e32\u0e22\u0e17\u0e35\u0e48 [[DARK_RED]]\u0e21\u0e36\u0e19\u0e07\u0e07 Combat.TouchedFuzzy=[[DARK_RED]]\u0e04\u0e38\u0e13\u0e23\u0e39\u0e49\u0e2a\u0e36\u0e01\u0e21\u0e36\u0e19 \u0e40\u0e1e\u0e23\u0e32\u0e30 \u0e17\u0e31\u0e01\u0e29\u0e30 Touched Fuzzy. -mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, +mcMMO.Description=[[DARK_AQUA]]About the [[YELLOW]]mcMMO[[DARK_AQUA]] Project:,[[GOLD]]mcMMO is an [[RED]]open source[[GOLD]] RPG mod created in February 2011,[[GOLD]]by [[BLUE]]com.gmail.nossr50[[GOLD]]. The goal is to provide a quality RPG experience.,[[DARK_AQUA]]Tips:,[[GOLD]] - [[GREEN]]Use [[RED]]/mcmmo help[[GREEN]] to see commands,[[GOLD]] - [[GREEN]]Type [[RED]]/SKILLNAME[[GREEN]] to see detailed skill info,[[DARK_AQUA]]Developers:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](Founder & Project Lead),[[GOLD]] - [[GREEN]]GJ [[BLUE]](Former Project Lead),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](Developer),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](Developer),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](Developer),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](Developer),[[DARK_AQUA]]Useful Links:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] Bug Reporting,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat, Commands.addlevels.AwardAll.1=[[GREEN]]\u0e04\u0e38\u0e13\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e23\u0e32\u0e07\u0e27\u0e31\u0e25 {0} \u0e17\u0e38\u0e01\u0e17\u0e31\u0e01\u0e29\u0e30! Commands.addlevels.AwardAll.2=\u0e17\u0e31\u0e01\u0e29\u0e30\u0e17\u0e31\u0e49\u0e07\u0e2b\u0e21\u0e14\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e01\u0e32\u0e23\u0e41\u0e01\u0e49\u0e44\u0e02\u0e40\u0e1e\u0e37\u0e48\u0e2d {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]\u0e04\u0e38\u0e13\u0e44\u0e14\u0e49\u0e23\u0e31\u0e1a\u0e23\u0e32\u0e07\u0e27\u0e31\u0e25 {0} \u0e43\u0e19\u0e17\u0e31\u0e01\u0e29\u0e30 {1}! diff --git a/src/main/resources/locale/locale_zh_CN.properties b/mcMMO-core/src/main/resources/locale/locale_zh_CN.properties similarity index 98% rename from src/main/resources/locale/locale_zh_CN.properties rename to mcMMO-core/src/main/resources/locale/locale_zh_CN.properties index 98b8c7d99..314e9e138 100644 --- a/src/main/resources/locale/locale_zh_CN.properties +++ b/mcMMO-core/src/main/resources/locale/locale_zh_CN.properties @@ -381,7 +381,7 @@ Combat.Gore=[[GREEN]]**\u76ee\u6807\u88ab\u653e\u8840** Combat.StruckByGore=**\u4f60\u88ab\u653e\u8840\u4e86** Combat.TargetDazed=\u76ee\u6807\u88ab [[DARK_RED]]\u88ab\u51fb\u6655 Combat.TouchedFuzzy=[[DARK_RED]]\u5934\u6655\u76ee\u7729 -mcMMO.Description=[[DARK_AQUA]]\u5173\u4e8e [[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO \u662f\u4e00\u4e2a [[RED]]\u5f00\u6e90[[GOLD]] RPG mod \u521b\u5efa\u4e8e2011\u5e742\u6708,[[GOLD]]by [[BLUE]]nossr50[[GOLD]]. \u76ee\u6807\u4e3a\u73a9\u5bb6\u63d0\u4f9b\u4e00\u4e2a\u9ad8\u8d28\u91cf\u7684RPG\u4f53\u9a8c.,[[DARK_AQUA]]\u63d0\u793a:,[[GOLD]] - [[GREEN]]\u4f7f\u7528 [[RED]]/mcmmo help[[GREEN]] \u67e5\u770b\u6307\u4ee4,[[GOLD]] - [[GREEN]]\u8f93\u5165 [[RED]]/\u6280\u80fd\u540d[[GREEN]] \u67e5\u770b\u8be6\u7ec6\u7684\u6280\u80fd\u4fe1\u606f,[[DARK_AQUA]]\u5f00\u53d1\u8005:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](\u521b\u59cb\u4eba),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u9879\u76ee\u7ec4\u957f),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u5f00\u53d1\u8005),[[DARK_AQUA]]\u6709\u7528\u7684\u94fe\u63a5:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u62a5\u544aBUG,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[YELLOW]]\u53c2\u4e0e\u8fc7\u7ffb\u8bd1\u4e0e\u6da6\u8272\u7684\u4eba[[DARK_AQUA]]:,[[GREEN]]hzk11o11k11o wolski Chikaze(Cirno) 664365842 zesty HDfunctions CNAmira,[[DARK_AQUA]]\u4fee\u6b63\u8865\u6f0f\u5de5\u4f5c\u8fd8\u5728\u7ee7\u7eed... +mcMMO.Description=[[DARK_AQUA]]\u5173\u4e8e [[YELLOW]]mcMMO[[DARK_AQUA]]:,[[GOLD]]mcMMO \u662f\u4e00\u4e2a [[RED]]\u5f00\u6e90[[GOLD]] RPG mod \u521b\u5efa\u4e8e2011\u5e742\u6708,[[GOLD]]by [[BLUE]]com.gmail.nossr50[[GOLD]]. \u76ee\u6807\u4e3a\u73a9\u5bb6\u63d0\u4f9b\u4e00\u4e2a\u9ad8\u8d28\u91cf\u7684RPG\u4f53\u9a8c.,[[DARK_AQUA]]\u63d0\u793a:,[[GOLD]] - [[GREEN]]\u4f7f\u7528 [[RED]]/mcmmo help[[GREEN]] \u67e5\u770b\u6307\u4ee4,[[GOLD]] - [[GREEN]]\u8f93\u5165 [[RED]]/\u6280\u80fd\u540d[[GREEN]] \u67e5\u770b\u8be6\u7ec6\u7684\u6280\u80fd\u4fe1\u606f,[[DARK_AQUA]]\u5f00\u53d1\u8005:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](\u521b\u59cb\u4eba),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u9879\u76ee\u7ec4\u957f),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\u5f00\u53d1\u8005),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u5f00\u53d1\u8005),[[DARK_AQUA]]\u6709\u7528\u7684\u94fe\u63a5:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u62a5\u544aBUG,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC Chat,[[YELLOW]]\u53c2\u4e0e\u8fc7\u7ffb\u8bd1\u4e0e\u6da6\u8272\u7684\u4eba[[DARK_AQUA]]:,[[GREEN]]hzk11o11k11o wolski Chikaze(Cirno) 664365842 zesty HDfunctions CNAmira,[[DARK_AQUA]]\u4fee\u6b63\u8865\u6f0f\u5de5\u4f5c\u8fd8\u5728\u7ee7\u7eed... Commands.addlevels.AwardAll.1=[[GREEN]]\u4f60\u7684\u6240\u6709\u7b49\u7ea7\u88ab\u5956\u52b1\u4e0a\u5347\u4e86 {0} \u7ea7! Commands.addlevels.AwardAll.2=\u6240\u6709\u6280\u80fd\u7b49\u7ea7\u5df2\u88ab\u8bbe\u7f6e\u4e3a {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]\u4f60\u5728 {1} \u91cc\u5347\u4e86 {0} \u7ea7! diff --git a/src/main/resources/locale/locale_zh_TW.properties b/mcMMO-core/src/main/resources/locale/locale_zh_TW.properties similarity index 98% rename from src/main/resources/locale/locale_zh_TW.properties rename to mcMMO-core/src/main/resources/locale/locale_zh_TW.properties index e6f7a9b8d..5c7140072 100644 --- a/src/main/resources/locale/locale_zh_TW.properties +++ b/mcMMO-core/src/main/resources/locale/locale_zh_TW.properties @@ -354,7 +354,7 @@ Combat.Gore=[[GREEN]]**\u6d41\u8840** Combat.StruckByGore=**\u4f60\u958b\u59cb\u6d41\u8840\u4e86** Combat.TargetDazed=\u76ee\u6a19\u5df2\u88ab [[DARK_RED]] \u64ca\u6688 Combat.TouchedFuzzy=[[DARK_RED]]\u982d\u6688\u76ee\u7729... -mcMMO.Description=[[DARK_AQUA]]\u95dc\u65bc [[YELLOW]]mcMMO[[DARK_AQUA]] \u5c08\u6848:,[[GOLD]]mcMMO\u662f\u4e00\u500b[[RED]]\u958b\u653e\u539f\u59cb\u78bc\u7684[[GOLD]] RPG \u6a21\u7d44\u59cb\u65bc2011\u5e74\u4e8c\u6708,[[GOLD]]\u5efa\u7acb\u8005 [[BLUE]]nossr50[[GOLD]]. \u65e8\u5728\u63d0\u4f9b\u4e00\u500b\u9ad8\u54c1\u8ceaRPG\u9ad4\u9a57.,[[DARK_AQUA]]\u5c0f\u6280\u5de7:,[[GOLD]] - [[GREEN]]\u8f38\u5165 [[RED]]/mcmmo help[[GREEN]] \u4ee5\u4e86\u89e3\u6240\u6709\u6307\u4ee4,[[GOLD]] - [[GREEN]]\u8f38\u5165 [[RED]]/\u6280\u80fd\u540d\u7a31 [[GREEN]]\u4ee5\u4e86\u89e3\u6280\u80fd\u7d30\u7bc0,[[DARK_AQUA]]\u958b\u767c\u8005:,[[GOLD]] - [[GREEN]]nossr50 [[BLUE]](\u8d0a\u52a9\u8005),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u5c08\u6848\u9818\u5c0e\u4eba),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u958b\u767c\u8005),[[DARK_AQUA]]\u5be6\u7528\u9023\u7d50:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u932f\u8aa4\u56de\u5831,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \u983b\u9053, +mcMMO.Description=[[DARK_AQUA]]\u95dc\u65bc [[YELLOW]]mcMMO[[DARK_AQUA]] \u5c08\u6848:,[[GOLD]]mcMMO\u662f\u4e00\u500b[[RED]]\u958b\u653e\u539f\u59cb\u78bc\u7684[[GOLD]] RPG \u6a21\u7d44\u59cb\u65bc2011\u5e74\u4e8c\u6708,[[GOLD]]\u5efa\u7acb\u8005 [[BLUE]]com.gmail.nossr50[[GOLD]]. \u65e8\u5728\u63d0\u4f9b\u4e00\u500b\u9ad8\u54c1\u8ceaRPG\u9ad4\u9a57.,[[DARK_AQUA]]\u5c0f\u6280\u5de7:,[[GOLD]] - [[GREEN]]\u8f38\u5165 [[RED]]/mcmmo help[[GREEN]] \u4ee5\u4e86\u89e3\u6240\u6709\u6307\u4ee4,[[GOLD]] - [[GREEN]]\u8f38\u5165 [[RED]]/\u6280\u80fd\u540d\u7a31 [[GREEN]]\u4ee5\u4e86\u89e3\u6280\u80fd\u7d30\u7bc0,[[DARK_AQUA]]\u958b\u767c\u8005:,[[GOLD]] - [[GREEN]]com.gmail.nossr50 [[BLUE]](\u8d0a\u52a9\u8005),[[GOLD]] - [[GREEN]]GJ [[BLUE]](\u5c08\u6848\u9818\u5c0e\u4eba),[[GOLD]] - [[GREEN]]NuclearW [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]bm01 [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]TfT_02 [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]Glitchfinder [[BLUE]](\u958b\u767c\u8005),[[GOLD]] - [[GREEN]]t00thpick1 [[BLUE]](\u958b\u767c\u8005),[[DARK_AQUA]]\u5be6\u7528\u9023\u7d50:,[[GOLD]] - [[GREEN]]https://github.com/mcMMO-Dev/mcMMO/issues[[GOLD]] \u932f\u8aa4\u56de\u5831,[[GOLD]] - [[GREEN]]#mcmmo @ irc.esper.net[[GOLD]] IRC \u983b\u9053, Commands.addlevels.AwardAll.1=[[GREEN]]\u5728\u5168\u90e8\u7684\u6280\u80fd\u88e1\u4f60\u9084\u5dee {0} \u7b49\u7d1a! Commands.addlevels.AwardAll.2=\u6240\u6709\u6280\u80fd\u7b49\u7d1a\u5df2\u88ab\u8a2d\u5b9a\u70ba {0}. Commands.addlevels.AwardSkill.1=[[GREEN]]{1}\u6280\u80fd\u5df2\u589e\u52a0{0}\u7b49! diff --git a/src/main/resources/mods/armor.default.yml b/mcMMO-core/src/main/resources/mods/armor.default.yml similarity index 100% rename from src/main/resources/mods/armor.default.yml rename to mcMMO-core/src/main/resources/mods/armor.default.yml diff --git a/src/main/resources/mods/blocks.default.yml b/mcMMO-core/src/main/resources/mods/blocks.default.yml similarity index 100% rename from src/main/resources/mods/blocks.default.yml rename to mcMMO-core/src/main/resources/mods/blocks.default.yml diff --git a/src/main/resources/mods/entities.default.yml b/mcMMO-core/src/main/resources/mods/entities.default.yml similarity index 100% rename from src/main/resources/mods/entities.default.yml rename to mcMMO-core/src/main/resources/mods/entities.default.yml diff --git a/src/main/resources/mods/tools.default.yml b/mcMMO-core/src/main/resources/mods/tools.default.yml similarity index 100% rename from src/main/resources/mods/tools.default.yml rename to mcMMO-core/src/main/resources/mods/tools.default.yml diff --git a/src/main/resources/plugin.yml b/mcMMO-core/src/main/resources/plugin.yml similarity index 99% rename from src/main/resources/plugin.yml rename to mcMMO-core/src/main/resources/plugin.yml index ad103914b..6777dbdc7 100644 --- a/src/main/resources/plugin.yml +++ b/mcMMO-core/src/main/resources/plugin.yml @@ -10,10 +10,10 @@ description: > an ever-evolving experience, and that we carefully read all feedback and bug reports in order to evaluate and balance the mechanics of mcMMO in every update. -author: nossr50 +author: com.gmail.nossr50 authors: [GJ, NuclearW, bm01, Glitchfinder, TfT_02, t00thpick1, Riking] website: https://www.mcmmo.org -main: com.gmail.nossr50.mcMMO +main: mcMMO softdepend: [WorldGuard, CombatTag, HealthBar] load: STARTUP api-version: 1.13 diff --git a/src/main/resources/potions.yml b/mcMMO-core/src/main/resources/potions.yml similarity index 100% rename from src/main/resources/potions.yml rename to mcMMO-core/src/main/resources/potions.yml diff --git a/src/main/resources/repair.vanilla.yml b/mcMMO-core/src/main/resources/repair.vanilla.yml similarity index 100% rename from src/main/resources/repair.vanilla.yml rename to mcMMO-core/src/main/resources/repair.vanilla.yml diff --git a/src/main/resources/salvage.vanilla.yml b/mcMMO-core/src/main/resources/salvage.vanilla.yml similarity index 100% rename from src/main/resources/salvage.vanilla.yml rename to mcMMO-core/src/main/resources/salvage.vanilla.yml diff --git a/src/main/resources/skillranks.yml b/mcMMO-core/src/main/resources/skillranks.yml similarity index 100% rename from src/main/resources/skillranks.yml rename to mcMMO-core/src/main/resources/skillranks.yml diff --git a/src/main/resources/sounds.yml b/mcMMO-core/src/main/resources/sounds.yml similarity index 100% rename from src/main/resources/sounds.yml rename to mcMMO-core/src/main/resources/sounds.yml diff --git a/src/main/resources/treasures.yml b/mcMMO-core/src/main/resources/treasures.yml old mode 100755 new mode 100644 similarity index 100% rename from src/main/resources/treasures.yml rename to mcMMO-core/src/main/resources/treasures.yml diff --git a/src/main/resources/upgrades.yml b/mcMMO-core/src/main/resources/upgrades.yml similarity index 100% rename from src/main/resources/upgrades.yml rename to mcMMO-core/src/main/resources/upgrades.yml diff --git a/pom.xml b/pom.xml deleted file mode 100755 index dcb2f6b34..000000000 --- a/pom.xml +++ /dev/null @@ -1,205 +0,0 @@ - - 4.0.0 - com.gmail.nossr50.mcMMO - mcMMO - 2.2.0-SNAPSHOT - mcMMO - https://github.com/mcMMO-Dev/mcMMO - - https://github.com/mcMMO-Dev/mcMMO - scm:git:git://github.com/mcMMO-Dev/mcMMO.git - scm:git:git@github.com:mcMMO-Dev/mcMMO.git - HEAD - - - https://github.com/mcMMO-Dev/mcMMO/issues - GitHub - - jar - - ${project.artifactId} - ${basedir}/src/main/java - - - . - true - ${basedir}/src/main/resources/ - - *.yml - .jenkins - - - - com/gmail/nossr50/locale - true - ${basedir}/src/main/resources/locale/ - - locale*.properties - - - - mods - true - ${basedir}/src/main/resources/mods - - *.yml - - - - . - true - ${basedir} - - LICENSE - - - - - - org.apache.maven.plugins - maven-release-plugin - 2.5.2 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.8 - 1.8 - - - - - - maven-assembly-plugin - - - src/main/assembly/package.xml - - - - - build - package - - single - - - - - - org.apache.maven.plugins - maven-shade-plugin - 3.1.1 - - - - commons-logging:commons-logging - org.apache.tomcat:tomcat-jdbc - org.apache.tomcat:tomcat-juli - org.bstats:bstats-bukkit - - - - - org.apache.commons.logging - com.gmail.nossr50.commons.logging - - - org.apache.juli - com.gmail.nossr50.database.tomcat.juli - - - org.apache.tomcat - com.gmail.nossr50.database.tomcat - - - org.bstats - com.gmail.nossr50.metrics.bstat - - - - - - package - - shade - - - - - - - - org.apache.maven.wagon - wagon-file - 2.2 - - - - - - spigot-repo - https://hub.spigotmc.org/nexus/content/repositories/snapshots/ - - - CodeMC - https://repo.codemc.org/repository/maven-public - - - sk89q-repo - http://maven.sk89q.com/repo/ - - - - - org.apache.maven.scm - maven-scm-provider-gitexe - 1.8.1 - - - org.bstats - bstats-bukkit - 1.4 - compile - - - org.spigotmc - spigot-api - 1.13.2-R0.1-SNAPSHOT - provided - - - com.sk89q.worldguard - worldguard-core - 7.0.0-SNAPSHOT - - - com.sk89q.worldguard - worldguard-legacy - 7.0.0-SNAPSHOT - - - org.bukkit - bukkit - - - - - junit - junit-dep - 4.10 - test - - - org.apache.tomcat - tomcat-jdbc - 7.0.52 - compile - - - - UTF-8 - - diff --git a/src/main/assembly/package.xml b/src/main/assembly/package.xml deleted file mode 100644 index 465536829..000000000 --- a/src/main/assembly/package.xml +++ /dev/null @@ -1,14 +0,0 @@ - - bin - false - - zip - - - - ${project.build.directory}/${artifactId}.jar - / - mcMMO.jar - - - \ No newline at end of file diff --git a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java b/src/main/java/com/gmail/nossr50/skills/mining/Mining.java deleted file mode 100644 index 91e5d156e..000000000 --- a/src/main/java/com/gmail/nossr50/skills/mining/Mining.java +++ /dev/null @@ -1,167 +0,0 @@ -package com.gmail.nossr50.skills.mining; - -import com.gmail.nossr50.config.experience.ExperienceConfig; -import com.gmail.nossr50.datatypes.skills.PrimarySkillType; -import com.gmail.nossr50.mcMMO; -import com.gmail.nossr50.util.Misc; -import org.bukkit.Material; -import org.bukkit.block.BlockState; -import org.bukkit.inventory.ItemStack; - -public class Mining { - - /** - * Calculate XP gain for Mining. - * - * @param blockState The {@link BlockState} to check ability activation for - */ - public static int getBlockXp(BlockState blockState) { - int xp = ExperienceConfig.getInstance().getXp(PrimarySkillType.MINING, blockState.getType()); - - if (xp == 0 && mcMMO.getModManager().isCustomMiningBlock(blockState)) { - xp = mcMMO.getModManager().getBlock(blockState).getXpGain(); - } - - return xp; - } - - /** - * Handle double drops when using Silk Touch. - * - * @param blockState The {@link BlockState} to check ability activation for - */ - protected static void handleSilkTouchDrops(BlockState blockState) { - Material blockType = blockState.getType(); - - switch (blockType) { - case END_STONE: - case TERRACOTTA: - case CLAY: - case IRON_ORE: - case MOSSY_COBBLESTONE: - case NETHERRACK: - case OBSIDIAN: - case SANDSTONE: - case BLACK_GLAZED_TERRACOTTA: - case BLACK_TERRACOTTA: - case BLUE_GLAZED_TERRACOTTA: - case BLUE_TERRACOTTA: - case BROWN_GLAZED_TERRACOTTA: - case BROWN_TERRACOTTA: - case CYAN_GLAZED_TERRACOTTA: - case CYAN_TERRACOTTA: - case GRAY_GLAZED_TERRACOTTA: - case GRAY_TERRACOTTA: - case GREEN_GLAZED_TERRACOTTA: - case GREEN_TERRACOTTA: - case LIGHT_BLUE_GLAZED_TERRACOTTA: - case LIGHT_BLUE_TERRACOTTA: - case LIGHT_GRAY_GLAZED_TERRACOTTA: - case LIGHT_GRAY_TERRACOTTA: - case LIME_GLAZED_TERRACOTTA: - case LIME_TERRACOTTA: - case MAGENTA_GLAZED_TERRACOTTA: - case MAGENTA_TERRACOTTA: - case ORANGE_GLAZED_TERRACOTTA: - case ORANGE_TERRACOTTA: - case PINK_GLAZED_TERRACOTTA: - case PINK_TERRACOTTA: - case PURPLE_GLAZED_TERRACOTTA: - case PURPLE_TERRACOTTA: - case RED_GLAZED_TERRACOTTA: - case RED_TERRACOTTA: - case WHITE_GLAZED_TERRACOTTA: - case WHITE_TERRACOTTA: - case YELLOW_GLAZED_TERRACOTTA: - case YELLOW_TERRACOTTA: - handleMiningDrops(blockState); - return; - - case COAL_ORE: - case DIAMOND_ORE: - case EMERALD_ORE: - case GLOWSTONE: - case LAPIS_ORE: - case PACKED_ICE: - case NETHER_QUARTZ_ORE: - case REDSTONE_ORE: - case STONE: - case PRISMARINE: - Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); - return; - - default: - if (mcMMO.getModManager().isCustomMiningBlock(blockState)) { - Misc.dropItem(Misc.getBlockCenter(blockState), new ItemStack(blockState.getType())); - } - return; - } - } - - /** - * Handle double drops from Mining & Blast Mining. - * - * @param blockState The {@link BlockState} to check ability activation for - */ - protected static void handleMiningDrops(BlockState blockState) { - switch (blockState.getType()) { - case COAL_ORE: - case DIAMOND_ORE: - case EMERALD_ORE: - case END_STONE: - case GLOWSTONE: - case GOLD_ORE: - case TERRACOTTA: - case IRON_ORE: - case LAPIS_ORE: - case MOSSY_COBBLESTONE: - case NETHERRACK: - case OBSIDIAN: - case PACKED_ICE: - case REDSTONE_ORE: - case SANDSTONE: - case BLACK_GLAZED_TERRACOTTA: - case BLACK_TERRACOTTA: - case BLUE_GLAZED_TERRACOTTA: - case BLUE_TERRACOTTA: - case BROWN_GLAZED_TERRACOTTA: - case BROWN_TERRACOTTA: - case CYAN_GLAZED_TERRACOTTA: - case CYAN_TERRACOTTA: - case GRAY_GLAZED_TERRACOTTA: - case GRAY_TERRACOTTA: - case GREEN_GLAZED_TERRACOTTA: - case GREEN_TERRACOTTA: - case LIGHT_BLUE_GLAZED_TERRACOTTA: - case LIGHT_BLUE_TERRACOTTA: - case LIGHT_GRAY_GLAZED_TERRACOTTA: - case LIGHT_GRAY_TERRACOTTA: - case LIME_GLAZED_TERRACOTTA: - case LIME_TERRACOTTA: - case MAGENTA_GLAZED_TERRACOTTA: - case MAGENTA_TERRACOTTA: - case ORANGE_GLAZED_TERRACOTTA: - case ORANGE_TERRACOTTA: - case PINK_GLAZED_TERRACOTTA: - case PINK_TERRACOTTA: - case PURPLE_GLAZED_TERRACOTTA: - case PURPLE_TERRACOTTA: - case RED_GLAZED_TERRACOTTA: - case RED_TERRACOTTA: - case WHITE_GLAZED_TERRACOTTA: - case WHITE_TERRACOTTA: - case YELLOW_GLAZED_TERRACOTTA: - case YELLOW_TERRACOTTA: - case STONE: - case NETHER_QUARTZ_ORE: - Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops()); - return; - - default: - if (mcMMO.getModManager().isCustomMiningBlock(blockState)) { - Misc.dropItems(Misc.getBlockCenter(blockState), blockState.getBlock().getDrops()); - } - return; - } - } -}