serverwatcher 5.9.dev11__py3-none-any.whl → 5.9.dev13__py3-none-any.whl

serverwatcher/watcher.py

@@ -96,6 +96,12 @@ class ServerWatcher:
             **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 shutdown(self):
         self.say(self.messages.shutdown)
         raise SystemExit
@@ -117,7 +123,7 @@ class ServerWatcher:
 
         if alive:
             self.say(self.messages.server_back_online)
-            self.say(self.messages.server_back_online_broadcast, broadcast=True, disable=[utils.ASCII_COLOR_MAP], enable=[utils.MC_COLOR_MAP])
+            self.say_mc(self.messages.server_back_online_broadcast)
         else:
             self.say(self.messages.server_failed_restart, level="error")
 
@@ -128,12 +134,12 @@ class ServerWatcher:
         local_time = scheduled.astimezone(self.tz)
         time_str = local_time.strftime("%I:%M %p")
 
-        self.router.broadcast(mapit(self.messages.broadcast_restart_at, time=time_str))
+        self.say_mc(self.messages.broadcast_restart_at, time=time_str)
 
         minute_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=mapit(getattr(self.messages, k)):
-                    self.router.broadcast(msg)
+                    self.say_mc(msg)
             )
             for k in vars(self.messages)
             if k.startswith("minute_")
@@ -142,7 +148,7 @@ class ServerWatcher:
         second_callbacks = {
             int(k.split("_")[1]): (
                 lambda msg=mapit(getattr(self.messages, k)):
-                    self.router.broadcast(msg)
+                    self.say_mc(msg)
             )
             for k in vars(self.messages)
             if k.startswith("second_")

{serverwatcher-5.9.dev11.dist-info → serverwatcher-5.9.dev13.dist-info}/METADATA

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

{serverwatcher-5.9.dev11.dist-info → serverwatcher-5.9.dev13.dist-info}/RECORD

@@ -1,6 +1,6 @@
 serverwatcher/__init__.py,sha256=Q_afN0XU29n48d6Gf0-LT2lLo3RiTWlHRT6rC_fYbjw,486
 serverwatcher/validator.py,sha256=idMwKv63hDS-xOe90h9TCUItdLuZpnEe0vG8Yl6mdeA,4644
-serverwatcher/watcher.py,sha256=JCwWP02ybjM07Rr1HTKdAI0v4NIk3hdUood6mHvoMtw,8520
+serverwatcher/watcher.py,sha256=MQsTIcT0SYpy8nkANWBYNIW4r87KOY6mc89HOwMTrYI,8745
 serverwatcher/configclasses/__init__.py,sha256=YS0KhxtAJGdMcaiFstqTRNxIPLnR7s9v3Tkt5h2uKE4,182
 serverwatcher/configclasses/config.py,sha256=TJI3QBERGlOJZ_kxqRgxgKryOXNdMkuOIuaUusISkOs,820
 serverwatcher/configclasses/messages.py,sha256=GN_TFLvESSW9ixfIC-FzNvwyQCPNJPJ2Wbw22xlkbS0,2184
@@ -8,8 +8,8 @@ serverwatcher/configclasses/watcher.py,sha256=iocNtCu8YifIxEkVfdYrkfj2tmd_F0Ukmk
 serverwatcher/defaultconfigs/config.yaml,sha256=dd4us7FybIkx43h7RIWxCpMn-pQLMz0Gw1c8EA2yrCs,439
 serverwatcher/defaultconfigs/messages.yaml,sha256=EFqAyyBKKVN6egtjir6Wl1YzTBVzVlbp_BwX_X-SawI,1490
 serverwatcher/defaultconfigs/watcher.yaml,sha256=fsfU7G7yGhc4mzGOSQA1IEa5Ru6aouc9BZG2zTYWF7g,401
-serverwatcher-5.9.dev11.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-serverwatcher-5.9.dev11.dist-info/METADATA,sha256=4mqa9bhVdLUnFum1toaq7Ev7NiPGQy2105iVsY2dJm0,1687
-serverwatcher-5.9.dev11.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
-serverwatcher-5.9.dev11.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
-serverwatcher-5.9.dev11.dist-info/RECORD,,
+serverwatcher-5.9.dev13.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+serverwatcher-5.9.dev13.dist-info/METADATA,sha256=32CErVI0lOB8PgE99gEjirN8x0e7VERukfvABCJ8bwE,1687
+serverwatcher-5.9.dev13.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+serverwatcher-5.9.dev13.dist-info/top_level.txt,sha256=8DJAf8WmmglgtZHkp8aoTriRJ2YPcS4F3DfOIkytASo,14
+serverwatcher-5.9.dev13.dist-info/RECORD,,