From 77697fc96ada428087f8abc2022ddb82df307d20 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sun, 1 Jan 2023 17:30:29 +0100 Subject: 0.13.1 color fix --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index eccfc78c9..fa5cc233f 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -62,7 +62,7 @@ import java.util.List; public class SkyHanniMod { public static final String MODID = "skyhanni"; - public static final String VERSION = "0.13"; + public static final String VERSION = "0.13.1"; public static Features feature; -- cgit From 267ef5a027c6c67f91e52cbf52a0aacb550d2378 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:12:44 +0100 Subject: debug command logic and console filter changes --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 -- 1 file changed, 2 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index fa5cc233f..a88ef4696 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -186,11 +186,9 @@ public class SkyHanniMod { private void registerEvent(Object object) { listenerClasses.add(object); String simpleName = object.getClass().getSimpleName(); - consoleLog("SkyHanni registering '" + simpleName + "'"); long start = System.currentTimeMillis(); MinecraftForge.EVENT_BUS.register(object); long duration = System.currentTimeMillis() - start; - consoleLog("Done after " + duration + " ms!"); } public static GuiScreen screenToOpen = null; -- cgit From 607a7cd9802b97f8102fdc535ed03090123f05ad Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:26:46 +0100 Subject: Added /shtrackcollection. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index a88ef4696..ba48a5103 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -163,6 +163,7 @@ public class SkyHanniMod { registerEvent(new GriffinBurrowHelper()); registerEvent(new GriffinBurrowParticleFinder()); registerEvent(new BurrowWarpHelper()); + registerEvent(new CollectionCounter()); registerEvent(new HighlightBonzoMasks()); registerEvent(new DungeonLevelColor()); registerEvent(new BazaarCancelledBuyOrderClipboard()); -- cgit From bdd4102b67c7498c366370e265f67ad25698950b Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:27:58 +0100 Subject: Reloading the profile data every 3 minutes. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index ba48a5103..0c68a9f89 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -89,7 +89,7 @@ public class SkyHanniMod { registerEvent(new HypixelData()); registerEvent(new DungeonData()); registerEvent(new ScoreboardData()); - registerEvent(new ApiKeyGrabber()); + registerEvent(new ApiDataLoader()); registerEvent(new SeaCreatureManager()); registerEvent(new ItemRenderBackground()); registerEvent(new EntityData()); -- cgit From ac0c2ee4e8e17492feceb0007ccab4a6ddfc27da Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 01:58:22 +0100 Subject: Removed unused code. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 0c68a9f89..5a1e9fb7c 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -186,10 +186,7 @@ public class SkyHanniMod { private void registerEvent(Object object) { listenerClasses.add(object); - String simpleName = object.getClass().getSimpleName(); - long start = System.currentTimeMillis(); MinecraftForge.EVENT_BUS.register(object); - long duration = System.currentTimeMillis() - start; } public static GuiScreen screenToOpen = null; -- cgit From cf9c5919746107cd4fc954f75b9d99223e1df591 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:23:14 +0100 Subject: Compact Bingo and Potion Effect chat messages. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 5a1e9fb7c..d7670e810 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -167,7 +167,9 @@ public class SkyHanniMod { registerEvent(new HighlightBonzoMasks()); registerEvent(new DungeonLevelColor()); registerEvent(new BazaarCancelledBuyOrderClipboard()); + registerEvent(new CompactSplashPotionMessage()); registerEvent(new CroesusUnopenedChestTracker()); + registerEvent(new CompactBingoChat()); Commands.INSTANCE.init(); -- cgit From b2083d8b1042c6841925a780ae9093eedb11e75e Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:27:43 +0100 Subject: Create misc package for the features. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index d7670e810..893792936 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -5,7 +5,6 @@ import at.hannibal2.skyhanni.config.Features; import at.hannibal2.skyhanni.config.commands.Commands; import at.hannibal2.skyhanni.data.*; import at.hannibal2.skyhanni.data.repo.RepoManager; -import at.hannibal2.skyhanni.features.*; import at.hannibal2.skyhanni.features.anvil.AnvilCombineHelper; import at.hannibal2.skyhanni.features.bazaar.BazaarApi; import at.hannibal2.skyhanni.features.bazaar.BazaarBestSellMethod; @@ -30,6 +29,7 @@ import at.hannibal2.skyhanni.features.inventory.*; import at.hannibal2.skyhanni.features.itemabilities.FireVeilWandParticles; import at.hannibal2.skyhanni.features.itemabilities.abilitycooldown.ItemAbilityCooldown; import at.hannibal2.skyhanni.features.minion.MinionFeatures; +import at.hannibal2.skyhanni.features.misc.*; import at.hannibal2.skyhanni.features.nether.MilleniaAgedBlazeColor; import at.hannibal2.skyhanni.features.nether.ashfang.*; import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon; -- cgit From 518e57a874a365883fc755655d78b0981076ffe1 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:28:50 +0100 Subject: renamed register event to module --- .../java/at/hannibal2/skyhanni/SkyHanniMod.java | 176 ++++++++++----------- 1 file changed, 88 insertions(+), 88 deletions(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 893792936..c59444b99 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -70,7 +70,7 @@ public class SkyHanniMod { public static ConfigManager configManager; private static Logger logger; - public static List listenerClasses = new ArrayList<>(); + public static List modules = new ArrayList<>(); public static Job globalJob = JobKt.Job(null); public static CoroutineScope coroutineScope = CoroutineScopeKt.CoroutineScope( @@ -84,97 +84,97 @@ public class SkyHanniMod { //API and utils new BazaarApi(); - registerEvent(this); - registerEvent(new ChatManager()); - registerEvent(new HypixelData()); - registerEvent(new DungeonData()); - registerEvent(new ScoreboardData()); - registerEvent(new ApiDataLoader()); - registerEvent(new SeaCreatureManager()); - registerEvent(new ItemRenderBackground()); - registerEvent(new EntityData()); - registerEvent(new EntityMovementData()); - registerEvent(new ItemClickData()); - registerEvent(new MinecraftData()); - registerEvent(new SendTitleHelper()); - registerEvent(new ItemTipHelper()); + loadModule(this); + loadModule(new ChatManager()); + loadModule(new HypixelData()); + loadModule(new DungeonData()); + loadModule(new ScoreboardData()); + loadModule(new ApiDataLoader()); + loadModule(new SeaCreatureManager()); + loadModule(new ItemRenderBackground()); + loadModule(new EntityData()); + loadModule(new EntityMovementData()); + loadModule(new ItemClickData()); + loadModule(new MinecraftData()); + loadModule(new SendTitleHelper()); + loadModule(new ItemTipHelper()); //features - registerEvent(new BazaarOrderHelper()); - registerEvent(new ChatFilter()); - registerEvent(new PlayerChatModifier()); - registerEvent(new DungeonChatFilter()); - registerEvent(new HideNotClickableItems()); - registerEvent(new ItemDisplayOverlayFeatures()); - registerEvent(new CurrentPetDisplay()); - registerEvent(new ExpBottleOnGroundHider()); - registerEvent(new DamageIndicatorManager()); - registerEvent(new ItemAbilityCooldown()); - registerEvent(new DungeonHighlightClickedBlocks()); - registerEvent(new DungeonMilestonesDisplay()); - registerEvent(new DungeonDeathCounter()); - registerEvent(new DungeonCleanEnd()); - registerEvent(new DungeonBossMessages()); - registerEvent(new DungeonBossHideDamageSplash()); - registerEvent(new TrophyFishMessages()); - registerEvent(new BazaarBestSellMethod()); - registerEvent(new AnvilCombineHelper()); - registerEvent(new SeaCreatureMessageShortener()); + loadModule(new BazaarOrderHelper()); + loadModule(new ChatFilter()); + loadModule(new PlayerChatModifier()); + loadModule(new DungeonChatFilter()); + loadModule(new HideNotClickableItems()); + loadModule(new ItemDisplayOverlayFeatures()); + loadModule(new CurrentPetDisplay()); + loadModule(new ExpBottleOnGroundHider()); + loadModule(new DamageIndicatorManager()); + loadModule(new ItemAbilityCooldown()); + loadModule(new DungeonHighlightClickedBlocks()); + loadModule(new DungeonMilestonesDisplay()); + loadModule(new DungeonDeathCounter()); + loadModule(new DungeonCleanEnd()); + loadModule(new DungeonBossMessages()); + loadModule(new DungeonBossHideDamageSplash()); + loadModule(new TrophyFishMessages()); + loadModule(new BazaarBestSellMethod()); + loadModule(new AnvilCombineHelper()); + loadModule(new SeaCreatureMessageShortener()); // registerEvent(new GriffinBurrowFinder()); - registerEvent(new AshfangFreezeCooldown()); - registerEvent(new AshfangNextResetCooldown()); - registerEvent(new SummoningSoulsName()); - registerEvent(new AshfangGravityOrbs()); - registerEvent(new AshfangBlazingSouls()); - registerEvent(new AshfangBlazes()); - registerEvent(new AshfangHideParticles()); - registerEvent(new AshfangHideDamageIndicator()); - registerEvent(new ItemStars()); - registerEvent(new MinionFeatures()); - registerEvent(new RealTime()); - registerEvent(new RngMeterInventory()); - registerEvent(new WikiCommand()); - registerEvent(new SummoningMobManager()); - registerEvent(new VoidlingExtremistColor()); - registerEvent(new MilleniaAgedBlazeColor()); - registerEvent(new CorruptedMobHighlight()); - registerEvent(new MarkedPlayerManager()); - registerEvent(new HighlightSlayerMiniboss()); - registerEvent(new PlayerDeathMessages()); - registerEvent(new HighlightDungeonDeathmite()); - registerEvent(new DungeonHideItems()); - registerEvent(new DungeonCopilot()); - registerEvent(new EndermanSlayerBeacon()); - registerEvent(new FireVeilWandParticles()); - registerEvent(new HideMobNames()); - registerEvent(new HideDamageSplash()); - registerEvent(new ThunderSparksHighlight()); - registerEvent(new BlazeSlayerPillar()); - registerEvent(new BlazeSlayerDaggerHelper()); - registerEvent(new HellionShieldHelper()); - registerEvent(new BlazeSlayerFirePitsWarning()); - registerEvent(new BlazeSlayerClearView()); - registerEvent(new PlayerChatFilter()); - registerEvent(new HideArmor()); - registerEvent(new SlayerQuestWarning()); - registerEvent(new StatsTuning()); - registerEvent(new NonGodPotEffectDisplay()); - registerEvent(new SoopyGuessBurrow()); - registerEvent(new GriffinBurrowHelper()); - registerEvent(new GriffinBurrowParticleFinder()); - registerEvent(new BurrowWarpHelper()); - registerEvent(new CollectionCounter()); - registerEvent(new HighlightBonzoMasks()); - registerEvent(new DungeonLevelColor()); - registerEvent(new BazaarCancelledBuyOrderClipboard()); - registerEvent(new CompactSplashPotionMessage()); - registerEvent(new CroesusUnopenedChestTracker()); - registerEvent(new CompactBingoChat()); + loadModule(new AshfangFreezeCooldown()); + loadModule(new AshfangNextResetCooldown()); + loadModule(new SummoningSoulsName()); + loadModule(new AshfangGravityOrbs()); + loadModule(new AshfangBlazingSouls()); + loadModule(new AshfangBlazes()); + loadModule(new AshfangHideParticles()); + loadModule(new AshfangHideDamageIndicator()); + loadModule(new ItemStars()); + loadModule(new MinionFeatures()); + loadModule(new RealTime()); + loadModule(new RngMeterInventory()); + loadModule(new WikiCommand()); + loadModule(new SummoningMobManager()); + loadModule(new VoidlingExtremistColor()); + loadModule(new MilleniaAgedBlazeColor()); + loadModule(new CorruptedMobHighlight()); + loadModule(new MarkedPlayerManager()); + loadModule(new HighlightSlayerMiniboss()); + loadModule(new PlayerDeathMessages()); + loadModule(new HighlightDungeonDeathmite()); + loadModule(new DungeonHideItems()); + loadModule(new DungeonCopilot()); + loadModule(new EndermanSlayerBeacon()); + loadModule(new FireVeilWandParticles()); + loadModule(new HideMobNames()); + loadModule(new HideDamageSplash()); + loadModule(new ThunderSparksHighlight()); + loadModule(new BlazeSlayerPillar()); + loadModule(new BlazeSlayerDaggerHelper()); + loadModule(new HellionShieldHelper()); + loadModule(new BlazeSlayerFirePitsWarning()); + loadModule(new BlazeSlayerClearView()); + loadModule(new PlayerChatFilter()); + loadModule(new HideArmor()); + loadModule(new SlayerQuestWarning()); + loadModule(new StatsTuning()); + loadModule(new NonGodPotEffectDisplay()); + loadModule(new SoopyGuessBurrow()); + loadModule(new GriffinBurrowHelper()); + loadModule(new GriffinBurrowParticleFinder()); + loadModule(new BurrowWarpHelper()); + loadModule(new CollectionCounter()); + loadModule(new HighlightBonzoMasks()); + loadModule(new DungeonLevelColor()); + loadModule(new BazaarCancelledBuyOrderClipboard()); + loadModule(new CompactSplashPotionMessage()); + loadModule(new CroesusUnopenedChestTracker()); + loadModule(new CompactBingoChat()); Commands.INSTANCE.init(); - registerEvent(new LorenzTest()); - registerEvent(new ButtonOnPause()); + loadModule(new LorenzTest()); + loadModule(new ButtonOnPause()); configManager = new ConfigManager(); configManager.firstLoad(); @@ -186,8 +186,8 @@ public class SkyHanniMod { repo.loadRepoInformation(); } - private void registerEvent(Object object) { - listenerClasses.add(object); + private void loadModule(Object object) { + modules.add(object); MinecraftForge.EVENT_BUS.register(object); } -- cgit From f5a2fa2f444817dfc67fc5c26d604fbf18ea6a6a Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 02:35:44 +0100 Subject: Renamed hypixel and skyblock. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index c59444b99..298b01686 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -86,7 +86,7 @@ public class SkyHanniMod { new BazaarApi(); loadModule(this); loadModule(new ChatManager()); - loadModule(new HypixelData()); + loadModule(new HyPixelData()); loadModule(new DungeonData()); loadModule(new ScoreboardData()); loadModule(new ApiDataLoader()); -- cgit From 8d1fa19a94a9820e2be5e7fe6a5b41371922f175 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 07:12:36 +0100 Subject: Add Brewing Stand Overlay. --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 1 + 1 file changed, 1 insertion(+) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 298b01686..62ff318ae 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -170,6 +170,7 @@ public class SkyHanniMod { loadModule(new CompactSplashPotionMessage()); loadModule(new CroesusUnopenedChestTracker()); loadModule(new CompactBingoChat()); + loadModule(new BrewingStandOverlay()); Commands.INSTANCE.init(); -- cgit From f365d1f6f2ebb3645ea7ad04736e98491781a284 Mon Sep 17 00:00:00 2001 From: hannibal2 <24389977+hannibal00212@users.noreply.github.com> Date: Sat, 7 Jan 2023 08:48:40 +0100 Subject: 0.14 --- src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java') diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index 62ff318ae..f6190fb10 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -62,7 +62,7 @@ import java.util.List; public class SkyHanniMod { public static final String MODID = "skyhanni"; - public static final String VERSION = "0.13.1"; + public static final String VERSION = "0.14"; public static Features feature; -- cgit