Better getMap method and compile fixes

Author: Warriorrrr

Towny/src/main/java/com/palmergames/bukkit/towny/TownySettings.java

@@ -38,6 +38,7 @@
 import org.bukkit.NamespacedKey;
 import org.bukkit.Registry;
 import org.bukkit.Tag;
+import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.EntityType;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
@@ -654,9 +655,12 @@ public static long getMillis(ConfigNodes node) {
 	public static Map<String, String> getMap(ConfigNodes node) {
 		final Map<String, String> map = new HashMap<>();
 
-		for (final Map<?, ?> generic : config.getMapList(node.getRoot()))
-			for (Map.Entry<?, ?> entry : generic.entrySet())
-				map.put(entry.getKey().toString(), entry.getValue().toString());
+		final ConfigurationSection section = config.getConfigurationSection(node.getRoot());
+		if (section == null)
+			return map;
+		
+		for (String key : section.getKeys(false))
+			map.put(key, section.getString(key));
 
 		return map;
 	}
@@ -1145,7 +1149,7 @@ private static <T extends Keyed, F extends AbstractRegistryList<T>> boolean chec
 		return true;
 	}
 
-	private static final List<String> REGISTRY_LIST_PACKAGES = List.of(
+	private static final List<String> REGISTRY_LIST_PACKAGES = Arrays.asList(
 		"org.bukkit.entity",
 		"org.bukkit.entity.minecart",
 		"org.bukkit.block.data",

Towny/src/test/java/com/palmergames/bukkit/towny/test/RegistryListTests.java

@@ -10,13 +10,14 @@
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
+import java.util.Arrays;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 import static org.bukkit.Material.*;
 import static org.junit.jupiter.api.Assertions.*;
 
+@SuppressWarnings("ArraysAsListWithZeroOrOneArgument")
 public class RegistryListTests {
 
 	@BeforeAll
@@ -44,19 +45,19 @@ void testNothingAddedToTheBuilderGivesEverything() {
 
 	@Test
 	void testCustomRegistryListBuilderClassNames() {
-		EntityLists built = (EntityLists) TownySettings.constructRegistryList(EntityLists.newBuilder(), Tag.REGISTRY_ENTITY_TYPES, List.of("c:Animals"), EntityType::getEntityClass);
+		EntityLists built = (EntityLists) TownySettings.constructRegistryList(EntityLists.newBuilder(), Tag.REGISTRY_ENTITY_TYPES, Arrays.asList("c:Animals"), EntityType::getEntityClass);
 		assertEquals(built.tagged(), EntityLists.ANIMALS.tagged());
 
-		Set<Material> expected = new HashSet<>(Set.of(WEEPING_VINES, NETHER_WART, FROSTED_ICE, SWEET_BERRY_BUSH, CACTUS, COCOA, CAVE_VINES, PITCHER_CROP, BEETROOTS, SUGAR_CANE, CHORUS_FLOWER, FIRE, BAMBOO, POTATOES, MELON_STEM, CARROTS, TORCHFLOWER_CROP, WHEAT, MANGROVE_PROPAGULE, KELP, TWISTING_VINES, PUMPKIN_STEM));
-		ItemLists list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, List.of("c:org.bukkit.block.data.Ageable"), type -> type.data);
+		Set<Material> expected = new HashSet<>(Arrays.asList(WEEPING_VINES, NETHER_WART, FROSTED_ICE, SWEET_BERRY_BUSH, CACTUS, COCOA, CAVE_VINES, PITCHER_CROP, BEETROOTS, SUGAR_CANE, CHORUS_FLOWER, FIRE, BAMBOO, POTATOES, MELON_STEM, CARROTS, TORCHFLOWER_CROP, WHEAT, MANGROVE_PROPAGULE, KELP, TWISTING_VINES, PUMPKIN_STEM));
+		ItemLists list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, Arrays.asList("c:org.bukkit.block.data.Ageable"), type -> type.data);
 		assertEquals(expected, list.tagged());
 
 		expected.remove(WEEPING_VINES);
-		list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, List.of("c:org.bukkit.block.data.Ageable", "-weeping_vines"), type -> type.data);
+		list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, Arrays.asList("c:org.bukkit.block.data.Ageable", "-weeping_vines"), type -> type.data);
 		assertEquals(expected, list.tagged());
 
 		expected.add(STONE);
-		list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, List.of("c:org.bukkit.block.data.Ageable", "-weeping_vines", "+stone"), type -> type.data);
+		list = (ItemLists) TownySettings.constructRegistryList(ItemLists.newBuilder(), Tag.REGISTRY_BLOCKS, Arrays.asList("c:org.bukkit.block.data.Ageable", "-weeping_vines", "+stone"), type -> type.data);
 		assertEquals(expected, list.tagged());
 	}
 }