[FEAT] Update AstraLibs to use native minecraft server instead of forge/neoforge

Author: makeevrserg

gradle/libs.versions.toml

@@ -27,7 +27,7 @@ kotlin-serialization = "1.11.0"
 kotlin-serialization-kaml = "0.104.0"
 kotlin-version = "2.2.0"
 ktor = "3.4.3"
-minecraft-astralibs = "3.39.1"
+minecraft-astralibs = "3.40.0"
 minecraft-brigadier = "1.3.10"
 minecraft-bstats = "3.2.1"
 minecraft-bungee = "26.1-R0.1-SNAPSHOT"
@@ -46,7 +46,7 @@ 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"

instances/forge/src/main/kotlin/ru/astrainteractive/messagebridge/di/RootModule.kt

@@ -4,9 +4,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.minecraftforge.fml.loading.FMLPaths
-import ru.astrainteractive.astralibs.coroutines.ForgeDispatchers
+import ru.astrainteractive.astralibs.coroutines.MinecraftDispatchers
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
-import ru.astrainteractive.astralibs.server.bridge.ForgePlatformServer
+import ru.astrainteractive.astralibs.server.bridge.MinecraftPlatformServer
 import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger
 import ru.astrainteractive.klibs.mikro.core.logging.Logger
 import ru.astrainteractive.messagebridge.core.di.CoreModule
@@ -29,8 +29,8 @@ class RootModule : Logger by JUtiltLogger("MessageBridge-RootModuleImpl").withou
                 .toAbsolutePath()
                 .toFile()
                 .also(File::mkdirs),
-            dispatchers = ForgeDispatchers(),
-            platformServer = ForgePlatformServer
+            dispatchers = MinecraftDispatchers(),
+            platformServer = MinecraftPlatformServer
         )
     }
 

instances/neoforge/src/main/kotlin/ru/astrainteractive/messagebridge/di/RootModule.kt

@@ -4,9 +4,9 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import net.neoforged.fml.loading.FMLPaths
-import ru.astrainteractive.astralibs.coroutines.NeoForgeDispatchers
+import ru.astrainteractive.astralibs.coroutines.MinecraftDispatchers
 import ru.astrainteractive.astralibs.lifecycle.Lifecycle
-import ru.astrainteractive.astralibs.server.bridge.NeoForgePlatformServer
+import ru.astrainteractive.astralibs.server.bridge.MinecraftPlatformServer
 import ru.astrainteractive.klibs.mikro.core.logging.JUtiltLogger
 import ru.astrainteractive.klibs.mikro.core.logging.Logger
 import ru.astrainteractive.messagebridge.core.di.CoreModule
@@ -29,8 +29,8 @@ class RootModule : Logger by JUtiltLogger("MessageBridge-RootModuleImpl").withou
                 .toAbsolutePath()
                 .toFile()
                 .also(File::mkdirs),
-            dispatchers = NeoForgeDispatchers(),
-            platformServer = NeoForgePlatformServer
+            dispatchers = MinecraftDispatchers(),
+            platformServer = MinecraftPlatformServer
         )
     }
 

modules/core/forge/src/main/kotlin/ru/astrainteractive/messagebridge/forge/core/api/ForgeOnlinePlayersProvider.kt

@@ -2,12 +2,12 @@ package ru.astrainteractive.messagebridge.forge.core.api
 
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
-import ru.astrainteractive.astralibs.server.util.ForgeUtil
+import ru.astrainteractive.astralibs.server.util.MinecraftUtil
 import ru.astrainteractive.messagebridge.core.api.OnlinePlayersProvider
 
 class ForgeOnlinePlayersProvider : OnlinePlayersProvider {
     override fun provide(): List<String> {
-        return ForgeUtil.serverOrNull
+        return MinecraftUtil.serverOrNull
             ?.playerList
             ?.players
             .orEmpty()

modules/core/neoforge/src/main/kotlin/ru/astrainteractive/messagebridge/forge/core/api/NeoForgeOnlinePlayersProvider.kt

@@ -2,12 +2,12 @@ package ru.astrainteractive.messagebridge.forge.core.api
 
 import net.minecraft.network.chat.Component
 import net.minecraft.server.level.ServerPlayer
-import ru.astrainteractive.astralibs.server.util.NeoForgeUtil
+import ru.astrainteractive.astralibs.server.util.MinecraftUtil
 import ru.astrainteractive.messagebridge.core.api.OnlinePlayersProvider
 
 class NeoForgeOnlinePlayersProvider : OnlinePlayersProvider {
     override fun provide(): List<String> {
-        return NeoForgeUtil.serverOrNull
+        return MinecraftUtil.serverOrNull
             ?.playerList
             ?.players
             .orEmpty()

modules/messenger/forge/src/main/kotlin/ru/astrainteractive/messagebridge/messenger/forge/messaging/ForgeBEventConsumer.kt

@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import ru.astrainteractive.astralibs.coroutines.withTimings
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
-import ru.astrainteractive.astralibs.server.util.ForgeUtil
+import ru.astrainteractive.astralibs.server.util.MinecraftUtil
 import ru.astrainteractive.astralibs.server.util.toNative
 import ru.astrainteractive.klibs.kstorage.api.CachedKrate
 import ru.astrainteractive.klibs.kstorage.api.getValue
@@ -48,7 +48,7 @@ internal class ForgeBEventConsumer(
             is PlayerDeathBEvent -> null
         }?.let(KyoriComponentSerializer.Legacy::toComponent) ?: return
 
-        ForgeUtil.serverOrNull?.playerList?.players.orEmpty().forEach { player ->
+        MinecraftUtil.serverOrNull?.playerList?.players.orEmpty().forEach { player ->
             player.sendSystemMessage(component.toNative())
         }
     }

modules/messenger/neoforge/src/main/kotlin/ru/astrainteractive/messagebridge/messenger/forge/messaging/NeoForgeBEventConsumer.kt

@@ -4,7 +4,7 @@ import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
 import ru.astrainteractive.astralibs.coroutines.withTimings
 import ru.astrainteractive.astralibs.kyori.KyoriComponentSerializer
-import ru.astrainteractive.astralibs.server.util.NeoForgeUtil
+import ru.astrainteractive.astralibs.server.util.MinecraftUtil
 import ru.astrainteractive.astralibs.server.util.toNative
 import ru.astrainteractive.klibs.kstorage.api.CachedKrate
 import ru.astrainteractive.klibs.kstorage.api.getValue
@@ -48,7 +48,7 @@ internal class NeoForgeBEventConsumer(
             is PlayerDeathBEvent -> null
         }?.let(KyoriComponentSerializer.Legacy::toComponent) ?: return
 
-        NeoForgeUtil.serverOrNull?.playerList?.players.orEmpty().forEach { player ->
+        MinecraftUtil.serverOrNull?.playerList?.players.orEmpty().forEach { player ->
             player.sendSystemMessage(component.toNative())
         }
     }

settings.gradle.kts

@@ -1,9 +1,10 @@
 pluginManagement {
     repositories {
         maven("https://maven.neoforged.net/releases")
-        maven("https://maven.minecraftforge.net")
         maven("https://files.minecraftforge.net/maven")
+        maven("https://maven.minecraftforge.net")
         maven("https://plugins.gradle.org/m2/")
+        maven("https://maven.fabricmc.net/")
         maven("https://jitpack.io")
         gradlePluginPortal()
         mavenCentral()
@@ -22,8 +23,7 @@ dependencyResolutionManagement {
         gradlePluginPortal()
         mavenCentral()
         mavenLocal()
-        maven("https://maven.minecraftforge.net/")
-        maven("https://files.minecraftforge.net/maven")
+        google()
         maven("https://repo.extendedclip.com/content/repositories/placeholderapi/")
         maven("https://hub.spigotmc.org/nexus/content/repositories/snapshots/")
         maven("https://papermc.io/repo/repository/maven-public/")
@@ -34,10 +34,15 @@ dependencyResolutionManagement {
         maven("https://repo.dmulloy2.net/repository/public/")
         maven("https://repo.essentialsx.net/snapshots/")
         maven("https://repo.essentialsx.net/releases/")
+        maven("https://files.minecraftforge.net/maven")
         maven("https://repo.maven.apache.org/maven2/")
+        maven("https://maven.neoforged.net/releases")
         maven("https://maven.enginehub.org/repo/")
+        maven("https://maven.minecraftforge.net/")
         maven("https://m2.dv8tion.net/releases")
         maven("https://repo1.maven.org/maven2/")
+        maven("https://plugins.gradle.org/m2/")
+        maven("https://maven.fabricmc.net/")
         maven("https://maven.playpro.com")
         maven("https://jitpack.io")
     }