diff --git a/.gitignore b/.gitignore index 984aba0..f95b34b 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ ### IntelliJ IDEA ### .idea +.kotlin ### Eclipse ### .apt_generated diff --git a/build.gradle.kts b/build.gradle.kts index cc0e480..7679417 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -10,7 +10,7 @@ plugins { id("io.github.goooler.shadow") version "8.1.8" apply false // Since this mod/bot is written in Kotlin and expected to run on Minecraft and as such // the JVM, the Kotlin plugin is needed - kotlin("jvm") version "2.0.0" + kotlin("jvm") version "2.0.10" // For generating documentation based on comments in the code id("org.jetbrains.dokka") version "1.9.10" java @@ -20,7 +20,7 @@ plugins { id("me.modmuss50.mod-publish-plugin") version "0.6.2" // NeoForge and Common development - id("net.neoforged.moddev") version "1.0.15" apply false + id("net.neoforged.moddev") version "1.0.19" apply false // Fabric development id("fabric-loom") version "1.7-SNAPSHOT" apply false } diff --git a/common/build.gradle.kts b/common/build.gradle.kts index 0c5e5ba..310d465 100644 --- a/common/build.gradle.kts +++ b/common/build.gradle.kts @@ -8,13 +8,14 @@ val neoformVersion: String by project val minecraftVersion: String by project val mcVersion = minecraftVersion val parchmentVersion: String by project +val parchmentMinecraft: String by project val modId: String by project neoForge { neoFormVersion = neoformVersion parchment { - minecraftVersion = mcVersion + minecraftVersion = parchmentMinecraft mappingsVersion = parchmentVersion } } diff --git a/gradle.properties b/gradle.properties index 77bee75..f689b61 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,14 +5,14 @@ org.gradle.jvmargs=-Xmx3G -XX:ThreadStackSize=4096 -XX:CompilerThreadStackSize=4 enabledPlatforms=fabric,neoforge # Fabric -fabricLoaderVersion=0.16.0 -fabricApiVersion=0.100.7 -fabricKotlinVersion=1.11.0+kotlin.2.0.0 +fabricLoaderVersion=0.16.3 +fabricApiVersion=0.102.0 +fabricKotlinVersion=1.12.1+kotlin.2.0.20 # Neo -neoVersion=21.0.139-beta +neoVersion=21.1.31 neoVersionRange=[21.0,21.1) -kotlinForgeVersion=5.4.0 +kotlinForgeVersion=5.5.0 kffLoaderRange=[5,) version=1.5.3 @@ -25,21 +25,22 @@ title=AstralBot description=Discord Bot and Minecraft Mod in one bundle. credits=Erdragh -minecraftVersion=1.21 +minecraftVersion=1.21.1 # https://projects.neoforged.net/neoforged/neoform -neoformVersion=1.21-20240613.152323 -minecraftVersionRange=[1.21,) -parchmentVersion=2024.07.07 +neoformVersion=1.21.1-20240808.144430 +minecraftVersionRange=[1.21,1.21.1) +parchmentMinecraft=1.21 +parchmentVersion=2024.07.28 -forgeConfigAPIVersion=21.0.6 +forgeConfigAPIVersion=21.1.0 # Discord Interactions -jdaVersion=5.0.1 +jdaVersion=5.1.0 dcWebhooksVersion=0.8.4 # Database Interactions -exposedVersion=0.52.0 -sqliteJDBCVersion=3.46.0.0 +exposedVersion=0.54.0 +sqliteJDBCVersion=3.46.1.0 # Message parsing commonmarkVersion=0.22.0 \ No newline at end of file diff --git a/neoforge/build.gradle.kts b/neoforge/build.gradle.kts index d487062..69e47d7 100644 --- a/neoforge/build.gradle.kts +++ b/neoforge/build.gradle.kts @@ -17,6 +17,7 @@ val runtimeLib: Configuration by configurations.getting val minecraftVersion: String by project val mcVersion = minecraftVersion +val parchmentMinecraft: String by project val parchmentVersion: String by project val neoVersion: String by project val kotlinForgeVersion: String by project @@ -25,7 +26,7 @@ neoForge { version = neoVersion parchment { - minecraftVersion = mcVersion + minecraftVersion = parchmentMinecraft mappingsVersion = parchmentVersion }