Skip to content

Commit

Permalink
Update buildscripts to 1.20.1
Browse files Browse the repository at this point in the history
  • Loading branch information
HyCraftHD committed Jul 29, 2023
1 parent 34ce977 commit 548c942
Show file tree
Hide file tree
Showing 3 changed files with 51 additions and 43 deletions.
58 changes: 21 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,38 +1,21 @@
buildscript {
repositories {
maven {
url = "https://maven.minecraftforge.net"
}
maven {
url = "https://maven.parchmentmc.org"
}
maven {
url = "https://repo.u-team.info"
}
mavenCentral()
}
dependencies {
classpath group: "net.minecraftforge.gradle", name: "ForgeGradle", version: "5.1.+", changing: true
classpath group: "org.parchmentmc", name: "librarian", version: "1.+", changing: true
classpath group: "info.u-team.gradle_files", name: "gradle_files", version: "1.2.2"
classpath group: "info.u-team.curse_gradle_uploader", name: "curse_gradle_uploader", version: "1.6.0"
}
plugins {
id "net.minecraftforge.gradle"
id "org.parchmentmc.librarian.forgegradle"
id "org.spongepowered.mixin"
id "info.u_team.gradle_files"
id "info.u_team.curse_gradle_uploader"
id "maven-publish"
}

apply plugin: "net.minecraftforge.gradle"
apply plugin: "org.parchmentmc.librarian.forgegradle"
apply plugin: "info.u_team.gradle_files"
apply plugin: "info.u_team.curse_gradle_uploader"
apply plugin: "maven-publish"
gradlefiles {
vendor "Team UTeam"
gradlefiles.loaderSuffix = "forge"
}

group = "info.u-team"
archivesBaseName = gradlefiles.archivesBaseName()
version = gradlefiles.version()

gradlefiles {
vendor "Team UTeam"
}

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
Expand All @@ -43,9 +26,9 @@ java {

minecraft {
mappings channel: config.forge.mapping_channel, version: config.forge.mapping

runs {
client = {
client {
workingDirectory file("run/client")

mods {
Expand All @@ -54,7 +37,7 @@ minecraft {
}
}
}
server = {
server {
workingDirectory file("run/server")

mods {
Expand All @@ -63,7 +46,7 @@ minecraft {
}
}
}
data = {
data {
workingDirectory file("run/data")

args "--mod", config.mod.modid
Expand All @@ -84,11 +67,11 @@ minecraft {
}
}

tasks.withType(Jar) { task ->
tasks.withType(Jar).configureEach { task ->
gradlefiles.defaultJar(task)
}

tasks.withType(Javadoc) { task ->
tasks.withType(Javadoc).configureEach { task ->
task.options.addStringOption("Xdoclint:none", "-quiet")
}

Expand All @@ -115,14 +98,14 @@ sourceSets {

repositories {
maven {
url = "https://dvs1.progwml6.com/files/maven"
url = "https://maven.blamejared.com"
}
}

dependencies {
minecraft gradlefiles.forgeDependency()

implementation fg.deobf("info.u-team:u_team_core-1.19.2:4.4.3.260")
implementation fg.deobf("info.u-team:u_team_core-forge-1.20.1:5.1.3.268")

runtimeOnly fg.deobf("mezz.jei:jei-${config.minecraft.version}-forge:${config.jei.version}")
}
Expand All @@ -140,10 +123,11 @@ curseforge {

relations {
requiredDependency "u-team-core"
optionalDependency "jei"
}

mainArtifact(tasks.getByName("jar")) {
displayName = "${config.curse.display}-${config.minecraft.version}-${project.version}"
displayName = "${config.curse.display}-Forge-${config.minecraft.version}-${project.version}"
changelogType = "html"
changelog = "<a href=\"${gradlefiles.changelogUrl()}\">Changelog of ${project.version}</a>"
}
Expand Down
12 changes: 6 additions & 6 deletions build.properties
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Minecraft
minecraft.version=1.19.2
minecraft.version=1.20.1

# Forge
forge.version=43.2.0
forge.version=47.0.35
forge.mapping_channel=parchment
forge.mapping=2022.11.27-1.19.2
forge.mapping=1.20.1-2023.06.26-1.20.1

# Mod
mod.version=1.2.0
Expand All @@ -19,8 +19,8 @@ curse.type=release
curse.display=Extreme-Cobble-Generator

# Github
github.name=Extreme-Cobble-Generator
github.branch=1.19.2
github.name=Useful-Railroads
github.branch=1.20.1

# Dependencies
jei.version=11.3.0.262
jei.version=15.2.0.22
24 changes: 24 additions & 0 deletions settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1,25 @@
pluginManagement {
repositories {
maven {
url = "https://maven.minecraftforge.net"
}
maven {
url = "https://repo.u-team.info"
}
maven {
url = "https://maven.parchmentmc.org"
}
mavenCentral()
gradlePluginPortal()
}
plugins {
id "net.minecraftforge.gradle" version "6.0.+"
id "org.parchmentmc.librarian.forgegradle" version "1.+"
id "org.spongepowered.mixin" version "0.7.+"

id "info.u_team.gradle_files" version "3.0.2"
id "info.u_team.curse_gradle_uploader" version "1.6.0"
}
}

rootProject.name = "Extreme-Cobble-Generator"

0 comments on commit 548c942

Please sign in to comment.