Просмотр исходного кода

Merge branch 'master' of https://github.com/LTCatt/LTW3

LTCatt 6 лет назад
Родитель
Сommit
63a3a1e9db

+ 7 - 78
data/mini/functions/colormatch/generate_floor.mcfunction

@@ -1,78 +1,7 @@
-# TODO 将场地设为固定位置
-# 随机生成地板
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_1",integrity:1.0f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_2",integrity:0.5f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_3",integrity:0.3333333333333333f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_4",integrity:0.25f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_5",integrity:0.2f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_6",integrity:0.16666666666666666f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_7",integrity:0.14285714285714285f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_8",integrity:0.125f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_9",integrity:0.1111111111111111f}
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_10",integrity:0.1f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_14",integrity:0.07142857142857142f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_15",integrity:0.06666666666666667f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_16",integrity:0.0625f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_17",integrity:0.058823529411764705f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_18",integrity:0.05555555555555555f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_19",integrity:0.05263157894736842f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_20",integrity:0.05f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_21",integrity:0.047619047619047616f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_22",integrity:0.045454545454545456f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_23",integrity:0.043478260869565216f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_24",integrity:0.041666666666666664f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_25",integrity:0.04f}
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:redstone_block
-# execute at @e[tag=color_match_floor] run setblock ~-1 ~ ~ minecraft:air
-# execute at @e[tag=color_match_floor] run setblock ~ ~ ~ minecraft:air
+# 设置初始分数
+scoreboard players set $floor_generate_part mem 0
+
+# 调用地板生成
+function mini:colormatch/generate_parts
+
+#

+ 32 - 0
data/mini/functions/colormatch/generate_parts.mcfunction

@@ -0,0 +1,32 @@
+# 分数更改 
+scoreboard players add $floor_generate_part mem 1
+# 随机生成地板
+execute if score $floor_generate_part mem matches 1 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_1",integrity:1.0f}
+execute if score $floor_generate_part mem matches 2 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_2",integrity:0.5f}
+execute if score $floor_generate_part mem matches 3 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_3",integrity:0.3333333333333333f}
+execute if score $floor_generate_part mem matches 4 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_4",integrity:0.25f}
+execute if score $floor_generate_part mem matches 5 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_5",integrity:0.2f}
+execute if score $floor_generate_part mem matches 6 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_6",integrity:0.16666666666666666f}
+execute if score $floor_generate_part mem matches 7 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_7",integrity:0.14285714285714285f}
+execute if score $floor_generate_part mem matches 8 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_8",integrity:0.125f}
+execute if score $floor_generate_part mem matches 9 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_9",integrity:0.1111111111111111f}
+execute if score $floor_generate_part mem matches 10 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_10",integrity:0.1f}
+execute if score $floor_generate_part mem matches 11 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_11",integrity:0.09090909090909091f}
+execute if score $floor_generate_part mem matches 12 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_12",integrity:0.08333333333333333f}
+execute if score $floor_generate_part mem matches 13 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_13",integrity:0.07692307692307693f}
+execute if score $floor_generate_part mem matches 14 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_14",integrity:0.07142857142857142f}
+execute if score $floor_generate_part mem matches 15 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_15",integrity:0.06666666666666667f}
+execute if score $floor_generate_part mem matches 16 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_16",integrity:0.0625f}
+execute if score $floor_generate_part mem matches 17 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_17",integrity:0.058823529411764705f}
+execute if score $floor_generate_part mem matches 18 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_18",integrity:0.05555555555555555f}
+execute if score $floor_generate_part mem matches 19 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_19",integrity:0.05263157894736842f}
+execute if score $floor_generate_part mem matches 20 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_20",integrity:0.05f}
+execute if score $floor_generate_part mem matches 21 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_21",integrity:0.047619047619047616f}
+execute if score $floor_generate_part mem matches 22 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_22",integrity:0.045454545454545456f}
+execute if score $floor_generate_part mem matches 23 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_23",integrity:0.043478260869565216f}
+execute if score $floor_generate_part mem matches 24 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_24",integrity:0.041666666666666664f}
+execute if score $floor_generate_part mem matches 25 positioned 1000 10 4000 run setblock ~ ~ ~ minecraft:structure_block{posX:1,mode:"LOAD",name:"mini:color_match/color_25",integrity:0.04f}
+setblock 1000 9 4000 redstone_block
+setblock 1000 9 4000 air
+setblock 1000 10 4000 air
+execute if score $floor_generate_part mem matches 1..24 run schedule function mini:colormatch/generate_parts 1t

+ 26 - 27
data/mini/functions/colormatch/get_random_floor.mcfunction

@@ -1,33 +1,32 @@
-# TODO 将随机地板设为固定位置
 scoreboard players set $random_min mem 1
 scoreboard players set $random_max mem 25
 function lib:random
 
 # TODO 更换地板方块-增强对比+辨识度
 # 随机选择不消失的方块
-execute at @e[tag=color_match_floor] run fill ~1 ~1 ~ ~26 ~1 ~25 air replace
-execute at @e[tag=color_match_floor] if score $random mem matches 1 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered iron_block
-execute at @e[tag=color_match_floor] if score $random mem matches 2 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered white_concrete
-execute at @e[tag=color_match_floor] if score $random mem matches 3 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered quartz_block
-execute at @e[tag=color_match_floor] if score $random mem matches 4 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered snow_block
-execute at @e[tag=color_match_floor] if score $random mem matches 5 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered white_wool
-execute at @e[tag=color_match_floor] if score $random mem matches 6 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered gold_block
-execute at @e[tag=color_match_floor] if score $random mem matches 7 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered sponge
-execute at @e[tag=color_match_floor] if score $random mem matches 8 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered sandstone
-execute at @e[tag=color_match_floor] if score $random mem matches 9 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered yellow_concrete
-execute at @e[tag=color_match_floor] if score $random mem matches 10 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered end_stone
-execute at @e[tag=color_match_floor] if score $random mem matches 11 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered emerald_block
-execute at @e[tag=color_match_floor] if score $random mem matches 12 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered lime_concrete
-execute at @e[tag=color_match_floor] if score $random mem matches 13 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered melon
-execute at @e[tag=color_match_floor] if score $random mem matches 14 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered dark_prismarine
-execute at @e[tag=color_match_floor] if score $random mem matches 15 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered green_wool
-execute at @e[tag=color_match_floor] if score $random mem matches 16 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered diamond_block
-execute at @e[tag=color_match_floor] if score $random mem matches 17 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered prismarine
-execute at @e[tag=color_match_floor] if score $random mem matches 18 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered blue_ice
-execute at @e[tag=color_match_floor] if score $random mem matches 19 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered warped_wart_block
-execute at @e[tag=color_match_floor] if score $random mem matches 20 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered prismarine_bricks
-execute at @e[tag=color_match_floor] if score $random mem matches 21 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_wool
-execute at @e[tag=color_match_floor] if score $random mem matches 22 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_concrete
-execute at @e[tag=color_match_floor] if score $random mem matches 23 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered netherrack
-execute at @e[tag=color_match_floor] if score $random mem matches 24 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_nether_bricks
-execute at @e[tag=color_match_floor] if score $random mem matches 25 run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered bricks
+execute positioned 1000 10 4000 run fill ~ ~1 ~ ~25 ~1 ~25 air replace
+execute positioned 1000 10 4000 if score $random mem matches 1 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered iron_block
+execute positioned 1000 10 4000 if score $random mem matches 2 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered white_concrete
+execute positioned 1000 10 4000 if score $random mem matches 3 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered quartz_block
+execute positioned 1000 10 4000 if score $random mem matches 4 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered snow_block
+execute positioned 1000 10 4000 if score $random mem matches 5 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered white_wool
+execute positioned 1000 10 4000 if score $random mem matches 6 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered gold_block
+execute positioned 1000 10 4000 if score $random mem matches 7 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered sponge
+execute positioned 1000 10 4000 if score $random mem matches 8 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered sandstone
+execute positioned 1000 10 4000 if score $random mem matches 9 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered yellow_concrete
+execute positioned 1000 10 4000 if score $random mem matches 10 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered end_stone
+execute positioned 1000 10 4000 if score $random mem matches 11 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered emerald_block
+execute positioned 1000 10 4000 if score $random mem matches 12 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered lime_concrete
+execute positioned 1000 10 4000 if score $random mem matches 13 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered melon
+execute positioned 1000 10 4000 if score $random mem matches 14 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered dark_prismarine
+execute positioned 1000 10 4000 if score $random mem matches 15 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered green_wool
+execute positioned 1000 10 4000 if score $random mem matches 16 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered diamond_block
+execute positioned 1000 10 4000 if score $random mem matches 17 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered prismarine
+execute positioned 1000 10 4000 if score $random mem matches 18 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered blue_ice
+execute positioned 1000 10 4000 if score $random mem matches 19 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered warped_wart_block
+execute positioned 1000 10 4000 if score $random mem matches 20 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered prismarine_bricks
+execute positioned 1000 10 4000 if score $random mem matches 21 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_wool
+execute positioned 1000 10 4000 if score $random mem matches 22 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_concrete
+execute positioned 1000 10 4000 if score $random mem matches 23 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered netherrack
+execute positioned 1000 10 4000 if score $random mem matches 24 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_nether_bricks
+execute positioned 1000 10 4000 if score $random mem matches 25 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered bricks

+ 52 - 51
data/mini/functions/colormatch/show_block_amount.mcfunction

@@ -2,59 +2,60 @@
 scoreboard objectives add block_count dummy
 
 # 获取分数
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered iron_block
-tellraw @a [{"text":"iron_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered white_concrete
-tellraw @a [{"text":"white_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered quartz_block
-tellraw @a [{"text":"quartz_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered snow_block
-tellraw @a [{"text":"snow_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered white_wool
-tellraw @a [{"text":"white_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered gold_block
-tellraw @a [{"text":"gold_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered sponge
-tellraw @a [{"text":"sponge数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered sandstone
-tellraw @a [{"text":"sandstone数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered yellow_concrete
-tellraw @a [{"text":"yellow_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered end_stone
-tellraw @a [{"text":"end_stone数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered emerald_block
-tellraw @a [{"text":"emerald_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered lime_concrete
-tellraw @a [{"text":"lime_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered melon
-tellraw @a [{"text":"melon数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered dark_prismarine
-tellraw @a [{"text":"dark_prismarine数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered green_wool
-tellraw @a [{"text":"green_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered diamond_block
-tellraw @a [{"text":"diamond_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered prismarine
-tellraw @a [{"text":"prismarine数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered blue_ice
-tellraw @a [{"text":"blue_ice数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered warped_wart_block
-tellraw @a [{"text":"warped_wart_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered prismarine_bricks
-tellraw @a [{"text":"prismarine_bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_wool
-tellraw @a [{"text":"red_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_concrete
-tellraw @a [{"text":"red_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered netherrack
-tellraw @a [{"text":"netherrack数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered red_nether_bricks
-tellraw @a [{"text":"red_nether_bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
-execute store result score block_count block_count at @e[tag=color_match_floor] run clone ~1 ~ ~ ~26 ~ ~25 ~1 ~1 ~ filtered bricks
-tellraw @a [{"text":"bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"}}]
+tellraw @a [{"text":"本轮方块列表:","color":"gold"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered iron_block
+tellraw @a [{"text":"iron_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered white_concrete
+tellraw @a [{"text":"white_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered quartz_block
+tellraw @a [{"text":"quartz_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered snow_block
+tellraw @a [{"text":"snow_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered white_wool
+tellraw @a [{"text":"white_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered gold_block
+tellraw @a [{"text":"gold_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered sponge
+tellraw @a [{"text":"sponge数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered sandstone
+tellraw @a [{"text":"sandstone数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered yellow_concrete
+tellraw @a [{"text":"yellow_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered end_stone
+tellraw @a [{"text":"end_stone数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered emerald_block
+tellraw @a [{"text":"emerald_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered lime_concrete
+tellraw @a [{"text":"lime_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered melon
+tellraw @a [{"text":"melon数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered dark_prismarine
+tellraw @a [{"text":"dark_prismarine数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered green_wool
+tellraw @a [{"text":"green_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered diamond_block
+tellraw @a [{"text":"diamond_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered prismarine
+tellraw @a [{"text":"prismarine数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered blue_ice
+tellraw @a [{"text":"blue_ice数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered warped_wart_block
+tellraw @a [{"text":"warped_wart_block数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered prismarine_bricks
+tellraw @a [{"text":"prismarine_bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_wool
+tellraw @a [{"text":"red_wool数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_concrete
+tellraw @a [{"text":"red_concrete数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered netherrack
+tellraw @a [{"text":"netherrack数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered red_nether_bricks
+tellraw @a [{"text":"red_nether_bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
+execute store result score block_count block_count positioned 1000 10 4000 run clone ~ ~ ~ ~25 ~ ~25 ~ ~1 ~ filtered bricks
+tellraw @a [{"text":"bricks数量: ","color":"green"},{"score": {"objective": "block_count","name": "block_count"},"color":"white"}]
 
 # 删除方块
-execute at @e[tag=color_match_floor] run fill ~1 ~1 ~ ~26 ~1 ~25 air replace
+execute positioned 1000 10 4000 run fill ~ ~1 ~ ~25 ~1 ~25 air replace
 
 # 删除计分板
 scoreboard objectives remove block_count