Skip to content

Commit

Permalink
Revert map scale changes and dungeon warp change
Browse files Browse the repository at this point in the history
  • Loading branch information
ILikePlayingGames committed Mar 18, 2022
1 parent bfef1e8 commit 4687b8e
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down Expand Up @@ -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();
Expand Down

0 comments on commit 4687b8e

Please sign in to comment.