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