Feature/structures git conflicts and changes #7624
Open
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
* Starter Commit * :) * Changes * Requested Changes Kept the changes that suited best between the overlapping requested changes * Requested Changes * Change * Requested Changes * More Changes * Update src/main/java/ch/njol/skript/conditions/CondLidState.java --------- Co-authored-by: sovdee <[email protected]>
* Add supplier to EnumClassInfo - removes it from 'ClassInfo#getSupplier' - Also renames some things under EnumClassInfo to better reflect * Revert removal of setting supplier in getSupplier * Commit suggestion Whoops didn't see this earlier Co-authored-by: Efy <[email protected]> * Fix build - adds additional annotations to string methods - uses enumUtils for toStrings in case it ever changes * EnumUtils - add a toString with StringMode support - currently unused but is good for future implementations --------- Co-authored-by: Efy <[email protected]> Co-authored-by: sovdee <[email protected]>
* init commit * invert if --------- Co-authored-by: sovdee <[email protected]>
* init commit * fixes * minor fixes * oops * fixed formatting * replace player hiding with entity hiding * update hidden players * fixed shane stuff * oops * Apply suggestions from code review Co-authored-by: cheeezburga <[email protected]> * fixed versions * fixed ParseResult import * added can see test * fixed review stuff * updated var, param names * updated CondCanSeeTest * fixed space * fixes * Update src/main/java/ch/njol/skript/conditions/CondCanSee.java Co-authored-by: Moderocky <[email protected]> * Update src/test/java/org/skriptlang/skript/test/tests/syntaxes/effects/EffEntityVisibilityTest.java Co-authored-by: LimeGlass <[email protected]> * Update src/test/java/org/skriptlang/skript/test/tests/syntaxes/conditions/CondCanSeeTest.java Co-authored-by: LimeGlass <[email protected]> * update invisibility tag --------- Co-authored-by: cheeezburga <[email protected]> Co-authored-by: Moderocky <[email protected]> Co-authored-by: LimeGlass <[email protected]>
* Create EffDetonate.java * Update EffDetonate.java now fireworks instantly detonate * adds support for windcharge and tnt minecart * Update EffDetonate.java * adds support for creeper * adds tests * fixes test version ty Sovde and ShaneBee * Update EffDetonate.sk * oops * Update EffDetonate.sk * Update EffDetonate.sk * Update EffDetonate.sk * Update EffDetonate.java * check descrription adds support for blocks, and adds tnt as a block * bandaid fix * bandaid fix again (I am stupid) * Update EffDetonate.java * Update EffDetonate.java * Update EffDetonate.java * Update EffDetonate.java * Requested Changes * Update EffDetonate.java * unneeded spacing * grammatical fixes * Requested Changes * Create EffDetonate.java * Update EffDetonate.java now fireworks instantly detonate * adds support for windcharge and tnt minecart * Update EffDetonate.java * adds support for creeper * adds tests * fixes test version ty Sovde and ShaneBee * Update EffDetonate.sk * oops * Update EffDetonate.sk * Update EffDetonate.sk * Update EffDetonate.sk * Update EffDetonate.java * check descrription adds support for blocks, and adds tnt as a block * bandaid fix * bandaid fix again (I am stupid) * Update EffDetonate.java * Update EffDetonate.java * Update EffDetonate.java * Update EffDetonate.java * Requested Changes * Update EffDetonate.java * unneeded spacing * grammatical fixes * Requested Changes * removes star import and useless spacing --------- Co-authored-by: Moderocky <[email protected]> Co-authored-by: sovdee <[email protected]>
…g#7145) * remove eclipse annotations in display rotation packageinfo * Update build.gradle * Update build.gradle --------- Co-authored-by: Moderocky <[email protected]>
* replace chat styles and remove unnecessary string valueof * handle errors too * remove outdated comment * better fix
* init commit * oops * no java 21 >:( * doc updates * update toString * remove world spawn references * add test-block, remove event-values * oops * fix test-block * fix block iterator using test-x * revert removing event-values, and add `event-world` * tabs * oops --------- Co-authored-by: Moderocky <[email protected]>
* Create CondIsDivisibleBy.java * requested changes + adds tests * requested changes * requested changes * requested changes * Update CondIsDivisibleBy.java * requested changes * requested changes * requested changes + oops * requested changes * requested changes + fixes tests * fixes documentation * makes "evenly" optional * makes evenly required again * requested changes + minor syntax update * Update CondIsDivisibleBy.java * requested changes * requested changes * requested changes --------- Co-authored-by: sovdee <[email protected]>
* Starter Commit * Changes + Tests * Requested Changes * Requested Changes * Requested Changes * Requested Change * Requested Changes * Requested Changes * Fix Syntax * Conflict * Requested Changes * Final Fix * Remove Specific Player Event Value --------- Co-authored-by: sovdee <[email protected]>
* 🚀 Add number format expression * Little changes * Prevent variables usage * Support variables as custom format * Make it return null if format is invalid * Add test script * Update test script * Update test script * Changes * Fix class to use same technique as SkriptLang#4664 * Apply suggestions from code review Co-authored-by: LimeGlass <[email protected]> * Add helpful comments and use lambda * Update src/main/java/ch/njol/skript/expressions/ExprFormatNumber.java Co-authored-by: LimeGlass <[email protected]> * Change expression to function * Remove unused imports * Refactoring and merge base, updating examples * return null instead of empty string * Update examples * Warn instead of erroring, but probably better to remove * Address reviews * better variable naming * init commit * update file name --------- Co-authored-by: Ayham Al-Ali <[email protected]> Co-authored-by: Ayham Al-Ali <[email protected]> Co-authored-by: LimeGlass <[email protected]> Co-authored-by: Moderocky <[email protected]>
* fix entry casing * lowercase seperator as well Co-authored-by: _tud <[email protected]> * use regionMatches instead * use regionMatches instead * remove import --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: _tud <[email protected]>
* init commit * oops * update * update ver * fix paper * hmm * yeah ok * oops * biggera oops * dont run tests on 1.20.6 * requested changes * tabs --------- Co-authored-by: sovdee <[email protected]>
* Starter Commit * Remove License * Requested Changes * Requested Changes * Error Messages Change * Changes + Revert * Tab Fixes + Line Splits * Requested Changes --------- Co-authored-by: sovdee <[email protected]>
* fix: Mod items support, for Hybrid Server * style: style * perf: rename function name and aliases name * perf: notes * perf: not a break change * perf: the @nullable annotation * docs: javadoc * style: to upper cases * perf: resolved mentioned * style: style * perf: resolved mentioned * feat: the expression: from * fix: wrong space * fix: ..s * perf: add warnings * style: just sort codes, using IDEA * perf: resolved mentioned --------- Co-authored-by: sovdee <[email protected]>
* hmm * hm --------- Co-authored-by: sovdee <[email protected]> Co-authored-by: Moderocky <[email protected]>
* Implement ADD and REMOVE changers to the metadata value expression * Remove license comment and import ParseResult directly * Update src/main/java/ch/njol/skript/expressions/ExprMetadata.java Co-authored-by: sovdee <[email protected]> * Requested Changes --------- Co-authored-by: sovdee <[email protected]>
* Update aliases I guess? * Revert "Update aliases I guess?" This reverts commit a437ca9. * Adding Events :paperclip: Added EntityEnterLoveModeEvent :pig: Added EntityBreedEvent :sparkles: Added EventValues for these events * Breeding Event Expressions :family: Added family expression for Father, Mother, Child, and Breeder :sparkles: Added breeding experience to experience class *update class to current standards * More Breeding Related Syntax :sparkles: Added condition for checking ageable :sparkles: Added condition for checking breedable :sparkles: Added effect for toggle breedable :sparkles: Added effect for locking age :sparkles: Added expression for love ticks * Pattern Fixes & Class Exist checks :bug: Fixed issue with `livingentities` :bug: Added class exist checks for Breedable instances :sparkles: Added RequirePlugins annotation to select classes * Test, Test, Test :clipboard: Added test for ExprLoveTime & CondIsInLove :clipboard: Addes test for EffBreedable & CondCanBreed :clipboard: Added test fpr EffLockAge & CondCanAge * :purple_heart: Formatting * Added Adult Syntax :sparkles: Added Condition for checking is adult :sparkles: Added Effect to make an entity a baby or adult :clipboard: Added test for these syntaxes :large_blue_circle: 1.16 for any mob, below that is animals only * Apply suggestions from code review Thanks for all these formatting changes it's just what I wanted when waking up Co-authored-by: Ayham Al Ali <[email protected]> * ExprLoveTime -> ExprLoveTicks :sparkles: Renamed expression to ExprLoveTicks :sparkles: Added support for ticks via integers :clipboard: Added a new test for using integers :clipboard: Removed unneeded test condition * Update ExprBreedingFamily.java :sparkles: Changed expression for father, mother and offspring a bit :sparkles: Converted get to a switch statement * Update ExprExperience.java :bug: Fixed an issue where set allowed more than one value :bug: Fixed a typo in examples :sparkles: Added a spacer to examples * Added comment to CondIsAdult and EffMakeAdult Co-Authored-By: Ayham Al Ali <[email protected]> * Syntax description notes Just adds some notes in descriptions to bring more light to animal exclusive syntax Co-Authored-By: Ayham Al Ali <[email protected]> * Update ExprLoveTicks and SimpleEvents :bug: fix accidental forgotten example :red_circle: remove integer support from love ticks expression :clipboard: remove a test from CondIsInLove.sk Co-Authored-By: Ayham Al Ali <[email protected]> * Fix ExprLoveTicks & Update Test :bug: Fixed an issue with ExprLoveTicks not working correctly :clipboard: Updated test to include more checks for add, remove and reset * LoveTicks -> LoveTime Co-Authored-By: Ayham Al Ali <[email protected]> * Apply suggestions from code review Co-authored-by: LimeGlass <[email protected]> * Change CondIsAdult condition checks Co-authored-by: LimeGlass <[email protected]> * Apply requested code review changes Co-authored-by: LimeGlass <[email protected]> * Apply more requested changes * update conds * update exprs * update effs * update event values * update annot * update annotations * update CondIsInLove * renames * updates * update tests * oops * fix * grr * gahr * add breeding trigger event * more * MORE * MORE!!!! * MORE!!!!!! * stupid copilot * g * fixes * agag * move to module * load * fix imports * fix indent --------- Co-authored-by: Fusezion <[email protected]> Co-authored-by: Ayham Al Ali <[email protected]> Co-authored-by: LimeGlass <[email protected]> Co-authored-by: sovdee <[email protected]>
* init commit * update * update * update doc * weird error * weird error * Apply suggestions from code review Co-authored-by: sovdee <[email protected]> * ok * add new cond * remove chat visibility type * remove old * fix names * oops * oops * aight --------- Co-authored-by: sovdee <[email protected]>
* 1.21.3 support * Update default.lang
…ptLang#7188) Fix ExprTimeStates not accepting plural expressions
* SoundUtils - handle Sound class for enum/interface * SoundUtils - fix an error with MC 1.15 * EffPlaySound.sk - add simple test to make sure syntax doesn't throw error * EffPlaySound - remove reflection and remove to effect class * EffPlaySound - some changes * EffPlaySound.sk - fix tests failing
* boats are hoes fix bugs with comparisons, use simple entity data for 1.21.3+ * whoops * .2 * Update skript-aliases * Apply suggestions from code review Co-authored-by: Patrick Miller <[email protected]> * requested changes 2 --------- Co-authored-by: Patrick Miller <[email protected]>
* init commit * remove option * update javadoc * le fix * update debuggable * add docs * add null check * change to append, add general for objects * add multiple objects to chain * oopsie * add space notice --------- Co-authored-by: sovdee <[email protected]>
Merge feature branch into master (before release).
ExprName - fix not being able to get/set name of block
Fix queue serialisation.
* Fix EffSend conflict with EffConnect * Update the check for the matchedPattern in init * Add JUnit test --------- Co-authored-by: cheeezburga <[email protected]>
* Fix loop behaviour from super call. * Update src/test/skript/tests/syntaxes/expressions/ExprQueue.sk
Merge patch into feature.
* Adds ParsingStack data type * Add ParseStackOverflowException * Store ParsingStack in ParserInstance * Implement the parsing stack in SkriptParser Document SkriptParser#parse_i a bit better * Improve robustness of ParsingStack Add more operations to ParsingStack * Add usage note to ParsingStack * Add modification notice to ParserInstance#getParsingStack * Switch from Stack class to LinkedList class Add notice on iteration order * Change brackets of ignored catch block Co-authored-by: Patrick Miller <[email protected]> * Review response, slight documentation changes, variable rename, formatting changes * Update src/main/java/ch/njol/skript/lang/parser/ParsingStack.java Co-authored-by: Kiip <[email protected]> * Add `@param` tags to method Javadocs for completeness sake Co-authored-by: LimeGlass <[email protected]> * Forgot import because of GH suggested change commit * Fix newer merge changes. --------- Co-authored-by: TPGamesNL <[email protected]> Co-authored-by: TPGamesNL <[email protected]> Co-authored-by: Patrick Miller <[email protected]> Co-authored-by: Kiip <[email protected]> Co-authored-by: LimeGlass <[email protected]>
…pace keys in ExprTag (SkriptLang#7474)
--------- 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.
Description
Updates #5222 and applies the changes
Target Minecraft Versions: any
Requirements: none
Related Issues: none