serverwatcher 5.9.dev12__py3-none-any.whl → 5.9.dev14__py3-none-any.whl

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/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/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.dist-info → serverwatcher-5.9.dev14.dist-info}/METADATA

@@ -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.dist-info → serverwatcher-5.9.dev14.dist-info}/RECORD

@@ -1,15 +1,15 @@
 serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
 serverwatcher/validator.py,sha256=idMwKv63hDS-xOe90h9TCUItdLuZpnEe0vG8Yl6mdeA,4644
-serverwatcher/watcher.py,sha256=Mvo6aW0Or2PMuOMefFV8Mu_87hzp_r92MZeWE00u66M,8725
+serverwatcher/watcher.py,sha256=mr40Icelk8enuAqbeimPj7VOULLotGLQwjFV9qFMEsA,8690
 serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
-serverwatcher/configclasses/config.py,sha256=TJI3QBERGlOJZ_kxqRgxgKryOXNdMkuOIuaUusISkOs,820
+serverwatcher/configclasses/config.py,sha256=CE5fp7CcLm8XPvDBAHXydn7BEjQmtf2VZirK-C7LNOQ,810
 serverwatcher/configclasses/messages.py,sha256=GN_TFLvESSW9ixfIC-FzNvwyQCPNJPJ2Wbw22xlkbS0,2184
 serverwatcher/configclasses/watcher.py,sha256=iocNtCu8YifIxEkVfdYrkfj2tmd_F0UkmkahIrGaXKU,1032
-serverwatcher/defaultconfigs/config.yaml,sha256=dd4us7FybIkx43h7RIWxCpMn-pQLMz0Gw1c8EA2yrCs,439
+serverwatcher/defaultconfigs/config.yaml,sha256=MrH5VVnVn3_AHeafm6JuwpCbJV_2or4iLHb-DUJBSNc,453
 serverwatcher/defaultconfigs/messages.yaml,sha256=EFqAyyBKKVN6egtjir6Wl1YzTBVzVlbp_BwX_X-SawI,1490
 serverwatcher/defaultconfigs/watcher.yaml,sha256=fsfU7G7yGhc4mzGOSQA1IEa5Ru6aouc9BZG2zTYWF7g,401
-serverwatcher-5.9.dev12.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.9.dev12.dist-info/METADATA,sha256=bwPRTJfM2v3raQmi0nOTQ0L2KP6BR9kkHgPSLTVIH3s,1687
-serverwatcher-5.9.dev12.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.9.dev12.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.9.dev12.dist-info/RECORD,,
+serverwatcher-5.9.dev14.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.9.dev14.dist-info/METADATA,sha256=b2BKSc-D6_5YnZ4D7q8U3yRueUVakXy2IDvy43L4N7U,1687
+serverwatcher-5.9.dev14.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.9.dev14.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.9.dev14.dist-info/RECORD,,