[FEAT] NeoForge

.github/workflows/call-build-project.yml

@@ -8,12 +8,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - id: "forge"
-            task: ":instances:forge:build"
+          - id: "neoforge"
+            task: ":instances:neoforge:build"
           - id: "bukkit"
             task: ":instances:bukkit:build"
-          - id: "fabric"
-            task: ":instances:fabric:build"
     steps:
       - name: Checkout Git repo
         uses: actions/checkout@v4

.github/workflows/call-upload-artifacts.yml

@@ -8,12 +8,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - id: "forge"
-            task: ":instances:forge:shadowJar"
+          - id: "neoforge"
+            task: ":instances:neoforge:shadowJar"
           - id: "bukkit"
             task: ":instances:bukkit:shadowJar"
-          - id: "fabric"
-            task: ":instances:fabric:remapJar"
     steps:
       - name: Checkout Git repo
         uses: actions/checkout@v4

.github/workflows/call-upload-github-release.yml

@@ -19,20 +19,15 @@ jobs:
           properties: 'makeevrserg.project.name makeevrserg.project.version.string'
 
       - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
-        name: "Download forge"
+        name: "Download neoforge"
         with:
-          name: forge
+          name: neoforge
           path: ./jars
       - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
         name: "Download bukkit"
         with:
           name: bukkit
           path: ./jars
-      - uses: actions/download-artifact@95815c38cf2ff2164869cbab79da8d1f422bc89e
-        name: "Download fabric"
-        with:
-          name: fabric
-          path: ./jars
 
       - name: Create release
         id: create_internal_release

.github/workflows/call-upload-modrinth-release.yml

@@ -11,8 +11,8 @@ jobs:
     strategy:
       matrix:
         include:
-          - id: "forge"
-            task: ":instances:forge:shadowJar"
+          - id: "neoforge"
+            task: ":instances:neoforge:shadowJar"
           - id: "bukkit"
             task: ":instances:bukkit:shadowJar"
     steps:

.gitignore

@@ -35,4 +35,5 @@ build-logic/build
 build-logic/plugins/convention/build
 astra.properties
 .gradle
-libs
+libs
+**/junit

build.gradle.kts

@@ -19,10 +19,11 @@ plugins {
     alias(libs.plugins.klibs.gradle.detekt.compose) apply false
     alias(libs.plugins.klibs.gradle.dokka.root) apply false
     alias(libs.plugins.klibs.gradle.dokka.module) apply false
-    alias(libs.plugins.klibs.gradle.java.core) apply false
+    alias(libs.plugins.klibs.gradle.java.version) apply false
     alias(libs.plugins.klibs.gradle.publication) apply false
     alias(libs.plugins.klibs.gradle.rootinfo) apply false
     alias(libs.plugins.klibs.minecraft.resource.processor) apply false
+    alias(libs.plugins.neoforgegradle) apply false
 }
 
 apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")
@@ -32,6 +33,6 @@ apply(plugin = "ru.astrainteractive.gradleplugin.root.info")
 subprojects.forEach {
     it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module")
     it.plugins.withId("org.jetbrains.kotlin.jvm") {
-        it.apply(plugin = "ru.astrainteractive.gradleplugin.java.core")
+        it.apply(plugin = "ru.astrainteractive.gradleplugin.java.version")
     }
 }

docker-compose.yml

@@ -12,22 +12,16 @@ services:
       EULA: true
       ONLINE_MODE: false
       # Forge --------------------
-      #      TYPE: FORGE
-      #      VERSION: "1.20.1"
-      #      FORGE_VERSION: "47.2.20"
+      TYPE: NEOFORGE
+      VERSION: "1.21.1"
+      NEOFORGE_VERSION: "21.1.129"
       # Paper --------------------
-      TYPE: PAPER
-      VERSION: 1.21.8
+      #      TYPE: PAPER
+      #      VERSION: 1.21.8
       # Custom -------------------
-      # CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar
-      # Fabric
-    #      TYPE: FABRIC
-    #      MEMORY: 6G
-    #      VERSION: "1.20.1"
-    #      FABRIC_LAUNCHER_VERSION: 1.0.3
-    #      FABRIC_LOADER_VERSION: 0.16.14    
+    #      CUSTOM_SERVER: https://api.papermc.io/v2/projects/paper/versions/1.21.1/builds/121/downloads/paper-1.21.1-121.jar
     volumes:
-      #      - ./build/forge:/data # Forge
-      - ./build/bukkit:/data # Bukkit/Paper/Spigot
+      - ./build/neoforge:/data # Forge
+#      - ./build/bukkit:/data # Bukkit/Paper/Spigot
 #      - ./build/velocity:/data # Velocity
 #      - ./build/fabric:/data # Fabric

gradle.properties

@@ -1,18 +1,19 @@
-    # Gradle
-org.gradle.parallel=true
+# Gradle
+org.gradle.parallel=false
 org.gradle.configuration-cache=false
 org.gradle.caching=false
-org.gradle.jvmargs=-Xmx3g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx3G"
+kotlin.incremental=false
+org.gradle.jvmargs=-Xmx5g -XX:+UseParallelGC -Dkotlin.daemon.jvm.options\="-Xmx5G"
 kotlin.code.style=official
-testTask.ignoreFailures=true
+testTask.ignoreFailures=false
 # Java
 makeevrserg.java.source=8
 makeevrserg.java.target=21
 makeevrserg.java.ktarget=21
 # Project
 makeevrserg.project.name=MessageBridge
 makeevrserg.project.group=ru.astrainteractive.messagebridge
-makeevrserg.project.version.string=0.16.0
+makeevrserg.project.version.string=0.17.0
 makeevrserg.project.description=Bridge for TG and Discord
 makeevrserg.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 makeevrserg.project.url=https://empireprojekt.ru

gradle/libs.versions.toml

@@ -7,17 +7,18 @@ driver-mariadb = "3.5.6"
 driver-mysql = "8.0.33"
 exposed = "0.61.0"
 forgegradle = "[6.0,6.2)"
+neoforgegradle = "7.1.6"
 gradle-buildconfig = "5.7.0"
 gradle-ftp = "0.1.2"
 gradle-shadow = "9.2.2"
 gson = "2.13.2"
 guava = "33.5.0-jre"
 jda = "6.1.0"
 jda-webhook = "0.8.4"
-klibs-gradleplugin = "1.11.1"
+klibs-gradleplugin = "1.13.2"
 klibs-kdi = "1.4.8"
 klibs-kstorage = "4.4.1"
-klibs-mikro = "1.16.0"
+klibs-mikro = "1.16.1"
 kotlin-benchmark = "0.4.14"
 kotlin-coroutines = "1.10.2"
 kotlin-datetime = "0.7.1-0.6.x-compat"
@@ -29,26 +30,27 @@ ktor = "3.3.1"
 kyori = "4.25.0"
 kyori-adventure = "4.25.0"
 mcprotocollib = "1.21.7-SNAPSHOT"
-minecraft-astralibs = "3.28.4"
+minecraft-astralibs = "3.31.1"
 minecraft-bstats = "3.1.0"
 minecraft-bungee = "1.21-R0.5-SNAPSHOT"
 minecraft-essentialsx = "2.21.2"
-minecraft-fabric-api = "0.134.1+"
+minecraft-fabric-api = "0.136.3+"
 minecraft-fabric-yarn = "1.20.1+build.10"
-minecraft-fabric-kotlin = "1.13.1+"
-minecraft-fabric-loader = "0.17.2"
-minecraft-fabric-loom = "1.11.8"
+minecraft-fabric-kotlin = "1.13.7+"
+minecraft-fabric-loader = "0.17.3"
+minecraft-fabric-loom = "1.12.5"
 minecraft-luckperms = "5.5"
 minecraft-mockbukkit = "4.33.2"
-minecraft-mojang-version = "1.20.1"
-minecraft-packetevents = "2.10.0"
+minecraft-mojang-version = "1.21.1"
+minecraft-packetevents = "2.10.1"
 minecraft-papi = "2.11.6"
 minecraft-protocollib = "5.3.0"
 minecraft-spigot = "1.21.9-R0.1-SNAPSHOT"
 minecraft-towny = "0.101.2.1"
 minecraft-vault = "1.7.1"
 minecraft-velocity = "4.0.0-SNAPSHOT"
 minecraft-forgeversion = "47.2.20"
+minecraft-neoforgeversion = "21.1.129"
 shadow = "8.1.8"
 telegrambots = "9.2.0"
 tests-junit-bom = "6.0.1"
@@ -103,7 +105,7 @@ mcprotocollib = { module = "org.geysermc.mcprotocollib:protocol", version.ref =
 minecraft-astralibs-command = { module = "ru.astrainteractive.astralibs:command", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-command-bukkit = { module = "ru.astrainteractive.astralibs:command-bukkit", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-core-bukkit = { module = "ru.astrainteractive.astralibs:core-bukkit", version.ref = "minecraft-astralibs" }
-minecraft-astralibs-core-forge = { module = "ru.astrainteractive.astralibs:core-forge", version.ref = "minecraft-astralibs" }
+minecraft-astralibs-core-neoforge = { module = "ru.astrainteractive.astralibs:core-neoforge", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-exposed = { module = "ru.astrainteractive.astralibs:exposed", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-menu-bukkit = { module = "ru.astrainteractive.astralibs:menu-bukkit", version.ref = "minecraft-astralibs" }
 minecraft-astralibs-orm = { module = "ru.astrainteractive.astralibs:orm", version.ref = "minecraft-astralibs" }
@@ -126,6 +128,7 @@ minecraft-spigot-core = { module = "org.spigotmc:spigot", version.ref = "minecra
 minecraft-towny = { module = "com.palmergames.bukkit.towny:towny", version.ref = "minecraft-towny" }
 minecraft-vaultapi = { module = "com.github.MilkBowl:VaultAPI", version.ref = "minecraft-vault" }
 minecraft-velocity-api = { module = "com.velocitypowered:velocity-api", version.ref = "minecraft-velocity" }
+minecraft-neoforgeversion = { module = "net.neoforged:neoforge", version.ref = "minecraft-neoforgeversion" }
 telegrambots-client = { module = "org.telegram:telegrambots-client", version.ref = "telegrambots" }
 telegrambots-extensions = { module = "org.telegram:telegrambots-extensions", version.ref = "telegrambots" }
 telegrambots-longpolling = { module = "org.telegram:telegrambots-longpolling", version.ref = "telegrambots" }
@@ -142,13 +145,14 @@ turbine = { module = "app.cash.turbine:turbine", version.ref = "turbine" }
 fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
 forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" }
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
+neoforgegradle = { id = "net.neoforged.gradle.userdev", version.ref = "neoforgegradle" }
 gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" }
 gradle-shadow = { id = "com.gradleup.shadow", version.ref = "gradle-shadow" }
 klibs-gradle-detekt = { id = "ru.astrainteractive.gradleplugin.detekt", version.ref = "klibs-gradleplugin" }
 klibs-gradle-detekt-compose = { id = "ru.astrainteractive.gradleplugin.detekt.compose", version.ref = "klibs-gradleplugin" }
 klibs-gradle-dokka-module = { id = "ru.astrainteractive.gradleplugin.dokka.module", version.ref = "klibs-gradleplugin" }
 klibs-gradle-dokka-root = { id = "ru.astrainteractive.gradleplugin.dokka.root", version.ref = "klibs-gradleplugin" }
-klibs-gradle-java-core = { id = "ru.astrainteractive.gradleplugin.java.core", version.ref = "klibs-gradleplugin" }
+klibs-gradle-java-version = { id = "ru.astrainteractive.gradleplugin.java.version", version.ref = "klibs-gradleplugin" }
 klibs-gradle-minecraft-empty = { id = "ru.astrainteractive.gradleplugin.minecraft.empty", version.ref = "klibs-gradleplugin" }
 klibs-gradle-minecraft-multiplatform = { id = "ru.astrainteractive.gradleplugin.minecraft.multiplatform", version.ref = "klibs-gradleplugin" }
 klibs-gradle-publication = { id = "ru.astrainteractive.gradleplugin.publication", version.ref = "klibs-gradleplugin" }

instances/bukkit/src/main/kotlin/ru/astrainteractive/messagebridge/di/RootModuleImpl.kt

@@ -2,7 +2,7 @@ package ru.astrainteractive.messagebridge.di
 
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import ru.astrainteractive.astralibs.async.DefaultBukkitDispatchers
+import ru.astrainteractive.astralibs.coroutines.DefaultBukkitDispatchers
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
 import ru.astrainteractive.klibs.kstorage.api.impl.DefaultMutableKrate