aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authormsg-programs <msgdoesstuff@gmail.com>2023-10-14 11:19:32 +0200
committermsg-programs <msgdoesstuff@gmail.com>2023-10-14 11:19:32 +0200
commit05aedd82de412e8373d1f241e9dad927924a6780 (patch)
tree4b77a9e19a28a84ed6c61cd390bda165400d3930 /src/main
parent48197bd0dff5816c53d1d7929246914efe2836da (diff)
downloadSkyblocker-05aedd82de412e8373d1f241e9dad927924a6780.tar.gz
Skyblocker-05aedd82de412e8373d1f241e9dad927924a6780.tar.bz2
Skyblocker-05aedd82de412e8373d1f241e9dad927924a6780.zip
Add config option to turn the thing on/off
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java3
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java10
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java5
-rw-r--r--src/main/resources/assets/skyblocker/lang/de_de.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json2
5 files changed, 19 insertions, 3 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..430fb5f0 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -527,6 +527,9 @@ public class SkyblockerConfig {
@SerialEntry
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..eb39e498 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -247,6 +247,14 @@ public class DungeonsCategory {
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()
.name(Text.translatable("text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia"))
.binding(defaults.locations.dungeons.solveTrivia,
@@ -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"))
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
index b495bd3e..1cad2980 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
@@ -8,6 +8,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import it.unimi.dsi.fastutil.objects.ObjectDoublePair;
+import de.hysky.skyblocker.config.SkyblockerConfigManager;
import de.hysky.skyblocker.utils.Utils;
import de.hysky.skyblocker.utils.render.RenderHelper;
import de.hysky.skyblocker.utils.scheduler.Scheduler;
@@ -177,8 +178,8 @@ public class CreeperBeams {
private static void render(WorldRenderContext wrc) {
- // don't render if solved
- if (solved) {
+ // don't render if solved or disabled
+ if (solved || !SkyblockerConfigManager.get().locations.dungeons.creepersolver) {
return;
}
diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json
index ccc958d0..dd8de99e 100644
--- a/src/main/resources/assets/skyblocker/lang/de_de.json
+++ b/src/main/resources/assets/skyblocker/lang/de_de.json
@@ -15,6 +15,8 @@
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Karte aktivieren",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Drei Verrückte Rätsel lösen",
"text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Blaze Rätsel lösen",
+ "text.autoconfig.skyblocker.option.locations.dungeons.creepersolver": "Creeper Beams lösen",
+ "text.autoconfig.skyblocker.option.locations.dungeons.creepersolver.@Tooltip": "Zeigt an, welche Strahlen die besten sind und welche Ziele man dafür treffen muss.",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Rätsel lösen",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Terminal Löser",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Wähle die richtige Farbe",
diff --git a/src/main/resources/assets/skyblocker/lang/en_us.json b/src/main/resources/assets/skyblocker/lang/en_us.json
index f889595e..69f79359 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -267,6 +267,8 @@
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Solve Three Weirdos Puzzle",
"text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Solve Blaze Puzzle",
"text.autoconfig.skyblocker.option.locations.dungeons.blazesolver.@Tooltip": "Boxes the correct blaze in green, also draws a line to and boxes the next blaze to kill in white.",
+ "text.autoconfig.skyblocker.option.locations.dungeons.creepersolver": "Solve Creeper Beams Puzzle",
+ "text.autoconfig.skyblocker.option.locations.dungeons.creepersolver.@Tooltip": "Highlights the best beams to make and the targets to hit.",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Solve Trivia Puzzle",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe": "Solve Tic Tac Toe Puzzle",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTicTacToe.@Tooltip": "Puts a red box around the next best move for you to make!",