EntityData Overhaul#7985
Merged
Absolutionism merged 36 commits intoSkriptLang:dev/featurefrom Sep 30, 2025
Merged
Conversation
…taMultiLinedPatterns # Conflicts: # src/main/resources/lang/default.lang
…taMultiLinedPatterns # Conflicts: # src/main/java/ch/njol/skript/entity/BeeData.java # src/main/java/ch/njol/skript/entity/BoatChestData.java # src/main/java/ch/njol/skript/entity/BoatData.java # src/main/java/ch/njol/skript/entity/DroppedItemData.java # src/main/java/ch/njol/skript/entity/EntityData.java # src/main/java/ch/njol/skript/entity/LlamaData.java # src/main/java/ch/njol/skript/entity/ParrotData.java # src/main/java/ch/njol/skript/entity/PigData.java # src/main/java/ch/njol/skript/entity/SheepData.java # src/main/java/ch/njol/skript/entity/ThrownPotionData.java # src/main/java/ch/njol/skript/entity/TropicalFishData.java # src/main/resources/lang/default.lang
Contributor
Author
|
Reviews are still welcome while in draft |
…taMultiLinedPatterns # Conflicts: # .github/CODEOWNERS # src/main/java/ch/njol/skript/lang/SkriptParser.java
…taMultiLinedPatterns # Conflicts: # src/main/java/ch/njol/skript/entity/PigData.java
Contributor
|
Can you work on fixing Also entity type is just multiples of an entity and can be done within entity data |
APickledWalrus
requested changes
Jul 28, 2025
sovdeeth
approved these changes
Jul 28, 2025
Member
sovdeeth
left a comment
There was a problem hiding this comment.
looks good with pickle's changes
APickledWalrus
requested changes
Jul 30, 2025
Member
APickledWalrus
left a comment
There was a problem hiding this comment.
I would go through and change most of the other occurrences of orElse(0) as they should likely be orElseThrow() (when there is no expectation that the optional would be empty)
Efnilite
approved these changes
Aug 5, 2025
…taMultiLinedPatterns
…taMultiLinedPatterns # Conflicts: # src/main/java/ch/njol/skript/classes/data/BukkitClasses.java
1 task
…taMultiLinedPatterns # Conflicts: # .github/CODEOWNERS
APickledWalrus
approved these changes
Sep 30, 2025
erenkarakal
pushed a commit
to erenkarakal/Skript
that referenced
this pull request
Nov 26, 2025
* Initial Commit * Additional Cleanup * Update default.lang * Initial Commit * Follow Up Commit * Language Map Update * EntityDataInfo and EnitityData Update * Overhaul * Enum->Interface Fixes * Added states and test * Update EntityData.java * Update EntityData.sk * Fix test * Kleenean Changes * Update EntityData.sk * Efy's Requested Changes * Efy's Requested Changes -2 * Sovdes Requested Changes Move EntityPatterns into Patterns Add getMatchedPattern to Patterns Add kleeneanMatch to EntityData add dataMatch to EntityData * FieldHandler * Massive Fixes/Changes * Update EntityData.sk * Requested Changes * Requested Changes * Approving Changes
erenkarakal
pushed a commit
to erenkarakal/Skript
that referenced
this pull request
Nov 26, 2025
* Initial Commit * Additional Cleanup * Update default.lang * Initial Commit * Follow Up Commit * Language Map Update * EntityDataInfo and EnitityData Update * Overhaul * Enum->Interface Fixes * Added states and test * Update EntityData.java * Update EntityData.sk * Fix test * Kleenean Changes * Update EntityData.sk * Efy's Requested Changes * Efy's Requested Changes -2 * Sovdes Requested Changes Move EntityPatterns into Patterns Add getMatchedPattern to Patterns Add kleeneanMatch to EntityData add dataMatch to EntityData * FieldHandler * Massive Fixes/Changes * Update EntityData.sk * Requested Changes * Requested Changes * Approving Changes
This file contains hidden or 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
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.
Problem
default.langfile became increasingly hard to readmatchedPatternfor abstractEntityData#init(...)is actuallymatchedCodeNameEntityData#matchedPatternwhich is used forEntityData#toStringEntityData#matchedPatterngives the wrong impression of what exactly it is used forSolution
EntityDataInfofor custom handling of multi lined patterns in thedefault.langfor code names.EntityData#init(...)now passes thematchedCodeName(which is the same behavior as the previousmatchedPattern)matchedPatternhas been refactored to pass along the actual matched pattern correlating to patterns of each code nameEntityData#matchedPatternhas been renamed tocodeNameIndexto be more specific and match these new changesdefault.langutilize the multi linedpatternssection for improved readabilitynullvalues for general purposes rather than a specific typematchedPatternin their#initusematchedCodeNamenowmatchedCodeNameandmatchedPatternPatterns<T>for code names forEntityData#registerTdata field usingEntityPatterns#getInfowithin#initusingmatchedCodeNamematchedCodeNamefromTobject usingPatterns#getMatchedPatternEntityData#codeNameIndexwithin#init(Class, Entity)and constructors with parameters#deserializedgetSuperTypenow correctly get a data object with no special dataSimpleEntityData#info->simpleInfoto remove any confusion ofEntityData#infosuper.infoforEntityData#infoMisc Changes
OcelotDataas no supported versions of Minecraft still hadOcelotasTameablethus not needing any special data and being moved toSimpleEntityDataentitiessection indefault.langto have the nodes be categorized by whichEntityDataclass handles itCondIsSpawnableto be able to check if anEntityDatacan be spawned#canSpawninDisplayDataensuring it wasn'tDisplayType.ANYEntityDataclasses use as fields and constructor parameters allowing to be stored in global variablesMisc Fixes
fox (kid|child[plural:ren])for bothred foxandsnow foxbut didn't have the leadingredorsnow, same was seen forMooshroomsTesting Completed
built-in tests
EntityData.skSupporting Information
N/A
Completes: none
Related: none