More 1.21.9 Feature Updates #1168
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # @s = player holding an Audere tool | ||
| # at @s | ||
| # run from active_tool | ||
|
|
||
| scoreboard players operation $tool_max_damage gm4_ml_data -= $tool_current_damage gm4_ml_data | ||
|
|
||
| execute if score $tool_max_damage gm4_ml_data matches 52..139 run effect give @s minecraft:haste 2 0 | ||
| execute if score $tool_max_damage gm4_ml_data matches 20..51 run effect give @s minecraft:haste 2 1 | ||
| execute if score $tool_max_damage gm4_ml_data matches 8..19 run effect give @s minecraft:haste 2 2 | ||
| execute if score $tool_max_damage gm4_ml_data matches ..7 run effect give @s minecraft:haste 2 3 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| # Check item in offhand to shoot | ||
| # @s = player using the crossbow | ||
| # at arrow | ||
| # run from shoot/any_arrow | ||
|
|
||
| # tripwire | ||
| execute if entity @s[gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/string,x_rotation=-15..15] align xyz positioned ~0.5 ~ ~0.5 run function gm4_crossbow_cartridges:cables/shoot_arrow | ||
|
|
||
| # bucket with fish/axolotl | ||
| execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/bucket] run function gm4_crossbow_cartridges:projectile/bucket | ||
|
|
||
| # torch | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/torch] run function gm4_crossbow_cartridges:projectile/torch | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/redstone_torch] run function gm4_crossbow_cartridges:projectile/redstone_torch | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/soul_torch] run function gm4_crossbow_cartridges:projectile/soul_torch | ||
|
|
||
| # potions | ||
| execute if entity @s[tag=!gm4_cb_use,predicate=gm4_crossbow_cartridges:items/potions] run function gm4_crossbow_cartridges:projectile/potions | ||
|
|
||
| # fireball | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/fire_charge] run function gm4_crossbow_cartridges:projectile/fireball | ||
|
|
||
| # wind charge | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/wind_charge] run function gm4_crossbow_cartridges:projectile/wind_charge | ||
|
|
||
| # tnt | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/tnt] run function gm4_crossbow_cartridges:projectile/tnt | ||
|
|
||
| # beehive | ||
| execute if entity @s[tag=!gm4_cb_use,gamemode=!adventure,predicate=gm4_crossbow_cartridges:items/beehive] run function gm4_crossbow_cartridges:projectile/beehive | ||
|
|
||
| tag @s remove gm4_cb_use | ||
| data remove storage gm4_crossbow_cartridges:temp projectile |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Check blocks, to place or drop copper torch | ||
| # @s = arrow with tag gm4_cb_ctorch, in a block | ||
| # at @s | ||
| # run from projectile/copper_torch/loop | ||
|
|
||
| # EMPTY TO AVOID ERRORS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Place copper torch on a valid adjacent block | ||
| # @s = arrow with tag gm4_cb_ctorch, in a block | ||
| # at @s | ||
| # run from projectile/copper_torch/check | ||
|
|
||
| # EMPTY TO AVOID ERRORS |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "equipment": { | ||
| "offhand": { | ||
| "items": [] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| # Shoot copper torch | ||
| # @s = player using the crossbow | ||
| # at arrow | ||
| # run from check_projectile and projectile/copper_torch | ||
|
|
||
| tag @s add gm4_cb_use | ||
|
|
||
| # add tag to arrow | ||
| tag @e[tag=gm4_cb_arrow,distance=..1,sort=nearest,limit=1] add gm4_cb_ctorch | ||
|
|
||
| # add fire to arrow | ||
| data merge entity @e[tag=gm4_cb_arrow,tag=gm4_cb_ctorch,distance=..1,sort=nearest,limit=1] {Fire:2000s} | ||
| tag @e[tag=gm4_cb_arrow,tag=gm4_cb_ctorch,distance=..1,sort=nearest,limit=1] remove gm4_cb_arrow | ||
|
|
||
| # clear copper torch from player | ||
| item modify entity @s[gamemode=!creative] weapon.offhand gm4_crossbow_cartridges:remove_item | ||
|
|
||
| # repeat | ||
| execute if entity @e[tag=gm4_cb_arrow,distance=..1,sort=nearest,limit=1] if entity @s[predicate=gm4_crossbow_cartridges:items/copper_torch] run function gm4_crossbow_cartridges:projectile/copper_torch | ||
|
|
||
| # start loop to check if arrow is in ground | ||
| schedule function gm4_crossbow_cartridges:projectile/copper_torch/loop 4t |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Check blocks, to place or drop copper torch | ||
| # @s = arrow with tag gm4_cb_ctorch, in a block | ||
| # at @s | ||
| # run from projectile/copper_torch/loop | ||
|
|
||
| # summon torch item if torch already exists at this block | ||
| execute if block ~ ~ ~ #gm4_crossbow_cartridges:torch run loot spawn ~ ~ ~ loot minecraft:blocks/copper_torch | ||
|
|
||
| # place torch if possible | ||
| execute if block ~ ~ ~ #gm4:replaceable run function gm4_crossbow_cartridges:projectile/copper_torch/place | ||
|
|
||
| # summon torch item if placing torch failed | ||
| execute unless block ~ ~ ~ #gm4_crossbow_cartridges:torch run loot spawn ~ ~ ~ loot minecraft:blocks/copper_torch | ||
|
|
||
| # place block sound | ||
| playsound minecraft:block.wood.place block @a[distance=..15] | ||
|
Member
There was a problem hiding this comment. Also for the other materials, but I feel like this shouldn't play if the torch didn't actually place
Contributor
Author
There was a problem hiding this comment. Oh huh, yeah. Likely a change for a different PR though so I'll make an issue to track it |
||
|
|
||
| # kill arrow | ||
| kill @s | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| # Check arrow with tag gm4_cb_ctorch | ||
| # run from projectile/copper_torch | ||
| # scheduled by projectile/copper_torch/loop | ||
|
|
||
| execute as @e[tag=gm4_cb_ctorch,nbt={inGround:1b}] at @s run function gm4_crossbow_cartridges:projectile/copper_torch/check | ||
| execute if entity @e[tag=gm4_cb_ctorch,limit=1] run schedule function gm4_crossbow_cartridges:projectile/copper_torch/loop 4t |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| # Place copper torch on a valid adjacent block | ||
| # @s = arrow with tag gm4_cb_ctorch, in a block | ||
| # at @s | ||
| # run from projectile/copper_torch/check | ||
|
|
||
| execute positioned ~.05 ~ ~ if predicate gm4_crossbow_cartridges:check_block/east run setblock ~-.1 ~ ~ minecraft:copper_wall_torch[facing=west] | ||
| execute positioned ~ ~ ~.05 if predicate gm4_crossbow_cartridges:check_block/south run setblock ~ ~ ~-.1 minecraft:copper_wall_torch[facing=north] | ||
| execute positioned ~-.05 ~ ~ if predicate gm4_crossbow_cartridges:check_block/west run setblock ~.1 ~ ~ minecraft:copper_wall_torch[facing=east] | ||
| execute positioned ~ ~ ~-.05 if predicate gm4_crossbow_cartridges:check_block/north run setblock ~ ~ ~.1 minecraft:copper_wall_torch[facing=south] | ||
| execute positioned ~ ~-.05 ~ if predicate gm4_crossbow_cartridges:check_block/below run setblock ~ ~.1 ~ minecraft:copper_torch |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| { | ||
| "condition": "minecraft:entity_properties", | ||
| "entity": "this", | ||
| "predicate": { | ||
| "equipment": { | ||
| "offhand": { | ||
| "items": [ | ||
| "minecraft:copper_torch" | ||
| ] | ||
| } | ||
| } | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this mean Audere is now reliant on Moneo? While that's technically fine while Moneo is in base Metallurgy it might cause problems if Moneo is ever updated / removed since it's unlikely this would be thought of then
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, although this is a change from #1167 which is only mixed in here because I needed to handle overlays of the same files for copper tools. We can definitely move the
store_maximumfunction into the metallurgy namespace if needed though