* Add null checks to fix NPEs caused by custom head blocks from Polymer
* Make sure block state is never null, remove now unnecessary null checks
* Remove unnecessary default fallback in skull block entity translator
* 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
* Skip lore creation if hide tooltips exists
* Fix not showing attributes for "Armor" category
* Minor refactor
---------
Co-authored-by: chris <github@onechris.mozmail.com>
The only recipes added should be the ones that are sent on Bedrock, so it appears in the recipe book. Every other recipe will be handled through our fallback system.
E.G. Blocks.PISTON_HEAD.defaultBlockState().withValue(FACING, Direction.SOUTH)
Some of the inspiration may be thanks to FerriteCore, at least with the shared property keys idea, so thank you to them.
* 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>
Previously, for any new tag, we would have to add a field, add the line to load it, add the line to clear it, and make a method for that tag. Now, you just add an enum.
* Try to properly check if so_reuseport is available
* io_uring "support"
* comment out io_uring, for now
* Make IO_uring opt-in via `-DGeyser.io_uring=true` flag
* dont include io_uring
* oops - bungee
editing on mobile is hard
* oops - spigot
* oops - velocity
* properly exclude all io_uring on all platforms except standalone
---------
Co-authored-by: Kas-tle <26531652+Kas-tle@users.noreply.github.com>
The following caveats apply because selectively removing or modifying the score numbers on Bedrock cannot be done without removing all of them:
* "blank" and "styled" number formats are ignored for "list" and "sidebar" display slots
* The "fixed" number format is appended to the end of the "list" and "sidebar" entry names instead of replacing the score number
* The "below_name" slot has no limitations and displays identically to Java
* Reset metadata and attributes if needed when respawning
* Minor edits
* Reset attributes in JavaLoginTranslator
* Fix client bug when updating absorption and health in the same tick
* ported camotoy's attempt of implementing structure blocks, removal of a few TODO's
* no more parsing of java structure templates
* Don't attempt to re-request structure size
* ensure we can load structures in even if we know the size
* init: send correct structure size/offset/rotation to java, not fully working yet
* restore offsets so we are sending correct values to the java server regarding where we want the structure to be placed
* something something mirror
* attempt at proper offsets for mirroring AND rotations. this was not fun at all
* rotation, mirror, offsetting all seem to work
* undo import changes
* fix NPE
* Proper handling of empty structures, ensure that we can clear the structure block outline when a zero vector was sent for structure size
* oops
* Update core/src/main/java/org/geysermc/geyser/session/cache/StructureBlockCache.java
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Update core/src/main/java/org/geysermc/geyser/translator/level/block/entity/StructureBlockBlockEntityTranslator.java
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Update core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockStructureBlockUpdateTranslator.java
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Update core/src/main/java/org/geysermc/geyser/translator/protocol/bedrock/BedrockStructureTemplateDataRequestTranslator.java
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* consolidate java structure sending into one method
* fix merge conflict
---------
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
* Fix (or workaround) armor items with custom armor trims having no texture on bedrock
* Fix armor items with custom trims causing issues on entity models by removing the Trim tag entirely
* Refer to minecraft namespace inline for consistency
* 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
* Fix lecterns on 1.20.60, start on virtual lecterns
* Fix: virtual books & actual books opening twice, resolve other issues, remove debug
* undo some unnecessary diff
* Don't try to send virtual books to pre 1.20.60 clients
* address review by camotoy
* 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.
* Use multiple channels at startup, fix the occasional issue of all players getting disconnected.
* Standardized shutdown periods and refactored network handlers for improved consistency.
* tiny fix
* Let's use the system property
---------
Co-authored-by: chris <github@onechris.mozmail.com>
* 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>
Revert to spectator_viewer instead of the native Bedrock spectator menu. While it looks uglier - e.g. it's showing health/hunger bars; it allows opening menus. It'll also be needed for entity spectating, since clicking on things isnt possible in bedrocks spectator mode
* Gracefully handle invalid stone cutter recipes
Further various little fixes:
- bump source version in AP to 17 to silence build log spam
- remove unneeded close() on auto-closable resource
* Add support for loading locale overwrites. Any lang files in this new folder will be appended to the main lang file when loaded.
* A locale will no longer attempt to be downloaded and loaded if it already is loaded. Previously a lang file was reloaded everytime a player joins.
* Switch some io bits to nio
* formatting fixes
* Update core/src/main/java/org/geysermc/geyser/text/MinecraftLocale.java
* Rename isLocalLoaded to isLocaleLoaded
* Rename overwrites to overrides
* Catch separate exceptions when parsing locale file. Similar to previous implementation
* Add //no-op to try/catch
* Apply suggestions to fix issues that might arise with the Norwegian locale
* Properly resolve override locale path for nb_no
* Yeet temporary fix - addresses @Camotoy's review
* Catch IOException properly
---------
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
- Port out of bounds checking
- Proper encoding of ip's to check
- Don't assume "cache" response is nonnull; it is null when there's an error
- Send users the error message that we get when server is unreachable
* Catch unknownhostexception to avoid network errors when using legacy ping passthrough
* Catch UnknownHostException separately, log a warning but no stacktrace
* Fix collision problem,the wide for bedrock is 0.5 but for java is 0.5625 when only one side connect.
* Fixed an issue where the collision box was abnormal at the corner when two sides of the glass panel were connected.
* Merge similar methods, adjust code.
* More lenient judgment; reduce redundant code to avoid repeated calls.
* Update config.yml
I will in no way be offended if this is not merged. Essentially, it makes Geyser slightly more configured at the start for plugin versions by forwarding more information about the server to Bedrock players.
* remove unused
---------
Co-authored-by: onebeastchris <github@onechris.mozmail.com>
* Added onlineMode, platformName, and Minecraft version to dump - renames platformVersion to loaderVersion since that is more fitting to modded structure
* rename loaderVersion back to platformVersion
* address review by @Konicai
* Fix geyser dump creation (regression from the syntax/annotation PR)
We only need to use recipe tags when there is more than one possible ingredient option. For example, before this, we applied a logs item tag to the planks recipe, which caused an issue with plank type suggestions. (#4321)
* Clear mob spawners if the Java server so requests
* Empty spawners by replacing the spawner block with a new one instead of adding an invalid identifier to them.
Unfortunately, sending one UpdateBlockPacket that replaces the spawner does not work, we need to set the spawner to air first. Cool. But at least we don't summon particles for all empty spawners now
* store position vector (address review by @konicai)
* remove empty line
* Ensure that a custom text display entity name doesn't show up - it doesn't show on Java, and if we show it, the text display contents aren't shown.
* Update core/src/main/java/org/geysermc/geyser/entity/type/TextDisplayEntity.java
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
---------
Co-authored-by: Konicai <71294714+Konicai@users.noreply.github.com>
* Start on 1.20.50
* Add 1.20.50 block_palette.1_20_50.nbt, creative_items.1_20_50.json and runtime_item_states.1_20_50.json
* fix stone and planks mappings
* add and do something with the new SetPlayerInventoryOptionsPacket
* Add readme version bump
* Cleanup/Explain the new BedrockSetPlayerInventoryOptionsTranslator
* Start on 1.20.10+ recipe unlocking system
* Keeping track of multiple Bedrock recipes to unlock for a single Java recipe
* Unlock stonecutter recipes
* Stonecutter recipes
* Unlock tipped arrows/shulker box recipes even when Java doesnt (why..?), and dont send trims if Java doesn't
* Translate FurnaceDataRecipes
* Revert FurnaceRecipe translation, revert stone cutter recipe identifier caching - Bedrock does not need the smelting recipe, and doesn't (un)lock stonecutter recipes (yet...?)
* Remove debug message
* Make decorated pot crafting just a little bit smoother :p
* formatting
* Use itemTag descriptors to fix https://github.com/GeyserMC/Geyser/issues/3784
* Use hashmap instead to store item tag overrides
* remove unnecessary comment
* Address review by @Konicai
* Support for 1.20.30
* undo add whitespace
* Merge upstream, use FastUtil maps, rename a few methods
* Address Camotoy's review
* Fix formatting
* 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
* This ensures bossbars are cleared on server switch. Additionally, this clears the EntityCache - which should resolve issues around air supply/hearts persisting visually.
* - Also reset attributes on server switch, aswell as air
