From 4687b8e876a3c5f0b529a70ad5fc9bd477c45494 Mon Sep 17 00:00:00 2001 From: ILikePlayingGames <22475143+ilikeplayinggames@users.noreply.github.com> Date: Thu, 17 Mar 2022 23:32:58 -0400 Subject: [PATCH] Revert map scale changes and dungeon warp change --- .../biscuit/skyblockaddons/asm/hooks/GuiChestHook.java | 7 +++++++ .../features/dungeonmap/DungeonMapManager.java | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java index 246c587462..02a29c6234 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java +++ b/src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java @@ -171,6 +171,13 @@ public static void drawScreenIslands(int mouseX, int mouseY, ReturnValue retu } } + /* + Special case: We have an extra dungeon hub warp as a separate island for convenience, so we have to + add it manually. + */ + markers.put(IslandWarpGui.Marker.DUNGEON_HUB_ISLAND, + markers.getOrDefault(IslandWarpGui.Marker.DUNGEON_HUB, IslandWarpGui.UnlockedStatus.UNKNOWN)); + if (islandWarpGui == null || !islandWarpGui.getMarkers().equals(markers)) { islandWarpGui = new IslandWarpGui(markers); ScaledResolution scaledresolution = new ScaledResolution(mc); diff --git a/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java b/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java index b002b0e144..fde4fb6ae2 100644 --- a/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java +++ b/src/main/java/codes/biscuit/skyblockaddons/features/dungeonmap/DungeonMapManager.java @@ -209,7 +209,7 @@ public static void drawDungeonsMap(Minecraft mc, float scale, ButtonLocation but } MapItemRenderer.Instance instance = mc.entityRenderer.getMapItemRenderer().getMapRendererInstance(mapData); - drawMapEdited(instance, isScoreSummary, totalScaleFactor); + drawMapEdited(instance, isScoreSummary, zoomScaleFactor); } } catch (Exception ex) { ex.printStackTrace(); @@ -336,7 +336,7 @@ else if (player == mc.thePlayer) { } } - markerScale = (float) (-0.75F * Math.pow((markerScale - 1.5F), 2F) + 3F); + markerScale = 4.0F / markerScale; for (MapMarker mapMarker : allMarkers) { GlStateManager.pushMatrix();