Now using LibLoader instead of bundling our dependencies

build.gradle

@@ -5,22 +5,23 @@ buildscript {
 			name = "forge"
 			url = "http://files.minecraftforge.net/maven"
 		}
+		maven {
+			name = "nallar"
+			url = "https://repo.nallar.me/"
+		}
+	}
+	configurations.all {
+		resolutionStrategy.cacheChangingModulesFor 10, 'seconds'
 	}
 	dependencies {
 		classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
+		classpath 'me.nallar.libloader:LibLoaderGradle:0.1-SNAPSHOT'
 	}
 }
+apply plugin: 'me.nallar.libloader.LibLoaderGradle'
 apply plugin: 'net.minecraftforge.gradle.forge'
 apply plugin: 'idea'
 
-configurations {
-	bundledLibs
-	bundledAsFile
-	compile {
-		extendsFrom bundledLibs
-	}
-}
-
 ext.mcVersion = "1.10.2"
 ext.runMcVersion = "1.10.2"
 ext.forgeVersion = "12.18.1.2076"
@@ -49,11 +50,10 @@ configurations.all {
 }
 
 dependencies {
-	bundledLibs 'org.codehaus.jackson:jackson-core-lgpl:1.9.13'
-	bundledLibs 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
-	bundledLibs "me.nallar:ModPatcher:$mcVersion-SNAPSHOT:api"
-	bundledAsFile "me.nallar:ModPatcher:$mcVersion-SNAPSHOT:lib"
-	compile 'org.projectlombok:lombok:1.16.16'
+	libLoader 'org.codehaus.jackson:jackson-core-lgpl:1.9.13'
+	libLoader 'org.codehaus.jackson:jackson-mapper-lgpl:1.9.13'
+	libLoader "me.nallar:ModPatcher:$mcVersion-SNAPSHOT"
+	compileOnly 'org.projectlombok:lombok:1.16.16'
 }
 
 tasks.withType(JavaCompile) {
@@ -88,16 +88,11 @@ processResources {
 }
 
 jar {
-	from(configurations.bundledLibs.collect { it.isDirectory() ? it : zipTree(it) }) {
-		exclude "META-INF/**"
-	}
-	from(configurations.bundledAsFile.collect { it })
-
 	manifest.mainAttributes("FMLCorePlugin": "nallar.tickprofiler.minecraft.CoreMod", "FMLCorePluginContainsFMLMod": "YasPlease")
 }
 
 wrapper {
-	gradleVersion = "3.2.1"
+	gradleVersion = "3.5"
 	def jvmOpts = "-Xmx2G"
 	inputs.property("jvmOpts", jvmOpts)
 	doLast {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Dec 10 14:26:05 GMT 2016
+#Fri May 12 19:01:27 BST 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-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -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 "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"

gradlew.bat

@@ -49,7 +49,6 @@ goto fail
 @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

src/main/java/nallar/tickprofiler/minecraft/CoreMod.java

@@ -1,17 +1,17 @@
 package nallar.tickprofiler.minecraft;
 
+import me.nallar.libloader.LibLoader;
 import me.nallar.modpatcher.api.ModPatcher;
 import nallar.tickprofiler.Log;
 import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin;
 
 import java.util.*;
 
-
 @IFMLLoadingPlugin.MCVersion("@MC_VERSION@")
-@IFMLLoadingPlugin.SortingIndex(1001)
+@IFMLLoadingPlugin.SortingIndex(-1)
 public class CoreMod implements IFMLLoadingPlugin {
 	static {
-		ModPatcher.requireVersion(CoreMod.class.getResource("/ModPatcher-1.10.2-SNAPSHOT-lib.jar"));
+		LibLoader.init();
 	}
 
 	@Override