fix xray inter mod comm

4 files changed, 74 insertions, 2 deletions

diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
index 04e938ab..ea0c05c0 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/FeatureRegistry.java
@@ -62,4 +62,6 @@ public class FeatureRegistry {
     public static final FeatureDungeonSecrets DUNGEON_SECRETS = register(new FeatureDungeonSecrets());
     public static final FeatureDungeonTombs DUNGEON_TOMBS = register(new FeatureDungeonTombs());
     public static final FeatureDungeonScore DUNGEON_SCORE = register(new FeatureDungeonScore());
+    public static final FeatureWarnLowHealth DUNGEON_LOWHEALTH_WARN = register(new FeatureWarnLowHealth());
+    public static final SimpleFeature DUNGEON_INTERMODCOMM = register(new SimpleFeature("Dungeon", "Communicate With Other's Dungeons Guide", "Sends total secret in the room to others\nSo that they can use the data to calculate total secret in dungeon run", "dungeon.intermodcomm", true));
 }
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureChestPrice.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureChestPrice.java
index 432f3169..041c0afc 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureChestPrice.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureChestPrice.java
@@ -36,7 +36,6 @@ public class FeatureChestPrice extends SimpleFeature implements GuiBackgroundRen
         if (!(rendered.gui instanceof GuiChest)) return;
         if (!e.getDungeonsGuide().getSkyblockStatus().isOnDungeon()) return;
 
-        GL11.glColor4f(1,1,1,1);
         GlStateManager.disableLighting();
 
         ContainerChest chest = (ContainerChest) ((GuiChest) rendered.gui).inventorySlots;
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 024ccb67..a95ed5d2 100644
--- a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureDungeonScore.java
@@ -41,7 +41,7 @@ public class FeatureDungeonScore extends GuiFeature {
             double scale = getFeatureRect().getHeight() / fr.FONT_HEIGHT;
             GL11.glScaled(scale, scale, 0);
             String letter = getLetter(sum);
-            fr.drawString("Score: "+score + "("+letter+")", 0,0, this.<Color>getParameter("color").getValue().getRGB());
+            fr.drawString("Score: "+sum + "("+letter+")", 0,0, this.<Color>getParameter("color").getValue().getRGB());
         }
    }
 
diff --git a/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java
new file mode 100644
index 00000000..b96841df
--- /dev/null
+++ b/src/main/java/kr/syeyoung/dungeonsguide/features/impl/FeatureWarnLowHealth.java
@@ -0,0 +1,71 @@
+package kr.syeyoung.dungeonsguide.features.impl;
+
+import com.google.common.base.Predicate;
+import kr.syeyoung.dungeonsguide.SkyblockStatus;
+import kr.syeyoung.dungeonsguide.e;
+import kr.syeyoung.dungeonsguide.features.FeatureParameter;
+import kr.syeyoung.dungeonsguide.features.GuiFeature;
+import kr.syeyoung.dungeonsguide.features.SimpleFeature;
+import kr.syeyoung.dungeonsguide.features.listener.WorldRenderListener;
+import kr.syeyoung.dungeonsguide.utils.RenderUtils;
+import kr.syeyoung.dungeonsguide.utils.TextUtils;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.FontRenderer;
+import net.minecraft.entity.item.EntityArmorStand;
+import net.minecraft.scoreboard.Score;
+import net.minecraft.scoreboard.ScoreObjective;
+import net.minecraft.scoreboard.ScorePlayerTeam;
+import net.minecraft.scoreboard.Scoreboard;
+import net.minecraft.util.BlockPos;
+import org.jetbrains.annotations.Nullable;
+import org.lwjgl.opengl.GL11;
+
+import java.awt.*;
+import java.util.List;
+
+
+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"));
+    }
+
+
+    private SkyblockStatus skyblockStatus = e.getDungeonsGuide().getSkyblockStatus();
+
+    @Override
+    public void drawDemo(float partialTicks) {
+        FontRenderer fr = getFontRenderer();
+        double scale = getFeatureRect().getHeight() / fr.FONT_HEIGHT;
+        GL11.glScaled(scale, scale, 0);
+        fr.drawString("DungeonsGuide: ", 0,0,this.<Color>getParameter("color").getValue().getRGB());
+        fr.drawString("500hp", fr.getStringWidth("DungeonsGuide: "), 0, Color.red.getRGB());
+    }
+
+    @Override
+    public void drawHUD(float partialTicks) {
+        FontRenderer fr = getFontRenderer();
+        double scale = getFeatureRect().getHeight() / fr.FONT_HEIGHT;
+        GL11.glScaled(scale, scale, 0);
+        String lowestHealthName = "";
+        int lowestHealth = 999999999;
+        Scoreboard scoreboard = Minecraft.getMinecraft().thePlayer.getWorldScoreboard();
+        ScoreObjective objective = scoreboard.getObjectiveInDisplaySlot(1);
+        for (Score sc : scoreboard.getSortedScores(objective)) {
+            ScorePlayerTeam scorePlayerTeam = scoreboard.getPlayersTeam(sc.getPlayerName());
+            String line = ScorePlayerTeam.formatPlayerName(scorePlayerTeam, sc.getPlayerName()).trim();
+            String stripped = TextUtils.keepScoreboardCharacters(TextUtils.stripColor(line));
+            if (line.endsWith("❤")) {
+                String name = stripped.split(" ")[1];
+                int health = Integer.parseInt(stripped.split(" ")[2]);
+                if (health < lowestHealth) {
+                    lowestHealth = health;
+                    lowestHealthName = name;
+                }
+            }
+        }
+        if (lowestHealth > 500) return;
+        fr.drawString(lowestHealthName+": ", 0,0,this.<Color>getParameter("color").getValue().getRGB());
+        fr.drawString(lowestHealth+"hp", fr.getStringWidth(lowestHealthName+"DungeonsGuide: "), 0, Color.red.getRGB());
+    }
+}