Made the score hud element's location and size configurable

1 files changed, 36 insertions, 12 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 02b08254..00a956e1 100644
--- a/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
+++ b/src/main/java/de/hysky/skyblocker/skyblock/dungeon/DungeonMapConfigScreen.java
@@ -5,13 +5,17 @@ import de.hysky.skyblocker.utils.render.RenderHelper;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.text.Text;
+import net.minecraft.util.Identifier;
 
 import java.awt.*;
 
 public class DungeonMapConfigScreen extends Screen {
 
-	private int hudX = SkyblockerConfigManager.get().locations.dungeons.mapX;
-	private int hudY = SkyblockerConfigManager.get().locations.dungeons.mapY;
+	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 static final Identifier MAP_BACKGROUND = new Identifier("textures/map/map_background.png");
 	private final Screen parent;
 
 	protected DungeonMapConfigScreen() {
@@ -27,17 +31,23 @@ public class DungeonMapConfigScreen extends Screen {
 	public void render(DrawContext context, int mouseX, int mouseY, float delta) {
 		super.render(context, mouseX, mouseY, delta);
 		renderBackground(context, mouseX, mouseY, delta);
-		DungeonMap.renderHUDMap(context, hudX, hudY);
+		renderHUDMap(context, mapX, mapY);
+		renderHUDScore(context, scoreX, scoreY);
 		context.drawCenteredTextWithShadow(textRenderer, "Right Click To Reset Position", width >> 1, height >> 1, Color.GRAY.getRGB());
 	}
 
 	@Override
 	public boolean mouseDragged(double mouseX, double mouseY, int button, double deltaX, double deltaY) {
-		float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling;
-		int size = (int) (128 * scaling);
-		if (RenderHelper.pointIsInArea(mouseX, mouseY, hudX, hudY, hudX + size, hudY + size) && button == 0) {
-			hudX = (int) Math.max(Math.min(mouseX - (size >> 1), this.width - size), 0);
-			hudY = (int) Math.max(Math.min(mouseY - (size >> 1), this.height - size), 0);
+		int mapSize = (int) (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling);
+		float scoreScaling = SkyblockerConfigManager.get().locations.dungeons.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) {
+			mapX = (int) Math.max(Math.min(mouseX - (mapSize >> 1), this.width - mapSize), 0);
+			mapY = (int) Math.max(Math.min(mouseY - (mapSize >> 1), this.height - mapSize), 0);
+		} else if (RenderHelper.pointIsInArea(mouseX, mouseY, scoreX, scoreY, scoreX + scoreWidth, scoreY + scoreHeight) && button == 0) {
+			scoreX = (int) Math.max(Math.min(mouseX - (scoreWidth >> 1), this.width - scoreWidth), 0);
+			scoreY = (int) Math.max(Math.min(mouseY - (scoreHeight >> 1), this.height - scoreHeight), 0);
 		}
 		return super.mouseDragged(mouseX, mouseY, button, deltaX, deltaY);
 	}
@@ -45,8 +55,10 @@ public class DungeonMapConfigScreen extends Screen {
 	@Override
 	public boolean mouseClicked(double mouseX, double mouseY, int button) {
 		if (button == 1) {
-			hudX = 2;
-			hudY = 2;
+			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);
+			scoreY = (int) (mapY + (128 * SkyblockerConfigManager.get().locations.dungeons.mapScaling) + 4);
 		}
 
 		return super.mouseClicked(mouseX, mouseY, button);
@@ -54,10 +66,22 @@ public class DungeonMapConfigScreen extends Screen {
 
 	@Override
 	public void close() {
-		SkyblockerConfigManager.get().locations.dungeons.mapX = hudX;
-		SkyblockerConfigManager.get().locations.dungeons.mapY = hudY;
+		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.save();
 
 		this.client.setScreen(parent);
 	}
+
+	public void renderHUDMap(DrawContext context, int x, int y) {
+		float scaling = SkyblockerConfigManager.get().locations.dungeons.mapScaling;
+		int size = (int) (128 * scaling);
+		context.drawTexture(MAP_BACKGROUND, x, y, 0, 0, size, size, size, size);
+	}
+
+	public void renderHUDScore(DrawContext context, int x, int y) {
+		DungeonScoreHUD.render(context, x, y);
+	}
 }