Skip to content

Commit

Permalink
Update build script for 1.14.4
Browse files Browse the repository at this point in the history
  • Loading branch information
HyCraftHD committed Aug 10, 2019
1 parent 2990430 commit 17ef865
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 31 deletions.
53 changes: 33 additions & 20 deletions build.gradle
Expand Up @@ -7,11 +7,11 @@ buildscript {
}
dependencies {
classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "3.+", changing: true
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.1.2"
classpath "gradle.plugin.com.matthewprenger:CurseGradle:1.3.0"
}
}

apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/build.methods"
apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/configuration.methods"
apply from: "https://raw.githubusercontent.com/HyCraftHD/Blank-Forge-Project/master/git.methods"

setup()
Expand Down Expand Up @@ -49,15 +49,24 @@ minecraft {
client = {
workingDirectory project.file("run/client").canonicalPath
mods {
overworldmirror {
umod {
source sourceSets.main
}
}
}
server = {
workingDirectory project.file("run/server").canonicalPath
mods {
overworldmirror {
umod {
source sourceSets.main
}
}
}
data = {
workingDirectory project.file("run/data").canonicalPath
args "--mod", "umod", "--all", "--output", "\"" + file("src/generated/resources").toString() + "\""
mods {
umod {
source sourceSets.main
}
}
Expand All @@ -69,7 +78,7 @@ def normalManifest = {
attributes(
"Specification-Title": config.mod.name,
"Specification-Vendor": "Team UTeam",
"Specification-Version": "25.0",
"Specification-Version": config.forge.major_version,
"Built-On": config.forge.mcversion,
"Implementation-Title": config.mod.name,
"Implementation-Version": project.version,
Expand All @@ -82,6 +91,9 @@ jar {
classifier = ""

from "LICENSE"

exclude("info/u_team/useful_resources/data")
exclude(".cache")

manifest normalManifest
}
Expand All @@ -91,6 +103,9 @@ task deobfJar(type: Jar) {

from sourceSets.main.output
from "LICENSE"

exclude("info/u_team/useful_resources/data")
exclude(".cache")

manifest normalManifest
}
Expand Down Expand Up @@ -124,19 +139,17 @@ artifacts {

sourceSets {
main {
java {
srcDirs += "src/api/java"
}
java
resources {
srcDirs += "src/api/resources"
}
srcDirs += "src/generated/resources"
}
}
}

dependencies {
minecraft "net.minecraftforge:forge:$config.forge.version"
compile "info.u-team:u_team_core-${config.forge.mcversion}:${config.uteamcore.version}:dev"
compileOnly fg.deobf("mezz.jei:jei-${config.forge.mcversion}:${config.jei.version}:api")
compileOnly fg.deobf("mezz.jei:jei-${config.forge.mcversion}:${config.jei.version}:api")
runtimeOnly fg.deobf("mezz.jei:jei-${config.forge.mcversion}:${config.jei.version}")
}

Expand Down Expand Up @@ -166,7 +179,7 @@ curseforge {
mainArtifact(jar) {
displayName = "${config.curse.display}-${config.forge.mcversion}-${project.version}"
changelogType = "html"
changelog = "<a href=\"${config.curse.changelog}\">Changelog of ${project.version}</a>"
changelog = "<a href=\"https://github.com/MC-U-Team/${config.github.name}/blob/${config.github.branch}/CHANGELOG.md\">Changelog of ${project.version}</a>"
}

addArtifact(deobfJar) {
Expand Down Expand Up @@ -195,21 +208,21 @@ uploadArchives {
project {
name project.archivesBaseName
packaging "jar"
description "${config.maven.github_name}"
url "https://github.com/MC-U-Team/${config.maven.github_name}"
description "${config.github.name}"
url "https://github.com/MC-U-Team/${config.github.name}"
scm {
url "https://github.com/MC-U-Team/${config.maven.github_name}"
connection "scm:git:git://github.com/MC-U-Team/${config.maven.github_name}.git"
developerConnection "scm:git:git@github.com:MC-U-Team/${config.maven.github_name}.git"
url "https://github.com/MC-U-Team/${config.github.name}"
connection "scm:git:git://github.com/MC-U-Team/${config.github.name}.git"
developerConnection "scm:git:git@github.com:MC-U-Team/${config.github.name}.git"
}
issueManagement {
system "github"
url "https://github.com/MC-U-Team/${config.maven.github_name}/issues"
url "https://github.com/MC-U-Team/${config.github.name}/issues"
}
licenses {
license {
name "Apache License 2.0"
url "https://github.com/MC-U-Team/${config.maven.github_name}/blob/1.13.2/LICENSE"
url "https://github.com/MC-U-Team/${config.github.name}/blob/${config.github.branch}/LICENSE"
distribution "repo"
}
}
Expand All @@ -233,4 +246,4 @@ task uploadBoth {
doLast {
println "Published both"
}
}
}
16 changes: 6 additions & 10 deletions build.properties
@@ -1,5 +1,5 @@
#Forge Settings
forge.mcversion=1.13.2
forge.mcversion=1.14.4

#Mod Settings
mod.version=0.0.1
Expand All @@ -12,14 +12,10 @@ curse.id=298305
curse.type=alpha
curse.display=U-Mod

curse.changelog=https://github.com/MC-U-Team/U-Mod/blob/1.13.2/CHANGELOG.md

#Maven
maven.github_name=U-Mod
#Github
github.name=U-Mod
github.branch=1.14.4

#Dependencies
#UTeamCore
uteamcore.version=2.4.0.110

#JEI
jei.version=5.0.0.27
#Jei
jei.version=6.0.0.10
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
#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-4.9-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip

0 comments on commit 17ef865

Please sign in to comment.