From 7f218d189b1e7d8ce9f0e6711a0d4286b1e43b51 Mon Sep 17 00:00:00 2001 From: nopo Date: Thu, 17 Oct 2024 23:41:55 +1100 Subject: [PATCH] remove loren event --- .../skyhanni/config/ConfigManager.kt | 4 +- .../hannibal2/skyhanni/events/LorenzEvent.kt | 92 ------------------- .../events/player/PlayerDeathEvent.kt | 1 - .../events/render/gui/ReplaceItemEvent.kt | 1 - .../hannibal2/skyhanni/utils/ConfigUtils.kt | 6 -- .../utils/repopatterns/RepoPatternManager.kt | 3 +- 6 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index 24a3748c6340..ba17bd13985f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -7,7 +7,6 @@ import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson import at.hannibal2.skyhanni.data.jsonobjects.local.JacobContestsJson import at.hannibal2.skyhanni.data.jsonobjects.local.KnownFeaturesJson import at.hannibal2.skyhanni.data.jsonobjects.local.VisualWordsJson -import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.features.misc.update.UpdateManager import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.ChatUtils @@ -95,8 +94,7 @@ class ConfigManager { try { findPositionLinks(features, mutableSetOf()) - } catch (e: Exception) { - if (LorenzEvent.isInGuardedEventHandler) throw e + } catch (_: Exception) { } } diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt deleted file mode 100644 index 6d144fd42e14..000000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt +++ /dev/null @@ -1,92 +0,0 @@ -package at.hannibal2.skyhanni.events - -import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.data.EventCounter -import at.hannibal2.skyhanni.mixins.hooks.getValue -import at.hannibal2.skyhanni.mixins.hooks.setValue -import at.hannibal2.skyhanni.mixins.transformers.AccessorEventBus -import at.hannibal2.skyhanni.test.command.ErrorManager -import at.hannibal2.skyhanni.utils.ChatUtils -import at.hannibal2.skyhanni.utils.StringUtils -import at.hannibal2.skyhanni.utils.chat.Text -import at.hannibal2.skyhanni.utils.system.PlatformUtils -import net.minecraftforge.common.MinecraftForge -import net.minecraftforge.fml.common.eventhandler.Event -import net.minecraftforge.fml.common.eventhandler.IEventListener - -/** - * Use @[SubscribeEvent] - */ - -@Deprecated("Use SkyHanniEvent instead") -abstract class LorenzEvent : Event() { - - private val eventName by lazy { - this::class.simpleName!! - } - - @Deprecated("Use SkyHanniEvent instead", ReplaceWith("")) - fun post() = postAndCatchAndBlock {} - - companion object { - - var eventHandlerDepth by object : ThreadLocal() { - override fun initialValue(): Int { - return 0 - } - } - val isInGuardedEventHandler get() = eventHandlerDepth > 0 || PlatformUtils.isDevEnvironment - } - - @Deprecated("Use SkyHanniEvent instead", ReplaceWith("")) - fun postAndCatchAndBlock( - printError: Boolean = true, - stopOnFirstError: Boolean = false, - ignoreErrorCache: Boolean = false, - onError: (Throwable) -> Unit, - ): Boolean { - EventCounter.count(eventName) - val visibleErrors = 3 - var errors = 0 - eventHandlerDepth++ - for (listener in getListeners()) { - try { - listener.invoke(this) - } catch (throwable: Throwable) { - errors++ - if (printError && errors <= visibleErrors) { - val callerName = listener.toString().split(" ")[1].split("@")[0].split(".").last() - val errorName = throwable::class.simpleName ?: "error" - val aOrAn = StringUtils.optionalAn(errorName) - val message = "Caught $aOrAn $errorName in $callerName at $eventName: ${throwable.message}" - ErrorManager.logErrorWithData(throwable, message, ignoreErrorCache = ignoreErrorCache) - } - onError(throwable) - if (stopOnFirstError) break - } - } - eventHandlerDepth-- - if (errors > visibleErrors) { - val hiddenErrors = errors - visibleErrors - ChatUtils.chat( - Text.text( - "§c[SkyHanni-${SkyHanniMod.version}] $hiddenErrors more errors in $eventName are hidden!", - ), - ) - } - return if (isCancelable) isCanceled else false - } - - private fun getListeners(): Array { - val accessorEventBus = MinecraftForge.EVENT_BUS as AccessorEventBus - return listenerList.getListeners(accessorEventBus.busId) - } - - @Deprecated("Use SkyHanniEvent instead", ReplaceWith("")) - fun postWithoutCatch() = MinecraftForge.EVENT_BUS.post(this) - - @Deprecated("Use SkyHanniEvent instead", ReplaceWith("")) - fun cancel() { - isCanceled = true - } -} diff --git a/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt index c34f6d6c60df..b1e2a63fad28 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt @@ -2,7 +2,6 @@ package at.hannibal2.skyhanni.events.player import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.events.SkyhanniChatEvent -import at.hannibal2.skyhanni.events.LorenzEvent /** * When the player "you" dies in the game. does not fire when other players die. diff --git a/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt index ec3eb1fdf824..55887f7b995c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/render/gui/ReplaceItemEvent.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.events.render.gui import at.hannibal2.skyhanni.api.event.SkyHanniEvent -import at.hannibal2.skyhanni.events.LorenzEvent import net.minecraft.inventory.IInventory import net.minecraft.inventory.InventoryBasic import net.minecraft.item.ItemStack diff --git a/src/main/java/at/hannibal2/skyhanni/utils/ConfigUtils.kt b/src/main/java/at/hannibal2/skyhanni/utils/ConfigUtils.kt index 94d981d8ef61..6300507332f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/ConfigUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/ConfigUtils.kt @@ -3,7 +3,6 @@ package at.hannibal2.skyhanni.utils import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.config.ConfigGuiManager import at.hannibal2.skyhanni.config.HasLegacyId -import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.test.command.ErrorManager import com.google.gson.JsonArray import com.google.gson.JsonElement @@ -84,11 +83,6 @@ object ConfigUtils { fun KMutableProperty0<*>.jumpToEditor() { if (tryJumpToEditor(ConfigGuiManager.getEditorInstance())) return - - // TODO create utils function "crashIfInDevEnv" - if (LorenzEvent.isInGuardedEventHandler) { - throw Error("can not jump to editor $name") - } ErrorManager.logErrorStateWithData( "Can not open the config", "error while trying to jump to an editor element", diff --git a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt index 906d62a18731..fd8f2a14f40c 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/repopatterns/RepoPatternManager.kt @@ -6,7 +6,6 @@ import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.config.features.dev.RepoPatternConfig import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.events.ConfigLoadEvent -import at.hannibal2.skyhanni.events.LorenzEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.utils.PreInitFinishedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -87,7 +86,7 @@ object RepoPatternManager { * Crash if in a development environment, or if inside a guarded event handler. */ fun crash(reason: String) { - if (isInDevEnv || LorenzEvent.isInGuardedEventHandler) + if (isInDevEnv) throw RuntimeException(reason) }