new settings for showing patreon, paypal

src/main/java/com/gmail/nossr50/config/ConfigManager.java

@@ -6,6 +6,9 @@ import com.gmail.nossr50.config.experience.ExperienceConfig;
 import com.gmail.nossr50.config.hocon.SerializedConfigLoader;
 import com.gmail.nossr50.config.hocon.antiexploit.ConfigExploitPrevention;
 import com.gmail.nossr50.config.hocon.database.ConfigDatabase;
+import com.gmail.nossr50.config.hocon.donation.ConfigAuthorAdvertisements;
+import com.gmail.nossr50.config.hocon.hardcore.ConfigHardcore;
+import com.gmail.nossr50.config.hocon.metrics.ConfigMetrics;
 import com.gmail.nossr50.config.hocon.motd.ConfigMOTD;
 import com.gmail.nossr50.config.hocon.playerleveling.ConfigLeveling;
 import com.gmail.nossr50.config.hocon.scoreboard.ConfigScoreboard;
@@ -70,7 +73,10 @@ public final class ConfigManager {
     private SerializedConfigLoader<ConfigLeveling> configLeveling;
     private SerializedConfigLoader<ConfigWorldBlacklist> configWorldBlacklist;
     private SerializedConfigLoader<ConfigExploitPrevention> configExploitPrevention;
+    private SerializedConfigLoader<ConfigHardcore> configHardcore;
+    private SerializedConfigLoader<ConfigMetrics> configMetrics;
     private SerializedConfigLoader<ConfigMOTD> configMOTD;
+    private SerializedConfigLoader<ConfigAuthorAdvertisements> configAuthorAdvertisements;
     private MainConfig mainConfig;
     private FishingTreasureConfig fishingTreasureConfig;
     private ExcavationTreasureConfig excavationTreasureConfig;
@@ -108,6 +114,9 @@ public final class ConfigManager {
         configWorldBlacklist = new SerializedConfigLoader<>(ConfigWorldBlacklist.class, "world_blacklist.conf", null);
         configExploitPrevention = new SerializedConfigLoader<>(ConfigExploitPrevention.class, "exploit_prevention.conf", null);
         configMOTD = new SerializedConfigLoader<>(ConfigMOTD.class, "message_of_the_day.conf", null);
+        configHardcore = new SerializedConfigLoader<>(ConfigHardcore.class, "hardcore_mode.conf", null);
+        configMetrics = new SerializedConfigLoader<>(ConfigMetrics.class, "analytics_reporting.conf", null);
+        configAuthorAdvertisements = new SerializedConfigLoader<>(ConfigAuthorAdvertisements.class, "author_support_advertisements.conf", null);
 
         mainConfig = new MainConfig();
 
@@ -134,26 +143,6 @@ public final class ConfigManager {
 
         salvageConfig = new SalvageConfig();
 
-
-        /*if (MainConfig.getInstance().getToolModsEnabled()) {
-            new ToolConfigManager();
-        }
-
-        if (MainConfig.getInstance().getArmorModsEnabled()) {
-            new ArmorConfigManager();
-        }
-
-        if (MainConfig.getInstance().getBlockModsEnabled()) {
-            new BlockConfigManager();
-        }
-
-        if (MainConfig.getInstance().getEntityModsEnabled()) {
-            new EntityConfigManager();
-        }*/
-
-        // Multi Config Containers
-        //initMultiConfigContainers();
-
         /*
          * Managers
          */
@@ -341,4 +330,16 @@ public final class ConfigManager {
     public ConfigMOTD getConfigMOTD() {
         return configMOTD.getConfig();
     }
+
+    public ConfigHardcore getConfigHardcore() {
+        return configHardcore.getConfig();
+    }
+
+    public ConfigMetrics getConfigMetrics() {
+        return configMetrics.getConfig();
+    }
+
+    public ConfigAuthorAdvertisements getConfigAds() {
+        return configAuthorAdvertisements.getConfig();
+    }
 }

src/main/java/com/gmail/nossr50/config/MainConfig.java

@@ -453,10 +453,6 @@ public class MainConfig extends ConfigValidated {
             return "en_US";
     }
 
-    public boolean getMOTDEnabled() {
-        return getBooleanValue(GENERAL, MOTD + ENABLED);
-    }
-
     public boolean getShowProfileLoadedMessage() {
         return getBooleanValue(GENERAL, SHOW_PROFILE_LOADED);
     }
@@ -799,10 +795,6 @@ public class MainConfig extends ConfigValidated {
      */
 
     /* General Settings */
-    public boolean getUrlLinksEnabled() {
-        return getBooleanValue(COMMANDS, SKILLS, URL_LINKS);
-    }
-
     public boolean getAbilityMessagesEnabled() {
         return getBooleanValue(ABILITIES, MESSAGES);
     }

src/main/java/com/gmail/nossr50/config/hocon/antiexploit/ConfigSectionGeneral.java

@@ -24,7 +24,8 @@ public class ConfigSectionGeneral {
     private boolean pistonsMarkBlocksUnnatural = PISTONS_MARK_BLOCKS_DEFAULT;
 
     @Setting(value = "Spawned-Mobs-Have-Modified-XP-Values",
-            comment =   "Spawned mobs will give different XP values than their naturally spawning counterparts" +
+            comment =
+                    "Spawned mobs will give different XP values than their naturally spawning counterparts" +
                     "\nBy default, spawned mob XP is reduced to zero, but you could change it in the experience config to whatever you want." +
                     "\nSpawned mobs include mobs spawned from a nether portal, mob spawner, or eggs." +
                     "\nThis will not include mobs spawned from commands, typically." +
@@ -32,7 +33,9 @@ public class ConfigSectionGeneral {
     private boolean markSpawnedMobs = SPAWNED_MOBS_DEFAULT;
 
     @Setting(value = "Tamed-Entities-Have-Modified-XP-Values",
-            comment = "Prevents tamed entities from giving combat XP when struck by players" +
+            comment =
+                    "Prevents tamed entities from giving normal combat XP when struck by players" +
+                    "\nBy default, combat XP from tamed mobs is reduced to zero, but you could change it in the experience config to whatever you want." +
                     "\nIt's hard to imagine this being abused, but we disable it anyways." +
                     "\nTamed entities get marked in the same way that spawned mobs do, so they are affected by the same XP modifiers." +
             "\nDefault value: "+TAMED_MOB_DEFAULT)

src/main/java/com/gmail/nossr50/config/hocon/hardcore/ConfigHardcore.java

@@ -1,7 +1,7 @@
-package com.gmail.nossr50.config.hocon;
+package com.gmail.nossr50.config.hocon.hardcore;
 
 import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
 
 @ConfigSerializable
-public class Metrics {
+public class ConfigHardcore {
 }

src/main/java/com/gmail/nossr50/config/hocon/metrics/ConfigMetrics.java

@@ -1,7 +1,8 @@
-package com.gmail.nossr50.config.hocon;
+package com.gmail.nossr50.config.hocon.metrics;
 
 import ninja.leaping.configurate.objectmapping.serialize.ConfigSerializable;
 
 @ConfigSerializable
-public class Hardcore {
+public class ConfigMetrics {
+
 }