feat: version 1.20.5

mcbeet · Apr 29, 2024 · 959af66 · 959af66
1 parent 0e5b1d4
commit 959af66
Show file tree

Hide file tree

Showing 59 changed files with 128 additions and 86 deletions.
diff --git a/examples/bolt_basic/src/data/demo/functions/foo.mcfunction b/examples/bolt_basic/src/data/demo/functions/foo.mcfunction
@@ -664,7 +664,7 @@ random_id = UUID(int=rd.getrandbits(128))
 whitelist add random_id
 
 other_id = UUID(int=rd.getrandbits(128))
-attribute @s minecraft:generic.attack_speed modifier add other_id "double" 0.5 multiply
+attribute @s minecraft:generic.attack_speed modifier add other_id "double" 0.5 add_multiplied_total
 
 x = 1
 del x

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -23,8 +23,8 @@ include = ["bolt/py.typed"]
 
 [tool.poetry.dependencies]
 python = "^3.10"
-beet = ">=0.104"
-mecha = ">=0.91.0"
+beet = ">=0.105.0"
+mecha = ">=0.94.0"
 
 [tool.poetry.group.dev.dependencies]
 pytest = "^8.0.1"

diff --git a/tests/snapshots/bolt__parse_103__0.txt b/tests/snapshots/bolt__parse_103__0.txt
@@ -115,7 +115,7 @@ as @a at @s if block ~ ~-1 ~ #wool give @s stone{
                               variable: 's'
                               arguments:
                                 <empty>
-                            <class 'mecha.ast.AstItem'>
+                            <class 'mecha.ast.AstItemStack'>
                               location: SourceLocation(pos=85, lineno=2, colno=44)
                               end_location: SourceLocation(pos=210, lineno=9, colno=2)
                               identifier:
@@ -125,7 +125,7 @@ as @a at @s if block ~ ~-1 ~ #wool give @s stone{
                                   is_tag: False
                                   namespace: None
                                   path: 'stone'
-                              components:
+                              arguments:
                                 <empty>
                               data_tags:
                                 <class 'mecha.ast.AstNbtCompound'>

diff --git a/tests/snapshots/bolt__parse_103__1.txt b/tests/snapshots/bolt__parse_103__1.txt
@@ -66,12 +66,12 @@ _bolt_refs[5]
   entries:
     <class 'mecha.ast.AstNbtCompoundEntry'>
 _bolt_refs[6]
-<class 'mecha.ast.AstItem'>
+<class 'mecha.ast.AstItemStack'>
   location: SourceLocation(pos=85, lineno=2, colno=44)
   end_location: SourceLocation(pos=210, lineno=9, colno=2)
   identifier:
     <class 'mecha.ast.AstResourceLocation'>
-  components:
+  arguments:
     <empty>
   data_tags:
     <class 'mecha.ast.AstNbtCompound'>
@@ -89,7 +89,7 @@ _bolt_refs[8]
   identifier: 'give:targets:item'
   arguments:
     <class 'mecha.ast.AstSelector'>
-    <class 'mecha.ast.AstItem'>
+    <class 'mecha.ast.AstItemStack'>
 _bolt_refs[9]
 <class 'mecha.ast.AstCommand'>
   location: SourceLocation(pos=77, lineno=2, colno=36)

diff --git a/tests/snapshots/bolt__parse_166__0.txt b/tests/snapshots/bolt__parse_166__0.txt
@@ -34,7 +34,7 @@ item replace block ~ ~2 ~ container.26 with minecraft:spruce_sapling 4
           location: SourceLocation(pos=26, lineno=1, colno=27)
           end_location: SourceLocation(pos=38, lineno=1, colno=39)
           value: 'container.26'
-        <class 'mecha.ast.AstItem'>
+        <class 'mecha.ast.AstItemStack'>
           location: SourceLocation(pos=44, lineno=1, colno=45)
           end_location: SourceLocation(pos=68, lineno=1, colno=69)
           identifier:
@@ -44,7 +44,7 @@ item replace block ~ ~2 ~ container.26 with minecraft:spruce_sapling 4
               is_tag: False
               namespace: 'minecraft'
               path: 'spruce_sapling'
-          components:
+          arguments:
             <empty>
           data_tags: None
         <class 'mecha.ast.AstNumber'>

diff --git a/tests/snapshots/bolt__parse_205__0.txt b/tests/snapshots/bolt__parse_205__0.txt
@@ -50,7 +50,7 @@ give @s bow{**bow_data}
           variable: 's'
           arguments:
             <empty>
-        <class 'mecha.ast.AstItem'>
+        <class 'mecha.ast.AstItemStack'>
           location: SourceLocation(pos=40, lineno=2, colno=9)
           end_location: SourceLocation(pos=55, lineno=2, colno=24)
           identifier:
@@ -60,7 +60,7 @@ give @s bow{**bow_data}
               is_tag: False
               namespace: None
               path: 'bow'
-          components:
+          arguments:
             <empty>
           data_tags:
             <class 'mecha.ast.AstNbtCompound'>

diff --git a/tests/snapshots/bolt__parse_205__1.txt b/tests/snapshots/bolt__parse_205__1.txt
@@ -30,12 +30,12 @@ _bolt_refs[1]
   entries:
     <class 'bolt.ast.AstInterpolation'>
 _bolt_refs[2]
-<class 'mecha.ast.AstItem'>
+<class 'mecha.ast.AstItemStack'>
   location: SourceLocation(pos=40, lineno=2, colno=9)
   end_location: SourceLocation(pos=55, lineno=2, colno=24)
   identifier:
     <class 'mecha.ast.AstResourceLocation'>
-  components:
+  arguments:
     <empty>
   data_tags:
     <class 'mecha.ast.AstNbtCompound'>
@@ -53,7 +53,7 @@ _bolt_refs[4]
   identifier: 'give:targets:item'
   arguments:
     <class 'mecha.ast.AstSelector'>
-    <class 'mecha.ast.AstItem'>
+    <class 'mecha.ast.AstItemStack'>
 _bolt_refs[5]
 <class 'mecha.ast.AstRoot'>
   location: SourceLocation(pos=0, lineno=1, colno=1)

diff --git a/tests/snapshots/bolt__parse_206__0.txt b/tests/snapshots/bolt__parse_206__0.txt
@@ -76,7 +76,7 @@ give @s stone{CanPlaceOn: [*stone_can_place_on], **custom_model_data}
           variable: 's'
           arguments:
             <empty>
-        <class 'mecha.ast.AstItem'>
+        <class 'mecha.ast.AstItemStack'>
           location: SourceLocation(pos=89, lineno=3, colno=9)
           end_location: SourceLocation(pos=150, lineno=3, colno=70)
           identifier:
@@ -86,7 +86,7 @@ give @s stone{CanPlaceOn: [*stone_can_place_on], **custom_model_data}
               is_tag: False
               namespace: None
               path: 'stone'
-          components:
+          arguments:
             <empty>
           data_tags:
             <class 'mecha.ast.AstNbtCompound'>

diff --git a/tests/snapshots/bolt__parse_206__1.txt b/tests/snapshots/bolt__parse_206__1.txt
@@ -59,12 +59,12 @@ _bolt_refs[4]
     <class 'mecha.ast.AstNbtCompoundEntry'>
     <class 'bolt.ast.AstInterpolation'>
 _bolt_refs[5]
-<class 'mecha.ast.AstItem'>
+<class 'mecha.ast.AstItemStack'>
   location: SourceLocation(pos=89, lineno=3, colno=9)
   end_location: SourceLocation(pos=150, lineno=3, colno=70)
   identifier:
     <class 'mecha.ast.AstResourceLocation'>
-  components:
+  arguments:
     <empty>
   data_tags:
     <class 'mecha.ast.AstNbtCompound'>
@@ -82,7 +82,7 @@ _bolt_refs[7]
   identifier: 'give:targets:item'
   arguments:
     <class 'mecha.ast.AstSelector'>
-    <class 'mecha.ast.AstItem'>
+    <class 'mecha.ast.AstItemStack'>
 _bolt_refs[8]
 <class 'mecha.ast.AstRoot'>
   location: SourceLocation(pos=0, lineno=1, colno=1)

diff --git a/tests/snapshots/bolt__parse_230__0.txt b/tests/snapshots/bolt__parse_230__0.txt
@@ -1,6 +1,6 @@
 macro foo:
     pass
-#>ERROR  Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 146 other tokens but got literal 'foo'.
+#>ERROR  Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 147 other tokens but got literal 'foo'.
 # line 3, column 7
 #      2 |      pass
 #      3 |  as @p foo

diff --git a/tests/snapshots/bolt__parse_305__0.txt b/tests/snapshots/bolt__parse_305__0.txt
@@ -1,4 +1,4 @@
-#>ERROR  Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 163 other tokens but got literal 'foo'.
+#>ERROR  Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 164 other tokens but got literal 'foo'.
 # line 1, column 11
 #      1 |  as @a run foo = "bar"
 #        :            ^^^

diff --git a/tests/snapshots/bolt__parse_352__0.txt b/tests/snapshots/bolt__parse_352__0.txt
@@ -1,6 +1,6 @@
 macro hello thing=subcommand:
     pass
-#>ERROR  Expected assignment, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 165 other tokens but got literal 'print(123)'.
+#>ERROR  Expected assignment, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 166 other tokens but got literal 'print(123)'.
 # line 3, column 7
 #      2 |      pass
 #      3 |  hello print(123)

diff --git a/tests/snapshots/bolt__parse_358__0.txt b/tests/snapshots/bolt__parse_358__0.txt
@@ -1,4 +1,4 @@
-#>ERROR  Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 163 other tokens but got literal '"not'.
+#>ERROR  Expected literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as', literal 'at' or 164 other tokens but got literal '"not'.
 # line 1, column 13
 #      1 |  execute run "not docstring"
 #        :              ^^^^

diff --git a/tests/snapshots/bolt__parse_38__0.txt b/tests/snapshots/bolt__parse_38__0.txt
@@ -1,4 +1,4 @@
-#>ERROR  Expected bracket '[', curly '{', docstring, ellipsis, false, identifier or 15 other tokens but reached end of file.
+#>ERROR  Expected bracket '[', curly '{', docstring, ellipsis, false, identifier or 16 other tokens but reached end of file.
 # line 1, column 3
 #      1 |  if
 if
diff --git a/tests/snapshots/bolt__parse_48__0.txt b/tests/snapshots/bolt__parse_48__0.txt
@@ -1,5 +1,5 @@
 1 * 2
-#>ERROR  Expected bracket '[', curly '{', decorator, docstring, ellipsis, false or 176 other tokens but got literal '*'.
+#>ERROR  Expected bracket '[', curly '{', decorator, docstring, ellipsis, false or 177 other tokens but got literal '*'.
 # line 2, column 1
 #      1 |  1 * 2
 #      2 |  * 3

diff --git a/tests/snapshots/bolt__parse_98__0.txt b/tests/snapshots/bolt__parse_98__0.txt
@@ -1,4 +1,4 @@
-#>ERROR  Expected literal 'biome', literal 'block', literal 'blocks', literal 'data', literal 'dimension', literal 'entity' or 4 other tokens but got literal '"foo"'.
+#>ERROR  Expected literal 'biome', literal 'block', literal 'blocks', literal 'data', literal 'dimension', literal 'entity' or 5 other tokens but got literal '"foo"'.
 # line 1, column 10
 #      1 |  at @s if "foo" == "bar":
 #        :           ^^^^^

diff --git a/tests/snapshots/bolt__parse_99__0.txt b/tests/snapshots/bolt__parse_99__0.txt
@@ -1,4 +1,4 @@
-#>ERROR  Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 146 other tokens but got literal 'for'.
+#>ERROR  Expected colon, literal 'advancement', literal 'align', literal 'anchored', literal 'append', literal 'as' or 147 other tokens but got literal 'for'.
 # line 1, column 7
 #      1 |  at @s for i in "foo":
 #        :        ^^^

diff --git a/tests/snapshots/examples__build_bolt_1_20__0.pack.md b/tests/snapshots/examples__build_bolt_1_20__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_assets__0.pack.md b/tests/snapshots/examples__build_bolt_assets__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 22,
+    "pack_format": 32,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_basic__0.pack.md b/tests/snapshots/examples__build_bolt_basic__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }
@@ -310,7 +310,7 @@ say AstCommand(identifier='tellraw:targets:message', arguments=AstChildren((AstS
 say tellraw @p "hello"
 execute as 00000001-0002-0003-0405-000000000006 run function test:test
 whitelist add bdd640fb-0667-1ad1-1c80-317fa3b1799d
-attribute @s minecraft:generic.attack_speed modifier add 23b8c1e9-3924-56de-3eb1-3b9046685257 double 0.5 multiply
+attribute @s minecraft:generic.attack_speed modifier add 23b8c1e9-3924-56de-3eb1-3b9046685257 double 0.5 add_multiplied_total
 ```
 
 `@function demo:import_a`
@@ -683,7 +683,7 @@ say json loaded!
 ```json
 {
   "pack": {
-    "pack_format": 22,
+    "pack_format": 32,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_chained_comp__0.pack.md b/tests/snapshots/examples__build_bolt_chained_comp__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_chicken__0.pack.md b/tests/snapshots/examples__build_bolt_chicken__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_circular__0.pack.md b/tests/snapshots/examples__build_bolt_circular__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_class__0.pack.md b/tests/snapshots/examples__build_bolt_class__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_compile_cached__0.pack.md b/tests/snapshots/examples__build_bolt_compile_cached__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_custom_provider__0.pack.md b/tests/snapshots/examples__build_bolt_custom_provider__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_debug__0.pack.md b/tests/snapshots/examples__build_bolt_debug__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_defer__0.pack.md b/tests/snapshots/examples__build_bolt_defer__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }

diff --git a/tests/snapshots/examples__build_bolt_docstring__0.pack.md b/tests/snapshots/examples__build_bolt_docstring__0.pack.md
@@ -7,7 +7,7 @@
 ```json
 {
   "pack": {
-    "pack_format": 26,
+    "pack_format": 41,
     "description": ""
   }
 }