Edit Dungeon Map Marker Scaling and Fix #609

Author: ILikePlayingGames

src/main/java/codes/biscuit/skyblockaddons/asm/hooks/GuiChestHook.java

@@ -53,6 +53,7 @@ public class GuiChestHook {
 
     private static final int REFORGE_MENU_HEIGHT = 222 - 108 + 5 * 18;
 
+    @Getter
     private static IslandWarpGui islandWarpGui = null;
 
     /** Reforge filter text field for reforges to match */
@@ -169,8 +170,7 @@ public static void drawScreenIslands(int mouseX, int mouseY, ReturnValue<?> retu
                             markers.put(marker, IslandWarpGui.UnlockedStatus.UNKNOWN);
                         }
                     }
-                    //markers.put(IslandWarpGui.Marker.DWARVEN_FORGE, markers.getOrDefault(IslandWarpGui.Marker.DEEP_CAVERNS, IslandWarpGui.UnlockedStatus.UNKNOWN));
-                    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);

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, zoomScaleFactor);
+                    drawMapEdited(instance, isScoreSummary, totalScaleFactor);
                 }
             } catch (Exception ex) {
                 ex.printStackTrace();
@@ -238,7 +238,7 @@ public static void drawDungeonsMap(Minecraft mc, float scale, ButtonLocation but
 
     private static final Map<String, Vec4b> savedMapDecorations = new HashMap<>();
 
-    public static void drawMapEdited(MapItemRenderer.Instance instance, boolean isScoreSummary, float zoom) {
+    public static void drawMapEdited(MapItemRenderer.Instance instance, boolean isScoreSummary, float markerScale) {
         Minecraft mc = Minecraft.getMinecraft();
         int startX = 0;
         int startY = 0;
@@ -336,11 +336,13 @@ else if (player == mc.thePlayer) {
             }
         }
 
+        markerScale = (float) (-0.75F * Math.pow((markerScale - 1.5F), 2F) + 3F);
+
         for (MapMarker mapMarker : allMarkers) {
             GlStateManager.pushMatrix();
             GlStateManager.translate((float)startX + mapMarker.getX() / 2.0F + 64.0F, (float)startY + mapMarker.getZ() / 2.0F + 64.0F, -0.02F);
             GlStateManager.rotate((mapMarker.getRotation() * 360) / 16.0F, 0.0F, 0.0F, 1.0F);
-            GlStateManager.scale(4.0F/zoom, 4.0F/zoom, 3.0F);
+            GlStateManager.scale(markerScale, markerScale, 3.0F);
             byte iconType = mapMarker.getIconType();
             float f1 = (float)(iconType % 4) / 4.0F;
             float f2 = (float)(iconType / 4) / 4.0F;

src/main/java/codes/biscuit/skyblockaddons/gui/IslandWarpGui.java

@@ -43,6 +43,7 @@ public class IslandWarpGui extends GuiScreen {
 
     private Marker selectedMarker;
     private boolean guiIsActualWarpMenu = false;
+    @Getter
     private boolean foundAdvancedWarpToggle = false;
 
     public static float ISLAND_SCALE;

src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandMarkerButton.java

@@ -1,6 +1,6 @@
 package codes.biscuit.skyblockaddons.gui.buttons;
 
-import codes.biscuit.skyblockaddons.SkyblockAddons;
+import codes.biscuit.skyblockaddons.asm.hooks.GuiChestHook;
 import codes.biscuit.skyblockaddons.gui.IslandWarpGui;
 import codes.biscuit.skyblockaddons.utils.ColorCode;
 import codes.biscuit.skyblockaddons.utils.ColorUtils;
@@ -19,7 +19,7 @@ public class IslandMarkerButton extends GuiButton {
 
     private static final ResourceLocation PORTAL_ICON = new ResourceLocation("skyblockaddons", "portal.png");
 
-    @Getter private IslandWarpGui.Marker marker;
+    @Getter private final IslandWarpGui.Marker marker;
 
     private float centerX;
     private float centerY;
@@ -33,7 +33,6 @@ public IslandMarkerButton(IslandWarpGui.Marker marker) {
 
     public void drawButton(float islandX, float islandY, float expansion, boolean hovered, boolean islandUnlocked, IslandWarpGui.UnlockedStatus status) {
         Minecraft mc = Minecraft.getMinecraft();
-        SkyblockAddons main =  SkyblockAddons.getInstance();
 
         float width = 50*expansion;
         float height = width*(100/81F); // Ratio is 81w : 100h
@@ -43,7 +42,16 @@ public void drawButton(float islandX, float islandY, float expansion, boolean ho
 
         this.centerX = centerX;
         this.centerY = centerY;
-        this.unlocked = status == IslandWarpGui.UnlockedStatus.UNLOCKED || status == IslandWarpGui.UnlockedStatus.IN_COMBAT;
+
+        /*
+        Assume crystal hollows and forge are unlocked for non-MVP+ players due to a Hypixel bug that causes those warps
+        to not show in the menu even when unlocked.
+         */
+        this.unlocked = status == IslandWarpGui.UnlockedStatus.UNLOCKED ||
+                status == IslandWarpGui.UnlockedStatus.IN_COMBAT ||
+                (!GuiChestHook.getIslandWarpGui().isFoundAdvancedWarpToggle() &&
+                        (marker == IslandWarpGui.Marker.CRYSTAL_HOLLOWS ||
+                                marker == IslandWarpGui.Marker.DWARVEN_FORGE));
 
         float x = centerX-(width/2);
         float y = centerY-(height/2);