From f46e22cc54606778142c66991dd537870955e9ee Mon Sep 17 00:00:00 2001
From: Anthony Calosa <anthonycalosa@gmail.com>
Date: Sat, 16 Nov 2024 20:13:17 +0800
Subject: [PATCH] minor cleanup

---
 .../src/forge/screens/match/MatchScreen.java  | 64 ++++++++-----------
 1 file changed, 26 insertions(+), 38 deletions(-)

diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
index 1d245df8c6a..0b84c8a1700 100644
--- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
+++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java
@@ -392,8 +392,7 @@ protected void drawOverlay(Graphics g) {
             if (Forge.isLandscapeMode() && (!GuiBase.isAndroid() || Forge.hasGamepad()) && !CardZoom.isOpen() && potentialListener != null) {
                 for (FDisplayObject object : potentialListener) {
                     if (object != null) {
-                        if (object instanceof FCardPanel) {
-                            FCardPanel cardPanel = (FCardPanel) object;
+                        if (object instanceof FCardPanel cardPanel) {
                             try {
                                 if (cardPanel.isHovered()) {
                                     VPlayerPanel vPlayerPanel = getPlayerPanel(cardPanel.getCard().getController());
@@ -431,9 +430,9 @@ protected void drawOverlay(Graphics g) {
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }
-                        } else if (object instanceof VStack.StackInstanceDisplay) {
+                        } else if (object instanceof VStack.StackInstanceDisplay vstackDisplay) {
                             try {
-                                CardView cardView = ((VStack.StackInstanceDisplay) object).stackInstance.getSourceCard();
+                                CardView cardView = vstackDisplay.stackInstance.getSourceCard();
                                 if (object.isHovered() && cardView != null && getStack().isVisible()) {
                                     float cardW = getHeight() * 0.45f;
                                     float cardH = FCardPanel.ASPECT_RATIO * cardW;
@@ -524,7 +523,7 @@ public boolean keyDown(int keyCode) {
                             }
                         }
                         revalidate(true);
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -538,7 +537,7 @@ public boolean keyDown(int keyCode) {
                             selectedPlayerPanel().getSelectedRow().setNextSelected(1);
                         }
                         revalidate(true);
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -562,7 +561,7 @@ public boolean keyDown(int keyCode) {
                             }
                         }
                         revalidate(true);
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -576,7 +575,7 @@ public boolean keyDown(int keyCode) {
                             selectedPlayerPanel().getSelectedRow().setPreviousSelected(1);
                         }
                         revalidate(true);
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -589,7 +588,7 @@ public boolean keyDown(int keyCode) {
                         } else {
                             selectedPlayerPanel().getSelectedRow().showZoom();
                         }
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -604,7 +603,7 @@ public boolean keyDown(int keyCode) {
                             //nullPotentialListener();
                             selectedPlayerPanel().getSelectedRow().tapChild();
                         }
-                    } catch (Exception e) {
+                    } catch (Exception ignored) {
                     }
                 }
                 break;
@@ -628,7 +627,7 @@ public boolean keyDown(int keyCode) {
                 return getActivePrompt().getBtnCancel().trigger(); //trigger Cancel if can't trigger OK
             case Keys.ESCAPE:
                 if (!FModel.getPreferences().getPrefBoolean(FPref.UI_ALLOW_ESC_TO_END_TURN) && !Forge.hasGamepad()) {//bypass check
-                    if (getActivePrompt().getBtnCancel().getText().equals(Forge.getLocalizer().getInstance().getMessage("lblEndTurn"))) {
+                    if (getActivePrompt().getBtnCancel().getText().equals(Forge.getLocalizer().getMessage("lblEndTurn"))) {
                         return false;
                     }
                 }
@@ -809,12 +808,11 @@ public void hideZones(final PlayerView controller, final Iterable<PlayerZoneUpda
     }
 
     public void updateSingleCard(final CardView card) {
-        final CardAreaPanel pnl = CardAreaPanel.get(card);
-        if (pnl == null) {
+        if (card == null)
             return;
-        }
+        final CardAreaPanel pnl = CardAreaPanel.get(card);
         final ZoneType zone = card.getZone();
-        if (zone != null && zone == ZoneType.Battlefield) {
+        if (zone == ZoneType.Battlefield) {
             pnl.updateCard(card);
         } else { //ensure card not on battlefield is reset such that it no longer thinks it's on the battlefield
             pnl.setTapped(false);
@@ -831,28 +829,18 @@ public void updateSingleCard(final CardView card) {
 
     FSkinTexture getBG() {
         if (Forge.isMobileAdventureMode) {
-            switch (GameScene.instance().getAdventurePlayerLocation(false, true)) {
-                case "green":
-                    return FSkinTexture.ADV_BG_FOREST;
-                case "black":
-                    return FSkinTexture.ADV_BG_SWAMP;
-                case "red":
-                    return FSkinTexture.ADV_BG_MOUNTAIN;
-                case "blue":
-                    return FSkinTexture.ADV_BG_ISLAND;
-                case "white":
-                    return FSkinTexture.ADV_BG_PLAINS;
-                case "waste":
-                    return FSkinTexture.ADV_BG_WASTE;
-                case "cave":
-                    return FSkinTexture.ADV_BG_CAVE;
-                case "dungeon":
-                    return FSkinTexture.ADV_BG_DUNGEON;
-                case "castle":
-                    return FSkinTexture.ADV_BG_CASTLE;
-                default:
-                    return FSkinTexture.ADV_BG_COMMON;
-            }
+            return switch (GameScene.instance().getAdventurePlayerLocation(false, true)) {
+                case "green" -> FSkinTexture.ADV_BG_FOREST;
+                case "black" -> FSkinTexture.ADV_BG_SWAMP;
+                case "red" -> FSkinTexture.ADV_BG_MOUNTAIN;
+                case "blue" -> FSkinTexture.ADV_BG_ISLAND;
+                case "white" -> FSkinTexture.ADV_BG_PLAINS;
+                case "waste" -> FSkinTexture.ADV_BG_WASTE;
+                case "cave" -> FSkinTexture.ADV_BG_CAVE;
+                case "dungeon" -> FSkinTexture.ADV_BG_DUNGEON;
+                case "castle" -> FSkinTexture.ADV_BG_CASTLE;
+                default -> FSkinTexture.ADV_BG_COMMON;
+            };
         }
         return FSkinTexture.BG_MATCH;
     }
@@ -965,7 +953,7 @@ public void drawBackground(Graphics g) {
                     if (!hasActivePlane())
                         return;
             }
-            boolean isGameFast = MatchController.instance.isGameFast();
+            //boolean isGameFast = MatchController.instance.isGameFast(); //this used to control animation speed
             float midField = topPlayerPanel.getBottom();
             float promptHeight = !Forge.isLandscapeMode() || bottomPlayerPrompt == null ? 0f : bottomPlayerPrompt.getHeight() / 1.3f;
             float x = topPlayerPanel.getField().getLeft();