Skip to content

Commit

Permalink
2.6 Update
Browse files Browse the repository at this point in the history
- Rewritten everything again, just to make porting changes from 1.10 and 1.11 easier

- Fixed error messages not showing up on servers, closes #35

- Added some Holding Enchant stuff for #37, not finished yet

- Added Blockcraftery blocks to global whitelist, closes #38

- Fixed blockstate issues with selected blocks, should hopefully fixes a bug and closes #39

- Added a config option to allow custom whitelist for blocks

- Added a config option to allow OreDict circuits being used in Mekanism Exchanger recipes

- Added some cool stuff for Patreon / Twitch subs

- Added jar signing

- Package name refactors
  • Loading branch information
JackyyTV committed Dec 30, 2017
1 parent 7e3b884 commit 6a164b3
Show file tree
Hide file tree
Showing 93 changed files with 5,400 additions and 3,409 deletions.
159 changes: 91 additions & 68 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,68 +1,91 @@
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 = "${mc_version}-${mod_version}"
group = "me.jacky1356400.exchangers"
archivesBaseName = "Exchangers"

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

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

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

dependencies {
deobfCompile "mezz.jei:jei_1.12.2:+:api"
runtime "mezz.jei:jei_1.12.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:+:api"
runtime "mcp.mobius.waila:Hwyla:+"
compile "cofh:RedstoneFlux:1.12-2.+:deobf"
}

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.3-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.12.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:+"
deobfCompile "cofh:CoFHCore:1.12.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
}
14 changes: 7 additions & 7 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx4G
mc_version=1.12
forge_version=1.12.2-14.23.0.2529
mod_version=2.5.2
mappings_version=snapshot_20170917
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx4G
mc_version=1.12.2
forge_version=1.12.2-14.23.1.2575
mod_version=2.6
mappings_version=snapshot_20170917
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ 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
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4.1-bin.zip
Loading

0 comments on commit 6a164b3

Please sign in to comment.