rustplus 5.6.15__tar.gz → 5.6.17__tar.gz

{rustplus-5.6.15/rustplus.egg-info → rustplus-5.6.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustplus
-Version: 5.6.15
+Version: 5.6.17
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/__init__.py

@@ -22,5 +22,5 @@ from .utils import *
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "5.6.15"
+__version__ = "5.6.17"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/base_rust_api.py

@@ -145,9 +145,11 @@ class BaseRustSocket:
         :return: None
         """
         EventLoopManager.set_loop(
-            self.event_loop
-            if self.event_loop is not None
-            else asyncio.get_event_loop(),
+            (
+                self.event_loop
+                if self.event_loop is not None
+                else asyncio.get_event_loop()
+            ),
             self.server_id,
         )
 
@@ -155,9 +157,11 @@ class BaseRustSocket:
             ServerChecker(self.server_id.ip, self.server_id.port).run()
 
         EventLoopManager.set_loop(
-            self.event_loop
-            if self.event_loop is not None
-            else asyncio.get_event_loop(),
+            (
+                self.event_loop
+                if self.event_loop is not None
+                else asyncio.get_event_loop()
+            ),
             self.server_id,
         )
 

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/remote/camera/camera_manager.py

@@ -80,9 +80,11 @@ class CameraManager:
             last_packet.vertical_fov,
             self._cam_info_message.far_plane,
             entity_render_distance,
-            max_entity_amount
-            if max_entity_amount is not None
-            else len(self._last_packets.get_last().entities),
+            (
+                max_entity_amount
+                if max_entity_amount is not None
+                else len(self._last_packets.get_last().entities)
+            ),
         )
 
     async def get_frame(

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/remote/camera/camera_parser.py

@@ -121,9 +121,9 @@ class Parser:
                 ] = (208, 230, 252)
                 distance = float("inf")
 
-            self.depth_output[
-                x : x + self.scale_factor, y : y + self.scale_factor
-            ] = distance
+            self.depth_output[x : x + self.scale_factor, y : y + self.scale_factor] = (
+                distance
+            )
 
         return False
 

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/remote/events/handler_list.py

@@ -29,9 +29,9 @@ class HandlerList:
 class EntityHandlerList(HandlerList):
     def __init__(self) -> None:
         super().__init__()
-        self._handlers: Dict[
-            ServerID, Dict[str, Set[RegisteredListener]]
-        ] = defaultdict(dict)
+        self._handlers: Dict[ServerID, Dict[str, Set[RegisteredListener]]] = (
+            defaultdict(dict)
+        )
 
     def unregister(self, listener: RegisteredListener, server_id: ServerID) -> None:
         if listener.listener_id in self._handlers.get(server_id):

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/rust_api.py

@@ -36,6 +36,7 @@ from ..utils import (
     convert_monument,
     translate_id_to_stack,
     deprecated,
+    generate_grid,
 )
 
 
@@ -205,17 +206,9 @@ class RustSocket(BaseRustSocket):
         game_map = image.resize((map_size, map_size), Image.LANCZOS).convert("RGBA")
 
         if add_grid:
-            grid = (
-                Image.open(
-                    requests.get(
-                        f"https://files.rustmaps.com/grids/{map_size}.png", stream=True
-                    ).raw
-                )
-                .resize((map_size, map_size), Image.LANCZOS)
-                .convert("RGBA")
-            )
+            grid = generate_grid(map_size)
 
-            game_map.paste(grid, (0, 0), grid)
+            game_map.paste(grid, (5, 5), grid)
 
         if add_icons or add_events or add_vending_machines:
             map_markers = (

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/api/structures/rust_marker.py

@@ -185,3 +185,6 @@ class RustMarker(Serializable):
                 self._out_of_stock,
             )
         )
+
+    def __hash__(self) -> int:
+        return hash((self._id, self._type))

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/commands/command_handler.py

@@ -1,4 +1,5 @@
 import asyncio
+import shlex
 from datetime import datetime
 
 from . import Command, CommandTime
@@ -22,7 +23,7 @@ class CommandHandler:
 
     async def run_command(self, message: RustChatMessage, prefix) -> None:
         if prefix == self.command_options.prefix:
-            command = message.message.split(" ")[0][len(prefix) :]
+            command = shlex.split(message.message)[0][len(prefix) :]
         else:
             command = prefix
 
@@ -35,7 +36,7 @@ class CommandHandler:
                     message.steam_id,
                     CommandTime(datetime.utcfromtimestamp(message.time), message.time),
                     command,
-                    message.message.split(" ")[1:],
+                    shlex.split(message.message)[1:],
                 )
             )
         else:
@@ -52,7 +53,7 @@ class CommandHandler:
                                 datetime.utcfromtimestamp(message.time), message.time
                             ),
                             command,
-                            message.message.split(" ")[1:],
+                            shlex.split(message.message)[1:],
                         ),
                     )
                     break

{rustplus-5.6.15 → rustplus-5.6.17}/rustplus/utils/rust_utils.py

@@ -1,13 +1,14 @@
 from importlib import resources
 from typing import Tuple
-from PIL import Image
+from PIL import Image, ImageDraw, ImageFont
 import logging
 import string
 
 from ..api.remote.rustplus_proto import AppMessage
 from ..api.structures import RustTime
 
-icons_path = "rustplus.api.icons"
+ICONS_PATH = "rustplus.api.icons"
+FONT_PATH = "rustplus.utils.fonts"
 GRID_DIAMETER = 146.28571428571428
 
 
@@ -60,21 +61,21 @@ def convert_marker(name, angle) -> Image.Image:
         "8": "patrol.png",
     }
 
-    with resources.path(icons_path, name_to_file[name]) as path:
+    with resources.path(ICONS_PATH, name_to_file[name]) as path:
         icon = Image.open(path).convert("RGBA")
     if name == "6":
         icon = icon.resize((85, 85))
     elif name == "2":
         icon = icon.resize((96, 96))
     elif name == "4":
-        with resources.path(icons_path, "chinook_blades.png") as path:
+        with resources.path(ICONS_PATH, "chinook_blades.png") as path:
             blades = Image.open(path).convert("RGBA")
         blades = blades.resize((100, 100))
         icon.paste(blades, (64 - 50, 96 - 50), blades)
         icon.paste(blades, (64 - 50, 32 - 50), blades)
     elif name == "8":
         icon = icon.resize((200, 200))
-        with resources.path(icons_path, "chinook_blades.png") as path:
+        with resources.path(ICONS_PATH, "chinook_blades.png") as path:
             blades = Image.open(path).convert("RGBA")
         blades = blades.resize((200, 200))
         icon.paste(blades, (0, 0), blades)
@@ -129,16 +130,16 @@ def convert_monument(name: str, override_images: dict) -> Image.Image:
 
     if name in name_to_file:
         file_name = name_to_file[name]
-        with resources.path(icons_path, file_name) as path:
+        with resources.path(ICONS_PATH, file_name) as path:
             icon = Image.open(path).convert("RGBA")
     elif "swamp" in name:
-        with resources.path(icons_path, "swamp.png") as path:
+        with resources.path(ICONS_PATH, "swamp.png") as path:
             icon = Image.open(path).convert("RGBA")
     else:
         logging.getLogger("rustplus.py").info(
             f"{name} - Has no icon, report this as an issue"
         )
-        with resources.path(icons_path, "icon.png") as path:
+        with resources.path(ICONS_PATH, "icon.png") as path:
             icon = Image.open(path).convert("RGBA")
     return icon
 
@@ -228,3 +229,35 @@ def convert_xy_to_grid(
     grid_pos_number = str(int(_get_grid_y(coords[1], corrected_map_size)))
 
     return HackyBackwardsCompatCoordClass(grid_pos_letters, grid_pos_number)
+
+
+def generate_grid(
+    map_size: int,
+    text_size: int = 20,
+    text_padding: int = 5,
+    color: str = "black",
+) -> Image.Image:
+    img = Image.new("RGBA", (map_size, map_size), (0, 0, 0, 0))
+    d = ImageDraw.Draw(img)
+
+    with resources.path(FONT_PATH, "PermanentMarker.ttf") as path:
+        font = ImageFont.truetype(str(path), text_size)
+
+    letters = list(string.ascii_uppercase)
+    letters.extend(
+        a + b for a in string.ascii_uppercase for b in string.ascii_uppercase
+    )
+
+    num_cells = int(map_size / GRID_DIAMETER)
+
+    for i in range(num_cells):
+        for j in range(num_cells):
+            start = (i * GRID_DIAMETER, j * GRID_DIAMETER)
+            end = ((i + 1) * GRID_DIAMETER, (j + 1) * GRID_DIAMETER)
+            d.rectangle((start, end), outline=color)
+
+            text = letters[i] + str(j)
+            text_pos = (start[0] + text_padding, start[1] + text_padding)
+            d.text(text_pos, text, fill=color, font=font)
+
+    return img

{rustplus-5.6.15 → rustplus-5.6.17/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: rustplus
-Version: 5.6.15
+Version: 5.6.17
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n