Skip to content

Commit

Permalink
🩹 インデントを修正
Browse files Browse the repository at this point in the history
  • Loading branch information
haiiro2gou committed Jan 9, 2024
1 parent dd5db7b commit da81fee
Show file tree
Hide file tree
Showing 54 changed files with 78 additions and 81 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> For tellraw
# @private
#declare score_holder $ReadableHealth
#declare score_holder $ReadableHealth

# 体力だけx10000なので戻す
scoreboard players operation $ReadableHealth Temporary = $MaxHealth Global
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Temp
# @private
#declare score_holder $isDefenseCalcSkip
#declare score_holder $isDefenseCalcSkip

# 計算式:
# damage * (1 - min(20, max(defensePoints / 5, defensePoints - damage / (2 + toughness / 4))) / 25) * (1 - min(5, resistanceLv) / 5) * (1 - (min(20, cappedEPF) / 25))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Temp
# @private
#declare score_holder $Mul
#declare score_holder $Mul

# $EPF(e2) = min(20, $EPF(e0)) * e2 / 50
scoreboard players operation $EPF Temporary < $20 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Temp
# @private
#declare score_holder $Mul
#declare score_holder $Mul

# $Resistance(e1) *= min(5, $Resistance(e0)) * e1 / 5
scoreboard players operation $Resistance Temporary < $10 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#> Inv
# @private
#declare score_holder $InvSize
#declare score_holder $InvSize

function api:data_get/inventory
execute store result score $InvSize Lib if data storage api: Inventory[]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#> Inv
# @private
#declare score_holder $InvSize
#declare score_holder $InvSize

# storage検証
execute unless data storage asset:artifact ID run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません"},{"text":" ID","color":"red"}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> TickScore
# @within function asset_manager:artifact/check/check_local_cooldown/*
#declare score_holder $Tick
#declare score_holder $Tick

# データをコピー
data modify storage asset:artifact CopiedItem set from storage asset:artifact TargetItems
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#> Private
# @private
#declare score_holder $nonIDEquals
#declare score_holder $nonIDEquals

# 比較
data modify storage asset:artifact Temp set from storage asset:artifact TargetID
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> consumable判定用アマスタ
# @private
#declare tag CheckConsumableStand
#declare tag CheckConsumableStand

# 食べたスロットを特定する
# 下ごしらえ
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

#> ScoreHolder
# @private
#declare score_holder $Remain
#declare score_holder $Remain

# 対象スロットの残り使用回数取得
execute store result score $Remain Temporary run data get storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,25 @@
# asset:island/*/register/*
# asset:island/common/register
# asset_manager:island/**
#declare storage asset:island
#declare storage asset:island

#> Tag
# @within *
# asset:island/*/register/
# asset_manager:island/**
# core:tick/
#declare tag CursedArtifact
#declare tag CursedArtifact

#> Tag
# @within *
# asset_manager:island/**
# core:tick/
#declare tag DispelledCursedArtifact
#declare tag DispelledCursedArtifact

#> Tag
# @within function
# asset_manager:island/register/*
#declare tag CursedArtifactInit
#declare tag CursedArtifactInit

#> Tag
# @within function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,4 +91,4 @@
# @within function
# asset_manager:mob/tick/*
# asset_manager:mob/bossbar/*
#declare tag BossbarTarget
#declare tag BossbarTarget
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Val
# @private
#declare score_holder $MaxHealth
#declare score_holder $MaxHealth

# 追跡対象の設定
tag @e[type=#lib:living,tag=BossbarTarget] remove BossbarTarget
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Val
# @private
#declare score_holder $ActivateStarCount
#declare score_holder $ActivateStarCount

# EntityStorageを再度取得する
execute as @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@

#> from: 0876ebb758ff06a693772f61d38826203e214486
# @private
scoreboard objectives add 7U.UserID dummy
scoreboard objectives add 7U.UserID dummy

#> from: ec624d1852620d3c7549df1cac0d0f9448cf6763
# @private
#declare objective MobHealthMax
scoreboard players operation * MobHealthMax /= $100 Const
#declare objective MobHealthMax
scoreboard players operation * MobHealthMax /= $100 Const
34 changes: 17 additions & 17 deletions TheSkyBlessing/data/core/functions/migration/v0.1.4/.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,27 @@

#> fix teleporter bug
# @private
#declare storage asset:teleporter
data modify storage asset:teleporter Teleporters[].ID append value 0
data remove storage asset:teleporter Teleporters[{ID:[]}]
#declare storage asset:teleporter
data modify storage asset:teleporter Teleporters[].ID append value 0
data remove storage asset:teleporter Teleporters[{ID:[]}]

#> from: e80055bf9f185e8154489e1c7d7ea0cbf8293998
# @private
scoreboard objectives add ChunkLoadWaitingTime dummy {"text":"プレイヤーの周囲のチャンクロードが終了するまでの待ち時間"}
scoreboard objectives add ChunkLoadWaitingTime dummy {"text":"プレイヤーの周囲のチャンクロードが終了するまでの待ち時間"}

#> from: b4073d1466557d33877ed430b3566a97add6651e
data modify storage global GodIcon.Flora set value '{"text":"\\uE010","color":"white","font":"tsb"}'
data modify storage global GodIcon.Urban set value '{"text":"\\uE011","color":"white","font":"tsb"}'
data modify storage global GodIcon.Nyaptov set value '{"text":"\\uE012","color":"white","font":"tsb"}'
data modify storage global GodIcon.Wi-ki set value '{"text":"\\uE013","color":"white","font":"tsb"}'
data modify storage global GodIcon.Rumor set value '{"text":"\\uE014","color":"white","font":"tsb"}'
data modify storage global GodIcon.Flora set value '{"text":"\\uE010","color":"white","font":"tsb"}'
data modify storage global GodIcon.Urban set value '{"text":"\\uE011","color":"white","font":"tsb"}'
data modify storage global GodIcon.Nyaptov set value '{"text":"\\uE012","color":"white","font":"tsb"}'
data modify storage global GodIcon.Wi-ki set value '{"text":"\\uE013","color":"white","font":"tsb"}'
data modify storage global GodIcon.Rumor set value '{"text":"\\uE014","color":"white","font":"tsb"}'

#> from: 61c9ba4adb1482b9f000fa66ad3f4669dec0e840
execute in overworld run forceload add 62 -12
execute in overworld run forceload add 3040 -544 3103 -481
execute in overworld run forceload add 2922 -1333 2934 -1313
execute in overworld run forceload add 2976 -144 3007 -129
execute in overworld run forceload add 3448 -472
execute in overworld run forceload add 2915 -862
execute in overworld run forceload add 3056 -896 3087 -881
execute in overworld run forceload add 3411 -630
execute in overworld run forceload add 62 -12
execute in overworld run forceload add 3040 -544 3103 -481
execute in overworld run forceload add 2922 -1333 2934 -1313
execute in overworld run forceload add 2976 -144 3007 -129
execute in overworld run forceload add 3448 -472
execute in overworld run forceload add 2915 -862
execute in overworld run forceload add 3056 -896 3087 -881
execute in overworld run forceload add 3411 -630
10 changes: 5 additions & 5 deletions TheSkyBlessing/data/core/functions/migration/v0.1.5/.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
# @private
#declare function core:tick/4_interval
#declare function core:tick/6_distributed_interval
schedule clear core:tick/4_interval
schedule clear core:tick/6_distributed_interval
schedule clear core:tick/4_interval
schedule clear core:tick/6_distributed_interval

#> from: fea94a6d6ba812974756ef4cdf4ed231b2e26959
# @private
scoreboard objectives add PerHealth dummy {"text":"","color":"#FF4c99"}
scoreboard objectives modify PerHealth rendertype hearts
scoreboard objectives setdisplay list PerHealth
scoreboard objectives add PerHealth dummy {"text":"","color":"#FF4c99"}
scoreboard objectives modify PerHealth rendertype hearts
scoreboard objectives setdisplay list PerHealth
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,4 @@
scoreboard objectives add PosPacketLossDetectAfterTick dummy

#> from: fae9d4f302b8cb5a3dc4dce0a7662549a8e5aa47
# @private
summon armor_stand 0.0 0.0 0.0 {UUID:[I;0,0,0,1],Marker:1b,Invisible:1b}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
data modify storage global Patcher.Version set value "v0.4.0"

#> from: b6f378b2a1cbf4c37dda26fc04fbde8695fc2589
# @private
gamerule blockExplosionDropDecay true
gamerule blockExplosionDropDecay true
gamerule doVinesSpread true
Expand All @@ -25,5 +24,4 @@
gamerule waterSourceConversion true

#> from: c22fa96a8c7926684d8cd43ce92fc54fd02a9a51
# @private
gamerule doWardenSpawning true
2 changes: 1 addition & 1 deletion TheSkyBlessing/data/core/functions/tick/.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#> Val
# @private
#declare score_holder $4tInterval
#declare score_holder $4tInterval

# デバッグ用TickRate操作システム
execute if data storage global {IsProduction:0b} if score $AwaitTime Global matches -2147483648..2147483647 run function debug:tps/watch
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# @within function
# core:tick/
# core:tick/check_item_meta/entity
#declare tag ItemMetaChecked
#declare tag ItemMetaChecked
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# @within
# core:tick/
# debug:tps/**
#declare score_holder $AwaitTime
#declare score_holder $AwaitTime
2 changes: 1 addition & 1 deletion TheSkyBlessing/data/debug/functions/tps/watch.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#>
# @private
#declare score_holder $MilliSecond
#declare score_holder $MilliSecond

execute store result score $MilliSecond Temporary in the_end run worldborder get

Expand Down
4 changes: 2 additions & 2 deletions TheSkyBlessing/data/lib/functions/array/_index.d.mcfunction
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

#> Compare処理用
# @within function lib:array/**compare*
#declare score_holder $Temp
#declare score_holder $Temp

#> sum処理用
# @within function lib:array/**sum
#declare score_holder $isNumeric
#declare score_holder $isNumeric

#> 算術処理用
# @within function
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Random
# @private
#declare score_holder $Random
#declare score_holder $Random

execute store result score $Random Temporary run function lib:random/
scoreboard players operation $Random Temporary %= $3 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Random
# @private
#declare score_holder $Random
#declare score_holder $Random

execute store result score $Random Temporary run function lib:random/
scoreboard players operation $Random Temporary %= $3 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Random
# @private
#declare score_holder $Random
#declare score_holder $Random

execute store result score $Random Temporary run function lib:random/
scoreboard players operation $Random Temporary %= $100 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Random
# @private
#declare score_holder $Random
#declare score_holder $Random

execute store result score $Random Temporary run function lib:random/
scoreboard players operation $Random Temporary %= $3 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> Random
# @private
#declare score_holder $Random
#declare score_holder $Random

execute store result score $Random Temporary run function lib:random/
scoreboard players operation $Random Temporary %= $3 Const
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> private
# @private
#declare score_holder $Calc
#declare score_holder $Calc

# 100からノックバック耐性を引いた値を出す
scoreboard players set $Calc Temporary 100
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

#> for moving player
# @within function lib:spread_entity/core/player/*
#declare tag TargetPlayer
#declare tag TargetPlayer
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> for moving player
# @private
#declare tag SubstituteMarker
#declare tag SubstituteMarker

# 実行座標を取得する
summon marker ~ ~ ~ {Tags:["SubstituteMarker"]}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

#> for moving player
# @private
#declare tag SubstituteMarker
#declare tag SubstituteMarker

# Pos取得
function api:data_get/pos
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

#> 最初と最後のみに動作させるためのタグ
# @within function player_manager:god/rumor/passive/*
#declare tag PassiveBuff
#declare tag PassiveBuff
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

#> 最初と最後のみに動作させるためのタグ
# @within function player_manager:god/wi-ki/passive/*
#declare tag PassiveDebuff
#declare tag PassiveDebuff
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@

#> 無敵であることが推奨されるプレイヤー
# @public
#declare tag PlayerShouldInvulnerable
#declare tag PlayerShouldInvulnerable
Loading

0 comments on commit da81fee

Please sign in to comment.