From 81491398e9db7af2e7d4313cc9031d69b6b70bbc Mon Sep 17 00:00:00 2001 From: Mohammed Alteneiji Date: Wed, 1 Apr 2026 15:58:59 +0400 Subject: [PATCH] make introduce libs of redisbungee back --- .github/workflows/gradle.yml | 6 +++--- build.gradle.kts | 3 +++ gradle.properties | 5 ++++- gradle/libs.versions.toml | 33 +++++++++++++++++++++++++++++++-- settings.gradle.kts | 21 +++++++++++++++++---- 5 files changed, 58 insertions(+), 10 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7b16813..6801dbf 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -29,14 +29,14 @@ jobs: # Artifact name name: RedisBungee-Bungee # Destination path - path: proxies/bungeecord/build/libs/* + path: redisbungee/proxies/bungeecord/build/libs/* - name: Upload Velocity uses: actions/upload-artifact@v4.4.0 with: name: RedisBungee-Velocity - path: proxies/velocity/build/libs/* + path: redisbungee/proxies/velocity/build/libs/* - name: Upload API uses: actions/upload-artifact@v4.4.0 with: name: RedisBungee-API - path: api/build/libs/* + path: redisbungee/api/build/libs/* diff --git a/build.gradle.kts b/build.gradle.kts index d7db9cd..7934b91 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -25,11 +25,14 @@ subprojects { } } extensions.configure { + var redisBungeeProjects = sequenceOf("RedisBungee-API", "RedisBungee-Lang", "RedisBungee-Commands", "RedisBungee-Bungee", "RedisBungee-Proxy-Bungee", "RedisBungee-Velocity", "RedisBungee-Proxy-Velocity") java { removeUnusedImports() googleJavaFormat() if (project.name == "valiobungee-api") { licenseHeaderFile(file("copyright_header.txt")) + } else if (redisBungeeProjects.contains(project.name)) { + licenseHeaderFile(rootProject.file("redisbungee/copyright_header.txt")) } else { licenseHeaderFile(rootProject.file("copyright_header.txt")) } diff --git a/gradle.properties b/gradle.properties index 1c6aa28..27abe91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,6 @@ group=net.limework version=1.0.0-SNAPSHOT -api-version=v1 \ No newline at end of file +api-version=v1 + +redisbungee-group=com.imaginarycode.minecraft +redisbungee-version=0.13.0-SNAPSHOT \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e32a413..dd8d046 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,22 +3,51 @@ protobuf-plugin = "0.9.5" protobuf = "3.25.8" # needed for reference to be used for protoc slf4j = "2.0.17" +guava = "33.5.0-jre" +jedis = "5.2.0" +okhttp = "4.12.0" +configurateV3 = "3.7.3" +adventure = "4.26.1" +adventure-bungeecord-platform = "4.4.1" +acf = "e2005dd62d" +bungeecordApi = "1.21-R0.5-SNAPSHOT" +velocity = "3.5.0-SNAPSHOT" + [plugins] blossom = "net.kyori.blossom:2.2.0" indragit = "net.kyori.indra.git:4.0.0" shadow = "com.gradleup.shadow:9.3.1" spotless = "com.diffplug.spotless:8.2.0" protobuf = { id = "com.google.protobuf", version.ref = "protobuf-plugin" } +run-velocity = { id = "xyz.jpenilla.run-velocity", version = "2.3.1" } [libraries] -redisson = "org.redisson:redisson:4.3.0" +# protobuf protobuf = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" } protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" } -caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.3" +# valiobungee +redisson = "org.redisson:redisson:4.3.0" +caffeine = "com.github.ben-manes.caffeine:caffeine:3.2.3" # logging slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" } + # testing testing-juipter = "org.junit.jupiter:junit-jupiter:6.0.3" testing-slf4j-simple = { group = "org.slf4j", name = "slf4j-simple", version.ref = "slf4j" } +# redisbungee speific +guava = { module = "com.google.guava:guava", version.ref = "guava" } +jedis = { module = "redis.clients:jedis", version.ref = "jedis" } +okhttp = { module = "com.squareup.okhttp3:okhttp", version.ref = "okhttp" } +configurateV3 = { module = "org.spongepowered:configurate-yaml", version.ref = "configurateV3" } + +# minecraft speific +adventure-api = { module = "net.kyori:adventure-api", version.ref = "adventure" } +adventure-miniMessage = { module = "net.kyori:adventure-text-minimessage", version.ref = "adventure" } +acf-core = { module = "com.github.ProxioDev.commands:acf-core", version.ref = "acf" } +acf-bungeecord = { module = "com.github.ProxioDev.commands:acf-bungee", version.ref = "acf" } +acf-velocity = { module = "com.github.ProxioDev.commands:acf-velocity", version.ref = "acf" } +platform-bungeecord = { module = "net.md-5:bungeecord-api", version.ref = "bungeecordApi" } +adventure-platforms-bungeecord = { module = "net.kyori:adventure-platform-bungeecord", version.ref = "adventure-bungeecord-platform" } +platform-velocity = { module = "com.velocitypowered:velocity-api", version.ref = "velocity" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 44f6fb5..6131d13 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,10 +9,12 @@ rootProject.name = "ValioBungee" fun configureProject(name: String) { val projectName = ":valiobungee-$name" - include(projectName) - project(projectName).projectDir = file(name) + configureProject(projectName,name) +} +fun configureProject(name: String, path: String) { + include(name) + project(name).projectDir = file(path) } - dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) @@ -24,4 +26,15 @@ dependencyResolutionManagement { } } -sequenceOf("core", "api").forEach{configureProject(it)} \ No newline at end of file +// main project stuff +sequenceOf("core", "api").forEach{configureProject(it)} +// RedisBunggee Project +// configureProject(":RedisBungee-API", "redisbungee/api") +// configureProject(":RedisBungee-Lang", "redisbungee/lang") +// configureProject(":RedisBungee-Commands", "redisbungee/commands") + +// configureProject(":RedisBungee-Bungee", "redisbungee/proxies/bungeecord/bungeecord-api") +// configureProject(":RedisBungee-Proxy-Bungee", "redisbungee/proxies/bungeecord") + +// configureProject(":RedisBungee-Velocity", "redisbungee/proxies/velocity/velocity-api") +// configureProject(":RedisBungee-Proxy-Velocity", "redisbungee/proxies/velocity") \ No newline at end of file