summaryrefslogtreecommitdiff
path: root/src/main/java/at/hannibal2/skyhanni/config
diff options
context:
space:
mode:
authorLorenz <lo.scherf@gmail.com>2022-08-15 12:55:49 +0200
committerLorenz <lo.scherf@gmail.com>2022-08-15 12:55:49 +0200
commite0f6fc1b4f0211a7bcdf42b5f579600889efd159 (patch)
tree65de97c4c1a7d6877328acffdccd54409d0826e8 /src/main/java/at/hannibal2/skyhanni/config
parent6fbbcb5a7ce630646ca374d811e480e7719a2641 (diff)
downloadskyhanni-e0f6fc1b4f0211a7bcdf42b5f579600889efd159.tar.gz
skyhanni-e0f6fc1b4f0211a7bcdf42b5f579600889efd159.tar.bz2
skyhanni-e0f6fc1b4f0211a7bcdf42b5f579600889efd159.zip
changed damage indicator chat message, added toggle in config
Diffstat (limited to 'src/main/java/at/hannibal2/skyhanni/config')
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java14
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/features/Misc.java18
-rw-r--r--src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java2
3 files changed, 22 insertions, 12 deletions
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 884f245ea..d234145aa 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Inventory.java
@@ -15,43 +15,43 @@ public class Inventory {
@Expose
@ConfigOption(name = "Item number as stack size", desc = "")
- @ConfigEditorAccordion(id = 2)
+ @ConfigEditorAccordion(id = 1)
public boolean filterTypes = false;
@Expose
@ConfigOption(name = "Master Star Number", desc = "Show the Tier of the Master Star.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayMasterStarNumber = false;
@Expose
@ConfigOption(name = "Master Skull Number", desc = "Show the tier of the Master Skull accessory.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayMasterSkullNumber = false;
@Expose
@ConfigOption(name = "Dungeon Head Floor", desc = "Show the correct floor for golden and diamond heads.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayDungeonHeadFloor = false;
@Expose
@ConfigOption(name = "New Year Cake", desc = "Show the Number of the Year of New Year Cakes.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayNewYearCakeNumber = false;
@Expose
@ConfigOption(name = "Pet Level", desc = "Show the level of the pet when not maxed.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayPetLevel = false;
@Expose
@ConfigOption(name = "Minion Tier", desc = "Show the Minion Tier over Items.")
@ConfigEditorBoolean
- @ConfigAccordionId(id = 2)
+ @ConfigAccordionId(id = 1)
public boolean displayMinionTier = false;
@Expose
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 a98f91a3e..5328ba1c1 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/features/Misc.java
@@ -1,19 +1,29 @@
package at.hannibal2.skyhanni.config.features;
import at.hannibal2.skyhanni.config.gui.core.config.Position;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorBoolean;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigEditorButton;
-import at.hannibal2.skyhanni.config.gui.core.config.annotations.ConfigOption;
+import at.hannibal2.skyhanni.config.gui.core.config.annotations.*;
import com.google.gson.annotations.Expose;
public class Misc {
@Expose
- @ConfigOption(name = "Damage Indicator", desc = "Show the missing health of a boss in the dungeon, of slayer bosses and other bosses and the cooldown time until the boss becomes attackable.")
+ @ConfigOption(name = "Damage Indicator", desc = "")
+ @ConfigEditorAccordion(id = 1)
+ public boolean damageIndicatorInternal = false;
+
+ @Expose
+ @ConfigOption(name = "Enabled", desc = "Show the missing health of a boss.")
@ConfigEditorBoolean
+ @ConfigAccordionId(id = 1)
public boolean damageIndicator = false;
@Expose
+ @ConfigOption(name = "Healing Chat Message", desc = "Sends a chat message when a boss heals himself.")
+ @ConfigEditorBoolean
+ @ConfigAccordionId(id = 1)
+ public boolean damageIndicatorHealingMessage = false;
+
+ @Expose
@ConfigOption(name = "Pet Display", desc = "Show the currently active pet.")
@ConfigEditorBoolean
public boolean petDisplay = false;
diff --git a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
index fe3a6f791..411e5b14d 100644
--- a/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
+++ b/src/main/java/at/hannibal2/skyhanni/config/gui/commands/Commands.java
@@ -62,7 +62,7 @@ public class Commands {
"testhanni",
new SimpleCommand.ProcessCommandRunnable() {
public void processCommand(ICommandSender sender, String[] args) {
- LorenzTest.Companion.testCommand();
+ LorenzTest.Companion.testCommand(args);
}
}
)