diff --git a/build.gradle b/build.gradle index d73a8a7..db3cd67 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ -buildscript { - repositories { +buildscript{ + repositories{ mavenCentral() - maven { + maven{ name = "forge" url = "http://files.minecraftforge.net/maven" } - maven { + maven{ name = "sonatype" url = "https://oss.sonatype.org/content/repositories/snapshots/" } } - dependencies { + dependencies{ classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT' } } @@ -18,45 +18,44 @@ buildscript { apply plugin: 'forge' version = "" -group = "chylex.java7check" -archivesBaseName = "Java7Checker MC-1.8+ v1.1" +group = "chylex.javacheck" +archivesBaseName = "Java7Checker MC-1.7.10 v1.1" -minecraft { - version = "1.8-11.14.1.1306" +minecraft{ + version = "1.7.10-10.13.4.1492-1.7.10" assetDir = "eclipse/assets" - mappings = "snapshot_nodoc_20141130" } -jar { - manifest { +jar{ + manifest{ attributes 'FMLCorePlugin': 'chylex.javacheck.Java7CheckerCoremod' } } -task java8Jar(type: Jar, dependsOn: "jar") { +task java8Jar(type: Jar, dependsOn: "jar"){ from sourceSets.main.output - manifest { + manifest{ attributes 'FMLCorePlugin': 'chylex.javacheck.Java8CheckerCoremod' } - baseName = "Java8Checker MC-1.8+ v1.1" + baseName = "Java8Checker MC-1.7.10 v1.1" } -reobf { - reobf java8Jar { classpath -> classpath = configurations.compile } +reobf{ + reobf java8Jar{ classpath -> classpath = configurations.compile } } -processResources { +processResources{ inputs.property "version", project.version inputs.property "mcversion", project.minecraft.version - from(sourceSets.main.resources.srcDirs) { + from(sourceSets.main.resources.srcDirs){ include 'mcmod.info' expand 'version':project.version, 'mcversion':project.minecraft.version } - from(sourceSets.main.resources.srcDirs) { + from(sourceSets.main.resources.srcDirs){ exclude 'mcmod.info' } } \ No newline at end of file diff --git a/src/main/java/chylex/javacheck/Java7CheckerCoremod.java b/src/main/java/chylex/javacheck/Java7CheckerCoremod.java index bb3f00f..96050fb 100644 --- a/src/main/java/chylex/javacheck/Java7CheckerCoremod.java +++ b/src/main/java/chylex/javacheck/Java7CheckerCoremod.java @@ -1,8 +1,8 @@ package chylex.javacheck; import java.util.Map; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import org.apache.commons.lang3.JavaVersion; import chylex.javacheck.report.JavaCheckerReporter; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; public class Java7CheckerCoremod implements IFMLLoadingPlugin{ @Override diff --git a/src/main/java/chylex/javacheck/Java8CheckerCoremod.java b/src/main/java/chylex/javacheck/Java8CheckerCoremod.java index 5f3b9b3..da6ce08 100644 --- a/src/main/java/chylex/javacheck/Java8CheckerCoremod.java +++ b/src/main/java/chylex/javacheck/Java8CheckerCoremod.java @@ -1,8 +1,8 @@ package chylex.javacheck; import java.util.Map; -import net.minecraftforge.fml.relauncher.IFMLLoadingPlugin; import org.apache.commons.lang3.JavaVersion; import chylex.javacheck.report.JavaCheckerReporter; +import cpw.mods.fml.relauncher.IFMLLoadingPlugin; public class Java8CheckerCoremod implements IFMLLoadingPlugin{ @Override diff --git a/src/main/java/chylex/javacheck/report/JavaCheckerReporter.java b/src/main/java/chylex/javacheck/report/JavaCheckerReporter.java index 0a91de4..deebeac 100644 --- a/src/main/java/chylex/javacheck/report/JavaCheckerReporter.java +++ b/src/main/java/chylex/javacheck/report/JavaCheckerReporter.java @@ -1,10 +1,10 @@ package chylex.javacheck.report; import java.util.Map; import javax.swing.JOptionPane; -import net.minecraftforge.fml.relauncher.FMLRelaunchLog; -import net.minecraftforge.fml.relauncher.IFMLCallHook; import org.apache.commons.lang3.JavaVersion; import org.apache.commons.lang3.SystemUtils; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import cpw.mods.fml.relauncher.IFMLCallHook; public final class JavaCheckerReporter implements IFMLCallHook{ public static JavaVersion minVersion = null;