diff --git a/.spyglassrc.json b/.spyglassrc.json index c051c25..2db32a5 100644 --- a/.spyglassrc.json +++ b/.spyglassrc.json @@ -1,6 +1,6 @@ { "env": { - "gameVersion": "1.21.4" + "gameVersion": "1.21.5" }, "lint": { "idOmitDefaultNamespace": false, diff --git a/data/bored-face.pose/function/add/cape.mcfunction b/data/bored-face.pose/function/add/cape.mcfunction index b4e98c7..205436d 100644 --- a/data/bored-face.pose/function/add/cape.mcfunction +++ b/data/bored-face.pose/function/add/cape.mcfunction @@ -1,3 +1,3 @@ -$data modify storage bored-face.pose:data capes append value {id: "$(id)", name: '{"text": "$(name)"}'} +$data modify storage bored-face.pose:data capes append value {id: "$(id)", name: {text: "$(name)"}} function bored-face.pose:reload_smartphone trigger bored-face.pose.smartphone diff --git a/data/bored-face.pose/function/add/player.mcfunction b/data/bored-face.pose/function/add/player.mcfunction index 6ab79ca..a5ad5cc 100644 --- a/data/bored-face.pose/function/add/player.mcfunction +++ b/data/bored-face.pose/function/add/player.mcfunction @@ -1,3 +1,3 @@ -$data modify storage bored-face.pose:data players append value {id: "$(id)", name: '{"text": "$(name)"}'} +$data modify storage bored-face.pose:data players append value {id: "$(id)", name: {text: "$(name)"}} function bored-face.pose:reload_smartphone trigger bored-face.pose.smartphone diff --git a/data/bored-face.pose/function/add/skin.mcfunction b/data/bored-face.pose/function/add/skin.mcfunction index ef4037d..aae371b 100644 --- a/data/bored-face.pose/function/add/skin.mcfunction +++ b/data/bored-face.pose/function/add/skin.mcfunction @@ -1,3 +1,3 @@ -$data modify storage bored-face.pose:data skins append value {id: "$(id)", name: '{"text": "$(name)"}'} +$data modify storage bored-face.pose:data skins append value {id: "$(id)", name: {text: "$(name)"}} function bored-face.pose:reload_smartphone trigger bored-face.pose.smartphone diff --git a/data/bored-face.pose/function/load/capes.mcfunction b/data/bored-face.pose/function/load/capes.mcfunction index 734d6dc..c6034e8 100644 --- a/data/bored-face.pose/function/load/capes.mcfunction +++ b/data/bored-face.pose/function/load/capes.mcfunction @@ -1,266 +1,266 @@ data modify storage bored-face.pose:data capes set value [ \ { \ id: "none", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.none.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.none.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.none.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.none.description"}} \ + }, \ }, \ { \ id: "bored", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.bored.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.bored.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.bored.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.bored.description"}} \ + }, \ }, \ { \ id: "15th_anniversary", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.15th_anniversary.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.15th_anniversary.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.15th_anniversary.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.15th_anniversary.description"}} \ + }, \ }, \ { \ id: "birthday", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.birthday.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.birthday.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.birthday.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.birthday.description"}} \ + }, \ }, \ { \ id: "cherry_blossom", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.cherry_blossom.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.cherry_blossom.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.cherry_blossom.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.cherry_blossom.description"}} \ + }, \ }, \ { \ id: "cobalt", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.cobalt.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.cobalt.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.cobalt.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.cobalt.description"}} \ + }, \ }, \ { \ id: "db", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.db.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.db.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.db.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.db.description"}} \ + }, \ }, \ { \ id: "followers", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.followers.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.followers.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.followers.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.followers.description"}} \ + }, \ }, \ { \ id: "mcc_15th_year", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mcc_15th_year.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mcc_15th_year.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mcc_15th_year.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mcc_15th_year.description"}} \ + }, \ }, \ { \ id: "migrator", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.migrator.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.migrator.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.migrator.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.migrator.description"}} \ + }, \ }, \ { \ id: "millionth_customer", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.millionth_customer.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.millionth_customer.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.millionth_customer.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.millionth_customer.description"}} \ + }, \ }, \ { \ id: "minecon_2011", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecon_2011.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecon_2011.description\"}} \ - }", \ - }, \ - { \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecon_2012.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecon_2012.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.minecon_2011.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecon_2011.description"}} \ + }, \ + }, \ + { \ + name: { \ + translate: "resource.bored-face.pose.cape.minecon_2012.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecon_2012.description"}} \ + }, \ id: "minecon_2012", \ }, \ { \ id: "minecon_2013", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecon_2013.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecon_2013.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.minecon_2013.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecon_2013.description"}} \ + }, \ }, \ { \ id: "minecon_2015", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecon_2015.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecon_2015.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.minecon_2015.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecon_2015.description"}} \ + }, \ }, \ { \ id: "minecon_2016", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecon_2016.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecon_2016.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.minecon_2016.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecon_2016.description"}} \ + }, \ }, \ { \ id: "minecraft_experience", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.minecraft_experience.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.minecraft_experience.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.minecraft_experience.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.minecraft_experience.description"}} \ + }, \ }, \ { \ id: "mojang_classic", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mojang_classic.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mojang_classic.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mojang_classic.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mojang_classic.description"}} \ + }, \ }, \ { \ id: "mojang_office", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mojang_office.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mojang_office.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mojang_office.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mojang_office.description"}} \ + }, \ }, \ { \ id: "mojang_studios", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mojang_studios.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mojang_studios.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mojang_studios.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mojang_studios.description"}} \ + }, \ }, \ { \ id: "mojang", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mojang.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mojang.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mojang.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mojang.description"}} \ + }, \ }, \ { \ id: "mojira_moderator", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.mojira_moderator.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.mojira_moderator.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.mojira_moderator.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.mojira_moderator.description"}} \ + }, \ }, \ { \ id: "prismarine", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.prismarine.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.prismarine.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.prismarine.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.prismarine.description"}} \ + }, \ }, \ { \ id: "purple_heart", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.purple_heart.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.purple_heart.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.purple_heart.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.purple_heart.description"}} \ + }, \ }, \ { \ id: "realms_mapmaker", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.realms_mapmaker.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.realms_mapmaker.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.realms_mapmaker.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.realms_mapmaker.description"}} \ + }, \ }, \ { \ id: "scrolls", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.scrolls.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.scrolls.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.scrolls.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.scrolls.description"}} \ + }, \ }, \ { \ id: "snowman", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.snowman.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.snowman.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.snowman.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.snowman.description"}} \ + }, \ }, \ { \ id: "spade", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.spade.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.spade.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.spade.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.spade.description"}} \ + }, \ }, \ { \ id: "test", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.test.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.test.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.test.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.test.description"}} \ + }, \ }, \ { \ id: "translator", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.translator.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.translator.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.translator.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.translator.description"}} \ + }, \ }, \ { \ id: "turtle", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.turtle.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.turtle.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.turtle.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.turtle.description"}} \ + }, \ }, \ { \ id: "valentine", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.valentine.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.valentine.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.valentine.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.valentine.description"}} \ + }, \ }, \ { \ id: "vanilla", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.cape.vanilla.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.cape.vanilla.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.cape.vanilla.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.cape.vanilla.description"}} \ + }, \ }, \ ] diff --git a/data/bored-face.pose/function/load/footer.mcfunction b/data/bored-face.pose/function/load/footer.mcfunction index 899bb93..78eaed9 100644 --- a/data/bored-face.pose/function/load/footer.mcfunction +++ b/data/bored-face.pose/function/load/footer.mcfunction @@ -1,6 +1,6 @@ -execute unless data storage bored-face.pose:smartphone nav_bar.player.icon run \ - data modify storage bored-face.pose:smartphone nav_bar.player.icon set value "{\"text\": \"\\u0005\", \"font\": \"bored-face.pose:icon\", \"color\": \"red\"}" -execute unless data storage bored-face.pose:smartphone nav_bar.cape.icon run \ - data modify storage bored-face.pose:smartphone nav_bar.cape.icon set value "{\"text\": \"\\u0006\", \"font\": \"bored-face.pose:icon\", \"color\": \"green\"}" -execute unless data storage bored-face.pose:smartphone nav_bar.skin.icon run \ - data modify storage bored-face.pose:smartphone nav_bar.skin.icon set value "{\"text\": \"\\u0007\", \"font\": \"bored-face.pose:icon\", \"color\": \"blue\"}" +execute unless data storage bored-face.pose:smartphone nav_bar.player.icon.text run \ + data modify storage bored-face.pose:smartphone nav_bar.player.icon set value {text: "\u0005", font: "bored-face.pose:icon", color: "red"} +execute unless data storage bored-face.pose:smartphone nav_bar.cape.icon.text run \ + data modify storage bored-face.pose:smartphone nav_bar.cape.icon set value {text: "\u0006", font: "bored-face.pose:icon", color: "green"} +execute unless data storage bored-face.pose:smartphone nav_bar.skin.icon.text run \ + data modify storage bored-face.pose:smartphone nav_bar.skin.icon set value {text: "\u0007", font: "bored-face.pose:icon", color: "blue"} diff --git a/data/bored-face.pose/function/load/players.mcfunction b/data/bored-face.pose/function/load/players.mcfunction index 3adb323..0fb02a3 100644 --- a/data/bored-face.pose/function/load/players.mcfunction +++ b/data/bored-face.pose/function/load/players.mcfunction @@ -1,58 +1,58 @@ data modify storage bored-face.pose:data players set value [ \ { \ id: "normal", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.normal.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.normal.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.normal.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.normal.description"}} \ + }, \ }, \ { \ id: "cardboard", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.cardboard.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.cardboard.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.cardboard.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.cardboard.description"}} \ + }, \ }, \ { \ id: "handstand", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.handstand.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.handstand.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.handstand.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.handstand.description"}} \ + }, \ }, \ { \ id: "happy", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.happy.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.happy.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.happy.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.happy.description"}} \ + }, \ }, \ { \ id: "high_five", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.high_five.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.high_five.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.high_five.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.high_five.description"}} \ + }, \ }, \ { \ id: "run", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.run.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.run.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.run.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.run.description"}} \ + }, \ }, \ { \ id: "sneak", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.player.sneak.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.player.sneak.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.player.sneak.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.player.sneak.description"}} \ + }, \ }, \ ] diff --git a/data/bored-face.pose/function/load/skins.mcfunction b/data/bored-face.pose/function/load/skins.mcfunction index 1f23b66..8391c49 100644 --- a/data/bored-face.pose/function/load/skins.mcfunction +++ b/data/bored-face.pose/function/load/skins.mcfunction @@ -1,34 +1,34 @@ data modify storage bored-face.pose:data skins set value [ \ { \ id: "default_wide", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.skin.default_wide.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.skin.default_wide.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.skin.default_wide.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.skin.default_wide.description"}} \ + }, \ }, \ { \ id: "default_slim", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.skin.default_slim.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.skin.default_slim.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.skin.default_slim.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.skin.default_slim.description"}} \ + }, \ }, \ { \ id: "steve", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.skin.steve.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.skin.steve.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.skin.steve.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.skin.steve.description"}} \ + }, \ }, \ { \ id: "alex", \ - name: "{ \ - \"translate\": \"resource.bored-face.pose.skin.alex.name\", \ - \"color\": \"#000000\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": {\"translate\": \"resource.bored-face.pose.skin.alex.description\"}} \ - }", \ + name: { \ + translate: "resource.bored-face.pose.skin.alex.name", \ + color: "#000000", \ + hover_event: {action: "show_text", value: {translate: "resource.bored-face.pose.skin.alex.description"}} \ + }, \ }, \ ] diff --git a/data/bored-face.pose/function/load/title.mcfunction b/data/bored-face.pose/function/load/title.mcfunction index b0aa122..4cb6957 100644 --- a/data/bored-face.pose/function/load/title.mcfunction +++ b/data/bored-face.pose/function/load/title.mcfunction @@ -1,117 +1,117 @@ data modify storage bored-face.pose:data title set value [ \ { \ id: "title", \ - name: "{ \ - \"text\": \"\\u0005\", \ - \"font\": \"bored-face.pose:space_neg\", \ - \"color\": \"white\", \ - \"extra\": [ \ - { \"text\": \"\\u0003\", \"font\": \"bored-face.pose:icon\" }, \ - { \"text\": \"\\u0001\" }, \ - { \"text\": \"\\u0004\", \"font\": \"bored-face.pose:icon\" } \ + name: { \ + text: "\u0005", \ + font: "bored-face.pose:space_neg", \ + color: "white", \ + extra: [ \ + { text: "\u0003", font: "bored-face.pose:icon" }, \ + { text: "\u0001" }, \ + { text: "\u0004", font: "bored-face.pose:icon" } \ ] \ - }", \ + }, \ }, \ { \ id: "title", \ - name: "{ \ - \"text\": \"\\u0005\", \ - \"font\": \"bored-face.pose:space_neg\", \ - \"extra\": [ \ + name: { \ + text: "\u0005", \ + font: "bored-face.pose:space_neg", \ + extra: [ \ { \ - \"text\": \"\\u0064\\u0013\", \ - \"font\": \"bored-face.pose:space_pos\" \ + text: "\u0064\u0013", \ + font: "bored-face.pose:space_pos" \ } \ ] \ - }", \ + }, \ }, \ - { name: "\"\""}, \ + { name: {text: ""}}, \ { \ - name: "{ \ - \"text\": \" v1.0\", \ - \"color\": \"#696969\" \ - }" \ + name: { \ + text: " v1.0", \ + color: "#696969" \ + } \ }, \ - { name: "\"\""}, \ - { name: "\"\""}, \ - { name: "\"\""}, \ - { name: "\"\""}, \ - { name: "\"\""}, \ - { name: "\"\""}, \ - { name: "\"\""}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ + { name: {text: ""}}, \ \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_1\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_2\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_3\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_4\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_5\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_6\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_7\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_8\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_9\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_10\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.welcome_11\", \"fallback\": \"\"} \ - ]}"}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_1", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_2", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_3", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_4", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_5", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_6", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_7", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_8", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_9", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_10", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.welcome_11", fallback: ""} \ + ]}}, \ \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000b\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"text\": \"\\u0005\", \"font\": \"bored-face.pose:icon\", \"color\": \"red\"}, \ - {\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.pose_1\", \"color\": \"#bb0000\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.pose_2\", \"color\": \"#bb0000\", \"fallback\": \"\"}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.pose_3\", \"color\": \"#bb0000\", \"fallback\": \"\"}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u0009\\u0001\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"text\": \"\\u0006\", \"font\": \"bored-face.pose:icon\", \"color\": \"green\"}, \ - {\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.cape_1\", \"color\": \"#00bb00\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.cape_2\", \"color\": \"#00bb00\", \"fallback\": \"\"}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.cape_3\", \"color\": \"#00bb00\", \"fallback\": \"\"}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000e\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"text\": \"\\u0007\", \"font\": \"bored-face.pose:icon\", \"color\": \"blue\"}, \ - {\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.skin_1\", \"color\": \"#0000bb\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.skin_2\", \"color\": \"#0000bb\", \"fallback\": \"\"}"}, \ - {name: "{\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar.skin_3\", \"color\": \"#0000bb\", \"fallback\": \"\"}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar_1\", \"fallback\": \"\"} \ - ]}"}, \ - {name: "{\"text\": \"\", \"extra\": [ \ - {\"text\": \"\\u000d\", \"font\": \"bored-face.pose:space_neg\"},\ - {\"translate\": \"gui.bored-face.pose.smartphone.title.nav_bar_2\", \"fallback\": \"\"} \ - ]}"}, \ + {name: {text: "", extra: [ \ + {text: "\u000b", font: "bored-face.pose:space_neg"},\ + {text: "\u0005", font: "bored-face.pose:icon", color: "red"}, \ + {translate: "gui.bored-face.pose.smartphone.title.nav_bar.pose_1", color: "#bb0000", fallback: ""} \ + ]}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.pose_2", color: "#bb0000", fallback: ""}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.pose_3", color: "#bb0000", fallback: ""}}, \ + {name: {text: "", extra: [ \ + {text: "\u0009\u0001", font: "bored-face.pose:space_neg"},\ + {text: "\u0006", font: "bored-face.pose:icon", color: "green"}, \ + {translate: "gui.bored-face.pose.smartphone.title.nav_bar.cape_1", color: "#00bb00", fallback: ""} \ + ]}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.cape_2", color: "#00bb00", fallback: ""}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.cape_3", color: "#00bb00", fallback: ""}}, \ + {name: {text: "", extra: [ \ + {text: "\u000e", font: "bored-face.pose:space_neg"},\ + {text: "\u0007", font: "bored-face.pose:icon", color: "blue"}, \ + {translate: "gui.bored-face.pose.smartphone.title.nav_bar.skin_1", color: "#0000bb", fallback: ""} \ + ]}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.skin_2", color: "#0000bb", fallback: ""}}, \ + {name: {translate: "gui.bored-face.pose.smartphone.title.nav_bar.skin_3", color: "#0000bb", fallback: ""}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.nav_bar_1", fallback: ""} \ + ]}}, \ + {name: {text: "", extra: [ \ + {text: "\u000d", font: "bored-face.pose:space_neg"},\ + {translate: "gui.bored-face.pose.smartphone.title.nav_bar_2", fallback: ""} \ + ]}}, \ ] diff --git a/data/bored-face.pose/function/reload_smartphone/add_page.mcfunction b/data/bored-face.pose/function/reload_smartphone/add_page.mcfunction index 2c90ca6..fd3bc8b 100644 --- a/data/bored-face.pose/function/reload_smartphone/add_page.mcfunction +++ b/data/bored-face.pose/function/reload_smartphone/add_page.mcfunction @@ -1,76 +1,76 @@ $data modify storage bored-face.pose:smartphone $(storage) append value [] -$data modify storage bored-face.pose:smartphone pages append value "{ \ - \"text\": \"\", \ - \"extra\": [ \ +$data modify storage bored-face.pose:smartphone pages append value { \ + text: "", \ + extra: [ \ { \ - \"text\": \"\\u0002\", \ - \"font\": \"bored-face.pose:icon\", \ - \"shadow_color\": 0, \ - \"color\": \"$(background_color)\", \ - \"extra\": [ \ - { \"text\": \"\\u0064\\u0035\", \"font\": \"bored-face.pose:space_neg\" }, \ - { \"text\": \"\\u0001\" }, \ - { \"text\": \"\\u0001\", \"font\": \"bored-face.pose:space_neg\" } \ + text: "\u0002", \ + font: "bored-face.pose:icon", \ + shadow_color: 0, \ + color: "$(background_color)", \ + extra: [ \ + { text: "\u0064\u0035", font: "bored-face.pose:space_neg" }, \ + { text: "\u0001" }, \ + { text: "\u0001", font: "bored-face.pose:space_neg" } \ ] \ }, \ { \ - \"translate\": \"gui.bored-face.pose.smartphone.$(function).title\", \ - \"fallback\": \"\" \ + translate: "gui.bored-face.pose.smartphone.$(function).title", \ + fallback: "" \ }, \ - { \"text\": \"\\n\" }, \ + { text: "\n" }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"$(storage)[$(page_num)][]\", \ - \"interpret\": true, \ - \"separator\": \"\\n\" \ + storage: "bored-face.pose:smartphone", \ + nbt: "$(storage)[$(page_num)][]", \ + interpret: true, \ + separator: "\n" \ }, \ - { \"text\": \"\\n \" }, \ + { text: "\n " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.player.$(nav_bar_player)\", \ - \"interpret\": true \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.player.$(nav_bar_player)", \ + interpret: true \ }, \ - { \"text\": \" \" }, \ + { text: " " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.cape.$(nav_bar_cape)\", \ - \"interpret\": true \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.cape.$(nav_bar_cape)", \ + interpret: true \ }, \ - { \"text\": \" \" }, \ + { text: " " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.skin.$(nav_bar_skin)\", \ - \"interpret\": true \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.skin.$(nav_bar_skin)", \ + interpret: true \ }, \ - { \"text\": \"\\n \" }, \ + { text: "\n " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.player.base\", \ - \"interpret\": true, \ - \"extra\": [ \ - {\"text\": \"\\u000b\", \"font\": \"bored-face.pose:space_pos\"} \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.player.base", \ + interpret: true, \ + extra: [ \ + {text: "\u000b", font: "bored-face.pose:space_pos"} \ ] \ }, \ - { \"text\": \" \" }, \ + { text: " " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.cape.base\", \ - \"interpret\": true, \ - \"extra\": [ \ - {\"text\": \"\\u0009\\u0001\", \"font\": \"bored-face.pose:space_pos\"} \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.cape.base", \ + interpret: true, \ + extra: [ \ + {text: "\u0009\u0001", font: "bored-face.pose:space_pos"} \ ] \ }, \ - { \"text\": \" \" }, \ + { text: " " }, \ { \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.skin.base\", \ - \"interpret\": true, \ - \"extra\": [ \ - {\"text\": \"\\u000e\", \"font\": \"bored-face.pose:space_pos\"} \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.skin.base", \ + interpret: true, \ + extra: [ \ + {text: "\u000e", font: "bored-face.pose:space_pos"} \ ] \ } \ ] \ -}" +} scoreboard players add $page_count bored-face.pose.loop 1 diff --git a/data/bored-face.pose/function/reload_smartphone/iterate.mcfunction b/data/bored-face.pose/function/reload_smartphone/iterate.mcfunction index 938ea3a..45f42bf 100644 --- a/data/bored-face.pose/function/reload_smartphone/iterate.mcfunction +++ b/data/bored-face.pose/function/reload_smartphone/iterate.mcfunction @@ -1,28 +1,28 @@ # with click $execute if data storage bored-face.pose:data $(storage)[$(total)].id run return run \ -data modify storage bored-face.pose:smartphone $(storage)[$(page_num)] append value "{ \ - \"text\": \"\", \ - \"extra\": [ \ +data modify storage bored-face.pose:smartphone $(storage)[$(page_num)] append value { \ + text: "", \ + extra: [ \ { \ - \"storage\": \"bored-face.pose:data\", \ - \"nbt\": \"$(storage)[$(total)].name\", \ - \"interpret\": true, \ - \"clickEvent\": { \ - \"action\": \"run_command\", \ - \"value\": \"/function bored-face.pose:$(function) {id: $(id)}\" \ + storage: "bored-face.pose:data", \ + nbt: "$(storage)[$(total)].name", \ + interpret: true, \ + click_event: { \ + action: "run_command", \ + command: "function bored-face.pose:$(function) {id: $(id)}" \ } \ } \ ] \ -}" +} # without click -$data modify storage bored-face.pose:smartphone $(storage)[$(page_num)] append value "{ \ - \"text\": \"\", \ - \"extra\": [ \ +$data modify storage bored-face.pose:smartphone $(storage)[$(page_num)] append value { \ + text: "", \ + extra: [ \ { \ - \"storage\": \"bored-face.pose:data\", \ - \"nbt\": \"$(storage)[$(total)].name\", \ - \"interpret\": true \ + storage: "bored-face.pose:data", \ + nbt: "$(storage)[$(total)].name", \ + interpret: true \ } \ ] \ -}" +} diff --git a/data/bored-face.pose/function/reload_smartphone/set_footer.mcfunction b/data/bored-face.pose/function/reload_smartphone/set_footer.mcfunction index f645bfb..b5e6c06 100644 --- a/data/bored-face.pose/function/reload_smartphone/set_footer.mcfunction +++ b/data/bored-face.pose/function/reload_smartphone/set_footer.mcfunction @@ -1,29 +1,29 @@ -$data modify storage bored-face.pose:smartphone nav_bar.$(function).base set value "{ \ - \"text\": \"\", \ - \"hoverEvent\": {\"action\": \"show_text\", \"contents\": { \ - \"text\": \"\", \ - \"extra\": [ \ - { \"storage\": \"bored-face.pose:smartphone\", \"nbt\": \"nav_bar.$(function).icon\", \"interpret\": true }, \ - { \"text\": \" \" }, \ - { \"translate\": \"gui.bored-face.pose.smartphone.$(function).nav_bar\" }, \ - { \"text\": \"\\n\" } \ +$data modify storage bored-face.pose:smartphone nav_bar.$(function).base set value { \ + text: "", \ + hover_event: {action: "show_text", value: { \ + text: "", \ + extra: [ \ + { storage: "bored-face.pose:smartphone", nbt: "nav_bar.$(function).icon", interpret: true }, \ + { text: " " }, \ + { translate: "gui.bored-face.pose.smartphone.$(function).nav_bar" }, \ + { text: "\n" } \ ] \ }}, \ - \"clickEvent\": {\"action\": \"change_page\", \"value\": \"$(page_num)\"} \ -}" -$data modify storage bored-face.pose:smartphone nav_bar.$(function).active set value "{ \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.$(function).base\", \ - \"interpret\": true, \ - \"extra\": [ \ - { \"storage\": \"bored-face.pose:smartphone\", \"nbt\": \"nav_bar.$(function).icon\", \"interpret\": true } \ + click_event: {action: "change_page", page: $(page_num)} \ +} +$data modify storage bored-face.pose:smartphone nav_bar.$(function).active set value { \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.$(function).base", \ + interpret: true, \ + extra: [ \ + { storage: "bored-face.pose:smartphone", nbt: "nav_bar.$(function).icon", interpret: true } \ ] \ -}" -$data modify storage bored-face.pose:smartphone nav_bar.$(function).inactive set value "{ \ - \"storage\": \"bored-face.pose:smartphone\", \ - \"nbt\": \"nav_bar.$(function).base\", \ - \"interpret\": true, \ - \"extra\": [ \ - { \"storage\": \"bored-face.pose:smartphone\", \"nbt\": \"nav_bar.$(function).icon\", \"interpret\": true, \"color\": \"gray\" } \ +} +$data modify storage bored-face.pose:smartphone nav_bar.$(function).inactive set value { \ + storage: "bored-face.pose:smartphone", \ + nbt: "nav_bar.$(function).base", \ + interpret: true, \ + extra: [ \ + { storage: "bored-face.pose:smartphone", nbt: "nav_bar.$(function).icon", interpret: true, color: "gray" } \ ] \ -}" +} diff --git a/data/bored-face.pose/function/title/title.mcfunction b/data/bored-face.pose/function/title/title.mcfunction index 7f4aa4c..47e0723 100644 --- a/data/bored-face.pose/function/title/title.mcfunction +++ b/data/bored-face.pose/function/title/title.mcfunction @@ -1,73 +1,73 @@ tellraw @s { \ - "text": "\n", \ - "color": "white", \ - "extra": [ \ - { "text": "\u0003", "font": "bored-face.pose:icon" }, \ - { "text": "\u0001", "font": "bored-face.pose:space_neg" }, \ - { "text": "\u0004", "font": "bored-face.pose:icon" }, \ + text: "\n", \ + color: "white", \ + extra: [ \ + { text: "\u0003", font: "bored-face.pose:icon" }, \ + { text: "\u0001", font: "bored-face.pose:space_neg" }, \ + { text: "\u0004", font: "bored-face.pose:icon" }, \ { \ - "text": "\n\n", \ - "extra": [ \ - { "translate": "selectWorld.version"}, \ - { "text": " 1.2.0\n"} \ + text: "\n\n", \ + extra: [ \ + { translate: "selectWorld.version"}, \ + { text: " 1.2.0\n"} \ ] \ }, \ { \ - "translate": "message.bored-face.pose.about.download", \ - "with": [ \ + translate: "message.bored-face.pose.about.download", \ + with: [ \ { \ - "translate": "message.bored-face.pose.resourcepack", \ - "color":"#aaffaa", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://modrinth.com/resourcepack/pose" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.resourcepack", \ + color:"#aaffaa", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://modrinth.com/resourcepack/pose" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ }, \ { \ - "translate": "message.bored-face.pose.datapack", \ - "color":"#aaffaa", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://modrinth.com/datapack/pose_data" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.datapack", \ + color:"#aaffaa", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://modrinth.com/datapack/pose_data" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ } \ ] \ }, \ - { "text": "\n"}, \ + { text: "\n"}, \ { \ - "translate": "message.bored-face.pose.about.sources", \ - "with": [ \ + translate: "message.bored-face.pose.about.sources", \ + with: [ \ { \ - "translate": "message.bored-face.pose.resourcepack", \ - "color":"#aaaaff", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://github.com/Bored-Face/pose-resources" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.resourcepack", \ + color:"#aaaaff", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://github.com/Bored-Face/pose-resources" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ }, \ { \ - "translate": "message.bored-face.pose.datapack", \ - "color":"#aaaaff", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://github.com/Bored-Face/pose_data" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.datapack", \ + color:"#aaaaff", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://github.com/Bored-Face/pose_data" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ } \ ] \ }, \ - { "text": "\n" }, \ + { text: "\n" }, \ { \ - "translate": "message.bored-face.pose.about.issues", \ - "with": [ \ + translate: "message.bored-face.pose.about.issues", \ + with: [ \ { \ - "translate": "message.bored-face.pose.resourcepack", \ - "color":"#ffaaaa", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://github.com/Bored-Face/pose-resources/issues" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.resourcepack", \ + color:"#ffaaaa", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://github.com/Bored-Face/pose-resources/issues" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ }, \ { \ - "translate": "message.bored-face.pose.datapack", \ - "color":"#ffaaaa", \ - "underlined": true, \ - "clickEvent": { "action": "open_url", "value": "https://github.com/Bored-Face/pose_data/issues" }, \ - "hoverEvent": { "action": "show_text", "contents": {"translate": "chat.link.open"} } \ + translate: "message.bored-face.pose.datapack", \ + color:"#ffaaaa", \ + underlined: true, \ + click_event: { action: "open_url", url: "https://github.com/Bored-Face/pose_data/issues" }, \ + hover_event: { action: "show_text", value: {translate: "chat.link.open"} } \ } \ ] \ } \ diff --git a/data/bored-face.pose/mcdoc/data.mcdoc b/data/bored-face.pose/mcdoc/data.mcdoc index 061f185..8e56426 100644 --- a/data/bored-face.pose/mcdoc/data.mcdoc +++ b/data/bored-face.pose/mcdoc/data.mcdoc @@ -1,3 +1,5 @@ +use ::java::util::text::TextObject + dispatch minecraft:storage[bored-face.pose:data] to struct { /// The title title: [Data], @@ -12,7 +14,7 @@ dispatch minecraft:storage[bored-face.pose:data] to struct { struct Data { /// The display name - name: #[text_component] string, + name: TextObject, /// The identifier. /// Used for the resource location of the item definition and to the call the the function. id?: string, diff --git a/data/bored-face.pose/mcdoc/smartphone.mcdoc b/data/bored-face.pose/mcdoc/smartphone.mcdoc index 380d791..ff6eaed 100644 --- a/data/bored-face.pose/mcdoc/smartphone.mcdoc +++ b/data/bored-face.pose/mcdoc/smartphone.mcdoc @@ -1,18 +1,19 @@ -use ::java::server::util::text::TextColor +use ::java::util::text::TextColor +use ::java::util::text::TextObject dispatch minecraft:storage[bored-face.pose:smartphone] to struct { /// The title - title: [[#[text_component] string]], + title: [[TextObject]], /// List of available players poses - players: [[#[text_component] string]], + players: [[TextObject]], /// List of available capes - capes: [[#[text_component] string]], + capes: [[TextObject]], /// List of available skins - skins: [[#[text_component] string]], + skins: [[TextObject]], /// list of pages - pages?: [#[text_component] string], + pages?: [TextObject], /// navigation footer nav_bar?: NavBar, @@ -31,10 +32,10 @@ struct NavBar { skin: NavBarIcon, } struct NavBarIcon { - icon : #[text_component] string, - base: #[text_component] string, - active: #[text_component] string, - inactive: #[text_component] string, + icon : TextObject, + base: TextObject, + active: TextObject, + inactive: TextObject, } /// Temporary data diff --git a/pack.mcmeta b/pack.mcmeta index 8612f7f..8022610 100644 --- a/pack.mcmeta +++ b/pack.mcmeta @@ -1,6 +1,6 @@ { "pack": { - "pack_format": 61, + "pack_format": 71, "description": "Player-Origin Statue Engine" } }