[FEAT] Forge support

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

@@ -12,6 +12,8 @@ jobs:
             task: ":instances:bukkit:build"
           - id: "neoforge"
             task: ":instances:neoforge:build --info --stacktrace"
+          - id: "forge"
+            task: ":instances:forge:build --info --stacktrace"
     steps:
       - name: Checkout Git repo
         uses: actions/checkout@v6

.github/workflows/call-gradle-wrapper-validation.yml

@@ -9,4 +9,4 @@ jobs:
     steps:
       - uses: actions/checkout@v6
       - name: Validate Gradle Wrapper
-        uses: gradle/wrapper-validation-action@v3
+        uses: gradle/actions/wrapper-validation@v6

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

@@ -12,6 +12,8 @@ jobs:
             task: ":instances:bukkit:shadowJar"
           - id: "neoforge"
             task: ":instances:neoforge:shadowJar"
+          - id: "forge"
+            task: ":instances:forge:shadowJar"
     steps:
       - name: Checkout Git repo
         uses: actions/checkout@v6

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

@@ -30,6 +30,12 @@ jobs:
           name: neoforge
           path: ./jars
 
+      - uses: actions/download-artifact@d0ce8fd1167ed839810201de977912a090ab10a7
+        name: "Download forge"
+        with:
+          name: forge
+          path: ./jars
+
       - name: Create release
         id: create_internal_release
         uses: softprops/action-gh-release@v2

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

@@ -15,6 +15,8 @@ jobs:
             task: ":instances:bukkit:shadowJar"
           - id: "neoforge"
             task: ":instances:neoforge:shadowJar"
+          - id: "forge"
+            task: ":instances:forge:shadowJar"
     steps:
       - name: Checkout Git repo
         uses: actions/checkout@v6

build.gradle.kts

@@ -14,21 +14,17 @@ plugins {
 
     // klibs - core
     alias(libs.plugins.klibs.gradle.detekt) 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.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.gradle.neoforgegradle) apply false
 }
 
-apply(plugin = "ru.astrainteractive.gradleplugin.dokka.root")
 apply(plugin = "ru.astrainteractive.gradleplugin.detekt")
 apply(plugin = "ru.astrainteractive.gradleplugin.rootinfo")
 
 subprojects.forEach {
-    it.apply(plugin = "ru.astrainteractive.gradleplugin.dokka.module")
     it.plugins.withId("org.jetbrains.kotlin.jvm") {
         it.apply(plugin = "ru.astrainteractive.gradleplugin.java.version")
     }

docker-compose.yml

@@ -1,27 +1,36 @@
 services:
-  # For command call use `docker exec mc_docker_soulkeeper rcon-cli <your_command>`
-  mc_docker_soulkeeper:
+  # For command call use `docker exec mc_docker_mbridge rcon-cli <your_command>`
+  mc_docker_mbridge:
     restart: no
-    container_name: mc_docker_soulkeeper
+    container_name: mc_docker_mbridge
     image: itzg/minecraft-server # https://github.com/itzg/docker-minecraft-server
     tty: true
     stdin_open: true
     ports:
       - "25565:25565"
     environment:
+      LEVEL_TYPE: FLAT
+      EXISTING_OPS_FILE: MERGE
+      OPS: |
+        RomaRoman
       EULA: true
       ONLINE_MODE: false
+      # NeoForge --------------------
+      #      TYPE: NEOFORGE
+      #      VERSION: "1.20.1"
+      #      NEOFORGE_VERSION: "21.1.129"
       # Forge --------------------
-#      TYPE: NEOFORGE
-#      VERSION: "1.21.1"
-#      NEOFORGE_VERSION: "21.1.209"
+#      TYPE: FORGE
+#      VERSION: "1.20.1"
+#      FORGE_VERSION: "47.4.12"
       # Paper --------------------
       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
     volumes:
-#      - ./build/neoforge:/data # Forge
+#      - ./build/forge:/data # Forge
+#      - ./build/neoforge:/data # NeoForge
       - ./build/bukkit:/data # Bukkit/Paper/Spigot
 #      - ./build/velocity:/data # Velocity
 #      - ./build/fabric:/data # Fabric

gradle.properties

@@ -13,7 +13,7 @@ klibs.java.ktarget=21
 # Project
 klibs.project.name=SoulKeeper
 klibs.project.group=ru.astrainteractive.soulkeeper
-klibs.project.version.string=1.7.0
+klibs.project.version.string=1.8.0
 klibs.project.description=Keep your items after death
 klibs.project.developers=makeevrserg|Makeev Roman|makeevrserg@gmail.com
 klibs.project.url=https://github.com/Astra-Interactive/SoulKeeper

gradle/libs.versions.toml

@@ -6,7 +6,6 @@ driver-jdbc = "3.53.0.0"
 driver-mariadb = "3.5.8"
 driver-mysql = "8.0.33"
 exposed = "1.2.0"
-forgegradle = "[6.0,6.2)"
 gradle-buildconfig = "6.0.9"
 gradle-ftp = "0.1.3"
 gradle-shadow = "9.4.1"
@@ -16,7 +15,7 @@ jda = "6.4.1"
 jda-webhook = "0.8.4"
 jmh-core = "1.37"
 joml = "1.10.8"
-klibs-gradleplugin = "2.0.0"
+klibs-gradleplugin = "2.0.3"
 klibs-kdi = "1.4.8"
 klibs-kstorage = "5.0.4"
 klibs-mikro = "1.23.0"
@@ -28,22 +27,26 @@ kotlin-serialization = "1.11.0"
 kotlin-serialization-kaml = "0.104.0"
 kotlin-version = "2.2.0"
 ktor = "3.4.3"
-minecraft-astralibs = "3.35.0"
+minecraft-astralibs = "3.40.2"
 minecraft-brigadier = "1.3.10"
 minecraft-bstats = "3.2.1"
 minecraft-bungee = "26.1-R0.1-SNAPSHOT"
 minecraft-datafixerupper = "8.0.16"
 minecraft-essentialsx = "2.21.2"
 minecraft-fabric-api = "0.139.5+"
-minecraft-fabric-yarn = "1.20.1+build.10"
 minecraft-fabric-kotlin = "1.13.7+"
 minecraft-fabric-loader = "0.19.2"
 minecraft-fabric-loom = "1.16.1"
+minecraft-fabric-yarn = "1.20.1+build.10"
+minecraft-forge-bus="6.0.5"
+minecraft-forgegradle = "7.0.25"
+minecraft-forgerenamer = "1.0.14"
+minecraft-forgeversion = "1.20.1-47.4.12"
 minecraft-kyori = "5.0.1"
 minecraft-luckperms = "5.5"
 minecraft-mcprotocollib = "1.21.7-SNAPSHOT"
 minecraft-mockbukkit = "4.108.0"
-minecraft-mojang-version = "1.21.11"
+minecraft-mojang-version = "1.20.1"
 minecraft-neoforged-bus = "8.0.2"
 minecraft-neoforgegradle = "7.1.20"
 minecraft-neoforgeversion = "21.1.129"
@@ -117,6 +120,8 @@ minecraft-fabric-api = { module = "net.fabricmc.fabric-api:fabric-api", version.
 minecraft-fabric-kotlin = { module = "net.fabricmc:fabric-language-kotlin", version.ref = "minecraft-fabric-kotlin" }
 minecraft-fabric-loader = { module = "net.fabricmc:fabric-loader", version.ref = "minecraft-fabric-loader" }
 minecraft-fabric-mojang = { module = "com.mojang:minecraft", version.ref = "minecraft-mojang-version" }
+minecraft-forge-bus = { module = "net.minecraftforge:eventbus", version.ref = "minecraft-forge-bus" }
+minecraft-forgeversion = { module = "net.minecraftforge:forge", version.ref = "minecraft-forgeversion" }
 minecraft-kyori-api = { module = "net.kyori:adventure-api", version.ref = "minecraft-kyori" }
 minecraft-kyori-gson = { module = "net.kyori:adventure-text-serializer-gson", version.ref = "minecraft-kyori" }
 minecraft-kyori-legacy = { module = "net.kyori:adventure-text-serializer-legacy", version.ref = "minecraft-kyori" }
@@ -151,13 +156,13 @@ tests-turbine = { module = "app.cash.turbine:turbine", version.ref = "tests-turb
 [plugins]
 gradle-buildconfig = { id = "com.github.gmazzo.buildconfig", version.ref = "gradle-buildconfig" }
 gradle-fabric-loom = { id = "fabric-loom", version.ref = "minecraft-fabric-loom" }
-gradle-forgegradle = { id = "net.minecraftforge.gradle", version.ref = "forgegradle" }
+gradle-forgegradle = { id = "net.minecraftforge.gradle", version.ref = "minecraft-forgegradle" }
+gradle-forgerenamer = { id = "net.minecraftforge.renamer", version.ref = "minecraft-forgerenamer" }
 gradle-ftp = { id = "ru.astrainteractive.ftpplugin.gradleftp", version.ref = "gradle-ftp" }
 gradle-neoforgegradle = { id = "net.neoforged.gradle.userdev", version.ref = "minecraft-neoforgegradle" }
 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" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,16 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
 networkTimeout=10000
+retries=0
+retryBackOffMs=500
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+
+
+
+
+
+
+