aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/de/hysky/skyblocker/skyblock/dungeon
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/de/hysky/skyblocker/skyblock/dungeon')
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java12
-rw-r--r--src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java6
2 files changed, 9 insertions, 9 deletions
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
index 00a956e1..b832f12d 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -13,8 +13,8 @@ public class DungeonMapConfigScreen extends Screen {
private int mapX = SkyblockerConfigManager.get().locations.dungeons.mapX;
private int mapY = SkyblockerConfigManager.get().locations.dungeons.mapY;
- private int scoreX = SkyblockerConfigManager.get().locations.dungeons.scoreX;
- private int scoreY = SkyblockerConfigManager.get().locations.dungeons.scoreY;
+ private int scoreX = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX;
+ private int scoreY = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY;
private static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
private final Screen parent;
@@ -39,7 +39,7 @@ public class DungeonMapConfigScreen extends Screen {
@Override
public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
int mapSize = (int) (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling);
- float scoreScaling = SkyblockerConfigManager.get().locations.dungeons.scoreScaling;
+ float scoreScaling = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling;
int scoreWidth = (int) (textRenderer.getWidth("Score: 300 (S+)") * scoreScaling);
int scoreHeight = (int) (textRenderer.fontHeight * scoreScaling);
if (RenderHelper.pointIsInArea(mouseX, mouseY, mapX, mapY, mapX + mapSize, mapY + mapSize) && button == 0) {
@@ -57,7 +57,7 @@ public class DungeonMapConfigScreen extends Screen {
if (button == 1) {
mapX = 2;
mapY = 2;
- scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().locations.dungeons.mapScaling)) - textRenderer.getWidth("Score: 300 (S+)") * SkyblockerConfigManager.get().locations.dungeons.scoreScaling / 2), 0);
+ scoreX = Math.max((int) ((mapX + (64 * SkyblockerConfigManager.get().locations.dungeons.mapScaling)) - textRenderer.getWidth("Score: 300 (S+)") * SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling / 2), 0);
scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling) + 4);
}
@@ -68,8 +68,8 @@ public class DungeonMapConfigScreen extends Screen {
public void close() {
SkyblockerConfigManager.get().locations.dungeons.mapX = mapX;
SkyblockerConfigManager.get().locations.dungeons.mapY = mapY;
- SkyblockerConfigManager.get().locations.dungeons.scoreX = scoreX;
- SkyblockerConfigManager.get().locations.dungeons.scoreY = scoreY;
+ SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX = scoreX;
+ SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY = scoreY;
SkyblockerConfigManager.save();
this.client.setScreen(parent);
diff --git a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
index 18038ccd..eedbf020 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonScoreHUD.java
@@ -12,13 +12,13 @@ public class DungeonScoreHUD {
}
public static void render(DrawContext context) {
- int x = SkyblockerConfigManager.get().locations.dungeons.scoreX;
- int y = SkyblockerConfigManager.get().locations.dungeons.scoreY;
+ int x = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreX;
+ int y = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreY;
render(context, x, y);
}
public static void render(DrawContext context, int x, int y) {
- float scale = SkyblockerConfigManager.get().locations.dungeons.scoreScaling;
+ float scale = SkyblockerConfigManager.get().locations.dungeons.dungeonScore.scoreScaling;
MatrixStack matrixStack = context.getMatrices();
matrixStack.push();
matrixStack.scale(scale, scale, 0);