diff options
Diffstat (limited to 'src/main')
31 files changed, 156 insertions, 158 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java index 6bd32254..9970eec1 100644 --- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java @@ -14,7 +14,7 @@ public class SkyblockerConfig { public UIAndVisualsConfig uiAndVisuals = new UIAndVisualsConfig(); @SerialEntry - public HelperConfig helper = new HelperConfig(); + public HelperConfig helpers = new HelperConfig(); @SerialEntry public DungeonsConfig dungeons = new DungeonsConfig(); @@ -32,7 +32,7 @@ public class SkyblockerConfig { public OtherLocationsConfig otherLocations = new OtherLocationsConfig(); @SerialEntry - public SlayersConfig slayer = new SlayersConfig(); + public SlayersConfig slayers = new SlayersConfig(); @SerialEntry public ChatConfig chats = new ChatConfig(); 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 b1754bbd..d44ab490 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java @@ -100,69 +100,69 @@ public class DungeonsCategory { .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveTicTacToe")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveTicTacToe.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveTicTacToe, - () -> config.dungeons.puzzleSolver.solveTicTacToe, - newValue -> config.dungeons.puzzleSolver.solveTicTacToe = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveTicTacToe, + () -> config.dungeons.puzzleSolvers.solveTicTacToe, + newValue -> config.dungeons.puzzleSolvers.solveTicTacToe = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveThreeWeirdos")) - .binding(defaults.dungeons.puzzleSolver.solveThreeWeirdos, - () -> config.dungeons.puzzleSolver.solveThreeWeirdos, - newValue -> config.dungeons.puzzleSolver.solveThreeWeirdos = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveThreeWeirdos, + () -> config.dungeons.puzzleSolvers.solveThreeWeirdos, + newValue -> config.dungeons.puzzleSolvers.solveThreeWeirdos = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.creeperSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.creeperSolver.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.creeperSolver, - () -> config.dungeons.puzzleSolver.creeperSolver, - newValue -> config.dungeons.puzzleSolver.creeperSolver = newValue) + .binding(defaults.dungeons.puzzleSolvers.creeperSolver, + () -> config.dungeons.puzzleSolvers.creeperSolver, + newValue -> config.dungeons.puzzleSolvers.creeperSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveWaterboard")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveWaterboard.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveWaterboard, - () -> config.dungeons.puzzleSolver.solveWaterboard, - newValue -> config.dungeons.puzzleSolver.solveWaterboard = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveWaterboard, + () -> config.dungeons.puzzleSolvers.solveWaterboard, + newValue -> config.dungeons.puzzleSolvers.solveWaterboard = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.blazeSolver")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.blazeSolver.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.blazeSolver, - () -> config.dungeons.puzzleSolver.blazeSolver, - newValue -> config.dungeons.puzzleSolver.blazeSolver = newValue) + .binding(defaults.dungeons.puzzleSolvers.blazeSolver, + () -> config.dungeons.puzzleSolvers.blazeSolver, + newValue -> config.dungeons.puzzleSolvers.blazeSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveBoulder")) .description(OptionDescription.of(Text.translatable("skyblocker.config.dungeons.puzzle.solveBoulder.@Tooltip"))) - .binding(defaults.dungeons.puzzleSolver.solveBoulder, - () -> config.dungeons.puzzleSolver.solveBoulder, - newValue -> config.dungeons.puzzleSolver.solveBoulder = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveBoulder, + () -> config.dungeons.puzzleSolvers.solveBoulder, + newValue -> config.dungeons.puzzleSolvers.solveBoulder = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveIceFill")) - .binding(defaults.dungeons.puzzleSolver.solveIceFill, - () -> config.dungeons.puzzleSolver.solveIceFill, - newValue -> config.dungeons.puzzleSolver.solveIceFill = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveIceFill, + () -> config.dungeons.puzzleSolvers.solveIceFill, + newValue -> config.dungeons.puzzleSolvers.solveIceFill = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveSilverfish")) - .binding(defaults.dungeons.puzzleSolver.solveSilverfish, - () -> config.dungeons.puzzleSolver.solveSilverfish, - newValue -> config.dungeons.puzzleSolver.solveSilverfish = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveSilverfish, + () -> config.dungeons.puzzleSolvers.solveSilverfish, + newValue -> config.dungeons.puzzleSolvers.solveSilverfish = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.dungeons.puzzle.solveTrivia")) - .binding(defaults.dungeons.puzzleSolver.solveTrivia, - () -> config.dungeons.puzzleSolver.solveTrivia, - newValue -> config.dungeons.puzzleSolver.solveTrivia = newValue) + .binding(defaults.dungeons.puzzleSolvers.solveTrivia, + () -> config.dungeons.puzzleSolvers.solveTrivia, + newValue -> config.dungeons.puzzleSolvers.solveTrivia = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java index 29444e48..4d0202aa 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/HelperCategory.java @@ -18,9 +18,9 @@ public class HelperCategory { .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.enableNewYearCakesHelper")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.enableNewYearCakesHelper.@Tooltip"))) - .binding(defaults.helper.enableNewYearCakesHelper, - () -> config.helper.enableNewYearCakesHelper, - newValue -> config.helper.enableNewYearCakesHelper = newValue) + .binding(defaults.helpers.enableNewYearCakesHelper, + () -> config.helpers.enableNewYearCakesHelper, + newValue -> config.helpers.enableNewYearCakesHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) @@ -30,9 +30,9 @@ public class HelperCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.mythologicalRitual.enableMythologicalRitualHelper")) - .binding(defaults.helper.mythologicalRitual.enableMythologicalRitualHelper, - () -> config.helper.mythologicalRitual.enableMythologicalRitualHelper, - newValue -> config.helper.mythologicalRitual.enableMythologicalRitualHelper = newValue) + .binding(defaults.helpers.mythologicalRitual.enableMythologicalRitualHelper, + () -> config.helpers.mythologicalRitual.enableMythologicalRitualHelper, + newValue -> config.helpers.mythologicalRitual.enableMythologicalRitualHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -43,23 +43,23 @@ public class HelperCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableChronomatronSolver")) - .binding(defaults.helper.experiments.enableChronomatronSolver, - () -> config.helper.experiments.enableChronomatronSolver, - newValue -> config.helper.experiments.enableChronomatronSolver = newValue) + .binding(defaults.helpers.experiments.enableChronomatronSolver, + () -> config.helpers.experiments.enableChronomatronSolver, + newValue -> config.helpers.experiments.enableChronomatronSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableSuperpairsSolver")) - .binding(defaults.helper.experiments.enableSuperpairsSolver, - () -> config.helper.experiments.enableSuperpairsSolver, - newValue -> config.helper.experiments.enableSuperpairsSolver = newValue) + .binding(defaults.helpers.experiments.enableSuperpairsSolver, + () -> config.helpers.experiments.enableSuperpairsSolver, + newValue -> config.helpers.experiments.enableSuperpairsSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.experiments.enableUltrasequencerSolver")) - .binding(defaults.helper.experiments.enableUltrasequencerSolver, - () -> config.helper.experiments.enableUltrasequencerSolver, - newValue -> config.helper.experiments.enableUltrasequencerSolver = newValue) + .binding(defaults.helpers.experiments.enableUltrasequencerSolver, + () -> config.helpers.experiments.enableUltrasequencerSolver, + newValue -> config.helpers.experiments.enableUltrasequencerSolver = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -70,41 +70,41 @@ public class HelperCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.enableFishingHelper")) - .binding(defaults.helper.fishing.enableFishingHelper, - () -> config.helper.fishing.enableFishingHelper, - newValue -> config.helper.fishing.enableFishingHelper = newValue) + .binding(defaults.helpers.fishing.enableFishingHelper, + () -> config.helpers.fishing.enableFishingHelper, + newValue -> config.helpers.fishing.enableFishingHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.enableFishingTimer")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.enableFishingTimer.@Tooltip"))) - .binding(defaults.helper.fishing.enableFishingTimer, - () -> config.helper.fishing.enableFishingTimer, - newValue -> config.helper.fishing.enableFishingTimer = newValue) + .binding(defaults.helpers.fishing.enableFishingTimer, + () -> config.helpers.fishing.enableFishingTimer, + newValue -> config.helpers.fishing.enableFishingTimer = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.changeTimerColor")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.changeTimerColor.@Tooltip"))) - .binding(defaults.helper.fishing.changeTimerColor, - () -> config.helper.fishing.changeTimerColor, - newValue -> config.helper.fishing.changeTimerColor = newValue) + .binding(defaults.helpers.fishing.changeTimerColor, + () -> config.helpers.fishing.changeTimerColor, + newValue -> config.helpers.fishing.changeTimerColor = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.fishingTimerScale")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.fishingTimerScale.@Tooltip"))) - .binding(defaults.helper.fishing.fishingTimerScale, - () -> config.helper.fishing.fishingTimerScale, - newValue -> config.helper.fishing.fishingTimerScale = newValue) + .binding(defaults.helpers.fishing.fishingTimerScale, + () -> config.helpers.fishing.fishingTimerScale, + newValue -> config.helpers.fishing.fishingTimerScale = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fishing.hideOtherPlayers")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fishing.hideOtherPlayers.@Tooltip"))) - .binding(defaults.helper.fishing.hideOtherPlayersRods, - () -> config.helper.fishing.hideOtherPlayersRods, - newValue -> config.helper.fishing.hideOtherPlayersRods = newValue) + .binding(defaults.helpers.fishing.hideOtherPlayersRods, + () -> config.helpers.fishing.hideOtherPlayersRods, + newValue -> config.helpers.fishing.hideOtherPlayersRods = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -115,24 +115,24 @@ public class HelperCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.enableFairySoulsHelper")) - .binding(defaults.helper.fairySouls.enableFairySoulsHelper, - () -> config.helper.fairySouls.enableFairySoulsHelper, - newValue -> config.helper.fairySouls.enableFairySoulsHelper = newValue) + .binding(defaults.helpers.fairySouls.enableFairySoulsHelper, + () -> config.helpers.fairySouls.enableFairySoulsHelper, + newValue -> config.helpers.fairySouls.enableFairySoulsHelper = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.highlightFoundSouls")) - .binding(defaults.helper.fairySouls.highlightFoundSouls, - () -> config.helper.fairySouls.highlightFoundSouls, - newValue -> config.helper.fairySouls.highlightFoundSouls = newValue) + .binding(defaults.helpers.fairySouls.highlightFoundSouls, + () -> config.helpers.fairySouls.highlightFoundSouls, + newValue -> config.helpers.fairySouls.highlightFoundSouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls")) .description(OptionDescription.of(Text.translatable("skyblocker.config.helper.fairySouls.highlightOnlyNearbySouls.@Tooltip"))) - .binding(defaults.helper.fairySouls.highlightOnlyNearbySouls, - () -> config.helper.fairySouls.highlightOnlyNearbySouls, - newValue -> config.helper.fairySouls.highlightOnlyNearbySouls = newValue) + .binding(defaults.helpers.fairySouls.highlightOnlyNearbySouls, + () -> config.helpers.fairySouls.highlightOnlyNearbySouls, + newValue -> config.helpers.fairySouls.highlightOnlyNearbySouls = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java index 8bb22c14..0a65aa3b 100644 --- a/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java +++ b/src/main/java/de/hysky/skyblocker/config/categories/SlayersCategory.java @@ -23,23 +23,23 @@ public class SlayersCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.enableYangGlyphsNotification")) - .binding(defaults.slayer.endermanSlayer.enableYangGlyphsNotification, - () -> config.slayer.endermanSlayer.enableYangGlyphsNotification, - newValue -> config.slayer.endermanSlayer.enableYangGlyphsNotification = newValue) + .binding(defaults.slayers.endermanSlayer.enableYangGlyphsNotification, + () -> config.slayers.endermanSlayer.enableYangGlyphsNotification, + newValue -> config.slayers.endermanSlayer.enableYangGlyphsNotification = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightBeacons")) - .binding(defaults.slayer.endermanSlayer.highlightBeacons, - () -> config.slayer.endermanSlayer.highlightBeacons, - newValue -> config.slayer.endermanSlayer.highlightBeacons = newValue) + .binding(defaults.slayers.endermanSlayer.highlightBeacons, + () -> config.slayers.endermanSlayer.highlightBeacons, + newValue -> config.slayers.endermanSlayer.highlightBeacons = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.endermanSlayer.highlightNukekubiHeads")) - .binding(defaults.slayer.endermanSlayer.highlightNukekubiHeads, - () -> config.slayer.endermanSlayer.highlightNukekubiHeads, - newValue -> config.slayer.endermanSlayer.highlightNukekubiHeads = newValue) + .binding(defaults.slayers.endermanSlayer.highlightNukekubiHeads, + () -> config.slayers.endermanSlayer.highlightNukekubiHeads, + newValue -> config.slayers.endermanSlayer.highlightNukekubiHeads = newValue) .controller(ConfigUtils::createBooleanController) .build()) .build()) @@ -50,90 +50,90 @@ public class SlayersCategory { .collapsed(true) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableEffigyWaypoints")) - .binding(defaults.slayer.vampireSlayer.enableEffigyWaypoints, - () -> config.slayer.vampireSlayer.enableEffigyWaypoints, - newValue -> config.slayer.vampireSlayer.enableEffigyWaypoints = newValue) + .binding(defaults.slayers.vampireSlayer.enableEffigyWaypoints, + () -> config.slayers.vampireSlayer.enableEffigyWaypoints, + newValue -> config.slayers.vampireSlayer.enableEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.compactEffigyWaypoints")) - .binding(defaults.slayer.vampireSlayer.compactEffigyWaypoints, - () -> config.slayer.vampireSlayer.compactEffigyWaypoints, - newValue -> config.slayer.vampireSlayer.compactEffigyWaypoints = newValue) + .binding(defaults.slayers.vampireSlayer.compactEffigyWaypoints, + () -> config.slayers.vampireSlayer.compactEffigyWaypoints, + newValue -> config.slayers.vampireSlayer.compactEffigyWaypoints = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.effigyUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.effigyUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.effigyUpdateFrequency, - () -> config.slayer.vampireSlayer.effigyUpdateFrequency, - newValue -> config.slayer.vampireSlayer.effigyUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.effigyUpdateFrequency, + () -> config.slayers.vampireSlayer.effigyUpdateFrequency, + newValue -> config.slayers.vampireSlayer.effigyUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHolyIceIndicator")) - .binding(defaults.slayer.vampireSlayer.enableHolyIceIndicator, - () -> config.slayer.vampireSlayer.enableHolyIceIndicator, - newValue -> config.slayer.vampireSlayer.enableHolyIceIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableHolyIceIndicator, + () -> config.slayers.vampireSlayer.enableHolyIceIndicator, + newValue -> config.slayers.vampireSlayer.enableHolyIceIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceIndicatorTickDelay")) - .binding(defaults.slayer.vampireSlayer.holyIceIndicatorTickDelay, - () -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay, - newValue -> config.slayer.vampireSlayer.holyIceIndicatorTickDelay = newValue) + .binding(defaults.slayers.vampireSlayer.holyIceIndicatorTickDelay, + () -> config.slayers.vampireSlayer.holyIceIndicatorTickDelay, + newValue -> config.slayers.vampireSlayer.holyIceIndicatorTickDelay = newValue) .controller(IntegerFieldControllerBuilder::create) .build()) .option(Option.<Integer>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.holyIceUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.holyIceUpdateFrequency, - () -> config.slayer.vampireSlayer.holyIceUpdateFrequency, - newValue -> config.slayer.vampireSlayer.holyIceUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.holyIceUpdateFrequency, + () -> config.slayers.vampireSlayer.holyIceUpdateFrequency, + newValue -> config.slayers.vampireSlayer.holyIceUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableHealingMelonIndicator")) - .binding(defaults.slayer.vampireSlayer.enableHealingMelonIndicator, - () -> config.slayer.vampireSlayer.enableHealingMelonIndicator, - newValue -> config.slayer.vampireSlayer.enableHealingMelonIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableHealingMelonIndicator, + () -> config.slayers.vampireSlayer.enableHealingMelonIndicator, + newValue -> config.slayers.vampireSlayer.enableHealingMelonIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Float>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.healingMelonHealthThreshold")) - .binding(defaults.slayer.vampireSlayer.healingMelonHealthThreshold, - () -> config.slayer.vampireSlayer.healingMelonHealthThreshold, - newValue -> config.slayer.vampireSlayer.healingMelonHealthThreshold = newValue) + .binding(defaults.slayers.vampireSlayer.healingMelonHealthThreshold, + () -> config.slayers.vampireSlayer.healingMelonHealthThreshold, + newValue -> config.slayers.vampireSlayer.healingMelonHealthThreshold = newValue) .controller(FloatFieldControllerBuilder::create) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableSteakStakeIndicator")) - .binding(defaults.slayer.vampireSlayer.enableSteakStakeIndicator, - () -> config.slayer.vampireSlayer.enableSteakStakeIndicator, - newValue -> config.slayer.vampireSlayer.enableSteakStakeIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableSteakStakeIndicator, + () -> config.slayers.vampireSlayer.enableSteakStakeIndicator, + newValue -> config.slayers.vampireSlayer.enableSteakStakeIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.steakStakeUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.steakStakeUpdateFrequency, - () -> config.slayer.vampireSlayer.steakStakeUpdateFrequency, - newValue -> config.slayer.vampireSlayer.steakStakeUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.steakStakeUpdateFrequency, + () -> config.slayers.vampireSlayer.steakStakeUpdateFrequency, + newValue -> config.slayers.vampireSlayer.steakStakeUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .option(Option.<Boolean>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.enableManiaIndicator")) - .binding(defaults.slayer.vampireSlayer.enableManiaIndicator, - () -> config.slayer.vampireSlayer.enableManiaIndicator, - newValue -> config.slayer.vampireSlayer.enableManiaIndicator = newValue) + .binding(defaults.slayers.vampireSlayer.enableManiaIndicator, + () -> config.slayers.vampireSlayer.enableManiaIndicator, + newValue -> config.slayers.vampireSlayer.enableManiaIndicator = newValue) .controller(ConfigUtils::createBooleanController) .build()) .option(Option.<Integer>createBuilder() .name(Text.translatable("skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency")) .description(OptionDescription.of(Text.translatable("skyblocker.config.slayer.vampireSlayer.maniaUpdateFrequency.@Tooltip"))) - .binding(defaults.slayer.vampireSlayer.maniaUpdateFrequency, - () -> config.slayer.vampireSlayer.maniaUpdateFrequency, - newValue -> config.slayer.vampireSlayer.maniaUpdateFrequency = newValue) + .binding(defaults.slayers.vampireSlayer.maniaUpdateFrequency, + () -> config.slayers.vampireSlayer.maniaUpdateFrequency, + newValue -> config.slayers.vampireSlayer.maniaUpdateFrequency = newValue) .controller(opt -> IntegerSliderControllerBuilder.create(opt).range(1, 10).step(1)) .build()) .build()) diff --git a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java index d458cd63..2c99dc56 100644 --- a/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java +++ b/src/main/java/de/hysky/skyblocker/config/configs/DungeonsConfig.java @@ -27,7 +27,7 @@ public class DungeonsConfig { public DungeonMap dungeonMap = new DungeonMap(); @SerialEntry - public PuzzleSolver puzzleSolver = new PuzzleSolver(); + public PuzzleSolvers puzzleSolvers = new PuzzleSolvers(); @SerialEntry public TheProfessor theProfessor = new TheProfessor(); @@ -67,7 +67,7 @@ public class DungeonsConfig { public int mapY = 2; } - public static class PuzzleSolver { + public static class PuzzleSolvers { @SerialEntry public boolean solveTicTacToe = true; diff --git a/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java b/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java index 77bb09bb..a192f448 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/DataTrackerMixin.java @@ -32,7 +32,7 @@ public abstract class DataTrackerMixin { @SuppressWarnings("ConstantValue") @Inject(method = "writeUpdatedEntries", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/data/DataTracker;copyToFrom(Lnet/minecraft/entity/data/DataTracker$Entry;Lnet/minecraft/entity/data/DataTracker$SerializedEntry;)V")) private <T> void skyblocker$onWriteUpdatedEntries(CallbackInfo ci, @Local DataTracker.Entry<T> entry, @Local DataTracker.SerializedEntry<T> serializedEntry) { - if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.enableYangGlyphsNotification && entry.getData() == EndermanEntityAccessor.getCARRIED_BLOCK() && entry.get() instanceof Optional<?> value && value.isPresent() && value.get() instanceof BlockState state && state.isOf(Blocks.BEACON) && ((Optional<?>) serializedEntry.value()).isEmpty()) { + if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayers.endermanSlayer.enableYangGlyphsNotification && entry.getData() == EndermanEntityAccessor.getCARRIED_BLOCK() && entry.get() instanceof Optional<?> value && value.isPresent() && value.get() instanceof BlockState state && state.isOf(Blocks.BEACON) && ((Optional<?>) serializedEntry.value()).isEmpty()) { MinecraftClient client = MinecraftClient.getInstance(); if (trackedEntity instanceof Entity entity && MobGlow.getArmorStands(entity).stream().anyMatch(armorStand -> armorStand.getName().getString().contains(client.getSession().getUsername()))) { client.inGameHud.setTitleTicks(5, 20, 10); diff --git a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java index 631a1ed8..04e6749c 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/HandledScreenMixin.java @@ -187,7 +187,7 @@ public abstract class HandledScreenMixin<T extends ScreenHandler> extends Screen // Prevent clicks on filler items if (SkyblockerConfigManager.get().uiAndVisuals.hideEmptyTooltips && FILLER_ITEMS.contains(stack.getName().getString()) && // Allow clicks in Ultrasequencer and Superpairs - (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helper.experiments.enableUltrasequencerSolver)) { + (!UltrasequencerSolver.INSTANCE.getName().matcher(title).matches() || SkyblockerConfigManager.get().helpers.experiments.enableUltrasequencerSolver)) { ci.cancel(); return; } diff --git a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java index 66449b24..3b7bc8be 100644 --- a/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java +++ b/src/main/java/de/hysky/skyblocker/mixins/RenderFishMixin.java @@ -19,7 +19,7 @@ public abstract class RenderFishMixin { @Inject(method = "render", at = @At("HEAD"), cancellable = true) private void skyblocker$render(FishingBobberEntity fishingBobberEntity, float f, float g, MatrixStack matrixStack, VertexConsumerProvider vertexConsumerProvider, int i, CallbackInfo ci) { //if rendered bobber is not the players and option to hide others is enabled do not render the bobber - if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().helper.fishing.hideOtherPlayersRods) { + if (Utils.isOnSkyblock() && fishingBobberEntity.getPlayerOwner() != MinecraftClient.getInstance().player && SkyblockerConfigManager.get().helpers.fishing.hideOtherPlayersRods) { ci.cancel(); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java index 3f4c8269..79239825 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/FishingHelper.java @@ -61,7 +61,7 @@ public class FishingHelper { public static void onSound(PlaySoundS2CPacket packet) { String path = packet.getSound().value().getId().getPath(); - if (SkyblockerConfigManager.get().helper.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { + if (SkyblockerConfigManager.get().helpers.fishing.enableFishingHelper && startTimeFish != 0 && System.currentTimeMillis() >= startTimeFish + 2000 && ("entity.generic.splash".equals(path) || "entity.player.splash".equals(path))) { ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player != null && player.fishHook != null) { Vec3d soundToFishHook = player.fishHook.getPos().subtract(packet.getX(), 0, packet.getZ()); @@ -76,15 +76,15 @@ public class FishingHelper { } public static void render(WorldRenderContext context) { - if (SkyblockerConfigManager.get().helper.fishing.enableFishingTimer && startTime != 0) { + if (SkyblockerConfigManager.get().helpers.fishing.enableFishingTimer && startTime != 0) { ClientPlayerEntity player = MinecraftClient.getInstance().player; if (player != null && player.fishHook != null) { float time = (int) ((System.currentTimeMillis() - startTime) / 100f) / 10f; //leave 1dp in seconds - float scale = SkyblockerConfigManager.get().helper.fishing.fishingTimerScale; + float scale = SkyblockerConfigManager.get().helpers.fishing.fishingTimerScale; Vec3d pos = player.fishHook.getPos().add(0, 0.4 + scale / 10, 0); Text text; - if (time >= 20 && SkyblockerConfigManager.get().helper.fishing.changeTimerColor) { + if (time >= 20 && SkyblockerConfigManager.get().helpers.fishing.changeTimerColor) { text = Text.literal(String.valueOf(time)).formatted(Formatting.GREEN); } else { text = Text.literal(String.valueOf(time)); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java index 8023ae05..747ce9b4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakeBagHelper.java @@ -17,7 +17,7 @@ public class NewYearCakeBagHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helpers.enableNewYearCakesHelper; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java index 1860dbc9..c403a81b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/accessories/newyearcakes/NewYearCakesHelper.java @@ -50,7 +50,7 @@ public class NewYearCakesHelper extends ContainerSolver { @Override protected boolean isEnabled() { - return SkyblockerConfigManager.get().helper.enableNewYearCakesHelper; + return SkyblockerConfigManager.get().helpers.enableNewYearCakesHelper; } public boolean addCake(int year) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java index 3fd24f8e..3d9e05ae 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/CreeperBeams.java @@ -177,7 +177,7 @@ public class CreeperBeams extends DungeonPuzzle { public void render(WorldRenderContext wrc) { // don't render if solved or disabled - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.creeperSolver) { + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.creeperSolver) { return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java index cd3508c1..8ac79f39 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/DungeonBlaze.java @@ -111,7 +111,7 @@ public class DungeonBlaze extends DungeonPuzzle { @Override public void render(WorldRenderContext wrc) { try { - if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().dungeons.puzzleSolver.blazeSolver) { + if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().dungeons.puzzleSolvers.blazeSolver) { if (highestBlaze.getY() < 69) { renderBlazeOutline(highestBlaze, nextHighestBlaze, wrc); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java index 6c2d56b3..8bc14b52 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/IceFill.java @@ -80,7 +80,7 @@ public class IceFill extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveIceFill || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -150,7 +150,7 @@ public class IceFill extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveIceFill || !DungeonManager.isCurrentRoomMatched()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveIceFill || !DungeonManager.isCurrentRoomMatched()) { return; } Room room = DungeonManager.getCurrentRoom(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java index eed291c2..3b0ee65c 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Silverfish.java @@ -65,7 +65,7 @@ public class Silverfish extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveSilverfish || client.world == null || !DungeonManager.isCurrentRoomMatched()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -158,7 +158,7 @@ public class Silverfish extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveSilverfish || !DungeonManager.isCurrentRoomMatched() || silverfishPath.isEmpty()) { return; } Room room = DungeonManager.getCurrentRoom(); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java index ae72d3cc..30119204 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/ThreeWeirdos.java @@ -17,7 +17,7 @@ public class ThreeWeirdos extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveThreeWeirdos ? null : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveThreeWeirdos ? null : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java index 088a6e6b..3c0b0dc9 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/TicTacToe.java @@ -111,7 +111,7 @@ public class TicTacToe extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { try { - if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTicTacToe && nextBestMoveToMake != null) { + if (SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveTicTacToe && nextBestMoveToMake != null) { RenderHelper.renderOutline(context, nextBestMoveToMake, RED_COLOR_COMPONENTS, 5, false); } } catch (Exception e) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java index 4dc72cff..874907c3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/Trivia.java @@ -29,7 +29,7 @@ public class Trivia extends ChatPatternListener { @Override public ChatFilterResult state() { - return SkyblockerConfigManager.get().dungeons.puzzleSolver.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS; + return SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveTrivia ? ChatFilterResult.FILTER : ChatFilterResult.PASS; } @Override diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java index 24d1331a..68671896 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/boulder/Boulder.java @@ -43,7 +43,7 @@ public class Boulder extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) { + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveBoulder || client.world == null || !DungeonManager.isCurrentRoomMatched()) { return; } @@ -195,7 +195,7 @@ public class Boulder extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolver.solveBoulder || !DungeonManager.isCurrentRoomMatched()) + if (!shouldSolve() || !SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveBoulder || !DungeonManager.isCurrentRoomMatched()) return; float alpha = 1.0f; float lineWidth = 5.0f; diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java index 852873ea..4e8122c3 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java @@ -133,7 +133,7 @@ public class Waterboard extends DungeonPuzzle { @Override public void tick(MinecraftClient client) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) { return; } Room room = DungeonManager.getCurrentRoom(); @@ -337,7 +337,7 @@ public class Waterboard extends DungeonPuzzle { @Override public void render(WorldRenderContext context) { - if (!SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return; + if (!SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return; Room room = DungeonManager.getCurrentRoom(); // Render the best combination. @@ -377,7 +377,7 @@ public class Waterboard extends DungeonPuzzle { private ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult blockHitResult) { BlockState state = world.getBlockState(blockHitResult.getBlockPos()); - if (SkyblockerConfigManager.get().dungeons.puzzleSolver.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) { + if (SkyblockerConfigManager.get().dungeons.puzzleSolvers.solveWaterboard && blockHitResult.getType() == HitResult.Type.BLOCK && waypoints[6] != null && DungeonManager.isCurrentRoomMatched() && blockHitResult.getBlockPos().equals(DungeonManager.getCurrentRoom().relativeToActual(WATER_LEVER)) && state.contains(LeverBlock.POWERED)) { if (!state.get(LeverBlock.POWERED)) { bestCombinationsUpdated = false; Scheduler.INSTANCE.schedule(() -> waypoints[6].setMissing(), 50); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java index a2298ecf..8f7ef286 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/end/BeaconHighlighter.java @@ -46,7 +46,7 @@ public class BeaconHighlighter { * @param context An instance of WorldRenderContext for the RenderHelper to use */ private static void render(WorldRenderContext context) { - if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayer.endermanSlayer.highlightBeacons) { + if (Utils.isInTheEnd() && SkyblockerConfigManager.get().slayers.endermanSlayer.highlightBeacons) { for (BlockPos pos : beaconPositions) { RenderHelper.renderFilled(context, pos, RED_COLOR_COMPONENTS, 0.5f, true); } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java index 5dc3b768..d6f9410b 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/entity/MobGlow.java @@ -52,7 +52,7 @@ public class MobGlow { // Enderman Slayer // Highlights Nukekubi Heads - case ArmorStandEntity armorStand when Utils.isInTheEnd() && SlayerUtils.isInSlayer() && isNukekubiHead(armorStand) -> SkyblockerConfigManager.get().slayer.endermanSlayer.highlightNukekubiHeads; + case ArmorStandEntity armorStand when Utils.isInTheEnd() && SlayerUtils.isInSlayer() && isNukekubiHead(armorStand) -> SkyblockerConfigManager.get().slayers.endermanSlayer.highlightNukekubiHeads; // Special Zelot case EndermanEntity enderman when Utils.isInTheEnd() && !entity.isInvisible() -> TheEnd.isSpecialZealot(enderman); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java index 4e28e3c1..f91055c7 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/experiment/ExperimentSolver.java @@ -1,6 +1,5 @@ package de.hysky.skyblocker.skyblock.experiment; -import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.configs.HelperConfig; import de.hysky.skyblocker.utils.render.gui.ContainerSolver; @@ -38,7 +37,7 @@ public abstract class ExperimentSolver extends ContainerSolver { @Override protected final boolean isEnabled() { - return isEnabled(SkyblockerConfigManager.get().helper.experiments); + return isEnabled(SkyblockerConfigManager.get().helpers.experiments); } protected abstract boolean isEnabled(HelperConfig.Experiments experimentsConfig); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java index ea0c5176..11963857 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/EffigyWaypoints.java @@ -28,7 +28,7 @@ public class EffigyWaypoints { private static final List<BlockPos> UNBROKEN_EFFIGIES = new ArrayList<>(); protected static void updateEffigies() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableEffigyWaypoints || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) return; + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) return; UNBROKEN_EFFIGIES.clear(); @@ -55,10 +55,10 @@ public class EffigyWaypoints { } protected static void render(WorldRenderContext context) { - if (SkyblockerConfigManager.get().slayer.vampireSlayer.enableEffigyWaypoints && Utils.getIslandArea().contains("Stillgore Château")) { + if (SkyblockerConfigManager.get().slayers.vampireSlayer.enableEffigyWaypoints && Utils.getIslandArea().contains("Stillgore Château")) { for (BlockPos effigy : UNBROKEN_EFFIGIES) { float[] colorComponents = DyeColor.RED.getColorComponents(); - if (SkyblockerConfigManager.get().slayer.vampireSlayer.compactEffigyWaypoints) { + if (SkyblockerConfigManager.get().slayers.vampireSlayer.compactEffigyWaypoints) { RenderHelper.renderFilledWithBeaconBeam(context, effigy.down(6), colorComponents, 0.5F, true); } else { RenderHelper.renderFilledWithBeaconBeam(context, effigy, colorComponents, 0.5F, true); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java index b94ebac1..c5b22576 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/HealingMelonIndicator.java @@ -13,12 +13,12 @@ public class HealingMelonIndicator { private static final Title title = new Title("skyblocker.rift.healNow", Formatting.DARK_RED); public static void updateHealth() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableHealingMelonIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableHealingMelonIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château")) { TitleContainer.removeTitle(title); return; } ClientPlayerEntity player = MinecraftClient.getInstance().player; - if (player != null && player.getHealth() <= SkyblockerConfigManager.get().slayer.vampireSlayer.healingMelonHealthThreshold * 2F) { + if (player != null && player.getHealth() <= SkyblockerConfigManager.get().slayers.vampireSlayer.healingMelonHealthThreshold * 2F) { RenderHelper.displayInTitleContainerAndPlaySound(title); } else { TitleContainer.removeTitle(title); diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java index d38151ff..54ea9093 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/ManiaIndicator.java @@ -17,7 +17,7 @@ public class ManiaIndicator { private static final Title title = new Title("skyblocker.rift.mania", Formatting.RED); protected static void updateMania() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableManiaIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableManiaIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java index db24efa2..54bee5ec 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/StakeIndicator.java @@ -13,7 +13,7 @@ public class StakeIndicator { private static final Title title = new Title("skyblocker.rift.stakeNow", Formatting.RED); protected static void updateStake() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableSteakStakeIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château") || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableSteakStakeIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !Utils.getIslandArea().contains("Stillgore Château") || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java index 7413e06f..568a5829 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/TheRift.java @@ -17,9 +17,9 @@ public class TheRift { ClientLifecycleEvents.CLIENT_STOPPING.register(EnigmaSouls::save); ClientReceiveMessageEvents.GAME.register(EnigmaSouls::onMessage); ClientCommandRegistrationCallback.EVENT.register(EnigmaSouls::registerCommands); - Scheduler.INSTANCE.scheduleCyclic(EffigyWaypoints::updateEffigies, SkyblockerConfigManager.get().slayer.vampireSlayer.effigyUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(TwinClawsIndicator::updateIce, SkyblockerConfigManager.get().slayer.vampireSlayer.holyIceUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(ManiaIndicator::updateMania, SkyblockerConfigManager.get().slayer.vampireSlayer.maniaUpdateFrequency); - Scheduler.INSTANCE.scheduleCyclic(StakeIndicator::updateStake, SkyblockerConfigManager.get().slayer.vampireSlayer.steakStakeUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(EffigyWaypoints::updateEffigies, SkyblockerConfigManager.get().slayers.vampireSlayer.effigyUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(TwinClawsIndicator::updateIce, SkyblockerConfigManager.get().slayers.vampireSlayer.holyIceUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(ManiaIndicator::updateMania, SkyblockerConfigManager.get().slayers.vampireSlayer.maniaUpdateFrequency); + Scheduler.INSTANCE.scheduleCyclic(StakeIndicator::updateStake, SkyblockerConfigManager.get().slayers.vampireSlayer.steakStakeUpdateFrequency); } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java b/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java index 48bb72ea..f6952ab4 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/rift/TwinClawsIndicator.java @@ -15,7 +15,7 @@ public class TwinClawsIndicator { private static boolean scheduled = false; protected static void updateIce() { - if (!SkyblockerConfigManager.get().slayer.vampireSlayer.enableHolyIceIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { + if (!SkyblockerConfigManager.get().slayers.vampireSlayer.enableHolyIceIndicator || !Utils.isOnSkyblock() || !Utils.isInTheRift() || !(Utils.getIslandArea().contains("Stillgore Château")) || !SlayerUtils.isInSlayer()) { TitleContainer.removeTitle(title); return; } @@ -32,7 +32,7 @@ public class TwinClawsIndicator { Scheduler.INSTANCE.schedule(() -> { RenderHelper.displayInTitleContainerAndPlaySound(title); scheduled = false; - }, SkyblockerConfigManager.get().slayer.vampireSlayer.holyIceIndicatorTickDelay); + }, SkyblockerConfigManager.get().slayers.vampireSlayer.holyIceIndicatorTickDelay); } } } diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java index f27a5fab..25741b22 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/FairySouls.java @@ -6,7 +6,6 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import com.mojang.brigadier.CommandDispatcher; import de.hysky.skyblocker.SkyblockerMod; -import de.hysky.skyblocker.config.SkyblockerConfig; import de.hysky.skyblocker.config.SkyblockerConfigManager; import de.hysky.skyblocker.config.configs.HelperConfig; import de.hysky.skyblocker.utils.Constants; @@ -143,7 +142,7 @@ public class FairySouls { } private static void render(WorldRenderContext context) { - HelperConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().helper.fairySouls; + HelperConfig.FairySouls fairySoulsConfig = SkyblockerConfigManager.get().helpers.fairySouls; if (fairySoulsConfig.enableFairySoulsHelper && fairySoulsLoaded.isDone() && fairySouls.containsKey(Utils.getLocationRaw())) { for (Waypoint fairySoul : fairySouls.get(Utils.getLocationRaw()).values()) { diff --git a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java index a82d32ae..254077ad 100644 --- a/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java +++ b/src/main/java/de/hysky/skyblocker/skyblock/waypoint/MythologicalRitual.java @@ -189,7 +189,7 @@ public class MythologicalRitual { } private static boolean isActive() { - return SkyblockerConfigManager.get().helper.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub"); + return SkyblockerConfigManager.get().helpers.mythologicalRitual.enableMythologicalRitualHelper && Utils.getLocationRaw().equals("hub"); } private static void reset() { |