diff options
author | Lorenz <lo.scherf@gmail.com> | 2022-09-12 00:01:31 +0200 |
---|---|---|
committer | Lorenz <lo.scherf@gmail.com> | 2022-09-12 00:01:31 +0200 |
commit | c6b688f864c28fcd7c1cbcb248086e5caee7f230 (patch) | |
tree | dc3a1f86ae8fa46d520567a668dbff2be181a9ac /src/main/java/at/hannibal2/skyhanni | |
parent | 8e55249bf19a44d829d802f14d31668a12239a12 (diff) | |
download | skyhanni-c6b688f864c28fcd7c1cbcb248086e5caee7f230.tar.gz skyhanni-c6b688f864c28fcd7c1cbcb248086e5caee7f230.tar.bz2 skyhanni-c6b688f864c28fcd7c1cbcb248086e5caee7f230.zip |
edited features order and made better wording
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni')
19 files changed, 106 insertions, 78 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java index f44020e4b..b545c7c22 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.java @@ -18,15 +18,18 @@ import at.hannibal2.skyhanni.features.end.VoidlingExtremistColor; import at.hannibal2.skyhanni.features.fishing.SeaCreatureManager; import at.hannibal2.skyhanni.features.fishing.SeaCreatureMessageShortener; import at.hannibal2.skyhanni.features.fishing.TrophyFishMessages; -import at.hannibal2.skyhanni.features.items.HideNotClickableItems; -import at.hannibal2.skyhanni.features.items.ItemDisplayOverlayFeatures; -import at.hannibal2.skyhanni.features.items.ItemStars; -import at.hannibal2.skyhanni.features.items.RngMeterInventory; -import at.hannibal2.skyhanni.features.items.abilitycooldown.ItemAbilityCooldown; +import at.hannibal2.skyhanni.features.inventory.HideNotClickableItems; +import at.hannibal2.skyhanni.features.inventory.ItemDisplayOverlayFeatures; +import at.hannibal2.skyhanni.features.inventory.ItemStars; +import at.hannibal2.skyhanni.features.inventory.RngMeterInventory; +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.nether.ashfang.*; import at.hannibal2.skyhanni.features.slayer.EndermanSlayerBeacon; import at.hannibal2.skyhanni.features.slayer.HighlightSlayerMiniboss; +import at.hannibal2.skyhanni.features.summonings.SummoningMobManager; +import at.hannibal2.skyhanni.features.summonings.SummoningSoulsName; import at.hannibal2.skyhanni.test.LorenzTest; import at.hannibal2.skyhanni.utils.MinecraftConsoleFilter; import net.minecraft.client.Minecraft; diff --git a/src/main/java/at/hannibal2/skyhanni/config/Features.java b/src/main/java/at/hannibal2/skyhanni/config/Features.java index 8688ab603..3495e4d96 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Features.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Features.java @@ -77,7 +77,7 @@ public class Features extends Config { } if (runnableId.equals("summoningMobDisplay")) { - editOverlay(activeConfigCategory, 200, 16, abilities.summoningMobDisplayPos); + editOverlay(activeConfigCategory, 200, 16, summonings.summoningMobDisplayPos); return; } @@ -110,8 +110,12 @@ public class Features extends Config { public Inventory inventory = new Inventory(); @Expose - @Category(name = "Abilities", desc = "Stuff about abilities") - public Abilities abilities = new Abilities(); + @Category(name = "Item Abilities", desc = "Stuff about item abilities") + public ItemAbilities itemAbilities = new ItemAbilities(); + + @Expose + @Category(name = "Summonings", desc = "Ashfang fight in Crimson Isle") + public Summonings summonings = new Summonings(); @Expose @Category(name = "Ashfang", desc = "Ashfang fight in Crimson Isle") @@ -134,6 +138,10 @@ public class Features extends Config { public DamageIndicator damageIndicator = new DamageIndicator(); @Expose + @Category(name = "Slayer", desc = "Slayer Features.") + public Slayer slayer = new Slayer(); + + @Expose @Category(name = "Misc", desc = "Settings without a category.") public Misc misc = new Misc(); diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java index 0aa24cb28..ad0a32b74 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java @@ -4,6 +4,7 @@ import at.hannibal2.skyhanni.config.core.config.annotations.*; import com.google.gson.annotations.Expose; import java.util.ArrayList; +import java.util.Collections; import java.util.List; public class Inventory { @@ -47,7 +48,7 @@ public class Inventory { "\u00a7bCrimson Armor", } ) - public List<Integer> itemNumberAsStackSize = new ArrayList<>(3); + public List<Integer> itemNumberAsStackSize = new ArrayList<>(Collections.singletonList(3)); @Expose @ConfigOption(name = "Sack Name", desc = "Show an abbreviation of the Sack name.") diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java new file mode 100644 index 000000000..38cb20940 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/ItemAbilities.java @@ -0,0 +1,37 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.annotations.*; +import com.google.gson.annotations.Expose; + +public class ItemAbilities { + + @Expose + @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") + @ConfigEditorBoolean + public boolean itemAbilityCooldown = false; + + @Expose + @ConfigOption(name = "Ability Cooldown Background", desc = "Show the cooldown color of item abilities in the background.") + @ConfigEditorBoolean + public boolean itemAbilityCooldownBackground = false; + + @Expose + @ConfigOption(name = "Fire Veil", desc = "") + @ConfigEditorAccordion(id = 1) + public boolean fireVeilWand = false; + + @Expose + @ConfigOption(name = "Fire Veil Design", desc = "Changes the flame particles of the Fire Veil Wand ability") + @ConfigEditorDropdown(values = {"Particles", "Line", "Off"}) + @ConfigAccordionId(id = 1) + public int fireVeilWandDisplay = 0; + + @Expose + @ConfigOption( + name = "Line Color", + desc = "Changes the color of the Fire Veil Wand line" + ) + @ConfigEditorColour + @ConfigAccordionId(id = 1) + public String fireVeilWandDisplayColor = "0:245:255:85:85"; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java index cb9071510..6fa5b8b2d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java @@ -52,14 +52,4 @@ public class Misc { @ConfigOption(name = "Corrupted Mob Highlight", desc = "Highlight corrupted mobs in purple color") @ConfigEditorBoolean public boolean corruptedMobHighlight = false; - - @Expose - @ConfigOption(name = "Slayer Miniboss Highlight", desc = "Highlight slayer miniboss in blue color") - @ConfigEditorBoolean - public boolean slayerMinibossHighlight = false; - - @Expose - @ConfigOption(name = "Slayer Enderman Beacon", desc = "Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)") - @ConfigEditorBoolean - public boolean slayerEndermanBeacon = false; }
\ No newline at end of file diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java new file mode 100644 index 000000000..cac13b109 --- /dev/null +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java @@ -0,0 +1,18 @@ +package at.hannibal2.skyhanni.config.features; + +import at.hannibal2.skyhanni.config.core.config.annotations.ConfigEditorBoolean; +import at.hannibal2.skyhanni.config.core.config.annotations.ConfigOption; +import com.google.gson.annotations.Expose; + +public class Slayer { + + @Expose + @ConfigOption(name = "Slayer Miniboss Highlight", desc = "Highlight slayer miniboss in blue color") + @ConfigEditorBoolean + public boolean slayerMinibossHighlight = false; + + @Expose + @ConfigOption(name = "Slayer Enderman Beacon", desc = "Highlight the enderman slayer Yang Glyph (Beacon) in red color (supports beacon in hand and beacon flying)") + @ConfigEditorBoolean + public boolean slayerEndermanBeacon = false; +} diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java b/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java index feaf50a60..88253fb0a 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Abilities.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Summonings.java @@ -4,17 +4,7 @@ import at.hannibal2.skyhanni.config.core.config.Position; import at.hannibal2.skyhanni.config.core.config.annotations.*; import com.google.gson.annotations.Expose; -public class Abilities { - - @Expose - @ConfigOption(name = "Ability Cooldown", desc = "Show the cooldown of item abilities.") - @ConfigEditorBoolean - public boolean itemAbilityCooldown = false; - - @Expose - @ConfigOption(name = "Ability Cooldown Background", desc = "Show the cooldown color of item abilities in the background.") - @ConfigEditorBoolean - public boolean itemAbilityCooldownBackground = false; +public class Summonings { @Expose @ConfigOption(name = "Summoning Soul Display", desc = "Show the name of dropped summoning souls laying on the ground. " + @@ -50,24 +40,4 @@ public class Abilities { @ConfigEditorBoolean @ConfigAccordionId(id = 0) public boolean summoningMobColored = false; - - @Expose - @ConfigOption(name = "Fire Veil", desc = "") - @ConfigEditorAccordion(id = 1) - public boolean fireVeilWand = false; - - @Expose - @ConfigOption(name = "Fire Veil Design", desc = "Changes the flame particles of the Fire Veil Wand ability") - @ConfigEditorDropdown(values = {"Particles", "Line", "Off"}) - @ConfigAccordionId(id = 1) - public int fireVeilWandDisplay = 0; - - @Expose - @ConfigOption( - name = "Line Color", - desc = "Changes the color of the Fire Veil Wand line" - ) - @ConfigEditorColour - @ConfigAccordionId(id = 1) - public String fireVeilWandDisplayColor = "0:245:255:85:85"; } diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/VanillaItemManager.kt b/src/main/java/at/hannibal2/skyhanni/data/VanillaItemManager.kt index f138d9c23..a61548309 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/VanillaItemManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/data/VanillaItemManager.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items +package at.hannibal2.skyhanni.data import com.google.gson.GsonBuilder import com.google.gson.JsonObject diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/HideNotClickableItems.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt index 2829742dc..c9a27eac6 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/HideNotClickableItems.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/HideNotClickableItems.kt @@ -1,7 +1,8 @@ -package at.hannibal2.skyhanni.features.items +package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background +import at.hannibal2.skyhanni.data.VanillaItemManager import at.hannibal2.skyhanni.events.GuiContainerEvent import at.hannibal2.skyhanni.events.RepositoryReloadEvent import at.hannibal2.skyhanni.features.bazaar.BazaarApi diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/ItemDisplayOverlayFeatures.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt index bc4caf181..650d68a17 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/ItemDisplayOverlayFeatures.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemDisplayOverlayFeatures.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items +package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderItemEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/ItemStars.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt index 0301ddb53..0e503c052 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/ItemStars.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/ItemStars.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items +package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiRenderItemEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/RngMeterInventory.kt b/src/main/java/at/hannibal2/skyhanni/features/inventory/RngMeterInventory.kt index 19c4ea249..51d81c5af 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/RngMeterInventory.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/inventory/RngMeterInventory.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items +package at.hannibal2.skyhanni.features.inventory import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.GuiContainerEvent diff --git a/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt index d7af6d6c3..c2b9ced29 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/FireVeilWandParticles.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/FireVeilWandParticles.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features +package at.hannibal2.skyhanni.features.itemabilities import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.ItemClickInHandEvent @@ -21,7 +21,7 @@ class FireVeilWandParticles { @SubscribeEvent fun onChatPacket(event: PacketEvent.ReceiveEvent) { if (!LorenzUtils.inSkyblock) return - if (SkyHanniMod.feature.abilities.fireVeilWandDisplay == 0) return + if (SkyHanniMod.feature.itemAbilities.fireVeilWandDisplay == 0) return if (System.currentTimeMillis() > lastClick + 5_500) return val packet = event.packet @@ -53,11 +53,11 @@ class FireVeilWandParticles { @SubscribeEvent fun onRenderWorld(event: RenderWorldLastEvent) { if (!LorenzUtils.inSkyblock) return - if (SkyHanniMod.feature.abilities.fireVeilWandDisplay != 1) return + if (SkyHanniMod.feature.itemAbilities.fireVeilWandDisplay != 1) return if (System.currentTimeMillis() > lastClick + 5_500) return val color = - Color(SpecialColour.specialToChromaRGB(SkyHanniMod.feature.abilities.fireVeilWandDisplayColor), true) + Color(SpecialColour.specialToChromaRGB(SkyHanniMod.feature.itemAbilities.fireVeilWandDisplayColor), true) RenderUtils.drawCircle(Minecraft.getMinecraft().thePlayer, event.partialTicks, 3.5, color) } diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/ItemAbilityCooldown.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt index b2974837b..01bef358f 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/ItemAbilityCooldown.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/ItemAbilityCooldown.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items.abilitycooldown +package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.data.ItemRenderBackground.Companion.background @@ -54,7 +54,7 @@ class ItemAbilityCooldown { } private fun isEnabled(): Boolean { - return LorenzUtils.inSkyblock && SkyHanniMod.feature.abilities.itemAbilityCooldown + return LorenzUtils.inSkyblock && SkyHanniMod.feature.itemAbilities.itemAbilityCooldown } private fun click(ability: Ability) { @@ -111,7 +111,7 @@ class ItemAbilityCooldown { val color = itemText.color stackTip = color.getChatColor() + itemText.text - if (SkyHanniMod.feature.abilities.itemAbilityCooldownBackground) { + if (SkyHanniMod.feature.itemAbilities.itemAbilityCooldownBackground) { var opacity = 130 if (color == LorenzColor.GREEN) { opacity = 80 diff --git a/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/WitherImpactDetection.kt b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/WitherImpactDetection.kt index da0d5068c..5ad5a4bb0 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/items/abilitycooldown/WitherImpactDetection.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/itemabilities/abilitycooldown/WitherImpactDetection.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features.items.abilitycooldown +package at.hannibal2.skyhanni.features.itemabilities.abilitycooldown import at.hannibal2.skyhanni.events.PacketEvent import at.hannibal2.skyhanni.utils.LorenzUtils diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt index 22a7826a7..847a3ab15 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/EndermanSlayerBeacon.kt @@ -99,7 +99,7 @@ class EndermanSlayerBeacon { } } - private fun isEnabled(): Boolean = LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.slayerEndermanBeacon && + private fun isEnabled(): Boolean = LorenzUtils.inSkyblock && SkyHanniMod.feature.slayer.slayerEndermanBeacon && LorenzUtils.skyBlockIsland == "The End" && (DamageIndicatorManager.isBossSpawned(BossType.SLAYER_ENDERMAN_2) || DamageIndicatorManager.isBossSpawned(BossType.SLAYER_ENDERMAN_3) || diff --git a/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt b/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt index 5555af33c..55a66ee14 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/slayer/HighlightSlayerMiniboss.kt @@ -87,6 +87,6 @@ class HighlightSlayerMiniboss { } private fun isEnabled(): Boolean { - return LorenzUtils.inSkyblock && SkyHanniMod.feature.misc.slayerMinibossHighlight && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight + return LorenzUtils.inSkyblock && SkyHanniMod.feature.slayer.slayerMinibossHighlight && !LorenzUtils.inDungeons && !LorenzUtils.inKuudraFight } } diff --git a/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt index 0d272771d..4334cd0d1 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/SummoningMobManager.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningMobManager.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features +package at.hannibal2.skyhanni.features.summonings import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.events.LorenzChatEvent @@ -46,7 +46,7 @@ class SummoningMobManager { val message = event.message val matcher = spawnPatter.matcher(message) if (matcher.matches()) { - if (SkyHanniMod.feature.abilities.summoningMobDisplay) { + if (SkyHanniMod.feature.summonings.summoningMobDisplay) { event.blockedReason = "summoning_soul" } summoningsSpawned++ @@ -56,13 +56,13 @@ class SummoningMobManager { if (despawnPatter.matcher(message).matches() || message.startsWith("§c ☠ §r§7You ")) { despawned() - if (SkyHanniMod.feature.abilities.summoningMobDisplay && !message.contains("☠")) { + if (SkyHanniMod.feature.summonings.summoningMobDisplay && !message.contains("☠")) { event.blockedReason = "summoning_soul" } } if (message == "§cThe Seraph recalled your summoned ally!" || seraphRecallPattern.matcher(message).matches()) { despawned() - if (SkyHanniMod.feature.abilities.summoningMobDisplay) { + if (SkyHanniMod.feature.summonings.summoningMobDisplay) { event.blockedReason = "summoning_soul" } } @@ -74,7 +74,7 @@ class SummoningMobManager { fun onTick(event: TickEvent.ClientTickEvent) { if (!isEnabled()) return - if (SkyHanniMod.feature.abilities.summoningMobDisplay) { + if (SkyHanniMod.feature.summonings.summoningMobDisplay) { if (tick++ % 20 == 0) { updateData() } @@ -138,7 +138,7 @@ class SummoningMobManager { @SubscribeEvent fun renderOverlay(event: RenderGameOverlayEvent.Post) { - if (!SkyHanniMod.feature.abilities.summoningMobDisplay) return + if (!SkyHanniMod.feature.summonings.summoningMobDisplay) return if (summoningMobs.isEmpty()) return val list = mutableListOf<String>() @@ -150,7 +150,7 @@ class SummoningMobManager { id++ } - SkyHanniMod.feature.abilities.summoningMobDisplayPos.renderStrings(list) + SkyHanniMod.feature.summonings.summoningMobDisplayPos.renderStrings(list) } @SubscribeEvent @@ -161,7 +161,7 @@ class SummoningMobManager { @SubscribeEvent(priority = EventPriority.HIGH) fun onRenderLiving(event: RenderLivingEvent.Specials.Pre<EntityLivingBase>) { if (!LorenzUtils.inSkyblock) return - if (!SkyHanniMod.feature.abilities.summoningMobHideNametag) return + if (!SkyHanniMod.feature.summonings.summoningMobHideNametag) return val entity = event.entity if (entity !is EntityArmorStand) return @@ -173,7 +173,7 @@ class SummoningMobManager { @SubscribeEvent fun onRenderMobColored(event: RenderMobColoredEvent) { - if (SkyHanniMod.feature.abilities.summoningMobColored) { + if (SkyHanniMod.feature.summonings.summoningMobColored) { val entity = event.entity if (entity is EntityLiving && entity in summoningMobs.keys) { event.color = LorenzColor.GREEN.toColor().withAlpha(127) @@ -184,7 +184,7 @@ class SummoningMobManager { @SubscribeEvent fun onResetEntityHurtTime(event: ResetEntityHurtEvent) { val entity = event.entity - if (SkyHanniMod.feature.abilities.summoningMobColored && entity in summoningMobs.keys) { + if (SkyHanniMod.feature.summonings.summoningMobColored && entity in summoningMobs.keys) { event.shouldReset = true } } @@ -198,7 +198,7 @@ class SummoningMobManager { } private fun isEnabled(): Boolean { - return LorenzUtils.inSkyblock && (SkyHanniMod.feature.abilities.summoningMobDisplay || SkyHanniMod.feature.abilities.summoningMobHideNametag) + return LorenzUtils.inSkyblock && (SkyHanniMod.feature.summonings.summoningMobDisplay || SkyHanniMod.feature.summonings.summoningMobHideNametag) } class SummoningMob( diff --git a/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt index 59784f027..c0ea8540b 100644 --- a/src/main/java/at/hannibal2/skyhanni/features/SummoningSoulsName.kt +++ b/src/main/java/at/hannibal2/skyhanni/features/summonings/SummoningSoulsName.kt @@ -1,4 +1,4 @@ -package at.hannibal2.skyhanni.features +package at.hannibal2.skyhanni.features.summonings import at.hannibal2.skyhanni.SkyHanniMod import at.hannibal2.skyhanni.test.GriffinJavaUtils @@ -127,6 +127,6 @@ class SummoningSoulsName { } private fun isEnabled(): Boolean { - return LorenzUtils.inSkyblock && SkyHanniMod.feature.abilities.summoningSoulDisplay + return LorenzUtils.inSkyblock && SkyHanniMod.feature.summonings.summoningSoulDisplay } }
\ No newline at end of file |