add even more commands

Author: PaddeCraft

README.md

@@ -18,16 +18,16 @@ These are the currently supported commands. Feel free to create a PR, the goal i
  - [ ] /attribute
  - [x] /ban
  - [x] /ban-ip
- - [ ] /banlist
- - [ ] /bossbar
+ - [x] /banlist
+ - [x] /bossbar
  - [x] /clear
  - [ ] /clone
  - [ ] /data
  - [ ] /datapack
  - [ ] /debug
  - [x] /defaultgamemode
  - [x] /deop
- - [ ] /difficultiy
+ - [x] /difficulty
  - [ ] /effect
  - [ ] /enchant
  - [x] /execute
@@ -61,12 +61,12 @@ These are the currently supported commands. Feel free to create a PR, the goal i
  - [ ] /setblock
  - [x] /setidletimeout
  - [x] /setworldspawn
- - [ ] /spawnpoint
- - [ ] /spectate
+ - [x] /spawnpoint
+ - [x] /spectate
  - [ ] /spreadplayers
  - [x] /stop
- - [ ] /stopsound
- - [ ] /summon
+ - [x] /stopsound
+ - [x] /summon
  - [x] /tag
  - [x] /team
  - [x] /teammsg (/tm)

pymcfunction/__init__.py

@@ -5,6 +5,7 @@
 from .commands.tag import tag
 from .commands.team import team
 from .commands.item import item
+from .commands.bossbar import bossbar
 from .commands.execute import execute
 from .commands.teleport import teleport
 from .commands.scoreboard import Scoreboard

pymcfunction/cli.py

@@ -149,7 +149,12 @@ def compile():
                 statements.remove(r)
 
             for s in statements:
-                code = imports + "\n_output = " + s + "\nprint(_output)"
+                code = (
+                    imports
+                    + "\n_output = "
+                    + s
+                    + "\nif type(_output) == str: print(_output)"
+                )
                 try:
                     stdout = StringIO()
                     with redirect_stdout(stdout):

pymcfunction/commands/bossbar.py

@@ -0,0 +1,37 @@
+import re
+from pymcfunction.types import BossbarColor, BossbarGetType, BossbarStyle
+
+
+class bossbar:
+    def __init__(self, id: str):
+        self.id = id
+
+    def create(self, name: str):
+        return f"bossbar add {self.id} {name}"
+
+    def get(self, propertie: BossbarGetType):
+        return f"bossbar get {self.id} {propertie.value}"
+
+    def listAll(self):
+        return f"bossbar list"
+
+    def setColor(self, color: BossbarColor):
+        return f"bossbar set {self.id} color {color.value}"
+
+    def setMax(self, max: int):
+        return f"bossbar set {self.id} max {max}"
+
+    def setName(self, name: str):
+        return f"bossbar set {self.id} name {name}"
+
+    def setPlayers(self, target: str):
+        return f"bossbar set {self.id} players {target}"
+
+    def setStyle(self, style: BossbarStyle):
+        return f"bossbar set {self.id} style {style.value}"
+
+    def setValue(self, value):
+        return f"bossbar set {self.id} value {value}"
+
+    def setVisibility(self, visible: bool):
+        return f"bossbar set {self.id} visible " + ("true" if visible else "false")

pymcfunction/commands/simple.py

@@ -1,4 +1,6 @@
-from pymcfunction.types import Gamemode, Weather
+from types import NoneType
+from pymcfunction.types import BanListType, Difficultiy, Gamemode, Weather
+from pymcfunction.util import _dictToMcKeyVal
 
 
 def say(msg: str):
@@ -103,3 +105,32 @@ def pardon_ip(ip: str):
 
 def teammsg(msg: str):
     return "teammsg " + msg
+
+
+def banlist(_type: BanListType):
+    return "banlist " + _type.value
+
+
+def summon(entity: str, pos: str = "~ ~ ~", nbt: dict | str = None):
+    return f"summon {entity} {pos}" + (
+        ((" " + (_dictToMcKeyVal(nbt)) if type(nbt) == dict else nbt)) if nbt else ""
+    )
+
+
+def stopsound(target: str, source: str = None, sound: str = None):
+    return f"stopsound {target}" + (
+        (" " + (source + ((" " + sound) if sound else ""))) if source else ""
+    )
+
+
+def spectate(target: str | NoneType, spectator: str = "@s"):
+    if target:
+        return f"spectate {target} {spectator}"
+    return "spectate"
+
+
+def spawnpoint(target: str, coord: str = "~ ~ ~", yaw: float = None):
+    return f"spawnpoint {target} {coord}" + ((" " + yaw) if yaw else "")
+
+def difficulty(_difficulty:Difficultiy):
+    return "difficulty " + _difficulty.value

pymcfunction/types.py

@@ -189,3 +189,39 @@ class Weather(Enum):
 class ContainerType(Enum):
     ENTITY = "entity"
     BLOCK = "block"
+
+
+class BanListType(Enum):
+    PLAYERS = "players"
+    IPS = "ips"
+
+
+class BossbarGetType(Enum):
+    MAX = "max"
+    PLAYERS = "players"
+    VALUE = "value"
+    VISIBLE = "visible"
+
+
+class BossbarColor(Enum):
+    BLUE = "blue"
+    GREEN = "green"
+    PINK = "pink"
+    PURPLE = "purple"
+    RED = "red"
+    WHITE = "white"
+    YELLOW = "yellow"
+
+
+class BossbarStyle(Enum):
+    NOTCHED6 = "notched_6"
+    NOTCHED10 = "notched_10"
+    NOTCHED12 = "notched_12"
+    NOTCHED20 = "notched_20"
+    PROGRESS = "progress"
+
+class Difficultiy(Enum):
+    PEACEFUL = "peaceful"
+    EASY = "easy"
+    NORMAL = "normal"
+    HARD = "hard"