From 9b1b1446814f971e914c034aab00c95fdae87163 Mon Sep 17 00:00:00 2001
From: Linnea Gräf <nea@nea.moe>
Date: Sat, 20 Jul 2024 14:46:34 +0200
Subject: Remove dbus integration

[no changelog]
---
 src/main/kotlin/moe/nea/firmament/Firmament.kt | 15 ---------------
 1 file changed, 15 deletions(-)

(limited to 'src/main/kotlin/moe/nea/firmament/Firmament.kt')

diff --git a/src/main/kotlin/moe/nea/firmament/Firmament.kt b/src/main/kotlin/moe/nea/firmament/Firmament.kt
index 9a04db1..e2b904f 100644
--- a/src/main/kotlin/moe/nea/firmament/Firmament.kt
+++ b/src/main/kotlin/moe/nea/firmament/Firmament.kt
@@ -30,8 +30,6 @@ import net.fabricmc.loader.api.Version
 import net.fabricmc.loader.api.metadata.ModMetadata
 import org.apache.logging.log4j.LogManager
 import org.apache.logging.log4j.Logger
-import org.freedesktop.dbus.connections.impl.DBusConnectionBuilder
-import org.freedesktop.dbus.exceptions.DBusException
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -43,7 +41,6 @@ import kotlin.coroutines.EmptyCoroutineContext
 import net.minecraft.command.CommandRegistryAccess
 import net.minecraft.util.Identifier
 import moe.nea.firmament.commands.registerFirmamentCommand
-import moe.nea.firmament.dbus.FirmamentDbusObject
 import moe.nea.firmament.events.ClientStartedEvent
 import moe.nea.firmament.events.CommandEvent
 import moe.nea.firmament.events.ItemTooltipEvent
@@ -97,12 +94,6 @@ object Firmament {
     }
 
     val globalJob = Job()
-    val dbusConnection = try {
-        DBusConnectionBuilder.forSessionBus()
-            .build()
-    } catch (e: Exception) {
-        null
-    }
     val coroutineScope =
         CoroutineScope(EmptyCoroutineContext + CoroutineName("Firmament")) + SupervisorJob(globalJob)
 
@@ -121,12 +112,6 @@ object Firmament {
 
     @JvmStatic
     fun onClientInitialize() {
-        try {
-            dbusConnection?.exportObject(FirmamentDbusObject)
-            dbusConnection?.requestBusName("moe.nea.firmament")
-        } catch (e: DBusException) {
-            // :(
-        }
         var tick = 0
         ClientTickEvents.END_CLIENT_TICK.register(ClientTickEvents.EndTick { instance ->
             TickEvent.publish(TickEvent(tick++))
-- 
cgit