diff options
| author | CalMWolfs <94038482+CalMWolfs@users.noreply.github.com> | 2023-10-07 11:43:32 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-07 02:43:32 +0200 |
| commit | 24c8ce90e3925a397975b617eedf796ae52208ae (patch) | |
| tree | 8ebdc6eab934f2ba6ebb5ef904212840ebfd5d3d /src/main/java/at/hannibal2/skyhanni | |
| parent | 9c2df723b49cf47f9e8a76b08a90ce9874456944 (diff) | |
| download | skyhanni-24c8ce90e3925a397975b617eedf796ae52208ae.tar.gz skyhanni-24c8ce90e3925a397975b617eedf796ae52208ae.tar.bz2 skyhanni-24c8ce90e3925a397975b617eedf796ae52208ae.zip | |
Feature: Compact tab list (from sba but better) (#459)
Added Advanced Tab List #459
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
73 files changed, 571 insertions, 79 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index b972dc6bf..c7ed9b3c6 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -192,6 +192,8 @@ import at.hannibal2.skyhanni.features.misc.SuperpairsClicksAlert import at.hannibal2.skyhanni.features.misc.ThunderSparksHighlight import at.hannibal2.skyhanni.features.misc.TimeFeatures import at.hannibal2.skyhanni.features.misc.TpsCounter +import at.hannibal2.skyhanni.features.misc.compacttablist.TabListReader +import at.hannibal2.skyhanni.features.misc.compacttablist.TabListRenderer import at.hannibal2.skyhanni.features.misc.discordrpc.DiscordRPCManager import at.hannibal2.skyhanni.features.misc.ghostcounter.GhostCounter import at.hannibal2.skyhanni.features.misc.items.EstimatedItemValue @@ -570,6 +572,8 @@ class SkyHanniMod { loadModule(CosmeticFollowingLine()) loadModule(SuperpairsClicksAlert()) loadModule(PowderTracker()) + loadModule(TabListReader) + loadModule(TabListRenderer) loadModule(GlowingDroppedItems()) loadModule(DungeonTeammateOutlines()) loadModule(DungeonRankTabListColor()) diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java index 0c7b1e701..95435f34f 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/MiscConfig.java @@ -536,6 +536,25 @@ public class MiscConfig { } @Expose + @ConfigOption(name = "Compact Tab List", desc = "") + @Accordion + public CompactTabList compactTabList = new CompactTabList(); + + public static class CompactTabList { + @Expose + @ConfigOption(name = "Enabled", desc = "Compacts the tablist to make it look much nicer like SBA did. Also " + + "doesn't break god-pot detection and shortens some other lines.") //made tablist one word here so both searches will pick it up + @ConfigEditorBoolean + @FeatureToggle + public boolean enabled = false; + + @Expose + @ConfigOption(name = "Hide Hypixel Adverts", desc = "Hides text from advertising the Hypixel server or store in the tablist") + @ConfigEditorBoolean + public boolean hideAdverts = false; + } + + @Expose @ConfigOption(name = "Exp Bottles", desc = "Hides all the experience orbs lying on the ground.") @ConfigEditorBoolean @FeatureToggle diff --git a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt index ad32abc15..4313fcb35 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/GuiEditManager.kt @@ -44,7 +44,7 @@ class GuiEditManager { } @SubscribeEvent(priority = EventPriority.LOWEST) - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { latestPositions = currentPositions.toMap() currentPositions.clear() } @@ -78,11 +78,11 @@ class GuiEditManager { GlStateManager.translate(0f, 0f, 200f) - GuiRenderEvent.GameOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() GlStateManager.pushMatrix() GlStateManager.enableDepth() - GuiRenderEvent.ChestBackgroundRenderEvent().postAndCatch() + GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch() GlStateManager.popMatrix() GlStateManager.translate(0f, 0f, -200f) diff --git a/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt b/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt index 1b6acd634..1d7a544ca 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/RenderGuiData.kt @@ -17,7 +17,7 @@ class RenderGuiData { if (event.type != RenderGameOverlayEvent.ElementType.HOTBAR) return if (GuiEditManager.isInGui() || FFGuideGUI.isInGui()) return - GuiRenderEvent.GameOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() } @SubscribeEvent @@ -30,10 +30,10 @@ class RenderGuiData { GlStateManager.enableDepth() if (GuiEditManager.isInGui()) { - GuiRenderEvent.GameOverlayRenderEvent().postAndCatch() + GuiRenderEvent.GuiOverlayRenderEvent().postAndCatch() } - GuiRenderEvent.ChestBackgroundRenderEvent().postAndCatch() + GuiRenderEvent.ChestGuiOverlayRenderEvent().postAndCatch() GlStateManager.popMatrix() } diff --git a/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt b/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt index 2004a1ed1..3970a1777 100644 --- a/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/TitleUtils.kt @@ -30,7 +30,7 @@ class TitleUtils { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (endTime.isInPast()) return val scaledResolution = ScaledResolution(Minecraft.getMinecraft()) diff --git a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt index 8650f1c7c..a9d190f89 100644 --- a/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/events/GuiRenderEvent.kt @@ -1,6 +1,6 @@ package at.hannibal2.skyhanni.events open class GuiRenderEvent : LorenzEvent() { - class ChestBackgroundRenderEvent : GuiRenderEvent() - class GameOverlayRenderEvent : GuiRenderEvent() + class ChestGuiOverlayRenderEvent : GuiRenderEvent() + class GuiOverlayRenderEvent : GuiRenderEvent() }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt index fcbc46e45..a2ec3dafc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/BingoCardDisplay.kt @@ -139,7 +139,7 @@ class BingoCardDisplay { private var lastSneak = false @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.isBingoProfile) return if (!config.enabled) 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 7f080ae39..6d211dcb5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/bingo/MinionCraftHelper.kt @@ -243,7 +243,7 @@ class MinionCraftHelper { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.isBingoProfile) return if (!config.minionCraftHelperEnabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt index ce83263ad..7b423af28 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonCopilot.kt @@ -129,7 +129,7 @@ class DungeonCopilot { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return SkyHanniMod.feature.dungeon.copilotPos.renderString(nextStep, posLabel = "Dungeon Copilot") diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt index e13dbcdb1..b1db55502 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonDeathCounter.kt @@ -85,7 +85,7 @@ class DungeonDeathCounter { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return SkyHanniMod.feature.dungeon.deathCounterPos.renderString(DungeonMilestonesDisplay.color + display, posLabel = "Dungeon Death Counter") diff --git a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt index 53d701b0d..69b06c0ce 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/dungeon/DungeonMilestonesDisplay.kt @@ -80,7 +80,7 @@ class DungeonMilestonesDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return SkyHanniMod.feature.dungeon.showMileStonesDisplayPos.renderString(color + display, posLabel = "Dungeon Milestone") diff --git a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt index 948d04269..8395b02da 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/event/anniversary/Year300RaffleEvent.kt @@ -42,7 +42,7 @@ object Year300RaffleEvent { @SubscribeEvent - fun onRender(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRender(event: GuiRenderEvent.GuiOverlayRenderEvent) { config.activeTimerPosition.renderSingleLineWithItems( overlay ?: return, posLabel = "300þ Anniversary Active Timer" @@ -70,6 +70,4 @@ object Year300RaffleEvent { Renderable.string("§eTime Left: ${timeLeft.format()}") ) } - - }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt index db7e2f57a..1238f41df 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fame/CityProjectFeatures.kt @@ -167,7 +167,7 @@ class CityProjectFeatures { } @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.showMaterials) return if (!inInventory) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt index b91d74f26..ec986f82e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingHookDisplay.kt @@ -56,7 +56,7 @@ class FishingHookDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val armorStand = armorStand ?: return diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt index 266325e3d..a3e491e02 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/FishingTimer.kt @@ -97,7 +97,7 @@ class FishingTimer { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.barnTimer) return if (!rightLocation) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt index c550f11ce..becdddf16 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/fishing/SharkFishCounter.kt @@ -69,7 +69,7 @@ class SharkFishCounter { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!SkyHanniMod.feature.fishing.sharkFishCounter) return if (!hasWaterRodInHand) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt index ca4bd5097..c1af6224d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/AnitaMedalProfit.kt @@ -136,7 +136,7 @@ class AnitaMedalProfit { } @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (inInventory) { config.anitaMedalProfitPos.renderStringsAndItems( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt index db14edcc9..40a603b7c 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/FarmingFortuneDisplay.kt @@ -78,13 +78,13 @@ class FarmingFortuneDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.farmingFortunePos.renderStringsAndItems(display, posLabel = "True Farming Fortune") } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!CropAccessoryData.isLoadingAccessories) return SkyHanniMod.feature.misc.inventoryLoadPos.renderString( diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt index e479bc2ac..7e5d3321f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenLevelDisplay.kt @@ -103,7 +103,7 @@ class GardenLevelDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.gardenLevelPos.renderString(display, posLabel = "Garden Level") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt index 768bf8bc8..6174298c4 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenNextJacobContest.kt @@ -372,7 +372,7 @@ object GardenNextJacobContest { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (display.isEmpty()) { @@ -383,7 +383,7 @@ object GardenNextJacobContest { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!config.nextJacobContestDisplay) return if (!inCalendar) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt index 71ac8b321..1574bf839 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenOptimalSpeed.kt @@ -80,7 +80,7 @@ class GardenOptimalSpeed { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (optimalSpeed == -1) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt index 4eafa6a38..896213429 100755 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/GardenYawAndPitch.kt @@ -19,7 +19,7 @@ class GardenYawAndPitch { private var lastPitch = 0f @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.enabled) return if (!GardenAPI.inGarden() && !config.showEverywhere) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt index a69a812d7..13679f643 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterDisplay.kt @@ -161,7 +161,7 @@ class ComposterDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (GardenAPI.inGarden() && config.composterDisplayEnabled) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt index 3fb00194a..f8abc9270 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/composter/ComposterOverlay.kt @@ -492,7 +492,7 @@ class ComposterOverlay { } @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (inInventory) { config.composterOverlayOrganicMatterPos.renderStringsAndItems( organicMatterDisplay, diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt index a6ef0d4f1..beb210cdc 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestFFNeededDisplay.kt @@ -124,7 +124,7 @@ class JacobContestFFNeededDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!FarmingContestAPI.inInventory) return if (System.currentTimeMillis() > lastToolTipTime + 200) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt index cf304c0db..461a6ac63 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/contest/JacobContestTimeNeeded.kt @@ -157,7 +157,7 @@ class JacobContestTimeNeeded { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (!FarmingContestAPI.inInventory) return config.jacobContextTimesPos.renderStringsAndItems(display, posLabel = "Jacob Contest Time Needed") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt index 7327fffb2..4bf29f93a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropMoneyDisplay.kt @@ -61,7 +61,7 @@ object CropMoneyDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!GardenAPI.hideExtraGuis()) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt index afeee870b..8abe65ccf 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/CropSpeedMeter.kt @@ -125,7 +125,7 @@ class CropSpeedMeter { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return SkyHanniMod.feature.garden.cropSpeedMeterPos.renderStrings(display, posLabel = "Crop Speed Meter") diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt index fb6453324..35fb5eaa5 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/DicerRngDropCounter.kt @@ -107,7 +107,7 @@ class DicerRngDropCounter { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (isEnabled()) { config.dicerCounterPos.renderStrings(display, posLabel = "Dicer Counter") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt index 9fb9be0b0..375398098 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/FarmingArmorDrops.kt @@ -79,7 +79,7 @@ class FarmingArmorDrops { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!GardenAPI.inGarden()) return if (!config.farmingArmorDropsEnabled) return if (!hasArmor) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt index 5f82e690b..384136ec2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/farming/GardenCropMilestoneDisplay.kt @@ -51,7 +51,7 @@ object GardenCropMilestoneDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (GardenAPI.hideExtraGuis()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt index 363d1c127..fbcbdc131 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/inventory/SkyMartCopperPrice.kt @@ -67,7 +67,7 @@ class SkyMartCopperPrice { } @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (inInventory) { config.skyMartCopperPricePos.renderStringsAndItems( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt index 0cb9588e3..69031505a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorDropStatistics.kt @@ -221,7 +221,7 @@ object GardenVisitorDropStatistics { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!GardenAPI.inGarden()) return if (GardenAPI.hideExtraGuis()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt index 8c9593117..a741017b6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/garden/visitor/GardenVisitorTimer.kt @@ -144,7 +144,7 @@ class GardenVisitorTimer { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.visitorTimerPos.renderString(render, posLabel = "Garden Visitor Timer") diff --git a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt index 757d9e741..ad9a963e8 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/SackDisplay.kt @@ -22,7 +22,7 @@ object SackDisplay { @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (SackAPI.inSackInventory) { if (!isEnabled()) return config.position.renderStringsAndItems( diff --git a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt index 12ba78702..af6a7dbfd 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/mining/KingTalismanHelper.kt @@ -139,7 +139,7 @@ class KingTalismanHelper { private fun getCurrentKing() = getKingTimes().sortedDesc().firstNotNullOf { it.key } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.kingTalismanHelper) return config.kingTalismanHelperPos.renderStrings(display, posLabel = "King Talisman Helper") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt index 6b33e0b47..211641694 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/BestiaryData.kt @@ -46,7 +46,7 @@ object BestiaryData { ) @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (inInventory) { config.position.renderStringsAndItems( diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt index 51fa9f685..70c6e8025 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ChestValue.kt @@ -44,7 +44,7 @@ class ChestValue { private val inInventory get() = InventoryUtils.openInventoryName().removeColor().isValidStorage() @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isEnabled()) return if (InventoryUtils.openInventoryName() == "") return if (inInventory) { 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 e5ce90ae8..c43f1f623 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ChickenHeadTimer.kt @@ -46,7 +46,7 @@ class ChickenHeadTimer { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!hasChickenHead) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt index fb74409ab..ebc00c989 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CollectionTracker.kt @@ -196,7 +196,7 @@ class CollectionTracker { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return SkyHanniMod.feature.misc.collectionCounterPos.renderStringsAndItems(display, posLabel = "Collection Tracker") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt index c747e5e28..aac4aff7a 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CurrentPetDisplay.kt @@ -61,7 +61,7 @@ class CurrentPetDisplay { @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (RiftAPI.inRift()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt index eb78def01..40b6abed1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/CustomTextBox.kt @@ -25,7 +25,7 @@ class CustomTextBox { private fun String.format() = replace("&", "§").split("\\n").toList() @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!LorenzUtils.inSkyBlock) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/EnderNodeTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/EnderNodeTracker.kt index 0600229de..d07ae0ef2 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/EnderNodeTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/EnderNodeTracker.kt @@ -127,7 +127,7 @@ class EnderNodeTracker { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!isInTheEnd()) return config.position.renderStringsAndItems(display, posLabel = "Ender Node Tracker") @@ -236,4 +236,4 @@ class EnderNodeTracker { } return newList } -} +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt index 6a77f9fe9..21e28319d 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/FrozenTreasureTracker.kt @@ -149,7 +149,7 @@ class FrozenTreasureTracker { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!onJerryWorkshop()) return if (config.onlyInCave && !inGlacialCave()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt index d6d73c3ce..52ca8a3d1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/MovementSpeedDisplay.kt @@ -38,7 +38,7 @@ class MovementSpeedDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.playerMovementSpeedPos.renderString(display, posLabel = "Movement Speed") diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt index e214fc140..ba71aeb9e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/NonGodPotEffectDisplay.kt @@ -212,7 +212,7 @@ class NonGodPotEffectDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (RiftAPI.inRift()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt index 6e6aa029f..bcee7863f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TimeFeatures.kt @@ -28,7 +28,7 @@ class TimeFeatures { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (config.realTime) { diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt index 684f97ba5..375238dc3 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/TpsCounter.kt @@ -84,7 +84,7 @@ class TpsCounter { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.tpsDisplay) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/RenderColumn.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/RenderColumn.kt new file mode 100644 index 000000000..2ee1e3442 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/RenderColumn.kt @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +class RenderColumn { + + val lines = mutableListOf<TabLine>() + + fun size(): Int { + return lines.size + } + + fun addLine(line: TabLine) { + lines.add(line) + } + + fun getMaxWidth(): Int { + return lines.maxOfOrNull { it.getWidth() } ?: 0 + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabColumn.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabColumn.kt new file mode 100644 index 000000000..d1e930a09 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabColumn.kt @@ -0,0 +1,17 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + + +class TabColumn(val columnTitle: String) { + val lines = mutableListOf<String>() + val sections = mutableListOf<TabSection>() + + fun addLine(line: String) { + lines.add(line) + } + + fun addSection(section: TabSection) { + sections.add(section) + } + + fun size() = lines.size + 1 +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt new file mode 100644 index 000000000..315ea1556 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabLine.kt @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +import net.minecraft.client.Minecraft + +class TabLine(var text: String, var type: TabStringType) { + + fun getWidth(): Int { + val mc = Minecraft.getMinecraft() + var width = mc.fontRendererObj.getStringWidth(text) + if (type === TabStringType.PLAYER) { + width += 8 + 2 // Player head + } + if (type === TabStringType.TEXT) { + width += 4 + } + return width + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt new file mode 100644 index 000000000..4eb60dda1 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListReader.kt @@ -0,0 +1,222 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.events.LorenzTickEvent +import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiPlayerTabOverlay +import at.hannibal2.skyhanni.utils.LorenzUtils +import at.hannibal2.skyhanni.utils.StringUtils.matchMatcher +import at.hannibal2.skyhanni.utils.StringUtils.removeColor +import at.hannibal2.skyhanni.utils.StringUtils.removeResets +import at.hannibal2.skyhanni.utils.StringUtils.trimWhiteSpaceAndResets +import at.hannibal2.skyhanni.utils.TabListData +import net.minecraft.client.Minecraft +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +// heavily inspired by SBA code +object TabListReader { + var hypixelAdvertisingString = "HYPIXEL.NET" + private val godPotPattern = "You have a God Potion active! (?<timer>[\\w ]+)".toPattern() + private val activeEffectPattern = "Active Effects(?:§.)*(?:\\n(?:§.)*§7.+)*".toPattern() + private val effectCountPattern = "You have (?<effectCount>[0-9]+) active effect".toPattern() + private val cookiePattern = "Cookie Buff(?:§.)*(?:\\n(§.)*§7.+)*".toPattern() + private val dungeonBuffPattern = "Dungeon Buffs(?:§.)*(?:\\n(§.)*§7.+)*".toPattern() + private val upgradesPattern = "(?<firstPart>§e[A-Za-z ]+)(?<secondPart> §f[\\w ]+)".toPattern() + private val tabListSPattern = "(?i)§S".toPattern() + + val renderColumns = mutableListOf<RenderColumn>() + + @SubscribeEvent + fun onTick(event: LorenzTickEvent) { + if (!LorenzUtils.inSkyBlock) return + if (!event.isMod(5)) return + if (!SkyHanniMod.feature.misc.compactTabList.enabled) return + + var tabLines = TabListData.getTabList() + + if (tabLines.size < 80) return + + tabLines = tabLines.subList(0, 80) + + val columns = parseColumns(tabLines) + val footerColumn = parseFooterAsColumn() + + if (footerColumn != null) { + columns.add(footerColumn) + } + + parseSections(columns) + + renderColumns.clear() + val renderColumn = RenderColumn() + renderColumns.add(renderColumn) + combineColumnsToRender(columns, renderColumn) + } + + private fun parseColumns(fullTabList: List<String>): MutableList<TabColumn> { + val columns = mutableListOf<TabColumn>() + + for (entry in fullTabList.indices step 20) { + val title = fullTabList[entry].trimWhiteSpaceAndResets() + var column = getColumnFromName(columns, title) + + if (column == null) { + column = TabColumn(title) + columns.add(column) + } + + for (columnEntry in (entry + 1) until fullTabList.size.coerceAtMost(entry + 20)) { + column.addLine(fullTabList[columnEntry]) + } + } + return columns + } + + private fun parseFooterAsColumn(): TabColumn? { + val tabList = Minecraft.getMinecraft().ingameGUI.tabList as AccessorGuiPlayerTabOverlay + + if (tabList.footer_skyhanni == null) { + return null + } + + val column = TabColumn("§2§lOther") + + var footer = tabListSPattern.matcher(tabList.footer_skyhanni.formattedText).replaceAll("") + + var matcher = godPotPattern.matcher(tabList.footer_skyhanni.unformattedText) + if (matcher.find()) { + footer = activeEffectPattern.matcher(footer).replaceAll("Active Effects:\n§cGod Potion§r: ${matcher.group("timer")}") + } else { + matcher = effectCountPattern.matcher(tabList.footer_skyhanni.unformattedText) + footer = if (matcher.find()) { + activeEffectPattern.matcher(footer).replaceAll("Active Effects: §r§e" + matcher.group("effectCount")) + } else { + activeEffectPattern.matcher(footer).replaceAll("Active Effects: §r§e0") + } + } + + matcher = cookiePattern.matcher(footer) + if (matcher.find() && matcher.group().contains("Not active!")) { + footer = matcher.replaceAll("Cookie Buff \n§r§7Not Active") + } + + matcher = dungeonBuffPattern.matcher(footer) + if (matcher.find() && matcher.group().contains("No Buffs active.")) { + footer = matcher.replaceAll("Dungeon Buffs \n§r§7None Found") + } + + for (line in footer.split("\n")) { + if (line.contains(hypixelAdvertisingString)) continue + + var newLine = line + matcher = upgradesPattern.matcher(newLine.removeResets()) + + if (matcher.matches()) { + var firstPart = matcher.group("firstPart").trimWhiteSpaceAndResets() + if (!firstPart.contains("§l")) { + firstPart = " $firstPart" + } + column.addLine(firstPart) + + newLine = matcher.group("secondPart") + } + + newLine = newLine.trimWhiteSpaceAndResets() + if (!newLine.contains("§l")) { + newLine = " $newLine" + } + column.addLine(newLine) + } + + return column + } + + private fun getColumnFromName(columns: List<TabColumn>, name: String): TabColumn? { + for (tabColumn in columns) { + if (name == tabColumn.columnTitle) { + return tabColumn + } + } + return null + } + + private fun parseSections(columns: MutableList<TabColumn>) { + for (column in columns) { + var currentTabSection: TabSection? = null + for (line in column.lines) { + if (line.trimWhiteSpaceAndResets().isEmpty()) { + currentTabSection = null + continue + } + + if (currentTabSection == null) { + column.addSection(TabSection(column).also { currentTabSection = it }) + } + + currentTabSection?.addLine(line) + } + } + } + + private fun combineColumnsToRender(columns: MutableList<TabColumn>, firstColumn: RenderColumn) { + var firstColumnCopy = firstColumn + var lastTitle: String? = null + + for (column in columns) { + for (section in column.sections) { + var sectionSize = section.size() + + var needsTitle = false + if (lastTitle != section.columnValue.columnTitle) { + needsTitle = true + sectionSize++ + } + + var currentCount = firstColumnCopy.size() + + if (sectionSize >= TabListRenderer.maxLines / 2) { + if (currentCount >= TabListRenderer.maxLines) { + renderColumns.add(RenderColumn().also { firstColumnCopy = it }) + currentCount = 1 + } else { + if (firstColumnCopy.size() > 0) { + firstColumnCopy.addLine(TabLine("", TabStringType.TEXT)) + } + } + + if (needsTitle) { + lastTitle = section.columnValue.columnTitle + firstColumnCopy.addLine(TabLine(lastTitle, TabStringType.TITLE)) + currentCount++ + } + + for (line in section.lines) { + if (currentCount >= TabListRenderer.maxLines) { + renderColumns.add(RenderColumn().also { firstColumnCopy = it }) + currentCount = 1 + } + + firstColumnCopy.addLine(TabLine(line, TabStringType.fromLine(line))) + currentCount++ + } + } else { + if (currentCount + sectionSize > TabListRenderer.maxLines) { + renderColumns.add(RenderColumn().also { firstColumnCopy = it }) + } else { + if (firstColumnCopy.size() > 0) { + firstColumnCopy.addLine(TabLine("", TabStringType.TEXT)) + } + } + + if (needsTitle) { + lastTitle = section.columnValue.columnTitle + firstColumnCopy.addLine(TabLine(lastTitle, TabStringType.TITLE)) + } + + for (line in section.lines) { + firstColumnCopy.addLine(TabLine(line, TabStringType.fromLine(line))) + } + } + } + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt new file mode 100644 index 000000000..ea850f6e2 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabListRenderer.kt @@ -0,0 +1,157 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +import at.hannibal2.skyhanni.SkyHanniMod +import at.hannibal2.skyhanni.mixins.transformers.AccessorGuiPlayerTabOverlay +import at.hannibal2.skyhanni.utils.LorenzUtils +import net.minecraft.client.Minecraft +import net.minecraft.client.gui.Gui +import net.minecraft.client.gui.ScaledResolution +import net.minecraft.client.renderer.GlStateManager +import net.minecraft.entity.player.EnumPlayerModelParts +import net.minecraftforge.client.event.RenderGameOverlayEvent +import net.minecraftforge.fml.common.eventhandler.SubscribeEvent + +object TabListRenderer { + private val config get() = SkyHanniMod.feature.misc.compactTabList + + const val maxLines = 22 + private const val lineHeight = 8 + 1 + private const val padding = 3 + private const val columnSpacing = 6 + + @SubscribeEvent + fun onRenderOverlay(event: RenderGameOverlayEvent.Pre) { + if (!LorenzUtils.inSkyBlock) return + if (event.type != RenderGameOverlayEvent.ElementType.PLAYER_LIST) return + if (!config.enabled) return + event.isCanceled = true + + val columns = TabListReader.renderColumns + + if (columns.isEmpty()) return + + var maxLines = 0 + var totalWidth = 0 - columnSpacing + + for (column in columns) { + maxLines = maxLines.coerceAtLeast(column.size()) + totalWidth += column.getMaxWidth() + columnSpacing + } + + var totalHeight = maxLines * lineHeight + val tabList = Minecraft.getMinecraft().ingameGUI.tabList as AccessorGuiPlayerTabOverlay + + var header = listOf<String>() + if (tabList.header_skyhanni != null) { + header = tabList.header_skyhanni.formattedText.split("\n").toMutableList() + header.removeIf { line -> !line.contains(TabListReader.hypixelAdvertisingString) } + if (config.hideAdverts) { + header = listOf() + } else { + totalHeight += header.size * lineHeight + padding + } + } + + var footer = listOf<String>() + if (tabList.footer_skyhanni != null) { + footer = tabList.footer_skyhanni.formattedText.split("\n").toMutableList() + footer.removeIf { line -> !line.contains(TabListReader.hypixelAdvertisingString) } + if (config.hideAdverts) { + footer = listOf() + } else { + totalHeight += footer.size * lineHeight + padding + } + } + + val minecraft = Minecraft.getMinecraft() + val scaledResolution = ScaledResolution(minecraft) + val screenWidth = scaledResolution.scaledWidth / 2 + val x = screenWidth - totalWidth / 2 + val y = 10 + + Gui.drawRect( + x - columnSpacing, + y - padding, + screenWidth + totalWidth / 2 + columnSpacing, + 10 + totalHeight + padding, + -0x80000000 + ) + + var headerY = y + if (header.isNotEmpty()) { + for (line in header) { + minecraft.fontRendererObj.drawStringWithShadow( + line, + x + totalWidth / 2f - minecraft.fontRendererObj.getStringWidth(line) / 2f, + headerY.toFloat(), + 0xFFFFFF + ) + headerY += 8 + 1 + } + } + + var middleX = x + for (column in columns) { + var middleY = if (config.hideAdverts) headerY else headerY + padding + 2 + + Gui.drawRect( + middleX - padding + 1, + middleY - padding + 1, + middleX + column.getMaxWidth() + padding - 2, + middleY + column.size() * lineHeight + padding - 2, + 0x20AAAAAA + ) + + for (tabLine in column.lines) { + val savedX = middleX + + if (tabLine.type == TabStringType.PLAYER) { + val pLayerInfo = minecraft.netHandler.getPlayerInfo(TabStringType.usernameFromLine(tabLine.text)) + if (pLayerInfo != null) { + val player = minecraft.theWorld.getPlayerEntityByUUID(pLayerInfo.gameProfile.id) + + minecraft.textureManager.bindTexture(pLayerInfo.locationSkin) + GlStateManager.color(1f, 1f, 1f, 1f) + Gui.drawScaledCustomSizeModalRect(middleX, middleY, 8f, 8f, 8, 8, 8, 8, 64.0f, 64.0f) + if (player != null && player.isWearing(EnumPlayerModelParts.HAT)) { + Gui.drawScaledCustomSizeModalRect(middleX, middleY, 40.0f, 8f, 8, 8, 8, 8, 64.0f, 64.0f) + } + } + middleX += 8 + 2 + } + + if (tabLine.type == TabStringType.TITLE) { + minecraft.fontRendererObj.drawStringWithShadow( + tabLine.text, + middleX + column.getMaxWidth() / 2f - tabLine.getWidth() / 2f, + middleY.toFloat(), + 0xFFFFFF + ) + } else { + minecraft.fontRendererObj.drawStringWithShadow( + tabLine.text, + middleX.toFloat(), + middleY.toFloat(), + 0xFFFFFF + ) + } + middleY += lineHeight + middleX = savedX + } + middleX += column.getMaxWidth() + columnSpacing + } + + if (footer.isNotEmpty()) { + var footerY = y + totalHeight - footer.size * lineHeight + padding / 2 + 1 + for (line in footer) { + minecraft.fontRendererObj.drawStringWithShadow( + line, + x + totalWidth / 2f - minecraft.fontRendererObj.getStringWidth(line) / 2f, + footerY.toFloat(), + -0x1 + ) + footerY += lineHeight + } + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabSection.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabSection.kt new file mode 100644 index 000000000..9754235fb --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabSection.kt @@ -0,0 +1,11 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +class TabSection(val columnValue: TabColumn) { + val lines = mutableListOf<String>() + + fun addLine(line: String) { + lines.add(line) + } + + fun size() = lines.size +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt new file mode 100644 index 000000000..344a21ae1 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/compacttablist/TabStringType.kt @@ -0,0 +1,31 @@ +package at.hannibal2.skyhanni.features.misc.compacttablist + +import at.hannibal2.skyhanni.utils.StringUtils.removeColor + +enum class TabStringType { + TITLE, + SUB_TITLE, + TEXT, + PLAYER; + + companion object { + private val usernamePattern = "^\\[(?<sblevel>\\d+)] (?:\\[\\w+] )?(?<username>\\w+)".toPattern() + + fun fromLine(line: String): TabStringType { + val strippedLine: String = line.removeColor() + if (strippedLine.startsWith(" ")) { + return TEXT + } + return if (usernamePattern.matcher(strippedLine).find()) { + PLAYER + } else { + SUB_TITLE + } + } + + fun usernameFromLine(input: String): String { + val usernameMatcher = usernamePattern.matcher(input.removeColor()) + return if (usernameMatcher.find()) usernameMatcher.group("username") else input + } + } +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt index 5999b3c62..8c2287720 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/ghostcounter/GhostCounter.kt @@ -97,7 +97,7 @@ object GhostCounter { private val VOLTA = "VOLTA".asInternalName() @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (config.onlyOnMist && !inMist) return config.position.renderStringsAndItems( diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt index 94d5b4eeb..4ec2dbf99 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/items/EstimatedItemValue.kt @@ -94,7 +94,7 @@ object EstimatedItemValue { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.estimatedIemValueEnabled) return if (!OSUtils.isKeyHeld(config.estimatedItemValueHotkey) && !config.estimatedIemValueAlwaysEnabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt index fab56b5af..d393fdd7f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorFeatures.kt @@ -144,7 +144,7 @@ object TrevorFeatures { } @SubscribeEvent(priority = EventPriority.LOWEST) - fun renderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun renderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.trapperCooldownGui) return if (!onFarmingIsland()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt index 52bb0f392..7a4213a64 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/misc/trevor/TrevorTracker.kt @@ -119,7 +119,7 @@ object TrevorTracker { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!shouldDisplay()) return config.position.renderStringsAndItems(display, posLabel = "Frozen Treasure Tracker") } diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt index 70514f8a2..8b1fc592f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangFreezeCooldown.kt @@ -28,7 +28,7 @@ class AshfangFreezeCooldown { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return val duration = System.currentTimeMillis() - lastHit val maxDuration = 3_000 diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt index 0f51a37fb..38e3665fa 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/ashfang/AshfangNextResetCooldown.kt @@ -31,7 +31,7 @@ class AshfangNextResetCooldown { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (spawnTime == -1L) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt index c18274b05..7fa82bcf9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/nether/reputationhelper/CrimsonIsleReputationHelper.kt @@ -106,7 +106,7 @@ class CrimsonIsleReputationHelper(skyHanniMod: SkyHanniMod) { } @SubscribeEvent(priority = EventPriority.LOWEST) - fun renderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun renderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!config.enabled) return if (!LorenzUtils.inSkyBlock) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt index e9671a3a4..025803ce1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/livingcave/LivingMetalSuitProgress.kt @@ -19,7 +19,7 @@ class LivingMetalSuitProgress { private var progressMap = mapOf<ItemStack, Double?>() @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderStringsAndItems( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt index 0aefac172..1c19cdef9 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/area/mirrorverse/DanceRoomHelper.kt @@ -78,7 +78,7 @@ object DanceRoomHelper { } + this @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!inRoom) return config.position.renderStrings( diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt index 1418f8f4b..2741694ed 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/CruxTalismanDisplay.kt @@ -28,7 +28,7 @@ object CruxTalismanDisplay { private var percentValue = 0.0 @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return config.position.renderStringsAndItems( display, diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt index eedd0b38d..880dc53ac 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/RiftTimer.kt @@ -82,7 +82,7 @@ class RiftTimer { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (LorenzUtils.skyBlockArea == "Mirrorverse") return diff --git a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt index cd8f257d0..c6337866e 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/rift/everywhere/motes/ShowMotesNpcSellPrice.kt @@ -34,7 +34,7 @@ class ShowMotesNpcSellPrice { private val slotList = mutableListOf<Int>() @SubscribeEvent - fun onBackgroundDraw(event: GuiRenderEvent.ChestBackgroundRenderEvent) { + fun onBackgroundDraw(event: GuiRenderEvent.ChestGuiOverlayRenderEvent) { if (!isInventoryValueEnabled()) return if (inInventory) { config.inventoryValue.position.renderStringsAndItems( diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt index 5decdb4ff..ee237c34f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/SlayerRngMeterDisplay.kt @@ -165,7 +165,7 @@ class SlayerRngMeterDisplay { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (!SlayerAPI.isInCorrectArea) return if (!SlayerAPI.hasActiveSlayerQuest()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt index 569486503..4c7567d8b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/blaze/BlazeSlayerDaggerHelper.kt @@ -239,7 +239,7 @@ class BlazeSlayerDaggerHelper { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!isEnabled()) return if (textTopLeft.isEmpty()) return diff --git a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt index cbf30000d..99d854cef 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -137,7 +137,7 @@ class SummoningMobManager { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.summoningMobDisplay) return if (summoningMobs.isEmpty()) return diff --git a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorGuiPlayerTabOverlay.java b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorGuiPlayerTabOverlay.java index 72bb00b0f..3d01a5083 100644 --- a/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorGuiPlayerTabOverlay.java +++ b/src/main/java/at/hannibal2/skyhanni/mixins/transformers/AccessorGuiPlayerTabOverlay.java @@ -12,4 +12,4 @@ public interface AccessorGuiPlayerTabOverlay { @Accessor("header") IChatComponent getHeader_skyhanni(); -} +}
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt index cfb892f84..3a0660c2d 100644 --- a/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt +++ b/src/main/java/at/hannibal2/skyhanni/test/SkyHanniDebugsAndTests.kt @@ -307,7 +307,7 @@ class SkyHanniDebugsAndTests { } @SubscribeEvent - fun onRenderLocation(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderLocation(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (LorenzUtils.inSkyBlock && Minecraft.getMinecraft().gameSettings.showDebugInfo) { config.debugLocationPos.renderString( "Current Area: ${HypixelData.skyBlockArea}", @@ -322,7 +322,7 @@ class SkyHanniDebugsAndTests { } @SubscribeEvent - fun onRenderOverlay(event: GuiRenderEvent.GameOverlayRenderEvent) { + fun onRenderOverlay(event: GuiRenderEvent.GuiOverlayRenderEvent) { if (!LorenzUtils.inSkyBlock) return if (!config.debugEnabled) return diff --git a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt index e5ebc25a5..252d974ca 100644 --- a/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt +++ b/src/main/java/at/hannibal2/skyhanni/utils/TabListData.kt @@ -43,7 +43,7 @@ class TabListData { private fun readTabList(): List<String>? { val thePlayer = Minecraft.getMinecraft()?.thePlayer ?: return null val players = playerOrdering.sortedCopy(thePlayer.sendQueue.playerInfoMap) - val result: MutableList<String> = ArrayList() + val result = mutableListOf<String>() tabListGuard = true for (info in players) { val name = Minecraft.getMinecraft().ingameGUI.tabList.getPlayerName(info) @@ -53,12 +53,9 @@ class TabListData { return result.dropLast(1) } - private var ticks = 0 - @SubscribeEvent fun onTick(event: LorenzTickEvent) { - - if (ticks++ % 5 != 0) return + if (!event.isMod(5)) return val tabList = readTabList() ?: return if (cache != tabList) { |