serverwatcher 5.9.dev12__tar.gz → 5.9.dev14__tar.gz

{serverwatcher-5.9.dev12/src/serverwatcher.egg-info → serverwatcher-5.9.dev14}/PKG-INFO

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

{serverwatcher-5.9.dev12 → serverwatcher-5.9.dev14}/pyproject.toml

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

{serverwatcher-5.9.dev12 → serverwatcher-5.9.dev14}/src/serverwatcher/configclasses/config.py

@@ -15,13 +15,14 @@ class GlobalConfig:
     server_domain: str = "server.domain"
     server_port: int = "server.port"
 
-    rcon_port: int = "server.rcon_port"
-    rcon_password: str = "server.rcon_password"
     tps_command: str = "server.tps_command"
 
+    bridge_token: str = "hungerbridge.token"
+    bridge_url: str = "hungerbridge.url"
+    bridge_port: int = "hungerbridge.port"
+
     enable_logging: bool = "logger.enabled"
     logger_name: str = "logger.name"
     log_path: str = "logger.log_path"
 
-    console_backspaces: int = "terminal.backspaces"
     clear_terminal: bool = "terminal.enable_clearing"

{serverwatcher-5.9.dev12 → serverwatcher-5.9.dev14}/src/serverwatcher/defaultconfigs/config.yaml

@@ -13,15 +13,17 @@ server:
   server_id: 'CHANGE_ME'
   domain: 'mc.example.com'
   port: 25565
-  rcon_port: 25575
-  rcon_password: 'password'
   tps_command: 'ticks'
 
+hungerbridge:
+  token: 'CHANGE_ME'
+  url: 'http://example.com'
+  port: 1913
+
 logger:
   enabled: True
   name: 'Server Watcher'
   log_path: '/home/container/logs/'
 
 terminal:
-  backspaces: 8
   enable_clearing: True

{serverwatcher-5.9.dev12 → serverwatcher-5.9.dev14}/src/serverwatcher/watcher.py

@@ -57,8 +57,8 @@ class ServerWatcher:
             server_id=self.config.server_id,
             server_domain=self.config.server_domain,
             server_port=self.config.server_port,
-            rcon_port=self.config.rcon_port,
-            rcon_password=self.config.rcon_password,
+            bridge_url=self.config.bridge_url.rstrip("/") + ":" + self.config.bridge_port,
+            bridge_token=self.config.bridge_token,
             tpsCommand=self.config.tps_command,
         )
 
@@ -69,7 +69,6 @@ class ServerWatcher:
             server=self.server,
             log_path=self.config.log_path,
             formatter=self._fmt,
-            console_backspaces=self.config.console_backspaces,
         )
 
         self.tz = ZoneInfo(self.config.timezone)
@@ -86,21 +85,19 @@ class ServerWatcher:
             only_maps=only_maps,
             disable=disable,
             enable=enable,
-            **ctx
         )
 
         self.router.say(
             msg,
             level=level,
             log=self.config.enable_logging,
-            **ctx
         )
 
-def say_mc(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
-    disable = (disable or []) + [utils.ASCII_COLOR_MAP]
-    enable = (enable or []) + [utils.MC_COLOR_MAP]
-    msg = mapit(template, only_maps=only_maps, disable=disable, enable=enable, **ctx)
-    self.router.broadcast(msg)
+    def say_mc(self, template, level="info", only_maps=None, disable=None, enable=None, **ctx):
+        disable = (disable or []) + [utils.ASCII_COLOR_MAP]
+        enable = (enable or []) + [utils.MC_COLOR_MAP]
+        msg = mapit(template, only_maps=only_maps, disable=disable, enable=enable, **ctx)
+        self.router.broadcast(msg)
 
     def shutdown(self):
         self.say(self.messages.shutdown)

{serverwatcher-5.9.dev12 → serverwatcher-5.9.dev14/src/serverwatcher.egg-info}/PKG-INFO

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