Skip to content
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

Jump to bottom

Add breeding #7110

Open
wants to merge 62 commits into
base: dev/feature
Choose a base branch
from
Open

Add breeding #7110

wants to merge 62 commits into from

Commits on Mar 30, 2023

  1. Update aliases I guess?

    @Fusezion
    Fusezion committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    a437ca9 View commit details
    Browse the repository at this point in the history

  2. Revert "Update aliases I guess?" 

    This reverts commit a437ca9.
    @Fusezion
    Fusezion committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    296a944 View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2023

  1. Adding Events 

    📎 Added EntityEnterLoveModeEvent
🐷 Added EntityBreedEvent
✨ Added EventValues for these events
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    2cdf76d View commit details
    Browse the repository at this point in the history

  2. Breeding Event Expressions 

    👪 Added family expression for Father, Mother, Child, and Breeder
✨ Added breeding experience to experience class
*update class to current standards
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    9b3afd9 View commit details
    Browse the repository at this point in the history

  3. More Breeding Related Syntax 

    ✨ Added condition for checking ageable
✨ Added condition for checking breedable
✨ Added effect for toggle breedable
✨ Added effect for locking age
✨ Added expression for love ticks
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    27e1392 View commit details
    Browse the repository at this point in the history

  4. Pattern Fixes & Class Exist checks 

    🐛 Fixed issue with `livingentities`
🐛 Added class exist checks for Breedable instances
✨ Added RequirePlugins annotation to select classes
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    07ced16 View commit details
    Browse the repository at this point in the history

  5. Test, Test, Test 

    📋 Added test for ExprLoveTime & CondIsInLove
📋 Addes test for EffBreedable & CondCanBreed
📋 Added test fpr EffLockAge & CondCanAge
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    6ab1dba View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into enhancement/Breedable

    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    0423ea7 View commit details
    Browse the repository at this point in the history

  7. 💜 Formatting

    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    c6acbe9 View commit details
    Browse the repository at this point in the history

  8. Added Adult Syntax 

    ✨ Added Condition for checking is adult
✨ Added Effect to make an entity a baby or adult
📋 Added test for these syntaxes
🔵 1.16 for any mob, below that is animals only
    @Fusezion
    Fusezion committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    243d402 View commit details
    Browse the repository at this point in the history

  9. Apply suggestions from code review 

    Thanks for all these formatting changes it's just what I wanted when waking up

Co-authored-by: Ayham Al Ali <[email protected]>
    @Fusezion @AyhamAl-Ali
    Fusezion and AyhamAl-Ali committed Apr 7, 2023
    Configuration menu
    Copy the full SHA
    8bcbffb View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2023

  1. ExprLoveTime -> ExprLoveTicks 

    ✨ Renamed expression to ExprLoveTicks
✨ Added support for ticks via integers
📋 Added a new test for using integers
📋 Removed unneeded test condition
    @Fusezion
    Fusezion committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    50748f5 View commit details
    Browse the repository at this point in the history

  2. Update ExprBreedingFamily.java 

    ✨ Changed expression for father, mother and offspring a bit
✨ Converted get to a switch statement
    @Fusezion
    Fusezion committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    93059ae View commit details
    Browse the repository at this point in the history

  3. Update ExprExperience.java 

    🐛 Fixed an issue where set allowed more than one value
🐛 Fixed a typo in examples
✨ Added a spacer to examples
    @Fusezion
    Fusezion committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    912a300 View commit details
    Browse the repository at this point in the history

  4. Added comment to CondIsAdult and EffMakeAdult 

    Co-Authored-By: Ayham Al Ali <[email protected]>
    @Fusezion @AyhamAl-Ali
    Fusezion and AyhamAl-Ali committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    09d1999 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into enhancement/Breedable

    @Fusezion
    Fusezion committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    daeb7bf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into enhancement/Breedable

    @TheLimeGlass
    TheLimeGlass committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    c543ef2 View commit details
    Browse the repository at this point in the history

  7. Syntax description notes 

    Just adds some notes in descriptions to bring more light to animal exclusive syntax

Co-Authored-By: Ayham Al Ali <[email protected]>
    @Fusezion @AyhamAl-Ali
    Fusezion and AyhamAl-Ali committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    34d5453 View commit details
    Browse the repository at this point in the history

  8. Update ExprLoveTicks and SimpleEvents 

    🐛 fix accidental forgotten example
🔴 remove integer support from love ticks expression
📋 remove a test from CondIsInLove.sk

Co-Authored-By: Ayham Al Ali <[email protected]>
    @Fusezion @AyhamAl-Ali
    Fusezion and AyhamAl-Ali committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    0b894cc View commit details
    Browse the repository at this point in the history

  9. Fix ExprLoveTicks & Update Test 

    🐛 Fixed an issue with ExprLoveTicks not working correctly
📋 Updated test to include more checks for add, remove and reset
    @Fusezion
    Fusezion committed Apr 8, 2023
    Configuration menu
    Copy the full SHA
    0b10f7d View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2023

  1. LoveTicks -> LoveTime 

    Co-Authored-By: Ayham Al Ali <[email protected]>
    @Fusezion @AyhamAl-Ali
    Fusezion and AyhamAl-Ali committed Apr 10, 2023
    Configuration menu
    Copy the full SHA
    14b7962 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2023

  1. Merge branch 'master' into enhancement/Breedable

    @Fusezion
    Fusezion committed Apr 17, 2023
    Configuration menu
    Copy the full SHA
    4ab107e View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2023

  1. Apply suggestions from code review 

    Co-authored-by: LimeGlass <[email protected]>
    @Fusezion @TheLimeGlass
    Fusezion and TheLimeGlass committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    442602a View commit details
    Browse the repository at this point in the history

  2. Change CondIsAdult condition checks 

    Co-authored-by: LimeGlass <[email protected]>
    @Fusezion @TheLimeGlass
    Fusezion and TheLimeGlass committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    babb7b1 View commit details
    Browse the repository at this point in the history

  3. Apply requested code review changes 

    Co-authored-by: LimeGlass <[email protected]>
    @Fusezion @TheLimeGlass
    Fusezion and TheLimeGlass committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    60a0500 View commit details
    Browse the repository at this point in the history

  4. Apply more requested changes

    @Fusezion
    Fusezion committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    a8deec7 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'enhancement/Breedable' of https://github.com/Fusezion/S… 

    …kript-forky into enhancement/Breedable
    @Fusezion
    Fusezion committed Apr 19, 2023
    Configuration menu
    Copy the full SHA
    f46a502 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2023

  1. Merge branch 'master' into enhancement/Breedable

    @Fusezion
    Fusezion committed May 1, 2023
    Configuration menu
    Copy the full SHA
    fcbe57a View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2023

  1. Merge branch 'master' into enhancement/Breedable

    @Fusezion
    Fusezion committed Jul 12, 2023
    Configuration menu
    Copy the full SHA
    a5f894d View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2023

  1. Merge branch 'SkriptLang:master' into enhancement/Breedable

    @Fusezion
    Fusezion committed Aug 8, 2023
    Configuration menu
    Copy the full SHA
    2556e3b View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2023

  1. Merge branch 'dev/feature' into enhancement/Breedable

    @Fusezion
    Fusezion committed Oct 13, 2023
    Configuration menu
    Copy the full SHA
    47301ca View commit details
    Browse the repository at this point in the history

Commits on Dec 30, 2023

  1. Merge branch 'dev/feature' into enhancement/Breedable

    @sovdeeth
    sovdeeth committed Dec 30, 2023
    Configuration menu
    Copy the full SHA
    abe6540 View commit details
    Browse the repository at this point in the history

Commits on Jan 1, 2024

  1. Merge branch 'dev/feature' into enhancement/Breedable

    @Fusezion
    Fusezion committed Jan 1, 2024
    Configuration menu
    Copy the full SHA
    f6e2954 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'dev/feature' into enhancement/Breedable

    @Fusezion
    Fusezion committed Jan 1, 2024
    Configuration menu
    Copy the full SHA
    04d4e3a View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2024

  1. Merge branch 'dev/feature' into enhancement/Breedable

    @sovdeeth
    sovdeeth committed Jun 28, 2024
    Configuration menu
    Copy the full SHA
    f14bc73 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2024

  1. Merge branch 'dev/feature' into enhancement/Breedable

    @sovdeeth
    sovdeeth committed Jul 1, 2024
    Configuration menu
    Copy the full SHA
    485ac5f View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2024

  1. update conds

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    9d98120 View commit details
    Browse the repository at this point in the history

  2. update exprs

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    29847db View commit details
    Browse the repository at this point in the history

  3. update effs

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    803c718 View commit details
    Browse the repository at this point in the history

  4. update event values

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    fe00590 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'fork/Fusezion/enhancement/Breedable' into breeding 

    # Conflicts:
#	src/main/java/ch/njol/skript/expressions/ExprExperience.java
    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    668dad6 View commit details
    Browse the repository at this point in the history

  6. update annot

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    91b9ee1 View commit details
    Browse the repository at this point in the history

  7. update annotations

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    5018770 View commit details
    Browse the repository at this point in the history

  8. update CondIsInLove

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    28c1ac3 View commit details
    Browse the repository at this point in the history

  9. renames

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    f0a12da View commit details
    Browse the repository at this point in the history

  10. updates

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    987ff80 View commit details
    Browse the repository at this point in the history

  11. update tests

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    11dbd44 View commit details
    Browse the repository at this point in the history

  12. oops

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    7715a65 View commit details
    Browse the repository at this point in the history

  13. fix

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    24e3c2b View commit details
    Browse the repository at this point in the history

  14. grr

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    05e7627 View commit details
    Browse the repository at this point in the history

  15. gahr

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    8b7106f View commit details
    Browse the repository at this point in the history

  16. add breeding trigger event

    @Efnilite
    Efnilite committed Sep 22, 2024
    Configuration menu
    Copy the full SHA
    d4be4e9 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2024

  1. more

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    06dd041 View commit details
    Browse the repository at this point in the history

  2. MORE

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    9ab4f4a View commit details
    Browse the repository at this point in the history

  3. MORE!!!!

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    555c053 View commit details
    Browse the repository at this point in the history

  4. MORE!!!!!!

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    fb105b4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'dev/feature' into breeding

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    fd0baef View commit details
    Browse the repository at this point in the history

  6. stupid copilot

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d74ddc9 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/breeding' into breeding

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    4f4b5aa View commit details
    Browse the repository at this point in the history

  8. g

    @Efnilite
    Efnilite committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    d43733a View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. fixes

    @Efnilite
    Efnilite committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    eff120d View commit details
    Browse the repository at this point in the history

  2. agag

    @Efnilite
    Efnilite committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    43d3769 View commit details
    Browse the repository at this point in the history