From 03ad5eea78660135c1a352da94bbd367de625872 Mon Sep 17 00:00:00 2001 From: Mark Rapson Date: Mon, 15 Jan 2024 02:05:44 +0000 Subject: [PATCH] Added Bamboo variants --- .../functions/rotate/pillars_click.mcfunction | 10 ++++++++++ .../functions/rotate/pillars_cycle.mcfunction | 10 ++++++++++ .../functions/rotate/pillars_player.mcfunction | 16 ++++++++++++++++ Wrench/data/wrench/tags/blocks/pillars.json | 1 + 4 files changed, 37 insertions(+) diff --git a/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction index 9ec7a32..8775378 100644 --- a/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction +++ b/Wrench/data/wrench/functions/rotate/pillars_click.mcfunction @@ -45,6 +45,16 @@ execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1. execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=y] replace minecraft:stripped_acacia_wood execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood +# Bamboo +execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block + +# Bamboo (Stripped) +execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}] unless score px WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block + # Birch Log execute as @s[scores={WrenchSuccess=0}] unless score pz WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=z] replace minecraft:birch_log execute as @s[scores={WrenchSuccess=0}] unless score py WrenchRaycast matches 1..14 store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log diff --git a/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction index 46f00dc..0d2ac6a 100644 --- a/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction +++ b/Wrench/data/wrench/functions/rotate/pillars_cycle.mcfunction @@ -22,6 +22,16 @@ execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=y] replace minecraft:stripped_acacia_wood[axis=x] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood[axis=z] +# Bamboo +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block[axis=y] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block[axis=x] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block[axis=z] + +# Bamboo (Stripped) +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block[axis=y] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block[axis=x] +execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block[axis=z] + # Birch Log execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=z] replace minecraft:birch_log[axis=y] execute as @s[scores={WrenchSuccess=0}] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log[axis=x] diff --git a/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction b/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction index 5e5bdc1..0b794af 100644 --- a/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction +++ b/Wrench/data/wrench/functions/rotate/pillars_player.mcfunction @@ -34,6 +34,22 @@ execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135 execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_acacia_wood[axis=x] replace minecraft:stripped_acacia_wood +# Bamboo +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=y] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=z] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:bamboo_block[axis=x] replace minecraft:bamboo_block + +# Bamboo (Stripped) +execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=y] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-45..45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=135..-135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=z] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=45..135] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block +execute as @s[scores={WrenchSuccess=0}, x_rotation=-45..45, y_rotation=-135..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:stripped_bamboo_block[axis=x] replace minecraft:stripped_bamboo_block + # Birch Log execute as @s[scores={WrenchSuccess=0}, x_rotation=45..90] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log execute as @s[scores={WrenchSuccess=0}, x_rotation=-90..-45] store result score @s WrenchSuccess run fill ~ ~ ~ ~ ~ ~ minecraft:birch_log[axis=y] replace minecraft:birch_log diff --git a/Wrench/data/wrench/tags/blocks/pillars.json b/Wrench/data/wrench/tags/blocks/pillars.json index 0688b84..ef14b4d 100644 --- a/Wrench/data/wrench/tags/blocks/pillars.json +++ b/Wrench/data/wrench/tags/blocks/pillars.json @@ -2,6 +2,7 @@ "replace": false, "values": [ "#minecraft:logs", + "#minecraft:bamboo_blocks", "minecraft:quartz_pillar", "minecraft:purpur_pillar", "minecraft:hay_block",