From 6e5e70ac904fa8400444c0281b2c63894e95505a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 May 2014 13:30:17 +0200 Subject: [PATCH] [Bleeding] A little more config tweaking --- src/config.yml | 8 +++++--- .../TotalFreedomMod/Config/TFM_ConfigEntry.java | 6 +++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/config.yml b/src/config.yml index e488b97f..5f1e389d 100644 --- a/src/config.yml +++ b/src/config.yml @@ -188,6 +188,7 @@ unbannable_usernames: - stampylonghead - stampylongnose - dantdm + - gizzy14gazza # TwitterBot - Used to allow superadmins to verify themselves using twitter twitterbot: @@ -208,9 +209,10 @@ logs: service_checker_url: http://status.mojang.com/check # HTTPD -httpd_enabled: true -httpd_public_folder: ./public_html -httpd_port: 28966 +httpd: + enabled: true + port: 28966 + public_folder: ./public_html # Inactivity Auto-Kick (Requires Essentials) autokick: diff --git a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java index 5340dbb9..e529db82 100644 --- a/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java +++ b/src/me/StevenLawson/TotalFreedomMod/Config/TFM_ConfigEntry.java @@ -31,7 +31,7 @@ public enum TFM_ConfigEntry PROTECTED_AREAS_ENABLED(Boolean.class, "protectarea.enabled"), TOSSMOB_ENABLED(Boolean.class, "tossmob_enabled"), TWITTERBOT_ENABLED(Boolean.class, "twitterbot.enabled"), - HTTPD_ENABLED(Boolean.class, "httpd_enabled"), + HTTPD_ENABLED(Boolean.class, "httpd.enabled"), AUTOKICK_ENABLED(Boolean.class, "autokick.enabled"), CONSOLE_IS_SENIOR(Boolean.class, "console_is_senior"), // @@ -44,7 +44,7 @@ public enum TFM_ConfigEntry MOB_LIMITER_MAX(Integer.class, "moblimiter.max"), NUKE_MONITOR_COUNT_BREAK(Integer.class, "nukemonitor.count_break"), NUKE_MONITOR_COUNT_PLACE(Integer.class, "nukemonitor.count_place"), - HTTPD_PORT(Integer.class, "httpd_port"), + HTTPD_PORT(Integer.class, "httpd.port"), AUTOKICK_TIME(Integer.class, "autokick.time"), // FLATLANDS_GENERATE_PARAMS(String.class, "flatlands.generate_params"), @@ -53,7 +53,7 @@ public enum TFM_ConfigEntry SERVICE_CHECKER_URL(String.class, "service_checker_url"), TWITTERBOT_SECRET(String.class, "twitterbot.secret"), TWITTERBOT_URL(String.class, "twitterbot.url"), - HTTPD_PUBLIC_FOLDER(String.class, "httpd_public_folder"), + HTTPD_PUBLIC_FOLDER(String.class, "httpd.public_folder"), // BLOCKED_COMMANDS(List.class, "blocked_commands"), HOST_SENDER_NAMES(List.class, "host_sender_names"),