From 635d6cee39cf710286364c47d3419bd6e923a513 Mon Sep 17 00:00:00 2001 From: HiZe_ Date: Tue, 11 Jul 2023 10:38:22 +0200 Subject: Merge pull request #302 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feature * save * changed things, fixed things * fixes * Merge branch 'beta' of https://github.com/hannibal002/skyhanni into h… * typo * changed how seeThrough work * moved function to entityutils * updated desc in config * changed value * Blood Ichor highlight * added killer spring highlight * warning for twinclaws * forgot to add config for twinclaws * renamed class * changed twinclaws title to be bold, moved it up a bit and extended ti… * always highlight co-op boss * save * config option for blood ichor beam * checking distance before processing * update * fixes * small fixes * changed detection from 20 to 15 blocs * merged beta * fixed crash with conflicting class name * moved everything in its own config, add steak title for each section * wording * Merge branch 'beta' into highlight_own_vampire * Moving vampire config into slayer category * Fixed one thing * IntelliJ auto formattings * IntelliJ auto formattings * Unnecessary check * code cleanup * parameter is already default false * moved distance check * merged beta * Fixed shouldRender --- .../skyhanni/config/features/RiftConfig.java | 1 + .../hannibal2/skyhanni/config/features/Slayer.java | 158 ++++++++++++++++++++- 2 files changed, 158 insertions(+), 1 deletion(-) (limited to 'src/main/java/at/hannibal2/skyhanni/config') diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java index 175a60c02..62f551490 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java @@ -447,6 +447,7 @@ public class RiftConfig { public static class LivingCaveConfig { + @Expose @ConfigOption(name = "Living Metal Suit Progress", desc = "") @Accordion diff --git a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java index 852b54970..36a4c6e3d 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/Slayer.java @@ -7,7 +7,7 @@ import io.github.moulberry.moulconfig.annotations.*; public class Slayer { @Expose - @ConfigOption(name = "Enderman", desc = "") + @ConfigOption(name = "Enderman Slayer Features", desc = "") @ConfigEditorAccordion(id = 0) public boolean enderman = false; @@ -82,6 +82,162 @@ public class Slayer { @ConfigAccordionId(id = 1) public boolean blazeClearView = false; + @Expose + @ConfigOption(name = "Vampire Slayer Features", desc = "") + @Accordion + public VampireSlayerConfig vampireSlayerConfig = new VampireSlayerConfig(); + + public static class VampireSlayerConfig { + + @Expose + @ConfigOption(name = "Your Boss", desc = "") + @Accordion + public OwnBoss ownBoss = new OwnBoss(); + + public static class OwnBoss { + + @Expose + @ConfigOption(name = "Highlight your boss", desc = "Highlight your own vampire slayer boss.") + @ConfigEditorBoolean + public boolean highlight = true; + + @Expose + @ConfigOption(name = "Highlight Color", desc = "What color to highlight the boss in.") + @ConfigEditorColour + public String highlightColor = "0:249:0:255:88"; + + @Expose + @ConfigOption(name = "Steak Alert", desc = "Show a title when you can steak your boss.") + @ConfigEditorBoolean + public boolean steakAlert = true; + + @Expose + @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.\nWork on others highlighted people boss.") + @ConfigEditorBoolean + public boolean twinClawsTitle = true; + } + + @Expose + @ConfigOption(name = "Others Boss", desc = "") + @Accordion + public OthersBoss othersBoss = new OthersBoss(); + + public static class OthersBoss { + + @Expose + @ConfigOption(name = "Highlight Others people boss", desc = "Highlight others players boss.\nYou need to hit them first.") + @ConfigEditorBoolean + public boolean highlight = true; + + @Expose + @ConfigOption(name = "Highlight Color", desc = "What color to highlight the boss in.") + @ConfigEditorColour + public String highlightColor = "0:249:0:255:88"; + + @Expose + @ConfigOption(name = "Steak Alert", desc = "Show a title when you can steak the boss.") + @ConfigEditorBoolean + public boolean steakAlert = true; + + @Expose + @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.") + @ConfigEditorBoolean + public boolean twinClawsTitle = true; + } + + @Expose + @ConfigOption(name = "Co-op Boss", desc = "") + @Accordion + public CoopBossHighlight coopsBossHighlight = new CoopBossHighlight(); + + public static class CoopBossHighlight { + @Expose + @ConfigOption(name = "Highlight Co-op Boss", desc = "Highlight boss of your co-op member.") + @ConfigEditorBoolean + public boolean highlight = true; + + @Expose + @ConfigOption(name = "Highlight Color", desc = "What color to highlight the boss in.") + @ConfigEditorColour + public String highlightColor = "0:249:0:255:88"; + + @Expose + @ConfigOption(name = "Co-op Members", desc = "Add your co-op member here.\n§eFormat: §7Name1,Name2,Name3") + @ConfigEditorText + public String coopMembers = ""; + + @Expose + @ConfigOption(name = "Steak Alert", desc = "Show a title when you can steak the boss.") + @ConfigEditorBoolean + public boolean steakAlert = true; + + @Expose + @ConfigOption(name = "Twinclaws warning", desc = "Send a title when Twinclaws is about to happen.") + @ConfigEditorBoolean + public boolean twinClawsTitle = true; + } + + @Expose + @ConfigOption(name = "Transparency", desc = "Choose the transparency of the color.") + @ConfigEditorSlider(minStep = 1, minValue = 1, maxValue = 250) + public int withAlpha = 80; + + @Expose + @ConfigOption(name = "See Through Blocs", desc = "Highlight even when behind others mobs/players") + @ConfigEditorBoolean + public boolean seeThrough = false; + + @Expose + @ConfigOption(name = "Low Health", desc = "Change color when the boss is below 20% health.") + @ConfigEditorBoolean + public boolean changeColorWhenCanSteak = true; + + @Expose + @ConfigOption(name = "Can use Steak Color", desc = "Color when the boss is below 20% health.") + @ConfigEditorColour + public String steakColor = "0:255:255:0:88"; + + + @Expose + @ConfigOption(name = "Blood Ichor", desc = "") + @Accordion + public BloodIchor bloodIchor = new BloodIchor(); + + public static class BloodIchor { + @Expose + @ConfigOption(name = "Highlight blood Ichor", desc = "Highlight the blood Ichor.") + @ConfigEditorBoolean + public boolean highlight = true; + + @Expose + @ConfigOption(name = "Beacon Beam", desc = "Render a beacon beam where the Blood Ichor is.") + @ConfigEditorBoolean + public boolean renderBeam = true; + + @Expose + @ConfigOption(name = "Color", desc = "Highlight color.") + @ConfigEditorColour + public String color = "0:199:100:0:88"; + } + + @Expose + @ConfigOption(name = "Killer Spring", desc = "") + @Accordion + public KillerSpring killerSpring = new KillerSpring(); + + public static class KillerSpring { + @Expose + @ConfigOption(name = "Highlight Killer Spring", desc = "Highlight the Killer Spring tower.") + @ConfigEditorBoolean + public boolean highlight = true; + + @Expose + @ConfigOption(name = "Color", desc = "Highlight color.") + @ConfigEditorColour + public String color = "0:199:100:0:88"; + } + } + @Expose @ConfigOption(name = "Item Profit Tracker", desc = "") @Accordion -- cgit