Merge pull request #42 from SlimeKnights/1.8rewrite

Cleaned up and updated forge version.
This commit is contained in:
Alexander Behrhof committed 2015-09-06 00:55:38 -04:00
commit 5ee88fc8e0
107 files changed
+15 -31

No files matched your search

+13 -29
View File
@@ -4,25 +4,27 @@
* Based on TConstruct's master build file
* Authors: Sunstrike, ProgWML6
* Help from AbrarSyed
*/
*/
buildscript {
repositories {
mavenCentral()
mavenLocal()
mavenLocal()
jcenter()
maven {
name = 'ForgeFS'
url = 'http://files.minecraftforge.net/maven'
name = "forge"
url = "http://files.minecraftforge.net/maven"
}
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: 'net.minecraftforge.gradle.forge'
repositories {
mavenLocal()
@@ -32,8 +34,6 @@ repositories {
}
}
apply plugin: 'forge'
group = 'mantle'
sourceCompatibility = 1.7
targetCompatibility = 1.7
@@ -48,8 +48,7 @@ configFile.withReader {
project.ext.config = new ConfigSlurper().parse prop
}
// sets version to the slimeKnights default version format
// Finds and sets version data
// sets version to the slimeKnights version format
task buildInfo {
def cmd = "git rev-parse --short HEAD"
def proc = cmd.execute()
@@ -83,30 +82,17 @@ minecraft {
replace '${version}', project.version
}
sourceSets {
main {
resources {
srcDir 'resources'
}
java {
srcDir 'src'
}
}
}
processResources
{
inputs.property "version", artifact_version
inputs.property "MCversion", config.minecraft_version
// replace stuff in text files, not binary ones.
// replace stuff in text files, not binary ones.
from(sourceSets.main.resources.srcDirs) {
include '**/*.info'
// replace version and MCVersion
// replace version and MCVersion
expand 'version':artifact_version,'MCversion':config.minecraft_version
}
// copy everything else, thats not text
// copy everything else, thats not text
from(sourceSets.main.resources.srcDirs) {
exclude '**/*.info'
}
@@ -129,9 +115,7 @@ artifacts {
}
task("uploadJars", dependsOn:"build") {
description = "uploads JARs"
if (project.hasProperty("local_maven")) {
apply plugin: 'maven'
uploadArchives {
@@ -142,4 +126,4 @@ task("uploadJars", dependsOn:"build") {
}
}
}
}
}
+2 -2
View File
@@ -1,5 +1,5 @@
mod_version=0.4
minecraft_version=1.8
forge_version=11.14.3.1487
mappings=snapshot_20150708
forge_version=11.14.3.1512
mappings=snapshot_20150905
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Before

Width:  |  Height:  |  Size: 18 KiB

After

Width:  |  Height:  |  Size: 18 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.3 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

File renamed without changes.

Before

Width:  |  Height:  |  Size: 468 B

After

Width:  |  Height:  |  Size: 468 B

File renamed without changes.

Before

Width:  |  Height:  |  Size: 465 B

After

Width:  |  Height:  |  Size: 465 B

Loaded 100 of 107 files, more files were not shown because too many files have changed in this diff. Show more