serverwatcher 5.24.1__tar.gz → 5.25__tar.gz

{serverwatcher-5.24.1/src/serverwatcher.egg-info → serverwatcher-5.25}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 5.24.1
+Version: 5.25
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

{serverwatcher-5.24.1 → serverwatcher-5.25}/pyproject.toml

@@ -7,7 +7,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "serverwatcher"
-version = "5.24.1"
+version = "5.25"
 description = "A HungerLib-powered Minecraft server automation engine."
 readme = "README.md"
 requires-python = ">=3.14"

serverwatcher-5.25/src/serverwatcher/__main__.py

@@ -0,0 +1,34 @@
+from .watcher import ServerWatcher
+from .validator import validate_all
+from hungerlib.utils.exceptions import (
+    ValidationError,
+    FatalValidationError,
+    ValidationFallbacks,
+)
+import time
+
+def main():
+    try:
+        validate_all()
+
+    except FatalValidationError as e:
+        print("❌ FATAL CONFIG ERROR:")
+        print(e)
+        return  # fully cancel
+
+    except ValidationFallbacks as e:
+        print("⚠️ CONFIG DEFAULTS IN USE:")
+        print(e)
+        print("Continuing in 5 seconds...")
+        time.sleep(5)
+
+    except ValidationError as e:
+        print("❌ CONFIG ERROR:")
+        print(e)
+        return  # non-fatal but still cancel
+
+    watcher = ServerWatcher()
+    watcher.run()
+
+if __name__ == "__main__":
+    main()

{serverwatcher-5.24.1 → serverwatcher-5.25}/src/serverwatcher/configclasses/config.py

@@ -16,8 +16,6 @@ class GlobalConfig:
     server_domain: str = 'server.domain'
     server_port: int = 'server.port'
 
-    tps_command: str = 'server.tps_command'
-
     bridge_token: str = 'hungerbridge.token'
     bridge_port: int = 'hungerbridge.port'
 
@@ -45,8 +43,6 @@ class fallbacks:
     server_domain = 'mc.example.com'
     server_port = 25565
 
-    tps_command = 'ticks'
-
     bridge_token = 'CHANGE_ME'
     bridge_port = 1913
 

{serverwatcher-5.24.1 → serverwatcher-5.25}/src/serverwatcher/defaultconfigs/config.yaml

@@ -10,7 +10,6 @@ server:
   server_id: 'CHANGE_ME'
   domain: 'mc.example.com'
   port: 25565
-  tps_command: 'ticks'
 
 hungerbridge:
   token: 'CHANGE_ME'

{serverwatcher-5.24.1 → serverwatcher-5.25}/src/serverwatcher/validator.py

@@ -45,9 +45,6 @@ def validate_global_config(config):
     if c.server_port is not None and not (1 <= c.server_port <= 65535):
         v.errors.append(f'server_port: must be 1–65535 (got "{c.server_port}")')
 
-    # tps_command
-    v.check_field(c, "tps_command")
-
     # hungerbridge
     v.check_field(c, "bridge_token", allow_fallback=False)
     v.check_field(c, "bridge_port")
@@ -109,52 +106,15 @@ def validate_all():
     messages = loadConfig(MessagesConfig)
     watcherconfig = loadConfig(WatcherConfig)
 
-    # type checks
     v.validate_key_types(config, GlobalConfig)
     v.validate_key_types(messages, MessagesConfig)
     v.validate_key_types(watcherconfig, WatcherConfig)
 
-    # semantic checks
     validate_global_config(config)
     validate_watcher_config(watcherconfig)
     validate_messages_config(messages)
 
-    critical_default_keys = [
-        "panel_url",
-        "panel_api_key",
-        "server_id",
-        "server_domain",
-        "bridge_token",
-    ]
-    critical_defaults_used = [
-        d for d in v.defaults
-        if any(d.startswith(k) for k in critical_default_keys)
-    ]
-
-    if len(critical_defaults_used) >= 3:
-        print('❌ CONFIG VALIDATION FAILED:\nIt looks like you haven\'t configured this yet! Please change these defaults:')
-        for d in critical_defaults_used:
-            print(' -', d)
-        sys.exit(1)
-
-    if v.errors or v.defaults:
-        print('❌ CONFIG VALIDATION FAILED:')
-        for e in v.errors:
-            print(' -', e)
-        for d in v.defaults:
-            print(' -', d)
-        if v.warnings:
-            print('\nWarnings:')
-            for w in v.warnings:
-                print(' -', w)
-        sys.exit(1)
-
-    if v.warnings:
-        print('⚠️  CONFIG VALIDATION WARNINGS:')
-        for w in v.warnings:
-            print(' -', w)
-
-    print('✅ All configs are valid.')
+    return v.run(config, messages, watcherconfig)
 
 
 if __name__ == '__main__':

{serverwatcher-5.24.1 → serverwatcher-5.25}/src/serverwatcher/watcher.py

@@ -35,7 +35,6 @@ class ServerWatcher:
             server_port=self.config.server_port,
             bridge_port=self.config.bridge_port,
             bridge_token=self.config.bridge_token,
-            tpsCommand=self.config.tps_command,
         )
 
         # logger name

{serverwatcher-5.24.1 → serverwatcher-5.25/src/serverwatcher.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: serverwatcher
-Version: 5.24.1
+Version: 5.25
 Summary: A HungerLib-powered Minecraft server automation engine.
 Author: iFamished
 License: GPL-3.0

serverwatcher-5.24.1/src/serverwatcher/__main__.py

@@ -1,11 +0,0 @@
-from .watcher import ServerWatcher
-from .validator import validate_all
-
-def main():
-    validate_all()
-    
-    watcher = ServerWatcher()
-    watcher.run()
-
-if __name__ == "__main__":
-    main()