diff options
27 files changed, 412 insertions, 317 deletions
diff --git a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt index 29746e638..c16efdb36 100644 --- a/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt +++ b/src/main/java/at/hannibal2/skyhanni/SkyHanniMod.kt @@ -60,7 +60,23 @@ import at.hannibal2.skyhanni.features.mobs.AshfangMinisNametagHider import at.hannibal2.skyhanni.features.mobs.MobHighlight import at.hannibal2.skyhanni.features.nether.ashfang.* import at.hannibal2.skyhanni.features.nether.reputationhelper.CrimsonIsleReputationHelper -import at.hannibal2.skyhanni.features.rift.* +import at.hannibal2.skyhanni.features.rift.RiftTimer +import at.hannibal2.skyhanni.features.rift.ShowMotesNpcSellPrice +import at.hannibal2.skyhanni.features.rift.area.RiftLarva +import at.hannibal2.skyhanni.features.rift.area.dreadfarm.RiftAgaricusCap +import at.hannibal2.skyhanni.features.rift.area.dreadfarm.VoltHighlighter +import at.hannibal2.skyhanni.features.rift.area.livingcave.LivingMetalSuitProgress +import at.hannibal2.skyhanni.features.rift.area.mirrorverse.DanceRoomHelper +import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftLavaMazeParkour +import at.hannibal2.skyhanni.features.rift.area.mirrorverse.RiftUpsideDownParkour +import at.hannibal2.skyhanni.features.rift.area.mirrorverse.TubulatorParkour +import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonHacking +import at.hannibal2.skyhanni.features.rift.area.wyldwoods.RiftOdonata +import at.hannibal2.skyhanni.features.rift.area.wyldwoods.ShyCruxWarnings +import at.hannibal2.skyhanni.features.rift.everywhere.CruxTalismanDisplay +import at.hannibal2.skyhanni.features.rift.everywhere.EnigmaSoulWaypoints +import at.hannibal2.skyhanni.features.rift.everywhere.HighlightRiftGuide +import at.hannibal2.skyhanni.features.rift.everywhere.RiftAPI import at.hannibal2.skyhanni.features.slayer.* import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerClearView import at.hannibal2.skyhanni.features.slayer.blaze.BlazeSlayerDaggerHelper diff --git a/src/main/java/at/hannibal2/skyhanni/config/Storage.java b/src/main/java/at/hannibal2/skyhanni/config/Storage.java index a1f9fbfb1..b55e410fe 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/Storage.java +++ b/src/main/java/at/hannibal2/skyhanni/config/Storage.java @@ -7,7 +7,7 @@ import at.hannibal2.skyhanni.features.garden.fortuneguide.FarmingItems; import at.hannibal2.skyhanni.features.garden.visitor.VisitorReward; import at.hannibal2.skyhanni.features.misc.FrozenTreasure; import at.hannibal2.skyhanni.features.misc.GhostCounter.Option; -import at.hannibal2.skyhanni.features.rift.KloonTerminal; +import at.hannibal2.skyhanni.features.rift.area.westvillage.KloonTerminal; import at.hannibal2.skyhanni.utils.LorenzVec; import com.google.gson.annotations.Expose; import net.minecraft.item.ItemStack; 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 f164750e3..702791dc0 100644 --- a/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java +++ b/src/main/java/at/hannibal2/skyhanni/config/features/RiftConfig.java @@ -34,40 +34,6 @@ public class RiftConfig { } - @ConfigOption(name = "Crux Warnings", desc = "") - @Accordion - @Expose - public CruxWarnings crux = new CruxWarnings(); - - public static class CruxWarnings { - - @Expose - @ConfigOption(name = "Shy Warning", desc = "Shows a warning when a shy is going to steal your time. " + - "Useful if you play without volume.") - @ConfigEditorBoolean - public boolean shyWarning = true; - - @Expose - @ConfigOption(name = "Volt Warning", desc = "Shows a warning while a volt is discharging lightning.") - @ConfigEditorBoolean - public boolean voltWarning = true; - - @Expose - @ConfigOption(name = "Volt Range Highlighter", desc = "Shows the area in which a Volt might strike lightning.") - @ConfigEditorBoolean - public boolean voltRange = true; - - @Expose - @ConfigOption(name = "Volt Range Highlighter Color", desc = "In which color should the volt range be highlighted?") - @ConfigEditorColour - public String voltColour = "0:60:0:0:255"; - - @Expose - @ConfigOption(name = "Volt mood color", desc = "Change the color of the volt enemy depending on their mood.") - @ConfigEditorBoolean - public boolean voltMoodMeter = false; - } - @ConfigOption(name = "Crux Talisman Progress", desc = "") @Accordion @Expose @@ -77,7 +43,7 @@ public class RiftConfig { @Expose @ConfigOption(name = "Crux Talisman Display", desc = "Display progress of the Crux Talisman on screen.") @ConfigEditorBoolean - public boolean enabled = true; + public boolean enabled = false; @Expose @ConfigOption(name = "Compact", desc = "Show a compacted version of the overlay when the talisman is maxed.") @@ -93,339 +59,452 @@ public class RiftConfig { public Position position = new Position(144, 139, false, true); } - @ConfigOption(name = "Larvas", desc = "") + @ConfigOption(name = "Enigma Soul Waypoints", desc = "") @Accordion @Expose - public LarvasConfig larvas = new LarvasConfig(); + public EnigmaSoulConfig enigmaSoulWaypoints = new EnigmaSoulConfig(); - public static class LarvasConfig { + public static class EnigmaSoulConfig { @Expose - @ConfigOption(name = "Highlight", desc = "Highlight §cLarvas on trees §7while holding a §eLarva Hook §7in the hand.") + @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.") @ConfigEditorBoolean - public boolean highlight = true; + public boolean enabled = true; @Expose - @ConfigOption(name = "Color", desc = "Color of the Larvas.") + @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.") @ConfigEditorColour - public String highlightColor = "0:120:13:49:255"; + public String color = "0:120:13:49:255"; } - @ConfigOption(name = "Odonatas", desc = "") + @ConfigOption(name = "Rift Areas", desc = "") @Accordion @Expose - public OdonataConfig odonata = new OdonataConfig(); + public RiftAreasConfig area = new RiftAreasConfig(); - public static class OdonataConfig { + public static class RiftAreasConfig { + @ConfigOption(name = "Wyld Woods", desc = "") + @Accordion @Expose - @ConfigOption(name = "Highlight", desc = "Highlight the small §cOdonatas §7flying around the trees while holding a " + - "§eEmpty Odonata Bottle §7in the hand.") - @ConfigEditorBoolean - public boolean highlight = true; + public WyldWoodsConfig wyldWoodsConfig = new WyldWoodsConfig(); - @Expose - @ConfigOption(name = "Color", desc = "Color of the Odonatas.") - @ConfigEditorColour - public String highlightColor = "0:120:13:49:255"; + public static class WyldWoodsConfig { - } + @Expose + @ConfigOption(name = "Shy Crux Warning", desc = "Shows a warning when a Shy Crux is going to steal your time. " + + "Useful if you play without volume.") + @ConfigEditorBoolean + public boolean shyWarning = true; - @ConfigOption(name = "Enigma Soul Waypoints", desc = "") - @Accordion - @Expose - public EnigmaSoulConfig enigmaSoulWaypoints = new EnigmaSoulConfig(); + @ConfigOption(name = "Larvas", desc = "") + @Accordion + @Expose + public LarvasConfig larvas = new LarvasConfig(); - public static class EnigmaSoulConfig { + public static class LarvasConfig { - @Expose - @ConfigOption(name = "Enabled", desc = "Click on Enigma Souls in Rift Guides to highlight their location.") - @ConfigEditorBoolean - public boolean enabled = true; + @Expose + @ConfigOption(name = "Highlight", desc = "Highlight §cLarvas on trees §7while holding a §eLarva Hook §7in the hand.") + @ConfigEditorBoolean + public boolean highlight = true; - @Expose - @ConfigOption(name = "Color", desc = "Color of the Enigma Souls.") - @ConfigEditorColour - public String color = "0:120:13:49:255"; + @Expose + @ConfigOption(name = "Color", desc = "Color of the Larvas.") + @ConfigEditorColour + public String highlightColor = "0:120:13:49:255"; - } + } - @Expose - @ConfigOption(name = "Highlight Guide", desc = "Highlight things to do in the Rift Guide.") - @ConfigEditorBoolean - public boolean highlightGuide = true; + @ConfigOption(name = "Odonatas", desc = "") + @Accordion + @Expose + public OdonataConfig odonata = new OdonataConfig(); - @Expose - @ConfigOption(name = "Agaricus Cap", desc = "Counts down the time until §eAgaricus Cap (Mushroom) " + - "§7changes color from brown to red and is breakable.") - @ConfigEditorBoolean - public boolean agaricusCap = true; + public static class OdonataConfig { - @ConfigOption(name = "Mirror Verse", desc = "") - @Accordion - @Expose - public MirrorVerse mirrorVerse = new MirrorVerse(); + @Expose + @ConfigOption(name = "Highlight", desc = "Highlight the small §cOdonatas §7flying around the trees while holding a " + + "§eEmpty Odonata Bottle §7in the hand.") + @ConfigEditorBoolean + public boolean highlight = true; - public static class MirrorVerse { + @Expose + @ConfigOption(name = "Color", desc = "Color of the Odonatas.") + @ConfigEditorColour + public String highlightColor = "0:120:13:49:255"; + + } + } - @ConfigOption(name = "Lava Maze", desc = "") + @ConfigOption(name = "West Village", desc = "") @Accordion @Expose - public LavaMazeConfig lavaMazeConfig = new LavaMazeConfig(); - public static class LavaMazeConfig { + public WestVillageConfig westVillageConfig = new WestVillageConfig(); - @Expose - @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the mirror verse by showing the correct way.") - @ConfigEditorBoolean - public boolean enabled = true; + public static class WestVillageConfig { + @ConfigOption(name = "Kloon Hacking", desc = "") + @Accordion @Expose - @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.") - @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1) - public Property<Integer> lookAhead = Property.of(3); + public KloonHacking hacking = new KloonHacking(); - @Expose - @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.") - @ConfigEditorBoolean - public Property<Boolean> rainbowColor = Property.of(true); + public static class KloonHacking { - @Expose - @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.") - @ConfigEditorColour - public Property<String> monochromeColor = Property.of("0:60:0:0:255"); + @Expose + @ConfigOption(name = "Hacking Solver", desc = "Highlights the correct button to click in the hacking inventory.") + @ConfigEditorBoolean + public boolean solver = true; - @Expose - @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.") - @ConfigEditorBoolean - public boolean hidePlayers = false; - } + @Expose + @ConfigOption(name = "Color Guide", desc = "Tells you which colour to pick.") + @ConfigEditorBoolean + public boolean colour = true; + @Expose + @ConfigOption(name = "Terminal Waypoints", desc = "While wearing the helmet, waypoints will appear at each terminal location.") + @ConfigEditorBoolean + public boolean waypoints = true; + } + } - @ConfigOption(name = "Upside Down Parkour", desc = "") - @Accordion @Expose - public UpsideDownParkour upsideDownParkour = new UpsideDownParkour(); - public static class UpsideDownParkour { + @ConfigOption(name = "Dreadfarm", desc = "") + @Accordion + public DreadfarmConfig dreadfarmConfig = new DreadfarmConfig(); + public static class DreadfarmConfig { @Expose - @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the mirror verse by showing the correct way.") + @ConfigOption(name = "Agaricus Cap", desc = "Counts down the time until §eAgaricus Cap (Mushroom) " + + "§7changes color from brown to red and is breakable.") @ConfigEditorBoolean - public boolean enabled = true; + public boolean agaricusCap = true; + @ConfigOption(name = "Volt Crux", desc = "") + @Accordion @Expose - @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.") - @ConfigEditorSlider(minStep = 1, maxValue = 9, minValue = 1) - public Property<Integer> lookAhead = Property.of(3); + public VoltCruxConfig voltCrux = new VoltCruxConfig(); - @Expose - @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.") - @ConfigEditorBoolean - public boolean outline = true; + public static class VoltCruxConfig { - @Expose - @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.") - @ConfigEditorBoolean - public Property<Boolean> rainbowColor = Property.of(true); + @Expose + @ConfigOption(name = "Volt Warning", desc = "Shows a warning while a volt is discharging lightning.") + @ConfigEditorBoolean + public boolean voltWarning = true; - @Expose - @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.") - @ConfigEditorColour - public Property<String> monochromeColor = Property.of("0:60:0:0:255"); + @Expose + @ConfigOption(name = "Volt Range Highlighter", desc = "Shows the area in which a Volt might strike lightning.") + @ConfigEditorBoolean + public boolean voltRange = true; - @Expose - @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the upside down parkour.") - @ConfigEditorBoolean - public boolean hidePlayers = false; - } + @Expose + @ConfigOption(name = "Volt Range Highlighter Color", desc = "In which color should the volt range be highlighted?") + @ConfigEditorColour + public String voltColour = "0:60:0:0:255"; + @Expose + @ConfigOption(name = "Volt mood color", desc = "Change the color of the volt enemy depending on their mood.") + @ConfigEditorBoolean + public boolean voltMoodMeter = false; + } + } - @ConfigOption(name = "Dance Room Helper", desc = "") + @ConfigOption(name = "Mirror Verse", desc = "") @Accordion @Expose - public DanceRoomHelper danceRoomHelper = new DanceRoomHelper(); - public static class DanceRoomHelper { + public MirrorVerse mirrorVerseConfig = new MirrorVerse(); - @Expose - @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the mirror verse by showing multiple tasks at once.") - @ConfigEditorBoolean - public boolean enabled = false; + public static class MirrorVerse { + @ConfigOption(name = "Lava Maze", desc = "") + @Accordion @Expose - @ConfigOption(name = "Lines to show", desc = "How many tasks you should see.") - @ConfigEditorSlider(minStep = 1, maxValue = 49, minValue = 1) - public int lineToShow = 3; + public LavaMazeConfig lavaMazeConfig = new LavaMazeConfig(); - @Expose - @ConfigOption(name = "Space", desc = "Change the space between each line.") - @ConfigEditorSlider(minStep = 1, maxValue = 10, minValue = -5) - public int extraSpace = 0; + public static class LavaMazeConfig { - @Expose - @ConfigOption(name = "Hide others players", desc = "Hide other players inside the dance room.") - @ConfigEditorBoolean - public boolean hidePlayers = false; + @Expose + @ConfigOption(name = "Enabled", desc = "Helps solving the lava maze in the mirror verse by showing the correct way.") + @ConfigEditorBoolean + public boolean enabled = true; + + @Expose + @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.") + @ConfigEditorSlider(minStep = 1, maxValue = 30, minValue = 1) + public Property<Integer> lookAhead = Property.of(3); + + @Expose + @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.") + @ConfigEditorBoolean + public Property<Boolean> rainbowColor = Property.of(true); + + @Expose + @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.") + @ConfigEditorColour + public Property<String> monochromeColor = Property.of("0:60:0:0:255"); + + @Expose + @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the lava maze.") + @ConfigEditorBoolean + public boolean hidePlayers = false; + } - @Expose - @ConfigOption(name = "Hide Title", desc = "Hide Instructions, \"§aIt's happening!\" §7and \"§aKeep it up!\" §7titles.") - @ConfigEditorBoolean - public boolean hideOriginalTitle = false; + @ConfigOption(name = "Upside Down Parkour", desc = "") + @Accordion @Expose - @ConfigOption(name = "Formatting", desc = "") + public UpsideDownParkour upsideDownParkour = new UpsideDownParkour(); + + public static class UpsideDownParkour { + + @Expose + @ConfigOption(name = "Enabled", desc = "Helps solving the upside down parkour in the mirror verse by showing the correct way.") + @ConfigEditorBoolean + public boolean enabled = true; + + @Expose + @ConfigOption(name = "Look Ahead", desc = "Change how many platforms should be shown in front of you.") + @ConfigEditorSlider(minStep = 1, maxValue = 9, minValue = 1) + public Property<Integer> lookAhead = Property.of(3); + + @Expose + @ConfigOption(name = "Outline", desc = "Outlines the top edge of the platforms.") + @ConfigEditorBoolean + public boolean outline = true; + + @Expose + @ConfigOption(name = "Rainbow Color", desc = "Show the rainbow color effect instead of a boring monochrome.") + @ConfigEditorBoolean + public Property<Boolean> rainbowColor = Property.of(true); + + @Expose + @ConfigOption(name = "Monochrome Color", desc = "Set a boring monochrome color for the parkour platforms.") + @ConfigEditorColour + public Property<String> monochromeColor = Property.of("0:60:0:0:255"); + + @Expose + @ConfigOption(name = "Hide others players", desc = "Hide other players while doing the upside down parkour.") + @ConfigEditorBoolean + public boolean hidePlayers = false; + } + + + @ConfigOption(name = "Dance Room Helper", desc = "") @Accordion - public DanceRoomFormatting danceRoomFormatting = new DanceRoomFormatting(); + @Expose + public DanceRoomHelper danceRoomHelper = new DanceRoomHelper(); - public static class DanceRoomFormatting { + public static class DanceRoomHelper { @Expose - @ConfigOption(name = "Now", desc = "Formatting for \"Now:\"") - @ConfigEditorText - public String now = "&7Now:"; + @ConfigOption(name = "Enabled", desc = "Helps to solve the dance room in the mirror verse by showing multiple tasks at once.") + @ConfigEditorBoolean + public boolean enabled = false; @Expose - @ConfigOption(name = "Next", desc = "Formatting for \"Next:\"") - @ConfigEditorText - public String next = "&7Next:"; + @ConfigOption(name = "Lines to show", desc = "How many tasks you should see.") + @ConfigEditorSlider(minStep = 1, maxValue = 49, minValue = 1) + public int lineToShow = 3; @Expose - @ConfigOption(name = "Later", desc = "Formatting for \"Later:\"") - @ConfigEditorText - public String later = "&7Later:"; + @ConfigOption(name = "Space", desc = "Change the space between each line.") + @ConfigEditorSlider(minStep = 1, maxValue = 10, minValue = -5) + public int extraSpace = 0; @Expose - @ConfigOption(name = "Color Option", desc = "") - @Accordion - public Color color = new Color(); - public static class Color { - @Expose - @ConfigOption(name = "Move", desc = "Color for the Move instruction") - @ConfigEditorText - public String move = "&e"; + @ConfigOption(name = "Hide others players", desc = "Hide other players inside the dance room.") + @ConfigEditorBoolean + public boolean hidePlayers = false; - @Expose - @ConfigOption(name = "Stand", desc = "Color for the Stand instruction") - @ConfigEditorText - public String stand = "&e"; + @Expose + @ConfigOption(name = "Hide Title", desc = "Hide Instructions, \"§aIt's happening!\" §7and \"§aKeep it up!\" §7titles.") + @ConfigEditorBoolean + public boolean hideOriginalTitle = false; - @Expose - @ConfigOption(name = "Sneak", desc = "Color for the Sneak instruction") - @ConfigEditorText - public String sneak = "&5"; + @Expose + @ConfigOption(name = "Formatting", desc = "") + @Accordion + public DanceRoomFormatting danceRoomFormatting = new DanceRoomFormatting(); + + public static class DanceRoomFormatting { @Expose - @ConfigOption(name = "Jump", desc = "Color for the Jump instruction") + @ConfigOption(name = "Now", desc = "Formatting for \"Now:\"") @ConfigEditorText - public String jump = "&b"; + public String now = "&7Now:"; @Expose - @ConfigOption(name = "Punch", desc = "Color for the Punch instruction") + @ConfigOption(name = "Next", desc = "Formatting for \"Next:\"") @ConfigEditorText - public String punch = "&d"; + public String next = "&7Next:"; @Expose - @ConfigOption(name = "Countdown", desc = "Color for the Countdown") + @ConfigOption(name = "Later", desc = "Formatting for \"Later:\"") @ConfigEditorText - public String countdown = "&f"; + public String later = "&7Later:"; @Expose - @ConfigOption(name = "Default", desc = "Fallback color") - @ConfigEditorText - public String fallback = "&f"; + @ConfigOption(name = "Color Option", desc = "") + @Accordion + public Color color = new Color(); + + public static class Color { + @Expose + @ConfigOption(name = "Move", desc = "Color for the Move instruction") + @ConfigEditorText + public String move = "&e"; + + @Expose + @ConfigOption(name = "Stand", desc = "Color for the Stand instruction") + @ConfigEditorText + public String stand = "&e"; + + @Expose + @ConfigOption(name = "Sneak", desc = "Color for the Sneak instruction") + @ConfigEditorText + public String sneak = "&5"; + + @Expose + @ConfigOption(name = "Jump", desc = "Color for the Jump instruction") + @ConfigEditorText + public String jump = "&b"; + + @Expose + @ConfigOption(name = "Punch", desc = "Color for the Punch instruction") + @ConfigEditorText + public String punch = "&d"; + + @Expose + @ConfigOption(name = "Countdown", desc = "Color for the Countdown") + @ConfigEditorText + public String countdown = "&f"; + + @Expose + @ConfigOption(name = "Default", desc = "Fallback color") + @ConfigEditorText + public String fallback = "&f"; + } } + + @Expose + public Position position = new Position(442, 239, false, true); } + + @ConfigOption(name = "Tubulator", desc = "") + @Accordion @Expose - public Position position = new Position(442, 239, false, true); - } + public TubulatorConfig tubulatorConfig = new TubulatorConfig(); + public static class TubulatorConfig { - @ConfigOption(name = "Tubulator", desc = "") - @Accordion - @Expose - public TubulatorConfig tubulatorConfig = new TubulatorConfig(); - public static class TubulatorConfig { - - @Expose - @ConfigOption(name = "Enabled", desc = "Highlights the location of the invisible Tubulator blocks (Laser Parkour).") - @ConfigEditorBoolean - public boolean enabled = true; + @Expose + @ConfigOption(name = "Enabled", desc = "Highlights the location of the invisible Tubulator blocks (Laser Parkour).") + @ConfigEditorBoolean + |