improve server list button detection

Author: fishstiz

common/src/main/java/io/github/fishstiz/minecraftcursor/cursor/handler/multiplayer/MultiplayerServerListWidgetCursorHandler.java

@@ -3,22 +3,40 @@
 import io.github.fishstiz.minecraftcursor.MinecraftCursor;
 import io.github.fishstiz.minecraftcursor.api.CursorHandler;
 import io.github.fishstiz.minecraftcursor.api.CursorType;
+import io.github.fishstiz.minecraftcursor.mixin.cursorhandler.access.OnlineServerEntryAccessor;
 import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList;
 
+import java.util.List;
+
 public class MultiplayerServerListWidgetCursorHandler implements CursorHandler<ServerSelectionList> {
-    public static final int ICON_SIZE = 32;
+    private static final int ICON_SIZE = 32;
+    private static final int MOVE_ICON_SIZE = ICON_SIZE / 2;
 
     @Override
     public CursorType getCursorType(ServerSelectionList serverList, double mouseX, double mouseY) {
         if (!MinecraftCursor.CONFIG.isServerIconEnabled()) return CursorType.DEFAULT;
 
-        ServerSelectionList.OnlineServerEntry serverEntry =
-                (ServerSelectionList.OnlineServerEntry) serverList.getChildAt(mouseX, mouseY)
-                        .filter(entry -> entry instanceof ServerSelectionList.OnlineServerEntry)
-                        .orElse(null);
-        if (serverEntry != null && mouseX >= serverList.getRowLeft() && mouseX <= serverList.getRowLeft() + ICON_SIZE) {
-            return CursorType.POINTER;
+        if (mouseX <= serverList.getRowLeft() + ICON_SIZE) {
+            List<ServerSelectionList.Entry> entries = serverList.children();
+            for (int i = 0; i <= entries.size(); i++) {
+                if (entries.get(i) instanceof ServerSelectionList.OnlineServerEntry entry && entry.isMouseOver(mouseX, mouseY)) {
+                    OnlineServerEntryAccessor accessor = (OnlineServerEntryAccessor) entry;
+                    double relativeX = mouseX - serverList.getRowLeft();
+                    double relativeY = mouseY - serverList.getRowTop(i);
+
+                    if (relativeX < ICON_SIZE && relativeX > MOVE_ICON_SIZE && accessor.invokeCanJoin()) {
+                        return CursorType.POINTER;
+                    }
+                    if (relativeX < MOVE_ICON_SIZE && relativeY < MOVE_ICON_SIZE && i > 0) {
+                        return CursorType.POINTER;
+                    }
+                    if (relativeX < MOVE_ICON_SIZE && relativeY > MOVE_ICON_SIZE && i < accessor.getScreen().getServers().size() - 1) {
+                        return CursorType.POINTER;
+                    }
+                }
+            }
         }
+
         return CursorType.DEFAULT;
     }
 }

common/src/main/java/io/github/fishstiz/minecraftcursor/mixin/cursorhandler/access/OnlineServerEntryAccessor.java

@@ -0,0 +1,16 @@
+package io.github.fishstiz.minecraftcursor.mixin.cursorhandler.access;
+
+import net.minecraft.client.gui.screens.multiplayer.JoinMultiplayerScreen;
+import net.minecraft.client.gui.screens.multiplayer.ServerSelectionList;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(ServerSelectionList.OnlineServerEntry.class)
+public interface OnlineServerEntryAccessor {
+    @Accessor("screen")
+    JoinMultiplayerScreen getScreen();
+
+    @Invoker("canJoin")
+    boolean invokeCanJoin();
+}

common/src/main/resources/minecraft-cursor.mixins.json

@@ -13,6 +13,7 @@
     "cursorhandler.access.CreativeInventoryScreenAccessor",
     "cursorhandler.access.HandledScreenAccessor",
     "cursorhandler.access.LoomScreenAccessor",
+    "cursorhandler.access.OnlineServerEntryAccessor",
     "cursorhandler.access.RecipeAlternativesWidgetAccessor",
     "cursorhandler.access.RecipeBookResultsAccessor",
     "cursorhandler.access.RecipeBookScreenAccessor",