First commit

Setup project structure for rewrite, modified gradle dependencies.

build.gradle

@@ -5,20 +5,22 @@ plugins {
     id 'java'
 }
 
+group 'me.iblitzkriegi.vixio'
+version '1.0-SNAPSHOT'
+
+apply plugin: 'java'
+
+sourceCompatibility = 1.8
+
 repositories {
     mavenLocal()
     mavenCentral()
     jcenter()
     maven {
         name 'spigot-repo'
-        url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/'
-    }
-    maven{
-        url 'http://maven.sedmelluq.com'
-    }
+        url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/'}
+    maven{ url 'http://maven.sedmelluq.com'}
 }
-
-
 import org.apache.tools.ant.filters.ReplaceTokens
 
 group = project.property("groupId")
@@ -56,43 +58,23 @@ configurations {
 }
 
 dependencies {
-
-    // Spigot API
-    provided group: 'org.spigotmc', name: 'spigot-api', version: project.property("apiversion")
-
-    // Spigot server
-    serverOnly group: 'org.spigotmc', name: 'spigot', version: project.property("apiversion")
-
-    // Bukkit
-    providedServer group: 'org.bukkit', name: 'bukkit', version: project.property("apiversion")
-
-    // Craftbukkit
-    providedServer group: 'org.bukkit', name: 'craftbukkit', version: project.property("apiversion")
-
-    // JDA
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    compile 'org.spigotmc:spigot-api:1.8.8-R0.1-SNAPSHOT'
     compile 'net.dv8tion:JDA:3.2.0_228'
-
-    // Provided local jars
-    provided fileTree(dir: 'libs/provided', include: '*.jar')
-
-    // Other plugins this depends on
-    plugins fileTree(dir: 'libs/plugins', include: '*.jar')
-
-    // Jars to include in that shaded jar
-    compile fileTree(dir: 'libs/compile', include: '*.jar')
     compile 'com.sedmelluq:lavaplayer:1.2.42'
     compile 'ca.pjer:chatter-bot-api:2.0.1'
     compile 'com.vdurmont:emoji-java:3.1.3'
+    plugins fileTree(dir: 'libs/plugins', include: '*.jar')
 
 
 }
 
 shadowJar {
     classifier = ''
-
     relocate 'org.apache.commons.lang3', project.group + ".org.apache.commons.lang3"
     relocate 'org.apache.http', project.group + ".org.apache.http"
     relocate 'org.apache.commons.io', project.group + ".org.apache.commons.io"
+    archiveName = 'Vixio-1.1.4.jar'
     destinationDir = new File("C:\\Users\\matthew\\Desktop\\VixioSk\\plugins")
 }
 
@@ -108,90 +90,3 @@ processResources {
             "version"   : project.property("version")
     ]
 }
-
-clean {
-    delete "final/"
-    delete "testserver/"
-}
-
-compileJava.dependsOn {
-    buildSpigot
-}
-
-jar {
-    actions = []
-    dependsOn = []
-    dependsOn('shadowJar')
-}
-
-task setupDevServer(dependsOn: 'extractServerJar', type: Copy) {
-    from 'config/serverfiles'
-    into 'testserver'
-}
-
-task extractServerJar(type: Copy) {
-}
-
-task copyPluginsToTestserver(dependsOn: ['build'], type: Copy) {
-    from "${buildDir}/libs"
-    from "/libs/plugins"
-    into "testserver/plugins"
-}
-
-task prepareDevServer(dependsOn: ['buildSpigot', 'setupDevServer', 'copyPluginsToTestserver']) {}
-
-task startDevServer(dependsOn: [prepareDevServer], type: JavaExec) {
-    classpath configurations.serverOnly
-    main = "org.bukkit.craftbukkit.Main"
-    workingDir = "testserver/"
-    standardInput = System.in
-}
-
-// START Building Spigot and Bukkit
-
-def spigotBuildDir = new File("$buildDir/spigot/")
-
-task setupWorkspace(dependsOn: ['buildSpigot']) {}
-
-task buildSpigot(type: Exec) {
-    if (hasSpigot()) {
-        enabled = false;
-    } else {
-        dependsOn 'cleanSpigotBuild', 'downloadBuildTools'
-
-        if (System.getProperty('os.name').toLowerCase().contains('windows')) {
-            commandLine "where git".execute().text.trim().replace('cmd\\git.exe', 'bin\\sh.exe'), '-login', '-c', "java -jar BuildTools.jar --rev " + project.property("apibuildtoolversion")
-        } else {
-            commandLine "java -jar BuildTools.jar --rev " + project.property("apibuildtoolversion")
-        }
-        workingDir = spigotBuildDir
-    }
-}
-
-task downloadBuildTools(type: de.undercouch.gradle.tasks.download.Download) {
-    spigotBuildDir.mkdirs()
-    src project.property("buildtoolurl")
-    dest new File(spigotBuildDir, "BuildTools.jar")
-}
-
-task cleanSpigotBuild() {
-    doLast {
-        spigotBuildDir.deleteDir()
-    }
-}
-
-def hasSpigot() {
-    def groupId = "org.spigotmc"
-    def version = project.property("apiversion")
-    return hasArtifact(groupId, "spigot-api", version) && hasArtifact(groupId, "spigot", version)
-}
-
-def hasArtifact(groupId, artifactId, version) {
-    def localMavenRepo = new File(new File(ant.properties['user.home'] as String), ".m2/repository/")
-    def file = new File(localMavenRepo, groupId.replace('.', '/') + "/" + artifactId + "/" + version + "/")
-    return file.exists()
-}
-
-wrapper {
-    gradleVersion = '3.2.1'
-}

gradle.properties

@@ -1 +1,6 @@
-groupId=me.iblitzkriegi.vixioname=VixiomainClass=me.iblitzkriegi.vixio.Vixioversion=1.1.4apiversion=1.8.8-R0.1-SNAPSHOTapibuildtoolversion=1.8.8sourceversion=1.8buildtoolurl=https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar
+groupId=me.iblitzkriegi.vixio
+name=Vixio
+mainClass=me.iblitzkriegi.vixio.Vixio
+version=1.1.4
+apiversion=1.8.8-R0.1-SNAPSHOT
+sourceversion=1.8

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Feb 11 13:53:38 EST 2017
+#Sat Jul 22 11:11:02 EDT 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -154,16 +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
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
   cd "$(dirname "$0")"
 fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

settings.gradle

@@ -1 +1,2 @@
-rootProject.name = 'Vixio'
+rootProject.name = 'Vixio'
+