chore: fix SonarCloud code smells on new code

Main code:
- InvEconomy: drop redundant @deprecated from the Vault interface overrides
  (suppress the unavoidable deprecation/removal warnings at class level),
  extract duplicated debug literals into constants, and replace nested
  ternaries in debug routing with a routeSuffix() helper.
- Store: merge nested if in island-key migration; replace if/containsKey in
  getStat UNTYPED branch with Optional.ifPresent.
- Remove unused import in InvSwitcherPladdon.

Tests:
- Remove the 'public' modifier from JUnit 5 test classes and annotated
  methods (S5786).
- Add assertDoesNotThrow assertions to four clear-stored tests that had none.
- Remove redundant local Island mocks that shadowed the @mock field.
- Remove unused 'server' locals, unused imports, and unnecessary
  'throws Exception' declarations.

Left intentionally: S110 (command class depth is inherent to BentoBox's
CompositeCommand hierarchy), S3776 (cognitive complexity on core inventory
methods - refactoring risks regressions), and S5738 (calls to deprecated
Bukkit.getOfflinePlayer required to implement Vault's name-based methods).

All 124 tests pass.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: tastybento

release-notes-1.19.0.md

@@ -0,0 +1,35 @@
+## 🎁 What's new
+
+1.19.0 is a follow-up to the 1.18.0 per-world economy release. It fixes two issues that stopped the new economy from working cleanly in a common setup. InvSwitcher now functions as a true **standalone economy** — you no longer need a separate economy plugin such as EssentialsX for it to take effect — and admin economy commands now report the **correct balance for offline players** instead of a stale value.
+
+## ✨ Highlights
+
+### 🐛 Standalone economy now works on its own
+InvSwitcher registers its own per-world Vault economy, but BentoBox hooks Vault during its early startup, *before* addons enable. When InvSwitcher was the only economy on the server, that early hook found nothing and was discarded, so BentoBox's `getVault()` stayed empty — and economy-dependent addons such as **Bank** disabled themselves with "Vault is required" even though a working per-world economy was present. InvSwitcher now registers a fresh Vault hook with BentoBox once its provider is live, so it works as the server's only economy.
+
+> Companion framework PRs harden this further: [BentoBox #2995](https://github.com/BentoBoxWorld/BentoBox/pull/2995) retries the Vault hook after addons enable, and [Bank #67](https://github.com/BentoBoxWorld/Bank/pull/67) retries before disabling.
+
+### 🐛 Correct balance reported for offline economy transactions
+Admin `eco give`, `eco set`, and `eco take` on an offline player reported a stale balance — for example "New balance: 0.00" right after giving 2,000. The money was always stored correctly, but the confirmation message re-read the balance from the database before the asynchronous save had flushed, returning the pre-transaction value. The commands now report the authoritative balance returned by the transaction itself.
+
+This release also hardens the underlying offline read-after-write path: offline saves are tracked while in flight so two rapid sequential transactions on the same offline player can no longer load independent stale copies and lose an update — without blocking the main thread or caching offline players indefinitely.
+
+## ⚙️ Compatibility
+
+✔️ BentoBox 3.17.0
+✔️ Paper Minecraft 1.21.5 – 26.1.2
+✔️ Java 21
+
+## 📥 How to update
+1. Take backups of your server, for safety.
+2. Stop the server.
+3. Drop the new InvSwitcher jar into the addons folder and remove the old one.
+4. Restart the server.
+5. You should be good to go!
+
+## What's Changed
+* 🐛 Register a fresh Vault hook so InvSwitcher works as a standalone economy by @tastybento in https://github.com/BentoBoxWorld/InvSwitcher/commit/d929649
+* 🐛 Report offline economy balances correctly and harden offline saves by @tastybento in https://github.com/BentoBoxWorld/InvSwitcher/commit/a15c645
+* Add MC 26.1.2 to Modrinth game-versions by @tastybento in https://github.com/BentoBoxWorld/InvSwitcher/pull/52
+
+**Full Changelog**: https://github.com/BentoBoxWorld/InvSwitcher/compare/1.18.0...1.19.0

src/main/java/com/wasteofplastic/invswitcher/InvSwitcherPladdon.java

@@ -2,7 +2,6 @@
 
 
 import world.bentobox.bentobox.api.addons.Addon;
-import world.bentobox.bentobox.api.addons.GameModeAddon;
 import world.bentobox.bentobox.api.addons.Pladdon;
 
 public class InvSwitcherPladdon extends Pladdon {

src/main/java/com/wasteofplastic/invswitcher/Store.java

@@ -261,12 +261,10 @@ public void getInventory(Player player, World world, Island island) {
         // Backward compat: if island-specific key has no data, migrate from world-only key.
         // This only happens once — the world-only data is cleared after migration so that
         // other islands don't also inherit a duplicate copy.
-        if (islandKey.contains("/") && !store.isInventory(islandKey)) {
-            if (store.isInventory(worldKey)) {
-                islandLoadKey = worldKey;
-                // Clear the world-only data so it can't be claimed by another island
-                store.clearWorldData(worldKey);
-            }
+        if (islandKey.contains("/") && !store.isInventory(islandKey) && store.isInventory(worldKey)) {
+            islandLoadKey = worldKey;
+            // Clear the world-only data so it can't be claimed by another island
+            store.clearWorldData(worldKey);
         }
 
         // Each option uses the island key or the world key based on its island sub-setting
@@ -549,11 +547,8 @@ private void getStat(Statistic s, InventoryStorage store, Player player, String
         case BLOCK -> store.getBlockStats(worldName).getOrDefault(s, Collections.emptyMap()).forEach((k,v) -> player.setStatistic(s, k, v));
         case ITEM -> store.getItemStats(worldName).getOrDefault(s, Collections.emptyMap()).forEach((k,v) -> player.setStatistic(s, k, v));
         case ENTITY -> store.getEntityStats(worldName).getOrDefault(s, Collections.emptyMap()).forEach((k,v) -> player.setStatistic(s, k, v));
-        case UNTYPED -> {
-            if (store.getUntypedStats(worldName).containsKey(s)) {
-                player.setStatistic(s, store.getUntypedStats(worldName).get(s));
-            }
-        }
+        case UNTYPED -> Optional.ofNullable(store.getUntypedStats(worldName).get(s))
+                .ifPresent(v -> player.setStatistic(s, v));
         }
     }
 

src/main/java/com/wasteofplastic/invswitcher/economy/InvEconomy.java

@@ -28,12 +28,21 @@
  *
  * @author tastybento
  */
+// The name-based account methods below implement Vault's deprecated Economy interface methods and
+// must call Bukkit.getOfflinePlayer(String); both are out of our control, so suppress the warnings.
+@SuppressWarnings({ "deprecation", "removal" })
 public class InvEconomy implements Economy {
 
     private static final String NEGATIVE_DEPOSIT = "Cannot deposit a negative amount";
     private static final String NEGATIVE_WITHDRAW = "Cannot withdraw a negative amount";
     private static final String NEGATIVE_SET = "Cannot set a negative balance";
     private static final String INSUFFICIENT_FUNDS = "Insufficient funds";
+    // Debug message fragments, factored out to avoid duplicated string literals.
+    private static final String DBG_KEY = " key=";
+    private static final String DBG_AMOUNT = " amount=";
+    private static final String ROUTE_SELF = " -> self";
+    private static final String ROUTE_DELEGATE = " -> DELEGATE";
+    private static final String ROUTE_DEFAULT = " -> default";
 
     private final InvSwitcher addon;
     /** The economy to fall back to for unmanaged worlds (e.g. EssentialsX). Resolved lazily on
@@ -120,6 +129,21 @@ private void debug(String msg) {
         }
     }
 
+    /**
+     * Debug-only suffix describing where a balance call routed: to the player's own managed balance
+     * ({@code managedSuffix}), or - when the world is unmanaged - to the delegate economy or the
+     * default key.
+     * @param key - the resolved money key, or null if the world is unmanaged
+     * @param managedSuffix - suffix to use when the key is non-null (managed)
+     * @return the routing suffix for the debug message
+     */
+    private String routeSuffix(String key, String managedSuffix) {
+        if (key != null) {
+            return managedSuffix;
+        }
+        return delegating() ? ROUTE_DELEGATE : ROUTE_DEFAULT;
+    }
+
     private static String who(OfflinePlayer player) {
         String name = player.getName() != null ? player.getName() : player.getUniqueId().toString();
         return name + (player.getPlayer() != null ? " (online)" : " (offline)");
@@ -260,7 +284,7 @@ public boolean hasAccount(OfflinePlayer player, String worldName) {
     @Override
     public double getBalance(OfflinePlayer player) {
         String key = currentKey(player);
-        debug("getBalance " + who(player) + " key=" + key + (key == null ? (delegating() ? " -> DELEGATE" : " -> default") : ""));
+        debug("getBalance " + who(player) + DBG_KEY + key + routeSuffix(key, ""));
         if (key == null) {
             return delegating() ? delegate().getBalance(player) : readSelf(player, Store.DEFAULT_WORLD_KEY);
         }
@@ -289,8 +313,7 @@ public boolean has(OfflinePlayer player, String worldName, double amount) {
     @Override
     public EconomyResponse withdrawPlayer(OfflinePlayer player, double amount) {
         String key = currentKey(player);
-        debug("withdrawPlayer " + who(player) + " amount=" + amount + " key=" + key
-                + (key == null ? (delegating() ? " -> DELEGATE" : " -> default") : " -> self"));
+        debug("withdrawPlayer " + who(player) + DBG_AMOUNT + amount + DBG_KEY + key + routeSuffix(key, ROUTE_SELF));
         if (key == null) {
             return delegating() ? delegate().withdrawPlayer(player, amount)
                     : withdrawSelf(player, Store.DEFAULT_WORLD_KEY, amount);
@@ -301,8 +324,8 @@ public EconomyResponse withdrawPlayer(OfflinePlayer player, double amount) {
     @Override
     public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, double amount) {
         String key = worldKey(player, worldName);
-        debug("withdrawPlayer(world) " + who(player) + " world=" + worldName + " amount=" + amount + " key=" + key
-                + (key == null ? (delegating() ? " -> DELEGATE" : " -> default") : " -> self"));
+        debug("withdrawPlayer(world) " + who(player) + " world=" + worldName + DBG_AMOUNT + amount + DBG_KEY + key
+                + routeSuffix(key, ROUTE_SELF));
         if (key == null) {
             return delegating() ? delegate().withdrawPlayer(player, worldName, amount)
                     : withdrawSelf(player, Store.DEFAULT_WORLD_KEY, amount);
@@ -313,8 +336,7 @@ public EconomyResponse withdrawPlayer(OfflinePlayer player, String worldName, do
     @Override
     public EconomyResponse depositPlayer(OfflinePlayer player, double amount) {
         String key = currentKey(player);
-        debug("depositPlayer " + who(player) + " amount=" + amount + " key=" + key
-                + (key == null ? (delegating() ? " -> DELEGATE" : " -> default") : " -> self"));
+        debug("depositPlayer " + who(player) + DBG_AMOUNT + amount + DBG_KEY + key + routeSuffix(key, ROUTE_SELF));
         if (key == null) {
             return delegating() ? delegate().depositPlayer(player, amount)
                     : depositSelf(player, Store.DEFAULT_WORLD_KEY, amount);
@@ -325,8 +347,8 @@ public EconomyResponse depositPlayer(OfflinePlayer player, double amount) {
     @Override
     public EconomyResponse depositPlayer(OfflinePlayer player, String worldName, double amount) {
         String key = worldKey(player, worldName);
-        debug("depositPlayer(world) " + who(player) + " world=" + worldName + " amount=" + amount + " key=" + key
-                + (key == null ? (delegating() ? " -> DELEGATE" : " -> default") : " -> self"));
+        debug("depositPlayer(world) " + who(player) + " world=" + worldName + DBG_AMOUNT + amount + DBG_KEY + key
+                + routeSuffix(key, ROUTE_SELF));
         if (key == null) {
             return delegating() ? delegate().depositPlayer(player, worldName, amount)
                     : depositSelf(player, Store.DEFAULT_WORLD_KEY, amount);
@@ -389,73 +411,61 @@ public boolean createPlayerAccount(OfflinePlayer player, String worldName) {
     // ------ DEPRECATED NAME-BASED METHODS (delegate up to OfflinePlayer variants) ------
 
     @Override
-    @Deprecated
     public boolean hasAccount(String playerName) {
         return hasAccount(Bukkit.getOfflinePlayer(playerName));
     }
 
     @Override
-    @Deprecated
     public boolean hasAccount(String playerName, String worldName) {
         return hasAccount(Bukkit.getOfflinePlayer(playerName), worldName);
     }
 
     @Override
-    @Deprecated
     public double getBalance(String playerName) {
         return getBalance(Bukkit.getOfflinePlayer(playerName));
     }
 
     @Override
-    @Deprecated
     public double getBalance(String playerName, String world) {
         return getBalance(Bukkit.getOfflinePlayer(playerName), world);
     }
 
     @Override
-    @Deprecated
     public boolean has(String playerName, double amount) {
         return has(Bukkit.getOfflinePlayer(playerName), amount);
     }
 
     @Override
-    @Deprecated
     public boolean has(String playerName, String worldName, double amount) {
         return has(Bukkit.getOfflinePlayer(playerName), worldName, amount);
     }
 
     @Override
-    @Deprecated
     public EconomyResponse withdrawPlayer(String playerName, double amount) {
         return withdrawPlayer(Bukkit.getOfflinePlayer(playerName), amount);
     }
 
     @Override
-    @Deprecated
     public EconomyResponse withdrawPlayer(String playerName, String worldName, double amount) {
         return withdrawPlayer(Bukkit.getOfflinePlayer(playerName), worldName, amount);
     }
 
     @Override
-    @Deprecated
     public EconomyResponse depositPlayer(String playerName, double amount) {
         return depositPlayer(Bukkit.getOfflinePlayer(playerName), amount);
     }
 
     @Override
-    @Deprecated
     public EconomyResponse depositPlayer(String playerName, String worldName, double amount) {
         return depositPlayer(Bukkit.getOfflinePlayer(playerName), worldName, amount);
     }
 
     @Override
-    @Deprecated
     public boolean createPlayerAccount(String playerName) {
         return createPlayerAccount(Bukkit.getOfflinePlayer(playerName));
     }
 
     @Override
-    @Deprecated
     public boolean createPlayerAccount(String playerName, String worldName) {
         return createPlayerAccount(Bukkit.getOfflinePlayer(playerName), worldName);
     }
@@ -472,7 +482,6 @@ public EconomyResponse createBank(String name, OfflinePlayer player) {
     }
 
     @Override
-    @Deprecated
     public EconomyResponse createBank(String name, String player) {
         return delegate() != null ? delegate().createBank(name, player) : bankUnsupported();
     }
@@ -508,7 +517,6 @@ public EconomyResponse isBankOwner(String name, OfflinePlayer player) {
     }
 
     @Override
-    @Deprecated
     public EconomyResponse isBankOwner(String name, String playerName) {
         return delegate() != null ? delegate().isBankOwner(name, playerName) : bankUnsupported();
     }
@@ -519,7 +527,6 @@ public EconomyResponse isBankMember(String name, OfflinePlayer player) {
     }
 
     @Override
-    @Deprecated
     public EconomyResponse isBankMember(String name, String playerName) {
         return delegate() != null ? delegate().isBankMember(name, playerName) : bankUnsupported();
     }

src/test/java/com/wasteofplastic/invswitcher/InvSwitcherTest.java

@@ -50,15 +50,14 @@
 import world.bentobox.bentobox.database.DatabaseSetup.DatabaseType;
 import world.bentobox.bentobox.managers.AddonsManager;
 import org.mockbukkit.mockbukkit.MockBukkit;
-import org.mockbukkit.mockbukkit.ServerMock;
 
 /**
  * @author tastybento
  *
  */
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
-public class InvSwitcherTest {
+class InvSwitcherTest {
 
     private static File jFile;
     @Mock
@@ -79,7 +78,7 @@ public class InvSwitcherTest {
     private MockedStatic<BentoBox> mockedBentoBox;
 
     @BeforeAll
-    public static void beforeClass() throws IOException {
+    static void beforeClass() throws IOException {
         // Make the addon jar
         jFile = new File("addon.jar");
         // Copy over config file from src folder
@@ -100,12 +99,9 @@ public static void beforeClass() throws IOException {
         }
     }
 
-    /**
-     * @throws Exception
-     */
     @BeforeEach
-    public void setUp() throws Exception {
-        ServerMock server = MockBukkit.mock();
+    void setUp() {
+        MockBukkit.mock();
 
         // Set up plugin
         mockedBentoBox = Mockito.mockStatic(BentoBox.class);
@@ -135,7 +131,7 @@ public void setUp() throws Exception {
      * @throws java.lang.Exception
      */
     @AfterEach
-    public void tearDown() throws Exception {
+    void tearDown() throws Exception {
         if (mockedBentoBox != null) {
             mockedBentoBox.close();
         }
@@ -144,7 +140,7 @@ public void tearDown() throws Exception {
     }
 
     @AfterAll
-    public static void cleanUp() throws Exception {
+    static void cleanUp() throws Exception {
         deleteAll(new File("database"));
         new File("addon.jar").delete();
         new File("config.yml").delete();
@@ -164,7 +160,7 @@ private static void deleteAll(File file) throws IOException {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#onEnable()}.
      */
     @Test
-    public void testOnEnable() {
+    void testOnEnable() {
         addon.onEnable();
         verify(plugin).logError("[InvSwitcher] This addon is incompatible with YAML database. Please use another type, like JSON.");
         assertEquals(State.DISABLED, addon.getState());
@@ -174,7 +170,7 @@ public void testOnEnable() {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#onDisable()}.
      */
     @Test
-    public void testOnDisable() {
+    void testOnDisable() {
         // Mock the static method
         try (MockedStatic<Bukkit> mockedBukkit = mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS)) {
             when(Bukkit.getWorld(anyString())).thenReturn(world);
@@ -192,7 +188,7 @@ public void testOnDisable() {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#onLoad()}.
      */
     @Test
-    public void testOnLoad() {
+    void testOnLoad() {
         addon.onLoad();
         File file = new File("config.yml");
         assertTrue(file.exists());
@@ -202,7 +198,7 @@ public void testOnLoad() {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#allLoaded()}.
      */
     @Test
-    public void testAllLoaded() {
+    void testAllLoaded() {
         // Mock the static method
         try (MockedStatic<Bukkit> mockedBukkit = mockStatic(Bukkit.class, Mockito.RETURNS_MOCKS)) {
             when(Bukkit.getWorld(anyString())).thenReturn(world);
@@ -221,7 +217,7 @@ public void testAllLoaded() {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#allLoaded()}.
      */
     @Test
-    public void testAllLoadedNoWorlds() {
+    void testAllLoadedNoWorlds() {
         addon.onLoad();
         addon.getSettings().setWorlds(Collections.emptySet());
         addon.allLoaded();
@@ -234,23 +230,23 @@ public void testAllLoadedNoWorlds() {
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#getStore()}.
      */
     @Test
-    public void testGetStore() {
+    void testGetStore() {
         assertNull(addon.getStore());
     }
 
     /**
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#getSettings()}.
      */
     @Test
-    public void testGetSettings() {
+    void testGetSettings() {
         assertNull(addon.getSettings());
     }
 
     /**
      * Test method for {@link com.wasteofplastic.invswitcher.InvSwitcher#getWorlds()}.
      */
     @Test
-    public void testGetWorlds() {
+    void testGetWorlds() {
         assertTrue(addon.getWorlds().isEmpty());
     }