factorio-draftsman 2.0.2__tar.gz → 2.0.3__tar.gz

{factorio_draftsman-2.0.2/factorio_draftsman.egg-info → factorio_draftsman-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: factorio-draftsman
-Version: 2.0.2
+Version: 2.0.3
 Summary: A complete, well-tested, and up-to-date module to manipulate Factorio blueprint strings. Compatible with mods.
 Home-page: https://github.com/redruin1/factorio-draftsman
 Author: redruin1

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/__init__.py

@@ -1,17 +1,17 @@
-# __init__.py
-"""
-Allows the user to import, create, manipulate, and export Factorio blueprint 
-strings.
-
-`draftsman` attempts to provide a convinient, 'one-stop-shop' solution to the
-problem of programmatically creating blueprint strings, used for automation of 
-designing structures that would be too tedius to build otherwise.
-
-In addition to providing the bare functionality of importing and exporting, 
-`draftsman` is designed with the developer in mind, and has a wide array of 
-methods and classes designed to write clean, self-documenting scripts. 
-`draftsman` is also well-documented, well-tested, and easy to install.
-"""
-
-from draftsman._version import __version__, __version_info__
-from draftsman._factorio_version import __factorio_version__, __factorio_version_info__
+# __init__.py
+"""
+Allows the user to import, create, manipulate, and export Factorio blueprint
+strings.
+
+`draftsman` attempts to provide a convinient, 'one-stop-shop' solution to the
+problem of programmatically creating blueprint strings, used for automation of
+designing structures that would be too tedius to build otherwise.
+
+In addition to providing the bare functionality of importing and exporting,
+`draftsman` is designed with the developer in mind, and has a wide array of
+methods and classes designed to write clean, self-documenting scripts.
+`draftsman` is also well-documented, well-tested, and easy to install.
+"""
+
+from draftsman._version import __version__, __version_info__
+from draftsman._factorio_version import __factorio_version__, __factorio_version_info__

factorio_draftsman-2.0.3/draftsman/_factorio_version.py

@@ -0,0 +1,4 @@
+# _factorio_version.py
+
+__factorio_version__ = "2.0.49.0"
+__factorio_version_info__ = (2, 0, 49, 0)

factorio_draftsman-2.0.3/draftsman/_version.py

@@ -0,0 +1,4 @@
+# _version.py
+
+__version__ = "2.0.3"
+__version_info__ = (2, 0, 3)

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/association.py

@@ -22,9 +22,9 @@ class Association(weakref.ref):
         int,
         Field(ge=0, lt=2**64),
         WrapValidator(
-            lambda value, handler: value
-            if isinstance(value, Association)
-            else handler(value)
+            lambda value, handler: (
+                value if isinstance(value, Association) else handler(value)
+            )
         ),
     ]
 

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/blueprint.py

@@ -21,13 +21,13 @@
                 ... # Up to 4 icons total
             ],
             "description": str, # A user given description for this blueprint
-            "version": int, # The encoded version of Factorio this planner was created 
+            "version": int, # The encoded version of Factorio this planner was created
                             # with/designed for (64 bits)
             "snap-to-grid": { # The size of the grid to snap this blueprint to
                 "x": int, # X dimension in units
                 "y": int, # Y dimension in units
             }
-            "absolute-snapping": bool, # Whether or not to use absolute placement 
+            "absolute-snapping": bool, # Whether or not to use absolute placement
                                        # (defaults to True)
             "position-relative-to-grid": { # The offset of the grid if using absolute
                                            # placement
@@ -37,7 +37,7 @@
             "entities": [ # A list of entities in this blueprint
                 {
                     "name": str, # Name of the entity,
-                    "entity_number": int, # Unique number associated with this entity 
+                    "entity_number": int, # Unique number associated with this entity
                     "position": {"x": float, "y": float}, # Position of the entity
                     ... # Any associated Entity key/value
                 },
@@ -61,7 +61,7 @@
                                     "type": str, # Name of the type of condition
                                     "compare_type": "and" or "or",
                                     "ticks": int, # If using "time" or "inactivity"
-                                    "condition": CONDITION, # If a circuit condition is 
+                                    "condition": CONDITION, # If a circuit condition is
                                                             # needed
                                 }
                             ],
@@ -73,7 +73,7 @@
                 },
                 ...
             ]
-            
+
         }
     }
 """

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/blueprint_book.py

@@ -21,7 +21,7 @@
                 ... # Up to 4 icons total
             ],
             "description": str, # A user given description for this blueprint book
-            "version": int, # The encoded version of Factorio this planner was created 
+            "version": int, # The encoded version of Factorio this planner was created
                             # with/designed for (64 bits)
             "active_index": int, # The currently selected blueprint in "blueprints"
             "blueprints": [ # A list of all Blueprintable objects this book contains
@@ -36,7 +36,7 @@
                     {
                         "item": "deconstruction-planner",
                         ... # Any associated DeconstructionPlanner key/values
-                    }, 
+                    },
                     "index": int # Index in the Blueprint Book
                 }, # or
                 {

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/deconstruction_planner.py

@@ -7,7 +7,7 @@
         "deconstruction_planner": {
             "item": "deconstruction-planner", # The associated item with this structure
             "label": str, # A user given name for this deconstruction planner
-            "version": int, # The encoded version of Factorio this planner was created 
+            "version": int, # The encoded version of Factorio this planner was created
                             # with/designed for (64 bits)
             "settings": {
                 "entity_filter_mode": int, # 0 = Whitelist, 1 = Blacklist
@@ -18,7 +18,7 @@
                     },
                     ... # Up to 30 filters total
                 ]
-                "trees_and_rocks_only": bool, # Self explanatory, disables everything 
+                "trees_and_rocks_only": bool, # Self explanatory, disables everything
                                               # else
                 "tile_filter_mode": int, # 0 = Whitelist, 1 = Blacklist
                 "tile_filters": [ # A list of tiles to deconstruct
@@ -28,9 +28,9 @@
                     },
                     ... # Up to 30 filters total
                 ]
-                "tile_selection_mode": int, # 0 = Normal, 1 = Always, 2 = Never, 
+                "tile_selection_mode": int, # 0 = Normal, 1 = Always, 2 = Never,
                                             # 3 = Only
-                "description": str, # A user given description for this deconstruction 
+                "description": str, # A user given description for this deconstruction
                                     # planner
                 "icons": [ # A set of signals to act as visual identification
                     {

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/entity.py

@@ -111,15 +111,15 @@ class Entity(Exportable, EntityLike):
             The internal ID of the entity.
             """,
         )
-        quality: Literal[
-            "normal", "uncommon", "rare", "epic", "legendary"
-        ] = Field(  # TODO: determine these automatically
-            "normal",
-            description="""
+        quality: Literal["normal", "uncommon", "rare", "epic", "legendary"] = (
+            Field(  # TODO: determine these automatically
+                "normal",
+                description="""
             The quality of the entity. Defaults to 'normal' when not specified,
             or when quality is not present in the save being imported to /
             exported from.
             """,
+            )
         )
         position: FloatPosition = Field(
             ...,

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/exportable.py

@@ -12,7 +12,7 @@ import pprint  # TODO: think about
 
 
 def attempt_and_reissue(
-    object: Any, format_model: Any, target: Any, name: str, value: Any, **kwargs
+    object: Any, format_model: BaseModel, target: Any, name: str, value: Any, **kwargs
 ):
     """
     Helper function that normalizes assignment validation

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/classes/transformable.py

@@ -177,8 +177,8 @@ class Transformable:
         if direction not in {"horizontal", "vertical"}:
             raise ValueError("'direction' must be either 'horizontal' or 'vertical'")
 
-        matrices = {"horizontal": [-1, +1], "vertical": [+1, -1]}
-        matrix = matrices[direction]
+        pos_matrices = {"horizontal": [-1, +1], "vertical": [+1, -1]}
+        pos_matrix = pos_matrices[direction]
 
         # Entities
         for entity in self.entities:
@@ -191,13 +191,14 @@ class Transformable:
             pos = Vector(entity.position.x, entity.position.y)
             # Alter the direction
             if entity.rotatable:
-                if direction == "horizontal":
-                    entity.direction += ((-2 * (entity.direction - 8)) % 16) % 16
-                else:  # direction == "vertical":
-                    entity.direction += (((-2 * entity.direction) % 16) - 8) % 16
+                entity.direction = entity.direction.flip(direction)
+                # if direction == "horizontal":
+                #     entity.direction += ((-2 * (entity.direction - 8)) % 16) % 16
+                # else:  # direction == "vertical":
+                #     entity.direction += (((-2 * entity.direction) % 16) - 8) % 16
 
             # Alter (both) the position(s)
-            entity.position = (pos.x * matrix[0], pos.y * matrix[1])
+            entity.position = (pos.x * pos_matrix[0], pos.y * pos_matrix[1])
 
             entity._parent = self
 
@@ -216,7 +217,10 @@ class Transformable:
                 # With tiles we flip from their center
                 pos = Vector(tile.position.x + 0.5, tile.position.y + 0.5)
                 # Alter the position
-                tile.position = (pos.x * matrix[0] - 0.5, pos.y * matrix[1] - 0.5)
+                tile.position = (
+                    pos.x * pos_matrix[0] - 0.5,
+                    pos.y * pos_matrix[1] - 0.5,
+                )
 
                 tile._parent = self
 

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/constants.py

@@ -11,6 +11,7 @@ from enum import IntEnum, Enum
 from functools import total_ordering
 import math
 from pydantic_core import core_schema
+from typing import Literal
 
 
 class Direction(IntEnum):
@@ -101,6 +102,47 @@ class Direction(IntEnum):
         """
         return Direction((self.value - (4 if four_way else 1)) % 16)
 
+    def flip(self, direction: Literal["horizontal", "vertical"] = "horizontal"):
+        matrix = {
+            "horizontal": {
+                Direction.NORTH: Direction.NORTH,
+                Direction.NORTHNORTHEAST: Direction.NORTHNORTHWEST,
+                Direction.NORTHEAST: Direction.NORTHWEST,
+                Direction.EASTNORTHEAST: Direction.WESTNORTHWEST,
+                Direction.EAST: Direction.WEST,
+                Direction.EASTSOUTHEAST: Direction.WESTSOUTHWEST,
+                Direction.SOUTHEAST: Direction.SOUTHWEST,
+                Direction.SOUTHSOUTHEAST: Direction.SOUTHSOUTHWEST,
+                Direction.SOUTH: Direction.SOUTH,
+                Direction.SOUTHSOUTHWEST: Direction.SOUTHSOUTHEAST,
+                Direction.SOUTHWEST: Direction.SOUTHEAST,
+                Direction.WESTSOUTHWEST: Direction.EASTSOUTHEAST,
+                Direction.WEST: Direction.EAST,
+                Direction.WESTNORTHWEST: Direction.EASTNORTHEAST,
+                Direction.NORTHWEST: Direction.NORTHEAST,
+                Direction.NORTHNORTHWEST: Direction.NORTHNORTHEAST,
+            },
+            "vertical": {
+                Direction.NORTH: Direction.SOUTH,
+                Direction.NORTHNORTHEAST: Direction.SOUTHSOUTHEAST,
+                Direction.NORTHEAST: Direction.SOUTHEAST,
+                Direction.EASTNORTHEAST: Direction.EASTSOUTHEAST,
+                Direction.EAST: Direction.EAST,
+                Direction.EASTSOUTHEAST: Direction.EASTNORTHEAST,
+                Direction.SOUTHEAST: Direction.NORTHEAST,
+                Direction.SOUTHSOUTHEAST: Direction.NORTHNORTHEAST,
+                Direction.SOUTH: Direction.NORTH,
+                Direction.SOUTHSOUTHWEST: Direction.NORTHNORTHWEST,
+                Direction.SOUTHWEST: Direction.NORTHWEST,
+                Direction.WESTSOUTHWEST: Direction.WESTNORTHWEST,
+                Direction.WEST: Direction.WEST,
+                Direction.WESTNORTHWEST: Direction.WESTSOUTHWEST,
+                Direction.NORTHWEST: Direction.SOUTHWEST,
+                Direction.NORTHNORTHWEST: Direction.SOUTHSOUTHWEST,
+            },
+        }
+        return matrix[direction][self.value]
+
     def to_orientation(self) -> "Orientation":
         """
         Converts this direction to an :py:class:`Orientation` of corresponding

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/env.py

@@ -2,7 +2,7 @@
 
 """
 Manages the Factorio environment. Primarily holds :py:func:`draftsman.env.update()`,
-which runs through the Factorio data lifecycle and updates the data in 
+which runs through the Factorio data lifecycle and updates the data in
 :py:mod:`draftsman.data`.
 
 

{factorio_draftsman-2.0.2 → factorio_draftsman-2.0.3}/draftsman/environment/mod_list.py

@@ -579,9 +579,11 @@ def display_mods(mods: dict[str, list[Mod]], verbose=False) -> None:
                         " ✓ " if mod.enabled and i == 0 else "   ",
                         "(zip)" if mod.is_archive else "(dir)",
                         printed_name,
-                        "-"
-                        if mod.version == ""
-                        else truncate_str(mod.version, version_width),
+                        (
+                            "-"
+                            if mod.version == ""
+                            else truncate_str(mod.version, version_width)
+                        ),
                         truncate_str(mod.location, location_width),
                         name_width=name_width,
                         version_width=version_width,
@@ -602,9 +604,11 @@ def display_mods(mods: dict[str, list[Mod]], verbose=False) -> None:
                         "✓" if mod.enabled and i == 0 else " ",
                         "(zip)" if mod.is_archive else "(dir)",
                         printed_name,
-                        "-"
-                        if mod.version == ""
-                        else truncate_str(mod.version, version_width),
+                        (
+                            "-"
+                            if mod.version == ""
+                            else truncate_str(mod.version, version_width)
+                        ),
                         name_width=name_width,
                         version_width=version_width,
                     )