From c0af00f2a348e5bfbefbc7b80fee75b290d57301 Mon Sep 17 00:00:00 2001 From: Martin Prokoph Date: Thu, 25 Jul 2024 11:10:36 +0200 Subject: [PATCH] Cleanup gradle files --- build_old.gradle | 168 ------------------------------------------ common/build.gradle | 1 - fabric/build.gradle | 1 + gradle.properties | 2 +- gradle_old.properties | 36 --------- 5 files changed, 2 insertions(+), 206 deletions(-) delete mode 100644 build_old.gradle delete mode 100644 gradle_old.properties diff --git a/build_old.gradle b/build_old.gradle deleted file mode 100644 index 1043260..0000000 --- a/build_old.gradle +++ /dev/null @@ -1,168 +0,0 @@ -plugins { - id 'fabric-loom' version '1.6-SNAPSHOT' - id 'java-library' - id 'maven-publish' - id 'com.github.johnrengelman.shadow' version '7.0.0' - id "me.shedaniel.unified-publishing" version "0.1.+" -} - -group = project.maven_group -version = "${project.mod_version}+${project.minecraft_version}" - -// This field defines the Java version your mod target. -def targetJavaVersion = 21 - -boolean isMCVersionNonRelease() { - return project.minecraft_version.matches('^\\d\\dw\\d\\d[a-z]$') - || project.minecraft_version.matches('\\d+\\.\\d+-(pre|rc)(\\d+)') -} - -repositories { - mavenLocal() - mavenCentral() - maven { url 'https://aperlambda.github.io/maven' } - maven { - name 'Gegy' - url 'https://maven.gegy.dev' - } - maven { - name = "CottonMC" - url = "https://server.bbkr.space/artifactory/libs-release" - } - maven { url "https://maven.terraformersmc.com/releases/" } - maven { url 'https://maven.kosmx.dev' } - maven { url 'https://maven.isxander.dev/releases' } - maven { url 'https://maven.shedaniel.me/' } - maven { url 'https://jitpack.io' } - maven { url "https://api.modrinth.com/maven" } - maven { url 'https://maven.quiltmc.org/repository/release'} -} - -configurations { - shadow - api.extendsFrom shadow -} - -dependencies { - //to change the versions see the gradle.properties file - minecraft "com.mojang:minecraft:${project.minecraft_version}" - mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2" - modImplementation "net.fabricmc:fabric-loader:${project.loader_version}" - - // Fabric API. This is technically optional, but you probably want it anyway. - modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" - - include modImplementation ("maven.modrinth:obsidianui:${project.obsidianui_version}") {} - api('org.aperlambda:lambdajcommon:1.8.1') { - exclude group: 'com.google.code.gson' - exclude group: 'com.google.guava' - } - include 'org.aperlambda:lambdajcommon:1.8.1' - - modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") { - exclude(group: "net.fabricmc.fabric-api") - } - - // Compatibility mods - - // Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions. - // modImplementation("maven.modrinth:ok-zoomer:${project.ok_zoomer_version}") - // modImplementation "io.github.ennuil:LibZoomer:${project.libzoomer_version}" - - modCompileOnlyApi "io.github.cottonmc:LibGui:${project.libgui_version}" - modCompileOnlyApi "org.quiltmc:quilt-json5:1.0.0" - modCompileOnly "maven.modrinth:sodium:${project.sodium_version}" - modCompileOnlyApi "maven.modrinth:emi:${project.emi_version}" - modCompileOnlyApi "maven.modrinth:emotecraft:${project.emotecraft_version}" - modCompileOnlyApi "io.github.kosmx:bendy-lib:${project.bendylib_version}" - modCompileOnlyApi "dev.isxander:yet-another-config-lib:${project.yacl_version}" - modCompileOnlyApi "maven.modrinth:inventory-tabs-updated:${project.inventorytabs_version}" - modCompileOnlyApi "maven.modrinth:bedrockify:${project.bedrockify_version}" - // Required for Inventory Tabs - modCompileOnlyApi("me.shedaniel.cloth:cloth-config-fabric:${project.clothconfig_version}") { - exclude(group: "net.fabricmc.fabric-api") - } - - modImplementation "maven.modrinth:midnightlib:${project.midnightlib_version}" - include "maven.modrinth:midnightlib:${project.midnightlib_version}" - - shadow 'com.electronwill.night-config:core:3.6.3' - shadow 'com.electronwill.night-config:toml:3.6.3' - apply plugin: 'java-library' -} -loom { - accessWidenerPath = file("src/main/resources/midnightcontrols.accesswidener") -} - -java { - sourceCompatibility = JavaVersion.toVersion(targetJavaVersion) - targetCompatibility = JavaVersion.toVersion(targetJavaVersion) - - withSourcesJar() -} - -tasks.withType(JavaCompile).configureEach { - it.options.encoding = 'UTF-8' - - it.options.release.set(targetJavaVersion) -} - -processResources { - inputs.property 'version', project.version - - filesMatching('fabric.mod.json') { - expand 'version': project.version - } -} - -ext { - releaseChangelog = { - def changes = new StringBuilder() - changes << "## MidnightControls v$project.version for $project.minecraft_version\n[View the changelog](https://www.github.com/TeamMidnightDust/MidnightControls/commits/)" - def proc = "git log --max-count=1 --pretty=format:%s".execute() - proc.in.eachLine { line -> - def processedLine = line.toString() - if (!processedLine.contains("New translations") && !processedLine.contains("Merge") && !processedLine.contains("branch")) { - changes << "\n- ${processedLine.capitalize()}" - } - } - proc.waitFor() - return changes.toString() - } -} - -unifiedPublishing { - project { - displayName = "MidnightControls v$project.version - Fabric $project.minecraft_version" - releaseType = "$project.release_type" - changelog = releaseChangelog() - gameVersions = [] - gameLoaders = ["fabric","quilt"] - mainPublication remapJar - relations { - includes { - curseforge = "midnightlib" - modrinth = "midnightlib" - } - } - - var CURSEFORGE_TOKEN = project.findProperty("CURSEFORGE_TOKEN") ?: System.getenv("CURSEFORGE_TOKEN") - if (CURSEFORGE_TOKEN != null) { - curseforge { - token = CURSEFORGE_TOKEN - id = rootProject.curseforge_id - gameVersions.addAll "Java 21", project.minecraft_version - } - } - - var MODRINTH_TOKEN = project.findProperty("MODRINTH_TOKEN") ?: System.getenv("MODRINTH_TOKEN") - if (MODRINTH_TOKEN != null) { - modrinth { - token = MODRINTH_TOKEN - id = rootProject.modrinth_id - version = "$project.version" - gameVersions.addAll project.minecraft_version - } - } - } -} diff --git a/common/build.gradle b/common/build.gradle index b4def6c..3e5447f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -30,7 +30,6 @@ dependencies { // Just make sure NOT to use classes from the .fabric classpath modCompileOnlyApi "maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric" modCompileOnlyApi "maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric" - include 'org.aperlambda:lambdajcommon:1.8.1' modCompileOnlyApi ("com.terraformersmc:modmenu:${project.modmenu_version}") { exclude(group: "net.fabricmc.fabric-api") } diff --git a/fabric/build.gradle b/fabric/build.gradle index 3d54fcd..8208364 100644 --- a/fabric/build.gradle +++ b/fabric/build.gradle @@ -25,6 +25,7 @@ dependencies { modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}" modImplementation include ("maven.modrinth:midnightlib:${rootProject.midnightlib_version}-fabric") modImplementation include ("maven.modrinth:obsidianui:${rootProject.obsidianui_version}-fabric") {} + include 'org.aperlambda:lambdajcommon:1.8.1' modImplementation "maven.modrinth:emi:${project.emi_version}" common(project(path: ":common", configuration: "namedElements")) { transitive false } diff --git a/gradle.properties b/gradle.properties index 0b811e0..df6e1b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,7 +7,7 @@ yarn_mappings=1.21+build.2 enabled_platforms=fabric,neoforge archives_base_name=midnightcontrols -mod_version=1.10.0 +mod_version=1.10.0-alpha.1 maven_group=eu.midnightdust release_type=release modrinth_id = bXX9h73M diff --git a/gradle_old.properties b/gradle_old.properties deleted file mode 100644 index c4aa330..0000000 --- a/gradle_old.properties +++ /dev/null @@ -1,36 +0,0 @@ -# Done to increase the memory available to gradle. -org.gradle.jvmargs=-Xmx1G - -# Fabric Properties -# check these on https://fabricmc.net/use -minecraft_version=1.21 -yarn_mappings=1.21+build.1 -loader_version=0.15.11 - -# Mod Properties -mod_version = 1.9.7 -maven_group = eu.midnightdust -archives_base_name = midnightcontrols -release_type=beta -modrinth_id = bXX9h73M -curseforge_id = 621768 - -# Dependencies -# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api -fabric_version=0.100.1+1.21 -sodium_version=mc1.19.2-0.4.4 -obsidianui_version=0.2.6+mc1.21-fabric -midnightlib_version=1.5.7-fabric -modmenu_version=10.0.0-beta.1 -emotecraft_version=2.1.3-SNAPSHOT-build.29-MC1.19-fabric -bendylib_version=2.0.+ -emi_version=1.1.1+1.20.4+fabric -libgui_version=6.0.0+1.19 -inventorytabs_version=inventorytabs-0.9.beta-1.19.x -clothconfig_version=7.0.72 -yacl_version=2.2.0 -bedrockify_version=1.9+mc1.20 - -# Ok Zoomer and LibZoomer are temporarily disabled for the time being, as we are currently using Reflection at runtime instead in OkZoomerCompat due to there being two major, completely incompatible API versions. -# ok_zoomer_version=5.0.0-beta.3+1.17.1 -# libzoomer_version=0.3.0+1.17.1