mirror of
https://github.com/MightyPirates/OpenComputers.git
synced 2025-09-08 06:41:23 -04:00
Updated to ForgeGradle 2 and latest Forge, adjusted build scripts.
Let's see if this works...
This commit is contained in:
parent
189ccdf4f9
commit
951e8b6180
50
build.gradle
50
build.gradle
@ -1,22 +1,19 @@
|
||||
// For those who want the bleeding edge
|
||||
buildscript {
|
||||
repositories {
|
||||
mavenCentral()
|
||||
jcenter()
|
||||
maven {
|
||||
name = "forge"
|
||||
url = "http://files.minecraftforge.net/maven"
|
||||
}
|
||||
maven {
|
||||
name = "sonatype"
|
||||
url = "https://oss.sonatype.org/content/repositories/snapshots/"
|
||||
}
|
||||
}
|
||||
dependencies {
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
|
||||
classpath 'net.minecraftforge.gradle:ForgeGradle:2.0-SNAPSHOT'
|
||||
}
|
||||
}
|
||||
|
||||
apply plugin: 'scala'
|
||||
apply plugin: 'forge'
|
||||
apply plugin: 'net.minecraftforge.gradle.forge'
|
||||
apply plugin: 'idea'
|
||||
apply plugin: 'maven-publish'
|
||||
|
||||
@ -189,7 +186,7 @@ dependencies {
|
||||
provided "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
|
||||
provided "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
|
||||
provided "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
|
||||
provided "mcp.mobius.waila:Waila:${config.waila.version}:dev"
|
||||
provided "mcp.mobius.waila:Waila:${config.waila.version}"
|
||||
/*
|
||||
provided "appeng:RotaryCraft:${config.rotc.version}:api"
|
||||
provided ("appeng:appliedenergistics2:${config.ae2.version}:dev") {
|
||||
@ -292,56 +289,33 @@ processResources {
|
||||
expand 'version': project.simpleVersion, 'mcversion': config.minecraft.version
|
||||
}
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
include 'application.conf'
|
||||
exclude 'mcmod.info'
|
||||
filter { line ->
|
||||
line.replaceAll("@VERSION@", project.simpleVersion)
|
||||
}
|
||||
}
|
||||
from(sourceSets.main.resources.srcDirs) {
|
||||
exclude 'mcmod.info'
|
||||
exclude 'application.conf'
|
||||
}
|
||||
|
||||
// Move access transformer to META-INF
|
||||
rename '(.+_at.cfg)', 'META-INF/$1'
|
||||
}
|
||||
|
||||
def commonManifest = {
|
||||
attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader"
|
||||
attributes FMLCorePluginContainsFMLMod: "true"
|
||||
attributes FMLAT: "oc_at.cfg"
|
||||
}
|
||||
|
||||
jar {
|
||||
exclude "cofh/**"
|
||||
exclude "mods/**"
|
||||
configurations.embedded.each { dep ->
|
||||
from(project.zipTree(dep)) {
|
||||
exclude 'META-INF', 'META-INF/**'
|
||||
}
|
||||
}
|
||||
classifier = 'universal'
|
||||
manifest commonManifest
|
||||
manifest {
|
||||
attributes FMLCorePlugin: "li.cil.oc.common.launch.TransformerLoader"
|
||||
attributes FMLCorePluginContainsFMLMod: "true"
|
||||
attributes FMLAT: "oc_at.cfg"
|
||||
}
|
||||
}
|
||||
|
||||
javadoc {
|
||||
include 'li/cil/oc/api/**'
|
||||
}
|
||||
|
||||
// because the normal default jar task has been modified to be obfuscated
|
||||
task deobfJar(type: Jar) {
|
||||
from sourceSets.main.output
|
||||
exclude "cofh/**"
|
||||
exclude "mods/**"
|
||||
configurations.embedded.each { dep ->
|
||||
from(project.zipTree(dep)) {
|
||||
exclude 'META-INF', 'META-INF/**'
|
||||
}
|
||||
}
|
||||
classifier = 'dev'
|
||||
manifest commonManifest
|
||||
}
|
||||
|
||||
task apiJar(type: Jar) {
|
||||
from sourceSets.main.output
|
||||
from sourceSets.main.java
|
||||
@ -361,7 +335,6 @@ task sourcesJar(type: Jar) {
|
||||
}
|
||||
|
||||
artifacts {
|
||||
archives deobfJar
|
||||
archives apiJar
|
||||
archives javadocJar
|
||||
archives sourcesJar
|
||||
@ -374,7 +347,6 @@ publishing {
|
||||
artifact apiJar
|
||||
artifact javadocJar
|
||||
artifact sourcesJar
|
||||
artifact deobfJar { classifier 'dev' }
|
||||
}
|
||||
}
|
||||
repositories {
|
||||
|
@ -1,5 +1,5 @@
|
||||
minecraft.version=1.8
|
||||
forge.version=11.14.3.1450
|
||||
forge.version=11.14.4.1572
|
||||
|
||||
oc.version=1.5.20
|
||||
oc.subversion=dev
|
||||
|
Loading…
x
Reference in New Issue
Block a user