diff --git a/common/build.gradle b/common/build.gradle index 2def9c0..01e10d2 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -26,6 +26,8 @@ final File buildConfigSrc = new File(buildDir, static void generateBuildConfig0(File buildConfigSrc, Project project) { buildConfigSrc.getParentFile().mkdirs() + final String FOXLOADER_TRANSFORMER_VERSION = + project['foxloader.lastReIndevTransformerChanges'] final String FOXLOADER_VERSION = project['foxloader.version'] final String SPARK_DEPENDENCY = project['spark.dependency'] final String REINDEV_VERSION = project['reindev.version'] @@ -39,6 +41,9 @@ static void generateBuildConfig0(File buildConfigSrc, Project project) { printStream.println() printStream.println("public final class BuildConfig {") printStream.println(" private BuildConfig() {}") + printStream.println( // We don't want devs to patch + decompile every update + " public static final String FOXLOADER_TRANSFORMER_VERSION = \"" + + FOXLOADER_TRANSFORMER_VERSION + "\";") printStream.println(" public static final String FOXLOADER_VERSION = \"" + FOXLOADER_VERSION + "\";") printStream.println(" public static final String SPARK_DEPENDENCY = \"" + SPARK_DEPENDENCY + "\";") printStream.println(" public static final String REINDEV_VERSION = \"" + REINDEV_VERSION + "\";") diff --git a/common/src/main/java/com/fox2code/foxloader/loader/PreLoader.java b/common/src/main/java/com/fox2code/foxloader/loader/PreLoader.java index e7bbc8d..5aa91d0 100644 --- a/common/src/main/java/com/fox2code/foxloader/loader/PreLoader.java +++ b/common/src/main/java/com/fox2code/foxloader/loader/PreLoader.java @@ -83,6 +83,7 @@ static void addCoreMod(File coreMod) { throw new RuntimeException(e); } FoxLauncher.getFoxClassLoader().addCoreModURL(url); + FoxLauncher.getFoxClassLoader().addURL(url); } static void initializePrePatch(boolean client) { diff --git a/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy b/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy index d588264..3b83799 100644 --- a/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy +++ b/dev/src/main/groovy/com/fox2code/foxloader/dev/GradlePlugin.groovy @@ -217,7 +217,8 @@ class GradlePlugin implements Plugin { sideName + "-" + version + ".pom") injectPom(pom, "net.silveros", sideName, version) DependencyHelper.loadDevDependencies(foxLoaderCache, client) - final String versionFox = version + "-rfl_" + BuildConfig.FOXLOADER_VERSION + final String versionFox = version + "-rfl_" + + BuildConfig.FOXLOADER_TRANSFORMER_VERSION File jarFox = new File(foxLoaderCache, "net/silveros/" + sideName + "/" + versionFox + "/" + sideName + "-" + versionFox + ".jar") diff --git a/final/build.gradle b/final/build.gradle index f84eebc..94c84ae 100644 --- a/final/build.gradle +++ b/final/build.gradle @@ -29,6 +29,8 @@ jar { manifest { attributes 'Main-Class': 'com.fox2code.foxloader.installer.Main' + attributes 'FoxLoader-Transformer-Version': + project['foxloader.lastReIndevTransformerChanges'] attributes 'FoxLoader-Version': project['foxloader.version'] attributes 'ReIndev-Version': project['reindev.version'] } diff --git a/gradle.properties b/gradle.properties index 49506aa..11260e3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,8 @@ org.gradle.parallel=true org.gradle.jvmargs=-Xmx1024m -XX:-UseGCOverheadLimit -Dfile.encoding=UTF-8 # FoxLoader properties -foxloader.version=0.1.6 +foxloader.version=0.1.7 +foxloader.lastReIndevTransformerChanges=0.1.6 # ReIndev properties reindev.clientUrl=https://cdn.fox2code.com/files/reindev_2.8_patched.jar