diff --git a/data/boomber/advancements/armor_stand/armor_stand_editor.json b/data/boomber/advancements/armor_stand/armor_stand_editor.json index 7b3a1b5..fb63dd1 100644 --- a/data/boomber/advancements/armor_stand/armor_stand_editor.json +++ b/data/boomber/advancements/armor_stand/armor_stand_editor.json @@ -1,6 +1,6 @@ { "display": { - "title": "Armor Stand Editor v0.1.0", + "title": "Armor Stand Editor v0.1.1", "description": [ {"text": "Intuitive armor stand editing"} ], diff --git a/data/boomber/functions/armor_stand/editor_mage/selection/armor_stand.mcfunction b/data/boomber/functions/armor_stand/editor_mage/selection/armor_stand.mcfunction index 175e147..a607081 100644 --- a/data/boomber/functions/armor_stand/editor_mage/selection/armor_stand.mcfunction +++ b/data/boomber/functions/armor_stand/editor_mage/selection/armor_stand.mcfunction @@ -1,4 +1,4 @@ -execute as @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!test.point, sort=nearest, limit=1, distance=..2.3] run tag @s add boomber.armor_stand.target_stand +execute as @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!global.ignore, sort=nearest, limit=1, distance=..2.3] run tag @s add boomber.armor_stand.target_stand function boomber:armor_stand/unique_vector/location scoreboard players operation #bb.ae.pos.x bb.variable = #bb.ae.result.x bb.variable diff --git a/data/boomber/functions/armor_stand/editor_mage/selection/raycast.mcfunction b/data/boomber/functions/armor_stand/editor_mage/selection/raycast.mcfunction index 9c1bcbc..61f01b6 100644 --- a/data/boomber/functions/armor_stand/editor_mage/selection/raycast.mcfunction +++ b/data/boomber/functions/armor_stand/editor_mage/selection/raycast.mcfunction @@ -1,2 +1,2 @@ -execute if entity @e[type=armor_stand, tag=!boomber.armor_stand.editing, distance=..2] run function boomber:armor_stand/editor_mage/selection/armor_stand +execute if entity @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!global.ignore, distance=..2] run function boomber:armor_stand/editor_mage/selection/armor_stand execute as @s[distance=..5.5] if score #bb.ae.raycast bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:armor_stand/editor_mage/selection/raycast \ No newline at end of file diff --git a/data/boomber/functions/armor_stand/editor_mage/submit/armor_stand.mcfunction b/data/boomber/functions/armor_stand/editor_mage/submit/armor_stand.mcfunction index d52a9b1..bcafa28 100644 --- a/data/boomber/functions/armor_stand/editor_mage/submit/armor_stand.mcfunction +++ b/data/boomber/functions/armor_stand/editor_mage/submit/armor_stand.mcfunction @@ -1,4 +1,4 @@ -execute as @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!test.point, sort=nearest, limit=1, distance=..2.3] run tag @s add boomber.armor_stand.target_stand +execute as @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!global.ignore, sort=nearest, limit=1, distance=..2.3] run tag @s add boomber.armor_stand.target_stand function boomber:armor_stand/unique_vector/location scoreboard players operation #bb.ae.pos.x bb.variable = #bb.ae.result.x bb.variable diff --git a/data/boomber/functions/armor_stand/editor_mage/submit/raycast.mcfunction b/data/boomber/functions/armor_stand/editor_mage/submit/raycast.mcfunction index 548674e..a398a15 100644 --- a/data/boomber/functions/armor_stand/editor_mage/submit/raycast.mcfunction +++ b/data/boomber/functions/armor_stand/editor_mage/submit/raycast.mcfunction @@ -1,2 +1,2 @@ -execute if entity @e[type=armor_stand, tag=!boomber.armor_stand.editing, distance=..2] run function boomber:armor_stand/editor_mage/submit/armor_stand +execute if entity @e[type=armor_stand, tag=!boomber.armor_stand.editing, tag=!global.ignore, distance=..2] run function boomber:armor_stand/editor_mage/submit/armor_stand execute as @s[distance=..5.5] if score #bb.ae.raycast bb.success matches 0 positioned ^ ^ ^0.1 run function boomber:armor_stand/editor_mage/submit/raycast \ No newline at end of file diff --git a/data/boomber/functions/armor_stand/main.mcfunction b/data/boomber/functions/armor_stand/main.mcfunction index e27f4b5..c441671 100644 --- a/data/boomber/functions/armor_stand/main.mcfunction +++ b/data/boomber/functions/armor_stand/main.mcfunction @@ -1,4 +1,4 @@ execute as @a[tag=!global.ignore, tag=!boomber.armor_stand.init] run function boomber:armor_stand/player/init execute as @a[tag=boomber.armor_stand.init] at @s run function boomber:armor_stand/player/main -execute as @e[type=armor_stand, tag=boomber.armor_stand.editing] at @s run function boomber:armor_stand/smart_stand/main \ No newline at end of file +execute as @e[type=armor_stand, tag=boomber.armor_stand.editing, tag=!global.ignore] at @s run function boomber:armor_stand/smart_stand/main \ No newline at end of file diff --git a/data/boomber/loot_tables/armor_stand/item/editor_wand.json b/data/boomber/loot_tables/armor_stand/item/editor_wand.json index 9e48ff8..7bddb6b 100644 --- a/data/boomber/loot_tables/armor_stand/item/editor_wand.json +++ b/data/boomber/loot_tables/armor_stand/item/editor_wand.json @@ -17,7 +17,7 @@ { "function": "minecraft:set_lore", "lore": [ - {"text": "\"A smart Armor Stand editor\" -Boomber, 2019", "color": "gray", "italic": false} + {"text": "Smart armor stand editor", "color": "gray", "italic": false} ] }, {