From 81274ff2d3373ea4cc364567cb7bb3397b0393a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A5=93?= Date: Mon, 3 Mar 2025 02:25:32 +0800 Subject: [PATCH] Updates (#11) --- dependencies.gradle | 12 ++++---- gradle.properties | 13 +++++++- gradle/wrapper/gradle-wrapper.properties | 2 +- settings.gradle | 2 +- src/main/resources/mcmod.info | 38 +++++++++++++----------- 5 files changed, 41 insertions(+), 26 deletions(-) diff --git a/dependencies.gradle b/dependencies.gradle index 3fc620b..6eaaaa3 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -1,10 +1,10 @@ // Add your dependencies here dependencies { - shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib:1.9.24") - shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24") - shadowImplementation("org.jetbrains.kotlin:kotlin-reflect:1.9.24") - shadowImplementation("org.jetbrains:annotations:24.1.0") - shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1") - shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.8.1") + shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib:2.1.10") + shadowImplementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.10") + shadowImplementation("org.jetbrains.kotlin:kotlin-reflect:2.1.10") + shadowImplementation("org.jetbrains:annotations:26.0.2") + shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.1") + shadowImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-jdk8:1.10.1") } diff --git a/gradle.properties b/gradle.properties index 936aa7f..59fe62a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -85,6 +85,11 @@ accessTransformersFile = # Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled! usesMixins = false +# Set to a non-empty string to configure mixins in a separate source set under src/VALUE, instead of src/main. +# This can speed up compile times thanks to not running the mixin annotation processor on all input sources. +# Mixin classes will have access to "main" classes, but not the other way around. +separateMixinSourceSet = + # Adds some debug arguments like verbose output and class export. usesMixinDebug = false @@ -117,9 +122,15 @@ minimizeShadowedDependencies = false # If disabled, won't rename the shadowed classes. relocateShadowedDependencies = false -# Adds the GTNH maven, CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. +# Adds CurseMaven, Modrinth, and some more well-known 1.7.10 repositories. includeWellKnownRepositories = true +# A list of repositories to exclude from the includeWellKnownRepositories setting. Should be a space separated +# list of strings, with the acceptable keys being(case does not matter): +# cursemaven +# modrinth +excludeWellKnownRepositories = + # Change these to your Maven coordinates if you want to publish to a custom Maven repository instead of the default GTNH Maven. # Authenticate with the MAVEN_USER and MAVEN_PASSWORD environment variables. # If you need a more complex setup disable maven publishing here and add a publishing repository to addon.gradle. diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23..e18bc25 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 94c2daf..39d96f7 100644 --- a/settings.gradle +++ b/settings.gradle @@ -17,7 +17,7 @@ pluginManagement { } plugins { - id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.22' + id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.33' } diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 43bc0d4..849ca01 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -1,17 +1,21 @@ -[ - { - "modid": "${modId}", - "name": "${modName}", - "version": "${modVersion}", - "mcversion": "${minecraftVersion}", - "description": "Kotlin helper library for Forge. Minecraft 1.7.10 Port", - "credits": "Emberwalker, for the original Forgelin, shadowfacts for the fork", - "url": "https://github.com/shadowfacts/Forgelin", - "updateUrl": "", - "authorList": [ - "bartimaeusnek", - "Telan" - ], - "screenshots": [] - } -] +{ + "modListVersion": 2, + "modList": [{ + "modid": "${modId}", + "name": "${modName}", + "version": "${modVersion}", + "mcversion": "${minecraftVersion}", + "description": "Kotlin helper library for Forge. Minecraft 1.7.10 Port", + "credits": "Emberwalker, for the original Forgelin, shadowfacts for the fork", + "url": "https://github.com/shadowfacts/Forgelin", + "updateUrl": "", + "authorList": ["bartimaeusnek", "Telan"], + "logoFile": "", + "screenshots": [], + "parent": "", + "requiredMods": [], + "dependencies": [], + "dependants": [], + "useDependencyInformation": false + }] +}