Skip to content
This repository was archived by the owner on Dec 10, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[versions]
velocity-version = "3.4.0-SNAPSHOT"
aide-reflection = "1.3"
netty = "4.1.117.Final"
netty = "4.2.0.Final"
netty-tcnative = "2.0.70.Final"
nbt = "6.1"
datafixerupper = "8.0.16"
byte-buddy = "1.15.10"
Expand Down Expand Up @@ -29,6 +30,7 @@ jackson-databind = { module = "com.fasterxml.jackson.core:jackson-databind" }
jackson-module-kotlin = { module = "com.fasterxml.jackson.module:jackson-module-kotlin" }
aide-reflection = { module = "tech.hiddenproject:aide-reflection", version.ref = "aide-reflection" }
netty-all = { module = "io.netty:netty-all", version.ref = "netty" }
netty-tcnative = { module = "io.netty:netty-tcnative", version.ref = "netty-tcnative" }
nbt = { module = "com.github.Querz:NBT", version.ref = "nbt" }
spring-data-jpa = { module = "org.springframework.data:spring-data-jpa" }
datafixerupper = { module = "com.mojang:datafixerupper", version.ref = "datafixerupper" }
Expand Down Expand Up @@ -73,6 +75,7 @@ kotlin-byte-buf-serializer = { module = "dev.slne.surf:kotlin-byte-buf-serialize
spring-boot = { id = "org.springframework.boot" }

[bundles]
netty-all = ["netty-all", "netty-tcnative"]
spring-aop = ["spring-aop", "aspectjweaver", "aspectjrt", "spring-aspects"]
spring-api-common = ["spring-boot-starter", "spring-boot-starter-cache"]
jackson-api-common = ["jackson-core", "jackson-databind", "jackson-module-kotlin"]
Expand Down
2 changes: 1 addition & 1 deletion surf-cloud-api/surf-cloud-api-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies {
api(libs.bundles.spring.aop)

api(libs.aide.reflection)
api(libs.netty.all)
api(libs.bundles.netty.all)
api(libs.kotlin.byte.buf.serializer) {
exclude(group = "io.netty")
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package dev.slne.surf.cloud.standalone.netty.server.network

import dev.slne.surf.cloud.core.common.netty.network.EncryptionManager
import dev.slne.surf.cloud.core.common.netty.network.HandlerNames
import dev.slne.surf.surfapi.core.api.util.logger
import io.netty.channel.Channel
import io.netty.handler.ssl.ClientAuth
import io.netty.handler.ssl.SslContext
Expand All @@ -12,8 +11,6 @@ import java.security.cert.CertificateFactory
import javax.net.ssl.TrustManagerFactory

object ServerEncryptionManager : EncryptionManager() {
private val log = logger()

private val serverCertificateFile = certificatesFolder.resolve("server.crt").toFile()
private val serverKeyFile = certificatesFolder.resolve("server.key").toFile()
private val clientCertificatesFolder =
Expand Down