forked from GeyserMC/Geyser
-
Notifications
You must be signed in to change notification settings - Fork 2
Fixed Jitpack build fail #9
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
Closed
misieur
wants to merge
5
commits into
eclipseisoffline:custom-item-api-v2
from
misieur:custom-item-api-v2
Closed
Fixed Jitpack build fail #9
misieur
wants to merge
5
commits into
eclipseisoffline:custom-item-api-v2
from
misieur:custom-item-api-v2
Conversation
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
* Improve error message handling Avoid GeyserMC#5832 * Update core/src/main/java/org/geysermc/geyser/util/WebUtils.java Co-authored-by: rtm516 <[email protected]> * rename variable --------- Co-authored-by: rtm516 <[email protected]>
* Implement block item and entity placer properties * Add documentation and change some stuff in the API * Implement the changes in Geyser * Implement the changes in Geyser part 2 * Remove old custom item options * Work on support for the old format * Start work on predicates, somewhat * More work on predicates, I'll probably simplify it later * Clean up predicates a bit * Add model grouping * Work on range dispatch predicate * Implement range dispatch predicates when converting old mappings to new one's * Implement reading range dispatch predicates from mappings * Implement sorting for range dispatch predicates, needs testing * Add model check to custom item comparator * Clean up predicates a bit * Update custom item translator for 1.21.4, implement custom model data * Implement/update register items event for new custom item definitions * More stuff in the custom item registry populator * Add priority option to definitions, deprecate texture size and render offsets * Implement priority option * Read priority option from mappings * Add unbreakable condition predicate * Use unbreakable predicate when converting v1 to v2 mappings * Remove BedrockCreativeTab in favour of CreativeCategory * Remove adventure from API module * Some fixes * Remove this * Reimplement unbreakable predicate check * Fix build * Fix charge type predicate * I'm very confused at why this doesn't work * Fix adding multiple definitions for same item model and sorting of predicates * Fix adding multiple definitions for same item model again * Improve mapping custom items * Improve the reading and error handling of item mappings * Some of Adventure was left in the API * Improve predicate reading error handling * Make item definitions in group able to override the group's model * Improve error handling when registering custom items * Clean up custom item registry populator a bit * Improve documentation of (predicate) new API * Apparently Javadoc can break builds * Improve documentation just a bit * Add predicate caching * Default to definition type when no type key is given * Whoops got to include the lib * Factor in range dispatch scaling when sorting predicate * Component combination validation * Fix max stack size validation when reading json mappings * "Implement" v2 block mappings reading * Cleanup item registry populator a bit * Fix mapping reading * Move identifierToKey out of ItemRegistryPopulator * Throw UnsupportedOperationException when reading block v2 mappings * Move predicate implementations out of API module * Send nutrition and saturation to the client * Refactor mappings reading with proper type checking and conversions and better error messages, read nutrition and saturation values from mappings * Small cleanup * Clean up predicates in the API * Implement predicate strategies * Read predicate strategies from mappings * Remove MCPL from API module, but now stuff is broken. Also still needs component verification * Update implementations and mappings reader, but populator is broken * My IDE did something it shouldn't have * Improve enum reader error message * Move predicate classes up * Fix component patching, MCPL removal is done now * Component validation in the API * Proper support for the enchantable value property * Reformat some stuff my IDE shouldn't have done * Properly implement protection value * Documentation improvements, add converter for enchantable component * Remove unused stuff * Remove rarely used method * Small documentation stuff * Work on tool component stuff * Add tool component to API * Implement tool component in custom item populator * Add tool component mappings reader * Update documentation * Add repairable mappings reader * Implement repairable component in custom item registry populator * Documentation whoopsy * Javadoc broke my build again (this isn't proper HTML) * Update MCPL * Consistency renames, start on has component predicate * Update API module with has component predicate * Update implementations and implement has component predicate * Update reading of match predicate property * Fix broken/damaged predicates * Remove enchantable stuff from chargeable properties as that is decided by enchantable Java component, hand equipped because that's decided by custom item definition * Clean up custom item registry populator * Make new item definition register method throw exception * Charge type javadocs * Make air model constant * Rename creative category internal name to bedrock name * Make sure deprecated getExistingCustomItems method still functions * Data component map javadoc * Apply suggestions from code review Co-authored-by: chris <[email protected]> * Forgot one Co-authored-by: chris <[email protected]> * I messed up the merge conflicts, whoops * Work on component javadoc * Some fixes * Whoops * Work on changing mappings reader to Gson * Update data component readers to use Gson * Mappings reader gson part 1 * Mappings reader gson part 2 * Mappings reader gson part 3 * Whoops almost removed v2 mappings * Some fixes and stuff * Bye bye render offsets * More small fixes * Rename getExistingCustomItemDefinitions to customItemDefinitions in define custom items event * Use API Identifiers to represent vanilla items instead of strings * Add javadocs to CustomItemDefinitionRegisterException * Switch tags to identifiers * Switch Identifier constructors to short .of call * Change Identifier in API to interface * Add tag(Identifier) method to bedrock options builder * Add new creative categories * Work on making predicates in API abstract * Implement predicate changes in geyser, range predicates still broken * Write javadocs for new predicate stuff in the API * Fix the build™ * Fix the build™ v2.0: now for the fancy predicate API * Lazy initialise the stuff in predicate context * Move item predicate context * Work on fishing_rod/cast predicate * Work on range-dispatch predicates in the new predicate API * Improve some javadocs * Write more javadocs * Re-implement reading range dispatch predicates from JSON mappings * Cleanup ItemMatchProperty a bit * Write some TODOs * Some fixes and docs * Start working on non-vanilla custom items v2 * Implement the stuff in Geyser * Update the define custom items event * More progress with non-vanilla custom items * Implement NonVanillaCustomItemData -> definition conversion * Fix v1 mappings using the vanilla item identifier as bedrock identifier * Add chargeable geyser data component * Implement chargeable data component in geyser * Convert old chargeable property to new component, don't allow chargeable component to be used for vanilla items * Remove chargeable method from NonVanillaCustomItemDefinition, work on attack damage geyser component * Implement attack damage component * Add and implement block placer component * Update documentation * Write some more documentation * Some TODOs and stuff * Reintroduce player place null check in BlockPlaceMixin * Make it build * Support new equipment slots * Introduce component converter for tool component and use in custom item registry populator * Random stuff to make it build * Some cleanups * Predicate conflict detection is back, sort of, by using a bunch of record implementations for common predicates * Add back fishing rod cast predicate * Implement removing of default vanilla item components * Fix the build * Allow 0 values for max draw duration in chargeable component * Fix applying component removals to custom items * Allow overriding vanilla models if the model is not used by the vanilla item * Some small changes * Some more small changes * Range dispatch predicate sorting and comments/documentation * More javadocs * Some more comments * Add back enchantment glint override component * Add enchantment_glint_override component reader * Give custom items a breaking speed of 1 * Add useBlockIcon property * Some clarifying comments * Allow null values for cooldown group in use cooldown component * I worked on this in 2025 too * Let it build * Use the right mappings * Component Javadocs and interfaces (#3) * Split component interfaces & record implementations, document fields, split java vs geyser data components Also updates mappings, and introduces the GenericBuilder interface for convenience * Address review * Apply suggestions from code review Co-authored-by: Eclipse <[email protected]> * fix repairable mapping reader * Small fixes and consistency things, default values for some components, shorthand constructors for BlockPlacer, Consumable, FoodProperties * Consistency things * Note down default component values in Javadocs --------- Co-authored-by: Eclipse <[email protected]> * Start on extended tool properties component, API is done * Work on resolvable components/session based components * Create CustomItemContext record * Fix build, actually create resolvable tool properties component * Make it run * Register Holders builder API * Only store ComponentCache for item stacks, debug statements * Fix build * Null-safety for component cache * Fix looking up block IDs by key * Javadocs and minor API changes * Proper Repairable component * Fix repairable reader * Move v2 JSON mapping reader logic out of MappingsReader_v2 and into separate classes * Implement legacy definitions * Fix custom item definition sorting and legacy definition reading * Allow passing JSON text component as display name * First batch of Javadoc reviews Co-authored-by: chris <[email protected]> * Address more reviews, and some other things * More reviews addressed * Fix: creative item groups/categories (GeyserMC#8) Co-authored-by: onebeastchris <[email protected]> * interfacing of predicates (GeyserMC#7) * interfacing of predicates * register all interfaces in the provider registry loader * remove reflection hack * address review * Apply suggestions from code review Co-authored-by: Eclipse <[email protected]> * Suggestions from review * More things from review * Switch from PredicateCreator to static factories * Whoops, this one too --------- Co-authored-by: Eclipse <[email protected]> * Simplify some component converters * Check non-vanilla item network ID for conflicts in API event call * Clarify enchantable component Javadocs * Clarify and test consumable animation behaviour * Translation string javadocs * Fix custom trident mappings not having an animation in 3rd-person (GeyserMC#6) * Add throwable, projectile, entity placer components to the API * Address reviews * Little things * Fix the build * Fix: right clicking for custom items --------- Co-authored-by: Eclipse <[email protected]> Co-authored-by: chris <[email protected]>
Author
|
This pr has the new commits from Geyser as my repo isn't based on your |
Author
|
This doesn't necessarily need to be merged you should just add the same jitpack.yml file so it can build on jitpack |
Author
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.
No description provided.