diff --git a/detekt/baseline.xml b/detekt/baseline.xml index 6665e039968c..bc1c7ce237fa 100644 --- a/detekt/baseline.xml +++ b/detekt/baseline.xml @@ -24,7 +24,7 @@ CyclomaticComplexMethod:ItemNameResolver.kt$ItemNameResolver$internal fun getInternalNameOrNull(itemName: String): NEUInternalName? CyclomaticComplexMethod:MinecraftConsoleFilter.kt$MinecraftConsoleFilter$override fun filter(event: LogEvent?): Filter.Result CyclomaticComplexMethod:PacketTest.kt$PacketTest$private fun Packet<*>.print() - CyclomaticComplexMethod:ParkourHelper.kt$ParkourHelper$fun render(event: LorenzRenderWorldEvent) + CyclomaticComplexMethod:ParkourHelper.kt$ParkourHelper$fun render(event: SkyHanniRenderWorldEvent) CyclomaticComplexMethod:Renderable.kt$Renderable.Companion$internal fun shouldAllowLink(debug: Boolean = false, bypassChecks: Boolean): Boolean CyclomaticComplexMethod:SkillProgress.kt$SkillProgress$private fun drawDisplay() CyclomaticComplexMethod:VampireSlayerFeatures.kt$VampireSlayerFeatures$private fun EntityOtherPlayerMP.process() diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 2c14076a93ba..6bf940223835 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.api.event.SkyHanniEvents import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.config.ConfigManager @@ -12,7 +13,7 @@ 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.data.repo.RepoManager -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.utils.PreInitFinishedEvent import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper import at.hannibal2.skyhanni.skyhannimodule.LoadedModules @@ -32,7 +33,6 @@ import net.minecraftforge.fml.common.Loader import net.minecraftforge.fml.common.Mod import net.minecraftforge.fml.common.event.FMLInitializationEvent import net.minecraftforge.fml.common.event.FMLPreInitializationEvent -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.apache.logging.log4j.Level import org.apache.logging.log4j.LogManager import org.apache.logging.log4j.Logger @@ -90,8 +90,8 @@ class SkyHanniMod { MinecraftForge.EVENT_BUS.register(obj) } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (screenToOpen != null) { screenTicks++ if (screenTicks == 5) { diff --git a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt index 2584b6616406..269d9d36d567 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/CollectionAPI.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.api +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.ItemAddManager import at.hannibal2.skyhanni.events.CollectionUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent @@ -19,7 +20,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object CollectionAPI { @@ -44,12 +44,12 @@ object CollectionAPI { "Mushroom" to "RED_MUSHROOM".asInternalName() ) - @SubscribeEvent + @HandleEvent fun onProfileJoin(event: ProfileJoinEvent) { collectionValue.clear() } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { val inventoryName = event.inventoryName if (inventoryName.endsWith(" Collection")) { @@ -87,7 +87,7 @@ object CollectionAPI { } } - @SubscribeEvent + @HandleEvent fun onItemAdd(event: ItemAddEvent) { if (event.source == ItemAddManager.Source.COMMAND) return val internalName = event.internalName diff --git a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt index e7e7fd2b5ac3..d0f26b33e812 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/DataWatcherAPI.kt @@ -1,20 +1,21 @@ package at.hannibal2.skyhanni.api +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.DataWatcherUpdatedEvent import at.hannibal2.skyhanni.events.EntityCustomNameUpdateEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import net.minecraft.entity.Entity @SkyHanniModule object DataWatcherAPI { private const val DATA_VALUE_CUSTOM_NAME = 2 - @SubscribeEvent - fun onDataWatcherUpdate(event: DataWatcherUpdatedEvent) { + @HandleEvent + fun onDataWatcherUpdate(event: DataWatcherUpdatedEvent) { for (updatedEntry in event.updatedEntries) { if (updatedEntry.dataValueId == DATA_VALUE_CUSTOM_NAME) { - EntityCustomNameUpdateEvent(event.entity.customNameTag, event.entity).postAndCatch() + EntityCustomNameUpdateEvent(event.entity, event.entity.customNameTag).post() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt index 4d7662b4f452..fdbd1b178694 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/GetFromSackAPI.kt @@ -1,13 +1,14 @@ package at.hannibal2.skyhanni.api import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.SackAPI import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzToolTipEvent import at.hannibal2.skyhanni.events.MessageSendToServerEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.SkyHanniToolTipEvent import at.hannibal2.skyhanni.features.commands.tabcomplete.GetFromSacksTabComplete import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager @@ -27,7 +28,6 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.inventory.Slot -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.Deque import java.util.LinkedList import kotlin.time.Duration.Companion.seconds @@ -86,8 +86,8 @@ object GetFromSackAPI { private fun addToInventory(items: List, slotId: Int) = inventoryMap.put(slotId, items) - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return if (queue.isNotEmpty() && lastTimeOfCommand.passedSince() >= minimumDelay) { val item = queue.poll() @@ -97,12 +97,12 @@ object GetFromSackAPI { } } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { inventoryMap.clear() } - @SubscribeEvent + @HandleEvent fun onSlotClicked(event: GuiContainerEvent.SlotClickEvent) { if (!LorenzUtils.inSkyBlock) return if (event.clickedButton != 1) return // filter none right clicks @@ -111,8 +111,8 @@ object GetFromSackAPI { event.cancel() } - @SubscribeEvent - fun onTooltip(event: LorenzToolTipEvent) { + @HandleEvent + fun onTooltip(event: SkyHanniToolTipEvent) { if (!LorenzUtils.inSkyBlock) return val list = inventoryMap[event.slot.slotIndex] ?: return event.toolTip.let { tip -> @@ -122,7 +122,7 @@ object GetFromSackAPI { } } - @SubscribeEvent + @HandleEvent fun onMessageToServer(event: MessageSendToServerEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.queuedGFS && !config.bazaarGFS) return @@ -130,7 +130,7 @@ object GetFromSackAPI { val replacedEvent = GetFromSacksTabComplete.handleUnderlineReplace(event) queuedHandler(replacedEvent) bazaarHandler(replacedEvent) - if (replacedEvent.isCanceled) { + if (replacedEvent.isCancelled) { event.cancel() return } @@ -157,7 +157,7 @@ object GetFromSackAPI { } private fun bazaarHandler(event: MessageSendToServerEvent) { - if (event.isCanceled) return + if (event.isCancelled) return if (!config.bazaarGFS || LorenzUtils.noTradeMode) return lastItemStack = commandValidator(event.splitMessage.drop(1)).second } @@ -201,8 +201,8 @@ object GetFromSackAPI { return CommandResult.VALID to PrimitiveItemStack(item, amountString.toDouble().toInt()) } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.bazaarGFS || LorenzUtils.noTradeMode) return val stack = lastItemStack ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt index 46d941fe007a..01ce629e03a1 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/ReforgeAPI.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.api +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuReforgeJson import at.hannibal2.skyhanni.data.model.SkyblockStat import at.hannibal2.skyhanni.data.model.SkyblockStatList @@ -20,7 +21,6 @@ import com.google.gson.TypeAdapter import com.google.gson.stream.JsonReader import com.google.gson.stream.JsonWriter import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object ReforgeAPI { @@ -151,7 +151,7 @@ object ReforgeAPI { override fun toString(): String = "Reforge $name" } - @SubscribeEvent + @HandleEvent fun onNeuRepoReload(event: NeuRepositoryReloadEvent) { val reforgeStoneData = event.readConstant>("reforgestones", reforgeGson).values val reforgeData = event.readConstant>("reforges", reforgeGson).values diff --git a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt index 1cb893dbc9f9..fb7f82c3f349 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/SkillAPI.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.api +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuSkillLevelJson import at.hannibal2.skyhanni.events.ActionBarUpdateEvent @@ -35,7 +36,6 @@ import at.hannibal2.skyhanni.utils.TabListData import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import com.google.gson.annotations.Expose import net.minecraft.command.CommandBase -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.LinkedList import java.util.regex.Matcher import kotlin.time.Duration.Companion.seconds @@ -86,7 +86,7 @@ object SkillAPI { var showDisplay = false var lastUpdate = SimpleTimeMark.farPast() - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { val activeSkill = activeSkill ?: return val info = skillXPInfoMap[activeSkill] ?: return @@ -108,7 +108,7 @@ object SkillAPI { } } - @SubscribeEvent + @HandleEvent fun onActionBarUpdate(event: ActionBarUpdateEvent) { val actionBar = event.actionBar.removeColor() val components = SPACE_SPLITTER.splitToList(actionBar) @@ -129,7 +129,7 @@ object SkillAPI { skillMultiplierPattern -> handleSkillPatternMultiplier(matcher, skillType, skillInfo) } - SkillExpGainEvent(skillType, matcher.group("gained").formatDouble()).postAndCatch() + SkillExpGainEvent(skillType, matcher.group("gained").formatDouble()).post() showDisplay = true lastUpdate = SimpleTimeMark.now() @@ -142,14 +142,14 @@ object SkillAPI { } } - @SubscribeEvent + @HandleEvent fun onNEURepoReload(event: NeuRepositoryReloadEvent) { levelArray = event.readConstant("leveling").levelingXp levelingMap = levelArray.withIndex().associate { (index, xp) -> index to xp } exactLevelingMap = levelArray.withIndex().associate { (index, xp) -> xp to index } } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { val inventoryName = event.inventoryName for (stack in event.inventoryItems.values) { @@ -213,7 +213,7 @@ object SkillAPI { } } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Skills") val storage = storage @@ -266,7 +266,7 @@ object SkillAPI { currentXp ) if (skillInfo.overflowLevel > 60 && levelOverflow == skillInfo.overflowLevel + 1) - SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).postAndCatch() + SkillOverflowLevelUpEvent(skillType, skillInfo.overflowLevel, levelOverflow).post() skillInfo.apply { this.level = level diff --git a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt index 97fcbf3c6f62..d65f5c081b24 100644 --- a/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt +++ b/src/main/java/at/hannibal2/skyhanni/api/event/SkyHanniEvents.kt @@ -6,7 +6,6 @@ import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.lang.reflect.Method @SkyHanniModule @@ -46,14 +45,14 @@ object SkyHanniEvents { .addListener(method, instance, options) } - @SubscribeEvent + @HandleEvent fun onRepoLoad(event: RepositoryReloadEvent) { val data = event.getConstant("DisabledEvents") disabledHandlers = data.disabledHandlers disabledHandlerInvokers = data.disabledInvokers } - @SubscribeEvent + @HandleEvent fun onDebug(event: DebugDataCollectEvent) { event.title("Events") event.addIrrelevant { diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt index a534eac89193..7ce4eca95733 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigManager.kt @@ -8,7 +8,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 @@ -97,7 +96,7 @@ class ConfigManager { try { findPositionLinks(features, mutableSetOf()) } catch (e: Exception) { - if (LorenzEvent.isInGuardedEventHandler || EventHandler.isInEventHandler) throw e + if (EventHandler.isInEventHandler) throw e } } diff --git a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt index f8afe645cf85..7008a40d0ef1 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt +++ b/src/main/java/at/hannibal2/skyhanni/config/ConfigUpdaterMigrator.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.config -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.misc.limbo.LimboTimeTracker import at.hannibal2.skyhanni.utils.LorenzLogger import at.hannibal2.skyhanni.utils.LorenzUtils.asIntOrNull @@ -30,7 +30,7 @@ object ConfigUpdaterMigrator { val oldVersion: Int, var movesPerformed: Int, val dynamicPrefix: Map>, - ) : LorenzEvent() { + ) : SkyHanniEvent() { init { dynamicPrefix.entries @@ -141,7 +141,7 @@ object ConfigUpdaterMigrator { it.add("lastVersion", JsonPrimitive(i + 1)) }, i, 0, dynamicPrefix - ).also { it.postAndCatch() } + ).also { it.post() } logger.log("Transformations scheduled: ${migration.new}") val mergesPerformed = merge(migration.old, migration.new) logger.log("Migration done with $mergesPerformed merges and ${migration.movesPerformed} moves performed") diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java index e1cd4fd33c85..73211fbf43a6 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/fishing/LavaReplacementConfig.java @@ -3,10 +3,8 @@ import at.hannibal2.skyhanni.config.FeatureToggle; import com.google.gson.annotations.Expose; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; -import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorButton; import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; import io.github.notenoughupdates.moulconfig.observer.Property; -import net.minecraft.client.Minecraft; public class LavaReplacementConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java index 21ba39b8eccf..c395e71c39b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/itemability/ItemAbilityConfig.java @@ -1,11 +1,9 @@ package at.hannibal2.skyhanni.config.features.itemability; import at.hannibal2.skyhanni.config.FeatureToggle; -import at.hannibal2.skyhanni.config.core.config.Position; import com.google.gson.annotations.Expose; import io.github.notenoughupdates.moulconfig.annotations.Accordion; import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; -import io.github.notenoughupdates.moulconfig.annotations.ConfigLink; import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; public class ItemAbilityConfig { diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt index 678fa4e33331..e0ca6ed4f9d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarData.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.ActionBarUpdateEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import net.minecraftforge.client.event.ClientChatReceivedEvent @@ -13,8 +14,8 @@ object ActionBarData { fun getActionBar() = actionBar - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { actionBar = "" } @@ -30,7 +31,7 @@ object ActionBarData { val message = LorenzUtils.stripVanillaMessage(original.formattedText) actionBar = message val actionBarEvent = ActionBarUpdateEvent(actionBar, event.message) - actionBarEvent.postAndCatch() + actionBarEvent.post() if (event.message.formattedText != actionBarEvent.chatComponent.formattedText) { event.message = actionBarEvent.chatComponent } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt index b2145db767c5..dd2417420088 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ActionBarStatsData.kt @@ -1,12 +1,12 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.ActionBarUpdateEvent import at.hannibal2.skyhanni.events.ActionBarValueUpdateEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.intellij.lang.annotations.Language enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) { @@ -45,7 +45,7 @@ enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) { entries.forEach { it.pattern } } - @SubscribeEvent + @HandleEvent fun onActionBarUpdate(event: ActionBarUpdateEvent) { if (!LorenzUtils.inSkyBlock) return @@ -57,7 +57,7 @@ enum class ActionBarStatsData(@Language("RegExp") rawPattern: String) { ActionBarValueUpdateEvent(data) } else null } - }.forEach { it.postAndCatch() } + }.forEach { it.post() } } } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt index 022a18d926e3..9710f4144034 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BitsAPI.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.data.FameRanks.getFameRankByNameOrNull import at.hannibal2.skyhanni.events.BitsUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.CollectionUtils.nextAfter @@ -21,7 +22,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeResets import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.days @SkyHanniModule @@ -143,7 +143,7 @@ object BitsAPI { "^(§aCommunity Shop|§eFame Rank)$", ) - @SubscribeEvent + @HandleEvent fun onScoreboardChange(event: ScoreboardUpdateEvent) { if (!isEnabled()) return for (line in event.scoreboard) { @@ -166,8 +166,8 @@ object BitsAPI { } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!isEnabled()) return val message = event.message.trimWhiteSpace().removeResets() @@ -206,7 +206,7 @@ object BitsAPI { fun bitsPerCookie(): Int = (defaultCookieBits * (currentFameRank?.bitsMultiplier ?: 1.0)).toInt() - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return @@ -311,14 +311,14 @@ object BitsAPI { fun hasCookieBuff() = cookieBuffTime?.isInFuture() ?: false private fun sendBitsGainEvent(difference: Int) = - BitsUpdateEvent.BitsGain(bits, bitsAvailable, difference).postAndCatch() + BitsUpdateEvent.BitsGain(bits, bitsAvailable, difference).post() - private fun sendBitsSpentEvent() = BitsUpdateEvent.BitsSpent(bits, bitsAvailable).postAndCatch() - private fun sendBitsAvailableGainedEvent() = BitsUpdateEvent.BitsAvailableGained(bits, bitsAvailable).postAndCatch() + private fun sendBitsSpentEvent() = BitsUpdateEvent.BitsSpent(bits, bitsAvailable).post() + private fun sendBitsAvailableGainedEvent() = BitsUpdateEvent.BitsAvailableGained(bits, bitsAvailable).post() fun isEnabled() = LorenzUtils.inSkyBlock && profileStorage != null - @SubscribeEvent + @HandleEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(35, "#profile.bits.bitsToClaim", "#profile.bits.bitsAvailable") } diff --git a/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt b/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt index 0dcc1714e1a1..ec135d96b187 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BlockData.kt @@ -15,10 +15,10 @@ object BlockData { if (event.packet is S23PacketBlockChange) { val blockPos = event.packet.blockPosition ?: return val blockState = event.packet.blockState ?: return - ServerBlockChangeEvent(blockPos, blockState).postAndCatch() + ServerBlockChangeEvent(blockPos, blockState).post() } else if (event.packet is S22PacketMultiBlockChange) { for (block in event.packet.changedBlocks) { - ServerBlockChangeEvent(block.pos, block.blockState).postAndCatch() + ServerBlockChangeEvent(block.pos, block.blockState).post() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt b/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt index d63b2aefd1b1..eec91063a1af 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/BossbarData.kt @@ -1,11 +1,11 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.BossbarUpdateEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraft.entity.boss.BossStatus -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object BossbarData { @@ -14,15 +14,15 @@ object BossbarData { fun getBossbar() = bossbar.orEmpty() - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { val oldBossbar = bossbar ?: return previousServerBossbar = oldBossbar bossbar = null } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { val bossbarLine = BossStatus.bossName ?: return if (bossbarLine.isBlank() || bossbarLine.isEmpty()) return if (bossbarLine == bossbar) return @@ -30,6 +30,6 @@ object BossbarData { if (previousServerBossbar.isNotEmpty()) previousServerBossbar = "" bossbar = bossbarLine - BossbarUpdateEvent(bossbarLine).postAndCatch() + BossbarUpdateEvent(bossbarLine).post() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt index 9564df15ac1d..c6ac91c12f03 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ChatManager.kt @@ -2,8 +2,8 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.api.event.HandleEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.MessageSendToServerEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketSentEvent import at.hannibal2.skyhanni.features.chat.ChatFilterGui import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -109,7 +109,7 @@ object ChatManager { trimmedMessage, trimmedMessage.split(" "), originatingModContainer - ).postAndCatch() + ).post() ) { event.cancel() messageHistory[IdentityCharacteristics(component)] = result.copy(actionKind = ActionKind.OUTGOING_BLOCKED) @@ -132,8 +132,8 @@ object ChatManager { return } val key = IdentityCharacteristics(original) - val chatEvent = LorenzChatEvent(message, original) - chatEvent.postAndCatch() + val chatEvent = SkyHanniChatEvent(message, original) + chatEvent.post() val blockReason = chatEvent.blockedReason.uppercase() if (blockReason != "") { diff --git a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt index d1923a938dfb..4e3212326040 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/CropAccessoryData.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.InventoryUpdatedEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.events.SecondPassedEvent @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object CropAccessoryData { @@ -25,13 +25,13 @@ object CropAccessoryData { private var accessoryInBag = CropAccessory.NONE private var accessoryInInventory = CropAccessory.NONE - @SubscribeEvent + @HandleEvent fun onProfileJoin(event: ProfileJoinEvent) { accessoryInBag = CropAccessory.NONE accessoryInInventory = CropAccessory.NONE } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryUpdatedEvent) { if (!accessoryBagNamePattern.matches(event.inventoryName)) return @@ -42,7 +42,7 @@ object CropAccessoryData { } } - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { if (!LorenzUtils.inSkyBlock) return if (!event.repeatSeconds(5)) return diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt index 04147ce7794c..d7ce49a59dd2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/EntityData.kt @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent import at.hannibal2.skyhanni.events.EntityMaxHealthUpdateEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.entity.EntityDisplayNameEvent import at.hannibal2.skyhanni.events.entity.EntityHealthDisplayEvent import at.hannibal2.skyhanni.events.entity.EntityLeaveWorldEvent @@ -25,7 +25,6 @@ import net.minecraft.entity.item.EntityItemFrame import net.minecraft.entity.item.EntityXPOrb import net.minecraft.network.play.server.S1CPacketEntityMetadata import net.minecraft.util.ChatComponentText -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.milliseconds @SkyHanniModule @@ -44,15 +43,15 @@ object EntityData { EntityPlayerSP::class.java, ) - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { for (entity in EntityUtils.getEntities()) { // this completely ignores the ignored entities list? val maxHealth = entity.baseMaxHealth val id = entity.entityId val oldMaxHealth = maxHealthMap.getOrDefault(id, -1) if (oldMaxHealth != maxHealth) { maxHealthMap[id] = maxHealth - EntityMaxHealthUpdateEvent(entity, maxHealth.derpy()).postAndCatch() + EntityMaxHealthUpdateEvent(entity, maxHealth.derpy()).post() } } } @@ -62,8 +61,8 @@ object EntityData { maxHealthMap -= event.entity.entityId } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { maxHealthMap.clear() } @@ -83,7 +82,7 @@ object EntityData { val health = (it.`object` as Float).toInt() if (entity is EntityWither && health == 300 && entityId < 0) return if (entity is EntityLivingBase) { - EntityHealthUpdateEvent(entity, health.derpy()).postAndCatch() + EntityHealthUpdateEvent(entity, health.derpy()).post() } } } @@ -100,14 +99,14 @@ object EntityData { private fun postRenderNametag(entity: Entity, chatComponent: ChatComponentText) = nametagCache.getOrPut(entity) { val event = EntityDisplayNameEvent(entity, chatComponent) - event.postAndCatch() + event.post() event.chatComponent } @JvmStatic fun getHealthDisplay(text: String) = healthDisplayCache.getOrPut(text) { val event = EntityHealthDisplayEvent(text) - event.postAndCatch() + event.post() event.text } diff --git a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt index 83fb0f8cf28e..9838a7a76153 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/EntityMovementData.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.EntityMoveEvent import at.hannibal2.skyhanni.events.IslandChangeEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.SkyHanniWarpEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.DelayedRun import at.hannibal2.skyhanni.utils.LorenzUtils @@ -16,8 +17,8 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.getLorenzVec import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.client.Minecraft +import net.minecraft.client.entity.EntityPlayerSP import net.minecraft.entity.Entity -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -47,7 +48,7 @@ object EntityMovementData { } } - @SubscribeEvent + @HandleEvent fun onIslandChange(event: IslandChangeEvent) { val nextData = nextTeleport ?: return if (nextData.island != event.newIsland) return @@ -63,9 +64,9 @@ object EntityMovementData { nextTeleport = null } - @SubscribeEvent - fun onPlayerMove(event: EntityMoveEvent) { - if (!LorenzUtils.inSkyBlock || event.entity != Minecraft.getMinecraft().thePlayer) return + @HandleEvent(onlyOnSkyblock = true) + fun onPlayerMove(event: EntityMoveEvent) { + if (!event.isLocalPlayer) return val nextData = nextTeleport ?: return @@ -81,8 +82,8 @@ object EntityMovementData { } } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return addToTrack(Minecraft.getMinecraft().thePlayer) @@ -94,13 +95,13 @@ object EntityMovementData { val distance = newLocation.distance(oldLocation) if (distance > 0.01) { entityLocation[entity] = newLocation - EntityMoveEvent(entity, oldLocation, newLocation, distance).postAndCatch() + EntityMoveEvent(entity, oldLocation, newLocation, distance).post() } } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.inSkyBlock) return if (!warpingPattern.matches(event.message)) return DelayedRun.runNextTick { @@ -108,8 +109,8 @@ object EntityMovementData { } } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { entityLocation.clear() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/EventCounter.kt b/src/main/java/at/hannibal2/skyhanni/data/EventCounter.kt index 67aec45cb1f5..c3451b47de6a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/EventCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/EventCounter.kt @@ -1,13 +1,13 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.SecondPassedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.NumberUtil.addSeparators import at.hannibal2.skyhanni.utils.SimpleTimeMark -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds @SkyHanniModule @@ -20,7 +20,7 @@ object EventCounter { private var enabled = false - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { enabled = LorenzUtils.onHypixel && config.eventCounter } diff --git a/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt b/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt index 750f1294390e..a59830829ddc 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FameRanks.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.FameRankJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object FameRanks { @@ -12,7 +12,7 @@ object FameRanks { fun getFameRankByNameOrNull(name: String) = fameRanks[name] - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { val ranks = event.getConstant("FameRank") fameRanks = ranks.fameRank.values.map { FameRank(it.name, it.fameRequired, it.bitsMultiplier, it.votes) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt index 36dc3c6f0b24..773fa6792901 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FixedRateTimerManager.kt @@ -14,7 +14,7 @@ object FixedRateTimerManager { fixedRateTimer(name = "skyhanni-fixed-rate-timer-manager", period = 1000L) { DelayedRun.onThread.execute { if (!LorenzUtils.onHypixel) return@execute - SecondPassedEvent(totalSeconds).postAndCatch() + SecondPassedEvent(totalSeconds).post() totalSeconds++ } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt index 58c5703bd22e..f48bdb181a04 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/FriendAPI.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson import at.hannibal2.skyhanni.data.jsonobjects.local.FriendsJson.PlayerFriends.Friend import at.hannibal2.skyhanni.events.HypixelJoinEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.LorenzUtils @@ -13,7 +14,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.util.ChatStyle -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.UUID @SkyHanniModule @@ -55,7 +55,7 @@ object FriendAPI { FriendsJson.PlayerFriends().also { it.friends = mutableMapOf() } }.friends - @SubscribeEvent + @HandleEvent fun onHypixelJoin(event: HypixelJoinEvent) { if (SkyHanniMod.friendsData.players == null) { SkyHanniMod.friendsData.players = mutableMapOf() @@ -74,8 +74,8 @@ object FriendAPI { SkyHanniMod.configManager.saveConfig(ConfigFileType.FRIENDS, "Save file") } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { readFriendsList(event) removedFriendPattern.matchMatcher(event.message) { @@ -114,7 +114,7 @@ object FriendAPI { saveConfig() } - private fun readFriendsList(event: LorenzChatEvent) { + private fun readFriendsList(event: SkyHanniChatEvent) { if (!event.message.contains("Friends")) return for (sibling in event.chatComponent.siblings) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt index 18093b880b86..5bdbf87eec66 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenComposterUpgradesData.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.model.ComposterUpgrade import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.features.garden.GardenAPI @@ -8,12 +9,11 @@ import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ItemUtils.name import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimalIfNecessary import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GardenComposterUpgradesData { - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!GardenAPI.inGarden()) return if (event.inventoryName != "Composter Upgrades") return diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt index d8fab21f44cf..134016deedbf 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestones.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import at.hannibal2.skyhanni.events.CropMilestoneUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent @@ -15,7 +16,6 @@ import at.hannibal2.skyhanni.utils.SoundUtils import at.hannibal2.skyhanni.utils.SoundUtils.playSound import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GardenCropMilestones { @@ -40,7 +40,7 @@ object GardenCropMilestones { return null } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (event.inventoryName != "Crop Milestones") return @@ -183,7 +183,7 @@ object GardenCropMilestones { return (progress - startCrops).toDouble() / (end - startCrops) } - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { cropMilestoneData = event.getConstant("Garden").cropMilestones } diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt index 4eaf3137e61a..0d91ce05c20d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropMilestonesCommunityFix.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.data.jsonobjects.repo.GardenJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent @@ -24,7 +25,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import kotlinx.coroutines.launch import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GardenCropMilestonesCommunityFix { @@ -36,7 +36,7 @@ object GardenCropMilestonesCommunityFix { private var showWrongData = false private var showWhenAllCorrect = false - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant("Garden") val map = data.cropMilestoneCommunityHelp diff --git a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt index 834c913cfd0a..d8d1496a94da 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GardenCropUpgrades.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.GardenAPI import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GardenCropUpgrades { @@ -29,8 +29,8 @@ object GardenCropUpgrades { private val cropUpgrades: MutableMap? get() = GardenAPI.storage?.cropUpgrades - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!GardenAPI.inGarden()) return chatUpgradePattern.matchMatcher(event.message) { @@ -40,7 +40,7 @@ object GardenCropUpgrades { } } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!GardenAPI.inGarden()) return if (event.inventoryName != "Crop Upgrades") return diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt index 688f8cc18c08..dea54f4f9de2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuiData.kt @@ -3,8 +3,8 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.NEURenderEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent import at.hannibal2.skyhanni.features.inventory.wardrobe.CustomWardrobeKeybinds import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -29,7 +29,7 @@ object GuiData { if (preDrawEventCancelled) event.cancel() } - @SubscribeEvent(priority = EventPriority.HIGH) + @HandleEvent(priority = HandleEvent.HIGH) fun onClick(event: GuiContainerEvent.SlotClickEvent) { if (preDrawEventCancelled) event.cancel() } @@ -59,7 +59,7 @@ object GuiData { if (preDrawEventCancelled) event.isCanceled = true } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { DelayedRun.runNextTick { if (Minecraft.getMinecraft().currentScreen !is GuiChest) { @@ -68,8 +68,8 @@ object GuiData { } } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { preDrawEventCancelled = false } diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt index 010267609ad4..3f3adf1c6c4d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.core.config.Position import at.hannibal2.skyhanni.config.core.config.gui.GuiPositionEditor import at.hannibal2.skyhanni.events.GuiPositionMovedEvent import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.LorenzKeyPressEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.KeyPressEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests import at.hannibal2.skyhanni.utils.ChatUtils @@ -23,8 +24,6 @@ import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.client.gui.inventory.GuiEditSign import net.minecraft.client.gui.inventory.GuiInventory import net.minecraft.client.renderer.GlStateManager -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.input.Keyboard import org.lwjgl.opengl.GL11 import java.util.UUID @@ -41,8 +40,8 @@ object GuiEditManager { private val currentBorderSize = mutableMapOf>() private var lastMovedGui: String? = null - @SubscribeEvent - fun onKeyClick(event: LorenzKeyPressEvent) { + @HandleEvent + fun onKeyClick(event: KeyPressEvent) { if (event.keyCode != SkyHanniMod.feature.gui.keyBindOpen) return if (event.keyCode == Keyboard.KEY_RETURN) { ChatUtils.chat("You can't use Enter as a keybind to open the gui editor!") @@ -62,17 +61,17 @@ object GuiEditManager { openGuiPositionEditor(hotkeyReminder = false) } - @SubscribeEvent(priority = EventPriority.LOWEST) + @HandleEvent(priority = HandleEvent.LOWEST) fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { GlStateManager.color(1f, 1f, 1f, 1f) GlStateManager.enableBlend() GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0) } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { lastMovedGui?.let { - GuiPositionMovedEvent(it).postAndCatch() + GuiPositionMovedEvent(it).post() lastMovedGui = null } } @@ -114,11 +113,11 @@ object GuiEditManager { GlStateManager.translate(0f, 0f, 200f) - GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().post() GlStateManager.pushMatrix() GlStateManager.enableDepth() - GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch() + GuiRenderEvent.ChestGuiOverlayRenderEvent().post() GlStateManager.popMatrix() GlStateManager.translate(0f, 0f, -200f) diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt index 81d2da77fe68..ca67495f4cd3 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuildAPI.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.api.event.HandleEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.StringUtils.cleanPlayerName -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object GuildAPI { @@ -11,8 +11,8 @@ object GuildAPI { private var inGuildMessage = false private val list = mutableListOf() - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { val message = event.message if (message.startsWith("§6Guild Name: ")) { inGuildMessage = true diff --git a/src/main/java/at/hannibal2/skyhanni/data/HighlightOnHoverSlot.kt b/src/main/java/at/hannibal2/skyhanni/data/HighlightOnHoverSlot.kt index c5aa22e66fd7..cfb2f2c3b2c5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HighlightOnHoverSlot.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HighlightOnHoverSlot.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryOpenEvent @@ -8,24 +9,22 @@ import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.LorenzColor import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.highlight -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object HighlightOnHoverSlot { val currentSlots = mutableMapOf, List>() - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryOpenEvent) { currentSlots.clear() } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { currentSlots.clear() } - @SubscribeEvent(priority = EventPriority.LOW) + @HandleEvent(priority = HandleEvent.LOW) fun onDrawBackground(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!LorenzUtils.inSkyBlock) return val list = currentSlots.flatMapTo(mutableSetOf()) { it.value } diff --git a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt index beb7581b0d0d..afd818220e1a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HotmData.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.HotmAPI import at.hannibal2.skyhanni.api.HotmAPI.MayhemPerk import at.hannibal2.skyhanni.api.HotmAPI.SkymallPerk +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage import at.hannibal2.skyhanni.data.jsonobjects.local.HotmTree import at.hannibal2.skyhanni.data.model.TabWidget @@ -10,9 +11,9 @@ import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.IslandChangeEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.events.WidgetUpdateEvent import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardPattern import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -33,7 +34,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.inventory.Slot -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.math.pow private fun calculateCoreOfTheMountainLoot(level: Int): Map = buildMap { @@ -676,7 +676,7 @@ enum class HotmData( } } - @SubscribeEvent + @HandleEvent fun onScoreboardUpdate(event: ScoreboardUpdateEvent) { if (!LorenzUtils.inSkyBlock) return @@ -691,7 +691,7 @@ enum class HotmData( } } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { if (!inInventory) return inInventory = false @@ -699,7 +699,7 @@ enum class HotmData( heartItem = null } - @SubscribeEvent + @HandleEvent fun onInventoryFullyOpen(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return inInventory = inventoryPattern.matches(event.inventoryName) @@ -712,7 +712,7 @@ enum class HotmData( } } - @SubscribeEvent + @HandleEvent fun onWidgetUpdate(event: WidgetUpdateEvent) { if (!event.isWidget(TabWidget.POWDER)) return event.lines.forEach { @@ -728,8 +728,8 @@ enum class HotmData( } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.inSkyBlock) return if (resetChatPattern.matches(event.message)) { resetTree() @@ -766,14 +766,14 @@ enum class HotmData( } } - @SubscribeEvent + @HandleEvent fun onWorldSwitch(event: IslandChangeEvent) { if (HotmAPI.mineshaftMayhem == null) return HotmAPI.mineshaftMayhem = null ChatUtils.debug("resetting mineshaftMayhem") } - @SubscribeEvent + @HandleEvent fun onProfileSwitch(event: ProfileJoinEvent) { HotmAPI.PowderType.entries.forEach { if (it.getStorage() == null) { @@ -785,7 +785,7 @@ enum class HotmData( } } - @SubscribeEvent + @HandleEvent fun onDebug(event: DebugDataCollectEvent) { event.title("HotM") event.addIrrelevant { diff --git a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt index b17c23d4dc33..3306034101fc 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/HypixelData.kt @@ -7,12 +7,12 @@ import at.hannibal2.skyhanni.data.model.TabWidget import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.HypixelJoinEvent import at.hannibal2.skyhanni.events.IslandChangeEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.WidgetUpdateEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent import at.hannibal2.skyhanni.features.bingo.BingoAPI @@ -34,7 +34,6 @@ import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import com.google.gson.JsonObject import io.github.moulberry.notenoughupdates.NotEnoughUpdates import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.concurrent.thread import kotlin.time.Duration.Companion.seconds @@ -193,7 +192,7 @@ object HypixelData { ) } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Server ID") if (!LorenzUtils.inSkyBlock) { @@ -289,8 +288,8 @@ object HypixelData { private val loggerIslandChange = LorenzLogger("debug/island_change") - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { locrawData = null skyBlock = false inLimbo = false @@ -315,13 +314,13 @@ object HypixelData { hasScoreboardUpdated = false } - @SubscribeEvent + @HandleEvent fun onScoreboardUpdate(event: ScoreboardUpdateEvent) { hasScoreboardUpdated = true } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.onHypixel) return val message = event.message.removeColor().lowercase() @@ -329,14 +328,14 @@ object HypixelData { val newProfile = message.replace("your profile was changed to:", "").replace("(co-op)", "").trim() if (profileName == newProfile) return profileName = newProfile - ProfileJoinEvent(newProfile).postAndCatch() + ProfileJoinEvent(newProfile).post() } if (message.startsWith("you are playing on profile:")) { val newProfile = message.replace("you are playing on profile:", "").replace("(co-op)", "").trim() ProfileStorageData.profileJoinMessage() if (profileName == newProfile) return profileName = newProfile - ProfileJoinEvent(newProfile).postAndCatch() + ProfileJoinEvent(newProfile).post() } } @@ -347,13 +346,13 @@ object HypixelData { if (RiftAPI.inRift()) newProfile = newProfile.reversed() if (profileName == newProfile) return profileName = newProfile - ProfileJoinEvent(newProfile).postAndCatch() + ProfileJoinEvent(newProfile).post() } } // TODO rewrite everything in here - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) { checkNEULocraw() } @@ -379,7 +378,7 @@ object HypixelData { if (!LorenzUtils.onHypixel) { checkHypixel() if (LorenzUtils.onHypixel) { - HypixelJoinEvent().postAndCatch() + HypixelJoinEvent.post() SkyHanniMod.repo.displayRepoStatus(true) } } @@ -412,7 +411,7 @@ object HypixelData { } } - @SubscribeEvent + @HandleEvent fun onTabListUpdate(event: WidgetUpdateEvent) { when (event.widget) { TabWidget.AREA -> checkIsland(event) @@ -426,7 +425,7 @@ object HypixelData { TabListData.getTabList().matchFirst(UtilsPatterns.tabListProfilePattern) { profileName = group("profile").lowercase() - ProfileJoinEvent(profileName).postAndCatch() + ProfileJoinEvent(profileName).post() } } @@ -506,7 +505,7 @@ object HypixelData { if (skyBlockIsland != newIsland) { val oldIsland = skyBlockIsland skyBlockIsland = newIsland - IslandChangeEvent(newIsland, oldIsland).postAndCatch() + IslandChangeEvent(newIsland, oldIsland).post() if (newIsland == IslandType.UNKNOWN) { ChatUtils.debug("Unknown island detected: '$foundIsland'") diff --git a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt index 386fb8bbf489..f8dee3f1365b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/IslandGraphs.kt @@ -7,10 +7,10 @@ import at.hannibal2.skyhanni.data.model.GraphNode import at.hannibal2.skyhanni.data.repo.RepoUtils import at.hannibal2.skyhanni.events.EntityMoveEvent import at.hannibal2.skyhanni.events.IslandChangeEvent -import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent +import at.hannibal2.skyhanni.events.SkyHanniRenderWorldEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent import at.hannibal2.skyhanni.features.misc.IslandAreas import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -35,7 +35,7 @@ import at.hannibal2.skyhanni.utils.chat.Text.onClick import at.hannibal2.skyhanni.utils.chat.Text.send import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent +import net.minecraft.client.entity.EntityPlayerSP import java.awt.Color import java.io.File import kotlin.time.Duration.Companion.milliseconds @@ -137,22 +137,22 @@ object IslandGraphs { "(Glacite Tunnels|Dwarven Base Camp|Great Glacite Lake|Fossil Research Center)", ) - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { if (!LorenzUtils.inSkyBlock) return loadIsland(LorenzUtils.skyBlockIsland) } - @SubscribeEvent + @HandleEvent fun onIslandChange(event: IslandChangeEvent) { if (currentIslandGraph != null) return if (event.newIsland == IslandType.NONE) return loadIsland(event.newIsland) } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { currentIslandGraph = null if (currentTarget != null) { "§e[SkyHanni] Navigation stopped because of world switch!".asComponent().send(PATHFIND_ID) @@ -224,8 +224,8 @@ object IslandGraphs { closestNode = null } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return if (event.isMod(2)) { handleTick() @@ -327,9 +327,9 @@ object IslandGraphs { } } - @SubscribeEvent - fun onPlayerMove(event: EntityMoveEvent) { - if (LorenzUtils.inSkyBlock && event.entity == Minecraft.getMinecraft().thePlayer) { + @HandleEvent(onlyOnSkyblock = true) + fun onPlayerMove(event: EntityMoveEvent) { + if (event.isLocalPlayer) { hasMoved = true } } @@ -473,8 +473,8 @@ object IslandGraphs { componentText.send(PATHFIND_ID) } - @SubscribeEvent - fun onRenderWorld(event: LorenzRenderWorldEvent) { + @HandleEvent + fun onRenderWorld(event: SkyHanniRenderWorldEvent) { if (!LorenzUtils.inSkyBlock) return val path = fastestPath ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt index b72c38c7f6d6..ca0965eb38f6 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemAddManager.kt @@ -1,10 +1,11 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryOpenEvent import at.hannibal2.skyhanni.events.ItemAddEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.SackChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.events.entity.ItemAddInInventoryEvent import at.hannibal2.skyhanni.features.inventory.SuperCraftFeatures.craftedPattern import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -16,7 +17,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.TimeLimitedSet import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -39,14 +39,14 @@ object ItemAddManager { private var inSackInventory = false private var lastSackInventoryLeave = SimpleTimeMark.farPast() - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryOpenEvent) { if (event.inventoryName.contains("Sack")) { inSackInventory = true } } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { if (inSackInventory) { inSackInventory = false @@ -54,7 +54,7 @@ object ItemAddManager { } } - @SubscribeEvent + @HandleEvent fun onSackChange(event: SackChangeEvent) { if (!LorenzUtils.inSkyBlock) return @@ -70,7 +70,7 @@ object ItemAddManager { superCraftedItems.clear() } - @SubscribeEvent + @HandleEvent fun onItemAdd(event: ItemAddInInventoryEvent) { if (!LorenzUtils.inSkyBlock) return @@ -85,14 +85,14 @@ object ItemAddManager { } private fun Source.addItem(internalName: NEUInternalName, amount: Int) { - ItemAddEvent(internalName, amount, this).postAndCatch() + ItemAddEvent(internalName, amount, this).post() } private var lastDiceRoll = SimpleTimeMark.farPast() private val superCraftedItems = TimeLimitedSet(30.seconds) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (diceRollChatPattern.matches(event.message)) { lastDiceRoll = SimpleTimeMark.now() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt index 2bcf589a3d50..235a45e3f5d4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemClickData.kt @@ -83,6 +83,6 @@ object ItemClickData { if (minecraft.thePlayer == null) return if (clickedEntity == null) return - EntityClickEvent(clickType, clickedEntity, InventoryUtils.getItemInHand()).postAndCatch() + EntityClickEvent(clickType, clickedEntity, InventoryUtils.getItemInHand()).post() } */ } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt index fbbd78e138ba..5ebaff057fec 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ItemTipHelper.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.DrawScreenAfterEvent import at.hannibal2.skyhanni.events.GuiRenderItemEvent import at.hannibal2.skyhanni.events.RenderInventoryItemTipEvent @@ -14,19 +15,17 @@ import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.client.renderer.GlStateManager import net.minecraft.inventory.ContainerChest -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object ItemTipHelper { - @SubscribeEvent + @HandleEvent fun onRenderItemOverlayPost(event: GuiRenderItemEvent.RenderOverlayEvent.GuiRenderItemPost) { val stack = event.stack ?: return if (!LorenzUtils.inSkyBlock || stack.stackSize != 1) return val itemTipEvent = RenderItemTipEvent(stack, mutableListOf()) - itemTipEvent.postAndCatch() + itemTipEvent.post() if (itemTipEvent.renderObjects.isEmpty()) return @@ -39,7 +38,7 @@ object ItemTipHelper { } } - @SubscribeEvent(priority = EventPriority.HIGHEST) + @HandleEvent(priority = HandleEvent.HIGHEST) fun onRenderInventoryItemOverlayPost(event: DrawScreenAfterEvent) { if (!LorenzUtils.inSkyBlock) return if (!SkyHanniDebugsAndTests.globalRender) return @@ -60,7 +59,7 @@ object ItemTipHelper { val stack = slot.stack ?: continue val itemTipEvent = RenderInventoryItemTipEvent(inventoryName, slot, stack) - itemTipEvent.postAndCatch() + itemTipEvent.post() val stackTip = itemTipEvent.stackTip if (stackTip.isEmpty()) continue diff --git a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt index 8ec067deb926..662d09f3e1d5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/LocationFixData.kt @@ -1,12 +1,11 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.LocationFixJson import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LocationUtils.isPlayerInside import net.minecraft.util.AxisAlignedBB -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object LocationFixData { @@ -16,7 +15,7 @@ object LocationFixData { private data class LocationFix(val area: AxisAlignedBB, val realLocation: String) // priority set to low so that IslandType can load their island names from repo earlier - @SubscribeEvent(priority = EventPriority.LOW) + @HandleEvent(priority = HandleEvent.LOW) fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant("LocationFix") locationFixes.clear() diff --git a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt index f94ab310d393..62cafaabfd6d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MaxwellAPI.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.MaxwellPowersJson import at.hannibal2.skyhanni.events.InventoryOpenEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.features.dungeon.DungeonAPI import at.hannibal2.skyhanni.features.gui.customscoreboard.CustomScoreboard import at.hannibal2.skyhanni.features.gui.customscoreboard.ScoreboardConfigElement @@ -24,8 +25,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import com.google.gson.annotations.Expose import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.regex.Pattern @SkyHanniModule @@ -128,8 +127,8 @@ object MaxwellAPI { fun isThaumaturgyInventory(inventoryName: String) = thaumaturgyGuiPattern.matches(inventoryName) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!isEnabled()) return val message = event.message.trimWhiteSpace().removeResets() @@ -156,7 +155,7 @@ object MaxwellAPI { } // load earlier, so that other features can already use the api in this event - @SubscribeEvent(priority = EventPriority.HIGH) + @HandleEvent(priority = HandleEvent.HIGH) fun onInventoryOpen(event: InventoryOpenEvent) { if (!isEnabled()) return @@ -302,7 +301,7 @@ object MaxwellAPI { private fun isEnabled() = LorenzUtils.inSkyBlock && storage != null // Load powers from repo - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { val data = event.getConstant("MaxwellPowers") powers = data.powers diff --git a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt index 1cb023ecd3df..3e9adc13ae4e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MayorAPI.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.data.Mayor.Companion.addPerks import at.hannibal2.skyhanni.data.Mayor.Companion.getMayorFromPerk @@ -12,8 +13,8 @@ import at.hannibal2.skyhanni.data.jsonobjects.other.MayorJson import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.SecondPassedEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.features.fame.ReminderUtils import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.APIUtils @@ -37,7 +38,6 @@ import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.hours import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.minutes @@ -119,7 +119,7 @@ object MayorAPI { */ fun mayorNameWithColorCode(input: String) = mayorNameToColorCode(input) + input - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { if (!LorenzUtils.onHypixel) return if (event.repeatSeconds(2)) { @@ -148,8 +148,8 @@ object MayorAPI { } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.inSkyBlock) return if (electionOverPattern.matches(event.message)) { @@ -159,7 +159,7 @@ object MayorAPI { } } - @SubscribeEvent + @HandleEvent fun onInventory(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return @@ -239,7 +239,7 @@ object MayorAPI { private fun List.bestCandidate() = maxBy { it.votes } - @SubscribeEvent + @HandleEvent fun onConfigReload(event: ConfigLoadEvent) { SkyHanniMod.feature.dev.debug.assumeMayor.onToggle { val mayor = SkyHanniMod.feature.dev.debug.assumeMayor.get() @@ -253,7 +253,7 @@ object MayorAPI { } } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Mayor") event.addIrrelevant { diff --git a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt index 02768fc3d4bf..fc3563ab5aa9 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MinecraftData.kt @@ -2,10 +2,10 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.ItemInHandChangeEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.PlaySoundEvent import at.hannibal2.skyhanni.events.ReceiveParticleEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.DelayedRun @@ -34,7 +34,7 @@ object MinecraftData { LorenzVec(packet.x, packet.y, packet.z), packet.pitch, packet.volume - ).postAndCatch() + ).post() ) { event.cancel() } @@ -42,7 +42,7 @@ object MinecraftData { @SubscribeEvent fun onWorldChange(event: WorldEvent.Load) { - LorenzWorldChangeEvent().postAndCatch() + WorldChangeEvent.post() } @HandleEvent(receiveCancelled = true, onlyOnSkyblock = true) @@ -58,7 +58,7 @@ object MinecraftData { LorenzVec(packet.xOffset, packet.yOffset, packet.zOffset), packet.isLongDistance, packet.particleArgs, - ).postAndCatch() + ).post() ) { event.cancel() } @@ -73,11 +73,11 @@ object MinecraftData { DelayedRun.checkRuns() totalTicks++ - LorenzTickEvent(totalTicks).postAndCatch() + SkyHanniTickEvent(totalTicks).post() } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return val hand = InventoryUtils.getItemInHand() val newItem = hand?.getInternalName() ?: NEUInternalName.NONE @@ -90,12 +90,12 @@ object MinecraftData { } InventoryUtils.itemInHandId = newItem InventoryUtils.latestItemInHand = hand - ItemInHandChangeEvent(newItem, oldItem).postAndCatch() + ItemInHandChangeEvent(newItem, oldItem).post() } } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { InventoryUtils.itemInHandId = NEUInternalName.NONE InventoryUtils.recentItemsInHand.clear() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt index fbe304098299..b0ae302123fd 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/MiningAPI.kt @@ -5,12 +5,12 @@ import at.hannibal2.skyhanni.events.BlockClickEvent import at.hannibal2.skyhanni.events.ColdUpdateEvent import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.IslandChangeEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.PlaySoundEvent import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent import at.hannibal2.skyhanni.events.ServerBlockChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.mining.OreMinedEvent import at.hannibal2.skyhanni.events.player.PlayerDeathEvent import at.hannibal2.skyhanni.events.skyblock.ScoreboardAreaChangeEvent @@ -32,7 +32,6 @@ import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import io.netty.util.internal.ConcurrentSet import net.minecraft.init.Blocks -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.ConcurrentLinkedQueue import kotlin.math.absoluteValue import kotlin.time.Duration.Companion.milliseconds @@ -163,7 +162,7 @@ object MiningAPI { fun inColdIsland() = inAnyIsland(IslandType.DWARVEN_MINES, IslandType.MINESHAFT) - @SubscribeEvent + @HandleEvent fun onScoreboardChange(event: ScoreboardUpdateEvent) { val newCold = coldPattern.firstMatcher(event.scoreboard) { group("cold").toInt().absoluteValue @@ -182,8 +181,8 @@ object MiningAPI { recentClickedBlocks += event.position to SimpleTimeMark.now() } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!inColdIsland()) return if (coldResetPattern.matches(event.message)) { updateCold(0) @@ -210,7 +209,7 @@ object MiningAPI { } - @SubscribeEvent + @HandleEvent fun onPlayerDeath(event: PlayerDeathEvent) { if (event.name == LorenzUtils.getPlayerName()) { updateCold(0) @@ -218,7 +217,7 @@ object MiningAPI { } } - @SubscribeEvent + @HandleEvent fun onPlaySound(event: PlaySoundEvent) { if (!inCustomMiningIsland()) return if (event.soundName == "random.explode" && lastPickobulusUse.passedSince() < 5.seconds) { @@ -253,7 +252,7 @@ object MiningAPI { } } - @SubscribeEvent + @HandleEvent fun onBlockChange(event: ServerBlockChangeEvent) { if (!inCustomMiningIsland()) return val oldState = event.oldState @@ -296,8 +295,8 @@ object MiningAPI { } } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!inCustomMiningIsland()) return if (currentAreaOreBlocks.isEmpty()) return @@ -320,7 +319,7 @@ object MiningAPI { updateLocation() } - @SubscribeEvent + @HandleEvent fun onIslandChange(event: IslandChangeEvent) { updateLocation() } @@ -344,8 +343,8 @@ object MiningAPI { recentClickedBlocks.removeIf { it.second.passedSince() >= originalBlock.time.passedSince() } } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { if (cold != 0) updateCold(0) lastColdReset = SimpleTimeMark.now() recentClickedBlocks.clear() @@ -378,7 +377,7 @@ object MiningAPI { lastOreMinedTime = SimpleTimeMark.now() } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Mining API") if (!inCustomMiningIsland()) { @@ -408,7 +407,7 @@ object MiningAPI { // Hypixel sends cold data once in scoreboard even after resetting it if (cold == 0 && lastColdUpdate.passedSince() < 1.seconds) return lastColdUpdate = SimpleTimeMark.now() - ColdUpdateEvent(newCold).postAndCatch() + ColdUpdateEvent(newCold).post() cold = newCold } diff --git a/src/main/java/at/hannibal2/skyhanni/data/NotificationManager.kt b/src/main/java/at/hannibal2/skyhanni/data/NotificationManager.kt index 748e46892865..9d30d2d2adc5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/NotificationManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/NotificationManager.kt @@ -4,7 +4,7 @@ import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.commands.CommandCategory import at.hannibal2.skyhanni.config.commands.CommandRegistrationEvent import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.LorenzKeyPressEvent +import at.hannibal2.skyhanni.events.KeyPressEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.GuiRenderUtils import at.hannibal2.skyhanni.utils.InventoryUtils @@ -13,7 +13,6 @@ import at.hannibal2.skyhanni.utils.TimeUtils.format import at.hannibal2.skyhanni.utils.compat.GuiScreenUtils import io.github.notenoughupdates.moulconfig.internal.RenderUtils import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.input.Keyboard import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -28,8 +27,8 @@ object NotificationManager { private const val CLOSE_TEXT = "§c[X] Close" - @SubscribeEvent - fun onKeyClick(event: LorenzKeyPressEvent) { + @HandleEvent + fun onKeyClick(event: KeyPressEvent) { currentNotification ?: return if (lastNotificationClosed.passedSince() < 200.milliseconds) return if (event.keyCode != Keyboard.KEY_X) return @@ -37,7 +36,7 @@ object NotificationManager { lastNotificationClosed = SimpleTimeMark.now() } - @SubscribeEvent + @HandleEvent fun onRenderOverlay(event: GuiRenderEvent) { val notification = getCurrentNotification() ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt index 02f3910196ac..9f69dda0c0f2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OtherInventoryData.kt @@ -5,14 +5,13 @@ import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.InventoryUpdatedEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraft.item.ItemStack import net.minecraft.network.play.server.S2DPacketOpenWindow import net.minecraft.network.play.server.S2EPacketCloseWindow import net.minecraft.network.play.server.S2FPacketSetSlot -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object OtherInventoryData { @@ -21,20 +20,20 @@ object OtherInventoryData { private var acceptItems = false private var lateEvent: InventoryUpdatedEvent? = null - @SubscribeEvent + @HandleEvent fun onCloseWindow(event: GuiContainerEvent.CloseWindowEvent) { close() } fun close(reopenSameName: Boolean = false) { - InventoryCloseEvent(reopenSameName).postAndCatch() + InventoryCloseEvent(reopenSameName).post() currentInventory = null } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { lateEvent?.let { - it.postAndCatch() + it.post() lateEvent = null } } @@ -95,9 +94,9 @@ object OtherInventoryData { } private fun done(inventory: Inventory) { - InventoryFullyOpenedEvent(inventory).postAndCatch() + InventoryFullyOpenedEvent(inventory).post() inventory.fullyOpenedOnce = true - InventoryUpdatedEvent(inventory).postAndCatch() + InventoryUpdatedEvent(inventory).post() acceptItems = false } diff --git a/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt index 0401746c4edb..67507ec1b8a5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OtherPlayersSlayerAPI.kt @@ -1,17 +1,17 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.mob.Mob import at.hannibal2.skyhanni.events.MobEvent import at.hannibal2.skyhanni.events.entity.slayer.SlayerDeathEvent import at.hannibal2.skyhanni.features.slayer.SlayerType import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object OtherPlayersSlayerAPI { - @SubscribeEvent + @HandleEvent fun onMobDespawn(event: MobEvent.DeSpawn.SkyblockMob) { val mob = event.mob diff --git a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt index 0b4abf42586f..4e9da4d6769d 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/OwnInventoryData.kt @@ -3,10 +3,10 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.events.entity.ItemAddInInventoryEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketSentEvent @@ -27,7 +27,6 @@ import net.minecraft.client.Minecraft import net.minecraft.network.play.client.C0EPacketClickWindow import net.minecraft.network.play.server.S0DPacketCollectItem import net.minecraft.network.play.server.S2FPacketSetSlot -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds import kotlin.time.Duration.Companion.seconds @@ -54,7 +53,7 @@ object OwnInventoryData { val slot = packet.func_149173_d() val item = packet.func_149174_e() ?: return DelayedRun.runNextTick { - OwnInventoryItemUpdateEvent(item, slot).postAndCatch() + OwnInventoryItemUpdateEvent(item, slot).post() } } } @@ -69,8 +68,8 @@ object OwnInventoryData { } } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return if (itemAmounts.isEmpty()) { itemAmounts = getCurrentItems() @@ -95,8 +94,8 @@ object OwnInventoryData { return map } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { itemAmounts = emptyMap() } @@ -109,14 +108,14 @@ object OwnInventoryData { } } - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { val item = Minecraft.getMinecraft().thePlayer.inventory.itemStack ?: return val internalNameOrNull = item.getInternalNameOrNull() ?: return ignoreItem(500.milliseconds) { it == internalNameOrNull } } - @SubscribeEvent + @HandleEvent fun onSlotClick(event: GuiContainerEvent.SlotClickEvent) { ignoreItem(500.milliseconds) { true } @@ -161,8 +160,8 @@ object OwnInventoryData { } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { sackToInventoryChatPattern.matchMatcher(event.message) { val name = group("name") ignoreItem(500.milliseconds) { it.itemName.contains(name) } @@ -187,6 +186,6 @@ object OwnInventoryData { if (internalName.startsWith("MAP-")) return - ItemAddInInventoryEvent(internalName, add).postAndCatch() + ItemAddInInventoryEvent(internalName, add).post() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt index 2ee30c27e55a..9cd60d5ac927 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PartyAPI.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.PartyChatEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.StringUtils.removeResets import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.random.Random @SkyHanniModule @@ -106,14 +106,14 @@ object PartyAPI { } } - @SubscribeEvent + @HandleEvent fun onPartyChat(event: PartyChatEvent) { val name = event.author.cleanPlayerName() addPlayer(name) } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { val message = event.message.trimWhiteSpace().removeResets() // new member joined diff --git a/src/main/java/at/hannibal2/skyhanni/data/PlayerDeathManager.kt b/src/main/java/at/hannibal2/skyhanni/data/PlayerDeathManager.kt index 75616520f8ff..d7e41e06524e 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PlayerDeathManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PlayerDeathManager.kt @@ -1,12 +1,12 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.api.event.HandleEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.events.player.PlayerDeathEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object PlayerDeathManager { @@ -19,13 +19,13 @@ object PlayerDeathManager { "§c ☠ §r§7§r§.(?.+)§r§7 (?.+)", ) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { val message = event.message deathMessagePattern.matchMatcher(message) { val name = group("name") val reason = group("reason").removeColor() - PlayerDeathEvent(name, reason, event).postAndCatch() + PlayerDeathEvent(name, reason, event).post() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt index ec5b0a4a8147..fbb17363b823 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ProfileStorageData.kt @@ -1,16 +1,17 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.SackData import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage import at.hannibal2.skyhanni.config.storage.ProfileSpecificStorage import at.hannibal2.skyhanni.data.model.TabWidget import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.HypixelJoinEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.WidgetUpdateEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.ChatUtils @@ -19,8 +20,6 @@ import at.hannibal2.skyhanni.utils.HypixelCommands import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.TabListData -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds @SkyHanniModule @@ -35,7 +34,7 @@ object ProfileStorageData { var sackProfiles: SackData.ProfileSpecific? = null var hypixelDataLoaded = false - @SubscribeEvent(priority = EventPriority.HIGHEST) + @HandleEvent(priority = HandleEvent.HIGHEST) fun onProfileJoin(event: ProfileJoinEvent) { val playerSpecific = playerSpecific val sackPlayers = sackPlayers @@ -51,7 +50,7 @@ object ProfileStorageData { } loadProfileSpecific(playerSpecific, sackPlayers, profileName) - ConfigLoadEvent().postAndCatch() + ConfigLoadEvent.post() } private fun workaroundIn10SecondsProfileStorage(profileName: String) { @@ -72,17 +71,17 @@ object ProfileStorageData { ErrorManager.skyHanniError("sackPlayers is null in ProfileJoinEvent!") } loadProfileSpecific(playerSpecific, sackPlayers, profileName) - ConfigLoadEvent().postAndCatch() + ConfigLoadEvent.post() } - @SubscribeEvent + @HandleEvent fun onTabListUpdate(event: WidgetUpdateEvent) { if (!event.isWidget(TabWidget.PROFILE)) return noTabListTime = if (event.isClear()) SimpleTimeMark.now() else SimpleTimeMark.farPast() } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return if (noTabListTime == SimpleTimeMark.farPast()) return @@ -122,19 +121,19 @@ object ProfileStorageData { profileSpecific = playerSpecific.profiles.getOrPut(profileName) { ProfileSpecificStorage() } sackProfiles = sackProfile.profiles.getOrPut(profileName) { SackData.ProfileSpecific() } loaded = true - ConfigLoadEvent().postAndCatch() + ConfigLoadEvent.post() } - @SubscribeEvent + @HandleEvent fun onHypixelJoin(event: HypixelJoinEvent) { val playerUuid = LorenzUtils.getRawPlayerUuid() playerSpecific = SkyHanniMod.feature.storage.players.getOrPut(playerUuid) { PlayerSpecificStorage() } sackPlayers = SkyHanniMod.sackData.players.getOrPut(playerUuid) { SackData.PlayerSpecific() } - ConfigLoadEvent().postAndCatch() + ConfigLoadEvent.post() } - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { hypixelDataLoaded = false } diff --git a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt index 0f029a1f2e2e..cc05a2456af2 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/PurseAPI.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.PurseChangeCause import at.hannibal2.skyhanni.events.PurseChangeEvent @@ -11,7 +12,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchFirst import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds @SkyHanniModule @@ -30,12 +30,12 @@ object PurseAPI { var currentPurse = 0.0 private set - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { inventoryCloseTime = SimpleTimeMark.now() } - @SubscribeEvent + @HandleEvent fun onScoreboardChange(event: ScoreboardUpdateEvent) { event.scoreboard.matchFirst(coinsPattern) { val newPurse = group("coins").formatDouble() @@ -43,7 +43,7 @@ object PurseAPI { if (diff == 0.0) return currentPurse = newPurse - PurseChangeEvent(diff, getCause(diff)).postAndCatch() + PurseChangeEvent(diff, getCause(diff)).post() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt index 2f516610ca51..e43fe2abfdce 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/QuiverAPI.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.ArrowTypeJson import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.OwnInventoryItemUpdateEvent import at.hannibal2.skyhanni.events.QuiverUpdateEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.SecondPassedEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.InventoryUtils @@ -27,7 +28,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeResets import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpace import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.item.ItemBow -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule @@ -103,8 +103,8 @@ object QuiverAPI { "§7Active Arrow: §.(?.*) §7\\(§e(?.*)§7\\)" ) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!isEnabled()) return val message = event.message.trimWhiteSpace().removeResets() @@ -193,7 +193,7 @@ object QuiverAPI { } } - @SubscribeEvent + @HandleEvent fun onInventoryFullyLoaded(event: InventoryFullyOpenedEvent) { if (!isEnabled()) return if (!quiverInventoryNamePattern.matches(event.inventoryName)) return @@ -211,7 +211,7 @@ object QuiverAPI { } } - @SubscribeEvent + @HandleEvent fun onInventoryUpdate(event: OwnInventoryItemUpdateEvent) { if (!isEnabled() && event.slot != 44) return val stack = event.itemStack @@ -274,10 +274,10 @@ object QuiverAPI { } private fun postUpdateEvent(arrowType: ArrowType? = currentArrow) { - QuiverUpdateEvent(arrowType, currentAmount).postAndCatch() + QuiverUpdateEvent(arrowType, currentAmount).post() } - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { if (!isEnabled()) return if (event.repeatSeconds(2)) { @@ -287,7 +287,7 @@ object QuiverAPI { } // Load arrows from repo - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { val arrowData = event.getConstant("ArrowTypes") arrows = arrowData.arrows.map { ArrowType(it.value.arrow, it.key.asInternalName()) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt index 0aae783575b8..9434b4700dc0 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/RenderData.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.features.chroma.ChromaConfig import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent +import at.hannibal2.skyhanni.events.SkyHanniRenderWorldEvent import at.hannibal2.skyhanni.features.misc.visualwords.VisualWordGui import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.SkyHanniDebugsAndTests @@ -28,7 +29,7 @@ object RenderData { if (GuiEditManager.isInGui() || VisualWordGui.isInGui()) return GlStateManager.translate(0f, 0f, -3f) - GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().post() GlStateManager.translate(0f, 0f, 3f) } @@ -45,11 +46,11 @@ object RenderData { if (GuiEditManager.isInGui()) { GlStateManager.translate(0f, 0f, -3f) - GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().post() GlStateManager.translate(0f, 0f, 3f) } - GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch() + GuiRenderEvent.ChestGuiOverlayRenderEvent().post() GlStateManager.popMatrix() } @@ -59,11 +60,11 @@ object RenderData { @SubscribeEvent fun onRenderWorld(event: RenderWorldLastEvent) { if (!SkyHanniDebugsAndTests.globalRender) return - LorenzRenderWorldEvent(event.partialTicks).postAndCatch() + SkyHanniRenderWorldEvent(event.partialTicks).post() } // TODO find better spot for this - @SubscribeEvent + @HandleEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.transform(17, "chroma.chromaDirection") { element -> ConfigUtils.migrateIntToEnum(element, ChromaConfig.Direction::class.java) diff --git a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt index 4978497cf3e8..3017ea38743a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SackAPI.kt @@ -1,14 +1,15 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigFileType import at.hannibal2.skyhanni.data.jsonobjects.repo.neu.NeuSacksJson import at.hannibal2.skyhanni.events.InventoryCloseEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent import at.hannibal2.skyhanni.events.NeuRepositoryReloadEvent import at.hannibal2.skyhanni.events.SackChangeEvent import at.hannibal2.skyhanni.events.SackDataUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.features.fishing.FishingAPI import at.hannibal2.skyhanni.features.fishing.trophy.TrophyRarity import at.hannibal2.skyhanni.features.inventory.SackDisplay @@ -33,7 +34,6 @@ import at.hannibal2.skyhanni.utils.StringUtils.removeNonAscii import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import com.google.gson.annotations.Expose import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object SackAPI { @@ -85,7 +85,7 @@ object SackAPI { var sackListNames = emptySet() private set - @SubscribeEvent + @HandleEvent fun onInventoryClose(event: InventoryCloseEvent) { inSackInventory = false isRuneSack = false @@ -97,7 +97,7 @@ object SackAPI { stackList.clear() } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { val inventoryName = event.inventoryName val isNewInventory = inventoryName != lastOpenedInventory @@ -225,8 +225,8 @@ object SackAPI { private val sackChangeRegex = Regex("""([+-][\d,]+) (.+) \((.+)\)""") - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!event.message.removeColor().startsWith("[Sacks]")) return val sackAddText = event.chatComponent.siblings.firstNotNullOfOrNull { sibling -> @@ -257,13 +257,13 @@ object SackAPI { } val sackEvent = SackChangeEvent(sackChanges, otherItemsAdded, otherItemsRemoved) updateSacks(sackEvent) - sackEvent.postAndCatch() + sackEvent.post() if (chatConfig.hideSacksChange) { event.blockedReason = "sacks_change" } } - @SubscribeEvent + @HandleEvent fun onNeuRepoReload(event: NeuRepositoryReloadEvent) { val sacksData = event.readConstant("sacks").sacks val uniqueSackItems = mutableSetOf() diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt index 42de7a75b1f1..f976a0ab4091 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ScoreboardData.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.api.event.HandleEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.RawScoreboardUpdateEvent import at.hannibal2.skyhanni.events.ScoreboardUpdateEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils @@ -15,8 +15,6 @@ import net.minecraft.network.play.server.S3CPacketUpdateScore import net.minecraft.network.play.server.S3EPacketTeams import net.minecraft.scoreboard.Score import net.minecraft.scoreboard.ScorePlayerTeam -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object ScoreboardData { @@ -101,8 +99,8 @@ object ScoreboardData { println(" ") } - @SubscribeEvent(priority = EventPriority.HIGHEST) - fun onTick(event: LorenzTickEvent) { + @HandleEvent(priority = HandleEvent.HIGHEST) + fun onTick(event: SkyHanniTickEvent) { if (!dirty) return dirty = false monitor() @@ -110,14 +108,14 @@ object ScoreboardData { val list = fetchScoreboardLines().reversed() val semiFormatted = list.map { cleanSB(it) } if (semiFormatted != sidebarLines) { - RawScoreboardUpdateEvent(semiFormatted).postAndCatch() + RawScoreboardUpdateEvent(semiFormatted).post() sidebarLines = semiFormatted } sidebarLinesRaw = list val new = formatLines(list) if (new != sidebarLinesFormatted) { - ScoreboardUpdateEvent(new).postAndCatch() + ScoreboardUpdateEvent(new).post() sidebarLinesFormatted = new } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/ScreenData.kt b/src/main/java/at/hannibal2/skyhanni/data/ScreenData.kt index 2b64ed1ab33d..8b1be1ee0c1b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ScreenData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ScreenData.kt @@ -1,22 +1,22 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object ScreenData { private var wasOpen = false - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { val isOpen = Minecraft.getMinecraft().currentScreen != null if (wasOpen == isOpen) return wasOpen = isOpen if (!wasOpen) { - InventoryCloseEvent(false).postAndCatch() + InventoryCloseEvent(false).post() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt index 367c3794e8d7..47967552b028 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SkillExperience.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.ActionBarUpdateEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.NumberUtil.romanToDecimal import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object SkillExperience { @@ -26,12 +26,12 @@ object SkillExperience { ".* §e(?.*)§6/.*" ) - @SubscribeEvent + @HandleEvent fun onProfileJoin(event: ProfileJoinEvent) { skillExp.clear() } - @SubscribeEvent + @HandleEvent fun onActionBarUpdate(event: ActionBarUpdateEvent) { if (!LorenzUtils.inSkyBlock) return @@ -46,7 +46,7 @@ object SkillExperience { } } - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (event.inventoryName != "Your Skills") return diff --git a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt index aa9aa1f65bc0..c6c0610459ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/SlayerAPI.kt @@ -1,8 +1,9 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.DebugDataCollectEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.SlayerChangeEvent import at.hannibal2.skyhanni.events.SlayerProgressChangeEvent import at.hannibal2.skyhanni.events.SlayerQuestCompleteEvent @@ -19,7 +20,6 @@ import at.hannibal2.skyhanni.utils.RecalculatingValue import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TimeLimitedCache -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds @@ -57,7 +57,7 @@ object SlayerAPI { } } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Slayer") @@ -74,8 +74,8 @@ object SlayerAPI { } } - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!LorenzUtils.inSkyBlock) return if (event.message.contains("§r§5§lSLAYER QUEST STARTED!")) { @@ -101,8 +101,8 @@ object SlayerAPI { return null } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.inSkyBlock) return // wait with sending SlayerChangeEvent until profile is detected @@ -112,12 +112,12 @@ object SlayerAPI { if (slayerQuest != latestSlayerCategory) { val old = latestSlayerCategory latestSlayerCategory = slayerQuest - SlayerChangeEvent(old, latestSlayerCategory).postAndCatch() + SlayerChangeEvent(old, latestSlayerCategory).post() } val slayerProgress = ScoreboardData.sidebarLinesFormatted.nextAfter("Slayer Quest", 2).orEmpty() if (latestSlayerProgress != slayerProgress) { - SlayerProgressChangeEvent(latestSlayerProgress, slayerProgress).postAndCatch() + SlayerProgressChangeEvent(latestSlayerProgress, slayerProgress).post() latestSlayerProgress = slayerProgress } diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt index f8ad4f652fc3..a58e00a16a78 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TitleData.kt @@ -16,7 +16,7 @@ object TitleData { if (packet !is S45PacketTitle) return val message = packet.message ?: return val formattedText = message.formattedText - if (TitleReceivedEvent(formattedText).postAndCatch()) { + if (TitleReceivedEvent(formattedText).post()) { event.cancel() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt index 95dbe1577f56..8eee5515b189 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TitleManager.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ProfileJoinEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -9,7 +10,6 @@ import io.github.notenoughupdates.moulconfig.internal.TextRenderUtils import net.minecraft.client.Minecraft import net.minecraft.client.gui.ScaledResolution import net.minecraft.client.renderer.GlStateManager -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.lwjgl.opengl.GL11 import kotlin.time.Duration import kotlin.time.Duration.Companion.milliseconds @@ -52,12 +52,12 @@ object TitleManager { sendTitle(title, duration, height, fontSize) } - @SubscribeEvent + @HandleEvent fun onProfileJoin(event: ProfileJoinEvent) { endTime = SimpleTimeMark.farPast() } - @SubscribeEvent + @HandleEvent fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (endTime.isInPast()) return diff --git a/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt b/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt index 482b590fe54b..5cad68683638 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/ToolTipData.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.data -import at.hannibal2.skyhanni.events.LorenzToolTipEvent +import at.hannibal2.skyhanni.events.SkyHanniToolTipEvent import at.hannibal2.skyhanni.events.item.ItemHoverEvent import at.hannibal2.skyhanni.test.command.ErrorManager import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName @@ -17,7 +17,7 @@ object ToolTipData { val slot = lastSlot ?: return val itemStack = slot.stack ?: return try { - if (LorenzToolTipEvent(slot, itemStack, toolTip).postAndCatch()) { + if (SkyHanniToolTipEvent(slot, itemStack, toolTip).post()) { toolTip.clear() } } catch (e: Throwable) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt index c1a7a60c3f49..a5dd9cb4e94a 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TrackerManager.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.ConfigLoadEvent import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.ItemAddEvent @@ -9,8 +10,6 @@ import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.ConditionalUtils import at.hannibal2.skyhanni.utils.NEUInternalName import at.hannibal2.skyhanni.utils.NumberUtil.formatIntOrUserError -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object TrackerManager { @@ -19,7 +18,7 @@ object TrackerManager { var dirty = false var commandEditTrackerSuccess = false - @SubscribeEvent + @HandleEvent fun onConfigLoad(event: ConfigLoadEvent) { val config = SkyHanniMod.feature.misc.tracker.hideCheapItems ConditionalUtils.onToggle(config.alwaysShowBest, config.minPrice, config.enabled) { @@ -27,14 +26,14 @@ object TrackerManager { } } - @SubscribeEvent(priority = EventPriority.HIGHEST) + @HandleEvent(priority = HandleEvent.HIGHEST) fun onRenderOverlayFirst(event: GuiRenderEvent) { if (hasChanged) { dirty = true } } - @SubscribeEvent(priority = EventPriority.LOWEST) + @HandleEvent(priority = HandleEvent.LOWEST) fun onRenderOverlayLast(event: GuiRenderEvent) { if (hasChanged) { dirty = false @@ -62,7 +61,7 @@ object TrackerManager { } commandEditTrackerSuccess = false - ItemAddEvent(internalName, amount, ItemAddManager.Source.COMMAND).postAndCatch() + ItemAddEvent(internalName, amount, ItemAddManager.Source.COMMAND).post() if (!commandEditTrackerSuccess) { ChatUtils.userError("Could not edit the Item Tracker! Does this item belong to this tracker? Is the tracker active right now?") } diff --git a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt index 7a97fca1d19d..5979752ce33f 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/bazaar/HypixelBazaarFetcher.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.data.bazaar import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.events.DebugDataCollectEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.features.inventory.bazaar.BazaarData import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.ErrorManager @@ -19,7 +20,6 @@ import at.hannibal2.skyhanni.utils.json.fromJson import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.seconds @@ -35,7 +35,7 @@ object HypixelBazaarFetcher { private var failedAttempts = 0 private var nextFetchIsManual = false - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Bazaar Data Fetcher from API") @@ -53,8 +53,8 @@ object HypixelBazaarFetcher { } } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!canFetch()) return SkyHanniMod.coroutineScope.launch { fetchAndProcessBazaarData() diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt index eb48bb4e9b97..c005a4672181 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerChatManager.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data.hypixel.chat +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.IslandType import at.hannibal2.skyhanni.data.hypixel.chat.event.AbstractChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.CoopChatEvent @@ -10,7 +11,7 @@ import at.hannibal2.skyhanni.data.hypixel.chat.event.PlayerAllChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.PlayerShowItemChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.PrivateMessageChatEvent import at.hannibal2.skyhanni.data.hypixel.chat.event.SystemMessageEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ComponentMatcher import at.hannibal2.skyhanni.utils.ComponentMatcherUtils.intoSpan @@ -19,7 +20,6 @@ import at.hannibal2.skyhanni.utils.ComponentSpan import at.hannibal2.skyhanni.utils.LorenzUtils.isInIsland import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.util.IChatComponent -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent /** * Reading normal chat events, and splitting them up into many different player chat events, with all available extra information @@ -114,8 +114,8 @@ object PlayerChatManager { "(?.*)(?§a\\[✌] )(?.*)" ) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { val chatComponent = event.chatComponent.intoSpan().stripHypixelMessage() coopPattern.matchStyledMatcher(chatComponent) { val author = groupOrThrow("author") @@ -167,7 +167,7 @@ object PlayerChatManager { sendSystemMessage(event) } - private fun ComponentMatcher.isGlobalChat(event: LorenzChatEvent): Boolean { + private fun ComponentMatcher.isGlobalChat(event: SkyHanniChatEvent): Boolean { var author = groupOrThrow("author") val message = groupOrThrow("message").removePrefix("§f") if (author.getText().contains("[NPC]")) { @@ -204,19 +204,19 @@ object PlayerChatManager { return true } - private fun sendSystemMessage(event: LorenzChatEvent) { + private fun sendSystemMessage(event: SkyHanniChatEvent) { with(SystemMessageEvent(event.message, event.chatComponent)) { - postAndCatch() + post() event.handleChat(blockedReason, chatComponent) } } - private fun AbstractChatEvent.postChat(event: LorenzChatEvent) { - postAndCatch() + private fun AbstractChatEvent.postChat(event: SkyHanniChatEvent) { + post() event.handleChat(blockedReason, chatComponent) } - private fun LorenzChatEvent.handleChat( + private fun SkyHanniChatEvent.handleChat( blockedReason: String?, chatComponent: IChatComponent, ) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt index bd7a407dfa7b..e49f535aea37 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/PlayerNameFormatter.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.data.hypixel.chat import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.config.features.chat.PlayerMessagesConfig import at.hannibal2.skyhanni.data.hypixel.chat.event.CoopChatEvent @@ -33,7 +34,6 @@ import com.google.gson.JsonNull import net.minecraft.util.ChatComponentText import net.minecraft.util.EnumChatFormatting import net.minecraft.util.IChatComponent -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent /** * Listening to the player chat events, and applying custom chat options to them. @@ -58,7 +58,7 @@ object PlayerNameFormatter { "(?(?:§.){0,2}.) (?.*)", ) - @SubscribeEvent + @HandleEvent fun onPlayerAllChat(event: PlayerAllChatEvent) { if (!isEnabled()) return val levelColor = event.levelColor @@ -86,7 +86,7 @@ object PlayerNameFormatter { event.chatComponent = StringUtils.replaceIfNeeded(event.chatComponent, all) ?: return } - @SubscribeEvent + @HandleEvent fun onCoopChat(event: CoopChatEvent) { if (!isEnabled()) return event.chatComponent = StringUtils.replaceIfNeeded( @@ -99,7 +99,7 @@ object PlayerNameFormatter { ) ?: return } - @SubscribeEvent + @HandleEvent fun onGuildChat(event: GuildChatEvent) { if (!isEnabled()) return event.chatComponent = StringUtils.replaceIfNeeded( @@ -112,7 +112,7 @@ object PlayerNameFormatter { ) ?: return } - @SubscribeEvent + @HandleEvent fun onPartyChat(event: PartyChatEvent) { if (!isEnabled()) return event.chatComponent = StringUtils.replaceIfNeeded( @@ -125,7 +125,7 @@ object PlayerNameFormatter { ) ?: return } - @SubscribeEvent + @HandleEvent fun onPrivateChat(event: PrivateMessageChatEvent) { if (!isEnabled()) return event.chatComponent = StringUtils.replaceIfNeeded( @@ -139,7 +139,7 @@ object PlayerNameFormatter { ) ?: return } - @SubscribeEvent + @HandleEvent fun onPlayerShowItemChat(event: PlayerShowItemChatEvent) { if (!isEnabled()) return event.chatComponent = StringUtils.replaceIfNeeded( @@ -271,7 +271,7 @@ object PlayerNameFormatter { fun isEnabled() = LorenzUtils.inSkyBlock && config.enable - @SubscribeEvent + @HandleEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.transform(41, "chat.PlayerMessagesConfig.partsOrder") { element -> val newList = JsonArray() diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/AbstractChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/AbstractChatEvent.kt index 6ef6861f2d56..630bd5c8072b 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/AbstractChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/AbstractChatEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.data.hypixel.chat.event -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.ComponentSpan import net.minecraft.util.IChatComponent @@ -9,7 +9,7 @@ open class AbstractChatEvent( val messageComponent: ComponentSpan, var chatComponent: IChatComponent, var blockedReason: String? = null, -) : LorenzEvent() { +) : SkyHanniEvent() { val message by lazy { messageComponent.getText().removePrefix("§r") } val author by lazy { authorComponent.getText() } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt index e33165b34acc..bb2de00104f5 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/PlayerAllChatEvent.kt @@ -1,10 +1,7 @@ package at.hannibal2.skyhanni.data.hypixel.chat.event import at.hannibal2.skyhanni.utils.ComponentSpan -import net.minecraft.util.ChatComponentText import net.minecraft.util.IChatComponent -import net.minecraftforge.fml.common.eventhandler.ListenerList -import org.jetbrains.annotations.ApiStatus class PlayerAllChatEvent( val levelComponent: ComponentSpan?, @@ -19,44 +16,4 @@ class PlayerAllChatEvent( val levelColor = levelComponent?.sampleStyleAtStart()?.color val level by lazy { levelComponent?.getText()?.toInt() } val isAGuest by lazy { privateIslandGuest != null } - - companion object { - private val listenerList = ListenerList( - AbstractChatEvent( - ComponentSpan.empty(), - ComponentSpan.empty(), - ChatComponentText(""), - "" - ).listenerList - ) - } - - /** - * This method is here to prevent FML from trying to add its own constructor. FML adds a public no args - * constructor to every Event class, which is used to determine the listener list using inheritance. This is done - * using class transformations, more specifically ASM. Sadly this class contains expressions which cause the class - * writer used by ASM to perform type unifications. Due to the way ASM is loaded these type unifications do not - * have access to some of the classes used in this class, causing a ClassNotFoundException. In order to prevent - * these unifications from happening we need to prevent FML from trying to generate this constructor, which we do - * by having our own setup function. - */ - override fun setup() { - super.setup() - } - - /** - * This method is required if [setup] is present. - */ - @ApiStatus.Internal - constructor() : this( - null, null, null, "", - ComponentSpan.empty(), ComponentSpan.empty(), ChatComponentText("") - ) - - /** - * This method is required if [setup] is present. - */ - override fun getListenerList(): ListenerList { - return PlayerAllChatEvent.listenerList - } } diff --git a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/SystemMessageEvent.kt b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/SystemMessageEvent.kt index 82c53d0b16d2..53e1440aed55 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/SystemMessageEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/hypixel/chat/event/SystemMessageEvent.kt @@ -1,10 +1,10 @@ package at.hannibal2.skyhanni.data.hypixel.chat.event -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.util.IChatComponent class SystemMessageEvent( val message: String, var chatComponent: IChatComponent, var blockedReason: String? = null, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/LineToMobHandler.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/LineToMobHandler.kt index 26313efba7a3..87a9e579ece9 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/LineToMobHandler.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/LineToMobHandler.kt @@ -1,11 +1,11 @@ package at.hannibal2.skyhanni.data.mob -import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.MobEvent +import at.hannibal2.skyhanni.events.SkyHanniRenderWorldEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.awt.Color @SkyHanniModule @@ -25,13 +25,13 @@ object LineToMobHandler { lines[mob] = settings } - @SubscribeEvent + @HandleEvent fun onMobDeSpawn(event: MobEvent.DeSpawn) { lines.remove(event.mob) } - @SubscribeEvent - fun onLorenzRenderWorld(event: LorenzRenderWorldEvent) { + @HandleEvent + fun onLorenzRenderWorld(event: SkyHanniRenderWorldEvent) { if (!LorenzUtils.inSkyBlock) return if (lines.isEmpty()) return RenderUtils.LineDrawer.draw3D(event.partialTicks) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt index 2363945d21df..a2fa5f3709ea 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobData.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data.mob +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.MobEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.takeIfAllNotNull @@ -8,7 +9,6 @@ import at.hannibal2.skyhanni.utils.LorenzLogger import at.hannibal2.skyhanni.utils.getLorenzVec import net.minecraft.entity.EntityLivingBase import net.minecraft.entity.item.EntityArmorStand -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.TreeMap import at.hannibal2.skyhanni.data.mob.Mob.Type as MobType @@ -89,66 +89,66 @@ object MobData { } } - @SubscribeEvent + @HandleEvent fun onMobEventSpawn(event: MobEvent.Spawn) { entityToMob.putAll(event.mob.makeEntityToMobAssociation()) currentMobs.add(event.mob) notSeenMobs.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onMobEventDeSpawn(event: MobEvent.DeSpawn) { event.mob.fullEntityList().forEach { entityToMob.remove(it) } currentMobs.remove(event.mob) notSeenMobs.remove(event.mob) } - @SubscribeEvent + @HandleEvent fun onSkyblockMobSpawnEvent(event: MobEvent.Spawn.SkyblockMob) { skyblockMobs.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onSkyblockMobDeSpawnEvent(event: MobEvent.DeSpawn.SkyblockMob) { skyblockMobs.remove(event.mob) } - @SubscribeEvent + @HandleEvent fun onSummonSpawnEvent(event: MobEvent.Spawn.Summon) { summoningMobs.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onSummonDeSpawnEvent(event: MobEvent.DeSpawn.Summon) { summoningMobs.remove(event.mob) } - @SubscribeEvent + @HandleEvent fun onSpecialSpawnEvent(event: MobEvent.Spawn.Special) { special.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onSpecialDeSpawnEvent(event: MobEvent.DeSpawn.Special) { special.remove(event.mob) } - @SubscribeEvent + @HandleEvent fun onDisplayNPCSpawnEvent(event: MobEvent.Spawn.DisplayNPC) { displayNPCs.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onDisplayNPCDeSpawnEvent(event: MobEvent.DeSpawn.DisplayNPC) { displayNPCs.remove(event.mob) } - @SubscribeEvent + @HandleEvent fun onRealPlayerSpawnEvent(event: MobEvent.Spawn.Player) { players.add(event.mob) } - @SubscribeEvent + @HandleEvent fun onRealPlayerDeSpawnEvent(event: MobEvent.DeSpawn.Player) { players.remove(event.mob) } diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt index e1da962ffccb..b787d48a67c7 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDebug.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.data.mob import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.features.dev.DebugMobConfig.HowToShow -import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent import at.hannibal2.skyhanni.events.MobEvent +import at.hannibal2.skyhanni.events.SkyHanniRenderWorldEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.test.command.CopyNearbyEntitiesCommand.getMobInfo import at.hannibal2.skyhanni.utils.LocationUtils.getTopCenter @@ -15,7 +16,6 @@ import at.hannibal2.skyhanni.utils.RenderUtils.drawString import at.hannibal2.skyhanni.utils.RenderUtils.expandBlock import net.minecraft.client.Minecraft import net.minecraft.client.entity.EntityPlayerSP -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object MobDebug { @@ -32,13 +32,13 @@ object MobDebug { private fun Mob.isNotInvisible() = !this.isInvisible() || (config.showInvisible && this == lastRayHit) - private fun MobData.MobSet.highlight(event: LorenzRenderWorldEvent, color: (Mob) -> (LorenzColor)) { + private fun MobData.MobSet.highlight(event: SkyHanniRenderWorldEvent, color: (Mob) -> (LorenzColor)) { for (mob in filter { it.isNotInvisible() }) { event.drawFilledBoundingBoxNea(mob.boundingBox.expandBlock(), color.invoke(mob).toColor(), 0.3f) } } - private fun MobData.MobSet.showName(event: LorenzRenderWorldEvent) { + private fun MobData.MobSet.showName(event: SkyHanniRenderWorldEvent) { val map = filter { it.canBeSeen() && it.isNotInvisible() } .map { it.boundingBox.getTopCenter() to it.name } for ((location, text) in map) { @@ -46,8 +46,8 @@ object MobDebug { } } - @SubscribeEvent - fun onWorldRenderDebug(event: LorenzRenderWorldEvent) { + @HandleEvent + fun onWorldRenderDebug(event: SkyHanniRenderWorldEvent) { if (config.showRayHit || config.showInvisible) { lastRayHit = MobUtils.rayTraceForMobs(Minecraft.getMinecraft().thePlayer, event.partialTicks) ?.firstOrNull { it.canBeSeen() && (!config.showInvisible || !it.isInvisible()) } @@ -87,7 +87,7 @@ object MobDebug { } } - @SubscribeEvent + @HandleEvent fun onMobEvent(event: MobEvent) { if (!config.logEvents) return val text = "Mob ${if (event is MobEvent.Spawn) "Spawn" else "Despawn"}: ${ diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt index dbfbfe533d4b..1510fa9f38f7 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobDetection.kt @@ -8,8 +8,8 @@ import at.hannibal2.skyhanni.data.mob.MobFilter.isRealPlayer import at.hannibal2.skyhanni.data.mob.MobFilter.isSkyBlockMob import at.hannibal2.skyhanni.events.DebugDataCollectEvent import at.hannibal2.skyhanni.events.EntityHealthUpdateEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.MobEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent import at.hannibal2.skyhanni.events.minecraft.ClientDisconnectEvent import at.hannibal2.skyhanni.events.minecraft.packet.PacketReceivedEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule @@ -33,7 +33,6 @@ import net.minecraft.network.play.server.S01PacketJoinGame import net.minecraft.network.play.server.S0CPacketSpawnPlayer import net.minecraft.network.play.server.S0FPacketSpawnMob import net.minecraft.world.World -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.concurrent.ConcurrentLinkedQueue import java.util.concurrent.atomic.AtomicBoolean @@ -63,7 +62,7 @@ object MobDetection { private fun mobDetectionReset() { MobData.currentMobs.map { it.createDeSpawnEvent() - }.forEach { it.postAndCatch() } + }.forEach { it.post() } MobData.retries.clear() } @@ -101,8 +100,8 @@ object MobDetection { this.armorStand?.let { it.worldObj != world } ?: false ) || this.extraEntities.any { it.worldObj != world } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (shouldClear.get()) { // Needs to work outside skyblock since it needs clearing when leaving skyblock and joining limbo mobDetectionReset() shouldClear.set(false) @@ -167,7 +166,7 @@ object MobDetection { Mob.Type.PROJECTILE -> MobEvent.FirstSeen.Projectile(mob) Mob.Type.DISPLAY_NPC -> MobEvent.FirstSeen.DisplayNPC(mob) Mob.Type.BASIC, Mob.Type.DUNGEON, Mob.Type.BOSS, Mob.Type.SLAYER -> MobEvent.FirstSeen.SkyblockMob(mob) - }.postAndCatch() + }.post() } return isVisible } @@ -175,7 +174,7 @@ object MobDetection { /**@return a false means that it should try again (later)*/ private fun entitySpawn(entity: EntityLivingBase, roughType: Mob.Type): Boolean { when (roughType) { - Mob.Type.PLAYER -> MobEvent.Spawn.Player(MobFactories.player(entity)).postAndCatch() + Mob.Type.PLAYER -> MobEvent.Spawn.Player(MobFactories.player(entity)).post() Mob.Type.DISPLAY_NPC -> return MobFilter.createDisplayNPC(entity) Mob.Type.BASIC -> { @@ -197,7 +196,7 @@ object MobDetection { Mob.Type.PROJECTILE -> MobEvent.Spawn.Projectile(mob) Mob.Type.DISPLAY_NPC -> MobEvent.Spawn.DisplayNPC(mob) // Needed for some special cases Mob.Type.PLAYER -> return mobDetectionError("An Player Ended Here. How?") - }.postAndCatch() + }.post() } } } @@ -223,7 +222,7 @@ object MobDetection { val entity = EntityUtils.getEntityByID(id) as? EntityBat ?: return@drainForEach if (MobData.entityToMob[entity] != null) return@drainForEach removeRetry(entity) - MobEvent.Spawn.Projectile(MobFactories.projectile(entity, "Spirit Scepter Bat")).postAndCatch() + MobEvent.Spawn.Projectile(MobFactories.projectile(entity, "Spirit Scepter Bat")).post() } EntityPacketType.VILLAGER -> { @@ -247,12 +246,12 @@ object MobDetection { if (MobData.entityToMob[entity] != null) return@drainForEach if (!entity.powered) return@drainForEach removeRetry(entity) - MobEvent.Spawn.Special(MobFactories.special(entity, "Creeper Veil")).postAndCatch() + MobEvent.Spawn.Special(MobFactories.special(entity, "Creeper Veil")).post() } } } - @SubscribeEvent + @HandleEvent fun onEntityHealthUpdateEvent(event: EntityHealthUpdateEvent) { when { event.entity is EntityBat && event.health == 6 -> { @@ -276,7 +275,7 @@ object MobDetection { } private fun entityDeSpawn(entity: EntityLivingBase) { - MobData.entityToMob[entity]?.createDeSpawnEvent()?.postAndCatch() ?: removeRetry(entity) + MobData.entityToMob[entity]?.createDeSpawnEvent()?.post() ?: removeRetry(entity) allEntitiesViaPacketId.remove(entity.entityId) } @@ -377,7 +376,7 @@ object MobDetection { shouldClear.set(true) } - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Mob Detection") if (forceReset) { diff --git a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt index 6938958e97b4..6c89e144d609 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/mob/MobFilter.kt @@ -201,7 +201,7 @@ object MobFilter { listOfClickArmorStand.contains(armorStand.name) } ?: return false val armorStand = MobUtils.getArmorStand(clickArmorStand, -1) ?: return false - MobEvent.Spawn.DisplayNPC(MobFactories.displayNPC(entity, armorStand, clickArmorStand)).postAndCatch() + MobEvent.Spawn.DisplayNPC(MobFactories.displayNPC(entity, armorStand, clickArmorStand)).post() return true } diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt index c7dc90840f57..be0b192f4877 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/SkyblockStat.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data.model +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent import at.hannibal2.skyhanni.events.WidgetUpdateEvent @@ -12,7 +13,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.allLettersFirstUppercase import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern import net.minecraft.client.Minecraft -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import org.intellij.lang.annotations.Language import java.util.EnumMap import java.util.regex.Pattern @@ -126,7 +126,7 @@ enum class SkyblockStat( } } - @SubscribeEvent + @HandleEvent fun onInventory(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.inSkyBlock) return onSkyblockMenu(event) @@ -154,7 +154,7 @@ enum class SkyblockStat( } } - @SubscribeEvent + @HandleEvent fun onTabList(event: WidgetUpdateEvent) { if (!event.isWidget(TabWidget.STATS, TabWidget.DUNGEON_SKILLS_AND_STATS)) return val type = if (event.isWidget(TabWidget.DUNGEON_SKILLS_AND_STATS)) StatSourceType.TABLIST_DUNGEON else StatSourceType.TABLIST diff --git a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt index 7a57de667dd1..00c4106cadf3 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/model/TabWidget.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.data.model +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.events.TabListUpdateEvent import at.hannibal2.skyhanni.events.WidgetUpdateEvent @@ -11,8 +12,6 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.EventPriority -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.util.regex.Matcher import java.util.regex.Pattern @@ -345,12 +344,12 @@ enum class TabWidget( if (lines == this.lines) return this.lines = lines isActive = true - WidgetUpdateEvent(this, lines).postAndCatch() + WidgetUpdateEvent(this, lines).post() } private fun postClearEvent() { lines = emptyList() - WidgetUpdateEvent(this, lines).postAndCatch() + WidgetUpdateEvent(this, lines).post() } /** Update the state of the widget, posts the clear if [isActive] == true && [gotChecked] == false */ @@ -375,7 +374,7 @@ enum class TabWidget( entries.forEach { it.pattern } } - @SubscribeEvent(priority = EventPriority.HIGH) + @HandleEvent(priority = HandleEvent.HIGH) fun onTabListUpdate(event: TabListUpdateEvent) { if (!LorenzUtils.inSkyBlock) { if (separatorIndexes.isNotEmpty()) { @@ -409,7 +408,7 @@ enum class TabWidget( } } - @SubscribeEvent(priority = EventPriority.LOW) + @HandleEvent(priority = HandleEvent.LOW) fun onRepoReload(event: RepositoryReloadEvent) { extraPatterns = repoGroup.getUnusedPatterns() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt index 9434835de98e..f15700d9b2a4 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/repo/RepoManager.kt @@ -194,7 +194,7 @@ class RepoManager(private val configLocation: File) { unsuccessfulConstants.clear() lastConstant = null - RepositoryReloadEvent(repoLocation, gson).postAndCatchAndBlock(ignoreErrorCache = true) { + RepositoryReloadEvent(repoLocation, gson).post { error = true lastConstant?.let { unsuccessfulConstants.add(it) @@ -321,7 +321,7 @@ class RepoManager(private val configLocation: File) { @SubscribeEvent fun onNeuRepoReload(event: io.github.moulberry.notenoughupdates.events.RepositoryReloadEvent) { - NeuRepositoryReloadEvent().postAndCatch() + NeuRepositoryReloadEvent().post() } fun resetRepositoryLocation(manual: Boolean = false) { diff --git a/src/main/java/at/hannibal2/skyhanni/events/ActionBarUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ActionBarUpdateEvent.kt index 52ec909c0216..911910ec7f38 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ActionBarUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ActionBarUpdateEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.util.ChatComponentText import net.minecraft.util.IChatComponent -class ActionBarUpdateEvent(var actionBar: String, var chatComponent: IChatComponent) : LorenzEvent() { +class ActionBarUpdateEvent(var actionBar: String, var chatComponent: IChatComponent) : SkyHanniEvent() { fun changeActionBar(newText: String) { chatComponent = ChatComponentText(newText) } diff --git a/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdateEvent.kt index fa3d6a730392..9ed1342580fc 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ActionBarValueUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.ActionBarStatsData -class ActionBarValueUpdateEvent(val updated: ActionBarStatsData) : LorenzEvent() +class ActionBarValueUpdateEvent(val updated: ActionBarStatsData) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt index e4995564de97..f83e4907a908 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BazaarOpenedProductEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.NEUInternalName class BazaarOpenedProductEvent(val openedProduct: NEUInternalName?, val inventoryOpenEvent: InventoryFullyOpenedEvent) : - LorenzEvent() + SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BitsUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BitsUpdateEvent.kt index 78ff15baee49..08147206e499 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BitsUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BitsUpdateEvent.kt @@ -1,6 +1,8 @@ package at.hannibal2.skyhanni.events -open class BitsUpdateEvent(val bits: Int, val bitsAvailable: Int, val difference: Int = 0) : LorenzEvent() { +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +open class BitsUpdateEvent(val bits: Int, val bitsAvailable: Int, val difference: Int = 0) : SkyHanniEvent() { class BitsGain(bits: Int, bitsAvailable: Int, difference: Int) : BitsUpdateEvent(bits, bitsAvailable, difference) class BitsSpent(bits: Int, bitsAvailable: Int) : BitsUpdateEvent(bits, bitsAvailable) class BitsAvailableGained(bits: Int, bitsAvailable: Int) : BitsUpdateEvent(bits, bitsAvailable) diff --git a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt index 42a827123411..e2f7a60db609 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BossHealthChangeEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData -class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : LorenzEvent() +class BossHealthChangeEvent(val entityData: EntityData, val lastHealth: Long, val health: Long, val maxHealth: Long) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt index 7dd0d10bbf31..84f8985edd46 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BossbarUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class BossbarUpdateEvent(val bossbar: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class BossbarUpdateEvent(val bossbar: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt index 26e13c42daa6..4ac1836da478 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDetectEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.event.diana.BurrowType import at.hannibal2.skyhanni.utils.LorenzVec -class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : LorenzEvent() +class BurrowDetectEvent(val burrowLocation: LorenzVec, val type: BurrowType) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt index 3f601fd2bb31..191b8ea0d2b9 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowDugEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.LorenzVec -class BurrowDugEvent(val burrowLocation: LorenzVec) : LorenzEvent() +class BurrowDugEvent(val burrowLocation: LorenzVec) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/BurrowGuessEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/BurrowGuessEvent.kt index 844e43eef3e5..3e6b8f8c164f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/BurrowGuessEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/BurrowGuessEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.LorenzVec -class BurrowGuessEvent(val guessLocation: LorenzVec) : LorenzEvent() +class BurrowGuessEvent(val guessLocation: LorenzVec) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ChatHoverEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ChatHoverEvent.kt index 38118bac6bce..04061788642b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ChatHoverEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ChatHoverEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.event.HoverEvent import net.minecraft.util.ChatComponentText @@ -12,6 +13,6 @@ import net.minecraft.util.ChatComponentText * The edited chat component in [GuiChatHook][at.hannibal2.skyhanni.mixins.hooks.GuiChatHook] does not change the actual * chat component, but rather makes a new one just before rendering. */ -class ChatHoverEvent(val component: ChatComponentText) : LorenzEvent() { +class ChatHoverEvent(val component: ChatComponentText) : SkyHanniEvent() { fun getHoverEvent(): HoverEvent = component.chatStyle.chatHoverEvent } diff --git a/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt index 13da59c430d9..b8f0e16c9b36 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/CheckRenderEntityEvent.kt @@ -1,14 +1,13 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import net.minecraft.client.renderer.culling.ICamera import net.minecraft.entity.Entity -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable data class CheckRenderEntityEvent( val entity: T, val camera: ICamera, val camX: Double, val camY: Double, val camZ: Double, -) : LorenzEvent() +) : GenericSkyHanniEvent(entity.javaClass) diff --git a/src/main/java/at/hannibal2/skyhanni/events/ColdUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ColdUpdateEvent.kt index 9894943b795d..1e654c021249 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ColdUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ColdUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class ColdUpdateEvent(val cold: Int) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class ColdUpdateEvent(val cold: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt index 4f1efeb9c246..72d0db796d68 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ConfigLoadEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class ConfigLoadEvent : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +object ConfigLoadEvent : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/CropClickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/CropClickEvent.kt index 960724a1701e..78e87eb5b41c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/CropClickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/CropClickEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.ClickType import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.utils.LorenzVec @@ -12,4 +13,4 @@ class CropClickEvent( val blockState: IBlockState, val clickType: ClickType, val itemInHand: ItemStack?, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt index 95b08ec51926..62c663c36342 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDeathEvent.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData import net.minecraft.entity.EntityLivingBase -class DamageIndicatorDeathEvent(val entity: EntityLivingBase, val data: EntityData) : LorenzEvent() +class DamageIndicatorDeathEvent(val entity: EntityLivingBase, val data: EntityData) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt index 2ca276e4c884..731199c3df5c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorDetectedEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.combat.damageindicator.EntityData -class DamageIndicatorDetectedEvent(val entityData: EntityData) : LorenzEvent() +class DamageIndicatorDetectedEvent(val entityData: EntityData) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt index 0d2564005091..6938ab9b527d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DamageIndicatorFinalBossEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class DamageIndicatorFinalBossEvent(val id: Int) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class DamageIndicatorFinalBossEvent(val id: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DataWatcherUpdatedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DataWatcherUpdatedEvent.kt index 05389c2d7f04..df2049517f5b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DataWatcherUpdatedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DataWatcherUpdatedEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import net.minecraft.entity.DataWatcher import net.minecraft.entity.Entity -data class DataWatcherUpdatedEvent( - val entity: Entity, +data class DataWatcherUpdatedEvent( + val entity: T, val updatedEntries: List, -) : LorenzEvent() +) : GenericSkyHanniEvent(entity.javaClass) diff --git a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt index 3b8a884a9e8f..011fbfb11bdd 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DebugDataCollectEvent.kt @@ -1,8 +1,9 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.StringUtils.equalsIgnoreColor -class DebugDataCollectEvent(private val list: MutableList, private val search: String) : LorenzEvent() { +class DebugDataCollectEvent(private val list: MutableList, private val search: String) : SkyHanniEvent() { var empty = true private var currentTitle = "" diff --git a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt index 822b80419983..8ef9dc54a43b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DrawScreenAfterEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import org.spongepowered.asm.mixin.injection.callback.CallbackInfo -class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : LorenzEvent() +class DrawScreenAfterEvent(val mouseX: Int, val mouseY: Int, val ci: CallbackInfo) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonCompleteEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonCompleteEvent.kt index d278753cb9ba..67e1e6c5fff5 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonCompleteEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonCompleteEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class DungeonCompleteEvent(val floor: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class DungeonCompleteEvent(val floor: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt index 1703b8a00e9a..19f677339ba6 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonEnterEvent.kt @@ -1,4 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + @Suppress("UnusedPrivateProperty") -class DungeonEnterEvent(dungeonFloor: String) : LorenzEvent() +class DungeonEnterEvent(dungeonFloor: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt index bb3cb36c3d45..eecb566f7f46 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/DungeonStartEvent.kt @@ -1,4 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + @Suppress("UnusedPrivateProperty") -class DungeonStartEvent(dungeonFloor: String) : LorenzEvent() +class DungeonStartEvent(dungeonFloor: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityCustomNameUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityCustomNameUpdateEvent.kt index 4b4b075e3ac3..4b2d97c3338d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityCustomNameUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityCustomNameUpdateEvent.kt @@ -1,8 +1,9 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import net.minecraft.entity.Entity -data class EntityCustomNameUpdateEvent( +data class EntityCustomNameUpdateEvent( + val entity: T, val newName: String?, - val entity: Entity, -) : LorenzEvent() +) : GenericSkyHanniEvent(entity.javaClass) diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityEquipmentChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityEquipmentChangeEvent.kt index efef208401b4..7ed391d6a3ad 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityEquipmentChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityEquipmentChangeEvent.kt @@ -1,13 +1,14 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import net.minecraft.entity.Entity import net.minecraft.item.ItemStack -data class EntityEquipmentChangeEvent( - val entity: Entity, +data class EntityEquipmentChangeEvent( + val entity: T, val equipmentSlot: Int, val newItemStack: ItemStack?, -) : LorenzEvent() { +) : GenericSkyHanniEvent(entity.javaClass) { val isHead get() = equipmentSlot == EQUIPMENT_SLOT_HEAD val isChest get() = equipmentSlot == EQUIPMENT_SLOT_CHEST diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt index 162efd9caa59..014259ce4fb8 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityHealthUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.entity.EntityLivingBase -class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : LorenzEvent() +class EntityHealthUpdateEvent(val entity: EntityLivingBase, val health: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt index 943a11cc3720..e19458c2b34e 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityMaxHealthUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.entity.EntityLivingBase -class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : LorenzEvent() +class EntityMaxHealthUpdateEvent(val entity: EntityLivingBase, val maxHealth: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/EntityMoveEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/EntityMoveEvent.kt index 68c913c1fda1..a27db36d3073 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/EntityMoveEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/EntityMoveEvent.kt @@ -1,11 +1,15 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import at.hannibal2.skyhanni.utils.LorenzVec +import net.minecraft.client.Minecraft import net.minecraft.entity.Entity -class EntityMoveEvent( - val entity: Entity, +class EntityMoveEvent( + val entity: T, val oldLocation: LorenzVec, val newLocation: LorenzVec, val distance: Double, -) : LorenzEvent() +) : GenericSkyHanniEvent(entity.javaClass) { + val isLocalPlayer by lazy { entity == Minecraft.getMinecraft().thePlayer } +} diff --git a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt index 5a4a83c1f829..ccb00a84efa4 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/FarmingContestEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.CropType import at.hannibal2.skyhanni.features.garden.contest.FarmingContestPhase -class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : LorenzEvent() +class FarmingContestEvent(val crop: CropType, val phase: FarmingContestPhase) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberCastEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberCastEvent.kt index 01ea0222e82b..ee9b1daa9522 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberCastEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberCastEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.entity.projectile.EntityFishHook -class FishingBobberCastEvent(val bobber: EntityFishHook) : LorenzEvent() +class FishingBobberCastEvent(val bobber: EntityFishHook) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt index a2cf6d2709c7..2e5c317795be 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/FishingBobberInLiquidEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.entity.projectile.EntityFishHook -class FishingBobberInLiquidEvent(val bobber: EntityFishHook, val onWater: Boolean) : LorenzEvent() +class FishingBobberInLiquidEvent(val bobber: EntityFishHook, val onWater: Boolean) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt index 2ad07aad8975..64aa2f48a6e9 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GardenToolChangeEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.CropType import net.minecraft.item.ItemStack -class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : LorenzEvent() +class GardenToolChangeEvent(val crop: CropType?, val toolItem: ItemStack?) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt index 34bc2a2a5d13..ebe606e6b2e1 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiContainerEvent.kt @@ -1,14 +1,14 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.GuiRenderUtils import net.minecraft.client.Minecraft import net.minecraft.client.gui.inventory.GuiContainer import net.minecraft.inventory.Container import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.Cancelable -abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: Container) : LorenzEvent() { +abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: Container) : SkyHanniEvent() { data class BackgroundDrawnEvent( override val gui: GuiContainer, @@ -18,14 +18,13 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: val partialTicks: Float, ) : GuiContainerEvent(gui, container) - @Cancelable data class PreDraw( override val gui: GuiContainer, override val container: Container, val mouseX: Int, val mouseY: Int, val partialTicks: Float, - ) : GuiContainerEvent(gui, container) { + ) : GuiContainerEvent(gui, container), Cancellable { fun drawDefaultBackground() = GuiRenderUtils.drawGradientRect(0, 0, gui.width, gui.height, -1072689136, -804253680, 0.0) } @@ -38,20 +37,18 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: val partialTicks: Float, ) : GuiContainerEvent(gui, container) - @Cancelable data class CloseWindowEvent(override val gui: GuiContainer, override val container: Container) : - GuiContainerEvent(gui, container) + GuiContainerEvent(gui, container), Cancellable abstract class DrawSlotEvent(gui: GuiContainer, container: Container, open val slot: Slot) : GuiContainerEvent(gui, container) { - @Cancelable data class GuiContainerDrawSlotPre( override val gui: GuiContainer, override val container: Container, override val slot: Slot, ) : - DrawSlotEvent(gui, container, slot) + DrawSlotEvent(gui, container, slot), Cancellable data class GuiContainerDrawSlotPost( override val gui: GuiContainer, @@ -69,7 +66,6 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: val partialTicks: Float, ) : GuiContainerEvent(gui, container) - @Cancelable data class SlotClickEvent( override val gui: GuiContainer, override val container: Container, @@ -80,7 +76,7 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: @Deprecated("old", ReplaceWith("clickTypeEnum")) val clickType: Int, val clickTypeEnum: ClickType? = ClickType.getTypeById(clickType), - ) : GuiContainerEvent(gui, container) { + ) : GuiContainerEvent(gui, container), Cancellable { fun makePickblock() { if (this.clickedButton == 2 && this.clickTypeEnum == ClickType.MIDDLE) return @@ -88,7 +84,7 @@ abstract class GuiContainerEvent(open val gui: GuiContainer, open val container: Minecraft.getMinecraft().playerController.windowClick( container.windowId, slotNumber, 2, 3, Minecraft.getMinecraft().thePlayer, ) - isCanceled = true + cancel() } } } diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiKeyPressEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiKeyPressEvent.kt index 4cfd1dfd913c..8601e9189d1a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiKeyPressEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiKeyPressEvent.kt @@ -1,7 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import net.minecraft.client.gui.inventory.GuiContainer -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable -class GuiKeyPressEvent(val guiContainer: GuiContainer) : LorenzEvent() +class GuiKeyPressEvent(val guiContainer: GuiContainer) : CancellableSkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiPositionMovedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiPositionMovedEvent.kt index 3d8fe02f991a..6c2c7e509449 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiPositionMovedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiPositionMovedEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class GuiPositionMovedEvent(val guiName: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class GuiPositionMovedEvent(val guiName: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt index 954bd0733391..5ea1a60e5568 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt @@ -1,6 +1,8 @@ package at.hannibal2.skyhanni.events -open class GuiRenderEvent : LorenzEvent() { +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +open class GuiRenderEvent : SkyHanniEvent() { class ChestGuiOverlayRenderEvent : GuiRenderEvent() class GuiOverlayRenderEvent : GuiRenderEvent() } diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt index 58dc557e856a..7defa6c75fa9 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderItemEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.client.gui.FontRenderer import net.minecraft.item.ItemStack -abstract class GuiRenderItemEvent : LorenzEvent() { +abstract class GuiRenderItemEvent : SkyHanniEvent() { abstract class RenderOverlayEvent( open val fontRenderer: FontRenderer, open val stack: ItemStack?, diff --git a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt index 6f7711118be6..69406065841a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/HypixelJoinEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class HypixelJoinEvent : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +object HypixelJoinEvent : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt index 70e87a53e71e..948c9bc5ab02 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryCloseEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class InventoryCloseEvent(val reopenSameName: Boolean) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class InventoryCloseEvent(val reopenSameName: Boolean) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt index 5374b95d3c2e..d9f5a0f70df7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/InventoryFullyOpenedEvent.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.OtherInventoryData import at.hannibal2.skyhanni.utils.PrimitiveItemStack import at.hannibal2.skyhanni.utils.PrimitiveItemStack.Companion.toPrimitiveStackOrNull import net.minecraft.item.ItemStack -open class InventoryOpenEvent(private val inventory: OtherInventoryData.Inventory) : LorenzEvent() { +open class InventoryOpenEvent(private val inventory: OtherInventoryData.Inventory) : SkyHanniEvent() { val inventoryId: Int by lazy { inventory.windowId } val inventoryName: String by lazy { inventory.title } diff --git a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt index ae22a4c751ad..587b35048021 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/IslandChangeEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.IslandType -class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : LorenzEvent() +class IslandChangeEvent(val newIsland: IslandType, val oldIsland: IslandType) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ItemAddEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ItemAddEvent.kt index ad0c6355dfd3..cacc8dd23bea 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ItemAddEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ItemAddEvent.kt @@ -1,7 +1,8 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.ItemAddManager import at.hannibal2.skyhanni.utils.NEUInternalName class ItemAddEvent(val internalName: NEUInternalName, val amount: Int, val source: ItemAddManager.Source) : - LorenzEvent() + SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ItemInHandChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ItemInHandChangeEvent.kt index 4ef39df43345..9312aa4aaa69 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ItemInHandChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ItemInHandChangeEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.NEUInternalName -class ItemInHandChangeEvent(val newItem: NEUInternalName, val oldItem: NEUInternalName) : LorenzEvent() +class ItemInHandChangeEvent(val newItem: NEUInternalName, val oldItem: NEUInternalName) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/KeyPressEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/KeyPressEvent.kt new file mode 100644 index 000000000000..cbac5f62df5a --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/events/KeyPressEvent.kt @@ -0,0 +1,5 @@ +package at.hannibal2.skyhanni.events + +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class KeyPressEvent(val keyCode: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/KuudraCompleteEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/KuudraCompleteEvent.kt index 98b207f49b49..d57a327ed157 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/KuudraCompleteEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/KuudraCompleteEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class KuudraCompleteEvent(val kuudraTier: Int) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class KuudraCompleteEvent(val kuudraTier: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/KuudraEnterEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/KuudraEnterEvent.kt index 8482058a7320..4b3ca2c9f3a3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/KuudraEnterEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/KuudraEnterEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class KuudraEnterEvent(val kuudraTier: Int) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class KuudraEnterEvent(val kuudraTier: Int) : SkyHanniEvent() 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 b567d9ae6d06..000000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzEvent.kt +++ /dev/null @@ -1,93 +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 -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent - -/** - * Use @[SubscribeEvent] - */ - -@Deprecated("Use SkyHanniEvent instead") -abstract class LorenzEvent : Event() { - - private val eventName by lazy { - this::class.simpleName!! - } - - @Deprecated("Use SkyHanniEvent instead", ReplaceWith("")) - fun postAndCatch() = 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/LorenzKeyPressEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt deleted file mode 100644 index e5af23d22ab6..000000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzKeyPressEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package at.hannibal2.skyhanni.events - -class LorenzKeyPressEvent(val keyCode: Int) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt deleted file mode 100644 index f61f0e16d35d..000000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzRenderWorldEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package at.hannibal2.skyhanni.events - -class LorenzRenderWorldEvent(val partialTicks: Float) : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt deleted file mode 100644 index de67180273b0..000000000000 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzWorldChangeEvent.kt +++ /dev/null @@ -1,3 +0,0 @@ -package at.hannibal2.skyhanni.events - -class LorenzWorldChangeEvent : LorenzEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/MessageSendToServerEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MessageSendToServerEvent.kt index 6aa07cb54ca0..82cbcfed1a6a 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/MessageSendToServerEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/MessageSendToServerEvent.kt @@ -1,11 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import at.hannibal2.skyhanni.utils.system.ModInstance -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable class MessageSendToServerEvent( val message: String, val splitMessage: List, val originatingModContainer: ModInstance? -) : LorenzEvent() +) : CancellableSkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/MinionOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MinionOpenEvent.kt index bfe8649ba97c..571bb70c7f90 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/MinionOpenEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/MinionOpenEvent.kt @@ -1,8 +1,9 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.LorenzVec import net.minecraft.item.ItemStack -class MinionOpenEvent(val inventoryName: String, val inventoryItems: Map) : LorenzEvent() -class MinionCloseEvent : LorenzEvent() -class MinionStorageOpenEvent(val position: LorenzVec?, val inventoryItems: Map) : LorenzEvent() +class MinionOpenEvent(val inventoryName: String, val inventoryItems: Map) : SkyHanniEvent() +class MinionCloseEvent : SkyHanniEvent() +class MinionStorageOpenEvent(val position: LorenzVec?, val inventoryItems: Map) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt index 07990ff222c5..2d4bd7cfed15 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/MobEvent.kt @@ -1,8 +1,9 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.mob.Mob -open class MobEvent(val mob: Mob) : LorenzEvent() { +open class MobEvent(val mob: Mob) : SkyHanniEvent() { open class Spawn(mob: Mob) : MobEvent(mob) { class SkyblockMob(mob: Mob) : Spawn(mob) class Summon(mob: Mob) : Spawn(mob) diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuProfileDataLoadedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuProfileDataLoadedEvent.kt index 175271e6902e..a2d4e4062c7e 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/NeuProfileDataLoadedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/NeuProfileDataLoadedEvent.kt @@ -1,10 +1,11 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.HypixelData import at.hannibal2.skyhanni.data.jsonobjects.other.HypixelPlayerApiJson import at.hannibal2.skyhanni.utils.LorenzUtils -class NeuProfileDataLoadedEvent(val playerData: HypixelPlayerApiJson) : LorenzEvent() { +class NeuProfileDataLoadedEvent(val playerData: HypixelPlayerApiJson) : SkyHanniEvent() { fun getCurrentProfileData() = playerData.profiles.firstOrNull { it.profileName.lowercase() == HypixelData.profileName } diff --git a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt index 9feb170c1f08..0fd5d5ea62b1 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/NeuRepositoryReloadEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.config.ConfigManager import at.hannibal2.skyhanni.data.repo.RepoError import at.hannibal2.skyhanni.data.repo.RepoUtils @@ -14,7 +15,7 @@ import com.google.gson.JsonSyntaxException import java.io.File import java.lang.reflect.Type -class NeuRepositoryReloadEvent : LorenzEvent() { +class NeuRepositoryReloadEvent : SkyHanniEvent() { fun getConstant(file: String): JsonObject? = File(manager.repoLocation, "constants/$file.json").getJson() inline fun readConstant(file: String, gson: Gson = ConfigManager.gson): T { diff --git a/src/main/java/at/hannibal2/skyhanni/events/OwnInventoryItemUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/OwnInventoryItemUpdateEvent.kt index 56264e198767..986e658bd9b0 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/OwnInventoryItemUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/OwnInventoryItemUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.item.ItemStack -data class OwnInventoryItemUpdateEvent(val itemStack: ItemStack, val slot: Int) : LorenzEvent() +data class OwnInventoryItemUpdateEvent(val itemStack: ItemStack, val slot: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt index 96f228a6ba85..c2dca7155fea 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/PlaySoundEvent.kt @@ -1,13 +1,12 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.NumberUtil.roundTo -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable class PlaySoundEvent(val soundName: String, val location: LorenzVec, val pitch: Float, val volume: Float) : - LorenzEvent() { + CancellableSkyHanniEvent() { val distanceToPlayer by lazy { location.distanceToPlayer() } override fun toString(): String { diff --git a/src/main/java/at/hannibal2/skyhanni/events/ProfileJoinEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ProfileJoinEvent.kt index 68d8f075d914..e4f53ba3a208 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ProfileJoinEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ProfileJoinEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class ProfileJoinEvent(val name: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class ProfileJoinEvent(val name: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/PurseChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/PurseChangeEvent.kt index d776fe32b672..9233706dcbb8 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/PurseChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/PurseChangeEvent.kt @@ -1,6 +1,8 @@ package at.hannibal2.skyhanni.events -class PurseChangeEvent(val coins: Double, val reason: PurseChangeCause) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class PurseChangeEvent(val coins: Double, val reason: PurseChangeCause) : SkyHanniEvent() enum class PurseChangeCause { GAIN_MOB_KILL, diff --git a/src/main/java/at/hannibal2/skyhanni/events/QuiverUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/QuiverUpdateEvent.kt index d0c0e5b0b1ac..eaaf4a1665ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/QuiverUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/QuiverUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.ArrowType -class QuiverUpdateEvent(val currentArrow: ArrowType?, val currentAmount: Int) : LorenzEvent() +class QuiverUpdateEvent(val currentArrow: ArrowType?, val currentAmount: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RawScoreboardUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RawScoreboardUpdateEvent.kt index ac11a5bcb153..45cc13659ac7 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RawScoreboardUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RawScoreboardUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class RawScoreboardUpdateEvent(val rawScoreboard: List) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class RawScoreboardUpdateEvent(val rawScoreboard: List) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt index 75fe8af8a3c2..2c41ead5ba58 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ReceiveParticleEvent.kt @@ -1,12 +1,11 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import at.hannibal2.skyhanni.utils.LocationUtils.distanceToPlayer import at.hannibal2.skyhanni.utils.LorenzVec import at.hannibal2.skyhanni.utils.NumberUtil.roundTo import net.minecraft.util.EnumParticleTypes -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable class ReceiveParticleEvent( val type: EnumParticleTypes, val location: LorenzVec, @@ -16,7 +15,7 @@ class ReceiveParticleEvent( val longDistance: Boolean, val particleArgs: IntArray, ) : - LorenzEvent() { + CancellableSkyHanniEvent() { val distanceToPlayer by lazy { location.distanceToPlayer() } diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt index 395d1be2db0c..9ea4e484dbc5 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderBlockInWorldEvent.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import net.minecraft.block.state.IBlockState import net.minecraft.util.BlockPos import net.minecraft.world.IBlockAccess -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable -data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) : LorenzEvent() +data class RenderBlockInWorldEvent(@JvmField var state: IBlockState?, var world: IBlockAccess, var pos: BlockPos?) : + CancellableSkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt index f64dfa27edf6..d7a5b1106d7f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderEntityOutlineEvent.kt @@ -1,12 +1,13 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.client.Minecraft import net.minecraft.entity.Entity import net.minecraft.entity.item.EntityArmorStand import net.minecraft.entity.item.EntityItemFrame class RenderEntityOutlineEvent(theType: Type?, potentialEntities: HashSet?) : - LorenzEvent() { + SkyHanniEvent() { /** * The phase of the event (see [Type] diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderGuiItemOverlayEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderGuiItemOverlayEvent.kt index 0db2e4e1466a..2034b09fbbd0 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderGuiItemOverlayEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderGuiItemOverlayEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.item.ItemStack class RenderGuiItemOverlayEvent( val stack: ItemStack?, val x: Int, val y: Int, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt index 0f16dad2a4a1..79c974dbde65 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderInventoryItemTipEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack @@ -11,4 +12,4 @@ class RenderInventoryItemTipEvent( var offsetX: Int = 0, var offsetY: Int = 0, var alignLeft: Boolean = true, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderItemTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTipEvent.kt index 5a144cb7e04d..451302602b3d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderItemTipEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTipEvent.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.item.ItemStack class RenderItemTipEvent( val stack: ItemStack, var renderObjects: MutableList, -) : LorenzEvent() { +) : SkyHanniEvent() { var stackTip = "" set(value) { diff --git a/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt index f8cb98802b1c..ea1283a52d58 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RenderItemTooltipEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.item.ItemStack -class RenderItemTooltipEvent(val stack: ItemStack) : LorenzEvent() +class RenderItemTooltipEvent(val stack: ItemStack) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt index ec5b0a8ec95e..f7e3af9a548c 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/RepositoryReloadEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.repo.RepoError import at.hannibal2.skyhanni.data.repo.RepoManager import at.hannibal2.skyhanni.data.repo.RepoUtils @@ -7,7 +8,7 @@ import com.google.gson.Gson import java.io.File import java.lang.reflect.Type -class RepositoryReloadEvent(val repoLocation: File, val gson: Gson) : LorenzEvent() { +class RepositoryReloadEvent(val repoLocation: File, val gson: Gson) : SkyHanniEvent() { inline fun getConstant(constant: String, type: Type? = null, gson: Gson = this.gson): T = try { RepoManager.setLastConstant(constant) diff --git a/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt index aa81287d7568..d51791a60125 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SackChangeEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.SackAPI class SackChangeEvent( val sackChanges: List, val otherItemsAdded: Boolean, val otherItemsRemoved: Boolean, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt index 9480e8061690..3a8409ecf7c3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ScoreboardUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class ScoreboardUpdateEvent(val scoreboard: List) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class ScoreboardUpdateEvent(val scoreboard: List) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SeaCreatureFishEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SeaCreatureFishEvent.kt index 0c0c4f62780a..615f9b9da693 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SeaCreatureFishEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SeaCreatureFishEvent.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.fishing.SeaCreature class SeaCreatureFishEvent( val seaCreature: SeaCreature, - val chatEvent: LorenzChatEvent, + val chatEvent: SkyHanniChatEvent, val doubleHook: Boolean, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SecondPassedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SecondPassedEvent.kt index d422a026f981..dd87346986d6 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SecondPassedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SecondPassedEvent.kt @@ -1,5 +1,7 @@ package at.hannibal2.skyhanni.events -class SecondPassedEvent(private val totalSeconds: Int) : LorenzEvent() { +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class SecondPassedEvent(private val totalSeconds: Int) : SkyHanniEvent() { fun repeatSeconds(i: Int) = totalSeconds % i == 0 } diff --git a/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt index 106ee2821cb3..ed0ef4ac9311 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/ServerBlockChangeEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.BlockUtils.getBlockAt import at.hannibal2.skyhanni.utils.BlockUtils.getBlockStateAt import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher @@ -7,7 +8,7 @@ import at.hannibal2.skyhanni.utils.toLorenzVec import net.minecraft.block.state.IBlockState import net.minecraft.util.BlockPos -class ServerBlockChangeEvent(blockPos: BlockPos, blockState: IBlockState) : LorenzEvent() { +class ServerBlockChangeEvent(blockPos: BlockPos, blockState: IBlockState) : SkyHanniEvent() { val location by lazy { blockPos.toLorenzVec() } val old by lazy { location.getBlockAt().toString().getName() } diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillExpGainEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillExpGainEvent.kt index 09365a7baa9c..a0a6a771f69d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkillExpGainEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkillExpGainEvent.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.skillprogress.SkillType // does not know how much exp is there, also gets called multiple times -class SkillExpGainEvent(val skill: SkillType, val gained: Double) : LorenzEvent() +class SkillExpGainEvent(val skill: SkillType, val gained: Double) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt index d3f356da7f7d..cd50caa5ea66 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkillOverflowLevelUpEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.skillprogress.SkillType -class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : LorenzEvent() +class SkillOverflowLevelUpEvent(val skill: SkillType, val oldLevel: Int, val newLevel: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkipTabListLineEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkipTabListLineEvent.kt index 0250b821f1f5..30d8f42fb6b3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkipTabListLineEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkipTabListLineEvent.kt @@ -1,11 +1,10 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import at.hannibal2.skyhanni.features.misc.compacttablist.TabLine -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable data class SkipTabListLineEvent( val line: TabLine, val lastSubTitle: TabLine?, val lastTitle: TabLine?, -) : LorenzEvent() +) : CancellableSkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzChatEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniChatEvent.kt similarity index 68% rename from src/main/java/at/hannibal2/skyhanni/events/LorenzChatEvent.kt rename to src/main/java/at/hannibal2/skyhanni/events/SkyHanniChatEvent.kt index 9d03549ac524..970e358ea186 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzChatEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniChatEvent.kt @@ -1,10 +1,11 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.util.IChatComponent -class LorenzChatEvent( +class SkyHanniChatEvent( val message: String, var chatComponent: IChatComponent, var blockedReason: String = "", var chatLineId: Int = 0, -) : LorenzEvent() +) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderEntityEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderEntityEvent.kt index 289e661f1b69..ac6183999206 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderEntityEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderEntityEvent.kt @@ -1,17 +1,16 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import net.minecraft.client.renderer.entity.RendererLivingEntity import net.minecraft.entity.EntityLivingBase -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable open class SkyHanniRenderEntityEvent( val entity: T, val renderer: RendererLivingEntity, val x: Double, val y: Double, val z: Double -) : LorenzEvent() { +) : CancellableSkyHanniEvent() { class Pre( entity: T, renderer: RendererLivingEntity, diff --git a/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderWorldEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderWorldEvent.kt new file mode 100644 index 000000000000..e8233bfecfab --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniRenderWorldEvent.kt @@ -0,0 +1,5 @@ +package at.hannibal2.skyhanni.events + +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class SkyHanniRenderWorldEvent(val partialTicks: Float) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniTickEvent.kt similarity index 66% rename from src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt rename to src/main/java/at/hannibal2/skyhanni/events/SkyHanniTickEvent.kt index f319ca557f74..6aa1a2bc63d0 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzTickEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniTickEvent.kt @@ -1,6 +1,8 @@ package at.hannibal2.skyhanni.events -class LorenzTickEvent(private val tick: Int) : LorenzEvent() { +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class SkyHanniTickEvent(private val tick: Int) : SkyHanniEvent() { fun isMod(i: Int, offset: Int = 0) = (tick + offset) % i == 0 diff --git a/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniToolTipEvent.kt similarity index 62% rename from src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt rename to src/main/java/at/hannibal2/skyhanni/events/SkyHanniToolTipEvent.kt index 4f6269c81745..ccd3dd35bccb 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/LorenzToolTipEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SkyHanniToolTipEvent.kt @@ -1,12 +1,12 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent import net.minecraft.inventory.Slot import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.Cancelable -@Cancelable -class LorenzToolTipEvent(val slot: Slot, val itemStack: ItemStack, private val toolTip0: MutableList) : - LorenzEvent() { + +class SkyHanniToolTipEvent(val slot: Slot, val itemStack: ItemStack, private val toolTip0: MutableList) : + CancellableSkyHanniEvent() { var toolTip: MutableList set(value) { diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt index c7da7f7bd7d3..05d2a357e3dc 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerChangeEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class SlayerChangeEvent(val oldSlayer: String, val newSlayer: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt index b87a854e1922..78a68c5d492f 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/SlayerProgressChangeEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class SlayerProgressChangeEvent(val oldProgress: String, val newProgress: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabCompletionEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabCompletionEvent.kt index f3ec47b02a20..368fb146bd4b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TabCompletionEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TabCompletionEvent.kt @@ -1,10 +1,12 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + class TabCompletionEvent( val leftOfCursor: String, val fullText: String, val originalCompletions: List, -) : LorenzEvent() { +) : SkyHanniEvent() { val lastWord = leftOfCursor.substringAfterLast(' ') val additionalSuggestions = mutableSetOf() val suppressedSuggestions = mutableSetOf() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt index 47478959291d..7a863a8e9635 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TabListLineRenderEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class TabListLineRenderEvent(var text: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class TabListLineRenderEvent(var text: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt index a1b36a667fb3..c4e44624ab11 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TabListUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class TabListUpdateEvent(val tabList: List) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class TabListUpdateEvent(val tabList: List) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TablistFooterUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TablistFooterUpdateEvent.kt index 6f12e99bc47e..ffca3d846259 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TablistFooterUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TablistFooterUpdateEvent.kt @@ -1,3 +1,5 @@ package at.hannibal2.skyhanni.events -class TablistFooterUpdateEvent(val footer: String) : LorenzEvent() +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +class TablistFooterUpdateEvent(val footer: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt index 912a4d8d6564..82f261e7614b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/TitleReceivedEvent.kt @@ -1,6 +1,5 @@ package at.hannibal2.skyhanni.events -import net.minecraftforge.fml.common.eventhandler.Cancelable +import at.hannibal2.skyhanni.api.event.CancellableSkyHanniEvent -@Cancelable -class TitleReceivedEvent(val title: String) : LorenzEvent() +class TitleReceivedEvent(val title: String) : CancellableSkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt index a91e7dca3a03..1c0bedcad69e 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/WidgetUpdateEvent.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.events +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.data.model.TabWidget import at.hannibal2.skyhanni.utils.LorenzUtils.isAnyOf @@ -7,7 +8,7 @@ import at.hannibal2.skyhanni.utils.LorenzUtils.isAnyOf open class WidgetUpdateEvent( val widget: TabWidget, val lines: List, -) : LorenzEvent() { +) : SkyHanniEvent() { fun isWidget(widgetType: TabWidget) = widget == widgetType fun isWidget(vararg widgetType: TabWidget) = widget.isAnyOf(*widgetType) diff --git a/src/main/java/at/hannibal2/skyhanni/events/WorldChangeEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/WorldChangeEvent.kt new file mode 100644 index 000000000000..936b6cfb090e --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/events/WorldChangeEvent.kt @@ -0,0 +1,5 @@ +package at.hannibal2.skyhanni.events + +import at.hannibal2.skyhanni.api.event.SkyHanniEvent + +object WorldChangeEvent : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt index c4d24eb0a2c9..2fa7272c212d 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityDisplayNameEvent.kt @@ -1,7 +1,7 @@ package at.hannibal2.skyhanni.events.entity -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.GenericSkyHanniEvent import net.minecraft.entity.Entity import net.minecraft.util.ChatComponentText -class EntityDisplayNameEvent(val entity: Entity, var chatComponent: ChatComponentText) : LorenzEvent() +class EntityDisplayNameEvent(val entity: T, var chatComponent: ChatComponentText) : GenericSkyHanniEvent(entity.javaClass) diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt index 5657dc2c83da..6194a53c38d6 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/entity/EntityHealthDisplayEvent.kt @@ -1,5 +1,5 @@ package at.hannibal2.skyhanni.events.entity -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent -class EntityHealthDisplayEvent(var text: String) : LorenzEvent() +class EntityHealthDisplayEvent(var text: String) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/entity/ItemAddInInventoryEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/entity/ItemAddInInventoryEvent.kt index 6b9747adfd40..2cf2501c0ced 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/entity/ItemAddInInventoryEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/entity/ItemAddInInventoryEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.entity -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.utils.NEUInternalName -class ItemAddInInventoryEvent(val internalName: NEUInternalName, val amount: Int) : LorenzEvent() +class ItemAddInInventoryEvent(val internalName: NEUInternalName, val amount: Int) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt index 41a429cfd372..250d103423cb 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() +class VisitorAcceptEvent(val visitor: VisitorAPI.Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt index 5b894768fb39..1636f9fc3ff3 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorAcceptedEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() +class VisitorAcceptedEvent(val visitor: VisitorAPI.Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt index f26dbb971275..1d5135d1c53e 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorArrivalEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI.Visitor -class VisitorArrivalEvent(val visitor: Visitor) : LorenzEvent() +class VisitorArrivalEvent(val visitor: Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt index f5673decd0e4..127d518277fe 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorLeftEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() +class VisitorLeftEvent(val visitor: VisitorAPI.Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt index c2e7a40b0c3d..f86b388f1e99 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorOpenEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() +class VisitorOpenEvent(val visitor: VisitorAPI.Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt index 94de16081b04..bcfe5b93d0af 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRefusedEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI -class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : LorenzEvent() +class VisitorRefusedEvent(val visitor: VisitorAPI.Visitor) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt index 9282d3e04fe6..08b006f889c0 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/garden/visitor/VisitorRenderEvent.kt @@ -1,8 +1,8 @@ package at.hannibal2.skyhanni.events.garden.visitor -import at.hannibal2.skyhanni.events.LorenzEvent -import at.hannibal2.skyhanni.events.LorenzRenderWorldEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent +import at.hannibal2.skyhanni.events.SkyHanniRenderWorldEvent import at.hannibal2.skyhanni.features.garden.visitor.VisitorAPI import at.hannibal2.skyhanni.utils.LorenzVec -class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: LorenzRenderWorldEvent) : LorenzEvent() +class VisitorRenderEvent(val visitor: VisitorAPI.Visitor, val location: LorenzVec, val parent: SkyHanniRenderWorldEvent) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt index 9e38d8e956d5..3e1008644368 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/mining/CorpseLootedEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events.mining -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import at.hannibal2.skyhanni.features.mining.glacitemineshaft.CorpseType -class CorpseLootedEvent(val corpseType: CorpseType, val loot: List>) : LorenzEvent() +class CorpseLootedEvent(val corpseType: CorpseType, val loot: List>) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt index 98b18a83f3ea..df827e7df169 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/mining/FossilExcavationEvent.kt @@ -1,5 +1,5 @@ package at.hannibal2.skyhanni.events.mining -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent -class FossilExcavationEvent(val loot: List>) : LorenzEvent() +class FossilExcavationEvent(val loot: List>) : SkyHanniEvent() 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 fe9cac685512..ea5396204fd1 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/player/PlayerDeathEvent.kt @@ -1,9 +1,9 @@ package at.hannibal2.skyhanni.events.player -import at.hannibal2.skyhanni.events.LorenzChatEvent -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent /** * When the player "you" dies in the game. does not fire when other players die. */ -class PlayerDeathEvent(val name: String, val reason: String, val chatEvent: LorenzChatEvent) : LorenzEvent() +class PlayerDeathEvent(val name: String, val reason: String, val chatEvent: SkyHanniChatEvent) : SkyHanniEvent() diff --git a/src/main/java/at/hannibal2/skyhanni/events/render/EntityRenderLayersEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/render/EntityRenderLayersEvent.kt index ff951736e764..05b54fa4348b 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/render/EntityRenderLayersEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/render/EntityRenderLayersEvent.kt @@ -1,15 +1,13 @@ package at.hannibal2.skyhanni.events.render -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.entity.Entity -import net.minecraftforge.fml.common.eventhandler.Cancelable open class EntityRenderLayersEvent( val entity: T, -) : LorenzEvent() { +) : SkyHanniEvent() { - @Cancelable class Pre( entity: T, - ) : EntityRenderLayersEvent(entity) + ) : EntityRenderLayersEvent(entity), Cancellable } 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 ca2f2efbb6f4..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,12 +1,12 @@ package at.hannibal2.skyhanni.events.render.gui -import at.hannibal2.skyhanni.events.LorenzEvent +import at.hannibal2.skyhanni.api.event.SkyHanniEvent import net.minecraft.inventory.IInventory import net.minecraft.inventory.InventoryBasic import net.minecraft.item.ItemStack import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable -class ReplaceItemEvent(val inventory: IInventory, val originalItem: ItemStack, val slot: Int) : LorenzEvent() { +class ReplaceItemEvent(val inventory: IInventory, val originalItem: ItemStack, val slot: Int) : SkyHanniEvent() { var replacement: ItemStack? = null private set @@ -24,7 +24,7 @@ class ReplaceItemEvent(val inventory: IInventory, val originalItem: ItemStack, v ) { val originalItem = inventoryContents.getOrNull(slot) ?: return val event = ReplaceItemEvent(inventory, originalItem, slot) - event.postAndCatch() + event.post() event.replacement?.let { cir.returnValue = it } } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt index 625ded34f838..e3eb1176bebf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/anvil/AnvilCombineHelper.kt @@ -1,6 +1,7 @@ package at.hannibal2.skyhanni.features.anvil import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.InventoryUtils.getInventoryName @@ -12,12 +13,11 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.highlight import net.minecraft.client.gui.inventory.GuiChest import net.minecraft.inventory.ContainerChest -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object AnvilCombineHelper { - @SubscribeEvent + @HandleEvent fun onBackgroundDrawn(event: GuiContainerEvent.BackgroundDrawnEvent) { if (!LorenzUtils.inSkyBlock) return if (!SkyHanniMod.feature.inventory.anvilCombineHelper) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt index b4ba01d58f0a..554eb719166c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoAPI.kt @@ -1,5 +1,6 @@ package at.hannibal2.skyhanni.features.bingo +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.storage.PlayerSpecificStorage.BingoSession import at.hannibal2.skyhanni.data.ProfileStorageData import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData @@ -15,7 +16,6 @@ import at.hannibal2.skyhanni.utils.RegexUtils.matches import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import java.time.LocalTime import java.time.OffsetDateTime import java.time.ZoneOffset @@ -36,7 +36,7 @@ object BingoAPI { " §.Ⓑ §.Bingo" ) - @SubscribeEvent + @HandleEvent fun onDebugDataCollect(event: DebugDataCollectEvent) { event.title("Bingo Card") @@ -67,7 +67,7 @@ object BingoAPI { } } - @SubscribeEvent + @HandleEvent fun onRepoReload(event: RepositoryReloadEvent) { ranks = event.getConstant("BingoRanks").ranks data = event.getConstant("Bingo").bingoTips diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt index 39f069771345..607766412f75 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/CompactBingoChat.kt @@ -1,14 +1,14 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.api.event.HandleEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.ChatUtils import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RegexUtils.matchMatcher import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent @SkyHanniModule object CompactBingoChat { @@ -35,8 +35,8 @@ object CompactBingoChat { "§[e3]§l▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬▬" ) - @SubscribeEvent - fun onChat(event: LorenzChatEvent) { + @HandleEvent + fun onChat(event: SkyHanniChatEvent) { if (!config.enabled) return if (!LorenzUtils.isBingoProfile && !config.outsideBingo) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt index 24835a458859..605427a88a0b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -1,11 +1,12 @@ package at.hannibal2.skyhanni.features.bingo import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.config.ConfigUpdaterMigrator import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.InventoryFullyOpenedEvent -import at.hannibal2.skyhanni.events.LorenzTickEvent -import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent +import at.hannibal2.skyhanni.events.SkyHanniTickEvent +import at.hannibal2.skyhanni.events.WorldChangeEvent import at.hannibal2.skyhanni.skyhannimodule.SkyHanniModule import at.hannibal2.skyhanni.utils.CollectionUtils.addOrPut import at.hannibal2.skyhanni.utils.ItemUtils.getInternalName @@ -28,7 +29,6 @@ import com.google.gson.JsonArray import com.google.gson.JsonObject import net.minecraft.client.Minecraft import net.minecraft.item.ItemStack -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.seconds @SkyHanniModule @@ -49,13 +49,13 @@ object MinionCraftHelper { private val allIngredients = mutableListOf() private val alreadyNotified = mutableListOf() - @SubscribeEvent - fun onWorldChange(event: LorenzWorldChangeEvent) { + @HandleEvent + fun onWorldChange(event: WorldChangeEvent) { alreadyNotified.clear() } - @SubscribeEvent - fun onTick(event: LorenzTickEvent) { + @HandleEvent + fun onTick(event: SkyHanniTickEvent) { if (!LorenzUtils.isBingoProfile) return if (!config.minionCraftHelperEnabled) return @@ -241,7 +241,7 @@ object MinionCraftHelper { } } - @SubscribeEvent + @HandleEvent fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.isBingoProfile) return if (!config.minionCraftHelperEnabled) return @@ -264,7 +264,7 @@ object MinionCraftHelper { private fun isMinionName(itemName: String) = itemName.contains(" Minion ") && !itemName.contains(" Minion Skin") - @SubscribeEvent + @HandleEvent fun onInventoryOpen(event: InventoryFullyOpenedEvent) { if (!LorenzUtils.isBingoProfile) return if (event.inventoryName != "Crafted Minions") return @@ -278,7 +278,7 @@ object MinionCraftHelper { } } - @SubscribeEvent + @HandleEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.transform(26, "#player.bingoSessions") { element -> for ((_, data) in element.asJsonObject.entrySet()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt index b04133b2abcc..47faac1b5b84 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardDisplay.kt @@ -26,7 +26,6 @@ import at.hannibal2.skyhanni.utils.renderables.Renderable import net.minecraft.client.Minecraft import net.minecraft.client.gui.GuiChat import net.minecraft.client.gui.inventory.GuiInventory -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration.Companion.days @SkyHanniModule @@ -68,7 +67,7 @@ object BingoCardDisplay { } } - @SubscribeEvent + @HandleEvent fun onSecondPassed(event: SecondPassedEvent) { if (hasHiddenPersonalGoals) { update() @@ -214,7 +213,7 @@ object BingoCardDisplay { private var lastSneak = false private var inventoryOpen = false - @SubscribeEvent + @HandleEvent fun onRenderOverlay(event: GuiRenderEvent) { if (!LorenzUtils.isBingoProfile) return if (!config.enabled) return @@ -256,14 +255,14 @@ object BingoCardDisplay { update() } - @SubscribeEvent + @HandleEvent fun onConfigLoad(event: ConfigLoadEvent) { config.hideCommunityGoals.onToggle { update() } config.nextTipDuration.onToggle { update() } update() } - @SubscribeEvent + @HandleEvent fun onConfigFix(event: ConfigUpdaterMigrator.ConfigFixEvent) { event.move(2, "bingo", "event.bingo") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt index 98b266053e04..3342657764c4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/card/BingoCardReader.kt @@ -1,9 +1,10 @@ package at.hannibal2.skyhanni.features.bingo.card import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.api.event.HandleEvent import at.hannibal2.skyhanni.data.jsonobjects.repo.BingoData import at.hannibal2.skyhanni.events.InventoryUpdatedEvent -import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.SkyHanniChatEvent import at.hannibal2.skyhanni.events.bingo.BingoCardUpdateEvent import at.hannibal2.skyhanni.events.bingo.BingoGoalReachedEvent import at.hannibal2.skyhanni.features.bingo.BingoAPI @@ -20,7 +21,6 @@ import at.hannibal2.skyhanni.utils.SimpleTimeMark import at.hannibal2.skyhanni.utils.StringUtils.removeColor import at.hannibal2.skyhanni.utils.TimeUtils import at.hannibal2.skyhanni.utils.repopatterns.RepoPattern -import net.minecraftforge.fml.common.eventhandler.SubscribeEvent import kotlin.time.Duration @SkyHanniModule @@ -41,7 +41,7 @@ object BingoCardReader { ".*§7§eThe next hint will unlock in (?