Removed everything bbt base setup for 1.13.2

.gitignore

@@ -15,4 +15,4 @@ build
 gradle.properties
 eclipse
 run
-libs
+libs

build.gradle

@@ -1,30 +1,37 @@
 buildscript {
-
-	apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/build.methods"
-	setup()
-
-	repositories {
+    repositories {
+        maven { url = "https://files.minecraftforge.net/maven" }
+		maven { url = "https://plugins.gradle.org/m2/" }
         jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
-        maven { url = "https://plugins.gradle.org/m2/" }
+        mavenCentral()
     }
     dependencies {
-        classpath "net.minecraftforge.gradle:ForgeGradle:${config.forge.gradle}"
-        classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.1.0"
+        classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "3.+", changing: true
+		classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.1.2"
     }
 }
 
-apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/build.methods"
 apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/git.methods"
-setup()
-info()
 
-apply plugin: "net.minecraftforge.gradle.forge"
+apply plugin: "net.minecraftforge.gradle"
+apply plugin: "eclipse"
 apply plugin: "com.matthewprenger.cursegradle"
 apply plugin: "maven"
 
 repositories {
-	maven { url = "https://repo.u-team.info" }
+    maven { url = "https://repo.u-team.info" }
+}
+
+loadConfig()
+
+def loadConfig() {
+	ext.buildProps = file "build.properties"
+
+	buildProps.withReader {
+		def prop = new Properties()
+		prop.load(it)
+		ext.config = new ConfigSlurper().parse prop
+	}
 }
 
 getBuildNumber()
@@ -43,63 +50,75 @@ def getAppendix() {
 
 sourceCompatibility = targetCompatibility = "1.8"
 
-compileJava {
-    sourceCompatibility = targetCompatibility = "1.8"
-}
-
 minecraft {
-    version = config.forge.version
-    runDir = "run"
-    mappings = config.forge.mapping
-    makeObfSourceJar = false
-
-	replace '${version}', project.version
-	replace '${mcversion}', project.minecraft.version
-	replaceIn "info/u_team/music_player/MusicPlayerConstants.java"
+    mappings channel: config.forge.mapping_channel, version: config.forge.mapping
+    runs {
+        client = {
+            workingDirectory project.file("run/client").canonicalPath
+            mods {
+                usefulbackpacks {
+                    source sourceSets.main
+				}
+			}
+        }
+        server = {
+            workingDirectory project.file("run/server").canonicalPath
+            mods {
+                usefulbackpacks {
+                    source sourceSets.main
+				}
+			}
+        }
+    }
 }
 
 def normalManifest = {
 	attributes(
+		"Specification-Title": config.mod.name,
+        "Specification-Vendor": "Team UTeam",
+        "Specification-Version": "25.0",
+		"Built-On": config.forge.mcversion,
 		"Implementation-Title": config.mod.name,
     	"Implementation-Version": project.version,
-		"Built-On": minecraft.version
+		"Implementation-Vendor": "Team UTeam",
+        "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
 	)
 }
 
 jar {
 	classifier = ""
 
     from "LICENSE"
-    from "LICENSE-DEPENDENCIES"
-    
-    jar.dependsOn ":musicplayer-lavaplayer-api:build"
+	from "LICENSE-DEPENDENCIES"
+	
+	jar.dependsOn ":musicplayer-lavaplayer-api:build"
     jar.dependsOn ":musicplayer-lavaplayer:build"
 
 	from "musicplayer-lavaplayer-api/build/classes/java/main"
 
     into ("dependencies") {
 		from "musicplayer-lavaplayer/build/libs/musicplayer-lavaplayer.jar"	
 	}
-
-    manifest normalManifest
+       
+   	manifest normalManifest
 }
 
 task deobfJar(type: Jar) {
 	classifier = "dev"
 
     from sourceSets.main.output
     from "LICENSE"
-    from "LICENSE-DEPENDENCIES"
-    
-    jar.dependsOn ":musicplayer-lavaplayer-api:build"
+	from "LICENSE-DEPENDENCIES"
+	
+	jar.dependsOn ":musicplayer-lavaplayer-api:build"
     jar.dependsOn ":musicplayer-lavaplayer:build"
 
 	from "musicplayer-lavaplayer-api/build/classes/java/main"
 
     into ("dependencies") {
 		from "musicplayer-lavaplayer/build/libs/musicplayer-lavaplayer.jar"	
 	}
-                
+
     manifest normalManifest
 }
 
@@ -131,33 +150,20 @@ artifacts {
 }
 
 sourceSets {
-   	main {
+	main {
 		java
 		resources
-   	}
+	}
 }
 
 dependencies {
-	compile "info.u-team:u_team_core-${minecraft.version}:${config.uteamcore.version}:dev"
+    minecraft "net.minecraftforge:forge:$config.forge.version"
+	compile "info.u-team:u_team_core-${config.forge.mcversion}:${config.uteamcore.version}:dev"
 	compile project(":musicplayer-lavaplayer-api")
 }
 
-processResources {
-    inputs.property "version", project.version
-    inputs.property "mcversion", project.minecraft.version
-
-    from(sourceSets.main.resources.srcDirs) {
-        include "mcmod.info"               
-        expand "version":project.version, "mcversion":project.minecraft.version
-    }
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "mcmod.info"
-    }
-}
-
 compileJava {
     options.encoding = "UTF-8"
-    options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
 }
 
 curseforge {
@@ -169,16 +175,22 @@ curseforge {
     	id = config.curse.id
     	releaseType = config.curse.type
 
+		addGameVersion config.forge.mcversion
+
+		options {
+		    forgeGradleIntegration = false
+		}
+
 		relations {
       		requiredDependency "u-team-core"
     	}
-		
+
     	mainArtifact(jar) {
-      		displayName = "${config.curse.display}-${minecraft.version}-${version}"
+      		displayName = "${config.curse.display}-${config.forge.mcversion}-${project.version}"
     	}
 
     	addArtifact(deobfJar) {
-    		displayName = "${config.curse.display}-${minecraft.version}-${version}-dev"
+    		displayName = "${config.curse.display}-${config.forge.mcversion}-${project.version}-dev"
     		changelog = "Mappings: " + config.forge.mapping
     	}
   	}
@@ -233,10 +245,11 @@ uploadArchives {
 }
 
 task uploadBoth {
+	tasks.uploadBoth.dependsOn build
 	tasks.uploadBoth.dependsOn uploadArchives
 	tasks.uploadBoth.dependsOn "curseforge${config.curse.id}"
 	tasks.uploadBoth.dependsOn setBuildNumber
 	doLast {
 		println "Published both"
 	}
-}
+}

build.properties

@@ -1,5 +1,8 @@
 #Forge Settings
-forge.mcversion=1.12.2
+forge.mcversion=1.13.2
+forge.mapping=43-1.13
+forge.mapping_channel=stable
+forge.version=1.13.2-25.0.76
 
 #Mod Settings
 mod.version=1.2.0
@@ -12,7 +15,6 @@ curse.id=294574
 curse.type=release
 curse.display=Music-Player
 
-
 #Dependencies
 	#UTeamCore
-	uteamcore.version=2.0.0.81
+	uteamcore.version=2.3.2.102

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,25 +1,43 @@
-#!/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"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# 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\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,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
@@ -114,6 +113,7 @@ fi
 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`
@@ -154,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" "$@"