From baf865e80b8d4c6b09cf8ac5c9c698464c8702f8 Mon Sep 17 00:00:00 2001 From: xtex Date: Thu, 29 Jun 2023 20:42:06 +0800 Subject: [PATCH] style: clean up --- build.gradle.kts | 24 ++++--------------- common/src/main/kotlin/quaedam/Quaedam.kt | 2 +- forge/build.gradle.kts | 14 ++++++----- .../main/kotlin/quaedam/forge/QuaedamForge.kt | 2 +- gradle.properties | 9 ------- settings.gradle.kts | 2 +- 6 files changed, 16 insertions(+), 37 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6c4e563..0ef40ea 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,15 +17,9 @@ subprojects { val loom = project.extensions.getByName("loom") - dependencies { "minecraft"("com.mojang:minecraft:${project.property("minecraft_version")}") - // The following line declares the mojmap mappings, you may use other mappings as well - "mappings"( - loom.officialMojangMappings() - ) - // The following line declares the yarn mappings you may select this one as well. - // "mappings"("net.fabricmc:yarn:1.18.2+build.3:v2") + "mappings"(loom.officialMojangMappings()) } } @@ -35,18 +29,9 @@ allprojects { apply(plugin = "architectury-plugin") apply(plugin = "maven-publish") - base.archivesName.set(rootProject.property("archives_base_name").toString()) - //base.archivesBaseName = rootProject.property("archives_base_name").toString() - version = rootProject.property("mod_version").toString() - group = rootProject.property("maven_group").toString() - - repositories { - // Add repositories to retrieve artifacts from in here. - // You should only use this when depending on other mods because - // Loom adds the essential maven repositories to download Minecraft and libraries from automatically. - // See https://docs.gradle.org/current/userguide/declaring_repositories.html - // for more information about repositories. - } + base.archivesName.set("quaedam") + version = "1.0.0" + group = "quaedam" dependencies { compileOnly("org.jetbrains.kotlin:kotlin-stdlib") @@ -56,6 +41,7 @@ allprojects { options.encoding = "UTF-8" options.release.set(17) } + kotlin.target.compilations.all { kotlinOptions.jvmTarget = "17" } diff --git a/common/src/main/kotlin/quaedam/Quaedam.kt b/common/src/main/kotlin/quaedam/Quaedam.kt index a1abec0..f0987de 100644 --- a/common/src/main/kotlin/quaedam/Quaedam.kt +++ b/common/src/main/kotlin/quaedam/Quaedam.kt @@ -3,12 +3,12 @@ package quaedam import dev.architectury.registry.CreativeTabRegistry import dev.architectury.registry.registries.DeferredRegister import dev.architectury.registry.registries.RegistrySupplier -import quaedam.QuaedamExpectPlatform.getConfigDirectory import net.minecraft.core.registries.Registries import net.minecraft.network.chat.Component import net.minecraft.world.item.CreativeModeTab import net.minecraft.world.item.Item import net.minecraft.world.item.ItemStack +import quaedam.QuaedamExpectPlatform.getConfigDirectory object Quaedam { const val MOD_ID = "quaedam" diff --git a/forge/build.gradle.kts b/forge/build.gradle.kts index 42a2001..638fc06 100644 --- a/forge/build.gradle.kts +++ b/forge/build.gradle.kts @@ -50,12 +50,14 @@ tasks.processResources { inputs.property("version", project.version) filesMatching("META-INF/mods.toml") { - expand(mapOf( - "version" to project.version, - "minecraft_version" to rootProject.property("minecraft_version"), - "architectury_version" to rootProject.property("architectury_version"), - "kotlin_for_forge_version" to rootProject.property("kotlin_for_forge_version") - )) + expand( + mapOf( + "version" to project.version, + "minecraft_version" to rootProject.property("minecraft_version"), + "architectury_version" to rootProject.property("architectury_version"), + "kotlin_for_forge_version" to rootProject.property("kotlin_for_forge_version") + ) + ) } } diff --git a/forge/src/main/kotlin/quaedam/forge/QuaedamForge.kt b/forge/src/main/kotlin/quaedam/forge/QuaedamForge.kt index 74a3525..f7d51be 100644 --- a/forge/src/main/kotlin/quaedam/forge/QuaedamForge.kt +++ b/forge/src/main/kotlin/quaedam/forge/QuaedamForge.kt @@ -1,8 +1,8 @@ package quaedam.forge import dev.architectury.platform.forge.EventBuses -import quaedam.Quaedam import net.minecraftforge.fml.common.Mod +import quaedam.Quaedam import thedarkcolour.kotlinforforge.forge.MOD_BUS @Mod(Quaedam.MOD_ID) diff --git a/gradle.properties b/gradle.properties index f55aa46..1defce5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,21 +1,12 @@ org.gradle.parallel=true org.gradle.caching=true org.gradle.jvmargs=-Xmx2048M - minecraft_version=1.20.1 - -archives_base_name=quaedam -mod_id=quaedam -mod_version=1.0.0 -maven_group=quaedam - # https://www.curseforge.com/minecraft/mc-mods/architectury-api architectury_version=9.0.8 - # https://files.minecraftforge.net/net/minecraftforge/forge/ forge_version=1.20.1-47.0.35 # https://www.curseforge.com/minecraft/mc-mods/kotlin-for-forge/files kotlin_for_forge_version=4.3.0 - # https://fabricmc.net/develop/ fabric_loader_version=0.14.21 diff --git a/settings.gradle.kts b/settings.gradle.kts index 91b5a3c..c1a4a41 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,7 +1,7 @@ pluginManagement { repositories { maven { url = uri("https://maven.architectury.dev/") } - maven { url =uri("https://maven.quiltmc.org/repository/release/") } + maven { url = uri("https://maven.quiltmc.org/repository/release/") } maven { url = uri("https://maven.fabricmc.net/") } maven { url = uri("https://maven.minecraftforge.net/") } gradlePluginPortal()