Address more warnings

Gaming32 · May 9, 2024 · 3eb1e7f · 3eb1e7f
1 parent 6636c28
commit 3eb1e7f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java b/src/main/java/io/github/gaming32/worldhost/gui/screen/FriendsScreen.java
@@ -258,7 +258,7 @@ public void maybeRemove() {
 
         @Override
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
-            list.setSelected(this);
+            FriendsScreen.this.list.setSelected(this);
             return false;
         }
     }

diff --git a/src/main/java/io/github/gaming32/worldhost/gui/screen/OnlineFriendsScreen.java b/src/main/java/io/github/gaming32/worldhost/gui/screen/OnlineFriendsScreen.java
@@ -29,7 +29,6 @@
 import org.lwjgl.glfw.GLFW;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.UUID;
@@ -50,7 +49,9 @@
 //#endif
 //#endif
 
-//#if MC < 1.19.4
+//#if MC >= 1.19.4
+import java.util.Arrays;
+//#else
 //$$ import java.util.Objects;
 //#endif
 
@@ -568,7 +569,7 @@ private boolean uploadServerIcon(
         public boolean mouseClicked(double mouseX, double mouseY, int button) {
             select(this);
 
-            final double relX = mouseX - list.getRowLeft();
+            final double relX = mouseX - OnlineFriendsScreen.this.list.getRowLeft();
             if (relX < 32.0 && relX > 16.0) {
                 connect();
                 return true;

diff --git a/src/main/java/io/github/gaming32/worldhost/gui/widget/CustomCycleButton.java b/src/main/java/io/github/gaming32/worldhost/gui/widget/CustomCycleButton.java
@@ -110,6 +110,13 @@ public Component getMessage() {
         return result;
     }
 
+    //#if MC >= 1.19.4
+    @Override
+    public final void setTooltip(@Nullable Tooltip tooltip) {
+        super.setTooltip(tooltip);
+    }
+    //#endif
+
     @NotNull
     public abstract Component getValueMessage();
 }
diff --git a/src/main/java/io/github/gaming32/worldhost/gui/widget/EnumButton.java b/src/main/java/io/github/gaming32/worldhost/gui/widget/EnumButton.java
@@ -8,7 +8,7 @@
 
 import java.util.function.Consumer;
 
-public class EnumButton<E extends Enum<E> & StringRepresentable> extends CustomCycleButton<E, EnumButton<E>> {
+public final class EnumButton<E extends Enum<E> & StringRepresentable> extends CustomCycleButton<E, EnumButton<E>> {
     private final Component[] translations;
 
     public EnumButton(