From 4a03c596f8839f920f18ff2e6ed5283732f5f521 Mon Sep 17 00:00:00 2001 From: xiaodou8593 <51410412+xiaodou8593@users.noreply.github.com> Date: Sat, 8 Jul 2023 00:07:15 +0800 Subject: [PATCH] update --- data/math/functions/3vec/_coordto.mcfunction | 9 +- data/math/functions/3vec/_dsp-ex.mcfunction | 7 +- data/math/functions/3vec/_dsp.mcfunction | 7 +- data/math/functions/3vec/_ex-len.mcfunction | 6 +- data/math/functions/3vec/_ex-rot.mcfunction | 7 +- data/math/functions/3vec/_ex-xyz.mcfunction | 7 +- data/math/functions/3vec/_ldsp.mcfunction | 5 +- data/math/functions/3vec/_polar.mcfunction | 10 + data/math/functions/3vec/_posto.mcfunction | 7 +- data/math/functions/3vec/_topos.mcfunction | 7 +- data/math/functions/4d/_dsp.mcfunction | 47 - data/math/functions/4d/_init.mcfunction | 39 - data/math/functions/4d/_title.mcfunction | 6 - data/math/functions/4d/arrow.mcfunction | 9 - data/math/functions/4d/arrow0.mcfunction | 5 - data/math/functions/4d/arrow1.mcfunction | 6 - .../functions/4d/buttons/facing.mcfunction | 102 --- .../functions/4d/buttons/reset.mcfunction | 6 - .../4d/buttons/reset_angle.mcfunction | 7 - .../functions/4d/buttons/switch0.mcfunction | 8 - .../functions/4d/buttons/switch1.mcfunction | 19 - data/math/functions/4d/buttons/upd.mcfunction | 14 - data/math/functions/4d/crc.mcfunction | 2 - data/math/functions/4d/get_ijk.mcfunction | 22 - data/math/functions/4d/loop.mcfunction | 86 -- data/math/functions/4d/main.mcfunction | 7 - .../4d/objects/_hypercube.mcfunction | 42 - .../4d/objects/_hypersphere.mcfunction | 4 - .../4d/objects/_hypertetrahedron.mcfunction | 76 -- .../4d/objects/hypercube_loop.mcfunction | 6 - .../4d/objects/hypersphere_loop.mcfunction | 30 - .../objects/hypertetrahedron_loop.mcfunction | 7 - .../math/functions/4d/objects/line.mcfunction | 61 -- .../functions/4d/objects/line_loop.mcfunction | 33 - data/math/functions/4d/running.mcfunction | 34 - data/math/functions/4d/test.mcfunction | 3 - data/math/functions/4d/test/ijk.mcfunction | 32 - .../functions/4d/test/projection.mcfunction | 2 - data/math/functions/4d/text0.mcfunction | 8 - data/math/functions/4d/text1.mcfunction | 8 - data/math/functions/4d/textboard.mcfunction | 5 - data/math/functions/4d/ui.mcfunction | 8 - data/math/functions/4d/ui_items.mcfunction | 5 - data/math/functions/_atan2.mcfunction | 5 +- data/math/functions/_init.mcfunction | 16 +- data/math/functions/_particle.mcfunction | 6 + data/math/functions/_posto.mcfunction | 3 + data/math/functions/_rand.mcfunction | 2 + data/math/functions/_randiter.mcfunction | 1 + data/math/functions/_random.mcfunction | 3 + data/math/functions/_refacing.mcfunction | 12 + data/math/functions/_sincos.mcfunction | 5 +- data/math/functions/_sqrt.mcfunction | 3 + data/math/functions/_topos.mcfunction | 3 + data/math/functions/_version.mcfunction | 5 +- data/math/functions/_xyz.mcfunction | 5 +- data/math/functions/cbox/_randnew.mcfunction | 2 +- data/math/functions/cbox/_sector.mcfunction | 2 +- .../functions/cbox/vanilla/_detect.mcfunction | 4 +- .../functions/geom/sector/_randnew.mcfunction | 2 +- data/math/functions/graph/_display.mcfunction | 7 - data/math/functions/graph/_get.mcfunction | 3 - data/math/functions/graph/_randnew.mcfunction | 29 - data/math/functions/graph/_ssnew.mcfunction | 11 - data/math/functions/graph/_store.mcfunction | 3 - .../functions/graph/display/_off.mcfunction | 6 - .../functions/graph/display/_phyx.mcfunction | 29 - .../functions/graph/display/_plane.mcfunction | 4 - .../functions/graph/display/init.mcfunction | 4 - .../functions/graph/display/line.mcfunction | 10 - .../functions/graph/display/loop.mcfunction | 28 - .../functions/graph/display/off.mcfunction | 3 - .../graph/display/off_loop.mcfunction | 9 - .../graph/display/phyx_lloop.mcfunction | 20 - .../graph/display/phyx_loop.mcfunction | 47 - .../graph/display/phyx_ploop.mcfunction | 12 - .../graph/display/phyx_sloop.mcfunction | 36 - .../graph/display/plane_loop.mcfunction | 12 - .../functions/graph/display/set.mcfunction | 8 - .../graph/display/set_psg.mcfunction | 6 - .../functions/graph/display/sloop.mcfunction | 19 - data/math/functions/graph/doc.txt | 25 - data/math/functions/graph/init.mcfunction | 4 - data/math/functions/graph/main.mcfunction | 12 - .../math/functions/graph/main_loop.mcfunction | 3 - .../functions/graph/main_sloop.mcfunction | 20 - .../functions/graph/main_ssloop.mcfunction | 22 - .../functions/graph/randnew/loop.mcfunction | 41 - .../graph/randnew/pre_loop.mcfunction | 6 - .../functions/graph/randnew/sloop.mcfunction | 9 - data/math/functions/graph/test.mcfunction | 6 - data/math/functions/graph/test/run.mcfunction | 6 - .../math/functions/graph/test/run0.mcfunction | 5 - .../math/functions/graph/test/run1.mcfunction | 12 - .../math/functions/graph/test/run2.mcfunction | 20 - .../math/functions/graph/test/run3.mcfunction | 5 - data/math/functions/init_overworld.mcfunction | 10 + data/math/functions/marker/_math.mcfunction | 3 + data/math/functions/marker/_origin.mcfunction | 2 + data/math/functions/marker/_return.mcfunction | 3 + data/math/functions/marker/_sign.mcfunction | 3 + data/math/functions/marker/_uuid.mcfunction | 3 + data/math/functions/math_marker.mcfunction | 3 - .../math/functions/obj_entity/_new.mcfunction | 3 + data/math/functions/obj_entity/set.mcfunction | 4 + data/math/functions/set/_append.mcfunction | 12 + data/math/functions/set/_diff.mcfunction | 11 - data/math/functions/set/_ex-string.mcfunction | 7 - data/math/functions/set/_issetof.mcfunction | 8 - data/math/functions/set/_ssnew.mcfunction | 4 + data/math/functions/set/_tagsdiff.mcfunction | 20 - data/math/functions/set/_tagsof.mcfunction | 16 - .../functions/set/append_success.mcfunction | 3 + data/math/functions/set/diff_loop.mcfunction | 10 - .../math/functions/set/string_loop.mcfunction | 9 - .../functions/set/tagsdiff_loop.mcfunction | 13 - data/math/functions/test.mcf | 186 ---- data/math/functions/test/aecbox.mcfunction | 4 - data/math/functions/test/cbox.mcfunction | 24 - data/math/functions/test/cbox_dsp.mcfunction | 10 - .../functions/test/cbox_vanilla.mcfunction | 9 - data/math/functions/test/circle.mcfunction | 3 - data/math/functions/test/cube.mcfunction | 7 - data/math/functions/test/cube_loop.mcfunction | 21 - data/math/functions/test/dcmd.mcfunction | 11 - data/math/functions/test/dfs.mcfunction | 3 - data/math/functions/test/dfs_call.mcfunction | 11 - .../math/functions/test/entity_cnt.mcfunction | 6 - .../functions/test/entity_loop.mcfunction | 5 - data/math/functions/test/f0.mcfunction | 40 - data/math/functions/test/facing.mcfunction | 18 - data/math/functions/test/float.mcfunction | 11 - data/math/functions/test/get_ijk.mcfunction | 9 - .../math/functions/test/get_sincos.mcfunction | 5 - .../math/functions/test/hanoi/call.mcfunction | 3 - .../math/functions/test/hanoi/next.mcfunction | 12 - .../functions/test/hanoi/print.mcfunction | 13 - data/math/functions/test/hanoi/rec.mcfunction | 7 - data/math/functions/test/init.mcfunction | 3 - .../functions/test/kill_another.mcfunction | 4 - .../functions/test/kill_each_other.mcfunction | 11 - data/math/functions/test/line.mcfunction | 3 - data/math/functions/test/line_loop.mcfunction | 5 - data/math/functions/test/loop.mcfunction | 4 - data/math/functions/test/loop0.mcfunction | 7 - data/math/functions/test/loop1.mcfunction | 6 - data/math/functions/test/loop2.mcfunction | 4 - data/math/functions/test/loop3.mcfunction | 7 - data/math/functions/test/loop4.mcfunction | 8 - data/math/functions/test/mine.mcfunction | 7 - data/math/functions/test/move.mcfunction | 17 - data/math/functions/test/move_loop.mcfunction | 16 - data/math/functions/test/new.mcfunction | 12 - data/math/functions/test/new_rot.mcfunction | 15 - .../functions/test/new_rot_cal.mcfunction | 65 -- .../functions/test/new_rot_init.mcfunction | 4 - data/math/functions/test/origin.mcfunction | 12 - .../functions/test/prepend_loop.mcfunction | 4 - data/math/functions/test/rand_uvec.mcfunction | 15 - data/math/functions/test/run.mcfunction | 9 +- data/math/functions/test/run0.mcfunction | 2 - data/math/functions/test/run1.mcfunction | 5 - data/math/functions/test/run2.mcfunction | 3 - data/math/functions/test/run3.mcfunction | 4 - data/math/functions/test/set.mcfunction | 3 - data/math/functions/test/set_cb.mcfunction | 3 - data/math/functions/test/sqrt.mcfunction | 8 - data/math/functions/test/uuid.mcfunction | 9 - data/math/functions/test/uv_topos.mcfunction | 27 - data/math/functions/test/void.mcfunction | 1 - data/math/functions/tick.mcfunction | 5 +- data/math/functions/uvw/_dsp.mcfunction | 30 +- data/math/functions/uvw/_ssdsp.mcfunction | 32 +- data/minecraft/advancements/crc.json | 17 - data/minecraft/tags/items/all.json | 866 ------------------ 175 files changed, 208 insertions(+), 3012 deletions(-) delete mode 100644 data/math/functions/4d/_dsp.mcfunction delete mode 100644 data/math/functions/4d/_init.mcfunction delete mode 100644 data/math/functions/4d/_title.mcfunction delete mode 100644 data/math/functions/4d/arrow.mcfunction delete mode 100644 data/math/functions/4d/arrow0.mcfunction delete mode 100644 data/math/functions/4d/arrow1.mcfunction delete mode 100644 data/math/functions/4d/buttons/facing.mcfunction delete mode 100644 data/math/functions/4d/buttons/reset.mcfunction delete mode 100644 data/math/functions/4d/buttons/reset_angle.mcfunction delete mode 100644 data/math/functions/4d/buttons/switch0.mcfunction delete mode 100644 data/math/functions/4d/buttons/switch1.mcfunction delete mode 100644 data/math/functions/4d/buttons/upd.mcfunction delete mode 100644 data/math/functions/4d/crc.mcfunction delete mode 100644 data/math/functions/4d/get_ijk.mcfunction delete mode 100644 data/math/functions/4d/loop.mcfunction delete mode 100644 data/math/functions/4d/main.mcfunction delete mode 100644 data/math/functions/4d/objects/_hypercube.mcfunction delete mode 100644 data/math/functions/4d/objects/_hypersphere.mcfunction delete mode 100644 data/math/functions/4d/objects/_hypertetrahedron.mcfunction delete mode 100644 data/math/functions/4d/objects/hypercube_loop.mcfunction delete mode 100644 data/math/functions/4d/objects/hypersphere_loop.mcfunction delete mode 100644 data/math/functions/4d/objects/hypertetrahedron_loop.mcfunction delete mode 100644 data/math/functions/4d/objects/line.mcfunction delete mode 100644 data/math/functions/4d/objects/line_loop.mcfunction delete mode 100644 data/math/functions/4d/running.mcfunction delete mode 100644 data/math/functions/4d/test.mcfunction delete mode 100644 data/math/functions/4d/test/ijk.mcfunction delete mode 100644 data/math/functions/4d/test/projection.mcfunction delete mode 100644 data/math/functions/4d/text0.mcfunction delete mode 100644 data/math/functions/4d/text1.mcfunction delete mode 100644 data/math/functions/4d/textboard.mcfunction delete mode 100644 data/math/functions/4d/ui.mcfunction delete mode 100644 data/math/functions/4d/ui_items.mcfunction create mode 100644 data/math/functions/_particle.mcfunction create mode 100644 data/math/functions/_refacing.mcfunction delete mode 100644 data/math/functions/graph/_display.mcfunction delete mode 100644 data/math/functions/graph/_get.mcfunction delete mode 100644 data/math/functions/graph/_randnew.mcfunction delete mode 100644 data/math/functions/graph/_ssnew.mcfunction delete mode 100644 data/math/functions/graph/_store.mcfunction delete mode 100644 data/math/functions/graph/display/_off.mcfunction delete mode 100644 data/math/functions/graph/display/_phyx.mcfunction delete mode 100644 data/math/functions/graph/display/_plane.mcfunction delete mode 100644 data/math/functions/graph/display/init.mcfunction delete mode 100644 data/math/functions/graph/display/line.mcfunction delete mode 100644 data/math/functions/graph/display/loop.mcfunction delete mode 100644 data/math/functions/graph/display/off.mcfunction delete mode 100644 data/math/functions/graph/display/off_loop.mcfunction delete mode 100644 data/math/functions/graph/display/phyx_lloop.mcfunction delete mode 100644 data/math/functions/graph/display/phyx_loop.mcfunction delete mode 100644 data/math/functions/graph/display/phyx_ploop.mcfunction delete mode 100644 data/math/functions/graph/display/phyx_sloop.mcfunction delete mode 100644 data/math/functions/graph/display/plane_loop.mcfunction delete mode 100644 data/math/functions/graph/display/set.mcfunction delete mode 100644 data/math/functions/graph/display/set_psg.mcfunction delete mode 100644 data/math/functions/graph/display/sloop.mcfunction delete mode 100644 data/math/functions/graph/doc.txt delete mode 100644 data/math/functions/graph/init.mcfunction delete mode 100644 data/math/functions/graph/main.mcfunction delete mode 100644 data/math/functions/graph/main_loop.mcfunction delete mode 100644 data/math/functions/graph/main_sloop.mcfunction delete mode 100644 data/math/functions/graph/main_ssloop.mcfunction delete mode 100644 data/math/functions/graph/randnew/loop.mcfunction delete mode 100644 data/math/functions/graph/randnew/pre_loop.mcfunction delete mode 100644 data/math/functions/graph/randnew/sloop.mcfunction delete mode 100644 data/math/functions/graph/test.mcfunction delete mode 100644 data/math/functions/graph/test/run.mcfunction delete mode 100644 data/math/functions/graph/test/run0.mcfunction delete mode 100644 data/math/functions/graph/test/run1.mcfunction delete mode 100644 data/math/functions/graph/test/run2.mcfunction delete mode 100644 data/math/functions/graph/test/run3.mcfunction create mode 100644 data/math/functions/init_overworld.mcfunction create mode 100644 data/math/functions/marker/_math.mcfunction create mode 100644 data/math/functions/marker/_origin.mcfunction create mode 100644 data/math/functions/marker/_return.mcfunction create mode 100644 data/math/functions/marker/_sign.mcfunction create mode 100644 data/math/functions/marker/_uuid.mcfunction delete mode 100644 data/math/functions/math_marker.mcfunction create mode 100644 data/math/functions/obj_entity/_new.mcfunction create mode 100644 data/math/functions/obj_entity/set.mcfunction create mode 100644 data/math/functions/set/_append.mcfunction delete mode 100644 data/math/functions/set/_diff.mcfunction delete mode 100644 data/math/functions/set/_ex-string.mcfunction delete mode 100644 data/math/functions/set/_issetof.mcfunction create mode 100644 data/math/functions/set/_ssnew.mcfunction delete mode 100644 data/math/functions/set/_tagsdiff.mcfunction delete mode 100644 data/math/functions/set/_tagsof.mcfunction create mode 100644 data/math/functions/set/append_success.mcfunction delete mode 100644 data/math/functions/set/diff_loop.mcfunction delete mode 100644 data/math/functions/set/string_loop.mcfunction delete mode 100644 data/math/functions/set/tagsdiff_loop.mcfunction delete mode 100644 data/math/functions/test.mcf delete mode 100644 data/math/functions/test/aecbox.mcfunction delete mode 100644 data/math/functions/test/cbox.mcfunction delete mode 100644 data/math/functions/test/cbox_dsp.mcfunction delete mode 100644 data/math/functions/test/cbox_vanilla.mcfunction delete mode 100644 data/math/functions/test/circle.mcfunction delete mode 100644 data/math/functions/test/cube.mcfunction delete mode 100644 data/math/functions/test/cube_loop.mcfunction delete mode 100644 data/math/functions/test/dcmd.mcfunction delete mode 100644 data/math/functions/test/dfs.mcfunction delete mode 100644 data/math/functions/test/dfs_call.mcfunction delete mode 100644 data/math/functions/test/entity_cnt.mcfunction delete mode 100644 data/math/functions/test/entity_loop.mcfunction delete mode 100644 data/math/functions/test/f0.mcfunction delete mode 100644 data/math/functions/test/facing.mcfunction delete mode 100644 data/math/functions/test/float.mcfunction delete mode 100644 data/math/functions/test/get_ijk.mcfunction delete mode 100644 data/math/functions/test/get_sincos.mcfunction delete mode 100644 data/math/functions/test/hanoi/call.mcfunction delete mode 100644 data/math/functions/test/hanoi/next.mcfunction delete mode 100644 data/math/functions/test/hanoi/print.mcfunction delete mode 100644 data/math/functions/test/hanoi/rec.mcfunction delete mode 100644 data/math/functions/test/init.mcfunction delete mode 100644 data/math/functions/test/kill_another.mcfunction delete mode 100644 data/math/functions/test/kill_each_other.mcfunction delete mode 100644 data/math/functions/test/line.mcfunction delete mode 100644 data/math/functions/test/line_loop.mcfunction delete mode 100644 data/math/functions/test/loop.mcfunction delete mode 100644 data/math/functions/test/loop0.mcfunction delete mode 100644 data/math/functions/test/loop1.mcfunction delete mode 100644 data/math/functions/test/loop2.mcfunction delete mode 100644 data/math/functions/test/loop3.mcfunction delete mode 100644 data/math/functions/test/loop4.mcfunction delete mode 100644 data/math/functions/test/mine.mcfunction delete mode 100644 data/math/functions/test/move.mcfunction delete mode 100644 data/math/functions/test/move_loop.mcfunction delete mode 100644 data/math/functions/test/new.mcfunction delete mode 100644 data/math/functions/test/new_rot.mcfunction delete mode 100644 data/math/functions/test/new_rot_cal.mcfunction delete mode 100644 data/math/functions/test/new_rot_init.mcfunction delete mode 100644 data/math/functions/test/origin.mcfunction delete mode 100644 data/math/functions/test/prepend_loop.mcfunction delete mode 100644 data/math/functions/test/rand_uvec.mcfunction delete mode 100644 data/math/functions/test/run0.mcfunction delete mode 100644 data/math/functions/test/run1.mcfunction delete mode 100644 data/math/functions/test/run2.mcfunction delete mode 100644 data/math/functions/test/run3.mcfunction delete mode 100644 data/math/functions/test/set.mcfunction delete mode 100644 data/math/functions/test/set_cb.mcfunction delete mode 100644 data/math/functions/test/sqrt.mcfunction delete mode 100644 data/math/functions/test/uuid.mcfunction delete mode 100644 data/math/functions/test/uv_topos.mcfunction delete mode 100644 data/math/functions/test/void.mcfunction delete mode 100644 data/minecraft/advancements/crc.json delete mode 100644 data/minecraft/tags/items/all.json diff --git a/data/math/functions/3vec/_coordto.mcfunction b/data/math/functions/3vec/_coordto.mcfunction index 6e099d9..80cf34b 100644 --- a/data/math/functions/3vec/_coordto.mcfunction +++ b/data/math/functions/3vec/_coordto.mcfunction @@ -1,8 +1,9 @@ #math:3vec/_coordto -#转换函数：将执行坐标转换为3vec -#需要传入世界实体为执行者 -#输入：执行坐标 -#输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 转换函数：将执行坐标转换为3vec +# 需要传入世界实体为执行者 +# 输入：执行坐标 +# 输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} + tp @s ~ ~ ~ execute store result score 3vec_x int run data get entity @s Pos[0] 10000 execute store result score 3vec_y int run data get entity @s Pos[1] 10000 diff --git a/data/math/functions/3vec/_dsp-ex.mcfunction b/data/math/functions/3vec/_dsp-ex.mcfunction index 283c6ea..cd5ad07 100644 --- a/data/math/functions/3vec/_dsp-ex.mcfunction +++ b/data/math/functions/3vec/_dsp-ex.mcfunction @@ -1,6 +1,7 @@ #math:3vec/_dsp-ex -#扩展函数：对3vec进行球坐标属性扩展，并对3vec进行粒子显示 -#需要传入世界实体为执行者 -#输入：,3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_n,int>} +# 扩展函数：对3vec进行球坐标属性扩展，并对3vec进行粒子显示 +# 需要传入世界实体为执行者 +# 输入：,3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_n,int>} + function math:3vec/_ex-rot function math:3vec/_dsp \ No newline at end of file diff --git a/data/math/functions/3vec/_dsp.mcfunction b/data/math/functions/3vec/_dsp.mcfunction index d067cd2..68881f6 100644 --- a/data/math/functions/3vec/_dsp.mcfunction +++ b/data/math/functions/3vec/_dsp.mcfunction @@ -1,7 +1,8 @@ #math:3vec/_dsp -#对3vec进行粒子显示 -#需要传入世界实体为执行者 -#输入：,3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_n,int>,<3vec_l,int>} +# 对3vec进行粒子显示 +# 需要传入世界实体为执行者 +# 输入：,3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_n,int>,<3vec_l,int>} + execute store result entity @s Pos[0] double 0.0001 run scoreboard players operation stemp0 int = 3vec_x int execute store result entity @s Pos[1] double 0.0001 run scoreboard players operation stemp1 int = 3vec_y int execute store result entity @s Pos[2] double 0.0001 run scoreboard players operation stemp2 int = 3vec_z int diff --git a/data/math/functions/3vec/_ex-len.mcfunction b/data/math/functions/3vec/_ex-len.mcfunction index 7f571b4..1f1441a 100644 --- a/data/math/functions/3vec/_ex-len.mcfunction +++ b/data/math/functions/3vec/_ex-len.mcfunction @@ -1,7 +1,7 @@ #math:3vec/_ex-rot -#扩展函数：对3vec进行长度属性扩展 -#输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} -#输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_l,int>} +# 扩展函数：对3vec进行长度属性扩展 +# 输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_l,int>} scoreboard players operation stempx int = 3vec_x int scoreboard players operation stempy int = 3vec_y int diff --git a/data/math/functions/3vec/_ex-rot.mcfunction b/data/math/functions/3vec/_ex-rot.mcfunction index 9e5db5d..6e7c676 100644 --- a/data/math/functions/3vec/_ex-rot.mcfunction +++ b/data/math/functions/3vec/_ex-rot.mcfunction @@ -1,7 +1,8 @@ #math:3vec/_ex-rot -#扩展函数：对3vec进行球坐标属性扩展 -#输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} -#输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} +# 扩展函数：对3vec进行球坐标属性扩展 +# 输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} + #获得单位方向向量以及朝向 execute store result entity @s Pos[0] double 0.0001 run scoreboard players get 3vec_x int execute store result entity @s Pos[1] double 0.0001 run scoreboard players get 3vec_y int diff --git a/data/math/functions/3vec/_ex-xyz.mcfunction b/data/math/functions/3vec/_ex-xyz.mcfunction index b2d644e..ea15077 100644 --- a/data/math/functions/3vec/_ex-xyz.mcfunction +++ b/data/math/functions/3vec/_ex-xyz.mcfunction @@ -1,7 +1,8 @@ #math:3vec/_ex-xyz -#扩展函数：对3vec进行直角坐标属性扩展 -#输入：3vec{<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} -#输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} +# 扩展函数：对3vec进行直角坐标属性扩展 +# 输入：3vec{<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} +# 输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_rot0,int>,<3vec_rot1,int>,<3vec_l,int>} + #获得单位方向向量 execute store result entity @s Rotation[0] float 0.0001 run scoreboard players get 3vec_rot0 int execute store result entity @s Rotation[1] float 0.0001 run scoreboard players get 3vec_rot1 int diff --git a/data/math/functions/3vec/_ldsp.mcfunction b/data/math/functions/3vec/_ldsp.mcfunction index 107c89c..e34a37b 100644 --- a/data/math/functions/3vec/_ldsp.mcfunction +++ b/data/math/functions/3vec/_ldsp.mcfunction @@ -1,6 +1,7 @@ #math:3vec/_ldsp -#对3vec进行无箭头粒子显示 -#需要传入世界实体为执行者 +# 对3vec进行无箭头粒子显示 +# 需要传入世界实体为执行者 + #输入：,3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>,<3vec_n,int>,<3vec_l,int>} execute store result entity @s Pos[0] double 0.0001 run scoreboard players operation stemp0 int = 3vec_x int execute store result entity @s Pos[1] double 0.0001 run scoreboard players operation stemp1 int = 3vec_y int diff --git a/data/math/functions/3vec/_polar.mcfunction b/data/math/functions/3vec/_polar.mcfunction index e5ad106..b7a700c 100644 --- a/data/math/functions/3vec/_polar.mcfunction +++ b/data/math/functions/3vec/_polar.mcfunction @@ -1,4 +1,14 @@ #math:3vec/_polar +# 规整化三维向量 +# 输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 输出：正方体半边长到 +# 输出：规整化后的三维向量{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 输出：筛离出的平面表面坐标{<@s,3vec_x>,<@s,3vec_y>,<@s,3vec_z>} +# 为避免顶点或者边上的情况被规整化为(1,1,1)或(1,1,0)，可以在外部使用以下命令: +# execute if score 3vec_x int = 3vec_z int run scoreboard players set 3vec_x int 0 +# execute if score 3vec_x int = 3vec_y int run scoreboard players set 3vec_x int 0 +# execute if score 3vec_y int = 3vec_z int run scoreboard players set 3vec_y int 0 + execute store result score @s 3vec_x run scoreboard players operation stempx int = 3vec_x int execute store result score @s 3vec_y run scoreboard players operation stempy int = 3vec_y int execute store result score @s 3vec_z run scoreboard players operation stempz int = 3vec_z int diff --git a/data/math/functions/3vec/_posto.mcfunction b/data/math/functions/3vec/_posto.mcfunction index 4197403..d21e029 100644 --- a/data/math/functions/3vec/_posto.mcfunction +++ b/data/math/functions/3vec/_posto.mcfunction @@ -1,7 +1,8 @@ #math:3vec/_posto -#转换函数：将执行者坐标转换为3vec -#输入：执行者坐标 -#输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 转换函数：将执行者坐标转换为3vec +# 输入：执行者坐标 +# 输出：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} + execute store result score 3vec_x int run data get entity @s Pos[0] 10000 execute store result score 3vec_y int run data get entity @s Pos[1] 10000 execute store result score 3vec_z int run data get entity @s Pos[2] 10000 diff --git a/data/math/functions/3vec/_topos.mcfunction b/data/math/functions/3vec/_topos.mcfunction index bfc6445..d2f44ec 100644 --- a/data/math/functions/3vec/_topos.mcfunction +++ b/data/math/functions/3vec/_topos.mcfunction @@ -1,7 +1,8 @@ #math:3vec/_topos -#转换函数：将3vec转换为执行者坐标 -#输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} -#输出：执行者坐标 +# 转换函数：将3vec转换为执行者坐标 +# 输入：3vec{<3vec_x,int>,<3vec_y,int>,<3vec_z,int>} +# 输出：执行者坐标 + scoreboard players operation stempx int = x int scoreboard players operation stempy int = y int scoreboard players operation stempz int = z int diff --git a/data/math/functions/4d/_dsp.mcfunction b/data/math/functions/4d/_dsp.mcfunction deleted file mode 100644 index e3563f5..0000000 --- a/data/math/functions/4d/_dsp.mcfunction +++ /dev/null @@ -1,47 +0,0 @@ -#执行环境 -execute facing entity @p eyes positioned ^ ^-2.0 ^ run tp @s ~ ~ ~ ~ ~ -data modify storage dcmd:io run_space.rot set from entity @s Rotation -data modify storage dcmd:io run_space.pos set from entity @s Pos -function dcmd:_reset - -#初始化 -data modify storage dcmd:io input.strings set value ["kill @e[tag=4d_display]"] -data modify storage dcmd:io input.strings append value "data modify entity @e[tag=math_marker,limit=1] Pos set from storage dcmd:io run_space.pos" -data modify storage dcmd:io input.strings append value "data modify entity @e[tag=math_marker,limit=1] Rotation set from storage dcmd:io run_space.rot" -function dcmd:_static - -#中心 -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:marker ^ ^2.6 ^ {Tags:[4d_display,center],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#背景板 -data modify storage dcmd:io input.return set value "execute as @e[tag=textboard,limit=1] run function math:4d/textboard" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:text_display ~ ~ ~ {Tags:[4d_display,textboard],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#横坐标轴 -data modify storage dcmd:io input.return set value "execute as @e[tag=arrow0,limit=1] run function math:4d/arrow0" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:text_display ^-0.5 ^-0.4 ^0.1 {Tags:[4d_display,arrow0],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#纵坐标轴 -data modify storage dcmd:io input.return set value "execute as @e[tag=arrow1,limit=1] run function math:4d/arrow1" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:text_display ^-1.5 ^2.2 ^0.1 {Tags:[4d_display,arrow1],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#横坐标标签 -data modify storage dcmd:io input.return set value "execute as @e[tag=text0,limit=1] run function math:4d/text0" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:text_display ^2.1 ^0.0 ^0.1 {Tags:[4d_display,text0],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#纵坐标标签 -data modify storage dcmd:io input.return set value "execute as @e[tag=text1,limit=1] run function math:4d/text1" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:text_display ^-2.35 ^4.1 ^0.1 {Tags:[4d_display,text1],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -#指针 -data modify storage dcmd:io input.return set value "execute as @e[tag=arrow,limit=1] run function math:4d/arrow" -data modify storage dcmd:io input.strings set value ['[{"text":"execute at @e[tag=math_marker,limit=1] run summon minecraft:item_display ^ ^2.5 ^0.1 {Tags:[4d_display,arrow],Rotation:"},{"nbt":"run_space.rot","storage":"dcmd:io"},{"text":"}"}]'] -function dcmd:_exec - -function dcmd:_new \ No newline at end of file diff --git a/data/math/functions/4d/_init.mcfunction b/data/math/functions/4d/_init.mcfunction deleted file mode 100644 index 9809730..0000000 --- a/data/math/functions/4d/_init.mcfunction +++ /dev/null @@ -1,39 +0,0 @@ -#初始化 -data modify storage math:io 4d.charts set value [{},{},{}] -data modify storage math:io 4d.charts[0] set value {id:"w-xyz",char0:'{"text":"xyz"}',char1:'{"text":"w"}',angle:0.0f} -data modify storage math:io 4d.charts[1] set value {id:"z-xy",char0:'{"text":"xy"}',char1:'{"text":"z"}',angle:0.0f} -data modify storage math:io 4d.charts[2] set value {id:"y-x",char0:'{"text":"x"}',char1:'{"text":"y"}',angle:0.0f} - -data modify storage math:io 4d.points set value [] - -scoreboard players set 4d_running int 0 - -function math:4d/ui_items - -scoreboard players set x int 8000 -scoreboard players set y int -48000 -scoreboard players set z int 8000 - -function math:4d/buttons/upd - -data modify storage math:io 4d.titles set value [] -data modify storage math:io 4d.titles append value '{"text":"懒人专用字幕_(:з」∠)_"}' -data modify storage math:io 4d.titles append value '{"text":"我们来观察四维物体的三维投影"}' -data modify storage math:io 4d.titles append value '{"text":"这里投影使用的是点光源"}' -data modify storage math:io 4d.titles append value '{"text":"摄像机是我们所在的三维空间"}' -data modify storage math:io 4d.titles append value '{"text":"也即四维空间中的一个超平面"}' -data modify storage math:io 4d.titles append value '{"text":"摄像机与点光源固定在超球的直径两端"}' -data modify storage math:io 4d.titles append value '{"text":"摄像机的法向沿着直径"}' -data modify storage math:io 4d.titles append value '{"text":"这是用23w06a版本display实体做的GUI"}' -data modify storage math:io 4d.titles append value '{"text":"调整它的箭头可以调整摄像机在超球面的相位"}' -data modify storage math:io 4d.titles append value '{"text":"先生成一个超立方体投影看看"}' -data modify storage math:io 4d.titles append value '{"text":"调整投影方向"}' -data modify storage math:io 4d.titles append value '{"text":"方向旋转90°后得到的投影是不变的"}' -data modify storage math:io 4d.titles append value '{"text":"调整绘制速率可以观察扫描过程"}' -data modify storage math:io 4d.titles append value '{"text":"然后是四维的正五胞体"}' -data modify storage math:io 4d.titles append value '{"text":"投影方向旋转90°可以得到正四面体"}' -data modify storage math:io 4d.titles append value '{"text":"最后看看超球球面的投影"}' -data modify storage math:io 4d.titles append value '{"text":"旋转投影方向"}' -data modify storage math:io 4d.titles append value '{"text":"还可以控制四维物体的平移"}' -data modify storage math:io 4d.titles append value '{"text":"例如离摄像机更近后投影会变大"}' -data modify storage math:io 4d.titles append value '{"text":"Thanks for watching！","color":"green"}' \ No newline at end of file diff --git a/data/math/functions/4d/_title.mcfunction b/data/math/functions/4d/_title.mcfunction deleted file mode 100644 index 62c2d86..0000000 --- a/data/math/functions/4d/_title.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:4d/_title -title @s title {"text":""} -title @s subtitle {"nbt":"4d.titles[0]","storage":"math:io","interpret":true} -#列表迭代 -data modify storage math:io 4d.titles append from storage math:io 4d.titles[0] -data remove storage math:io 4d.titles[0] \ No newline at end of file diff --git a/data/math/functions/4d/arrow.mcfunction b/data/math/functions/4d/arrow.mcfunction deleted file mode 100644 index 4df5b2f..0000000 --- a/data/math/functions/4d/arrow.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -data modify entity @s item set value {id:"minecraft:arrow",Count:1b} -data modify entity @s transformation.scale set value [3.0f,3.0f,0.1f] - -data modify storage math:io temp set value {axis:[0.0f,0.0f,1.0f],angle:0.0f} -execute store result score temp int run data get storage math:io 4d.charts[0].angle 10000 -execute store result storage math:io temp.angle float 0.0001 run scoreboard players remove temp int 23562 -data modify entity @s transformation.left_rotation set from storage math:io temp - -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/arrow0.mcfunction b/data/math/functions/4d/arrow0.mcfunction deleted file mode 100644 index b3d56cd..0000000 --- a/data/math/functions/4d/arrow0.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -data modify entity @s background set value 0 -data modify entity @s text set value '{"text":"------>"}' -data modify entity @s transformation.scale set value [6.0f,6.0f,0.1f] -data modify entity @s alignment set value "left" -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/arrow1.mcfunction b/data/math/functions/4d/arrow1.mcfunction deleted file mode 100644 index 0c7b130..0000000 --- a/data/math/functions/4d/arrow1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -data modify entity @s background set value 0 -data modify entity @s text set value '{"text":"------>"}' -data modify entity @s transformation.scale set value [6.0f,6.0f,0.1f] -data modify entity @s transformation.left_rotation set value [0.0f,0.0f,0.7071f,0.7071f] -data modify entity @s alignment set value "left" -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/buttons/facing.mcfunction b/data/math/functions/4d/buttons/facing.mcfunction deleted file mode 100644 index 4ebda09..0000000 --- a/data/math/functions/4d/buttons/facing.mcfunction +++ /dev/null @@ -1,102 +0,0 @@ -#圆心 -execute at @e[tag=center,limit=1] run particle minecraft:flame ^ ^ ^0.2 0.0 0.0 0.0 0.0 1 force @a - -#坐标和法向获取 -execute at @e[tag=center,limit=1] run tp @s ~ ~ ~ -execute store result score tempx0 int run data get entity @s Pos[0] 1000 -execute store result score tempy0 int run data get entity @s Pos[1] 1000 -execute store result score tempz0 int run data get entity @s Pos[2] 1000 - -execute at @e[tag=center,limit=1] positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score tempf0 int run data get entity @s Pos[0] 1000 -execute store result score tempf1 int run data get entity @s Pos[1] 1000 -execute store result score tempf2 int run data get entity @s Pos[2] 1000 - -tp @s ~ ~ ~ -execute store result score tempx int run data get entity @s Pos[0] 1000 -execute store result score tempy int run data get entity @s Pos[1] 1000 -execute store result score tempz int run data get entity @s Pos[2] 1000 - -execute positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score tempv0 int run data get entity @s Pos[0] 1000 -execute store result score tempv1 int run data get entity @s Pos[1] 1000 -execute store result score tempv2 int run data get entity @s Pos[2] 1000 - -scoreboard players operation tempx int -= tempx0 int -scoreboard players operation tempy int -= tempy0 int -scoreboard players operation tempz int -= tempz0 int - -#计算参数t -scoreboard players operation res int = tempx int -scoreboard players operation res int *= tempf0 int -scoreboard players operation temp0 int = tempy int -scoreboard players operation temp0 int *= tempf1 int -scoreboard players operation res int += temp0 int -scoreboard players operation temp0 int = tempz int -scoreboard players operation temp0 int *= tempf2 int -scoreboard players operation res int += temp0 int - -scoreboard players operation inp int = tempv0 int -scoreboard players operation inp int *= tempf0 int -scoreboard players operation temp0 int = tempv1 int -scoreboard players operation temp0 int *= tempf1 int -scoreboard players operation inp int += temp0 int -scoreboard players operation temp0 int = tempv2 int -scoreboard players operation temp0 int *= tempf2 int -scoreboard players operation inp int += temp0 int - -function math:hpo/_3div - -#算得交点坐标 -scoreboard players operation tempv0 int *= res int -scoreboard players operation tempv1 int *= res int -scoreboard players operation tempv2 int *= res int -scoreboard players operation tempv0 int /= 1000 int -scoreboard players operation tempv1 int /= 1000 int -scoreboard players operation tempv2 int /= 1000 int - -execute store result entity @s Pos[0] double 0.001 run scoreboard players operation tempx int -= tempv0 int -execute store result entity @s Pos[1] double 0.001 run scoreboard players operation tempy int -= tempv1 int -execute store result entity @s Pos[2] double 0.001 run scoreboard players operation tempz int -= tempv2 int - -execute positioned 0.0 0.0 0.0 facing entity @s feet run tp @s ^ ^ ^2.0 -execute store result score tempx int run data get entity @s Pos[0] 1000 -execute store result score tempy int run data get entity @s Pos[1] 1000 -execute store result score tempz int run data get entity @s Pos[2] 1000 - -execute store result entity @s Pos[0] double 0.001 run scoreboard players operation tempx0 int += tempx int -execute store result entity @s Pos[1] double 0.001 run scoreboard players operation tempy0 int += tempy int -execute store result entity @s Pos[2] double 0.001 run scoreboard players operation tempz0 int += tempz int -execute at @s rotated as @e[tag=center,limit=1] run particle flame ^ ^ ^0.2 0.0 0.0 0.0 0.0 1 force @a - -#局部坐标 -execute at @e[tag=center,limit=1] positioned 0.0 0.0 0.0 run tp @s ^1.0 ^ ^ -execute store result score tempi0 int run data get entity @s Pos[0] 1000 -execute store result score tempi2 int run data get entity @s Pos[2] 1000 -execute at @e[tag=center,limit=1] positioned 0.0 0.0 0.0 run tp @s ^ ^1.0 ^ -execute store result score tempj0 int run data get entity @s Pos[0] 1000 -execute store result score tempj1 int run data get entity @s Pos[1] 1000 -execute store result score tempj2 int run data get entity @s Pos[2] 1000 - -scoreboard players operation tempu int = tempx int -scoreboard players operation tempu int *= tempi0 int -scoreboard players operation temp0 int = tempz int -scoreboard players operation temp0 int *= tempi2 int -execute store result entity @s Pos[2] double 0.000001 run scoreboard players operation tempu int += temp0 int - -scoreboard players operation tempv int = tempx int -scoreboard players operation tempv int *= tempj0 int -scoreboard players operation temp0 int = tempy int -scoreboard players operation temp0 int *= tempj1 int -scoreboard players operation tempv int += temp0 int -scoreboard players operation temp0 int = tempz int -scoreboard players operation temp0 int *= tempj2 int -execute store result entity @s Pos[0] double 0.000001 run scoreboard players operation tempv int += temp0 int - -execute positioned 0.0 0.0 0.0 facing entity @s feet rotated ~ 0.0 run tp @s ~ ~ ~ ~ 0.0 - -data modify storage math:io temp_rot set value {axis:[0.0f,0.0f,1.0f],angle:0.0f} -execute store result storage math:io 4d.charts[0].angle float 0.0001 store result score stemp int run data get entity @s Rotation[0] -174.5329 -#execute store result storage math:io temp_rot.angle float 0.0001 run scoreboard players remove stemp int 23562 -execute store result storage math:io temp_rot.angle float 0.0001 run scoreboard players add stemp int 54978 -data modify entity @e[tag=arrow,limit=1] transformation.left_rotation set from storage math:io temp_rot \ No newline at end of file diff --git a/data/math/functions/4d/buttons/reset.mcfunction b/data/math/functions/4d/buttons/reset.mcfunction deleted file mode 100644 index cd0162a..0000000 --- a/data/math/functions/4d/buttons/reset.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:4d/buttons/reset -scoreboard players set temp int 0 - -execute at @s run playsound minecraft:block.piston.extend player @s ~ ~ ~ 1.0 1.5 - -execute at @s anchored eyes positioned ^ ^ ^8 as @e[tag=math_marker,limit=1] run function math:4d/_dsp \ No newline at end of file diff --git a/data/math/functions/4d/buttons/reset_angle.mcfunction b/data/math/functions/4d/buttons/reset_angle.mcfunction deleted file mode 100644 index 9c3a825..0000000 --- a/data/math/functions/4d/buttons/reset_angle.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -execute store result storage math:io 4d.charts[{id:"w-xyz"}].angle float 0.0001 run data get storage math:io 4d.angles[0] 174.5329 -execute store result storage math:io 4d.charts[{id:"z-xy"}].angle float 0.0001 run data get storage math:io 4d.angles[1] 174.5329 -execute store result storage math:io 4d.charts[{id:"y-x"}].angle float 0.0001 run data get storage math:io 4d.angles[2] 174.5329 - -data remove storage math:io 4d.angles - -function math:4d/buttons/upd \ No newline at end of file diff --git a/data/math/functions/4d/buttons/switch0.mcfunction b/data/math/functions/4d/buttons/switch0.mcfunction deleted file mode 100644 index f104ff6..0000000 --- a/data/math/functions/4d/buttons/switch0.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#math:4d/buttons/switch0 - -execute at @s run playsound minecraft:block.lever.click player @s ~ ~ ~ 1.0 2.0 - -scoreboard players add 4d_running int 1 -scoreboard players operation 4d_running int %= 2 int - -scoreboard players set temp int 0 \ No newline at end of file diff --git a/data/math/functions/4d/buttons/switch1.mcfunction b/data/math/functions/4d/buttons/switch1.mcfunction deleted file mode 100644 index 095f37d..0000000 --- a/data/math/functions/4d/buttons/switch1.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#math:4d/buttons/switch1 - -execute at @s run playsound minecraft:block.lever.click player @s ~ ~ ~ 1.0 2.0 - -data modify storage math:io 4d.charts append from storage math:io 4d.charts[0] -data remove storage math:io 4d.charts[0] - -data modify storage math:io temp_rot set value {axis:[0.0f,0.0f,1.0f],angle:0.0f} -execute store result score stemp int run data get storage math:io 4d.charts[0].angle 10000 -execute store result storage math:io temp_rot.angle float 0.0001 run scoreboard players remove stemp int 23562 -data modify entity @e[tag=arrow,limit=1] transformation.left_rotation set from storage math:io temp_rot - -setblock 0 11 0 air -setblock 0 11 0 oak_sign{Text1:'{"nbt":"4d.charts[0].char0","storage":"math:io","interpret":true}'} -data modify entity @e[tag=text0,limit=1] text set from block 0 11 0 Text1 -data modify block 0 11 0 Text1 set value '{"nbt":"4d.charts[0].char1","storage":"math:io","interpret":true}' -data modify entity @e[tag=text1,limit=1] text set from block 0 11 0 Text1 - -scoreboard players set temp int 0 \ No newline at end of file diff --git a/data/math/functions/4d/buttons/upd.mcfunction b/data/math/functions/4d/buttons/upd.mcfunction deleted file mode 100644 index bf04b08..0000000 --- a/data/math/functions/4d/buttons/upd.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#math:4d/buttons/upd - -data modify storage math:io temp_rot set value {axis:[0.0f,0.0f,1.0f],angle:0.0f} -execute store result score stemp int run data get storage math:io 4d.charts[0].angle 10000 -execute store result storage math:io temp_rot.angle float 0.0001 run scoreboard players remove stemp int 23562 -data modify entity @e[tag=arrow,limit=1] transformation.left_rotation set from storage math:io temp_rot - -setblock 0 11 0 air -setblock 0 11 0 oak_sign{Text1:'{"nbt":"4d.charts[0].char0","storage":"math:io","interpret":true}'} -data modify entity @e[tag=text0,limit=1] text set from block 0 11 0 Text1 -data modify block 0 11 0 Text1 set value '{"nbt":"4d.charts[0].char1","storage":"math:io","interpret":true}' -data modify entity @e[tag=text1,limit=1] text set from block 0 11 0 Text1 - -scoreboard players set temp int 0 \ No newline at end of file diff --git a/data/math/functions/4d/crc.mcfunction b/data/math/functions/4d/crc.mcfunction deleted file mode 100644 index bbe67e0..0000000 --- a/data/math/functions/4d/crc.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -execute at @s anchored eyes positioned ^ ^ ^ as @e[tag=math_marker,limit=1] run function math:4d/buttons/facing -advancement revoke @s only crc \ No newline at end of file diff --git a/data/math/functions/4d/get_ijk.mcfunction b/data/math/functions/4d/get_ijk.mcfunction deleted file mode 100644 index a257721..0000000 --- a/data/math/functions/4d/get_ijk.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -tp @s ^ ^ ^1.0 -execute store result score tempk0 int run data get entity @s Pos[2] 10000 -execute store result score tempk1 int run data get entity @s Pos[0] 10000 -execute store result score tempk2 int run data get entity @s Pos[1] 10000 -scoreboard players operation tempk0 int *= cos int -scoreboard players operation tempk1 int *= cos int -scoreboard players operation tempk2 int *= cos int -scoreboard players operation tempk0 int /= 100000 int -scoreboard players operation tempk1 int /= 100000 int -scoreboard players operation tempk2 int /= 100000 int - -#tellraw @a {"text":"---"} -#tellraw @a [{"text":"k:"},{"score":{"name":"tempk0","objective":"int"}},{"text":","},{"score":{"name":"tempk1","objective":"int"}},{"text":","},{"score":{"name":"tempk2","objective":"int"}},{"text":","},{"score":{"name":"tempk3","objective":"int"}}] - -tp @s ^ ^1.0 ^ -execute store result score tempj0 int run data get entity @s Pos[2] 1000 -execute store result score tempj1 int run data get entity @s Pos[0] 1000 -execute store result score tempj2 int run data get entity @s Pos[1] 1000 - -tp @s ^1.0 ^ ^ -execute store result score tempi0 int run data get entity @s Pos[2] 1000 -execute store result score tempi1 int run data get entity @s Pos[0] 1000 \ No newline at end of file diff --git a/data/math/functions/4d/loop.mcfunction b/data/math/functions/4d/loop.mcfunction deleted file mode 100644 index 4ec5d2c..0000000 --- a/data/math/functions/4d/loop.mcfunction +++ /dev/null @@ -1,86 +0,0 @@ -#投影 -execute store result score inp int run data get storage math:io 4d.points[0][0] 1000 -execute store result score tempx1 int run data get storage math:io 4d.points[0][1] 1000 -execute store result score tempx2 int run data get storage math:io 4d.points[0][2] 1000 -execute store result score tempx3 int run data get storage math:io 4d.points[0][3] 1000 -scoreboard players operation inp int += offset_x int -scoreboard players operation tempx1 int += offset_y int -scoreboard players operation tempx2 int += offset_z int -scoreboard players operation tempx3 int += offset_w int - -scoreboard players operation inp int -= tempp0 int -scoreboard players operation tempx1 int -= tempp1 int -scoreboard players operation tempx2 int -= tempp2 int -scoreboard players operation tempx3 int -= tempp3 int - -scoreboard players operation tempv0 int = inp int -scoreboard players operation tempv1 int = tempx1 int -scoreboard players operation tempv2 int = tempx2 int -scoreboard players operation tempv3 int = tempx3 int -#tellraw @a {"text":"---"} -#tellraw @a [{"text":"v:"},{"score":{"name":"tempv0","objective":"int"}},{"text":","},{"score":{"name":"tempv1","objective":"int"}},{"text":","},{"score":{"name":"tempv2","objective":"int"}},{"text":","},{"score":{"name":"tempv3","objective":"int"}}] - -scoreboard players operation inp int *= tempp0 int -scoreboard players operation tempx1 int *= tempp1 int -scoreboard players operation tempx2 int *= tempp2 int -scoreboard players operation tempx3 int *= tempp3 int -scoreboard players operation inp int += tempx1 int -scoreboard players operation inp int += tempx2 int -scoreboard players operation inp int += tempx3 int -scoreboard players operation res int = 2tempp int -function math:hpo/_3div -#tellraw @a [{"text":"res:"},{"score":{"name":"res","objective":"int"}}] - -scoreboard players operation tempv0 int *= res int -scoreboard players operation tempv1 int *= res int -scoreboard players operation tempv2 int *= res int -scoreboard players operation tempv3 int *= res int -scoreboard players operation tempv0 int /= 1000 int -scoreboard players operation tempv1 int /= 1000 int -scoreboard players operation tempv2 int /= 1000 int -scoreboard players operation tempv3 int /= 1000 int -#tellraw @a [{"text":"p:"},{"score":{"name":"tempp0","objective":"int"}},{"text":","},{"score":{"name":"tempp1","objective":"int"}},{"text":","},{"score":{"name":"tempp2","objective":"int"}},{"text":","},{"score":{"name":"tempp3","objective":"int"}}] -scoreboard players operation tempv0 int += tempp0 int -scoreboard players operation tempv1 int += tempp1 int -scoreboard players operation tempv2 int += tempp2 int -scoreboard players operation tempv3 int += tempp3 int -scoreboard players operation tempv0 int += tempp0 int -scoreboard players operation tempv1 int += tempp1 int -scoreboard players operation tempv2 int += tempp2 int -scoreboard players operation tempv3 int += tempp3 int - -scoreboard players operation stempx int = tempv0 int -scoreboard players operation stempx int *= tempi0 int -scoreboard players operation stemp0 int = tempv1 int -scoreboard players operation stemp0 int *= tempi1 int -scoreboard players operation stempx int += stemp0 int -scoreboard players operation stempx int /= 1000 int -execute store result entity @s Pos[0] double 0.001 run scoreboard players operation stempx int += x int - -scoreboard players operation stempy int = tempv0 int -scoreboard players operation stempy int *= tempj0 int -scoreboard players operation stemp0 int = tempv1 int -scoreboard players operation stemp0 int *= tempj1 int -scoreboard players operation stempy int += stemp0 int -scoreboard players operation stemp0 int = tempv2 int -scoreboard players operation stemp0 int *= tempj2 int -scoreboard players operation stempy int += stemp0 int -scoreboard players operation stempy int /= 1000 int -execute store result entity @s Pos[1] double 0.001 run scoreboard players operation stempy int += y int - -scoreboard players operation stempz int = tempv0 int -scoreboard players operation stempz int *= tempk0 int -scoreboard players operation stemp0 int = tempv1 int -scoreboard players operation stemp0 int *= tempk1 int -scoreboard players operation stempz int += stemp0 int -scoreboard players operation stemp0 int = tempv2 int -scoreboard players operation stemp0 int *= tempk2 int -scoreboard players operation stempz int += stemp0 int -scoreboard players operation stemp0 int = tempv3 int -scoreboard players operation stemp0 int *= tempk3 int -scoreboard players operation stempz int += stemp0 int -scoreboard players operation stempz int /= 1000 int -#tellraw @a [{"text":"z:"},{"score":{"name":"stempz","objective":"int"}}] -execute store result entity @s Pos[2] double 0.001 run scoreboard players operation stempz int += z int - -execute at @s run function math:particle/_dsp \ No newline at end of file diff --git a/data/math/functions/4d/main.mcfunction b/data/math/functions/4d/main.mcfunction deleted file mode 100644 index 23d11f4..0000000 --- a/data/math/functions/4d/main.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -kill @e[type=item,nbt={Item:{tag:{ui:1b}}}] - -execute as @p run function math:4d/ui - -execute if data storage math:io 4d.angles run function math:4d/buttons/reset_angle - -execute if score 4d_running int matches 1 as @e[tag=math_marker,limit=1] run function math:4d/running \ No newline at end of file diff --git a/data/math/functions/4d/objects/_hypercube.mcfunction b/data/math/functions/4d/objects/_hypercube.mcfunction deleted file mode 100644 index 10a621c..0000000 --- a/data/math/functions/4d/objects/_hypercube.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ -data modify storage math:io 4d.points set value [] - -data modify storage math:io temp set value [[],[],[],[]] - -data modify storage math:io temp[0] append value [0.0f,3.0f,3.0f,3.0f] -data modify storage math:io temp[0] append value [0.0f,3.0f,3.0f,-3.0f] -data modify storage math:io temp[0] append value [0.0f,3.0f,-3.0f,3.0f] -data modify storage math:io temp[0] append value [0.0f,3.0f,-3.0f,-3.0f] -data modify storage math:io temp[0] append value [0.0f,-3.0f,3.0f,3.0f] -data modify storage math:io temp[0] append value [0.0f,-3.0f,3.0f,-3.0f] -data modify storage math:io temp[0] append value [0.0f,-3.0f,-3.0f,3.0f] -data modify storage math:io temp[0] append value [0.0f,-3.0f,-3.0f,-3.0f] - -data modify storage math:io temp[1] append value [3.0f,0.0f,3.0f,3.0f] -data modify storage math:io temp[1] append value [3.0f,0.0f,3.0f,-3.0f] -data modify storage math:io temp[1] append value [3.0f,0.0f,-3.0f,3.0f] -data modify storage math:io temp[1] append value [3.0f,0.0f,-3.0f,-3.0f] -data modify storage math:io temp[1] append value [-3.0f,0.0f,3.0f,3.0f] -data modify storage math:io temp[1] append value [-3.0f,0.0f,3.0f,-3.0f] -data modify storage math:io temp[1] append value [-3.0f,0.0f,-3.0f,3.0f] -data modify storage math:io temp[1] append value [-3.0f,0.0f,-3.0f,-3.0f] - -data modify storage math:io temp[2] append value [3.0f,3.0f,0.0f,3.0f] -data modify storage math:io temp[2] append value [3.0f,3.0f,0.0f,-3.0f] -data modify storage math:io temp[2] append value [3.0f,-3.0f,0.0f,3.0f] -data modify storage math:io temp[2] append value [3.0f,-3.0f,0.0f,-3.0f] -data modify storage math:io temp[2] append value [-3.0f,3.0f,0.0f,3.0f] -data modify storage math:io temp[2] append value [-3.0f,3.0f,0.0f,-3.0f] -data modify storage math:io temp[2] append value [-3.0f,-3.0f,0.0f,3.0f] -data modify storage math:io temp[2] append value [-3.0f,-3.0f,0.0f,-3.0f] - -data modify storage math:io temp[3] append value [3.0f,3.0f,3.0f,0.0f] -data modify storage math:io temp[3] append value [3.0f,3.0f,-3.0f,0.0f] -data modify storage math:io temp[3] append value [3.0f,-3.0f,3.0f,0.0f] -data modify storage math:io temp[3] append value [3.0f,-3.0f,-3.0f,0.0f] -data modify storage math:io temp[3] append value [-3.0f,3.0f,3.0f,0.0f] -data modify storage math:io temp[3] append value [-3.0f,3.0f,-3.0f,0.0f] -data modify storage math:io temp[3] append value [-3.0f,-3.0f,3.0f,0.0f] -data modify storage math:io temp[3] append value [-3.0f,-3.0f,-3.0f,0.0f] - -execute store result storage math:io temp[0][][0] float 0.1 store result storage math:io temp[1][][1] float 0.1 store result storage math:io temp[2][][2] float 0.1 store result storage math:io temp[3][][3] float 0.1 run scoreboard players set loop int -30 -execute if score loop int matches ..30 run function math:4d/objects/hypercube_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/_hypersphere.mcfunction b/data/math/functions/4d/objects/_hypersphere.mcfunction deleted file mode 100644 index f2e6216..0000000 --- a/data/math/functions/4d/objects/_hypersphere.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -data modify storage math:io 4d.points set value [] - -scoreboard players set loop int 11664 -execute if score loop int matches 1.. as @e[tag=math_marker,limit=1] run function math:4d/objects/hypersphere_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/_hypertetrahedron.mcfunction b/data/math/functions/4d/objects/_hypertetrahedron.mcfunction deleted file mode 100644 index aa500b7..0000000 --- a/data/math/functions/4d/objects/_hypertetrahedron.mcfunction +++ /dev/null @@ -1,76 +0,0 @@ -data modify storage math:io temp set value [] -data modify storage math:io temp append value [0.0,0.0,0.0,4.000000] -data modify storage math:io temp append value [0.0,0.0,3.872983,-1.000000] -data modify storage math:io temp append value [0.0,3.651484,-1.290994,-1.000000] -data modify storage math:io temp append value [3.162278,-1.825742,-1.290994,-1.000000] -data modify storage math:io temp append value [-3.162278,-1.825742,-1.290994,-1.000000] - -data modify storage math:io stemp set value [] - -scoreboard players set inp int 100 -data modify storage math:io input.start set value [0.0d,0.0d,0.0d,0.0d] - -data modify storage math:io input.end set from storage math:io temp[0] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.end set from storage math:io temp[1] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.end set from storage math:io temp[2] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.end set from storage math:io temp[3] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.end set from storage math:io temp[4] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.start set from storage math:io temp[0] -data modify storage math:io input.end set from storage math:io temp[1] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result -data modify storage math:io input.end set from storage math:io temp[2] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.start set from storage math:io temp[1] -data modify storage math:io input.end set from storage math:io temp[2] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result -data modify storage math:io input.end set from storage math:io temp[3] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.start set from storage math:io temp[2] -data modify storage math:io input.end set from storage math:io temp[3] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result -data modify storage math:io input.end set from storage math:io temp[4] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.start set from storage math:io temp[3] -data modify storage math:io input.end set from storage math:io temp[4] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result -data modify storage math:io input.end set from storage math:io temp[0] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io input.start set from storage math:io temp[4] -data modify storage math:io input.end set from storage math:io temp[0] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result -data modify storage math:io input.end set from storage math:io temp[1] -function math:4d/objects/line -data modify storage math:io stemp append from storage math:io result - -data modify storage math:io 4d.points set value [] - -scoreboard players operation loop int = inp int -execute if score loop int matches 1.. run function math:4d/objects/hypertetrahedron_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/hypercube_loop.mcfunction b/data/math/functions/4d/objects/hypercube_loop.mcfunction deleted file mode 100644 index 3ce2291..0000000 --- a/data/math/functions/4d/objects/hypercube_loop.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#描点 -data modify storage math:io 4d.points append from storage math:io temp[][] - -#递归迭代 -execute store result storage math:io temp[0][][0] float 0.1 store result storage math:io temp[1][][1] float 0.1 store result storage math:io temp[2][][2] float 0.1 store result storage math:io temp[3][][3] float 0.1 run scoreboard players add loop int 1 -execute if score loop int matches ..30 run function math:4d/objects/hypercube_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/hypersphere_loop.mcfunction b/data/math/functions/4d/objects/hypersphere_loop.mcfunction deleted file mode 100644 index 27f49d0..0000000 --- a/data/math/functions/4d/objects/hypersphere_loop.mcfunction +++ /dev/null @@ -1,30 +0,0 @@ -#计算坐标 -data modify storage math:io 4d.points prepend value [0.0f,0.0f,0.0f,0.0f] -scoreboard players operation temp0 int = loop int - -scoreboard players operation temp2 int = temp0 int -execute store result entity @s Rotation[0] float -10 run scoreboard players operation temp2 int %= 36 int -scoreboard players operation temp0 int /= 36 int - -scoreboard players operation temp1 int = temp0 int -scoreboard players operation temp1 int %= 18 int -execute store result entity @s Rotation[1] float -10 run scoreboard players remove temp1 int 9 - -execute at @s positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score tempx int run data get entity @s Pos[0] 1000 -execute store result score tempy int run data get entity @s Pos[1] 1000 -execute store result score tempz int run data get entity @s Pos[2] 1000 - -scoreboard players operation temp0 int /= 18 int -execute store result entity @s Rotation[0] float -10 run scoreboard players remove temp0 int 9 - -execute at @s positioned 0.0 0.0 0.0 rotated ~ 0.0 run tp @s ^ ^ ^5.0 -execute store result score cos int run data get entity @s Pos[2] 1000 -execute store result storage math:io 4d.points[0][3] float -0.001 run data get entity @s Pos[0] 1000 -execute store result storage math:io 4d.points[0][0] float -0.000001 run scoreboard players operation tempx int *= cos int -execute store result storage math:io 4d.points[0][1] float -0.000001 run scoreboard players operation tempy int *= cos int -execute store result storage math:io 4d.points[0][2] float -0.000001 run scoreboard players operation tempz int *= cos int - -#递归迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:4d/objects/hypersphere_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/hypertetrahedron_loop.mcfunction b/data/math/functions/4d/objects/hypertetrahedron_loop.mcfunction deleted file mode 100644 index f401da2..0000000 --- a/data/math/functions/4d/objects/hypertetrahedron_loop.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#描点 -data modify storage math:io 4d.points append from storage math:io stemp[][0] - -#递归迭代 -data remove storage math:io stemp[][0] -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:4d/objects/hypertetrahedron_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/line.mcfunction b/data/math/functions/4d/objects/line.mcfunction deleted file mode 100644 index 8b752ed..0000000 --- a/data/math/functions/4d/objects/line.mcfunction +++ /dev/null @@ -1,61 +0,0 @@ -#起始坐标 -execute store result score stempx int store result score stempx0 int run data get storage math:io input.start[0] 1000000 -scoreboard players operation stempx int /= 1000 int -scoreboard players operation stempx0 int %= 1000 int -execute store result score stempy int store result score stempy0 int run data get storage math:io input.start[1] 1000000 -scoreboard players operation stempy int /= 1000 int -scoreboard players operation stempy0 int %= 1000 int -execute store result score stempz int store result score stempz0 int run data get storage math:io input.start[2] 1000000 -scoreboard players operation stempz int /= 1000 int -scoreboard players operation stempz0 int %= 1000 int -execute store result score stempw int store result score stempw0 int run data get storage math:io input.start[3] 1000000 -scoreboard players operation stempw int /= 1000 int -scoreboard players operation stempw0 int %= 1000 int - -#中止坐标 -execute store result score stempdx int run data get storage math:io input.end[0] 1000 -execute store result score stempdy int run data get storage math:io input.end[1] 1000 -execute store result score stempdz int run data get storage math:io input.end[2] 1000 -execute store result score stempdw int run data get storage math:io input.end[3] 1000 - -#距离 -scoreboard players operation stempdx int -= stempx int -scoreboard players operation stempdy int -= stempy int -scoreboard players operation stempdz int -= stempz int -scoreboard players operation stempdw int -= stempw int - -scoreboard players operation stempdx int *= 1000 int -scoreboard players operation stempdy int *= 1000 int -scoreboard players operation stempdz int *= 1000 int -scoreboard players operation stempdw int *= 1000 int - -scoreboard players operation stempdx int /= inp int -scoreboard players operation stempdy int /= inp int -scoreboard players operation stempdz int /= inp int -scoreboard players operation stempdw int /= inp int - -scoreboard players operation stempdx0 int = stempdx int -scoreboard players operation stempdy0 int = stempdy int -scoreboard players operation stempdz0 int = stempdz int -scoreboard players operation stempdw0 int = stempdw int - -scoreboard players operation stempdx int /= 1000 int -scoreboard players operation stempdy int /= 1000 int -scoreboard players operation stempdz int /= 1000 int -scoreboard players operation stempdw int /= 1000 int - -scoreboard players operation stempdx0 int %= 1000 int -scoreboard players operation stempdy0 int %= 1000 int -scoreboard players operation stempdz0 int %= 1000 int -scoreboard players operation stempdw0 int %= 1000 int - -data modify storage math:io result set value [] - -#tellraw @a {"text":"---"} -#tellraw @a [{"text":"xyzw:"},{"score":{"name":"stempx","objective":"int"}},{"text":","},{"score":{"name":"stempy","objective":"int"}},{"text":","},{"score":{"name":"stempz","objective":"int"}},{"text":","},{"score":{"name":"stempw","objective":"int"}}] -#tellraw @a [{"text":"xyzw0:"},{"score":{"name":"stempx0","objective":"int"}},{"text":","},{"score":{"name":"stempy0","objective":"int"}},{"text":","},{"score":{"name":"stempz0","objective":"int"}},{"text":","},{"score":{"name":"stempw0","objective":"int"}}] -#tellraw @a [{"text":"dxyzw:"},{"score":{"name":"stempdx","objective":"int"}},{"text":","},{"score":{"name":"stempdy","objective":"int"}},{"text":","},{"score":{"name":"stempdz","objective":"int"}},{"text":","},{"score":{"name":"stempdw","objective":"int"}}] -#tellraw @a [{"text":"dxyzw0:"},{"score":{"name":"stempdx0","objective":"int"}},{"text":","},{"score":{"name":"stempdy0","objective":"int"}},{"text":","},{"score":{"name":"stempdz0","objective":"int"}},{"text":","},{"score":{"name":"stempdw0","objective":"int"}}] - -scoreboard players operation sloop int = inp int -function math:4d/objects/line_loop \ No newline at end of file diff --git a/data/math/functions/4d/objects/line_loop.mcfunction b/data/math/functions/4d/objects/line_loop.mcfunction deleted file mode 100644 index c8188a4..0000000 --- a/data/math/functions/4d/objects/line_loop.mcfunction +++ /dev/null @@ -1,33 +0,0 @@ -#描点 - -scoreboard players operation stempx int += stempdx int -scoreboard players operation stempy int += stempdy int -scoreboard players operation stempz int += stempdz int -scoreboard players operation stempw int += stempdw int -scoreboard players operation stempx0 int += stempdx0 int -scoreboard players operation stempy0 int += stempdy0 int -scoreboard players operation stempz0 int += stempdz0 int -scoreboard players operation stempw0 int += stempdw0 int - -scoreboard players operation stempx1 int = stempx0 int -scoreboard players operation stempy1 int = stempy0 int -scoreboard players operation stempz1 int = stempz0 int -scoreboard players operation stempw1 int = stempw0 int -scoreboard players operation stempx1 int /= 1000 int -scoreboard players operation stempy1 int /= 1000 int -scoreboard players operation stempz1 int /= 1000 int -scoreboard players operation stempw1 int /= 1000 int -scoreboard players operation stempx0 int %= 1000 int -scoreboard players operation stempy0 int %= 1000 int -scoreboard players operation stempz0 int %= 1000 int -scoreboard players operation stempw0 int %= 1000 int - -data modify storage math:io result prepend value [0.0f,0.0f,0.0f,0.0f] -execute store result storage math:io result[0][0] float 0.001 run scoreboard players operation stempx int += stempx1 int -execute store result storage math:io result[0][1] float 0.001 run scoreboard players operation stempy int += stempy1 int -execute store result storage math:io result[0][2] float 0.001 run scoreboard players operation stempz int += stempz1 int -execute store result storage math:io result[0][3] float 0.001 run scoreboard players operation stempw int += stempw1 int - -#递归迭代 -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:4d/objects/line_loop \ No newline at end of file diff --git a/data/math/functions/4d/running.mcfunction b/data/math/functions/4d/running.mcfunction deleted file mode 100644 index 50dea12..0000000 --- a/data/math/functions/4d/running.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -#单位向量3 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"w-xyz"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 rotated ~ 0.0 run tp @s ^ ^ ^15.0 -execute store result score cos int run data get entity @s Pos[2] 10000 -execute store result score tempp3 int run data get entity @s Pos[0] 1000 -execute store result entity @s Rotation[1] float -0.0001 run data get storage math:io 4d.charts[{id:"z-xy"}].angle 572958 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"y-x"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score tempp0 int run data get entity @s Pos[2] 10000 -execute store result score tempp1 int run data get entity @s Pos[0] 10000 -execute store result score tempp2 int run data get entity @s Pos[1] 10000 -scoreboard players operation tempp0 int *= cos int -scoreboard players operation tempp1 int *= cos int -scoreboard players operation tempp2 int *= cos int -scoreboard players operation tempp0 int /= 100000 int -scoreboard players operation tempp1 int /= 100000 int -scoreboard players operation tempp2 int /= 100000 int - -#单位向量012 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"w-xyz"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 rotated ~-90.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score cos int run data get entity @s Pos[2] 10000 -execute store result score tempk3 int run data get entity @s Pos[0] 1000 -execute store result entity @s Rotation[1] float -0.0001 run data get storage math:io 4d.charts[{id:"z-xy"}].angle 572958 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"y-x"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 run function math:4d/get_ijk - -#模长平方 -scoreboard players set 2tempp int -450000000 - -#进入循环 -execute store result score loop int if data storage math:io 4d.points[] -scoreboard players operation loop int < 4d_maxloop int -execute if score loop int matches 1.. run function math:4d/loop \ No newline at end of file diff --git a/data/math/functions/4d/test.mcfunction b/data/math/functions/4d/test.mcfunction deleted file mode 100644 index 09795a1..0000000 --- a/data/math/functions/4d/test.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -scoreboard players set inp int 1000 -data modify storage math:io input set value {start:[-0.8593d,-0.8593d,-0.8593d,-0.8593d],end:[3.528d,3.528d,3.528d,3.528d]} -function math:4d/objects/line \ No newline at end of file diff --git a/data/math/functions/4d/test/ijk.mcfunction b/data/math/functions/4d/test/ijk.mcfunction deleted file mode 100644 index 881b7ed..0000000 --- a/data/math/functions/4d/test/ijk.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#单位向量3 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"w-xyz"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 rotated ~ 0.0 run tp @s ^ ^ ^15.0 -execute store result score cos int run data get entity @s Pos[2] 10000 -execute store result score tempp3 int run data get entity @s Pos[0] 1000 -execute store result entity @s Rotation[1] float -0.0001 run data get storage math:io 4d.charts[{id:"z-xy"}].angle 572958 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"y-x"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score tempp0 int run data get entity @s Pos[2] 10000 -execute store result score tempp1 int run data get entity @s Pos[0] 10000 -execute store result score tempp2 int run data get entity @s Pos[1] 10000 -scoreboard players operation tempp0 int *= cos int -scoreboard players operation tempp1 int *= cos int -scoreboard players operation tempp2 int *= cos int -scoreboard players operation tempp0 int /= 100000 int -scoreboard players operation tempp1 int /= 100000 int -scoreboard players operation tempp2 int /= 100000 int - -#单位向量012 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"w-xyz"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 rotated ~-90.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score cos int run data get entity @s Pos[2] 10000 -execute store result score tempk3 int run data get entity @s Pos[0] 1000 -execute store result entity @s Rotation[1] float -0.0001 run data get storage math:io 4d.charts[{id:"z-xy"}].angle 572958 -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io 4d.charts[{id:"y-x"}].angle 572958 -execute at @s positioned 0.0 0.0 0.0 run function math:4d/get_ijk - -tellraw @a {"text":"---"} -tellraw @a [{"text":"p:"},{"score":{"name":"tempp0","objective":"int"}},{"text":","},{"score":{"name":"tempp1","objective":"int"}},{"text":","},{"score":{"name":"tempp2","objective":"int"}},{"text":","},{"score":{"name":"tempp3","objective":"int"}}] -tellraw @a [{"text":"k:"},{"score":{"name":"tempk0","objective":"int"}},{"text":","},{"score":{"name":"tempk1","objective":"int"}},{"text":","},{"score":{"name":"tempk2","objective":"int"}},{"text":","},{"score":{"name":"tempk3","objective":"int"}}] -tellraw @a [{"text":"j:"},{"score":{"name":"tempj0","objective":"int"}},{"text":","},{"score":{"name":"tempj1","objective":"int"}},{"text":","},{"score":{"name":"tempj2","objective":"int"}}] -tellraw @a [{"text":"i:"},{"score":{"name":"tempi0","objective":"int"}},{"text":","},{"score":{"name":"tempi1","objective":"int"}}] \ No newline at end of file diff --git a/data/math/functions/4d/test/projection.mcfunction b/data/math/functions/4d/test/projection.mcfunction deleted file mode 100644 index 0f790ab..0000000 --- a/data/math/functions/4d/test/projection.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -data modify storage math:io 4d.points set value [[1.0f,1.0f,1.0f,1.0f]] -execute as @e[tag=math_marker,limit=1] run function math:4d/running \ No newline at end of file diff --git a/data/math/functions/4d/text0.mcfunction b/data/math/functions/4d/text0.mcfunction deleted file mode 100644 index 59013a8..0000000 --- a/data/math/functions/4d/text0.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -setblock 0 11 0 air -setblock 0 11 0 oak_sign{Text1:'{"nbt":"4d.charts[0].char0","storage":"math:io","interpret":true}'} - -data modify entity @s background set value 0 -data modify entity @s text set from block 0 11 0 Text1 -data modify entity @s transformation.scale set value [3.5f,3.5f,0.1f] -data modify entity @s alignment set value "left" -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/text1.mcfunction b/data/math/functions/4d/text1.mcfunction deleted file mode 100644 index 1335737..0000000 --- a/data/math/functions/4d/text1.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -setblock 0 11 0 air -setblock 0 11 0 oak_sign{Text1:'{"nbt":"4d.charts[0].char1","storage":"math:io","interpret":true}'} - -data modify entity @s background set value 0 -data modify entity @s text set from block 0 11 0 Text1 -data modify entity @s transformation.scale set value [3.5f,3.5f,0.1f] -data modify entity @s alignment set value "left" -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/textboard.mcfunction b/data/math/functions/4d/textboard.mcfunction deleted file mode 100644 index abd3228..0000000 --- a/data/math/functions/4d/textboard.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -data modify entity @s background set value 2030056345 -data modify entity @s text set value '{"text":" \\n\\n"}' -data modify entity @s transformation.scale set value [6.0f,6.5f,0.1f] -data modify entity @s alignment set value "left" -data modify entity @s brightness set value {sky:15,block:15} \ No newline at end of file diff --git a/data/math/functions/4d/ui.mcfunction b/data/math/functions/4d/ui.mcfunction deleted file mode 100644 index 8ac9cb0..0000000 --- a/data/math/functions/4d/ui.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -scoreboard players set temp int 1 - -execute unless data entity @s Inventory[{Slot:3b}].tag{4d_item:"switch"} run function math:4d/buttons/switch0 - -execute if data entity @s Inventory[{Slot:-106b}].tag{4d_item:"eye"} run function math:4d/buttons/switch1 -execute unless data entity @s Inventory[].tag{4d_item:"eye"} run function math:4d/buttons/reset - -execute if score temp int matches 0 run function math:4d/ui_items \ No newline at end of file diff --git a/data/math/functions/4d/ui_items.mcfunction b/data/math/functions/4d/ui_items.mcfunction deleted file mode 100644 index 1457d0f..0000000 --- a/data/math/functions/4d/ui_items.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -clear @s #all{ui:1b} - -execute unless score 4d_running int matches 1 run item replace entity @s container.3 with arrow{ui:1b,4d_item:"switch",display:{Name:'{"text":"§b打开"}'}} -execute if score 4d_running int matches 1 run item replace entity @s container.3 with barrier{ui:1b,4d_item:"switch",display:{Name:'{"text":"§c关闭"}'}} -item replace entity @s container.4 with ender_eye{ui:1b,4d_item:"eye",display:{Name:'{"text":"§b四维之眼"}'}} \ No newline at end of file diff --git a/data/math/functions/_atan2.mcfunction b/data/math/functions/_atan2.mcfunction index a793762..b95e178 100644 --- a/data/math/functions/_atan2.mcfunction +++ b/data/math/functions/_atan2.mcfunction @@ -1,5 +1,8 @@ #math:_atan2 -#需要传入世界实体为执行者 +# 计算平面向量的方向角 +# 需要传入世界实体为执行者 +# 输入{,} +# 输出 execute store result entity @s Pos[2] double 0.0001 run scoreboard players get u int execute store result entity @s Pos[0] double 0.0001 run scoreboard players get v int execute positioned 0.0 0.0 0.0 facing entity @s feet rotated ~ 0.0 run tp @s 0.0 0.0 0.0 ~ ~ diff --git a/data/math/functions/_init.mcfunction b/data/math/functions/_init.mcfunction index f93e6d1..88dc4b0 100644 --- a/data/math/functions/_init.mcfunction +++ b/data/math/functions/_init.mcfunction @@ -1,7 +1,9 @@ #math:_init +# 初始化数学库 +# 使用数学库之前必须手动执行 -#空间运算区块 -forceload add -1 -1 1 1 +#主世界设置 +execute in minecraft:the_overworld run function math:init_overworld #全局记分板 scoreboard objectives add id dummy @@ -49,9 +51,8 @@ scoreboard players set 100000000 int 100000000 scoreboard players set 1000000000 int 1000000000 scoreboard players set 1103515245 int 1103515245 -#世界实体 +#高频循环 schedule function math:tick 1t replace -function math:math_marker #数据模板 data modify storage math:class cmp_rules set value {"ab":1b,"a<=b":0b,"a>=b":1b} @@ -60,10 +61,17 @@ data modify storage math:class items set value [{id:"minecraft:red_wool",Count:1 #临时对象初始化 data modify storage math:io item set value {} + data modify storage math:io classify set value [] scoreboard players set classify_cnt int 0 + +data modify storage math:io set set value [] +data modify storage math:io set_tags set value [] +scoreboard players set set_cnt int 0 + data modify storage math:io rand_lst set value [8593,45316,3528,4112,43,296358,12936510] execute store result score rand_seed int run data get storage math:io rand_lst[0] + scoreboard players set particle int 4 scoreboard players set 3vec_n int 200 diff --git a/data/math/functions/_particle.mcfunction b/data/math/functions/_particle.mcfunction new file mode 100644 index 0000000..3c984e2 --- /dev/null +++ b/data/math/functions/_particle.mcfunction @@ -0,0 +1,6 @@ +#math:_particle +# 进行粒子显示 +# 输入粒子分数 +execute if score particle int matches 1..9 run function math:particle/1_9 +execute if score particle int matches 10..18 run function math:particle/10_18 +execute if score particle int matches 19..27 run function math:particle/19_27 \ No newline at end of file diff --git a/data/math/functions/_posto.mcfunction b/data/math/functions/_posto.mcfunction index f1a3bba..951dc7a 100644 --- a/data/math/functions/_posto.mcfunction +++ b/data/math/functions/_posto.mcfunction @@ -1,4 +1,7 @@ #math:_posto +# 坐标转换函数 +# 输入执行者坐标 +# 输出{,,} execute store result score x int run data get entity @s Pos[0] 10000 execute store result score y int run data get entity @s Pos[1] 10000 execute store result score z int run data get entity @s Pos[2] 10000 \ No newline at end of file diff --git a/data/math/functions/_rand.mcfunction b/data/math/functions/_rand.mcfunction index eaa85bc..5f7d8bd 100644 --- a/data/math/functions/_rand.mcfunction +++ b/data/math/functions/_rand.mcfunction @@ -1,4 +1,6 @@ #math:_rand +# 进行一次LCG随机数迭代 +# 输出 scoreboard players operation rand_seed int *= 1103515245 int scoreboard players add rand_seed int 12345 scoreboard players operation random int = rand_seed int \ No newline at end of file diff --git a/data/math/functions/_randiter.mcfunction b/data/math/functions/_randiter.mcfunction index d2584cc..15c3e91 100644 --- a/data/math/functions/_randiter.mcfunction +++ b/data/math/functions/_randiter.mcfunction @@ -1,4 +1,5 @@ #math:_randiter +# 切换随机数迭代器 execute store result storage math:io rand_lst[0] int 1 run scoreboard players get rand_seed int data modify storage math:io rand_lst append from storage math:io rand_lst[0] data remove storage math:io rand_lst[0] diff --git a/data/math/functions/_random.mcfunction b/data/math/functions/_random.mcfunction index 187c551..94e9f9e 100644 --- a/data/math/functions/_random.mcfunction +++ b/data/math/functions/_random.mcfunction @@ -1,4 +1,7 @@ #math:_random +# 进行一次随机数迭代 +# 输入随机数范围{,} +# 输出 scoreboard players operation sstemp int = max int scoreboard players operation sstemp int -= min int scoreboard players add sstemp int 1 diff --git a/data/math/functions/_refacing.mcfunction b/data/math/functions/_refacing.mcfunction new file mode 100644 index 0000000..1b6f097 --- /dev/null +++ b/data/math/functions/_refacing.mcfunction @@ -0,0 +1,12 @@ +#math:_refacing +# 规整化执行者的朝向 +# execute rotated 44.9 45.1 as entity run function math:_refacing +# 朝向被规整化为(0.0,90.0) + +execute as 0-0-0-8593-0 run function math:3vec/_facingto +function math:3vec/_polar +execute if score 3vec_x int = 3vec_z int run scoreboard players set 3vec_x int 0 +execute if score 3vec_x int = 3vec_y int run scoreboard players set 3vec_x int 0 +execute if score 3vec_y int = 3vec_z int run scoreboard players set 3vec_y int 0 +execute as 0-0-0-8593-0 run function math:3vec/_tofacing +execute at @s rotated as 0-0-0-8593-0 run tp @s ~ ~ ~ ~ ~ \ No newline at end of file diff --git a/data/math/functions/_sincos.mcfunction b/data/math/functions/_sincos.mcfunction index 0a62ed0..f301b0f 100644 --- a/data/math/functions/_sincos.mcfunction +++ b/data/math/functions/_sincos.mcfunction @@ -1,5 +1,8 @@ #math:_sincos -#需要传入世界实体为执行者 +# 计算正余弦 +# 需要传入世界实体为执行者 +# 输入 +# 输出{,} execute store result entity @s Rotation[0] float -0.0001 run scoreboard players get inp int execute at @s positioned 0.0 0.0 0.0 rotated ~ 0.0 run tp @s ^ ^ ^1.0 execute store result score cos int run data get entity @s Pos[2] 10000 diff --git a/data/math/functions/_sqrt.mcfunction b/data/math/functions/_sqrt.mcfunction index 37e1a06..473435e 100644 --- a/data/math/functions/_sqrt.mcfunction +++ b/data/math/functions/_sqrt.mcfunction @@ -1,4 +1,7 @@ #math:_sqrt +# 计算整数精度开根号 +# 输入 +# 输出 execute store result score stemp0 int store result score stemp1 int store result score stemp2 int store result score stemp3 int run scoreboard players operation res int = inp int execute if score inp int matches ..13924 run function math:sqrt/range0 execute if score inp int matches 13925..16777216 run function math:sqrt/range1 diff --git a/data/math/functions/_topos.mcfunction b/data/math/functions/_topos.mcfunction index 148dba4..1782e18 100644 --- a/data/math/functions/_topos.mcfunction +++ b/data/math/functions/_topos.mcfunction @@ -1,4 +1,7 @@ #math:_topos +# 坐标转换函数 +# 输入{,,} +# 输出执行者坐标 execute store result entity @s Pos[0] double 0.0001 run scoreboard players get x int execute store result entity @s Pos[1] double 0.0001 run scoreboard players get y int execute store result entity @s Pos[2] double 0.0001 run scoreboard players get z int \ No newline at end of file diff --git a/data/math/functions/_version.mcfunction b/data/math/functions/_version.mcfunction index 50b5dd1..2307761 100644 --- a/data/math/functions/_version.mcfunction +++ b/data/math/functions/_version.mcfunction @@ -1,3 +1,4 @@ #math:_version -tellraw @s {"text":"<数学库> 当前为2.0.1版本."} -scoreboard players set version int 201 \ No newline at end of file +# 输出数学库版本 +tellraw @s {"text":"<数学库> 当前为2.0.2版本."} +scoreboard players set version int 202 \ No newline at end of file diff --git a/data/math/functions/_xyz.mcfunction b/data/math/functions/_xyz.mcfunction index 9eeb912..d3d3f7d 100644 --- a/data/math/functions/_xyz.mcfunction +++ b/data/math/functions/_xyz.mcfunction @@ -1,5 +1,8 @@ #math:_xyz -#需要传入世界实体为执行者 +# 坐标转换函数 +# 需要传入世界实体为执行者 +# 输入执行坐标 +# 输出{,,} tp @s ~ ~ ~ execute store result score x int run data get entity @s Pos[0] 10000 execute store result score y int run data get entity @s Pos[1] 10000 diff --git a/data/math/functions/cbox/_randnew.mcfunction b/data/math/functions/cbox/_randnew.mcfunction index e13339d..93609a1 100644 --- a/data/math/functions/cbox/_randnew.mcfunction +++ b/data/math/functions/cbox/_randnew.mcfunction @@ -1,4 +1,4 @@ #math:cbox/_randnew tag @e remove result summon marker ~ ~ ~ {Tags:["result","cbox"]} -execute as @e[tag=result,limit=1] run function math:cbox/randnew_set \ No newline at end of file +execute as @e[tag=result,limit=1,type=minecraft:marker] run function math:cbox/randnew_set \ No newline at end of file diff --git a/data/math/functions/cbox/_sector.mcfunction b/data/math/functions/cbox/_sector.mcfunction index 3487e92..30ad370 100644 --- a/data/math/functions/cbox/_sector.mcfunction +++ b/data/math/functions/cbox/_sector.mcfunction @@ -7,4 +7,4 @@ scoreboard players operation sector_r int = @s sector_r scoreboard players operation sector_beta int = @s sector_beta scoreboard players operation sector_alpha int = @s sector_alpha -execute as @e[tag=math_marker,limit=1] run function math:cbox/sector/cal \ No newline at end of file +execute as 0-0-0-8593-0 run function math:cbox/sector/cal \ No newline at end of file diff --git a/data/math/functions/cbox/vanilla/_detect.mcfunction b/data/math/functions/cbox/vanilla/_detect.mcfunction index 4866c63..e74dce5 100644 --- a/data/math/functions/cbox/vanilla/_detect.mcfunction +++ b/data/math/functions/cbox/vanilla/_detect.mcfunction @@ -1,5 +1,5 @@ #math:cbox/vanilla/_detect -execute as @e[tag=math_marker,limit=1] run function math:3vec/_facingto +execute as 0-0-0-8593-0 run function math:3vec/_facingto execute store result score stempx int run data get entity @s Pos[0] 10000 execute store result score stempy int run data get entity @s Pos[1] 10000 execute store result score stempz int run data get entity @s Pos[2] 10000 @@ -7,7 +7,7 @@ execute store result score stempz int run data get entity @s Pos[2] 10000 scoreboard players set min int 0 scoreboard players set max int 160000 tag @s add sstmp -execute as @e[tag=math_marker,limit=1] run function math:cbox/vanilla/detect_loop +execute as 0-0-0-8593-0 run function math:cbox/vanilla/detect_loop tag @s remove sstmp tellraw @a [{"selector":"@s"},": ",{"score":{"name":"res","objective":"int"}}] \ No newline at end of file diff --git a/data/math/functions/geom/sector/_randnew.mcfunction b/data/math/functions/geom/sector/_randnew.mcfunction index 1ba2c11..8f4519d 100644 --- a/data/math/functions/geom/sector/_randnew.mcfunction +++ b/data/math/functions/geom/sector/_randnew.mcfunction @@ -1,4 +1,4 @@ #math:geom/sector/_randnew tag @e remove result summon marker ~ ~ ~ {Tags:["geom","sector","result"]} -execute as @e[tag=result,limit=1] run function math:geom/sector/randnew_set \ No newline at end of file +execute as @e[tag=result,limit=1,type=minecraft:marker] run function math:geom/sector/randnew_set \ No newline at end of file diff --git a/data/math/functions/graph/_display.mcfunction b/data/math/functions/graph/_display.mcfunction deleted file mode 100644 index 0853f3e..0000000 --- a/data/math/functions/graph/_display.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#math:graph/_display -#显示函数，对临时对象进行显示 -summon item 0 11 0 {Tags:["uuid_marker"],Item:{id:"minecraft:glass",Count:1b}} -execute store result score n int if data storage math:io list[] -scoreboard players set loop int 0 -execute if score loop int < n int as @e[tag=uuid_marker,limit=1] run function math:graph/display/loop -kill @e[tag=uuid_marker] \ No newline at end of file diff --git a/data/math/functions/graph/_get.mcfunction b/data/math/functions/graph/_get.mcfunction deleted file mode 100644 index 661679f..0000000 --- a/data/math/functions/graph/_get.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:graph/_get -function math:list/_get -function math:uvw/_get \ No newline at end of file diff --git a/data/math/functions/graph/_randnew.mcfunction b/data/math/functions/graph/_randnew.mcfunction deleted file mode 100644 index b10657e..0000000 --- a/data/math/functions/graph/_randnew.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#math:graph/_randnew -#需要传入世界实体为执行者 -data modify storage math:io sstemp set value {nodes:[],pos:[0.0d,0.0d,0.0d],rot:[0.0f,0.0f],uvw_theta:0.0f} -data modify storage math:io temp set value {name:"",to:[],display:{hide_name:0b,item:{},uvw:[0.0d,0.0d,0.0d]}} -tp @s ~ ~ ~ -data modify storage math:io sstemp.pos set from entity @s Pos - -#随机生成节点数量 -scoreboard players set min int 8 -scoreboard players set max int 18 -function math:_random -scoreboard players operation tempn int = random int - -#洗牌准备 -data modify storage math:io list set value [] -scoreboard players set loop int 0 -execute if score loop int < tempn int run function math:graph/randnew/pre_loop -function math:list/shuffle/_start - -#进入循环 -setblock 0 11 0 oak_sign -scoreboard players set inp int 3 -scoreboard players set loop int 0 -execute if score loop int < tempn int run function math:graph/randnew/loop - -#洗牌结束 -function math:list/shuffle/_end - -data modify storage math:io result set from storage math:io sstemp \ No newline at end of file diff --git a/data/math/functions/graph/_ssnew.mcfunction b/data/math/functions/graph/_ssnew.mcfunction deleted file mode 100644 index fce39f1..0000000 --- a/data/math/functions/graph/_ssnew.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:graph/_ssnew -#需要传入世界实体为执行者 -#把图的数据模板实例化为临时对象 -data modify storage math:io list set from storage math:io input.nodes -scoreboard players set list_phi int 0 - -#局部坐标系临时化 -execute store result score uvw_theta int run data get storage math:io input.uvw_theta 10000 -data modify entity @s Pos set from storage math:io input.pos -data modify entity @s Rotation set from storage math:io input.rot -execute at @s run function math:uvw/_base \ No newline at end of file diff --git a/data/math/functions/graph/_store.mcfunction b/data/math/functions/graph/_store.mcfunction deleted file mode 100644 index 8b723df..0000000 --- a/data/math/functions/graph/_store.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:graph/_store -function math:list/_store -function math:uvw/_store \ No newline at end of file diff --git a/data/math/functions/graph/display/_off.mcfunction b/data/math/functions/graph/display/_off.mcfunction deleted file mode 100644 index bad3f1f..0000000 --- a/data/math/functions/graph/display/_off.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:graph/display/_off -#关闭临时对象的显示 -summon item 0 11 0 {Tags:["uuid_marker"],Item:{id:"minecraft:glass",Count:1b}} -execute store result score loop int if data storage math:io list[] -execute if score loop int matches 1.. as @e[tag=uuid_marker,limit=1] run function math:graph/display/off_loop -kill @e[tag=uuid_marker] \ No newline at end of file diff --git a/data/math/functions/graph/display/_phyx.mcfunction b/data/math/functions/graph/display/_phyx.mcfunction deleted file mode 100644 index afdc0fd..0000000 --- a/data/math/functions/graph/display/_phyx.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#tellraw @a "---" -#tellraw @a ["test_step : ",{"score":{"name":"test_step","objective":"int"}}] -#math:graph/display/_phyx -#需要传入世界实体为执行者 -function math:uvw/_store -#临时化 -execute store result score center_x int run data get storage math:io input.center[0] 10000 -execute store result score center_y int run data get storage math:io input.center[1] 10000 -execute store result score center_k int run data get storage math:io input.center_force 10000 - -execute store result score collision_r2 int run data get storage math:io input.collision_r2 10000 -execute store result score collision_k int run data get storage math:io input.collision_force 10000 - -execute store result score link_k int run data get storage math:io input.link_force 10000 -execute store result score push_k int run data get storage math:io input.push_force 10000 - -#计算节点速度 -data modify entity @s Pos[1] set value 0.0d -execute store result score n int if data storage math:io list[] -scoreboard players set loop int 0 -execute if score loop int < n int run function math:graph/display/phyx_loop - -#位置迭代 -execute store result score loop int if data storage math:io list[] -execute if score loop int matches 1.. run function math:graph/display/phyx_ploop - -function math:uvw/_get - -scoreboard players add test_step int 1 \ No newline at end of file diff --git a/data/math/functions/graph/display/_plane.mcfunction b/data/math/functions/graph/display/_plane.mcfunction deleted file mode 100644 index e19b0b7..0000000 --- a/data/math/functions/graph/display/_plane.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:graph/display/_plane -#输入，将临时对象转换为平面排布 -execute store result score loop int if data storage math:io list[] -execute if score loop int matches 1.. run function math:graph/display/plane_loop \ No newline at end of file diff --git a/data/math/functions/graph/display/init.mcfunction b/data/math/functions/graph/display/init.mcfunction deleted file mode 100644 index 9bf4633..0000000 --- a/data/math/functions/graph/display/init.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:graph/display/init -summon area_effect_cloud 0 11 0 {Tags:["stmp","upd_aec","graph_node","graph_entity"],Duration:2147483647,Passengers:[{Tags:["graph_entity"],id:"minecraft:item_display",brightness:{sky:15,block:15},transformation:{left_rotation:[0.0f,0.0f,0.0f,1.0f],scale:[0.25f,0.25f,0.25f],right_rotation:[0.0f,0.0f,0.0f,1.0f],translation:[0.0f,0.0f,0.0f]}}]} -data modify storage math:io list[0].display.uuid set from entity @e[tag=stmp,limit=1] UUID -tag @e remove stmp \ No newline at end of file diff --git a/data/math/functions/graph/display/line.mcfunction b/data/math/functions/graph/display/line.mcfunction deleted file mode 100644 index 417e2ba..0000000 --- a/data/math/functions/graph/display/line.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#math:graph/display/line -execute store result score tempx int run data get entity @s Pos[0] 10000 -execute store result score tempy int run data get entity @s Pos[1] 10000 -execute store result score tempz int run data get entity @s Pos[2] 10000 -scoreboard players add tempy int 3500 - -data modify storage math:io temp set from storage math:io list[0].display -execute store result score sloop int if data storage math:io temp.dis[] -execute if score sloop int matches 1.. as @e[tag=math_marker,limit=1] run function math:graph/main_sloop -data modify storage math:io list[0].display.dis set from storage math:io temp.dis \ No newline at end of file diff --git a/data/math/functions/graph/display/loop.mcfunction b/data/math/functions/graph/display/loop.mcfunction deleted file mode 100644 index 340549e..0000000 --- a/data/math/functions/graph/display/loop.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#math:graph/display/loop -scoreboard players operation inp int = loop int -function math:list/_index - -#显示同步 -execute unless data storage math:io list[0].display.uuid run function math:graph/display/init -data modify entity @s Thrower set from storage math:io list[0].display.uuid -execute on origin run function math:graph/display/set - -#距离信息 -execute store result score stempx int run data get storage math:io list[0].display.uvw[0] 1000 -execute store result score stempy int run data get storage math:io list[0].display.uvw[1] 1000 -execute store result score stempz int run data get storage math:io list[0].display.uvw[2] 1000 -data modify storage math:io stemp set value {dis:[],end_dis:[]} -data modify storage math:io stemp.to set from storage math:io list[0].to -execute store result score sloop int if data storage math:io stemp.to[] -execute if score sloop int matches 1.. as @e[tag=math_marker,limit=1] run function math:graph/display/sloop - -#复原 -scoreboard players operation inp int = loop int -function math:list/_index -data modify storage math:io list[0].display.dis set from storage math:io stemp.dis -data modify storage math:io list[0].display.end_dis set from storage math:io stemp.end_dis -data modify storage math:io list[0].display.dis_vec set from storage math:io stemp.dis_vec - -#循环迭代 -scoreboard players add loop int 1 -execute if score loop int < n int run function math:graph/display/loop \ No newline at end of file diff --git a/data/math/functions/graph/display/off.mcfunction b/data/math/functions/graph/display/off.mcfunction deleted file mode 100644 index 69a264b..0000000 --- a/data/math/functions/graph/display/off.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:graph/display/off -execute on passengers run kill @s -kill @s \ No newline at end of file diff --git a/data/math/functions/graph/display/off_loop.mcfunction b/data/math/functions/graph/display/off_loop.mcfunction deleted file mode 100644 index 5e001ef..0000000 --- a/data/math/functions/graph/display/off_loop.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#math:graph/display/off_loop -data modify entity @s Thrower set from storage math:io list[0].display.uuid -execute on origin run function math:graph/display/off -data remove storage math:io list[0].display.uuid -#循环迭代 -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:graph/display/off_loop \ No newline at end of file diff --git a/data/math/functions/graph/display/phyx_lloop.mcfunction b/data/math/functions/graph/display/phyx_lloop.mcfunction deleted file mode 100644 index 131fec6..0000000 --- a/data/math/functions/graph/display/phyx_lloop.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#math:graph/display/phyx_lloop -execute store result score inp int run data get storage math:io temp[0] -function math:list/_index -#弹簧拉力 -execute store result score stempx int run data get storage math:io list[0].display.uvw[0] 10000 -execute store result score stempy int run data get storage math:io list[0].display.uvw[1] 10000 - -scoreboard players operation stempx int -= x int -scoreboard players operation stempy int -= y int -scoreboard players operation stempx int *= link_k int -scoreboard players operation stempx int /= 10000 int -scoreboard players operation stempy int *= link_k int -scoreboard players operation stempy int /= 10000 int -scoreboard players operation vx int += stempx int -scoreboard players operation vy int += stempy int - -#循环迭代 -data remove storage math:io temp[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:graph/display/phyx_lloop \ No newline at end of file diff --git a/data/math/functions/graph/display/phyx_loop.mcfunction b/data/math/functions/graph/display/phyx_loop.mcfunction deleted file mode 100644 index 35df90c..0000000 --- a/data/math/functions/graph/display/phyx_loop.mcfunction +++ /dev/null @@ -1,47 +0,0 @@ -#math:graph/display/phyx_loop -#列表当前项 -scoreboard players operation inp int = loop int -function math:list/_index - -execute store result score x int run data get storage math:io list[0].display.uvw[0] 10000 -execute store result score y int run data get storage math:io list[0].display.uvw[1] 10000 -execute store result score vx int run data get storage math:io list[0].display.velocity[0] 10000 -execute store result score vy int run data get storage math:io list[0].display.velocity[1] 10000 -#execute if score loop int = test int run tellraw @a ["velocity : [",{"score":{"name":"vx","objective":"int"}},{"text":", "},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] - -#对每个节点 -data modify storage math:io temp set from storage math:io list -data remove storage math:io temp[0] -scoreboard players operation sloop int = n int -execute if score sloop int matches 2.. run function math:graph/display/phyx_sloop -#execute if score loop int = test int run tellraw @a ["velocity : [",{"score":{"name":"vx","objective":"int"}},{"text":", "},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] - -#对中心节点 -scoreboard players operation tempf int = center_x int -scoreboard players operation tempf int -= x int -scoreboard players operation tempf int *= center_k int -scoreboard players operation tempf int /= 10000 int -scoreboard players operation vx int += tempf int -scoreboard players operation tempf int = center_y int -scoreboard players operation tempf int -= y int -scoreboard players operation tempf int *= center_k int -scoreboard players operation tempf int /= 10000 int -scoreboard players operation vy int += tempf int -#execute if score loop int = test int run tellraw @a ["velocity : [",{"score":{"name":"vx","objective":"int"}},{"text":", "},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] - -#对连接节点 -data modify storage math:io temp set from storage math:io list[0].to -execute store result score sloop int if data storage math:io temp[] -execute if score sloop int matches 1.. run function math:graph/display/phyx_lloop -#execute if score loop int = test int run tellraw @a ["velocity : [",{"score":{"name":"vx","objective":"int"}},{"text":", "},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] - -#恢复 -scoreboard players operation inp int = loop int -function math:list/_index - -execute store result storage math:io list[0].display.velocity[0] double 0.0001 run scoreboard players get vx int -execute store result storage math:io list[0].display.velocity[1] double 0.0001 run scoreboard players get vy int - -#循环迭代 -scoreboard players add loop int 1 -execute if score loop int < n int run function math:graph/display/phyx_loop \ No newline at end of file diff --git a/data/math/functions/graph/display/phyx_ploop.mcfunction b/data/math/functions/graph/display/phyx_ploop.mcfunction deleted file mode 100644 index 73ba24e..0000000 --- a/data/math/functions/graph/display/phyx_ploop.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:graph/display/phyx_ploop -execute store result score x int run data get storage math:io list[0].display.uvw[0] 10000 -execute store result score y int run data get storage math:io list[0].display.uvw[1] 10000 -execute store result score vx int run data get storage math:io list[0].display.velocity[0] 10000 -execute store result score vy int run data get storage math:io list[0].display.velocity[1] 10000 -execute store result storage math:io list[0].display.uvw[0] double 0.0001 run scoreboard players operation x int += vx int -execute store result storage math:io list[0].display.uvw[1] double 0.0001 run scoreboard players operation y int += vy int -#循环 -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:graph/display/phyx_ploop \ No newline at end of file diff --git a/data/math/functions/graph/display/phyx_sloop.mcfunction b/data/math/functions/graph/display/phyx_sloop.mcfunction deleted file mode 100644 index f96fc9a..0000000 --- a/data/math/functions/graph/display/phyx_sloop.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -#math:graph/display/phyx_sloop -#对每个节点 -#execute if score loop int matches 1 if score sloop int matches 11 run tellraw @a "---" -#execute if score loop int matches 1 if score sloop int matches 11 run tellraw @a ["sloop:",{"score":{"name":"sloop","objective":"int"}}] -#execute if score loop int matches 1 if score sloop int matches 11 run tellraw @a ["velocity:[",{"score":{"name":"vx","objective":"int"}},{"text":","},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] -execute store result score stempx int run data get storage math:io temp[0].display.uvw[0] 10000 -execute store result score stempy int run data get storage math:io temp[0].display.uvw[1] 10000 - -execute store result entity @s Pos[2] double -0.0001 run scoreboard players operation stempx int -= x int -execute store result entity @s Pos[0] double -0.0001 run scoreboard players operation stempy int -= y int -execute positioned 0.0 0.0 0.0 facing entity @s feet run tp @s ^ ^ ^1.0 - -scoreboard players operation stempx int *= stempx int -scoreboard players operation stempy int *= stempy int -scoreboard players operation stempx int += stempy int -scoreboard players operation stempx int /= 10000 int - -#碰撞判定 -scoreboard players operation stempx int > collision_r2 int - -#库仑力 -execute store result score tempf int run data get entity @s Pos[2] 10000 -scoreboard players operation tempf int *= push_k int -scoreboard players operation tempf int /= stempx int -scoreboard players operation vx int += tempf int -execute store result score tempf int run data get entity @s Pos[0] 10000 -scoreboard players operation tempf int *= push_k int -scoreboard players operation tempf int /= stempx int -scoreboard players operation vy int += tempf int -#execute if score loop int matches 1 if score sloop int matches 11 run tellraw @a ["velocity:[",{"score":{"name":"vx","objective":"int"}},{"text":","},{"score":{"name":"vy","objective":"int"}},{"text":"]"}] -#execute if score loop int matches 1 if score sloop int matches 11 run tellraw @a "---" - -#循环迭代 -data remove storage math:io temp[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 2.. run function math:graph/display/phyx_sloop \ No newline at end of file diff --git a/data/math/functions/graph/display/plane_loop.mcfunction b/data/math/functions/graph/display/plane_loop.mcfunction deleted file mode 100644 index ff111d2..0000000 --- a/data/math/functions/graph/display/plane_loop.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:graph/display/plane_loop -execute store result score stemp0 int store result score stemp1 int run scoreboard players remove loop int 1 - -data modify storage math:io list[0].display.velocity set value [0.0d,0.0d] -execute store result storage math:io list[0].display.uvw[0] double 1 run scoreboard players operation stemp0 int %= inp int -execute store result storage math:io list[0].display.uvw[1] double 1 run scoreboard players operation stemp1 int /= inp int -data modify storage math:io list[0].display.uvw[2] set value 0.0d - -#循环迭代 -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] -execute if score loop int matches 1.. run function math:graph/display/plane_loop \ No newline at end of file diff --git a/data/math/functions/graph/display/set.mcfunction b/data/math/functions/graph/display/set.mcfunction deleted file mode 100644 index 1c61241..0000000 --- a/data/math/functions/graph/display/set.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#math:graph/display/set -#显示实体 -execute on passengers run function math:graph/display/set_psg -#位置同步 -execute store result score u int run data get storage math:io list[0].display.uvw[0] 10000 -execute store result score v int run data get storage math:io list[0].display.uvw[1] 10000 -execute store result score w int run data get storage math:io list[0].display.uvw[2] 10000 -function math:uvw/_topos \ No newline at end of file diff --git a/data/math/functions/graph/display/set_psg.mcfunction b/data/math/functions/graph/display/set_psg.mcfunction deleted file mode 100644 index 695a379..0000000 --- a/data/math/functions/graph/display/set_psg.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:graph/display/set_psg -#文字显示 -data modify entity @s CustomName set from storage math:io list[0].name -execute store result entity @s CustomNameVisible byte 1 if data storage math:io list[0].display{hide_name:0b} -#物品显示 -data modify entity @s item set from storage math:io list[0].display.item \ No newline at end of file diff --git a/data/math/functions/graph/display/sloop.mcfunction b/data/math/functions/graph/display/sloop.mcfunction deleted file mode 100644 index c184f44..0000000 --- a/data/math/functions/graph/display/sloop.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#math:graph/display/sloop -execute store result score inp int run data get storage math:io stemp.to[0] -function math:list/_index -data modify storage math:io stemp.dis append value 0.0d -data modify storage math:io stemp.end_dis append value 0.0d -#计算距离 -execute store result score 3vec_x int run data get storage math:io list[0].display.uvw[0] 1000 -execute store result score 3vec_y int run data get storage math:io list[0].display.uvw[1] 1000 -execute store result score 3vec_z int run data get storage math:io list[0].display.uvw[2] 1000 -scoreboard players operation 3vec_x int -= stempx int -scoreboard players operation 3vec_y int -= stempy int -scoreboard players operation 3vec_z int -= stempz int -function math:3vec/_ex-rot -data modify storage math:io stemp.dis_vec append from entity @s Pos -execute store result storage math:io stemp.end_dis[-1] double 0.001 run scoreboard players get 3vec_l int -#循环迭代 -data remove storage math:io stemp.to[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:graph/display/sloop \ No newline at end of file diff --git a/data/math/functions/graph/doc.txt b/data/math/functions/graph/doc.txt deleted file mode 100644 index 8f28693..0000000 --- a/data/math/functions/graph/doc.txt +++ /dev/null @@ -1,25 +0,0 @@ -#图的数据模板 -{ - nodes:[ - { - name:"", - to:[1,2], - display:{ - hide_name:1b, - item:{}, - uvw:[0.0d,0.0d,0.0d] - } - } - ], - pos:[0.0d,0.0d,0.0d], - rot:[0.0f,0.0f], - uvw_theta:0.0f -} -#物理模拟参数模板 -{ - center:[0.0d,0.0d], - center_force:0.05d, - collision_r2:0.5d, - link_force:0.1d, - push_force:1.0d -} \ No newline at end of file diff --git a/data/math/functions/graph/init.mcfunction b/data/math/functions/graph/init.mcfunction deleted file mode 100644 index 3effdd8..0000000 --- a/data/math/functions/graph/init.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:graph/init - -scoreboard players set graph_step int 10 -scoreboard players set graph_maxloop int 100 \ No newline at end of file diff --git a/data/math/functions/graph/main.mcfunction b/data/math/functions/graph/main.mcfunction deleted file mode 100644 index 9e07274..0000000 --- a/data/math/functions/graph/main.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:graph/main -summon item 0 11 0 {Tags:["uuid_marker"],Item:{id:"minecraft:glass",Count:1b}} -execute as @e[tag=uuid_marker,limit=1] run function math:graph/main_loop -kill @e[tag=uuid_marker] - -#data modify storage math:io list append from storage math:io list[0] -#data remove storage math:io list[0] -#scoreboard players add list_phi int 1 -#execute store result score n int if data storage math:io list[] -#scoreboard players operation list_phi int %= n int - -function math:list/_shuffle \ No newline at end of file diff --git a/data/math/functions/graph/main_loop.mcfunction b/data/math/functions/graph/main_loop.mcfunction deleted file mode 100644 index 109c4f1..0000000 --- a/data/math/functions/graph/main_loop.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:graph/main_loop -data modify entity @s Thrower set from storage math:io list[0].display.uuid -execute on origin run function math:graph/display/line \ No newline at end of file diff --git a/data/math/functions/graph/main_sloop.mcfunction b/data/math/functions/graph/main_sloop.mcfunction deleted file mode 100644 index 63d31e1..0000000 --- a/data/math/functions/graph/main_sloop.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#math:graph/main_sloop -execute store result score tempi0 int run data get storage math:io temp.dis_vec[0][0] 10000 -execute store result score tempi1 int run data get storage math:io temp.dis_vec[0][1] 10000 -execute store result score tempi2 int run data get storage math:io temp.dis_vec[0][2] 10000 - -execute store result score tempd0 int run data get storage math:io temp.dis[0] 10000 -execute store result score tempd1 int run data get storage math:io temp.end_dis[0] 10000 - -scoreboard players operation ssloop int = graph_maxloop int -execute if score tempd0 int < tempd1 int if score ssloop int matches 1.. run function math:graph/main_ssloop -execute if score tempd0 int >= tempd1 int run scoreboard players set tempd0 int 0 -execute store result storage math:io temp.dis[0] double 0.0001 run scoreboard players get tempd0 int - -#循环 -data modify storage math:io temp.dis append from storage math:io temp.dis[0] -data remove storage math:io temp.dis[0] -data remove storage math:io temp.dis_vec[0] -data remove storage math:io temp.end_dis[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:graph/main_sloop \ No newline at end of file diff --git a/data/math/functions/graph/main_ssloop.mcfunction b/data/math/functions/graph/main_ssloop.mcfunction deleted file mode 100644 index 03bd915..0000000 --- a/data/math/functions/graph/main_ssloop.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#math:graph/main_ssloop -scoreboard players operation stempx int = tempi0 int -scoreboard players operation stempx int *= tempd0 int -scoreboard players operation stempx int /= 10000 int -execute store result entity @s Pos[0] double 0.0001 run scoreboard players operation stempx int += tempx int - -scoreboard players operation stempy int = tempi1 int -scoreboard players operation stempy int *= tempd0 int -scoreboard players operation stempy int /= 10000 int -execute store result entity @s Pos[1] double 0.0001 run scoreboard players operation stempy int += tempy int - -scoreboard players operation stempz int = tempi2 int -scoreboard players operation stempz int *= tempd0 int -scoreboard players operation stempz int /= 10000 int -execute store result entity @s Pos[2] double 0.0001 run scoreboard players operation stempz int += tempz int - -execute at @s run function math:particle/_dsp - -#循环 -scoreboard players operation tempd0 int += graph_step int -scoreboard players remove ssloop int 1 -execute if score tempd0 int < tempd1 int if score ssloop int matches 1.. run function math:graph/main_ssloop \ No newline at end of file diff --git a/data/math/functions/graph/randnew/loop.mcfunction b/data/math/functions/graph/randnew/loop.mcfunction deleted file mode 100644 index 57b9e8b..0000000 --- a/data/math/functions/graph/randnew/loop.mcfunction +++ /dev/null @@ -1,41 +0,0 @@ -#math:graph/randnew/loop -data modify storage math:io temp.to set value [] -#名字 -function math:randstring/_pull -data modify block 0 11 0 Text1 set value '{"nbt":"result","storage":"math:io","interpret":true}' -data modify storage math:io temp.name set from block 0 11 0 Text1 - -#连接 -function math:list/shuffle/_next -scoreboard players set min int -30 -scoreboard players operation max int = tempn int -function math:_random -execute if score random int matches -30..-25 run scoreboard players set random int 0 -execute if score random int matches -24..-10 run scoreboard players set random int 1 -execute if score random int matches -9..-1 run scoreboard players set random int 2 -scoreboard players operation sloop int = random int -execute if score sloop int matches 1.. run function math:graph/randnew/sloop - -#物品 -scoreboard players set min int 0 -scoreboard players set max int 2 -function math:_random -execute if score random int matches 0 run data modify storage math:io temp.display.item set from storage math:class items[0] -execute if score random int matches 1 run data modify storage math:io temp.display.item set from storage math:class items[1] -execute if score random int matches 2 run data modify storage math:io temp.display.item set from storage math:class items[2] - -#坐标 -scoreboard players set min int -25000 -scoreboard players set max int 25000 -function math:_random -execute store result storage math:io temp.display.uvw[0] double 0.0001 run scoreboard players get random int -function math:_random -execute store result storage math:io temp.display.uvw[1] double 0.0001 run scoreboard players get random int -function math:_random -execute store result storage math:io temp.display.uvw[2] double 0.0001 run scoreboard players get random int - -data modify storage math:io sstemp.nodes append from storage math:io temp - -#循环迭代 -scoreboard players add loop int 1 -execute if score loop int < tempn int run function math:graph/randnew/loop \ No newline at end of file diff --git a/data/math/functions/graph/randnew/pre_loop.mcfunction b/data/math/functions/graph/randnew/pre_loop.mcfunction deleted file mode 100644 index 52958f4..0000000 --- a/data/math/functions/graph/randnew/pre_loop.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:graph/randnew/pre_loop -data modify storage math:io list prepend value 0 -execute store result storage math:io list[0] int 1 run scoreboard players get loop int -#循环迭代 -scoreboard players add loop int 1 -execute if score loop int < tempn int run function math:graph/randnew/pre_loop \ No newline at end of file diff --git a/data/math/functions/graph/randnew/sloop.mcfunction b/data/math/functions/graph/randnew/sloop.mcfunction deleted file mode 100644 index a0cf10c..0000000 --- a/data/math/functions/graph/randnew/sloop.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#math:graph/randnew/sloop -data modify storage math:io temp.to append from storage math:io list[0] -execute store result score stemp int run data get storage math:io list[0] -execute if score stemp int = loop int run data remove storage math:io temp.to[-1] -#循环迭代 -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:graph/randnew/sloop \ No newline at end of file diff --git a/data/math/functions/graph/test.mcfunction b/data/math/functions/graph/test.mcfunction deleted file mode 100644 index e20273d..0000000 --- a/data/math/functions/graph/test.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:graph/test -function math:graph/display/_off -function math:graph/_randnew -data modify storage math:io input set from storage math:io result -function math:graph/_ssnew -function math:graph/_display \ No newline at end of file diff --git a/data/math/functions/graph/test/run.mcfunction b/data/math/functions/graph/test/run.mcfunction deleted file mode 100644 index b25e77f..0000000 --- a/data/math/functions/graph/test/run.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:graph/test/run -execute as @e[tag=test,limit=1] run function math:graph/_get -data modify storage math:io input set from storage math:io test.phyx -function math:graph/display/_phyx -function math:graph/_display -execute as @e[tag=test,limit=1] run function math:graph/_store \ No newline at end of file diff --git a/data/math/functions/graph/test/run0.mcfunction b/data/math/functions/graph/test/run0.mcfunction deleted file mode 100644 index 0807faa..0000000 --- a/data/math/functions/graph/test/run0.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:graph/test/run0 -function math:graph/display/_off -data modify storage math:io input set from storage math:io test -function math:graph/_ssnew -function math:graph/_display \ No newline at end of file diff --git a/data/math/functions/graph/test/run1.mcfunction b/data/math/functions/graph/test/run1.mcfunction deleted file mode 100644 index a182c95..0000000 --- a/data/math/functions/graph/test/run1.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:graph/test/run1 -kill @e[tag=test] -function math:graph/display/_off - -summon marker 0 11 0 {Tags:["test"]} -data modify storage math:io input set from storage math:io test -function math:graph/_ssnew -scoreboard players set inp int 5 -function math:graph/display/_plane -execute as @e[tag=test,limit=1] run function math:graph/_store - -data modify storage math:io test.phyx set value {center:[2.0d,2.0d],center_force:0.8d,collison_r2:0.5d,collision_force:1.0d,link_force:0.1d,push_force:1.0d} \ No newline at end of file diff --git a/data/math/functions/graph/test/run2.mcfunction b/data/math/functions/graph/test/run2.mcfunction deleted file mode 100644 index ddb0797..0000000 --- a/data/math/functions/graph/test/run2.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#math:graph/test/run2 - -kill @e[tag=test] -function math:graph/display/_off - -summon marker 0 11 0 {Tags:["test"]} -data modify storage math:io input set from storage math:io test -function math:graph/_ssnew -scoreboard players set inp int 5 -function math:graph/display/_plane -execute as @e[tag=test,limit=1] run function math:graph/_store - -data modify storage math:io test.phyx set value {center:[2.0d,2.0d],center_force:0.15d,collision_r2:0.5d,link_force:0.025d,push_force:0.015d} - -scoreboard players set test_step int 1 -execute as @e[tag=test,limit=1] run function math:graph/_get -data modify storage math:io input set from storage math:io test.phyx -function math:graph/display/_phyx -function math:graph/_display -execute as @e[tag=test,limit=1] run function math:graph/_store \ No newline at end of file diff --git a/data/math/functions/graph/test/run3.mcfunction b/data/math/functions/graph/test/run3.mcfunction deleted file mode 100644 index 9039209..0000000 --- a/data/math/functions/graph/test/run3.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:graph/test/run3 -execute as @e[tag=test,limit=1] run function math:graph/_get -data modify storage math:io input set from storage math:io test.phyx -function math:graph/display/_phyx -function math:graph/_display \ No newline at end of file diff --git a/data/math/functions/init_overworld.mcfunction b/data/math/functions/init_overworld.mcfunction new file mode 100644 index 0000000..99a6047 --- /dev/null +++ b/data/math/functions/init_overworld.mcfunction @@ -0,0 +1,10 @@ +#math:init_overworld + +#空间运算区块 +function math:marker/_origin +#告示牌 +function math:marker/_sign +#世界实体 +function math:marker/_math +#转发实体 +function math:marker/_uuid \ No newline at end of file diff --git a/data/math/functions/marker/_math.mcfunction b/data/math/functions/marker/_math.mcfunction new file mode 100644 index 0000000..824ea6c --- /dev/null +++ b/data/math/functions/marker/_math.mcfunction @@ -0,0 +1,3 @@ +#math:marker/_math +kill @e[tag=math_marker,type=minecraft:marker] +summon marker 0 11 0 {Tags:["math_marker"],CustomName:'{"text":"math_marker"}',UUID:[I;0,0,-2053963776,0]} \ No newline at end of file diff --git a/data/math/functions/marker/_origin.mcfunction b/data/math/functions/marker/_origin.mcfunction new file mode 100644 index 0000000..0a01487 --- /dev/null +++ b/data/math/functions/marker/_origin.mcfunction @@ -0,0 +1,2 @@ +#math:marker/_origin +forceload add -1 -1 1 1 \ No newline at end of file diff --git a/data/math/functions/marker/_return.mcfunction b/data/math/functions/marker/_return.mcfunction new file mode 100644 index 0000000..c938689 --- /dev/null +++ b/data/math/functions/marker/_return.mcfunction @@ -0,0 +1,3 @@ +#math:marker/_return +tp @s 0 11 0 +data modify entity @s data set value {} \ No newline at end of file diff --git a/data/math/functions/marker/_sign.mcfunction b/data/math/functions/marker/_sign.mcfunction new file mode 100644 index 0000000..6d90467 --- /dev/null +++ b/data/math/functions/marker/_sign.mcfunction @@ -0,0 +1,3 @@ +#math:marker/_sign +forceload add 29999984 8591 29999984 8591 +setblock 29999984 0 8591 oak_sign \ No newline at end of file diff --git a/data/math/functions/marker/_uuid.mcfunction b/data/math/functions/marker/_uuid.mcfunction new file mode 100644 index 0000000..790bf44 --- /dev/null +++ b/data/math/functions/marker/_uuid.mcfunction @@ -0,0 +1,3 @@ +#math:marker/_uuid +kill @e[tag=uuid_marker,type=minecraft:item] +summon item 0 -67 0 {Tags:["uuid_marker"],UUID:[I;0,0,-2053963776,1],NoGravity:1b,PickupDelay:32767s,CustomName:'{"text":"uuid_marker"}',Item:{id:"minecraft:glass",Count:1b}} \ No newline at end of file diff --git a/data/math/functions/math_marker.mcfunction b/data/math/functions/math_marker.mcfunction deleted file mode 100644 index d9d1386..0000000 --- a/data/math/functions/math_marker.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#刷新世界实体 -kill @e[tag=math_marker] -summon marker 0 11 0 {Tags:["math_marker"],CustomName:'{"text":"math_marker"}'} \ No newline at end of file diff --git a/data/math/functions/obj_entity/_new.mcfunction b/data/math/functions/obj_entity/_new.mcfunction new file mode 100644 index 0000000..f3fa655 --- /dev/null +++ b/data/math/functions/obj_entity/_new.mcfunction @@ -0,0 +1,3 @@ +#math:obj/_entity + +execute summon marker run function math:obj_entity/new_set \ No newline at end of file diff --git a/data/math/functions/obj_entity/set.mcfunction b/data/math/functions/obj_entity/set.mcfunction new file mode 100644 index 0000000..49b2d69 --- /dev/null +++ b/data/math/functions/obj_entity/set.mcfunction @@ -0,0 +1,4 @@ +#math:obj_entity/set +execute store result score @s id run scoreboard players add #id id 1 +data modify entity @s Tags set value ["obj_entity"] +data modify storage math:io result set from entity @s UUID \ No newline at end of file diff --git a/data/math/functions/set/_append.mcfunction b/data/math/functions/set/_append.mcfunction new file mode 100644 index 0000000..ef2d590 --- /dev/null +++ b/data/math/functions/set/_append.mcfunction @@ -0,0 +1,12 @@ +#math:set/_append +#需要传入世界实体为执行者 +data modify block 29999984 0 8591 back_text.messages[0] set value '{"nbt":"input","storage":"math:io"}' + +data modify entity @s Tags set from storage math:io set_tags +data modify entity @s Tags append from block 29999984 0 8591 back_text.messages[0] +data modify storage math:io set_tags set from entity @s Tags + +execute store result score sstemp int if data storage math:io set_tags[] +execute if score sstemp int > set_cnt int run function math:set/append_success + +data modify entity @s Tags set value ["math_marker"] \ No newline at end of file diff --git a/data/math/functions/set/_diff.mcfunction b/data/math/functions/set/_diff.mcfunction deleted file mode 100644 index 3d4ebdb..0000000 --- a/data/math/functions/set/_diff.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:set/_diff -#结果置空 -data modify storage math:io result set value [] - -#获得input集合有多少项 -execute store result score stemp1 int if data storage math:io input[] - -#遍历被减集合每一项 -data modify storage math:io stemp set from storage math:io set -execute store result score sloop int if data storage math:io stemp[] -execute if score sloop int matches 1.. run function math:set/diff_loop \ No newline at end of file diff --git a/data/math/functions/set/_ex-string.mcfunction b/data/math/functions/set/_ex-string.mcfunction deleted file mode 100644 index e5f3f3f..0000000 --- a/data/math/functions/set/_ex-string.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#math:set/_ex-string -#输出置为空 -data modify storage math:io string_set set value [] -#遍历集合每一项 -data modify storage math:io stemp set from storage math:io set -execute store result score sloop int if data storage math:io stemp[] -execute if score sloop int matches 1.. run function math:set/string_loop \ No newline at end of file diff --git a/data/math/functions/set/_issetof.mcfunction b/data/math/functions/set/_issetof.mcfunction deleted file mode 100644 index 4359302..0000000 --- a/data/math/functions/set/_issetof.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#math:set/_issetof -#集合转移到临时数据 -data modify storage math:io stemp set from storage math:io set -#获得长度 -execute store result score stemp1 int if data storage math:io stemp[] -execute store result score stemp0 int run data modify storage math:io stemp[] set from storage math:io input -#比较长度返回结果 -execute store result score res int unless score stemp0 int = stemp1 int \ No newline at end of file diff --git a/data/math/functions/set/_ssnew.mcfunction b/data/math/functions/set/_ssnew.mcfunction new file mode 100644 index 0000000..d75bc0b --- /dev/null +++ b/data/math/functions/set/_ssnew.mcfunction @@ -0,0 +1,4 @@ +#math:set/_ssnew +data modify storage math:io set set value [] +data modify storage math:io set_tags set value [] +scoreboard players set set_cnt int 0 \ No newline at end of file diff --git a/data/math/functions/set/_tagsdiff.mcfunction b/data/math/functions/set/_tagsdiff.mcfunction deleted file mode 100644 index e0d4158..0000000 --- a/data/math/functions/set/_tagsdiff.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#math:set/_tagsdiff -#输入math_marker为执行者 -data modify entity @s Tags set value [] -#结果置空 -data modify storage math:io result set value [] -#临时告示牌 -setblock 0 11 0 air -setblock 0 11 0 oak_sign - -#减集合字符串 -execute store result score stemp_l int if data storage math:io string_input[] -data modify entity @s Tags set from storage math:io string_input - -#遍历被减集合每一项 -data modify storage math:io stemp set from storage math:io set -execute store result score sloop int if data storage math:io stemp[] -execute if score sloop int matches 1.. run function math:set/tagsdiff_loop - -#tag复原 -data modify entity @s Tags set value ["math_marker"] \ No newline at end of file diff --git a/data/math/functions/set/_tagsof.mcfunction b/data/math/functions/set/_tagsof.mcfunction deleted file mode 100644 index 6984280..0000000 --- a/data/math/functions/set/_tagsof.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#math:set/_tagsof -#输入math_marker为执行者，Tags置为待判集合字符串 -data modify entity @s Tags set from storage math:io string_set - -#获得前后长度 -execute store result score stemp0 int if data storage math:io string_set[] -setblock 0 11 0 air -setblock 0 11 0 oak_sign{Text1:'{"nbt":"input","storage":"math:io"}'} -data modify entity @s Tags append from block 0 11 0 Text1 -execute store result score stemp1 int if data entity @s Tags[] - -#比较长度获得输出 -execute store result score res int if score stemp0 int = stemp1 int - -#tag复原 -data modify entity @s Tags set value ["math_marker"] \ No newline at end of file diff --git a/data/math/functions/set/append_success.mcfunction b/data/math/functions/set/append_success.mcfunction new file mode 100644 index 0000000..801da03 --- /dev/null +++ b/data/math/functions/set/append_success.mcfunction @@ -0,0 +1,3 @@ +#math:set/append_success +data modify storage math:io set append from storage math:io input +scoreboard players add set_cnt int 1 \ No newline at end of file diff --git a/data/math/functions/set/diff_loop.mcfunction b/data/math/functions/set/diff_loop.mcfunction deleted file mode 100644 index a62ab4b..0000000 --- a/data/math/functions/set/diff_loop.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#math:set/diff_loop -#检查stemp[0]是否在input中未出现 -data modify storage math:io stemp_set set from storage math:io input -execute store result score stemp0 int run data modify storage math:io stemp_set[] set from storage math:io stemp[0] -execute if score stemp0 int = stemp1 int run data modify storage math:io result append from storage math:io stemp[0] - -#递归迭代 -data remove storage math:io stemp[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:set/diff_loop \ No newline at end of file diff --git a/data/math/functions/set/string_loop.mcfunction b/data/math/functions/set/string_loop.mcfunction deleted file mode 100644 index ab12328..0000000 --- a/data/math/functions/set/string_loop.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#math:set/string_loop -#stemp[0]字符串化后加入string_set -data modify block 0 11 0 Text1 set value '{"nbt":"stemp[0]","storage":"math:io"}' -data modify storage math:io string_set append from block 0 11 0 Text1 - -#递归迭代 -data remove storage math:io stemp[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:set/string_loop \ No newline at end of file diff --git a/data/math/functions/set/tagsdiff_loop.mcfunction b/data/math/functions/set/tagsdiff_loop.mcfunction deleted file mode 100644 index 76107f4..0000000 --- a/data/math/functions/set/tagsdiff_loop.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#math:set/tagsdiff_loop -#检查stemp[0]是否在input中未出现 -data modify block 0 11 0 Text1 set value '{"nbt":"stemp[0]","storage":"math:io"}' -data modify entity @s Tags append from block 0 11 0 Text1 -execute store result score stempl int if data entity @s Tags[] -execute if score stempl int > stemp_l int run data modify storage math:io result append from storage math:io stemp[0] -#长度状态转移 -scoreboard players operation stemp_l int = stempl int - -#递归迭代 -data remove storage math:io stemp[0] -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. run function math:set/tagsdiff_loop \ No newline at end of file diff --git a/data/math/functions/test.mcf b/data/math/functions/test.mcf deleted file mode 100644 index 6034e99..0000000 --- a/data/math/functions/test.mcf +++ /dev/null @@ -1,186 +0,0 @@ -#math:test - -构造方式:function - ·依次执行与嵌套执行 - ·函数层级与s命名法 - -构造方式:execute - 实时解析与预解析 - execute嵌套问题 - -·分支 - ·简单分支 - 前后无关性问题 - 嵌套的化解:顺序化分支 - 条件的与或非运算 - 条件频率与开销 - ·记分板树 - 长度与分支因子x - 非整数类型的记分板树 - -·常用调试技巧 - ·测试方法 - ·黑箱测试 - ·可视化测试 - ·搜索异常 - ·直觉与经验 - ·执果索因 - ·断点信息 - ·日志法 - -定时炸弹的数据模板： -{time:0,power:0,pos:[0.0d,0.0d,0.0d],rot:[0.0f,0.0f]} - -#timebomb:_new -#执行者是世界实体 -tp @s ~ ~ ~ ~ ~ -execute unless data storage math:io input.pos run data modify storage math:io input.pos set from entity @s Pos -execute unless data storage math:io input.rot run data modify storage math:io input.rot set from entity @s Rotation -tag @e remove result -summon marker 0 11 0 {Tags:["result"]} -execute as @e[tag=result,limit=1] run function timebomb:set - -#timebomb:set -execute store result score @s id run scoreboard players add #id int 1 -data modify entity @s Pos set from storage math:io input.pos -data modify entity @s Rotation set from storage math:io input.rot -data modify entity @s data.power set from storage math:io input.power -execute store result score temp int run data get storage math:io input.time -data modify storage math:io input set value {cmd:"execute as @e[tag=as_entity,limit=1] at @s run function timebomb:explode"} -execute store result storage math:io input.time int 1 run scoreboard players operation temp int += gametime int -function timer:_setas -function timer:_new - -#timebomb:explode -summon creeper 0 11 0 {Tags:["tmp"],Fuse:0} -data modify entity @e[tag=tmp,limit=1] ExplosionRadius set from entity @s data.power -tp @e[tag=tmp,limit=1] ~ ~ ~ -kill @s - -#假设有两个实体 -scoreboard players set test int 0 -execute as @e if score test int matches 0 store result score test if if score test int matches 0 - -#shoot -execute anchored eyes run summon fireball ^ ^ ^0.5 {Tags:["tmp"]} -execute positioned 0.0 0.0 0.0 as @e[tag=tmp,limit=1] run function #set_velocity - -#set_velocity -tp @e[tag=math_marker,limit=1] ^ ^ ^1.5 -data modify entity @s power set from entity @e[tag=math_marker,limit=1] Pos -tag @s remove tmp - -#state_trans -data modify storage math:io input set value {cmd:"execute as @e[tag=dcmd_as,limit=1] store result score @s state run data get storage math:io run_space.state",time:10} -data modify storage math:io input.uuid set from entity @s UUID - -function math:_rand -scoreboard players operation random int %= 2 int -execute if score @s state matches 1 run scoreboard players set random int 1 -execute if score @s state matches 2 run scoreboard players set random int -1 -execute store result storage math:io input.run_space.state int 1 run scoreboard players add random int 1 - -function timer:_new - -func _topos{ - #传入世界实体为执行者，输入编号，输出到世界实体的坐标 - scoreboard players operation stempy int = inp int - scoreboard players operation stempz int = inp int - - scoreboard players operation stempy int /= area_xz int - execute store result entity @s Pos[1] double 1 run scoreboard players operation stempy int += start_y int - scoreboard players operation stempz int %= area_xz int - - scoreboard players operation stempx int = stempz int - scoreboard players operation stempz int /= len_x int - execute store result entity @s Pos[2] double 1 run scoreboard players operation stempz int += start_z int - - scoreboard players operation stempx int %= len_x int - execute store result entity @s Pos[0] double 1 run scoreboard players operation stempx int += start_x int - - #对齐到方块中心 - execute at @s run tp @s ~0.5 ~0.5 ~0.5 -} - -func _posto{ - #传入世界实体为执行者，输入执行坐标，输出编号 - execute align xyz run tp @s ~0.5 ~0.5 ~0.5 - execute store result score res int run data get entity @s Pos[0] - execute store result score stempy int run data get entity @s Pos[1] - execute store result score stempz int run data get entity @s Pos[2] - scoreboard players operation res int -= start_x int - scoreboard players operation stempy int -= start_y int - scoreboard players operation stempz int -= start_z int - - scoreboard players operation stempy int *= area_xz int - scoreboard players operation stempz int *= len_x int - scoreboard players operation res int += stempy int - scoreboard players operation res int += stempz int -} - -type{ - string s; - int key,cnt; - list ptrs,same; - bool tag; -} node; - -list top; - -#全部元素节点输入到top列表，初始cnt为0，ptrs和same为空，tag为true -input(top); - -while(true) -{ - int i=0,n=len(top); - if(n<1) break; - if(n==1) - { - int j=0,l=len(top[0].ptrs); - while(j>,n=len(top); - } - while(itop[0].key) top[0].ptrs<<&top[1],top[1].tag=false,top[0].cnt++; - else if(top[1].key>; - } -} - -#loop -data modify storage math:io list prepend from storage math:io list[-1] -data remove storage math:io list[-1] -execute if ... run function #loop -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] - -execute as @e[tag=math_marker,limit=1] run function math:qrot/facing/_2toxyzw -execute as @e[tag=math_marker,limit=1] run function math:qrot/pose/_xyzwto -scoreboard players set u int 0 -scoreboard players set v int 0 -scoreboard players set w int 10000 -function math:qrot/axis/_uvwto - -scoreboard players set qror_alpha int 225000 -execute as @e[tag=math_marker,limit=1] run function math:qrot/_xyzw -execute as @e[tag=math_marker,limit=1] run function math:qrot/pose/_xyzwto -scoreboard players set u int 0 -scoreboard players set v int 10000 -scoreboard players set w int 0 -function math:qrot/axis/_uvwto - -scoreboard players set qror_alpha int 225000 -execute as @e[tag=math_marker,limit=1] run function math:qrot/_stoxyzw \ No newline at end of file diff --git a/data/math/functions/test/aecbox.mcfunction b/data/math/functions/test/aecbox.mcfunction deleted file mode 100644 index 861e1d9..0000000 --- a/data/math/functions/test/aecbox.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/aecbox -tellraw @a "---" -tellraw @a {"nbt":"Radius","entity":"@s"} -execute rotated 0.0 -90.0 run function math:cbox/vanilla/_detect \ No newline at end of file diff --git a/data/math/functions/test/cbox.mcfunction b/data/math/functions/test/cbox.mcfunction deleted file mode 100644 index 2615c07..0000000 --- a/data/math/functions/test/cbox.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#math:test/cbox -scoreboard players operation test_seed int = rand_seed int -#scoreboard players operation rand_seed int = test_seed int -kill @e[tag=cbox] -function math:cbox/_randnew -tag @e[tag=result,limit=1] add test - -execute as @e[tag=cbox,limit=1] run function math:cbox/_get -function math:cbox/_center -execute at @s run function math:_xyz -function math:3vec/_ssrandnew -scoreboard players operation y int = @e[tag=cbox,limit=1] y -scoreboard players set 3vec_y int 4000 -function math:3vec/_topos - -kill @e[tag=sector] -execute at @s run function math:geom/sector/_randnew -tag @e[tag=result,limit=1] add test - -execute as @e[tag=cbox,limit=1] run function math:cbox/_get -execute as @e[tag=sector,limit=1] run function math:cbox/_sector -scoreboard players set test_res int 6 -execute if score res int matches 1 run scoreboard players set test_res int 4 -execute if score res int matches 1 run say hit！ \ No newline at end of file diff --git a/data/math/functions/test/cbox_dsp.mcfunction b/data/math/functions/test/cbox_dsp.mcfunction deleted file mode 100644 index 4c0763a..0000000 --- a/data/math/functions/test/cbox_dsp.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#math:test/cbox -execute as @e[tag=test,tag=cbox,limit=1] run function math:cbox/_get -scoreboard players operation particle int = test_res int -scoreboard players set 3vec_n int 50 -execute as @e[tag=math_marker,limit=1] run function math:cbox/_dsp - -execute as @e[tag=test,tag=sector,limit=1] run function math:geom/sector/_get -scoreboard players operation particle int = test int -scoreboard players set arc_n int 50 -execute as @e[tag=math_marker,limit=1] run function math:geom/sector/_dsp \ No newline at end of file diff --git a/data/math/functions/test/cbox_vanilla.mcfunction b/data/math/functions/test/cbox_vanilla.mcfunction deleted file mode 100644 index 6f18c62..0000000 --- a/data/math/functions/test/cbox_vanilla.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -function math:_posto -function math:cbox/vanilla/_load -function math:cbox/_get -scoreboard players operation sstemp int = h int -scoreboard players operation sstemp int /= 2 int -execute if entity @s[type=painting] run scoreboard players operation y int -= sstemp int -execute if entity @s[type=item_frame] run scoreboard players operation y int -= sstemp int -execute if entity @s[type=glow_item_frame] run scoreboard players operation y int -= sstemp int -execute as @e[tag=math_marker,limit=1] run function math:cbox/_dsp \ No newline at end of file diff --git a/data/math/functions/test/circle.mcfunction b/data/math/functions/test/circle.mcfunction deleted file mode 100644 index 675dfd6..0000000 --- a/data/math/functions/test/circle.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/circle -particle end_rod ^ ^ ^5.0 0.0 0.0 0.0 0.0 1 force @a -particle end_rod ^ ^ ^-5.0 0.0 0.0 0.0 0.0 1 force @a \ No newline at end of file diff --git a/data/math/functions/test/cube.mcfunction b/data/math/functions/test/cube.mcfunction deleted file mode 100644 index 31426a2..0000000 --- a/data/math/functions/test/cube.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#math:test/cube -#生成均匀点阵 -data modify storage math:io list set value [] -scoreboard players set loop int 4069 -function math:test/cube_loop -#随机打乱 -function math:list/_shuffle \ No newline at end of file diff --git a/data/math/functions/test/cube_loop.mcfunction b/data/math/functions/test/cube_loop.mcfunction deleted file mode 100644 index d2ba011..0000000 --- a/data/math/functions/test/cube_loop.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#math:test/cube_loop -#生成 -data modify storage math:io list prepend value [0.0d,0.0d,0.0d] - -#z坐标 -scoreboard players operation tempz int = loop int -scoreboard players operation tempx int = loop int -scoreboard players operation tempz int /= 256 int -execute store result storage math:io list[0][2] double 1 run scoreboard players remove tempz int 8 - -#xy坐标 -scoreboard players operation tempx int %= 256 int -scoreboard players operation tempy int = tempx int -scoreboard players operation tempy int /= 16 int -execute store result storage math:io list[0][1] double 1 run scoreboard players remove tempy int 8 -scoreboard players operation tempx int %= 16 int -execute store result storage math:io list[0][0] double 1 run scoreboard players remove tempx int 8 - -#递归迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:test/cube_loop \ No newline at end of file diff --git a/data/math/functions/test/dcmd.mcfunction b/data/math/functions/test/dcmd.mcfunction deleted file mode 100644 index 329548c..0000000 --- a/data/math/functions/test/dcmd.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:test/dcmd -function dcmd:_reset -function dcmd:_setas -data modify storage dcmd:io input.strings set value ['["scoreboard players set test int ",{"score":{"name":"test","objective":"int"}}]'] -data modify storage dcmd:io input.return set value "tellraw @a 123" -function dcmd:_interpret -function dcmd:_new - -#循环 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:test/dcmd \ No newline at end of file diff --git a/data/math/functions/test/dfs.mcfunction b/data/math/functions/test/dfs.mcfunction deleted file mode 100644 index c18e5f8..0000000 --- a/data/math/functions/test/dfs.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/dfs -setblock ~ ~ ~ command_block{auto:1b,Command:"setblock ~ ~ ~ air"} -execute if score explode int matches 1.. run function math:test/dfs_call \ No newline at end of file diff --git a/data/math/functions/test/dfs_call.mcfunction b/data/math/functions/test/dfs_call.mcfunction deleted file mode 100644 index 5ad676f..0000000 --- a/data/math/functions/test/dfs_call.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:test/dfs_call -scoreboard players remove explode int 1 - -execute positioned ~1 ~ ~ unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs -execute positioned ~ ~1 ~ unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs -execute positioned ~ ~ ~1 unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs -execute positioned ~-1 ~ ~ unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs -execute positioned ~ ~-1 ~ unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs -execute positioned ~ ~ ~-1 unless block ~ ~ ~ glass unless block ~ ~ ~ command_block run function math:test/dfs - -scoreboard players add explode int 1 \ No newline at end of file diff --git a/data/math/functions/test/entity_cnt.mcfunction b/data/math/functions/test/entity_cnt.mcfunction deleted file mode 100644 index a082754..0000000 --- a/data/math/functions/test/entity_cnt.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#math:test/entity_50 -kill @e[tag=cnt_entity] -execute store result score temp int if entity @e -scoreboard players operation loop int = entity_cnt int -scoreboard players operation loop int -= temp int -execute if score loop int matches 1.. run function math:test/entity_loop \ No newline at end of file diff --git a/data/math/functions/test/entity_loop.mcfunction b/data/math/functions/test/entity_loop.mcfunction deleted file mode 100644 index 4e0862e..0000000 --- a/data/math/functions/test/entity_loop.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:test/entity_loop -summon marker 0 11 0 {Tags:["cnt_entity"]} -#递归迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:test/entity_loop \ No newline at end of file diff --git a/data/math/functions/test/f0.mcfunction b/data/math/functions/test/f0.mcfunction deleted file mode 100644 index 5542f52..0000000 --- a/data/math/functions/test/f0.mcfunction +++ /dev/null @@ -1,40 +0,0 @@ -#math:test/f0 -#计算点乘 -scoreboard players operation tempd int = x int -scoreboard players operation tempd int *= i0 int -scoreboard players operation temp0 int = y int -scoreboard players operation temp0 int *= i1 int -scoreboard players operation tempd int += temp0 int -scoreboard players operation temp0 int = z int -scoreboard players operation temp0 int *= i2 int -scoreboard players operation tempd int += temp0 int -scoreboard players operation temp0 int = tempd int -scoreboard players operation tempd int /= 1000 int -scoreboard players operation temp0 int %= 1000 int - -#计算点乘平方 -scoreboard players operation temp0 int *= tempd int -scoreboard players operation temp0 int *= 2 int -scoreboard players operation temp0 int /= 1000 int -scoreboard players operation tempd2 int = tempd int -scoreboard players operation tempd2 int *= tempd int -scoreboard players operation tempd2 int += temp0 int - -#计算模长平方 -scoreboard players operation templ2 int = x int -scoreboard players operation templ2 int *= x int -scoreboard players operation temp0 int = y int -scoreboard players operation temp0 int *= y int -scoreboard players operation templ2 int += temp0 int -scoreboard players operation temp0 int = z int -scoreboard players operation temp0 int *= z int -scoreboard players operation templ2 int += temp0 int - -#开根号 -scoreboard players operation inp int = r int -scoreboard players operation inp int *= r int -scoreboard players operation inp int += tempd2 int -scoreboard players operation inp int -= templ2 int -function math:_sqrt -scoreboard players operation res int -= tempd int -execute if score inp int matches ..-1 run scoreboard players set res int 0 \ No newline at end of file diff --git a/data/math/functions/test/facing.mcfunction b/data/math/functions/test/facing.mcfunction deleted file mode 100644 index a8c2644..0000000 --- a/data/math/functions/test/facing.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#math:test/facing -tp @s 0.0 0.0 0.0 ~ ~ -execute store result entity @s Rotation[0] float -0.0001 run data get entity @s Rotation[0] 5000 -execute at @s rotated ~ 0.0 run tp @s ^ ^ ^1.0 -execute store result score c1 int run data get entity @s Pos[2] 10000 -execute store result score s1 int run data get entity @s Pos[0] 10000 - -execute store result entity @s Rotation[0] float -0.0001 run data get entity @s Rotation[1] 5000 -execute at @s rotated ~ 0.0 positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score c0 int run data get entity @s Pos[2] 10000 -execute store result score s0 int run data get entity @s Pos[0] 10000 - -scoreboard players operation temp int = s0 int -execute store result storage math:io xyzw[0] float 0.00000001 run scoreboard players operation temp int *= c1 int -scoreboard players operation temp int = c0 int -execute store result storage math:io xyzw[1] float -0.00000001 run scoreboard players operation temp int *= s1 int -execute store result storage math:io xyzw[2] float 0.00000001 run scoreboard players operation s0 int *= s1 int -execute store result storage math:io xyzw[3] float 0.00000001 run scoreboard players operation c0 int *= c1 int \ No newline at end of file diff --git a/data/math/functions/test/float.mcfunction b/data/math/functions/test/float.mcfunction deleted file mode 100644 index 6f6bfa3..0000000 --- a/data/math/functions/test/float.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:test/float -tellraw @a "---float_test---" -function math:hpo/float/_ssrandnew -function math:hpo/float/_ssprint -function math:hpo/float/_store -function math:hpo/float/_ssrandnew -function math:hpo/float/_ssprint -function math:hpo/float/_div -function math:hpo/float/_ssprint -function math:hpo/float/todata/_double -tellraw @a {"nbt":"double","storage":"math:io"} \ No newline at end of file diff --git a/data/math/functions/test/get_ijk.mcfunction b/data/math/functions/test/get_ijk.mcfunction deleted file mode 100644 index f9da404..0000000 --- a/data/math/functions/test/get_ijk.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#math:test/get_ijk -tp @s ^1.0 ^ ^ -execute store result score tempi0 int run data get entity @s Pos[0] 1000 -execute store result score tempi2 int run data get entity @s Pos[2] 1000 - -tp @s ^ ^1.0 ^ -execute store result score tempj0 int run data get entity @s Pos[0] 1000 -execute store result score tempj1 int run data get entity @s Pos[1] 1000 -execute store result score tempj2 int run data get entity @s Pos[2] 1000 \ No newline at end of file diff --git a/data/math/functions/test/get_sincos.mcfunction b/data/math/functions/test/get_sincos.mcfunction deleted file mode 100644 index 8b4bf37..0000000 --- a/data/math/functions/test/get_sincos.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:test/get_sincos -execute store result entity @s Rotation[0] float -1 run scoreboard players get t int -execute at @s rotated ~ 0.0 positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score u int run data get entity @s Pos[2] 10000 -execute store result score v int run data get entity @s Pos[0] 10000 \ No newline at end of file diff --git a/data/math/functions/test/hanoi/call.mcfunction b/data/math/functions/test/hanoi/call.mcfunction deleted file mode 100644 index 84052a2..0000000 --- a/data/math/functions/test/hanoi/call.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#hanoi/call -data modify storage math:io rec[0] set from storage math:io input -function math:test/hanoi/rec \ No newline at end of file diff --git a/data/math/functions/test/hanoi/next.mcfunction b/data/math/functions/test/hanoi/next.mcfunction deleted file mode 100644 index e6e4480..0000000 --- a/data/math/functions/test/hanoi/next.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#hanoi/next -data modify storage math:io temp set from storage math:io rec[0].chars[2] -data modify storage math:io rec[0].chars[2] set from storage math:io rec[0].chars[1] -data modify storage math:io rec[0].chars[1] set from storage math:io temp -execute store result storage math:io rec[0].n int 1 run scoreboard players remove n int 1 -function math:test/hanoi/rec -tellraw @a [{"nbt":"rec[1].chars[0]","storage":"math:io"},{"text":"->"},{"nbt":"rec[1].chars[2]","storage":"math:io"}] -data modify storage math:io rec[0].chars set from storage math:io rec[1].chars -data modify storage math:io temp set from storage math:io rec[0].chars[1] -data modify storage math:io rec[0].chars[1] set from storage math:io rec[0].chars[0] -data modify storage math:io rec[0].chars[0] set from storage math:io temp -function math:test/hanoi/rec \ No newline at end of file diff --git a/data/math/functions/test/hanoi/print.mcfunction b/data/math/functions/test/hanoi/print.mcfunction deleted file mode 100644 index 6bad36a..0000000 --- a/data/math/functions/test/hanoi/print.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#hanoi/print -execute store result score temp0 int run data get entity @s Pos[1] -execute store result score temp1 int run data get entity @s Pos[2] -#获取第一个输出字符 -execute if score temp0 int matches 0 run data modify storage math:io temp.char0 set from storage math:io input.chars[0] -execute if score temp0 int matches 1 run data modify storage math:io temp.char0 set from storage math:io input.chars[1] -execute if score temp0 int matches 2 run data modify storage math:io temp.char0 set from storage math:io input.chars[2] -#获取第二个输出字符 -execute if score temp1 int matches 0 run data modify storage math:io temp.char1 set from storage math:io input.chars[0] -execute if score temp1 int matches 1 run data modify storage math:io temp.char1 set from storage math:io input.chars[1] -execute if score temp1 int matches 2 run data modify storage math:io temp.char1 set from storage math:io input.chars[2] -#输出 -tellraw @a [{"nbt":"temp.char0","storage":"math:io"},{"text":"->"},{"nbt":"temp.char1","storage":"math:io"}] \ No newline at end of file diff --git a/data/math/functions/test/hanoi/rec.mcfunction b/data/math/functions/test/hanoi/rec.mcfunction deleted file mode 100644 index 48eff4b..0000000 --- a/data/math/functions/test/hanoi/rec.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#hanoi/rec -#注意这里是prepend from而不是prepend value，它不仅实现了栈空间，还实现了类似于execute执行方式的继承性。 -data modify storage math:io rec prepend from storage math:io rec[0] -execute store result score n int run data get storage math:io rec[1].n -execute if score n int matches 1 run tellraw @a [{"nbt":"rec[1].chars[0]","storage":"math:io"},{"text":"->"},{"nbt":"rec[1].chars[2]","storage":"math:io"}] -execute if score n int matches 2.. run function math:test/hanoi/next -data remove storage math:io rec[0] \ No newline at end of file diff --git a/data/math/functions/test/init.mcfunction b/data/math/functions/test/init.mcfunction deleted file mode 100644 index a69f4a4..0000000 --- a/data/math/functions/test/init.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/init -scoreboard objectives add t dummy -scoreboard objectives add r dummy \ No newline at end of file diff --git a/data/math/functions/test/kill_another.mcfunction b/data/math/functions/test/kill_another.mcfunction deleted file mode 100644 index 30d3991..0000000 --- a/data/math/functions/test/kill_another.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/kill_another -tag @s add tmp -kill @e[tag=input,tag=!tmp,limit=1,sort=random] -tag @s remove tmp \ No newline at end of file diff --git a/data/math/functions/test/kill_each_other.mcfunction b/data/math/functions/test/kill_each_other.mcfunction deleted file mode 100644 index bce0a9d..0000000 --- a/data/math/functions/test/kill_each_other.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#math:test/kill_each_other -tag @e remove input -summon marker 0 11 0 {Tags:["input"],CustomName:'{"text":"A"}'} -summon marker 0 11 0 {Tags:["input"],CustomName:'{"text":"B"}'} -summon marker 0 11 0 {Tags:["input"],CustomName:'{"text":"C"}'} -summon marker 0 11 0 {Tags:["input"],CustomName:'{"text":"D"}'} -summon marker 0 11 0 {Tags:["input"],CustomName:'{"text":"E"}'} - -execute as @e[tag=input,sort=random] run function math:test/kill_another - -say @e[tag=input] \ No newline at end of file diff --git a/data/math/functions/test/line.mcfunction b/data/math/functions/test/line.mcfunction deleted file mode 100644 index 589ee97..0000000 --- a/data/math/functions/test/line.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/line -scoreboard players operation loop int = length int -execute if score loop int matches 1.. run function math:test/line_loop \ No newline at end of file diff --git a/data/math/functions/test/line_loop.mcfunction b/data/math/functions/test/line_loop.mcfunction deleted file mode 100644 index ee1b531..0000000 --- a/data/math/functions/test/line_loop.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:test/line_loop -particle end_rod ~ ~ ~ 0.0 0.0 0.0 0.0 1 force @a -#循环迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. positioned ^ ^ ^0.1 run function math:test/line_loop \ No newline at end of file diff --git a/data/math/functions/test/loop.mcfunction b/data/math/functions/test/loop.mcfunction deleted file mode 100644 index 20aab2d..0000000 --- a/data/math/functions/test/loop.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/loop -execute if entity @e -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:test/loop \ No newline at end of file diff --git a/data/math/functions/test/loop0.mcfunction b/data/math/functions/test/loop0.mcfunction deleted file mode 100644 index 8aedf8b..0000000 --- a/data/math/functions/test/loop0.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#loop0 -#循环操作:进入第二重循环 -scoreboard players set sloop int 60 -function math:test/loop1 -#循环状态迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. rotated 0.0 ~6.0 run function math:test/loop0 \ No newline at end of file diff --git a/data/math/functions/test/loop1.mcfunction b/data/math/functions/test/loop1.mcfunction deleted file mode 100644 index 3e3f699..0000000 --- a/data/math/functions/test/loop1.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#loop1 -#循环操作 -particle end_rod ^ ^ ^5.0 -#循环状态迭代 -scoreboard players remove sloop int 1 -execute if score sloop int matches 1.. rotated ~6.0 ~ run function math:test/loop1 \ No newline at end of file diff --git a/data/math/functions/test/loop2.mcfunction b/data/math/functions/test/loop2.mcfunction deleted file mode 100644 index aec6494..0000000 --- a/data/math/functions/test/loop2.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/loop2 -particle end_rod ^ ^ ^5.0 0.0 0.0 0.0 0.0 1 force @a -scoreboard players remove loop int 1 -execute if score loop int matches 1.. facing ^0.1 ^ ^10.0 run function math:test/loop2 \ No newline at end of file diff --git a/data/math/functions/test/loop3.mcfunction b/data/math/functions/test/loop3.mcfunction deleted file mode 100644 index 97e93d2..0000000 --- a/data/math/functions/test/loop3.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#math:test/loop3 -tp @s ~ ~ ~ ~ 0.0 -scoreboard players set sloop int 0 -execute if score sloop int matches ..19 run function math:test/loop4 -#循环状态迭代 -scoreboard players remove loop int 1 -execute if score loop int matches 1.. rotated ~6.0 0.0 run function math:test/loop3 \ No newline at end of file diff --git a/data/math/functions/test/loop4.mcfunction b/data/math/functions/test/loop4.mcfunction deleted file mode 100644 index fe47993..0000000 --- a/data/math/functions/test/loop4.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#math:test/loop4 -scoreboard players operation stemp int = sloop int -scoreboard players operation stemp int *= 94248 int -execute store result entity @s Rotation[1] float 0.0001 run scoreboard players remove stemp int 900000 -execute at @s run particle end_rod ^ ^ ^5.0 -#循环迭代 -scoreboard players add sloop int 1 -execute if score sloop int matches ..19 run function math:test/loop4 \ No newline at end of file diff --git a/data/math/functions/test/mine.mcfunction b/data/math/functions/test/mine.mcfunction deleted file mode 100644 index 8aafcb1..0000000 --- a/data/math/functions/test/mine.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -setblock ~ ~ ~ air destroy -execute positioned ~1 ~ ~ if block ~ ~ ~ diamond_ore run function math:test/mine -execute positioned ~-1 ~ ~ if block ~ ~ ~ diamond_ore run function math:test/mine -execute positioned ~ ~1 ~ if block ~ ~ ~ diamond_ore run function math:test/mine -execute positioned ~ ~-1 ~ if block ~ ~ ~ diamond_ore run function math:test/mine -execute positioned ~ ~ ~1 if block ~ ~ ~ diamond_ore run function math:test/mine -execute positioned ~ ~ ~-1 if block ~ ~ ~ diamond_ore run function math:test/mine \ No newline at end of file diff --git a/data/math/functions/test/move.mcfunction b/data/math/functions/test/move.mcfunction deleted file mode 100644 index 04ccbe6..0000000 --- a/data/math/functions/test/move.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#math:test/move -#调用F() -function math:test/f0 - -#移动 -scoreboard players operation res_x int = i0 int -scoreboard players operation res_y int = i1 int -scoreboard players operation res_z int = i2 int -scoreboard players operation res_x int *= res int -scoreboard players operation res_y int *= res int -scoreboard players operation res_z int *= res int -scoreboard players operation res_x int /= 1000 int -scoreboard players operation res_y int /= 1000 int -scoreboard players operation res_z int /= 1000 int -scoreboard players operation res_x int += x int -scoreboard players operation res_y int += y int -scoreboard players operation res_z int += z int \ No newline at end of file diff --git a/data/math/functions/test/move_loop.mcfunction b/data/math/functions/test/move_loop.mcfunction deleted file mode 100644 index fa47240..0000000 --- a/data/math/functions/test/move_loop.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#math:test/move_loop -#投影 -execute as @e[tag=math_marker,limit=1] run function math:test/rand_uvec -execute store result score x int run data get storage math:io list[0][0] 1000 -execute store result score y int run data get storage math:io list[0][1] 1000 -execute store result score z int run data get storage math:io list[0][2] 1000 -function math:test/move -execute store result storage math:io list[0][0] double 0.001 run scoreboard players get res_x int -execute store result storage math:io list[0][1] double 0.001 run scoreboard players get res_y int -execute store result storage math:io list[0][2] double 0.001 run scoreboard players get res_z int - -#递归迭代 -data modify storage math:io list append from storage math:io list[0] -data remove storage math:io list[0] -scoreboard players remove loop int 1 -execute if score loop int matches 1.. run function math:test/move_loop \ No newline at end of file diff --git a/data/math/functions/test/new.mcfunction b/data/math/functions/test/new.mcfunction deleted file mode 100644 index b8933c0..0000000 --- a/data/math/functions/test/new.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:test/new -#实例化一对旋转实体 -tag @e remove result -summon marker 0 11 0 {Tags:["result","center_entity"]} -summon marker 0 11 0 {Tags:["result","rotate_entity"]} -#设置旋转轴方向 -tp @e[tag=result,tag=center_entity] ~ ~ ~ ~ ~ -#设置半径5格 -scoreboard players set @e[tag=result,tag=rotate_entity,limit=1] r 50000 -#设置实体指针 -execute as @e[tag=result,tag=center_entity,limit=1] store result score @s id run scoreboard players add #id id 1 -scoreboard players operation @e[tag=result,tag=rotate_entity,limit=1] int = @e[tag=result,tag=center_entity,limit=1] id \ No newline at end of file diff --git a/data/math/functions/test/new_rot.mcfunction b/data/math/functions/test/new_rot.mcfunction deleted file mode 100644 index 0e9e529..0000000 --- a/data/math/functions/test/new_rot.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#math:test/new_rot -#设置偏移{<@s,trans_x>,<@s,trans_y>,<@s,trans_z>},1w倍率 -#输入旋转轴角 math:io input -#以展示实体为执行者 - -data modify entity @s transformation.left_rotation set from storage math:io input - -scoreboard players operation trans_x int = @s trans_x -scoreboard players operation trans_y int = @s trans_y -scoreboard players operation trans_z int = @s trans_z -execute as @e[tag=math_marker,limit=1] run function math:test/new_rot_cal - -execute store result entity @s transformation.translation[0] float 0.0001 run scoreboard players operation trans_x int += tempr0 int -execute store result entity @s transformation.translation[1] float 0.0001 run scoreboard players operation trans_y int += tempr1 int -execute store result entity @s transformation.translation[2] float 0.0001 run scoreboard players operation trans_z int += tempr2 int \ No newline at end of file diff --git a/data/math/functions/test/new_rot_cal.mcfunction b/data/math/functions/test/new_rot_cal.mcfunction deleted file mode 100644 index 9c7d57d..0000000 --- a/data/math/functions/test/new_rot_cal.mcfunction +++ /dev/null @@ -1,65 +0,0 @@ -#math:test/new_rot_cal -execute store result score cos int store result score tempr0 int store result score tempi0 int run data get storage math:io input.axis[0] 10000 -execute store result score temp0 int store result score tempr1 int store result score tempi1 int run data get storage math:io input.axis[1] 10000 -execute store result score temp1 int store result score tempr2 int store result score tempi2 int run data get storage math:io input.axis[2] 10000 -scoreboard players operation cos int *= trans_x int -scoreboard players operation temp0 int *= trans_y int -scoreboard players operation temp1 int *= trans_z int -scoreboard players operation cos int += temp0 int -scoreboard players operation cos int += temp1 int -scoreboard players operation cos int /= 10000 int - -scoreboard players operation tempr0 int *= cos int -scoreboard players operation tempr1 int *= cos int -scoreboard players operation tempr2 int *= cos int -scoreboard players operation tempr0 int /= 10000 int -scoreboard players operation tempr1 int /= 10000 int -scoreboard players operation tempr2 int /= 10000 int - -scoreboard players operation trans_x int -= tempr0 int -scoreboard players operation trans_y int -= tempr1 int -scoreboard players operation trans_z int -= tempr2 int - -scoreboard players operation tempk2 int = tempi0 int -scoreboard players operation tempk2 int *= trans_y int -scoreboard players operation temp0 int = trans_x int -scoreboard players operation temp0 int *= tempi1 int -scoreboard players operation tempk2 int -= temp0 int -scoreboard players operation tempk2 int /= 10000 int - -scoreboard players operation tempk0 int = tempi1 int -scoreboard players operation tempk0 int *= trans_z int -scoreboard players operation temp0 int = trans_y int -scoreboard players operation temp0 int *= tempi2 int -scoreboard players operation tempk0 int -= temp0 int -scoreboard players operation tempk0 int /= 10000 int - -scoreboard players operation tempk1 int = tempi2 int -scoreboard players operation tempk1 int *= trans_x int -scoreboard players operation temp0 int = trans_z int -scoreboard players operation temp0 int *= tempi0 int -scoreboard players operation tempk1 int -= temp0 int -scoreboard players operation tempk1 int /= 10000 int - -execute store result entity @s Rotation[0] float -0.0001 run data get storage math:io input.angle 572957.79513 -execute at @s rotated ~ 0.0 positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score cos int run data get entity @s Pos[2] 10000 -execute store result score sin int run data get entity @s Pos[0] 10000 - -scoreboard players operation trans_x int *= cos int -scoreboard players operation trans_y int *= cos int -scoreboard players operation trans_z int *= cos int -scoreboard players operation trans_x int /= 10000 int -scoreboard players operation trans_y int /= 10000 int -scoreboard players operation trans_z int /= 10000 int - -scoreboard players operation tempk0 int *= sin int -scoreboard players operation tempk1 int *= sin int -scoreboard players operation tempk2 int *= sin int -scoreboard players operation tempk0 int /= 10000 int -scoreboard players operation tempk1 int /= 10000 int -scoreboard players operation tempk2 int /= 10000 int - -scoreboard players operation trans_x int += tempk0 int -scoreboard players operation trans_y int += tempk1 int -scoreboard players operation trans_z int += tempk2 int \ No newline at end of file diff --git a/data/math/functions/test/new_rot_init.mcfunction b/data/math/functions/test/new_rot_init.mcfunction deleted file mode 100644 index 9484b46..0000000 --- a/data/math/functions/test/new_rot_init.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/new_rot_init -scoreboard objectives add trans_x dummy -scoreboard objectives add trans_y dummy -scoreboard objectives add trans_z dummy \ No newline at end of file diff --git a/data/math/functions/test/origin.mcfunction b/data/math/functions/test/origin.mcfunction deleted file mode 100644 index 88b70d3..0000000 --- a/data/math/functions/test/origin.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#math:test/origin -data modify entity @s Thrower set from entity @s UUID -execute on origin run say 1 - -#这是一个区块没加载的地方 -tp @s 859345 0 859345 -execute if entity @s run say 2 -execute at @s if entity @e[tag=uuid_marker,limit=1,distance=..1] run say 3 -execute on origin run say 4 - -tp @s 0 11 0 -execute on origin run say 5 \ No newline at end of file diff --git a/data/math/functions/test/prepend_loop.mcfunction b/data/math/functions/test/prepend_loop.mcfunction deleted file mode 100644 index d22d6ad..0000000 --- a/data/math/functions/test/prepend_loop.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/prepend_loop -data modify storage test:8593 list prepend value 0 -execute store result storage test:8593 list[0] int 1 run scoreboard players add loop int 1 -execute if score loop int < test int run function math:test/prepend_loop \ No newline at end of file diff --git a/data/math/functions/test/rand_uvec.mcfunction b/data/math/functions/test/rand_uvec.mcfunction deleted file mode 100644 index 9f28de0..0000000 --- a/data/math/functions/test/rand_uvec.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#math:test/rand_uvec -#随机朝向 -scoreboard players set min int 0 -scoreboard players set max int 359999 -function math:_random -execute store result entity @s Rotation[0] float 0.001 run scoreboard players get random int -scoreboard players set min int -90000 -scoreboard players set max int 90000 -function math:_random -execute store result entity @s Rotation[1] float 0.001 run scoreboard players get random int -#获得uvec -execute at @s positioned 0.0 0.0 0.0 run tp @s ^ ^ ^1.0 -execute store result score i0 int run data get entity @s Pos[0] 1000 -execute store result score i1 int run data get entity @s Pos[1] 1000 -execute store result score i2 int run data get entity @s Pos[2] 1000 \ No newline at end of file diff --git a/data/math/functions/test/run.mcfunction b/data/math/functions/test/run.mcfunction index 82282b5..9b2c813 100644 --- a/data/math/functions/test/run.mcfunction +++ b/data/math/functions/test/run.mcfunction @@ -1,5 +1,6 @@ #math:test/run -summon item_display 0 11 0 {item:{id:"minecraft:dragon_head",Count:1b},Tags:["stmp","test"]} -tp @e[tag=stmp,limit=1] ^ ^ ^2.5 ~ ~ -scoreboard players set @e[tag=stmp,limit=1] killtime 5 -tag @e remove stmp \ No newline at end of file +kill @e[tag=test] +summon item_display ~ ~ ~ {item:{id:"minecraft:grass",Count:1b},Tags:["test"]} +data merge entity @e[tag=test,limit=1] {transformation:{scale:[5.25f,5.25f,5.25f],translation:[-2.0f,0.0f,0.0f]},start_interpolation:0,interpolation_duration:20} + +scoreboard players set test int 0 \ No newline at end of file diff --git a/data/math/functions/test/run0.mcfunction b/data/math/functions/test/run0.mcfunction deleted file mode 100644 index bc6bc96..0000000 --- a/data/math/functions/test/run0.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -#math:test/run0 -kill @e[tag=test] \ No newline at end of file diff --git a/data/math/functions/test/run1.mcfunction b/data/math/functions/test/run1.mcfunction deleted file mode 100644 index 97e7a8c..0000000 --- a/data/math/functions/test/run1.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#math:test/run1 -kill @e[tag=test] -summon area_effect_cloud 0 15 -0.5 {Duration:2147483647,Tags:["upd_aec","test","test0"],Passengers:[{id:"minecraft:item_display",Tags:["test"],item:{id:"minecraft:yellow_wool",Count:1b}}]} -summon item_display 0 15.375 1.5 {Tags:["test","test0","upd_aec"],item:{id:"minecraft:green_wool",Count:1b}} -schedule function math:test/run0 5s replace \ No newline at end of file diff --git a/data/math/functions/test/run2.mcfunction b/data/math/functions/test/run2.mcfunction deleted file mode 100644 index 0464b62..0000000 --- a/data/math/functions/test/run2.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/run2 -execute facing entity @p eyes positioned 0.0 0.0 0.0 run tp @e[tag=math_marker,limit=1] ^ ^ ^0.25 -data modify entity @s Motion set from entity @e[tag=math_marker,limit=1] Pos \ No newline at end of file diff --git a/data/math/functions/test/run3.mcfunction b/data/math/functions/test/run3.mcfunction deleted file mode 100644 index cf34601..0000000 --- a/data/math/functions/test/run3.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#math:test/run3 -data modify storage math:io list set value [] -function math:list/_shuffle -tellraw @a {"nbt":"list","storage":"math:io"} \ No newline at end of file diff --git a/data/math/functions/test/set.mcfunction b/data/math/functions/test/set.mcfunction deleted file mode 100644 index 5195fa1..0000000 --- a/data/math/functions/test/set.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/set -tp @s ~ ~ ~ -tag @s remove tmp \ No newline at end of file diff --git a/data/math/functions/test/set_cb.mcfunction b/data/math/functions/test/set_cb.mcfunction deleted file mode 100644 index 6d30ad7..0000000 --- a/data/math/functions/test/set_cb.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#math:test/set_cb -scoreboard players remove cnt int 1 -execute if score cnt int matches 1.. run setblock ~1 ~ ~ command_block{UpdateLastExecution:false,Command:"function math:test/set_cb",auto:1b} \ No newline at end of file diff --git a/data/math/functions/test/sqrt.mcfunction b/data/math/functions/test/sqrt.mcfunction deleted file mode 100644 index 385a059..0000000 --- a/data/math/functions/test/sqrt.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#math:test/sqrt -scoreboard players set sqrt int 2661 -function math:sqrt/_3self -#tellraw @a {"score":{"name":"sqrt","objective":"int"}} - -scoreboard players set inp int 2661 -function math:sqrt/_3sqrt -#tellraw @a {"score":{"name":"res","objective":"int"}} \ No newline at end of file diff --git a/data/math/functions/test/uuid.mcfunction b/data/math/functions/test/uuid.mcfunction deleted file mode 100644 index c0042f4..0000000 --- a/data/math/functions/test/uuid.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#tick -#维护uuid_marker -execute store result score temp int if entity @e[tag=uuid_marker] -execute unless score temp int matches 1 run function #uuid_marker -#更新药水云 -scoreboard players add upd_aec int 1 -execute as @e[tag=upd_aec] store result entity @s Air short 1 run scoreboard players operation upd_aec int %= 10 int -#玩家刻 -execute as @a if data entity @s SelectedItem.tag{mew:"greatsword"} run function #greatsword/main \ No newline at end of file diff --git a/data/math/functions/test/uv_topos.mcfunction b/data/math/functions/test/uv_topos.mcfunction deleted file mode 100644 index cf4bde4..0000000 --- a/data/math/functions/test/uv_topos.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -#math:test/uv_topos -#x坐标 -scoreboard players operation tempx int = tempx0 int -scoreboard players operation temp0 int = tempu int -scoreboard players operation temp0 int *= tempi0 int -scoreboard players operation temp0 int /= 1000 int -scoreboard players operation tempx int += temp0 int -scoreboard players operation temp0 int = tempv int -scoreboard players operation temp0 int *= tempj0 int -scoreboard players operation temp0 int /= 1000 int -execute store result entity @s Pos[0] double 0.001 run scoreboard players operation tempx int += temp0 int - -#y坐标 -scoreboard players operation tempy int = tempy0 int -scoreboard players operation temp0 int = tempv int -scoreboard players operation temp0 int *= tempj1 int -scoreboard players operation temp0 int /= 1000 int -execute store result entity @s Pos[1] double 0.001 run scoreboard players operation tempy int += temp0 int - -#z坐标 -scoreboard players operation tempz int = tempz0 int -scoreboard players operation tempu int *= tempi2 int -scoreboard players operation tempu int /= 1000 int -scoreboard players operation tempz int += tempu int -scoreboard players operation tempv int *= tempj2 int -scoreboard players operation tempv int /= 1000 int -execute store result entity @s Pos[2] double 0.001 run scoreboard players operation tempz int += tempv int \ No newline at end of file diff --git a/data/math/functions/test/void.mcfunction b/data/math/functions/test/void.mcfunction deleted file mode 100644 index 9d1153d..0000000 --- a/data/math/functions/test/void.mcfunction +++ /dev/null @@ -1 +0,0 @@ -#math:test/void \ No newline at end of file diff --git a/data/math/functions/tick.mcfunction b/data/math/functions/tick.mcfunction index 3087f0f..52a79e3 100644 --- a/data/math/functions/tick.mcfunction +++ b/data/math/functions/tick.mcfunction @@ -1,7 +1,6 @@ scoreboard players add upd_aec int 1 -execute as @e[tag=upd_aec] store result entity @s Air short 1 run scoreboard players operation upd_aec int %= 10 int +execute as @e[tag=upd_aec,type=minecraft:area_effect_cloud] store result entity @s Air short 1 run scoreboard players operation upd_aec int %= 10 int -execute store result score temp int if entity @e[tag=math_marker] -execute unless score temp int matches 1 run function math:math_marker +data modify entity 0-0-0-8593-1 Age set value 0 schedule function math:tick 1t replace \ No newline at end of file diff --git a/data/math/functions/uvw/_dsp.mcfunction b/data/math/functions/uvw/_dsp.mcfunction index 4b132f0..ebe7f4a 100644 --- a/data/math/functions/uvw/_dsp.mcfunction +++ b/data/math/functions/uvw/_dsp.mcfunction @@ -1,5 +1,6 @@ #math:uvw/_dsp -#对执行者的局部坐标系进行粒子显示 +# 对执行者的局部坐标系进行粒子显示 +# 输入{,1w倍率}控制坐标系大小 execute store result storage math:io xyz[0] double 0.0001 run scoreboard players get @s x execute store result storage math:io xyz[1] double 0.0001 run scoreboard players get @s y execute store result storage math:io xyz[2] double 0.0001 run scoreboard players get @s z @@ -10,9 +11,12 @@ scoreboard players set particle int 4 scoreboard players operation 3vec_x int = @s u0 scoreboard players operation 3vec_y int = @s u1 scoreboard players operation 3vec_z int = @s u2 -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @e[tag=math_marker,limit=1] Pos set from storage math:io xyz execute at @e[tag=math_marker,limit=1] run function math:3vec/_dsp-ex @@ -20,9 +24,12 @@ scoreboard players set particle int 5 scoreboard players operation 3vec_x int = @s v0 scoreboard players operation 3vec_y int = @s v1 scoreboard players operation 3vec_z int = @s v2 -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @e[tag=math_marker,limit=1] Pos set from storage math:io xyz execute at @e[tag=math_marker,limit=1] run function math:3vec/_dsp-ex @@ -30,8 +37,11 @@ scoreboard players set particle int 6 scoreboard players operation 3vec_x int = @s w0 scoreboard players operation 3vec_y int = @s w1 scoreboard players operation 3vec_z int = @s w2 -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @e[tag=math_marker,limit=1] Pos set from storage math:io xyz execute at @e[tag=math_marker,limit=1] run function math:3vec/_dsp-ex \ No newline at end of file diff --git a/data/math/functions/uvw/_ssdsp.mcfunction b/data/math/functions/uvw/_ssdsp.mcfunction index f50d38d..da5c393 100644 --- a/data/math/functions/uvw/_ssdsp.mcfunction +++ b/data/math/functions/uvw/_ssdsp.mcfunction @@ -1,6 +1,7 @@ #math:uvw/_ssdsp -#对局部坐标系临时对象进行粒子显示 -#需要传入世界实体为执行者 +# 对局部坐标系临时对象进行粒子显示 +# 需要传入世界实体为执行者 +# 输入{,1w倍率}控制坐标系大小 execute store result storage math:io xyz[0] double 0.0001 run scoreboard players get x int execute store result storage math:io xyz[1] double 0.0001 run scoreboard players get y int execute store result storage math:io xyz[2] double 0.0001 run scoreboard players get z int @@ -11,9 +12,12 @@ scoreboard players set particle int 4 scoreboard players operation 3vec_x int = u0 int scoreboard players operation 3vec_y int = u1 int scoreboard players operation 3vec_z int = u2 int -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @s Pos set from storage math:io xyz execute at @s run function math:3vec/_dsp-ex @@ -21,9 +25,12 @@ scoreboard players set particle int 5 scoreboard players operation 3vec_x int = v0 int scoreboard players operation 3vec_y int = v1 int scoreboard players operation 3vec_z int = v2 int -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @s Pos set from storage math:io xyz execute at @s run function math:3vec/_dsp-ex @@ -31,8 +38,11 @@ scoreboard players set particle int 6 scoreboard players operation 3vec_x int = w0 int scoreboard players operation 3vec_y int = w1 int scoreboard players operation 3vec_z int = w2 int -scoreboard players operation 3vec_x int *= 3 int -scoreboard players operation 3vec_y int *= 3 int -scoreboard players operation 3vec_z int *= 3 int +scoreboard players operation 3vec_x int *= inp int +scoreboard players operation 3vec_y int *= inp int +scoreboard players operation 3vec_z int *= inp int +scoreboard players operation 3vec_x int /= 10000 int +scoreboard players operation 3vec_y int /= 10000 int +scoreboard players operation 3vec_z int /= 10000 int data modify entity @s Pos set from storage math:io xyz execute at @s run function math:3vec/_dsp-ex \ No newline at end of file diff --git a/data/minecraft/advancements/crc.json b/data/minecraft/advancements/crc.json deleted file mode 100644 index 755e58d..0000000 --- a/data/minecraft/advancements/crc.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "criteria":{ - "requirement":{ - "trigger":"minecraft:using_item", - "conditions":{ - "item":{ - "items":[ - "minecraft:ender_eye" - ] - } - } - } - }, - "rewards":{ - "function":"math:4d/crc" - } -} \ No newline at end of file diff --git a/data/minecraft/tags/items/all.json b/data/minecraft/tags/items/all.json deleted file mode 100644 index 6adbc4f..0000000 --- a/data/minecraft/tags/items/all.json +++ /dev/null @@ -1,866 +0,0 @@ -{ - "replace": true, - "values": [ - "minecraft:birch_log", - "minecraft:jungle_log", - "minecraft:acacia_log", - "minecraft:dark_oak_log", - "minecraft:stripped_oak_log", - "minecraft:stripped_spruce_log", - "minecraft:stripped_birch_log", - "minecraft:stripped_jungle_log", - "minecraft:stripped_acacia_log", - "minecraft:stone", - "minecraft:granite", - "minecraft:diorite", - "minecraft:polished_granite", - "minecraft:polished_diorite", - "minecraft:andesite", - "minecraft:polished_andesite", - "minecraft:grass_block", - "minecraft:dirt", - "minecraft:coarse_dirt", - "minecraft:podzol", - "minecraft:cobblestone", - "minecraft:oak_planks", - "minecraft:spruce_planks", - "minecraft:birch_planks", - "minecraft:jungle_planks", - "minecraft:acacia_planks", - "minecraft:dark_oak_planks", - "minecraft:bedrock", - "minecraft:sand", - "minecraft:red_sand", - "minecraft:gravel", - "minecraft:iron_ore", - "minecraft:coal_ore", - "minecraft:gold_ore", - "minecraft:spruce_log", - "minecraft:oak_log", - "minecraft:pink_wool", - "minecraft:gray_wool", - "minecraft:light_gray_wool", - "minecraft:cyan_wool", - "minecraft:purple_wool", - "minecraft:blue_wool", - "minecraft:brown_wool", - "minecraft:green_wool", - "minecraft:red_wool", - "minecraft:yellow_wool", - "minecraft:lime_wool", - "minecraft:light_blue_wool", - "minecraft:magenta_wool", - "minecraft:white_wool", - "minecraft:orange_wool", - "minecraft:cut_sandstone", - "minecraft:chiseled_sandstone", - "minecraft:sandstone", - "minecraft:glass", - "minecraft:lapis_block", - "minecraft:lapis_ore", - "minecraft:sponge", - "minecraft:wet_sponge", - "minecraft:dark_oak_wood", - "minecraft:acacia_wood", - "minecraft:birch_wood", - "minecraft:jungle_wood", - "minecraft:stripped_dark_oak_log", - "minecraft:stripped_oak_wood", - "minecraft:stripped_spruce_wood", - "minecraft:stripped_birch_wood", - "minecraft:stripped_jungle_wood", - "minecraft:stripped_acacia_wood", - "minecraft:stripped_dark_oak_wood", - "minecraft:oak_wood", - "minecraft:spruce_wood", - "minecraft:smooth_sandstone", - "minecraft:smooth_stone", - "minecraft:bricks", - "minecraft:bookshelf", - "minecraft:mossy_cobblestone", - "minecraft:obsidian", - "minecraft:purpur_block", - "minecraft:purpur_pillar", - "minecraft:purpur_stairs", - "minecraft:quartz_slab", - "minecraft:red_sandstone_slab", - "minecraft:cut_red_sandstone_slab", - "minecraft:purpur_slab", - "minecraft:prismarine_slab", - "minecraft:prismarine_slab", - "minecraft:dark_prismarine_slab", - "minecraft:smooth_quartz", - "minecraft:smooth_red_sandstone", - "minecraft:stone_slab", - "minecraft:smooth_stone_slab", - "minecraft:sandstone_slab", - "minecraft:cut_sandstone_slab", - "minecraft:petrified_oak_slab", - "minecraft:cobblestone_slab", - "minecraft:brick_slab", - "minecraft:stone_brick_slab", - "minecraft:nether_brick_slab", - "minecraft:dark_oak_slab", - "minecraft:acacia_slab", - "minecraft:jungle_slab", - "minecraft:birch_slab", - "minecraft:oak_slab", - "minecraft:spruce_slab", - "minecraft:gold_block", - "minecraft:iron_block", - "minecraft:black_wool", - "minecraft:emerald_ore", - "minecraft:emerald_block", - "minecraft:spruce_stairs", - "minecraft:birch_stairs", - "minecraft:jungle_stairs", - "minecraft:nether_quartz_ore", - "minecraft:chiseled_quartz_block", - "minecraft:quartz_block", - "minecraft:quartz_pillar", - "minecraft:end_stone_bricks", - "minecraft:sandstone_stairs", - "minecraft:end_stone", - "minecraft:nether_brick_stairs", - "minecraft:nether_bricks", - "minecraft:mycelium", - "minecraft:brick_stairs", - "minecraft:melon", - "minecraft:stone_brick_stairs", - "minecraft:stone_bricks", - "minecraft:glowstone", - "minecraft:soul_sand", - "minecraft:carved_pumpkin", - "minecraft:netherrack", - "minecraft:jack_o_lantern", - "minecraft:mossy_stone_bricks", - "minecraft:chiseled_stone_bricks", - "minecraft:cracked_stone_bricks", - "minecraft:pumpkin", - "minecraft:snow_block", - "minecraft:ice", - "minecraft:clay", - "minecraft:redstone_ore", - "minecraft:diamond_block", - "minecraft:oak_stairs", - "minecraft:diamond_ore", - "minecraft:cobblestone_stairs", - "minecraft:yellow_stained_glass", - "minecraft:lime_stained_glass", - "minecraft:pink_stained_glass", - "minecraft:gray_stained_glass", - "minecraft:light_gray_stained_glass", - "minecraft:purple_stained_glass", - "minecraft:blue_stained_glass", - "minecraft:cyan_stained_glass", - "minecraft:brown_stained_glass", - "minecraft:light_blue_stained_glass", - "minecraft:magenta_stained_glass", - "minecraft:white_stained_glass", - "minecraft:dark_oak_stairs", - "minecraft:acacia_stairs", - "minecraft:packed_ice", - "minecraft:terracotta", - "minecraft:coal_block", - "minecraft:orange_stained_glass", - "minecraft:hay_block", - "minecraft:red_terracotta", - "minecraft:black_terracotta", - "minecraft:brown_terracotta", - "minecraft:green_terracotta", - "minecraft:blue_terracotta", - "minecraft:purple_terracotta", - "minecraft:cyan_terracotta", - "minecraft:light_gray_terracotta", - "minecraft:quartz_stairs", - "minecraft:white_terracotta", - "minecraft:orange_terracotta", - "minecraft:magenta_terracotta", - "minecraft:light_blue_terracotta", - "minecraft:yellow_terracotta", - "minecraft:lime_terracotta", - "minecraft:pink_terracotta", - "minecraft:gray_terracotta", - "minecraft:orange_concrete_powder", - "minecraft:white_concrete_powder", - "minecraft:black_concrete", - "minecraft:red_concrete", - "minecraft:green_concrete", - "minecraft:blue_concrete", - "minecraft:purple_concrete", - "minecraft:brown_concrete", - "minecraft:cyan_concrete", - "minecraft:white_concrete", - "minecraft:orange_concrete", - "minecraft:magenta_concrete", - "minecraft:light_blue_concrete", - "minecraft:yellow_concrete", - "minecraft:lime_concrete", - "minecraft:pink_concrete", - "minecraft:gray_concrete", - "minecraft:light_gray_concrete", - "minecraft:bone_block", - "minecraft:red_nether_bricks", - "minecraft:nether_wart_block", - "minecraft:magma_block", - "minecraft:red_sandstone_stairs", - "minecraft:cut_red_sandstone", - "minecraft:chiseled_red_sandstone", - "minecraft:red_sandstone", - "minecraft:sea_lantern", - "minecraft:green_stained_glass", - "minecraft:red_stained_glass", - "minecraft:prismarine", - "minecraft:black_stained_glass", - "minecraft:prismarine_bricks", - "minecraft:dark_prismarine", - "minecraft:prismarine_stairs", - "minecraft:prismarine_brick_stairs", - "minecraft:dark_prismarine_stairs", - "minecraft:mossy_stone_brick_stairs", - "minecraft:mossy_cobblestone_stairs", - "minecraft:end_stone_brick_stairs", - "minecraft:polished_diorite_stairs", - "minecraft:stone_stairs", - "minecraft:smooth_quartz_stairs", - "minecraft:smooth_sandstone_stairs", - "minecraft:granite_stairs", - "minecraft:andesite_stairs", - "minecraft:smooth_red_sandstone_stairs", - "minecraft:polished_granite_stairs", - "minecraft:blue_ice", - "minecraft:horn_coral_block", - "minecraft:fire_coral_block", - "minecraft:bubble_coral_block", - "minecraft:brain_coral_block", - "minecraft:tube_coral_block", - "minecraft:dead_horn_coral_block", - "minecraft:blue_concrete_powder", - "minecraft:brown_concrete_powder", - "minecraft:green_concrete_powder", - "minecraft:black_concrete_powder", - "minecraft:dead_tube_coral_block", - "minecraft:red_concrete_powder", - "minecraft:dead_brain_coral_block", - "minecraft:dead_bubble_coral_block", - "minecraft:dead_fire_coral_block", - "minecraft:magenta_concrete_powder", - "minecraft:light_blue_concrete_powder", - "minecraft:lime_concrete_powder", - "minecraft:yellow_concrete_powder", - "minecraft:pink_concrete_powder", - "minecraft:light_gray_concrete_powder", - "minecraft:purple_concrete_powder", - "minecraft:cyan_concrete_powder", - "minecraft:gray_concrete_powder", - "minecraft:granite_slab", - "minecraft:smooth_quartz_slab", - "minecraft:smooth_sandstone_slab", - "minecraft:andesite_slab", - "minecraft:red_nether_brick_slab", - "minecraft:diorite_slab", - "minecraft:polished_andesite_slab", - "minecraft:dried_kelp_block", - "minecraft:red_nether_brick_stairs", - "minecraft:polished_andesite_stairs", - "minecraft:diorite_stairs", - "minecraft:polished_granite_slab", - "minecraft:mossy_stone_brick_slab", - "minecraft:polished_diorite_slab", - "minecraft:smooth_red_sandstone_slab", - "minecraft:mossy_cobblestone_slab", - "minecraft:end_stone_brick_slab", - "minecraft:chorus_plant", - "minecraft:end_rod", - "minecraft:torch", - "minecraft:brown_mushroom", - "minecraft:red_mushroom", - "minecraft:wither_rose", - "minecraft:lily_of_the_valley", - "minecraft:cornflower", - "minecraft:oxeye_daisy", - "minecraft:white_tulip", - "minecraft:red_tulip", - "minecraft:pink_tulip", - "minecraft:orange_tulip", - "minecraft:azure_bluet", - "minecraft:allium", - "minecraft:blue_orchid", - "minecraft:poppy", - "minecraft:dandelion", - "minecraft:jungle_leaves", - "minecraft:acacia_leaves", - "minecraft:cobweb", - "minecraft:dark_oak_leaves", - "minecraft:grass", - "minecraft:fern", - "minecraft:dead_bush", - "minecraft:seagrass", - "minecraft:sea_pickle", - "minecraft:oak_sapling", - "minecraft:birch_sapling", - "minecraft:spruce_sapling", - "minecraft:jungle_sapling", - "minecraft:acacia_sapling", - "minecraft:oak_leaves", - "minecraft:spruce_leaves", - "minecraft:birch_leaves", - "minecraft:dark_oak_sapling", - "minecraft:lily_pad", - "minecraft:nether_brick_fence", - "minecraft:enchanting_table", - "minecraft:end_portal_frame", - "minecraft:ender_chest", - "minecraft:cobblestone_wall", - "minecraft:mossy_cobblestone_wall", - "minecraft:brick_wall", - "minecraft:prismarine_wall", - "minecraft:vine", - "minecraft:iron_bars", - "minecraft:glass_pane", - "minecraft:mushroom_stem", - "minecraft:red_mushroom_block", - "minecraft:brown_mushroom_block", - "minecraft:infested_chiseled_stone_bricks", - "minecraft:infested_mossy_stone_bricks", - "minecraft:infested_cracked_stone_bricks", - "minecraft:oak_fence", - "minecraft:jungle_fence", - "minecraft:spruce_fence", - "minecraft:dark_oak_fence", - "minecraft:acacia_fence", - "minecraft:birch_fence", - "minecraft:infested_cobblestone", - "minecraft:infested_stone", - "minecraft:infested_stone_bricks", - "minecraft:chorus_flower", - "minecraft:chest", - "minecraft:furnace", - "minecraft:crafting_table", - "minecraft:farmland", - "minecraft:ladder", - "minecraft:snow", - "minecraft:cactus", - "minecraft:jukebox", - "minecraft:red_carpet", - "minecraft:black_carpet", - "minecraft:slime_block", - "minecraft:sunflower", - "minecraft:lilac", - "minecraft:rose_bush", - "minecraft:peony", - "minecraft:tall_grass", - "minecraft:lime_carpet", - "minecraft:pink_carpet", - "minecraft:gray_carpet", - "minecraft:light_gray_carpet", - "minecraft:cyan_carpet", - "minecraft:purple_carpet", - "minecraft:brown_carpet", - "minecraft:green_carpet", - "minecraft:blue_carpet", - "minecraft:diorite_wall", - "minecraft:anvil", - "minecraft:chipped_anvil", - "minecraft:damaged_anvil", - "minecraft:white_carpet", - "minecraft:orange_carpet", - "minecraft:magenta_carpet", - "minecraft:light_blue_carpet", - "minecraft:yellow_carpet", - "minecraft:end_stone_brick_wall", - "minecraft:red_nether_brick_wall", - "minecraft:sandstone_wall", - "minecraft:andesite_wall", - "minecraft:nether_brick_wall", - "minecraft:stone_brick_wall", - "minecraft:granite_wall", - "minecraft:mossy_stone_brick_wall", - "minecraft:red_sandstone_wall", - "minecraft:large_fern", - "minecraft:white_stained_glass_pane", - "minecraft:orange_stained_glass_pane", - "minecraft:magenta_stained_glass_pane", - "minecraft:light_blue_stained_glass_pane", - "minecraft:yellow_stained_glass_pane", - "minecraft:lime_stained_glass_pane", - "minecraft:pink_stained_glass_pane", - "minecraft:gray_stained_glass_pane", - "minecraft:light_gray_stained_glass_pane", - "minecraft:cyan_stained_glass_pane", - "minecraft:purple_stained_glass_pane", - "minecraft:blue_stained_glass_pane", - "minecraft:brown_stained_glass_pane", - "minecraft:green_stained_glass_pane", - "minecraft:red_stained_glass_pane", - "minecraft:black_stained_glass_pane", - "minecraft:shulker_box", - "minecraft:white_shulker_box", - "minecraft:magenta_shulker_box", - "minecraft:light_blue_shulker_box", - "minecraft:lime_shulker_box", - "minecraft:yellow_shulker_box", - "minecraft:orange_shulker_box", - "minecraft:pink_shulker_box", - "minecraft:gray_shulker_box", - "minecraft:light_gray_shulker_box", - "minecraft:cyan_shulker_box", - "minecraft:purple_shulker_box", - "minecraft:blue_shulker_box", - "minecraft:brown_shulker_box", - "minecraft:green_shulker_box", - "minecraft:red_shulker_box", - "minecraft:black_shulker_box", - "minecraft:white_glazed_terracotta", - "minecraft:orange_glazed_terracotta", - "minecraft:magenta_glazed_terracotta", - "minecraft:light_blue_glazed_terracotta", - "minecraft:yellow_glazed_terracotta", - "minecraft:lime_glazed_terracotta", - "minecraft:pink_glazed_terracotta", - "minecraft:gray_glazed_terracotta", - "minecraft:light_gray_glazed_terracotta", - "minecraft:cyan_glazed_terracotta", - "minecraft:purple_glazed_terracotta", - "minecraft:blue_glazed_terracotta", - "minecraft:green_glazed_terracotta", - "minecraft:brown_glazed_terracotta", - "minecraft:red_glazed_terracotta", - "minecraft:black_glazed_terracotta", - "minecraft:tube_coral", - "minecraft:bubble_coral", - "minecraft:fire_coral", - "minecraft:brain_coral", - "minecraft:horn_coral", - "minecraft:dead_brain_coral", - "minecraft:dead_bubble_coral", - "minecraft:dead_fire_coral", - "minecraft:dead_horn_coral", - "minecraft:tube_coral_fan", - "minecraft:brain_coral_fan", - "minecraft:dead_tube_coral", - "minecraft:bubble_coral_fan", - "minecraft:fire_coral_fan", - "minecraft:horn_coral_fan", - "minecraft:dead_tube_coral_fan", - "minecraft:dead_brain_coral_fan", - "minecraft:dead_bubble_coral_fan", - "minecraft:dead_fire_coral_fan", - "minecraft:dead_horn_coral_fan", - "minecraft:painting", - "minecraft:scaffolding", - "minecraft:oak_sign", - "minecraft:spruce_sign", - "minecraft:birch_sign", - "minecraft:jungle_sign", - "minecraft:acacia_sign", - "minecraft:dark_oak_sign", - "minecraft:white_bed", - "minecraft:orange_bed", - "minecraft:magenta_bed", - "minecraft:light_blue_bed", - "minecraft:yellow_bed", - "minecraft:lime_bed", - "minecraft:pink_bed", - "minecraft:gray_bed", - "minecraft:light_gray_bed", - "minecraft:cyan_bed", - "minecraft:purple_bed", - "minecraft:blue_bed", - "minecraft:brown_bed", - "minecraft:red_bed", - "minecraft:black_bed", - "minecraft:item_frame", - "minecraft:green_bed", - "minecraft:flower_pot", - "minecraft:skeleton_skull", - "minecraft:wither_skeleton_skull", - "minecraft:player_head", - "minecraft:zombie_head", - "minecraft:dragon_head", - "minecraft:armor_stand", - "minecraft:white_banner", - "minecraft:creeper_head", - "minecraft:orange_banner", - "minecraft:magenta_banner", - "minecraft:light_blue_banner", - "minecraft:yellow_banner", - "minecraft:lime_banner", - "minecraft:pink_banner", - "minecraft:gray_banner", - "minecraft:light_gray_banner", - "minecraft:cyan_banner", - "minecraft:purple_banner", - "minecraft:brown_banner", - "minecraft:green_banner", - "minecraft:blue_banner", - "minecraft:red_banner", - "minecraft:black_banner", - "minecraft:end_crystal", - "minecraft:loom", - "minecraft:barrel", - "minecraft:cartography_table", - "minecraft:blast_furnace", - "minecraft:smoker", - "minecraft:fletching_table", - "minecraft:grindstone", - "minecraft:smithing_table", - "minecraft:stonecutter", - "minecraft:bell", - "minecraft:lantern", - "minecraft:campfire", - "minecraft:dispenser", - "minecraft:note_block", - "minecraft:sticky_piston", - "minecraft:piston", - "minecraft:tnt", - "minecraft:lever", - "minecraft:stone_pressure_plate", - "minecraft:oak_pressure_plate", - "minecraft:spruce_pressure_plate", - "minecraft:birch_pressure_plate", - "minecraft:jungle_pressure_plate", - "minecraft:acacia_pressure_plate", - "minecraft:dark_oak_pressure_plate", - "minecraft:redstone_torch", - "minecraft:stone_button", - "minecraft:oak_trapdoor", - "minecraft:spruce_trapdoor", - "minecraft:birch_trapdoor", - "minecraft:jungle_trapdoor", - "minecraft:acacia_trapdoor", - "minecraft:dark_oak_trapdoor", - "minecraft:oak_fence_gate", - "minecraft:spruce_fence_gate", - "minecraft:birch_fence_gate", - "minecraft:jungle_fence_gate", - "minecraft:dark_oak_fence_gate", - "minecraft:acacia_fence_gate", - "minecraft:redstone_lamp", - "minecraft:tripwire_hook", - "minecraft:oak_button", - "minecraft:spruce_button", - "minecraft:birch_button", - "minecraft:jungle_button", - "minecraft:acacia_button", - "minecraft:dark_oak_button", - "minecraft:trapped_chest", - "minecraft:light_weighted_pressure_plate", - "minecraft:heavy_weighted_pressure_plate", - "minecraft:daylight_detector", - "minecraft:redstone_block", - "minecraft:hopper", - "minecraft:dropper", - "minecraft:iron_trapdoor", - "minecraft:observer", - "minecraft:iron_door", - "minecraft:oak_door", - "minecraft:spruce_door", - "minecraft:birch_door", - "minecraft:jungle_door", - "minecraft:acacia_door", - "minecraft:dark_oak_door", - "minecraft:repeater", - "minecraft:comparator", - "minecraft:redstone", - "minecraft:lectern", - "minecraft:powered_rail", - "minecraft:detector_rail", - "minecraft:rail", - "minecraft:activator_rail", - "minecraft:minecart", - "minecraft:saddle", - "minecraft:oak_boat", - "minecraft:chest_minecart", - "minecraft:furnace_minecart", - "minecraft:carrot_on_a_stick", - "minecraft:tnt_minecart", - "minecraft:hopper_minecart", - "minecraft:elytra", - "minecraft:spruce_boat", - "minecraft:birch_boat", - "minecraft:jungle_boat", - "minecraft:acacia_boat", - "minecraft:dark_oak_boat", - "minecraft:beacon", - "minecraft:turtle_egg", - "minecraft:conduit", - "minecraft:composter", - "minecraft:scute", - "minecraft:coal", - "minecraft:charcoal", - "minecraft:diamond", - "minecraft:iron_ingot", - "minecraft:gold_ingot", - "minecraft:stick", - "minecraft:bowl", - "minecraft:string", - "minecraft:feather", - "minecraft:gunpowder", - "minecraft:wheat_seeds", - "minecraft:wheat", - "minecraft:flint", - "minecraft:bucket", - "minecraft:water_bucket", - "minecraft:lava_bucket", - "minecraft:snowball", - "minecraft:leather", - "minecraft:milk_bucket", - "minecraft:pufferfish_bucket", - "minecraft:salmon_bucket", - "minecraft:cod_bucket", - "minecraft:tropical_fish_bucket", - "minecraft:brick", - "minecraft:clay_ball", - "minecraft:sugar_cane", - "minecraft:kelp", - "minecraft:bamboo", - "minecraft:paper", - "minecraft:book", - "minecraft:slime_ball", - "minecraft:egg", - "minecraft:glowstone_dust", - "minecraft:ink_sac", - "minecraft:red_dye", - "minecraft:green_dye", - "minecraft:cocoa_beans", - "minecraft:lapis_lazuli", - "minecraft:purple_dye", - "minecraft:cyan_dye", - "minecraft:light_gray_dye", - "minecraft:gray_dye", - "minecraft:pink_dye", - "minecraft:lime_dye", - "minecraft:yellow_dye", - "minecraft:light_blue_dye", - "minecraft:magenta_dye", - "minecraft:orange_dye", - "minecraft:bone_meal", - "minecraft:blue_dye", - "minecraft:brown_dye", - "minecraft:black_dye", - "minecraft:white_dye", - "minecraft:bone", - "minecraft:sugar", - "minecraft:pumpkin_seeds", - "minecraft:melon_seeds", - "minecraft:ender_pearl", - "minecraft:blaze_rod", - "minecraft:gold_nugget", - "minecraft:nether_wart", - "minecraft:ender_eye", - "minecraft:bat_spawn_egg", - "minecraft:blaze_spawn_egg", - "minecraft:cat_spawn_egg", - "minecraft:cave_spider_spawn_egg", - "minecraft:chicken_spawn_egg", - "minecraft:cod_spawn_egg", - "minecraft:cow_spawn_egg", - "minecraft:creeper_spawn_egg", - "minecraft:dolphin_spawn_egg", - "minecraft:donkey_spawn_egg", - "minecraft:drowned_spawn_egg", - "minecraft:elder_guardian_spawn_egg", - "minecraft:enderman_spawn_egg", - "minecraft:endermite_spawn_egg", - "minecraft:evoker_spawn_egg", - "minecraft:fox_spawn_egg", - "minecraft:ghast_spawn_egg", - "minecraft:guardian_spawn_egg", - "minecraft:horse_spawn_egg", - "minecraft:husk_spawn_egg", - "minecraft:llama_spawn_egg", - "minecraft:magma_cube_spawn_egg", - "minecraft:mooshroom_spawn_egg", - "minecraft:mule_spawn_egg", - "minecraft:ocelot_spawn_egg", - "minecraft:panda_spawn_egg", - "minecraft:parrot_spawn_egg", - "minecraft:phantom_spawn_egg", - "minecraft:pig_spawn_egg", - "minecraft:pillager_spawn_egg", - "minecraft:polar_bear_spawn_egg", - "minecraft:pufferfish_spawn_egg", - "minecraft:rabbit_spawn_egg", - "minecraft:ravager_spawn_egg", - "minecraft:salmon_spawn_egg", - "minecraft:sheep_spawn_egg", - "minecraft:shulker_spawn_egg", - "minecraft:silverfish_spawn_egg", - "minecraft:skeleton_spawn_egg", - "minecraft:skeleton_horse_spawn_egg", - "minecraft:slime_spawn_egg", - "minecraft:spider_spawn_egg", - "minecraft:squid_spawn_egg", - "minecraft:stray_spawn_egg", - "minecraft:trader_llama_spawn_egg", - "minecraft:tropical_fish_spawn_egg", - "minecraft:turtle_spawn_egg", - "minecraft:vex_spawn_egg", - "minecraft:villager_spawn_egg", - "minecraft:vindicator_spawn_egg", - "minecraft:wandering_trader_spawn_egg", - "minecraft:witch_spawn_egg", - "minecraft:wither_skeleton_spawn_egg", - "minecraft:wolf_spawn_egg", - "minecraft:zombie_spawn_egg", - "minecraft:zombie_horse_spawn_egg", - "minecraft:zombie_villager_spawn_egg", - "minecraft:experience_bottle", - "minecraft:fire_charge", - "minecraft:writable_book", - "minecraft:emerald", - "minecraft:map", - "minecraft:nether_star", - "minecraft:firework_rocket", - "minecraft:firework_star", - "minecraft:nether_brick", - "minecraft:quartz", - "minecraft:prismarine_shard", - "minecraft:prismarine_crystals", - "minecraft:rabbit_hide", - "minecraft:iron_horse_armor", - "minecraft:golden_horse_armor", - "minecraft:diamond_horse_armor", - "minecraft:leather_horse_armor", - "minecraft:chorus_fruit", - "minecraft:popped_chorus_fruit", - "minecraft:beetroot_seeds", - "minecraft:shulker_shell", - "minecraft:iron_nugget", - "minecraft:music_disc_13", - "minecraft:music_disc_cat", - "minecraft:music_disc_blocks", - "minecraft:music_disc_chirp", - "minecraft:music_disc_far", - "minecraft:music_disc_mall", - "minecraft:music_disc_mellohi", - "minecraft:music_disc_stal", - "minecraft:music_disc_strad", - "minecraft:music_disc_ward", - "minecraft:music_disc_11", - "minecraft:music_disc_wait", - "minecraft:nautilus_shell", - "minecraft:heart_of_the_sea", - "minecraft:flower_banner_pattern", - "minecraft:creeper_banner_pattern", - "minecraft:skull_banner_pattern", - "minecraft:mojang_banner_pattern", - "minecraft:globe_banner_pattern", - "minecraft:apple", - "minecraft:mushroom_stew", - "minecraft:bread", - "minecraft:porkchop", - "minecraft:cooked_porkchop", - "minecraft:golden_apple", - "minecraft:enchanted_golden_apple", - "minecraft:cod", - "minecraft:salmon", - "minecraft:tropical_fish", - "minecraft:pufferfish", - "minecraft:cooked_cod", - "minecraft:cooked_salmon", - "minecraft:cake", - "minecraft:cookie", - "minecraft:melon_slice", - "minecraft:dried_kelp", - "minecraft:beef", - "minecraft:cooked_beef", - "minecraft:chicken", - "minecraft:cooked_chicken", - "minecraft:rotten_flesh", - "minecraft:spider_eye", - "minecraft:carrot", - "minecraft:potato", - "minecraft:baked_potato", - "minecraft:poisonous_potato", - "minecraft:pumpkin_pie", - "minecraft:rabbit", - "minecraft:cooked_rabbit", - "minecraft:rabbit_stew", - "minecraft:mutton", - "minecraft:cooked_mutton", - "minecraft:beetroot", - "minecraft:beetroot_soup", - "minecraft:sweet_berries", - "minecraft:iron_shovel", - "minecraft:iron_pickaxe", - "minecraft:iron_axe", - "minecraft:flint_and_steel", - "minecraft:wooden_shovel", - "minecraft:wooden_pickaxe", - "minecraft:wooden_axe", - "minecraft:stone_shovel", - "minecraft:stone_pickaxe", - "minecraft:stone_axe", - "minecraft:diamond_shovel", - "minecraft:diamond_pickaxe", - "minecraft:diamond_axe", - "minecraft:golden_shovel", - "minecraft:golden_pickaxe", - "minecraft:golden_axe", - "minecraft:wooden_hoe", - "minecraft:stone_hoe", - "minecraft:iron_hoe", - "minecraft:diamond_hoe", - "minecraft:golden_hoe", - "minecraft:compass", - "minecraft:fishing_rod", - "minecraft:clock", - "minecraft:shears", - "minecraft:enchanted_book", - "minecraft:lead", - "minecraft:name_tag", - "minecraft:turtle_helmet", - "minecraft:bow", - "minecraft:arrow", - "minecraft:iron_sword", - "minecraft:wooden_sword", - "minecraft:stone_sword", - "minecraft:diamond_sword", - "minecraft:golden_sword", - "minecraft:leather_helmet", - "minecraft:leather_chestplate", - "minecraft:leather_leggings", - "minecraft:leather_boots", - "minecraft:chainmail_helmet", - "minecraft:chainmail_chestplate", - "minecraft:chainmail_leggings", - "minecraft:chainmail_boots", - "minecraft:iron_helmet", - "minecraft:iron_chestplate", - "minecraft:iron_leggings", - "minecraft:iron_boots", - "minecraft:diamond_helmet", - "minecraft:diamond_chestplate", - "minecraft:diamond_leggings", - "minecraft:diamond_boots", - "minecraft:golden_helmet", - "minecraft:golden_chestplate", - "minecraft:golden_leggings", - "minecraft:golden_boots", - "minecraft:enchanted_book", - "minecraft:spectral_arrow", - "minecraft:tipped_arrow", - "minecraft:shield", - "minecraft:totem_of_undying", - "minecraft:trident", - "minecraft:crossbow", - "minecraft:ghast_tear", - "minecraft:potion", - "minecraft:glass_bottle", - "minecraft:fermented_spider_eye", - "minecraft:blaze_powder", - "minecraft:magma_cream", - "minecraft:brewing_stand", - "minecraft:cauldron", - "minecraft:glistering_melon_slice", - "minecraft:golden_carrot", - "minecraft:rabbit_foot", - "minecraft:dragon_breath", - "minecraft:splash_potion", - "minecraft:lingering_potion", - "minecraft:phantom_membrane", - "minecraft:command_block" - ] -} \ No newline at end of file