Merge feature branch into master (before release). #7307
Merged
+45,671
−32,766
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
* init commit innit * minor touch ups * oops * fix annotation * oopsie * fixes * removed unused import * update annotation * added text --------- Co-authored-by: sovdee <[email protected]>
* Adds tame syntax * Adds test * Adds Skript doc annotations * NotSoDelayed Suggestions Co-authored-by: NotSoDelayed <[email protected]> * Suggestions - Removed 'de' as an option to untame a tameable entity - Adds untaming to test - Deletes value within variables instead of killing * Fixes test * Changed tests slightly * Auggestion Co-authored-by: NotSoDelayed <[email protected]> * Suggestions * Changes to JetBrains nullable annotation --------- Co-authored-by: NotSoDelayed <[email protected]> Co-authored-by: sovdee <[email protected]>
* Add condition type to fix parsing order * Add JUnit test * Move java imports backs * Move java imports backs * Complete tests * Change tests * Complete tests * Update src/test/skript/tests/regressions/5804-is-burning.sk
* Add optional ascending, descending sort order to SortEff * Add version to Since annotation for explicit sort order * Change toString() to reflect change in syntax * Add missing space in EffSort#toString * Change "explicit order" to "sort order" for clarity * Revert "Change "explicit order" to "sort order" for clarity" This reverts commit ae11d23. * Update src/main/java/ch/njol/skript/effects/EffSort.java --------- Co-authored-by: Moderocky <[email protected]>
* Add duration conversion methods. * Add TemporalAmount & TemporalUnit methods.
* Added on piglin bartering * Added bartering input * Added bartering output * Minor formatting/documentation fixes * Fixed IDE using wildcard import * Epically forgot space * Fixed review comments * Okay, should be good now * Added junit tests * Fix tests for <1.16 versions * uhh * Only register exprs if event exists * Remove plagiarism * Minor spelling mistake * Fixed errors * Fixed no completion * oopsie * tried parsing section * forgot "to console" * move to file loading * rename file * remove broadcast * Update src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java Co-authored-by: Patrick Miller <[email protected]> * Update src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java Co-authored-by: Patrick Miller <[email protected]> * Update src/main/java/ch/njol/skript/expressions/ExprBarterInput.java Co-authored-by: Patrick Miller <[email protected]> * Update src/test/skript/junit/EvtPiglinBarterTest.sk Co-authored-by: Patrick Miller <[email protected]> * Apply suggestions from code review Didn't realise this existed until now. Oops! Co-authored-by: Patrick Miller <[email protected]> * Fixed review stuff * Extra nls Co-authored-by: Patrick Miller <[email protected]> * oops * fixes * moar fixes * thanks pickle --------- Co-authored-by: Moderocky <[email protected]> Co-authored-by: Patrick Miller <[email protected]> Co-authored-by: sovdee <[email protected]>
* Update CondIsCharged * Adds new test and updates effect - Also deletes old test * Fixes test - Wither skull wasn't spawning as I thought it was, changed to shoot effect * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * Suggestions --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Commit * Commit x2 * whoops * Suggested * One last change * Commit * Commit x2 * whoops * Suggested * One last change * change * yes?! * moved config * e * simplification * e * pickle please 🙏 * stupid IDE * aaaaaaaaaaaaaaaaaa * Changes, once again * chagne * deleted left other thing from a pr that i didnt make * e * done * Cleanup + Remove config --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Fix ExprBookAuthors performance Java 17 * Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java Co-authored-by: Moderocky <[email protected]> * Update ExprBookAuthor.java * Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java Co-authored-by: Patrick Miller <[email protected]> * Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java Co-authored-by: sovdee <[email protected]> --------- Co-authored-by: Moderocky <[email protected]> Co-authored-by: Patrick Miller <[email protected]> Co-authored-by: sovdee <[email protected]>
#6912) * Add SecFilter, refactor Variable and Variables slightly to accomodate. * Messed up merge * realllly bad at merging * generify convertIfOldPlayer * use SectionNode#isEmpty() * small edits and implement variableIterator#remove() * Update src/main/java/ch/njol/skript/sections/SecFilter.java Co-authored-by: Patrick Miller <[email protected]> --------- Co-authored-by: Patrick Miller <[email protected]>
* Start work on new json docs generation * Add more to the JSON * Add sections * Add ID generation to JSON docs * Fix SkriptCommand errors * Add license header * Test duplicate checker * Existing IDs actually start at 2 * Address reviews * Remove test class * Address reviews * Address reviews * Try new way of generating IDs * Add license header * Fix nullable import * Add javadocs * Remove license headers * Address reviews * Address reviews * Address reviews Co-authored-by: _tud <[email protected]> * Address reviews * Address reviews --------- Co-authored-by: _tud <[email protected]>
Co-authored-by: sovdee <[email protected]>
* Multiple Random Numbers Support Took 26 minutes * Change pattern a wee bit. Took 2 minutes * Use parse tags instead of parse marks. Took 3 minutes * Requested Changes Took 15 minutes * Requested Changes Took 3 minutes * Apply suggestions from code review Co-authored-by: Ayham Al Ali <[email protected]> * Requested changes, added tests, bug fixes * Add check for literal 1 in isSingle * Use Integer instead of Number * forgot to delete the infinity tests * Update skript-aliases --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Ayham Al Ali <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Add player chat completion suggestions * Add method exists check * Syntax adjustment and remove DataFlowIssue suppression * Docs improvements * Requested changes * Update src/main/java/ch/njol/skript/expressions/ExprPlayerChatCompletions.java Co-authored-by: sovdee <[email protected]> * Remove license header (#6684) * Java 17 ready --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Entity Potion Effect Event and event-values * Updated syntax for EvtEntityPotion, and readded the imports to EventValues. * Forgot to change e to event. * Added suggested changes :) * silly me * even sillier me (how did I manage to do that) * even sillier me (how did I manage to do that) * I don't get why the build is failing * BRO * Added type stuff, and made check a lot better * Changes * change * done * resolve conflict * Update src/main/java/ch/njol/skript/classes/data/BukkitClasses.java Co-authored-by: _tud <[email protected]> --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: _tud <[email protected]>
* adds more entity potion causes and adds the type * Update default.lang * requested changes
* Fixes 5804-is-burning regression test - Previously used a wait to allow the pig's fire ticks to update, but waits aren't allowed in tests, so now just uses the ignite effect * Suggestions Co-authored-by: Efy <[email protected]> --------- Co-authored-by: Efy <[email protected]>
Fixes missing and/or warnings in ExprJoinSplit.sk and SecFilter.sk Co-authored-by: sovdee <[email protected]>
* Combine activity events and add unload event * Add global script events * Add EventRegister API * Javadoc improvements * Refactoring * Cleanup and additional refactoring * Add ScriptLoadEvent and ScriptInitEvent * Add PreScriptInitEvent This is an alternative for the now-deprecated Bukkit implementation * Minor javadoc corrections * Oopsie! add license headers * Requested formatting changes * Javadoc tweaks * Fix script load triggering * Remove license headers * Update class and method names * Formatting tweaks * Refactor event classes into appropriate locations The event classes have been refactored as inner classes of the classes they concern. This is to help accomdate future API changes (e.g. to ParserInstance, ScriptLoader, etc.) where the events may need to change. * Add Event parent class for type restriction --------- Co-authored-by: sovdee <[email protected]>
* Fix gradle temp * Start on displays * Save * More work * update gradle.build * stash * Progress so far * Finish bulk add * Finalize so far * Minimize adventure api * Fix static class check for not 1.19.4 * Fix missing display classinfo in pattern under 1.19.4 * Fix missing quaternions classinfo in pattern under 1.19.4 * Make sure test runs on only 1.19.4 * Address reviews and fix java 8 * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * Move classes * Apply changes * Move classes * Class rename * Update to Spigot's fix to TextAlignment * Return null when using w of vector * Update src/main/java/ch/njol/skript/expressions/ExprXYZComponent.java Co-authored-by: sovdee <[email protected]> * Use brackets * Add entity hiding * Add property init values for displays * 1.19.4 check * Add rotate syntaxes * Change example * Fix tests * shadow syntax missing * Change setting * Revert change * Update src/main/java/ch/njol/skript/conditions/CondCanSee.java * Fix imports from master merge * Get tests working * Add color reset * Update ExprXYZComponent.java * Update DisplayData.java * Update DisplayData.java * Change the package naming and merge item into its own class * Add versioning for hide effect * Add versioning for hide effect * Change tests * Update submodule skript-aliases * Fix tests * Fix tests * Fix tests * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * Apply changes * Add axis angle * Add axis angle * Update skript-aliases * fix merge error * Remove axisangle and only present quaternion to users * Add tests for basic quaternion features, cleanup and fix bugs with ExprXYZComponent, add tests Notable changes include changing float comparison behavior (needs discussion) and allowing multiple vectors/quaternions to be changed at once (will overwrite list indices, needs discussion) * Add ExprQuaternionAxisAngle and tests. Change float comparison to use dynamic epsilon value. * Temporary change to build.gradle for java 17 * Revert "Update src/main/java/ch/njol/skript/conditions/CondCanSee.java" This reverts commit 3da7b37. * Reverts entity hiding commits in favor of #6867 Shouldn't be in the scope of this PR. * version check for EQAA and displaydata cleanup * force 'rotation' in EQAA, fix classdef error, add itemtypes to block display entitydata pattern, add tests for display entitydata Not sure wh * Clean up colorOf, add tests, add alpha parameter to rgb function and color tostring, add rgba factory method + constructor Discussion needed surrounding type checking in colorof acceptChange * update Nullable annotations to jetbrains * Fix <1.19 errors (just for actions) and fix subtle issues with xyz component changer * rename package to bukkit * finish package refactor * Add tests for billboarding, rework display brightness and add tests, move joml utilities * tests + allow setting override to a single number * tests, cleanup, and bug fixes for glow override and hegiht/width * Interpolation and Shadow tests + correct reset value for shadow strength + guard against NaN and init * Tests and cleanup for teleportation duration, remove number from changers for tp duration and interpolation delay/duration * Transformation tests, cleanup, bugfixes. Removed unnecessary Joml utils class. * wrong version check for teleportation duration * Display view range tests, cleanup, finite guard, switch to Timespan#getAs * strip licenses * cleanup, tests for ItemDisplayTransfrom. Fixed default from being FIXED to NONE, changed lang for NONE to be no transform to avoid confusion * Remove ItemOfItemDisplay (redundant), cleanup/test the text display expressions. * small cleanup to textdisplayexprs and rename ItemFrameSlot to be more generic * rework ExprRotate * Completely rework rotation with new Rotator API. Add support for quaternions + displays in EffRotate * cleanup rotations - java 17 tests will fail until legacy tests are removed * Fix bugs with rotation, adds tests * Add drop shadow syntax and small cleanup of ExprTextOf * See through blocks syntax * Update ExprRotate.java * remove extra [a]'s * whoops! reverts a change to number accuracy config done for testing * Module-ize, package infos, remove mc version checks * rename display.expressions package, use for loops, move displaydata * display data improvements * requested changes 1 * update switches and remove banana * requested changes 2 * Apply suggestions from code review Co-authored-by: cheeezburga <[email protected]> * Apply suggestions from code review Co-authored-by: cheeezburga <[email protected]> * fix expritemofentity description * Apply suggestions from code review Co-authored-by: cheeezburga <[email protected]> * Update ExprDisplayHeightWidth.java * Apply suggestions from code review Co-authored-by: Patrick Miller <[email protected]> * requested changes 2 + rotator docs * requested changes * Apply suggestions from code review Co-authored-by: Patrick Miller <[email protected]> * requested changes! --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]> Co-authored-by: cheeezburga <[email protected]> Co-authored-by: Patrick Miller <[email protected]>
* Added gamemode to CondIsInvulnerable.java Took 1 hour 13 minutes * Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java example fixed Co-authored-by: _tud <[email protected]> * Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java since* fixed Co-authored-by: _tud <[email protected]> * Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java only allowing entities and gamemodes* Co-authored-by: _tud <[email protected]> * Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java i literally forgot about curly brackets for a sec Co-authored-by: _tud <[email protected]> * Added methodExists check Took 10 minutes * checks if the method for gamemodes exists when registering the condition, fixed typo Took 9 minutes * all gamemodes over variable in example Co-authored-by: Patrick Miller <[email protected]> * tests Took 4 minutes * Refactor + space Took 5 minutes * Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk Co-authored-by: sovdee <[email protected]> * updated test Took 8 minutes * updated test Took 2 minutes * Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk Co-authored-by: sovdee <[email protected]> * Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk Co-authored-by: _tud <[email protected]> * Update CondIsInvulnerable.sk * Update CondIsInvulnerable.sk --------- Co-authored-by: _tud <[email protected]> Co-authored-by: sovdee <[email protected]> Co-authored-by: Patrick Miller <[email protected]>
* Starter Commits * Commit 2 * Commit 3 * Removed un-needed import + details to config * Fixed config.sk * Suggestion Changes Changed to primitive java types Added checks within the method incase called manually by a user. Changed config option Add config description * Revert Reverted back to defining how many files a user wants to keep Sovde and eren agreed upon so * Config Update Added info on what the user can not set the options to. Can be removed if needed. * One Liner Change Changed to a 1 liner option in config Changed method handler to support the new option Changed description in config * More Changes... Added the option to all other applicable databases. Changed function to support other databases. Moved the main description of the option to the top database in the config. Re-worded the description. * Fixed Integer.class * Config Typos Fixed * Disable Backups Added, The ability to put 0 Added, 0 does not call "startBackupTask" Added, 0 deletes all files in backup directory Changed, Config for putting 0 Added, warning for putting 0 Changed, "backupPurge" method to allow 0 as a parameter Changed, filters files array only if tokeep > 0 * Test Class Added Test Class Tests levels of deletion Tests invalid input Note: `BellEvents.sk` causes `JUnitQuick` to fail * Requested Changes Changed, config.sk description Changed, variable names Added, extra info to the exception message Removed, `Final`s * IllegalArgumentException Added, Throw IllegalArgumentException into method Added, IllegalArgumentException in the catch Changed, Expected exception to be thrown in test class * Requested Changes Changed, var name for the `file` in `backupPurge` Added, Javadocs for method * Parameter Name Change So it doesnt look like its strictly only for .csv files * Fix Indentation --------- Co-authored-by: sovdee <[email protected]>
* Adds command block syntax - An expression to get/set the command of a command block or minecart with command block - An effect and condition for whether a command block is conditional or not - Tests for both * Adds Skript annotations * Apply suggestion from review Co-authored-by: sovdee <[email protected]> * Suggestions * Hopefully fixes tests * Hopefully fixes tests * Uses setNegated and hopefully fixes tests * Suggestions * Suggestions and stuff * Changes effect pattern to be more clear * Fixes test syntax * Pattern matching in CondIsCommandBlockConditional --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Adds domestication syntax - An expression with changers - A test for the expression * Hopefully fixes tests * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * Suggestions * Test suggestions * Removes reset changer and (hopefully) fixes tests * Suggestions * Suggestions * Adds domestication syntax - An expression with changers - A test for the expression * Hopefully fixes tests * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * Suggestions * Test suggestions * Removes reset changer and (hopefully) fixes tests * Suggestions * Suggestions * Suggestions and some changes * Suggestion --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Time Until * ghost of christmas past Adds condition for checking whether dates are in the past or the future * Update CondPastFuture.java * Update CondPastFuture.java * Make tests more reliable * Requested changes * requested changes, fix merge issue --------- Co-authored-by: Moderocky <[email protected]>
* Add method to search cuboids
* Remove wait
* Update imports
* More descriptive variables
* Improve readability of #toString
* Remove unnecessary {}
* Update src/test/skript/tests/syntaxes/expressions/ExprEntities.sk
Co-authored-by: sovdee <[email protected]>
* Use correct variables
* Less technical terminology in description
* Change annotation
* Check if world is null
* Add more spawn locations
---------
Co-authored-by: sovdee <[email protected]>
EffTestPluralClassInfos - remove from docs
* Testing. * I'll have the third part first, please. * Revert "Testing." This reverts commit 52c3b75.
Fix duplicate secspression logs Co-authored-by: Efnilite <[email protected]> Co-authored-by: Moderocky <[email protected]>
* init commit * fix incorrect order of typed args in getter * oops! --------- Co-authored-by: Moderocky <[email protected]>
* Add slightly more custom highlighting control * Removes RuntimeErrorProducer#toHighlight() - Highlighting defaults to null now, if error(String) is used * Removes toHighlight() override in SPE * Adds getRawExpr() method to SPE * Makes rawExpr field protected instead of having a public method to access it - Cheers Sovde --------- Co-authored-by: Moderocky <[email protected]>
* init commit * use chunks * oops * use non-spawn-chunk chunk --------- Co-authored-by: Moderocky <[email protected]>
* PotionEffectUtils - fix null in docs * PotionEffectType overhaul * default.lang - remove "s" * BukkitUtils - remove extra space * BukkitUtils - no need for reflection (it was hidden in the javadocs) * DocumentationIdProvider - fix collision checker always returning at least 1 * Revert "DocumentationIdProvider - fix collision checker always returning at least 1" This reverts commit dea1d22. * PotionEffectUtils - add notes to legacy method * BukkitUtils - make method nullable * PotionEffectUtils - move doc to new line - how'd you get up there silly? --------- Co-authored-by: Moderocky <[email protected]> Co-authored-by: cheeezburga <[email protected]>
* Adds second pattern to ExprVectorFromYawAndPitch * Adds second pattern to ExprVectorFromYawAndPitch * Changes @name to match file name, description, original pattern * Code suggestion Co-authored-by: LimeGlass <[email protected]> --------- Co-authored-by: LimeGlass <[email protected]>
* Tests - even more fun updates * SkriptCommand - close loggers to stop errors * TestResults - make lists look like list and add "none" when empty * TestTracker - add "parsing" * CountingLogHandler - revert * TestingLogHandler - switch to custom log handler * CountingLogHandler - revert more * CountingLogHandler - revert more * Tests - even more fun updates * SkriptCommand - close loggers to stop errors * TestTracker - add "parsing" * CountingLogHandler - revert * TestingLogHandler - switch to custom log handler * CountingLogHandler - revert more * CountingLogHandler - revert more * Tests - even more fun updates * CountingLogHandler - revert changes * Skript - change logger and remove delay in dev mode
* init commit * forgot to remove node in add(Int, Node) * forgot debug
* Improve description * Update src/main/java/ch/njol/skript/effects/EffKill.java --------- Co-authored-by: Efnilite <[email protected]>
* init commit * add comments
Co author by Me
* init commit * fix firework warning * fix & update purge test * fix backup cleanup * fix imports * change names
* Add back converter class stub. * Add caller error. * Alter message a bit. * Update src/main/java/ch/njol/skript/util/Utils.java * Remove method. ---------
Moderocky
force-pushed
the
dev/feature
branch
from
3794e2e to
0a441ce
Compare
Add missing nullable check.
* Add support for more value types. * Use proper array types. * Remove old node value class. * Clean up some bad imports.
* Enhance test loading Improves test loading to properly support placing tests at their equivalent src/main packages. Corrects some improper test naming. Enhances ClassLoader utility with additional API. * SkriptImpl: remove accidental statics * Some initial tests * PriorityTest: Add complex test * Rename Buildable#builder to Buildable#toBuilder * ClassLoader: Implement Builder/Buildable * Priority: Improve equality comparisons * Use static import for Assert in tests * Skript: Improve SyntaxOrigin resolution Some addons register classes that were created in a manner such that JavaPlugin#getProvidingPlugin fails on them. This attempts to resolve that issue through catching the exception and returning a * Fix modern addon registration * Remove Builder Interface * Fix a few SyntaxInfo building bugs - Parameterized addEvents should not be varargs - nodeType was not applied if entryValidator was missing * Add SyntaxInfo tests * Rework Skript/SkriptAddon Testing * Add SyntaxRegistry Tests * SyntaxRegistry: Add simplified unregistration * SyntaxRegistry: Fix elements() containing duplicates
* Clean up existing example issues. * Fix some issues with queues. * Add an example structure. * Fix the old tests. * Add example scripts for the experimental features. * Fix toString. * Apply suggestions from code review * Change text type. * Fix spacing. * Change node names. * Fix issues from merge. * Update src/main/resources/scripts/-examples/experimental features/for loops.sk Co-authored-by: Patrick Miller <[email protected]> * Fix some more merge errors. --------- Co-authored-by: Patrick Miller <[email protected]>
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.
This is the 2.10 update commit.
Merge this on release day, and then create the release from master branch so it has the right signature.
Note: make sure to merge patch into feature before this.