优化多人游戏界面与交互

Author: vlouboos

src/main/java/top/fpsmaster/ui/mc/GuiMultiplayer.java

@@ -30,7 +30,6 @@
 import java.util.List;
 
 public class GuiMultiplayer extends ScaledGuiScreen {
-
     private ServerData selectedServer;
     private static final Logger logger = LogManager.getLogger();
     private final List<ServerData> servers = Lists.newArrayList();
@@ -95,7 +94,7 @@ public class GuiMultiplayer extends ScaledGuiScreen {
     public void initGui() {
         super.initGui();
         loadServerList();
-        selectedServer = servers.isEmpty() ? null : servers.get(0);
+        selectedServer = null;
 
         serverListInternet.clear();
         for (ServerData server : servers) {
@@ -183,14 +182,15 @@ public void render(int mouseX, int mouseY, float partialTicks) {
                 if (rowVisible && mouseInViewport && Hover.is(rowX, y, rowWidth, rowHeight, mouseX, mouseY)) {
                     if (consumePressInBounds(rowX, y, rowWidth, rowHeight, 0) != null) {
                         selectedServer = server.getServerData();
+                        server.triggerClick();
                     }
                     Rects.rounded(Math.round(rowX), Math.round(y), Math.round(rowWidth), Math.round(rowHeight), new Color(0, 0, 0, 50));
                 }
 
                 if (selectedServer != null && selectedServer == server.getServerData()) {
                     Rects.rounded(Math.round(rowX), Math.round(y), Math.round(rowWidth), Math.round(rowHeight), new Color(255, 255, 255, 50));
                 }
-                server.drawEntry(0, (int) rowX, (int) y, (int) rowWidth, (int) rowHeight, mouseX, mouseY, false);
+                server.drawEntry(0, (int) rowX, (int) y, (int) rowWidth, mouseX, mouseY);
                 y += 58;
             }
             scrollContainer.setHeight(y - 50 - scrollContainer.getScroll());
@@ -214,7 +214,6 @@ public void updateScreen() {
         super.updateScreen();
         FMLClientHandler.instance().setupServerList();
         this.oldServerPinger.pingPendingNetworks();
-
     }
 
     @Override

src/main/java/top/fpsmaster/ui/mc/ServerListEntry.java

@@ -20,13 +20,10 @@
 import org.apache.commons.lang3.Validate;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
-import org.lwjgl.opengl.GL11;
 import top.fpsmaster.FPSMaster;
 import top.fpsmaster.font.impl.UFontRenderer;
 import top.fpsmaster.utils.render.draw.Hover;
 import top.fpsmaster.utils.render.draw.Images;
-import top.fpsmaster.utils.render.draw.Rects;
-import top.fpsmaster.utils.render.gui.UiScale;
 
 import java.awt.image.BufferedImage;
 import java.net.UnknownHostException;
@@ -39,17 +36,13 @@ public class ServerListEntry {
     private static final Logger logger = LogManager.getLogger();
     private static final ThreadPoolExecutor field_148302_b = new ScheduledThreadPoolExecutor(5, (new ThreadFactoryBuilder()).setNameFormat("Server Pinger #%d").setDaemon(true).build());
     private static final ResourceLocation UNKNOWN_SERVER = new ResourceLocation("textures/misc/unknown_server.png");
-    private static final ResourceLocation SERVER_SELECTION_BUTTONS = new ResourceLocation("textures/gui/server_selection.png");
     private final Minecraft mc;
     private final ServerData server;
     private final ResourceLocation serverIcon;
     private String field_148299_g;
     private DynamicTexture field_148305_h;
-
-
-    int x, y, width, height;
-
-    GuiMultiplayer owner;
+    private final GuiMultiplayer owner;
+    private long lastClick = 0;
 
     protected ServerListEntry(GuiMultiplayer multiplayer, ServerData p_i45048_2_) {
         this.owner = multiplayer;
@@ -60,18 +53,13 @@ protected ServerListEntry(GuiMultiplayer multiplayer, ServerData p_i45048_2_) {
     }
 
 
-    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected) {
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int mouseX, int mouseY) {
         if (!this.server.field_78841_f) {
             this.server.field_78841_f = true;
             this.server.pingToServer = -2L;
             this.server.serverMOTD = "";
             this.server.populationInfo = "";
 
-            this.x = x;
-            this.y = y;
-            this.width = listWidth;
-            this.height = slotHeight;
-
             field_148302_b.submit(() -> {
                 try {
                     owner.oldServerPinger.ping(ServerListEntry.this.server);
@@ -102,7 +90,6 @@ public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight
         int j = text.getStringWidth(s2);
         text.drawString(s2, x + listWidth - j - 15 - 2 - 5, y + 1 + 5, -1);
         int k = 0;
-        String s = null;
         int l;
         String s1;
         if (flag2) {
@@ -139,7 +126,7 @@ public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight
         }
 
 //        this.mc.getTextureManager().bindTexture(Gui.icons);
-        Images.drawUV(Gui.icons, x + listWidth - 15 - 5, y + 5, k * 10, 176 + l * 8, 10, 8, 256, 256,-1,false);
+        Images.drawUV(Gui.icons, x + listWidth - 18, y + 7, k * 10, 176 + l * 8, 10, 8, 256, 256,-1,false);
 
 //        Gui.drawModalRectWithCustomSizedTexture(UiScale.scale(x + listWidth - 15 - 5), UiScale.scale(y + 5), (float) (k * 10), (float) (176 + l * 8), 10, 8, 256.0F, 256.0F);
         if (this.server.getBase64EncodedIconData() != null && !this.server.getBase64EncodedIconData().equals(this.field_148299_g)) {
@@ -166,19 +153,16 @@ public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight
 //            this.owner.setHoveringText(s);
 //        }
 
-        if (Hover.is(x + listWidth - 16, y + 4, 16, 12, mouseX, mouseY)) {
-            text.drawString(s1, x + listWidth - 8, y + 4, -1);
+        if (Hover.is(x + listWidth - 18, y + 7, 10, 8, mouseX, mouseY)) {
+            text.drawString(s1, mouseX + 6, mouseY - 6, -1);
         }
     }
 
     protected void drawTextureAt(int p_178012_1_, int p_178012_2_, ResourceLocation p_178012_3_) {
         Images.draw(p_178012_3_, p_178012_1_, p_178012_2_, 32, 32);
     }
 
-    private boolean func_178013_b() {
-        return true;
-    }
-
+    @SuppressWarnings("VulnerableCodeUsages")
     private void prepareServerIcon() {
         if (this.server.getBase64EncodedIconData() == null) {
             this.mc.getTextureManager().deleteTexture(this.serverIcon);
@@ -217,12 +201,16 @@ private void prepareServerIcon() {
 
     }
 
-    public void clicked(int mouseX, int mouseY, int button) {
-    }
-
     public ServerData getServerData() {
         return this.server;
     }
+
+    public void triggerClick() {
+        if (Minecraft.getSystemTime() - lastClick < 250L) {
+            FMLClientHandler.instance().connectToServer(owner, getServerData());
+        }
+        lastClick = Minecraft.getSystemTime();
+    }
 }