From d841a5fe1a68c04513103ebcef0d63aa36295e57 Mon Sep 17 00:00:00 2001 From: DBotThePony Date: Wed, 11 Oct 2023 16:20:57 +0700 Subject: [PATCH] Statically initialize criteria triggers --- .../dbotthepony/mc/otm/registry/MRegistry.kt | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt index c99cc71ab..2457b71f8 100644 --- a/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt +++ b/src/main/kotlin/ru/dbotthepony/mc/otm/registry/MRegistry.kt @@ -286,33 +286,33 @@ object MRegistry { // call static constructors NanobotsArmorFeature.Companion EnderTeleporterFeature.Companion + + CriteriaTriggers.register(BlackHoleTrigger.id.toString(), BlackHoleTrigger) + CriteriaTriggers.register(BecomeAndroidTrigger.id.toString(), BecomeAndroidTrigger) + CriteriaTriggers.register(BecomeAndroidDeathTrigger.id.toString(), BecomeAndroidDeathTrigger) + CriteriaTriggers.register(BecomeAndroidSleepTrigger.id.toString(), BecomeAndroidSleepTrigger) + CriteriaTriggers.register(BecomeHumaneTrigger.id.toString(), BecomeHumaneTrigger) + CriteriaTriggers.register(AndroidResearchTrigger.id.toString(), AndroidResearchTrigger) + CriteriaTriggers.register(ShockwaveDamageMobTrigger.id.toString(), ShockwaveDamageMobTrigger) + CriteriaTriggers.register(ShockwaveTrigger.id.toString(), ShockwaveTrigger) + CriteriaTriggers.register(AndroidBatteryTrigger.id.toString(), AndroidBatteryTrigger) + CriteriaTriggers.register(NanobotsArmorTrigger.id.toString(), NanobotsArmorTrigger) + CriteriaTriggers.register(FallDampenersSaveTrigger.id.toString(), FallDampenersSaveTrigger) + CriteriaTriggers.register(EnderTeleporterFallDeathTrigger.id.toString(), EnderTeleporterFallDeathTrigger) + CriteriaTriggers.register(KillAsAndroidTrigger.id.toString(), KillAsAndroidTrigger) + CriteriaTriggers.register(AndroidTravelUnderwater.id.toString(), AndroidTravelUnderwater) + CriteriaTriggers.register(NailedEntityTrigger.id.toString(), NailedEntityTrigger) + CriteriaTriggers.register(ExopackObtainedTrigger.id.toString(), ExopackObtainedTrigger) + CriteriaTriggers.register(ExopackGainedSmeltingTrigger.id.toString(), ExopackGainedSmeltingTrigger) + CriteriaTriggers.register(ExopackGainedCraftingTrigger.id.toString(), ExopackGainedCraftingTrigger) + CriteriaTriggers.register(ExopackGainedEnderAccessTrigger.id.toString(), ExopackGainedEnderAccessTrigger) + CriteriaTriggers.register(ExopackSlotsExpandedTrigger.id.toString(), ExopackSlotsExpandedTrigger) + CriteriaTriggers.register(ExopackBatterySlotTrigger.id.toString(), ExopackBatterySlotTrigger) + CriteriaTriggers.register(TakeItemOutOfReplicatorTrigger.id.toString(), TakeItemOutOfReplicatorTrigger) } private fun initializeCommon(event: FMLCommonSetupEvent) { - event.enqueueWork { - CriteriaTriggers.register(BlackHoleTrigger.id.toString(), BlackHoleTrigger) - CriteriaTriggers.register(BecomeAndroidTrigger.id.toString(), BecomeAndroidTrigger) - CriteriaTriggers.register(BecomeAndroidDeathTrigger.id.toString(), BecomeAndroidDeathTrigger) - CriteriaTriggers.register(BecomeAndroidSleepTrigger.id.toString(), BecomeAndroidSleepTrigger) - CriteriaTriggers.register(BecomeHumaneTrigger.id.toString(), BecomeHumaneTrigger) - CriteriaTriggers.register(AndroidResearchTrigger.id.toString(), AndroidResearchTrigger) - CriteriaTriggers.register(ShockwaveDamageMobTrigger.id.toString(), ShockwaveDamageMobTrigger) - CriteriaTriggers.register(ShockwaveTrigger.id.toString(), ShockwaveTrigger) - CriteriaTriggers.register(AndroidBatteryTrigger.id.toString(), AndroidBatteryTrigger) - CriteriaTriggers.register(NanobotsArmorTrigger.id.toString(), NanobotsArmorTrigger) - CriteriaTriggers.register(FallDampenersSaveTrigger.id.toString(), FallDampenersSaveTrigger) - CriteriaTriggers.register(EnderTeleporterFallDeathTrigger.id.toString(), EnderTeleporterFallDeathTrigger) - CriteriaTriggers.register(KillAsAndroidTrigger.id.toString(), KillAsAndroidTrigger) - CriteriaTriggers.register(AndroidTravelUnderwater.id.toString(), AndroidTravelUnderwater) - CriteriaTriggers.register(NailedEntityTrigger.id.toString(), NailedEntityTrigger) - CriteriaTriggers.register(ExopackObtainedTrigger.id.toString(), ExopackObtainedTrigger) - CriteriaTriggers.register(ExopackGainedSmeltingTrigger.id.toString(), ExopackGainedSmeltingTrigger) - CriteriaTriggers.register(ExopackGainedCraftingTrigger.id.toString(), ExopackGainedCraftingTrigger) - CriteriaTriggers.register(ExopackGainedEnderAccessTrigger.id.toString(), ExopackGainedEnderAccessTrigger) - CriteriaTriggers.register(ExopackSlotsExpandedTrigger.id.toString(), ExopackSlotsExpandedTrigger) - CriteriaTriggers.register(ExopackBatterySlotTrigger.id.toString(), ExopackBatterySlotTrigger) - CriteriaTriggers.register(TakeItemOutOfReplicatorTrigger.id.toString(), TakeItemOutOfReplicatorTrigger) - } + } private fun initializeClient(event: FMLClientSetupEvent) {