Permalink
Browse files

Split API into it's own jar.

Wasn't going to do this, until I realised the dependency hell it will cause for other plugins.

* Made some events extend Event (accidently missed those...)
* Update Gradle to 3.3

Fixes #151
  • Loading branch information...
dualspiral committed Jan 29, 2017
1 parent 8d4c081 commit 5f3f442ccd76ef48a3ecc03953b368c27d675c4f
Showing with 524 additions and 380 deletions.
  1. +2 −0 .gitignore
  2. +57 −30 build.gradle
  3. BIN gradle/wrapper/gradle-wrapper.jar
  4. +2 −2 gradle/wrapper/gradle-wrapper.properties
  5. +40 −28 gradlew
  6. +4 −10 gradlew.bat
  7. +65 −0 nucleus-api/build.gradle
  8. 0 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/Stable.java
  9. 0 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/CancelMessage.java
  10. 0 ...us-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusChangeNicknameEvent.java
  11. +3 −2 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusHomeEvent.java
  12. 0 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusMailEvent.java
  13. 0 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusMessageEvent.java
  14. +23 −1 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusModuleEvent.java
  15. 0 ...cleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusSendToSpawnEvent.java
  16. +3 −2 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/events/NucleusWarpEvent.java
  17. 0 ...us-api}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/ModulesLoadedException.java
  18. 0 ...nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/NoModuleException.java
  19. 0 ...eus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/NoSuchPlayerException.java
  20. 0 ...leus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/NoSuchWorldException.java
  21. 0 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/NucleusException.java
  22. 0 ...c/main/java/io/github/nucleuspowered/nucleus/api/exceptions/PluginAlreadyRegisteredException.java
  23. 0 ...pi}/src/main/java/io/github/nucleuspowered/nucleus/api/exceptions/UnremovableModuleException.java
  24. +1 −1 .../api/data → nucleus-api/src/main/java/io/github/nucleuspowered/nucleus/api/nucleusdata}/Home.java
  25. +3 −15 ...s/api/data → nucleus-api/src/main/java/io/github/nucleuspowered/nucleus/api/nucleusdata}/Kit.java
  26. +1 −1 ... → nucleus-api/src/main/java/io/github/nucleuspowered/nucleus/api/nucleusdata}/NamedLocation.java
  27. +1 −1 .../api/data → nucleus-api/src/main/java/io/github/nucleuspowered/nucleus/api/nucleusdata}/Warp.java
  28. +1 −1 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusHomeService.java
  29. +1 −1 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusKitService.java
  30. +2 −0 ...s-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusMessageTokenService.java
  31. 0 ...nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusModuleService.java
  32. +101 −0 nucleus-api/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusSeenService.java
  33. +2 −0 ...-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusWarmupManagerService.java
  34. +1 −1 { → nucleus-api}/src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusWarpService.java
  35. +1 −0 settings.gradle
  36. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/NucleusPlugin.java
  37. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/Util.java
  38. +0 −50 src/main/java/io/github/nucleuspowered/nucleus/api/data/seen/SeenInformationProvider.java
  39. +0 −29 src/main/java/io/github/nucleuspowered/nucleus/api/enums/ModuleEnableState.java
  40. +0 −37 src/main/java/io/github/nucleuspowered/nucleus/api/service/NucleusSeenService.java
  41. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/HomeArgument.java
  42. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/JailArgument.java
  43. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/KitArgument.java
  44. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/MailFilterArgument.java
  45. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/NoteArgument.java
  46. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/WarningArgument.java
  47. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/argumentparsers/WarpArgument.java
  48. +19 −1 src/main/java/io/github/nucleuspowered/nucleus/configurate/datatypes/KitDataNode.java
  49. +5 −5 src/main/java/io/github/nucleuspowered/nucleus/configurate/datatypes/UserDataNode.java
  50. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/dataservices/GeneralService.java
  51. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/dataservices/KitService.java
  52. +7 −7 src/main/java/io/github/nucleuspowered/nucleus/dataservices/UserService.java
  53. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/dataservices/WorldService.java
  54. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/dataservices/loaders/UserDataManager.java
  55. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/dataservices/loaders/WorldDataManager.java
  56. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/JailData.java
  57. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/MuteData.java
  58. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/NoteData.java
  59. +2 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/NucleusUser.java
  60. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/NucleusWorld.java
  61. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/WarnData.java
  62. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/interfaces/EndTimestamp.java
  63. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/mail/BetweenInstantsData.java
  64. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/mail/MailData.java
  65. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/data/mail/MailFilter.java
  66. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusBackService.java
  67. +4 −4 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusJailService.java
  68. +4 −4 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusMailService.java
  69. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusMuteService.java
  70. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusNoteService.java
  71. +1 −1 ...in/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusPrivateMessagingService.java
  72. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusUserLoaderService.java
  73. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusWarnService.java
  74. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/service/NucleusWorldLoaderService.java
  75. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/{api → iapi}/util/NucleusIgnorableChatChannel.java
  76. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/internal/LocationData.java
  77. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/internal/migrators/EssCmdsMigrator.java
  78. +0 −1 src/main/java/io/github/nucleuspowered/nucleus/internal/qsml/event/BaseModuleEvent.java
  79. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/internal/qsml/module/StandardModule.java
  80. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/back/BackModule.java
  81. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/back/handlers/BackHandler.java
  82. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/back/listeners/BackListeners.java
  83. +4 −3 src/main/java/io/github/nucleuspowered/nucleus/modules/chat/commands/MeCommand.java
  84. +3 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/chat/listeners/ChatListener.java
  85. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/environment/commands/LockWeatherCommand.java
  86. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/environment/commands/WeatherCommand.java
  87. +1 −1 ...main/java/io/github/nucleuspowered/nucleus/modules/environment/listeners/EnvironmentListener.java
  88. +1 −1 ...main/java/io/github/nucleuspowered/nucleus/modules/freezeplayer/commands/FreezePlayerCommand.java
  89. +1 −1 ...in/java/io/github/nucleuspowered/nucleus/modules/freezeplayer/listeners/FreezePlayerListener.java
  90. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/DeleteHomeCommand.java
  91. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/DeleteOtherHomeCommand.java
  92. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/HomeCommand.java
  93. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/HomeOtherCommand.java
  94. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/ListHomeCommand.java
  95. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/commands/SetHomeCommand.java
  96. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/events/DeleteHomeEvent.java
  97. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/events/ModifyHomeEvent.java
  98. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/events/UseHomeEvent.java
  99. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/home/handlers/HomeHandler.java
  100. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/JailModule.java
  101. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/commands/CheckJailCommand.java
  102. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/commands/JailCommand.java
  103. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/commands/JailsCommand.java
  104. +3 −3 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/handlers/JailHandler.java
  105. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/jail/listeners/JailListener.java
  106. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/kit/commands/KitCommand.java
  107. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/kit/commands/KitGiveCommand.java
  108. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/kit/commands/KitListCommand.java
  109. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/kit/handlers/KitHandler.java
  110. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/mail/MailModule.java
  111. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/mail/commands/MailReadBase.java
  112. +4 −4 src/main/java/io/github/nucleuspowered/nucleus/modules/mail/handlers/MailHandler.java
  113. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/message/MessageModule.java
  114. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/message/handlers/MessageHandler.java
  115. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/misc/listeners/MiscListener.java
  116. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/misc/runnables/GodRunnable.java
  117. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/mute/MuteModule.java
  118. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/mute/commands/CheckMuteCommand.java
  119. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/mute/commands/MuteCommand.java
  120. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/mute/handler/MuteHandler.java
  121. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/mute/listeners/MuteListener.java
  122. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/NoteModule.java
  123. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/commands/CheckNotesCommand.java
  124. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/commands/ClearNotesCommand.java
  125. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/commands/NoteCommand.java
  126. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/commands/RemoveNoteCommand.java
  127. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/note/handlers/NoteHandler.java
  128. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/note/listeners/NoteListener.java
  129. +5 −6 ...uspowered/nucleus/{api/data/seen → modules/playerinfo/handlers}/BasicSeenInformationProvider.java
  130. +18 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/playerinfo/handlers/SeenHandler.java
  131. +4 −3 src/main/java/io/github/nucleuspowered/nucleus/modules/staffchat/StaffChatMessageChannel.java
  132. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/WarnModule.java
  133. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/commands/CheckWarningsCommand.java
  134. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/commands/ClearWarningsCommand.java
  135. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/commands/RemoveWarningCommand.java
  136. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/commands/WarnCommand.java
  137. +2 −2 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/handlers/WarnHandler.java
  138. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warn/listeners/WarnListener.java
  139. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/commands/DeleteWarpCommand.java
  140. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/commands/ListWarpCommand.java
  141. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/commands/SetCategoryCommand.java
  142. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/commands/SetCostCommand.java
  143. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/commands/WarpCommand.java
  144. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/event/DeleteWarpEvent.java
  145. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/event/UseWarpEvent.java
  146. +1 −1 src/main/java/io/github/nucleuspowered/nucleus/modules/warp/handlers/WarpHandler.java
View
@@ -110,3 +110,5 @@ gradle-app.setting
run/
classes/
out/
output/
View
@@ -1,20 +1,42 @@
plugins {
id 'java'
id 'idea'
id 'eclipse'
id 'com.github.hierynomus.license' version '0.12.1'
id 'ninja.miserable.blossom' version '1.0.1'
id 'maven'
id 'com.github.johnrengelman.shadow' version '1.2.3'
id "com.qixalite.spongestart" version "1.4.3"
// id "com.qixalite.spongestart" version "1.4.3"
}
allprojects {
apply plugin: 'java'
def versionno = '0.21.0'
def spongeapiversion = '5.1'
def suffix = '-SNAPSHOT'
version = versionno + '-S' + spongeapiversion + suffix
repositories {
jcenter()
maven {
name 'Sponge maven repo'
url 'http://repo.spongepowered.org/maven'
}
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
archiveName = "Nucleus-${version}-api-javadocs.jar"
}
}
ext.spongeapi = '5.1.0-SNAPSHOT'
description = 'The Ultimate Essentials Plugin.'
ext.url = 'http://nucleuspowered.org'
group 'io.github.nucleuspowered'
version '0.21.0-5.0-SNAPSHOT'
project.ext.spongeapi = '5.1.0-SNAPSHOT'
def mixinversion = '0.15.0-5.0'
def qsmlDep = "uk.co.drnaylor:quickstart-moduleloader:0.4.3"
@@ -46,7 +68,8 @@ repositories {
}
dependencies {
compile "org.spongepowered:spongeapi:5.0.0"
compile project(":nucleus-api")
compile "org.spongepowered:spongeapi:" + project.ext.spongeapi
compile qsmlDep
compile(mixinDep) {
exclude module: 'mixin'
@@ -84,10 +107,6 @@ license {
}
}
spongestart{
eula true
}
blossom {
def location = 'src/main/java/io/github/nucleuspowered/nucleus/PluginInfo.java'
@@ -109,29 +128,9 @@ jar {
}
}
task sourcesJar(type: Jar, dependsOn: classes) {
classifier = 'sources'
from sourceSets.main.allSource
}
task javadocJar(type: Jar, dependsOn: javadoc) {
classifier = 'javadoc'
from javadoc.destinationDir
}
artifacts {
archives sourcesJar
archives javadocJar
}
def private String getGitHash() {
def process = 'git rev-parse --short HEAD'.execute();
process.waitFor();
return process.exitValue() ? 'unknown' : process.text.trim();
}
shadowJar {
dependencies {
include(project(":nucleus-api"))
include(dependency(qsmlDep))
include(dependency(geoIpDep))
include(dependency("com.maxmind.db:maxmind-db"))
@@ -143,5 +142,33 @@ shadowJar {
relocate 'com.maxmind.geoip2', 'io.github.nucleuspowered.relocate.com.maxmind.geoip2'
relocate 'com.maxmind.db', 'io.github.nucleuspowered.relocate.com.maxmind.db'
relocate 'com.fasterxml.jackson', 'io.github.nucleuspowered.relocate.com.fasterxml.jackson'
archiveName = "Nucleus-${version}-plugin.jar"
}
shadowJar.dependsOn(':nucleus-api:build')
task cleanJars() {
project.file('output').listFiles().each {
x -> x.delete()
}
}
task copyJars(type: Copy, dependsOn: ':nucleus-api:build') {
from([subprojects.jar, subprojects.javadocJar, shadowJar])
into project.file('output')
}
artifacts {
archives shadowJar
}
static String getGitHash() {
def process = 'git rev-parse --short HEAD'.execute()
process.waitFor()
return process.exitValue() ? 'unknown' : process.text.trim()
}
clean.dependsOn(cleanJars)
copyJars.mustRunAfter(cleanJars)
build.dependsOn(shadowJar)
build.dependsOn(copyJars)
Binary file not shown.
@@ -1,6 +1,6 @@
#Sat Feb 20 11:14:43 GMT 2016
#Sun Jan 29 17:23:11 GMT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip
View
68 gradlew
@@ -1,17 +1,35 @@
#!/usr/bin/env bash
#!/usr/bin/env sh
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# 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"
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac
# 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
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
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
@@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi
# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
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" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
View
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
@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=
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
@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
goto execute
:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
View
@@ -0,0 +1,65 @@
plugins {
id 'java'
id 'idea'
id 'eclipse'
id 'maven'
}
apply plugin: 'com.github.hierynomus.license'
description = 'The Ultimate Essentials Plugin API.'
ext.url = 'http://nucleuspowered.org'
group 'io.github.nucleuspowered'
defaultTasks 'licenseFormat build'
sourceCompatibility = 1.8
targetCompatibility = 1.8
repositories {
jcenter()
maven {
name 'Sponge maven repo'
url 'http://repo.spongepowered.org/maven'
}
}
dependencies {
compile "org.spongepowered:spongeapi:" + project.getRootProject().ext.spongeapi
}
license {
ext.name = project.getRootProject().name
exclude "**/*.info"
exclude "assets/**"
exclude "*.properties"
exclude "*.txt"
header file('../HEADER.txt')
sourceSets = project.sourceSets
ignoreFailures false
strictCheck true
mapping {
java = 'SLASHSTAR_STYLE'
}
}
jar {
manifest {
attributes 'Implementation-Title': project.name,
'Implementation-Version': project.getRootProject().version,
'SpongeAPI-Version': project.spongeapi,
'Git-Hash': project.getRootProject().getGitHash()
}
archiveName = "Nucleus-${version}-api.jar"
}
artifacts {
archives javadocJar
archives jar
}
@@ -5,9 +5,10 @@
package io.github.nucleuspowered.nucleus.api.events;
import io.github.nucleuspowered.nucleus.api.Stable;
import io.github.nucleuspowered.nucleus.api.data.Home;
import io.github.nucleuspowered.nucleus.api.nucleusdata.Home;
import org.spongepowered.api.entity.living.player.User;
import org.spongepowered.api.event.Cancellable;
import org.spongepowered.api.event.Event;
import org.spongepowered.api.event.user.TargetUserEvent;
import org.spongepowered.api.world.Location;
import org.spongepowered.api.world.World;
@@ -18,7 +19,7 @@
* Events when a player's home changes.
*/
@Stable
public interface NucleusHomeEvent extends Cancellable, CancelMessage {
public interface NucleusHomeEvent extends Cancellable, CancelMessage, Event {
/**
* Gets the name of the home.
Oops, something went wrong.

0 comments on commit 5f3f442

Please sign in to comment.