Added more commands, linted and bumped version to 0.1.2

Author: PaddeCraft

.github/workflows/publish.yaml

@@ -0,0 +1,17 @@
+name: Release on Pypi
+on:
+    release:
+        types: [published]
+
+jobs:
+    ReleasePypi:
+        runs-on: ubuntu-latest
+        steps:
+            - uses: actions/checkout@v2
+            - name: Build and publish to pypi
+              uses: JRubics/poetry-publish@v1.13
+              with:
+                  pypi_token: ${{ secrets.PYPI_TOKEN }}
+                  python_version: "3.10.8"
+                  allow_poetry_pre_release: "yes"
+                  ignore_dev_requirements: "yes"

README.md

@@ -16,8 +16,8 @@ These are the currently supported commands. Feel free to create a PR, the goal i
 
  - [ ] /advancement
  - [ ] /attribute
- - [ ] /ban
- - [ ] /ban-ip
+ - [x] /ban
+ - [x] /ban-ip
  - [ ] /banlist
  - [ ] /bossbar
  - [x] /clear
@@ -35,48 +35,47 @@ These are the currently supported commands. Feel free to create a PR, the goal i
  - [ ] /fill
  - [ ] /forceload
  - [x] /function
- - [ ] /gamemode
- - [ ] /gamerule
- - [ ] /give
- - [ ] /item
- - [ ] /kick
- - [ ] /kill
+ - [x] /gamemode
+ - [x] /gamerule
+ - [x] /give
+ - [x] /item
+ - [x] /kick
+ - [x] /kill
  - [ ] /locate
  - [ ] /loot
- - [ ] /msg (/tell and /w)
- - [ ] /op
- - [ ] /pardon
- - [ ] /pardon-ip
+ - [x] /op
+ - [x] /pardon
+ - [x] /pardon-ip
  - [ ] /particle
  - [ ] /place
  - [ ] /playsound
  - [ ] /publish
  - [ ] /recipe
- - [ ] /save-all
- - [ ] /save-off
- - [ ] /save-on
+ - [x] /save-all
+ - [x] /save-off
+ - [x] /save-on
  - [x] /say
  - [ ] /schedule
  - [x] /scoreboard
- - [ ] /seed
+ - [x] /seed
  - [ ] /setblock
- - [ ] /setidletimeout
- - [ ] /setworldspawn
+ - [x] /setidletimeout
+ - [x] /setworldspawn
  - [ ] /spawnpoint
  - [ ] /spectate
  - [ ] /spreadplayers
- - [ ] /stop
+ - [x] /stop
  - [ ] /stopsound
  - [ ] /summon
- - [ ] /tag
- - [ ] /team
- - [ ] /teammsg (/tm)
- - [ ] /teleport (/tp)
+ - [x] /tag
+ - [x] /team
+ - [x] /teammsg (/tm)
+ - [x] /teleport (/tp)
  - [ ] /tellraw
  - [ ] /time
  - [ ] /title
  - [ ] /trigger
- - [ ] /weather
+ - [x] /weather
  - [ ] /whitelist
  - [ ] /worldborder
 

pymcfunction/__init__.py

@@ -2,7 +2,11 @@
 
 from .util import *
 
+from .commands.tag import tag
+from .commands.team import team
+from .commands.item import item
 from .commands.execute import execute
+from .commands.teleport import teleport
 from .commands.scoreboard import Scoreboard
 
 from .commands.simple import *

pymcfunction/cli.py

@@ -187,7 +187,7 @@ def publish():
         filetypes=files,
         defaultextension=files,
         title="Save packaged datapack...",
-        confirmoverwrite = True,
+        confirmoverwrite=True,
         initialfile=f'{config["compiled_folder_name"]}-{int(time.time())}.zip',
     )
     print(file)
@@ -199,4 +199,5 @@ def publish():
     shutil.make_archive(file, "zip", outFolder)
     print("Created archive!")
 
+
 app()

pymcfunction/commands/item.py

@@ -0,0 +1,40 @@
+from pymcfunction.types import ContainerType
+
+
+class item:
+    def __init__(self) -> None:
+        pass
+
+    def modifyEntity(self, target: str, slot: str, modifier: str):
+        return f"item modify entity {target} {slot} {modifier}"
+
+    def modifyBlock(self, coord: str, slot: str, modifier: str):
+        return f"item modify block {coord} {slot} {modifier}"
+
+    def replaceEntity(self, target: str, slot: str, item: str, count: int = 1):
+        return f"item replace entity {target} {slot} with {item} {count}"
+
+    def replaceBlock(self, coord: str, slot: str, item: str, count: int = 1):
+        return f"item replace block {coord} {slot} with {item} {count}"
+
+    def copy(
+        self,
+        sourceType: ContainerType,
+        source: str,
+        sourceSlot: str,
+        destType: ContainerType,
+        dest: str,
+        destSlot: str,
+        modifier: str = None,
+    ):
+        """Copy item
+
+        Args:
+            sourceType (ContainerType): ContainerType.ENTITY or ContainerType.Block
+            source (str): Coordinate or selector of source
+            sourceSlot (str): Slot of item in the source
+            destType (ContainerType): ContainerType.ENTITY or ContainerType.BLOCK
+            dest (str): Coordinate or selector of destination
+            destSlot (str): Slot of item in destination
+        """
+        return f"item replace {destType.value} {dest} {destSlot} from {sourceType.value} {source} {sourceSlot}{(' ' + modifier) if modifier else ''}"

pymcfunction/commands/scoreboard.py

@@ -15,7 +15,7 @@ def delete(self):
     def setdisplay(self, slot: str):
         return f"scoreboard objectives setdisplay {slot} {self.name}"
 
-    def modifyDisplayName(self, displayNameJsonComponent: str|dict):
+    def modifyDisplayName(self, displayNameJsonComponent: str | dict):
         return f"scoreboard objectives modify {self.name} displayname {displayNameJsonComponent}"
 
     def modifyRendertype(self, rendertype: ScoreboardRenderType):

pymcfunction/commands/simple.py

@@ -1,20 +1,104 @@
-from pymcfunction.types import Gamemode
+from pymcfunction.types import Gamemode, Weather
+
 
 def say(msg):
     return "say " + str(msg)
 
 
 def function(path: str, includeWorkspace=True):
-    return "function " + ("@@PYMCFUNCTION-NAMESPACE:" if includeWorkspace else "") + path
+    return (
+        "function " + ("@@PYMCFUNCTION-NAMESPACE:" if includeWorkspace else "") + path
+    )
+
 
-def clear(target:str="@s"):
+def clear(target: str = "@s"):
     return "clear " + target
 
-def defaultgamemode(mode:Gamemode):
+
+def defaultgamemode(mode: Gamemode):
     val = mode.value
     if val[0] == "!":
         raise Exception("Default gamemode needs to be one specific gamemode.")
     return "defaultgamemode " + val
 
-def deop(player:str):
-    return "deop " + player
+
+def deop(player: str):
+    return "deop " + player
+
+
+def op(player: str):
+    return "op " + player
+
+
+def stop():
+    return "stop"
+
+
+def weather(_type: Weather, duration: int = 999999):
+    return f"weather {_type.value} {duration}"
+
+
+def seed():
+    return "seed"
+
+
+def setworldspawn(coord: str, yaw: float = 0.0):
+    return f"setworldspawn {coord} {yaw}"
+
+
+def setidletimeout(minutes: int):
+    return "setidletimeout " + str(minutes)
+
+
+def give(target: str, item: str, count: int = 1):
+    return f"give {target} {count}"
+
+
+def kill(target: str):
+    return "kill " + target
+
+
+def kick(target: str):
+    return "kick " + target
+
+
+def gamemode(mode: Gamemode):
+    val = mode.value
+    if val[0] == "!":
+        raise Exception("Gamemode needs to be one specific gamemode.")
+    return "gamemode " + val
+
+
+def gamerule(rule: str, val: str):
+    return f"gamerule {rule} {val}"
+
+
+def save_all(flush=False):
+    return "save-all" + (" flush" if flush else "")
+
+
+def save_off():
+    return "save-off"
+
+
+def save_on():
+    return "save-on"
+
+
+def ban(player: str, reason: str = None):
+    return f"ban {player}" + ((" " + reason) if reason else "")
+
+
+def ban_ip(ip: str, reason: str = None):
+    return f"ban-ip {ip}" + ((" " + reason) if reason else "")
+
+
+def pardon(player: str):
+    return "pardon " + player
+
+
+def pardon_ip(ip: str):
+    return "pardon " + ip
+
+def teammsg(msg:str):
+    return "teammsg " + msg

pymcfunction/commands/tag.py

@@ -0,0 +1,12 @@
+class tag:
+    def __init__(self, target: str) -> None:
+        self.target = target
+
+    def add(self, tag):
+        return f"tag {self.target} add {tag}"
+
+    def remove(self, tag):
+        return f"tag {self.target} remove {tag}"
+
+    def list(self):
+        return f"tag {self.target} list"

pymcfunction/commands/team.py

@@ -0,0 +1,27 @@
+class team:
+    def __init__(self, name: str) -> None:
+        self.name = name
+
+    def create(self, displayName: str = None):
+        return f"team add {self.name}" + ((" " + displayName) if displayName else "")
+
+    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"):
+        return f"team join {self.name} {target}"
+    
+    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}"

pymcfunction/commands/teleport.py

@@ -0,0 +1,14 @@
+from pymcfunction.types import AnchorType
+
+class teleport:
+    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):
+        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}"