rustplus 6.1.0__tar.gz → 6.1.1__tar.gz

{rustplus-6.1.0/rustplus.egg-info → rustplus-6.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.1.0
+Version: 6.1.1
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b7
+Requires-Dist: resvg
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type

{rustplus-6.1.0 → rustplus-6.1.1}/requirements.txt

@@ -7,3 +7,4 @@ requests
 numpy
 scipy
 betterproto==2.0.0b7
+resvg

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus/__init__.py

@@ -22,5 +22,5 @@ from .structs import RustError, RustMarker, Vector
 
 __name__ = "rustplus"
 __author__ = "olijeffers0n"
-__version__ = "6.1.0"
+__version__ = "6.1.1"
 __support__ = "Discord: https://discord.gg/nQqJe8qvP8"

rustplus-6.1.1/rustplus/annotations/chat_event.py

@@ -0,0 +1,34 @@
+from typing import Callable
+
+from .. import ServerDetails
+from ..identification import RegisteredListener
+from ..events import ChatEventPayload as ChatEventManager
+
+
+def ChatEvent(server_details: ServerDetails) -> Callable:
+
+    def wrapper(func) -> RegisteredListener:
+
+        if isinstance(func, RegisteredListener):
+            func = func.get_coro()
+
+        listener = RegisteredListener(func.__name__, func)
+
+        ChatEventManager.HANDLER_LIST.register(listener, server_details)
+
+        return listener
+
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "ChatEvent decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "ChatEvent decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
+    return wrapper

rustplus-6.1.1/rustplus/annotations/clan_event.py

@@ -0,0 +1,34 @@
+from typing import Callable
+
+from .. import ServerDetails
+from ..identification import RegisteredListener
+from ..events import ClanInfoEventPayload as ClanInfoEventManager
+
+
+def ClanEvent(server_details: ServerDetails) -> Callable:
+
+    def wrapper(func) -> RegisteredListener:
+
+        if isinstance(func, RegisteredListener):
+            func = func.get_coro()
+
+        listener = RegisteredListener(func.__name__, func)
+
+        ClanInfoEventManager.HANDLER_LIST.register(listener, server_details)
+
+        return listener
+
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "ClanEvent decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "ClanEvent decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
+    return wrapper

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus/annotations/command.py

@@ -20,4 +20,17 @@ def Command(
 
         return RegisteredListener(func.__name__, func)
 
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "Command decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "Command decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
     return wrapper

rustplus-6.1.1/rustplus/annotations/entity_event.py

@@ -0,0 +1,32 @@
+from typing import Callable
+
+from .. import ServerDetails
+from ..identification import RegisteredListener
+from ..events import EntityEventPayload as EntityEventManager
+
+
+def EntityEvent(server_details: ServerDetails, eid: int) -> Callable:
+    def wrapper(func) -> RegisteredListener:
+        if isinstance(func, RegisteredListener):
+            func = func.get_coro()
+
+        listener = RegisteredListener(str(eid), func)
+
+        EntityEventManager.HANDLER_LIST.register(listener, server_details)
+
+        return listener
+
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "EntityEvent decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "EntityEvent decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
+    return wrapper

rustplus-6.1.1/rustplus/annotations/protobuf_event.py

@@ -0,0 +1,32 @@
+from typing import Callable
+
+from .. import ServerDetails
+from ..identification import RegisteredListener
+from ..events import ProtobufEventPayload as ProtobufEventManager
+
+
+def ProtobufEvent(server_details: ServerDetails) -> Callable:
+    def wrapper(func) -> RegisteredListener:
+        if isinstance(func, RegisteredListener):
+            func = func.get_coro()
+
+        listener = RegisteredListener(func.__name__, func)
+
+        ProtobufEventManager.HANDLER_LIST.register(listener, server_details)
+
+        return listener
+
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "ProtobufEvent decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "ProtobufEvent decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
+    return wrapper

rustplus-6.1.1/rustplus/annotations/team_event.py

@@ -0,0 +1,32 @@
+from typing import Callable
+
+from .. import ServerDetails
+from ..identification import RegisteredListener
+from ..events import TeamEventPayload as TeamEventManager
+
+
+def TeamEvent(server_details: ServerDetails) -> Callable:
+    def wrapper(func) -> RegisteredListener:
+        if isinstance(func, RegisteredListener):
+            func = func.get_coro()
+
+        listener = RegisteredListener(func.__name__, func)
+
+        TeamEventManager.HANDLER_LIST.register(listener, server_details)
+
+        return listener
+
+    if not isinstance(server_details, ServerDetails):
+        if callable(server_details):
+            message = (
+                "TeamEvent decorator requires a ServerDetails object as an argument. You have probably "
+                "forgotten the brackets on the decorator to pass the server details object."
+            )
+        else:
+            message = (
+                "TeamEvent decorator requires a ServerDetails object as an argument. Please provide a valid "
+                "ServerDetails instance."
+            )
+        raise TypeError(message)
+
+    return wrapper

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus/rust_api.py

@@ -44,7 +44,7 @@ from .utils import (
     fetch_avatar_icon,
     format_coord,
     convert_marker,
-    convert_monument,
+    convert_monument_to_image,
 )
 from .remote.ratelimiter import RateLimiter
 from .utils.utils import error_present
@@ -317,6 +317,9 @@ class RustSocket:
                 await self.get_markers() if add_events or add_vending_machines else []
             )
 
+            if isinstance(map_markers, RustError):
+                return map_markers
+
             if add_icons:
                 for monument in monuments:
                     if str(monument.token) == "DungeonBase":
@@ -326,11 +329,12 @@ class RustSocket:
                         # reported as separate markers next to the lab; they aren't
                         # standalone monuments, so don't draw them.
                         continue
-                    icon = convert_monument(monument.token, override_images)
+
                     if monument.token in override_images:
-                        icon = icon.resize((150, 150))
-                    if str(monument.token) == "train_tunnel_display_name":
-                        icon = icon.resize((100, 125))
+                        icon = override_images[monument.token].resize((150, 150))
+                    else:
+                        icon = convert_monument_to_image(monument.token)
+
                     output.paste(
                         icon,
                         (format_coord(int(monument.x), int(monument.y), map_size)),

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus/utils/__init__.py

@@ -5,7 +5,7 @@ from .utils import (
     fetch_avatar_icon,
     format_coord,
     convert_marker,
-    convert_monument,
+    convert_monument_to_image,
     convert_event_type_to_name,
     convert_coordinates,
 )

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus/utils/utils.py

@@ -1,10 +1,13 @@
 import logging
 import string
 from importlib import resources
-from typing import Tuple, Dict
+from typing import Tuple
 
 import requests
 from PIL import ImageFont, Image, ImageDraw
+from pathlib import Path
+from resvg import render, usvg
+from io import BytesIO
 
 ICONS_PATH = "rustplus.icons"
 FONT_PATH = "rustplus.utils.fonts"
@@ -179,64 +182,69 @@ def convert_marker(marker_type: int, angle) -> Image.Image:
     return icon
 
 
-def convert_monument(name: str, override_images: Dict[str, Image.Image]) -> Image.Image:
+def convert_monument_to_image(name: str) -> Image.Image:
     name_to_file = {
-        "supermarket": "supermarket.png",
-        "mining_outpost_display_name": "mining_outpost.png",
-        "gas_station": "oxums.png",
-        "fishing_village_display_name": "fishing.png",
-        "large_fishing_village_display_name": "fishing.png",
-        "lighthouse_display_name": "lighthouse.png",
-        "excavator": "excavator.png",
-        "water_treatment_plant_display_name": "water_treatment.png",
-        "train_yard_display_name": "train_yard.png",
-        "outpost": "outpost.png",
-        "bandit_camp": "bandit.png",
-        "jungle_ziggurat": "jungle_ziggurat.png",
-        "junkyard_display_name": "junkyard.png",
-        "dome_monument_name": "dome.png",
-        "satellite_dish_display_name": "satellite.png",
-        "power_plant_display_name": "power_plant.png",
-        "military_tunnels_display_name": "military_tunnels.png",
-        "airfield_display_name": "airfield.png",
-        "launchsite": "launchsite.png",
-        "sewer_display_name": "sewer.png",
-        "oil_rig_small": "small_oil_rig.png",
-        "large_oil_rig": "large_oil_rig.png",
-        "underwater_lab": "underwater_lab.png",
-        "AbandonedMilitaryBase": "desert_base.png",
-        "ferryterminal": "ferryterminal.png",
-        "harbor_display_name": "harbour.png",
-        "harbor_2_display_name": "harbour.png",
-        "arctic_base_a": "arctic_base.png",
-        "arctic_base_b": "arctic_base.png",
-        "missile_silo_monument": "missile_silo.png",
-        "stables_a": "stables.png",
-        "stables_b": "stables.png",
-        "mining_quarry_stone_display_name": "mining_quarry_stone.png",
-        "mining_quarry_sulfur_display_name": "mining_quarry_sulfur.png",
-        "mining_quarry_hqm_display_name": "mining_quarry_hqm.png",
-        "train_tunnel_link_display_name": "train.png",
-        "train_tunnel_display_name": "train.png",
-        "radtown": "radtown.png",
+        "ferryterminal": "Ferry_Terminal.svg",
+        "train_tunnel_display_name": "Tunnel_Entrance.svg",
+        "train_tunnel_link_display_name": "Tunnel_Entrance.svg",
+        "apartmentcomplex": "Apartments_Complex.svg",
+        "harbor_display_name": "Harbor.svg",
+        "harbor_2_display_name": "Harbor.svg",
+        "large_fishing_village_display_name": "Fishing_Village.svg",
+        "fishing_village_display_name": "Fishing_Village.svg",
+        "AbandonedMilitaryBase": "Military_Base.svg",
+        "power_plant_display_name": "Powerplant.svg",
+        "missile_silo_monument": "Missile_Silo.svg",
+        "outpost": "Outpost.svg",
+        "bandit_camp": "Bandit_Camp.svg",
+        "stables_a": "Stables.svg",
+        "stables_b": "Stables.svg",
+        "mining_quarry_stone_display_name": "Stone_Quarry.svg",
+        "mining_quarry_sulfur_display_name": "Sulfur_Quarry.svg",
+        "mining_quarry_hqm_display_name": "HQM_Quarry.svg",
+        "satellite_dish_display_name": "Satellite_Dish.svg",
+        "dome_monument_name": "Dome.svg",
+        "junkyard_display_name": "Junkyard.svg",
+        "sewer_display_name": "Sewer_Branch.svg",
+        "oil_rig_small": "Oil_Rig_Small.svg",
+        "large_oil_rig": "Oil_Rig_Large.svg",
+        "lighthouse_display_name": "Lighthouse.svg",
+        "mining_outpost_display_name": "Mining_Outpost.svg",
+        "supermarket": "Supermarket.svg",
+        "arctic_base_a": "Arctic_Research_Base.svg",
+        "arctic_base_b": "Arctic_Research_Base.svg",
+        "launchsite": "Launch_Site.svg",
+        "water_treatment_plant_display_name": "Water_Treatment.svg",
+        "excavator": "Excavator.svg",
+        "train_yard_display_name": "Trainyard.svg",
+        "airfield_display_name": "Airfield.svg",
+        "military_tunnels_display_name": "Military_Tunnels.svg",
+        "gas_station": "Gas_Station.svg",
+        "jungle_ziggurat": "Jungle_Ziggurat.svg",
+        "radtown": "Radtown.svg",
     }
 
-    try:
-        return override_images[name]
-    except KeyError:
-        pass
-
     if name in name_to_file:
         file_name = name_to_file[name]
         with resources.path(ICONS_PATH, file_name) as path:
-            icon = Image.open(path).convert("RGBA")
+            if file_name.endswith(".png"):
+                return Image.open(path).convert("RGBA")
+            elif file_name.endswith(".svg"):
+                return svg_to_pil(path, (150, 150))
+            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:
+                    return Image.open(path).convert("RGBA")
+
     elif "swamp" in name:
-        with resources.path(ICONS_PATH, "swamp.png") as path:
-            icon = Image.open(path).convert("RGBA")
+        with resources.path(ICONS_PATH, "Swamp.svg") as path:
+            return svg_to_pil(path, (150, 150))
     elif "underwater_lab" in name:
         # Same story with swamp, no rust+ specific token so prefab name is sent instead
-        with resources.path(ICONS_PATH, "underwater_lab.png") as path:
-            icon = Image.open(path).convert("RGBA")
+        with resources.path(ICONS_PATH, "Underwater_Lab.svg") as path:
+            return svg_to_pil(path, (150, 150))
     else:
         logging.getLogger("rustplus.py").info(
             f"{name} - Has no icon, report this as an issue"
@@ -245,3 +253,37 @@ def convert_monument(name: str, override_images: Dict[str, Image.Image]) -> Imag
             icon = Image.open(path).convert("RGBA")
 
     return icon
+
+
+def svg_to_pil(filepath: str | Path, size: tuple[int, int]) -> Image.Image:
+    target_w, target_h = size
+
+    svg = Path(filepath).read_text()
+
+    opts = usvg.Options.default()
+    tree = usvg.Tree.from_str(svg, opts)
+
+    orig_w, orig_h = tree.int_size()
+
+    # Preserve aspect ratio (fit inside target)
+    scale_x = target_w / orig_w
+    scale_y = target_h / orig_h
+    scale = min(scale_x, scale_y)  # use max for "cover" behavior
+
+    # center the scaled image in the target canvas
+    tx = (target_w - orig_w * scale) / 2.0
+    ty = (target_h - orig_h * scale) / 2.0
+
+    # transform tuple format: (a, b, c, d, e, f)
+    # corresponds to the affine matrix rows:
+    # [ a  b  c ]
+    # [ d  e  f ]
+    transform_fit = (scale, 0.0, tx, 0.0, scale, ty)
+
+    png_bytes = render(
+        tree,
+        transform_fit,
+        bg_size=(target_w, target_h),
+    )
+
+    return Image.open(BytesIO(png_bytes)).convert("RGBA")

{rustplus-6.1.0 → rustplus-6.1.1/rustplus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rustplus
-Version: 6.1.0
+Version: 6.1.1
 Summary: A python wrapper for the Rust Plus API
 Home-page: https://github.com/olijeffers0n/rustplus
 Author: olijeffers0n
@@ -18,6 +18,7 @@ Requires-Dist: requests
 Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: betterproto==2.0.0b7
+Requires-Dist: resvg
 Dynamic: author
 Dynamic: description
 Dynamic: description-content-type

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus.egg-info/SOURCES.txt

@@ -31,49 +31,14 @@ rustplus/events/team_event.py
 rustplus/exceptions/__init__.py
 rustplus/exceptions/exceptions.py
 rustplus/icons/__init__.py
-rustplus/icons/airfield.png
-rustplus/icons/arctic_base.png
-rustplus/icons/bandit.png
-rustplus/icons/barn.png
 rustplus/icons/cargo.png
 rustplus/icons/chinook.png
 rustplus/icons/chinook_blades.png
 rustplus/icons/crate.png
-rustplus/icons/desert_base.png
-rustplus/icons/dome.png
-rustplus/icons/excavator.png
 rustplus/icons/explosion.png
-rustplus/icons/ferryterminal.png
-rustplus/icons/fishing.png
-rustplus/icons/harbour.png
 rustplus/icons/icon.png
-rustplus/icons/jungle_ziggurat.png
-rustplus/icons/junkyard.png
-rustplus/icons/large_oil_rig.png
-rustplus/icons/launchsite.png
-rustplus/icons/lighthouse.png
-rustplus/icons/military_tunnels.png
-rustplus/icons/mining_outpost.png
-rustplus/icons/mining_quarry_hqm.png
-rustplus/icons/mining_quarry_stone.png
-rustplus/icons/mining_quarry_sulfur.png
-rustplus/icons/missile_silo.png
-rustplus/icons/outpost.png
-rustplus/icons/oxums.png
 rustplus/icons/patrol.png
-rustplus/icons/power_plant.png
-rustplus/icons/radtown.png
-rustplus/icons/satellite.png
-rustplus/icons/sewer.png
-rustplus/icons/small_oil_rig.png
-rustplus/icons/stables.png
-rustplus/icons/supermarket.png
-rustplus/icons/swamp.png
-rustplus/icons/train.png
-rustplus/icons/train_yard.png
-rustplus/icons/underwater_lab.png
 rustplus/icons/vending_machine.png
-rustplus/icons/water_treatment.png
 rustplus/identification/__init__.py
 rustplus/identification/handler_list.py
 rustplus/identification/registered_listener.py

{rustplus-6.1.0 → rustplus-6.1.1}/rustplus.egg-info/requires.txt

@@ -7,3 +7,4 @@ requests
 numpy
 scipy
 betterproto==2.0.0b7
+resvg

{rustplus-6.1.0 → rustplus-6.1.1}/setup.cfg

@@ -1,5 +1,5 @@
 [metadata]
-description-file = README
+description_file = README
 
 [egg_info]
 tag_build = 

rustplus-6.1.0/rustplus/annotations/chat_event.py

@@ -1,21 +0,0 @@
-from typing import Callable
-
-from .. import ServerDetails
-from ..identification import RegisteredListener
-from ..events import ChatEventPayload as ChatEventManager
-
-
-def ChatEvent(server_details: ServerDetails) -> Callable:
-
-    def wrapper(func) -> RegisteredListener:
-
-        if isinstance(func, RegisteredListener):
-            func = func.get_coro()
-
-        listener = RegisteredListener(func.__name__, func)
-
-        ChatEventManager.HANDLER_LIST.register(listener, server_details)
-
-        return listener
-
-    return wrapper

rustplus-6.1.0/rustplus/annotations/clan_event.py

@@ -1,21 +0,0 @@
-from typing import Callable
-
-from .. import ServerDetails
-from ..identification import RegisteredListener
-from ..events import ClanInfoEventPayload as ClanInfoEventManager
-
-
-def ClanEvent(server_details: ServerDetails) -> Callable:
-
-    def wrapper(func) -> RegisteredListener:
-
-        if isinstance(func, RegisteredListener):
-            func = func.get_coro()
-
-        listener = RegisteredListener(func.__name__, func)
-
-        ClanInfoEventManager.HANDLER_LIST.register(listener, server_details)
-
-        return listener
-
-    return wrapper

rustplus-6.1.0/rustplus/annotations/entity_event.py

@@ -1,19 +0,0 @@
-from typing import Callable
-
-from .. import ServerDetails
-from ..identification import RegisteredListener
-from ..events import EntityEventPayload as EntityEventManager
-
-
-def EntityEvent(server_details: ServerDetails, eid: int) -> Callable:
-    def wrapper(func) -> RegisteredListener:
-        if isinstance(func, RegisteredListener):
-            func = func.get_coro()
-
-        listener = RegisteredListener(str(eid), func)
-
-        EntityEventManager.HANDLER_LIST.register(listener, server_details)
-
-        return listener
-
-    return wrapper

rustplus-6.1.0/rustplus/annotations/protobuf_event.py

@@ -1,19 +0,0 @@
-from typing import Callable
-
-from .. import ServerDetails
-from ..identification import RegisteredListener
-from ..events import ProtobufEventPayload as ProtobufEventManager
-
-
-def ProtobufEvent(server_details: ServerDetails) -> Callable:
-    def wrapper(func) -> RegisteredListener:
-        if isinstance(func, RegisteredListener):
-            func = func.get_coro()
-
-        listener = RegisteredListener(func.__name__, func)
-
-        ProtobufEventManager.HANDLER_LIST.register(listener, server_details)
-
-        return listener
-
-    return wrapper

rustplus-6.1.0/rustplus/annotations/team_event.py

@@ -1,19 +0,0 @@
-from typing import Callable
-
-from .. import ServerDetails
-from ..identification import RegisteredListener
-from ..events import TeamEventPayload as TeamEventManager
-
-
-def TeamEvent(server_details: ServerDetails) -> Callable:
-    def wrapper(func) -> RegisteredListener:
-        if isinstance(func, RegisteredListener):
-            func = func.get_coro()
-
-        listener = RegisteredListener(func.__name__, func)
-
-        TeamEventManager.HANDLER_LIST.register(listener, server_details)
-
-        return listener
-
-    return wrapper