Commit graph

812 commits

Author SHA1 Message Date
RednedEpic
ad596cdccb Add sound handlers for block interaction
These sound handlers had to be added since on Minecraft: Java Edition, these sounds are handled clientside whilst Minecraft: Bedrock Edition expects something from the server. To counter this, we emulate the sounds of that on Minecraft: Java Edition within Geyser and send it to the client. The code may seem a tadredundant, but there is not much of an alternative unfortunately.
2020-04-30 00:21:02 -05:00
RednedEpic
4d32f6ab70 Access world manager instead of chunk cache to fix particles on Bukkit version 2020-04-29 15:56:41 -05:00
RednedEpic
364aac7e1a Fix block break particles not displaying in survival 2020-04-29 15:47:29 -05:00
RednedEpic
1fbb755d26 Merge branch 'master' into sound-master 2020-04-29 15:14:25 -05:00
RednedEpic
31be608038 Add block break sounds for blocks with 0 hardness, and refactor some things
The refactors in this commit go a bit beyond the scope of what the sound/effects branch was meant to accomplish, however most of these changes are necessary so chunk caching could be reintroduced for the standalone version. The chunk caching here allows for us to get the block ID before the block was broken, and in the future allow us to implement newer features. Chunk caching is optional (and disabled by default) as on non-Bukkit versions, it can eat up a lot of RAM with many players online.
2020-04-29 15:01:53 -05:00
rtm516
bea070395f
Handle player teleports properly (#389)
* Handle player teleports properly

Co-authored-by: ForceUpdate1 <mneuhaus44@gmail.com>

* impl teleport cache

* impl teleport cache

* removed debugs

* Cleanup

Co-authored-by: ForceUpdate1 <mneuhaus44@gmail.com>
2020-04-29 11:06:25 -05:00
ForceUpdate1
82433f8078
Fix capes (#436)
* fix capes

* remove gson

* clean up

* clean up

* formatting code

* Made the changes fit a bit better into the already existing code

* Throw the nullptr before the download complete message,
making debugging skins less confusing

Co-authored-by: Tim203 <mctim203@gmail.com>
2020-04-29 11:04:45 -05:00
rtm516
7a9fff1a64
Fix shulkers being upside down on load (#446)
* Added shulker box direction handeling

* Update mappings

* Added missing Object2ByteMap

* Cleaned javadoc

* Moved shulker box direction conversion to the mappings generator
2020-04-29 11:01:56 -05:00
ForceUpdate1
87be8c378e
Fix Item Name and Lore (#443)
* add basic item translator

* add licence
remove debugs

* fix default lore
2020-04-29 10:58:29 -05:00
Camotoy
ebbb656d45
Revert sending message when creative crafting table is used (#440) 2020-04-27 15:49:24 -05:00
rtm516
78f2d2c089
Added translation to container names (#442) 2020-04-27 15:48:53 -05:00
rtm516
fc17b7cc7a Disabled attempted rendering of the globe pattern 2020-04-27 02:01:15 -05:00
rtm516
3163ab8ddc
Update mappings (#432) 2020-04-27 01:47:13 -05:00
RednedEpic
efcf739973 Merge branch 'feature/sounds' of https://github.com/GeyserMC/Geyser into sound-master 2020-04-26 00:32:01 -05:00
RednedEpic
c22eb170ec Merge branch 'master' into feature/sounds 2020-04-26 00:26:14 -05:00
RednedEpic
08b7857292 Remove unused imports in GeyserSession 2020-04-26 00:24:06 -05:00
rtm516
2fabcefb8d
Fixed error when certain items are spawned from the creative inventory (#430) 2020-04-25 23:55:20 -05:00
rtm516
257918904b
Fixed spawn egg colours not loading in (#429) 2020-04-25 23:55:06 -05:00
Camotoy
0caecf68db
Only add entity to entity cache if ID doesn't exist (#428) 2020-04-25 23:54:42 -05:00
RednedEpic
497825dd96 Fix NPE in console when a sound was missing and clean up nesting 2020-04-25 18:23:01 -05:00
RednedEpic
7320e38a08 Update mappings 2020-04-25 17:56:39 -05:00
RednedEpic
61587ec320 Use Int2ObjectMap in InventoryCache and JavaServerDeclareCommandsTranslator 2020-04-25 17:56:19 -05:00
RednedEpic
8b487df698 Properly remove players from Geyser playerlist (Fixes #421 2020-04-25 17:53:35 -05:00
rtm516
1a53f53d78
Added barriers to creative inventory crafting grid (#426) 2020-04-25 17:33:52 -05:00
Camotoy
36708da1d6
Add message when you try to use creative crafting table (#422)
* Add message when you try to use creative crafting table

* Update message; set access level
2020-04-25 17:29:26 -05:00
Gerrygames
74f869beb5
Fix map colors, remove unnecessary array stream (#423) 2020-04-25 15:46:24 -05:00
rtm516
602166b25d
Added offhand command (#412) 2020-04-24 23:03:34 -05:00
AJ Ferguson
357b681841
Fix movement when far away from the center of the world (#419)
* Fix movement when far away from the center of the world

* Add comment on why we parse a float as string

Co-authored-by: Redned <redned235@gmail.com>
2020-04-24 22:56:56 -05:00
OnlyBMan
e82adf2cf9
Implement shield blocking (#395)
* basic shield blocking

* Offhand works

* Add Shield as id in BlockTranslator

* Change Block Translator to Item Translator

* Fix formatting

Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
Co-authored-by: Redned <redned235@gmail.com>
2020-04-24 22:11:28 -05:00
Redned
6a8f4dfa8b
Add missing license header from EffectUtils 2020-04-23 02:12:50 -05:00
RednedEpic
59b2805a4a Fix NPE for unknown enchantments/enchantments not in bedrock 2020-04-23 02:09:40 -05:00
ForceUpdate1
6f7ad4b569
Implement Book pages (#408)
* add text component library
implement books

* add licence header
2020-04-23 01:26:54 -05:00
RednedEpic
79185fabb5 Only send block sounds when a block is being placed
Previously, any time a block was clicked whether it be with a block in the hand or not, a sound would play. This checks if the item in the players hand is indeed a block as well as the same block in the UpdateBlockPacket, and properly plays the packet.
2020-04-23 01:01:33 -05:00
RednedEpic
09297a467c Update submodules 2020-04-22 23:51:22 -05:00
DoctorMacc
b0a8b9219a Add effects support and block break particles/place sounds
Co-authored-by: RednedEpic <redned235@gmail.com>
2020-04-22 23:40:49 -05:00
RednedEpic
3e15d21931 Merge branch 'master' into sound-master 2020-04-22 18:18:13 -05:00
RednedEpic
987edbb217 Nitpicks and add serverbound sound packet translator 2020-04-22 18:17:34 -05:00
ForceUpdate1
733ec2a0ec
Implement Updated Item Translator (#388)
* add item translator

* add item translator

* add nbt item translator

* fix empty list tags

* formatting code

* use Int2ObjectMap
remove session

* rename annotation
2020-04-22 16:26:16 -05:00
RednedEpic
a8805d9d71 Add a /geyser list command (Closes #342) 2020-04-22 01:51:49 -05:00
RednedEpic
e8bf8ff2a0 Fix javadoc related errors 2020-04-22 01:03:46 -05:00
Redned
7ca1d1bea6
Merge pull request #398 from GeyserMC/inventory
Merges branch 'inventory' into master
2020-04-22 00:49:48 -05:00
rtm516
daba0d6d5e
Improved the outdated version kick message (#394)
* Improved the outdated version kick message

* Swapped 'server' to 'proxy'
2020-04-22 00:41:25 -05:00
Camotoy
aad4536990
Fix /fly command (#396)
* Fix /fly

* Add comment
2020-04-21 14:36:13 -05:00
Camotoy
94ecb2c6c7
Block entity rewrite (#382)
* Initial attempt

* Rewrite of the rewrite

* First working implementation

* Far better working implementation

* Clean up imports

* Remove commented code

* Cleanup code; change things

* Remove unused imports

* Cleanup code

* Add licenses; add comment

* More cleanup

* Clarifications

* It complained about a JavaDoc comment

* Update access permissions

* Switch from reflections to iteration over BlockEntityTranslators
2020-04-21 00:32:32 -05:00
rtm516
1b15f3058f
Javadoc a bit of Geyser (#392)
* A bunch of javadoc comments

* Cleaned up javadocs
2020-04-21 00:28:44 -05:00
rtm516
4ee95f585d
Move all json to Jackson instead of a mix of 2 libraries (#302)
* Swapped most GSON refrences to Jackson

* Converted FormWindow getJSONData

Co-authored-by: Redned <redned235@gmail.com>
2020-04-20 15:10:30 -05:00
rtm516
7417f57d47
Fish fixes (#374)
* Fixed tropical fish display.

* Added base pufferfish class

* Fixed pufferfish, fish flags and cleaned up tropical fish spawning

* Fixed tropical fish model variant

* Fix tropical fish colours
2020-04-20 00:29:36 -05:00
RednedEpic
3574212b4b Merge branch 'master' of https://github.com/GeyserMC/Geyser 2020-04-19 18:09:31 -05:00
RednedEpic
bab2b4a420 Pull command descriptions from Bukkit and Sponge versions when listing commands
This allows the description of the commands to display when listing the commands in bedrock by tab-completing. This is currently only available on Sponge and Bukkit versions as there is no support in BungeeCord and Velocity to get these values. This data is also not sent in any packet, so we cannot retrieve that from standalone either.
2020-04-19 18:08:14 -05:00
Redned
aea1600072
Merge pull request #379 from ForceUpdate1/scoreboard
Fix NullPointerException
2020-04-19 17:19:35 -05:00
Redned
7d52d8aea0
Merge pull request #380 from ForceUpdate1/entity
Fix some entity metadata values
2020-04-19 17:19:08 -05:00
Jason
12b99c5b1b
Merge branch 'master' into master 2020-04-19 14:09:36 -07:00
rtm516
89a7f8f17c
Removed descriptions from commands 2020-04-19 11:08:42 +01:00
Marco
60abdbac3c Fix NullPointerException with invalid scoreboard teams 2020-04-19 11:17:40 +02:00
Marco
36b549be39 Reset wolf color 2020-04-19 11:06:11 +02:00
Marco
46989fb6b5 Reset wolf color, if not tamed
Fix baby metadata
2020-04-19 10:57:37 +02:00
Redned
2dc9a7186e
Merge pull request #372 from ForceUpdate1/bossbar
Fix Bossbars
2020-04-18 21:54:44 -05:00
Marco
88a1238593 add licence header 2020-04-18 21:37:14 +02:00
Redned
40feb0880f
Merge pull request #370 from ForceUpdate1/interact
Fix interact at
2020-04-18 14:07:19 -05:00
rtm516
6880507469 Fix all block entities being updated as Skulls 2020-04-18 17:50:14 +01:00
Marco
de9c9b3dfa reset color 2020-04-18 15:49:28 +02:00
Marco
7cd941e5d6 Fix BossBars 2020-04-18 15:48:21 +02:00
Marco
e3932cba62 fix interact at 2020-04-18 11:13:00 +02:00
Marco
685df6266f code formatting 2020-04-18 10:30:25 +02:00
Marco
1c0ea9c60c fix npe 2020-04-18 10:29:13 +02:00
RednedEpic
c52b3b61c7 Merge branch 'master' into inventory 2020-04-17 23:35:34 -05:00
RednedEpic
a3cc5ecd63 Remove sentry since it's unused 2020-04-17 23:21:51 -05:00
RednedEpic
4b001593fc Merge branch 'master' into inventory 2020-04-17 18:37:22 -05:00
Redned
52ebb1a53c
Merge pull request #356 from ForceUpdate1/shulker
Implement ShulkerEntity
2020-04-17 13:21:49 -05:00
Marco
2386b415a5 add licence header 2020-04-17 20:19:14 +02:00
Redned
206825ae61
Merge pull request #353 from DoctorMacc/fishing-hook
Make the fishing hook appear
2020-04-17 13:11:36 -05:00
Redned
0eea637aed
Merge pull request #359 from ForceUpdate1/rain
Reset rain during respawning
2020-04-17 13:10:08 -05:00
Redned
18be53ee13
Merge pull request #362 from ForceUpdate1/brand
Fix brand Plugin Message
2020-04-17 13:09:12 -05:00
Redned
a8f8de8613
Merge pull request #363 from ForceUpdate1/login
Improve login screen
2020-04-17 13:08:28 -05:00
rtm516
03f8074619 Update Protocol to v390 2020-04-17 17:38:18 +01:00
DoctorMacc
204035323b Update everything else 2020-04-17 12:34:09 -04:00
Marco
1beea43a1e remove bytebuffer 2020-04-17 16:35:48 +02:00
Marco
5e9e17e47d clean up text 2020-04-17 15:52:46 +02:00
rtm516
dc59be3901
Fix blank login causing error 2020-04-17 14:34:44 +01:00
Marco
1a06fe331e Improve login screen 2020-04-17 14:54:04 +02:00
Marco
c246a32844 Fix brand 2020-04-17 13:29:35 +02:00
Marco
ec9f692418 Reset rain during respawning
Fixes #358
2020-04-17 00:03:01 +02:00
Marco
ca8b19c0d0 Implement ShulkerEntity 2020-04-16 14:36:03 +02:00
Artuto
508d56ffc8 Fix inverted booleans in MessageUtils.isTooLong 2020-04-15 22:50:02 -05:00
DoctorMacc
406f76201d Add license; add comment 2020-04-15 18:35:14 -04:00
DoctorMacc
1c255e4d73 Fishing bobber shows 2020-04-15 18:33:16 -04:00
Redned
e96863e941
Merge pull request #308 from rtm516/command-completion
Command auto-completion
2020-04-15 15:31:38 -05:00
RednedEpic
0a5312fff2 Update mappings submodule 2020-04-15 15:02:12 -05:00
Redned
ee88557674
Merge pull request #350 from DoctorMacc/copyright
Update various copyright dates (Inventory branch)
2020-04-15 14:47:29 -05:00
Redned
915cff2eb9
Merge pull request #349 from DoctorMacc/copyright-master
Update various copyright dates (Master branch)
2020-04-15 14:47:15 -05:00
Redned
628dac8c26
Merge pull request #344 from ForceUpdate1/anvil_rename
Fix Anvil Item Rename
2020-04-15 14:46:39 -05:00
Redned
5ffd5d50f1
Merge pull request #336 from OnlyBMan/inventory
Implements Skulls and Heads
2020-04-15 14:46:09 -05:00
DoctorMacc
bfb3fb4258 Update various copyright dates 2020-04-15 15:39:21 -04:00
OnlyBMan
80a7f3a578
It's not 2019 anymore? 2020-04-15 15:38:17 -04:00
DoctorMacc
e8a441d667 Update various copyright dates 2020-04-15 15:37:53 -04:00
Marco
0a9470acb8 formatting code 2020-04-15 21:37:12 +02:00
Redned
09e5bbb466
Merge pull request #331 from rtm516/early-animation-fix
Prevents animations from being sent to the server before the player has spawned
2020-04-15 14:36:06 -05:00
DoctorMacc
d7b8f08899 Fix piston/sticky piston (among others) not being able to be retrieved in creative 2020-04-15 15:24:57 -04:00
Redned
f8c3cf1aac
Merge pull request #324 from rtm516/chat-limit-warning
Added warning message if chat message is longer than 256 characters.
2020-04-15 13:10:15 -05:00
OnlyBMan
60b65e4be6 Add copyright notice 2020-04-15 10:11:32 -04:00
Marco
0152107a06 Send rename item packet on update slot 2020-04-15 13:13:46 +02:00
rtm516
8fd4632d07 Fixed single line if statements 2020-04-15 10:55:10 +01:00
rtm516
34a8a6d55f Fixed single line if statements 2020-04-15 10:51:56 +01:00
RednedEpic
1cb2e658e0 Merge branch 'master' into inventory 2020-04-14 23:40:50 -05:00
RednedEpic
dbe2a9b3b0 Return COLOR_0 for null values in MapColor
Might be better to eventually figure out why this is null to begin with, but for the time being considering maps are not working, we'd have to get to that step first. This just prevents the console from spamming errors, and will do until maps are fully implemented/fixed.
2020-04-14 23:35:59 -05:00
RednedEpic
b15d37a4c5 Print throwable for disconnection if present 2020-04-14 23:27:16 -05:00
Redned
f920013d2b
Merge pull request #338 from theminecoder/fix/client-full-server-bug
Fix client not letting you connect to a full server
2020-04-14 23:11:52 -05:00
theminecoder
95e1eb2a63 Fix bedrock clients not able to connect when the client thinks the server is full 2020-04-15 14:04:53 +10:00
Redned
d66cad964c
Merge pull request #337 from DoctorMacc/endercrystal
Add Ender Dragon, Ender Crystal entities; update Enderman entity metadata
2020-04-14 23:04:42 -05:00
Redned
08ddcbac65
Merge pull request #323 from DoctorMacc/gamerule
Add doDaylightCycle gamerule support
2020-04-14 22:49:10 -05:00
DoctorMacc
9e93ea4c8d Add licenses 2020-04-14 21:52:25 -04:00
DoctorMacc
52783804ac Remove debug code 2020-04-14 21:50:43 -04:00
DoctorMacc
ee453502e2 Final touches 2020-04-14 21:46:05 -04:00
OnlyBMan
9bd1c0fc70 Cleanup some code 2020-04-14 20:08:48 -04:00
OnlyBMan
87e372ce21 Put everything into bedrock mapping 2020-04-14 19:34:11 -04:00
OnlyBMan
3972cc7f87 Fix comments 2020-04-14 18:40:05 -04:00
OnlyBMan
08eb99fa94 Implement skulls and heads 2020-04-14 18:33:55 -04:00
DoctorMacc
d92b83afdb Fix ender dragon; add enderman 2020-04-14 16:58:41 -04:00
rtm516
522dc864de Removed unneeded import 2020-04-14 10:55:12 +01:00
DoctorMacc
2402a33798 Merge branch 'master' of https://github.com/GeyserMC/Geyser into endercrystal 2020-04-13 23:05:12 -04:00
DoctorMacc
821f164b23 Fix requested changes 2020-04-13 18:01:30 -04:00
rtm516
f7c5fea87e Prevents animations from being sent to the server before the player has spawned 2020-04-13 22:52:38 +01:00
rtm516
3616aa07fe Fixed colour and style formatting for some messages 2020-04-13 22:29:22 +01:00
rtm516
55608a2a48 Centeralised message length checking and added TODO for localization 2020-04-13 17:49:29 +01:00
rtm516
549fe1d479 Fixed crashing bug when using more than 1 root node 2020-04-13 17:27:30 +01:00
DoctorMacc
35a16996b5 Small change 2020-04-13 10:58:10 -04:00
DoctorMacc
1714445df9 Remove unused imports 2020-04-13 10:55:52 -04:00
DoctorMacc
d08c13a7e3 Remove old lines of code 2020-04-13 10:47:30 -04:00
DoctorMacc
5c62b47175 Simplify logic 2020-04-13 10:46:13 -04:00
rtm516
79a7258fd1 Added warning message if chat message is longer than 256 characters. 2020-04-13 11:10:53 +01:00
DoctorMacc
daa1888c09 Add some code in case of a rogue plugin 2020-04-12 21:33:51 -04:00
DoctorMacc
746cd29a6d Add doDaylightCycle gamerule support 2020-04-12 21:13:51 -04:00
DoctorMacc
fc988dfd70 Implement grindstone 2020-04-12 18:32:07 -04:00
Redned
e67ed6dc8d
Merge pull request #319 from rtm516/patch-2
Added debug packet logging for unhandled packets
2020-04-12 16:27:56 -05:00
rtm516
d613835f92
Added debug packet logging for unhandled packets 2020-04-12 10:37:31 +01:00
RednedEpic
605c9ef4db Merge branch 'master' into inventory 2020-04-11 22:46:25 -05:00
rtm516
76e29af6b8
Fixed map name 2020-04-12 01:45:31 +01:00
Redned
68d7f2629a
Merge pull request #317 from DoctorMacc/item-animation
Item pickup animation
2020-04-11 17:57:07 -05:00
Redned
00198af794
Merge pull request #316 from AJ-Ferguson/dimension-login-fix
Fix crash on some devices when logging into a different dimension
2020-04-11 17:50:25 -05:00
DoctorMacc
ce7954d8ab Add license 2020-04-11 18:50:01 -04:00
Redned
fe382e5864
Merge pull request #310 from DoctorMacc/villagers
Villager visuals
2020-04-11 17:49:41 -05:00
DoctorMacc
5116f250ad Add item collection animation 2020-04-11 18:48:04 -04:00
DoctorMacc
f3344dbfed Change villager maps to private final 2020-04-11 15:18:22 -04:00
Redned
e5f0840335
Merge pull request #315 from rtm516/waterlogged-fix
Fixes waterlogged blocks in master
2020-04-11 14:17:06 -05:00
rtm516
613626915a Copied fix from inventory a00cf75 2020-04-11 20:11:46 +01:00
AJ Ferguson
f04a267d98 Only show login form if AuthType is Online 2020-04-11 10:53:27 -08:00
rtm516
1abc0f9764 Added translation to bossbar titles 2020-04-11 19:43:29 +01:00
AJ Ferguson
95bcc04177 Fix crash on some devices when logging into a different dimension 2020-04-11 10:33:06 -08:00
rtm516
b0d39c587f Removed debugging code 2020-04-11 19:31:06 +01:00
DoctorMacc
13bee6ca6a Debug stuff 2020-04-11 13:10:35 -04:00