sm-blueprint-lib 0.0.5__tar.gz → 0.0.7__tar.gz

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/.gitignore

@@ -16,7 +16,6 @@ eggs/
 .eggs/
 lib/
 lib64/
-parts/
 sdist/
 var/
 wheels/

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sm_blueprint_lib
-Version: 0.0.5
+Version: 0.0.7
 Summary: Scrap Mechanic Library for Blueprint manipulation.
 Project-URL: Homepage, https://github.com/MauriceTZ/sm_blueprint_lib
 Project-URL: Issues, https://github.com/MauriceTZ/sm_blueprint_lib/issues

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "sm_blueprint_lib"
-version = "0.0.5"
+version = "0.0.7"
 dependencies = ["numpy"]
 authors = [
   { name="Maurice", email="mauriciotorrez00@gmail.com" },

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/__init__.py

@@ -0,0 +1,10 @@
+from .blueprint import Blueprint
+from .body import *
+from .bounds import *
+from .constants import *
+from .id import *
+from .pos import *
+from .utils import *
+
+from .parts import *
+from .prebuilds import *

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/bases/controllers/basecontroller.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass, field
 from typing import Any, Optional
 
-from constants import get_new_id
-from id import ID
+from ...constants import get_new_id
+from ...id import ID
 
 
 @dataclass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/bases/controllers/baselogiccontroller.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from bases.controllers.basecontroller import BaseController
+from .basecontroller import BaseController
 
 
 @dataclass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/bases/controllers/logicgatecontroller.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from bases.controllers.baselogiccontroller import BaseLogicController
+from .baselogiccontroller import BaseLogicController
 
 
 @dataclass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/bases/controllers/sensorcontroller.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from bases.controllers.basecontroller import BaseController
+from .basecontroller import BaseController
 
 
 @dataclass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/bases/controllers/timercontroller.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
 
-from bases.controllers.baselogiccontroller import BaseLogicController
+from .baselogiccontroller import BaseLogicController
 
 
 @dataclass

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/bases/parts/baseboundablepart.py

@@ -0,0 +1,23 @@
+from dataclasses import dataclass, field
+
+from .basepart import BasePart
+from ...bounds import Bounds
+from ...constants import AXIS
+
+
+@dataclass
+class BaseBoundablePart(BasePart):
+    """Base class for all Boundable parts (those that are draggable)
+    """
+    bounds: Bounds
+    xaxis: int = field(kw_only=True, default=AXIS.DEFAULT_XAXIS)
+    zaxis: int = field(kw_only=True, default=AXIS.DEFAULT_ZAXIS)
+
+    def __post_init__(self):
+        super().__post_init__()
+        if not isinstance(self.bounds, Bounds):
+            try:
+                self.bounds = Bounds(**self.bounds)
+            except TypeError:
+                self.bounds = Bounds(
+                    self.bounds[0], self.bounds[1], self.bounds[2])

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/bases/parts/baseinteractablepart.py

@@ -0,0 +1,19 @@
+from dataclasses import dataclass, field
+
+from ..controllers.basecontroller import BaseController
+from .basepart import BasePart
+from ...id import ID
+
+
+@dataclass
+class BaseInteractablePart(BasePart):
+    """Base class for Interactable parts
+    """
+    controller: BaseController = field(default_factory=BaseController)
+
+    def connect(self, o: "BaseInteractablePart"):
+        if not self.controller.controllers:
+            self.controller.controllers = []
+            
+        self.controller.controllers.append(ID(o.controller.id))
+        return o

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/bases/parts/baselogicpart.py

@@ -0,0 +1,13 @@
+from dataclasses import dataclass, field
+
+from .baseinteractablepart import BaseInteractablePart
+from ..controllers.baselogiccontroller import BaseLogicController
+
+
+@dataclass
+class BaseLogicPart(BaseInteractablePart):
+    """Base class for Logic parts with active state (mostly Logic Gate and Timer)
+    """
+    controller: BaseLogicController = field(default_factory=BaseLogicController)
+    xaxis: int = field(kw_only=True, default=1)
+    zaxis: int = field(kw_only=True, default=-2)

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/bases/parts/basepart.py

@@ -0,0 +1,34 @@
+from dataclasses import dataclass, field
+
+from ...constants import AXIS, SHAPEID
+from ...pos import Pos
+
+
+@dataclass
+class BasePart:
+    """Base class for all in-game parts
+    """
+    shapeId: str
+    pos: Pos
+    color: str
+    xaxis: int = field(kw_only=True, default=AXIS.DEFAULT_XAXIS)
+    zaxis: int = field(kw_only=True, default=AXIS.DEFAULT_ZAXIS)
+
+    def __post_init__(self):
+        # if pos given as {"x": ..., "y": ..., "z": ...} or (x, y, z) then convert to Pos class
+        if not isinstance(self.pos, Pos):
+            try:
+                self.pos = Pos(**self.pos)
+            except TypeError:
+                self.pos = Pos(self.pos[0], self.pos[1], self.pos[2])
+        # if color given as (r, g, b) then convert to hex string
+        if not isinstance(self.color, str):
+            self.color = "%02X%02X%02X" % (
+                self.color[0], self.color[1], self.color[2])
+
+    def __init_subclass__(cls):
+        super().__init_subclass__()
+        try:
+            SHAPEID.SHAPEID_TO_CLASS[cls.shapeId.default] = cls
+        except AttributeError:
+            pass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/blueprint.py

@@ -1,8 +1,8 @@
 from dataclasses import dataclass, field
 
-from bases.parts.basepart import BasePart
-from body import Body
-from constants import VERSION
+from .bases.parts.basepart import BasePart
+from .body import Body
+from .constants import VERSION
 
 
 @dataclass

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/body.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass, field
 
-from bases.parts.basepart import BasePart
-from constants import SHAPEID
+from .bases.parts.basepart import BasePart
+from .constants import SHAPEID
 
 
 @dataclass

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/__init__.py

@@ -0,0 +1,5 @@
+from .barrierblock import *
+from .logicgate import *
+from .sensor import *
+# from .switch import * # not finished
+from .timer import *

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/barrierblock.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass, field
+
+from ..bases.parts.baseboundablepart import BaseBoundablePart
+from ..constants import SHAPEID
+
+
+@dataclass
+class BarrierBlock(BaseBoundablePart):
+    shapeId: str = field(kw_only=True, default=SHAPEID.BARRIER_BLOCK)

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/logicgate.py

@@ -0,0 +1,24 @@
+from dataclasses import dataclass, field
+
+from ..bases.parts.baselogicpart import BaseLogicPart
+from ..bases.controllers.logicgatecontroller import LogicGateController
+from ..constants import SHAPEID
+
+
+@dataclass
+class LogicGate(BaseLogicPart):
+    controller: LogicGateController = field(
+        default_factory=LogicGateController)
+    shapeId: str = field(kw_only=True, default=SHAPEID.LOGIC_GATE)
+
+    def __post_init__(self):
+        super().__post_init__()
+        # Can specify mode as a dict, a tuple (mode,) or just the parameter mode
+        if not isinstance(self.controller, LogicGateController):
+            try:
+                self.controller = LogicGateController(**self.controller)
+            except TypeError:
+                try:
+                    self.controller = LogicGateController(*self.controller)
+                except TypeError:
+                    self.controller = LogicGateController(self.controller)

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/sensor.py

@@ -0,0 +1,24 @@
+from dataclasses import dataclass, field
+
+from ..bases.controllers.sensorcontroller import SensorController
+from ..bases.parts.baseinteractablepart import BaseInteractablePart
+from ..constants import SHAPEID
+
+
+@dataclass
+class Sensor5(BaseInteractablePart):
+    controller: SensorController = field(
+        default_factory=SensorController)
+    shapeId: str = field(kw_only=True, default=SHAPEID.SENSOR5)
+
+    def __post_init__(self):
+        super().__post_init__()
+        # Can specify sensor controller as a dict, a tuple (audioEnable, buttonMode, color, colorMode, range) or just the parameter mode
+        if not isinstance(self.controller, SensorController):
+            try:
+                self.controller = SensorController(**self.controller)
+            except TypeError:
+                try:
+                    self.controller = SensorController(*self.controller)
+                except TypeError:
+                    self.controller = SensorController(self.controller)

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/switch.py

@@ -0,0 +1,9 @@
+from dataclasses import dataclass, field
+
+from ..bases.parts.baseinteractablepart import BaseInteractablePart
+from ..constants import SHAPEID
+
+
+@dataclass
+class Switch(BaseInteractablePart):
+    raise NotImplemented

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/parts/timer.py

@@ -0,0 +1,20 @@
+from dataclasses import dataclass, field
+
+from ..bases.controllers.timercontroller import TimerController
+from ..bases.parts.baselogicpart import BaseLogicPart
+from ..constants import SHAPEID
+
+
+@dataclass
+class Timer(BaseLogicPart):
+    controller: TimerController = field(default_factory=TimerController)
+    shapeId: str = field(kw_only=True, default=SHAPEID.TIMER)
+
+    def __post_init__(self):
+        super().__post_init__()
+        # Can provide seconds and ticks as a the TimerController class itself, a dict or a tuple (seconds, tick)
+        if not isinstance(self.controller, TimerController):
+            try:
+                self.controller = TimerController(**self.controller)
+            except TypeError:
+                self.controller = TimerController(*self.controller)

sm_blueprint_lib-0.0.7/src/sm_blueprint_lib/prebuilds/__init__.py

@@ -0,0 +1,12 @@
+from .adder import *
+from .barrel_shifter import *
+from .clock40hz import *
+from .comparator import *
+from .counter import *
+from .decoder import *
+from .distance_sensor import *
+from .ram import *
+from .register import *
+from .rom import *
+from .timer_ram_cached import * # not finished
+from .timer_ram_multiclient import *

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/adder.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def simple_adder_subtractor(bp: Blueprint,

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/barrel_shifter.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def barrel_shifter(bp: Blueprint, bit_length: int, num_bit_shift: int, pos: Pos | Sequence = (0, 0, 0)):

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/clock40hz.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def clock40hz(bp: Blueprint, bit_length: int, pos: Pos | Sequence = (0, 0, 0)):

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/comparator.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import check_pos, connect
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import check_pos, connect
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def comparator(bp: Blueprint,

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/counter.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def counter(bp: Blueprint,

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/decoder.py

@@ -1,9 +1,9 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
 
 
 def decoder(bp: Blueprint, num_address: int, pos: Pos | Sequence = (0, 0, 0),

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/distance_sensor.py

@@ -1,11 +1,11 @@
 from typing import Sequence
 from numpy import array, ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from parts.sensor import Sensor5
-from parts.timer import Timer
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..parts.sensor import Sensor5
+from ..parts.timer import Timer
+from ..pos import Pos
 
 
 def distance_sensor(bp: Blueprint,

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/ram.py

@@ -1,11 +1,11 @@
 from itertools import cycle
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
-from prebuilds.decoder import decoder
+from ..utils import get_bits_required, check_pos, connect
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
+from ..prebuilds.decoder import decoder
 
 
 def ram(bp: Blueprint, bit_length: int, num_address: int, pos: Pos | Sequence = (0, 0, 0),

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/register.py

@@ -1,10 +1,10 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import check_pos
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from pos import Pos
-from prebuilds.counter import counter, counter_decrement
+from ..utils import check_pos
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..pos import Pos
+from ..prebuilds.counter import counter, counter_decrement
 
 
 def register(bp: Blueprint,

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/rom.py

@@ -2,12 +2,12 @@ from itertools import batched, cycle
 from math import ceil
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from prebuilds.decoder import decoder
-from parts.timer import Timer
-from pos import Pos
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..prebuilds.decoder import decoder
+from ..parts.timer import Timer
+from ..pos import Pos
 
 
 def rom(

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/timer_ram_cached.py

@@ -1,19 +1,19 @@
 from itertools import cycle
 from typing import Sequence
 from numpy import array, clip, ndarray
-from utils import get_bits_required, check_pos, connect, num_to_bit_list
-from bases.parts.baseinteractablepart import BaseInteractablePart
-from bases.parts.baselogicpart import BaseLogicPart
-from blueprint import Blueprint
-from constants import TICKS_PER_SECOND
-from parts.logicgate import LogicGate
-from parts.timer import Timer
-from pos import Pos
-from prebuilds.clock40hz import clock40hz
-from prebuilds.counter import counter
-from prebuilds.decoder import decoder
-from prebuilds.ram import ram
-from prebuilds.register import register
+from ..utils import get_bits_required, check_pos, connect, num_to_bit_list
+from ..bases.parts.baseinteractablepart import BaseInteractablePart
+from ..bases.parts.baselogicpart import BaseLogicPart
+from ..blueprint import Blueprint
+from ..constants import TICKS_PER_SECOND
+from ..parts.logicgate import LogicGate
+from ..parts.timer import Timer
+from ..pos import Pos
+from ..prebuilds.clock40hz import clock40hz
+from ..prebuilds.counter import counter
+from ..prebuilds.decoder import decoder
+from ..prebuilds.ram import ram
+from ..prebuilds.register import register
 
 
 def timer_ram_cached(

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/prebuilds/timer_ram_multiclient.py

@@ -1,14 +1,14 @@
 from typing import Sequence
 from numpy import ndarray
-from utils import get_bits_required, check_pos, connect
-from blueprint import Blueprint
-from parts.logicgate import LogicGate
-from parts.timer import Timer
-from pos import Pos
-from prebuilds.clock40hz import clock40hz
-from prebuilds.decoder import decoder
-from prebuilds.ram import ram
-from prebuilds.register import register
+from ..utils import get_bits_required, check_pos, connect
+from ..blueprint import Blueprint
+from ..parts.logicgate import LogicGate
+from ..parts.timer import Timer
+from ..pos import Pos
+from ..prebuilds.clock40hz import clock40hz
+from ..prebuilds.decoder import decoder
+from ..prebuilds.ram import ram
+from ..prebuilds.register import register
 
 
 def timer_ram_multiclient(bp: Blueprint, bit_length: int, num_address: int, num_clients=1, pos: Pos | Sequence = (0, 0, 0)):

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/src/sm_blueprint_lib/utils.py

@@ -1,6 +1,7 @@
 from dataclasses import asdict
 from json import load, dump, loads, dumps
 from math import ceil, log2
+from typing import Sequence
 
 from numpy import ndarray
 
@@ -12,7 +13,7 @@ from .parts.timer import Timer
 from .pos import Pos
 
 
-def load_blueprint(path):
+def load_blueprint(path: str):
     """Load a blueprint from a path file (normally a blueprint.json).
 
     Args:
@@ -25,7 +26,7 @@ def load_blueprint(path):
         return Blueprint(**load(fp))
 
 
-def save_blueprint(path, bp: Blueprint):
+def save_blueprint(bp: Blueprint, path: str):
     """Save a blueprint to a file (normally a blueprint.json).
 
     Args:
@@ -36,7 +37,7 @@ def save_blueprint(path, bp: Blueprint):
         return dump(asdict(bp), fp, sort_keys=True, separators=(',', ':'))
 
 
-def load_string(str):
+def load_blueprint_from_string(str: str):
     """Load a blueprint from a json string.
 
     Args:
@@ -48,7 +49,7 @@ def load_string(str):
     return Blueprint(**loads(str))
 
 
-def dump_string(bp: Blueprint):
+def dump_string_from_blueprint(bp: Blueprint):
     """Dump a blueprint into a json-formatted string.
 
     Args:
@@ -110,9 +111,17 @@ def connect(_from, _to, *, parallel=True):
                 connect(_from, subto, parallel=parallel)
 
 
-def check_pos(pos):
+def check_pos(pos: Sequence) -> Pos:
+    """Converts a Sequence into a Pos class if it wasn't already.
+
+    Args:
+        pos (Sequence): The Sequence to be converted.
+
+    Returns:
+        Pos: The converted Pos.
+    """
     if not isinstance(pos, Pos):
-        pos = Pos(*pos)
+        pos = Pos(*list(pos))
     return pos
 
 

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/test_connections.py

@@ -2,7 +2,7 @@ from pprint import pp
 
 from numpy import ndarray
 
-from sm_blueprint_lib import Timer, LogicGate, BarrierBlock, Blueprint, save_blueprint, dump_string, connect
+from src.sm_blueprint_lib import Timer, LogicGate, BarrierBlock, Blueprint, save_blueprint, dump_string_from_blueprint, connect
 
 size = 10
 l0 = [
@@ -62,4 +62,4 @@ bp.add(l0, l1, l2, base, zero, l3)
 
 print(len(bp.bodies[0].childs))
 path = r"C:\Users\mauri\AppData\Roaming\Axolot Games\Scrap Mechanic\User\User_76561198400983548\Blueprints\c35f6e4e-52cb-4b00-8afa-f0ffd3fbb012\blueprint.json"
-save_blueprint(path, bp)
+save_blueprint(bp, path)

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/test_prebuilds.py

@@ -4,21 +4,21 @@ from math import sin
 from typing import Sequence
 
 from numpy import array
-from sm_blueprint_lib import Blueprint, connect, num_to_bit_list, save_blueprint
-from sm_blueprint_lib.parts.logicgate import LogicGate
-from sm_blueprint_lib.pos import Pos
-from sm_blueprint_lib.prebuilds.adder import simple_adder_subtractor
-from sm_blueprint_lib.prebuilds.barrel_shifter import barrel_shifter
-from sm_blueprint_lib.prebuilds.clock40hz import clock40hz
-from sm_blueprint_lib.prebuilds.comparator import comparator
-from sm_blueprint_lib.prebuilds.counter import counter
-from sm_blueprint_lib.prebuilds.distance_sensor import distance_sensor, distance_sensor_raycast
-from sm_blueprint_lib.prebuilds.ram import ram
-from sm_blueprint_lib.prebuilds.decoder import decoder
-from sm_blueprint_lib.prebuilds.register import counter_register, register
-from sm_blueprint_lib.prebuilds.rom import rom
-from sm_blueprint_lib.prebuilds.timer_ram_multiclient import timer_ram_multiclient
-from sm_blueprint_lib.prebuilds.timer_ram_cached import timer_ram_cached
+from src.sm_blueprint_lib import Blueprint, connect, num_to_bit_list, save_blueprint
+from src.sm_blueprint_lib.parts.logicgate import LogicGate
+from src.sm_blueprint_lib.pos import Pos
+from src.sm_blueprint_lib.prebuilds.adder import simple_adder_subtractor
+from src.sm_blueprint_lib.prebuilds.barrel_shifter import barrel_shifter
+from src.sm_blueprint_lib.prebuilds.clock40hz import clock40hz
+from src.sm_blueprint_lib.prebuilds.comparator import comparator
+from src.sm_blueprint_lib.prebuilds.counter import counter
+from src.sm_blueprint_lib.prebuilds.distance_sensor import distance_sensor, distance_sensor_raycast
+from src.sm_blueprint_lib.prebuilds.ram import ram
+from src.sm_blueprint_lib.prebuilds.decoder import decoder
+from src.sm_blueprint_lib.prebuilds.register import counter_register, register
+from src.sm_blueprint_lib.prebuilds.rom import rom
+from src.sm_blueprint_lib.prebuilds.timer_ram_multiclient import timer_ram_multiclient
+from src.sm_blueprint_lib.prebuilds.timer_ram_cached import timer_ram_cached
 
 
 bp = Blueprint()
@@ -86,4 +86,4 @@ timer_ram_cached(bp,
 
 print(f"Prebuild size: {len(bp.bodies[0].childs)} parts")
 path = r"C:\Users\mauri\AppData\Roaming\Axolot Games\Scrap Mechanic\User\User_76561198400983548\Blueprints\c35f6e4e-52cb-4b00-8afa-f0ffd3fbb012\blueprint.json"
-save_blueprint(path, bp)
+save_blueprint(bp, path)

{sm_blueprint_lib-0.0.5 → sm_blueprint_lib-0.0.7}/tests.py

@@ -2,7 +2,7 @@ import json
 from pprint import pp
 
 
-from sm_blueprint_lib import load_blueprint, save_blueprint, load_string
+from src.sm_blueprint_lib import load_blueprint, save_blueprint, load_blueprint_from_string
 # from sm.bases.controllers.basecontroller import BaseController
 # from sm.bases.controllers.baselogiccontroller import BaseLogicController
 # from sm.bases.parts.baselogicpart import BaseLogicPart
@@ -13,8 +13,8 @@ from sm_blueprint_lib import load_blueprint, save_blueprint, load_string
 # import sm.parts.barrierblock
 # from dataclasses import asdict
 
-from sm_blueprint_lib.constants import SHAPEID
-from sm_blueprint_lib.parts.sensor import Sensor5
+from src.sm_blueprint_lib.constants import SHAPEID
+from src.sm_blueprint_lib.parts.sensor import Sensor5
 # from sm.bases.parts.baseinteractablepart import BaseInteractablePart
 # from sm.parts.logicgate import LogicGate
 
@@ -61,7 +61,7 @@ with open(path) as fp:
 
 
 j = '{"bodies":[{"childs":[{"bounds":{"x":2,"y":2,"z":1},"color":"CE9E0C","pos":{"x":-13,"y":-7,"z":2},"shapeId":"09ca2713-28ee-4119-9622-e85490034758","xaxis":1,"zaxis":3},{"color":"DF7F01","controller":{"active":false,"controllers":[{"id":7227441}],"id":7227439,"joints":null,"seconds":2,"ticks":1},"pos":{"x":-12,"y":-5,"z":3},"shapeId":"8f7fd0e7-c46e-4944-a414-7ce2437bb30f","xaxis":1,"zaxis":-2},{"color":"DF7F01","controller":{"active":true,"controllers":[{"id":7227439}],"id":7227440,"joints":null,"mode":3},"pos":{"x":-12,"y":-6,"z":3},"shapeId":"9f0f56e8-2c31-4d83-996c-d00a9b296c3f","xaxis":1,"zaxis":-2},{"color":"DF7F01","controller":{"active":false,"controllers":[{"id":7227440}],"id":7227441,"joints":null,"mode":0},"pos":{"x":-13,"y":-6,"z":3},"shapeId":"9f0f56e8-2c31-4d83-996c-d00a9b296c3f","xaxis":1,"zaxis":-2}]}],"version":4}'
-bp = load_string(j)
+bp = load_blueprint_from_string(j)
 pp(bp)
 
 pp(Sensor5((1,2,3), (255,255,255), (False, True, (255,0,0), False, 1)))
@@ -115,7 +115,7 @@ pp(Sensor5((1,2,3), (255,255,255), (False, True, (255,0,0), False, 1)))
 # bp = load_blueprint(path)
 # pp(bp)
 # pp(json.dumps(asdict(bp)))
-# save_blueprint(path, bp)
+# save_blueprint(bp, path)
 
 # pp(sm.constants.SHAPEID.SHAPEID_TO_CLASS)