Code

Custom item API v2#5189

Code

Draft

eclipseisoffline wants to merge 123 commits intoGeyserMC:masterGeyserMC/Geyser:masterfrom eclipseisoffline:custom-item-api-v2eclipseisoffline/Geyser:custom-item-api-v2Copy head branch name to clipboard

+3,992-751

Commits

Commits on Nov 29, 2024

• First work on a new API (wow that's a lot of TODOs)

  eclipseisoffline

  committed
  61f5db1

  Copy full SHA for 61f5db1

• Add component readers for all the planned components

  eclipseisoffline

  committed
  ea6c3c6

  Copy full SHA for ea6c3c6

• Fix equippable slot reading and add support for all consume animations

  eclipseisoffline

  committed
  0922b18

  Copy full SHA for 0922b18

• Add use cooldown support

  eclipseisoffline

  committed
  435b73d

  Copy full SHA for 435b73d

Commits on Nov 30, 2024

• Fix max stack size and max damage components

  eclipseisoffline

  committed
  cce49fa

  Copy full SHA for cce49fa

• Implement block item and entity placer properties

  eclipseisoffline

  committed
  1dd854a

  Copy full SHA for 1dd854a

• Add documentation and change some stuff in the API

  eclipseisoffline

  committed
  4af8e12

  Copy full SHA for 4af8e12

• Implement the changes in Geyser

  eclipseisoffline

  committed
  efae1f3

  Copy full SHA for efae1f3

• Implement the changes in Geyser part 2

  eclipseisoffline

  committed
  8bbad9d

  Copy full SHA for 8bbad9d

• Remove old custom item options

  eclipseisoffline

  committed
  7eeb5bb

  Copy full SHA for 7eeb5bb

• Work on support for the old format

  eclipseisoffline

  committed
  4514f55

  Copy full SHA for 4514f55

• Start work on predicates, somewhat

  eclipseisoffline

  committed
  8ea3c97

  Copy full SHA for 8ea3c97

Commits on Dec 1, 2024

• More work on predicates, I'll probably simplify it later

  eclipseisoffline

  committed
  7888956

  Copy full SHA for 7888956

• Clean up predicates a bit

  eclipseisoffline

  committed
  ce55d88

  Copy full SHA for ce55d88

Commits on Dec 2, 2024

• Add model grouping

  eclipseisoffline

  committed
  52f2b9f

  Copy full SHA for 52f2b9f

Commits on Dec 6, 2024

• Work on range dispatch predicate

  eclipseisoffline

  committed
  49f31c9

  Copy full SHA for 49f31c9

• Implement range dispatch predicates when converting old mappings to new one's

  eclipseisoffline

  committed
  9139af2

  Copy full SHA for 9139af2

• Implement reading range dispatch predicates from mappings

  eclipseisoffline

  committed
  4d09104

  Copy full SHA for 4d09104

• Implement sorting for range dispatch predicates, needs testing

  eclipseisoffline

  committed
  0346a80

  Copy full SHA for 0346a80

• Add model check to custom item comparator

  eclipseisoffline

  committed
  c38bf26

  Copy full SHA for c38bf26

• Clean up predicates a bit

  eclipseisoffline

  committed
  79bf4af

  Copy full SHA for 79bf4af

Commits on Dec 12, 2024

• Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

  Show description for f6f6423
  eclipseisoffline

  committed
  f6f6423

  Copy full SHA for f6f6423

• Update custom item translator for 1.21.4, implement custom model data

  eclipseisoffline

  committed
  fd09a05

  Copy full SHA for fd09a05

• Implement/update register items event for new custom item definitions

  eclipseisoffline

  committed
  7fabf0c

  Copy full SHA for 7fabf0c

• More stuff in the custom item registry populator

  eclipseisoffline

  committed
  04d7f48

  Copy full SHA for 04d7f48

• Add priority option to definitions, deprecate texture size and render offsets

  eclipseisoffline

  committed
  04fe043

  Copy full SHA for 04fe043

• Implement priority option

  eclipseisoffline

  committed
  5ecc61f

  Copy full SHA for 5ecc61f

• Read priority option from mappings

  eclipseisoffline

  committed
  12499bf

  Copy full SHA for 12499bf

• Add unbreakable condition predicate

  eclipseisoffline

  committed
  bca98c7

  Copy full SHA for bca98c7

• Use unbreakable predicate when converting v1 to v2 mappings

  eclipseisoffline

  committed
  6e0e3c0

  Copy full SHA for 6e0e3c0

• Remove BedrockCreativeTab in favour of CreativeCategory

  eclipseisoffline

  committed
  774e556

  Copy full SHA for 774e556

• Remove adventure from API module

  eclipseisoffline

  committed
  1685918

  Copy full SHA for 1685918

• Some fixes

  eclipseisoffline

  committed
  7164ca0

  Copy full SHA for 7164ca0

• Remove this

  eclipseisoffline

  committed
  2263cc8

  Copy full SHA for 2263cc8

• Reimplement unbreakable predicate check

  eclipseisoffline

  committed
  3fac2cd

  Copy full SHA for 3fac2cd

• Fix build

  eclipseisoffline

  committed
  361df16

  Copy full SHA for 361df16

• Fix charge type predicate

  eclipseisoffline

  committed
  b80c054

  Copy full SHA for b80c054

• I'm very confused at why this doesn't work

  eclipseisoffline

  committed
  eb0b40c

  Copy full SHA for eb0b40c

• Fix adding multiple definitions for same item model and sorting of predicates

  eclipseisoffline

  committed
  a4c17da

  Copy full SHA for a4c17da

• Fix adding multiple definitions for same item model again

  eclipseisoffline

  committed
  a80e90d

  Copy full SHA for a80e90d

Commits on Dec 14, 2024

• Improve mapping custom items

  eclipseisoffline

  committed
  e7d7a9d

  Copy full SHA for e7d7a9d

Commits on Dec 16, 2024

• Improve the reading and error handling of item mappings

  eclipseisoffline

  committed
  12f2e1a

  Copy full SHA for 12f2e1a

• Some of Adventure was left in the API

  eclipseisoffline

  committed
  fe8336a

  Copy full SHA for fe8336a

• Improve predicate reading error handling

  eclipseisoffline

  committed
  f44f368

  Copy full SHA for f44f368

• Make item definitions in group able to override the group's model

  eclipseisoffline

  committed
  a997820

  Copy full SHA for a997820

• Improve error handling when registering custom items

  eclipseisoffline

  committed
  7ed830a

  Copy full SHA for 7ed830a

• Clean up custom item registry populator a bit

  eclipseisoffline

  committed
  b5cef99

  Copy full SHA for b5cef99

• Improve documentation of (predicate) new API

  eclipseisoffline

  committed
  66e288f

  Copy full SHA for 66e288f

• Apparently Javadoc can break builds

  eclipseisoffline

  committed
  852c5c2

  Copy full SHA for 852c5c2

• Improve documentation just a bit

  eclipseisoffline

  committed
  18cde32

  Copy full SHA for 18cde32

• Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

  eclipseisoffline

  committed
  885c4d9

  Copy full SHA for 885c4d9

Commits on Dec 19, 2024

• Add predicate caching

  eclipseisoffline

  committed
  25109b7

  Copy full SHA for 25109b7

• Default to definition type when no type key is given

  eclipseisoffline

  committed
  635c8c4

  Copy full SHA for 635c8c4

• Whoops got to include the lib

  eclipseisoffline

  committed
  e84f8a3

  Copy full SHA for e84f8a3

• Factor in range dispatch scaling when sorting predicate

  eclipseisoffline

  committed
  bcc7915

  Copy full SHA for bcc7915

• Component combination validation

  eclipseisoffline

  committed
  4aea17a

  Copy full SHA for 4aea17a

• Fix max stack size validation when reading json mappings

  eclipseisoffline

  committed
  1683243

  Copy full SHA for 1683243

• "Implement" v2 block mappings reading

  eclipseisoffline

  committed
  4629f7b

  Copy full SHA for 4629f7b

• Cleanup item registry populator a bit

  eclipseisoffline

  committed
  2b9f519

  Copy full SHA for 2b9f519

• Fix mapping reading

  eclipseisoffline

  committed
  ff35c6e

  Copy full SHA for ff35c6e

• Move identifierToKey out of ItemRegistryPopulator

  eclipseisoffline

  committed
  b254594

  Copy full SHA for b254594

• Throw UnsupportedOperationException when reading block v2 mappings

  eclipseisoffline

  committed
  56c508d

  Copy full SHA for 56c508d

Commits on Jan 10, 2025

• Move predicate implementations out of API module

  eclipseisoffline

  committed
  5620f0a

  Copy full SHA for 5620f0a

• Send nutrition and saturation to the client

  eclipseisoffline

  committed
  0986203

  Copy full SHA for 0986203

• Refactor mappings reading with proper type checking and conversions and better error messages, read nutrition and saturation values from mappings

  eclipseisoffline

  committed
  e8bd2a1

  Copy full SHA for e8bd2a1

• Small cleanup

  eclipseisoffline

  committed
  aa365d9

  Copy full SHA for aa365d9

• Clean up predicates in the API

  eclipseisoffline

  committed
  aa13113

  Copy full SHA for aa13113

• Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

  Show description for 094ff41
  eclipseisoffline

  committed
  094ff41

  Copy full SHA for 094ff41

• Implement predicate strategies

  eclipseisoffline

  committed
  7af9518

  Copy full SHA for 7af9518

• Read predicate strategies from mappings

  eclipseisoffline

  committed
  f4c9c3d

  Copy full SHA for f4c9c3d

Commits on Jan 11, 2025

• Remove MCPL from API module, but now stuff is broken. Also still needs component verification

  eclipseisoffline

  committed
  46e6fd3

  Copy full SHA for 46e6fd3

• Update implementations and mappings reader, but populator is broken

  eclipseisoffline

  committed
  03402d4

  Copy full SHA for 03402d4

• My IDE did something it shouldn't have

  eclipseisoffline

  committed
  aabd537

  Copy full SHA for aabd537

• Improve enum reader error message

  eclipseisoffline

  committed
  d06ad0b

  Copy full SHA for d06ad0b

• Move predicate classes up

  eclipseisoffline

  committed
  1dce683

  Copy full SHA for 1dce683

• Fix component patching, MCPL removal is done now

  eclipseisoffline

  committed
  7e973ea

  Copy full SHA for 7e973ea

• Component validation in the API

  eclipseisoffline

  committed
  9f21221

  Copy full SHA for 9f21221

Commits on Jan 13, 2025

• Proper support for the enchantable value property

  eclipseisoffline

  committed
  ffb94ff

  Copy full SHA for ffb94ff

• Reformat some stuff my IDE shouldn't have done

  eclipseisoffline

  committed
  44a1bba

  Copy full SHA for 44a1bba

• Properly implement protection value

  eclipseisoffline

  committed
  33b49eb

  Copy full SHA for 33b49eb

• Documentation improvements, add converter for enchantable component

  eclipseisoffline

  committed
  0e5dba1

  Copy full SHA for 0e5dba1

• Remove unused stuff

  eclipseisoffline

  committed
  0308388

  Copy full SHA for 0308388

• Remove rarely used method

  eclipseisoffline

  committed
  d522f61

  Copy full SHA for d522f61

• Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

  eclipseisoffline

  committed
  61b703c

  Copy full SHA for 61b703c

• Small documentation stuff

  eclipseisoffline

  committed
  ebbd1c5

  Copy full SHA for ebbd1c5

Commits on Jan 14, 2025

• Work on tool component stuff

  eclipseisoffline

  committed
  1afb733

  Copy full SHA for 1afb733

• Add tool component to API

  eclipseisoffline

  committed
  75e371c

  Copy full SHA for 75e371c

• Implement tool component in custom item populator

  eclipseisoffline

  committed
  67b615e

  Copy full SHA for 67b615e

• Add tool component mappings reader

  eclipseisoffline

  committed
  261b6ca

  Copy full SHA for 261b6ca

• Update documentation

  eclipseisoffline

  committed
  c63386a

  Copy full SHA for c63386a

• Add repairable mappings reader

  eclipseisoffline

  committed
  2558620

  Copy full SHA for 2558620

• Implement repairable component in custom item registry populator

  eclipseisoffline

  committed
  373eeac

  Copy full SHA for 373eeac

• Documentation whoopsy

  eclipseisoffline

  committed
  fbbf210

  Copy full SHA for fbbf210

• Javadoc broke my build again (this isn't proper HTML)

  eclipseisoffline

  committed
  ab174b5

  Copy full SHA for ab174b5

Commits on Jan 17, 2025

• Update MCPL

  eclipseisoffline

  committed
  422c5a9

  Copy full SHA for 422c5a9

• Consistency renames, start on has component predicate

  eclipseisoffline

  committed
  a5d6fb1

  Copy full SHA for a5d6fb1

• Update API module with has component predicate

  eclipseisoffline

  committed
  af76cd0

  Copy full SHA for af76cd0

Commits on Jan 18, 2025

• Update implementations and implement has component predicate

  eclipseisoffline

  committed
  505a74b

  Copy full SHA for 505a74b

• Update reading of match predicate property

  eclipseisoffline

  committed
  dee7b5a

  Copy full SHA for dee7b5a

• Fix broken/damaged predicates

  eclipseisoffline

  committed
  6705513

  Copy full SHA for 6705513

• Remove enchantable stuff from chargeable properties as that is decided by enchantable Java component, hand equipped because that's decided by custom item definition

  eclipseisoffline

  committed
  bd7e471

  Copy full SHA for bd7e471

• Clean up custom item registry populator

  eclipseisoffline

  committed
  ea850f4

  Copy full SHA for ea850f4

• Make new item definition register method throw exception

  eclipseisoffline

  committed
  020e78e

  Copy full SHA for 020e78e

• Charge type javadocs

  eclipseisoffline

  committed
  27b2ec7

  Copy full SHA for 27b2ec7

• Make air model constant

  eclipseisoffline

  committed
  fc0103b

  Copy full SHA for fc0103b

• Rename creative category internal name to bedrock name

  eclipseisoffline

  committed
  2662c81

  Copy full SHA for 2662c81

• Make sure deprecated getExistingCustomItems method still functions

  eclipseisoffline

  committed
  6f67814

  Copy full SHA for 6f67814

• Data component map javadoc

  eclipseisoffline

  committed
  c1bd5fa

  Copy full SHA for c1bd5fa

• Apply suggestions from code review

  Show description for 99b01ee
  

  eclipseisoffline

  and

  onebeastchris

  authored
  99b01ee

  Copy full SHA for 99b01ee

• Forgot one

  Show description for b2776a3
  

  eclipseisoffline

  and

  onebeastchris

  authored
  b2776a3

  Copy full SHA for b2776a3

• Merge remote-tracking branch 'upstream/master' into custom-item-api-v2

  Show description for 5ac8a24
  eclipseisoffline

  committed
  5ac8a24

  Copy full SHA for 5ac8a24

• I messed up the merge conflicts, whoops

  eclipseisoffline

  committed
  ec9e9fc

  Copy full SHA for ec9e9fc

• Work on component javadoc

  eclipseisoffline

  committed
  d22e815

  Copy full SHA for d22e815

Commits on Jan 19, 2025

• Some fixes

  eclipseisoffline

  committed
  4b7ef99

  Copy full SHA for 4b7ef99

• Whoops

  eclipseisoffline

  committed
  a0b785c

  Copy full SHA for a0b785c

• Work on changing mappings reader to Gson

  eclipseisoffline

  committed
  92d3296

  Copy full SHA for 92d3296

• Update data component readers to use Gson

  eclipseisoffline

  committed
  af371b1

  Copy full SHA for af371b1

• Mappings reader gson part 1

  eclipseisoffline

  committed
  2c9596d

  Copy full SHA for 2c9596d

• Mappings reader gson part 2

  eclipseisoffline

  committed
  4095f89

  Copy full SHA for 4095f89

• Mappings reader gson part 3

  eclipseisoffline

  committed
  a7fbcc6

  Copy full SHA for a7fbcc6

• Whoops almost removed v2 mappings

  eclipseisoffline

  committed
  0ae556c

  Copy full SHA for 0ae556c

• Some fixes and stuff

  eclipseisoffline

  committed
  3fff601

  Copy full SHA for 3fff601

• Bye bye render offsets

  eclipseisoffline

  committed
  de95eb5

  Copy full SHA for de95eb5