Skip to content

Commit

Permalink
Gradle 1.14.4 config
Browse files Browse the repository at this point in the history
  • Loading branch information
fuj1n committed Sep 6, 2019
1 parent f1a9118 commit 2e87299
Show file tree
Hide file tree
Showing 7 changed files with 133 additions and 86 deletions.
143 changes: 91 additions & 52 deletions build.gradle
Expand Up @@ -21,10 +21,13 @@ buildscript {
}
}
dependencies {
classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
}
}

apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'maven'

repositories {
maven {
name 'DVS1 Maven FS'
Expand All @@ -40,46 +43,79 @@ repositories {
}
}

apply plugin: 'net.minecraftforge.gradle.forge'

sourceCompatibility = 1.8
targetCompatibility = 1.8

group = "slimeknights"

// define the peroperties file
ext.configFile = file "build.properties"
configFile.withReader {
//ext.configFile = file "build.properties"
//configFile.withReader {
// Load config. It shall from now be referenced as simply config or project.config
def prop = new Properties()
prop.load(it)
project.ext.config = new ConfigSlurper().parse prop
}
// def prop = new Properties()
// prop.load(it)
// project.ext.config = new ConfigSlurper().parse prop
//}

version = "${config.minecraft_version}-${config.mod_version}"
version = "${minecraft_version}-${mod_version}"

minecraft {
version = config.minecraft_version + "-" + config.forge_version
runDir = 'run/'
replace '${version}', config.mod_version
// 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 allways work.
// simply re-run your setup task after changing the mappings to update your workspace.
mappings = config.mappings_version
mappings channel: mappings_channel, version: mappings_version

runs {
client {
workingDirectory project.file('run')

property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE,PULSAR'
property 'forge.logging.console.level', 'debug'

mods {
mantle {
source sourceSets.main
}
}
}

server {
workingDirectory project.file('run')

property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP,CORE,PULSAR'
property 'forge.logging.console.level', 'debug'

mods {
mantle {
source sourceSets.main
}
}
}

data {
workingDirectory project.file('run')

property 'forge.logging.markers', 'SCAN,REGISTRIES,REGISTRYDUMP,CORE,PULSAR'
property 'forge.logging.console.level', 'debug'

args '--mod', 'tmechworks', '--all', '--output', file('generated/resources/')

mods {
tmechworks {
source sourceSets.main
}
}
}
}
}

dependencies {
deobfCompile "slimeknights.mantle:Mantle:${config.minecraft_version_short}-${config.mantle_version}"
deobfCompile "slimeknights:TConstruct:${config.minecraft_version}-${config.tinkers_version}"
minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version

compile fg.deobf("slimeknights.mantle:Mantle:${minecraft_version}-${mantle_version}")

//compile fg.deobf("slimeknights:TConstruct:${minecraft_version}-${tinkers_version}")

// compile against the JEI API
deobfCompile "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}:api"
compileOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}:api")
// at runtime, use the full JEI jar
runtime "mezz.jei:jei_${config.minecraft_version}:${config.jei_version}"
runtimeOnly fg.deobf("mezz.jei:jei-${minecraft_version}:${jei_version}")

deobfCompile "mcp.mobius.waila:Hwyla:${config.hwyla_version}_${config.minecraft_version}"
//compile fg.deobf("mcp.mobius.waila:Hwyla:${hwyla_version}_${minecraft_version}")
}

sourceSets {
Expand All @@ -90,42 +126,45 @@ sourceSets {
}
}

processResources
{
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "MCversion", project.minecraft.version
processResources {
// this will ensure that this task is redone when the versions change.
inputs.property "version", project.version
inputs.property "MCversion", minecraft_version

// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mcmod.info'
// replace stuff in mcmod.info, nothing else
from(sourceSets.main.resources.srcDirs) {
include 'mods.toml'

// replace version and mcversion
expand 'version': project.version, 'MCversion': project.minecraft.version
}
// replace version and mcversion
expand 'version': mod_version, 'MCversion': minecraft_version
}

// copy everything else
from(sourceSets.main.resources.srcDirs) {
exclude 'mcmod.info'
}
}
// copy everything else
from(sourceSets.main.resources.srcDirs) {
exclude 'mods.toml'
}
}

// Add Access Transformers Manifest
jar {
manifest {
//attributes 'FMLAT': 'tconstruct_at.cfg'
attributes([
"Specification-Title" : "Tinkers' Mechworks",
"Specification-Vendor" : "Slime Knights",
"Specification-Version" : "1", // We are version 1 of ourselves
"Implementation-Title" : project.name,
"Implementation-Version" : project.version,
"Implementation-Vendor" : "Slime Knights",
"Implementation-Timestamp" : new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
])
}
}

// Create deobf dev jars
task deobfJar(type: Jar) {
from sourceSets.main.output
classifier = 'deobf'
manifest {
//attributes 'FMLAT': 'tconstruct_at.cfg'
}
task sourcesJar(type: Jar) {
from sourceSets.main.allJava
classifier = 'sources'
}

artifacts {
archives deobfJar
archives sourcesJar
}
14 changes: 0 additions & 14 deletions build.properties

This file was deleted.

20 changes: 20 additions & 0 deletions gradle.properties
@@ -0,0 +1,20 @@
# 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=-Xmx3G
org.gradle.daemon=false

mod_version=2.0

minecraft_version=1.14.4
minecraft_version_short=1.14

forge_version=28.0.93

mappings_channel=snapshot
mappings_version=20190815-1.14.3

mantle_version=1.4.+
tinkers_version=2.12.0.+

jei_version=6.0.0.+
hwyla_version=1.8.26-B41
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
#Mon Sep 14 12:28:28 PDT 2015
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip
17 changes: 0 additions & 17 deletions resources/mcmod.info

This file was deleted.

20 changes: 20 additions & 0 deletions resources/mods.toml
@@ -0,0 +1,20 @@
modLoader="javafml"
loaderVersion="[24,)"
issueTrackerURL="https://github.com/SlimeKnights/TinkersMechworks/issues"
logoFile=""

[[mods]]
modId="tmechworks"
version="${version}"
displayName="Tinkers' Mechworks"
authors="Slime Knights"
description='''
'''
displayURL="https://www.curseforge.com/minecraft/mc-mods/tinkers-mechworks"
[[dependencies.mantle]]
modId="forge"
mandatory=true
versionRange="[${forge_version},)"
ordering="NONE"
side="BOTH"
2 changes: 1 addition & 1 deletion resources/pack.mcmeta
@@ -1,6 +1,6 @@
{
"pack": {
"pack_format": 1,
"pack_format": 4,
"description": "Resources used for Tinkers Mechworks"
}
}

0 comments on commit 2e87299

Please sign in to comment.