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

Boats+ #7055

Merged
merged 21 commits into from
Oct 13, 2024
Merged

Boats+ #7055

merged 21 commits into from
Oct 13, 2024

Conversation

TheAbsolutionism
Copy link
Contributor

@TheAbsolutionism TheAbsolutionism commented Sep 7, 2024 •
edited
Loading

Description

This PR aims to add some missing (chest)boats as well as stop using a deprecated class.
Now also includes:

  • The ability to spawn chest boats
  • Test for spawning majority of entity types

Target Minecraft Versions: any
Requirements: none
Related Issues: #6840

TheLimeGlass
TheLimeGlass suggested changes Sep 8, 2024
View reviewed changes
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatData.java Outdated Show resolved Hide resolved
@TheLimeGlass TheLimeGlass added the enhancement Feature request, an issue about something that could be improved, or a PR improving something. label Sep 8, 2024
@TheAbsolutionism
Requested Changes
34df948
@TheAbsolutionism
Requested Changes - 2
76c3072 
Changed, syntax patterns are now automatic
Changed, to jetbrains nullable
Changed, automatic item comparison
Fixed, inability to spawn chest boats
Efnilite
Efnilite requested changes Sep 8, 2024
View reviewed changes
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatData.java Outdated Show resolved Hide resolved
@TheAbsolutionism
Fixes
bbacb5e 
Added, Nullable annotation
Fixed, Test for entities
Changed, parameter names
Removed, 'fireball' and 'wind charge' entities for test
sovdeeth
sovdeeth requested changes Sep 8, 2024
View reviewed changes
src/main/resources/lang/default.lang Outdated Show resolved Hide resolved
src/main/java/ch/njol/skript/entity/BoatChestData.java Outdated Show resolved Hide resolved
@TheAbsolutionism
Requested Changes
e5609b7 
Changed, bamboo pattern getter
Changed, patterns in lang
Added, expected/got to assert
@TheAbsolutionism
Merge branch 'dev/feature' into dev/boats+
f3c1991
@TheAbsolutionism
Copy link
Contributor Author

I did not mean to reclick you Sovde

@sovdeeth
Copy link
Member

I did not mean to reclick you Sovde

>:(

@Efnilite Efnilite added the feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. label Sep 30, 2024
sovdeeth
sovdeeth requested changes Oct 13, 2024
View reviewed changes
Copy link
Member

@sovdeeth sovdeeth left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

conflicts

@sovdeeth sovdeeth merged commit 1993ab6 into SkriptLang:dev/feature Oct 13, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ShaneBeee ShaneBeee ShaneBeee left review comments

@sovdeeth sovdeeth sovdeeth approved these changes

@TheLimeGlass TheLimeGlass TheLimeGlass approved these changes

@Efnilite Efnilite Efnilite approved these changes

@Pikachu920 Pikachu920 Awaiting requested review from Pikachu920

Assignees
No one assigned
Labels
enhancement Feature request, an issue about something that could be improved, or a PR improving something. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@TheAbsolutionism @sovdeeth @TheLimeGlass @ShaneBeee @Pikachu920 @Efnilite