Remove ModPatcher download code. Fix #14

MinimallyCorrect · May 11, 2017 · 4c2a991 · 4c2a991
1 parent 5a6b4ab
commit 4c2a991
Show file tree

Hide file tree

Showing 18 changed files with 465 additions and 558 deletions.
diff --git a/COREMOD.md b/COREMOD.md
@@ -7,7 +7,7 @@ Add the following annotation to your IFMLLoadingPlugin.
 
 Change your IFMLLoadingPlugin's `getSetupClass(data)` method to:
 
-    return me.nallar.modpatcher.ModPatcher.getSetupClass()
+    return me.nallar.modpatcher.api.ModPatcher.getSetupClass()
 
 Load your patch files with ModPatcher in your IFMLLoadingPlugin's injectData method. For example:
 

diff --git a/build.gradle b/build.gradle
@@ -52,7 +52,7 @@ version = mcVersion + '-SNAPSHOT'
 ext.versionWithBuildNumber = project.buildNumber != 0 ? project.version.replace("-SNAPSHOT", "") + "." + project.buildNumber : project.version
 ext.versionPath = "./build/version.txt"
 
-def versionFile = file(versionPath);
+def versionFile = file(versionPath)
 versionFile.getParentFile().mkdir()
 
 minecraft {
@@ -89,7 +89,7 @@ dependencies {
 	compile group: 'me.nallar', name: 'JavaPatcher', version: '1.4', changing: false
 	compile group: 'me.nallar', name: 'Mixin', version: '1.0-SNAPSHOT', changing: true
 	provided group: 'me.nallar', name: 'CachingClassLoader', version: '0.1-SNAPSHOT', changing: true
-	compile 'org.javassist:javassist:3.20.0-GA'
+	compile 'org.javassist:javassist:3.21.0-GA'
 }
 
 if (System.env.GRADLE_USER_HOME) {
@@ -171,7 +171,7 @@ tasks.withType(JavaCompile) {
 	targetCompatibility = 8
 	options.with {
 		encoding = 'UTF-8'
-		compilerArgs << "-Xlint:all" << "-Xlint:-classfile"
+		compilerArgs << "-Xlint:all" << "-Xlint:-classfile" << "-Xlint:-processing"
 	}
 }
 
@@ -185,9 +185,7 @@ def apiJarConfig = {
 		sourceSets.main.allSource
 		sourceSets.main.output
 	} {
-		include 'me/nallar/modpatcher/ModPatcher.*'
-		include 'me/nallar/modpatcher/ModPatcher$Version.*'
-		include 'me/nallar/modpatcher/ModPatcherSetup.*'
+		include 'me/nallar/modpatcher/api/*'
 	}
 }
 

diff --git a/src/main/java/javassist/ClassLoaderPool.java b/src/main/java/javassist/ClassLoaderPool.java
@@ -1,7 +1,7 @@
 package javassist;
 
-import me.nallar.modpatcher.LaunchClassLoaderUtil;
-import me.nallar.modpatcher.PatcherLog;
+import me.nallar.modpatcher.internal.LaunchClassLoaderUtil;
+import me.nallar.modpatcher.internal.PatcherLog;
 
 import java.io.*;
 import java.net.*;