aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle
diff options
context:
space:
mode:
authorKevin <92656833+kevinthegreat1@users.noreply.github.com>2024-01-04 14:56:54 +0800
committerGitHub <noreply@github.com>2024-01-04 01:56:54 -0500
commit39fc7afc81197e2c637fd10322c1a15ec587337a (patch)
treee817f5e14fef1568d4395c4772664f2102fa978b /src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle
parent4dc26a13ced11281a4da74bd52d00ef36c0d03d5 (diff)
downloadSkyblocker-39fc7afc81197e2c637fd10322c1a15ec587337a.tar.gz
Skyblocker-39fc7afc81197e2c637fd10322c1a15ec587337a.tar.bz2
Skyblocker-39fc7afc81197e2c637fd10322c1a15ec587337a.zip
Add waterboard toggle (#476)
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/puzzle/waterboard/Waterboard.java7
1 files changed, 4 insertions, 3 deletions
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 0006e6e2..3244996a 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
@@ -5,6 +5,7 @@ import com.google.common.collect.MultimapBuilder;
import com.mojang.brigadier.Command;
import com.mojang.brigadier.arguments.IntegerArgumentType;
import de.hysky.skyblocker.SkyblockerMod;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.debug.Debug;
import de.hysky.skyblocker.skyblock.dungeon.puzzle.DungeonPuzzle;
import de.hysky.skyblocker.skyblock.dungeon.puzzle.waterboard.Cell.SwitchCell;
@@ -133,7 +134,7 @@ public class Waterboard extends DungeonPuzzle {
@Override
public void tick(MinecraftClient client) {
- if (client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
+ if (!SkyblockerConfigManager.get().locations.dungeons.solveWaterboard || client.world == null || !DungeonManager.isCurrentRoomMatched() || solve != null && !solve.isDone()) {
return;
}
Room room = DungeonManager.getCurrentRoom();
@@ -337,7 +338,7 @@ public class Waterboard extends DungeonPuzzle {
@Override
public void render(WorldRenderContext context) {
- if (!DungeonManager.isCurrentRoomMatched()) return;
+ if (!SkyblockerConfigManager.get().locations.dungeons.solveWaterboard || !DungeonManager.isCurrentRoomMatched()) return;
Room room = DungeonManager.getCurrentRoom();
// Render the best combination.
@@ -377,7 +378,7 @@ public class Waterboard extends DungeonPuzzle {
private ActionResult onUseBlock(PlayerEntity player, World world, Hand hand, BlockHitResult blockHitResult) {
BlockState state = world.getBlockState(blockHitResult.getBlockPos());
- if (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().locations.dungeons.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);