Skip to content

Blossoming Pots #1070

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Bloo-dev merged 60 commits into from
Feb 9, 2025
Merged

Blossoming Pots #1070

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
60 commits
Select commit Hold shift + click to select a range
b20c7fb
Initial Commit
runcows Nov 24, 2024
85a3579
Refactor to only summon displays as they are used.
runcows Nov 27, 2024
884bc5c
Added main types
runcows Nov 27, 2024
6488bd1
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Nov 28, 2024
b85c91a
slight corrections in set_storages
runcows Nov 28, 2024
a756fc1
Edit raycasts to use player.block_interaction_range
runcows Nov 28, 2024
25f2d10
Added overlay for block_interaction_range since mojang removed the pl…
runcows Nov 28, 2024
43398e1
Cleaning up some comments
runcows Nov 28, 2024
669528f
Remove overlay because I didn't need to do it at all
runcows Nov 29, 2024
0a18491
Removed stages and plantables talked about in meeting. Still need to …
runcows Dec 1, 2024
3f42c46
Fix decorated pot plants not initializing when more items than stages
runcows Dec 2, 2024
0d1e89f
Changes to plantables as discussed
runcows Dec 7, 2024
4b10837
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Dec 7, 2024
30340bf
Added overlay for 1.21.4 and changed storage version_history array to…
runcows Dec 7, 2024
e2aab6e
Fix decorated pot temp marker not being removed when pot is empty
runcows Dec 10, 2024
3f5955f
Simplify block interaction range raycast range to not need scoreboard…
runcows Dec 10, 2024
8d0e9ff
Changes from Bloo's comments
runcows Dec 10, 2024
7ce25a8
Adding icon
runcows Dec 10, 2024
d5a1a67
Fixing my new entry in contributors.json not being inserted alphabeti…
runcows Dec 10, 2024
f55f575
Remove cocoa beans from README
runcows Dec 10, 2024
8de3e09
Fix break and replace partial plant cannibalizing
runcows Dec 11, 2024
002d60c
Fix plant rotation not being locked for newly summoned displays of a …
runcows Dec 11, 2024
da4351a
Implement Bloo's suggestion for in_pot changes to not need to select …
runcows Dec 11, 2024
63a4bf3
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Dec 12, 2024
a897a52
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Dec 16, 2024
9556ff8
Add webp animation (20fps, compressed to 351 KB)
runcows Dec 25, 2024
a2035fb
Change my contributors.json link to bluesky for upcoming changes
runcows Dec 25, 2024
542d9b0
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Dec 25, 2024
9ae9e04
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Jan 6, 2025
7db3bcb
Update header of gm4_blossoming_pots/data/gm4_blossoming_pots/functio…
runcows Jan 19, 2025
8b19a34
Change function header "with" lines to follow the style bloo specifie…
runcows Jan 19, 2025
dad1bd0
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Jan 19, 2025
06ed2ae
Change as_player -> as marker selectors to limit 1
runcows Jan 19, 2025
bd40b5b
Change player rotation data to use storage instead of marker data
runcows Jan 21, 2025
b5e4698
Fix empty hand scenario being overlooked by player rotation changes
runcows Jan 22, 2025
4127daf
Change empty hand interact on flower pot to summon an item at players…
runcows Jan 22, 2025
ebff299
Assorted changes from review session
runcows Feb 1, 2025
a07dd26
Rename advancements
runcows Feb 1, 2025
eae18a5
Refactor vanilla flower pot handling
runcows Feb 1, 2025
362ba7c
Comments on potential changes
runcows Feb 1, 2025
6db62ad
Refactor decorated pot handling
runcows Feb 1, 2025
1c81619
Rename vanilla_pot_handling/in_pot
runcows Feb 1, 2025
5331209
Refactor flower pot handling
runcows Feb 1, 2025
9822155
Function header changes
runcows Feb 1, 2025
8100f28
Change distance range to be self consistent with module
runcows Feb 1, 2025
264108e
Condense flower pot clean up
runcows Feb 1, 2025
4c96a48
Combine like selectors into one function
runcows Feb 1, 2025
b02c00e
Comment format change
runcows Feb 1, 2025
bdcf7d9
Fix temp storage not being reset
runcows Feb 2, 2025
ff1b1c9
Remove player nbt UUID check
runcows Feb 2, 2025
0fdcddc
Fix issues from changes
runcows Feb 2, 2025
c698378
Merge branch 'master' of https://github.com/Gamemode4Dev/GM4_Datapack…
runcows Feb 6, 2025
0eba8db
Wrap marker data in gm4_blossoming_pots tag
runcows Feb 8, 2025
b282b53
Replace FallDistance stage tracking with Scoreboard
runcows Feb 8, 2025
5f30f5f
Update gm4_blossoming_pots/beet.yaml
runcows Feb 8, 2025
e83f651
Update gm4_blossoming_pots/beet.yaml
runcows Feb 8, 2025
cc83d68
Update gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorate…
runcows Feb 8, 2025
fd7ca5e
Merge branch 'gm4-blossoming-pots-intial' of https://github.com/runco…
runcows Feb 8, 2025
ff074b0
Fix main marker cleanup macro not reflecting change in marker data wr…
runcows Feb 8, 2025
b0f22d5
Fix anchored eyes not moving execution context on first raycast loop
runcows Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions gm4_blossoming_pots/beet.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,11 @@ version: 3.0.X
# should I start the version number over for gm4 release?
data_pack:
load: .
overlays:
- formats:
min_inclusive: 0
max_inclusive: 48
directory: overlay_48

resource_pack:
load: .
Expand Down
2 changes: 1 addition & 1 deletion gm4_blossoming_pots/data/gm4_blossoming_pots/function/decorated/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# run from advancement gm4_blossoming_pots:item_in_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:decorated/raycast/loop

Expand Down
2 changes: 1 addition & 1 deletion gm4_blossoming_pots/data/gm4_blossoming_pots/function/flower/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# run from advancement gm4_blossoming_pots:interact_flower_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:flower/raycast/loop

Expand Down
2 changes: 1 addition & 1 deletion ...lossoming_pots/data/gm4_blossoming_pots/function/flower/vanilla_pots/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# run from advancement gm4_blossoming_pots:interact_vanilla_flower_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:flower/vanilla_pots/raycast/loop

Expand Down
15 changes: 15 additions & 0 deletions ...ossoming_pots/overlay_48/data/gm4_blossoming_pots/function/decorated/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Sets up raycast, then redirects to as_marker, then revokes advancement
# @s = player who interacted with a decorated pot
# at @s
# run from advancement gm4_blossoming_pots:item_in_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:decorated/raycast/loop

execute as @e[type=minecraft:marker,sort=nearest,tag=gm4_blossoming_pots.temp.decorated_pot] at @s \
align xyz positioned ~.5 ~.5 ~.5 run function gm4_blossoming_pots:decorated/as_marker with block ~ ~ ~ item

# Reset advancement
advancement revoke @s only gm4_blossoming_pots:item_in_pot
15 changes: 15 additions & 0 deletions gm4_blossoming_pots/overlay_48/data/gm4_blossoming_pots/function/flower/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Sets up raycast, then redirects to as_marker, then revokes advancement
# @s = player who interacted with an empty flower pot
# at @s
# run from advancement gm4_blossoming_pots:interact_flower_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:flower/raycast/loop

execute as @e[type=minecraft:marker,sort=nearest,tag=gm4_blossoming_pots.temp.flower_pot] at @s \
align xyz positioned ~.5 ~.5 ~.5 run function gm4_blossoming_pots:flower/as_marker with entity @s data

# Reset advancement
advancement revoke @s only gm4_blossoming_pots:interact_flower_pot
15 changes: 15 additions & 0 deletions ...ots/overlay_48/data/gm4_blossoming_pots/function/flower/vanilla_pots/as_player.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Sets up raycast, then redirects to as_marker, then revokes advancement
# @s = player who interacted with a filled vanilla flower pot
# at @s
# run from advancement gm4_blossoming_pots:interact_vanilla_flower_pot

# Raycast for the pot (set up range and search)
execute store result score @s gm4_blossoming_pots.range run attribute @s minecraft:player.block_interaction_range get 1
scoreboard players operation @s gm4_blossoming_pots.range *= $raycast_multiplier gm4_blossoming_pots.range
execute anchored eyes run function gm4_blossoming_pots:flower/vanilla_pots/raycast/loop

execute as @e[type=minecraft:marker,sort=nearest,tag=gm4_blossoming_pots.temp.vanilla_flower_pot] at @s \
align xyz positioned ~.5 ~.5 ~.5 run function gm4_blossoming_pots:flower/vanilla_pots/as_marker

# Reset advancement
advancement revoke @s only gm4_blossoming_pots:interact_vanilla_flower_pot