Breedable & Ageable Stuff #5584

Fusezion · 2023-04-07T14:36:16Z

Description

This PR aims to add breeding support along with syntax related to breeding and aging.

Added ✨ EntityBreedEvent MC 1.13+
Added ✨ EntityEnterLoveModeEvent PAPER 1.16+
Added ✨ ExprBreedingFamily MC 1.13+
Added ✨ CondCanAge, CondCanBreed MC 1.16+
Added ✨ EffLockAge, EffBreedable MC 1.16+
Added ✨ ExprLoveTime MC 1.16+ *if anyone has a better name please help
Updated 📋 ExprExperience

Added ✨ CondIsAdult MC 1.13+ (Req: 1.16+ for any non animal)
Added ✨ EffMakeAdult MC 1.13+ (Req: 1.16+ for any non animal)
*the method I used for telling if using 1.16+ if there's any other alternative please let me know

Breaks 🪦 Removes remove_all support from ExprExperience, people using it before will break

Some of these 1.16 events could of been added under the Ageable class instead of Breedable which would allow earlier versions, however I find it better to use Breedable in this case then Ageable as it makes more sense. If anyone would prefer Ageable please let me know.

Target Minecraft Versions: 1.13+, 1.16+ & Paper 1.16+
Requirements: Breed event 1.13, Enter love mode paper 1.16, rest 1.16
Related Issues: #5111
Additional: this PR is the updated one for #5116 I accidently did some issues as such just decided to recode it.
Majority if not all of the requested changes there should transfer here, however I've added much more syntax compared to before.

This reverts commit a437ca9.

📎 Added EntityEnterLoveModeEvent 🐷 Added EntityBreedEvent ✨ Added EventValues for these events

👪 Added family expression for Father, Mother, Child, and Breeder ✨ Added breeding experience to experience class *update class to current standards

✨ 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

🐛 Fixed issue with `livingentities` 🐛 Added class exist checks for Breedable instances ✨ Added RequirePlugins annotation to select classes

📋 Added test for ExprLoveTime & CondIsInLove 📋 Addes test for EffBreedable & CondCanBreed 📋 Added test fpr EffLockAge & CondCanAge

✨ 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

AyhamAl-Ali

Nice PR ⚡, It's better to split features in multiple PRs next time to avoid such big review and requested changes :)

src/main/java/ch/njol/skript/classes/data/BukkitEventValues.java

src/main/java/ch/njol/skript/conditions/CondCanAge.java

src/main/java/ch/njol/skript/expressions/ExprExperience.java

src/main/java/ch/njol/skript/expressions/ExprLoveTime.java

Thanks for all these formatting changes it's just what I wanted when waking up Co-authored-by: Ayham Al Ali <[email protected]>

✨ Renamed expression to ExprLoveTicks ✨ Added support for ticks via integers 📋 Added a new test for using integers 📋 Removed unneeded test condition

✨ Changed expression for father, mother and offspring a bit ✨ Converted get to a switch statement

🐛 Fixed an issue where set allowed more than one value 🐛 Fixed a typo in examples ✨ Added a spacer to examples

Co-Authored-By: Ayham Al Ali <[email protected]>

Fusezion · 2023-04-08T02:33:08Z

Failing on CondIsWithin.sk "failed within chunk # 1" 1.19.4 all other ones pass

sovdeeth · 2023-04-08T03:17:02Z

Failing on CondIsWithin.sk "failed within chunk # 1" 1.19.4 all other ones pass

Fixed in #5587, not related to this PR.

Fusezion · 2023-04-08T03:24:03Z

Nice PR ⚡, It's better to split features in multiple PRs next time to avoid such big review and requested changes :)

Didn't intend to really add so much stuff, love ticks made sense due to breedable, and ageable was just close enough to each other I found it fair. Most requested changes seem to be formatting which is just caused by how little I mess with PRs it'll get better over time.

AyhamAl-Ali · 2023-04-08T11:01:18Z

Didn't intend to really add so much stuff, love ticks made sense due to breedable, and ageable was just close enough to each other I found it fair. Most requested changes seem to be formatting which is just caused by how little I mess with PRs it'll get better over time.

All good for now. It's just easier for us to review and easier for you to handle requested changes as the larger the PR is the more time it requires to review/change/merge

As for the formatting stuff, it's just a matter of time as you stated.

Just adds some notes in descriptions to bring more light to animal exclusive syntax Co-Authored-By: Ayham Al Ali <[email protected]>

Co-authored-by: LimeGlass <[email protected]>

…kript-forky into enhancement/Breedable

APickledWalrus · 2024-07-01T22:25:59Z

src/main/java/ch/njol/skript/effects/EffLockAge.java

+
+	static {
+		if (Skript.classExists("org.bukkit.entity.Breedable"))
+			Skript.registerEffect(EffLockAge.class, "(lock|:unlock) age of %livingentities%");


It would be good to support syntax like allow entities to age or prevent entities from aging

APickledWalrus · 2024-07-14T04:17:54Z

src/main/java/ch/njol/skript/conditions/CondIsAdult.java

+	private static final boolean HAS_MOB_SUPPORT = Skript.isRunningMinecraft(1, 16, 5);
+
+	static {
+		register(CondIsAdult.class, "[an] adult", "livingentities");


maybe worth including a child option?

APickledWalrus · 2024-07-14T04:21:18Z

src/main/java/ch/njol/skript/conditions/CondIsAdult.java

+@RequiredPlugins("MC 1.16.5+ (Mobs)")
+public class CondIsAdult extends PropertyCondition<LivingEntity> {
+
+	// This is required since before 1.16 the 'isAdult' method only supported Animals


does it throw an error or something when called on a non Animals mob?

My initial worry of this from what I see is unfounded, the same goes for the effect version, the ageable instance check already handles this, I just needed to make mentions in the description annotation

APickledWalrus · 2024-07-14T04:25:58Z

src/main/java/ch/njol/skript/effects/EffBreedable.java

+
+@Name("Make Breedable")
+@Description({
+		"Picks whether or not entities will be able to breed.",


Suggested change

"Picks whether or not entities will be able to breed.",

"Sets whether or not entities will be able to breed.",

APickledWalrus · 2024-07-14T04:30:13Z

src/main/java/ch/njol/skript/events/SimpleEvents.java

+					.requiredPlugins("MC 1.16+");
+		}
+
+    Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing| ]up [an] arrow|arrow pick[ing| ]up)")


Suggested change

Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing| ]up [an] arrow|arrow pick[ing| ]up)")

Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing| ]up [an] arrow|arrow pick[ing| ]up)")

APickledWalrus · 2024-07-14T04:31:53Z

src/main/java/ch/njol/skript/events/SimpleEvents.java

@@ -733,7 +735,25 @@ public class SimpleEvents {
 					.requiredPlugins("Paper 1.16+");
 		}

-		Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing| ]up [an] arrow|arrow pick[ing| ]up)")
+		Skript.registerEvent("Entity Breed", SimpleEvent.class, EntityBreedEvent.class, "[entity] breed[ing]")


I think it could be a good idea for these events to support triggering conditions (e.g. on pig breed) using a dedicated event class

hmm, not a bad idea, I'll need to relook at this PR again soon, with all the changes recently there's bound to be one or two conflicts in addition to all the changes regarding conventions

APickledWalrus · 2024-07-14T04:33:24Z

src/main/java/ch/njol/skript/expressions/ExprBreedingFamily.java

+		Skript.registerExpression(ExprBreedingFamily.class, LivingEntity.class, ExpressionType.SIMPLE,
+				"breed[ing] mother",
+				"breed[ing] father",
+				"[bred] (offspring|child)",
+				"breeder");


Suggested change

Skript.registerExpression(ExprBreedingFamily.class, LivingEntity.class, ExpressionType.SIMPLE,

"breed[ing] mother",

"breed[ing] father",

"[bred] (offspring|child)",

"breeder");

Skript.registerExpression(ExprBreedingFamily.class, LivingEntity.class, ExpressionType.SIMPLE,

"[the] breed[ing] mother",

"[the] breed[ing] father",

"[the] [bred] (offspring|child)",

"[the] breeder");

Thoughts about removing the optional [ing] in favor of forcing it; for mother and father?
I don't like breed father or the breed father

APickledWalrus · 2024-07-14T04:41:32Z

src/main/java/ch/njol/skript/expressions/ExprExperience.java

+				return CollectionUtils.array(ExprExperience.class, Integer.class);
+			case ADD:
+			case REMOVE:
+				return CollectionUtils.array(ExprExperience[].class, Integer[].class);


Suggested change

return CollectionUtils.array(ExprExperience.class, Integer.class);

case ADD:

case REMOVE:

return CollectionUtils.array(ExprExperience[].class, Integer[].class);

return CollectionUtils.array(Experience.class, Integer.class);

case ADD:

case REMOVE:

return CollectionUtils.array(Experience[].class, Integer[].class);

This isn't supposed to be ExprExperience, right?

APickledWalrus · 2024-07-14T04:48:50Z

src/main/java/ch/njol/skript/expressions/ExprLoveTime.java

+	public Class<?>[] acceptChange(ChangeMode mode) {
+		switch (mode) {
+			case SET:
+			case RESET:


maybe worth support delete as in clear love time?

Fusezion

Looking over this PR again, and I want some feedback on a few things before I ship anything

Fusezion · 2024-07-19T01:00:28Z

src/main/java/ch/njol/skript/expressions/ExprBreedingFamily.java

+		Skript.registerExpression(ExprBreedingFamily.class, LivingEntity.class, ExpressionType.SIMPLE,
+				"breed[ing] mother",
+				"breed[ing] father",
+				"[bred] (offspring|child)",
+				"breeder");


Thoughts about removing the optional [ing] in favor of forcing it; for mother and father?
I don't like breed father or the breed father

Fusezion · 2024-07-19T01:02:51Z

src/main/java/ch/njol/skript/effects/EffBreedable.java

+		if (Skript.classExists("org.bukkit.entity.Breedable"))
+			Skript.registerEffect(EffBreedable.class, "make %livingentities% [negate:(not |non(-| )|un)]breedable");
+	}


I'm personally not a huge fan of not breedable do we believe it's fine to remove as I don't think of it as valid

personally i like prevent %entities% from breeding
or the more risque sterilize %entities%

I believe my latest build does add prevent and allow formatting, sterilize is possible but I'll probably put it on the back burner for now.

sovdeeth · 2024-09-15T20:49:35Z

@Efnilite will be taking this over

Fusezion added 7 commits March 29, 2023 20:33

Update aliases I guess?

a437ca9

Revert "Update aliases I guess?"

296a944

This reverts commit a437ca9.

Adding Events

2cdf76d

📎 Added EntityEnterLoveModeEvent 🐷 Added EntityBreedEvent ✨ Added EventValues for these events

Breeding Event Expressions

9b3afd9

👪 Added family expression for Father, Mother, Child, and Breeder ✨ Added breeding experience to experience class *update class to current standards

More Breeding Related Syntax

27e1392

✨ 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

Pattern Fixes & Class Exist checks

07ced16

🐛 Fixed issue with `livingentities` 🐛 Added class exist checks for Breedable instances ✨ Added RequirePlugins annotation to select classes

Test, Test, Test

6ab1dba

📋 Added test for ExprLoveTime & CondIsInLove 📋 Addes test for EffBreedable & CondCanBreed 📋 Added test fpr EffLockAge & CondCanAge

This comment was marked as resolved.

Sign in to view

Fusezion added 3 commits April 7, 2023 10:52

Merge branch 'master' into enhancement/Breedable

0423ea7

💜 Formatting

c6acbe9

Added Adult Syntax

243d402

✨ 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

AyhamAl-Ali added the feature Pull request adding a new feature. label Apr 7, 2023

AyhamAl-Ali requested changes Apr 7, 2023

View reviewed changes

Apply suggestions from code review

8bcbffb

Thanks for all these formatting changes it's just what I wanted when waking up Co-authored-by: Ayham Al Ali <[email protected]>

TheLimeGlass requested review from TheLimeGlass, APickledWalrus and UnderscoreTud April 8, 2023 00:56

Fusezion and others added 5 commits April 7, 2023 21:45

ExprLoveTime -> ExprLoveTicks

50748f5

✨ Renamed expression to ExprLoveTicks ✨ Added support for ticks via integers 📋 Added a new test for using integers 📋 Removed unneeded test condition

Update ExprBreedingFamily.java

93059ae

✨ Changed expression for father, mother and offspring a bit ✨ Converted get to a switch statement

Update ExprExperience.java

912a300

🐛 Fixed an issue where set allowed more than one value 🐛 Fixed a typo in examples ✨ Added a spacer to examples

Added comment to CondIsAdult and EffMakeAdult

09d1999

Co-Authored-By: Ayham Al Ali <[email protected]>

Merge branch 'master' into enhancement/Breedable

daeb7bf

Fusezion changed the title ~~Breedable Stuff~~ Breedable & Ageable Stuff Apr 8, 2023

Merge branch 'master' into enhancement/Breedable

c543ef2

AyhamAl-Ali added the breaking changes Pull or feature requests that contain breaking changes (API, syntax, etc.) label Apr 8, 2023

Syntax description notes

34d5453

Just adds some notes in descriptions to bring more light to animal exclusive syntax Co-Authored-By: Ayham Al Ali <[email protected]>

Fusezion and others added 6 commits April 18, 2023 20:43

Change CondIsAdult condition checks

babb7b1

Co-authored-by: LimeGlass <[email protected]>

Apply requested code review changes

60a0500

Co-authored-by: LimeGlass <[email protected]>

Apply more requested changes

a8deec7

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

f46a502

…kript-forky into enhancement/Breedable

Merge branch 'master' into enhancement/Breedable

fcbe57a

Merge branch 'master' into enhancement/Breedable

a5f894d

TheLimeGlass approved these changes Aug 3, 2023

View reviewed changes

TheLimeGlass requested a review from sovdeeth August 3, 2023 09:01

sovdeeth approved these changes Aug 3, 2023

View reviewed changes

Merge branch 'SkriptLang:master' into enhancement/Breedable

2556e3b

Moderocky force-pushed the master branch 3 times, most recently from bd134d0 to 3f08853 Compare September 16, 2023 16:59

Moderocky changed the base branch from master to dev/feature September 18, 2023 10:33

Fusezion and others added 2 commits October 13, 2023 18:30

Merge branch 'dev/feature' into enhancement/Breedable

47301ca

Merge branch 'dev/feature' into enhancement/Breedable

abe6540

sovdeeth added the 2.8 Targeting a 2.8.X version release label Dec 30, 2023

Fusezion added 2 commits January 1, 2024 16:36

Merge branch 'dev/feature' into enhancement/Breedable

f6e2954

Merge branch 'dev/feature' into enhancement/Breedable

04d4e3a

sovdeeth added 2.9 Targeting a 2.9.X version release and removed 2.8 Targeting a 2.8.X version release labels Jan 2, 2024

sovdeeth added 2 commits June 28, 2024 18:06

Merge branch 'dev/feature' into enhancement/Breedable

f14bc73

Merge branch 'dev/feature' into enhancement/Breedable

485ac5f

APickledWalrus removed the 2.9 Targeting a 2.9.X version release label Jul 2, 2024

APickledWalrus requested changes Jul 14, 2024

View reviewed changes

Fusezion commented Jul 19, 2024

View reviewed changes

Efnilite self-assigned this Sep 22, 2024

Efnilite mentioned this pull request Sep 22, 2024

Add breeding #7110

Merged

Efnilite closed this Sep 22, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Breedable & Ageable Stuff #5584

Breedable & Ageable Stuff #5584

Fusezion commented Apr 7, 2023 •

edited

Loading

This comment was marked as resolved.

AyhamAl-Ali left a comment

Fusezion commented Apr 8, 2023 •

edited

Loading

sovdeeth commented Apr 8, 2023

Fusezion commented Apr 8, 2023

AyhamAl-Ali commented Apr 8, 2023

APickledWalrus Jul 1, 2024

APickledWalrus Jul 14, 2024

APickledWalrus Jul 14, 2024

Fusezion Jul 19, 2024 •

edited

Loading

APickledWalrus Jul 14, 2024

APickledWalrus Jul 14, 2024

APickledWalrus Jul 14, 2024

Fusezion Jul 14, 2024

APickledWalrus Jul 14, 2024

Fusezion Jul 19, 2024

APickledWalrus Jul 14, 2024

APickledWalrus Jul 14, 2024

Fusezion left a comment

Fusezion Jul 19, 2024

Fusezion Jul 19, 2024

sovdeeth Jul 19, 2024

sovdeeth Jul 19, 2024 •

edited

Loading

Fusezion Jul 19, 2024

sovdeeth commented Sep 15, 2024

	"Picks whether or not entities will be able to breed.",
	"Sets whether or not entities will be able to breed.",

	Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing\| ]up [an] arrow\|arrow pick[ing\| ]up)")
	Skript.registerEvent("Player Pickup Arrow", SimpleEvent.class, PlayerPickupArrowEvent.class, "[player] (pick[ing\| ]up [an] arrow\|arrow pick[ing\| ]up)")

Breedable & Ageable Stuff #5584

Breedable & Ageable Stuff #5584

Conversation

Fusezion commented Apr 7, 2023 • edited Loading

Description

This comment was marked as resolved.

AyhamAl-Ali left a comment

Choose a reason for hiding this comment

Fusezion commented Apr 8, 2023 • edited Loading

sovdeeth commented Apr 8, 2023

Fusezion commented Apr 8, 2023

AyhamAl-Ali commented Apr 8, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fusezion Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fusezion left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sovdeeth Jul 19, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sovdeeth commented Sep 15, 2024

Fusezion commented Apr 7, 2023 •

edited

Loading

Fusezion commented Apr 8, 2023 •

edited

Loading

Fusezion Jul 19, 2024 •

edited

Loading

sovdeeth Jul 19, 2024 •

edited

Loading