From 45c84957f40bb1c8643cc3479d743f84d5e617e6 Mon Sep 17 00:00:00 2001 From: Dvdcd Date: Sun, 23 Dec 2018 21:14:17 -0800 Subject: [PATCH] Moving files to better spots and adding 1.1.0 hotfix --- warpbook-pack/bookcode.txt => bookcode.txt | 0 .../data => data}/main/functions/cooldown.mcfunction | 0 .../data => data}/main/functions/givebook.mcfunction | 0 {warpbook-pack/data => data}/main/functions/init.mcfunction | 0 {warpbook-pack/data => data}/main/functions/master.mcfunction | 3 ++- .../data => data}/main/functions/resetupdate.mcfunction | 0 {warpbook-pack/data => data}/main/functions/second.mcfunction | 0 {warpbook-pack/data => data}/main/functions/tp.mcfunction | 0 {warpbook-pack/data => data}/main/functions/update.mcfunction | 0 {warpbook-pack/data => data}/main/functions/warp.mcfunction | 0 {warpbook-pack/data => data}/main/tags/functions/init.json | 0 {warpbook-pack/data => data}/main/tags/functions/second.json | 0 .../data => data}/minecraft/tags/functions/load.json | 0 .../data => data}/minecraft/tags/functions/tick.json | 0 warpbook-pack/pack.mcmeta => pack.mcmeta | 0 15 files changed, 2 insertions(+), 1 deletion(-) rename warpbook-pack/bookcode.txt => bookcode.txt (100%) rename {warpbook-pack/data => data}/main/functions/cooldown.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/givebook.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/init.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/master.mcfunction (87%) rename {warpbook-pack/data => data}/main/functions/resetupdate.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/second.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/tp.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/update.mcfunction (100%) rename {warpbook-pack/data => data}/main/functions/warp.mcfunction (100%) rename {warpbook-pack/data => data}/main/tags/functions/init.json (100%) rename {warpbook-pack/data => data}/main/tags/functions/second.json (100%) rename {warpbook-pack/data => data}/minecraft/tags/functions/load.json (100%) rename {warpbook-pack/data => data}/minecraft/tags/functions/tick.json (100%) rename warpbook-pack/pack.mcmeta => pack.mcmeta (100%) diff --git a/warpbook-pack/bookcode.txt b/bookcode.txt similarity index 100% rename from warpbook-pack/bookcode.txt rename to bookcode.txt diff --git a/warpbook-pack/data/main/functions/cooldown.mcfunction b/data/main/functions/cooldown.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/cooldown.mcfunction rename to data/main/functions/cooldown.mcfunction diff --git a/warpbook-pack/data/main/functions/givebook.mcfunction b/data/main/functions/givebook.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/givebook.mcfunction rename to data/main/functions/givebook.mcfunction diff --git a/warpbook-pack/data/main/functions/init.mcfunction b/data/main/functions/init.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/init.mcfunction rename to data/main/functions/init.mcfunction diff --git a/warpbook-pack/data/main/functions/master.mcfunction b/data/main/functions/master.mcfunction similarity index 87% rename from warpbook-pack/data/main/functions/master.mcfunction rename to data/main/functions/master.mcfunction index 068ff67..328b8ba 100644 --- a/warpbook-pack/data/main/functions/master.mcfunction +++ b/data/main/functions/master.mcfunction @@ -6,7 +6,8 @@ scoreboard players add #tick tick 1 scoreboard players enable @a warpbook scoreboard players enable @a warpupdatet -execute as @a unless score @s warpupdate matches 1 run scoreboard players set @s warpupdate 0 +execute at @a unless score @s warpbook matches 1.. run scoreboard players set @s warpcooldown 0 +execute as @a unless score @s warpupdate matches 1 run scoreboard players set @s warpupdate 0 execute as @a if score @s warpupdatet matches 1 run function main:update #Run the main warping command if a player has pushed the book button execute as @a if score @s warpbook matches 1.. run function main:warp diff --git a/warpbook-pack/data/main/functions/resetupdate.mcfunction b/data/main/functions/resetupdate.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/resetupdate.mcfunction rename to data/main/functions/resetupdate.mcfunction diff --git a/warpbook-pack/data/main/functions/second.mcfunction b/data/main/functions/second.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/second.mcfunction rename to data/main/functions/second.mcfunction diff --git a/warpbook-pack/data/main/functions/tp.mcfunction b/data/main/functions/tp.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/tp.mcfunction rename to data/main/functions/tp.mcfunction diff --git a/warpbook-pack/data/main/functions/update.mcfunction b/data/main/functions/update.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/update.mcfunction rename to data/main/functions/update.mcfunction diff --git a/warpbook-pack/data/main/functions/warp.mcfunction b/data/main/functions/warp.mcfunction similarity index 100% rename from warpbook-pack/data/main/functions/warp.mcfunction rename to data/main/functions/warp.mcfunction diff --git a/warpbook-pack/data/main/tags/functions/init.json b/data/main/tags/functions/init.json similarity index 100% rename from warpbook-pack/data/main/tags/functions/init.json rename to data/main/tags/functions/init.json diff --git a/warpbook-pack/data/main/tags/functions/second.json b/data/main/tags/functions/second.json similarity index 100% rename from warpbook-pack/data/main/tags/functions/second.json rename to data/main/tags/functions/second.json diff --git a/warpbook-pack/data/minecraft/tags/functions/load.json b/data/minecraft/tags/functions/load.json similarity index 100% rename from warpbook-pack/data/minecraft/tags/functions/load.json rename to data/minecraft/tags/functions/load.json diff --git a/warpbook-pack/data/minecraft/tags/functions/tick.json b/data/minecraft/tags/functions/tick.json similarity index 100% rename from warpbook-pack/data/minecraft/tags/functions/tick.json rename to data/minecraft/tags/functions/tick.json diff --git a/warpbook-pack/pack.mcmeta b/pack.mcmeta similarity index 100% rename from warpbook-pack/pack.mcmeta rename to pack.mcmeta