From c9b42a6dfbd6501475aff582b7ab911a319c1ca6 Mon Sep 17 00:00:00 2001
From: "Breno A." <git@breno.tech>
Date: Sun, 9 Jun 2024 09:25:14 -0300
Subject: [PATCH] refactor: replace switch with enhanced switch

---
 .../grasscutter/game/inventory/Inventory.java | 38 +++++++++----------
 .../recv/HandlerSetPlayerBirthdayReq.java     | 24 +++---------
 2 files changed, 25 insertions(+), 37 deletions(-)

diff --git a/src/main/java/emu/grasscutter/game/inventory/Inventory.java b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
index 67dcd32ba..b0e8f72d9 100644
--- a/src/main/java/emu/grasscutter/game/inventory/Inventory.java
+++ b/src/main/java/emu/grasscutter/game/inventory/Inventory.java
@@ -431,26 +431,26 @@ public class Inventory extends BasePlayerManager implements Iterable<GameItem> {
     }
 
     private int getVirtualItemCount(int itemId) {
-        switch (itemId) {
-            case 201: // Primogem
-                return this.player.getPrimogems();
-            case 202: // Mora
-                return this.player.getMora();
-            case 203: // Genesis Crystals
-                return this.player.getCrystals();
-            case 106: // Resin
-                return this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
-            case 107: // Legendary Key
-                return this.player.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
-            case 204: // Home Coin
-                return this.player.getHomeCoin();
-            default:
+        return switch (itemId) {
+            case 201 -> // Primogem
+                this.player.getPrimogems();
+            case 202 -> // Mora
+                this.player.getMora();
+            case 203 -> // Genesis Crystals
+                this.player.getCrystals();
+            case 106 -> // Resin
+                this.player.getProperty(PlayerProperty.PROP_PLAYER_RESIN);
+            case 107 -> // Legendary Key
+                this.player.getProperty(PlayerProperty.PROP_PLAYER_LEGENDARY_KEY);
+            case 204 -> // Home Coin
+                this.player.getHomeCoin();
+            default -> {
                 GameItem item =
-                        getInventoryTab(ItemType.ITEM_MATERIAL)
-                                .getItemById(
-                                        itemId); // What if we ever want to operate on weapons/relics/furniture? :S
-                return (item == null) ? 0 : item.getCount();
-        }
+                    getInventoryTab(ItemType.ITEM_MATERIAL)
+                        .getItemById(
+                            itemId); // What if we ever want to operate on weapons/relics/furniture? :Syield (item == null) ? 0 : item.getCount(); // What if we ever want to operate on weapons/relics/furniture? :S
+            }
+        };
     }
 
     public synchronized boolean payItem(int id, int count) {
diff --git a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
index 4103ca8d4..b4752b421 100644
--- a/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
+++ b/src/main/java/emu/grasscutter/server/packet/recv/HandlerSetPlayerBirthdayReq.java
@@ -40,24 +40,12 @@ public class HandlerSetPlayerBirthdayReq extends PacketHandler {
 
     private boolean isValidBirthday(int month, int day) {
 
-        switch (month) {
-            case 1:
-            case 3:
-            case 5:
-            case 7:
-            case 8:
-            case 10:
-            case 12:
-                return day > 0 & day <= 31;
-            case 4:
-            case 6:
-            case 9:
-            case 11:
-                return day > 0 && day <= 30;
-            case 2:
-                return day > 0 & day <= 29;
-        }
+        return switch (month) {
+            case 1, 3, 5, 7, 8, 10, 12 -> day > 0 & day <= 31;
+            case 4, 6, 9, 11 -> day > 0 && day <= 30;
+            case 2 -> day > 0 & day <= 29;
+            default -> false;
+        };
 
-        return false;
     }
 }