serverwatcher 5.8.dev33__tar.gz → 5.8.dev35__tar.gz

{serverwatcher-5.8.dev33/src/serverwatcher.egg-info → serverwatcher-5.8.dev35}/PKG-INFO

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

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/pyproject.toml

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

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/src/serverwatcher/configclasses/config.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class GlobalConfig:
     timezone: str = yaml_key("timezone")
 

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/src/serverwatcher/configclasses/messages.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class MessagesConfig:
     prefix: str = yaml_key("prefix", "<aqua>[Server Watcher]")
     bullet: str = yaml_key("bullet")

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/src/serverwatcher/configclasses/watcher.py

@@ -1,10 +1,10 @@
 from dataclasses import field
-from hungerlib import datamap, Syntax
+from hungerlib import datamap, datamap_api
 
 def yaml_key(path: str, default=None):
     return field(default=default, metadata={"yaml_key": path})
 
-@datamap(syntax=Syntax.braces)
+@datamap(syntax=datamap_api.braces)
 class WatcherConfig:
     watch_interval: int = yaml_key("watch_interval")
     schedule_control: bool = yaml_key("schedule_control.enabled")

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/src/serverwatcher/validator.py

@@ -1,12 +1,12 @@
 import sys
 from dataclasses import fields
-from hungerlib import loadConfig, clearTerminal
+from hungerlib import utils, loadConfig
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
 from serverwatcher.configclasses.watcher import WatcherConfig
 
-clearTerminal()
+utils.clearTerminal()
 
 def deep_get_attr(obj, dotted):
     parts = dotted.split(".")

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35}/src/serverwatcher/watcher.py

@@ -2,20 +2,7 @@ import os
 import time
 from zoneinfo import ZoneInfo
 
-from hungerlib import (
-    Panel,
-    GenericServer,
-    MinecraftServer,
-    MessageRouter,
-    loadConfig,
-    clearTerminal,
-    set_default_maps,
-    ASCII_COLOR_MAP,
-    mapit,
-    validateAll,
-    Snapshot,
-    waitForOnline,
-)
+from hungerlib import servers, MessageRouter, loadConfig, utils, datamap_api, mapit
 
 from serverwatcher.configclasses.config import GlobalConfig
 from serverwatcher.configclasses.messages import MessagesConfig
@@ -45,26 +32,26 @@ class ServerWatcher:
             WatcherConfig
         )
 
-        set_default_maps(
-            ASCII_COLOR_MAP,
+        datamap_api.set_default_maps(
+            utils.ASCII_COLOR_MAP,
             self.config,
             self.messages,
             self.watcherconfig
         )
 
-        self.panel = Panel(
+        self.panel = servers.Panel(
             name=self.config.panel_name,
             url=self.config.panel_url,
             api_key=self.config.panel_api_key,
         )
 
-        self.origin = GenericServer(
+        self.origin = servers.Generic(
             name="Origin",
             panel=self.panel,
             server_id=self.config.origin_server_id
         )
 
-        self.server = MinecraftServer(
+        self.server = servers.Minecraft(
             name=self.config.server_name,
             panel=self.panel,
             server_id=self.config.server_id,
@@ -114,7 +101,7 @@ class ServerWatcher:
         time.sleep(self.watcherconfig.restart_wait_seconds)
 
         self.say(self.messages.status_check, level="warn")
-        alive = waitForOnline(
+        alive = utils.waitForOnline(
             self.server,
             timeout=self.watcherconfig.restart_timeout,
             interval=self.watcherconfig.restart_online_interval,
@@ -162,12 +149,12 @@ class ServerWatcher:
     def evaluate(self):
         self.say(self.messages.startup)
 
-        if not validateAll(self.panel, self.server):
+        if not utils.validateAll(self.panel, self.server):
             self.say(self.messages.validation_fail, level="error")
             self.shutdown()
 
         self.server.refresh()
-        snap = Snapshot(self.server, 2, True)
+        snap = utils.Snapshot(self.server, 2, True)
 
         pro = 0
         anti = 0
@@ -243,9 +230,9 @@ class ServerWatcher:
 
     def run(self):
         if self.config.clear_terminal:
-            clearTerminal()
+            utils.clearTerminal()
         while True:
             if self.config.clear_terminal:
-                clearTerminal()
+                utils.clearTerminal()
             self.evaluate()
             time.sleep(self.watcherconfig.watch_interval)

{serverwatcher-5.8.dev33 → serverwatcher-5.8.dev35/src/serverwatcher.egg-info}/PKG-INFO

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