From 1708bd1ae5f345ae21974eb0393352adbf746b6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20L=C3=B8vbr=C3=B8tte=20Olsen?= Date: Fri, 13 Sep 2019 17:17:05 +0200 Subject: [PATCH] Upgrade 1ps --- .../data/1ps/functions/loop.mcfunction | 1 - .../1ps/functions/internal_loop.mcfunction | 6 ++-- .../data/1ps/functions/load.mcfunction | 1 + .../data/1ps/functions/loop.mcfunction | 1 + .../data/1ps/functions/skipday.mcfunction | 34 +++++++++++++++++++ .../data/1ps/tags/functions/tick.json | 0 .../data/minecraft/tags/functions/load.json | 4 +++ .../data/minecraft/tags/functions/tick.json | 0 .../pack.mcmeta | 0 9 files changed, 43 insertions(+), 4 deletions(-) delete mode 100755 datapacks/1ps-1516729816-1/data/1ps/functions/loop.mcfunction rename datapacks/{1ps-1516729816-1 => 1ps-1556049967}/data/1ps/functions/internal_loop.mcfunction (50%) mode change 100755 => 100644 create mode 100644 datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction create mode 100644 datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction create mode 100644 datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction rename datapacks/{1ps-1516729816-1 => 1ps-1556049967}/data/1ps/tags/functions/tick.json (100%) mode change 100755 => 100644 create mode 100644 datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json rename datapacks/{1ps-1516729816-1 => 1ps-1556049967}/data/minecraft/tags/functions/tick.json (100%) mode change 100755 => 100644 rename datapacks/{1ps-1516729816-1 => 1ps-1556049967}/pack.mcmeta (100%) mode change 100755 => 100644 diff --git a/datapacks/1ps-1516729816-1/data/1ps/functions/loop.mcfunction b/datapacks/1ps-1516729816-1/data/1ps/functions/loop.mcfunction deleted file mode 100755 index 33eae99..0000000 --- a/datapacks/1ps-1516729816-1/data/1ps/functions/loop.mcfunction +++ /dev/null @@ -1 +0,0 @@ -execute if entity @a[nbt={Sleeping:1b}] run function 1ps:internal_loop \ No newline at end of file diff --git a/datapacks/1ps-1516729816-1/data/1ps/functions/internal_loop.mcfunction b/datapacks/1ps-1556049967/data/1ps/functions/internal_loop.mcfunction old mode 100755 new mode 100644 similarity index 50% rename from datapacks/1ps-1516729816-1/data/1ps/functions/internal_loop.mcfunction rename to datapacks/1ps-1556049967/data/1ps/functions/internal_loop.mcfunction index 2bf4605..bcc65a1 --- a/datapacks/1ps-1516729816-1/data/1ps/functions/internal_loop.mcfunction +++ b/datapacks/1ps-1556049967/data/1ps/functions/internal_loop.mcfunction @@ -1,3 +1,3 @@ -time add 125 -execute as @a[nbt={SleepTimer:1s}] run tellraw @a [{"selector":"@s","color":"yellow"},{"text":" is now sleeping ","color":"yellow"}] -execute if entity @a[nbt={SleepTimer:99s}] run weather clear 0 \ No newline at end of file +execute as @a[nbt={SleepTimer:1s}] run tellraw @a [{"selector":"@s","color":"yellow"},{"text":" is now sleeping ","color":"yellow"}] +execute as @a[nbt={SleepTimer:99s}] run function 1ps:skipday +execute if entity @a[nbt={SleepTimer:100s}] run weather clear 0 diff --git a/datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction b/datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction new file mode 100644 index 0000000..b0c0d97 --- /dev/null +++ b/datapacks/1ps-1556049967/data/1ps/functions/load.mcfunction @@ -0,0 +1 @@ +scoreboard objectives add 1ps.dayTimer dummy \ No newline at end of file diff --git a/datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction b/datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction new file mode 100644 index 0000000..ffccfd0 --- /dev/null +++ b/datapacks/1ps-1556049967/data/1ps/functions/loop.mcfunction @@ -0,0 +1 @@ +execute if entity @a[nbt=!{SleepTimer:0s}] run function 1ps:internal_loop diff --git a/datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction b/datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction new file mode 100644 index 0000000..85d75ca --- /dev/null +++ b/datapacks/1ps-1556049967/data/1ps/functions/skipday.mcfunction @@ -0,0 +1,34 @@ +execute store result score @s 1ps.dayTimer run time query daytime + +scoreboard players remove @s 1ps.dayTimer 24000 + +execute if entity @s[scores={1ps.dayTimer=..-16384}] run time add 16384 +execute if entity @s[scores={1ps.dayTimer=..-16384}] run scoreboard players add @s 1ps.dayTimer 16384 +execute if entity @s[scores={1ps.dayTimer=..-8192}] run time add 8192 +execute if entity @s[scores={1ps.dayTimer=..-8192}] run scoreboard players add @s 1ps.dayTimer 8192 +execute if entity @s[scores={1ps.dayTimer=..-4096}] run time add 4096 +execute if entity @s[scores={1ps.dayTimer=..-4096}] run scoreboard players add @s 1ps.dayTimer 4096 +execute if entity @s[scores={1ps.dayTimer=..-2048}] run time add 2048 +execute if entity @s[scores={1ps.dayTimer=..-2048}] run scoreboard players add @s 1ps.dayTimer 2048 +execute if entity @s[scores={1ps.dayTimer=..-1024}] run time add 1024 +execute if entity @s[scores={1ps.dayTimer=..-1024}] run scoreboard players add @s 1ps.dayTimer 1024 +execute if entity @s[scores={1ps.dayTimer=..-512}] run time add 512 +execute if entity @s[scores={1ps.dayTimer=..-512}] run scoreboard players add @s 1ps.dayTimer 512 +execute if entity @s[scores={1ps.dayTimer=..-256}] run time add 256 +execute if entity @s[scores={1ps.dayTimer=..-256}] run scoreboard players add @s 1ps.dayTimer 256 +execute if entity @s[scores={1ps.dayTimer=..-128}] run time add 128 +execute if entity @s[scores={1ps.dayTimer=..-128}] run scoreboard players add @s 1ps.dayTimer 128 +execute if entity @s[scores={1ps.dayTimer=..-64}] run time add 64 +execute if entity @s[scores={1ps.dayTimer=..-64}] run scoreboard players add @s 1ps.dayTimer 64 +execute if entity @s[scores={1ps.dayTimer=..-32}] run time add 32 +execute if entity @s[scores={1ps.dayTimer=..-32}] run scoreboard players add @s 1ps.dayTimer 32 +execute if entity @s[scores={1ps.dayTimer=..-16}] run time add 16 +execute if entity @s[scores={1ps.dayTimer=..-16}] run scoreboard players add @s 1ps.dayTimer 16 +execute if entity @s[scores={1ps.dayTimer=..-8}] run time add 8 +execute if entity @s[scores={1ps.dayTimer=..-8}] run scoreboard players add @s 1ps.dayTimer 8 +execute if entity @s[scores={1ps.dayTimer=..-4}] run time add 4 +execute if entity @s[scores={1ps.dayTimer=..-4}] run scoreboard players add @s 1ps.dayTimer 4 +execute if entity @s[scores={1ps.dayTimer=..-2}] run time add 2 +execute if entity @s[scores={1ps.dayTimer=..-2}] run scoreboard players add @s 1ps.dayTimer 2 +execute if entity @s[scores={1ps.dayTimer=..-1}] run time add 1 +execute if entity @s[scores={1ps.dayTimer=..-1}] run scoreboard players add @s 1ps.dayTimer 1 diff --git a/datapacks/1ps-1516729816-1/data/1ps/tags/functions/tick.json b/datapacks/1ps-1556049967/data/1ps/tags/functions/tick.json old mode 100755 new mode 100644 similarity index 100% rename from datapacks/1ps-1516729816-1/data/1ps/tags/functions/tick.json rename to datapacks/1ps-1556049967/data/1ps/tags/functions/tick.json diff --git a/datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json b/datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json new file mode 100644 index 0000000..1b0c8bb --- /dev/null +++ b/datapacks/1ps-1556049967/data/minecraft/tags/functions/load.json @@ -0,0 +1,4 @@ +{ + "replace": false, + "values": ["1ps:load"] +} \ No newline at end of file diff --git a/datapacks/1ps-1516729816-1/data/minecraft/tags/functions/tick.json b/datapacks/1ps-1556049967/data/minecraft/tags/functions/tick.json old mode 100755 new mode 100644 similarity index 100% rename from datapacks/1ps-1516729816-1/data/minecraft/tags/functions/tick.json rename to datapacks/1ps-1556049967/data/minecraft/tags/functions/tick.json diff --git a/datapacks/1ps-1516729816-1/pack.mcmeta b/datapacks/1ps-1556049967/pack.mcmeta old mode 100755 new mode 100644 similarity index 100% rename from datapacks/1ps-1516729816-1/pack.mcmeta rename to datapacks/1ps-1556049967/pack.mcmeta