Update Hysentials Online List.

Author: sinender

src/main/java/llc/redstone/hysentials/guis/hsplayerlist/GuiOnlineList.java

@@ -26,6 +26,7 @@
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.IChatComponent;
 import net.minecraft.util.MathHelper;
+import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -34,35 +35,20 @@
 @SideOnly(Side.CLIENT)
 public class GuiOnlineList extends Gui {
     private static final Ordering<HysentialsSchema.User> field_175252_a = Ordering.from(new PlayerComparator());
+    private static final ResourceLocation hsob = new ResourceLocation("hysentials:gui/hsob.png");
     private final Minecraft mc;
-    private final GuiIngame guiIngame;
     private IChatComponent footer;
     private IChatComponent header;
-    private long lastTimeOpened;
-    private boolean isBeingRendered;
 
     public GuiOnlineList() {
         this.mc = Minecraft.getMinecraft();
-        this.guiIngame = this.mc.ingameGUI;
-    }
-
-    public String getPlayerName(NetworkPlayerInfo networkPlayerInfoIn) {
-        return networkPlayerInfoIn.getDisplayName() != null ? networkPlayerInfoIn.getDisplayName().getFormattedText() : ScorePlayerTeam.formatPlayerName(networkPlayerInfoIn.getPlayerTeam(), networkPlayerInfoIn.getGameProfile().getName());
-    }
-
-    public void updatePlayerList(boolean willBeRendered) {
-        if (willBeRendered && !this.isBeingRendered) {
-            this.lastTimeOpened = Minecraft.getSystemTime();
-        }
-
-        this.isBeingRendered = willBeRendered;
+        footer = null;
     }
 
     public void renderPlayerlist(int width) {
         GlStateManager.pushMatrix();
         List<HysentialsSchema.User> list = field_175252_a.sortedCopy(Socket.cachedUsers.values());
         int i = 0;
-        int j = 0;
         Iterator<HysentialsSchema.User> iterator = list.iterator();
         int k;
         while(iterator.hasNext()) {
@@ -90,6 +76,7 @@ public void renderPlayerlist(int width) {
         List<String> list3 = null;
         Iterator iterator2;
         String string;
+
         if (this.header != null) {
             list2 = this.mc.fontRendererObj.listFormattedStringToWidth(this.header.getFormattedText(), width - 50);
 
@@ -107,17 +94,17 @@ public void renderPlayerlist(int width) {
         }
 
         int s;
-        if (list2 != null) {
-            drawRect(width / 2 - r / 2 - 1, q - 1, width / 2 + r / 2 + 1, q + list2.size() * this.mc.fontRendererObj.FONT_HEIGHT, Integer.MIN_VALUE);
-
-            for(iterator2 = list2.iterator(); iterator2.hasNext(); q += this.mc.fontRendererObj.FONT_HEIGHT) {
-                string = (String)iterator2.next();
-                s = this.mc.fontRendererObj.getStringWidth(string);
-                this.mc.fontRendererObj.drawStringWithShadow(string, (float)(width / 2 - s / 2), (float)q, -1);
-            }
+        //draw hsob
+        drawRect(width / 2 - r / 2 - 1, 0, width / 2 + r / 2 + 1, (int) ((r/2.688172043) + 10), Integer.MIN_VALUE);
+        this.mc.getTextureManager().bindTexture(hsob);
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+        drawModalRectWithCustomSizedTexture(width / 2 - (r + 10) / 2, 0, 0, 0, r + 10, (int) ((r/2.688172043) + 10), r + 10, r/3f + 10);
+        q += (int) (r/2.688172043);
+        this.mc.getTextureManager().bindTexture(GuiIngame.icons);
 
-            ++q;
-        }
 
         drawRect(width / 2 - r / 2 - 1, q - 1, width / 2 + r / 2 + 1, q + m * 9, Integer.MIN_VALUE);
 
@@ -166,103 +153,6 @@ public void renderPlayerlist(int width) {
         GlStateManager.popMatrix();
     }
 
-    protected void drawPing(int i, int j, int k, NetworkPlayerInfo networkPlayerInfoIn) {
-        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-        this.mc.getTextureManager().bindTexture(icons);
-        int l = 0;
-
-        int m;
-        if (networkPlayerInfoIn.getResponseTime() < 0) {
-            m = 5;
-        } else if (networkPlayerInfoIn.getResponseTime() < 150) {
-            m = 0;
-        } else if (networkPlayerInfoIn.getResponseTime() < 300) {
-            m = 1;
-        } else if (networkPlayerInfoIn.getResponseTime() < 600) {
-            m = 2;
-        } else if (networkPlayerInfoIn.getResponseTime() < 1000) {
-            m = 3;
-        } else {
-            m = 4;
-        }
-
-        this.zLevel += 100.0F;
-        this.drawTexturedModalRect(j + i - 11, k, 0 + l * 10, 176 + m * 8, 10, 8);
-        this.zLevel -= 100.0F;
-
-    }
-
-    private void drawScoreboardValues(ScoreObjective scoreObjective, int i, String string, int j, int k, NetworkPlayerInfo networkPlayerInfo) {
-        int l = scoreObjective.getScoreboard().getValueFromObjective(string, scoreObjective).getScorePoints();
-        if (scoreObjective.getRenderType() == EnumRenderType.HEARTS) {
-            this.mc.getTextureManager().bindTexture(icons);
-            if (this.lastTimeOpened == networkPlayerInfo.func_178855_p()) {
-                if (l < networkPlayerInfo.func_178835_l()) {
-                    networkPlayerInfo.func_178846_a(Minecraft.getSystemTime());
-                    networkPlayerInfo.func_178844_b((long)(this.guiIngame.getUpdateCounter() + 20));
-                } else if (l > networkPlayerInfo.func_178835_l()) {
-                    networkPlayerInfo.func_178846_a(Minecraft.getSystemTime());
-                    networkPlayerInfo.func_178844_b((long)(this.guiIngame.getUpdateCounter() + 10));
-                }
-            }
-
-            if (Minecraft.getSystemTime() - networkPlayerInfo.func_178847_n() > 1000L || this.lastTimeOpened != networkPlayerInfo.func_178855_p()) {
-                networkPlayerInfo.func_178836_b(l);
-                networkPlayerInfo.func_178857_c(l);
-                networkPlayerInfo.func_178846_a(Minecraft.getSystemTime());
-            }
-
-            networkPlayerInfo.func_178843_c(this.lastTimeOpened);
-            networkPlayerInfo.func_178836_b(l);
-            int m = MathHelper.ceiling_float_int((float)Math.max(l, networkPlayerInfo.func_178860_m()) / 2.0F);
-            int n = Math.max(MathHelper.ceiling_float_int((float)(l / 2)), Math.max(MathHelper.ceiling_float_int((float)(networkPlayerInfo.func_178860_m() / 2)), 10));
-            boolean bl = networkPlayerInfo.func_178858_o() > (long)this.guiIngame.getUpdateCounter() && (networkPlayerInfo.func_178858_o() - (long)this.guiIngame.getUpdateCounter()) / 3L % 2L == 1L;
-            if (m > 0) {
-                float f = Math.min((float)(k - j - 4) / (float)n, 9.0F);
-                if (f > 3.0F) {
-                    int o;
-                    for(o = m; o < n; ++o) {
-                        this.drawTexturedModalRect((float)j + (float)o * f, (float)i, bl ? 25 : 16, 0, 9, 9);
-                    }
-
-                    for(o = 0; o < m; ++o) {
-                        this.drawTexturedModalRect((float)j + (float)o * f, (float)i, bl ? 25 : 16, 0, 9, 9);
-                        if (bl) {
-                            if (o * 2 + 1 < networkPlayerInfo.func_178860_m()) {
-                                this.drawTexturedModalRect((float)j + (float)o * f, (float)i, 70, 0, 9, 9);
-                            }
-
-                            if (o * 2 + 1 == networkPlayerInfo.func_178860_m()) {
-                                this.drawTexturedModalRect((float)j + (float)o * f, (float)i, 79, 0, 9, 9);
-                            }
-                        }
-
-                        if (o * 2 + 1 < l) {
-                            this.drawTexturedModalRect((float)j + (float)o * f, (float)i, o >= 10 ? 160 : 52, 0, 9, 9);
-                        }
-
-                        if (o * 2 + 1 == l) {
-                            this.drawTexturedModalRect((float)j + (float)o * f, (float)i, o >= 10 ? 169 : 61, 0, 9, 9);
-                        }
-                    }
-                } else {
-                    float g = MathHelper.clamp_float((float)l / 20.0F, 0.0F, 1.0F);
-                    int p = (int)((1.0F - g) * 255.0F) << 16 | (int)(g * 255.0F) << 8;
-                    String string2 = "" + (float)l / 2.0F;
-                    if (k - this.mc.fontRendererObj.getStringWidth(string2 + "hp") >= j) {
-                        string2 = string2 + "hp";
-                    }
-
-                    this.mc.fontRendererObj.drawStringWithShadow(string2, (float)((k + j) / 2 - this.mc.fontRendererObj.getStringWidth(string2) / 2), (float)i, p);
-                }
-            }
-        } else {
-            String string3 = EnumChatFormatting.YELLOW + "" + l;
-            this.mc.fontRendererObj.drawStringWithShadow(string3, (float)(k - this.mc.fontRendererObj.getStringWidth(string3)), (float)i, 16777215);
-        }
-
-    }
-
     public void setFooter(IChatComponent footerIn) {
         this.footer = footerIn;
     }

src/main/java/llc/redstone/hysentials/mixin/GuiIngameForgeMixin.java

@@ -123,7 +123,6 @@ private void cancelSelectedItem(CallbackInfo ci) {
     protected boolean hysentials$renderHysentialsPlayerList(int width, int height)
     {
         if (HysentialsConfig.onlinePlayersKeyBind.isActive() && Minecraft.getMinecraft().currentScreen == null) {
-            hysentials$hysentialsOnlineList.updatePlayerList(true);
             ScaledResolution res = new ScaledResolution(Minecraft.getMinecraft());
             hysentials$hysentialsOnlineList.renderPlayerlist(res.getScaledWidth());
             return true;