Skip to content

Add better armor stands and sweethearts modules#2

Closed
misode wants to merge 2 commits into
Gamemode4Dev:masterfrom
misode:master
Closed

Add better armor stands and sweethearts modules#2
misode wants to merge 2 commits into
Gamemode4Dev:masterfrom
misode:master

Conversation

@misode
Copy link
Copy Markdown
Member

@misode misode commented Aug 28, 2018

No description provided.

@misode misode changed the title Add better armor stands module Add better armor stands and sweethearts modules Aug 28, 2018
@SpiderRobotMan
Copy link
Copy Markdown
Member

SpiderRobotMan commented Aug 28, 2018

I'd try to keep each module a separate PR

@misode
Copy link
Copy Markdown
Member Author

misode commented Aug 29, 2018

Ah, my bad. I'm still a bit new with pull requests

@misode misode closed this Aug 29, 2018
ToffeeMax referenced this pull request in ToffeeMax/GM4_Datapacks May 4, 2019
misode pushed a commit that referenced this pull request Aug 26, 2025
* Initial Commit

* Fix Version Compat

* Add player gamemode check

* Fix Allay HandItems[0] being removed instead of set empty

* Add shulker pulling

* Fix minecart fishing bobber vertical displacement off by 0.00001

* Fix Allay item summon wrong location

* Add witch potion stealing

* Slight python change

* Add villager theft

* Python changes to allow baby mobs to be processed

* Add fox theft

* Add witch theft limit

* Add pig desaddling

* Add strider desaddling

* Add snow golem beheading

* Add entity TODO list

* Add wolf armor stealing

* Add horse type mob item yoinking

* Fix Donkey and Mule code a bit

* Add Llama yoinking

* Python refactor & the start of Dismounting work

* Remove witch limit

* Fix file new line issue

* Switch to id based system for entity selection

* Intial commit for id changes

* Fix everything

* overwrite old

* actual overwrite old

* minor text fixes

* more fixes from the id change

* Fix wrong command syntax :(

* Re-Add smithed.entity ignore

* Change id tags to be removed when unneeded

* Vehicle separation passenger transfer

* Add live catch to recommended

* Misc comments because I need these file changes on my laptop to work on this while not at home

* misc beet changes

* py comment restructure

* Refactor in prep for generic item yoinking

* Refactor & Add Generic Hand/Armor Yoinking

* Update to 1.21.5

* Some comment changes

* Missed changes for 1.21.5

* Fix shulker teleporting

* Fix chest boat yoinking

* Rename function for clarity

* Add Sheep shearing yoinking

* Fix sheep wool yoinking
I was rushing before

* Fixes (hopefully)

* Add Binding blocking for equipment theft

* Add Entities
- Wandering Trader: Steal Hands
- Armor Stand: Steal Equipment
- Camel: Steal Saddle
- Mooshroom: Shear and steal shrooms
- Bee: Steal honey comb and suffer the consequences

* Optimize bobber id setting

* single comment change because nobody can stop me

* Fix my id changes & add sounds :D

* Change some player selectors to `@p`

* Change a few more player selectors to @p

* Shorten bee anger time

* Add Barbed Enchantment (#2)

* Add Barbed Enchantment

* Fix formatting

* Update apply_barbed_damage header

* Add missing comma

* Remove extra line

* Update non_treasure.json to include barbed

Needed for it to show up in enchanting table

* Fix barbed damage not running

* Increase Barbed Damage

* Adjust Enchantment Cost

---------

Co-authored-by: runcows <124551271+runcows@users.noreply.github.com>

* Fix overassigning ID causing breakage

* Adjust enchantment cost & rarity

* Remove excess entity_data storage

* Add Barbed Delayed Damage

* Fix Bleeding Damage not Starting

* Adjust Damage & Particles

* Add Custom Death Messages

* Adjust Enchantment Weights

* Fix Death Messages & Properly Reset Players on Respawn

* Fix Bleeding Damage not Triggering for non-Player Entities

* ID rewrite to use scores & optimization

* Swap enchantment name for translation string

* Big Reorganization

* Add Bloo to credits

* Missed renaming for reorganization

* minor changes

* Fix item data not being reset all the time

* Change barbed to explode tnt minecarts

* Rework hooked_entity/select_type to use bolt in file instead of generating file

* Add drop chance usage to reeling

* Drop Chance Rework
- if 0%, playsound and fail
- else, yoink
- there are exceptions for stealing mainhand
Also did some reorganization to make this easier to update in the future

* Formatting Changes

* Update to 1.21.6
- extend leash knot search range to 12 blocks
- add happy_ghast to leashable tag list
- add happy_ghast harness reeling

* Fix item frame yoinking not respecting fixed tag

* Set module to not run if hooked entity is Invulnerable

* Upload Icon

* Uncomment Icon Design in beet.yaml

* Initial Guidebook and Readme

* Automated Guidebook Building Stuff

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/id/loop.mcfunction

Co-authored-by: Bloo <git@bloo.boo>

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/tick.mcfunction

Co-authored-by: Bloo <git@bloo.boo>

* A couple of header comments

* Update gm4_reeling_rods/generate_files.py

* Fail minecart & mooshroom if passengers

* Optimize reeling/stealable/steal_hand

* Clean `generate_files.py` and move a tag command

* Add enderman falling block yoinking, fix a logical error with motion function, adjust a few commands

* Update get_motion_to_player header comment

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/get_motion_to_player.mcfunction
- Swear this is the last time. I got all nitpicky about the comments

* Translations file

* Forgot key in translations

* Add Panda to steal hand
- because I forgot them

* Update header in get_execution_pos

* Guidebook pages for reeling and barbed now unlock when getting an enchanted book with them on it

* Reword Guidebook Pages

* Add unreleased modrinth page id

---------

Co-authored-by: Bloo <git@bloo.boo>
github-actions Bot pushed a commit that referenced this pull request Aug 26, 2025
* Initial Commit

* Fix Version Compat

* Add player gamemode check

* Fix Allay HandItems[0] being removed instead of set empty

* Add shulker pulling

* Fix minecart fishing bobber vertical displacement off by 0.00001

* Fix Allay item summon wrong location

* Add witch potion stealing

* Slight python change

* Add villager theft

* Python changes to allow baby mobs to be processed

* Add fox theft

* Add witch theft limit

* Add pig desaddling

* Add strider desaddling

* Add snow golem beheading

* Add entity TODO list

* Add wolf armor stealing

* Add horse type mob item yoinking

* Fix Donkey and Mule code a bit

* Add Llama yoinking

* Python refactor & the start of Dismounting work

* Remove witch limit

* Fix file new line issue

* Switch to id based system for entity selection

* Intial commit for id changes

* Fix everything

* overwrite old

* actual overwrite old

* minor text fixes

* more fixes from the id change

* Fix wrong command syntax :(

* Re-Add smithed.entity ignore

* Change id tags to be removed when unneeded

* Vehicle separation passenger transfer

* Add live catch to recommended

* Misc comments because I need these file changes on my laptop to work on this while not at home

* misc beet changes

* py comment restructure

* Refactor in prep for generic item yoinking

* Refactor & Add Generic Hand/Armor Yoinking

* Update to 1.21.5

* Some comment changes

* Missed changes for 1.21.5

* Fix shulker teleporting

* Fix chest boat yoinking

* Rename function for clarity

* Add Sheep shearing yoinking

* Fix sheep wool yoinking
I was rushing before

* Fixes (hopefully)

* Add Binding blocking for equipment theft

* Add Entities
- Wandering Trader: Steal Hands
- Armor Stand: Steal Equipment
- Camel: Steal Saddle
- Mooshroom: Shear and steal shrooms
- Bee: Steal honey comb and suffer the consequences

* Optimize bobber id setting

* single comment change because nobody can stop me

* Fix my id changes & add sounds :D

* Change some player selectors to `@p`

* Change a few more player selectors to @p

* Shorten bee anger time

* Add Barbed Enchantment (#2)

* Add Barbed Enchantment

* Fix formatting

* Update apply_barbed_damage header

* Add missing comma

* Remove extra line

* Update non_treasure.json to include barbed

Needed for it to show up in enchanting table

* Fix barbed damage not running

* Increase Barbed Damage

* Adjust Enchantment Cost

---------

Co-authored-by: runcows <124551271+runcows@users.noreply.github.com>

* Fix overassigning ID causing breakage

* Adjust enchantment cost & rarity

* Remove excess entity_data storage

* Add Barbed Delayed Damage

* Fix Bleeding Damage not Starting

* Adjust Damage & Particles

* Add Custom Death Messages

* Adjust Enchantment Weights

* Fix Death Messages & Properly Reset Players on Respawn

* Fix Bleeding Damage not Triggering for non-Player Entities

* ID rewrite to use scores & optimization

* Swap enchantment name for translation string

* Big Reorganization

* Add Bloo to credits

* Missed renaming for reorganization

* minor changes

* Fix item data not being reset all the time

* Change barbed to explode tnt minecarts

* Rework hooked_entity/select_type to use bolt in file instead of generating file

* Add drop chance usage to reeling

* Drop Chance Rework
- if 0%, playsound and fail
- else, yoink
- there are exceptions for stealing mainhand
Also did some reorganization to make this easier to update in the future

* Formatting Changes

* Update to 1.21.6
- extend leash knot search range to 12 blocks
- add happy_ghast to leashable tag list
- add happy_ghast harness reeling

* Fix item frame yoinking not respecting fixed tag

* Set module to not run if hooked entity is Invulnerable

* Upload Icon

* Uncomment Icon Design in beet.yaml

* Initial Guidebook and Readme

* Automated Guidebook Building Stuff

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/id/loop.mcfunction

Co-authored-by: Bloo <git@bloo.boo>

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/tick.mcfunction

Co-authored-by: Bloo <git@bloo.boo>

* A couple of header comments

* Update gm4_reeling_rods/generate_files.py

* Fail minecart & mooshroom if passengers

* Optimize reeling/stealable/steal_hand

* Clean `generate_files.py` and move a tag command

* Add enderman falling block yoinking, fix a logical error with motion function, adjust a few commands

* Update get_motion_to_player header comment

* Update gm4_reeling_rods/data/gm4_reeling_rods/function/get_motion_to_player.mcfunction
- Swear this is the last time. I got all nitpicky about the comments

* Translations file

* Forgot key in translations

* Add Panda to steal hand
- because I forgot them

* Update header in get_execution_pos

* Guidebook pages for reeling and barbed now unlock when getting an enchanted book with them on it

* Reword Guidebook Pages

* Add unreleased modrinth page id

---------

Co-authored-by: Bloo <git@bloo.boo>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants