Mass-merge for script reflection pull requests. #7334
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moderocky
added
2.10
Moderocky
requested review from
sovdeeth,
APickledWalrus,
Efnilite and
a team
APickledWalrus
approved these changes
Jan 1, 2025
* Create Script type. * Support script string/name conversion. * Script expression. * Add script lang entry. * Tests for script expression & names. * Support all scripts expression. * Script effects & tests. * Create dummy Script handle for disabled scripts. * Script reflection feature flag. * Restrict literal parsing to commands & parse. * Test feature flag for resolving name. * Split ExprScripts by feature to support disabled scripts. * Fix ExprName tests for new & old behaviour. * Add tests for disabled script handles. * Apply suggestions from code review Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> * Improve script loading/unloading safety. * Add feature check for script hotswapping. * Use expression stream. * Conformity for file names and proper loading safety. * Document validity & add condition support. * Add script is loaded condition + tests. * Some changes from code review. * More changes. * Apply suggestions from code review Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> * Clean up EffScriptFile and rename ExprScripts variations. * Finish code review changes. * Clean up script loader stuff. * Fix conflicts. * Suggested changes. * Apply suggestions from code review Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> * Finished. --------- Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Base change.
* Create Script type. * Support script string/name conversion. * Script expression. * Add script lang entry. * Tests for script expression & names. * Support all scripts expression. * Script effects & tests. * Create dummy Script handle for disabled scripts. * Script reflection feature flag. * Restrict literal parsing to commands & parse. * Test feature flag for resolving name. * Split ExprScripts by feature to support disabled scripts. * Fix ExprName tests for new & old behaviour. * Add tests for disabled script handles. * Apply suggestions from code review Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> * Improve script loading/unloading safety. * Add feature check for script hotswapping. * Use expression stream. * Conformity for file names and proper loading safety. * Document validity & add condition support. * Add script is loaded condition + tests. * Dynamic function calling + tests. * Add language entry for types. * Single-encounter input bootstrapping. * Apply suggestions from code review Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> * Fix inspection. * Update src/main/java/ch/njol/skript/expressions/ExprFunction.java Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> * Update src/main/java/ch/njol/skript/expressions/ExprResult.java Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com> * Changes from review. * Fix merge problems. * Remove script command method usage. * Fix branch muck. * Fix more branch muck. * Fix up ExprName. * Add docs. * Add docs. * Add docs. * Fix bits. * Apply suggestions from code review Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> * Fix some bits. * Function parsing by name. * Fix up some bits for Walrus. * Fix merge error. --------- Co-authored-by: Patrick Miller <apickledwalrus@gmail.com> Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Moderocky
force-pushed
the
feature/script-reflection
branch
from
b945e0c to
2dd5cff
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
All of these pull requests were done to a special branch and have already passed review, but I wanted an extra review round to catch any last issues.
This needs to be merged in a special way. Don't update the branch.
Target Minecraft Versions: any
Requirements: none
Related Issues: none