sm-blueprint-lib 0.0.8__tar.gz → 0.0.10__tar.gz

{sm_blueprint_lib-0.0.8 → sm_blueprint_lib-0.0.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sm_blueprint_lib
-Version: 0.0.8
+Version: 0.0.10
 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.8 → sm_blueprint_lib-0.0.10}/pyproject.toml

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

{sm_blueprint_lib-0.0.8 → sm_blueprint_lib-0.0.10}/src/sm_blueprint_lib/constants.py

@@ -4,9 +4,19 @@ class SHAPEID:
     TIMER = "8f7fd0e7-c46e-4944-a414-7ce2437bb30f"
     SENSOR5 = "20dcd41c-0a11-4668-9b00-97f278ce21af"
     SWITCH = "7cf717d7-d167-4f2d-a6e7-6b2c70aa3986"
+    BUTTON = "1e8d93a4-506b-470d-9ada-9c0a321e2db5"
     SHAPEID_TO_CLASS = {}
 
 
+class COLOR:
+    BARRIER_BLOCK_DEFAULT = "CE9E0C"
+    BUTTON_DEFAULT = "DF7F01"
+    LOGIC_GATE_DEFAULT = "DF7F01"
+    SENSOR5_DEFAULT = "DF7F01"
+    SWITCH_DEFAULT = "DF7F01"
+    TIMER_DEFAULT = "DF7F01"
+
+
 class AXIS:
     DEFAULT_XAXIS = 1
     DEFAULT_ZAXIS = 3

{sm_blueprint_lib-0.0.8 → sm_blueprint_lib-0.0.10}/src/sm_blueprint_lib/parts/__init__.py

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

sm_blueprint_lib-0.0.8/src/sm_blueprint_lib/parts/switch.py → sm_blueprint_lib-0.0.10/src/sm_blueprint_lib/parts/button.py

@@ -5,5 +5,5 @@ from ..constants import SHAPEID
 
 
 @dataclass
-class Switch(BaseInteractablePart):
-    raise NotImplemented
+class Button(BaseInteractablePart):
+    shapeId: str = field(kw_only=True, default=SHAPEID.BUTTON)

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

@@ -0,0 +1,9 @@
+from dataclasses import dataclass, field
+
+from ..bases.parts.baselogicpart import BaseLogicPart
+from ..constants import SHAPEID
+
+
+@dataclass
+class Switch(BaseLogicPart):
+    shapeId: str = field(kw_only=True, default=SHAPEID.SWITCH)

{sm_blueprint_lib-0.0.8 → sm_blueprint_lib-0.0.10}/src/sm_blueprint_lib/utils.py

@@ -88,22 +88,27 @@ def connect(_from, _to, *, parallel=True):
     if isinstance(_from, BaseInteractablePart) and isinstance(_to, BaseInteractablePart):
         _from.connect(_to)
         return
-    if parallel:    # Try connect things row-by-row if possible (one to one, one to many, many to many)
-        if not isinstance(_from, BaseInteractablePart) and not isinstance(_to, BaseInteractablePart):   # Assume both are sequence of parts
+    # Try connect things row-by-row if possible (one to one, one to many, many to many)
+    if parallel:
+        # Assume both are sequence of parts
+        if not isinstance(_from, BaseInteractablePart) and not isinstance(_to, BaseInteractablePart):
             for subfrom, subto in zip(_from, _to):
                 connect(subfrom, subto, parallel=parallel)
-        elif not isinstance(_from, BaseInteractablePart):   # Assume _from is a sequence of parts
+        # Assume _from is a sequence of parts
+        elif not isinstance(_from, BaseInteractablePart):
             for subfrom in _from:
                 connect(subfrom, _to, parallel=parallel)
         else:                                               # Assume _to is a sequence of parts
             for subto in _to:
                 connect(_from, subto, parallel=parallel)
     else:           # Just connect everything to everything lol
-        if not isinstance(_from, BaseInteractablePart) and not isinstance(_to, BaseInteractablePart):   # Assume both are sequence of parts
+        # Assume both are sequence of parts
+        if not isinstance(_from, BaseInteractablePart) and not isinstance(_to, BaseInteractablePart):
             for subfrom in _from:
                 for subto in _to:
                     connect(subfrom, subto, parallel=parallel)
-        elif not isinstance(_from, BaseInteractablePart):   # Assume _from is a sequence of parts
+        # Assume _from is a sequence of parts
+        elif not isinstance(_from, BaseInteractablePart):
             for subfrom in _from:
                 connect(subfrom, _to, parallel=parallel)
         else:                                               # Assume _to is a sequence of parts

{sm_blueprint_lib-0.0.8 → sm_blueprint_lib-0.0.10}/test_connections.py

@@ -2,7 +2,7 @@ from pprint import pp
 
 from numpy import ndarray
 
-from src.sm_blueprint_lib import Timer, LogicGate, BarrierBlock, Blueprint, save_blueprint, dump_string_from_blueprint, connect
+from src.sm_blueprint_lib import Timer, LogicGate, BarrierBlock, Switch, Button, Blueprint, save_blueprint, dump_string_from_blueprint, connect
 
 size = 10
 l0 = [
@@ -31,15 +31,19 @@ for x in range(size):
 base = BarrierBlock((0, -1, -1), "000000", (size+1, size+1, 1))
 zero = BarrierBlock((0, -1, 0), "000000", (1, 1, 1))
 
+s = Switch((10, 10, 0), "ff0000")
+b = Button((9, 9, 0), "ff0000")
+
 bp = Blueprint()
 
+connect(s, l1)
 connect(l0, l1)
 connect(l0, l3)
 connect(l3, l2[-1])
 connect(l1, l2, parallel=False)
 connect(l3.T, l1)
 
-bp.add(l0, l1, l2, base, zero, l3)
+bp.add(l0, l1, l2, base, zero, l3, s, b)
 
 # bp.add(l0)
 # bp.add(l1)