what?

6 files changed, 322 insertions, 21 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDisableMessage.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDisableMessage.java
index e4ac78c7..50bb0211 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDisableMessage.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDisableMessage.java
@@ -31,19 +31,19 @@ public class FeatureDisableMessage extends SimpleFeature implements ChatListener
 
     private static final MessageData[] PRE_DEFINED = new MessageData[] {
             new MessageData(Pattern.compile("§r§cThere are blocks in the way!§r"), "Aote block message", "\"There are blocks in the way!\"", "aote"),
-            new MessageData(Pattern.compile("§r§cThis ability is currently on cooldown for .+ more seconds\\.§r"), "Ability cooldown message", "\"This ability is currently on cooldown for 3 more seconds.\"", "cooldown"),
+            new MessageData(Pattern.compile("§r§cThis ability is currently on cooldown for .+ more seconds?\\.§r"), "Ability cooldown message", "\"This ability is currently on cooldown for 3 more seconds.\"", "cooldown"),
             new MessageData(Pattern.compile("§r§cWhow! Slow down there!§r"), "Grappling hook cooldown", "\"Whow! Slow down there!\"", "grappling"),
             new MessageData(Pattern.compile("§r§cNo more charges, next one in §r§e.+§r§cs!§r"), "Zombie Sword Charging", "\"No more charges, next one in 3s!\"", "zombie"),
             new MessageData(Pattern.compile("§r§7Your .+ hit §r§c.+ §r§7enem(?:y|ies) for §r§c.+ §r§7damage\\.§r"), "Ability Damage", "\"Your blahblah hit 42 enemy for a lots of damage\"", "ability"),
             new MessageData(Pattern.compile("§r§cYou do not have enough mana to do this!§r"), "Not enough mana", "\"You do not have enough mana to do this!\"", "mana"),
             new MessageData(Pattern.compile("§r§aUsed §r.+§r§a!§r"), "Dungeon Ability Usage", "\"Used Guided Sheep!\" and such", "dungeonability"),
-            new MessageData(Pattern.compile("D§r.+§r§a is ready to use! Press §r.+§r§a to activate it!§r"), "Ready to use message", "\"Blah is ready to use! Press F to activate it!", "readytouse"),
+            new MessageData(Pattern.compile("§r.+§r§a is ready to use! Press §r.+§r§a to activate it!§r"), "Ready to use message", "\"Blah is ready to use! Press F to activate it!", "readytouse"),
             new MessageData(Pattern.compile("§r.+ §r§ais now available!§r"), "Ability Available","\"blah is now available!\"", "available"),
             new MessageData(Pattern.compile("§r§cThe Stone doesn't seem to do anything here\\.§r"), "Stone Message", "\"The Stone doesn't seem to do anything here\"", "stone")
     };
 
     public FeatureDisableMessage() {
-        super("Fixes", "Disable ability messages", "Do not let ability messages show up in chatbox\nclick on Edit for more precise settings", "fixes.messagedisable", true);
+        super("fixes", "Disable ability messages", "Do not let ability messages show up in chatbox\nclick on Edit for more precise settings", "fixes.messagedisable", true);
         for (MessageData messageData : PRE_DEFINED) {
             this.parameters.put(messageData.key, new FeatureParameter<Boolean>(messageData.key, messageData.name, messageData.description, true, "boolean"));
         }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java
new file mode 100644
index 00000000..67b2dfac
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonMap.java
@@ -0,0 +1,301 @@
+package kr.syeyoung.dungeonsguide.features.impl;
+
+import com.google.common.collect.ComparisonChain;
+import com.google.common.collect.Ordering;
+import com.mojang.authlib.GameProfile;
+import kr.syeyoung.dungeonsguide.SkyblockStatus;
+import kr.syeyoung.dungeonsguide.dungeon.DungeonContext;
+import kr.syeyoung.dungeonsguide.dungeon.MapProcessor;
+import kr.syeyoung.dungeonsguide.dungeon.roomfinder.DungeonRoom;
+import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.features.FeatureParameter;
+import kr.syeyoung.dungeonsguide.features.GuiFeature;
+import kr.syeyoung.dungeonsguide.features.listener.BossroomEnterListener;
+import kr.syeyoung.dungeonsguide.features.listener.ChatListener;
+import kr.syeyoung.dungeonsguide.features.listener.DungeonEndListener;
+import kr.syeyoung.dungeonsguide.features.listener.DungeonStartListener;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.block.material.MapColor;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.client.gui.Gui;
+import net.minecraft.client.gui.GuiPlayerTabOverlay;
+import net.minecraft.client.gui.MapItemRenderer;
+import net.minecraft.client.network.NetworkPlayerInfo;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.DynamicTexture;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EnumPlayerModelParts;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Vec4b;
+import net.minecraft.world.WorldSettings;
+import net.minecraft.world.storage.MapData;
+import net.minecraftforge.client.event.ClientChatReceivedEvent;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import org.lwjgl.opengl.GL11;
+
+import java.awt.*;
+import java.util.List;
+import java.util.Comparator;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class FeatureDungeonMap extends GuiFeature implements DungeonEndListener, DungeonStartListener, BossroomEnterListener {
+    public FeatureDungeonMap() {
+        super("Dungeon", "Dungeon Map", "Display dungeon map!", "dungeon.map", true, 512,512);
+        this.setEnabled(false);
+        parameters.put("scale", new FeatureParameter<Boolean>("scale", "Scale map", "Whether to scale map to fit screen", true, "boolean"));
+        parameters.put("playerCenter", new FeatureParameter<Boolean>("playerCenter", "Center map at player", "Render you in the center", false, "boolean"));
+        parameters.put("rotate", new FeatureParameter<Boolean>("rotate", "Rotate map centered at player", "Only works with Center map at player enabled", false, "boolean"));
+        parameters.put("postScale", new FeatureParameter<Float>("postScale", "Scale factor of map", "Only works with Center map at player enabled", 1.0f, "float"));
+        parameters.put("showotherplayers", new FeatureParameter<Boolean>("showotherplayers", "Show other players", "Option to show other players in map", true, "boolean"));
+    }
+
+    SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+    public static final Ordering<NetworkPlayerInfo> field_175252_a = Ordering.from(new PlayerComparator());
+
+    private boolean on = false;
+
+    @Override
+    public void onDungeonEnd() {
+        on = false;
+    }
+
+    @Override
+    public void onDungeonStart() {
+        on = true;
+    }
+
+    @Override
+    public void onBossroomEnter() {
+        on = false;
+    }
+
+    @SideOnly(Side.CLIENT)
+    static class PlayerComparator implements Comparator<NetworkPlayerInfo>
+    {
+        private PlayerComparator()
+        {
+        }
+
+        public int compare(NetworkPlayerInfo p_compare_1_, NetworkPlayerInfo p_compare_2_)
+        {
+            ScorePlayerTeam scoreplayerteam = p_compare_1_.getPlayerTeam();
+            ScorePlayerTeam scoreplayerteam1 = p_compare_2_.getPlayerTeam();
+            return ComparisonChain.start().compareTrueFirst(p_compare_1_.getGameType() != WorldSettings.GameType.SPECTATOR, p_compare_2_.getGameType() != WorldSettings.GameType.SPECTATOR).compare(scoreplayerteam != null ? scoreplayerteam.getRegisteredName() : "", scoreplayerteam1 != null ? scoreplayerteam1.getRegisteredName() : "").compare(p_compare_1_.getGameProfile().getName(), p_compare_2_.getGameProfile().getName()).result();
+        }
+    }
+    @Override
+    public void drawHUD(float partialTicks) {
+        if (!skyblockStatus.isOnDungeon()) return;
+        if (skyblockStatus.getContext() == null | !skyblockStatus.getContext().getMapProcessor().isInitialized()) return;
+
+        GL11.glPushMatrix();;
+        float postScale = this.<Boolean>getParameter("playerCenter").getValue() ? this.<Float>getParameter("postScale").getValue() : 1;
+
+        DungeonContext context = skyblockStatus.getContext();
+        MapProcessor mapProcessor = context.getMapProcessor();
+        MapData mapData = mapProcessor.getLastMapData2();
+        Gui.drawRect(0,0,getFeatureRect().width, getFeatureRect().height, 0x22000000);
+        GlStateManager.color(1,1,1,1);
+        if (mapData == null) {
+            Gui.drawRect(0,0,getFeatureRect().width, getFeatureRect().height, 0xFFFF0000);
+        } else {
+            int width = getFeatureRect().width;
+            float scale = (this.<Boolean>getParameter("scale").getValue() ? width / 128.0f : 1);
+            GL11.glTranslated(width / 2, width / 2, 0);
+            GL11.glScaled(scale, scale, 0);
+            GL11.glScaled(postScale, postScale,0);
+            EntityPlayer p = Minecraft.getMinecraft().thePlayer;
+            Point pt = mapProcessor.worldPointToMapPoint(p.getPositionEyes(partialTicks));
+            double yaw = p.prevRotationYawHead + (p.rotationYaw - p.prevRotationYawHead) * partialTicks;
+            if (this.<Boolean>getParameter("playerCenter").getValue()) {
+                if (this.<Boolean>getParameter("rotate").getValue()) {
+                    GL11.glRotated((180 - yaw), 0,0,1);
+                }
+                GL11.glTranslated( -pt.x, -pt.y, 0);
+            } else {
+                GL11.glTranslated( -64, -64, 0);
+            }
+            updateMapTexture(mapData.colors, mapProcessor, context.getDungeonRoomList());
+            render(mapData, false);
+
+            for (Map.Entry<String, Vec4b> stringVec4bEntry : mapData.mapDecorations.entrySet()) {
+                System.out.println(stringVec4bEntry.getKey() + " - "+stringVec4bEntry.getValue());
+            }
+
+                List<NetworkPlayerInfo> list = field_175252_a.sortedCopy(Minecraft.getMinecraft().thePlayer.sendQueue.getPlayerInfoMap());
+                for (int i = 1; i < 10; i++) {
+                    NetworkPlayerInfo networkPlayerInfo = list.get(i);
+                    String name = networkPlayerInfo.getDisplayName() != null ? networkPlayerInfo.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfo.getPlayerTeam(), networkPlayerInfo.getGameProfile().getName());
+                    if (name.trim().equals("§r") || name.startsWith("§r ")) continue;
+                    EntityPlayer entityplayer = Minecraft.getMinecraft().theWorld.getPlayerEntityByName(TextUtils.stripColor(name).trim().split(" ")[0]);
+                    if (entityplayer == null) continue;
+                    if (entityplayer == Minecraft.getMinecraft().thePlayer || this.<Boolean>getParameter("showotherplayers").getValue())
+                    {
+
+                        GL11.glPushMatrix();
+                        boolean flag1 = entityplayer.isWearing(EnumPlayerModelParts.CAPE);
+                        Minecraft.getMinecraft().getTextureManager().bindTexture(networkPlayerInfo.getLocationSkin());
+                        int l2 = 8 + (flag1 ? 8 : 0);
+                        int i3 = 8 * (flag1 ? -1 : 1);
+
+                        Point pt2 = mapProcessor.worldPointToMapPoint(entityplayer.getPositionEyes(partialTicks));
+                        double yaw2 = entityplayer.prevRotationYawHead + (entityplayer.rotationYaw - entityplayer.prevRotationYawHead) * partialTicks;
+
+
+                        GL11.glTranslated(pt2.x, pt2.y, 0);
+                        GL11.glRotated(yaw2 - 180, 0, 0, 1);
+
+                        GL11.glScaled(1 / scale, 1 / scale, 0);
+                        GL11.glScaled(1 / postScale, 1 / postScale, 0);
+                        Gui.drawScaledCustomSizeModalRect(-4, -4, 8.0F, (float) l2, 8, i3, 8, 8, 64.0F, 64.0F);
+
+                        if (entityplayer.isWearing(EnumPlayerModelParts.HAT)) {
+                            int j3 = 8 + (flag1 ? 8 : 0);
+                            int k3 = 8 * (flag1 ? -1 : 1);
+                            Gui.drawScaledCustomSizeModalRect(-4, -4, 40.0F, (float) j3, 8, k3, 8, 8, 64.0F, 64.0F);
+                        }
+                    }
+                    GL11.glPopMatrix();
+                }
+
+            FontRenderer fr = getFontRenderer();
+            if (true) {
+                for (DungeonRoom dungeonRoom : context.getDungeonRoomList()) {
+                    GL11.glPushMatrix();
+                    Point mapPt = mapProcessor.roomPointToMapPoint(dungeonRoom.getUnitPoints().get(0));
+                    GL11.glTranslated(mapPt.x + mapProcessor.getUnitRoomDimension().width / 2, mapPt.y + mapProcessor.getUnitRoomDimension().height / 2, 0);
+
+                    if (this.<Boolean>getParameter("rotate").getValue()) {
+                        GL11.glRotated(yaw - 180, 0, 0, 1);
+                    }
+                    GL11.glScaled(1 / scale, 1 / scale, 0);
+                    GL11.glScaled(1 / postScale, 1 / postScale, 0);
+                    String str = dungeonRoom.getTotalSecrets() == -1 ? "?" : String.valueOf(dungeonRoom.getTotalSecrets());
+                    str += " ";
+                    if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FINISHED) {
+                        str += "●";
+                    } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.COMPLETE_WITHOUT_SECRETS) {
+                        str += "◎";
+                    } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.DISCOVERED) {
+                        str += "○";
+                    } else if (dungeonRoom.getCurrentState() == DungeonRoom.RoomState.FAILED) {
+                        str += "❌";
+                    }
+
+                    fr.drawString(str, -(fr.getStringWidth(str) / 2) ,  - (fr.FONT_HEIGHT / 2), dungeonRoom.getColor() == 74 ? 0xff000000 : 0xFFFFFFFF);
+                    GL11.glPopMatrix();
+                }
+            }
+        }
+        GL11.glPopMatrix();
+    }
+
+    @Override
+    public void drawDemo(float partialTicks) {
+    }
+
+
+
+    private DynamicTexture mapTexture = new DynamicTexture(128, 128);
+    private ResourceLocation location = Minecraft.getMinecraft().getTextureManager().getDynamicTextureLocation("dungeonmap/map", mapTexture);
+    private int[] mapTextureData = mapTexture.getTextureData();
+
+    private void updateMapTexture(byte[] colors, MapProcessor mapProcessor, List<DungeonRoom> dungeonRooms) {
+        for (int i = 0; i < 16384; ++i) {
+            int j = colors[i] & 255;
+
+            if (j / 4 == 0) {
+                this.mapTextureData[i] = (i + i / 128 & 1) * 8 + 16 << 24;
+            } else {
+                this.mapTextureData[i] = MapColor.mapColorArray[j / 4].func_151643_b(j & 3);
+            }
+        }
+
+        for (DungeonRoom dungeonRoom : dungeonRooms) {
+            for (Point pt : dungeonRoom.getUnitPoints()) {
+                for (int y1 = 0; y1 < mapProcessor.getUnitRoomDimension().height; y1++) {
+                    for (int x1 = 0; x1 < mapProcessor.getUnitRoomDimension().width; x1++) {
+                        int x = MathHelper.clamp_int(pt.x * (mapProcessor.getUnitRoomDimension().width + mapProcessor.getDoorDimension().height) + x1 + mapProcessor.getTopLeftMapPoint().x, 0, 128);
+                        int y = MathHelper.clamp_int(pt.y * (mapProcessor.getUnitRoomDimension().height + mapProcessor.getDoorDimension().height)+ y1 + mapProcessor.getTopLeftMapPoint().y, 0, 128);
+                        int i = y * 128 + x;
+                        int j = dungeonRoom.getColor();
+
+                        if (j / 4 == 0) {
+                            this.mapTextureData[i] = (i + i / 128 & 1) * 8 + 16 << 24;
+                        } else {
+                            this.mapTextureData[i] = MapColor.mapColorArray[j / 4].func_151643_b(j & 3);
+                        }
+                    }
+                }
+            }
+        }
+
+
+        this.mapTexture.updateDynamicTexture();
+    }
+
+    private void render(MapData mapData, boolean noOverlayRendering) {
+        int i = 0;
+        int j = 0;
+        Tessellator tessellator = Tessellator.getInstance();
+        WorldRenderer worldrenderer = tessellator.getWorldRenderer();
+        float f = 0.0F;
+        Minecraft.getMinecraft().getTextureManager().bindTexture(this.location);
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(1, 771, 0, 1);
+        GlStateManager.disableAlpha();
+        worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
+        worldrenderer.pos((float)(i) + f, (double)((float)(j + 128) - f), -0.009999999776482582D).tex(0.0D, 1.0D).endVertex();
+        worldrenderer.pos((float)(i + 128) - f, (double)((float)(j + 128) - f), -0.009999999776482582D).tex(1.0D, 1.0D).endVertex();
+        worldrenderer.pos((float)(i + 128) - f, (double)((float)(j) + f), -0.009999999776482582D).tex(1.0D, 0.0D).endVertex();
+        worldrenderer.pos((float)(i) + f, (double)((float)(j) + f), -0.009999999776482582D).tex(0.0D, 0.0D).endVertex();
+        tessellator.draw();
+        GlStateManager.enableAlpha();
+        GlStateManager.disableBlend();
+//        Minecraft.getMinecraft().getTextureManager().bindTexture(MapItemRenderer.mapIcons);
+//        int k = 0;
+//
+//        for (Vec4b vec4b : this.mapData.mapDecorations.values())
+//        {
+//            if (!noOverlayRendering || vec4b.func_176110_a() == 1)
+//            {
+//                GlStateManager.pushMatrix();
+//                GlStateManager.translate((float)i + (float)vec4b.func_176112_b() / 2.0F + 64.0F, (float)j + (float)vec4b.func_176113_c() / 2.0F + 64.0F, -0.02F);
+//                GlStateManager.rotate((float)(vec4b.func_176111_d() * 360) / 16.0F, 0.0F, 0.0F, 1.0F);
+//                GlStateManager.scale(4.0F, 4.0F, 3.0F);
+//                GlStateManager.translate(-0.125F, 0.125F, 0.0F);
+//                byte b0 = vec4b.func_176110_a();
+//                float f1 = (float)(b0 % 4 + 0) / 4.0F;
+//                float f2 = (float)(b0 / 4 + 0) / 4.0F;
+//                float f3 = (float)(b0 % 4 + 1) / 4.0F;
+//                float f4 = (float)(b0 / 4 + 1) / 4.0F;
+//                worldrenderer.begin(7, DefaultVertexFormats.POSITION_TEX);
+//                float f5 = -0.001F;
+//                worldrenderer.pos(-1.0D, 1.0D, (double)((float)k * -0.001F)).tex((double)f1, (double)f2).endVertex();
+//                worldrenderer.pos(1.0D, 1.0D, (double)((float)k * -0.001F)).tex((double)f3, (double)f2).endVertex();
+//                worldrenderer.pos(1.0D, -1.0D, (double)((float)k * -0.001F)).tex((double)f3, (double)f4).endVertex();
+//                worldrenderer.pos(-1.0D, -1.0D, (double)((float)k * -0.001F)).tex((double)f1, (double)f4).endVertex();
+//                tessellator.draw();
+//                GlStateManager.popMatrix();
+//                ++k;
+//            }
+//        }
+
+        GlStateManager.pushMatrix();
+        GlStateManager.translate(0.0F, 0.0F, -0.04F);
+        GlStateManager.scale(1.0F, 1.0F, 1.0F);
+        GlStateManager.popMatrix();
+    }
+
+}
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java
index 444cd85a..880efbaf 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java
@@ -76,6 +76,8 @@ public class FeatureDungeonScore extends GuiFeature {
         if (!skyblockStatus.isOnDungeon()) return null;
         DungeonContext context = skyblockStatus.getContext();
         if (context == null) return null;
+        if (!context.getMapProcessor().isInitialized()) return null;
+
         int skill = 100;
         int deaths = 0;
         {
@@ -107,7 +109,7 @@ public class FeatureDungeonScore extends GuiFeature {
         int time = 0;
         {
             double timeModifier;
-            if (context.getMapProcessor().isInBossRoom()) {
+            if (context.getBossRoomEnterSeconds() != -1) {
                 timeModifier = Math.max(0, context.getBossRoomEnterSeconds() - 1200);
             } else {
                 timeModifier = Math.max(0, FeatureRegistry.DUNGEON_SBTIME.getTimeElapsed() / 1000 - 1200);
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java
index 74c0cec3..db2439e5 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureInstaCloseChest.java
@@ -62,10 +62,10 @@ public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenList
                 public int compare(String o1, String o2) {
                     String id2 = id + "::" + o1 + "-" + enchants.getInteger(o1);
                     AhUtils.AuctionData auctionData = AhUtils.auctions.get(id2);
-                    int price1 = (auctionData == null) ? 0 : ((Integer)auctionData.prices.first()).intValue();
+                    int price1 = (auctionData == null) ? 0 : auctionData.lowestBin;
                     String id3 = id + "::" + o2 + "-" + enchants.getInteger(o2);
                     AhUtils.AuctionData auctionData2 = AhUtils.auctions.get(id3);
-                    int price2 = (auctionData2 == null) ? 0 : ((Integer)auctionData2.prices.first()).intValue();
+                    int price2 = (auctionData2 == null) ? 0 : auctionData2.lowestBin;
                     return (compare2(price1, price2) == 0) ? o1.compareTo(o2) : compare2(price1, price2);
                 }
 
@@ -78,7 +78,7 @@ public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenList
             for (String key : actualKeys) {
                 String id2 = id + "::" + key + "-" + enchants.getInteger(key);
                 AhUtils.AuctionData auctionData = AhUtils.auctions.get(id2);
-                totalLowestPrice += auctionData.prices.first();
+                totalLowestPrice += auctionData.lowestBin;
             }
             return totalLowestPrice;
         } else {
@@ -86,10 +86,10 @@ public class FeatureInstaCloseChest extends SimpleFeature implements GuiOpenList
             if (auctionData == null) {
                 return 0;
             } else {
-                if (auctionData.sellPrice == -1 && auctionData.prices.size() > 0) return auctionData.prices.first();
-                else if (auctionData.sellPrice != -1 && auctionData.prices.size() == 0) return auctionData.sellPrice;
+                if (auctionData.sellPrice == -1 && auctionData.lowestBin != -1) return auctionData.lowestBin;
+                else if (auctionData.sellPrice != -1 && auctionData.lowestBin == -1) return auctionData.sellPrice;
                 else {
-                    int ahPrice = auctionData.prices.first();
+                    int ahPrice = auctionData.lowestBin;
                     if (ahPrice > auctionData.sellPrice) return ahPrice;
                     else return auctionData.sellPrice;
                 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureTooltipPrice.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureTooltipPrice.java
index 68393ca2..ba8422af 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureTooltipPrice.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureTooltipPrice.java
@@ -46,10 +46,10 @@ public class FeatureTooltipPrice extends SimpleFeature implements TooltipListene
                 public int compare(String o1, String o2) {
                     String id2 = id + "::" + o1 + "-" + enchants.getInteger(o1);
                     AhUtils.AuctionData auctionData = AhUtils.auctions.get(id2);
-                    int price1 = (auctionData == null) ? 0 : ((Integer)auctionData.prices.first()).intValue();
+                    int price1 = (auctionData == null) ? 0 : auctionData.lowestBin;
                     String id3 = id + "::" + o2 + "-" + enchants.getInteger(o2);
                     AhUtils.AuctionData auctionData2 = AhUtils.auctions.get(id3);
-                    int price2 = (auctionData2 == null) ? 0 : ((Integer)auctionData2.prices.first()).intValue();
+                    int price2 = (auctionData2 == null) ? 0 : auctionData2.lowestBin;
                     return (compare2(price1, price2) == 0) ? o1.compareTo(o2) : compare2(price1, price2);
                 }
 
@@ -59,7 +59,6 @@ public class FeatureTooltipPrice extends SimpleFeature implements TooltipListene
             });
             actualKeys.addAll(keys);
             int totalLowestPrice = 0;
-            int totalHighestPrice = 0;
             int iterations = 0;
             for (String key : actualKeys) {
                 iterations++;
@@ -71,24 +70,21 @@ public class FeatureTooltipPrice extends SimpleFeature implements TooltipListene
                     continue;
                 }
                 if (iterations < 10)
-                    event.toolTip.add("§f"+ key + " " + enchants.getInteger(key) + "§7: §e"+ TextUtils.format((Integer) auctionData.prices.first()) + " §7to§e "+ TextUtils.format(auctionData.prices.last()));
-                totalLowestPrice += auctionData.prices.first();
-                totalHighestPrice += auctionData.prices.last();
+                    event.toolTip.add("§f"+ key + " " + enchants.getInteger(key) + "§7: §e"+ TextUtils.format( auctionData.lowestBin));
+                totalLowestPrice += auctionData.lowestBin;
             }
             if (iterations >= 10)
                 event.toolTip.add("§7"+ (iterations - 10) + " more enchants... ");
-            event.toolTip.add("§fTotal§7: §e"+ TextUtils.format(totalLowestPrice) + " §7to§e "+ TextUtils.format(totalHighestPrice));
+            event.toolTip.add("§fTotal Lowest§7: §e"+ TextUtils.format(totalLowestPrice));
         } else {
             AhUtils.AuctionData auctionData = AhUtils.auctions.get(id);
             event.toolTip.add("");
             if (auctionData == null) {
                 event.toolTip.add("§fLowest ah §7: §cn/a");
-                event.toolTip.add("§fHighest ah §7: §cn/a");
                 event.toolTip.add("§fBazaar sell price §7: §cn/a");
                 event.toolTip.add("§fBazaar buy price §7: §cn/a");
             } else {
-                event.toolTip.add("§fLowest ah §7: " + ((auctionData.prices.size() != 0) ? ("§e"+ TextUtils.format(auctionData.prices.first().intValue())) : "§cn/a"));
-                event.toolTip.add("§fHighest ah §7: " + ((auctionData.prices.size() != 0) ? ("§e"+ TextUtils.format((auctionData.prices.last()).intValue())) : "§cn/a"));
+                event.toolTip.add("§fLowest ah §7: " + ((auctionData.lowestBin != -1) ? ("§e"+ TextUtils.format(auctionData.lowestBin)) : "§cn/a"));
                 event.toolTip.add("§fBazaar sell price §7: " + ((auctionData.sellPrice == -1) ? "§cn/a": ("§e"+ TextUtils.format(auctionData.sellPrice))));
                 event.toolTip.add("§fBazaar buy price §7: " + ((auctionData.buyPrice == -1) ? "§cn/a": ("§e"+ TextUtils.format(auctionData.buyPrice))));
             }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java
index b96841df..ab3a727d 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java
@@ -28,6 +28,8 @@ public class FeatureWarnLowHealth extends GuiFeature {
     public FeatureWarnLowHealth() {
         super("Dungeon", "Low Health Warning", "Warn if someone is on low health", "dungeon.lowhealthwarn", false, 200, 50);
         parameters.put("color", new FeatureParameter<Color>("color", "Color", "Color of playername", Color.yellow, "color"));
+        parameters.put("threshold", new FeatureParameter<Integer>("threshold", "Health Threshold", "Health Threshold for this feature to be toggled. default to 500", 500, "integer"));
+
     }
 
 
@@ -64,7 +66,7 @@ public class FeatureWarnLowHealth extends GuiFeature {
                 }
             }
         }
-        if (lowestHealth > 500) return;
+        if (lowestHealth > this.<Integer>getParameter("threshold").getValue()) return;
         fr.drawString(lowestHealthName+": ", 0,0,this.<Color>getParameter("color").getValue().getRGB());
         fr.drawString(lowestHealth+"hp", fr.getStringWidth(lowestHealthName+"DungeonsGuide: "), 0, Color.red.getRGB());
     }