Skip to content

Commit

Permalink
1.7 Update
Browse files Browse the repository at this point in the history
  • Loading branch information
JackyyTV committed Dec 30, 2017
1 parent e44cf6a commit d46d103
Show file tree
Hide file tree
Showing 179 changed files with 7,241 additions and 7,078 deletions.
155 changes: 91 additions & 64 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,64 +1,91 @@
buildscript {
repositories {
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-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 = "${mc_version}-${mod_version}"
group = "me.jacky1356400.exchangers"
archivesBaseName = "Exchangers"

sourceCompatibility = targetCompatibility = "1.8"
compileJava {
sourceCompatibility = targetCompatibility = "1.8"
}

minecraft {
version = "${mc_version}-${forge_version}"
runDir = "run"
mappings = "${mappings_version}"
}

repositories {
maven {
url "http://dvs1.progwml6.com/files/maven"
}
maven {
url "http://tehnut.info/maven"
}
}

dependencies {
compile files('libs/')
deobfCompile "mezz.jei:jei_1.10.2:+:api"
runtime "mezz.jei:jei_1.10.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:1.8.17-B31_1.10.2:api"
runtime "mcp.mobius.waila:Hwyla:1.8.17-B31_1.10.2"
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
expand 'version':project.version, 'mcversion':project.minecraft.version
}
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}

artifacts {
archives deobfJar
}
buildscript {
repositories {
jcenter()
maven { url = "http://files.minecraftforge.net/maven" }
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.2-SNAPSHOT'
}
}
apply plugin: 'net.minecraftforge.gradle.forge'

version = "${mc_version}-${mod_version}"
group = "jackyy.exchangers"
archivesBaseName = "Exchangers"

sourceCompatibility = targetCompatibility = "1.8"
compileJava {
sourceCompatibility = targetCompatibility = "1.8"
}

minecraft {
version = "${forge_version}"
runDir = "run"
mappings = "${mappings_version}"

replace '@FINGERPRINT@', project.findProperty('signSHA1')
replaceIn "Exchangers.java"
}

repositories {
maven {
name = "JEI Maven"
url = "http://dvs1.progwml6.com/files/maven"
}
maven {
name = "Hwyla Maven"
url = "http://tehnut.info/maven"
}
maven {
name = "CoFH Maven"
url = "http://maven.covers1624.net"
}
}

dependencies {
deobfCompile "mezz.jei:jei_1.10.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:1.8.17-B31_1.10.2"
deobfCompile "cofh:CoFHCore:1.10.2-4.+:universal"
}

processResources {
inputs.property "version", project.version
inputs.property "mcversion", project.minecraft.version
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
expand 'version':project.version, 'mcversion':project.minecraft.version
}
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
rename '(.+_at.cfg)', 'META-INF/$1'
}

jar {
manifest {
attributes 'FMLAT': 'exchangers_at.cfg'
}
}

task signJar(type: SignJar, dependsOn: reobfJar) {
onlyIf {
project.hasProperty('keyStore')
}
keyStore = project.findProperty('keyStore')
alias = project.findProperty('keyStoreAlias')
storePass = project.findProperty('keyStorePass')
keyPass = project.findProperty('keyStoreKeyPass')
inputFile = jar.archivePath
outputFile = jar.archivePath
}

build.dependsOn signJar

task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
}

artifacts {
archives deobfJar
}
4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx4G
mc_version=1.10.2
forge_version=12.18.3.2511
mod_version=1.6.2
forge_version=1.10.2-12.18.3.2511
mod_version=1.7
mappings_version=snapshot_20161111
12 changes: 6 additions & 6 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Jun 13 19:20:47 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.2.1-bin.zip
#Tue Jun 13 19:20:47 CST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
22 changes: 11 additions & 11 deletions src/main/java/cofh/api/CoFHAPIProps.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package cofh.api;

public class CoFHAPIProps {

private CoFHAPIProps() {

}

public static final String VERSION = "1.5.0";

}
package cofh.api;

public class CoFHAPIProps {

private CoFHAPIProps() {

}

public static final String VERSION = "1.5.0";

}
Loading

0 comments on commit d46d103

Please sign in to comment.