浏览代码

Converting mcMMO to gradle (NOT DONE YET)

nossr50 6 年之前
父节点
当前提交
bbbf6777f9
共有 100 个文件被更改,包括 290 次插入6 次删除
  1. 6 4
      Changelog.txt
  2. 1 1
      README.md
  3. 二进制
      mcMMO-core/.gradle/4.10/fileChanges/last-build.bin
  4. 二进制
      mcMMO-core/.gradle/4.10/fileHashes/fileHashes.bin
  5. 二进制
      mcMMO-core/.gradle/4.10/fileHashes/fileHashes.lock
  6. 0 0
      mcMMO-core/.gradle/4.10/gc.properties
  7. 二进制
      mcMMO-core/.gradle/4.10/taskHistory/taskHistory.bin
  8. 二进制
      mcMMO-core/.gradle/4.10/taskHistory/taskHistory.lock
  9. 二进制
      mcMMO-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock
  10. 2 0
      mcMMO-core/.gradle/buildOutputCleanup/cache.properties
  11. 二进制
      mcMMO-core/.gradle/buildOutputCleanup/outputFiles.bin
  12. 0 0
      mcMMO-core/.gradle/vcs-1/gc.properties
  13. 16 0
      mcMMO-core/build.gradle
  14. 6 0
      mcMMO-core/gradle/wrapper/gradle-wrapper.properties
  15. 172 0
      mcMMO-core/gradlew
  16. 84 0
      mcMMO-core/gradlew.bat
  17. 2 0
      mcMMO-core/settings.gradle
  18. 0 0
      mcMMO-core/src/main/java/META-INF/MANIFEST.MF
  19. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java
  20. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java
  21. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java
  22. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java
  23. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java
  24. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java
  25. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java
  26. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java
  27. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java
  28. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java
  29. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java
  30. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java
  31. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java
  32. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java
  33. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java
  34. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java
  35. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java
  36. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java
  37. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java
  38. 1 1
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java
  39. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java
  40. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java
  41. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java
  42. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java
  43. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java
  44. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java
  45. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java
  46. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java
  47. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java
  48. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java
  49. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java
  50. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java
  51. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java
  52. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java
  53. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java
  54. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java
  55. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java
  56. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java
  57. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java
  58. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java
  59. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java
  60. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java
  61. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java
  62. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java
  63. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java
  64. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java
  65. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java
  66. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java
  67. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java
  68. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java
  69. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java
  70. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java
  71. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java
  72. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java
  73. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java
  74. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java
  75. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java
  76. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java
  77. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java
  78. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java
  79. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java
  80. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java
  81. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java
  82. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java
  83. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java
  84. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java
  85. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java
  86. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java
  87. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java
  88. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java
  89. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java
  90. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java
  91. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java
  92. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java
  93. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java
  94. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java
  95. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java
  96. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java
  97. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java
  98. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java
  99. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java
  100. 0 0
      mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java

+ 6 - 4
Changelog.txt

@@ -9,6 +9,8 @@ Key:
 
 
 Version 2.2.0
 Version 2.2.0
     Salvage config entries are no longer case sensitive
     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
     Fixed a bug where Fishing was not rewarding vanilla XP orbs
 
 
 Version 2.1.11
 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 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 cooldown donor perks were reducing more than expected
  = Fixed bug where disabling hardcore mode for specific skills didn't work
  = 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 party chat broke if the display name contained special characters
  = Fixed bug where `/addlevels all` and `/skillreset all` didn't work
  = 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
  = 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 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 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 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
  ! 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 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.
  ! 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 permission nodes for Treasure & Magic Hunter for Fishing
  + Added a permission node for Farmer's Diet
  + Added a permission node for Farmer's Diet
  + Added config options for enabling/disabling specific double drops
  + 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
  + 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 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
  = 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/
 mcmmo.users file moved into /plugins/mcMMO/FlatFileStuff/
 Leaderboard files now moved into /plugins/mcMMO/FlatFileStuff/Leaderboards
 Leaderboard files now moved into /plugins/mcMMO/FlatFileStuff/Leaderboards
 Locale files now have the prefix locale_ instead of messages_
 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!)
 Updated the code that handles permissions (this may mean 3.1.6 will finally play well!)
 Some more source code organization
 Some more source code organization
 Fixed warnings for compiler
 Fixed warnings for compiler

+ 1 - 1
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.
 mcMMO is currently developed by a team of individuals from all over the world.
 
 
 ### Project Lead & Founder
 ### 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
 ### Former Lead
 [![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)
 [![gmcferrin](http://www.gravatar.com/avatar/b64c52daf25d206b27650788b5813b7b.png)](https://github.com/gmcferrin)

二进制
mcMMO-core/.gradle/4.10/fileChanges/last-build.bin


二进制
mcMMO-core/.gradle/4.10/fileHashes/fileHashes.bin


二进制
mcMMO-core/.gradle/4.10/fileHashes/fileHashes.lock


+ 0 - 0
mcMMO-core/.gradle/4.10/gc.properties


二进制
mcMMO-core/.gradle/4.10/taskHistory/taskHistory.bin


二进制
mcMMO-core/.gradle/4.10/taskHistory/taskHistory.lock


二进制
mcMMO-core/.gradle/buildOutputCleanup/buildOutputCleanup.lock


+ 2 - 0
mcMMO-core/.gradle/buildOutputCleanup/cache.properties

@@ -0,0 +1,2 @@
+#Wed Feb 06 17:16:15 PST 2019
+gradle.version=4.10

二进制
mcMMO-core/.gradle/buildOutputCleanup/outputFiles.bin


+ 0 - 0
mcMMO-core/.gradle/vcs-1/gc.properties


+ 16 - 0
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'
+}

+ 6 - 0
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

+ 172 - 0
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" "$@"

+ 84 - 0
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

+ 2 - 0
mcMMO-core/settings.gradle

@@ -0,0 +1,2 @@
+rootProject.name = 'mcMMO'
+

+ 0 - 0
src/main/java/META-INF/MANIFEST.MF → mcMMO-core/src/main/java/META-INF/MANIFEST.MF


+ 0 - 0
src/main/java/com/gmail/nossr50/api/AbilityAPI.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/AbilityAPI.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/ChatAPI.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/ChatAPI.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/ExperienceAPI.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/ExperienceAPI.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/PartyAPI.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/PartyAPI.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/SkillAPI.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/SkillAPI.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidFormulaTypeException.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidPlayerException.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidSkillException.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/InvalidXPGainReasonException.java


+ 0 - 0
src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java → mcMMO-core/src/main/java/com/gmail/nossr50/api/exceptions/McMMOPlayerNotFoundException.java


+ 0 - 0
src/main/java/com/gmail/nossr50/chat/AdminChatManager.java → mcMMO-core/src/main/java/com/gmail/nossr50/chat/AdminChatManager.java


+ 0 - 0
src/main/java/com/gmail/nossr50/chat/ChatManager.java → mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManager.java


+ 0 - 0
src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java → mcMMO-core/src/main/java/com/gmail/nossr50/chat/ChatManagerFactory.java


+ 0 - 0
src/main/java/com/gmail/nossr50/chat/PartyChatManager.java → mcMMO-core/src/main/java/com/gmail/nossr50/chat/PartyChatManager.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/MHDCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/MHDCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McImportCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McImportCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McabilityCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McabilityCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McconvertCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McconvertCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McgodCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McgodCommand.java


+ 1 - 1
src/main/java/com/gmail/nossr50/commands/McmmoCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McmmoCommand.java

@@ -26,7 +26,7 @@ public class McmmoCommand implements CommandExecutor {
 
 
                 if (Config.getInstance().getDonateMessageEnabled()) {
                 if (Config.getInstance().getDonateMessageEnabled()) {
                     sender.sendMessage(LocaleLoader.getString("MOTD.Donate"));
                     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)) {
                 if (Permissions.showversion(sender)) {

+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McnotifyCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McrefreshCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/McscoreboardCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/ToggleCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/ToggleCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/XprateCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/XprateCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/AdminChatCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/ChatCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/McChatSpy.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/chat/PartyChatCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/ConvertDatabaseCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McpurgeCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/McremoveCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/database/MmoshowdbCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddlevelsCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/AddxpCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ConvertExperienceCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/ExperienceCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/MmoeditCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/experience/SkillresetCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/HardcoreModeCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/hardcore/VampirismCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyAcceptCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangeOwnerCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyChangePasswordCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyCreateCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyDisbandCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyHelpCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInfoCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyInviteCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyItemShareCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyJoinCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyKickCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyLockCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyQuitCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyRenameCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartySubcommandType.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/PartyXpShareCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceAcceptCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceDisbandCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/alliance/PartyAllianceInviteCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptAnyCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpAcceptCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/party/teleport/PtpToggleCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/InspectCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MccooldownCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McrankCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/McstatsCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/player/MctopCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/server/Mcmmoupgrade.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AcrobaticsCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AlchemyCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AprilCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ArcheryCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/AxesCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/ExcavationCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/FishingCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/HerbalismCommand.java


+ 0 - 0
src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java → mcMMO-core/src/main/java/com/gmail/nossr50/commands/skills/MiningCommand.java


部分文件因为文件数量过多而无法显示