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

Preliminary 1.17 work #4070

Merged
merged 25 commits into from
Jun 24, 2021
Merged

Preliminary 1.17 work #4070

merged 25 commits into from
Jun 24, 2021

Conversation

ShaneBeee
Copy link
Contributor

@ShaneBeee ShaneBeee commented Jun 13, 2021 •
edited
Loading

Description

This PR aims to get Skript ready for MC 1.17

NOTES:

  • Particles -> I haven't used TPGames' new particle system yet, so all particles are added as normal particles, but the vibration and dust_color_transition particles will need some more work in the code
  • From what I can see in the Bukkit 1.17 update, there are no potions/enchants/anything else that need to be added. Please let me know if I missed anything
  • Thanks to @TPGamesNL for updating Gradle and dealing some other minor changes

Target Minecraft Versions: 1.17
Requirements: 1.17 Paper API
Related Issues: none

@ShaneBeee ShaneBeee added 2.6 enhancement Feature request, an issue about something that could be improved, or a PR improving something. labels Jun 13, 2021
ShaneBeee and others added 12 commits June 13, 2021 11:10
@ShaneBeee
lang - add freeze damage cause
b95aaf8
@ShaneBeee
lang - add new biomes
efd4356
@ShaneBeee
lang - add missing spawn reason
92e7192
@ShaneBeee
SimpleEntityData - register squid after glow squid
3eac11c 
- due to glow squid extending from squid, the squid has to be registered after (same thing as the zombie situation)
@ShaneBeee
build.gradle - update to Paper 1.17
a341ab7
@TPGamesNL
Update aliases subproject
ae95720 
Update Gradle and shadow plugin
Set source & target compat
Update Bukkit-implementing classes
@TPGamesNL
Merge remote-tracking branch 'upstream/master' into feature/prepare-117
c2ae2df
@TPGamesNL
Update GH Actions workflow
d1895c3
@ShaneBeee
workflows/gradle.yml - testing switching back to java 8 after Skript …
d0aea5c 
…builds

- seems to be issues running the older servers on java 16
- this is a test
@ShaneBeee
workflows/gradle.yml - remove test as it failed
7e27bd5
@ShaneBeee
switch test 1.15.2 to 1.17
79be864
@ShaneBeee
Merge branch 'master' into feature/prepare-117
6f12698
@ShaneBeee ShaneBeee changed the title Preliminary 1.17 work [WIP] Preliminary 1.17 work Jun 22, 2021
@ShaneBeee ShaneBeee marked this pull request as ready for review June 22, 2021 17:12
APickledWalrus
APickledWalrus requested changes Jun 23, 2021
View reviewed changes
Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

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

just the one thing

src/main/java/ch/njol/skript/entity/AxolotlData.java Outdated Show resolved Hide resolved
src/main/resources/lang/english.lang Show resolved Hide resolved
APickledWalrus
APickledWalrus approved these changes Jun 23, 2021
View reviewed changes
Copy link
Member

@APickledWalrus APickledWalrus left a comment

Choose a reason for hiding this comment

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

Looks good to me. I suppose the particle changes should be revised by TP maybe just incase.

@ShaneBeee
Copy link
Contributor Author

Looks good to me. I suppose the particle changes should be revised by TP maybe just incase.

thats what I was thinking. I didnt want to get into that right now, as I haven't spent time with his new system.

@TPGamesNL
Copy link
Member

The particle stuff looks good, but indeed DUST_COLOR_TRANSITION and VIBRATION need extra data, I'll add that

@ShaneBeee ShaneBeee merged commit f4fbb44 into SkriptLang:master Jun 24, 2021
@ShaneBeee ShaneBeee deleted the feature/prepare-117 branch June 24, 2021 19:46
@TPGamesNL TPGamesNL mentioned this pull request Jun 27, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TPGamesNL TPGamesNL TPGamesNL approved these changes

@APickledWalrus APickledWalrus APickledWalrus approved these changes

Assignees
No one assigned
Labels
enhancement Feature request, an issue about something that could be improved, or a PR improving something.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@ShaneBeee @TPGamesNL @APickledWalrus