Update buildscript and resource data to 1.14.4 (#1292)

* Update gradlew wrapper

* Update buildscript to 1.14

* Fix wrong plugin path

* Replace mcmod.info with new mods.toml

* Add pack mcmeta

* Move logo to main folder because forge 1.14.4 cannot load logo files with a path

* Fix version number is wrong

* Add jei

* Add manifest data (Used for version replacement)
This commit is contained in:
Johannes 2019-11-07 18:59:07 +01:00 committed by Brennan Ward
parent b409090ec4
commit 5cf1d2e674
7 changed files with 83 additions and 47 deletions

View File

@ -7,14 +7,15 @@ 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.forge'
apply plugin: 'net.minecraftforge.gradle'
apply plugin: 'eclipse'
apply plugin: 'idea'
version = "1.12.2-r150"
version = "1.14.4-r151"
group = "de.ellpeck.actuallyadditions"
archivesBaseName = "ActuallyAdditions"
@ -23,12 +24,34 @@ if(hasProperty('buildnumber')){
}
minecraft {
version = "1.12.2-14.23.5.2836"
runDir = "run"
mappings = "stable_39"
makeObfSourceJar = false
replaceIn "ActuallyAdditions.java"
replace "@VERSION@", project.version.toString()
mappings channel: "snapshot", version: "20191107-1.14.3"
runs {
client = {
workingDirectory project.file("run/client").canonicalPath
mods {
actuallyadditions {
source sourceSets.main
}
}
}
server = {
workingDirectory project.file("run/server").canonicalPath
mods {
actuallyadditions {
source sourceSets.main
}
}
}
data = {
workingDirectory project.file("run/data").canonicalPath
args "--mod", "actuallyadditions", "--all", "--output", "\"" + file("src/generated/resources").toString() + "\"", "--validate", "--existing", "\"" + sourceSets.main.resources.srcDirs[0] + "\""
mods {
actuallyadditions {
source sourceSets.main
}
}
}
}
}
repositories {
@ -44,34 +67,34 @@ repositories {
}
dependencies {
deobfCompile "mezz.jei:jei_1.12.2:+"
deobfCompile "mcp.mobius.waila:Hwyla:1.8+"
deobfCompile ("org.cyclops.commoncapabilities:CommonCapabilities:1.12.2-+")
minecraft "net.minecraftforge:forge:1.14.4-28.1.86"
compileOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.24:api")
runtimeOnly fg.deobf("mezz.jei:jei-1.14.4:6.0.0.24")
//deobfCompile "mcp.mobius.waila:Hwyla:1.8+"
//deobfCompile ("org.cyclops.commoncapabilities:CommonCapabilities:1.12.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'
}
def normalManifest = {
attributes(
"Built-On": "1.14.4",
"Implementation-Title": "ActuallyAdditions",
"Implementation-Version": project.version,
"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
)
}
jar {
exclude(".cache")
manifest normalManifest
}
task deobfJar(type: Jar) {
from sourceSets.main.output
from sourceSets.main.java
classifier = 'dev'
exclude(".cache")
manifest normalManifest
}
task apiJar(type: Jar) {

Binary file not shown.

View File

@ -1,6 +1,5 @@
#Sat Jul 01 10:16:13 EDT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

View File

@ -0,0 +1,27 @@
modLoader="javafml"
loaderVersion="[28,)"
issueTrackerURL="http://github.com/Ellpeck/ActuallyAdditions/issues"
displayURL="http://github.com/Ellpeck/ActuallyAdditions"
logoFile="logo.png"
credits="Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp"
authors="Ellpeck"
[[mods]]
modId="actuallyadditions"
version="${file.jarVersion}"
displayName="Actually Additions"
description="Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!"
[[dependencies.actuallyadditions]]
modId="forge"
mandatory=true
versionRange="[28.1.86,)"
ordering="NONE"
side="BOTH"
[[dependencies.actuallyadditions]]
modId="minecraft"
mandatory=true
versionRange="[1.14.4]"
ordering="NONE"
side="BOTH"

View File

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 112 KiB

View File

@ -1,19 +0,0 @@
[
{
"modid": "actuallyadditions",
"name": "Actually Additions",
"description": "Do you want Automation? Wireless Transport? Better Machines? A cup o' Coffee? Chests? Better Hoppers? Leaf Blowers? Faster Growth? Plants? Well, Actually Additions has all that and a lot more!",
"version": "${version}",
"mcversion": "${mcversion}",
"url": "http://github.com/Ellpeck/ActuallyAdditions",
"updateUrl": "",
"authorList": [ "Ellpeck" ],
"credits": "Author: Ellpeck; Textures and Models: BootyToast, GlenthorLP, canitzp",
"logoFile": "assets/actuallyadditions/textures/logo.png",
"screenshots": [
],
"parent":"",
"dependencies": [
]
}
]

View File

@ -0,0 +1,6 @@
{
"pack": {
"description": "Actually Additions",
"pack_format": 4
}
}