From 5c4d361fea178f0bcf605148c78b8466475cbdf0 Mon Sep 17 00:00:00 2001
From: Jordan Irwin <antumdeluge@gmail.com>
Date: Tue, 1 Jun 2021 18:33:33 -0700
Subject: [PATCH] Change setting "enable_debug_mods" to "debug_mods" &...

...re-organize settings.
---
 settings.lua     | 66 +++++++++++++++++++++++++++---------------------
 settingtypes.txt |  9 ++++---
 2 files changed, 43 insertions(+), 32 deletions(-)

diff --git a/settings.lua b/settings.lua
index 731813b..af2075d 100644
--- a/settings.lua
+++ b/settings.lua
@@ -6,37 +6,9 @@
 --  @module settings.lua
 
 
-cmer.debug = core.settings:get_bool("enable_debug_mods", false)
+-- cmer specific settings
 
 
---- Disables attacking players.
---
---  @setting only_peaceful_mobs
---  @settype bool
---  @default false
-cmer.allow_hostile = core.settings:get_bool("only_peaceful_mobs") ~= true
-
---- Enables damage.
---
---  Global setting.
---
---  @setting enable_damage
---  @settype bool
---  @default false
-cmer.enable_damage = core.settings:get_bool("enable_damage", false)
-
---- Enables creative mode.
---
---  Global setting.
---
---  @setting creative_mode
---  @settype bool
---  @default false
-cmer.creative = core.settings:get_bool("creative_mode", false)
-
-
--- mobs specific settings
-
 --- Enables particles when swimming.
 --
 --  @setting mobs.particles
@@ -57,3 +29,39 @@ cmer.nametags = core.settings:get_bool("mobs.nametags", false)
 --  @settype bool
 --  @default false
 cmer.grief_owned = core.settings:get_bool("mobs.grief_owned", false)
+
+
+-- general mobs settings
+
+
+--- Disables attacking players.
+--
+--  @setting only_peaceful_mobs
+--  @settype bool
+--  @default false
+cmer.allow_hostile = core.settings:get_bool("only_peaceful_mobs") ~= true
+
+
+-- general settings
+
+
+--- Print extra debugging messages.
+--
+--  @setting debug_mods
+--  @settype bool
+--  @default false
+cmer.debug = core.settings:get_bool("debug_mods", false)
+
+--- Enables creative mode.
+--
+--  @setting creative_mode
+--  @settype bool
+--  @default false
+cmer.creative = core.settings:get_bool("creative_mode", false)
+
+--- Enables damage.
+--
+--  @setting enable_damage
+--  @settype bool
+--  @default false
+cmer.enable_damage = core.settings:get_bool("enable_damage", false)
diff --git a/settingtypes.txt b/settingtypes.txt
index f099948..47ca285 100644
--- a/settingtypes.txt
+++ b/settingtypes.txt
@@ -1,7 +1,4 @@
 
-# Only spawn mobs that don't attack players.
-only_peaceful_mobs (Peaceful only) bool false
-
 mobs.particles (Enable particles) bool false
 
 # Displays nametags above mobs.
@@ -9,3 +6,9 @@ mobs.nametags (Enable mob nametags) bool false
 
 # Determines if owned entities can be killed by non-owners.
 mobs.grief_owned (Players can kill owned) bool false
+
+# Only spawn mobs that don't attack players.
+only_peaceful_mobs (Peaceful only) bool false
+
+# Print extra debugging messages.
+debug_mods (Debug mods) bool false