diff --git a/build.gradle b/build.gradle index b1a9480..934c48a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,139 +1,149 @@ -import groovy.json.JsonOutput - -buildscript { - repositories { - jcenter() - maven { url = "http://files.minecraftforge.net/maven" } - } - dependencies { - classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' - } -} -apply plugin: 'net.minecraftforge.gradle.forge' -//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup. - - -version = "0.1.3" -//group = "fr.jackcartersmith.orbsat" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -group = "jackcartersmith" -def archiveGroup = group -archivesBaseName = "OrbitalSatellite" - -sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly. -compileJava { - sourceCompatibility = targetCompatibility = '1.8' -} - -minecraft { - version = "1.12.2-14.23.5.2768" - runDir = "run" - - // the mappings can be changed at any time, and must be in the following format. - // snapshot_YYYYMMDD snapshot are built nightly. - // stable_# stables are built at the discretion of the MCP team. - // Use non-default mappings at your own risk. they may not always work. - // simply re-run your setup task after changing the mappings to update your workspace. - mappings = "stable_39" - //mappings = "snapshot_20171003" - // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. -} - -repositories { - maven { // JEI & Tinkers - name 'DVS1 Maven FS' - url 'http://dvs1.progwml6.com/files/maven' - } - maven { // HWYLA - name "TehNuts WAILA fork" - url "http://tehnut.info/maven" - } - maven { // OpenComputers - name "OpenComputers" - url "http://maven.cil.li/" - } - repositories {//Curseforge maven, in case some other maven goes offline - maven { - name = "CurseForge" - url = "https://minecraft.curseforge.com/api/maven/" - } - } - /*maven { //IC2 - name = "ic2" - url = "http://maven.ic2.player.to/" - }*/ - maven { // Redstone Flux - name 'CoFH Maven' - url "http://maven.covers1624.net/" - } - maven { // Albedo Lights - url 'https://repo.elytradev.com/' - } -} - -dependencies { - // you may put jars on which you depend on in ./libs - // or you may define them like so.. - //compile "some.group:artifact:version:classifier" - //compile "some.group:artifact:version" - - // real examples - //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env - //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env - - // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. - //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, - // except that these dependencies get remapped to your current MCP mappings - //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' - //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' - - // for more info... - // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html - // http://www.gradle.org/docs/current/userguide/dependency_management.html - - compileOnly "mezz.jei:jei_1.12.2:4.10.+" - compileOnly "cofh:RedstoneFlux:1.12-2.+:deobf" - compileOnly "opencomputers:OpenComputers:MC1.12.2:1.7.2.67"//li.cil.oc:OpenComputers:MC1.12.1-1.7.0.+" - compileOnly "mcp.mobius.waila:Hwyla:1.8.20-B35_1.12" - compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+' - compileOnly 'baubles:Baubles:1.12:1.5.2' - deobfCompile "albedo:albedo:0.1.3" - -} - -processResources { - // this will ensure that this task is redone when the versions change. - inputs.property "version", project.version - inputs.property "mcversion", project.minecraft.version - - // replace stuff in mcmod.info, nothing else - from(sourceSets.main.resources.srcDirs) { - include "mcmod.info" - - // replace version and mcversion - expand "version": project.version, "mcversion": "1.12" - } - - // copy everything else, thats not the mcmod.info - from(sourceSets.main.resources.srcDirs) { - exclude "mcmod.info" - } -} - -task signJar(type: SignJar, dependsOn: reobfJar) { - onlyIf { // Skip the task if our secret data isn't available - project.hasProperty('keyStore') - } - dependsOn reobfJar - if (project.hasProperty('keyStore')) { // This needs to be a path to the keystore file - keyStore = project.keyStore - alias = project.keyStoreAlias - storePass = project.keyStorePass - keyPass = project.keyStoreKeyPass - inputFile = jar.archivePath - outputFile = jar.archivePath - } -} - +buildscript { + repositories { + jcenter() + mavenCentral() + mavenLocal() + maven { url = "http://files.minecraftforge.net/maven" } + } + dependencies { + classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT' + classpath "org.jfrog.buildinfo:build-info-extractor-gradle:3.0.1" + } +} + +repositories { + maven { + name = "JEI" + url "http://dvs1.progwml6.com/files/maven" + } + maven { // HWYLA + name "TehNuts WAILA fork" + url "http://tehnut.info/maven" + } + maven { // OpenComputers + name "OpenComputers" + url "http://maven.cil.li/" + } + repositories {//Curseforge maven, in case some other maven goes offline + maven { + name = "CurseForge" + url = "https://minecraft.curseforge.com/api/maven/" + } + } + /*maven { //IC2 + name = "ic2" + url = "http://maven.ic2.player.to/" + }*/ + maven { + name = "CoFH Maven" + url = "http://maven.covers1624.net" + } +} + +apply plugin: 'net.minecraftforge.gradle.forge' + +ext.buildNumber = "0" +if (System.getenv("BUILD_NUMBER") != null) { + buildNumber = System.getenv("BUILD_NUMBER") + +} + +version = "$baseVersion.$buildNumber" +group = "fr.jackcartersmith.orbsat" +archivesBaseName = "OrbitalSatellite-$project.minecraftVersion" + +sourceCompatibility = targetCompatibility = 1.8 +compileJava { + sourceCompatibility = targetCompatibility = 1.8 +} + +minecraft { + version = "$project.minecraftVersion-$project.forgeVersion" + runDir = "eclipse" + + mappings = "stable_39" + //mappings = "snapshot_20171003" + // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable. +} + +dependencies { + // you may put jars on which you depend on in ./libs + // or you may define them like so.. + //compile "some.group:artifact:version:classifier" + //compile "some.group:artifact:version" + + // real examples + //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev' // adds buildcraft to the dev env + //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env + + // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime. + //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // the deobf configurations: 'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided, + // except that these dependencies get remapped to your current MCP mappings + //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev' + //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev' + + // for more info... + // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html + // http://www.gradle.org/docs/current/userguide/dependency_management.html + + compile "mezz.jei:jei_1.12.2:4.10.+:api" + deobfCompile "cofh:RedstoneFlux:1.12-2.1.0.6:universal" + compile "li.cil.oc:OpenComputers:MC1.12.2-1.7.+:api" + compile "mcp.mobius.waila:Hwyla:1.8.26-B41_1.12.2:api" + //compileOnly 'industrial-craft:industrialcraft-2:release:ex112'//'net.industrial-craft:industrialcraft-2:2.8.+' + //compileOnly 'baubles:Baubles:1.12:1.5.2' +} + +task signJar(type: SignJar, dependsOn: reobfJar) { + onlyIf { // Skip the task if our secret data isn't available + project.hasProperty('keyStore') + } + dependsOn reobfJar + if (project.hasProperty('keyStore')) { // This needs to be a path to the keystore file + keyStore = project.keyStore + alias = project.keyStoreAlias + storePass = project.keyStorePass + keyPass = project.keyStoreKeyPass + inputFile = jar.archivePath + outputFile = jar.archivePath + } +} +build.dependsOn signJar + +processResources { + // this will ensure that this task is redone when the versions change. + inputs.property "version", project.version + inputs.property "mcversion", project.minecraft.version + + // replace stuff in mcmod.info, nothing else + from(sourceSets.main.resources.srcDirs) { + include "mcmod.info" + + // replace version and mcversion + expand "version": project.version, "mcversion": "1.12.2" + } + + // copy everything else, thats not the mcmod.info + from(sourceSets.main.resources.srcDirs) { + exclude "mcmod.info" + } +} + +task signJar(type: SignJar, dependsOn: reobfJar) { + onlyIf { // Skip the task if our secret data isn't available + project.hasProperty('keyStore') + } + dependsOn reobfJar + if (project.hasProperty('keyStore')) { // This needs to be a path to the keystore file + keyStore = project.keyStore + alias = project.keyStoreAlias + storePass = project.keyStorePass + keyPass = project.keyStoreKeyPass + inputFile = jar.archivePath + outputFile = jar.archivePath + } +} + build.dependsOn signJar \ No newline at end of file diff --git a/src/main/java/jackcartersmith/orbsat/OrbitalSatellite.java b/src/main/java/jackcartersmith/orbsat/OrbitalSatellite.java index 20a3cac..2bd6413 100644 --- a/src/main/java/jackcartersmith/orbsat/OrbitalSatellite.java +++ b/src/main/java/jackcartersmith/orbsat/OrbitalSatellite.java @@ -30,7 +30,7 @@ import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper; import net.minecraftforge.fml.relauncher.Side; @Mod(modid = OrbitalSatellite.MODID, name = OrbitalSatellite.NAME, version = OrbitalSatellite.VERSION, modLanguage = "java", - certificateFingerprint = "3ce4f2265ef35e83d8d32f87fa6394a56e9b0e49", dependencies = "required-after:forge@[14.23.5.2768,)") +certificateFingerprint = "30f9f06606e9ab799c59ec743cab264c8310531d", dependencies = "required-after:forge@[14.23.5.2838,)") public class OrbitalSatellite { public static final String MODID = "orbsat"; public static final String NAME = "Orbital Satellite"; diff --git a/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java b/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java index 8071183..22eba51 100644 --- a/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java +++ b/src/main/java/jackcartersmith/orbsat/common/compat/OrbsatCompatModule.java @@ -18,7 +18,6 @@ public abstract class OrbsatCompatModule { static { - moduleClasses.put("albedo", AlbedoHelper.class); //moduleClasses.put("baubles", BaublesHelper.class); //moduleClasses.put("opencomputers", OCHelper.class); moduleClasses.put("waila", WailaHelper.class);