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.

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

Merge feature branch into master (before release). #7307

Draft
wants to merge 152 commits into
base: master
Choose a base branch
from
Draft

Conversation

Moderocky
Copy link
Member

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.

sovdeeth and others added 30 commits July 24, 2024 11:04
* Update lang package to new annotation conventions, new warning conventions, and use try-with-resources for loggers

* Apply suggestions from code review

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Requested changes

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
Require Java 17

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* Allows for multiple return types in ExpressionEntryData
- Changes the constructors to allow for multiple return types
- Changes the calls to SkriptParser#parseExpression to pass in the array of types

* Changes list to array and redirects existing constructors
- Changes returnTypes field to an array
- Adds 2 new constructors, one which has the flags parameter and the other that defaults to ALL_FLAGS

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* init commit innit

* minor touch ups

* oops

* fix annotation

* oopsie

* fixes

* removed unused import

* update annotation

* added text

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* Adds tame syntax

* Adds test

* Adds Skript doc annotations

* NotSoDelayed Suggestions

Co-authored-by: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com>

* 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 <72163224+NotSoDelayed@users.noreply.github.com>

* Suggestions

* Changes to JetBrains nullable annotation

---------

Co-authored-by: NotSoDelayed <72163224+NotSoDelayed@users.noreply.github.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* 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 <admin@moderocky.com>
* 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 <apickledwalrus@gmail.com>

* Update src/main/java/ch/njol/skript/expressions/ExprBarterDrops.java

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Update src/main/java/ch/njol/skript/expressions/ExprBarterInput.java

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Update src/test/skript/junit/EvtPiglinBarterTest.sk

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Apply suggestions from code review

Didn't realise this existed until now. Oops!

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Fixed review stuff

* Extra nls

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* oops

* fixes

* moar fixes

* thanks pickle

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* 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 <10354869+sovdeeth@users.noreply.github.com>

* Suggestions

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* 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 <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Fix ExprBookAuthors performance Java 17

* Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java

Co-authored-by: Moderocky <admin@moderocky.com>

* Update ExprBookAuthor.java

* Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* Update src/main/java/ch/njol/skript/expressions/ExprBookAuthor.java

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
#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 <apickledwalrus@gmail.com>

---------

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
* 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 <98935832+UnderscoreTud@users.noreply.github.com>

* Address reviews

* Address reviews

---------

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* 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 <20037329+AyhamAl-Ali@users.noreply.github.com>

* 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 <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Ayham Al Ali <20037329+AyhamAl-Ali@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* 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 <10354869+sovdeeth@users.noreply.github.com>

* Remove license header (#6684)

* Java 17 ready

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* 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 <98935832+UnderscoreTud@users.noreply.github.com>

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
* 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 <35348263+Efnilite@users.noreply.github.com>

---------

Co-authored-by: Efy <35348263+Efnilite@users.noreply.github.com>
Fixes missing and/or warnings in ExprJoinSplit.sk and SecFilter.sk

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
* 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 <10354869+sovdeeth@users.noreply.github.com>
* 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 <ethansovde@gmail.com>

* 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 <ethansovde@gmail.com>

* 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 <10354869+sovdeeth@users.noreply.github.com>

* 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 <47320303+cheeezburga@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: cheeezburga <47320303+cheeezburga@users.noreply.github.com>

* fix expritemofentity description

* Apply suggestions from code review

Co-authored-by: cheeezburga <47320303+cheeezburga@users.noreply.github.com>

* Update ExprDisplayHeightWidth.java

* Apply suggestions from code review

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* requested changes 2 + rotator docs

* requested changes

* Apply suggestions from code review

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* requested changes!

---------

Co-authored-by: sovdee <ethansovde@gmail.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: cheeezburga <47320303+cheeezburga@users.noreply.github.com>
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
* 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 <98935832+UnderscoreTud@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java

since* fixed

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java

only allowing entities and gamemodes*

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/conditions/CondIsInvulnerable.java

i literally forgot about curly brackets for a sec

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

* 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 <apickledwalrus@gmail.com>

* tests

Took 4 minutes

* Refactor + space

Took 5 minutes

* Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

* updated test

Took 8 minutes

* updated test

Took 2 minutes

* Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>

* Update src/test/skript/tests/syntaxes/conditions/CondIsInvulnerable.sk

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>

* Update CondIsInvulnerable.sk

* Update CondIsInvulnerable.sk

---------

Co-authored-by: _tud <98935832+UnderscoreTud@users.noreply.github.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
sovdeeth and others added 5 commits December 21, 2024 18:14
unsafe

Co-authored-by: Moderocky <admin@moderocky.com>
* SkriptCommand - don't double send reload messages

* SkriptCommand - fix an issue with missing all output for sender
Added a missing space in the documentation of the Experience Cooldown Change Reason expression.
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
@Moderocky Moderocky added feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version. 2.10 Targeting a 2.10.X version release don't merge me !! For pull requests that should not be merged due to some outstanding dispute, conflict or dependency. labels Dec 23, 2024
@Moderocky Moderocky self-assigned this Dec 23, 2024
Moderocky and others added 15 commits December 23, 2024 18:21
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Initial Commit

* add back licence header to all package-info.java

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Starter Commit

* Update

* Fix Test

* Changes

* Requested Changes

* Minor Changes

* Requested Changes

* Oops

* Quick Fix

* Parse Error

* Fix Error

* Fix Parse Error

* Requested Changes

* More Changes :'(

* EntityData#create

* Changes

* Conflict

* Minor Changes

---------

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Add Loot Tables

* Optimize Imports

* Fix docs and add a registry class info

* Changes

* remove license thing

* Add converter for LootTables - LootTable,
Change toString for LootTable class info,
Change syntax

* add tests ? unsure if theyre correct and add expressions to get luck/killer/entity of context

* Replace current implementation to module, add NameSpacedUtils class from the Recipe pull request, and changes

* Add docs, optimize imports and changes

* Change syntax and add some tests

* Fix docs, fix tests, replace paper methods to bukkit ones and changes

* one silly thing hehe

* Add JUnit tests, fix tests and changes

* Fix JUnit test

* ok junit test

* fix tests

* Optimize imports and fix description of EffGenerateLoot and ExprLootItems

* Clean up LootTableUtils and update docs

* update tests

* add loot table type in the default.lang file

* Fix the seed expression not actually updating the state

* optimize imports

* change exampled for loot table seed

* Add default event value for LootTable in LootGenerate event

* Add escape character for colons

* Add LootContext event value in LootGenerateEvent

* Make cached loot context transient

* changes

* tests and fix docs

* alot of things

* fix toString

* remove consumer

* fix tests

* optimize imports

* Fix exception in Java 17

* hopefully one last thing

* move LootGenerateEvent and event values to module class because idk why i didn't have it there

* optimize imports and another one

* pickel era changes

* update tests

* more pickel era changes

* uh oh

* more uh ohs

* even more uh ohs

* we dont talk about it

* small changes

* optimize le importos

* even more pickel era changes

* wow pickel has alot of changes

* Move ExprLoot to module and clean it up

* changes

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
* Starter Commit

Added, EffBlockUpdate
Added, ExprBlockState
Added, Blockstate in lang
Added, Blockstate in Classes
Added, Test

* Commit 2

* Fix Test

* Requested Changes

* Requested Changes

* Changes

* Changes

* Fix Test

* Requested Changes

* Change

* Change setting blocks

* Update test

* Requested Changes

* Update Description

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Add a way to get patterns from the PropertyCondition

* Update PropertyCondition.java

* Do requested changes.
Co-authored-by: Moderocky <admin@moderocky.com>

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Add enchantment glint override

* Add Skript docs and fix annotations

* Add expr item with glint

* Add condition item has enchantment glint

* Add version check

* Add tests

* Correction to syntax patterns

* License says hi

* Expression said bye

* Fix setExpr

* Finally

* Fix tests

* Bulk requested changes

* Implementation overhaul

* Implementation overhaul

* Implementation overhaul

* Fix test

* Fix test

* Fix test

* Fix test

* Fix test

* Remove license header (#6684)

* Requested changes and optimise imports

* Requested changes, reworked condition, and optimized for latest code convention

* Fix and test revamp

* Reorganize test

* Indentation!

* Test…

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Starter Commit

* ExprShooter Update

* Enhance Consumer

* Cleanup + Tests

* Requested Changes - 1

* Requested Changes - 2

* Fix ExprShooter

* Fix Test

* Update ExprShooter

* Efy Changes

* Suppres Change

* Consumer var

* Fix 1.19 LivingEntity#launchProjectile

* Changes

* Requested Changes

* Reduce Nesting

* Requested Changes

* Fix

* docs

---------

Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Villager stuff

* ExprBiome.sk - removed, due to comparator issue

* More changes

* Comparators - add default comparators for Registry/Enum class infos

* Remove comparators and ClassUtils.java

* DefaultComparators - revert changes to this class

* DefaultComparators - stop removing this IJ, we dont need this change, thank you

* ExprVillagerLevel - update docs

* MathUtils.java - remove

* ExprVillagerLevel - remove delete

* default.lang - remove "none" as it may cause conflicts

* default.lang - re-order "none" profession

* Update src/main/java/ch/njol/skript/expressions/ExprVillagerLevel.java

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/expressions/ExprVillagerType.java

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>

* Update src/main/java/ch/njol/skript/classes/data/BukkitClasses.java

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>

* EnumClassInfo - remove line i accidentally created

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
* add key updating

* update VoidNode

* add getIndex to Node

* replace insert with add at index to match List

* ensure correct order when adding entries

* update InvalidNode

* update SimpleNode

* update EntryNode

* add iterator for VoidNodes for comments, update SectionNode

* add getting a node from full idx

* added comparisons between diff lines, getting path, reformatted

* update to make it actually work

* add formatted debug method

* fix error message

* reformatted, reduced visibility of getAt

* update node comparisons

* finalize

* update docs

* backup before updating, lol

* Update src/main/java/ch/njol/skript/config/Config.java

* requested changes

* change to map

* fix paths containing dots causing problems for getPath

* update

* revert reformatting of node classes

* add missing methods to Node

* comments

* add test

* add tests

* oops

* remove todo

* Update src/main/java/ch/njol/skript/config/SectionNode.java

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>

* address reviews

* remove debug

---------

Co-authored-by: Patrick Miller <apickledwalrus@gmail.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Starter Commit

* More Commits

* Cleanup

* Chanages

* Requested Changes

* Syntax Fix

* Requested Changes

* Requested Changes

* Requested Changes

* Partial Changes

* Requested Changes

* Requested Changes

* fix merge issues

* Removed default case

* Requested Changes

* Module

* Requested Changes

* Conflict

* Update Event-Values

* Resolve

---------

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Initial Commit

* Tests

* Fix JUnit

* Actually Fix JUnit

* Requested Changes

* Fix Typos

* Update Example

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Initial Commit

* Starter Changes

* Changes

* Remove Namespace Coders

* Quick Fix

* Remove NamespacedUtils

---------

Co-authored-by: Moderocky <admin@moderocky.com>
* Initial Commit

* Docs

* Update Method

* Test

* Fix JUnit

* Update src/main/java/ch/njol/skript/test/runner/StructEntryContainerTest.java

---------

Co-authored-by: Moderocky <admin@moderocky.com>
Moderocky and others added 5 commits December 24, 2024 12:38
* feat: damage entity with damage-causes

* style: import

* fix: ArrayIndexOutOfBoundsException

* perf: resolved pr mentioned

* style: Add example

* style: sort codes

* perf: resolved PR mentioned

* style: depart to DamageUtils

* style: remove licence

* perf: depart to HealthUtils

* style: description

* style: to JetBrains annotation

* perf: resolved PR mentioned

* style: Suppress exactly; Add description

* perf: Deny using damage cause in old version

* perf: resolved PR mentioned

* perf: resolved PR mentioned

* perf: 更新 EffHealth.java

* style: sort code

* feat: test codes

* perf: test codes

* perf: check version

* fix: wrong health

* fix: test codes

* Update src/main/java/ch/njol/skript/bukkitutil/HealthUtils.java

* Fix tests (WIP on dev/feature)

---------

Co-authored-by: XPYEX <XPYEX0@163.com>
Co-authored-by: XPYEX <50171612+0XPYEX0@users.noreply.github.com>
Co-authored-by: sovdee <10354869+sovdeeth@users.noreply.github.com>
Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
* Initial Commit

* Fix + Update

* Tweak something.

* More Updates

---------

Co-authored-by: Efnilite <35348263+Efnilite@users.noreply.github.com>
Co-authored-by: Moderocky <admin@moderocky.com>
* Fix plural issues for class infos.

* Remove todo.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
2.10 Targeting a 2.10.X version release don't merge me !! For pull requests that should not be merged due to some outstanding dispute, conflict or dependency. feature-ready A PR/issue that has been approved, tested and can be merged/closed in the next feature version.
Projects
None yet
Development

Successfully merging this pull request may close these issues.