diff options
| author | Kevin <92656833+kevinthegreat1@users.noreply.github.com> | 2023-10-15 13:46:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-15 13:46:21 -0400 |
| commit | a30a0f061c187b3e9700388b62b8de32d659dd12 (patch) | |
| tree | 038b9c60ae2f3d7e3ed92c1eef87442d5ae837e3 /src/main/java/de/hysky/skyblocker/config | |
| parent | a7912e665bfb1308166d4e496512037baa10b655 (diff) | |
| parent | 87f8ee2c0be3d87f800fa09064ea80de61812970 (diff) | |
| download | Skyblocker-a30a0f061c187b3e9700388b62b8de32d659dd12.tar.gz Skyblocker-a30a0f061c187b3e9700388b62b8de32d659dd12.tar.bz2 Skyblocker-a30a0f061c187b3e9700388b62b8de32d659dd12.zip | |
Merge pull request #355 from msg-programs/beeper-creams
Creeper beam puzzle solver
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/config')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java | 29 | ||||
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java | 20 |
2 files changed, 30 insertions, 19 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index cb51afdc..189c6af7 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -47,8 +47,8 @@ public class SkyblockerConfig { /* REGEX Explanation * "Pets" : simple match on letters - * "(?: \\(\\d+\\/\\d+\\))?" : optional match on the non-capturing group for the page in the format " ($number/$number)" - */ + * "(?: \\(\\d+\\/\\d+\\))?" : optional match on the non-capturing group for the page in the format " ($number/$number)" + */ @SerialEntry public QuickNavItem button3 = new QuickNavItem(true, new ItemData("bone"), "Pets(:? \\(\\d+\\/\\d+\\))?", "/pets"); @@ -332,16 +332,16 @@ public class SkyblockerConfig { public boolean enableCommandArgShortcuts = true; } - public static class QuiverWarning { - @SerialEntry - public boolean enableQuiverWarning = true; - - @SerialEntry - public boolean enableQuiverWarningInDungeons = true; - - @SerialEntry - public boolean enableQuiverWarningAfterDungeon = true; - } + public static class QuiverWarning { + @SerialEntry + public boolean enableQuiverWarning = true; + + @SerialEntry + public boolean enableQuiverWarningInDungeons = true; + + @SerialEntry + public boolean enableQuiverWarningAfterDungeon = true; + } public static class Hitbox { @SerialEntry @@ -526,7 +526,10 @@ public class SkyblockerConfig { public boolean solveThreeWeirdos = true; @SerialEntry - public boolean blazesolver = true; + public boolean blazeSolver = true; + + @SerialEntry + public boolean creeperSolver = true; @SerialEntry public boolean solveTrivia = true; diff --git a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java index ffd979eb..a9c0c26b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -240,11 +240,19 @@ public class DungeonsCategory { .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() - .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.blazesolver")) - .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.blazesolver.@Tooltip"))) - .binding(defaults.locations.dungeons.blazesolver, - () -> config.locations.dungeons.blazesolver, - newValue -> config.locations.dungeons.blazesolver = newValue) + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver.@Tooltip"))) + .binding(defaults.locations.dungeons.blazeSolver, + () -> config.locations.dungeons.blazeSolver, + newValue -> config.locations.dungeons.blazeSolver = newValue) + .controller(ConfigUtils::createBooleanController) + .build()) + .option(Option.<Boolean>createBuilder() + .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.creeperSolver")) + .description(OptionDescription.of(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.creeperSolver.@Tooltip"))) + .binding(defaults.locations.dungeons.creeperSolver, + () -> config.locations.dungeons.creeperSolver, + newValue -> config.locations.dungeons.creeperSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() @@ -262,7 +270,7 @@ public class DungeonsCategory { newValue -> config.locations.dungeons.solveTicTacToe = newValue) .controller(ConfigUtils::createBooleanController) .build()) - + //Livid Color .group(OptionGroup.createBuilder() .name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.lividColor")) |