aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java4
-rw-r--r--src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java20
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java53
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java2
-rw-r--r--src/main/resources/assets/skyblocker/lang/de_de.json6
-rw-r--r--src/main/resources/assets/skyblocker/lang/en_us.json8
-rw-r--r--src/main/resources/assets/skyblocker/lang/es_es.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/fr_fr.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/id_id.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/ja_jp.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/ko_kr.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/nb_no.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/ru_ru.json2
-rw-r--r--src/main/resources/assets/skyblocker/lang/zh_cn.json4
14 files changed, 56 insertions, 55 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
index 430fb5f0..b673a9db 100644
--- a/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
+++ b/src/main/java/de/hysky/skyblocker/config/SkyblockerConfig.java
@@ -526,10 +526,10 @@ public class SkyblockerConfig {
public boolean solveThreeWeirdos = true;
@SerialEntry
- public boolean blazesolver = true;
+ public boolean blazeSolver = true;
@SerialEntry
- public boolean creepersolver = true;
+ 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 eb39e498..066d8b8c 100644
--- a/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
+++ b/src/main/java/de/hysky/skyblocker/config/categories/DungeonsCategory.java
@@ -240,19 +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)
+ .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()
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 1cad2980..5356658e 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/CreeperBeams.java
@@ -1,17 +1,10 @@
package de.hysky.skyblocker.skyblock.dungeon;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.joml.Intersectiond;
-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;
+import it.unimi.dsi.fastutil.objects.ObjectDoublePair;
import net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderContext;
import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
@@ -22,9 +15,17 @@ import net.minecraft.client.network.ClientPlayerEntity;
import net.minecraft.client.world.ClientWorld;
import net.minecraft.entity.mob.CreeperEntity;
import net.minecraft.predicate.entity.EntityPredicates;
+import net.minecraft.util.DyeColor;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Box;
import net.minecraft.util.math.Vec3d;
+import org.joml.Intersectiond;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
public class CreeperBeams {
@@ -32,11 +33,12 @@ public class CreeperBeams {
// "missing, this palette looks like you stole it from a 2018 bootstrap webapp!"
private static final float[][] COLORS = {
- { 0.33f, 1f, 1f },
- { 1f, 0.33f, 0.33f },
- { 1f, 0.66f, 0f },
- { 1f, 0.33f, 1f },
+ DyeColor.LIGHT_BLUE.getColorComponents(),
+ DyeColor.PINK.getColorComponents(),
+ DyeColor.ORANGE.getColorComponents(),
+ DyeColor.MAGENTA.getColorComponents(),
};
+ private static final float[] LIME_COLOR_COMPONENTS = DyeColor.LIME.getColorComponents();
private static final int FLOOR_Y = 68;
private static final int BASE_Y = 74;
@@ -80,8 +82,8 @@ public class CreeperBeams {
return;
}
Vec3d creeperPos = new Vec3d(base.getX() + 0.5, BASE_Y + 3.5, base.getZ() + 0.5);
- ArrayList<BlockPos> targets = findTargets(player, world, base);
- beams = findLines(player, world, creeperPos, targets);
+ ArrayList<BlockPos> targets = findTargets(world, base);
+ beams = findLines(creeperPos, targets);
}
// update the beam states
@@ -102,7 +104,7 @@ public class CreeperBeams {
player.getBoundingBox().expand(50D),
EntityPredicates.VALID_ENTITY);
- if (creepers.size() == 0) {
+ if (creepers.isEmpty()) {
return null;
}
@@ -121,23 +123,22 @@ public class CreeperBeams {
}
// find the sea lanterns (and the ONE prismarine ty hypixel) in the room
- private static ArrayList<BlockPos> findTargets(ClientPlayerEntity player, ClientWorld world, BlockPos basePos) {
+ private static ArrayList<BlockPos> findTargets(ClientWorld world, BlockPos basePos) {
ArrayList<BlockPos> targets = new ArrayList<>();
BlockPos start = new BlockPos(basePos.getX() - 15, BASE_Y + 12, basePos.getZ() - 15);
BlockPos end = new BlockPos(basePos.getX() + 16, FLOOR_Y, basePos.getZ() + 16);
- for (BlockPos bp : BlockPos.iterate(start, end)) {
- if (isTarget(world, bp)) {
- targets.add(new BlockPos(bp));
+ for (BlockPos pos : BlockPos.iterate(start, end)) {
+ if (isTarget(world, pos)) {
+ targets.add(new BlockPos(pos));
}
}
return targets;
}
// generate lines between targets and finally find the solution
- private static ArrayList<Beam> findLines(ClientPlayerEntity player, ClientWorld world, Vec3d creeperPos,
- ArrayList<BlockPos> targets) {
+ private static ArrayList<Beam> findLines(Vec3d creeperPos, ArrayList<BlockPos> targets) {
ArrayList<ObjectDoublePair<Beam>> allLines = new ArrayList<>();
@@ -157,7 +158,7 @@ public class CreeperBeams {
// this feels a bit heavy-handed, but it works for now.
ArrayList<Beam> result = new ArrayList<>();
- allLines.sort((a, b) -> Double.compare(a.rightDouble(), b.rightDouble()));
+ allLines.sort(Comparator.comparingDouble(ObjectDoublePair::rightDouble));
while (result.size() < 4 && !allLines.isEmpty()) {
Beam solution = allLines.get(0).left();
@@ -179,7 +180,7 @@ public class CreeperBeams {
private static void render(WorldRenderContext wrc) {
// don't render if solved or disabled
- if (solved || !SkyblockerConfigManager.get().locations.dungeons.creepersolver) {
+ if (solved || !SkyblockerConfigManager.get().locations.dungeons.creeperSolver) {
return;
}
@@ -241,9 +242,9 @@ public class CreeperBeams {
RenderHelper.renderOutline(wrc, outlineTwo, color, 3);
RenderHelper.renderLinesFromPoints(wrc, line, color, 1, 2);
} else {
- RenderHelper.renderOutline(wrc, outlineOne, new float[] { 0.33f, 1f, 0.33f }, 1);
- RenderHelper.renderOutline(wrc, outlineTwo, new float[] { 0.33f, 1f, 0.33f }, 1);
- RenderHelper.renderLinesFromPoints(wrc, line, new float[] { 0.33f, 1f, 0.33f }, 0.75f, 1);
+ RenderHelper.renderOutline(wrc, outlineOne, LIME_COLOR_COMPONENTS, 1);
+ RenderHelper.renderOutline(wrc, outlineTwo, LIME_COLOR_COMPONENTS, 1);
+ RenderHelper.renderLinesFromPoints(wrc, line, LIME_COLOR_COMPONENTS, 0.75f, 1);
}
}
}
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
index 044949db..cfb16b4d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonBlaze.java
@@ -106,7 +106,7 @@ public class DungeonBlaze {
*/
public static void blazeRenderer(WorldRenderContext wrc) {
try {
- if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().locations.dungeons.blazesolver) {
+ if (highestBlaze != null && lowestBlaze != null && highestBlaze.isAlive() && lowestBlaze.isAlive() && SkyblockerConfigManager.get().locations.dungeons.blazeSolver) {
if (highestBlaze.getY() < 69) {
renderBlazeOutline(highestBlaze, nextHighestBlaze, wrc);
}
diff --git a/src/main/resources/assets/skyblocker/lang/de_de.json b/src/main/resources/assets/skyblocker/lang/de_de.json
index dd8de99e..5fc389ee 100644
--- a/src/main/resources/assets/skyblocker/lang/de_de.json
+++ b/src/main/resources/assets/skyblocker/lang/de_de.json
@@ -14,9 +14,9 @@
"text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
"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.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 69f79359..3d0c010f 100644
--- a/src/main/resources/assets/skyblocker/lang/en_us.json
+++ b/src/main/resources/assets/skyblocker/lang/en_us.json
@@ -265,10 +265,10 @@
"text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "Starred Mob Glow",
"text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow.@Tooltip": "Applies the glowing effect to starred mobs that are visible.",
"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.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!",
diff --git a/src/main/resources/assets/skyblocker/lang/es_es.json b/src/main/resources/assets/skyblocker/lang/es_es.json
index 5b2a9807..faa77b85 100644
--- a/src/main/resources/assets/skyblocker/lang/es_es.json
+++ b/src/main/resources/assets/skyblocker/lang/es_es.json
@@ -75,7 +75,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Habilitar Mapa",
"text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "Escala del Mapa",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Resuelve el Acertijo de \"Los Tres Chiflados\"",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Resuelve el Acertijo del Blaze",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Resuelve el Acertijo del Blaze",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Resuelve el Acertijo de Trivia",
"text.autoconfig.skyblocker.option.locations.dwarvenMines": "Minas Dwarven",
"text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Habilitar Combustible del Taladro",
diff --git a/src/main/resources/assets/skyblocker/lang/fr_fr.json b/src/main/resources/assets/skyblocker/lang/fr_fr.json
index a2084fc2..8da7809a 100644
--- a/src/main/resources/assets/skyblocker/lang/fr_fr.json
+++ b/src/main/resources/assets/skyblocker/lang/fr_fr.json
@@ -39,7 +39,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "Griser les coffres qui ont déjà été ouverts.",
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Activer la carte",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Résoudre le puzzle des trois PNJ « Three Weirdos »",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Résoudre le puzzle des blazes « Higher or Lower »",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Résoudre le puzzle des blazes « Higher or Lower »",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Résoudre le quiz",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals": "Solveurs des terminaux",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "Résoudre le puzzle des couleurs « Color »",
diff --git a/src/main/resources/assets/skyblocker/lang/id_id.json b/src/main/resources/assets/skyblocker/lang/id_id.json
index 90c0a281..52a6f9bb 100644
--- a/src/main/resources/assets/skyblocker/lang/id_id.json
+++ b/src/main/resources/assets/skyblocker/lang/id_id.json
@@ -9,7 +9,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons",
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Aktifkan Peta",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Pecahkan Teka Teki \"Tiga Orang Aneh\"",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Pecahkan Teka Teki \"Blaze\"",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Pecahkan Teka Teki \"Blaze\"",
"text.autoconfig.skyblocker.category.messages": "Pesan",
"text.autoconfig.skyblocker.option.messages.hideAbility": "Sembunyikan Cooldown Kemampuan",
"text.autoconfig.skyblocker.option.messages.hideHeal": "Sembunyikan Pesan Penyembuhan",
diff --git a/src/main/resources/assets/skyblocker/lang/ja_jp.json b/src/main/resources/assets/skyblocker/lang/ja_jp.json
index 9a4b7a1d..a0456936 100644
--- a/src/main/resources/assets/skyblocker/lang/ja_jp.json
+++ b/src/main/resources/assets/skyblocker/lang/ja_jp.json
@@ -36,7 +36,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons": "ダンジョン",
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "ダンジョンのマップ表示を有効にする",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "嘘つきを当てるパズルのソルバー",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "ブレイズパズルのソルバー",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "ブレイズパズルのソルバー",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "クイズのソルバー",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals": "F7のターミナルソルバー",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "select Coloredのソルバー",
diff --git a/src/main/resources/assets/skyblocker/lang/ko_kr.json b/src/main/resources/assets/skyblocker/lang/ko_kr.json
index cfb4e556..4cfbab47 100644
--- a/src/main/resources/assets/skyblocker/lang/ko_kr.json
+++ b/src/main/resources/assets/skyblocker/lang/ko_kr.json
@@ -148,7 +148,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "지도 활성화",
"text.autoconfig.skyblocker.option.locations.dungeons.mapScaling": "지도 크기",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Three Weirdos 퍼즐 해결",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "블레이즈 퍼즐 해결",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "블레이즈 퍼즐 해결",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Trivia 퍼즐 해결",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals": "터미널 해결",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "색상 선택 해결",
diff --git a/src/main/resources/assets/skyblocker/lang/nb_no.json b/src/main/resources/assets/skyblocker/lang/nb_no.json
index 897379c2..e44d492f 100644
--- a/src/main/resources/assets/skyblocker/lang/nb_no.json
+++ b/src/main/resources/assets/skyblocker/lang/nb_no.json
@@ -87,7 +87,7 @@
"text.autoconfig.skyblocker.option.quickNav.button10.clickEvent": "Klikk hendelse",
"text.autoconfig.skyblocker.option.quickNav.button12.item": "Gjenstand",
"text.autoconfig.skyblocker.option.general.itemList.enableItemList": "Aktiver gjenstad liste",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Løs Blaze-puslespillet",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Løs Blaze-puslespillet",
"text.autoconfig.skyblocker.option.quickNav.button5.uiTitle": "UI Tittel",
"text.autoconfig.skyblocker.option.quickNav.button5.clickEvent": "Klikk hendelse",
"text.autoconfig.skyblocker.option.quickNav.button6": "Knapp 6",
diff --git a/src/main/resources/assets/skyblocker/lang/ru_ru.json b/src/main/resources/assets/skyblocker/lang/ru_ru.json
index e6fa0600..5ef92494 100644
--- a/src/main/resources/assets/skyblocker/lang/ru_ru.json
+++ b/src/main/resources/assets/skyblocker/lang/ru_ru.json
@@ -9,7 +9,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons": "Dungeons (Подземелья)",
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "Включить Карту",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "Решать Головоломку Three Weirdos",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "Решать Головоломку Blaze",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "Решать Головоломку Blaze",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "Решать Головоломку Trivia",
"text.autoconfig.skyblocker.option.locations.dwarvenMines": "Гномьи Шахты",
"text.autoconfig.skyblocker.option.locations.dwarvenMines.enableDrillFuel": "Показывать Топливо Дрели",
diff --git a/src/main/resources/assets/skyblocker/lang/zh_cn.json b/src/main/resources/assets/skyblocker/lang/zh_cn.json
index d9d8d180..d322b371 100644
--- a/src/main/resources/assets/skyblocker/lang/zh_cn.json
+++ b/src/main/resources/assets/skyblocker/lang/zh_cn.json
@@ -66,7 +66,7 @@
"text.autoconfig.skyblocker.option.locations.dungeons.croesusHelper.@Tooltip": "将打开过的箱子标记为灰色。",
"text.autoconfig.skyblocker.option.locations.dungeons.enableMap": "启用地牢地图",
"text.autoconfig.skyblocker.option.locations.dungeons.solveThreeWeirdos": "解决三怪人迷题",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver": "烈焰人迷题助手",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver": "烈焰人迷题助手",
"text.autoconfig.skyblocker.option.locations.dungeons.solveTrivia": "常识问答谜题助手",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals": "终端助手",
"text.autoconfig.skyblocker.option.locations.dungeons.terminals.solveColor": "选色终端助手",
@@ -227,7 +227,7 @@
"text.autoconfig.skyblocker.option.general.shortcuts.enableCommandArgShortcuts": "启用带参命令别名",
"text.autoconfig.skyblocker.option.general.tabHud.nameSorting": "玩家名排列顺序",
"text.autoconfig.skyblocker.option.general.etherwarpOverlay": "Etherwarp 技能目标位置显示",
- "text.autoconfig.skyblocker.option.locations.dungeons.blazesolver.@Tooltip": "以绿色边框标记正确的烈焰人,并将下一个烈焰人以白色线条与边框一同标记.",
+ "text.autoconfig.skyblocker.option.locations.dungeons.blazeSolver.@Tooltip": "以绿色边框标记正确的烈焰人,并将下一个烈焰人以白色线条与边框一同标记.",
"text.autoconfig.skyblocker.option.general.tabHud.plainPlayerNames.@Tooltip": "开启后在公共岛屿显示玩家名时不显示任何特殊效果。",
"text.autoconfig.skyblocker.option.messages.hideShowOff.@Tooltip": "过滤来自 /show 命令的消息",
"text.autoconfig.skyblocker.option.locations.dungeons.starredMobGlow": "使星标怪物发光",