Make all warps unlocked in fancy warp menu

BiscuitDevelopment · Aug 19, 2022 · 2e63017 · 2e63017
1 parent de64eaf
commit 2e63017
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandButton.java b/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandButton.java
@@ -1,6 +1,5 @@
 package codes.biscuit.skyblockaddons.gui.buttons;
 
-import codes.biscuit.skyblockaddons.SkyblockAddons;
 import codes.biscuit.skyblockaddons.gui.IslandWarpGui;
 import codes.biscuit.skyblockaddons.utils.ColorCode;
 import codes.biscuit.skyblockaddons.utils.ColorUtils;
@@ -35,7 +34,7 @@ public IslandButton(IslandWarpGui.Island island, IslandWarpGui.UnlockedStatus un
         super(0, island.getX(), island.getY(), island.getLabel());
 
         this.island = island;
-        this.unlockedStatus = unlockedStatus;
+        this.unlockedStatus = IslandWarpGui.UnlockedStatus.UNLOCKED;
         this.markers = markers;
 
         for (IslandWarpGui.Marker marker : IslandWarpGui.Marker.values()) {

diff --git a/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandMarkerButton.java b/src/main/java/codes/biscuit/skyblockaddons/gui/buttons/IslandMarkerButton.java
@@ -1,6 +1,5 @@
 package codes.biscuit.skyblockaddons.gui.buttons;
 
-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;
@@ -33,6 +32,7 @@ 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();
+        status = IslandWarpGui.UnlockedStatus.UNLOCKED;
 
         float width = 50*expansion;
         float height = width*(100/81F); // Ratio is 81w : 100h
@@ -43,15 +43,8 @@ public void drawButton(float islandX, float islandY, float expansion, boolean ho
         this.centerX = centerX;
         this.centerY = centerY;
 
-        /*
-        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));
+                status == IslandWarpGui.UnlockedStatus.IN_COMBAT;
 
         float x = centerX-(width/2);
         float y = centerY-(height/2);