Commit graph

3814 commits

Author SHA1 Message Date
onebeastchris
86f645899f Code cleanup, less futures, more exceptions when needed 2024-06-19 23:35:36 +02:00
onebeastchris
507a79eb88 Merge remote-tracking branch 'refs/remotes/upstream/master' into rp
# Conflicts:
#	core/src/main/java/org/geysermc/geyser/GeyserImpl.java
#	core/src/main/java/org/geysermc/geyser/util/WebUtils.java
2024-06-19 20:09:10 +02:00
chris
6884a0f7db
Fix: norwegian locale handling (#4716) 2024-06-19 02:37:34 +02:00
Camotoy
a9300fb1ab
Vault: show some components in block entity (enchantments, potion types) 2024-06-18 15:30:19 -04:00
chris
77fa37ff82
Fix: readme not being synched to modrinth, publish spigot/bungee/velocity variants to modrinth (#4761)
* Fix: readme not being synched to modrinth

* use new build_number system env var

* also upload bungee/spigot/velocity

* change name

* undo debug mode, oops
2024-06-17 21:31:54 +02:00
chris
29928c2d83
Sanity check for shulker boxes (#4762) 2024-06-17 18:46:57 +02:00
basaigh
deb25d7147
Bump mappings to fix effects error on startup (#4760) 2024-06-17 13:17:57 +01:00
Eclipse
63a3da7c56
Fix reading custom jukebox songs (#4757)
* Read sound event objects properly in jukebox song

* Add debug log for unexpected sound event type
2024-06-16 19:35:18 -04:00
basaigh
1efb633723
Bump MCPL (#4756) 2024-06-16 22:05:28 +01:00
YHDiamond
6cda7c2202
Partially implement handling of "hide_tooltip" and fix attribute modifiers in "Armor" category not showing (#4731)
* Skip lore creation if hide tooltips exists

* Fix not showing attributes for "Armor" category

* Minor refactor

---------

Co-authored-by: chris <github@onechris.mozmail.com>
2024-06-16 21:01:21 +02:00
Camotoy
d9f9fcf39a
Bump Protocol 2024-06-16 12:26:31 -04:00
Camotoy
0484782703
Merge branch 'feature/1.21' of https://github.com/GeyserMC/Geyser into feature/1.21 2024-06-16 12:19:38 -04:00
Camotoy
3b46622ffa
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/1.21 2024-06-16 12:19:32 -04:00
AJ Ferguson
bd30b34600 Bump MCPL 2024-06-16 01:06:17 -04:00
Camotoy
6025931c7d
Properly translate player entity UUID for vaults 2024-06-15 22:40:29 -04:00
Camotoy
851ed36244
Translate vault block entity 2024-06-15 16:52:09 -04:00
onebeastchris
b1d319bb7e Add Spigot 1.21 world adapter 2024-06-15 18:39:09 +02:00
Camotoy
be83fe7220
Re-enable crafter inventory 2024-06-14 19:36:10 -04:00
Camotoy
7e87af718b
Fix item attribute modifiers 2024-06-14 16:48:46 -04:00
Camotoy
a9ba1ad603
Properly translate ominous items 2024-06-14 15:44:00 -04:00
Camotoy
28e4661fcf
Fix incoming player chat 2024-06-14 14:02:11 -04:00
chris
138c7b4eee
Catch EOFExceptions while pinging Java servers when it is misconfigured/not online (#4746)
* Catch EOFExceptions when the remote server is misconfigured/not online
2024-06-14 17:27:30 +02:00
onebeastchris
09c0ada502
Catch Throwable when trying to load world adapter 2024-06-13 23:06:56 -04:00
onebeastchris
6a715770e2 Update mod dependencies to their official 1.21 releases 2024-06-13 23:20:43 +02:00
Camotoy
4a334a2c8d
Bed block sanity check for villagers 2024-06-13 14:58:39 -04:00
onebeastchris
a5ecee73ef Update Bungee warning for outdated proxy checks 2024-06-13 20:12:45 +02:00
onebeastchris
b6653acc29 Catch Throwable when trying to load world adapter 2024-06-13 19:53:47 +02:00
Camotoy
746be566a2
Sanity check for BlockState being chest 2024-06-13 13:53:20 -04:00
Camotoy
ce3083b9b8
Fix key regression with pre-built registries 2024-06-13 11:24:16 -04:00
Camotoy
842e1b4d12
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/1.21 2024-06-13 11:12:01 -04:00
chris
db5a528965
Fix: Improper detection of virtual double chests (#4738) 2024-06-13 16:53:01 +02:00
chris
d00cab18fd
Only translate double chest tags if we are dealing with a double chest (#4736) 2024-06-13 14:14:57 +02:00
Camotoy
73d5f24f40
Fix compilation for modded 2024-06-12 23:53:02 -04:00
Camotoy
026e6fc4f1
Merge remote-tracking branch 'origin/master' into feature/1.21 2024-06-12 23:48:51 -04:00
Camotoy
be04ff2a13
Update to latest MCProtocolLib 2024-06-12 23:48:40 -04:00
Camotoy
3528b1d692
Allow recipes to default count as 1 2024-06-12 22:47:47 -04:00
Camotoy
52a93ecc18
Implement breeze 2024-06-12 22:16:14 -04:00
Camotoy
9db1dd10d2
Fix some water plants not being waterlogged 2024-06-12 20:56:06 -04:00
Camotoy
82d0a87020
Remove debug code 2024-06-12 20:45:47 -04:00
Camotoy
2ecc4cd841
Point to right mappings 2024-06-12 20:42:29 -04:00
Camotoy
7314571b94
Merge branch 'feature/1.21' of https://github.com/GeyserMC/Geyser into feature/1.21 2024-06-12 20:34:55 -04:00
Camotoy
ecffb564ed
Refactor static recipe loading
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.
2024-06-12 20:34:42 -04:00
onebeastchris
82d68bfe9b Bump fabric/neoforge dependencies to 1.21, update README.md, bump Geyser version to 2.4.0 2024-06-13 00:14:10 +02:00
Camotoy
a42c979abb
This variant of tag loading should be slightly more efficient 2024-06-12 00:12:15 -04:00
Camotoy
29dacd2397
Properly remap coral blocks on 1.20.80 2024-06-11 14:26:53 -04:00
Camotoy
b78c7b2bd3
Fix #4729 2024-06-11 10:54:57 -04:00
Camotoy
956a84a3fb
Enchantment tag can be null 2024-06-11 10:47:26 -04:00
Camotoy
d19807170d
Properly show dyed wolf armor 2024-06-10 22:40:14 -04:00
Camotoy
7fc370cef7
Merge remote-tracking branch 'origin/master' into feature/1.21 2024-06-10 22:04:27 -04:00
Camotoy
9a310f248b
1.21-pre4 updated block tags 2024-06-10 21:59:03 -04:00