fixed cli, formatted code and changed text/example

Author: PaddeCraft

.github/workflows/publish.yaml

@@ -8,6 +8,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - uses: actions/checkout@v2
+            - name: Setup Python
+            - uses: actions/setup-python@v4
+              with:
+                  python-version: "3.10.8"
             - name: Build and publish to pypi
               uses: JRubics/poetry-publish@v1.13
               with:

pymcfunction/cli.py

@@ -127,30 +127,38 @@ def compile():
 
             lines = []
             imports = ""
-            for x in statements:
-                if x.split(" ")[0] in ["import", "from"]:
-                    imports += x + "\n"
-                    statements.remove(x)
-                elif x == "##pymcfunction-tick":
+            removelist = []
+            for s in statements:
+                if s.split(" ")[0] in ["import", "from"]:
+                    imports += s + "\n"
+                    removelist.append(s)
+                if s == "##pymcfunction-tick":
                     specialFunctions["tick"].append(
                         config["namespace"] + ":" + f.removesuffix(".py")
                     )
-                elif x == "##pymcfunction-load":
+                elif s == "##pymcfunction-load":
                     specialFunctions["load"].append(
                         config["namespace"] + ":" + f.removesuffix(".py")
                     )
-                if len(x) > 0:
-                    if x[0] == "#":
-                        statements.remove(x)
+                if len(s) > 0:
+                    if s[0] == "#":
+                        removelist.append(s)
+
+            # Yes, this is needed because of weird python behaviour
+            for r in removelist:
+                statements.remove(r)
 
             for s in statements:
+                code = imports + "\n_output = " + s + "\nprint(_output)"
                 try:
                     stdout = StringIO()
                     with redirect_stdout(stdout):
-                        exec(imports + "\n_output = " + s + "\nprint(_output)")
+                        exec(code)
                     lines.append(stdout.getvalue().strip("\n"))
-                except Exception:
-                    print(f"\nError while compiling {f}!")
+                except Exception as e:
+                    print("\n" + str(e) + "\n\nCode used:\n" + code)
+                    print(f"\n\nError while compiling {f}!")
+                    print(statements)
                     raise typer.Abort()
             # Write to file
             Path(os.path.split(out)[0]).mkdir(parents=True, exist_ok=True)

pymcfunction/commands/simple.py

@@ -1,7 +1,7 @@
 from pymcfunction.types import Gamemode, Weather
 
 
-def say(msg):
+def say(msg: str):
     return "say " + str(msg)
 
 
@@ -100,5 +100,6 @@ def pardon(player: str):
 def pardon_ip(ip: str):
     return "pardon " + ip
 
-def teammsg(msg:str):
-    return "teammsg " + msg
+
+def teammsg(msg: str):
+    return "teammsg " + msg

pymcfunction/commands/team.py

@@ -7,21 +7,21 @@ def create(self, displayName: str = None):
 
     def listTeams(self):
         return "team list"
-    
+
     def listMembers(self):
         return "team list " + self.name
-    
+
     def remove(self):
         return "team remove " + self.name
-    
+
     def empty(self):
         return "team emtpy " + self.name
-    
-    def join(self, target:str="@s"):
+
+    def join(self, target: str = "@s"):
         return f"team join {self.name} {target}"
-    
-    def leave(self, target:str):
+
+    def leave(self, target: str):
         return f"team leave {target}"
-    
-    def modify(self, option:str, value:str):
-        return f"team modify {self.name} {option} {value}"
+
+    def modify(self, option: str, value: str):
+        return f"team modify {self.name} {option} {value}"

pymcfunction/commands/teleport.py

@@ -1,14 +1,19 @@
 from pymcfunction.types import AnchorType
 
+
 class teleport:
-    def __init__(self, target:str="@s") -> None:
+    def __init__(self, target: str = "@s") -> None:
         self.target = target
-        
-    def destination(self, coord:str, rotation:float|int=None):
-        return f"teleport {self.target} {coord}" + ((" " + str(rotation)) if rotation else "")
 
-    def facingCoordinate(self, coord:str, facing:str):
+    def destination(self, coord: str, rotation: float | int = None):
+        return f"teleport {self.target} {coord}" + (
+            (" " + str(rotation)) if rotation else ""
+        )
+
+    def facingCoordinate(self, coord: str, facing: str):
         return f"teleport {self.target} {coord} facing {facing}"
-    
-    def facingEntity(self, coord:str, facingEntity:str, anchor:AnchorType=AnchorType.EYES):
-        return f"teleport {self.target} {coord} facing entity {facingEntity} {anchor.value}"    
+
+    def facingEntity(
+        self, coord: str, facingEntity: str, anchor: AnchorType = AnchorType.EYES
+    ):
+        return f"teleport {self.target} {coord} facing entity {facingEntity} {anchor.value}"

test/data/ticker.py

@@ -1 +1,4 @@
 ##pymcfunction-tick
+from pymcfunction import *
+
+say("TICK")