diff --git a/src/main/kotlin/nl/enjarai/doabarrelroll/compat/flightassistant/DaBRCompatFA.kt b/src/main/kotlin/nl/enjarai/doabarrelroll/compat/flightassistant/DaBRCompatFA.kt index 6c6e9fb..33ab0b7 100644 --- a/src/main/kotlin/nl/enjarai/doabarrelroll/compat/flightassistant/DaBRCompatFA.kt +++ b/src/main/kotlin/nl/enjarai/doabarrelroll/compat/flightassistant/DaBRCompatFA.kt @@ -1,7 +1,6 @@ package nl.enjarai.doabarrelroll.compat.flightassistant import dev.architectury.platform.Platform -import net.fabricmc.api.ClientModInitializer import net.minecraft.text.Text import ru.octol1ttle.flightassistant.FlightAssistant import ru.octol1ttle.flightassistant.api.alert.AlertCategory @@ -10,10 +9,10 @@ import ru.octol1ttle.flightassistant.api.autoflight.thrust.ThrustSourceRegistrat import ru.octol1ttle.flightassistant.api.computer.ComputerRegistrationCallback import ru.octol1ttle.flightassistant.impl.alert.fault.computer.ComputerFaultAlert -object DaBRCompatFA : ClientModInitializer { +object DaBRCompatFA { private lateinit var thrustComputer: DaBRThrustComputer - override fun onInitializeClient() { + fun init() { if (!Platform.isModLoaded("do_a_barrel_roll")) { return } diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt index 02c3e41..c3759d4 100644 --- a/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt +++ b/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantFabric.kt @@ -4,10 +4,12 @@ package ru.octol1ttle.flightassistant import dev.architectury.registry.client.keymappings.KeyMappingRegistry import net.fabricmc.api.ClientModInitializer import net.minecraft.client.option.KeyBinding +import nl.enjarai.doabarrelroll.compat.flightassistant.DaBRCompatFA object FlightAssistantFabric : ClientModInitializer { override fun onInitializeClient() { FlightAssistant.init() + DaBRCompatFA.init() for (keyBinding: KeyBinding in FAKeyBindings.keyBindings) { KeyMappingRegistry.register(keyBinding) } diff --git a/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantForge.kt b/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantForge.kt index 3b441ff..cdbdb58 100644 --- a/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantForge.kt +++ b/src/main/kotlin/ru/octol1ttle/flightassistant/FlightAssistantForge.kt @@ -22,11 +22,11 @@ import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay import net.minecraftforge.eventbus.api.IEventBus import net.minecraftforge.fml.ModLoadingContext import net.minecraftforge.fml.common.Mod +import nl.enjarai.doabarrelroll.compat.flightassistant.DaBRCompatFA import ru.octol1ttle.flightassistant.api.util.event.FixedHudRenderCallback import ru.octol1ttle.flightassistant.config.FAConfigScreen import thedarkcolour.kotlinforforge.KotlinModLoadingContext - typealias CSF = net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactory ^///?} @@ -34,6 +34,7 @@ typealias CSF = net.minecraftforge.client.ConfigScreenHandler.ConfigScreenFactor object FlightAssistantForge { init { FlightAssistant.init() + DaBRCompatFA.init() ModLoadingContext.get().registerExtensionPoint( CSF::class.java, ) { CSF { _, parent -> FAConfigScreen.generate(parent) } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 16a8d21..5277510 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -21,10 +21,6 @@ { "value": "ru.octol1ttle.flightassistant.FlightAssistantFabric", "adapter": "kotlin" - }, - { - "value": "nl.enjarai.doabarrelroll.compat.flightassistant.DaBRCompatFA", - "adapter": "kotlin" } ], "modmenu": [