forked from hannibal002/SkyHanni
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/beta' into fork/ItsEmpa/ghost-counter-rework
# Conflicts: # src/main/java/at/hannibal2/skyhanni/config/commands/Commands.kt
- Loading branch information
Showing
18 changed files
with
562 additions
and
28 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
src/main/java/at/hannibal2/skyhanni/config/features/chat/StashConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| package at.hannibal2.skyhanni.config.features.chat; | ||
|
|
||
| import at.hannibal2.skyhanni.config.FeatureToggle; | ||
| import com.google.gson.annotations.Expose; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; | ||
|
|
||
| public class StashConfig { | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Stash Warnings", desc = "Compact warnings relating to items/materials in your stash.") | ||
| @ConfigEditorBoolean | ||
| @FeatureToggle | ||
| public boolean enabled = true; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Hide Duplicate Warnings", desc = "Hide duplicate warnings for previously reported stash counts.") | ||
| @ConfigEditorBoolean | ||
| public boolean hideDuplicateCounts = true; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Hide Low Warnings", desc = "Hide warnings with a total count below this number.") | ||
| @ConfigEditorSlider(minValue = 0, maxValue = 1000000, minStep = 100) | ||
| public int hideLowWarningsThreshold = 0; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Use /ViewStash", desc = "Use /viewstash [type] instead of /pickupstash.") | ||
| @ConfigEditorBoolean | ||
| public boolean useViewStash = false; | ||
| } |
46 changes: 46 additions & 0 deletions
46
src/main/java/at/hannibal2/skyhanni/config/features/mining/FlowstateHelperConfig.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package at.hannibal2.skyhanni.config.features.mining; | ||
|
|
||
| import at.hannibal2.skyhanni.config.FeatureToggle; | ||
| import at.hannibal2.skyhanni.config.core.config.Position; | ||
| import at.hannibal2.skyhanni.features.mining.FlowstateElements; | ||
| import com.google.gson.annotations.Expose; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorBoolean; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorDraggableList; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigEditorSlider; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigLink; | ||
| import io.github.notenoughupdates.moulconfig.annotations.ConfigOption; | ||
| import io.github.notenoughupdates.moulconfig.annotations.SearchTag; | ||
|
|
||
| import java.util.List; | ||
|
|
||
| public class FlowstateHelperConfig { | ||
| @Expose | ||
| @ConfigOption(name = "Enabled", desc = "Shows stats for the Flowstate enchantment on Mining Tools.") | ||
| @ConfigEditorBoolean | ||
| @FeatureToggle | ||
| public boolean enabled = false; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Appearance", desc = "Drag text to change the appearance.") | ||
| @ConfigEditorDraggableList() | ||
| public List<FlowstateElements> appearance = FlowstateElements.defaultOption; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Dynamic Color", desc = "Makes the timer's color dynamic.") | ||
| @ConfigEditorBoolean | ||
| public boolean colorfulTimer = false; | ||
|
|
||
| @Expose | ||
| @ConfigOption(name = "Auto Hide", desc = "Automatically hides the GUI after being idle, in seconds.") | ||
| @SearchTag("autohide") | ||
| @ConfigEditorSlider( | ||
| minValue = -1, | ||
| maxValue = 30, | ||
| minStep = 1 | ||
| ) | ||
| public int autoHide = 10; | ||
|
|
||
| @Expose | ||
| @ConfigLink(owner = FlowstateHelperConfig.class, field = "enabled") | ||
| public Position position = new Position(-110 , 9); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.