Prep for material mapping removal

Author: mbax

bukkit/src/main/java/dev/kitteh/factions/config/file/MainConfig.java

@@ -5,7 +5,6 @@
 import dev.kitteh.factions.config.annotation.WipeOnReload;
 import dev.kitteh.factions.permissible.Relation;
 import dev.kitteh.factions.permissible.Role;
-import dev.kitteh.factions.util.MaterialDb;
 import dev.kitteh.factions.util.MiscUtil;
 import net.kyori.adventure.text.format.NamedTextColor;
 import net.kyori.adventure.text.format.TextColor;
@@ -1149,10 +1148,7 @@ public class SpecialCase {
 
             public Set<Material> getIgnoreBuildMaterials() {
                 if (ignoreBuildMaterialsMat == null) {
-                    ignoreBuildMaterialsMat = new HashSet<>();
-                    ignoreBuildMaterials.forEach(m -> ignoreBuildMaterialsMat.add(MaterialDb.get(m)));
-                    ignoreBuildMaterialsMat.remove(Material.AIR);
-                    ignoreBuildMaterials = Collections.unmodifiableSet(ignoreBuildMaterials);
+                    ignoreBuildMaterialsMat = MiscUtil.typeSetFromStringSet(ignoreBuildMaterials, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return ignoreBuildMaterialsMat;
             }
@@ -1734,40 +1730,28 @@ public boolean isWildernessBlockOtherExplosions() {
 
             public Set<Material> getTerritoryDenyUsageMaterials() {
                 if (territoryDenyUsageMaterialsMat == null) {
-                    territoryDenyUsageMaterialsMat = new HashSet<>();
-                    territoryDenyUsageMaterials.forEach(m -> territoryDenyUsageMaterialsMat.add(MaterialDb.get(m)));
-                    territoryDenyUsageMaterialsMat.remove(Material.AIR);
-                    territoryDenyUsageMaterialsMat = Collections.unmodifiableSet(territoryDenyUsageMaterialsMat);
+                    territoryDenyUsageMaterialsMat = MiscUtil.typeSetFromStringSet(territoryDenyUsageMaterials, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return territoryDenyUsageMaterialsMat;
             }
 
             public Set<Material> getTerritoryDenyUsageMaterialsWhenOffline() {
                 if (territoryDenyUsageMaterialsWhenOfflineMat == null) {
-                    territoryDenyUsageMaterialsWhenOfflineMat = new HashSet<>();
-                    territoryDenyUsageMaterialsWhenOffline.forEach(m -> territoryDenyUsageMaterialsWhenOfflineMat.add(MaterialDb.get(m)));
-                    territoryDenyUsageMaterialsWhenOfflineMat.remove(Material.AIR);
-                    territoryDenyUsageMaterialsWhenOfflineMat = Collections.unmodifiableSet(territoryDenyUsageMaterialsWhenOfflineMat);
+                    territoryDenyUsageMaterialsWhenOfflineMat = MiscUtil.typeSetFromStringSet(territoryDenyUsageMaterialsWhenOffline, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return territoryDenyUsageMaterialsWhenOfflineMat;
             }
 
             public Set<Material> getContainerExceptions() {
                 if (containerExceptionsMat == null) {
-                    containerExceptionsMat = new HashSet<>();
-                    containerExceptions.forEach(m -> containerExceptionsMat.add(MaterialDb.get(m)));
-                    containerExceptionsMat.remove(Material.AIR);
-                    containerExceptionsMat = Collections.unmodifiableSet(containerExceptionsMat);
+                    containerExceptionsMat = MiscUtil.typeSetFromStringSet(containerExceptions, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return containerExceptionsMat;
             }
 
             public Set<Material> getBreakExceptions() {
                 if (breakExceptionsMat == null) {
-                    breakExceptionsMat = new HashSet<>();
-                    breakExceptions.forEach(m -> breakExceptionsMat.add(MaterialDb.get(m)));
-                    breakExceptionsMat.remove(Material.AIR);
-                    breakExceptionsMat = Collections.unmodifiableSet(breakExceptionsMat);
+                    breakExceptionsMat = MiscUtil.typeSetFromStringSet(breakExceptions, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return breakExceptionsMat;
             }
@@ -1786,10 +1770,7 @@ public Set<String> getWorldsNoWildernessProtection() {
 
             public Set<Material> getCustomContainers() {
                 if (customContainersMat == null) {
-                    customContainersMat = new HashSet<>();
-                    customContainers.forEach(m -> customContainersMat.add(MaterialDb.get(m)));
-                    customContainersMat.remove(Material.AIR);
-                    customContainersMat = Collections.unmodifiableSet(customContainersMat);
+                    customContainersMat = MiscUtil.typeSetFromStringSet(customContainers, MiscUtil.MATERIAL_FUNCTION);
                 }
                 return customContainersMat;
             }

bukkit/src/main/java/dev/kitteh/factions/plugin/AbstractFactionsPlugin.java

@@ -340,6 +340,25 @@ public void close() throws SecurityException {
         // Load Material database
         MaterialDb.load();
 
+        // Hit all material lookups in config
+        {
+            var conf = this.configManager.mainConfig().factions();
+            conf.specialCase().getIgnoreBuildMaterials();
+            conf.protection().getBreakExceptions();
+            conf.protection().getContainerExceptions();
+            conf.protection().getCustomContainers();
+            conf.protection().getTerritoryDenyUsageMaterials();
+            conf.protection().getTerritoryDenyUsageMaterialsWhenOffline();
+            conf.spawning().getPreventInSafezone();
+            conf.spawning().getPreventInSafezoneExceptions();
+            conf.spawning().getPreventInTerritory();
+            conf.spawning().getPreventInTerritoryExceptions();
+            conf.spawning().getPreventInWarzone();
+            conf.spawning().getPreventInWarzoneExceptions();
+            conf.spawning().getPreventInWilderness();
+            conf.spawning().getPreventInWildernessExceptions();
+        }
+
         // Create Utility Instances
         WorldUtil.init(this.conf().restrictWorlds());
 

bukkit/src/main/java/dev/kitteh/factions/util/MaterialDb.java

@@ -12,6 +12,7 @@
 import java.util.logging.Level;
 
 @ApiStatus.Obsolete
+@Deprecated(forRemoval = true, since = "4.0.0")
 public class MaterialDb {
     private static Map<String, Material> map;
 
@@ -24,17 +25,21 @@ public static Material get(String name) {
 
     public static Material get(String name, Material defaultMaterial) {
         if (name == null) {
-            AbstractFactionsPlugin.instance().log("Null material name found");
             return defaultMaterial;
         }
 
         Material material = Material.getMaterial(name);
         if (material == null) {
             material = map.get(name.toUpperCase());
+            if (material != null) {
+                AbstractFactionsPlugin.instance().getLogger().warning("Outdated material name \"" + name + "\" found in a config - update it to \"" + material.name() + "\" ASAP!");
+            }
         }
 
         if (material == null) {
-            AbstractFactionsPlugin.instance().log(Level.INFO, "Material does not exist: " + name.toUpperCase());
+            if (!name.equalsIgnoreCase("exampleMaterial")) {
+                AbstractFactionsPlugin.instance().log(Level.INFO, "Material does not exist: " + name.toUpperCase());
+            }
             return defaultMaterial;
         }
 
@@ -59,6 +64,5 @@ public static void load() {
             }
             map.put(nNull ? n : l, nNull ? matL : matN);
         });
-        AbstractFactionsPlugin.instance().getLogger().info(String.format("Loaded %s material mappings.", map.size()));
     }
 }