* let extensions specify geyser api version instead of base api version
* fix spacing, @link formatting, properly check for compat
* Proper warning, update to API changes to also check patch version
* Bump base-api version
* adapt to new base api changes
* Actually bump to 2.4.1
* Update api/src/main/java/org/geysermc/geyser/api/extension/ExtensionDescription.java
* Address reviews
* Address reviews
* Update to latest base api changes; proper extension *human* version checking
* no need to apply a plugin, that's the default
---------
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
* Init: Add /geyser ping command
* Block just console execution, not everything but console senders
* Use RTT as that seems to vary less wildly compared to getPing()
* Cleanup, use lang strings
* Add ping() method to GeyserConnection in api
* Update to cloud changes
* Proper block entity checks; ignore invalid block entity data sent by Java server
* fix intelliJ warning about potentially null block state
* Use auto-generated block entity types instead of hardcoding them
* undo some diff
* Update BlockRegistryPopulator.java
* Access block entity type of state by getting the block first
* deprecate JavaBlockState#hasBlockEntity
* Simplify check
* Add type check in JavaBlockEntityDataTranslator, ensure deprecated setBlockEntity() method still sets piston behavior
* nullability annotations
* yeet duplicate check
* Remove ears and unoffical skin sources
* Remove supplyEars
* Cleanup and add SkinApplyEvent
* Add failed back to skin
* Accept suggestion on SkinGeometry
Co-authored-by: chris <github@onechris.mozmail.com>
* Add javadoc and update copyright
* Remove old config options
* Make SkinApplyEvent a ConnectionEvent
* Add warning about third-party config options
* Update warning message
* Add javadoc to event
* Fix javadoc
* Ajust for review and bump version to 2.2.4
* Get rid of array and preserve original skin data
* Add originalSkin method to event
* Handle NonNull in SessionSkinApplyEvent
* Revert default copyright change
---------
Co-authored-by: chris <github@onechris.mozmail.com>
* Add ConnectionRequestEvent and implement it
* Add debug message and use InetSocketAddress instead of string
* Provide both proxy and real client ip
And add some minor javadocs
* Make ProxyIp nullable
* Apply changes from pr
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Apply changes from pr
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Apply changes from pr
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Bump API version
* Dont JiJ common on mod platforms
---------
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
Co-authored-by: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
* Allow adding custom items to the creative inventory in order for recipes outputting said custom items to work
* yeet includeInCreativeInventory as it would break existing nonvanilla extensions - and is pretty pointless anyways
* rename mappings to `creative_group` and `creative_category`
* delete outdated comment
* Initial work on Forge platform
* Rework modded platforms to use a common module
* Add support for integrated worlds on modded platforms
* Fix classload errors and move mixins to shared module
* Fix Fabric mixins and check min height in mod world manager
* Add Forge command support
* Add back modrinth publishing
* Don't apply application plugin to shared mod sources
* Fix docs
* Delete unused class
* Clean up repositories
* - Update to 1.20.2
- set custom refmap name
- fixed console commands crashing the server (hasPermission now accepts CommandSourceStack instead of Player)
- Forge wants fastutil relocated, so be it
Current issues:
- ClassNotFound exceptions with classes that are clearly present
* - Fix ClassNotFound errors on Forge due to weird Classloader
- Dont relocate gson
* merge upstream
* oh no
* Bump lombok, architectury-loom
* init: neoforge 1.20.4 support
* NeoForge builds
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Archive neoforge artifacts
* transformForge -> transformNeoForge
* Neoforge boots!
* Fix mixins on neoforge
* Update build/pr file names
* Update mods.toml to new neoforge standard
* Fix refmap naming
* more fixes
- no need to include gson
- cleanup nullable/nonnull annotations
- add more info to geyser dumps on neoforge
* yeet platform executor
* yet another temp branch to figure out the runServer task
* yeet transitive dependency, that cant be right
* Attempt at getting the runServer task to work, part two
* Revert the changes for the runServer task, try and shut down the injector
* Remove spigot weird bug workaround, shut down properly
Also add a compileOnly dependency for the mod module to get rid of spammy false warnings
* Update to latest restart changes
- fix duplicate nodes crashing neoforge
- connector -> geyser in GeyserModCommandExecutor
- create command manager early to fix issues with permission gather event
* Consistent NeoForge spelling, move some dependencies to the version toml
* Add lombok to version catalogue
* Add plugins to version catalogue
* revert move to buildSrc
* Create `assets/geyser/icon.png` to reference icon from a single file on standalone/neoforge/fabric
* add fabric permissions api to libs.versions.toml
---------
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
Co-authored-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Implemented ViaProxy bootstrap
* Applied requested changes to code
* Override indra settings to Java 17
* Removed explicit java source/target version
* Added ViaProxy artifact to build.yml
* Added ViaProxy artifact to pullrequest.yml
* Updated ViaProxy API usage
* Implemented floodgate support for ViaProxy
* Depend on stable ViaProxy release
* Initialize command manager and ping passthrough before Geyser#start
* Revert "Initialize command manager and ping passthrough before Geyser#start"
This reverts commit 39356071c4.
* Some ping passthrough improvements
* Merged code properly
* Updated ViaProxy API usage
* Implemented better command handling
* Updated ViaProxy and Geyser API usage
* Combine bootstrap and plugin into one class
* Minor code improvements
* Call Geyser shutdown on plugin disable
* Only call disable if Geyser was enabled once
* Don't send two shutdown done messages
* Use setter for enabled boolean
* This makes `geyser reload` work the same across all platforms. For example, it ensures that we reload the config to the greatest extent possible (with the exception of compression/injection settings). Additionally, this clears up issues where Extensions were previously disabled during reloading - instead, the new Pre and Post reload events allow extensions to reload whatever necessary on their own.
* Allow changing the broadcasted port using a system property. This may be needed if the port Geyser runs on & the port Bedrock players connect on do not match - e.g. due to port forwarding/different routing.
* initial stab at making the broadcast port an (unsafe) config option
* Automatically set broadcast port to be the bind port unless manually overridden
* Warn about broadcast port mismatch
* Use 0 instead of -1 as indicator to broadcast the port geyser is running on
* Add fetching MC versions and Console from the extensions API
* Address reviews, expose custom MinecraftVersion interface
* Rename of McVersion -> MinecraftVersionImpl; proper nonnull annotation
* fluent consoleCommandSource(), change MinecraftVersion#name() to versionString()
* Javadocs adjustments
* Create impl package and move `MinecraftVersionImpl` there
* api version bump
---------
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
* Start on custom molang tags with custom items
* geyser_custom instead of geyser item tag
* Address reviews, add custom namespace ("geyser_custom") to tags
* use isBlank() instead of isEmpty()
* More efficient item tag setting
Co-authored-by: Konicai <71294714+konicai@users.noreply.github.com>
* tags instead of temp
* Merge in master, adapt to changes in the MappingsReader, delete unused ToolBreakSpeedsUtils class
* oops
* clean diff
* Change namespace from `geyser_custom` to just `geyser`
* Don't force a namespace at all; just like blocks don't
* Tags for items are now, as blocks, NonNull. Additionally, calling the .tags() builder multiple times will not add both sets of tags, but replace the existing tag set
* Remove @NotNull usage in favor of @NonNull
* Allow setting null for tags, but ensure that .tags() is always non-null
* Fix nullable annotation on tags method in the builder interface
- the extensionmanagers `extension` method now takes in a extension id instead of name
- extension folders are now created using extension id's
- Extensions can load classes from other extensions now
- Added warning about external class loading
- Wherever applicable: store extensions internally by id instead of name
* Super cursed custom skulls custom block
* Rename some stuff
* Attempt to clean up some code
* Remove skull translation events and define custom blocks for custom skulls
Clean up skull block translation a bit
* Auto generate skull resource pack
Change `davchoo` to `geyser` in geometry
* Add config options for custom blocks and custom skull blocks
* Fix formatting and names for player skulls
* Use block states more efficiently for custom skulls
21 block states vs 48 block states
* Clean up custom block api a bit
* Apply some suggestions from Camotoy
* Move custom skull config stuff to its own file
Custom skulls can now be added by username, uuid, and textures
Move skull nbt stuff from requestTexturesFromUsername to
SkullBlockEntityTranslator
Add requestTexturesFromUUID
* Update custom block nbt for v534
* Disable collision box & selection box when box is empty
Fix incorrect collision names used in CustomBlockComponentsBuilder
* Add custom block stuff to provider registry loader
* More API changes
Convert CustomBlockPermutation into a record
Change materialInstances in CustomBlockComponents Builder to
materialInstance
Reuse box components in CustomSkull
* Convert skull floor geometries into a template
Should be easier to modify in needed in the future.
* Crop and reorder skull textures to eliminate unused space
Should reduce memory & storage usage for Bedrock clients
* Revert "Crop and reorder skull textures to eliminate unused space"
This reverts commit 15fd5353e1.
* Use identifier from CustomBlockData in SkullResourcePackManager
* Fix isIncorrectHeldItem check for custom skull blocks
Add defaultBlockState to CustomBlockData
* Fix adding duplicate block states for custom blocks with 0 properties
Remove defaultBlockState CustomBlockState field from
GeyserCustomBlockData since it creates a circular reference
* Add basis for overriding Bedrock block states
Fix missing providers when used in GeyserDefineCustomBlocksEvent
* Fix custom blocks in 1.19.50
* Decouple mappings from items
* Decouple mappings from items
* Null check
* Move to CustomBlockRegistryPopulator
* Remove name_hash from blocksTag/vanillaBlockStates
Fixes creative inventory contents with custom blocks registered
* Limit Bedrock versions to 1.19.40+
Custom blocks were released in 1.19.40
* Un-revert Crop and reorder skull textures to eliminate unused space
Should reduce memory & storage usage for Bedrock clients
Bug with top face flipping + per-face uv's was fixed in 1.19.40+
https://bugs.mojang.com/browse/MCPE-160073
Geometry is still offset by 0.5 to prevent lighting bugs
* Add validation custom block components and s/lightFilter/lightDampening/
Also validate custom block names
* Add display name component and add toggle for client block placing
The display name component allows blocks to use other locale keys.
placeAir will prevent the client from placing the default block state.
* Begin parsing block mappings (still much to do!)
* CustomBlockMapping stores block w/ all states
* Mappings almost :/
* Ok now they work at least
* Read most mapping components
* Block mappings mostly done
* Translate block item
* Add docs for custom blocks
* Add tags
* More docs
* Accidentally added name comp.
* Fix collide box and warn for >16 props
* add registerBlockItemOverride event + refactor
* Inventory overrides for multistate bedrock blocks
* Implement all remaining block components
* Minor cleanup and javadocs
* Update custom skull config example
* Address @Camotoy's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix light_emission and light_dampening components
* Remove redundant populate method and remove BLOCKS_JSON after last use
* Fix inventories with block state overrides not opening
* API event for skull blocks & let register via URL
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Use skin hash instead of URL
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @davchoo's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Rework MappingsReader_v1 to avoid passing maps around
* Treat all properties as string properties
There isn't a real need to check for boolean and int properties
* Fix block registry scan in MappingsReader
* Skin hashes can have less than 64 characters?
* Include entry when logging exceptions from block mappings
* Submodule
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix block break speeds thanks to @Camotoy
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Temporarily fix build on eclipse so I may work...
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Custom tool breakspeed by server; Closes#3348
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Account for if custom skulls are added on 1st run
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Initial framework for extended collision boxes
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Add some notes for the extended collision box impl
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* We have our extended collision registry
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Notes for me
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Extended collision boxes almost work
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Extended collision boxes actually work
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Consider all hitboxes in calculation
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* X is mirrored...
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Extended collision boxes are much improved
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Upstream fallout
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @Redned235's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Oops my bad that makes no sense :)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Ext collision box chunk translation optimization
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Trunc skinhash to 32 chars due to 80 char limit
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Use new transformation cmpnt vs legacy rotation
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* keep arr null on get extcolstor
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Properly handle if extended collision box is below
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Less ugly (realized it can go here)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Prevent 2x placement due to extended collision box
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Properly build on eclipse via indra
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Ensure enough bits in bedrockData for paletteIDs
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix not needed whitespace
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Update license headers to 2023
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Use release indra over snapshot
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Revert "Update license headers to 2023"
This reverts commit f750059e8e.
* Account for collisions in chunk section y0 layer
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix extended collision @ air section bottom
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @davchoo's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @rtm516's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* More @rtm516's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @Camotoy's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Update javadocs
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @davchoo's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Lock extended collision to section
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Clear ext col even when air
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Let override vanilla items in creative inventory
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Avoid creating 12 HashSets for every overrided block state
* Super minor nitpicks + Custom Skull NBT fix
* Check custom skull is within Bedrock bounds
Fixes NPE with custom skulls above y=320 or below y=-64
* Add static builder methods to match CustomItemData API
* Upstream
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Initial API setup for modded blocks (no impl yet)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* More work on nonvanilla blocks (nonfunctional)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix compile
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Update submodules
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Modded reg so far (not done)
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Add non-vanilla registration and fix a few bugs
* Fixes for non-vanilla blocks
* Remove import
* CustomRegPop. go1st for now; must split for modded
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address silent change to geo component for blocks
Co-Authored-By: Unoqwy <pm@unoqwy.dev>
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Seperate bedrock, vanilla, & nonvanilla block reg
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Single event
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Impl MaterialInstance as builder per @Redned235
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Added creative category enum & added some missing overrides (#7)
* Add material instance to provider registry
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* oops
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix case of correctBedrockIdentifier not found
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Fix docs
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address @Camotoy's review
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address review from @davchoo
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Set namespace of custom blocks vs ident direct
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Address review from @rtm516
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* One more
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Remove rogue space
* Geo component as builder
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* use super name
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
* Bump version
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
---------
Signed-off-by: Joshua Castle <26531652+Kas-tle@users.noreply.github.com>
Signed-off-by: GitHub <noreply@github.com>
Co-authored-by: davchoo <davchoo@users.noreply.github.com>
Co-authored-by: davchoo <4722249+davchoo@users.noreply.github.com>
Co-authored-by: Unoqwy <pm@unoqwy.dev>
Co-authored-by: RednedEpic <redned235@gmail.com>
Co-authored-by: ImDaBigBoss <67973871+ImDaBigBoss@users.noreply.github.com>
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
