Migrate to Configurate

Essentials/build.gradle

@@ -8,6 +8,10 @@ dependencies {
 
     api 'org.bstats:bstats-bukkit:1.8'
 
+    api 'org.spongepowered:configurate-yaml:4.1.1'
+    implementation 'org.yaml:snakeyaml:1.+'
+    implementation 'org.checkerframework:checker-qual:3.7.1'
+
     // Providers
     api project(':providers:BaseProviders')
     api project(':providers:PaperProvider')
@@ -23,11 +27,19 @@ shadowJar {
     dependencies {
         include (dependency('io.papermc:paperlib'))
         include (dependency('org.bstats:bstats-bukkit'))
+        include (dependency('org.spongepowered:configurate-yaml'))
+        include (dependency('org.spongepowered:configurate-core'))
+        include (dependency('org.yaml:snakeyaml'))
+        include (dependency('io.leangen.geantyref:geantyref'))
         include (project(':providers:BaseProviders'))
         include (project(':providers:PaperProvider'))
         include (project(':providers:NMSReflectionProvider'))
         include (project(':providers:1_8Provider'))
     }
     relocate 'io.papermc.lib', 'com.earth2me.essentials.paperlib'
     relocate 'org.bstats.bukkit', 'com.earth2me.essentials.metrics'
+    relocate 'org.spongepowered.configurate', 'com.earth2me.essentials.libs.configurate'
+    relocate 'org.yaml.snakeyaml', 'com.earth2me.essentials.libs.snakeyaml'
+    relocate 'io.leangen.geantyref', 'com.earth2me.essentials.libs.geantyref'
+    relocate 'org.checkerframework', 'com.earth2me.essentials.libs.checkerframework'
 }

Essentials/src/main/java/com/earth2me/essentials/Essentials.java

@@ -107,7 +107,6 @@
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.bukkit.scheduler.BukkitScheduler;
 import org.bukkit.scheduler.BukkitTask;
-import org.yaml.snakeyaml.error.YAMLException;
 
 import java.io.File;
 import java.io.IOException;
@@ -263,151 +262,141 @@ public void onEnable() {
                 }
             }
 
-            try {
-                final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
-                upgrade.beforeSettings();
-                execTimer.mark("Upgrade");
+            final EssentialsUpgrade upgrade = new EssentialsUpgrade(this);
+            upgrade.beforeSettings();
+            execTimer.mark("Upgrade");
 
-                confList = new ArrayList<>();
-                settings = new Settings(this);
-                confList.add(settings);
-                execTimer.mark("Settings");
+            confList = new ArrayList<>();
+            settings = new Settings(this);
+            confList.add(settings);
+            execTimer.mark("Settings");
 
-                userMap = new UserMap(this);
-                confList.add(userMap);
-                execTimer.mark("Init(Usermap)");
+            userMap = new UserMap(this);
+            confList.add(userMap);
+            execTimer.mark("Init(Usermap)");
 
-                balanceTop = new BalanceTopImpl(this);
-                execTimer.mark("Init(BalanceTop)");
+            balanceTop = new BalanceTopImpl(this);
+            execTimer.mark("Init(BalanceTop)");
 
-                kits = new Kits(this);
-                confList.add(kits);
-                upgrade.convertKits();
-                execTimer.mark("Kits");
+            kits = new Kits(this);
+            confList.add(kits);
+            upgrade.convertKits();
+            execTimer.mark("Kits");
 
-                upgrade.afterSettings();
-                execTimer.mark("Upgrade2");
+            upgrade.afterSettings();
+            execTimer.mark("Upgrade2");
 
-                warps = new Warps(getServer(), this.getDataFolder());
-                confList.add(warps);
-                execTimer.mark("Init(Warp)");
+            warps = new Warps(this.getDataFolder());
+            confList.add(warps);
+            execTimer.mark("Init(Warp)");
 
-                worth = new Worth(this.getDataFolder());
-                confList.add(worth);
-                execTimer.mark("Init(Worth)");
+            worth = new Worth(this.getDataFolder());
+            confList.add(worth);
+            execTimer.mark("Init(Worth)");
 
-                itemDb = getItemDbFromConfig();
-                confList.add(itemDb);
-                execTimer.mark("Init(ItemDB)");
+            itemDb = getItemDbFromConfig();
+            confList.add(itemDb);
+            execTimer.mark("Init(ItemDB)");
 
-                randomTeleport = new RandomTeleport(this);
-                if (randomTeleport.getPreCache()) {
-                    randomTeleport.cacheRandomLocations(randomTeleport.getCenter(), randomTeleport.getMinRange(), randomTeleport.getMaxRange());
-                }
-                confList.add(randomTeleport);
-                execTimer.mark("Init(RandomTeleport)");
+            randomTeleport = new RandomTeleport(this);
+            if (randomTeleport.getPreCache()) {
+                randomTeleport.cacheRandomLocations(randomTeleport.getCenter(), randomTeleport.getMinRange(), randomTeleport.getMaxRange());
+            }
+            confList.add(randomTeleport);
+            execTimer.mark("Init(RandomTeleport)");
 
-                customItemResolver = new CustomItemResolver(this);
-                try {
-                    itemDb.registerResolver(this, "custom_items", customItemResolver);
-                    confList.add(customItemResolver);
-                } catch (final Exception e) {
-                    e.printStackTrace();
-                    customItemResolver = null;
-                }
-                execTimer.mark("Init(CustomItemResolver)");
+            customItemResolver = new CustomItemResolver(this);
+            try {
+                itemDb.registerResolver(this, "custom_items", customItemResolver);
+                confList.add(customItemResolver);
+            } catch (final Exception e) {
+                e.printStackTrace();
+                customItemResolver = null;
+            }
+            execTimer.mark("Init(CustomItemResolver)");
 
-                jails = new Jails(this);
-                confList.add(jails);
-                execTimer.mark("Init(Jails)");
+            jails = new Jails(this);
+            confList.add(jails);
+            execTimer.mark("Init(Jails)");
 
-                //Spawner item provider only uses one but it's here for legacy...
-                spawnerItemProvider = new BlockMetaSpawnerItemProvider();
+            //Spawner item provider only uses one but it's here for legacy...
+            spawnerItemProvider = new BlockMetaSpawnerItemProvider();
 
-                //Spawner block providers
-                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_12_0_R01)) {
-                    spawnerBlockProvider = new ReflSpawnerBlockProvider();
-                } else {
-                    spawnerBlockProvider = new BukkitSpawnerBlockProvider();
-                }
+            //Spawner block providers
+            if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_12_0_R01)) {
+                spawnerBlockProvider = new ReflSpawnerBlockProvider();
+            } else {
+                spawnerBlockProvider = new BukkitSpawnerBlockProvider();
+            }
 
-                //Spawn Egg Providers
-                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
-                    spawnEggProvider = new LegacySpawnEggProvider();
-                } else if (VersionUtil.getServerBukkitVersion().isLowerThanOrEqualTo(VersionUtil.v1_12_2_R01)) {
-                    spawnEggProvider = new ReflSpawnEggProvider();
-                } else {
-                    spawnEggProvider = new FlatSpawnEggProvider();
-                }
+            //Spawn Egg Providers
+            if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
+                spawnEggProvider = new LegacySpawnEggProvider();
+            } else if (VersionUtil.getServerBukkitVersion().isLowerThanOrEqualTo(VersionUtil.v1_12_2_R01)) {
+                spawnEggProvider = new ReflSpawnEggProvider();
+            } else {
+                spawnEggProvider = new FlatSpawnEggProvider();
+            }
 
-                //Potion Meta Provider
-                if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
-                    potionMetaProvider = new LegacyPotionMetaProvider();
-                } else {
-                    potionMetaProvider = new BasePotionDataProvider();
-                }
+            //Potion Meta Provider
+            if (VersionUtil.getServerBukkitVersion().isLowerThan(VersionUtil.v1_9_R01)) {
+                potionMetaProvider = new LegacyPotionMetaProvider();
+            } else {
+                potionMetaProvider = new BasePotionDataProvider();
+            }
 
-                //Server State Provider
-                //Container Provider
-                if (PaperLib.isPaper() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_15_2_R01)) {
-                    serverStateProvider = new PaperServerStateProvider();
-                    containerProvider = new PaperContainerProvider();
-                } else {
-                    serverStateProvider = new ReflServerStateProvider();
-                }
+            //Server State Provider
+            //Container Provider
+            if (PaperLib.isPaper() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_15_2_R01)) {
+                serverStateProvider = new PaperServerStateProvider();
+                containerProvider = new PaperContainerProvider();
+            } else {
+                serverStateProvider = new ReflServerStateProvider();
+            }
 
-                //Event Providers
-                if (PaperLib.isPaper()) {
-                    try {
-                        Class.forName("com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent");
-                        recipeBookEventProvider = new PaperRecipeBookListener(event -> {
-                            if (this.getUser(((PlayerEvent) event).getPlayer()).isRecipeSee()) {
-                                ((Cancellable) event).setCancelled(true);
-                            }
-                        });
-                    } catch (final ClassNotFoundException ignored) {
-                    }
+            //Event Providers
+            if (PaperLib.isPaper()) {
+                try {
+                    Class.forName("com.destroystokyo.paper.event.player.PlayerRecipeBookClickEvent");
+                    recipeBookEventProvider = new PaperRecipeBookListener(event -> {
+                        if (this.getUser(((PlayerEvent) event).getPlayer()).isRecipeSee()) {
+                            ((Cancellable) event).setCancelled(true);
+                        }
+                    });
+                } catch (final ClassNotFoundException ignored) {
                 }
+            }
 
-                //Known Commands Provider
-                if (PaperLib.isPaper() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_11_2_R01)) {
-                    knownCommandsProvider = new PaperKnownCommandsProvider();
-                } else {
-                    knownCommandsProvider = new ReflKnownCommandsProvider();
-                }
+            //Known Commands Provider
+            if (PaperLib.isPaper() && VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_11_2_R01)) {
+                knownCommandsProvider = new PaperKnownCommandsProvider();
+            } else {
+                knownCommandsProvider = new ReflKnownCommandsProvider();
+            }
 
-                // Command aliases provider
-                formattedCommandAliasProvider = new ReflFormattedCommandAliasProvider(PaperLib.isPaper());
+            // Command aliases provider
+            formattedCommandAliasProvider = new ReflFormattedCommandAliasProvider(PaperLib.isPaper());
 
-                // Material Tag Providers
-                if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_13_0_R01)) {
-                    materialTagProvider = PaperLib.isPaper() ? new PaperMaterialTagProvider() : new BukkitMaterialTagProvider();
-                }
+            // Material Tag Providers
+            if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_13_0_R01)) {
+                materialTagProvider = PaperLib.isPaper() ? new PaperMaterialTagProvider() : new BukkitMaterialTagProvider();
+            }
 
-                // Sync Commands Provider
-                syncCommandsProvider = new ReflSyncCommandsProvider();
+            // Sync Commands Provider
+            syncCommandsProvider = new ReflSyncCommandsProvider();
 
-                if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_4_R01)) {
-                    persistentDataProvider = new ModernPersistentDataProvider(this);
-                } else {
-                    persistentDataProvider = new ReflPersistentDataProvider(this);
-                }
+            if (VersionUtil.getServerBukkitVersion().isHigherThanOrEqualTo(VersionUtil.v1_14_4_R01)) {
+                persistentDataProvider = new ModernPersistentDataProvider(this);
+            } else {
+                persistentDataProvider = new ReflPersistentDataProvider(this);
+            }
 
-                execTimer.mark("Init(Providers)");
-                reload();
+            execTimer.mark("Init(Providers)");
+            reload();
 
-                // The item spawn blacklist is loaded with all other settings, before the item
-                // DB, but it depends on the item DB, so we need to reload it again here:
-                ((Settings) settings)._lateLoadItemSpawnBlacklist();
-            } catch (final YAMLException exception) {
-                if (pm.getPlugin("EssentialsUpdate") != null) {
-                    LOGGER.log(Level.SEVERE, tl("essentialsHelp2"));
-                } else {
-                    LOGGER.log(Level.SEVERE, tl("essentialsHelp1"));
-                }
-                handleCrash(exception);
-                return;
-            }
+            // The item spawn blacklist is loaded with all other settings, before the item
+            // DB, but it depends on the item DB, so we need to reload it again here:
+            ((Settings) settings)._lateLoadItemSpawnBlacklist();
             backup = new Backup(this);
             permissionsHandler = new PermissionsHandler(this, settings.useBukkitPermissions());
             alternativeCommandsHandler = new AlternativeCommandsHandler(this);
@@ -1192,7 +1181,7 @@ private static class EssentialsWorldListener implements Listener, Runnable {
         public void onWorldLoad(final WorldLoadEvent event) {
             PermissionsDefaults.registerBackDefaultFor(event.getWorld());
 
-            ess.getJails().onReload();
+            ess.getJails().reloadConfig();
             ess.getWarps().reloadConfig();
             for (final IConf iConf : ((Essentials) ess).confList) {
                 if (iConf instanceof IEssentialsModule) {
@@ -1203,7 +1192,7 @@ public void onWorldLoad(final WorldLoadEvent event) {
 
         @EventHandler(priority = EventPriority.LOW)
         public void onWorldUnload(final WorldUnloadEvent event) {
-            ess.getJails().onReload();
+            ess.getJails().reloadConfig();
             ess.getWarps().reloadConfig();
             for (final IConf iConf : ((Essentials) ess).confList) {
                 if (iConf instanceof IEssentialsModule) {