Google/Geyser
1
0
Fork 0
forked from GeyserMC/Geyser
Code Issues Pull requests Projects Releases Wiki Activity
1354 commits 7 branches 0 tags 53 MiB
Commit graph

1047 commits

Author SHA1 Message Date
Camotoy
fe6257bb38
Check if firework item explosions tag is null (#626) 2020-05-23 21:16:11 -04:00
RednedEpic
0574feb87e Fix block breaking animations when in water (Closes #494) 2020-05-23 18:29:11 -05:00
Camotoy
99f69b3a7d
Rewrite Ping Passthrough (#468) 
* Fix ping passthrough on BungeeCord

* Initial implementation of direct ping passthrough

* Finished implementation of direct ping passthrough

* Remove test for something else entirely

* Fix standalone

* Add config option for ping passthrough interval

* Use GeyserPingInfo to reduce methods

* Add querying; modify ping passthrough

* Add separate config options for passthrough MOTD and player counts

* Convert all plugin bootstraps to use internal ping events to that other plugins can handle ping modifications

* Small changes

* Fix invalid packet spawm

* Add legacy ping passthrough option

* Fix BungeeCord

* Proper UUID for BungeeCord, thanks @theminecoder

* Update config version and messages

* Merge master... again

* Add missing javadocs and minor changes

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
Co-authored-by: theminecoder <theminecoder.dev@gmail.com>
Co-authored-by: Redned <redned235@gmail.com>
 2020-05-23 16:50:04 -05:00
Camotoy
59da87a10f
Merge entity mounts branch to master (#589) 
* Initial support for entity mounts*

* This only works for viewing other players on mounts/vehicles. Currently, mounting on vehicles through Geyser with bedrock does not work at all, though, you can see other Java players on mounts just fine.

* Fix Bedrock player mounting; add minecart offset

* Remove debug code

* Fix boat animation

* Remove debug code

* Add notice of possible steering flip

* Add translator for PlayerInputPacket

* Upload WIP code for BoatEntity.java

* Add animation for rowing on Bedrock side

* Clean up debug code, start on boat movement

* Add notice about flying horses

* Rename BedrockPlayerInputPacket.java to BedrockPlayerInputTranslator.java

* Delete BedrockPlayerInputPacket.java

* Use Translator Annotation again; Thanks to LegacyGamerHD

* Upload ineffective mount-on-login code

* Upload current changes with no debug code

* Change case where applicable

* Change Integer[] to int[]; Change schedule() to execute()

* Don't use Thread.Sleep() and instead call itself again

* Fix players not being linked on login/chunk load

* Little changes

* Minor improvements/fixes to boats

* Remove empty file

* Fix horse flying.

* Various entity mounting fixes

* Add mounting offsets for skeleton and zombie horses

* Another round of entity mount-related fixes

- Add offsets for skeleton and zombie horses (Thanks to tester DirtNasty)
- Boats can now be placed in survival (Thanks again to tester DirtNasty)
- Boats and minecarts can now shake

* Add translating for ServerVehicleMovePacket

* Cleaning up

* More cleaning up

* Add interactive tag support for mountable entities

* Boats move far more nicely

* Add horse heart visuals

* Update interactive tags

Co-authored-by: RednedEpic <redned235@gmail.com>
 2020-05-23 16:39:17 -05:00
rtm516
d8d9fb7190
Fireworks! (#579) 
* Fixed firework entity

* Added firework item translator

* Fixed mappings submodule
 2020-05-23 16:33:39 -05:00
Camotoy
22a1073e54
Debugging improvements (#585) 
* Debugging improvements

- Added an ObjectArrayList of packets we don't anticipate ever translating. Currently only holds ServerUpdateLightPacket which we don't use and probably don't need.
- Only print debugging logs from sounds if they failed to play.

* Add space
 2020-05-23 16:11:54 -05:00
Camotoy
714c450291
Add players able to sleep in beds (#575) 
* Add players able to sleep in beds

This commit sets the correct metadata and flags when the Java pose changes to sleeping.

* Player view while sleeping now works

* Fixed bed offset for other players
 2020-05-23 16:09:11 -05:00
rtm516
fc6532732d
Adds skin ears from MinecraftCapes.co.uk + Clientside linked account skins + Elytra textures (#539) 
* Added ears geometry support

* Added ear fetching from mc capes

* Added support for deadmau5

* Commented, documented and cleaned code

* Allow bedrock players to see their java skin/cape/ears when joining

* Optimised Imports

* Fix missing else statement

* Moved ears and fixed elytra skins

* Added ears config option

* Fixed cape/elytra transparency

* Fixed slim skin geometry

* Fixed async ears request and added alex skin

* Fixed default elytra not showing with no cape

* Moved to normal Base64 functions

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
 2020-05-23 16:06:34 -05:00
Camotoy
1664221fa9
Add optional workaround for >Y128 Nether building (#615) 
* Add optional workaround for >Y128 Nether building

This commit adds a config option for building above the Nether by changing the Nether's dimension ID to match the End's.

* Only check for workaround application once

* Fix mappings?

* Include a bit more for the above bedrock nether building config option

Co-authored-by: Redned <redned235@gmail.com>
 2020-05-23 16:02:51 -05:00
rtm516
8f01221275
Updated to support latest MCProtocolLib (#623) 
* Updated to support latest MCProtocolLib

* Cleaned up names and imports

* Fixed minecarts

* Fixed throwables

* Fixed tnt
 2020-05-23 15:56:49 -05:00
OnlyBMan
81d3b0ef10
Fix painting rotation (#597) 
* Fix painting rotation

* add comment and spacing

* Dont sleep everything :P

* Fix whitespace

* Remove whitespace

* Fix underlying issue

Instead of adding a delay, exclude Painting in HeadLookTranslator.java. Thanks AJ!

* Remove unneeded import

Co-authored-by: Camotoy <20743703+DoctorMacc@users.noreply.github.com>
 2020-05-21 18:45:35 -05:00
Camotoy
61e0e796da
Fix /geyser offhand command on Bukkit (#611) 
If CommandSender is not an instance of GeyserSession, we iterate through all GeyserSessions in order to find the sender.
 2020-05-21 17:48:24 -05:00
Camotoy
a7f363ec09
Add option for disabling command suggestions; add config version (#598) 
* Add option for disabling command suggestions; add config version

This commit adds an option for disabling command suggestions. If enabled, command suggestions will not be sent to the server so as to remove command freezing. This commit also adds a config version variable so users are notified when to regenerate their configs.

* Rename GeyserConfiguration.checkGeyserConfiguration()
 2020-05-20 22:43:22 -05:00
Camotoy
83c7858a8c
Fix bug where online mode players couldn't move after logging in (#610) 2020-05-20 13:43:17 -04:00
Camotoy
fbfc987d2b
Fix mapping for Burning Skull painting type (#608) 
Otherwise, painting shows up as a 1x1 painting of another kind.
 2020-05-20 12:40:07 -05:00
rtm516
18415d5d15
Fixed trident display and some arrow related cleanup (#609) 
* Fixed trident display and some arrow related cleanup

* Renamed trident entity
 2020-05-20 12:39:58 -05:00
Camotoy
1395b719cb
Add missing break to JavaEntityStatusTranslator (#600) 2020-05-20 10:12:31 -05:00
Creeperface01
5fe38fa83f
Show form window immediately after spawn (#606) 2020-05-20 10:12:03 -05:00
rtm516
3ab5c697c1
Updated mappings submodule (#596) 2020-05-19 21:39:10 +01:00
AJ Ferguson
2366559694 Store villager data in the player and fix wandering trader 2020-05-19 09:41:44 -08:00
AJ Ferguson
95297e4047 Update villager xp while trading 2020-05-19 07:28:33 -08:00
AJ Ferguson
e2d46c3d49 Work on villager trading 2020-05-18 21:15:29 -08:00
rtm516
c0f678a8af
Added a docker container IP warning (#584) 
* Added a docker container IP warning

* Corrected messages

* Moved to normal java file read instead of starting cat

* Fixed capitalisation on method name
 2020-05-18 22:27:35 -05:00
Camotoy
fd36930502
Add entity event for drowning. (#588) 
This commit translates Java's LIVING_DROWN entity status to Bedrock's HURT_ANIMATION.
 2020-05-18 22:26:27 -05:00
OnlyBMan
fc5230c248
Add firework boost for elytras (#552) 
* Add firework boost for elytras!

* Change how to detect player glide

* Add comments explaining code

* Remove unused ID
 2020-05-18 10:46:35 -04:00
Camotoy
31d3d2e289
Add some elder guardian properties (#586) 
- Adds the ELDER flag to all elder guardians, so they look like elder guardians and not giant regular guardians.
- Translates AFFECTED_BY_ELDER_GUARDIAN in JavaNotifyClientTranslator to add the elder guardian curse event.
 2020-05-17 23:35:26 -05:00
rtm516
405ffb2666
Added mob spawner block entity data (#587) 2020-05-17 23:35:01 -05:00
rtm516
43ee7d6027
Fixed creepers, giants and eye of ender (#578) 2020-05-17 01:26:13 -05:00
RednedEpic
b0d0c168d2 Fix bossbar causing players to be unable to break blocks or interact in small areas (Closes #537) 2020-05-17 01:06:07 -05:00
Camotoy
57717795a3
Add enchantment table book on chunk load (#568) 
Java's block entity ID is enchantment_table whereas Bedrock's is EnchantTable; this commit adds an exception to the block entity regex as such.
 2020-05-16 23:59:03 -05:00
rtm516
95b7055c10
Added map icons (#572) 
* Added map icons

* Cleaned up and moved to enum
 2020-05-16 23:58:00 -05:00
Camotoy
563cde2ade
Switch to client's translation for jukebox song name. (#573) 
Just for consistency with the other part of the code.
 2020-05-16 23:57:34 -05:00
rtm516
3220532083
Fixed fishing rod lines not connecting to other players (#580) 2020-05-16 23:57:18 -05:00
RednedEpic
30e38b3a2f Add basic villager trading support (incomplete) 
This commit implements basic functionality for villager trading. This is still incomplete and is buggy in areas such as with villager trades that have more than one input and trade inputs and outputs containing NBT.

Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
 2020-05-16 23:52:39 -05:00
Camotoy
b4ecb88d49 Add air bubble UI support (#569) 
This commit translates entity metadata ID 1 into the AIR entity metadata.
 2020-05-15 15:29:54 -05:00
Camotoy
1b260c16d7
Leash fixes (#567) 
* Leash fixes

- Adds visuals for leash string by translating ServerEntityAttachPacket
- Updates position offset for lead knots, making them properly appear on fences

* Add basic description of JavaEntityAttachTranslator
 2020-05-15 12:50:34 -05:00
rtm516
2830756a55
Fixed unusable space being off by 1 (#561) 2020-05-15 11:08:44 -05:00
rtm516
919af5203d
Fix banner items loosing patterns in inventory (#560) 2020-05-14 19:41:42 -05:00
Camotoy
d4995acec6
Add support for absorption (golden hearts) (#553) 
Absorption is an attribute in Bedrock and an entity metadata value in Java. This commit sends an attribute update packet when the metadata value is updated.
 2020-05-14 11:30:33 -05:00
Camotoy
d5c14921e9
Add message when playing record (#549) 
It appears that the record message is client-sided in Java Edition, so this sends a message whenever a record is played in-world.
 2020-05-13 16:08:52 -05:00
Camotoy
278f59103e
Replace illusioners with pillagers (#550) 
Illusioners do not exist in Bedrock edition; this commit replaces them with pillagers so they can be somewhat replicated.
 2020-05-13 16:08:32 -05:00
rtm516
6aadfb3a63
Fixed wither shield (#544) 2020-05-13 16:08:14 -05:00
rtm516
46b0054435
Fixed guardian beam getting stuck on players (#540) 
* Fixed guardian beam getting stuck on players

* Fixed formatting
 2020-05-12 21:31:42 -05:00
rtm516
0c60af66b2
Fixed customised skins causing strange display (#534) 
* Fixed customised skins causing strange display

* Cleaned up floodgate player checking

* Fixed cape scale

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
 2020-05-11 23:45:16 -05:00
rtm516
c84c0f23cb
Fixed invisible flag not getting set back (#535) 
* Fixed invisible flag not getting set back

* Fixed indentation
 2020-05-11 23:44:30 -05:00
rtm516
324bc67c97
Fixed small armour stands not respecting invisibility (#533) 2020-05-11 14:56:50 -05:00
rtm516
f9ee569cd5
Various entity fixes (#529) 
* Fixed invisible entities nametags being displayed

* Fixed most entity collision boxes

* Fixed area effect cloud not displaying

* Fixed armour stand size and marker

* Fix baby collision boxes

* Fixed squid animation (rotation still broken)

* Fix Guardian beam for local player

* Fixed armour stand invisibility

* Fixed Wither boss data

* Fixed  fishing line attach to entities
 2020-05-11 00:09:16 -05:00
Camotoy
64bfad2af9
Use Bukkit methods to send block sound (#522) 2020-05-10 15:25:28 -05:00
Heath123
720ae3c92d
Add survival-style block pick support (#526) 
* Add survival-style block pick support

* Add BedrockBlockPickRequestPacketTranslator.java

* Remove unnecessary println

* Edit styling and add null check

* Fix compile error

* Remove nesting and unnecessary check

* Further reduce nesting

* Change 1-line statements and add missing comment

* Fix creating translator

* Fix imports
 2020-05-10 15:05:51 -05:00
RednedEpic
d2a18f8fd5 Remove dangling entity link packet in PlayerEntity for parrots 2020-05-10 14:47:40 -05:00
Camotoy
6192237cc9
Add parrots on player shoulders (#530) 
* Add parrots on player shoulders

Parrots on player shoulders are a separate entity in Bedrock, but part of the player metadata in Java. This commit creates a parrot entity from the NBT data given by the player's entity data.

* Remove unused import

* Nullify parrot after despawning

* Remove debug code
 2020-05-10 14:38:39 -05:00
Camotoy
34d4817795
Add visual support for double chests (#523) 
* Add visual support for double chests

* Update mappings submodule
 2020-05-10 14:26:00 -05:00
RednedEpic
e58ffdd3c0 Add support for block break animations from java players to bedrock 2020-05-08 00:18:05 -05:00
RednedEpic
edc8ea998c Add slime and magma cube size support 2020-05-07 22:57:08 -05:00
James Harrison
2355c503c9
Enderchest and Invisible Players fix. (#506) 
* Fix EnderChests not showing on legacy servers (Hypixel)
Fix NPCs/Players sometimes being invisible

* Remove unused import

* Fix standard
 2020-05-07 21:49:44 -05:00
Camotoy
f11bae0bf0
Fix signs (#439) 
* Fix signs on everything except Paper

* Fix sign line placement

* Update shulker box block entity

Co-authored-by: James Harrison <james@fasttortoise.co.uk>
 2020-05-06 16:52:57 -05:00
rtm516
5ae95433e5
Bedrock to Bedrock legacy skin support (#276) 
* Added legacy skin support for bedrock to bedrock clients

* Added bedrock to bedrock cape handling

* Added bedrock geometry support

* Bedrock skins now work in all auth modes

* Tonne of debug info

* Added fix to prevent customised skins from being loaded

* Added skin size to bedrock client data

* Cleaned debugging code

* Made bedrock cape take priority over third party

* Cut the customised skin image in half to hopefully get it to map

* Removed hacky conversion attempt

* Fixed bedrock skin caching on load and 1.14.60 support

* Cleaned up debug messages

* Added linked player ignore
 2020-05-06 16:50:01 -05:00
Luke
4c1dae6714
Add unusable inventory space message (#492) 
* Add unusable inventory space message

* Remove unused imports

* Fixed barrier pickup (#1)

Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
 2020-05-06 16:05:03 -05:00
Camotoy
48147c2ce3
Fix Floodgate players causing errors on Bukkit. (#490) 
Co-authored-by: Tim203 <mctim203@gmail.com>
 2020-05-05 12:53:25 -05:00
Luke
7195d20fae
Implement helper methods for sending packets (#487) 
* Implement helper methods for sending packets, fixes an NPE when chatting before connecting to the remote server

* Change method names

* Add a space between doc comment lines

* Add debug messages
 2020-05-05 10:51:43 -05:00
rtm516
96a7770c22
Fixed entity bugs introduced by 6642f1e and added fishing lines (#483) 
* Fixed entity bugs introduced by 6642f1e

* Fixed fishing line not displaying

* Clean extra line and added todo
 2020-05-05 10:48:01 -05:00
RednedEpic
20bbbee3eb Remove flower pot debug code 2020-05-05 00:10:23 -05:00
RednedEpic
6642f1ec26 Fix a few entities not showing up and include identifiers for entities in EntityType 2020-05-05 00:09:36 -05:00
RednedEpic
26266bf9b6 Fix black texture of offhand item (Closes #332) 2020-05-04 22:01:34 -05:00
rtm516
eeb4cafbc8
Fix some nested language strings (#482) 2020-05-04 21:32:57 -05:00
James Harrison
5b3e7c965f
Chat/Skin fixes (#480) 
* Made MessageUtils mimic java chat behavior
Send ClientSettingsPacket when player joins a server

* Fix comments
Set use client locale instead of hard coding

* Moved chat reset to fix some broken formatting

* Revert MessageUtil as rtm516 has implemented a better fix
 2020-05-04 21:32:37 -05:00
Camotoy
b49004ddaf
Add block entity translators for Bedrock-only block entities (#478) 
* Initial work on flower pots

* Flowers work in-game, not yet chunk load

* Don't overwrite my code before merge

* Finish up flower pots; add piston support on chunk load

* Clean up

* Remove debug line; update mappings
 2020-05-04 21:32:02 -05:00
rtm516
fcf1949b28
Fix trapped chests not displaying (#481) 2020-05-04 19:39:44 -05:00
rtm516
129e10c920
Added automatic git version infomation to startup (#327) 
* Added automatic git version infomation to startup

* Moved to compile time replacement

* Cleaned up old functions

* Removed redundant variable

* Added project version to version string
 2020-05-04 14:17:25 -05:00
ForceUpdate1
d0a2f6ac27
Fix movement issues #466 (#473) 2020-05-04 01:06:08 -05:00
RednedEpic
7d67b65777 Merge branch 'master' into feature/sounds 2020-05-04 00:51:22 -05:00
RednedEpic
0532d5310f Update mappings 2020-05-04 00:29:22 -05:00
RednedEpic
25d3e0708f Map most all missing sounds 2020-05-03 23:56:07 -05:00
RednedEpic
1aca44ec7f Fix playsounds 2020-05-03 15:56:46 -05:00
rtm516
692e46146c
Remove duplicate commands by name (#474) 
* Remove duplicate commands by name

* Removed comment
 2020-05-03 15:26:14 -05:00
RednedEpic
7f7d89e517 Add tnt sounds/particles and support for level event sounds 2020-05-03 01:48:38 -05:00
RednedEpic
3370ad3db9 Merge branch 'master' into feature/sounds 2020-05-02 23:06:53 -05:00
Camotoy
9846058377
Add item frames (#415) 
* Initial attempt

* Item frames 'work'

* Blocks in the item frames work

* Remove commented code

* Small changes

* More progress

* Whittling down

* Fix swords, etc

* NBT data implemented

* Remove unused import

* Add item frame item removing; add checks for removing item frames

* Add requested changes; clean up logic

* Add license

* Always delay item frame updates by 500 milliseconds

* Switch to per-session item frame cache

* Revert item translator refactoring
 2020-05-02 15:44:05 -05:00
RednedEpic
d7592d8216 Add back in explosion translator, add identifier support for sounds 
Some sounds require an identifier be added, otherwise they don't properly play.
 2020-05-02 01:56:08 -05:00
RednedEpic
99e8ca83ab Fix eating sounds and bow sounds 2020-05-02 01:29:30 -05:00
RednedEpic
ff26dcad0d Start work on entity sounds, other misc implementations/fixes 2020-05-02 01:06:22 -05:00
Camotoy
b07161b0a9
Add block values + note block note graphics (#455) 
* Add note block visual without note pitch

* Add rest of block value code

* Add rest of block value code

* Fix pistons, somewhat

* Remove note block attempt

* Re-add whitespace

* Simplify sendPacket of BlockEventPacket

* Add note block visual without note pitch

* Add rest of block value code

* Fix pistons, somewhat

* Remove note block attempt

* Re-add whitespace

* Add mappings for noteblock pitch

* Change noteblock pitch code

* Noteblock Pitch Attempt

* Commit with PistonBlockEntityTranslator

* Cleanup for PR

* Improve pistons

Co-authored-by: blazewalker462 <blazewalker462@protonmail.com>
 2020-05-01 00:51:23 -05:00
rtm516
2e3f32d769
Only replace the first '.' in a message (#463) 2020-05-01 00:49:29 -05:00
RednedEpic
f057edb526 Don't show block break animation at all in creative 2020-04-30 00:53:28 -05:00
RednedEpic
0ac4789f2c Don't send sound updates if block of the same type already exists in placing position 
This prevents the block place sound (most notably buttons or blocks that don't occupy one whole block) from spamming the client if they have their place button held down.
 2020-04-30 00:45:27 -05:00
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
DoctorMacc
ec5c1ef0b2 Merge branch 'master' of https://github.com/GeyserMC/Geyser into endercrystal 2020-04-11 13:06:53 -04:00
DoctorMacc
fd5333b77b Merge latest master 2020-04-11 13:06:50 -04:00
DoctorMacc
0af919effe Merge latest master 2020-04-11 11:38:32 -04:00
DoctorMacc
6b04f2b5d8 Final touches 2020-04-11 11:35:14 -04:00
rtm516
00099b5332 Multi arguments handling 2020-04-11 15:53:53 +01:00
rtm516
c95d2d2f47 New parameter parsing ready for multiple params 2020-04-11 14:57:29 +01:00
rtm516
74d3254bf0 Automatic enum creation and comments 2020-04-11 02:58:07 +01:00
rtm516
010840bebe Better parameter handling 2020-04-11 02:25:58 +01:00
rtm516
c050086221 Basic param parsing 2020-04-11 01:24:22 +01:00
rtm516
927542ff2e Added base command completion 2020-04-11 00:20:34 +01:00
DoctorMacc
e2e4fb2b3c Some final touches 2020-04-10 18:11:16 -04:00
DoctorMacc
f046ef52f1 Add license 2020-04-10 18:06:35 -04:00
DoctorMacc
d547b31b38 Fix first load crashing; fix NPE 2020-04-10 16:36:41 -04:00
DoctorMacc
1dc6d4fbdc Fixed 2020-04-10 16:07:36 -04:00
Redned
d8ff735626
Merge pull request #298 from rtm516/language-and-colour-fix 
Fixed language processing and chat colours being reset for no reason
 2020-04-10 15:06:55 -05:00
AJ Ferguson
23d98bb25f Fix block placement for stairs, slabs, etc. 2020-04-10 10:46:29 -08:00
DoctorMacc
392d2ca6f7 Begin work on ender crystal support 2020-04-10 12:39:52 -04:00
DoctorMacc
6359fd4e83 Use switch statement for cat variant color 2020-04-09 20:23:52 -04:00
DoctorMacc
a580edc78f Little touch 2020-04-09 20:20:41 -04:00
DoctorMacc
d0a7f6282c Initial villager types support 2020-04-09 19:33:52 -04:00
DoctorMacc
8f735ae453 Remove debug code 2020-04-09 18:12:53 -04:00
DoctorMacc
c777641a90 Changes? 2020-04-09 17:53:38 -04:00
DoctorMacc
c1dbd64f12 Add wolf collar support 2020-04-09 16:36:30 -04:00
DoctorMacc
c2fc3a7873 Add copyright 2020-04-09 16:09:03 -04:00
DoctorMacc
af4edf159a Add tameable entity features 2020-04-09 16:06:00 -04:00
rtm516
9f1da99b71 Fixed NONE colour formatting and cleaned up imports 2020-04-09 20:24:32 +01:00
rtm516
1e1d2f00ae Fixed language processing and chat colours being reset for no reason 2020-04-09 19:46:45 +01:00
DoctorMacc
da99bb16d5 Cat work 2020-04-09 13:37:27 -04:00
rtm516
78fdab2090 Removed left in debug line 2020-04-09 17:34:49 +01:00
rtm516
81c1533ee2 en_us user now gets a chat message if the locale isnt already loaded 2020-04-09 17:21:51 +01:00
rtm516
013bca024c Removed auto download and load of en_us 2020-04-09 17:06:17 +01:00
rtm516
64e0af48f9 Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 16:56:14 +01:00
rtm516
b43a3e9abd Fixed players not getting removed from the players map on disconnect 2020-04-09 15:26:14 +01:00
rtm516
1ef50cbb95 Added automatic en_us download and extraction from JAR 2020-04-09 14:36:32 +01:00
rtm516
c51a48221b Merge remote-tracking branch 'origin/master' into server-language-processing 2020-04-09 13:58:45 +01:00
Redned
77a7b55fb1
Merge pull request #294 from DoctorMacc/bows 
Fix bows, potentially buckets, other items
 2020-04-08 23:04:08 -05:00
DoctorMacc
0521a30266 Simplify 2020-04-08 22:17:29 -04:00
DoctorMacc
545604bf91 Merge branch 'sign-editing' of https://github.com/DoctorMacc/Geyser into sign-editing 2020-04-08 21:33:24 -04:00
DoctorMacc
d518d5ef63 One More Thing™️ 2020-04-08 21:33:07 -04:00
DoctorMacc
c393dc9f21 Initial bow support 2020-04-08 21:29:33 -04:00
rtm516
bc67675d16 Added translation of extra message parts 2020-04-09 01:30:27 +01:00
rtm516
70a71b2ee8 Updated mappings commit 2020-04-09 00:23:21 +01:00
rtm516
c61d87714b On demand downloading and loading of language files 2020-04-09 00:20:41 +01:00
Camotoy
a1c0ec6c12
Update copyright 2020-04-08 19:14:34 -04:00
DoctorMacc
c41740a9fa Add entity flag for if bee has nectar 2020-04-08 17:58:07 -04:00
DoctorMacc
aff33bd8b3 Whitespace 2020-04-08 17:44:51 -04:00
DoctorMacc
962d987274 Remove unused imports 2020-04-08 17:44:34 -04:00
DoctorMacc
6ea0fcabc3 Sign editing 2020-04-08 17:42:36 -04:00
rtm516
2cd5472ff0 Started work on the locale fetching and loading system 2020-04-08 21:11:56 +01:00
DoctorMacc
7993f38437 Prepare for PR 2020-04-08 15:30:36 -04:00
Jason Ho
9e03c9b93a Annotate sound translator classes 2020-04-07 18:11:27 -07:00
Redned
ece1eeb451
Merge pull request #274 from rtm516/shutdown-fix 
Kick players on shutdown and fix window not closing on standalone
 2020-04-07 19:20:01 -05:00
Redned
553b72bf30
Merge pull request #289 from DoctorMacc/llama-decoration 
Add llama decoration support
 2020-04-07 19:19:20 -05:00
rtm516
8e1b5de4b0
Merge branch 'master' into shutdown-fix 2020-04-08 01:07:12 +01:00
DoctorMacc
d4f23379ef Fix requested change; modify comments 2020-04-07 20:06:20 -04:00
rtm516
70975a1d36 Updated player count for ade40d5 2020-04-08 01:03:25 +01:00
DoctorMacc
20700998b1 Fix requested changes; remove unused import 2020-04-07 19:57:34 -04:00
Redned
ade40d5a8b
Only add the player to the players map once 2020-04-07 18:54:58 -05:00
DoctorMacc
bbf0baf948 Additional explanation comment 2020-04-07 19:40:35 -04:00
DoctorMacc
03c611224b Add llama decoration support 2020-04-07 19:38:44 -04:00
DoctorMacc
12e67d9b28 Merge branch 'master' of https://github.com/GeyserMC/Geyser into map-quick-fix 2020-04-07 18:23:22 -04:00
Redned
9bdc083963
Merge pull request #286 from DoctorMacc/trader-llamas 
Fix trader llamas not appearing; add llama metadata
 2020-04-07 15:32:41 -05:00
William Johnstone
c44708cc22 Add requested changes 2020-04-07 21:22:10 +01:00
DoctorMacc
588c89ded2 Fix requested changes 2020-04-07 16:21:42 -04:00
DoctorMacc
b8c1a1d0ba Fix trader llamas not appearing; show llama variant 2020-04-07 16:12:55 -04:00