diff --git a/android/assets/music/thatched-villagers.mp3 b/android/assets/music/thatched-villagers.mp3 deleted file mode 100644 index 4107c94f9a..0000000000 Binary files a/android/assets/music/thatched-villagers.mp3 and /dev/null differ diff --git a/build.gradle.kts b/build.gradle.kts index beb16e57a9..111887ab53 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -68,7 +68,6 @@ project(":desktop") { "implementation"("com.badlogicgames.gdx:gdx-tools:$gdxVersion") // This is for the TexturePacker class "implementation"("com.github.MinnDevelopment:java-discord-rpc:v2.0.1") - "implementation"("io.ktor:ktor-server-netty:1.3.2") } } diff --git a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt index 1603d0a275..a3c694f7f1 100644 --- a/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt +++ b/desktop/src/com/unciv/app/desktop/DesktopLauncher.kt @@ -15,13 +15,6 @@ import com.unciv.logic.GameSaver import com.unciv.models.metadata.GameSettings import com.unciv.models.translations.tr import com.unciv.ui.utils.Fonts -import io.ktor.application.* -import io.ktor.http.* -import io.ktor.request.* -import io.ktor.response.* -import io.ktor.routing.* -import io.ktor.server.engine.* -import io.ktor.server.netty.* import java.util.* import kotlin.concurrent.timer @@ -64,56 +57,6 @@ internal object DesktopLauncher { LwjglApplication(game, config) } - // Work in Progress? - @Suppress("unused") - private fun startMultiplayerServer() { -// val games = HashMap() - val files = HashMap() - embeddedServer(Netty, 8080) { - routing { - get("/files/getFile/{fileName}") { - val fileName = call.parameters["fileName"] - if (!files.containsKey(fileName)) call.respond(HttpStatusCode.NotFound, - "Game with the name $fileName does not exist") - else call.respondText(files[fileName]!!) - } - - post("/files/{fileName}") { - val fileName = call.parameters["fileName"]!! - val body = call.receiveText() - files[fileName] = body - } -// -// get("/getGame/{gameName}") { -// val gameName = call.parameters["gameName"] -// if(!games.containsKey(gameName)) call.respond(HttpStatusCode.NotFound, -// "Game with the name $gameName does not exist") -// else call.respondText(Json().toJson(games[gameName])) -// } -// get("/getGameNames"){ -// call.respondText(Json().toJson(games.keys.toList())) -// } -// post("/addNewGame/{gameName}") { -// val gameName = call.parameters["gameName"]!! -// if (games.containsKey(gameName)) { -// call.respond(HttpStatusCode.NotAcceptable, "A game with the name $gameName already exists") -// return@post -// } -// val body = call.receiveText() -// val newGameInfo:GameSetupInfo -// try{ -// newGameInfo = Json().apply { ignoreUnknownFields }.fromJson(GameSetupInfo::class.java, body) -// } -// catch (ex:Exception){ -// call.respond(HttpStatusCode.NotAcceptable, "Could not deserialize json") -// return@post -// } -// games[gameName] = newGameInfo -// } - } - }.start() - } - private fun tryActivateDiscord(game: UncivGame) { try { /*