Gui editor (#316)

* kinda working ig

* gui editor kinda works. map and drill fuel doesnt show yet. weird overlapping issues. overlays that have itemstacks glitch out on the left side

* POV: im making scuffed af code during business class

* a

* made it so you ""can"" move the map

* works for everything but the map (AAAAAAAA)

* remove options

* everything working™️ besides the hollows overlay buggin

* hearth 💀

* swap the thingies

* Update Position.java

* Change arbitrary if statement

* Fixed dontRenderOverlay

* Made code more sane

* Add powder overlay and cleaned up NEUConfig

* less work for new gui overlays in the future

* its not a bug
its a feature suggestion

* Fixed map on f1 (thank soopy)

* Fixed map on entrance and fixed interp for e and f1

* no more warning !!

Co-authored-by: hannibal2 <24389977+hannibal00212@users.noreply.github.com>

21 files changed, 538 insertions, 442 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
index 3967edb4..d52ed196 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/commands/dungeon/MapCommand.java
@@ -33,14 +33,10 @@ import net.minecraft.item.ItemMap;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
 import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.storage.MapData;
 
 import java.awt.*;
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
 import java.util.Map;
 
 public class MapCommand extends ClientCommandBase {
@@ -52,35 +48,8 @@ public class MapCommand extends ClientCommandBase {
 	@Override
 	public void processCommand(ICommandSender sender, String[] args) throws CommandException {
 
-		if (NotEnoughUpdates.INSTANCE.colourMap == null) {
-			try (
-				BufferedReader reader = new BufferedReader(new InputStreamReader(Minecraft
-					.getMinecraft()
-					.getResourceManager()
-					.getResource(
-						new ResourceLocation("notenoughupdates:maps/F1Full.json"))
-					.getInputStream(), StandardCharsets.UTF_8))
-			) {
-				JsonObject json = NotEnoughUpdates.INSTANCE.manager.gson.fromJson(reader, JsonObject.class);
-
-				NotEnoughUpdates.INSTANCE.colourMap = new Color[128][128];
-				for (int x = 0; x < 128; x++) {
-					for (int y = 0; y < 128; y++) {
-						NotEnoughUpdates.INSTANCE.colourMap[x][y] = new Color(0, 0, 0, 0);
-					}
-				}
-				for (Map.Entry<String, JsonElement> entry : json.entrySet()) {
-					int x = Integer.parseInt(entry.getKey().split(":")[0]);
-					int y = Integer.parseInt(entry.getKey().split(":")[1]);
-
-					NotEnoughUpdates.INSTANCE.colourMap[x][y] = new Color(entry.getValue().getAsInt(), true);
-				}
-			} catch (Exception ignored) {
-			}
-		}
-
 		if (!NotEnoughUpdates.INSTANCE.config.hidden.dev) {
-			NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor();
+			NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor(null);
 			return;
 		}
 
@@ -90,7 +59,7 @@ public class MapCommand extends ClientCommandBase {
 		}
 
 		if (args.length != 2) {
-			NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor();
+			NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor(null);
 			return;
 		}
 
@@ -157,6 +126,6 @@ public class MapCommand extends ClientCommandBase {
 			return;
 		}
 
-		NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor();
+		NotEnoughUpdates.INSTANCE.openGui = new GuiDungeonMapEditor(null);
 	}
 }
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java
index 535c92bf..57b2bed7 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/Position.java
@@ -31,6 +31,7 @@ public class Position {
 	private boolean centerX;
 	@Expose
 	private boolean centerY;
+	private boolean clicked = false;
 
 	private static final int EDGE_OFFSET = 0;
 
@@ -72,6 +73,13 @@ public class Position {
 		return y;
 	}
 
+	public void setClicked(boolean state) {
+		this.clicked = state;
+	}
+	public boolean getClicked() {
+		return clicked;
+	}
+
 	public int getAbsX(ScaledResolution scaledResolution, int objWidth) {
 		int width = scaledResolution.getScaledWidth();
 
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java
index ed45bab6..6fb8f353 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditor.java
@@ -20,6 +20,8 @@
 package io.github.moulberry.notenoughupdates.core.config.gui;
 
 import io.github.moulberry.notenoughupdates.core.config.Position;
+import io.github.moulberry.notenoughupdates.overlays.OverlayManager;
+import io.github.moulberry.notenoughupdates.overlays.TextOverlay;
 import io.github.moulberry.notenoughupdates.util.Utils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
@@ -29,45 +31,66 @@ import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;
 
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
 
 public class GuiPositionEditor extends GuiScreen {
-	private final Position position;
-	private final Position originalPosition;
-	private final int elementWidth;
-	private final int elementHeight;
-	private final Runnable renderCallback;
+	private final ArrayList<Position> positions;
+	private final ArrayList<Position> originalPositions;
+	private final ArrayList<Integer> elementWidths;
+	private final ArrayList<Integer> elementHeights;
+	private final ArrayList<Runnable> renderCallback;
 	private final Runnable positionChangedCallback;
 	private final Runnable closedCallback;
-	private boolean clicked = false;
 	private int grabbedX = 0;
 	private int grabbedY = 0;
+	private int clickedPos = -1;
+
+	public static boolean renderDrill = false;
 
 	private int guiScaleOverride = -1;
 
 	public GuiPositionEditor(
-		Position position, int elementWidth, int elementHeight,
+		LinkedHashMap<TextOverlay, Position> overlayPositions,
 		Runnable renderCallback,
 		Runnable positionChangedCallback,
 		Runnable closedCallback
 	) {
-		this.position = position;
-		this.originalPosition = position.clone();
-		this.elementWidth = elementWidth;
-		this.elementHeight = elementHeight;
-		this.renderCallback = renderCallback;
+		ArrayList<Position> pos = new ArrayList<>();
+		ArrayList<Position> ogPos = new ArrayList<>();
+		ArrayList<Runnable> renderCallbac = new ArrayList<>();
+		ArrayList<Integer> width = new ArrayList<>();
+		ArrayList<Integer> height = new ArrayList<>();
+		for (int i = 0; i < overlayPositions.size(); i++) {
+			TextOverlay overlay = new ArrayList<>(overlayPositions.keySet()).get(i);
+			pos.add(overlayPositions.get(overlay));
+			ogPos.add(pos.get(i).clone());
+			width.add((int) overlay.getDummySize().x);
+			height.add((int) overlay.getDummySize().y);
+			renderCallbac.add(() -> {
+				if (overlay.shouldRenderInGuiEditor) {
+					overlay.renderDummy();
+					OverlayManager.dontRenderOverlay.add(overlay.getClass());
+				}
+			});
+		}
+
+
+		this.positions = pos;
+		this.originalPositions = ogPos;
+		this.renderCallback = renderCallbac;
+		this.elementWidths = width;
+		this.elementHeights = height;
 		this.positionChangedCallback = positionChangedCallback;
 		this.closedCallback = closedCallback;
 	}
 
-	public GuiPositionEditor withScale(int scale) {
-		this.guiScaleOverride = scale;
-		return this;
-	}
-
 	@Override
 	public void onGuiClosed() {
 		super.onGuiClosed();
 		closedCallback.run();
+		renderDrill = false;
+		clickedPos = -1;
 	}
 
 	@Override
@@ -86,32 +109,34 @@ public class GuiPositionEditor extends GuiScreen {
 		mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
 
 		drawDefaultBackground();
+		renderDrill = true;
+		for (Position position : positions) {
+			int elementHeight = elementHeights.get(positions.indexOf(position));
+			int elementWidth = elementWidths.get(positions.indexOf(position));
+			if (position.getClicked()) {
+				grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+				grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
+			}
 
-		if (clicked) {
-			grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
-			grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
-		}
-
-		renderCallback.run();
+			renderCallback.get(positions.indexOf(position)).run();
 
-		int x = position.getAbsX(scaledResolution, elementWidth);
-		int y = position.getAbsY(scaledResolution, elementHeight);
+			int x = position.getAbsX(scaledResolution, elementWidth);
+			int y = position.getAbsY(scaledResolution, elementHeight);
 
-		if (position.isCenterX()) x -= elementWidth / 2;
-		if (position.isCenterY()) y -= elementHeight / 2;
-		Gui.drawRect(x, y, x + elementWidth, y + elementHeight, 0x80404040);
+			if (position.isCenterX()) x -= elementWidth / 2;
+			if (position.isCenterY()) y -= elementHeight / 2;
+			Gui.drawRect(x, y, x + elementWidth, y + elementHeight, 0x80404040);
 
-		if (guiScaleOverride >= 0) {
 			Utils.pushGuiScale(-1);
-		}
 
-		scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-		Utils.drawStringCentered("Position Editor", Minecraft.getMinecraft().fontRendererObj,
-			scaledResolution.getScaledWidth() / 2, 8, true, 0xffffff
-		);
-		Utils.drawStringCentered("R to Reset - Arrow keys/mouse to move", Minecraft.getMinecraft().fontRendererObj,
-			scaledResolution.getScaledWidth() / 2, 18, true, 0xffffff
-		);
+			scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+			Utils.drawStringCentered("Position Editor", Minecraft.getMinecraft().fontRendererObj,
+				scaledResolution.getScaledWidth() / 2, 8, true, 0xffffff
+			);
+			Utils.drawStringCentered("R to Reset - Arrow keys/mouse to move", Minecraft.getMinecraft().fontRendererObj,
+				scaledResolution.getScaledWidth() / 2, 18, true, 0xffffff
+			);
+		}
 	}
 
 	@Override
@@ -127,20 +152,25 @@ public class GuiPositionEditor extends GuiScreen {
 			}
 			mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
 			mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+			for (int i = positions.size() - 1; i >= 0; i--) {
+				Position position = positions.get(i);
+				int elementHeight = elementHeights.get(positions.indexOf(position));
+				int elementWidth = elementWidths.get(positions.indexOf(position));
+				int x = position.getAbsX(scaledResolution, elementWidth);
+				int y = position.getAbsY(scaledResolution, elementHeight);
+				if (position.isCenterX()) x -= elementWidth / 2;
+				if (position.isCenterY()) y -= elementHeight / 2;
+				if (!position.getClicked()) {
+					if (mouseX >= x && mouseY >= y &&
+						mouseX <= x + elementWidth && mouseY <= y + elementHeight) {
+						clickedPos = i;
+						position.setClicked(true);
+						grabbedX = mouseX;
+						grabbedY = mouseY;
+						break;
+					}
+				}
 
-			int x = position.getAbsX(scaledResolution, elementWidth);
-			int y = position.getAbsY(scaledResolution, elementHeight);
-			if (position.isCenterX()) x -= elementWidth / 2;
-			if (position.isCenterY()) y -= elementHeight / 2;
-
-			if (mouseX >= x && mouseY >= y &&
-				mouseX <= x + elementWidth && mouseY <= y + elementHeight) {
-				clicked = true;
-				grabbedX = mouseX;
-				grabbedY = mouseY;
-			}
-
-			if (guiScaleOverride >= 0) {
 				Utils.pushGuiScale(-1);
 			}
 		}
@@ -148,19 +178,24 @@ public class GuiPositionEditor extends GuiScreen {
 
 	@Override
 	protected void keyTyped(char typedChar, int keyCode) throws IOException {
-		if (keyCode == Keyboard.KEY_R) {
-			position.set(originalPosition);
-		} else if (!clicked) {
-			boolean shiftHeld = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
-			int dist = shiftHeld ? 10 : 1;
-			if (keyCode == Keyboard.KEY_DOWN) {
-				position.moveY(dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
-			} else if (keyCode == Keyboard.KEY_UP) {
-				position.moveY(-dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
-			} else if (keyCode == Keyboard.KEY_LEFT) {
-				position.moveX(-dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
-			} else if (keyCode == Keyboard.KEY_RIGHT) {
-				position.moveX(dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
+		if (clickedPos != -1) {
+			Position position = positions.get(clickedPos);
+			int elementHeight = elementHeights.get(positions.indexOf(position));
+			int elementWidth = elementWidths.get(positions.indexOf(position));
+			if (keyCode == Keyboard.KEY_R) {
+				position.set(originalPositions.get(positions.indexOf(position)));
+			} else if (!position.getClicked()) {
+				boolean shiftHeld = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+				int dist = shiftHeld ? 10 : 1;
+				if (keyCode == Keyboard.KEY_DOWN) {
+					position.moveY(dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
+				} else if (keyCode == Keyboard.KEY_UP) {
+					position.moveY(-dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
+				} else if (keyCode == Keyboard.KEY_LEFT) {
+					position.moveX(-dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
+				} else if (keyCode == Keyboard.KEY_RIGHT) {
+					position.moveX(dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
+				}
 			}
 		}
 		super.keyTyped(typedChar, keyCode);
@@ -169,28 +204,26 @@ public class GuiPositionEditor extends GuiScreen {
 	@Override
 	protected void mouseReleased(int mouseX, int mouseY, int state) {
 		super.mouseReleased(mouseX, mouseY, state);
-		clicked = false;
+		for (Position position : positions) {
+			position.setClicked(false);
+		}
 	}
 
 	@Override
 	protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
 		super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+		for (Position position : positions) {
+			int elementHeight = elementHeights.get(positions.indexOf(position));
+			int elementWidth = elementWidths.get(positions.indexOf(position));
+			if (position.getClicked()) {
+				ScaledResolution scaledResolution = Utils.pushGuiScale(-1);
+				mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+				mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+				grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+				grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
+				positionChangedCallback.run();
 
-		if (clicked) {
-			ScaledResolution scaledResolution;
-			if (guiScaleOverride >= 0) {
-				scaledResolution = Utils.pushGuiScale(guiScaleOverride);
-			} else {
-				scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
-			}
-			mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
-			mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
-
-			grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
-			grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
-			positionChangedCallback.run();
-
-			if (guiScaleOverride >= 0) {
 				Utils.pushGuiScale(-1);
 			}
 		}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditorButForTheDungeonMap.java b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditorButForTheDungeonMap.java
new file mode 100644
index 00000000..b334418c
--- /dev/null
+++ b/src/main/java/io/github/moulberry/notenoughupdates/core/config/gui/GuiPositionEditorButForTheDungeonMap.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright (C) 2022 NotEnoughUpdates contributors
+ *
+ * This file is part of NotEnoughUpdates.
+ *
+ * NotEnoughUpdates is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * NotEnoughUpdates is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with NotEnoughUpdates. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package io.github.moulberry.notenoughupdates.core.config.gui;
+
+import io.github.moulberry.notenoughupdates.core.config.Position;
+import io.github.moulberry.notenoughupdates.util.Utils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.ScaledResolution;
+import org.lwjgl.input.Keyboard;
+import org.lwjgl.input.Mouse;
+
+import java.io.IOException;
+
+public class GuiPositionEditorButForTheDungeonMap extends GuiScreen { // nea is gonna LOVE this file's existence
+	private final Position position;
+	private final Position originalPosition;
+	private final int elementWidth;
+	private final int elementHeight;
+	private final Runnable renderCallback;
+	private final Runnable positionChangedCallback;
+	private final Runnable closedCallback;
+	private boolean clicked = false;
+	private int grabbedX = 0;
+	private int grabbedY = 0;
+
+	private int guiScaleOverride = -1;
+
+	public GuiPositionEditorButForTheDungeonMap(
+		Position position, int elementWidth, int elementHeight,
+		Runnable renderCallback,
+		Runnable positionChangedCallback,
+		Runnable closedCallback
+	) {
+		this.position = position;
+		this.originalPosition = position.clone();
+		this.elementWidth = elementWidth;
+		this.elementHeight = elementHeight;
+		this.renderCallback = renderCallback;
+		this.positionChangedCallback = positionChangedCallback;
+		this.closedCallback = closedCallback;
+	}
+
+	public GuiPositionEditorButForTheDungeonMap withScale(int scale) {
+		this.guiScaleOverride = scale;
+		return this;
+	}
+
+	@Override
+	public void onGuiClosed() {
+		super.onGuiClosed();
+		closedCallback.run();
+	}
+
+	@Override
+	public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+		super.drawScreen(mouseX, mouseY, partialTicks);
+		ScaledResolution scaledResolution;
+		if (guiScaleOverride >= 0) {
+			scaledResolution = Utils.pushGuiScale(guiScaleOverride);
+		} else {
+			scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		}
+
+		this.width = scaledResolution.getScaledWidth();
+		this.height = scaledResolution.getScaledHeight();
+		mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+		mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+		drawDefaultBackground();
+
+		if (clicked) {
+			grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+			grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
+		}
+
+		renderCallback.run();
+
+		int x = position.getAbsX(scaledResolution, elementWidth);
+		int y = position.getAbsY(scaledResolution, elementHeight);
+
+		if (position.isCenterX()) x -= elementWidth / 2;
+		if (position.isCenterY()) y -= elementHeight / 2;
+		Gui.drawRect(x, y, x + elementWidth, y + elementHeight, 0x80404040);
+
+		if (guiScaleOverride >= 0) {
+			Utils.pushGuiScale(-1);
+		}
+
+		scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+		Utils.drawStringCentered("Position Editor", Minecraft.getMinecraft().fontRendererObj,
+			scaledResolution.getScaledWidth() / 2, 8, true, 0xffffff
+		);
+		Utils.drawStringCentered("R to Reset - Arrow keys/mouse to move", Minecraft.getMinecraft().fontRendererObj,
+			scaledResolution.getScaledWidth() / 2, 18, true, 0xffffff
+		);
+	}
+
+	@Override
+	protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+		super.mouseClicked(mouseX, mouseY, mouseButton);
+
+		if (mouseButton == 0) {
+			ScaledResolution scaledResolution;
+			if (guiScaleOverride >= 0) {
+				scaledResolution = Utils.pushGuiScale(guiScaleOverride);
+			} else {
+				scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+			}
+			mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+			mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+			int x = position.getAbsX(scaledResolution, elementWidth);
+			int y = position.getAbsY(scaledResolution, elementHeight);
+			if (position.isCenterX()) x -= elementWidth / 2;
+			if (position.isCenterY()) y -= elementHeight / 2;
+
+			if (mouseX >= x && mouseY >= y &&
+				mouseX <= x + elementWidth && mouseY <= y + elementHeight) {
+				clicked = true;
+				grabbedX = mouseX;
+				grabbedY = mouseY;
+			}
+
+			if (guiScaleOverride >= 0) {
+				Utils.pushGuiScale(-1);
+			}
+		}
+	}
+
+	@Override
+	protected void keyTyped(char typedChar, int keyCode) throws IOException {
+		if (keyCode == Keyboard.KEY_R) {
+			position.set(originalPosition);
+		} else if (!clicked) {
+			boolean shiftHeld = Keyboard.isKeyDown(Keyboard.KEY_LSHIFT) || Keyboard.isKeyDown(Keyboard.KEY_RSHIFT);
+			int dist = shiftHeld ? 10 : 1;
+			if (keyCode == Keyboard.KEY_DOWN) {
+				position.moveY(dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
+			} else if (keyCode == Keyboard.KEY_UP) {
+				position.moveY(-dist, elementHeight, new ScaledResolution(Minecraft.getMinecraft()));
+			} else if (keyCode == Keyboard.KEY_LEFT) {
+				position.moveX(-dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
+			} else if (keyCode == Keyboard.KEY_RIGHT) {
+				position.moveX(dist, elementWidth, new ScaledResolution(Minecraft.getMinecraft()));
+			}
+		}
+		super.keyTyped(typedChar, keyCode);
+	}
+
+	@Override
+	protected void mouseReleased(int mouseX, int mouseY, int state) {
+		super.mouseReleased(mouseX, mouseY, state);
+		clicked = false;
+	}
+
+	@Override
+	protected void mouseClickMove(int mouseX, int mouseY, int clickedMouseButton, long timeSinceLastClick) {
+		super.mouseClickMove(mouseX, mouseY, clickedMouseButton, timeSinceLastClick);
+
+		if (clicked) {
+			ScaledResolution scaledResolution;
+			if (guiScaleOverride >= 0) {
+				scaledResolution = Utils.pushGuiScale(guiScaleOverride);
+			} else {
+				scaledResolution = new ScaledResolution(Minecraft.getMinecraft());
+			}
+			mouseX = Mouse.getX() * width / Minecraft.getMinecraft().displayWidth;
+			mouseY = height - Mouse.getY() * height / Minecraft.getMinecraft().displayHeight - 1;
+
+			grabbedX += position.moveX(mouseX - grabbedX, elementWidth, scaledResolution);
+			grabbedY += position.moveY(mouseY - grabbedY, elementHeight, scaledResolution);
+			positionChangedCallback.run();
+
+			if (guiScaleOverride >= 0) {
+				Utils.pushGuiScale(-1);
+			}
+		}
+	}
+}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
index 88c89773..e15168f5 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/DungeonMap.java
@@ -65,8 +65,13 @@ import java.awt.*;
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
-import java.util.*;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 
 public class DungeonMap {
 	private static final ResourceLocation GREEN_CHECK = new ResourceLocation(
@@ -498,8 +503,8 @@ public class DungeonMap {
 			mapSizeX = borderSizeOption == 0 ? 90 : borderSizeOption == 1 ? 120 : borderSizeOption == 2 ? 160 : 240;
 		}
 		mapSizeY = mapSizeX;
-		int roomsSizeX = (maxRoomX - minRoomX) * (renderRoomSize + renderConnSize) + renderRoomSize;
-		int roomsSizeY = (maxRoomY - minRoomY) * (renderRoomSize + renderConnSize) + renderRoomSize;
+		int roomsSizeX = (maxRoomX - minRoomX) * (renderRoomSize + renderConnSize) + renderRoomSize + (isFloorOne ? getRenderRoomSize() : 0);
+		int roomsSizeY = (maxRoomY - minRoomY) * (renderRoomSize + renderConnSize) + renderRoomSize + (isEntrance ? getRenderRoomSize() : 0);
 		int mapCenterX = mapSizeX / 2;
 		int mapCenterY = mapSizeY / 2;
 		int scaleFactor = 8;
@@ -669,12 +674,12 @@ public class DungeonMap {
 					float angle = pos.rotation;
 
 					boolean doInterp = NotEnoughUpdates.INSTANCE.config.dungeonMap.dmPlayerInterp;
-					if (!isFloorOne && playerEntityMapPositions.containsKey(name)) {
+					if (playerEntityMapPositions.containsKey(name)) {
 						MapPosition entityPos = playerEntityMapPositions.get(name);
 						angle = entityPos.rotation;
 
-						float deltaX = entityPos.getRenderX() - pos.getRenderX();
-						float deltaY = entityPos.getRenderY() - pos.getRenderY();
+						float deltaX = entityPos.getRenderX() - pos.getRenderX() + (isFloorOne ? getRenderRoomSize() : 0);
+						float deltaY = entityPos.getRenderY() - pos.getRenderY() + (isEntrance ? getRenderRoomSize() : 0);
 
 						x += deltaX;
 						y += deltaY;
@@ -1119,6 +1124,7 @@ public class DungeonMap {
 	}
 
 	private boolean isFloorOne = false;
+	private boolean isEntrance = false;
 	private boolean failMap = false;
 	private long lastClearCache = 0;
 
@@ -1160,6 +1166,9 @@ public class DungeonMap {
 
 				if (line.contains("(F1)") || line.contains("(E)") || line.contains("(M1)")) {
 					isFloorOne = true;
+					if (line.contains("(E)")) {
+						isEntrance = true;
+					}
 					break;
 				}
 			}
diff --git a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
index 735fa3e6..98d36f2b 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/dungeons/GuiDungeonMapEditor.java
@@ -19,11 +19,13 @@
 
 package io.github.moulberry.notenoughupdates.dungeons;
 
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import io.github.moulberry.notenoughupdates.core.GuiElementColour;
 import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigEditorSlider;
 import io.github.moulberry.notenoughupdates.core.config.annotations.ConfigOption;
-import io.github.moulberry.notenoughupd