Skip to content

Commit

Permalink
MCver1.19.4での開発完全終了 (#315)
Browse files Browse the repository at this point in the history
1.19.4での開発終了に合わせてここで一旦devにマージする
  • Loading branch information
NePonpon authored Apr 28, 2024
2 parents 872eeee + 2ad7ab6 commit 26d1c6b
Show file tree
Hide file tree
Showing 1,144 changed files with 67,543 additions and 3,642 deletions.
2 changes: 2 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ body:
attributes:
label: 発生したTUSBv13のVersion
options:
- v13.1.0α2
- v13.0.1α2
- v13.0.0α2
- v13.2.1α
- v13.2.0α
Expand Down
47 changes: 47 additions & 0 deletions data/advancement/advancements/tutorial/secret18.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
{
"display": {
"icon": {
"item": "minecraft:bedrock",
"nbt": "{Enchantments:[{}]}"
},
"title": [
{
"translate": "岩盤化したスポナー ",
"color": "#FF2739",
"bold": true
}
],
"description": {
"translate": "%1$sが%2$sの周りに集まると、\n%3$sことがあります。\nこの状態の%2$sは破壊しても、\n%4$s為、溜まった%1$sを\n減らす必要があります。",
"color": "white",
"with": [
{
"translate": "敵モブ",
"color": "red"
},
{
"translate": "スポナー",
"color": "dark_aqua"
},
{
"translate": "岩盤のような外観に変化する",
"color": "gray"
},
{
"translate": "HPが減少しなくなる",
"color": "#FF0000"
}
]
},
"frame": "task",
"show_toast": true,
"announce_to_chat": false,
"hidden": true
},
"parent": "advancement:tutorial/secret17",
"criteria": {
"spawner_lock": {
"trigger": "minecraft:impossible"
}
}
}
56 changes: 56 additions & 0 deletions data/advancement/advancements/tutorial/tutorial16.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
{
"display": {
"icon": {
"item": "minecraft:smithing_table",
"nbt": "{}"
},
"title": [
{
"translate": "鍛冶台の使用制限 ",
"color": "white",
"bold": true
}
],
"description": {
"translate": "魔石によるエンチャントシステム導入に伴い\n%1$sように\n制限している。\nその代わり簡易的ではあるが%2$sで\n%3$sと%4$sを\n組み合わせることができる。",
"color": "white",
"with": [
{
"translate": "鍛冶台でツールを制作できない",
"color": "red"
},
{
"translate": "クラフト",
"color": "#7CD100"
},
{
"translate": "ツール",
"color": "#32EBCA"
},
{
"translate": "item.minecraft.netherite_ingot",
"color": "#716871"
}
]
},
"frame": "task",
"show_toast": true,
"announce_to_chat": false,
"hidden": false
},
"parent": "advancement:tutorial/tutorial14",
"criteria": {
"requirement": {
"trigger": "minecraft:item_used_on_block",
"conditions": {
"location": {
"block": {
"blocks": [
"minecraft:smithing_table"
]
}
}
}
}
}
}
4 changes: 4 additions & 0 deletions data/area/functions/entered/flying_island.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,7 @@ function settings:area/flying_island
function area:entered/
# 演出表示
function makeup:area/entered/flying_island

# 初回入場ならば交易島固定を解除
execute if data storage area: {FlyingIslandEnteredFlag:1b} run schedule function area:flying_islands_gate/change 1d replace
data remove storage area: FlyingIslandEnteredFlag
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
execute in area:control_area run setblock 2 2 2 shulker_box
execute in area:control_area run setblock 2 3 2 oak_sign
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
function makeup:area/system/flying_island/training_ground
tag @e[x=-640,y=86,z=-818,dx=17,dy=13,dz=20,tag=Training] add Garbage
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tp @a[sort=nearest,limit=1] ~3 ~ ~
function area:system/flying_island/training_ground/
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tp @a[sort=nearest,limit=1] ~-3 ~ ~
function area:system/flying_island/training_ground/
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tp @a[sort=nearest,limit=1] ~ ~ ~-3
function area:system/flying_island/training_ground/
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
tp @a[sort=nearest,limit=1] ~ ~ ~3
function area:system/flying_island/training_ground/
102 changes: 51 additions & 51 deletions data/area/functions/system/island_capture.mcfunction
Original file line number Diff line number Diff line change
@@ -1,58 +1,58 @@
#進捗の判定
##skylands
execute if entity @s[advancements={area:system/island_capture={skylands.001=true}}] run data modify storage area: capture.skylands.001 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.002=true}}] run data modify storage area: capture.skylands.002 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.003=true}}] run data modify storage area: capture.skylands.003 set value true
# execute if entity @s[advancements={area:system/island_capture={skylands.004=true}}] run data modify storage area: capture.skylands.004 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.005=true}}] run data modify storage area: capture.skylands.005 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.006=true}}] run data modify storage area: capture.skylands.006 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.007=true}}] run data modify storage area: capture.skylands.007 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.008=true}}] run data modify storage area: capture.skylands.008 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.009=true}}] run data modify storage area: capture.skylands.009 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.010=true}}] run data modify storage area: capture.skylands.010 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.011=true}}] run data modify storage area: capture.skylands.011 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.012=true}}] run data modify storage area: capture.skylands.012 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.013=true}}] run data modify storage area: capture.skylands.013 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.014=true}}] run data modify storage area: capture.skylands.014 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.015=true}}] run data modify storage area: capture.skylands.015 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.016=true}}] run data modify storage area: capture.skylands.016 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.017=true}}] run data modify storage area: capture.skylands.017 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.018=true}}] run data modify storage area: capture.skylands.018 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.019=true}}] run data modify storage area: capture.skylands.019 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.020=true}}] run data modify storage area: capture.skylands.020 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.021=true}}] run data modify storage area: capture.skylands.021 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.022=true}}] run data modify storage area: capture.skylands.022 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.023=true}}] run data modify storage area: capture.skylands.023 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.024=true}}] run data modify storage area: capture.skylands.024 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.025=true}}] run data modify storage area: capture.skylands.025 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.026=true}}] run data modify storage area: capture.skylands.026 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.027=true}}] run data modify storage area: capture.skylands.027 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.028=true}}] run data modify storage area: capture.skylands.028 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.029=true}}] run data modify storage area: capture.skylands.029 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.030=true}}] run data modify storage area: capture.skylands.030 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.031=true}}] run data modify storage area: capture.skylands.031 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.032=true}}] run data modify storage area: capture.skylands.032 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.033=true}}] run data modify storage area: capture.skylands.033 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.034=true}}] run data modify storage area: capture.skylands.034 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.035=true}}] run data modify storage area: capture.skylands.035 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.036=true}}] run data modify storage area: capture.skylands.036 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.037=true}}] run data modify storage area: capture.skylands.037 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.038=true}}] run data modify storage area: capture.skylands.038 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.039=true}}] run data modify storage area: capture.skylands.039 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.040=true}}] run data modify storage area: capture.skylands.040 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.041=true}}] run data modify storage area: capture.skylands.041 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.042=true}}] run data modify storage area: capture.skylands.042 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.043=true}}] run data modify storage area: capture.skylands.043 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.044=true}}] run data modify storage area: capture.skylands.044 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.045=true}}] run data modify storage area: capture.skylands.045 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.046=true}}] run data modify storage area: capture.skylands.046 set value true
execute if entity @s[advancements={area:system/island_capture={skylands.001=true}}] run data modify storage area: capture.skylands.001 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.002=true}}] run data modify storage area: capture.skylands.002 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.003=true}}] run data modify storage area: capture.skylands.003 set value 1
# execute if entity @s[advancements={area:system/island_capture={skylands.004=true}}] run data modify storage area: capture.skylands.004 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.005=true}}] run data modify storage area: capture.skylands.005 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.006=true}}] run data modify storage area: capture.skylands.006 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.007=true}}] run data modify storage area: capture.skylands.007 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.008=true}}] run data modify storage area: capture.skylands.008 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.009=true}}] run data modify storage area: capture.skylands.009 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.010=true}}] run data modify storage area: capture.skylands.010 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.011=true}}] run data modify storage area: capture.skylands.011 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.012=true}}] run data modify storage area: capture.skylands.012 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.013=true}}] run data modify storage area: capture.skylands.013 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.014=true}}] run data modify storage area: capture.skylands.014 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.015=true}}] run data modify storage area: capture.skylands.015 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.016=true}}] run data modify storage area: capture.skylands.016 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.017=true}}] run data modify storage area: capture.skylands.017 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.018=true}}] run data modify storage area: capture.skylands.018 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.019=true}}] run data modify storage area: capture.skylands.019 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.020=true}}] run data modify storage area: capture.skylands.020 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.021=true}}] run data modify storage area: capture.skylands.021 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.022=true}}] run data modify storage area: capture.skylands.022 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.023=true}}] run data modify storage area: capture.skylands.023 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.024=true}}] run data modify storage area: capture.skylands.024 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.025=true}}] run data modify storage area: capture.skylands.025 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.026=true}}] run data modify storage area: capture.skylands.026 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.027=true}}] run data modify storage area: capture.skylands.027 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.028=true}}] run data modify storage area: capture.skylands.028 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.029=true}}] run data modify storage area: capture.skylands.029 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.030=true}}] run data modify storage area: capture.skylands.030 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.031=true}}] run data modify storage area: capture.skylands.031 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.032=true}}] run data modify storage area: capture.skylands.032 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.033=true}}] run data modify storage area: capture.skylands.033 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.034=true}}] run data modify storage area: capture.skylands.034 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.035=true}}] run data modify storage area: capture.skylands.035 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.036=true}}] run data modify storage area: capture.skylands.036 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.037=true}}] run data modify storage area: capture.skylands.037 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.038=true}}] run data modify storage area: capture.skylands.038 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.039=true}}] run data modify storage area: capture.skylands.039 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.040=true}}] run data modify storage area: capture.skylands.040 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.041=true}}] run data modify storage area: capture.skylands.041 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.042=true}}] run data modify storage area: capture.skylands.042 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.043=true}}] run data modify storage area: capture.skylands.043 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.044=true}}] run data modify storage area: capture.skylands.044 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.045=true}}] run data modify storage area: capture.skylands.045 set value 1
execute if entity @s[advancements={area:system/island_capture={skylands.046=true}}] run data modify storage area: capture.skylands.046 set value 1
# ##flying_island
execute if entity @s[advancements={area:system/island_capture={flying_island.001=true}}] run data modify storage area: capture.flying_island.046 set value true
execute if entity @s[advancements={area:system/island_capture={flying_island.002=true}}] run data modify storage area: capture.flying_island.047 set value true
execute if entity @s[advancements={area:system/island_capture={flying_island.001=true}}] run data modify storage area: capture.flying_island.046 set value 1
execute if entity @s[advancements={area:system/island_capture={flying_island.002=true}}] run data modify storage area: capture.flying_island.047 set value 1
# ##cloudia
# execute if entity @s[advancements={area:system/island_capture={cloudia.001=true}}] run data modify storage area: capture.cloudia.048 set value true
# execute if entity @s[advancements={area:system/island_capture={cloudia.002=true}}] run data modify storage area: capture.cloudia.049 set value true
# execute if entity @s[advancements={area:system/island_capture={cloudia.003=true}}] run data modify storage area: capture.cloudia.050 set value true
# execute if entity @s[advancements={area:system/island_capture={cloudia.001=true}}] run data modify storage area: capture.cloudia.048 set value 1
# execute if entity @s[advancements={area:system/island_capture={cloudia.002=true}}] run data modify storage area: capture.cloudia.049 set value 1
# execute if entity @s[advancements={area:system/island_capture={cloudia.003=true}}] run data modify storage area: capture.cloudia.050 set value 1

#クリア数抽出
execute store result score _ Calc run function calc:island/clear_count
Expand Down
14 changes: 14 additions & 0 deletions data/area/functions/villager_point/init.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
# VillagerPoint
# summon marker ~ ~ ~ {Tags:[VillagerPoint]}

## 通常世界
execute in area:skylands run forceload add -95 -629
execute in area:skylands run summon marker -95.5 32.0 -629.5 {Tags:[VillagerPoint]}

## 飛空島
execute in area:flying_island run forceload add -585 -817
execute in area:flying_island run summon marker -585.5 90 -817.5 {Tags:[VillagerPoint]}

## クラウディア(α2)
execute in area:cloudia run forceload add -1895 -141
execute in area:cloudia run summon marker -1895.5 111 -141.5 {Tags:[VillagerPoint]}
2 changes: 2 additions & 0 deletions data/area/functions/villager_point/tp.mcfunction
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ride @s dismount
tp @s @e[tag=VillagerPoint,distance=0..,limit=1]
Loading

0 comments on commit 26d1c6b

Please sign in to comment.