From 0ffa43692382b2b79cfc170c7670fb27fe51c858 Mon Sep 17 00:00:00 2001
From: SamB440 <sam@islandearth.net>
Date: Sat, 12 Jun 2021 17:13:44 +0100
Subject: [PATCH] Fix deprecation warnings

---
 .../rpgregions/managers/data/IRPGRegionsCache.java    | 11 ++++-------
 .../rpgregions/commands/RPGRegionsCommand.java        |  3 ++-
 .../rpgregions/managers/data/RPGRegionsCache.java     | 10 ++++++++--
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/api/src/main/java/net/islandearth/rpgregions/managers/data/IRPGRegionsCache.java b/api/src/main/java/net/islandearth/rpgregions/managers/data/IRPGRegionsCache.java
index 8138c90..fda0148 100644
--- a/api/src/main/java/net/islandearth/rpgregions/managers/data/IRPGRegionsCache.java
+++ b/api/src/main/java/net/islandearth/rpgregions/managers/data/IRPGRegionsCache.java
@@ -1,8 +1,8 @@
 package net.islandearth.rpgregions.managers.data;
 
+import com.google.common.collect.ImmutableMap;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 
-import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.CompletableFuture;
 
@@ -14,12 +14,9 @@ public interface IRPGRegionsCache {
 
     void removeConfiguredRegion(String id);
 
-    /**
-     * @deprecated Subject to removal, as direct access should not be used.
-     * @return {@link Map} of region names and the {@link ConfiguredRegion} pair.
-     */
-    @Deprecated
-    Map<String, ConfiguredRegion> getConfiguredRegions();
+    ImmutableMap<String, ConfiguredRegion> getConfiguredRegions();
+
+    void clear();
 
     CompletableFuture<Boolean> saveAll(boolean async);
 }
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
index 02af954..6a34c25 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/commands/RPGRegionsCommand.java
@@ -142,7 +142,7 @@ public class RPGRegionsCommand extends BaseCommand {
         sender.sendMessage(ChatColor.GREEN + "Reloading region files...");
         long startTime = System.currentTimeMillis();
         File folder = new File(plugin.getDataFolder() + "/regions/");
-        plugin.getManagers().getRegionsCache().getConfiguredRegions().clear();
+        plugin.getManagers().getRegionsCache().clear();
 
         for (File file : folder.listFiles()) {
             // Exclude non-json files
@@ -195,6 +195,7 @@ public class RPGRegionsCommand extends BaseCommand {
     @CommandPermission("rpgregions.reset")
     @CommandCompletion("@players @regions")
     public void onReset(CommandSender sender, String[] args) {
+        @SuppressWarnings({"deprecation"}) // We know what we're doing.
         OfflinePlayer player = Bukkit.getOfflinePlayer(args[0]);
         if (!player.hasPlayedBefore()) {
             sender.sendMessage(ChatColor.RED + "That player cannot be found.");
diff --git a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
index d17a1a4..b7eb2a1 100644
--- a/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
+++ b/rpgregions/src/main/java/net/islandearth/rpgregions/managers/data/RPGRegionsCache.java
@@ -1,5 +1,6 @@
 package net.islandearth.rpgregions.managers.data;
 
+import com.google.common.collect.ImmutableMap;
 import net.islandearth.rpgregions.RPGRegions;
 import net.islandearth.rpgregions.managers.data.region.ConfiguredRegion;
 import org.bukkit.Bukkit;
@@ -34,8 +35,13 @@ public class RPGRegionsCache implements IRPGRegionsCache {
     }
 
     @Override
-    public Map<String, ConfiguredRegion> getConfiguredRegions() {
-        return configuredRegions;
+    public ImmutableMap<String, ConfiguredRegion> getConfiguredRegions() {
+        return ImmutableMap.copyOf(configuredRegions);
+    }
+
+    @Override
+    public void clear() {
+        configuredRegions.clear();
     }
 
     @Override