From a2ea62c88e4b7d25b27ccfde3d4d94d39c0a419f Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Tue, 25 Jul 2023 04:15:38 +0200 Subject: We do love LorenzTickEvent now --- .../at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt | 7 +++---- .../hannibal2/skyhanni/features/misc/CityProjectFeatures.kt | 13 +++---------- .../hannibal2/skyhanni/features/misc/CollectionCounter.kt | 4 ++-- .../hannibal2/skyhanni/features/misc/MarkedPlayerManager.kt | 7 ++----- .../skyhanni/features/misc/NonGodPotEffectDisplay.kt | 7 ++----- .../at/hannibal2/skyhanni/features/misc/PasteIntoSigns.kt | 4 ++-- .../skyhanni/features/misc/PatcherSendCoordinates.kt | 2 +- .../hannibal2/skyhanni/features/misc/QuickModMenuSwitch.kt | 7 +++---- .../hannibal2/skyhanni/features/misc/ServerRestartTitle.kt | 10 +++------- .../skyhanni/features/misc/ThunderSparksHighlight.kt | 4 ++-- .../skyhanni/features/misc/discordrpc/DiscordRPCManager.kt | 4 ++-- .../skyhanni/features/misc/tiarelay/TiaRelayHelper.kt | 11 +++-------- .../skyhanni/features/misc/trevor/TrevorFeatures.kt | 8 ++------ .../skyhanni/features/misc/update/UpdateManager.kt | 6 +++--- 14 files changed, 33 insertions(+), 61 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/features/misc') diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt index ad4ba25ed..8a7dc645f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt @@ -3,6 +3,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderEvent import at.hannibal2.skyhanni.events.LorenzChatEvent +import at.hannibal2.skyhanni.events.LorenzTickEvent import at.hannibal2.skyhanni.events.LorenzWorldChangeEvent import at.hannibal2.skyhanni.utils.InventoryUtils import at.hannibal2.skyhanni.utils.ItemUtils.name @@ -10,18 +11,16 @@ import at.hannibal2.skyhanni.utils.LorenzUtils import at.hannibal2.skyhanni.utils.RenderUtils.renderString import at.hannibal2.skyhanni.utils.TimeUtils import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import net.minecraftforge.fml.common.gameevent.TickEvent class ChickenHeadTimer { - private var tick = 0 private var hasChickenHead = false private var lastTime = 0L private val config get() = SkyHanniMod.feature.misc @SubscribeEvent - fun onTick(event: TickEvent.ClientTickEvent) { + fun onTick(event: LorenzTickEvent) { if (!isEnabled()) return - if (tick++ % 5 != 0) return + if (!event.isMod(5)) return val itemStack = InventoryUtils.getArmor()[3] val name = itemStack?.name ?: "" diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt index 1610b3ef4..a00477b07 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CityProjectFeatures.kt @@ -2,10 +2,7 @@ package at.hannibal2.skyhanni.features.misc import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ProfileStorageData -import at.hannibal2.skyhanni.events.GuiContainerEvent -import at.hannibal2.skyhanni.events.GuiRenderEvent -import at.hannibal2.skyhanni.events.InventoryCloseEvent -import at.hannibal2.skyhanni.events.InventoryOpenEvent +import at.hannibal2.skyhanni.events.* import at.hannibal2.skyhanni.features.bazaar.BazaarApi import at.hannibal2.skyhanni.features.garden.contest.FarmingContestAPI import at.hannibal2.skyhanni.utils.* @@ -23,12 +20,10 @@ import net.minecraft.client.gui.inventory.GuiEditSign import net.minecraft.inventory.ContainerChest import net.minecraft.item.ItemStack import net.minecraftforge.fml.common.eventhandler.SubscribeEvent -import net.minecraftforge.fml.common.gameevent.TickEvent class CityProjectFeatures { private var display = emptyList>() private var inInventory = false - private var tick = 0 private var lastReminderSend = 0L private val contributeAgainPattern = "§7Contribute again: §e(?