diff --git a/datapack/Barrelbot/.vscode/settings.json b/datapack/Barrelbot/.vscode/settings.json deleted file mode 100644 index 6416f49..0000000 --- a/datapack/Barrelbot/.vscode/settings.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "workbench.iconTheme": "mc-dp-icons" -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/atlases/blocks.json b/datapack/Barrelbot/assets/minecraft/atlases/blocks.json deleted file mode 100644 index bab6cb8..0000000 --- a/datapack/Barrelbot/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "sources": [ - {"type": "single","resource": "whimc:barrelbot/execution_display/barrelbot"}, - {"type": "single","resource": "whimc:barrelbot/execution_display/cursor"}, - {"type": "single","resource": "whimc:barrelbot/execution_display/function"}, - {"type": "single","resource": "whimc:barrelbot/instructions/move_forward"}, - {"type": "single","resource": "whimc:barrelbot/instructions/turn_left"}, - {"type": "single","resource": "whimc:barrelbot/instructions/turn_right"}, - {"type": "single","resource": "whimc:barrelbot/instructions/end_code_block"}, - {"type": "single","resource": "whimc:barrelbot/instructions/loop"}, - {"type": "single","resource": "whimc:barrelbot/instructions/if"}, - {"type": "single","resource": "whimc:barrelbot/faces/top"}, - {"type": "single","resource": "whimc:barrelbot/faces/side"}, - {"type": "single","resource": "whimc:barrelbot/faces/neutral"}, - {"type": "single","resource": "whimc:barrelbot/faces/happy"}, - {"type": "single","resource": "whimc:barrelbot/faces/short_circuited"}, - {"type": "single","resource": "whimc:barrelbot/faces/dispenser/neutral"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_bottom"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_side"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_front"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_top"}, - {"type": "single","resource": "whimc:barrelbot/ui/close"}, - {"type": "single","resource": "whimc:barrelbot/ui/barrelbot/swap_mode"}, - {"type": "single","resource": "whimc:barrelbot/ui/puzzle/set_success_condition"}, - {"type": "single","resource": "whimc:barrelbot/ui/left_arrow"}, - {"type": "single","resource": "whimc:barrelbot/ui/right_arrow"}, - {"type": "single","resource": "whimc:barrelbot/ui/puzzle/touch_observer"}, - {"type": "single","resource": "whimc:barrelbot/ui/barrelbot/lock"}, - {"type": "single","resource": "whimc:barrelbot/ui/puzzle/toggle_size_editor"}, - {"type": "single","resource": "whimc:barrelbot/ui/puzzle/touch_blue"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/barrel.json b/datapack/Barrelbot/assets/minecraft/models/item/barrel.json deleted file mode 100644 index a421fe8..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/barrel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/barrel", - "overrides": [ - { "predicate": {"custom_model_data": 130123}, "model": "whimc:barrelbot/block/barrelbot"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/black_stained_glass_pane.json b/datapack/Barrelbot/assets/minecraft/models/item/black_stained_glass_pane.json deleted file mode 100644 index 6a53be4..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/black_stained_glass_pane.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/black_stained_glass" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/faces/neutral"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/faces/happy"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/faces/short_circuited"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/book.json b/datapack/Barrelbot/assets/minecraft/models/item/book.json deleted file mode 100644 index d15f012..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/book.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/book" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/instructions/move_forward"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/instructions/turn_left"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/instructions/turn_right"}, - { "predicate": {"custom_model_data": 130003}, "model": "whimc:barrelbot/instructions/end_code_block"}, - { "predicate": {"custom_model_data": 130004}, "model": "whimc:barrelbot/instructions/if"}, - { "predicate": {"custom_model_data": 130005}, "model": "whimc:barrelbot/instructions/loop"} - - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/glowstone_dust.json b/datapack/Barrelbot/assets/minecraft/models/item/glowstone_dust.json deleted file mode 100644 index ec12cee..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/glowstone_dust.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/glowstone_dust" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/execution_display/barrelbot"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/execution_display/cursor"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/execution_display/function"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/red_stained_glass_pane.json b/datapack/Barrelbot/assets/minecraft/models/item/red_stained_glass_pane.json deleted file mode 100644 index 8599e65..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/red_stained_glass_pane.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/red_stained_glass" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/faces/dispenser/neutral"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/minecraft/models/item/white_stained_glass_pane.json b/datapack/Barrelbot/assets/minecraft/models/item/white_stained_glass_pane.json deleted file mode 100644 index 53d30ca..0000000 --- a/datapack/Barrelbot/assets/minecraft/models/item/white_stained_glass_pane.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/white_stained_glass" - }, - "overrides": [ - { "predicate": {"custom_model_data": 129999}, "model": "whimc:barrelbot/ui/close"}, - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/ui/barrelbot/swap_mode"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/ui/puzzle/set_success_condition"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/ui/left_arrow"}, - { "predicate": {"custom_model_data": 130003}, "model": "whimc:barrelbot/ui/right_arrow"}, - { "predicate": {"custom_model_data": 130004}, "model": "whimc:barrelbot/ui/puzzle/touch_observer"}, - { "predicate": {"custom_model_data": 130005}, "model": "whimc:barrelbot/ui/barrelbot/lock"}, - { "predicate": {"custom_model_data": 130006}, "model": "whimc:barrelbot/ui/puzzle/toggle_size_editor"}, - { "predicate": {"custom_model_data": 130007}, "model": "whimc:barrelbot/ui/puzzle/touch_blue"} - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/block/barrelbot.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/block/barrelbot.json deleted file mode 100644 index ca436b5..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/block/barrelbot.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:block/orientable_with_bottom", - "textures": { - "front": "whimc:barrelbot/block/barrelbot_front", - "side": "whimc:barrelbot/block/barrelbot_side", - "top": "whimc:barrelbot/block/barrelbot_top", - "bottom": "whimc:barrelbot/block/barrelbot_bottom" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/barrelbot.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/barrelbot.json deleted file mode 100644 index 510bc0f..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/barrelbot.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [256, 256], - "textures": { - "0": "whimc:barrelbot/execution_display/barrelbot", - "particle": "whimc:barrelbot/execution_display/barrelbot" - }, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 6.90909, 8], - "faces": { - "north": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "south": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0.5, 0] - }, - "gui": { - "translation": [0, 0, 0.01] - } - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/cursor.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/cursor.json deleted file mode 100644 index 344f1eb..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/cursor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/execution_display/cursor" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/function.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/function.json deleted file mode 100644 index 61e74f2..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/execution_display/function.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [256, 256], - "textures": { - "0": "whimc:barrelbot/execution_display/function", - "particle": "whimc:barrelbot/execution_display/function" - }, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 6.90909, 8], - "faces": { - "north": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "south": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0.5, 0] - }, - "gui": { - "translation": [0, 0, 0.01] - } - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/dispenser/neutral.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/dispenser/neutral.json deleted file mode 100644 index 0383a63..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/dispenser/neutral.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/dispenser/neutral", - "side": "minecraft:block/furnace_side", - "top": "minecraft:block/furnace_top" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/happy.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/happy.json deleted file mode 100644 index 7d8d8fb..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/happy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/happy", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/neutral.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/neutral.json deleted file mode 100644 index 21eb0a8..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/neutral.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/neutral", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/short_circuited.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/short_circuited.json deleted file mode 100644 index 4d253fe..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/faces/short_circuited.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/short_circuited", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/end_code_block.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/end_code_block.json deleted file mode 100644 index 0f3b662..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/end_code_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/end_code_block" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/if.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/if.json deleted file mode 100644 index a706aca..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/if.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/if" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/loop.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/loop.json deleted file mode 100644 index 58a044c..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/loop.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/loop" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/move_forward.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/move_forward.json deleted file mode 100644 index e6f3e23..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/move_forward.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/move_forward" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_left.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_left.json deleted file mode 100644 index 53bb075..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_left.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/turn_left" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_right.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_right.json deleted file mode 100644 index d4eb589..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/instructions/turn_right.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/turn_right" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/lock.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/lock.json deleted file mode 100644 index 013b47b..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/lock.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/barrelbot/lock" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json deleted file mode 100644 index ea91c3a..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/barrelbot/swap_mode" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/close.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/close.json deleted file mode 100644 index f7043be..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/close.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/close" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/left_arrow.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/left_arrow.json deleted file mode 100644 index 1155330..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/left_arrow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/left_arrow" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/set_success_condition.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/set_success_condition.json deleted file mode 100644 index 2be8194..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/set_success_condition.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/puzzle/set_success_condition" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/toggle_size_editor.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/toggle_size_editor.json deleted file mode 100644 index cc97280..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/toggle_size_editor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/puzzle/toggle_size_editor" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_blue.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_blue.json deleted file mode 100644 index 38ab45c..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_blue.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/puzzle/touch_blue" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_observer.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_observer.json deleted file mode 100644 index 729ec6d..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/puzzle/touch_observer.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/puzzle/touch_observer" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/right_arrow.json b/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/right_arrow.json deleted file mode 100644 index c62187c..0000000 --- a/datapack/Barrelbot/assets/whimc/models/barrelbot/ui/right_arrow.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/right_arrow" - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png deleted file mode 100644 index de0af25..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_front.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_front.png deleted file mode 100644 index fd8bc3c..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_front.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_side.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_side.png deleted file mode 100644 index fb9da44..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_side.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_top.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_top.png deleted file mode 100644 index de74294..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/block/barrelbot_top.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/barrelbot.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/barrelbot.png deleted file mode 100644 index 2d61512..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/barrelbot.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/cursor.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/cursor.png deleted file mode 100644 index 923caca..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/cursor.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/function.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/function.png deleted file mode 100644 index 6fc570c..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/execution_display/function.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png deleted file mode 100644 index 0d87bce..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png deleted file mode 100644 index b5aa08a..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta deleted file mode 100644 index 9ace70a..0000000 --- a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 0, - 2 - ] - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png deleted file mode 100644 index b817fe5..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta deleted file mode 100644 index 2df87df..0000000 --- a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta +++ /dev/null @@ -1,70 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 60 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 4, - "time": 2 - }, - { - "index": 0, - "time": 40 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 0, - "time": 3 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 2, - "time": 2 - }, - { - "index": 0, - "time": 80 - }, - { - "index": 6, - "time": 2 - }, - { - "index": 5, - "time": 15 - }, - { - "index": 0, - "time": 1 - }, - { - "index": 8, - "time": 1 - }, - { - "index": 7, - "time": 15 - }, - { - "index": 8, - "time": 1 - } - ] - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png deleted file mode 100644 index fb3b591..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta deleted file mode 100644 index f63ebf7..0000000 --- a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta +++ /dev/null @@ -1,51 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 0, - 1, - 4, - 2, - 1, - 0, - 3, - 0, - 1, - 2, - 3, - 0, - 1, - 4, - 2, - 1, - 0, - 3, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3}, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3} - ] - } -} \ No newline at end of file diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/side.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/side.png deleted file mode 100644 index 6f542bd..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/side.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/top.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/top.png deleted file mode 100644 index 8847eb0..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/faces/top.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/end_code_block.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/end_code_block.png deleted file mode 100644 index 5383697..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/end_code_block.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/if.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/if.png deleted file mode 100644 index 61863f4..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/if.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/loop.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/loop.png deleted file mode 100644 index 3281469..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/loop.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/move_forward.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/move_forward.png deleted file mode 100644 index d8bf5b8..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/move_forward.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_left.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_left.png deleted file mode 100644 index 1281f46..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_left.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_right.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_right.png deleted file mode 100644 index 52a3073..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/instructions/turn_right.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/lock.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/lock.png deleted file mode 100644 index cb90350..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/lock.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png deleted file mode 100644 index f4e7874..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/close.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/close.png deleted file mode 100644 index 795adf0..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/close.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/left_arrow.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/left_arrow.png deleted file mode 100644 index 7426fc9..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/left_arrow.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/set_success_condition.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/set_success_condition.png deleted file mode 100644 index f15f1e5..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/set_success_condition.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/toggle_size_editor.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/toggle_size_editor.png deleted file mode 100644 index fb5fd0a..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/toggle_size_editor.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_blue.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_blue.png deleted file mode 100644 index dd890c2..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_blue.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_observer.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_observer.png deleted file mode 100644 index 6606e07..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/puzzle/touch_observer.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/right_arrow.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/right_arrow.png deleted file mode 100644 index 781f6dc..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/right_arrow.png and /dev/null differ diff --git a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/template.png b/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/template.png deleted file mode 100644 index 3382e7d..0000000 Binary files a/datapack/Barrelbot/assets/whimc/textures/barrelbot/ui/template.png and /dev/null differ diff --git a/datapack/Barrelbot/data/minecraft/tags/functions/load.json b/datapack/Barrelbot/data/minecraft/tags/functions/load.json deleted file mode 100644 index 56368a7..0000000 --- a/datapack/Barrelbot/data/minecraft/tags/functions/load.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values" : [ - "whimc:technical/load" - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/data/minecraft/tags/functions/tick.json b/datapack/Barrelbot/data/minecraft/tags/functions/tick.json deleted file mode 100644 index c0aa46d..0000000 --- a/datapack/Barrelbot/data/minecraft/tags/functions/tick.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "values" : [ - "whimc:technical/tick" - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/badlands.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/badlands.json deleted file mode 100644 index 5ef04d0..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/badlands.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 5790308, - "fog_color": 11059416, - "foliage_color": 7893104, - "grass_color": 3420722, - "water_color": 12628048, - "water_fog_color": 8421424, - "ambient_sound": "minecraft:ambient.nether_wastes.loop", - "particle": { - "options": { - "type": "minecraft:ash" - }, - "probability": 0.001875 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/bamboo_jungle.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/bamboo_jungle.json deleted file mode 100644 index 101d6a3..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/bamboo_jungle.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "temperature": 0.95, - "downfall": 0.9, - "effects": { - "sky_color": 9998591, - "fog_color": 12636415, - "water_color": 1475065, - "water_fog_color": 11573440, - "grass_color": 6355154, - "foliage_color": 5300472, - "music": { - "sound": "minecraft:music.creative", - "min_delay": 12000, - "max_delay": 24000, - "replace_current_music": false - }, - "particle": { - "options": { - "type": "minecraft:end_rod" - }, - "probability": 0.0000625 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": true -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/basalt_deltas.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/basalt_deltas.json deleted file mode 100644 index f0d1b81..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/basalt_deltas.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 5901355, - "fog_color": 4396554, - "water_color": 8126244, - "water_fog_color": 809739, - "ambient_sound": "minecraft:ambient.basalt_deltas.loop", - "particle": { - "options": { - "type": "minecraft:ash" - }, - "probability": 0.005 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/crimson_forest.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/crimson_forest.json deleted file mode 100644 index 4690018..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/crimson_forest.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 5243135, - "fog_color": 12435455, - "water_color": 7867135, - "water_fog_color": 1508659, - "grass_color": 13634305, - "foliage_color": 16268301, - "ambient_sound": "minecraft:ambient.crimson_forest.loop", - "particle": { - "options": { - "type": "minecraft:crimson_spore" - }, - "probability": 0.001 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/modified_badlands_plateau.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/modified_badlands_plateau.json deleted file mode 100644 index 6abd639..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/modified_badlands_plateau.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 14001491, - "fog_color": 13073736, - "water_color": 4596689, - "water_fog_color": 1671664, - "ambient_sound": "minecraft:ambient.soul_sand_valley.loop", - "particle": { - "options": { - "type": "minecraft:falling_dust" - }, - "probability": 0.02 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/nether_wastes.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/nether_wastes.json deleted file mode 100644 index 79985a0..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/nether_wastes.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 8900331, - "fog_color": 6268611, - "water_color": 4159204, - "water_fog_color": 329011, - "ambient_sound": "minecraft:ambient.nether_wastes.loop", - "particle": { - "options": { - "type": "minecraft:smoke" - }, - "probability": 0.015 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/ocean.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/ocean.json deleted file mode 100644 index 5f40ab5..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/ocean.json +++ /dev/null @@ -1,43 +0,0 @@ -{ - "scale": 0.1, - "effects": { - "sky_color": 8103167, - "fog_color": 12638463, - "water_color": 4159204, - "water_fog_color": 329011 - }, - "surface_builder": "minecraft:grass", - "carvers": { - "air": [], - "liquid": [] - }, - "features": [ - [], - [], - [], - [], - [], - [], - [], - [], - [], - [] - ], - "starts": [], - "spawners": { - "monster": [], - "creature": [], - "ambient": [], - "underground_water_creature": [], - "water_creature": [], - "water_ambient": [], - "misc": [] - }, - "spawn_costs": {}, - "player_spawn_friendly": false, - "temperature": 0.5, - "downfall": 0.5, - "depth": -1, - "creature_spawn_probability": 0, - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/soul_sand_valley.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/soul_sand_valley.json deleted file mode 100644 index b6d1e95..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/soul_sand_valley.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 16738048, - "fog_color": 13448448, - "water_color": 11502605, - "water_fog_color": 329011, - "grass_color": 8676931, - "foliage_color": 9790032, - "ambient_sound": "minecraft:ambient.soul_sand_valley.loop" - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/minecraft/worldgen/biome/warped_forest.json b/datapack/Barrelbot/data/minecraft/worldgen/biome/warped_forest.json deleted file mode 100644 index d8fcb93..0000000 --- a/datapack/Barrelbot/data/minecraft/worldgen/biome/warped_forest.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "temperature": 0.8, - "downfall": 0.4, - "creature_spawn_probability": 0, - "effects": { - "sky_color": 48127, - "fog_color": 37847, - "water_color": 8007174, - "water_fog_color": 3670784, - "ambient_sound": "minecraft:ambient.warped_forest.loop", - "additions_sound": { - "sound": "minecraft:block.fire.extinguish", - "tick_chance": 0.005 - }, - "music": { - "sound": "minecraft:music.nether.warped_forest", - "min_delay": 12000, - "max_delay": 24000, - "replace_current_music": true - }, - "particle": { - "options": { - "type": "minecraft:white_ash" - }, - "probability": 0.02 - } - }, - "spawners": {}, - "spawn_costs": {}, - "carvers": {}, - "features": [], - "has_precipitation": false -} diff --git a/datapack/Barrelbot/data/whimc/advancements/block/place_custom_block.json b/datapack/Barrelbot/data/whimc/advancements/block/place_custom_block.json deleted file mode 100644 index eb21b4d..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/block/place_custom_block.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:placed_block", - "conditions": { - "item": { - "nbt": "{BlockEntityTag:{Items:[{tag:{whimc:{block:{}}}}]}}" - }, - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "tag": "whimc:custom_blocks" - } - } - } - ] - } - } - }, - "rewards": { - "function": "whimc:barrelbot/block/place_custom_block" - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/advancements/block/place_puzzle_button.json b/datapack/Barrelbot/data/whimc/advancements/block/place_puzzle_button.json deleted file mode 100644 index 13c6ac0..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/block/place_puzzle_button.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:placed_block", - "conditions": { - "item": { - "nbt": "{whimc:{puzzle_button:1b}}" - }, - "location": [ - { - "condition": "minecraft:location_check", - "predicate": { - "block": { - "blocks": [ - "minecraft:stone_button" - ] - } - } - } - ] - } - } - }, - "rewards": { - "function": "whimc:barrelbot/block/puzzle_button/place" - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_editor.json b/datapack/Barrelbot/data/whimc/advancements/interact/right_click_editor.json deleted file mode 100644 index 31de933..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_editor.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"whimc.editor_click\"]}" - } - } - } - }, - "rewards": { - "function": "whimc:barrelbot/editor/edit_wand/edit_mode/click" - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_function.json b/datapack/Barrelbot/data/whimc/advancements/interact/right_click_function.json deleted file mode 100644 index cd82190..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_function.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"whimc.barrelbot.function_interaction\"]}" - } - } - } - }, - "rewards": { - "function": "whimc:barrelbot/functions/interact/right_click" - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_node.json b/datapack/Barrelbot/data/whimc/advancements/interact/right_click_node.json deleted file mode 100644 index fbb2d88..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/interact/right_click_node.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:player_interacted_with_entity", - "conditions": { - "entity": { - "type": "minecraft:interaction", - "nbt": "{Tags:[\"whimc.editor_node\"]}" - } - } - } - }, - "rewards": { - "function": "whimc:barrelbot/editor/drag/click_node" - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/advancements/inventory/receive_puzzle_item.json b/datapack/Barrelbot/data/whimc/advancements/inventory/receive_puzzle_item.json deleted file mode 100644 index 3955c93..0000000 --- a/datapack/Barrelbot/data/whimc/advancements/inventory/receive_puzzle_item.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "criteria": { - "requirement": { - "trigger": "minecraft:inventory_changed", - "conditions": { - "items": [ - { - "nbt": "{barrelbot:{puzzle_item:1b}}" - } - ] - } - } - }, - "rewards": { - "function": "whimc:barrelbot/no_smuggle/receive_puzzle_item" - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/give.mcfunction deleted file mode 100644 index 88a5da4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/give.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/block/barrelbot/give -# Gives the user a barrelbot - -give @s barrel{display:{Name:'{"text":"Barrelbot","color":"yellow","italic":false}'},BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,Slot:0b,tag:{whimc:{block:{id:"barrelbot"}}}}]},CustomModelData:130123} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/initialize.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/initialize.mcfunction deleted file mode 100644 index cff87d3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/barrelbot/initialize.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/block/barrelbot/initialize -# Sets up a barrelbot block when it is placed - -execute summon marker run function whimc:barrelbot/manager/get_execution_direction -setblock ~ ~ ~ air -setblock ~ ~ ~ barrel[facing=up] - -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon item_display run function whimc:barrelbot/bot/setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/block_found.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/block_found.mcfunction deleted file mode 100644 index 1483752..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/block_found.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/block/block_found -# Sets up a custom block - -data modify storage whimc:macro block.id set from block ~ ~ ~ Items[0].tag.whimc.block.id -function whimc:barrelbot/block/initialize with storage whimc:macro block \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/give.mcfunction deleted file mode 100644 index bb0bbbc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/give.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/block/barrelbot/give -# Gives the user a barrelbot - -give @s dispenser{display:{Name:'{"text":"Dispenser Bot","color":"yellow","italic":false}'},BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,Slot:0b,tag:{whimc:{block:{id:"dispenser_bot"}}}}]},CustomModelData:130123} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/initialize.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/initialize.mcfunction deleted file mode 100644 index c4aec18..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/dispenser_bot/initialize.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/block/barrelbot/initialize -# Sets up a barrelbot block when it is placed - -execute summon marker run function whimc:barrelbot/manager/get_execution_direction -setblock ~ ~ ~ air -setblock ~ ~ ~ dispenser[facing=up] - -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon item_display: - function whimc:barrelbot/bot/setup - function whimc:barrelbot/dispenser_bot/convert \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/give.mcfunction deleted file mode 100644 index a67f9c3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/give.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/block/function/give -# Gives the user a function block - -give @s shulker_box{display:{Name:'{"text":"Function","color":"cyan","italic":false}'},BlockEntityTag:{Items:[{id:"minecraft:barrier",Count:1b,Slot:0b,tag:{whimc:{block:{id:"function"}}}}]},CustomModelData:130123} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/initialize.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/initialize.mcfunction deleted file mode 100644 index 986d3e1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/function/initialize.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/block/function/initialize -# Sets up a function block - -function whimc:barrelbot/dev/create_function \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/initialize.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/initialize.mcfunction deleted file mode 100644 index 41920c3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/initialize.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/block/initialize - -$function whimc:barrelbot/block/$(id)/initialize \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/place_custom_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/place_custom_block.mcfunction deleted file mode 100644 index 136d92b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/place_custom_block.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> whimc:barrelbot/block/place_custom_block -# Sets up a custom block when it is placed -# -#Code stolen from smithed lol - -advancement revoke @s only whimc:block/place_custom_block - -execute align xyz positioned ~0.5 ~-6.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-5.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-4.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-3.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-2.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-1.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~-0.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~0.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~1.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~2.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~3.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~4.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~5.5 ~0.5 run function whimc:barrelbot/block/scan_layer -execute align xyz positioned ~0.5 ~6.5 ~0.5 run function whimc:barrelbot/block/scan_layer \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/give.mcfunction deleted file mode 100644 index eed5b20..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/give.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/block/puzzle_button/give -# Gives the user a puzzle button item - -give @s minecraft:stone_button{whimc:{puzzle_button:1b},display:{Name:'{"text":"Puzzle Button","italic":false}'},Enchantments:[{}]} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/initialize.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/initialize.mcfunction deleted file mode 100644 index 4b8604e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/initialize.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/block/puzzle_button/initialize -# Sets up a puzzle button - -scoreboard players set $raycast whimc.dummy 0 - -function whimc:barrelbot/dev/spawn_manager \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/place.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/place.mcfunction deleted file mode 100644 index 2ccbde0..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/place.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/block/puzzle_button/place -# Sets up a puzzle button when it is placed - -advancement revoke @s only whimc:block/place_puzzle_button - -#Raycast to find the button -scoreboard players set $raycast whimc.dummy 60 -execute anchored eyes positioned ^ ^ ^ run function whimc:barrelbot/block/puzzle_button/raycast \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/raycast.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/raycast.mcfunction deleted file mode 100644 index acfde18..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/puzzle_button/raycast.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/block/puzzle_button/raycast -# Raycasts to find the button - -execute if block ~ ~ ~ stone_button align xyz positioned ~0.5 ~0.5 ~0.5 run function whimc:barrelbot/block/puzzle_button/initialize - -scoreboard players remove $raycast whimc.dummy 1 -execute if score $raycast whimc.dummy matches 1.. positioned ^ ^ ^0.1 run function whimc:barrelbot/block/puzzle_button/raycast \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/scan_layer.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/block/scan_layer.mcfunction deleted file mode 100644 index 18b4056..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/block/scan_layer.mcfunction +++ /dev/null @@ -1,172 +0,0 @@ -#> whimc:barrelbot/block/scan_layer -# Scans through a layer of blocks, looking for the custom block that was placed - -execute positioned ~-6 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-6 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-5 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-4 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-3 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-2 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~-1 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~00 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~01 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~02 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~03 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~04 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~05 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-6 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-5 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-4 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-3 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-2 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~-1 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~00 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~01 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~02 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~03 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~04 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~05 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found -execute positioned ~06 ~ ~06 if block ~ ~ ~ #whimc:custom_blocks{Items:[{tag:{whimc:{block:{}}}}]} run function whimc:barrelbot/block/block_found \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_marker_data.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_marker_data.mcfunction deleted file mode 100644 index d37015c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_marker_data.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/bot/grab_marker_data -# Gets data from the marker on the barrel bot - -execute on passengers run data modify storage whimc:storage marker_data set from entity @s data \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_slot.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_slot.mcfunction deleted file mode 100644 index 394c8a4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/grab_slot.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/bot/grab_slot -# Gets data from a slot - -data modify storage whimc:storage current_step set value {} - -#Get the function id -- A score of -1 indicates "main", grabbing instructions from the barrelbot itself -execute store result score $function_id whimc.dummy run data get storage whimc:storage marker_data.stack[-1].function - -#data modify storage whimc:macro slot.slot set from storage whimc:storage marker_data.stack[-1].step -execute if score $function_id whimc.dummy matches -1 run function whimc:barrelbot/functions/main/get_instruction with storage whimc:storage marker_data.stack[-1] - -execute unless score $function_id whimc.dummy matches -1 run function whimc:barrelbot/functions/load_instruction_from_function with storage whimc:storage marker_data.stack[-1] diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/kill.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/kill.mcfunction deleted file mode 100644 index 59c2143..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/kill.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/bot/kill -# Cleanly removes the bot from the world - -execute on passengers run kill @s -scoreboard players operation $temp whimc.barrelbot.bot_id = @s whimc.barrelbot.bot_id -kill @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] - -setblock ~ ~ ~ air -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions.mcfunction deleted file mode 100644 index 55bdc6c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/bot/load_instructions -# Grabs the data from the block to load it into the marker - -execute if score $is_dispenser whimc.dummy matches 0 run data modify entity @s data.instructions set from block ~ ~ ~ Items -data modify entity @s data.stack set value [{function:-1,step:0}] -data modify entity @s data.stack[0].length set from entity @s data.instructions[-1].Slot -data modify block ~ ~ ~ Lock set value "heheheha" - -#Display instructions -function whimc:barrelbot/display/generate_data -function whimc:barrelbot/display/spawn_displays \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions_wrapper.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions_wrapper.mcfunction deleted file mode 100644 index 148fe97..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/load_instructions_wrapper.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/bot/load_instructions_wrapper -# Wrapper function to the load_instructions function - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -scoreboard players operation $temp whimc.barrelbot.bot_id = @s whimc.barrelbot.bot_id -execute store success score $is_dispenser whimc.dummy if entity @s[tag=whimc.dispenser_bot] -execute on passengers run function whimc:barrelbot/bot/load_instructions \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/marker_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/marker_setup.mcfunction deleted file mode 100644 index 29ff397..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/marker_setup.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/bot/marker_setup -# Sets up the marker that rides the barrelbot item display for data storage - -tag @s remove whimc.barrelbot.marker.init -data modify entity @s data.SpawnPos set from storage whimc:storage SpawnPos -data modify entity @s data.SpawnRotation set from storage whimc:storage SpawnRotation \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/reset.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/reset.mcfunction deleted file mode 100644 index 8195f75..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/reset.mcfunction +++ /dev/null @@ -1,25 +0,0 @@ -#> whimc:barrelbot/bot/reset -# Resets the barrelbot to its starting state - -function whimc:barrelbot/bot/grab_marker_data -tag @s remove whimc.barrelbot.short_circuited -execute as @s[tag=!whimc.dispenser_bot] at @s run item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130000} -execute as @s[tag=whimc.dispenser_bot] at @s run item replace entity @s container.0 with red_stained_glass_pane{CustomModelData:130000} - -scoreboard players set @s whimc.barrelbot.slot 0 - -execute at @s run data modify storage whimc:storage Items set from block ~ ~ ~ Items -setblock ~ ~ ~ air -data modify entity @s Pos set from storage whimc:storage marker_data.SpawnPos -data modify entity @s Rotation set from storage whimc:storage marker_data.SpawnRotation - -execute if entity @s[tag=whimc.dispenser_bot] at @s run setblock ~ ~ ~ dispenser[facing=up]{Lock:"hurdy gurdy"} - -execute at @s[tag=!whimc.dispenser_bot] run setblock ~ ~ ~ barrel[facing=up]{CustomName:'{"text":"Barrelbot"}'} -execute at @s[tag=!whimc.dispenser_bot] run data modify block ~ ~ ~ Items set from storage whimc:storage Items - -scoreboard players operation $temp whimc.barrelbot.bot_id = @s whimc.barrelbot.bot_id -execute at @s as @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] run kill @s - -scoreboard players reset @s whimc.barrelbot.push_count -scoreboard players reset @s whimc.barrelbot.puzzle_id \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/setup.mcfunction deleted file mode 100644 index e624768..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/setup.mcfunction +++ /dev/null @@ -1,24 +0,0 @@ -#> whimc:barrelbot/bot/setup -# Sets up the marker entity for tracking the barrel bot - -item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130000} -data merge entity @s {brightness:{block:15,sky:15},transformation:{scale:[1.001f,1.001f,1.001f]}} - -tag @s add whimc.barrelbot -#scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -scoreboard players add $global whimc.barrelbot.bot_id 1 -scoreboard players operation @s whimc.barrelbot.bot_id = $global whimc.barrelbot.bot_id - -data modify storage whimc:storage SpawnPos set from entity @s Pos - -execute if score $direction whimc.dummy matches 3 run tp @s ~ ~ ~ 90 0 -execute if score $direction whimc.dummy matches 0 run tp @s ~ ~ ~ 180 0 -execute if score $direction whimc.dummy matches 1 run tp @s ~ ~ ~ 270 0 - -data modify storage whimc:storage SpawnRotation set from entity @s Rotation - -#Create marker for storing data on the barrelbot -summon marker ~ ~ ~ {data:{stack:[{function:-1,step:0}]},Tags:["whimc.barrelbot.marker","whimc.barrelbot.marker.init"]} -ride @e[type=marker,limit=1,sort=nearest,distance=..0.1,tag=whimc.barrelbot.marker.init] mount @s -execute on passengers run function whimc:barrelbot/bot/marker_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/short_circuit.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/short_circuit.mcfunction deleted file mode 100644 index ddb1c84..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/short_circuit.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/bot/short_circuit -# Short circuits the barrelbot when it is destroyed - -tag @s add whimc.barrelbot.short_circuited -execute on passengers as @s[type=marker] run data remove entity @s data.stack[] -playsound minecraft:block.fire.extinguish block @a ~ ~ ~ 2 1 -playsound minecraft:block.respawn_anchor.deplete player @a ~ ~ ~ 1 1.3 -particle minecraft:angry_villager ~ ~ ~ 0.7 0.7 0.7 0 10 normal -particle minecraft:smoke ~ ~1 ~ 0.3 0.1 0.3 0 30 normal - -item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130002} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/step.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/step.mcfunction deleted file mode 100644 index efdbe00..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/step.mcfunction +++ /dev/null @@ -1,56 +0,0 @@ -#> whimc:barrelbot/bot/step -# Steps the barrel bot forward once through its instructions - -#> Need to make a way to track the current state of the system -# Maybe stack-based? -# Index based -# Can literally just use an array of indices to represent the stack -# How to do while loops? -# When entering a while loop, keep track of starting point -# When execution completes, pop index off of stack - -scoreboard players operation $temp whimc.barrelbot.bot_id = @s whimc.barrelbot.bot_id -scoreboard players set $queued_instruction whimc.dummy 0 - -#Get stack data from the barrelbot -function whimc:barrelbot/bot/grab_marker_data - -#If there were previous push_forwards queued, run them now -#execute if score @s whimc.barrelbot.push_count matches 1.. as @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] run function whimc:barrelbot/display/push_forward -execute if score @s whimc.barrelbot.push_count matches 1.. run function whimc:barrelbot/display/push_forward_loop - -#Update visual cursor on display -execute at @s as @e[type=item_display,tag=whimc.execution_display_cursor,predicate=whimc:barrelbot/match_bot_id,scores={whimc.barrelbot.display_layer=0}] run function whimc:barrelbot/display/update_cursor - -#If execution has completed, don't do anything -execute unless data storage whimc:storage marker_data.stack[] run return 0 - -#Debug toggle -#tellraw @p {"nbt":"marker_data.stack","storage":"whimc:storage"} -#tellraw @p {"text":""} - -#Get the individual instruction to be called -function whimc:barrelbot/bot/grab_slot - -function whimc:barrelbot/instructions/general/execute_instruction with storage whimc:storage current_step - -#Iterate forward -#execute if score $in_code_block whimc.dummy matches 0 run function whimc:barrelbot/functions/iterate -#execute if score $in_code_block whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/iterate -execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage marker_data.stack[-1].step int 1 run scoreboard players add $step whimc.dummy 1 - -function whimc:barrelbot/functions/check_step_out - -#Update execution display -scoreboard players operation $temp whimc.barrelbot.bot_id = @s whimc.barrelbot.bot_id -execute at @s as @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] run function whimc:barrelbot/display/update - -execute at @s if block ~ ~-1 ~ lime_concrete on passengers run data remove storage whimc:storage marker_data.stack[] -execute at @s if block ~ ~-1 ~ black_concrete run function whimc:barrelbot/functions/recursion_limit_reached - -#Write data back to marker -function whimc:barrelbot/bot/write_marker_data - -#If there is a queued instruction, repeat this process. (This only goes if an if statement fails) -execute if score $queued_instruction whimc.dummy matches 1 at @s run function whimc:barrelbot/bot/step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/write_marker_data.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/write_marker_data.mcfunction deleted file mode 100644 index 6a1f8f2..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/bot/write_marker_data.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/bot/write_marker_data -# Writes the data from storage back to the marker - -execute on passengers run data modify entity @s data set from storage whimc:storage marker_data \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x.mcfunction deleted file mode 100644 index 5a610ef..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/clone/cascade/iterate_x - -scoreboard players operation $paste_z whimc.dummy = $original_paste_z whimc.dummy -scoreboard players operation $paste_x whimc.dummy += $jump_x whimc.dummy - -scoreboard players operation $z_iter whimc.dummy = $temp whimc.barrelbot.cascade.z -execute if score $z_iter whimc.dummy matches 1.. run function whimc:barrelbot/clone/cascade/iterate_z with storage whimc:macro jump - -scoreboard players remove $x_iter whimc.dummy 1 -$execute if score $x_iter whimc.dummy matches 1.. positioned ~$(x) ~ ~ run function whimc:barrelbot/clone/cascade/iterate_x with storage whimc:macro jump \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x_wrapper.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x_wrapper.mcfunction deleted file mode 100644 index c22c072..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_x_wrapper.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/clone/cascade/iterate_x_wrapper -# Does the first iteration along the x-axis for a cascade clone - -#Get center coordinates -execute store result score $paste_x whimc.dummy run data get entity @s Pos[0] -execute store result score $paste_y whimc.dummy run data get entity @s Pos[1] -execute store result score $paste_z whimc.dummy run data get entity @s Pos[2] - -scoreboard players operation $original_paste_z whimc.dummy = $paste_z whimc.dummy - -#Check to see if it should be cloned along the z-axis -scoreboard players operation $z_iter whimc.dummy = $temp whimc.barrelbot.cascade.z -scoreboard players remove $z_iter whimc.dummy 1 -execute if score $z_iter whimc.dummy matches 1.. run function whimc:barrelbot/clone/cascade/iterate_z_wrapper with storage whimc:macro jump - - -scoreboard players remove $x_iter whimc.dummy 1 -$execute if score $x_iter whimc.dummy matches 1.. positioned ~$(x) ~ ~ run function whimc:barrelbot/clone/cascade/iterate_x with storage whimc:macro jump \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z.mcfunction deleted file mode 100644 index 15a1d98..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/clone/cascade/iterate_z -# Iterates along the z axis for a cascade clone - -function whimc:barrelbot/clone/clone_as_manager - -scoreboard players remove $z_iter whimc.dummy 1 -execute if score $z_iter whimc.dummy matches 1.. run function whimc:barrelbot/clone/cascade/iterate_z_wrapper with storage whimc:macro jump \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z_wrapper.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z_wrapper.mcfunction deleted file mode 100644 index 0ca10a2..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/cascade/iterate_z_wrapper.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/clone/cascade/iterate_z_wrapper -# Positions the iterate_z function - -scoreboard players operation $paste_z whimc.dummy += $jump_z whimc.dummy -$execute positioned ~ ~ ~$(z) run function whimc:barrelbot/clone/cascade/iterate_z \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_as_manager.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_as_manager.mcfunction deleted file mode 100644 index bf972a3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_as_manager.mcfunction +++ /dev/null @@ -1,51 +0,0 @@ -#> whimc:barrelbot/clone/clone_as_manager -# Clones all the stuff -# Executed as puzzle manager, at player - -scoreboard players operation $temp whimc.barrelbot.puzzle_type_id = @s whimc.barrelbot.puzzle_type_id - -#Get data from marker -#data modify storage whimc:storage clone.marker set from entity @s -function whimc:barrelbot/manager/get_dimensions -scoreboard players operation $min_source_x whimc.dummy = $real_min_x whimc.dummy -scoreboard players operation $min_source_y whimc.dummy = $real_min_y whimc.dummy -scoreboard players operation $min_source_z whimc.dummy = $real_min_z whimc.dummy -scoreboard players operation $max_source_x whimc.dummy = $real_max_x whimc.dummy -scoreboard players operation $max_source_y whimc.dummy = $real_max_y whimc.dummy -scoreboard players operation $max_source_z whimc.dummy = $real_max_z whimc.dummy -scoreboard players operation $vol_x whimc.dummy = $size_x whimc.dummy -scoreboard players operation $vol_y whimc.dummy = $size_y whimc.dummy -scoreboard players operation $vol_z whimc.dummy = $size_z whimc.dummy - - -#Get coordinates -execute store result score $source_x whimc.dummy run data get entity @s Pos[0] -execute store result score $source_y whimc.dummy run data get entity @s Pos[1] -execute store result score $source_z whimc.dummy run data get entity @s Pos[2] - -#Clone blocks -function whimc:barrelbot/clone/clone_blocks - -#Summon new puzzle marker -execute on passengers run data modify storage whimc:storage bounding_box set from entity @s data.bounding_box -execute store result score $max_x whimc.dummy run data get storage whimc:storage bounding_box.max_x -execute store result score $max_y whimc.dummy run data get storage whimc:storage bounding_box.max_y -execute store result score $max_z whimc.dummy run data get storage whimc:storage bounding_box.max_z -execute store result score $min_x whimc.dummy run data get storage whimc:storage bounding_box.min_x -execute store result score $min_y whimc.dummy run data get storage whimc:storage bounding_box.min_y -execute store result score $min_z whimc.dummy run data get storage whimc:storage bounding_box.min_z -execute rotated as @s run function whimc:barrelbot/clone/spawn_manager - -#Clone entities -function whimc:barrelbot/manager/get_dimensions -function whimc:barrelbot/clone/clone_entities with storage whimc:macro Pos - - -#Have any other puzzle markers in the bounding box clone as well -#execute store result storage whimc:macro scan.x int 1 run scoreboard players get $min_source_x whimc.dummy -#execute store result storage whimc:macro scan.y int 1 run scoreboard players get $min_source_y whimc.dummy -#execute store result storage whimc:macro scan.z int 1 run scoreboard players get $min_source_z whimc.dummy -# -#execute store result storage whimc:macro scan.dx int 1 run scoreboard players get $vol_x whimc.dummy -#execute store result storage whimc:macro scan.dy int 1 run scoreboard players get $vol_y whimc.dummy -#execute store result storage whimc:macro scan.dz int 1 run scoreboard players get $vol_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_blocks.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_blocks.mcfunction deleted file mode 100644 index e5cdc36..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_blocks.mcfunction +++ /dev/null @@ -1,37 +0,0 @@ -#> whimc:barrelbot/clone/clone_blocks -#Clones all blocks in the area - -#Get difference between corners and source -scoreboard players operation $bottom_x whimc.dummy = $min_source_x whimc.dummy -scoreboard players operation $bottom_x whimc.dummy -= $source_x whimc.dummy -scoreboard players operation $bottom_y whimc.dummy = $min_source_y whimc.dummy -scoreboard players operation $bottom_y whimc.dummy -= $source_y whimc.dummy -scoreboard players operation $bottom_z whimc.dummy = $min_source_z whimc.dummy -scoreboard players operation $bottom_z whimc.dummy -= $source_z whimc.dummy - -scoreboard players operation $top_x whimc.dummy = $max_source_x whimc.dummy -scoreboard players operation $top_x whimc.dummy -= $source_x whimc.dummy -scoreboard players operation $top_y whimc.dummy = $max_source_y whimc.dummy -scoreboard players operation $top_y whimc.dummy -= $source_y whimc.dummy -scoreboard players operation $top_z whimc.dummy = $max_source_z whimc.dummy -scoreboard players operation $top_z whimc.dummy -= $source_z whimc.dummy - -scoreboard players operation $destination_x whimc.dummy = $paste_x whimc.dummy -scoreboard players operation $destination_y whimc.dummy = $paste_y whimc.dummy -scoreboard players operation $destination_z whimc.dummy = $paste_z whimc.dummy -scoreboard players operation $destination_x whimc.dummy += $bottom_x whimc.dummy -scoreboard players operation $destination_y whimc.dummy += $bottom_y whimc.dummy -scoreboard players operation $destination_z whimc.dummy += $bottom_z whimc.dummy - -execute store result storage whimc:macro clone.bottom_x int 1 run scoreboard players get $min_source_x whimc.dummy -execute store result storage whimc:macro clone.bottom_y int 1 run scoreboard players get $min_source_y whimc.dummy -execute store result storage whimc:macro clone.bottom_z int 1 run scoreboard players get $min_source_z whimc.dummy -execute store result storage whimc:macro clone.top_x int 1 run scoreboard players get $max_source_x whimc.dummy -execute store result storage whimc:macro clone.top_y int 1 run scoreboard players get $max_source_y whimc.dummy -execute store result storage whimc:macro clone.top_z int 1 run scoreboard players get $max_source_z whimc.dummy -execute store result storage whimc:macro clone.destination_x int 1 run scoreboard players get $destination_x whimc.dummy -execute store result storage whimc:macro clone.destination_y int 1 run scoreboard players get $destination_y whimc.dummy -execute store result storage whimc:macro clone.destination_z int 1 run scoreboard players get $destination_z whimc.dummy - -#Clone using macros -function whimc:barrelbot/clone/paste_blocks with storage whimc:macro clone \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_bot.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_bot.mcfunction deleted file mode 100644 index b5dff3b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_bot.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:barrelbot/clone/clone_bot - -execute on passengers as @s[type=marker] run data modify storage whimc:storage marker_data set from entity @s data - -execute store result score $is_dispenser whimc.dummy if entity @s[tag=whimc.dispenser_bot] - -execute store result score $bot_offset_x whimc.dummy run data get entity @s Pos[0] -execute store result score $bot_offset_y whimc.dummy run data get entity @s Pos[1] -execute store result score $bot_offset_z whimc.dummy run data get entity @s Pos[2] - -execute store result storage whimc:macro Pos.x int 1 run scoreboard players operation $bot_offset_x whimc.dummy -= $source_x whimc.dummy -execute store result storage whimc:macro Pos.y int 1 run scoreboard players operation $bot_offset_y whimc.dummy -= $source_y whimc.dummy -execute store result storage whimc:macro Pos.z int 1 run scoreboard players operation $bot_offset_z whimc.dummy -= $source_z whimc.dummy - - -execute rotated as @s rotated ~180 ~ run function whimc:barrelbot/clone/position_bot_clone with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_entities.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_entities.mcfunction deleted file mode 100644 index c3f3257..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_entities.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/clone/clone_entities -# Clones all entities linked to this puzzle - -#For each barrelbot, clone it -$execute as @e[type=minecraft:item_display,tag=whimc.barrelbot,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] run function whimc:barrelbot/clone/clone_bot - -#Clone each function -$execute as @e[type=minecraft:marker,tag=whimc.barrelbot.function,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] run function whimc:barrelbot/clone/clone_function diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_function.mcfunction deleted file mode 100644 index 018c6ac..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_function.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/clone/clone_function -# Clones a function box - -data modify storage whimc:storage function_id set from entity @s data.id -execute at @s positioned ~ ~1 ~ store success score #locked whimc.dummy if entity @e[type=item_display,limit=1,sort=nearest,tag=whimc.function_display.locked] -execute at @s positioned ~ ~1 ~ run data modify storage whimc:storage display_item set from entity @e[type=item_display,limit=1,sort=nearest] item -execute at @s positioned ~ ~1.35 ~ run data modify storage whimc:storage text_display set from entity @e[type=text_display,limit=1,sort=nearest] text - -execute store result score $bot_offset_x whimc.dummy run data get entity @s Pos[0] -execute store result score $bot_offset_y whimc.dummy run data get entity @s Pos[1] -execute store result score $bot_offset_z whimc.dummy run data get entity @s Pos[2] - -execute store result storage whimc:macro Pos.x int 1 run scoreboard players operation $bot_offset_x whimc.dummy -= $source_x whimc.dummy -execute store result storage whimc:macro Pos.y int 1 run scoreboard players operation $bot_offset_y whimc.dummy -= $source_y whimc.dummy -execute store result storage whimc:macro Pos.z int 1 run scoreboard players operation $bot_offset_z whimc.dummy -= $source_z whimc.dummy - -execute rotated as @s run function whimc:barrelbot/clone/position_function_clone with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_subpuzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_subpuzzle.mcfunction deleted file mode 100644 index 45f7b9b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/clone_subpuzzle.mcfunction +++ /dev/null @@ -1,40 +0,0 @@ -#> whimc:barrelbot/clone/clone_subpuzzle -# Clones a subpuzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -execute store result score $manager_offset_x whimc.dummy run data get entity @s Pos[0] -execute store result score $manager_offset_y whimc.dummy run data get entity @s Pos[1] -execute store result score $manager_offset_z whimc.dummy run data get entity @s Pos[2] - -scoreboard players operation $temp_source_x whimc.dummy = $manager_offset_x whimc.dummy -scoreboard players operation $temp_source_y whimc.dummy = $manager_offset_y whimc.dummy -scoreboard players operation $temp_source_z whimc.dummy = $manager_offset_z whimc.dummy -scoreboard players operation $old_source_x whimc.dummy = $source_x whimc.dummy -scoreboard players operation $old_source_y whimc.dummy = $source_y whimc.dummy -scoreboard players operation $old_source_z whimc.dummy = $source_z whimc.dummy - - -scoreboard players operation $manager_offset_x whimc.dummy -= $source_x whimc.dummy -scoreboard players operation $manager_offset_y whimc.dummy -= $source_y whimc.dummy -scoreboard players operation $manager_offset_z whimc.dummy -= $source_z whimc.dummy - -execute store result storage whimc:macro Pos.x int 1 run scoreboard players operation $manager_offset_x whimc.dummy += $paste_x whimc.dummy -execute store result storage whimc:macro Pos.y int 1 run scoreboard players operation $manager_offset_y whimc.dummy += $paste_y whimc.dummy -execute store result storage whimc:macro Pos.z int 1 run scoreboard players operation $manager_offset_z whimc.dummy += $paste_z whimc.dummy - -#Create the new puzzle -function whimc:barrelbot/clone/position_subpuzzle_clone with storage whimc:macro Pos - -#Get coordinates -scoreboard players operation $source_x whimc.dummy = $temp_source_x whimc.dummy -scoreboard players operation $source_y whimc.dummy = $temp_source_y whimc.dummy -scoreboard players operation $source_z whimc.dummy = $temp_source_z whimc.dummy - -#Clone entities -scoreboard players operation $temp whimc.barrelbot.puzzle_id = $new_id whimc.barrelbot.puzzle_id -execute at @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] run function whimc:barrelbot/clone/clone_entities - -scoreboard players operation $source_x whimc.dummy = $old_source_x whimc.dummy -scoreboard players operation $source_y whimc.dummy = $old_source_y whimc.dummy -scoreboard players operation $source_z whimc.dummy = $old_source_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_display_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_display_setup.mcfunction deleted file mode 100644 index 3c3a4b6..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_display_setup.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/clone/function_display_setup -# Sets up the item display that hovers above a function barrel - -data merge entity @s {brightness:{sky:15,block:15},billboard:"center",transformation:{scale:[0.5f,0.5f,0.001f]}} -data modify entity @s item set from storage whimc:storage display_item -tag @s add whimc.function_display -execute if score #locked whimc.dummy matches 1 run tag @s add whimc.function_display.locked \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_setup.mcfunction deleted file mode 100644 index f68f52b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_setup.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:barrelbot/clone/function_setup -# Sets up a cloned function - -tag @s add whimc.barrelbot.function - -#Set function ID -data modify entity @s data.id set from storage whimc:storage function_id - -#Summon item display -execute positioned ~ ~1 ~ summon minecraft:item_display run function whimc:barrelbot/clone/function_display_setup - -#Summon interaction -execute positioned ~ ~0.75 ~ summon minecraft:interaction run function whimc:barrelbot/functions/interaction_setup - -#Summon text display -execute positioned ~ ~1.35 ~ summon minecraft:text_display run function whimc:barrelbot/clone/function_text_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_text_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_text_setup.mcfunction deleted file mode 100644 index 5826983..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/function_text_setup.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/clone/function_text_setup -# Sets up a cloned text display for functions - -tag @s add whimc.barrelbot.function_text -data merge entity @s {billboard:"center"} -data modify entity @s text set from storage whimc:storage text_display \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_new_hitbox.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_new_hitbox.mcfunction deleted file mode 100644 index 7985f6e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_new_hitbox.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -#> whimc:barrelbot/clone/get_new_hitbox -# Outputs a new hitbox at the new location - -scoreboard players operation $temp_max_x whimc.dummy = $max_x whimc.dummy -scoreboard players operation $temp_max_y whimc.dummy = $max_y whimc.dummy -scoreboard players operation $temp_max_z whimc.dummy = $max_z whimc.dummy -scoreboard players operation $temp_min_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $temp_min_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $temp_min_z whimc.dummy = $min_z whimc.dummy - - -#Set up hitbox -scoreboard players operation $temp_max_x whimc.dummy -= $source_x whimc.dummy -scoreboard players operation $temp_max_y whimc.dummy -= $source_y whimc.dummy -scoreboard players operation $temp_max_z whimc.dummy -= $source_z whimc.dummy -scoreboard players operation $temp_min_x whimc.dummy -= $source_x whimc.dummy -scoreboard players operation $temp_min_y whimc.dummy -= $source_y whimc.dummy -scoreboard players operation $temp_min_z whimc.dummy -= $source_z whimc.dummy - -scoreboard players operation $temp_max_x whimc.dummy += $paste_x whimc.dummy -scoreboard players operation $temp_max_y whimc.dummy += $paste_y whimc.dummy -scoreboard players operation $temp_max_z whimc.dummy += $paste_z whimc.dummy -scoreboard players operation $temp_min_x whimc.dummy += $paste_x whimc.dummy -scoreboard players operation $temp_min_y whimc.dummy += $paste_y whimc.dummy -scoreboard players operation $temp_min_z whimc.dummy += $paste_z whimc.dummy - -execute store result storage whimc:storage bounding_box.max_x int 1 run scoreboard players get $temp_max_x whimc.dummy -execute store result storage whimc:storage bounding_box.max_y int 1 run scoreboard players get $temp_max_y whimc.dummy -execute store result storage whimc:storage bounding_box.max_z int 1 run scoreboard players get $temp_max_z whimc.dummy -execute store result storage whimc:storage bounding_box.min_x int 1 run scoreboard players get $temp_min_x whimc.dummy -execute store result storage whimc:storage bounding_box.min_y int 1 run scoreboard players get $temp_min_y whimc.dummy -execute store result storage whimc:storage bounding_box.min_z int 1 run scoreboard players get $temp_min_z whimc.dummy - -execute on passengers run data modify entity @s data.bounding_box set from storage whimc:storage bounding_box \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_pos.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_pos.mcfunction deleted file mode 100644 index d4c8cfa..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/get_pos.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/clone/get_pos -# Gets the position of the execution spot - -data modify storage whimc:storage Pos set from entity @s Pos -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_highlight_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_highlight_block.mcfunction deleted file mode 100644 index 2a6599d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_highlight_block.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/clone/green_highlight_block -# Makes a simple highlight around a block - -particle dust 0 1 0 1 ~ ~1 ~1 -particle dust 0 1 0 1 ~1 ~1 ~1 -particle dust 0 1 0 1 ~ ~ ~1 -particle dust 0 1 0 1 ~1 ~ ~1 -particle dust 0 1 0 1 ~ ~1 ~ -particle dust 0 1 0 1 ~1 ~1 ~ -particle dust 0 1 0 1 ~ ~ ~ -particle dust 0 1 0 1 ~1 ~ ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_position_highlight.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_position_highlight.mcfunction deleted file mode 100644 index 976d075..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/green_position_highlight.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/green_position_highlight -# Positions the highlight_block function to the right corner - -$execute positioned $(x).0 $(y).0 $(z).0 run function whimc:barrelbot/clone/green_highlight_block \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/highlight_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/highlight_block.mcfunction deleted file mode 100644 index 134bc4a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/highlight_block.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/clone/highlight_block -# Makes a simple highlight around a block - -particle electric_spark ~ ~1 ~1 -particle electric_spark ~1 ~1 ~1 -particle electric_spark ~ ~ ~1 -particle electric_spark ~1 ~ ~1 -particle electric_spark ~ ~1 ~ -particle electric_spark ~1 ~1 ~ -particle electric_spark ~ ~ ~ -particle electric_spark ~1 ~ ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/manager_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/manager_setup.mcfunction deleted file mode 100644 index e6bc0d6..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/manager_setup.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/clone/manager_setup -# Sets up a cloned manager entity - -#Perform all normal setup -function whimc:barrelbot/manager/setup - -scoreboard players operation @s whimc.barrelbot.puzzle_type_id = $temp whimc.barrelbot.puzzle_type_id - -function whimc:barrelbot/clone/get_new_hitbox \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/paste_blocks.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/paste_blocks.mcfunction deleted file mode 100644 index fef147b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/paste_blocks.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/paste_blocks -# Pastes the blocks of the puzzle - -$clone $(bottom_x) $(bottom_y) $(bottom_z) $(top_x) $(top_y) $(top_z) $(destination_x) $(destination_y) $(destination_z) \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_bot_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_bot_clone.mcfunction deleted file mode 100644 index 4e9c6cb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_bot_clone.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/position_bot_clone - -$execute positioned ~$(x) ~$(y) ~$(z) run function whimc:barrelbot/dev/spawn_bot -$execute positioned ~$(x) ~$(y) ~$(z) align xyz positioned ~0.5 ~0.5 ~0.5 as @e[type=item_display,tag=whimc.barrelbot,limit=1,sort=nearest] run function whimc:barrelbot/clone/set_bot_data \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_function_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_function_clone.mcfunction deleted file mode 100644 index f22bbe6..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_function_clone.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/position_function_clone -# Selects the position to spawn a cloned function - -$execute positioned ~$(x) ~$(y) ~$(z) run function whimc:barrelbot/clone/spawn_cloned_function \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_highlight.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_highlight.mcfunction deleted file mode 100644 index 19aca50..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_highlight.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/position_highlight -# Positions the highlight_block function to the right corner - -$execute positioned $(x).0 $(y).0 $(z).0 run function whimc:barrelbot/clone/highlight_block \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_subpuzzle_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_subpuzzle_clone.mcfunction deleted file mode 100644 index 318a595..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/position_subpuzzle_clone.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/clone/position_subpuzzle_clone - -$execute positioned $(x) $(y) $(z) run function whimc:barrelbot/clone/spawn_subpuzzle_manager \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/clone_details.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/clone_details.mcfunction deleted file mode 100644 index fc98563..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/clone_details.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/clone/propagate/clone_details -# Same as clone as manager, just doesn't create a new marker - -execute summon marker run function whimc:barrelbot/clone/propagate/get_position - -#Clone blocks -function whimc:barrelbot/clone/clone_blocks - -#Clone entities -function whimc:barrelbot/clone/clone_entities with storage whimc:macro Pos diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/delete_old_entities.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/delete_old_entities.mcfunction deleted file mode 100644 index e8e8359..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/delete_old_entities.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/clone/propagate/delete_old_entities -# Gets rid of any previously existing entities in the area - -#Delete barrelbots -$execute as @e[type=minecraft:item_display,tag=whimc.barrelbot,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] run function whimc:barrelbot/bot/kill - -#Delete functions -$execute as @e[type=minecraft:marker,tag=whimc.barrelbot.function,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] at @s run function whimc:barrelbot/functions/delete diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/get_position.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/get_position.mcfunction deleted file mode 100644 index c896bdc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/get_position.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/clone/propagate/get_position -# Gets the location to paste the puzzle - -data modify storage whimc:storage Pos set from entity @s Pos -execute store result score $paste_x whimc.dummy run data get storage whimc:storage Pos[0] -execute store result score $paste_y whimc.dummy run data get storage whimc:storage Pos[1] -execute store result score $paste_z whimc.dummy run data get storage whimc:storage Pos[2] - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/propagate_changes.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/propagate_changes.mcfunction deleted file mode 100644 index d00525c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/propagate_changes.mcfunction +++ /dev/null @@ -1,47 +0,0 @@ -#> whimc:barrelbot/clone/propagate/propagate_changes -# Propagate any changes to the puzzle to all clones - -#Get coordinates -execute store result score $source_x whimc.dummy run data get entity @s Pos[0] -execute store result score $source_y whimc.dummy run data get entity @s Pos[1] -execute store result score $source_z whimc.dummy run data get entity @s Pos[2] - -execute on passengers run data modify storage whimc:storage bounding_box set from entity @s data.bounding_box -execute store result score $max_x whimc.dummy run data get storage whimc:storage bounding_box.max_x -execute store result score $max_y whimc.dummy run data get storage whimc:storage bounding_box.max_y -execute store result score $max_z whimc.dummy run data get storage whimc:storage bounding_box.max_z -execute store result score $min_x whimc.dummy run data get storage whimc:storage bounding_box.min_x -execute store result score $min_y whimc.dummy run data get storage whimc:storage bounding_box.min_y -execute store result score $min_z whimc.dummy run data get storage whimc:storage bounding_box.min_z - -#This is total spaghetti code -#Accidentally used the same variable name for two slightly different circumstances and am now facing the consequences -scoreboard players operation $base_max_x whimc.dummy = $max_x whimc.dummy -scoreboard players operation $base_max_y whimc.dummy = $max_y whimc.dummy -scoreboard players operation $base_max_z whimc.dummy = $max_z whimc.dummy -scoreboard players operation $base_min_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $base_min_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $base_min_z whimc.dummy = $min_z whimc.dummy - -scoreboard players operation $temp whimc.barrelbot.puzzle_type_id = @s whimc.barrelbot.puzzle_type_id -execute as @e[type=text_display,distance=0.1..,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_puzzle_type_id] at @s run function whimc:barrelbot/clone/propagate/update_puzzle - - -#Get data from marker -#data modify storage whimc:storage clone.marker set from entity @s -function whimc:barrelbot/manager/get_dimensions -scoreboard players operation $min_source_x whimc.dummy = $real_min_x whimc.dummy -scoreboard players operation $min_source_y whimc.dummy = $real_min_y whimc.dummy -scoreboard players operation $min_source_z whimc.dummy = $real_min_z whimc.dummy -scoreboard players operation $max_source_x whimc.dummy = $real_max_x whimc.dummy -scoreboard players operation $max_source_y whimc.dummy = $real_max_y whimc.dummy -scoreboard players operation $max_source_z whimc.dummy = $real_max_z whimc.dummy -scoreboard players operation $vol_x whimc.dummy = $size_x whimc.dummy -scoreboard players operation $vol_y whimc.dummy = $size_y whimc.dummy -scoreboard players operation $vol_z whimc.dummy = $size_z whimc.dummy - - - -#Propagate changes -execute positioned as @e[type=text_display,distance=0.1..,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_puzzle_type_id] run function whimc:barrelbot/clone/propagate/clone_details - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/update_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/update_puzzle.mcfunction deleted file mode 100644 index 9c0e95b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/propagate/update_puzzle.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/clone/propagate/update_puzzle -# Deletes the old stuff - -scoreboard players operation $max_x whimc.dummy = $base_max_x whimc.dummy -scoreboard players operation $max_y whimc.dummy = $base_max_y whimc.dummy -scoreboard players operation $max_z whimc.dummy = $base_max_z whimc.dummy -scoreboard players operation $min_x whimc.dummy = $base_min_x whimc.dummy -scoreboard players operation $min_y whimc.dummy = $base_min_y whimc.dummy -scoreboard players operation $min_z whimc.dummy = $base_min_z whimc.dummy - -#Update bounding box -execute at @s summon marker run function whimc:barrelbot/clone/propagate/get_position -function whimc:barrelbot/clone/get_new_hitbox - -#Get rid of old entities -function whimc:barrelbot/manager/get_dimensions -execute at @s run function whimc:barrelbot/clone/propagate/delete_old_entities with storage whimc:macro Pos - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_highlight_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_highlight_block.mcfunction deleted file mode 100644 index 2b3f115..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_highlight_block.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/clone/red_highlight_block -# Makes a simple highlight around a block - -particle dust 1 0 0 1 ~ ~1 ~1 -particle dust 1 0 0 1 ~1 ~1 ~1 -particle dust 1 0 0 1 ~ ~ ~1 -particle dust 1 0 0 1 ~1 ~ ~1 -particle dust 1 0 0 1 ~ ~1 ~ -particle dust 1 0 0 1 ~1 ~1 ~ -particle dust 1 0 0 1 ~ ~ ~ -particle dust 1 0 0 1 ~1 ~ ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_position_highlight.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_position_highlight.mcfunction deleted file mode 100644 index c2c1226..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/red_position_highlight.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/red_position_highlight -# Positions the highlight_block function to the right corner - -$execute positioned $(x).0 $(y).0 $(z).0 run function whimc:barrelbot/clone/red_highlight_block \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/scan_for_markers.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/scan_for_markers.mcfunction deleted file mode 100644 index 32cd671..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/scan_for_markers.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/scan_for_markers -# Scans the area for any other puzzles containted within the bounding box - -$execute positioned $(x) $(y) $(z) as @e[type=text_display,dx=$(dx),dy=$(dy),dz=$(dz),tag=whimc.barrelbot.puzzle_manager,tag=!whimc.this] run function whimc:barrelbot/clone/clone_subpuzzle \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/set_bot_data.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/set_bot_data.mcfunction deleted file mode 100644 index e3d88a1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/set_bot_data.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/set_bot_data - -execute if score $is_dispenser whimc.dummy matches 1 run function whimc:barrelbot/dispenser_bot/convert -execute on passengers run data modify entity @s data.instructions set from storage whimc:storage marker_data.instructions diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_cloned_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_cloned_function.mcfunction deleted file mode 100644 index 19ca800..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_cloned_function.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/clone/spawn_cloned_function -# Spawns a new function entity in the new location - -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon marker at @s run function whimc:barrelbot/clone/function_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_manager.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_manager.mcfunction deleted file mode 100644 index 668dc0d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_manager.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/clone/spawn_manager -# Spawns a new manager entity for a cloned puzzle - -execute summon marker run function whimc:barrelbot/manager/get_execution_direction - -execute unless block ~ ~ ~ #minecraft:buttons run setblock ~ ~ ~ minecraft:stone_button[face=floor] - -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon text_display run function whimc:barrelbot/clone/manager_setup - -scoreboard players operation @s[type=player] whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id -scoreboard players operation $new_id whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id - -scoreboard players operation @s whimc.barrelbot.puzzle_type_id = $temp whimc.barrelbot.puzzle_type_id - -tellraw @s {"text": "Successfully linked to puzzle", "color": "green"} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_subpuzzle_manager.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_subpuzzle_manager.mcfunction deleted file mode 100644 index 6650b68..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/spawn_subpuzzle_manager.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/clone/spawn_subpuzzle_manager - -execute rotated as @s run function whimc:barrelbot/dev/spawn_manager \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/tick.mcfunction deleted file mode 100644 index 0e85cdc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/clone/tick.mcfunction +++ /dev/null @@ -1,38 +0,0 @@ -#> whimc:barrelbot/clone/tick -# Ticks the player while cloning. Mostly for bounding box display purposes - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -#x1y1x1 -execute store result storage whimc:macro Pos.x int 1 run scoreboard players get @s whimc.barrelbot.clone.x1 -execute store result storage whimc:macro Pos.y int 1 run scoreboard players get @s whimc.barrelbot.clone.y1 -execute store result storage whimc:macro Pos.z int 1 run scoreboard players get @s whimc.barrelbot.clone.z1 -function whimc:barrelbot/clone/green_position_highlight with storage whimc:macro Pos - -#x2yz1 -execute store result storage whimc:macro Pos.x int 1 run scoreboard players get @s whimc.barrelbot.clone.x2 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos - -#x2y2z1 -execute store result storage whimc:macro Pos.y int 1 run scoreboard players get @s whimc.barrelbot.clone.y2 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos - -#x1y2z1 -execute store result storage whimc:macro Pos.x int 1 run scoreboard players get @s whimc.barrelbot.clone.x1 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos - -#x1y2z2 -execute store result storage whimc:macro Pos.z int 1 run scoreboard players get @s whimc.barrelbot.clone.z2 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos - -#x2y2z2 -execute store result storage whimc:macro Pos.x int 1 run scoreboard players get @s whimc.barrelbot.clone.x2 -function whimc:barrelbot/clone/red_position_highlight with storage whimc:macro Pos - -#x2y1z2 -execute store result storage whimc:macro Pos.y int 1 run scoreboard players get @s whimc.barrelbot.clone.y1 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos - -#z1y1z2 -execute store result storage whimc:macro Pos.x int 1 run scoreboard players get @s whimc.barrelbot.clone.x1 -function whimc:barrelbot/clone/position_highlight with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/cascade_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/cascade_clone.mcfunction deleted file mode 100644 index 63148b6..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/cascade_clone.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/dev/cascade_clone -# Brings up the prompt for a cascade clone - -tellraw @s {"text":"Cascade Clone","bold": true,"underlined": true} -tellraw @s ["","- ",{"text":"Set x-axis cascade count","color":"gold","clickEvent":{"action":"suggest_command","value":"/scoreboard players set @s whimc.barrelbot.cascade.x 1"}}] -tellraw @s ["","- ",{"text":"Set z-axis cascade count","color":"gold","clickEvent":{"action":"suggest_command","value":"/scoreboard players set @s whimc.barrelbot.cascade.z 1"}}] -tellraw @s ["","- ",{"text":"Set x-axis spacing","color":"yellow","clickEvent":{"action":"suggest_command","value":"/scoreboard players set @s whimc.barrelbot.cascade.x_spacing 1"}}] -tellraw @s ["","- ",{"text":"Set z-axis spacing","color":"yellow","clickEvent":{"action":"suggest_command","value":"/scoreboard players set @s whimc.barrelbot.cascade.z_spacing 1"}}] -tellraw @s ["",{"text":"Preview ","bold":true,"color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/preview_cascade"}},{"text":"|","bold":true,"color":"white"},{"text":" Paste","bold":true,"color":"green","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/paste_cascade"}}] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/begin_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/begin_clone.mcfunction deleted file mode 100644 index f518d19..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/begin_clone.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/dev/clone/begin_clone -# Tags the player as ready to begin the cloning process - -tag @s add whimc.barrelbot.cloning - -scoreboard players set @s whimc.barrelbot.clone.x1 0 -scoreboard players set @s whimc.barrelbot.clone.y1 0 -scoreboard players set @s whimc.barrelbot.clone.z1 0 -scoreboard players set @s whimc.barrelbot.clone.x2 0 -scoreboard players set @s whimc.barrelbot.clone.y2 0 -scoreboard players set @s whimc.barrelbot.clone.z2 0 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/end_clone.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/end_clone.mcfunction deleted file mode 100644 index e4c9035..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/end_clone.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/clone/end_clone -# Tags the player as ready to begin the cloning process - -tag @s remove whimc.barrelbot.cloning diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_down.mcfunction deleted file mode 100644 index f63e114..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.x1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_up.mcfunction deleted file mode 100644 index 27c9da0..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x1_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.x1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_down.mcfunction deleted file mode 100644 index e689ea9..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.x2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_up.mcfunction deleted file mode 100644 index 4b999d8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_x2_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.x2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_down.mcfunction deleted file mode 100644 index e8abacb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.y1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_up.mcfunction deleted file mode 100644 index 0a74f29..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y1_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.y1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_down.mcfunction deleted file mode 100644 index 903a1d3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.y2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_up.mcfunction deleted file mode 100644 index 3c8c311..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_y2_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.y2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_down.mcfunction deleted file mode 100644 index 0302de3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.z1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_up.mcfunction deleted file mode 100644 index 3988d4a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z1_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.z1 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_down.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_down.mcfunction deleted file mode 100644 index cf28948..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_down.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players remove @s whimc.barrelbot.clone.z2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_up.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_up.mcfunction deleted file mode 100644 index 216b476..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/nudge_z2_up.mcfunction +++ /dev/null @@ -1,2 +0,0 @@ -scoreboard players add @s whimc.barrelbot.clone.z2 1 -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_cascade.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_cascade.mcfunction deleted file mode 100644 index 4bfc702..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_cascade.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ -#> whimc:barrelbot/dev/clone/paste_cascade -# Pastes a cascade clone - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -#Clean up any invalid inputs -execute if score @s whimc.barrelbot.cascade.x_spacing matches ..-1 run scoreboard players set @s whimc.barrelbot.cascade.x 0 -execute if score @s whimc.barrelbot.cascade.z_spacing matches ..-1 run scoreboard players set @s whimc.barrelbot.cascade.z 0 - -#Transfer to fakeplayers -scoreboard players operation $temp whimc.barrelbot.cascade.x = @s whimc.barrelbot.cascade.x -scoreboard players operation $temp whimc.barrelbot.cascade.z = @s whimc.barrelbot.cascade.z -scoreboard players operation $temp whimc.barrelbot.cascade.x_spacing = @s whimc.barrelbot.cascade.x_spacing -scoreboard players operation $temp whimc.barrelbot.cascade.z_spacing = @s whimc.barrelbot.cascade.z_spacing - -#Get dimension data -execute as @e[type=text_display,limit=1,predicate=whimc:barrelbot/match_id,tag=whimc.barrelbot.puzzle_manager] on passengers run data modify storage whimc:storage bounding_box set from entity @s data.bounding_box -execute store result score $jump_x whimc.dummy run data get storage whimc:storage bounding_box.max_x -execute store result score $min_x whimc.dummy run data get storage whimc:storage bounding_box.min_x -scoreboard players operation $jump_x whimc.dummy -= $min_x whimc.dummy -execute if score $jump_x whimc.dummy matches ..-1 run scoreboard players operation $jump_x whimc.dummy *= #-1 whimc.const -scoreboard players add $jump_x whimc.dummy 1 -scoreboard players operation $jump_x whimc.dummy += $temp whimc.barrelbot.cascade.x_spacing - -execute store result score $jump_z whimc.dummy run data get storage whimc:storage bounding_box.max_z -execute store result score $min_z whimc.dummy run data get storage whimc:storage bounding_box.min_z -scoreboard players operation $jump_z whimc.dummy -= $min_z whimc.dummy -execute if score $jump_z whimc.dummy matches ..-1 run scoreboard players operation $jump_z whimc.dummy *= #-1 whimc.const -scoreboard players add $jump_z whimc.dummy 1 -scoreboard players operation $jump_z whimc.dummy += $temp whimc.barrelbot.cascade.z_spacing - -#Get sign -execute if score $temp whimc.barrelbot.cascade.x matches ..-1 run scoreboard players operation $jump_x whimc.dummy *= #-1 whimc.const -execute if score $temp whimc.barrelbot.cascade.z matches ..-1 run scoreboard players operation $jump_z whimc.dummy *= #-1 whimc.const -execute if score $temp whimc.barrelbot.cascade.x matches ..-1 run scoreboard players operation $temp whimc.barrelbot.cascade.x *= #-1 whimc.const -execute if score $temp whimc.barrelbot.cascade.z matches ..-1 run scoreboard players operation $temp whimc.barrelbot.cascade.z *= #-1 whimc.const - -execute store result storage whimc:macro jump.x int 1 run scoreboard players get $jump_x whimc.dummy -execute store result storage whimc:macro jump.z int 1 run scoreboard players get $jump_z whimc.dummy - -scoreboard players operation $x_iter whimc.dummy = $temp whimc.barrelbot.cascade.x -execute as @e[type=text_display,limit=1,predicate=whimc:barrelbot/match_id,tag=whimc.barrelbot.puzzle_manager] at @s run function whimc:barrelbot/clone/cascade/iterate_x_wrapper with storage whimc:macro jump \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_puzzle.mcfunction deleted file mode 100644 index 7457675..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/paste_puzzle.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ -#> whimc:barrelbot/dev/clone/paste_puzzle -# Pastes the puzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -#Get center coordinates -execute store result score $paste_x whimc.dummy run data get entity @s Pos[0] -execute store result score $paste_y whimc.dummy run data get entity @s Pos[1] -execute store result score $paste_z whimc.dummy run data get entity @s Pos[2] -# -##Get source min and max coordinates -#scoreboard players operation $min_source_x whimc.dummy = @s whimc.barrelbot.clone.x1 -#scoreboard players operation $min_source_x whimc.dummy < @s whimc.barrelbot.clone.x2 -#scoreboard players operation $min_source_y whimc.dummy = @s whimc.barrelbot.clone.y1 -#scoreboard players operation $min_source_y whimc.dummy < @s whimc.barrelbot.clone.y2 -#scoreboard players operation $min_source_z whimc.dummy = @s whimc.barrelbot.clone.z1 -#scoreboard players operation $min_source_z whimc.dummy < @s whimc.barrelbot.clone.z2 -# -#scoreboard players operation $max_source_x whimc.dummy = @s whimc.barrelbot.clone.x1 -#scoreboard players operation $max_source_x whimc.dummy > @s whimc.barrelbot.clone.x2 -#scoreboard players operation $max_source_y whimc.dummy = @s whimc.barrelbot.clone.y1 -#scoreboard players operation $max_source_y whimc.dummy > @s whimc.barrelbot.clone.y2 -#scoreboard players operation $max_source_z whimc.dummy = @s whimc.barrelbot.clone.z1 -#scoreboard players operation $max_source_z whimc.dummy > @s whimc.barrelbot.clone.z2 -# -##Get dimensions of bounding box -#scoreboard players operation $vol_x whimc.dummy = $max_source_x whimc.dummy -#scoreboard players operation $vol_x whimc.dummy -= $min_source_x whimc.dummy -#scoreboard players operation $vol_y whimc.dummy = $max_source_y whimc.dummy -#scoreboard players operation $vol_y whimc.dummy -= $min_source_y whimc.dummy -#scoreboard players operation $vol_z whimc.dummy = $max_source_z whimc.dummy -#scoreboard players operation $vol_z whimc.dummy -= $min_source_z whimc.dummy -# -##Cancel if not bound to a puzzle -#execute unless entity @s[tag=whimc.barrelbot.cloning] run tellraw @s {"text":"Not bound to a puzzle!","color":"red"} -#execute unless entity @s[tag=whimc.barrelbot.cloning] run return 0 - -execute unless entity @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] run tellraw @s {"text":"Not bound to a puzzle!","color":"red"} -execute unless entity @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] run return 0 - -#Run all cloning stuff from the manager entity (but positioned at the player) -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,limit=1,predicate=whimc:barrelbot/match_id] run function whimc:barrelbot/clone/clone_as_manager diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/send_nudge_message.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/send_nudge_message.mcfunction deleted file mode 100644 index 401a4e2..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/send_nudge_message.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/dev/clone/send_nudge_message -#Prompts the player to nudge the position - - -tellraw @p ["",{"text":"Pos 1: ","bold":true,"color":"green"},{"text":"+x","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_x1_up"}}," ",{"text":"+y","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_y1_up"}}," ",{"text":"+z","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_z1_up"}}," ",{"text":"-x","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_x1_down"}}," ",{"text":"-y","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_y1_down"}}," ",{"text":"-z","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_z1_down"}}] -tellraw @p ["",{"text":"Pos 2: ","bold":true,"color":"red"},{"text":"+x","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_x2_up"}}," ",{"text":"+y","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_y2_up"}}," ",{"text":"+z","color":"white","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_z2_up"}}," ",{"text":"-x","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_x2_down"}}," ",{"text":"-y","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_y2_down"}}," ",{"text":"-z","color":"gray","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/nudge_z2_down"}}] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos1.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos1.mcfunction deleted file mode 100644 index 8afc014..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos1.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/dev/clone/set_pos1 -# Sets position one to the player's feet - -execute store result score @s whimc.barrelbot.clone.x1 run data get entity @s Pos[0] -execute store result score @s whimc.barrelbot.clone.y1 run data get entity @s Pos[1] -execute store result score @s whimc.barrelbot.clone.z1 run data get entity @s Pos[2] - -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos2.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos2.mcfunction deleted file mode 100644 index 5f4c6fe..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/clone/set_pos2.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/dev/clone/set_pos2 -# Sets position two to the player's feet - -execute store result score @s whimc.barrelbot.clone.x2 run data get entity @s Pos[0] -execute store result score @s whimc.barrelbot.clone.y2 run data get entity @s Pos[1] -execute store result score @s whimc.barrelbot.clone.z2 run data get entity @s Pos[2] - -function whimc:barrelbot/dev/clone/send_nudge_message \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_barrel.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_barrel.mcfunction deleted file mode 100644 index e0f3727..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_barrel.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/convert_to_barrel -# Converts a barrelbot to a dispenser bot - -execute as @e[type=item_display,tag=whimc.dispenser_bot,limit=1,sort=nearest] at @s run function whimc:barrelbot/dispenser_bot/convert_to_barrel \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_dispenser.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_dispenser.mcfunction deleted file mode 100644 index 0359912..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/convert_to_dispenser.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/convert_to_dispenser -# Converts a barrelbot to a dispenser bot - -execute as @e[type=item_display,tag=whimc.barrelbot,limit=1,sort=nearest] at @s run function whimc:barrelbot/dispenser_bot/convert \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/create_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/create_function.mcfunction deleted file mode 100644 index 42d44ec..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/create_function.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/dev/create_function -# Creates a function barrel linked to the current puzzle - -# How to display/link? -# Should have a connected item that displays above the function barrel -# Actual linking is all handled internally -# Make a "Link item" function that updates the display and links the current item to the barrel -# Functions are stored in an array of functions on the manager marker - -setblock ~ ~ ~ shulker_box[facing=up]{CustomName:'{"text":"Function"}'} -#scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon marker at @s run function whimc:barrelbot/functions/marker_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_bot.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_bot.mcfunction deleted file mode 100644 index 8991879..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_bot.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/delete_bot -# Deletes the nearest barrel bot - -execute as @e[type=item_display,tag=whimc.barrelbot,limit=1,sort=nearest] at @s run function whimc:barrelbot/bot/kill \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_function.mcfunction deleted file mode 100644 index 142cae7..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_function.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/delete_function -# Deletes the nearest function barrel - -execute as @e[type=marker,tag=whimc.barrelbot.function,limit=1,sort=nearest] at @s run function whimc:barrelbot/functions/delete \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_puzzle.mcfunction deleted file mode 100644 index d17ac3b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/delete_puzzle.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/dev/delete_puzzle -# Deletes the linked puzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,limit=1,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/manager/delete_puzzle \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/give_dev_book.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/give_dev_book.mcfunction deleted file mode 100644 index 43e2e96..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/give_dev_book.mcfunction +++ /dev/null @@ -1,44 +0,0 @@ -give @s written_book{barrelbot_dev_book:1b,display:{Name:'{"text":"Barrelbot Dev Book","color":"gold","bold":true,"italic":false}'},title:"",author:"",pages:[\ - '[\ - {"text":"Contents\\n"},\ - {"text":"Features\\n","color":"blue","clickEvent":{"action":"change_page","value":"2"}},\ - {"text":"Puzzle\\n","color":"blue","clickEvent":{"action":"change_page","value":"3"}},\ - {"text":"Instructions\\n","color":"blue","clickEvent":{"action":"change_page","value":"4"}},\ - {"text":"Clone\\n","color":"blue","clickEvent":{"action":"change_page","value":"5"}}\ - ]',\ - '[\ - {"text":"Features\\n"},\ - {"text":"Spawn Bot\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/spawn_bot"}},\ - {"text":"Convert to Dispenser\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/convert_to_dispenser"}},\ - {"text":"Convert to Barrel\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/convert_to_barrel"}},\ - {"text":"Create Function\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/create_function"}},\ - {"text":"Link Function Item\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/link_function_item"}}\ - ]',\ - '[\ - {"text":"Puzzle\\n"},\ - {"text":"Link to Puzzle\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/link_puzzle"}},\ - {"text":"Create Puzzle\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/spawn_manager"}},\ - {"text":"Set Success Condition\\n","color":"blue","clickEvent":{"action":"copy_to_clipboard","value":"/data modify entity @e[type=marker,limit=1,tag=whimc.barrelbot.puzzle_storage,sort=nearest] data.success_function set value \\"\\""},"hoverEvent":{"action":"show_text","value":[{"text":"Copy to Clipboard"}]}},\ - {"text":"Set Puzzle Items\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/lock_puzzle_items"}},\ - {"text":"Reset All Puzzles\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/reset_all_puzzles"}},\ - {"text":"Toggle Edit Mode\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/toggle_edit_mode"}}\ - ]',\ - '[\ - {"text":"Instructions\\n"},\ - {"text":"Move Down\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/move_down/give"}},\ - {"text":"Move Forward\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/move_forward/give"}},\ - {"text":"Turn Left\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/turn_left/give"}},\ - {"text":"Turn Right\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/turn_right/give"}},\ - {"text":"Counter Loop\\n","color":"blue","clickEvent":{"action":"copy_to_clipboard","value":"/function whimc:barrelbot/instructions/loop/counter/give {cycles:}"},"hoverEvent":{"action":"show_text","value":[{"text":"Copy to Clipboard"}]}},\ - {"text":"While Loop\\n","color":"blue","clickEvent":{"action":"copy_to_clipboard","value":"/function whimc:barrelbot/instructions/loop/while/give {condition:\\"\\",description:\\"\\"}"},"hoverEvent":{"action":"show_text","value":[{"text":"Copy to Clipboard"}]}},\ - {"text":"Infinite Loop\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/loop/give_infinite"}},\ - {"text":"If Statement\\n","color":"blue","clickEvent":{"action":"copy_to_clipboard","value":"/function whimc:barrelbot/instructions/if/give {condition:\\"\\",description:\\"\\"}"},"hoverEvent":{"action":"show_text","value":[{"text":"Copy to Clipboard"}]}},\ - {"text":"End Code Block\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/instructions/end_code_block/give"}}\ - ]',\ - '[\ - {"text":"Clone\\n"},\ - {"text":"Paste Puzzle\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/clone/paste_puzzle"}},\ - {"text":"Cascade Clone\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/cascade_clone"}},\ - {"text":"Propagate Changes\\n","color":"blue","clickEvent":{"action":"run_command","value":"/function whimc:barrelbot/dev/propagate_changes"}}\ - ]'\ -]} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/highlight_linked_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/highlight_linked_puzzle.mcfunction deleted file mode 100644 index 894fc02..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/highlight_linked_puzzle.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/dev/highlight_linked_puzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -execute at @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] run particle dust 0.647 0.267 1 0.7 ~ ~1 ~ 0.01 0.15 0.01 0 3 force @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_function_item.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_function_item.mcfunction deleted file mode 100644 index 8a12a45..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_function_item.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/dev/link_function_item -# Links the item the player is holding to the nearest function - -data modify storage whimc:storage item_modifier.id set from entity @e[type=marker,limit=1,sort=nearest,tag=whimc.barrelbot.function] data.id -item modify entity @s weapon.mainhand whimc:barrelbot/set_function_id -item replace entity @e[type=item_display,limit=1,sort=nearest,tag=whimc.function_display] container.0 from entity @s weapon.mainhand \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_puzzle.mcfunction deleted file mode 100644 index 276580c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/link_puzzle.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/dev/link_puzzle -# Link yourself to the ID of the nearest puzzle - -scoreboard players operation @s whimc.barrelbot.puzzle_id = @e[type=text_display,limit=1,sort=nearest] whimc.barrelbot.puzzle_id -tellraw @s {"text": "Successfully linked to puzzle", "color": "green"} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/lock_puzzle_items.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/lock_puzzle_items.mcfunction deleted file mode 100644 index da45d17..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/lock_puzzle_items.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/dev/lock_puzzle_items -# Sets in stone the current configuration of items - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/no_smuggle/define_items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/propagate_changes.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/propagate_changes.mcfunction deleted file mode 100644 index 96d3854..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/propagate_changes.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/dev/propagate_changes -# Propagate any changes to the puzzle to all clones - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute as @e[type=text_display,limit=1,predicate=whimc:barrelbot/match_id,tag=whimc.barrelbot.puzzle_manager] at @s run function whimc:barrelbot/clone/propagate/propagate_changes \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/reset_all_puzzles.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/reset_all_puzzles.mcfunction deleted file mode 100644 index ccb46f5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/reset_all_puzzles.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/dev/reset_all_puzzles -# Resets every puzzle and its items - -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager.active] at @s run function whimc:barrelbot/manager/stop_execution - -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager] at @s positioned ~ ~-1 ~ on passengers run data modify block ^ ^ ^-1 Items set from entity @s data.Items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_lower_bound.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_lower_bound.mcfunction deleted file mode 100644 index 1cc3562..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_lower_bound.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/dev/set_lower_bound - - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -execute as @e[type=interaction,predicate=whimc:barrelbot/match_id,tag=whimc.max_node] at @s run function whimc:barrelbot/editor/set_max -function whimc:barrelbot/editor/set_min - -function whimc:barrelbot/editor/outline/adjust -execute as @e[type=marker,predicate=whimc:barrelbot/match_id,tag=whimc.edit_mode] run function whimc:barrelbot/editor/apply_lower_bound \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_upper_bound.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_upper_bound.mcfunction deleted file mode 100644 index 212781b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/set_upper_bound.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/dev/set_upper_bound - - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -execute as @e[type=interaction,predicate=whimc:barrelbot/match_id,tag=whimc.min_node] at @s run function whimc:barrelbot/editor/set_min -function whimc:barrelbot/editor/set_max - -function whimc:barrelbot/editor/outline/adjust -execute as @e[type=marker,predicate=whimc:barrelbot/match_id,tag=whimc.edit_mode] run function whimc:barrelbot/editor/apply_upper_bound \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_bot.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_bot.mcfunction deleted file mode 100644 index 1772087..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_bot.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/dev/spawn_bot -# Spawns a barrel bot, linked to the current puzzle - -execute unless block ~ ~ ~ barrel run setblock ~ ~ ~ minecraft:barrel[facing=up]{CustomName:'{"text":"Barrelbot"}'} -execute summon marker run function whimc:barrelbot/manager/get_execution_direction - -#scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -#execute if score $bot_summon.call_type whimc.dummy matches 1 run scoreboard players operation $temp whimc.barrelbot.puzzle_id = $new_id whimc.barrelbot.puzzle_id -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon item_display run function whimc:barrelbot/bot/setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_manager.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_manager.mcfunction deleted file mode 100644 index ad207b8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/spawn_manager.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/dev/spawn_manager -# Spawns the button (if necessary) and manager for a particular puzzle - -execute summon marker run function whimc:barrelbot/manager/get_execution_direction - -execute unless block ~ ~ ~ #minecraft:buttons run setblock ~ ~ ~ minecraft:stone_button[face=floor] - -execute align xyz positioned ~0.5 ~0.5 ~0.5 summon text_display run function whimc:barrelbot/manager/setup - -scoreboard players operation @s[type=player] whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id -scoreboard players operation $new_id whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id - -tellraw @s {"text": "Successfully linked to puzzle", "color": "green"} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/toggle_edit_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/toggle_edit_mode.mcfunction deleted file mode 100644 index e87a3d7..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dev/toggle_edit_mode.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/dev/toggle_edit_mode -# Toggles edit mode for the nearest puzzle - -execute as @e[type=text_display,limit=1,tag=whimc.barrelbot.puzzle_manager,sort=nearest] on passengers at @s run function whimc:barrelbot/editor/toggle_edit_mode \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert.mcfunction deleted file mode 100644 index 5d5b3cb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/dispenser_bot/convert -# Converts a barrelbot to a dispenser bot, locking it and making it uneditable - -tag @s add whimc.dispenser_bot -execute on passengers run data modify entity @s[tag=!whimc.dispenser_bot] data.instructions set from block ~ ~ ~ Items -setblock ~ ~ ~ minecraft:dispenser[facing=up]{Lock:"hurdy gurdy"} - -item replace entity @s container.0 with red_stained_glass_pane{CustomModelData:130000} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert_to_barrel.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert_to_barrel.mcfunction deleted file mode 100644 index 93081af..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/convert_to_barrel.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/dispenser_bot/convert_to_barrel - -tag @s remove whimc.dispenser_bot -setblock ~ ~ ~ minecraft:barrel[facing=up] -execute on passengers run data modify block ~ ~ ~ Items set from entity @s[tag=!whimc.dispenser_bot] data.instructions - -item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130000} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/toggle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/toggle.mcfunction deleted file mode 100644 index ad8e2a1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/dispenser_bot/toggle.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/dispenser_bot/toggle - -particle smoke ~ ~ ~ 0.5 0.5 0.5 0.1 20 normal - -execute store result score $is_dispenser whimc.dummy if entity @s[tag=whimc.dispenser_bot] -execute if score $is_dispenser whimc.dummy matches 0 run function whimc:barrelbot/dispenser_bot/convert -execute if score $is_dispenser whimc.dummy matches 1 run function whimc:barrelbot/dispenser_bot/convert_to_barrel \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_base.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_base.mcfunction deleted file mode 100644 index bd937fc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_base.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/display/function/setup_base -# Sets up the base entity for an execution display - -tag @s add whimc.execution_display -tag @s add whimc.execution_display_base - -scoreboard players operation @s whimc.barrelbot.bot_id = $temp whimc.barrelbot.bot_id -scoreboard players set @s whimc.barrelbot.display_layer 0 -data merge entity @s {billboard:"center",item_display:"gui",transformation:{scale:[2.22f,2.22f,2.22f],translation:[0f,0.72f,0f]}} - -item replace entity @s container.0 with glowstone_dust{CustomModelData:130002} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_cursor.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_cursor.mcfunction deleted file mode 100644 index 173d51b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/setup_cursor.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/display/function/setup_cursor -# Sets up the cursor display entity - -scoreboard players operation @s whimc.barrelbot.bot_id = $temp whimc.barrelbot.bot_id -scoreboard players set @s whimc.barrelbot.display_layer 0 - -tag @s add whimc.execution_display -tag @s add whimc.execution_display_cursor - -item replace entity @s container.0 with glowstone_dust{CustomModelData:130001} -data merge entity @s {billboard:"center",transformation:{scale:[0.26f,0.26f,0f],translation:[-0.912f,0.225f,0.01f],left_rotation:{angle:3.141592f,axis:[0f, 1f, 0f]}},item_display:"gui"} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/spawn_displays.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/spawn_displays.mcfunction deleted file mode 100644 index 0adbfd2..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/function/spawn_displays.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> whimc:barrelbot/display/function/spawn_displays -# Spawns the display entities for a function - -#Generate list of displays from function -data modify storage whimc:storage execution_displays set value [] - -data modify storage whimc:storage display_instructions set from storage whimc:storage function.function -execute store result score $entries whimc.dummy if data storage whimc:storage display_instructions[] - -execute if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/generate_data_recursive - -#Recursively iterate through list of displays -execute store result score $entries whimc.dummy if data storage whimc:storage execution_displays[] -execute positioned ~ ~1.25 ~ if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/spawn_displays_recursive - -#Summon cursor entity -execute positioned ~ ~1.25 ~ summon item_display run function whimc:barrelbot/display/function/setup_cursor - -#Summon inventory container entity -execute positioned ~ ~1.25 ~ summon item_display run function whimc:barrelbot/display/function/setup_base \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data.mcfunction deleted file mode 100644 index 3332883..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/display/generate_data -# Generates the data for the display entities that will be bound to the barrel bot - -data modify storage whimc:storage execution_displays set value [] - -data modify storage whimc:storage display_instructions set from entity @s data.instructions -execute store result score $entries whimc.dummy if data storage whimc:storage display_instructions[] - -execute if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/generate_data_recursive \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data_recursive.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data_recursive.mcfunction deleted file mode 100644 index dd34362..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/generate_data_recursive.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> whimc:barrelbot/display/generate_data_recursive -# Creates the data for a singular item - -#Create base data structure -data modify storage whimc:storage current_display set value {transformation:{translation:[0f,0f,0f]},item:{id:"minecraft:barrier",Count:1b}} - -#Get position from slot -execute store result score $slot whimc.dummy run data get storage whimc:storage display_instructions[0].Slot -scoreboard players operation $x whimc.dummy = $slot whimc.dummy -scoreboard players operation $x whimc.dummy %= #DISPLAY_WIDTH whimc.const -scoreboard players operation $y whimc.dummy = $slot whimc.dummy -scoreboard players operation $y whimc.dummy /= #DISPLAY_WIDTH whimc.const - -scoreboard players remove $x whimc.dummy 4 -scoreboard players remove $y whimc.dummy 1 - -execute store result storage whimc:storage current_display.transformation.translation[0] float 0.228 run scoreboard players get $x whimc.dummy -execute store result storage whimc:storage current_display.transformation.translation[1] float -0.225 run scoreboard players get $y whimc.dummy - -#Get item -data modify storage whimc:storage current_display.item set from storage whimc:storage display_instructions[0] - -#Append to storage and continue loop if there are more items to do -data modify storage whimc:storage execution_displays append from storage whimc:storage current_display - -scoreboard players remove $entries whimc.dummy 1 -data remove storage whimc:storage display_instructions[0] -execute if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/generate_data_recursive \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/initialize_item.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/initialize_item.mcfunction deleted file mode 100644 index 80202ba..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/initialize_item.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/display/initialize_item -# Sets up an individual instruction display - -data merge entity @s {teleport_duration:0,billboard:"center",transformation:{scale:[0.2f,0.2f,0f],left_rotation:{angle:3.141592f,axis:[0f, 1f, 0f]}},item_display:"gui",brightness:{sky:15,block:15}} -data modify entity @s {} merge from storage whimc:storage execution_displays[0] - -tag @s add whimc.execution_display -tag @s add whimc.execution_display_item - -scoreboard players operation @s whimc.barrelbot.bot_id = $temp whimc.barrelbot.bot_id -scoreboard players set @s whimc.barrelbot.display_layer 0 -#ride @s mount @e[type=item_display,tag=whimc.execution_display_base,predicate=whimc:barrelbot/match_bot_id,limit=1] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_back.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_back.mcfunction deleted file mode 100644 index 26b65b1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_back.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/display/push_back - -execute store result entity @s transformation.translation[2] float -0.2 run scoreboard players add @s whimc.barrelbot.display_layer 1 -data merge entity @s {interpolation_duration:5,start_interpolation:0} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward.mcfunction deleted file mode 100644 index 8aa945b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/display/push_forward - -execute store result entity @s transformation.translation[2] float -0.2 run scoreboard players remove @s whimc.barrelbot.display_layer 1 -data merge entity @s {interpolation_duration:5,start_interpolation:0} - -execute if score @s whimc.barrelbot.display_layer matches ..-1 run kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward_loop.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward_loop.mcfunction deleted file mode 100644 index 6ec93bf..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/push_forward_loop.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/display/push_forward_loop -# Repeatedly pushes forward if necessary - -execute as @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] run function whimc:barrelbot/display/push_forward - -scoreboard players remove @s whimc.barrelbot.push_count 1 -execute if score @s whimc.barrelbot.push_count matches 1.. run function whimc:barrelbot/display/push_forward_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_base.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_base.mcfunction deleted file mode 100644 index 5783c5a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_base.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/display/setup_base -# Sets up the base entity for an execution display - -tag @s add whimc.execution_display -tag @s add whimc.execution_display_base - -scoreboard players operation @s whimc.barrelbot.bot_id = $temp whimc.barrelbot.bot_id -scoreboard players set @s whimc.barrelbot.display_layer 0 -data merge entity @s {billboard:"center",item_display:"gui",transformation:{scale:[2.22f,2.22f,2.22f],translation:[0f,0.72f,0f]}} - -item replace entity @s container.0 with glowstone_dust{CustomModelData:130000} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_cursor.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_cursor.mcfunction deleted file mode 100644 index 9411857..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/setup_cursor.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/display/setup_cursor -# Sets up the cursor display entity - -scoreboard players operation @s whimc.barrelbot.bot_id = $temp whimc.barrelbot.bot_id -scoreboard players set @s whimc.barrelbot.display_layer 0 - -tag @s add whimc.execution_display -tag @s add whimc.execution_display_cursor - -item replace entity @s container.0 with glowstone_dust{CustomModelData:130001} -data merge entity @s {billboard:"center",transformation:{scale:[0.26f,0.26f,0f],translation:[100000f,0.225f,0.01f],left_rotation:{angle:3.141592f,axis:[0f, 1f, 0f]}},item_display:"gui",brightness:{sky:15,block:15}} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays.mcfunction deleted file mode 100644 index e36d510..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/display/spawn_displays -# Spawns all the item displays to appear over the barrelbot -# -#Input: whimc:storage execution_displays - -#Recursively iterate through list of displays - -execute store result score $entries whimc.dummy if data storage whimc:storage execution_displays[] -execute positioned ~ ~1.25 ~ if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/spawn_displays_recursive - -#Summon cursor entity -execute positioned ~ ~1.25 ~ summon item_display run function whimc:barrelbot/display/setup_cursor - -#Summon inventory container entity -execute positioned ~ ~1.25 ~ summon item_display run function whimc:barrelbot/display/setup_base \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays_recursive.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays_recursive.mcfunction deleted file mode 100644 index 0e79cc8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/spawn_displays_recursive.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/display/spawn_displays_recursive -# Summons a single item display - -#Summon display -execute summon item_display run function whimc:barrelbot/display/initialize_item - -#Continue recursion -scoreboard players remove $entries whimc.dummy 1 -data remove storage whimc:storage execution_displays[0] -execute if score $entries whimc.dummy matches 1.. run function whimc:barrelbot/display/spawn_displays_recursive - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update.mcfunction deleted file mode 100644 index a071a78..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/display/update -# Updates the execution display as the bot moves - -#Move with the bot -tp @s ~ ~1.25 ~ diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update_cursor.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update_cursor.mcfunction deleted file mode 100644 index 19edc89..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/display/update_cursor.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/display/update_cursor -# Updates cursor position - -#Get slot from appropriate layer - -execute store result score $slot whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute if score $slot whimc.dummy matches 0 unless data storage whimc:storage marker_data.stack[] run return 0 -scoreboard players operation $x whimc.dummy = $slot whimc.dummy -scoreboard players operation $x whimc.dummy %= #DISPLAY_WIDTH whimc.const -scoreboard players operation $y whimc.dummy = $slot whimc.dummy -scoreboard players operation $y whimc.dummy /= #DISPLAY_WIDTH whimc.const - -scoreboard players remove $x whimc.dummy 4 -scoreboard players remove $y whimc.dummy 1 - -execute store result entity @s transformation.translation[0] float 0.228 run scoreboard players get $x whimc.dummy -execute store result entity @s transformation.translation[1] float -0.225 run scoreboard players get $y whimc.dummy -data merge entity @s {interpolation_duration:2,start_interpolation:0} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_lower_bound.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_lower_bound.mcfunction deleted file mode 100644 index f461cc8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_lower_bound.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/apply_lower_bound -# Internally modifies the marker's lower bound data - -execute store result entity @s data.bounding_box.min_x int 1 run scoreboard players get $min_x whimc.dummy -execute store result entity @s data.bounding_box.min_y int 1 run scoreboard players get $min_y whimc.dummy -execute store result entity @s data.bounding_box.min_z int 1 run scoreboard players get $min_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_upper_bound.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_upper_bound.mcfunction deleted file mode 100644 index bbf6a6d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/apply_upper_bound.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/apply_upper_bound -# Internally modifies the marker's upper bound data - -execute store result entity @s data.bounding_box.max_x int 1 run scoreboard players get $max_x whimc.dummy -execute store result entity @s data.bounding_box.max_y int 1 run scoreboard players get $max_y whimc.dummy -execute store result entity @s data.bounding_box.max_z int 1 run scoreboard players get $max_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/disable_edit_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/disable_edit_mode.mcfunction deleted file mode 100644 index f3a3df5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/disable_edit_mode.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/disable_edit_mode -# Disables edit mode - -tag @s remove whimc.edit_mode -function whimc:barrelbot/editor/outline/delete \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/check_match.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/check_match.mcfunction deleted file mode 100644 index f92dab9..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/check_match.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/drag/check_match -# Checks if this was the interaction clicked by the player - -scoreboard players set #match_found whimc.dummy 0 -execute on target if entity @s[tag=whimc.clicker] run scoreboard players set #match_found whimc.dummy 1 - -execute if score #match_found whimc.dummy matches 1 run function whimc:barrelbot/editor/drag/node_clicked \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/click_node.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/click_node.mcfunction deleted file mode 100644 index 0b798c5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/click_node.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/editor/drag/click_node -# Toggles node dragging - -advancement revoke @s only whimc:interact/right_click_node - -execute store success score $dragging whimc.dummy if entity @s[tag=whimc.dragging_node] -execute if score $dragging whimc.dummy matches 1 run tag @s remove whimc.dragging_node -execute if score $dragging whimc.dummy matches 0 run tag @s add whimc.dragging_node - -scoreboard players set $temp whimc.barrelbot.node_id -1 -tag @s add whimc.clicker -execute as @e[type=interaction,tag=whimc.editor_node,distance=..6] run function whimc:barrelbot/editor/drag/check_match -tag @s remove whimc.clicker - -scoreboard players operation @s whimc.barrelbot.node_id = $temp whimc.barrelbot.node_id diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/display_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/display_setup.mcfunction deleted file mode 100644 index cd6c2e4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/display_setup.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/drag/display_setup -# Sets up the visual queue thing for the node - -tag @s add whimc.node_display - -item replace entity @s container.0 with yellow_concrete -data modify entity @s transformation.scale set value [0.5f,0.5f,0.5f] -data modify entity @s transformation.translation set value [0.0f,0.5f,0.0f] -data modify entity @s Glowing set value 1b -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id -ride @s mount @e[limit=1,type=interaction,tag=whimc.this_node] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/drag_tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/drag_tick.mcfunction deleted file mode 100644 index a77e421..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/drag_tick.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/drag/drag_tick -# Tick the player dragging the node - -scoreboard players operation $temp whimc.barrelbot.node_id = @s whimc.barrelbot.node_id -execute anchored eyes positioned ^ ^ ^3 as @e[type=interaction,tag=whimc.editor_node,predicate=whimc:barrelbot/match_node_id,limit=1] run function whimc:barrelbot/editor/drag/node_tick \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_clicked.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_clicked.mcfunction deleted file mode 100644 index 040b5e4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_clicked.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/drag/node_clicked -# Commands run as the node clicked - -#Data stuff -data remove entity @s interaction -scoreboard players operation $temp whimc.barrelbot.node_id = @s whimc.barrelbot.node_id - -#Feedback -execute if score $dragging whimc.dummy matches 0 run playsound minecraft:entity.item_frame.remove_item player @a ~ ~ ~ 1 1.3 -execute if score $dragging whimc.dummy matches 1 run playsound minecraft:entity.item_frame.remove_item player @a ~ ~ ~ 1 0.9 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_setup.mcfunction deleted file mode 100644 index a805bfb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_setup.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/drag/node_setup -# Setup common to all nodes - -tag @s add whimc.editor_node -data merge entity @s {response:1b} -execute store result score @s whimc.barrelbot.node_id run scoreboard players add $global whimc.barrelbot.node_id 1 - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id -tag @s add whimc.this_node -execute summon item_display run function whimc:barrelbot/editor/drag/display_setup -tag @s remove whimc.this_node \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_tick.mcfunction deleted file mode 100644 index 08d94a2..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/node_tick.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/editor/drag/node_tick -# Updates the node as it is being dragged - -execute align xyz run tp @s ~0.5 ~ ~0.5 - -execute as @s[tag=whimc.min_node] at @s run function whimc:barrelbot/dev/set_lower_bound -execute as @s[tag=whimc.max_node] at @s run function whimc:barrelbot/dev/set_upper_bound - -execute at @s run particle dust 1.0 0.7 0.2 0.8 ~ ~0.5 ~ 0.3 0.3 0.3 0 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_max_node.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_max_node.mcfunction deleted file mode 100644 index fe99b88..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_max_node.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/drag/setup_max_node -# Sets up the lowest node - -tag @s add whimc.max_node -function whimc:barrelbot/editor/drag/node_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_min_node.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_min_node.mcfunction deleted file mode 100644 index 495c310..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/setup_min_node.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/drag/setup_min_node -# Sets up the lowest node - -tag @s add whimc.min_node -function whimc:barrelbot/editor/drag/node_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/spawn_drag_nodes.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/spawn_drag_nodes.mcfunction deleted file mode 100644 index 03b888c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/drag/spawn_drag_nodes.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/drag/spawn_drag_nodes -# Spawns the clickable and draggable nodes for the bounding box - -$execute positioned $(min_x) $(min_y) $(min_z) summon interaction run function whimc:barrelbot/editor/drag/setup_min_node -$execute positioned $(max_x) $(max_y) $(max_z) summon interaction run function whimc:barrelbot/editor/drag/setup_max_node diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/barrelbot_found.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/barrelbot_found.mcfunction deleted file mode 100644 index 541c059..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/barrelbot_found.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/barrelbot_found -# Returns that a barrelbot was found by the scan - -scoreboard players set #success whimc.dummy 1 - -data remove storage whimc:macro page -data modify storage whimc:macro page.page set value "barrelbot" -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id - -tag @s add whimc.edit_subject \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/check_if_puzzle_storage.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/check_if_puzzle_storage.mcfunction deleted file mode 100644 index caa5040..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/check_if_puzzle_storage.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -execute positioned ~ ~1 ~1 as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,dx=0,dy=0,dz=0,y_rotation=0] positioned ~ ~-1 ~-1 run function whimc:barrelbot/editor/edit_wand/lock_puzzle_items -execute positioned ~ ~1 ~-1 as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,dx=0,dy=0,dz=0,y_rotation=180] positioned ~ ~-1 ~1 run function whimc:barrelbot/editor/edit_wand/lock_puzzle_items -execute positioned ~1 ~1 ~ as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,dx=0,dy=0,dz=0,y_rotation=-90] positioned ~-1 ~-1 ~ run function whimc:barrelbot/editor/edit_wand/lock_puzzle_items -execute positioned ~-1 ~1 ~ as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,dx=0,dy=0,dz=0,y_rotation=90] positioned ~1 ~-1 ~ run function whimc:barrelbot/editor/edit_wand/lock_puzzle_items - -function whimc:barrelbot/editor/edit_wand/lock_puzzle_items: - execute at @s run function whimc:barrelbot/no_smuggle/define_items - scoreboard players set #raycast_length whimc.dummy 0 - particle end_rod ~ ~1 ~1 - particle end_rod ~ ~1 ~ - particle end_rod ~ ~ ~1 - particle end_rod ~ ~ ~ - particle end_rod ~1 ~1 ~1 - particle end_rod ~1 ~1 ~ - particle end_rod ~1 ~ ~1 - particle end_rod ~1 ~ ~ - playsound minecraft:entity.player.levelup block @a ~ ~ ~ 1 2 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/click.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/click.mcfunction deleted file mode 100644 index 81ac043..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/click.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/click -# Searches for something to edit when the player clicks - -scoreboard players add $global whimc.barrelbot.edit_instance_id 1 -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = $global whimc.barrelbot.edit_instance_id - -#Initial scan -scoreboard players set #raycast_length whimc.dummy 300 -scoreboard players set #success whimc.dummy 0 -scoreboard players set $out whimc.barrelbot.puzzle_id -1 -execute anchored eyes positioned ^ ^ ^1.5 run function whimc:barrelbot/editor/edit_wand/raycast - -#Do stuff if scan was successful -execute if score #success whimc.dummy matches 1 run function whimc:barrelbot/editor/edit_wand/enter_edit_mode - -#If the scan hit a puzzle button, link to that puzzle -execute unless score $out whimc.barrelbot.puzzle_id matches -1 run scoreboard players operation @s whimc.barrelbot.puzzle_id = $out whimc.barrelbot.puzzle_id \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/delete_edit_instance.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/delete_edit_instance.mcfunction deleted file mode 100644 index 1e08502..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/delete_edit_instance.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/delete_edit_instance -# Deletes an edit instance - -execute on passengers run kill @s[type=!player] - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id -kill @e[type=item_display,tag=whimc.edit_button_display,predicate=whimc:barrelbot/match_edit_id] -execute as @e[type=text_display,tag=whimc.edit_text_display,predicate=whimc:barrelbot/match_edit_id] on passengers run kill @s -kill @e[type=text_display,tag=whimc.edit_text_display,predicate=whimc:barrelbot/match_edit_id] - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/animate_button.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/animate_button.mcfunction deleted file mode 100644 index 86b2713..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/animate_button.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/animate_button -# Makes the button kinda pop into place so it doesn't look so weird - -data merge entity @s {interpolation_duration:3,start_interpolation:0} - -execute store result entity @s transformation.scale[0] float 0.001 run scoreboard players get @s whimc.barrelbot.ui.stored_scale -execute store result entity @s transformation.scale[1] float 0.001 run scoreboard players get @s whimc.barrelbot.ui.stored_scale - -#Note: scale factor 1000, divide by 2 because I'm taking the average of the 2 positions -execute store result entity @s transformation.translation[0] float 0.0005 run scoreboard players get @s whimc.barrelbot.ui.stored_x -execute store result entity @s transformation.translation[1] float 0.0005 run scoreboard players get @s whimc.barrelbot.ui.stored_y diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/button_clicked.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/button_clicked.mcfunction deleted file mode 100644 index 6ac163f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/button_clicked.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/button_clicked -# Outputs data when a button is successfully clicked - -data modify storage whimc:storage ClickedButton set from storage whimc:storage Buttons[0] -scoreboard players set $success whimc.dummy 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/barrelbot/swap_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/barrelbot/swap_mode.mcfunction deleted file mode 100644 index 83f7fef..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/barrelbot/swap_mode.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/buttons/barrelbot/swap_mode -# Swaps the barrelbot between barrel and dispenser mode - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id - -execute as @e[type=item_display,tag=whimc.barrelbot,predicate=whimc:barrelbot/match_edit_id] at @s run function whimc:barrelbot/dispenser_bot/toggle \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/close.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/close.mcfunction deleted file mode 100644 index 0d0c583..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/close.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/buttons/close -# Closes the UI - -ride @s dismount -tp @s ~ ~ ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor.mcfunction deleted file mode 100644 index fc5c407..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor -# Toggles the size editor for the currently selected puzzle - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id -execute as @e[type=text_display,limit=1,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_edit_id] on passengers at @s run function whimc:barrelbot/editor/toggle_edit_mode \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/change_page.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/change_page.mcfunction deleted file mode 100644 index 38a13d4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/change_page.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/change_page -# Swaps the page being displayed - -#Unrender previous page -function whimc:barrelbot/editor/edit_wand/edit_mode/erase_page - -#Render new page -execute on vehicle rotated as @s on passengers as @s[type=player] anchored eyes positioned ^ ^ ^1.25 run function whimc:barrelbot/editor/edit_wand/edit_mode/load_page_display with storage whimc:storage ClickedButton - -#Load new page into base -execute on vehicle run data modify entity @s item.tag.Page set from storage whimc:storage Page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/click.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/click.mcfunction deleted file mode 100644 index 2b82d29..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/click.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/click -# Interacts with the interface when the player clicks while in edit mode - -advancement revoke @s only whimc:interact/right_click_editor - -function whimc:barrelbot/editor/edit_wand/math/find_selected_button - -#If the button is clicked, run the function -execute if score $success whimc.dummy matches 1 run playsound minecraft:ui.button.click master @s ~ ~ ~ 0.3 1 -execute if score $success whimc.dummy matches 1 if data storage whimc:storage ClickedButton.command run function whimc:barrelbot/editor/edit_wand/edit_mode/execute_button_action with storage whimc:storage ClickedButton -execute if score $success whimc.dummy matches 1 if data storage whimc:storage ClickedButton.page run function whimc:barrelbot/editor/edit_wand/edit_mode/change_page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/edit_tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/edit_tick.mcfunction deleted file mode 100644 index 3fc7887..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/edit_tick.mcfunction +++ /dev/null @@ -1,42 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/edit_tick -# Does tickly updates on the player while editing - -data remove storage whimc:storage ClickedButton -function whimc:barrelbot/editor/edit_wand/math/find_selected_button -title @s actionbar {"nbt":"ClickedButton.hover_text","storage":"whimc:storage"} - -execute unless predicate whimc:barrelbot/riding_edit_instance: - tag @s remove whimc.in_edit_menu - title @s actionbar "" - execute as @e[type=item_display,tag=whimc.editor_base,predicate=!whimc:has_riding_player] run function whimc:barrelbot/editor/edit_wand/delete_edit_instance - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id -execute at @e[type=!player,predicate=whimc:barrelbot/match_edit_id,tag=whimc.edit_subject] align xyz: - def drawline(p1, p2, steps): - stepX = (p2[0] - p1[0]) / (steps - 1) - stepY = (p2[1] - p1[1]) / (steps - 1) - stepZ = (p2[2] - p1[2]) / (steps - 1) - - i = 0 - while i < steps: - x = (p1[0] + i * stepX - 0.5) * 1.05 + 0.5 - y = (p1[1] + i * stepY - 0.5) * 1.05 + 0.5 - z = (p1[2] + i * stepZ - 0.5) * 1.05 + 0.5 - particle electric_spark ~x ~y ~z 0 0 0 0 0 force @s - - i += 1 - - drawline([0, 0, 0], [0, 0, 1], 4) - drawline([0, 0, 0], [0, 1, 0], 4) - drawline([0, 0, 0], [1, 0, 0], 4) - drawline([0, 1, 1], [1, 1, 1], 4) - drawline([0, 1, 1], [0, 0, 1], 4) - drawline([0, 1, 1], [0, 1, 0], 4) - drawline([1, 1, 0], [1, 1, 1], 4) - drawline([1, 1, 0], [1, 0, 0], 4) - drawline([1, 1, 0], [0, 1, 0], 4) - drawline([1, 0, 1], [1, 0, 0], 4) - drawline([1, 0, 1], [1, 1, 1], 4) - drawline([1, 0, 1], [0, 0, 1], 4) - - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/erase_page.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/erase_page.mcfunction deleted file mode 100644 index 2c7004b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/erase_page.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/erase_page -# Wipes out the current page to make way for a new one - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id -kill @e[type=item_display,tag=whimc.edit_button_display,predicate=whimc:barrelbot/match_edit_id] -execute as @e[type=text_display,tag=whimc.edit_text_display,predicate=whimc:barrelbot/match_edit_id] on passengers run kill @s -kill @e[type=text_display,tag=whimc.edit_text_display,predicate=whimc:barrelbot/match_edit_id] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/execute_button_action.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/execute_button_action.mcfunction deleted file mode 100644 index 3a3160a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/execute_button_action.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/execute_button_action - -$$(command) \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button.mcfunction deleted file mode 100644 index f64ad80..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/find_clicked_button -# Returns which button was clicked - -#> Inputs: -# - #u_proj whimc.dummy | Coords in screen basis of the clicked spot -# - #v_proj whimc.dummy | -# -# - whimc:storage Page | Page data - -#> Outputs: -# - whimc:storage ClickedButton - -#Loop through all buttons -data modify storage whimc:storage Buttons set from storage whimc:storage Page.Buttons -execute store result score $buttons whimc.dummy if data storage whimc:storage Buttons[] -execute if score $buttons whimc.dummy matches 1.. run function whimc:barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop.mcfunction deleted file mode 100644 index 068952a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop -# Iterates through buttons to see if the clicked coordinates correspond with it - -#Get button coords into a score -execute store result score $x_min whimc.dummy run data get storage whimc:storage Buttons[0].x_min -execute store result score $x_max whimc.dummy run data get storage whimc:storage Buttons[0].x_max - -execute store result score $y_min whimc.dummy run data get storage whimc:storage Buttons[0].y_min -execute store result score $y_max whimc.dummy run data get storage whimc:storage Buttons[0].y_max - -#Perform the check -execute if score $x_min whimc.dummy <= #u_proj whimc.dummy if score $x_max whimc.dummy >= #u_proj whimc.dummy if score $y_min whimc.dummy <= #v_proj whimc.dummy if score $y_max whimc.dummy >= #v_proj whimc.dummy run function whimc:barrelbot/editor/edit_wand/edit_mode/button_clicked - -#Continue loop -data remove storage whimc:storage Buttons[0] -scoreboard players remove $buttons whimc.dummy 1 -execute if score $buttons whimc.dummy matches 1.. if score $success whimc.dummy matches 0 run function whimc:barrelbot/editor/edit_wand/edit_mode/find_clicked_button_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_button_display.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_button_display.mcfunction deleted file mode 100644 index b0665e3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_button_display.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/initialize_button_display -# Sets up the displays used for the edit wand buttons - -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id -tag @s add whimc.edit_button_display -tag @s add whimc.edit_button_display.needs_animated - -tp @s ~ ~ ~ ~ ~ -item replace entity @s container.0 with red_stained_glass_pane -data modify entity @s item merge from storage whimc:storage Buttons[0].item - -data merge entity @s {transformation:{scale:[0.0f,0.0f,0.0001f]},teleport_duration:0,interpolation_duration:0} - -#Load position and size of button into scores to be applied later -execute store result score $x whimc.dummy run data get storage whimc:storage Buttons[0].x_min -execute store result score $x2 whimc.dummy run data get storage whimc:storage Buttons[0].x_max -scoreboard players operation $scale whimc.dummy = $x2 whimc.dummy -scoreboard players operation $scale whimc.dummy -= $x whimc.dummy -scoreboard players operation $x whimc.dummy += $x2 whimc.dummy - -execute store result score $y whimc.dummy run data get storage whimc:storage Buttons[0].y_min -execute store result score $y2 whimc.dummy run data get storage whimc:storage Buttons[0].y_max -scoreboard players operation $y whimc.dummy += $y2 whimc.dummy - -scoreboard players operation @s whimc.barrelbot.ui.stored_scale = $scale whimc.dummy -scoreboard players operation @s whimc.barrelbot.ui.stored_x = $x whimc.dummy -scoreboard players operation @s whimc.barrelbot.ui.stored_y = $y whimc.dummy - -schedule function whimc:barrelbot/editor/edit_wand/edit_mode/scheduled_button_animation 2t append diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_display.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_display.mcfunction deleted file mode 100644 index d3f3460..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_display.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/initialize_text_display -# Initializes the text display - -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id -tag @s add whimc.edit_text_display - -execute facing ^ ^ ^-1 run tp @s ~ ~ ~ ~ ~ -data modify entity @s {} merge from storage whimc:storage Text[0].data - -execute if data storage whimc:storage Text[0].text_provider run function whimc:barrelbot/editor/edit_wand/edit_mode/text_provider_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_provider.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_provider.mcfunction deleted file mode 100644 index 97072eb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/initialize_text_provider.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/initialize_text_provider -# Initializes a text provider storage - -data modify entity @s data.text set from storage whimc:storage Text[0].text_provider -tag @s remove whimc.text_provider_storage.init \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_button_display_loop.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_button_display_loop.mcfunction deleted file mode 100644 index bd1cbb8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_button_display_loop.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/load_button_display_loop -# Loops through all the buttons and generates item displays for them - -execute summon item_display run function whimc:barrelbot/editor/edit_wand/edit_mode/initialize_button_display - - -#Continue loop -data remove storage whimc:storage Buttons[0] -scoreboard players remove $buttons whimc.dummy 1 -execute if score $buttons whimc.dummy matches 1.. run function whimc:barrelbot/editor/edit_wand/edit_mode/load_button_display_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_page_display.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_page_display.mcfunction deleted file mode 100644 index 1443cda..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_page_display.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/load_page_display -# Loads all the display entities for a page - -#Load from storage based on key -data modify storage whimc:storage Page set value {} -$data modify storage whimc:storage Page set from storage whimc:const WandPages[{key:"$(page)"}] - -#Loop through all buttons -data modify storage whimc:storage Buttons set from storage whimc:storage Page.Buttons -execute store result score $buttons whimc.dummy if data storage whimc:storage Buttons[] -execute if score $buttons whimc.dummy matches 1.. run function whimc:barrelbot/editor/edit_wand/edit_mode/load_button_display_loop - -#Loop through all text displays -data modify storage whimc:storage Text set from storage whimc:storage Page.Text -execute store result score $displays whimc.dummy if data storage whimc:storage Text[] -execute if score $displays whimc.dummy matches 1.. run function whimc:barrelbot/editor/edit_wand/edit_mode/load_text_display_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_text_display_loop.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_text_display_loop.mcfunction deleted file mode 100644 index 71c3414..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/load_text_display_loop.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/load_text_display_loop -# Loops through all the text displays on a page - -execute summon text_display run function whimc:barrelbot/editor/edit_wand/edit_mode/initialize_text_display - - -#Continue loop -data remove storage whimc:storage Text[0] -scoreboard players remove $displays whimc.dummy 1 -execute if score $displays whimc.dummy matches 1.. run function whimc:barrelbot/editor/edit_wand/edit_mode/load_button_display_loop \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/__template.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/__template.mcfunction deleted file mode 100644 index 2daa192..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/__template.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/pages/__template -data modify storage whimc:storage Page set value {Buttons:[],Text:[]} - -#ID -data modify storage whimc:storage Page.key set value "" - -#Buttons -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:lime_stained_glass"},x_min:-100,x_max:100,y_min:-100,y_max:100,command:"say This is a command!"} - -#Close button -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:barrier",tag:{CustomModelData:129999}},x_min:-125,x_max:125,y_min:-875,y_max:-625,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/close"} - -#Text -data modify storage whimc:storage Page.Text append value {data:{transformation:{translation:[0.0f,0.0f,0.0f],scale:[1.0f,1.0f,1.0f]}},text_provider:'{"text":"Hello world!","color":"green"}'} - -#Append to storage -data modify storage whimc:const WandPages append from storage whimc:storage Page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/barrelbot.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/barrelbot.mcfunction deleted file mode 100644 index dfcbe14..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/barrelbot.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/pages/barrelbot -data modify storage whimc:storage Page set value {Buttons:[],Text:[]} - -#ID -data modify storage whimc:storage Page.key set value "barrelbot" - -#Buttons -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:barrier",tag:{CustomModelData:130000}},x_min:-250,x_max:250,y_min:-600,y_max:-100,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/barrelbot/swap_mode"} - -#Close button -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:barrier",tag:{CustomModelData:129999}},x_min:-125,x_max:125,y_min:-875,y_max:-625,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/close"} - -#Text -#data modify storage whimc:storage Page.Text append value {data:{transformation:{translation:[0.0f,0.0f,0.0f],scale:[1.0f,1.0f,1.0f]}},text_provider:'{"text":"Hello world!","color":"green"}'} - -#Append to storage -data modify storage whimc:const WandPages append from storage whimc:storage Page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle.mcfunction deleted file mode 100644 index 6e76c18..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/pages/puzzle -data modify storage whimc:storage Page set value {Buttons:[],Text:[]} - -#ID -data modify storage whimc:storage Page.key set value "puzzle" - -#Buttons -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:yellow_stained_glass"},x_min:-250,x_max:250,y_min:-600,y_max:-100,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor"} -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:orange_stained_glass"},x_min:-800,x_max:-300,y_min:-600,y_max:-100,command:"function whimc:barrelbot/dev/propagate_changes"} - -#Close button -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:barrier",tag:{CustomModelData:129999}},x_min:-125,x_max:125,y_min:-875,y_max:-625,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/close"} - -#Text -#data modify storage whimc:storage Page.Text append value {data:{transformation:{translation:[0.0f,0.0f,0.0f],scale:[1.0f,1.0f,1.0f]}},text_provider:'{"text":"Hello world!","color":"green"}'} - -#Append to storage -data modify storage whimc:const WandPages append from storage whimc:storage Page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle_temp.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle_temp.mcfunction deleted file mode 100644 index 0f64a39..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/puzzle_temp.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/pages/puzzle -data modify storage whimc:storage Page set value {Buttons:[],Text:[]} - -#ID -data modify storage whimc:storage Page.key set value "puzzle" - -#Buttons -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:yellow_stained_glass"},x_min:-250,x_max:250,y_min:-600,y_max:-100,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/puzzle/toggle_size_editor"} -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:orange_stained_glass"},x_min:-800,x_max:-300,y_min:-600,y_max:-100,command:"function whimc:barrelbot/dev/propagate_changes"} - -#Close button -data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:barrier",tag:{CustomModelData:129999}},x_min:-125,x_max:125,y_min:-875,y_max:-625,command:"function whimc:barrelbot/editor/edit_wand/edit_mode/buttons/close"} - -#Text -#data modify storage whimc:storage Page.Text append value {data:{transformation:{translation:[0.0f,0.0f,0.0f],scale:[1.0f,1.0f,1.0f]}},text_provider:'{"text":"Hello world!","color":"green"}'} diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/register_pages.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/register_pages.mcfunction deleted file mode 100644 index f64519d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/pages/register_pages.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/pages/register_pages -# Loads all UI pages into storage - -data modify storage whimc:const WandPages set value [] - -function whimc:barrelbot/editor/edit_wand/edit_mode/pages/barrelbot -function whimc:barrelbot/editor/edit_wand/edit_mode/pages/puzzle \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text.mcfunction deleted file mode 100644 index 69f4d2d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/refresh_text -# Refreshes all linked text displays - -#Can be called either from player or root entity - -scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id - -execute as @e[type=text_display,tag=whimc.edit_text_display,predicate=whimc:barrelbot/match_edit_id]: - data modify storage whimc:storage text set value "" - execute on passengers run data modify storage whimc:storage text set from entity @s data.text - data modify entity @s text set from storage whimc:storage text \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text_display.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text_display.mcfunction deleted file mode 100644 index 0f44c84..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/refresh_text_display.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/refresh_text_display -# Refreshes an individual text display - -data modify storage whimc:storage text set value "" -execute on passengers run data modify storage whimc:storage text set from entity @s data.text -data modify entity @s text set from storage whimc:storage text \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/scheduled_button_animation.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/scheduled_button_animation.mcfunction deleted file mode 100644 index b09ca29..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/scheduled_button_animation.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/scheduled_button_animation -# Animates the buttons all cool-like - -execute as @e[type=item_display,tag=whimc.edit_button_display.needs_animated] run function whimc:barrelbot/editor/edit_wand/edit_mode/animate_button \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/text_provider_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/text_provider_setup.mcfunction deleted file mode 100644 index 6e9a9c3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/edit_mode/text_provider_setup.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/edit_mode/text_provider_setup -# Sets up the text provider marker for dynamic displays - -data modify entity @s text set from storage whimc:storage Text[0].text_provider - -#Spawn text provider storage -summon marker ~ ~ ~ {Tags:["whimc.text_provider_storage","whimc.text_provider_storage.init"]} -ride @e[type=marker,tag=whimc.text_provider_storage.init,limit=1] mount @s - -execute on passengers run function whimc:barrelbot/editor/edit_wand/edit_mode/initialize_text_provider \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/enter_edit_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/enter_edit_mode.mcfunction deleted file mode 100644 index 45feddf..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/enter_edit_mode.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/enter_edit_mode -# Puts the player into edit mode (invisible chair that edits things) - -#Getting basis vectors for projection calculations (THIS IS SO COOL IM ACTUALLY USING THE MATH IM LEARNING) -#IM LITERALLY SO EXCITED RIGHT NOW -function whimc:barrelbot/editor/edit_wand/math/get_plane_basis - -#Set up displays -execute anchored eyes positioned ^ ^ ^1.25 run function whimc:barrelbot/editor/edit_wand/edit_mode/load_page_display with storage whimc:macro page - -#Chair stuff -ride @s dismount - -summon item_display ~ ~0.6 ~ {Tags:["whimc.editor_base","whimc.editor_base.init"],Passengers:[{id:"minecraft:interaction",Tags:["whimc.editor_click"],width:0.01f,height:1.15f}]} -ride @s mount @e[type=item_display,tag=whimc.editor_base.init,limit=1,sort=nearest] -execute on vehicle run function whimc:barrelbot/editor/edit_wand/setup_base - -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id - -tag @s add whimc.in_edit_menu \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/function_found.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/function_found.mcfunction deleted file mode 100644 index 6f26d7f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/function_found.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/barrelbot_found -# Returns that a barrelbot was found by the scan - -scoreboard players set #success whimc.dummy 1 - -data remove storage whimc:macro page -data modify storage whimc:macro page.page set value "function" -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id - -tag @s add whimc.edit_subject \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/dot_product.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/dot_product.mcfunction deleted file mode 100644 index f80cbcc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/dot_product.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/math/dot_product -# Takes the dot product of two vectors - -#> Inputs: -# Scale factor 1000 -# -# - #dot.x1 whimc.dummy | -# - #dot.y1 whimc.dummy | First input vector -# - #dot.z1 whimc.dummy | -# -# - #dot.x2 whimc.dummy | -# - #dot.y2 whimc.dummy | Second input vector -# - #dot.z2 whimc.dummy | - -#> Outputs: -# Scale factor 1000 -# -# - #dot.out whimc.dummy - - -scoreboard players operation #dot.out whimc.dummy = #dot.x1 whimc.dummy -scoreboard players operation #dot.out whimc.dummy *= #dot.x2 whimc.dummy - -scoreboard players operation #dot.temp whimc.dummy = #dot.y1 whimc.dummy -scoreboard players operation #dot.temp whimc.dummy *= #dot.y2 whimc.dummy -scoreboard players operation #dot.out whimc.dummy += #dot.temp whimc.dummy - -scoreboard players operation #dot.temp whimc.dummy = #dot.z1 whimc.dummy -scoreboard players operation #dot.temp whimc.dummy *= #dot.z2 whimc.dummy -scoreboard players operation #dot.out whimc.dummy += #dot.temp whimc.dummy - -scoreboard players operation #dot.out whimc.dummy /= #1000 whimc.const \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/find_selected_button.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/find_selected_button.mcfunction deleted file mode 100644 index 9eb107d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/find_selected_button.mcfunction +++ /dev/null @@ -1,29 +0,0 @@ -#> find_selected_button -# Returns the data of the button that is currently being looked at - -#> Outputs: -# - whimc:storage ClickedButton - -#Get looking vector -execute positioned 0.0 0.0 0.0 positioned ^ ^ ^1 summon marker run function whimc:barrelbot/editor/edit_wand/math/get_vec -execute store result score #lookvec.x whimc.dummy run data get storage whimc:storage Pos[0] 1000 -execute store result score #lookvec.y whimc.dummy run data get storage whimc:storage Pos[1] 1000 -execute store result score #lookvec.z whimc.dummy run data get storage whimc:storage Pos[2] 1000 - -#Find point where player's eyes meet the "screen" using cool math stuff -scoreboard players operation #intersection.basis.x whimc.dummy = @s whimc.math.ux -scoreboard players operation #intersection.basis.y whimc.dummy = @s whimc.math.uy -scoreboard players operation #intersection.basis.z whimc.dummy = @s whimc.math.uz -function whimc:barrelbot/editor/edit_wand/math/get_intersection -scoreboard players operation #u_proj whimc.dummy = #intersection.out whimc.dummy - -scoreboard players operation #intersection.basis.x whimc.dummy = @s whimc.math.vx -scoreboard players operation #intersection.basis.y whimc.dummy = @s whimc.math.vy -scoreboard players operation #intersection.basis.z whimc.dummy = @s whimc.math.vz -function whimc:barrelbot/editor/edit_wand/math/get_intersection -scoreboard players operation #v_proj whimc.dummy = #intersection.out whimc.dummy - -#Iterate through all buttons, see which one was pressed -execute on vehicle run data modify storage whimc:storage Page set from entity @s item.tag.Page -scoreboard players set $success whimc.dummy 0 -function whimc:barrelbot/editor/edit_wand/edit_mode/find_clicked_button \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_intersection.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_intersection.mcfunction deleted file mode 100644 index bf5dfd9..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_intersection.mcfunction +++ /dev/null @@ -1,30 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/math/get_intersection -# Finds where a raycast from the player's eyes intersects with an invisible "screen" in front of the player - -#Find projection of looking vector onto interface plane, scaled by distance (This is the coolest commment I have ever written) -# 1. Take dot product of looking vector and u hat -# 2. Multiply by constant distance D -# 3. Take dot product of looking vector and w hat -# 4. Divide product from step 2 by product from step 3 -# 5. Repeat these steps but with v hat instead of u hat - -#l dot u -scoreboard players operation #dot.x1 whimc.dummy = #lookvec.x whimc.dummy -scoreboard players operation #dot.y1 whimc.dummy = #lookvec.y whimc.dummy -scoreboard players operation #dot.z1 whimc.dummy = #lookvec.z whimc.dummy -scoreboard players operation #dot.x2 whimc.dummy = #intersection.basis.x whimc.dummy -scoreboard players operation #dot.y2 whimc.dummy = #intersection.basis.y whimc.dummy -scoreboard players operation #dot.z2 whimc.dummy = #intersection.basis.z whimc.dummy -function whimc:barrelbot/editor/edit_wand/math/dot_product -scoreboard players operation #intersection.out whimc.dummy = #dot.out whimc.dummy - -#multiply by D -scoreboard players operation #intersection.out whimc.dummy *= #EDITOR_DISPLAY_DISTANCE whimc.const - -#l dot w -scoreboard players operation #dot.x2 whimc.dummy = @s whimc.math.wx -scoreboard players operation #dot.y2 whimc.dummy = @s whimc.math.wy -scoreboard players operation #dot.z2 whimc.dummy = @s whimc.math.wz -function whimc:barrelbot/editor/edit_wand/math/dot_product - -scoreboard players operation #intersection.out whimc.dummy /= #dot.out whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_plane_basis.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_plane_basis.mcfunction deleted file mode 100644 index c4bdfa5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_plane_basis.mcfunction +++ /dev/null @@ -1,22 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/math/get_plane_basis -# Outputs a basis of the plane that the puzzle icons lie on - -#> Outputs -# - @s whimc.math.u | Horizontal basis vector -# - @s whimc.math.v | Vertical basis vector - -execute positioned 0.0 0.0 0.0 positioned ^1 ^ ^ summon marker run function whimc:barrelbot/editor/edit_wand/math/get_vec -execute store result score @s whimc.math.ux run data get storage whimc:storage Pos[0] 1000 -execute store result score @s whimc.math.uy run data get storage whimc:storage Pos[1] 1000 -execute store result score @s whimc.math.uz run data get storage whimc:storage Pos[2] 1000 - -execute positioned 0.0 0.0 0.0 positioned ^ ^1 ^ summon marker run function whimc:barrelbot/editor/edit_wand/math/get_vec -execute store result score @s whimc.math.vx run data get storage whimc:storage Pos[0] 1000 -execute store result score @s whimc.math.vy run data get storage whimc:storage Pos[1] 1000 -execute store result score @s whimc.math.vz run data get storage whimc:storage Pos[2] 1000 - -#This is used for some projection math later on, not part of the plane basis (though it is normal to it) -execute positioned 0.0 0.0 0.0 positioned ^ ^ ^1 summon marker run function whimc:barrelbot/editor/edit_wand/math/get_vec -execute store result score @s whimc.math.wx run data get storage whimc:storage Pos[0] 1000 -execute store result score @s whimc.math.wy run data get storage whimc:storage Pos[1] 1000 -execute store result score @s whimc.math.wz run data get storage whimc:storage Pos[2] 1000 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_vec.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_vec.mcfunction deleted file mode 100644 index 2cb997e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/math/get_vec.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/math/get_vec -# Returns the position of the marker executing the function - -data modify storage whimc:storage Pos set from entity @s Pos - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/puzzle_button_found.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/puzzle_button_found.mcfunction deleted file mode 100644 index 9e4dd10..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/puzzle_button_found.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/puzzle_button_found - -scoreboard players set #success whimc.dummy 1 - -data remove storage whimc:macro page -data modify storage whimc:macro page.page set value "puzzle" -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id -execute on passengers run scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id - -scoreboard players operation $out whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -tag @s add whimc.edit_subject \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast.mcfunction deleted file mode 100644 index 99fa76d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/raycast -# Recursively searches for an editable thing - -particle electric_spark ^ ^-0.1 ^ -particle dust 0.906 0.863 0.471 0.6 ^ ^-0.1 ^ 0.1 0.1 0.1 0 1 force - -execute align xyz run function whimc:barrelbot/editor/edit_wand/raycast_check - -scoreboard players remove #raycast_length whimc.dummy 1 -execute if score #raycast_length whimc.dummy matches 1.. if score #success whimc.dummy matches 0 positioned ^ ^ ^0.2 run function whimc:barrelbot/editor/edit_wand/raycast \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast_check.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast_check.mcfunction deleted file mode 100644 index a82c402..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/raycast_check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/raycast_check -# Checks the current block, whether it is something that should be scanned - -execute if block ~ ~ ~ #whimc:barrelbot as @e[type=item_display,tag=whimc.barrelbot,dx=0,dy=0,dz=0,limit=1] run function whimc:barrelbot/editor/edit_wand/barrelbot_found -execute if block ~ ~ ~ #minecraft:buttons as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,dx=0,dy=0,dz=0,limit=1] run function whimc:barrelbot/editor/edit_wand/puzzle_button_found -execute if block ~ ~ ~ #minecraft:shulker_boxes as @e[type=marker,tag=whimc.barrelbot.function,dx=0,dy=0,dz=0,limit=1] run function whimc:barrelbot/editor/edit_wand/function_found -execute if block ~ ~ ~ minecraft:yellow_shulker_box run function whimc:barrelbot/editor/edit_wand/check_if_puzzle_storage \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/setup_base.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/setup_base.mcfunction deleted file mode 100644 index 0fa3356..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/edit_wand/setup_base.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/edit_wand/setup_base -# Sets up the root entity for an editing instance - -execute positioned as @s run tp @s ~ ~ ~ ~ ~ - -tag @s remove whimc.editor_base.init -scoreboard players operation @s whimc.barrelbot.edit_instance_id = $temp whimc.barrelbot.edit_instance_id - -data merge entity @s {transformation:{scale:[0f,0f,0f]},item:{id:"minecraft:stone_button",Count:1b}} -data modify entity @s item.tag.Page set from storage whimc:storage Page \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/enable_edit_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/enable_edit_mode.mcfunction deleted file mode 100644 index 8247d95..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/enable_edit_mode.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/editor/enable_edit_mode -# Enables edit mode for the puzzle - -tag @s add whimc.edit_mode - -data modify storage whimc:storage data set from entity @s data.bounding_box -execute store result score $min_x whimc.dummy run data get storage whimc:storage data.min_x -execute store result score $min_y whimc.dummy run data get storage whimc:storage data.min_y -execute store result score $min_z whimc.dummy run data get storage whimc:storage data.min_z - -execute store result score $max_x whimc.dummy run data get storage whimc:storage data.max_x -execute store result score $max_y whimc.dummy run data get storage whimc:storage data.max_y -execute store result score $max_z whimc.dummy run data get storage whimc:storage data.max_z - -function whimc:barrelbot/editor/outline/spawn - -#Spawn interactions -function whimc:barrelbot/editor/drag/spawn_drag_nodes with storage whimc:storage data \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust.mcfunction deleted file mode 100644 index 6d610d3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust.mcfunction +++ /dev/null @@ -1,46 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust -# Adjusts the linked displays to the current inputs - -#> INPUTS -# $min_x whimc.dummy | -# $min_y whimc.dummy | Minimum coordinate for the box -# $min_z whimc.dummy | -# -# $max_x whimc.dummy | -# $max_y whimc.dummy | Maximum coordinate for the box -# $max_z whimc.dummy | -# -# $temp whimc.barrelbot.puzzle_id - -scoreboard players operation $real_min_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_min_x whimc.dummy < $max_x whimc.dummy -scoreboard players operation $real_min_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_min_y whimc.dummy < $max_y whimc.dummy -scoreboard players operation $real_min_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_min_z whimc.dummy < $max_z whimc.dummy - -scoreboard players operation $real_max_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_max_x whimc.dummy > $max_x whimc.dummy -scoreboard players operation $real_max_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_max_y whimc.dummy > $max_y whimc.dummy -scoreboard players operation $real_max_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_max_z whimc.dummy > $max_z whimc.dummy - -#Get position into storage -execute store result storage whimc:macro Pos.min_x int 1 run scoreboard players get $real_min_x whimc.dummy -execute store result storage whimc:macro Pos.min_y int 1 run scoreboard players get $real_min_y whimc.dummy -execute store result storage whimc:macro Pos.min_z int 1 run scoreboard players get $real_min_z whimc.dummy - -#Get dimensions -scoreboard players operation $size_x whimc.dummy = $real_max_x whimc.dummy -scoreboard players operation $size_y whimc.dummy = $real_max_y whimc.dummy -scoreboard players operation $size_z whimc.dummy = $real_max_z whimc.dummy -scoreboard players operation $size_x whimc.dummy -= $real_min_x whimc.dummy -scoreboard players operation $size_y whimc.dummy -= $real_min_y whimc.dummy -scoreboard players operation $size_z whimc.dummy -= $real_min_z whimc.dummy - -scoreboard players add $size_x whimc.dummy 1 -scoreboard players add $size_y whimc.dummy 1 -scoreboard players add $size_z whimc.dummy 1 - -execute as @e[type=text_display,tag=whimc.editor_outline,predicate=whimc:barrelbot/match_id] run function whimc:barrelbot/editor/outline/adjust/position_adjust with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_x.mcfunction deleted file mode 100644 index 3eacb78..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_x.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_max_x - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_y.mcfunction deleted file mode 100644 index b7fbdc1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_y.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_max_y - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[1] float 1 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_z.mcfunction deleted file mode 100644 index 6d3a241..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_max_z.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_max_z - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_x.mcfunction deleted file mode 100644 index 6ef638a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_x.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_min_x - -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_y.mcfunction deleted file mode 100644 index 0b38c0d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_y.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_min_y - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_z.mcfunction deleted file mode 100644 index f24c936..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/inverted_min_z.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/inverted_min_z - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/main.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/main.mcfunction deleted file mode 100644 index 9b5674d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/main.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/main -# Adjusts all of the text displays - - -tp @s ~ ~ ~ - -execute as @s[tag=whimc.editor_outline.max_x] run function whimc:barrelbot/editor/outline/adjust/max_x -execute as @s[tag=whimc.editor_outline.max_y] run function whimc:barrelbot/editor/outline/adjust/max_y -execute as @s[tag=whimc.editor_outline.max_z] run function whimc:barrelbot/editor/outline/adjust/max_z -execute as @s[tag=whimc.editor_outline.min_x] run function whimc:barrelbot/editor/outline/adjust/min_x -execute as @s[tag=whimc.editor_outline.min_y] run function whimc:barrelbot/editor/outline/adjust/min_y -execute as @s[tag=whimc.editor_outline.min_z] run function whimc:barrelbot/editor/outline/adjust/min_z - -execute as @s[tag=whimc.editor_outline.inverted_max_x] run function whimc:barrelbot/editor/outline/adjust/inverted_max_x -execute as @s[tag=whimc.editor_outline.inverted_max_y] run function whimc:barrelbot/editor/outline/adjust/inverted_max_y -execute as @s[tag=whimc.editor_outline.inverted_max_z] run function whimc:barrelbot/editor/outline/adjust/inverted_max_z -execute as @s[tag=whimc.editor_outline.inverted_min_x] run function whimc:barrelbot/editor/outline/adjust/inverted_min_x -execute as @s[tag=whimc.editor_outline.inverted_min_y] run function whimc:barrelbot/editor/outline/adjust/inverted_min_y -execute as @s[tag=whimc.editor_outline.inverted_min_z] run function whimc:barrelbot/editor/outline/adjust/inverted_min_z \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_x.mcfunction deleted file mode 100644 index f2e8dfd..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_x.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/max_x - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_y.mcfunction deleted file mode 100644 index 2f14f47..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_y.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/max_y - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[1] float 1 run scoreboard players get $size_y whimc.dummy -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_z.mcfunction deleted file mode 100644 index ef00e00..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/max_z.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/max_z - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_x.mcfunction deleted file mode 100644 index f72491c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_x.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/min_x - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_y.mcfunction deleted file mode 100644 index 48cde17..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_y.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/min_y - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_z.mcfunction deleted file mode 100644 index dd2e843..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/min_z.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/min_z - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/position_adjust.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/position_adjust.mcfunction deleted file mode 100644 index fb67e7c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/adjust/position_adjust.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/outline/adjust/position_adjust -# Moves execution to the lowest corner - -$execute positioned $(min_x).0 $(min_y).0 $(min_z).0 run function whimc:barrelbot/editor/outline/adjust/main \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/delete.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/delete.mcfunction deleted file mode 100644 index 9e83043..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/delete.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/editor/outline/delete -# Deletes the linked outline - -kill @e[type=text_display,tag=whimc.editor_outline,predicate=whimc:barrelbot/match_id] -kill @e[type=interaction,tag=whimc.editor_node,predicate=whimc:barrelbot/match_id] -kill @e[type=item_display,tag=whimc.node_display,predicate=whimc:barrelbot/match_id] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/position_lowest_corner.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/position_lowest_corner.mcfunction deleted file mode 100644 index 4a90d22..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/position_lowest_corner.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/outline/position_lowest_corner -# Moves execution to the lowest corner - -$execute positioned $(min_x).0 $(min_y).0 $(min_z).0 run function whimc:barrelbot/editor/outline/summon_displays \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn.mcfunction deleted file mode 100644 index 1e8b135..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn.mcfunction +++ /dev/null @@ -1,47 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn -# Spawns an outline given a size - -#> INPUTS -# $min_x whimc.dummy | -# $min_y whimc.dummy | Minimum coordinate for the box -# $min_z whimc.dummy | -# -# $max_x whimc.dummy | -# $max_y whimc.dummy | Maximum coordinate for the box -# $max_z whimc.dummy | -# -# $temp whimc.barrelbot.puzzle_id - -scoreboard players operation $real_min_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_min_x whimc.dummy < $max_x whimc.dummy -scoreboard players operation $real_min_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_min_y whimc.dummy < $max_y whimc.dummy -scoreboard players operation $real_min_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_min_z whimc.dummy < $max_z whimc.dummy - -scoreboard players operation $real_max_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_max_x whimc.dummy > $max_x whimc.dummy -scoreboard players operation $real_max_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_max_y whimc.dummy > $max_y whimc.dummy -scoreboard players operation $real_max_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_max_z whimc.dummy > $max_z whimc.dummy - -#Get position into storage -execute store result storage whimc:macro Pos.min_x int 1 run scoreboard players get $real_min_x whimc.dummy -execute store result storage whimc:macro Pos.min_y int 1 run scoreboard players get $real_min_y whimc.dummy -execute store result storage whimc:macro Pos.min_z int 1 run scoreboard players get $real_min_z whimc.dummy - -#Get dimensions -scoreboard players operation $size_x whimc.dummy = $real_max_x whimc.dummy -scoreboard players operation $size_y whimc.dummy = $real_max_y whimc.dummy -scoreboard players operation $size_z whimc.dummy = $real_max_z whimc.dummy -scoreboard players operation $size_x whimc.dummy -= $real_min_x whimc.dummy -scoreboard players operation $size_y whimc.dummy -= $real_min_y whimc.dummy -scoreboard players operation $size_z whimc.dummy -= $real_min_z whimc.dummy - -scoreboard players add $size_x whimc.dummy 1 -scoreboard players add $size_y whimc.dummy 1 -scoreboard players add $size_z whimc.dummy 1 - -#Summon all the item displays -function whimc:barrelbot/editor/outline/position_lowest_corner with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_x.mcfunction deleted file mode 100644 index 2faad71..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_x.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_max_x - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_max_x -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[0.0f,1.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_y.mcfunction deleted file mode 100644 index c62fb71..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_y.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_max_y - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_max_y -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[1.0f,0.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[1] float 1 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_z.mcfunction deleted file mode 100644 index 5f4be16..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_max_z.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_max_z - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_max_z -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_x.mcfunction deleted file mode 100644 index fda3b9d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_x.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_min_x - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_min_x -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[0.0f,1.0f,0.0f]}}} - -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_y.mcfunction deleted file mode 100644 index 4d205fa..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_y.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_min_y - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_min_y -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[1.0f,0.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_z.mcfunction deleted file mode 100644 index 8324137..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/inverted_min_z.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/inverted_min_z - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.inverted_min_z -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304} - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_x.mcfunction deleted file mode 100644 index a510112..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_x.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/max_x - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.max_x -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[0.0f,1.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_y.mcfunction deleted file mode 100644 index 090aaa4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_y.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/max_y - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.max_y -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[1.0f,0.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy - -execute store result entity @s transformation.translation[1] float 1 run scoreboard players get $size_y whimc.dummy -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_z.mcfunction deleted file mode 100644 index 85140a3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/max_z.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/max_z - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.max_z -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304} - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[2] float 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_x.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_x.mcfunction deleted file mode 100644 index 7514dc4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_x.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/min_x - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.min_x -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[0.0f,1.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_z whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_y.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_y.mcfunction deleted file mode 100644 index 4c5df01..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_y.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/min_y - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.min_y -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304,transformation:{left_rotation:{angle:1.570796326f,axis:[1.0f,0.0f,0.0f]}}} - -execute store result entity @s transformation.scale[0] float 40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_z.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_z.mcfunction deleted file mode 100644 index cabd37e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/spawn/min_z.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/editor/outline/spawn/min_z - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -tag @s add whimc.editor_outline -tag @s add whimc.editor_outline.min_z -data merge entity @s {see_through:1b,brightness:{sky:15,block:15},background:855618304} - -execute store result entity @s transformation.scale[0] float -40 run scoreboard players get $size_x whimc.dummy -execute store result entity @s transformation.scale[1] float 40 run scoreboard players get $size_y whimc.dummy - -execute store result entity @s transformation.translation[0] float 1 run scoreboard players get $size_x whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/summon_displays.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/summon_displays.mcfunction deleted file mode 100644 index f9064db..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/outline/summon_displays.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/editor/outline/summon_displays -# Summons and sets up the individual item displays - -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/min_x -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/min_y -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/min_z -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/max_x -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/max_y -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/max_z - - -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_min_x -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_min_y -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_min_z -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_max_x -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_max_y -execute summon text_display run function whimc:barrelbot/editor/outline/spawn/inverted_max_z \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max.mcfunction deleted file mode 100644 index 6dc4634..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/set_max -# Sets the minimum coordinate of a bounding box - -execute summon marker run function whimc:barrelbot/editor/set_max_marker \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max_marker.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max_marker.mcfunction deleted file mode 100644 index 884b614..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_max_marker.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/editor/set_max_marker - -data modify storage whimc:storage Pos set from entity @s Pos - -execute store result score $max_x whimc.dummy run data get storage whimc:storage Pos[0] -execute store result score $max_y whimc.dummy run data get storage whimc:storage Pos[1] -execute store result score $max_z whimc.dummy run data get storage whimc:storage Pos[2] - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min.mcfunction deleted file mode 100644 index 5741b13..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/editor/set_min -# Sets the minimum coordinate of a bounding box - -execute summon marker run function whimc:barrelbot/editor/set_min_marker \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min_marker.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min_marker.mcfunction deleted file mode 100644 index 85b7a24..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/set_min_marker.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/editor/set_min_marker - -data modify storage whimc:storage Pos set from entity @s Pos - -execute store result score $min_x whimc.dummy run data get storage whimc:storage Pos[0] -execute store result score $min_y whimc.dummy run data get storage whimc:storage Pos[1] -execute store result score $min_z whimc.dummy run data get storage whimc:storage Pos[2] - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/toggle_edit_mode.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/toggle_edit_mode.mcfunction deleted file mode 100644 index f1a4cbe..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/editor/toggle_edit_mode.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/editor/toggle_edit_mode -# Toggles the puzzle between edit mode and normal mode - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute store result score $in_edit_mode whimc.dummy if entity @s[tag=whimc.edit_mode] - -execute if score $in_edit_mode whimc.dummy matches 0 run function whimc:barrelbot/editor/enable_edit_mode -execute if score $in_edit_mode whimc.dummy matches 1 run function whimc:barrelbot/editor/disable_edit_mode \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/check_step_out.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/check_step_out.mcfunction deleted file mode 100644 index 35dfb8c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/check_step_out.mcfunction +++ /dev/null @@ -1,23 +0,0 @@ -#> whimc:barrelbot/functions/check_step_out -# Checks if the function execution needs to exit the current context - -scoreboard players set $step_out whimc.dummy 0 - -#Determine how to iterate forward depending on whether currently in a loop -# 0 = Function -# 1 = Loop -# 2 = If statement -scoreboard players set $step_type whimc.dummy 0 -execute if data storage whimc:storage marker_data.stack[-1].loop run scoreboard players set $step_type whimc.dummy 1 -execute if data storage whimc:storage marker_data.stack[-1].if run scoreboard players set $step_type whimc.dummy 2 - -#Check step condition depending on type -execute if score $step_type whimc.dummy matches 0 run function whimc:barrelbot/instructions/function/check_step_out -execute if score $step_type whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/check_step_out -execute if score $step_type whimc.dummy matches 2 run function whimc:barrelbot/instructions/if/check_step_out - - - - -#If a function was stepped out of, check to see if it needs to be done again -execute if score $step_out whimc.dummy matches 1 run function whimc:barrelbot/functions/check_step_out \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/delete.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/delete.mcfunction deleted file mode 100644 index d7a49be..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/delete.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/functions/delete -# Deletes a function - -setblock ~ ~ ~ air -execute positioned ~ ~1 ~ as @e[type=item_display,tag=whimc.function_display,limit=1,sort=nearest,distance=..0.1] run kill @s -execute positioned ~ ~0.75 ~ as @e[type=interaction,tag=whimc.barrelbot.function_interaction,limit=1,sort=nearest,distance=..0.1] run kill @s -execute positioned ~ ~1.35 ~ as @e[type=text_display,tag=whimc.barrelbot.function_text,limit=1,sort=nearest,distance=..0.1] run kill @s -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/check_match.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/check_match.mcfunction deleted file mode 100644 index cbcaaac..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/check_match.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/functions/interact/check_match -# Checks to see if this interaction was clicked by the player - -scoreboard players set #match_found whimc.dummy 0 -execute on target if entity @s[tag=whimc.clicker] run scoreboard players set #match_found whimc.dummy 1 - -execute if score #match_found whimc.dummy matches 1 run data remove entity @s interaction -execute if score #match_found whimc.dummy matches 1 at @s positioned ~ ~0.25 ~ as @e[type=item_display,tag=whimc.function_display,distance=..0.001] at @s run function whimc:barrelbot/functions/interact/swap_item \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/lock.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/lock.mcfunction deleted file mode 100644 index 7b2abbc..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/lock.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/functions/interact/lock -# Locks a function's item display so the linked item can't be changed - - - -execute store result score $locked whimc.dummy if entity @s[tag=whimc.function_display.locked] -execute if score $locked whimc.dummy matches 1 run tag @s remove whimc.function_display.locked -execute if score $locked whimc.dummy matches 0 run tag @s add whimc.function_display.locked - -execute if score $locked whimc.dummy matches 1 run particle wax_off ~ ~ ~ 0.3 0.3 0.3 0 10 normal -execute if score $locked whimc.dummy matches 0 run particle wax_on ~ ~ ~ 0.3 0.3 0.3 0 10 normal \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/right_click.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/right_click.mcfunction deleted file mode 100644 index ae727b0..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/right_click.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> whimc:barrelbot/functions/interact/right_click -# Run when a player right clicks a function item - -advancement revoke @s only whimc:interact/right_click_function - -data modify storage whimc:storage item set value {} -data modify storage whimc:storage item set from entity @s SelectedItem -data modify storage whimc:storage item.tag.Enchantments set value [{}] - -execute if data storage whimc:storage item.tag.barrelbot.instruction unless data storage whimc:storage {item:{tag:{barrelbot:{instruction:"function"}}}} run tellraw @s {"text": "This instruction already does something! Try a different item instead!","color":"red"} -execute if data storage whimc:storage item.tag.barrelbot.instruction unless data storage whimc:storage {item:{tag:{barrelbot:{instruction:"function"}}}} run return 0 - -execute unless data storage whimc:storage item.tag.display.Name unless data storage whimc:storage {item:{id:"minecraft:honeycomb"}} if data storage whimc:storage item.id run tellraw @s {"text":"Try giving this item a name with an anvil before linking it!","color":"red"} -execute unless data storage whimc:storage item.tag.display.Name unless data storage whimc:storage {item:{id:"minecraft:honeycomb"}} if data storage whimc:storage item.id run return 0 - -scoreboard players set $link_success whimc.dummy 0 -tag @s add whimc.clicker -execute as @e[type=interaction,tag=whimc.barrelbot.function_interaction,distance=..6] run function whimc:barrelbot/functions/interact/check_match -tag @s remove whimc.clicker - -execute if score $link_success whimc.dummy matches 1 unless data storage whimc:storage item.tag.barrelbot.instruction run item modify entity @s weapon.mainhand whimc:barrelbot/set_function_item \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/swap_item.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/swap_item.mcfunction deleted file mode 100644 index b689806..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interact/swap_item.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> whimc:barrelbot/functions/interact/swap_item -# Swaps out a function's item - -#If the item is a honeycomb, toggle lock -execute if data storage whimc:storage {item:{id:"minecraft:honeycomb"}} run function whimc:barrelbot/functions/interact/lock -execute if data storage whimc:storage {item:{id:"minecraft:honeycomb"}} run return 0 -execute if entity @s[tag=whimc.function_display.locked] run return 0 - -data modify entity @s item set from storage whimc:storage item -execute positioned ~ ~0.35 ~ as @e[type=text_display,tag=whimc.barrelbot.function_text,distance=..0.001,limit=1] run data modify entity @s text set from storage whimc:storage item.tag.display.Name -execute unless data storage whimc:storage item.id run item replace entity @s container.0 with barrier{Enchantments:[{}]} -execute unless data storage whimc:storage item.id positioned ~ ~0.35 ~ as @e[type=text_display,tag=whimc.barrelbot.function_text,distance=..0.001,limit=1] run data modify entity @s text set value '{"text":"Click to link a function item!"}' - -scoreboard players set $link_success whimc.dummy 1 diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interaction_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interaction_setup.mcfunction deleted file mode 100644 index a68ca7d..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/interaction_setup.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/functions/interaction_setup -# Sets up the interaction used for swapping out a function's linked item - -tag @s add whimc.barrelbot.function_interaction -data merge entity @s {width:0.5f,height:0.5f,response:1b} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/item_display_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/item_display_setup.mcfunction deleted file mode 100644 index 792eb2c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/item_display_setup.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/functions/item_display_setup -# Sets up the item display that hovers above a function barrel - -data merge entity @s {brightness:{sky:15,block:15},billboard:"center",transformation:{scale:[0.5f,0.5f,0.001f]}} -item replace entity @s container.0 with barrier{Enchantments:[{}]} -tag @s add whimc.function_display \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/iterate.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/iterate.mcfunction deleted file mode 100644 index cfc297f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/iterate.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/functions/iterate -# Move forward if currently processing a function - -#Add to step -execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage marker_data.stack[-1].step int 1 run scoreboard players add $step whimc.dummy 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_function.mcfunction deleted file mode 100644 index 2db6ae3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_function.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/functions/load_function -# Loads a function into the active puzzle context - -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id - -execute at @s positioned ~ ~1 ~ as @e[type=item_display,limit=1,distance=..0.001,tag=whimc.function_display] run data modify storage whimc:storage item set from entity @s item -data modify storage whimc:storage current_function set value {} -data modify storage whimc:storage current_function.function set from block ~ ~ ~ Items -data modify storage whimc:storage current_function.id set from storage whimc:storage item.tag.display.Name -data modify storage whimc:storage current_function.length set from storage whimc:storage current_function.function[-1].Slot - -data modify storage whimc:storage functions append from storage whimc:storage current_function \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_instruction_from_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_instruction_from_function.mcfunction deleted file mode 100644 index f471363..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/load_instruction_from_function.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/functions/load_instruction_from_function -# Loads a singular instruction from a function - -$data modify storage whimc:storage current_step set from storage whimc:storage functions[{id:'$(function)'}].function[{Slot:$(step)b}].tag.barrelbot \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/main/get_instruction.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/main/get_instruction.mcfunction deleted file mode 100644 index bb2b45e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/main/get_instruction.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/functions/main/get_instruction - -data modify storage whimc:storage current_step set value {} -$data modify storage whimc:storage current_step set from storage whimc:storage marker_data.instructions[{Slot:$(step)b}].tag.barrelbot \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/marker_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/marker_setup.mcfunction deleted file mode 100644 index df3a5ea..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/marker_setup.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/functions/marker_setup -# Sets up the marker for tracking a function barrel - -tag @s add whimc.barrelbot.function - -#Summon item display -execute positioned ~ ~1 ~ summon minecraft:item_display run function whimc:barrelbot/functions/item_display_setup - -#Summon interaction -execute positioned ~ ~0.75 ~ summon minecraft:interaction run function whimc:barrelbot/functions/interaction_setup - -#Create text display -execute positioned ~ ~1.35 ~ summon minecraft:text_display run function whimc:barrelbot/functions/text_display_setup \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/pop_stack.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/pop_stack.mcfunction deleted file mode 100644 index 82e31a7..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/pop_stack.mcfunction +++ /dev/null @@ -1,27 +0,0 @@ -#> whimc:barrelbot/functions/pop_stack -# Removes the top-most function on the stack and increments the step of the next one - -#data remove storage whimc:storage marker_data.stack[-1] -#execute unless data storage whimc:storage marker_data.stack[] run return 0 -# -#execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -#execute store result storage whimc:storage marker_data.stack[-1].step int 1 run scoreboard players add $step whimc.dummy 1 - -##Recursively step out of function if necessary -#execute store result score $max_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].length -#execute if score $step whimc.dummy > $max_step whimc.dummy run function whimc:barrelbot/functions/pop_stack - -scoreboard players set $step_out whimc.dummy 1 - -data remove storage whimc:storage marker_data.stack[-1] -execute unless data storage whimc:storage marker_data.stack[] run return 0 - -#Determine how to iterate forward depending on whether currently in a loop -execute store success score $in_loop whimc.dummy if data storage whimc:storage marker_data.stack[-1].loop - -##Push displays forward -scoreboard players add @s whimc.barrelbot.push_count 1 - -function whimc:barrelbot/functions/iterate -#execute if score $in_loop whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/iterate - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/recursion_limit_reached.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/recursion_limit_reached.mcfunction deleted file mode 100644 index 83b18c5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/recursion_limit_reached.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/functions/recursion_limit_reached -# Terminates the proccess and provides some visual feedback when the recursion limit is reached - -data remove storage whimc:storage marker_data.stack[] -particle minecraft:angry_villager ~ ~ ~ 0.7 0.7 0.7 0 10 normal -particle minecraft:smoke ~ ~1 ~ 0.3 0.1 0.3 0 30 normal - -playsound minecraft:block.fire.extinguish block @a ~ ~ ~ 2 1 -item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130002} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/retrieve_function.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/retrieve_function.mcfunction deleted file mode 100644 index 3b1ecc0..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/retrieve_function.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/functions/retrieve_function -# Gets the length of a function as it is added to the stack - -$data modify storage whimc:storage function set from storage whimc:storage functions[{id:'$(function)'}] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/text_display_setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/text_display_setup.mcfunction deleted file mode 100644 index 9ef1d77..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/functions/text_display_setup.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/functions/text_display_setup -# Summons the text display above a function - -tag @s add whimc.barrelbot.function_text -data merge entity @s {billboard:"center",text:'{"text":"Click to link a function item!"}'} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/execute.mcfunction deleted file mode 100644 index 3fa5015..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/execute.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/instructions/death_ray/execute - -scoreboard players set $steps whimc.dummy 3 -execute if data storage whimc:storage current_step.reach store result score $steps whimc.dummy run data get storage whimc:storage current_step.reach - -playsound minecraft:block.fire.extinguish block @a ~ ~ ~ 1 2 - -execute align xyz positioned ^ ^ ^1 run function whimc:barrelbot/instructions/death_ray/recurse \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/recurse.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/recurse.mcfunction deleted file mode 100644 index 561dce3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/death_ray/recurse.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/instructions/death_ray/recurse -# Step through the death ray recursion - -execute as @e[type=item_display,tag=whimc.barrelbot,dx=0,dy=0,dz=0,tag=!whimc.barrelbot.short_circuited] at @s run function whimc:barrelbot/bot/short_circuit - - - -execute positioned ~0.5 ~0.5 ~0.5 run particle dust_color_transition 0.95 0.2 0.1 1 1 0.6 0.6 ^ ^ ^-0.4 0.05 0.05 0.05 0 3 -execute positioned ~0.5 ~0.5 ~0.5 run particle dust_color_transition 0.95 0.2 0.1 1 1 0.6 0.6 ^ ^ ^-0.2 0.05 0.05 0.05 0 3 -execute positioned ~0.5 ~0.5 ~0.5 run particle dust_color_transition 0.95 0.2 0.1 1 1 0.6 0.6 ^ ^ ^ 0.05 0.05 0.05 0 3 -execute positioned ~0.5 ~0.5 ~0.5 run particle dust_color_transition 0.95 0.2 0.1 1 1 0.6 0.6 ^ ^ ^0.2 0.05 0.05 0.05 0 3 -execute positioned ~0.5 ~0.5 ~0.5 run particle dust_color_transition 0.95 0.2 0.1 1 1 0.6 0.6 ^ ^ ^0.4 0.05 0.05 0.05 0 3 - -scoreboard players remove $steps whimc.dummy 1 -execute if score $steps whimc.dummy matches 1.. positioned ^ ^ ^1 if block ~ ~ ~ #whimc:death_rayable run function whimc:barrelbot/instructions/death_ray/recurse \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/execute.mcfunction deleted file mode 100644 index 8525e24..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/execute.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> whimc:barrelbot/instructions/end_code_block/execute -# Ends the current code block (if inside of one) -# This function should not actually do anything, this should never be called - -return 0 - -#Exit if not in a code block ############################################################ -execute unless data storage whimc:storage marker_data.stack[-1].code_block run return 0 -# ####################################################################################### - -execute store success score $in_loop whimc.dummy if data storage whimc:storage marker_data.stack[-1].loop -#> IF IN LOOP - -execute if score $in_loop whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/end_code_block - - - - - - -#If the code block was successfully exited, step forward diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/give.mcfunction deleted file mode 100644 index fb2a88b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/end_code_block/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/end_code_block/give - -give @s book{display:{Name:'{"text":"End Code Block","color":"#F5255C","italic":false}',Lore:['[{"text":"Ends the code block for ","color":"gray","italic":false},{"text":"loops","color":"#F5255C","bold":true},{"text":" and ","color":"gray","bold":false},{"text":"if statements","color":"#F5255C","bold":false}]','{"text":" "}','{"text":"Instruction","color":"blue","bold":false,"italic":false}']},CustomModelData:130003,barrelbot:{instruction:"end_code_block"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/check_step_out.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/check_step_out.mcfunction deleted file mode 100644 index 34a8891..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/check_step_out.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/instructions/function/check_step_out -# Checks if the current function needs to leave the current context - -execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result score $max_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].length -execute if score $step whimc.dummy > $max_step whimc.dummy run function whimc:barrelbot/functions/pop_stack \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/execute.mcfunction deleted file mode 100644 index 32c1b7c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/function/execute.mcfunction +++ /dev/null @@ -1,32 +0,0 @@ -#> whimc:barrelbot/instructions/function/execute -# Steps into a function - -#Recursion depth check - If number of recursions exceeds a certain amount, terminate execution -execute store result score $stack_depth whimc.dummy if data storage whimc:storage marker_data.stack[] -execute if score $stack_depth whimc.dummy > #MAX_RECURSION_DEPTH whimc.const run function whimc:barrelbot/functions/recursion_limit_reached -execute if score $stack_depth whimc.dummy > #MAX_RECURSION_DEPTH whimc.const run return 0 - -#Push function to stack -data modify storage whimc:storage stack_entry set value {step:0} -data modify storage whimc:storage stack_entry.function set from storage whimc:storage current_step.function_id - -#Retrieve function length -function whimc:barrelbot/functions/retrieve_function with storage whimc:storage stack_entry -data modify storage whimc:storage stack_entry.length set from storage whimc:storage function.length - -data modify storage whimc:storage marker_data.stack append from storage whimc:storage stack_entry - -## Display stuff - -#Push back all previous entities -execute as @e[type=item_display,tag=whimc.execution_display,predicate=whimc:barrelbot/match_bot_id] run function whimc:barrelbot/display/push_back - -#Summon a new set of entities with the new function -function whimc:barrelbot/display/function/spawn_displays -## - - -#Call the function -function whimc:barrelbot/bot/grab_slot -function whimc:barrelbot/instructions/general/execute_instruction with storage whimc:storage current_step - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/general/execute_instruction.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/general/execute_instruction.mcfunction deleted file mode 100644 index 0260dc7..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/general/execute_instruction.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/instructions/general/execute_instruction -# Executes an instruction from the data listed in the item - -$function whimc:barrelbot/instructions/$(instruction)/execute \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_condition.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_condition.mcfunction deleted file mode 100644 index 37e50d0..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_condition.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/instructions/if/check_condition -# Returns whether the condition passed - -$execute store success score $success whimc.dummy $(condition) \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_step_out.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_step_out.mcfunction deleted file mode 100644 index 2e6db9f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/check_step_out.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/instructions/if/check_step_out -# Checks if the if statement code block has ended - -#Check to see if the next step is a code block end -scoreboard players set $iterate whimc.dummy 0 -function whimc:barrelbot/bot/grab_slot -execute if data storage whimc:storage {current_step:{instruction:"end_code_block"}} run scoreboard players set $iterate whimc.dummy 1 - -#If at the end, complete current cycle -execute store result score $max_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].length -execute if score $step whimc.dummy > $max_step whimc.dummy run scoreboard players set $iterate whimc.dummy 1 -execute if score $iterate whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/pop_stack \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/execute.mcfunction deleted file mode 100644 index f7eb8a1..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/execute.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> whimc:barrelbot/instructions/if/execute -# Runs an if statement - -#Check condition -function whimc:barrelbot/instructions/if/check_condition with storage whimc:storage current_step - -#execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -#execute store result storage whimc:storage marker_data.stack[-1].step int 1 run scoreboard players operation $step whimc.dummy += $success whimc.dummy - -#> FAILURE -#If condition isn't met, iterate forward until the end of a code block is hit -scoreboard players set $code_block_depth whimc.dummy 0 -execute if score $success whimc.dummy matches 0 run function whimc:barrelbot/instructions/if/failure -execute if score $success whimc.dummy matches 0 run scoreboard players set $queued_instruction whimc.dummy 1 - -#> SUCCESS -#If condition check was successful, put code block on the call stack -execute if score $success whimc.dummy matches 1 run function whimc:barrelbot/instructions/if/success - -execute at @s as @e[type=item_display,tag=whimc.execution_display_cursor,predicate=whimc:barrelbot/match_bot_id,scores={whimc.barrelbot.display_layer=0}] run function whimc:barrelbot/display/update_cursor \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/failure.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/failure.mcfunction deleted file mode 100644 index 8278cc7..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/failure.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> whimc:barrelbot/instructions/if/failure -# If it fails, keep iterating forward until the end of the code block is hit - -function whimc:barrelbot/functions/iterate - -#Check to see if the next step is a code block end -scoreboard players set $end_found whimc.dummy 0 -function whimc:barrelbot/bot/grab_slot - -execute if data storage whimc:storage {current_step:{instruction:"loop"}} run scoreboard players add $code_block_depth whimc.dummy 1 -execute if data storage whimc:storage {current_step:{instruction:"if"}} run scoreboard players add $code_block_depth whimc.dummy 1 -execute if data storage whimc:storage {current_step:{instruction:"end_code_block"}} run scoreboard players remove $code_block_depth whimc.dummy 1 -execute if score $code_block_depth whimc.dummy matches ..-1 run scoreboard players set $end_found whimc.dummy 1 - -#If at the end, stop iterating -execute store result score $max_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].length -execute if score $step whimc.dummy > $max_step whimc.dummy run scoreboard players set $end_found whimc.dummy 1 - -execute if score $end_found whimc.dummy matches 0 run function whimc:barrelbot/instructions/if/failure \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/give.mcfunction deleted file mode 100644 index b0b32a8..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/if/give - -$give @s book{display:{Name:'{"text":"If Statement","color":"#FF4F67","italic":false}',Lore:['{"text":"Runs the following code block if the condition is met","color":"gray","italic":false}','{"text":" "}','[{"text":"Condition: ","color":"gold","bold":true,"italic":false},{"text":"$(description)","color":"white","bold":false,"italic":false}]','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130004,barrelbot:{instruction:"if",condition:"$(condition)"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/success.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/success.mcfunction deleted file mode 100644 index e0989ac..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/if/success.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/instructions/if/success -# Pushes on to stack if success condition is met - -data modify storage whimc:storage stack_entry set value {if:1b,code_block:1b} -data modify storage whimc:storage stack_entry.function set from storage whimc:storage marker_data.stack[-1].function -data modify storage whimc:storage stack_entry.length set from storage whimc:storage marker_data.stack[-1].length - -execute store result score $prev_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage stack_entry.step int 1 run scoreboard players add $prev_step whimc.dummy 1 - -data modify storage whimc:storage marker_data.stack append from storage whimc:storage stack_entry - -#Call the next instruction -function whimc:barrelbot/bot/grab_slot -function whimc:barrelbot/instructions/general/execute_instruction with storage whimc:storage current_step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/check_step_out.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/check_step_out.mcfunction deleted file mode 100644 index 9c5194a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/check_step_out.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/instructions/loop/check_step_out -# Checks if the current loop needs to be popped from the stack - -#Check to see if the next step is a code block end -scoreboard players set $iterate whimc.dummy 0 -function whimc:barrelbot/bot/grab_slot -execute if data storage whimc:storage {current_step:{instruction:"end_code_block"}} run scoreboard players set $iterate whimc.dummy 1 - - -#If at the end, complete current cycle - - -execute store result score $max_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].length -execute if score $step whimc.dummy > $max_step whimc.dummy run scoreboard players set $iterate whimc.dummy 1 -execute if score $iterate whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/increment_cycle \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/check_condition.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/check_condition.mcfunction deleted file mode 100644 index d2b956a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/check_condition.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/instructions/loop/counter/check_condition -# Checks if a counter loop needs to be exited - -#Increase cycle count -execute store result score $cycle whimc.dummy run data get storage whimc:storage marker_data.stack[-1].cycle -execute store result storage whimc:storage marker_data.stack[-1].cycle int 1 run scoreboard players add $cycle whimc.dummy 1 - - -#If cycle is complete, terminate loop - -execute store result score $max_cycle whimc.dummy run data get storage whimc:storage marker_data.stack[-1].cycles -execute if score $cycle whimc.dummy = $max_cycle whimc.dummy run scoreboard players set $exit_loop whimc.dummy 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/execute.mcfunction deleted file mode 100644 index b65b394..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/execute.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/instructions/loop/counter/execute -# Begins a counter loop - -#Push loop to stack -data modify storage whimc:storage stack_entry set value {loop:1b,cycle:0,code_block:1b} -data modify storage whimc:storage stack_entry.function set from storage whimc:storage marker_data.stack[-1].function -data modify storage whimc:storage stack_entry.cycles set from storage whimc:storage current_step.cycles -data modify storage whimc:storage stack_entry.length set from storage whimc:storage marker_data.stack[-1].length - -execute store result score $prev_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage stack_entry.step int 1 run scoreboard players add $prev_step whimc.dummy 1 -execute store result storage whimc:storage stack_entry.start_step int 1 run scoreboard players get $prev_step whimc.dummy - -data modify storage whimc:storage marker_data.stack append from storage whimc:storage stack_entry - -#Call the next instruction -function whimc:barrelbot/bot/grab_slot -function whimc:barrelbot/instructions/general/execute_instruction with storage whimc:storage current_step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/give.mcfunction deleted file mode 100644 index aad74fd..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/counter/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/loop/counter/give - -$give @s book{display:{Name:'{"text":"Counter Loop","color":"#FFF385","italic":false}',Lore:['[{"text":"Repeats the next code block ","color":"gray","italic":false},{"text":"$(cycles)","color":"gold","bold":true,"italic":false},{"text":" times","color":"gray","bold":false,"italic":false}]','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130005,barrelbot:{instruction:"loop","cycles":$(cycles)}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/end_code_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/end_code_block.mcfunction deleted file mode 100644 index 98c86dd..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/end_code_block.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/instructions/loop/end_code_block -# Commands run when the end of a code block is hit -# Either continues the loop or steps forward - -#Increase cycle count -execute store result score $cycle whimc.dummy run data get storage whimc:storage marker_data.stack[-1].cycle -execute store result storage whimc:storage marker_data.stack[-1].cycle int 1 run scoreboard players add $cycle whimc.dummy 1 - -#If cycle is complete, step out of loop -execute store result score $max_cycle whimc.dummy run data get storage whimc:storage marker_data.stack[-1].cycles -execute if score $cycle whimc.dummy = $max_cycle whimc.dummy run function whimc:barrelbot/instructions/loop/pop_stack \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/execute.mcfunction deleted file mode 100644 index 584c97e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/execute.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/instructions/loop/execute -# Steps into a loop - -#Determine set up based on whether the loop is a while loop or counter loop -execute if data storage whimc:storage current_step.cycles run function whimc:barrelbot/instructions/loop/counter/execute -execute if data storage whimc:storage current_step.condition run function whimc:barrelbot/instructions/loop/while/execute - -#Update cursor (test this later) -execute at @s as @e[type=item_display,tag=whimc.execution_display_cursor,predicate=whimc:barrelbot/match_bot_id,scores={whimc.barrelbot.display_layer=0}] run function whimc:barrelbot/display/update_cursor \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/give_infinite.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/give_infinite.mcfunction deleted file mode 100644 index 6780f2c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/give_infinite.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/loop/give_infinite - -give @s book{display:{Name:'{"text":"Infinite Loop","color":"#FFF385","italic":false}',Lore:['[{"text":"Repeats the next code block ","color":"gray","italic":false},{"text":"infinite","color":"gold","bold":true,"italic":false},{"text":" times","color":"gray","bold":false,"italic":false}]','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130005,barrelbot:{instruction:"loop","cycles":-1}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/increment_cycle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/increment_cycle.mcfunction deleted file mode 100644 index c24cf82..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/increment_cycle.mcfunction +++ /dev/null @@ -1,20 +0,0 @@ -#> whimc:barrelbot/instructions/loop/increment_cycle -# Increments the cycle - -scoreboard players set $exit_loop whimc.dummy 0 - - -#If loop is a counter loop, increment the counter -execute if data storage whimc:storage marker_data.stack[-1].cycles run function whimc:barrelbot/instructions/loop/counter/check_condition - -#If loop is a while loop, check exit condition -execute if data storage whimc:storage marker_data.stack[-1].condition run function whimc:barrelbot/instructions/loop/while/check_condition - - - - -#Pop loop from stack if it is done -execute if score $exit_loop whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/pop_stack - -#Set step to first step if loop is continuing -execute if score $exit_loop whimc.dummy matches 0 run data modify storage whimc:storage marker_data.stack[-1].step set from storage whimc:storage marker_data.stack[-1].start_step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/iterate.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/iterate.mcfunction deleted file mode 100644 index 5b8e3f4..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/iterate.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/instructions/loop/iterate -# Iterates through the loop, checking the exit condition - -#Add to step -execute store result score $step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage marker_data.stack[-1].step int 1 run scoreboard players add $step whimc.dummy 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/pop_stack.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/pop_stack.mcfunction deleted file mode 100644 index d5a7ed6..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/pop_stack.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/instructions/loop/pop_stack - -scoreboard players set $step_out whimc.dummy 1 - -#Paste over current step, then remove from stack -#execute store result score $loop_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -#execute store result storage whimc:storage marker_data.stack[-2].step int 1 run scoreboard players add $loop_step whimc.dummy 1 - -data modify storage whimc:storage marker_data.stack[-2].step set from storage whimc:storage marker_data.stack[-1].step -data remove storage whimc:storage marker_data.stack[-1] -#execute unless data storage whimc:storage marker_data.stack[] run return 0 - -#Determine how to iterate forward depending on whether currently in a loop -execute store success score $in_loop whimc.dummy if data storage whimc:storage marker_data.stack[-1].loop - -execute if score $in_loop whimc.dummy matches 0 run function whimc:barrelbot/functions/iterate -execute if score $in_loop whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/iterate \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/begin.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/begin.mcfunction deleted file mode 100644 index 0c1c120..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/begin.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/instructions/loop/while/begin -# Pushes a whlie loop to the stack - -#Push loop to stack -data modify storage whimc:storage stack_entry set value {loop:1b,code_block:1b} -data modify storage whimc:storage stack_entry.function set from storage whimc:storage marker_data.stack[-1].function -data modify storage whimc:storage stack_entry.condition set from storage whimc:storage current_step.condition -data modify storage whimc:storage stack_entry.length set from storage whimc:storage marker_data.stack[-1].length - -execute store result score $prev_step whimc.dummy run data get storage whimc:storage marker_data.stack[-1].step -execute store result storage whimc:storage stack_entry.step int 1 run scoreboard players add $prev_step whimc.dummy 1 -execute store result storage whimc:storage stack_entry.start_step int 1 run scoreboard players get $prev_step whimc.dummy - -data modify storage whimc:storage marker_data.stack append from storage whimc:storage stack_entry - -#Call the next instruction -function whimc:barrelbot/bot/grab_slot -function whimc:barrelbot/instructions/general/execute_instruction with storage whimc:storage current_step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/check_condition.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/check_condition.mcfunction deleted file mode 100644 index 9d399df..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/check_condition.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/instructions/loop/while/check_condition -# Checks if a while loop should be exited - -execute at @s run function whimc:barrelbot/instructions/if/check_condition with storage whimc:storage marker_data.stack[-1] - -execute if score $success whimc.dummy matches 0 run scoreboard players set $exit_loop whimc.dummy 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/execute.mcfunction deleted file mode 100644 index 441c56a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/execute.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> whimc:barrelbot/instructions/loop/while/execute -# Begins a while loop (if the initial condition is met) - -#Check condition -function whimc:barrelbot/instructions/if/check_condition with storage whimc:storage current_step - -#> FAILURE -#If condition isn't met, iterate forward until the end of a code block is hit -scoreboard players set $code_block_depth whimc.dummy 0 -execute if score $success whimc.dummy matches 0 run function whimc:barrelbot/instructions/if/failure -execute if score $success whimc.dummy matches 0 run scoreboard players set $queued_instruction whimc.dummy 1 - -#> SUCCESS -#If condition is met, push to stack -execute if score $success whimc.dummy matches 1 run function whimc:barrelbot/instructions/loop/while/begin \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/give.mcfunction deleted file mode 100644 index 05abebd..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/loop/while/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/loop/while/give - -$give @s book{display:{Name:'{"text":"While Loop","color":"#FFF385","italic":false}',Lore:['{"text":"Runs the following code block while the condition is true","color":"gray","italic":false}','{"text":" "}','[{"text":"Condition: ","color":"gold","bold":true,"italic":false},{"text":"$(description)","color":"white","bold":false,"italic":false}]','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130005,barrelbot:{instruction:"loop",condition:"$(condition)"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/execute.mcfunction deleted file mode 100644 index d65037c..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/execute.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/instructions/move_forward/execute - -execute unless block ^ ^-1 ^ air run return 1 - -clone ~ ~ ~ ~ ~ ~ ^ ^-1 ^ masked move -tp @s ^ ^-1 ^ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/give.mcfunction deleted file mode 100644 index 3748a2b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_down/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/move_down/give - -give @s book{display:{Name:'{"text":"Move Down","color":"#FFAA00","italic":false}',Lore:['{"text":"Moves the barrelbot down","color":"gray","italic":false}','{"text":"1 tile, if it is open","color":"gray","italic":false}','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130006,barrelbot:{instruction:"move_down"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/execute.mcfunction deleted file mode 100644 index e4bd016..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/execute.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/instructions/move_forward/execute - -execute unless block ^ ^ ^1 air run return 1 - -clone ~ ~ ~ ~ ~ ~ ^ ^ ^1 masked move -tp @s ^ ^ ^1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/give.mcfunction deleted file mode 100644 index 920ca3e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/move_forward/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/move_forward/give - -give @s book{display:{Name:'{"text":"Move Forward","color":"#FFAA00","italic":false}',Lore:['{"text":"Moves the barrelbot forward","color":"gray","italic":false}','{"text":"1 tile, if it is open","color":"gray","italic":false}','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130000,barrelbot:{instruction:"move_forward"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/delete_block.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/delete_block.mcfunction deleted file mode 100644 index 29c2c8f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/delete_block.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/instructions/place_block/delete_block -# Removes a barrelbot-placed block - -setblock ~ ~ ~ air -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/execute.mcfunction deleted file mode 100644 index f60f410..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/execute.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/instructions/place_block/execute -# Places a block in front of the barrelbot - -execute store success score $block_placed whimc.dummy run setblock ^ ^ ^1 minecraft:black_stained_glass keep -execute if score $block_placed whimc.dummy matches 1 positioned ^ ^ ^1 summon marker run function whimc:barrelbot/instructions/place_block/setup_marker \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/setup_marker.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/setup_marker.mcfunction deleted file mode 100644 index c80d5c3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/place_block/setup_marker.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/instructions/place_block/setup_marker -# Sets a marker at the block so it can be tracked and destroyed - -tag @s add whimc.barrelbot.placed_block -scoreboard players operation @s whimc.barrelbot.puzzle_id = $temp whimc.barrelbot.puzzle_id \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/execute.mcfunction deleted file mode 100644 index 3952c1b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/execute.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/instructions/turn_left/execute -# Turns left - -tp @s ~ ~ ~ ~-90 ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/give.mcfunction deleted file mode 100644 index 17b4021..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_left/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/turn_left/give - -give @s book{display:{Name:'{"text":"Turn Left","color":"#81FF12","italic":false}',Lore:['{"text":"Rotate the barrelbot","color":"gray","italic":false}','{"text":"counterclockwise","color":"gray","italic":false}','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130001,barrelbot:{instruction:"turn_left"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/execute.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/execute.mcfunction deleted file mode 100644 index 7db126e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/execute.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/instructions/turn_right/execute -# Turns right - -tp @s ~ ~ ~ ~90 ~ \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/give.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/give.mcfunction deleted file mode 100644 index e2a45cb..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/instructions/turn_right/give.mcfunction +++ /dev/null @@ -1,3 +0,0 @@ -#> whimc:barrelbot/instructions/turn_right/give - -give @s book{display:{Name:'{"text":"Turn Right","color":"#00B3FF","italic":false}',Lore:['{"text":"Rotate the barrelbot","color":"gray","italic":false}','{"text":"clockwise","color":"gray","italic":false}','{"text":" "}','{"text":"Instruction","color":"blue","italic":false}']},CustomModelData:130002,barrelbot:{instruction:"turn_right"}} 1 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/active_tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/active_tick.mcfunction deleted file mode 100644 index 7e11a8b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/active_tick.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/manager/active_tick -# Ticks the puzzle while its running - -scoreboard players add @s whimc.barrelbot.step_timer 1 - -execute if score @s whimc.barrelbot.step_timer matches 10.. run function whimc:barrelbot/manager/step \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/assign_ids.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/assign_ids.mcfunction deleted file mode 100644 index d8c57c5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/assign_ids.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> whimc:barrelbot/manager/assign_ids -# Assigns all bots and functions in the area this puzzle's id - -function whimc:barrelbot/manager/get_dimensions - -function whimc:barrelbot/manager/scan_bounding_box with storage whimc:macro Pos \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/check_success_condition.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/check_success_condition.mcfunction deleted file mode 100644 index c66aabd..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/check_success_condition.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/manager/check_success_condition -# Checks if the success condition has passed - -$function whimc:barrelbot/success_conditions/$(function) \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/delete_puzzle.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/delete_puzzle.mcfunction deleted file mode 100644 index 624d100..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/delete_puzzle.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> whimc:barrelbot/manager/delete_puzzle -# Deletes the whole puzzle (but not the blocks) - -#Kill all bots -#execute as @e[type=item_display,tag=whimc.barrelbot,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/bot/kill - -#Kill all functions -#execute as @e[type=marker,tag=whimc.barrelbot.function,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/functions/delete - -#Kill manager -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute on passengers if entity @s[tag=whimc.edit_mode] at @s run function whimc:barrelbot/editor/disable_edit_mode -execute on passengers run kill @s -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_dimensions.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_dimensions.mcfunction deleted file mode 100644 index 5671789..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_dimensions.mcfunction +++ /dev/null @@ -1,43 +0,0 @@ -#> whimc:barrelbot/manager/get_dimensions -# Gets the manager's bounding box dimensions into storage for use in macros - -execute on passengers run data modify storage whimc:storage data set from entity @s data.bounding_box - -execute store result score $min_x whimc.dummy run data get storage whimc:storage data.min_x -execute store result score $min_y whimc.dummy run data get storage whimc:storage data.min_y -execute store result score $min_z whimc.dummy run data get storage whimc:storage data.min_z -execute store result score $max_x whimc.dummy run data get storage whimc:storage data.max_x -execute store result score $max_y whimc.dummy run data get storage whimc:storage data.max_y -execute store result score $max_z whimc.dummy run data get storage whimc:storage data.max_z - -scoreboard players operation $real_min_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_min_x whimc.dummy < $max_x whimc.dummy -scoreboard players operation $real_min_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_min_y whimc.dummy < $max_y whimc.dummy -scoreboard players operation $real_min_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_min_z whimc.dummy < $max_z whimc.dummy - -scoreboard players operation $real_max_x whimc.dummy = $min_x whimc.dummy -scoreboard players operation $real_max_x whimc.dummy > $max_x whimc.dummy -scoreboard players operation $real_max_y whimc.dummy = $min_y whimc.dummy -scoreboard players operation $real_max_y whimc.dummy > $max_y whimc.dummy -scoreboard players operation $real_max_z whimc.dummy = $min_z whimc.dummy -scoreboard players operation $real_max_z whimc.dummy > $max_z whimc.dummy - -#Get position into storage -execute store result storage whimc:macro Pos.min_x int 1 run scoreboard players get $real_min_x whimc.dummy -execute store result storage whimc:macro Pos.min_y int 1 run scoreboard players get $real_min_y whimc.dummy -execute store result storage whimc:macro Pos.min_z int 1 run scoreboard players get $real_min_z whimc.dummy - -#Get dimensions -scoreboard players operation $size_x whimc.dummy = $real_max_x whimc.dummy -scoreboard players operation $size_y whimc.dummy = $real_max_y whimc.dummy -scoreboard players operation $size_z whimc.dummy = $real_max_z whimc.dummy -scoreboard players operation $size_x whimc.dummy -= $real_min_x whimc.dummy -scoreboard players operation $size_y whimc.dummy -= $real_min_y whimc.dummy -scoreboard players operation $size_z whimc.dummy -= $real_min_z whimc.dummy - -#Get dimension into storage -execute store result storage whimc:macro Pos.vol_x int 1 run scoreboard players get $size_x whimc.dummy -execute store result storage whimc:macro Pos.vol_y int 1 run scoreboard players get $size_y whimc.dummy -execute store result storage whimc:macro Pos.vol_z int 1 run scoreboard players get $size_z whimc.dummy \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_execution_direction.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_execution_direction.mcfunction deleted file mode 100644 index 12c8b22..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/get_execution_direction.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/manager/get_execution_direction - -tp @s ~ ~ ~ ~ ~ - -execute if entity @s[y_rotation=-45..45] run scoreboard players set $direction whimc.dummy 0 -execute if entity @s[y_rotation=45..135] run scoreboard players set $direction whimc.dummy 1 -execute if entity @s[y_rotation=135..225] run scoreboard players set $direction whimc.dummy 2 -execute if entity @s[y_rotation=225..315] run scoreboard players set $direction whimc.dummy 3 - -kill @s \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/puzzle_success.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/puzzle_success.mcfunction deleted file mode 100644 index 6d45363..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/puzzle_success.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/manager/puzzle_success -# Party time - -tag @s add whimc.success - -playsound minecraft:entity.player.levelup player @a ~ ~ ~ 2 1 -execute at @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] run particle happy_villager ~ ~ ~ 0.6 0.6 0.6 0 35 force - -execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] run item replace entity @s container.0 with black_stained_glass_pane{CustomModelData:130001} - -execute as @a if score @s whimc.barrelbot.in_puzzle_id = $temp whimc.barrelbot.puzzle_id run tag @s add whimc.success_haver -tellraw @a ["",{"text":"[Barrelbot] ","bold":true,"color":"gray"},{"selector":"@a[tag=whimc.success_haver]","color":"gold"}," has completed puzzle #",{"score":{"name":"@s","objective":"whimc.barrelbot.puzzle_type_id"},"color":"green"},"!"] -tag @s remove whimc.success_haver \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/scan_bounding_box.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/scan_bounding_box.mcfunction deleted file mode 100644 index 1feb4a5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/scan_bounding_box.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:barrelbot/manager/scan_bounding_box - -#Tell all barrel markers to grab the relevant block data (this reduces the number of block data serializations) -$execute as @e[type=minecraft:item_display,tag=whimc.barrelbot,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] at @s run function whimc:barrelbot/bot/load_instructions_wrapper - -#Load any linked functions -data modify storage whimc:storage functions set value [] -$execute as @e[type=minecraft:marker,tag=whimc.barrelbot.function,x=$(min_x),y=$(min_y),z=$(min_z),dx=$(vol_x),dy=$(vol_y),dz=$(vol_z)] at @s run function whimc:barrelbot/functions/load_function diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup.mcfunction deleted file mode 100644 index 711c4d9..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup.mcfunction +++ /dev/null @@ -1,34 +0,0 @@ -#> whimc:barrelbot/manager/setup -# Sets up the manager text display entity for a given puzzle - -tag @s add whimc.barrelbot.puzzle_manager - -execute if score $direction whimc.dummy matches 1 run tp @s ~ ~ ~ 90 0 -execute if score $direction whimc.dummy matches 2 run tp @s ~ ~ ~ 180 0 -execute if score $direction whimc.dummy matches 3 run tp @s ~ ~ ~ 270 0 - -scoreboard players add $global whimc.barrelbot.puzzle_id 1 -scoreboard players operation @s whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id - -#Puzzle type ID is used to link together cloned puzzles -scoreboard players add $global whimc.barrelbot.puzzle_type_id 1 -scoreboard players operation @s whimc.barrelbot.puzzle_type_id = $global whimc.barrelbot.puzzle_type_id - -data merge entity @s {"billboard":"center"} -data modify entity @s text set from storage whimc:const text.barrelbot.start - -#If there's a shulker box present, set items -function whimc:barrelbot/no_smuggle/define_items - -#Summon data storage marker -summon marker ~ ~ ~ {Tags:["whimc.barrelbot.puzzle_storage","whimc.barrelbot.puzzle_storage.init"],data:{success_function:"touch_green"}} -ride @e[type=marker,limit=1,tag=whimc.barrelbot.puzzle_storage.init] mount @s -execute as @e[type=marker,limit=1,tag=whimc.barrelbot.puzzle_storage.init] run function whimc:barrelbot/manager/setup_marker -tag @e[tag=whimc.barrelbot.puzzle_storage.init] remove whimc.barrelbot.puzzle_storage.init - -#Set the shulker box and hopper -execute rotated as @s positioned ~ ~-1 ~ positioned ^ ^ ^-1 unless block ~ ~ ~ yellow_shulker_box run setblock ~ ~ ~ yellow_shulker_box -execute if score $direction whimc.dummy matches 0 rotated as @s positioned ~ ~-1 ~ positioned ^1 ^ ^-1 run setblock ~ ~ ~ hopper[facing=west] -execute if score $direction whimc.dummy matches 1 rotated as @s positioned ~ ~-1 ~ positioned ^1 ^ ^-1 run setblock ~ ~ ~ hopper[facing=north] -execute if score $direction whimc.dummy matches 2 rotated as @s positioned ~ ~-1 ~ positioned ^1 ^ ^-1 run setblock ~ ~ ~ hopper[facing=east] -execute if score $direction whimc.dummy matches 3 rotated as @s positioned ~ ~-1 ~ positioned ^1 ^ ^-1 run setblock ~ ~ ~ hopper[facing=south] \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup_marker.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup_marker.mcfunction deleted file mode 100644 index b5727e9..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/setup_marker.mcfunction +++ /dev/null @@ -1,18 +0,0 @@ -#> whimc:barrelbot/manager/setup_marker -# Sets up the initial bounding box for the puzzle - -data modify storage whimc:storage Pos set from entity @s Pos -scoreboard players operation @s whimc.barrelbot.puzzle_id = $global whimc.barrelbot.puzzle_id - -execute store result score $marker_x whimc.dummy run data get storage whimc:storage Pos[0] -execute store result score $marker_y whimc.dummy run data get storage whimc:storage Pos[1] -execute store result score $marker_z whimc.dummy run data get storage whimc:storage Pos[2] - -execute store result entity @s data.bounding_box.min_x int 1 run scoreboard players remove $marker_x whimc.dummy 2 -execute store result entity @s data.bounding_box.min_y int 1 run scoreboard players remove $marker_y whimc.dummy 1 -execute store result entity @s data.bounding_box.min_z int 1 run scoreboard players remove $marker_z whimc.dummy 2 - - -execute store result entity @s data.bounding_box.max_x int 1 run scoreboard players add $marker_x whimc.dummy 4 -execute store result entity @s data.bounding_box.max_y int 1 run scoreboard players add $marker_y whimc.dummy 3 -execute store result entity @s data.bounding_box.max_z int 1 run scoreboard players add $marker_z whimc.dummy 4 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/start_execution.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/start_execution.mcfunction deleted file mode 100644 index 3b32a50..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/start_execution.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:barrelbot/manager/start_execution -# Begins execution of the given puzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -#Change text -data modify entity @s text set from storage whimc:const text.barrelbot.stop - -#Add tag -tag @s add whimc.barrelbot.puzzle_manager.active - -#Get all entities in the area and set them up -function whimc:barrelbot/manager/assign_ids - -execute on passengers run data modify entity @s data.functions set from storage whimc:storage functions - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/step.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/step.mcfunction deleted file mode 100644 index d3664f5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/step.mcfunction +++ /dev/null @@ -1,21 +0,0 @@ -#> whimc:barrelbot/manager/step -# Steps the whole program forward once - -execute if entity @s[tag=whimc.success] run return 1 - -#Load function data into storage -execute on passengers run data modify storage whimc:storage functions set from entity @s data.functions - -scoreboard players set @s whimc.barrelbot.step_timer 0 -execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/bot/step -execute as @e[type=item_display,tag=whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/bot/step - -#Check success condition -data modify storage whimc:macro success_function set value {} -execute on passengers run data modify storage whimc:macro success_function.function set from entity @s data.success_function -scoreboard players set $success whimc.dummy 0 -function whimc:barrelbot/manager/check_success_condition with storage whimc:macro success_function - -#If success condition's met, party time -scoreboard players operation $temp whimc.barrelbot.puzzle_type_id = @s whimc.barrelbot.puzzle_type_id -execute if score $success whimc.dummy matches 1 run function whimc:barrelbot/manager/puzzle_success \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/stop_execution.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/stop_execution.mcfunction deleted file mode 100644 index ac1772e..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/stop_execution.mcfunction +++ /dev/null @@ -1,17 +0,0 @@ -#> whimc:barrelbot/manager/stop_execution -# Ends the execution of the given puzzle - -#Change text -data modify entity @s text set from storage whimc:const text.barrelbot.start - -#Add tag -tag @s remove whimc.barrelbot.puzzle_manager.active -tag @s remove whimc.success - -#Reset all barrel bots -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id -execute as @e[type=item_display,tag=whimc.barrelbot,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/bot/reset - -#Delete all blocks placed by the barrelbot -execute as @e[type=marker,tag=whimc.barrelbot.placed_block,predicate=whimc:barrelbot/match_id] at @s run function whimc:barrelbot/instructions/place_block/delete_block - diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/tick.mcfunction deleted file mode 100644 index 9b387ac..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/tick.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/manager/tick -# Ticks the manager - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -scoreboard players remove @s[scores={whimc.button_delay=1..}] whimc.button_delay 1 -execute unless score @s whimc.button_delay matches 1.. if entity @a[distance=..10] if block ~ ~ ~ #minecraft:buttons[powered=true] run function whimc:barrelbot/manager/toggle_execution - -execute if entity @s[tag=whimc.barrelbot.puzzle_manager.active] run function whimc:barrelbot/manager/active_tick \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/toggle_execution.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/toggle_execution.mcfunction deleted file mode 100644 index 8e20c21..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/manager/toggle_execution.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> whimc:barrelbot/manager/toggle_execution -# - -scoreboard players set @s whimc.button_delay 25 - -execute store result score $is_active whimc.dummy if entity @s[tag=whimc.barrelbot.puzzle_manager.active] - -execute if score $is_active whimc.dummy matches 0 run function whimc:barrelbot/manager/start_execution -execute if score $is_active whimc.dummy matches 1 run function whimc:barrelbot/manager/stop_execution \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/assign_id.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/assign_id.mcfunction deleted file mode 100644 index 73f17b5..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/assign_id.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -#> whimc:barrelbot/no_smuggle/assign_id -# Gives the player an id based on what puzzle they're interacting with - -tag @s add whimc.in_puzzle -execute store result score @s whimc.barrelbot.in_puzzle_id run data get storage whimc:storage Inventory[{tag:{barrelbot:{puzzle_item:1b}}}].tag.barrelbot.puzzle_id -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.in_puzzle_id -scoreboard players operation @s whimc.barrelbot.puzzle_type_id = @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,limit=1,predicate=whimc:barrelbot/match_id] whimc.barrelbot.puzzle_type_id - -#Assign the bounding box of the puzzle they're interacting with -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.in_puzzle_id -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,limit=1,predicate=whimc:barrelbot/match_id] on passengers run data modify storage whimc:storage bounding_box set from entity @s data.bounding_box -execute store result score $min_x whimc.dummy run data get storage whimc:storage bounding_box.min_x -execute store result score $min_y whimc.dummy run data get storage whimc:storage bounding_box.min_y -execute store result score $min_z whimc.dummy run data get storage whimc:storage bounding_box.min_z - -execute store result score $max_x whimc.dummy run data get storage whimc:storage bounding_box.max_x -execute store result score $max_y whimc.dummy run data get storage whimc:storage bounding_box.max_y -execute store result score $max_z whimc.dummy run data get storage whimc:storage bounding_box.max_z - -scoreboard players operation @s whimc.barrelbot.bound_x = $min_x whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_x < $max_x whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_y = $min_y whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_y < $max_y whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_z = $min_z whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_z < $max_z whimc.dummy - -scoreboard players operation @s whimc.barrelbot.bound_dx = $min_x whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_dx > $max_x whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_dy = $min_y whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_dy > $max_y whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_dz = $min_z whimc.dummy -scoreboard players operation @s whimc.barrelbot.bound_dz > $max_z whimc.dummy - -scoreboard players operation @s whimc.barrelbot.bound_dx -= @s whimc.barrelbot.bound_x -scoreboard players operation @s whimc.barrelbot.bound_dy -= @s whimc.barrelbot.bound_y -scoreboard players operation @s whimc.barrelbot.bound_dz -= @s whimc.barrelbot.bound_z \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/check_leave_boundary.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/check_leave_boundary.mcfunction deleted file mode 100644 index c926917..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/check_leave_boundary.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> whimc:barrelbot/no_smuggle/check_leave_boundary -# Check to see if the player has left the boundary of the puzzle they are currently interacting with - -execute store result storage whimc:macro volume.x int 1 run scoreboard players get @s whimc.barrelbot.bound_x -execute store result storage whimc:macro volume.y int 1 run scoreboard players get @s whimc.barrelbot.bound_y -execute store result storage whimc:macro volume.z int 1 run scoreboard players get @s whimc.barrelbot.bound_z - -execute store result storage whimc:macro volume.dx int 1 run scoreboard players get @s whimc.barrelbot.bound_dx -execute store result storage whimc:macro volume.dy int 1 run scoreboard players get @s whimc.barrelbot.bound_dy -execute store result storage whimc:macro volume.dz int 1 run scoreboard players get @s whimc.barrelbot.bound_dz - -function whimc:barrelbot/no_smuggle/volume_check with storage whimc:macro volume \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/define_items.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/define_items.mcfunction deleted file mode 100644 index 0982f48..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/define_items.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> whimc:barrelbot/no_smuggle/define_items -# Defines the items for a given puzzle - -scoreboard players operation $temp whimc.barrelbot.puzzle_id = @s whimc.barrelbot.puzzle_id - -data remove storage whimc:storage Items - -#Get data from block -execute positioned ~ ~-1 ~ run data modify storage whimc:storage Items set from block ^ ^ ^-1 Items - -#Recursively assign IDs -execute store result score $item_count whimc.dummy if data storage whimc:storage Items[] -execute if score $item_count whimc.dummy matches 1.. run function whimc:barrelbot/no_smuggle/recursively_assign_items - -#Write data to marker -execute on passengers run data modify entity @s data.Items set from storage whimc:storage Items - -#Write data to block -execute positioned ~ ~-1 ~ run data modify block ^ ^ ^-1 Items set from storage whimc:storage Items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/receive_puzzle_item.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/receive_puzzle_item.mcfunction deleted file mode 100644 index 43514a3..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/receive_puzzle_item.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> whimc:barrelbot/no_smuggle/receive_puzzle_item -# When a player receives a puzzle item, either mark them for boundary checking or check if they have an invalid item - -advancement revoke @s only whimc:inventory/receive_puzzle_item - -execute store success score $in_puzzle whimc.dummy if entity @s[tag=whimc.in_puzzle] -data modify storage whimc:storage Inventory set from entity @s Inventory - -execute if score $in_puzzle whimc.dummy matches 0 run function whimc:barrelbot/no_smuggle/assign_id -execute store result storage whimc:macro puzzle_id.id int 1 run scoreboard players get @s whimc.barrelbot.in_puzzle_id -function whimc:barrelbot/no_smuggle/scan_for_mismatch with storage whimc:macro puzzle_id \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_assign_items.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_assign_items.mcfunction deleted file mode 100644 index a9bac19..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_assign_items.mcfunction +++ /dev/null @@ -1,13 +0,0 @@ -#> whimc:barrelbot/no_smuggle/recursively_assign_items -# Give each item the ID corresponding to the puzzle ID - -execute store result storage whimc:storage Items[0].tag.barrelbot.puzzle_id int 1 run scoreboard players get $temp whimc.barrelbot.puzzle_id -data modify storage whimc:storage Items[0].tag.barrelbot.puzzle_item set value 1b - -#Cycle array -data modify storage whimc:storage Items append from storage whimc:storage Items[0] -data remove storage whimc:storage Items[0] - -#Recurse if there are still entries to process -scoreboard players remove $item_count whimc.dummy 1 -execute if score $item_count whimc.dummy matches 1.. run function whimc:barrelbot/no_smuggle/recursively_assign_items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_return_items.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_return_items.mcfunction deleted file mode 100644 index 6c7b000..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/recursively_return_items.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/no_smuggle/recursively_return_items -# Takes items from the inventory and spawns them at the hopper next to the shulker box - -#Check if the item is a valid item. If it is, return it -execute if data storage whimc:storage Inventory[0].tag.barrelbot.puzzle_item run function whimc:barrelbot/no_smuggle/return_item - -#Recurse -data remove storage whimc:storage Inventory[0] -scoreboard players remove $item_count whimc.dummy 1 -execute if score $item_count whimc.dummy matches 1.. run function whimc:barrelbot/no_smuggle/recursively_return_items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_all_items.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_all_items.mcfunction deleted file mode 100644 index 8045b83..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_all_items.mcfunction +++ /dev/null @@ -1,28 +0,0 @@ -#> whimc:barrelbot/no_smuggle/return_all_items -# If the player hits a border, return all items to their rightful puzzle - -tag @s remove whimc.in_puzzle -execute unless data entity @s Inventory[{tag:{barrelbot:{puzzle_item:1b}}}] run return 0 - -#Recursively return all items -data modify storage whimc:storage Inventory set from entity @s Inventory -execute store result score $item_count whimc.dummy if data storage whimc:storage Inventory[] -function whimc:barrelbot/no_smuggle/recursively_return_items - -#Clear all items -clear @s minecraft:book{barrelbot:{puzzle_item:1b}} - -execute if data entity @s Inventory[{tag:{barrelbot:{puzzle_item:1b}}}]: - data modify storage whimc:storage Inventory set from entity @s Inventory - execute store result score $items whimc.dummy if data storage whimc:storage Inventory[] - function ./clear_functions - -function ./clear_functions: - execute if data storage whimc:storage Inventory[0].tag.barrelbot.puzzle_item: - execute store result score $slot whimc.dummy run data get storage whimc:storage Inventory[0].Slot - for i in range(0, 36): - raw f"execute if score $slot whimc.dummy matches {i} run item replace entity @s container.{i} with air" - - scoreboard players remove $items whimc.dummy 1 - data remove storage whimc:storage Inventory[0] - execute if score $items whimc.dummy matches 1.. run function ./clear_functions \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_item.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_item.mcfunction deleted file mode 100644 index 20cf659..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/return_item.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> whimc:barrelbot/no_smuggle/return_item -# Spawns a singular item back at the hopper - -execute store result score $temp whimc.barrelbot.puzzle_id run data get storage whimc:storage Inventory[0].tag.barrelbot.puzzle_id -execute at @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] positioned ^1 ^ ^-1 run summon item ~ ~ ~ {Item:{id:"minecraft:stone",Count:1b},PickupDelay:100000000,Age:0,Tags:["whimc.item.init"]} -execute at @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] positioned ^ ^ ^-1 run particle end_rod ~ ~ ~ 0.05 0.05 0.05 0 1 normal -execute at @e[type=text_display,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_id] positioned ^ ^ ^-1 run playsound minecraft:entity.item.pickup block @a ~ ~ ~ 1.5 1 - -data modify entity @e[type=item,limit=1,tag=whimc.item.init] Item set from storage whimc:storage Inventory[0] -tag @e[type=item,limit=1,tag=whimc.item.init] remove whimc.item.init \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/scan_for_mismatch.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/scan_for_mismatch.mcfunction deleted file mode 100644 index bd5b152..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/scan_for_mismatch.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> whimc:barrelbot/no_smuggle/scan_for_mismatch -# Checks to see if the player has an instruction to a puzzle they shouldn't, - -data modify storage whimc:storage TempInventory set from storage whimc:storage Inventory -$data remove storage whimc:storage TempInventory[{tag:{barrelbot:{puzzle_id:$(id)}}}] - -execute if data storage whimc:storage TempInventory[{tag:{barrelbot:{puzzle_item:1b}}}] run function whimc:barrelbot/no_smuggle/return_all_items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/volume_check.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/volume_check.mcfunction deleted file mode 100644 index 694a74b..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/no_smuggle/volume_check.mcfunction +++ /dev/null @@ -1,4 +0,0 @@ -#> whimc:barrelbot/no_smuggle/volume_check -# Checks the volume to see if the player has left it - -$execute unless entity @s[x=$(x),y=$(y),z=$(z),dx=$(dx),dy=$(dy),dz=$(dz)] run function whimc:barrelbot/no_smuggle/return_all_items \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/barrelbot/success_conditions/touch_green.mcfunction b/datapack/Barrelbot/data/whimc/functions/barrelbot/success_conditions/touch_green.mcfunction deleted file mode 100644 index 574f31a..0000000 --- a/datapack/Barrelbot/data/whimc/functions/barrelbot/success_conditions/touch_green.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -#> whimc:barrelbot/success_conditions/touch_green -# Succeeds if all barrelbots are on a green space - -scoreboard players set $success whimc.dummy 1 -execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s unless block ~ ~-1 ~ minecraft:lime_concrete run scoreboard players set $success whimc.dummy 0 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/technical/click_wfoas.mcfunction b/datapack/Barrelbot/data/whimc/functions/technical/click_wfoas.mcfunction deleted file mode 100644 index 445bc7f..0000000 --- a/datapack/Barrelbot/data/whimc/functions/technical/click_wfoas.mcfunction +++ /dev/null @@ -1,16 +0,0 @@ -#> whimc:technical/click_wfoas -# Run when a player clicks a warped fungus on a stick - - -scoreboard players set @s whimc.click_wfoas 0 - -#Determine data of item that was clicked -execute if predicate whimc:holding_coas_mainhand run return 0 - -execute store result score #hand whimc.dummy if predicate whimc:holding_wfoas_mainhand -execute if score #hand whimc.dummy matches 1 run data modify storage whimc:storage ClickedItem set from entity @s SelectedItem -execute if score #hand whimc.dummy matches 0 run data modify storage whimc:storage ClickedItem set from entity @s Inventory[{Slot:-106b}] - -########################################################################################### - -execute if data storage whimc:storage {ClickedItem:{tag:{whimc_puzzle_wand:1b}}} run function whimc:barrelbot/editor/edit_wand/click \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/technical/load.mcfunction b/datapack/Barrelbot/data/whimc/functions/technical/load.mcfunction deleted file mode 100644 index 3fbe7be..0000000 --- a/datapack/Barrelbot/data/whimc/functions/technical/load.mcfunction +++ /dev/null @@ -1,65 +0,0 @@ -#> whimc:technical/load -# Sets up all necessary scoreboards - -scoreboard objectives add whimc.timer dummy -scoreboard objectives add whimc.click minecraft.used:minecraft.carrot_on_a_stick -scoreboard objectives add whimc.click_wfoas minecraft.used:minecraft.warped_fungus_on_a_stick -scoreboard objectives add whimc.dummy dummy - -scoreboard objectives add whimc.barrelbot.slot dummy -scoreboard objectives add whimc.barrelbot.step_timer dummy -scoreboard objectives add whimc.barrelbot.puzzle_id dummy -scoreboard objectives add whimc.barrelbot.bot_id dummy -scoreboard objectives add whimc.barrelbot.node_id dummy -scoreboard objectives add whimc.button_delay dummy -scoreboard objectives add whimc.barrelbot.display_layer dummy -scoreboard objectives add whimc.barrelbot.push_count dummy -scoreboard objectives add whimc.barrelbot.in_puzzle_id dummy -scoreboard objectives add whimc.barrelbot.puzzle_type_id dummy -scoreboard objectives add whimc.barrelbot.edit_instance_id dummy - -scoreboard objectives add whimc.barrelbot.ui.stored_x dummy -scoreboard objectives add whimc.barrelbot.ui.stored_y dummy -scoreboard objectives add whimc.barrelbot.ui.stored_scale dummy - -#Bounding box -scoreboard objectives add whimc.barrelbot.bound_x dummy -scoreboard objectives add whimc.barrelbot.bound_y dummy -scoreboard objectives add whimc.barrelbot.bound_z dummy -scoreboard objectives add whimc.barrelbot.bound_dx dummy -scoreboard objectives add whimc.barrelbot.bound_dy dummy -scoreboard objectives add whimc.barrelbot.bound_dz dummy - -#Cloning -scoreboard objectives add whimc.barrelbot.cascade.x dummy -scoreboard objectives add whimc.barrelbot.cascade.z dummy -scoreboard objectives add whimc.barrelbot.cascade.x_spacing dummy -scoreboard objectives add whimc.barrelbot.cascade.z_spacing dummy - -#Math -scoreboard objectives add whimc.math.ux dummy -scoreboard objectives add whimc.math.uy dummy -scoreboard objectives add whimc.math.uz dummy -scoreboard objectives add whimc.math.vx dummy -scoreboard objectives add whimc.math.vy dummy -scoreboard objectives add whimc.math.vz dummy -scoreboard objectives add whimc.math.wx dummy -scoreboard objectives add whimc.math.wy dummy -scoreboard objectives add whimc.math.wz dummy - -#Storage things -#declare storage whimc:macro -#declare storage whimc:storage - -#declare storage whimc:const -data modify storage whimc:const text.barrelbot.start set value '{"text":"Run","color":"green","bold":true}' -data modify storage whimc:const text.barrelbot.stop set value '{"text":"Reset","color":"red","bold":true}' -function whimc:barrelbot/editor/edit_wand/edit_mode/pages/register_pages - -#Constants -scoreboard objectives add whimc.const dummy -scoreboard players set #MAX_RECURSION_DEPTH whimc.const 32 -scoreboard players set #DISPLAY_WIDTH whimc.const 9 -scoreboard players set #EDITOR_DISPLAY_DISTANCE whimc.const 1250 -scoreboard players set #-1 whimc.const -1 -scoreboard players set #1000 whimc.const 1000 diff --git a/datapack/Barrelbot/data/whimc/functions/technical/slow_tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/technical/slow_tick.mcfunction deleted file mode 100644 index 0439c76..0000000 --- a/datapack/Barrelbot/data/whimc/functions/technical/slow_tick.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> whimc:technical/slow_tick -# Runs once every 5 ticks - -execute as @e[type=item_display,tag=whimc.barrelbot] at @s if block ~ ~ ~ air run function whimc:barrelbot/bot/kill -execute as @e[type=marker,tag=whimc.barrelbot.function] at @s if block ~ ~ ~ air run function whimc:barrelbot/functions/delete -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager] at @s if block ~ ~ ~ air run function whimc:barrelbot/manager/delete_puzzle - -scoreboard players set #slow_tick whimc.dummy 0 \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/functions/technical/tick.mcfunction b/datapack/Barrelbot/data/whimc/functions/technical/tick.mcfunction deleted file mode 100644 index 73f0040..0000000 --- a/datapack/Barrelbot/data/whimc/functions/technical/tick.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> whimc:technical/tick -# Commands run per tick - -#Barrelbot -execute as @e[type=text_display,tag=whimc.barrelbot.puzzle_manager] at @s run function whimc:barrelbot/manager/tick -execute as @a[tag=whimc.in_puzzle] at @s run function whimc:barrelbot/no_smuggle/check_leave_boundary -execute as @a[tag=whimc.barrelbot.cloning] at @s run function whimc:barrelbot/clone/tick -execute as @a[tag=whimc.dragging_node] at @s run function whimc:barrelbot/editor/drag/drag_tick -execute as @a[predicate=whimc:barrelbot/holding_edit_wand] run function whimc:barrelbot/dev/highlight_linked_puzzle -execute as @a[tag=whimc.in_edit_menu] at @s run function whimc:barrelbot/editor/edit_wand/edit_mode/edit_tick -scoreboard players add #slow_tick whimc.dummy 1 -execute if score #slow_tick whimc.dummy matches 5.. run function whimc:technical/slow_tick - -execute as @a[scores={whimc.click_wfoas=1..}] at @s run function whimc:technical/click_wfoas \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_id.json b/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_id.json deleted file mode 100644 index b9b17aa..0000000 --- a/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_id.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "function": "minecraft:set_nbt", - "tag": "{barrelbot:{instruction:\"function\"}}" - }, - { - "function": "minecraft:copy_nbt", - "source": { - "type": "minecraft:storage", - "source": "whimc:storage" - }, - "ops": [ - { - "source": "item_modifier.id", - "target": "barrelbot.function_id", - "op": "replace" - } - ] - } - ] - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_item.json b/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_item.json deleted file mode 100644 index cf8eec2..0000000 --- a/datapack/Barrelbot/data/whimc/item_modifiers/barrelbot/set_function_item.json +++ /dev/null @@ -1,33 +0,0 @@ -[ - { - "function": "minecraft:copy_nbt", - "source": { - "type": "minecraft:storage", - "source": "whimc:storage" - }, - "ops": [ - { - "source": "item.tag.display.Name", - "target": "barrelbot.function_id", - "op": "replace" - } - ] - }, - { - "function": "minecraft:set_lore", - "lore": [ - { - "text": " " - }, - { - "text": "Function", - "color": "blue", - "italic": false - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{barrelbot:{instruction:\"function\"},Enchantments:[{}]}" - } -] diff --git a/datapack/Barrelbot/data/whimc/loot_tables/edit_wand.json b/datapack/Barrelbot/data/whimc/loot_tables/edit_wand.json deleted file mode 100644 index 54f1794..0000000 --- a/datapack/Barrelbot/data/whimc/loot_tables/edit_wand.json +++ /dev/null @@ -1,38 +0,0 @@ -{ - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:warped_fungus_on_a_stick", - "functions": [ - { - "function": "minecraft:set_lore", - "lore": [ - { - "text": "Right click to edit puzzle features", - "color": "gray", - "italic": false - } - ] - }, - { - "function": "minecraft:set_nbt", - "tag": "{Enchantments:[{}],whimc_puzzle_wand:1b}" - }, - { - "function": "minecraft:set_name", - "name": { - "text": "Puzzle Wand", - "color": "#FFD9B8", - "italic": false - } - } - ] - } - ] - } - ] - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/modules/main.bolt b/datapack/Barrelbot/data/whimc/modules/main.bolt deleted file mode 100644 index 523b691..0000000 --- a/datapack/Barrelbot/data/whimc/modules/main.bolt +++ /dev/null @@ -1,2 +0,0 @@ -import whimc:pages as pages -import whimc:success_conditions as sc \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/modules/pages.bolt b/datapack/Barrelbot/data/whimc/modules/pages.bolt deleted file mode 100644 index 80ca0d2..0000000 --- a/datapack/Barrelbot/data/whimc/modules/pages.bolt +++ /dev/null @@ -1,35 +0,0 @@ -#> pages.bolt -# Loads all pages for the barrelbot editor - - -import whimc:utils as utils -import whimc:ui_buttons as buttons - -append function whimc:barrelbot/editor/edit_wand/edit_mode/pages/register_pages: - data modify storage whimc:const WandPages set value [] - - -# Barrelbot -barrelbot_page = utils.WandPage("barrelbot") -#barrelbot_page.add_button(buttons.swap_mode, [0, -0.35]) -barrelbot_page.add_button_array([buttons.lock, buttons.swap_mode, buttons.set_bot_success_condition], [0, -0.35]) -barrelbot_page.add_button(buttons.close, [0, -0.75]) -barrelbot_page.add_text([0.0, 0.5, 0.1], [1.0, 1.0, 1.0], '{"text":"Barrelbot","color":"yellow"}') - -# Sub-page: Barrelbot success conditions -#utils.multipage_array([buttons.swap_mode, buttons.swap_mode, buttons.swap_mode, buttons.swap_mode, buttons.swap_mode], 2, "test", "Test", "hi") -#go_to_test = utils.WandButton("go_to_test", [0.5, 0.5], 130000) -#go_to_test.page_link = "test_0" -#go_to_test.hover_text = "Open test menu" -#barrelbot_page.add_button(go_to_test, [1.5, 0.3]) - -# Puzzle button -puzzle_page = utils.WandPage("puzzle") -puzzle_page.add_button(buttons.close, [0, -0.75]) - -puzzle_page.add_button_array([buttons.toggle_size_editor, buttons.set_success_condition], [0, -0.35]) - -# Function -function_page = utils.WandPage("function") -function_page.add_button(buttons.lock, [0, -0.35]) -function_page.add_button(buttons.close, [0, -0.75]) \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/modules/success_conditions.bolt b/datapack/Barrelbot/data/whimc/modules/success_conditions.bolt deleted file mode 100644 index 75c0878..0000000 --- a/datapack/Barrelbot/data/whimc/modules/success_conditions.bolt +++ /dev/null @@ -1,45 +0,0 @@ -import whimc:utils as utils - -## PUZZLE SUCCESS CONDITIONS - -# Succeed if all barrelbots are on green -with utils.add_success_condition("touch_green", "Touch Green", 130001): - scoreboard players set $success whimc.dummy 1 - execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s unless block ~ ~-1 ~ minecraft:lime_concrete run scoreboard players set $success whimc.dummy 0 - -with utils.add_success_condition("touch_observer", "Touch Observer",130004): - scoreboard players set $success whimc.dummy 1 - execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s unless block ~ ~-1 ~ minecraft:observer run scoreboard players set $success whimc.dummy 0 - -# Defer success condition to individual barrelbots -with utils.add_success_condition("defer", "Defer to Barrelbots"): - scoreboard players set $failure_found whimc.dummy 0 - execute as @e[type=item_display,tag=whimc.barrelbot,tag=!whimc.dispenser_bot,predicate=whimc:barrelbot/match_id] at @s: - data remove storage whimc:macro success_condition.function - execute on passengers run data modify storage whimc:macro success_condition.function set from entity @s data.success_function - with storage whimc:macro success_condition: - scoreboard players set $success whimc.dummy 1 - $function whimc:barrelbot/bot_success_conditions/$(function) - execute if score $success whimc.dummy matches 0 run scoreboard players set $failure_found whimc.dummy 1 - - scoreboard players set $success whimc.dummy 0 - execute if score $failure_found whimc.dummy matches 0 run scoreboard players set $success whimc.dummy 1 - - -## BOT SUCCESS CONDITIONS - -# Succeeds if the barrelbot is on lime concrete -with utils.add_bot_success_condition("touch_green", "Touch Green", 130001): - scoreboard players set $success whimc.dummy 0 - execute if block ~ ~-1 ~ lime_concrete run scoreboard players set $success whimc.dummy 1 - -with utils.add_bot_success_condition("touch_blue", "Touch Blue", 130007): - scoreboard players set $success whimc.dummy 0 - execute if block ~ ~-1 ~ light_blue_concrete run scoreboard players set $success whimc.dummy 1 - -with utils.add_bot_success_condition("touch_observer", "Touch Observer", 130004): - execute store result score $success whimc.dummy if block ~ ~-1 ~ observer - - -utils.create_success_conditions_page() -utils.create_bot_success_conditions_page() \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/modules/ui_buttons.bolt b/datapack/Barrelbot/data/whimc/modules/ui_buttons.bolt deleted file mode 100644 index 05362f8..0000000 --- a/datapack/Barrelbot/data/whimc/modules/ui_buttons.bolt +++ /dev/null @@ -1,54 +0,0 @@ -# Defines all buttons for the wand UI pages and their functions - -import whimc:utils as utils - -## Barrelbot - -# Swap mode -swap_mode = utils.WandButton("swap_mode", [0.3, 0.3], 130000) -with swap_mode.create_function(): - scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id - execute as @e[type=item_display,tag=whimc.barrelbot,predicate=whimc:barrelbot/match_edit_id] at @s run function whimc:barrelbot/dispenser_bot/toggle - -swap_mode.hover_text = "Toggle Dispenser Mode" - -# Bot success condition -set_bot_success_condition = utils.WandButton("set_bot_success_condition", [0.3, 0.3], 130001) -set_bot_success_condition.page_link = "bot_success_conditions_0" -set_bot_success_condition.hover_text = "Set Success Condition" - -## Puzzle - -# Success condition -set_success_condition = utils.WandButton("set_success_condition", [0.3, 0.3], 130001) -set_success_condition.page_link = "success_conditions_0" -set_success_condition.hover_text = "Set Success Condition" - -# Toggle size editor -toggle_size_editor = utils.WandButton("toggle_size_editor", [0.3, 0.3], 130006) -with toggle_size_editor.create_function(): - scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id - execute as @e[type=text_display,limit=1,tag=whimc.barrelbot.puzzle_manager,predicate=whimc:barrelbot/match_edit_id] on passengers at @s run function whimc:barrelbot/editor/toggle_edit_mode - -toggle_size_editor.hover_text = "Toggle Size Editor" - -## Function - -lock = utils.WandButton("lock", [0.3, 0.3], 130005) -with lock.create_function(): - scoreboard players operation $temp whimc.barrelbot.edit_instance_id = @s whimc.barrelbot.edit_instance_id - execute as @e[type=marker,tag=whimc.barrelbot.function,predicate=whimc:barrelbot/match_edit_id] at @s positioned ~ ~1 ~ as @e[type=item_display,tag=whimc.function_display,distance=..0.001] run function whimc:barrelbot/functions/interact/lock - -lock.hover_text = "Lock/Unlock Function" - -## General - -close = utils.WandButton("close", [0.25, 0.25], 129999) -with close.create_function(): - execute on vehicle run function whimc:barrelbot/editor/edit_wand/delete_edit_instance - ride @s dismount - tp @s ~ ~ ~ - tag @s remove whimc.in_edit_menu - title @s actionbar "" - -close.hover_text = "Exit Menu" \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/modules/utils.bolt b/datapack/Barrelbot/data/whimc/modules/utils.bolt deleted file mode 100644 index 3bac3c5..0000000 --- a/datapack/Barrelbot/data/whimc/modules/utils.bolt +++ /dev/null @@ -1,149 +0,0 @@ -#> Barrelbot bolt utils -# -# - -from contextlib import contextmanager -from nbtlib import parse_nbt -import math - -## Edit wand: UI Page and Button commands - -class WandPage: - def __init__(self, _name): - self.name = _name - self.Buttons = [] - append function whimc:barrelbot/editor/edit_wand/edit_mode/pages/register_pages: - function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{_name}" - data modify storage whimc:const WandPages append from storage whimc:storage Page - - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{_name}": - data modify storage whimc:storage Page set value {Buttons:[],Text:[]} - data modify storage whimc:storage Page.key set value f"{_name}" - - def add_button(self, button, pos): - x_min = (int) ((pos[0] + button.size[0] / 2) * -1000) - y_min = (int) ((pos[1] - button.size[1] / 2) * 1000) - x_max = (int) ((pos[0] - button.size[0] / 2) * -1000) - y_max = (int) ((pos[1] + button.size[1] / 2) * 1000) - - - # This is probably a horrible way of coding this but idk bolt well enough to write it more concisely. It gets the job done - # (P.S) the job is adding the command to add the button to storage. The different cases correspond to whether the button has a command, page link, both, or neither - if button.command != "" and button.page_link == "": - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:white_stained_glass_pane",tag:{CustomModelData:button.cmd}},x_min:x_min,x_max:x_max,y_min:y_min,y_max:y_max,command:f"{button.command}",hover_text:button.hover_text} - elif button.command == "" and button.page_link != "": - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:white_stained_glass_pane",tag:{CustomModelData:button.cmd}},x_min:x_min,x_max:x_max,y_min:y_min,y_max:y_max,page:f"{button.page_link}",hover_text:button.hover_text} - elif button.command != "" and button.page_link != "": - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:white_stained_glass_pane",tag:{CustomModelData:button.cmd}},x_min:x_min,x_max:x_max,y_min:y_min,y_max:y_max,command:f"{button.command}",page:f"{button.page_link}",hover_text:button.hover_text} - else: - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - data modify storage whimc:storage Page.Buttons append value {item:{id:"minecraft:white_stained_glass_pane",tag:{CustomModelData:button.cmd}},x_min:x_min,x_max:x_max,y_min:y_min,y_max:y_max,hover_text:button.hover_text} - - def add_text(self, translation, scale, text_provider): - append function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - formatted_translation = parse_nbt(f"[{translation[0]}f, {translation[1]}f, {translation[2]}f]") - formatted_scale = parse_nbt(f"[{scale[0]}f, {scale[1]}f, {scale[2]}f]") - #nbt = parse_nbt(f'{{data:{{transformation:{{translation:{formatted_translation},scale:{formatted_scale}}}}},text_provider:text_provider}}') - - data modify storage whimc:storage Page.Text append value {data:{transformation:{translation:formatted_translation,scale:formatted_scale}},text_provider:text_provider} - - def add_button_array(self, buttons, pos_center, spacing = 0): - - # Get total width - total_width = spacing * (len(buttons) - 1) - for button in buttons: - total_width += button.size[0] - - x = pos_center[0] - total_width / 2 - y = pos_center[1] - - # Insert all the buttons - for button in buttons: - self.add_button(button, [x + button.size[0] / 2, y]) - x += button.size[0] + spacing - - -class WandButton: - def __init__(self, _name, _size, _cmd): - self.name = _name - self.size = _size - self.cmd = _cmd - self.command = "" - self.page_link = "" - self.hover_text = "" - - @contextmanager - def create_function(self): # Creates a function and sets the command to be that function - self.command = f"function whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}" - - function f"whimc:barrelbot/editor/edit_wand/edit_mode/pages/{self.name}": - yield - -def multipage_array(buttons, page_size, name, display_name, backlink): - i = 0 - page = 0 - size = buttons[0].size - page_count = round(len(buttons) / page_size + 0.5) - while i < len(buttons): - page_buttons = buttons[i:min(i+page_size, len(buttons))] - prev_page_number = (page - 1) % page_count - prev_page_button = WandButton("previous_page", size, 130002) - prev_page_button.page_link = f"{name}_{prev_page_number}" - prev_page_button.hover_text = "Previous Page" - page_buttons.insert(0, prev_page_button) - - next_page_number = (page + 1) % page_count - next_page_button = WandButton("next_page", size, 130003) - next_page_button.page_link = f"{name}_{next_page_number}" - next_page_button.hover_text = "Next Page" - page_buttons.append(next_page_button) - - - this_page = WandPage(f"{name}_{page}") - this_page.add_button_array(page_buttons, [0, -0.5]) - this_page.add_text([0, 0.75, 0], [1, 1, 1], f'{{"text":"{display_name}","color":"yellow"}}') - - page += 1 - i += page_size - -success_conditions = [] -bot_success_conditions = [] - -@contextmanager -def add_success_condition(name, display_name, custom_model_data = 0): - function f"whimc:barrelbot/success_conditions/{name}": - yield - - success_conditions.append({"name": name, "display_name": display_name, "custom_model_data": custom_model_data}) - -@contextmanager -def add_bot_success_condition(name, display_name, custom_model_data = 0): - function f"whimc:barrelbot/bot_success_conditions/{name}": - yield - - bot_success_conditions.append({"name": name, "display_name": display_name, "custom_model_data": custom_model_data}) - -def create_success_conditions_page(): - buttons = [] - - for x in success_conditions: - button = WandButton(x["name"], [0.3, 0.3], x["custom_model_data"]) - button.command = f'data modify entity @e[type=marker,limit=1,tag=whimc.barrelbot.puzzle_storage,predicate=whimc:barrelbot/match_edit_id] data.success_function set value {x["name"]}' - button.hover_text = x["display_name"] - buttons.append(button) - - multipage_array(buttons, 5, "success_conditions", "Success Conditions", "puzzle") - -def create_bot_success_conditions_page(): - buttons = [] - - for x in bot_success_conditions: - button = WandButton(x["name"], [0.3, 0.3], x["custom_model_data"]) - button.command = f'execute as @e[type=item_display,limit=1,tag=whimc.barrelbot,predicate=whimc:barrelbot/match_edit_id] on passengers run data modify entity @s[type=marker] data.success_function set value {x["name"]}' - button.hover_text = x["display_name"] - buttons.append(button) - - multipage_array(buttons, 5, "bot_success_conditions", "Success Conditions", "barrelbot") \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_dev_book.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_dev_book.json deleted file mode 100644 index ae1a1f1..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_dev_book.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:written_book" - ], - "nbt": "{barrelbot_dev_book:1b}" - } - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_edit_wand.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_edit_wand.json deleted file mode 100644 index 9d652b4..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/holding_edit_wand.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:warped_fungus_on_a_stick" - ], - "nbt": "{whimc_puzzle_wand:1b}" - } - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_bot_id.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_bot_id.json deleted file mode 100644 index ba0f2bf..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_bot_id.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "whimc.barrelbot.bot_id": { - "min": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.bot_id" - }, - "max": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.bot_id" - } - } - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_edit_id.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_edit_id.json deleted file mode 100644 index 98e9406..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_edit_id.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "whimc.barrelbot.edit_instance_id": { - "min": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.edit_instance_id" - }, - "max": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.edit_instance_id" - } - } - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_id.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_id.json deleted file mode 100644 index e18acfd..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_id.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "whimc.barrelbot.puzzle_id": { - "min": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.puzzle_id" - }, - "max": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.puzzle_id" - } - } - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_node_id.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_node_id.json deleted file mode 100644 index 84a8b12..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_node_id.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "whimc.barrelbot.node_id": { - "min": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.node_id" - }, - "max": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.node_id" - } - } - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_puzzle_type_id.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_puzzle_type_id.json deleted file mode 100644 index 3b55951..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/match_puzzle_type_id.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "condition": "minecraft:entity_scores", - "entity": "this", - "scores": { - "whimc.barrelbot.puzzle_type_id": { - "min": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.puzzle_type_id" - }, - "max": { - "type": "minecraft:score", - "target": { - "type": "minecraft:fixed", - "name": "$temp" - }, - "score": "whimc.barrelbot.puzzle_type_id" - } - } - } - } \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/barrelbot/riding_edit_instance.json b/datapack/Barrelbot/data/whimc/predicates/barrelbot/riding_edit_instance.json deleted file mode 100644 index 8ca315c..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/barrelbot/riding_edit_instance.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "vehicle": { - "type": "minecraft:item_display", - "nbt": "{Tags:[\"whimc.editor_base\"]}" - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/has_riding_player.json b/datapack/Barrelbot/data/whimc/predicates/has_riding_player.json deleted file mode 100644 index f21b49d..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/has_riding_player.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "passenger": { - "type": "minecraft:player" - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/holding_coas_mainhand.json b/datapack/Barrelbot/data/whimc/predicates/holding_coas_mainhand.json deleted file mode 100644 index 60c59d4..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/holding_coas_mainhand.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:carrot_on_a_stick" - ] - } - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/holding_demo_hologram.json b/datapack/Barrelbot/data/whimc/predicates/holding_demo_hologram.json deleted file mode 100644 index d55cb86..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/holding_demo_hologram.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:carrot_on_a_stick" - ], - "nbt": "{hologram_demo:1b}" - } - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/predicates/holding_wfoas_mainhand.json b/datapack/Barrelbot/data/whimc/predicates/holding_wfoas_mainhand.json deleted file mode 100644 index 244dac7..0000000 --- a/datapack/Barrelbot/data/whimc/predicates/holding_wfoas_mainhand.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "condition": "minecraft:entity_properties", - "entity": "this", - "predicate": { - "equipment": { - "mainhand": { - "items": [ - "minecraft:warped_fungus_on_a_stick" - ] - } - } - } - } - \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/tags/blocks/barrelbot.json b/datapack/Barrelbot/data/whimc/tags/blocks/barrelbot.json deleted file mode 100644 index 127e14c..0000000 --- a/datapack/Barrelbot/data/whimc/tags/blocks/barrelbot.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "values": [ - "minecraft:barrel", - "minecraft:dispenser" - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/tags/blocks/custom_blocks.json b/datapack/Barrelbot/data/whimc/tags/blocks/custom_blocks.json deleted file mode 100644 index c224d12..0000000 --- a/datapack/Barrelbot/data/whimc/tags/blocks/custom_blocks.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:barrel", - "minecraft:shulker_box", - "minecraft:dispenser" - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/data/whimc/tags/blocks/death_rayable.json b/datapack/Barrelbot/data/whimc/tags/blocks/death_rayable.json deleted file mode 100644 index 4917d26..0000000 --- a/datapack/Barrelbot/data/whimc/tags/blocks/death_rayable.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "values": [ - "minecraft:air", - "minecraft:barrel", - "minecraft:dispenser" - ] -} \ No newline at end of file diff --git a/datapack/Barrelbot/pack.mcmeta b/datapack/Barrelbot/pack.mcmeta deleted file mode 100644 index d63a7ed..0000000 --- a/datapack/Barrelbot/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 18, - "description": "Barrelbot + WHIMC Exoplanets" - } -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/atlases/blocks.json b/resourcepack/assets/minecraft/atlases/blocks.json deleted file mode 100644 index a8f1a65..0000000 --- a/resourcepack/assets/minecraft/atlases/blocks.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "sources": [ - {"type": "single","resource": "whimc:barrelbot/execution_display/barrelbot"}, - {"type": "single","resource": "whimc:barrelbot/execution_display/cursor"}, - {"type": "single","resource": "whimc:barrelbot/execution_display/function"}, - {"type": "single","resource": "whimc:barrelbot/instructions/move_forward"}, - {"type": "single","resource": "whimc:barrelbot/instructions/turn_left"}, - {"type": "single","resource": "whimc:barrelbot/instructions/turn_right"}, - {"type": "single","resource": "whimc:barrelbot/instructions/end_code_block"}, - {"type": "single","resource": "whimc:barrelbot/instructions/loop"}, - {"type": "single","resource": "whimc:barrelbot/instructions/if"}, - {"type": "single","resource": "whimc:barrelbot/faces/top"}, - {"type": "single","resource": "whimc:barrelbot/faces/side"}, - {"type": "single","resource": "whimc:barrelbot/faces/neutral"}, - {"type": "single","resource": "whimc:barrelbot/faces/happy"}, - {"type": "single","resource": "whimc:barrelbot/faces/short_circuited"}, - {"type": "single","resource": "whimc:barrelbot/faces/dispenser/neutral"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_bottom"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_side"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_front"}, - {"type": "single","resource": "whimc:barrelbot/block/barrelbot_top"}, - {"type": "single","resource": "whimc:barrelbot/ui/close"}, - {"type": "single","resource": "whimc:barrelbot/ui/barrelbot/swap_mode"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/barrel.json b/resourcepack/assets/minecraft/models/item/barrel.json deleted file mode 100644 index a421fe8..0000000 --- a/resourcepack/assets/minecraft/models/item/barrel.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/barrel", - "overrides": [ - { "predicate": {"custom_model_data": 130123}, "model": "whimc:barrelbot/block/barrelbot"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/barrier.json b/resourcepack/assets/minecraft/models/item/barrier.json deleted file mode 100644 index c0ea41d..0000000 --- a/resourcepack/assets/minecraft/models/item/barrier.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/barrier" - }, - "overrides": [ - { "predicate": {"custom_model_data": 129999}, "model": "whimc:barrelbot/ui/close"}, - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/ui/barrelbot/swap_mode"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/black_stained_glass_pane.json b/resourcepack/assets/minecraft/models/item/black_stained_glass_pane.json deleted file mode 100644 index 6a53be4..0000000 --- a/resourcepack/assets/minecraft/models/item/black_stained_glass_pane.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/black_stained_glass" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/faces/neutral"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/faces/happy"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/faces/short_circuited"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/book.json b/resourcepack/assets/minecraft/models/item/book.json deleted file mode 100644 index d15f012..0000000 --- a/resourcepack/assets/minecraft/models/item/book.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/book" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/instructions/move_forward"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/instructions/turn_left"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/instructions/turn_right"}, - { "predicate": {"custom_model_data": 130003}, "model": "whimc:barrelbot/instructions/end_code_block"}, - { "predicate": {"custom_model_data": 130004}, "model": "whimc:barrelbot/instructions/if"}, - { "predicate": {"custom_model_data": 130005}, "model": "whimc:barrelbot/instructions/loop"} - - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/glowstone_dust.json b/resourcepack/assets/minecraft/models/item/glowstone_dust.json deleted file mode 100644 index ec12cee..0000000 --- a/resourcepack/assets/minecraft/models/item/glowstone_dust.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:item/glowstone_dust" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/execution_display/barrelbot"}, - { "predicate": {"custom_model_data": 130001}, "model": "whimc:barrelbot/execution_display/cursor"}, - { "predicate": {"custom_model_data": 130002}, "model": "whimc:barrelbot/execution_display/function"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/models/item/red_stained_glass_pane.json b/resourcepack/assets/minecraft/models/item/red_stained_glass_pane.json deleted file mode 100644 index 8599e65..0000000 --- a/resourcepack/assets/minecraft/models/item/red_stained_glass_pane.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "minecraft:block/red_stained_glass" - }, - "overrides": [ - { "predicate": {"custom_model_data": 130000}, "model": "whimc:barrelbot/faces/dispenser/neutral"} - ] -} \ No newline at end of file diff --git a/resourcepack/assets/minecraft/textures/block/comparator.png b/resourcepack/assets/minecraft/textures/block/comparator.png deleted file mode 100644 index ba66af5..0000000 Binary files a/resourcepack/assets/minecraft/textures/block/comparator.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/block/comparator_on.png b/resourcepack/assets/minecraft/textures/block/comparator_on.png deleted file mode 100644 index 22ef01f..0000000 Binary files a/resourcepack/assets/minecraft/textures/block/comparator_on.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/block/observer_front.png b/resourcepack/assets/minecraft/textures/block/observer_front.png deleted file mode 100644 index 6ad4758..0000000 Binary files a/resourcepack/assets/minecraft/textures/block/observer_front.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/block/repeater.png b/resourcepack/assets/minecraft/textures/block/repeater.png deleted file mode 100644 index 943a527..0000000 Binary files a/resourcepack/assets/minecraft/textures/block/repeater.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/block/repeater_on.png b/resourcepack/assets/minecraft/textures/block/repeater_on.png deleted file mode 100644 index 209d084..0000000 Binary files a/resourcepack/assets/minecraft/textures/block/repeater_on.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/entity/armorstand/blank.png b/resourcepack/assets/minecraft/textures/entity/armorstand/blank.png deleted file mode 100644 index ec92780..0000000 Binary files a/resourcepack/assets/minecraft/textures/entity/armorstand/blank.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/entity/armorstand/wood.png b/resourcepack/assets/minecraft/textures/entity/armorstand/wood.png deleted file mode 100644 index 98df014..0000000 Binary files a/resourcepack/assets/minecraft/textures/entity/armorstand/wood.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/environment/clouds.png b/resourcepack/assets/minecraft/textures/environment/clouds.png deleted file mode 100644 index 2a3ad3f..0000000 Binary files a/resourcepack/assets/minecraft/textures/environment/clouds.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/environment/moon_phases.png b/resourcepack/assets/minecraft/textures/environment/moon_phases.png deleted file mode 100644 index 05195d2..0000000 Binary files a/resourcepack/assets/minecraft/textures/environment/moon_phases.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/environment/rain.png b/resourcepack/assets/minecraft/textures/environment/rain.png deleted file mode 100644 index abed9f9..0000000 Binary files a/resourcepack/assets/minecraft/textures/environment/rain.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/environment/sun.png b/resourcepack/assets/minecraft/textures/environment/sun.png deleted file mode 100644 index fa3cc4b..0000000 Binary files a/resourcepack/assets/minecraft/textures/environment/sun.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/gui/book.png b/resourcepack/assets/minecraft/textures/gui/book.png deleted file mode 100644 index d6f33dd..0000000 Binary files a/resourcepack/assets/minecraft/textures/gui/book.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/gui/options_background.png b/resourcepack/assets/minecraft/textures/gui/options_background.png deleted file mode 100644 index 460a53c..0000000 Binary files a/resourcepack/assets/minecraft/textures/gui/options_background.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/book.png b/resourcepack/assets/minecraft/textures/item/book.png deleted file mode 100644 index 2d0977f..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/book.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/enchanted_book.png b/resourcepack/assets/minecraft/textures/item/enchanted_book.png deleted file mode 100644 index 2d0977f..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/enchanted_book.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/filled_map_markings.png b/resourcepack/assets/minecraft/textures/item/filled_map_markings.png deleted file mode 100644 index e327442..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/filled_map_markings.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/iron_boots.png b/resourcepack/assets/minecraft/textures/item/iron_boots.png deleted file mode 100644 index d6eef7a..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/iron_boots.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/iron_chestplate.png b/resourcepack/assets/minecraft/textures/item/iron_chestplate.png deleted file mode 100644 index d1fd4ed..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/iron_chestplate.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/iron_helmet.png b/resourcepack/assets/minecraft/textures/item/iron_helmet.png deleted file mode 100644 index 1db2db5..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/iron_helmet.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/iron_leggings.png b/resourcepack/assets/minecraft/textures/item/iron_leggings.png deleted file mode 100644 index 1dca075..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/iron_leggings.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/map_filled.png b/resourcepack/assets/minecraft/textures/item/map_filled.png deleted file mode 100644 index ce4356e..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/map_filled.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/writable_book.png b/resourcepack/assets/minecraft/textures/item/writable_book.png deleted file mode 100644 index 2d0977f..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/writable_book.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/item/written_book.png b/resourcepack/assets/minecraft/textures/item/written_book.png deleted file mode 100644 index 2d0977f..0000000 Binary files a/resourcepack/assets/minecraft/textures/item/written_book.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/map/map_background.png b/resourcepack/assets/minecraft/textures/map/map_background.png deleted file mode 100644 index 6ffa524..0000000 Binary files a/resourcepack/assets/minecraft/textures/map/map_background.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/map/map_background_checkerboard.png b/resourcepack/assets/minecraft/textures/map/map_background_checkerboard.png deleted file mode 100644 index 6ffa524..0000000 Binary files a/resourcepack/assets/minecraft/textures/map/map_background_checkerboard.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png b/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png deleted file mode 100644 index 1bb8eb1..0000000 Binary files a/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png.mcmeta b/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png.mcmeta deleted file mode 100644 index 5b992c3..0000000 --- a/resourcepack/assets/minecraft/textures/misc/pumpkinblur.png.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "texture": { - "blur": true - } -} - diff --git a/resourcepack/assets/minecraft/textures/models/armor/iron_layer_1.png b/resourcepack/assets/minecraft/textures/models/armor/iron_layer_1.png deleted file mode 100644 index fcc9926..0000000 Binary files a/resourcepack/assets/minecraft/textures/models/armor/iron_layer_1.png and /dev/null differ diff --git a/resourcepack/assets/minecraft/textures/models/armor/iron_layer_2.png b/resourcepack/assets/minecraft/textures/models/armor/iron_layer_2.png deleted file mode 100644 index 138c7ec..0000000 Binary files a/resourcepack/assets/minecraft/textures/models/armor/iron_layer_2.png and /dev/null differ diff --git a/resourcepack/assets/whimc/models/barrelbot/block/barrelbot.json b/resourcepack/assets/whimc/models/barrelbot/block/barrelbot.json deleted file mode 100644 index ca436b5..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/block/barrelbot.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "parent": "minecraft:block/orientable_with_bottom", - "textures": { - "front": "whimc:barrelbot/block/barrelbot_front", - "side": "whimc:barrelbot/block/barrelbot_side", - "top": "whimc:barrelbot/block/barrelbot_top", - "bottom": "whimc:barrelbot/block/barrelbot_bottom" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/execution_display/barrelbot.json b/resourcepack/assets/whimc/models/barrelbot/execution_display/barrelbot.json deleted file mode 100644 index 510bc0f..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/execution_display/barrelbot.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [256, 256], - "textures": { - "0": "whimc:barrelbot/execution_display/barrelbot", - "particle": "whimc:barrelbot/execution_display/barrelbot" - }, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 6.90909, 8], - "faces": { - "north": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "south": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0.5, 0] - }, - "gui": { - "translation": [0, 0, 0.01] - } - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/execution_display/cursor.json b/resourcepack/assets/whimc/models/barrelbot/execution_display/cursor.json deleted file mode 100644 index 344f1eb..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/execution_display/cursor.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/execution_display/cursor" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/execution_display/function.json b/resourcepack/assets/whimc/models/barrelbot/execution_display/function.json deleted file mode 100644 index 61e74f2..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/execution_display/function.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "credit": "Made with Blockbench", - "texture_size": [256, 256], - "textures": { - "0": "whimc:barrelbot/execution_display/function", - "particle": "whimc:barrelbot/execution_display/function" - }, - "elements": [ - { - "from": [0, 0, 8], - "to": [16, 6.90909, 8], - "faces": { - "north": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "east": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "south": {"uv": [0, 0, 11, 4.75], "texture": "#0"}, - "west": {"uv": [0, 0, 0, 6.90909], "texture": "#missing"}, - "up": {"uv": [0, 0, 16, 0], "texture": "#missing"}, - "down": {"uv": [0, 0, 16, 0], "texture": "#missing"} - } - } - ], - "display": { - "thirdperson_righthand": { - "translation": [0, 0.5, 0] - }, - "gui": { - "translation": [0, 0, 0.01] - } - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/faces/dispenser/neutral.json b/resourcepack/assets/whimc/models/barrelbot/faces/dispenser/neutral.json deleted file mode 100644 index 0383a63..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/faces/dispenser/neutral.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/dispenser/neutral", - "side": "minecraft:block/furnace_side", - "top": "minecraft:block/furnace_top" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/faces/happy.json b/resourcepack/assets/whimc/models/barrelbot/faces/happy.json deleted file mode 100644 index 7d8d8fb..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/faces/happy.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/happy", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/faces/neutral.json b/resourcepack/assets/whimc/models/barrelbot/faces/neutral.json deleted file mode 100644 index 21eb0a8..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/faces/neutral.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/neutral", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/faces/short_circuited.json b/resourcepack/assets/whimc/models/barrelbot/faces/short_circuited.json deleted file mode 100644 index 4d253fe..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/faces/short_circuited.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "parent": "minecraft:block/orientable", - "textures": { - "front": "whimc:barrelbot/faces/short_circuited", - "side": "whimc:barrelbot/faces/side", - "top": "whimc:barrelbot/faces/top" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/end_code_block.json b/resourcepack/assets/whimc/models/barrelbot/instructions/end_code_block.json deleted file mode 100644 index 0f3b662..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/end_code_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/end_code_block" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/if.json b/resourcepack/assets/whimc/models/barrelbot/instructions/if.json deleted file mode 100644 index a706aca..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/if.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/if" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/loop.json b/resourcepack/assets/whimc/models/barrelbot/instructions/loop.json deleted file mode 100644 index 58a044c..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/loop.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/loop" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/move_forward.json b/resourcepack/assets/whimc/models/barrelbot/instructions/move_forward.json deleted file mode 100644 index e6f3e23..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/move_forward.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/move_forward" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/turn_left.json b/resourcepack/assets/whimc/models/barrelbot/instructions/turn_left.json deleted file mode 100644 index 53bb075..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/turn_left.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/turn_left" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/instructions/turn_right.json b/resourcepack/assets/whimc/models/barrelbot/instructions/turn_right.json deleted file mode 100644 index d4eb589..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/instructions/turn_right.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/instructions/turn_right" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json b/resourcepack/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json deleted file mode 100644 index ea91c3a..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/ui/barrelbot/swap_mode.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/barrelbot/swap_mode" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/models/barrelbot/ui/close.json b/resourcepack/assets/whimc/models/barrelbot/ui/close.json deleted file mode 100644 index f7043be..0000000 --- a/resourcepack/assets/whimc/models/barrelbot/ui/close.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:item/generated", - "textures": { - "layer0": "whimc:barrelbot/ui/close" - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png b/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png deleted file mode 100644 index de0af25..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_bottom.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_front.png b/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_front.png deleted file mode 100644 index fd8bc3c..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_front.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_side.png b/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_side.png deleted file mode 100644 index fb9da44..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_side.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_top.png b/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_top.png deleted file mode 100644 index de74294..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/block/barrelbot_top.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/execution_display/barrelbot.png b/resourcepack/assets/whimc/textures/barrelbot/execution_display/barrelbot.png deleted file mode 100644 index 2d61512..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/execution_display/barrelbot.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/execution_display/cursor.png b/resourcepack/assets/whimc/textures/barrelbot/execution_display/cursor.png deleted file mode 100644 index 923caca..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/execution_display/cursor.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/execution_display/function.png b/resourcepack/assets/whimc/textures/barrelbot/execution_display/function.png deleted file mode 100644 index 6fc570c..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/execution_display/function.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png b/resourcepack/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png deleted file mode 100644 index 0d87bce..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/dispenser/neutral.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png b/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png deleted file mode 100644 index b5aa08a..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta b/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta deleted file mode 100644 index 9ace70a..0000000 --- a/resourcepack/assets/whimc/textures/barrelbot/faces/happy.png.mcmeta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "animation": { - "frametime": 5, - "frames": [ - 0, - 1, - 0, - 2 - ] - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png b/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png deleted file mode 100644 index b817fe5..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta b/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta deleted file mode 100644 index 2df87df..0000000 --- a/resourcepack/assets/whimc/textures/barrelbot/faces/neutral.png.mcmeta +++ /dev/null @@ -1,70 +0,0 @@ -{ - "animation": { - "frames": [ - { - "index": 0, - "time": 60 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 3, - "time": 2 - }, - { - "index": 4, - "time": 2 - }, - { - "index": 0, - "time": 40 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 0, - "time": 3 - }, - { - "index": 1, - "time": 2 - }, - { - "index": 2, - "time": 2 - }, - { - "index": 0, - "time": 80 - }, - { - "index": 6, - "time": 2 - }, - { - "index": 5, - "time": 15 - }, - { - "index": 0, - "time": 1 - }, - { - "index": 8, - "time": 1 - }, - { - "index": 7, - "time": 15 - }, - { - "index": 8, - "time": 1 - } - ] - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png b/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png deleted file mode 100644 index fb3b591..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta b/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta deleted file mode 100644 index f63ebf7..0000000 --- a/resourcepack/assets/whimc/textures/barrelbot/faces/short_circuited.png.mcmeta +++ /dev/null @@ -1,51 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 0, - 1, - 4, - 2, - 1, - 0, - 3, - 0, - 1, - 2, - 3, - 0, - 1, - 4, - 2, - 1, - 0, - 3, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3}, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":9,"time":1}, - {"index":10,"time":1}, - {"index":5,"time":3}, - {"index":6,"time":3}, - {"index":7,"time":3}, - {"index":8,"time":3} - ] - } -} \ No newline at end of file diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/side.png b/resourcepack/assets/whimc/textures/barrelbot/faces/side.png deleted file mode 100644 index 6f542bd..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/side.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/faces/top.png b/resourcepack/assets/whimc/textures/barrelbot/faces/top.png deleted file mode 100644 index 8847eb0..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/faces/top.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/end_code_block.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/end_code_block.png deleted file mode 100644 index 5383697..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/end_code_block.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/if.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/if.png deleted file mode 100644 index 61863f4..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/if.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/loop.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/loop.png deleted file mode 100644 index 3281469..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/loop.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/move_forward.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/move_forward.png deleted file mode 100644 index d8bf5b8..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/move_forward.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_left.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_left.png deleted file mode 100644 index 1281f46..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_left.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_right.png b/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_right.png deleted file mode 100644 index 52a3073..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/instructions/turn_right.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png b/resourcepack/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png deleted file mode 100644 index f4e7874..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/ui/barrelbot/swap_mode.png and /dev/null differ diff --git a/resourcepack/assets/whimc/textures/barrelbot/ui/close.png b/resourcepack/assets/whimc/textures/barrelbot/ui/close.png deleted file mode 100644 index 795adf0..0000000 Binary files a/resourcepack/assets/whimc/textures/barrelbot/ui/close.png and /dev/null differ diff --git a/resourcepack/pack.mcmeta b/resourcepack/pack.mcmeta deleted file mode 100644 index 2339c35..0000000 --- a/resourcepack/pack.mcmeta +++ /dev/null @@ -1,6 +0,0 @@ -{ - "pack": { - "pack_format": 22, - "description": "WHIMC Resources" - } -} \ No newline at end of file