0178492b59
Fix some book translation failures ( #661 )
...
Book pages can be sent as plain text rather than JSON. The text library doesn't use lenient parsing, so this fails, and the book isn't visible in the inventory.
This will convert the text into JSON if it's not already, before feeding it to the text library.
2020-05-25 21:19:37 -04:00
d0545c57c4
Fix some fireworks colors and NPE of there is no NBT ( #650 )
...
Adds Bukkit colors and an additional NPE check
2020-05-25 17:57:10 -04:00
6b68bbb413
Large refactoring to item translator and registry/util classes
...
- Merged ItemTranslator and ItemStackTranslator together.
- Split ItemTranslator into two classes: ItemTranslator and ItemRegistry. The registry is where items are registered, and the translator class is where item translation takes place.
- Made most of ItemTranslator's methods static and removed the initialization in Toolbox.
- Moved a handful of registry classes previously ending with 'Utils' to a 'Registry' class to be more fitting for the term.
- Moved inventory and block entity registration out of Translators.
- Renamed Translators to PacketTranslatorRegistry.
- Yeeted Toolbox.
- Minor cleanups and small refactors.
2020-05-24 20:07:05 -05:00
3d0dbff87b
Remove effects on world/server change ( Fixes #467 )
...
The server re-sends these effects upon joining the new world or server.
2020-05-23 23:45:39 -05:00
0574feb87e
Fix block breaking animations when in water ( Closes #494 )
2020-05-23 18:29:11 -05:00
d8d9fb7190
Fireworks! ( #579 )
...
* Fixed firework entity
* Added firework item translator
* Fixed mappings submodule
2020-05-23 16:33:39 -05:00
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
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
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
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
5fe38fa83f
Show form window immediately after spawn ( #606 )
2020-05-20 10:12:03 -05:00
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
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
95b7055c10
Added map icons ( #572 )
...
* Added map icons
* Cleaned up and moved to enum
2020-05-16 23:58:00 -05:00
919af5203d
Fix banner items loosing patterns in inventory ( #560 )
2020-05-14 19:41:42 -05:00
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
e58ffdd3c0
Add support for block break animations from java players to bedrock
2020-05-08 00:18:05 -05:00
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
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
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
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
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
eeb4cafbc8
Fix some nested language strings ( #482 )
2020-05-04 21:32:57 -05:00
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
fcf1949b28
Fix trapped chests not displaying ( #481 )
2020-05-04 19:39:44 -05:00
1aca44ec7f
Fix playsounds
2020-05-03 15:56:46 -05:00
7f7d89e517
Add tnt sounds/particles and support for level event sounds
2020-05-03 01:48:38 -05:00
3370ad3db9
Merge branch 'master' into feature/sounds
2020-05-02 23:06:53 -05:00
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
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
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
f057edb526
Don't show block break animation at all in creative
2020-04-30 00:53:28 -05:00
1fbb755d26
Merge branch 'master' into sound-master
2020-04-29 15:14:25 -05:00
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
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
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
efcf739973
Merge branch 'feature/sounds' of https://github.com/GeyserMC/Geyser into sound-master
2020-04-26 00:32:01 -05:00
c22eb170ec
Merge branch 'master' into feature/sounds
2020-04-26 00:26:14 -05:00
257918904b
Fixed spawn egg colours not loading in ( #429 )
2020-04-25 23:55:06 -05:00
497825dd96
Fix NPE in console when a sound was missing and clean up nesting
2020-04-25 18:23:01 -05:00
1a53f53d78
Added barriers to creative inventory crafting grid ( #426 )
2020-04-25 17:33:52 -05:00
74f869beb5
Fix map colors, remove unnecessary array stream ( #423 )
2020-04-25 15:46:24 -05:00
6a8f4dfa8b
Add missing license header from EffectUtils
2020-04-23 02:12:50 -05:00
6f7ad4b569
Implement Book pages ( #408 )
...
* add text component library
implement books
* add licence header
2020-04-23 01:26:54 -05:00
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
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
3e15d21931
Merge branch 'master' into sound-master
2020-04-22 18:18:13 -05:00
987edbb217
Nitpicks and add serverbound sound packet translator
2020-04-22 18:17:34 -05:00
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
e8bf8ff2a0
Fix javadoc related errors
2020-04-22 01:03:46 -05:00
7ca1d1bea6
Merge pull request #398 from GeyserMC/inventory
...
Merges branch 'inventory' into master
2020-04-22 00:49:48 -05:00
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
1b15f3058f
Javadoc a bit of Geyser ( #392 )
...
* A bunch of javadoc comments
* Cleaned up javadocs
2020-04-21 00:28:44 -05:00
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
12b99c5b1b
Merge branch 'master' into master
2020-04-19 14:09:36 -07:00
4b001593fc
Merge branch 'master' into inventory
2020-04-17 18:37:22 -05:00
a8f8de8613
Merge pull request #363 from ForceUpdate1/login
...
Improve login screen
2020-04-17 13:08:28 -05:00
5e9e17e47d
clean up text
2020-04-17 15:52:46 +02:00
1a06fe331e
Improve login screen
2020-04-17 14:54:04 +02:00
508d56ffc8
Fix inverted booleans in MessageUtils.isTooLong
2020-04-15 22:50:02 -05:00
5ffd5d50f1
Merge pull request #336 from OnlyBMan/inventory
...
Implements Skulls and Heads
2020-04-15 14:46:09 -05:00
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
1cb2e658e0
Merge branch 'master' into inventory
2020-04-14 23:40:50 -05:00
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
3972cc7f87
Fix comments
2020-04-14 18:40:05 -04:00
08eb99fa94
Implement skulls and heads
2020-04-14 18:33:55 -04:00
3616aa07fe
Fixed colour and style formatting for some messages
2020-04-13 22:29:22 +01:00
55608a2a48
Centeralised message length checking and added TODO for localization
2020-04-13 17:49:29 +01:00
605c9ef4db
Merge branch 'master' into inventory
2020-04-11 22:46:25 -05:00
1abc0f9764
Added translation to bossbar titles
2020-04-11 19:43:29 +01:00
d547b31b38
Fix first load crashing; fix NPE
2020-04-10 16:36:41 -04:00
9f1da99b71
Fixed NONE colour formatting and cleaned up imports
2020-04-09 20:24:32 +01:00
1e1d2f00ae
Fixed language processing and chat colours being reset for no reason
2020-04-09 19:46:45 +01:00
013bca024c
Removed auto download and load of en_us
2020-04-09 17:06:17 +01:00
1ef50cbb95
Added automatic en_us download and extraction from JAR
2020-04-09 14:36:32 +01:00
c51a48221b
Merge remote-tracking branch 'origin/master' into server-language-processing
2020-04-09 13:58:45 +01:00
bc67675d16
Added translation of extra message parts
2020-04-09 01:30:27 +01:00
c61d87714b
On demand downloading and loading of language files
2020-04-09 00:20:41 +01:00
2cd5472ff0
Started work on the locale fetching and loading system
2020-04-08 21:11:56 +01:00
44a46d1872
Remove unnecessary code
2020-04-06 11:18:16 -04:00
81c9e4f165
Fix beds and signs
2020-04-06 11:16:16 -04:00
28217adfdf
Added support for numbered param replacements
2020-04-05 23:37:41 +01:00
9a6b537e89
Removed debugging line
2020-04-05 22:49:10 +01:00
49df48fcf0
Fixed some strings getting missed
2020-04-05 22:47:03 +01:00
18311e3c1c
Added argument parsing to serverside language processing
2020-04-05 12:19:20 +01:00
c809ddb618
Renamed translation method and cleaned up variable declaration
2020-04-05 10:13:47 +01:00
d635939c5b
Add map item translators
2020-04-05 00:48:53 -05:00
845c914492
Moved loading and added default locale config option
2020-04-05 02:58:23 +01:00
b5ce83bbe2
Missed changes
2020-04-05 02:37:39 +01:00
c13bbcda85
Fix null block entity console spam, which caused the world to be invisible
...
This was a rare bug that only happened on very few servers, and from what I gathered, only 1.8 servers using ViaVersion.
2020-04-04 17:22:54 -05:00
de37046466
Add map item translators
2020-04-04 17:23:02 -03:00
c1e00e3614
Moved to json file lang mapping
2020-04-04 19:39:14 +01:00
7298e2ff3f
Added a few more lang string translations
2020-04-04 17:44:41 +01:00
65277dc82a
Added java -> bedrock lang conversions
2020-04-04 17:25:38 +01:00
392b0b5727
Merge branch 'master' into inventory
2020-04-04 03:12:23 -05:00
7e54170473
Merge branch 'master' into inventory
2020-04-04 03:04:38 -05:00
ddf2f471ea
Merge branch 'master' into chunk-fix
2020-04-04 02:00:18 -05:00
786f137e28
Add support for team prefixes, suffixes, and colors ( Fixes #150 )
2020-04-04 01:27:34 -05:00
e76b67265a
Rebase
2020-04-02 17:53:45 -05:00
be9396f585
Merge branch 'master' into inventory
2020-04-02 17:01:17 -05:00
3721cc084e
Add packet translators for Play, Stop, and Builtin sounds
2020-03-28 16:50:50 -07:00
20e6c7fcbf
Merge branch 'inventory' into block-break-animations
2020-03-28 00:04:53 +00:00
0caee67e43
Finalise block breaking, (water calculations omitted because of no access to server api)
2020-03-27 23:39:53 +00:00
22908c4de7
Remove whitespace
2020-03-26 10:31:57 -04:00
545ab0f268
Move bed-specific code to BedBlockEntityTranslator.java
2020-03-26 10:22:44 -04:00
5301c8c3f6
Implement bed colors
...
Java Edition includes the bed color in the namespaced ID; in Bedrock edition it's one of the tag values as a block entity. This code involves creating a table between block states and bed color numbers and looking that up on chunk load or block update.
2020-03-25 22:03:46 -04:00
bb601daf26
Merge pull request #239 from e3ndr/master
...
Make translators annotation based.
2020-03-25 01:01:37 -05:00
13a58dc825
Begin making translators annotation based
...
Also, rename TranslatorsInit to Translators; makes alot more sense.
2020-03-23 23:03:33 -05:00
a821312f7e
Add switch for dealing with ChatColor.NONE
...
In-game chat uses ChatColor.NONE for handling reset of text.
2020-03-23 15:13:45 -04:00
60662ae06c
Moved break time checks to BlockUtils class, Created ItemUtils and added helper function to get enchantment levels on items, implemented a entity effect cache, added haste and mining fatigue check for block breaking animations, fixed block breaking animations for blocks with speeds that are not affected by tools.
2020-03-22 22:59:34 +00:00
4b40b07bf8
Refactor code and improve sword breaking
2020-03-21 21:37:55 +00:00
09cdcbdf94
Add block breaking animations that actually work (still incomplete, doesn't take enchantments or player effects into account, also doesn't account for being in the air or underwater)
2020-03-21 20:14:09 +00:00
350bb28c7c
revert last commit as I'm starting over
2020-03-20 21:28:20 +00:00
650a1e2ab1
Start block breaking animations (inventory is broken)
2020-03-20 20:34:16 +00:00
62b183a387
Update bedrock protocol lib and remove trove
2020-03-18 16:10:28 -05:00
1bcee8d36f
Merge branch 'master' into inventory
2020-03-15 13:21:37 -05:00
105ce2b3b5
Add effect translations
2020-03-10 19:40:51 -05:00
70d6a28c22
Merge branch 'master' into inventory
2020-03-06 17:30:46 -06:00
7bd53c95c3
Work on a lot more entity flags
2020-03-06 17:29:11 -06:00
119f35b690
Fix chat getting cut off ( Closes #188 )
2020-03-06 15:44:49 -06:00
b2d611e24c
Fix some problems brought from merge conflicts
2020-03-05 20:53:58 -06:00
418026dbe6
Merge branch 'block-entities' into inventory
2020-03-05 20:00:14 -06:00
eaf45ff6f7
Fix chunk view position bugs on some servers
2020-03-05 16:26:36 -09:00
6b22bcec2b
Merge branch 'master' into inventory
2020-03-04 21:35:20 -06:00
2bdf3d4d7f
Merge branch 'master' into plugin
2020-02-26 19:31:19 -06:00
bfca25bbe3
Fix compile errors
2020-02-25 22:31:55 -09:00
bc3992f775
Merge remote-tracking branch 'remotes/upstream/master' into inventory
...
# Conflicts:
# connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
# connector/src/main/java/org/geysermc/connector/network/translators/inventory/updater/ChestInventoryUpdater.java
2020-02-25 22:12:39 -09:00
f5bc328737
Merge branch 'master' into feature/new-protocol-lib
2020-02-25 18:54:31 -06:00
41a24ca6ab
Merge branch 'master' into plugin
2020-02-16 13:25:37 -06:00
4bb34cdcce
Merge branch 'master' into feature/new-protocol-lib
2020-02-14 17:57:28 -06:00
4186715083
Update to NukkitX Protocol Lib 2.5.0 release
2020-02-14 17:39:26 -06:00
b1a0ed3e91
Merge remote-tracking branch 'remotes/upstream/master' into inventory
...
# Conflicts:
# connector/src/main/java/org/geysermc/connector/network/translators/TranslatorsInit.java
# connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-12 21:58:09 -09:00
9008036ee4
Merge remote-tracking branch 'remotes/upstream/master' into chunk-fix
...
# Conflicts:
# connector/src/main/java/org/geysermc/connector/network/translators/block/BlockTranslator.java
# connector/src/main/java/org/geysermc/connector/network/translators/java/world/JavaChunkDataTranslator.java
# connector/src/main/java/org/geysermc/connector/utils/ChunkUtils.java
# connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-10 17:38:56 -09:00
c70cf0bb47
Make biomes tag final
2020-02-09 22:55:07 +00:00
f9cd88eaa2
Merge branch 'master' of https://github.com/GeyserMC/Geyser into feature/direct-block-mapping
...
Conflicts:
connector/src/main/java/org/geysermc/connector/utils/Toolbox.java
2020-02-09 22:53:57 +00:00
9594b42523
Add waterlogging support
2020-02-09 22:06:22 +00:00
e8a1e0dae1
Add velocity platform support
2020-02-08 13:43:50 -06:00
516fc51162
Small changes
2020-02-05 20:23:06 -09:00
e4ab4b336c
Chunk fixes
2020-02-05 19:32:33 -09:00
13f198845c
Fix bugs when rapidly switching dimensions
2020-02-05 19:21:09 -09:00
0bb18d26b0
Load biome definitions only once instead of everytime a new player joins
2020-02-05 22:02:23 -05:00
4dff067faa
Add biomes
2020-02-05 21:10:34 -05:00
0cf574ddcb
Merge branch 'master' into feature/direct-block-mapping
2020-02-05 18:59:20 -06:00
4f461bf374
Start on converting to the new NukkitX protocol library updates
2020-02-05 18:55:34 -06:00
3d61b3ce28
Bump OpenNBT lib to 1.4-SNAPSHOT
...
This fixes the NPE when sending an ItemStack with a null NBT tag.
This also fixes some item movement bugs on pure vanilla servers.
2020-01-30 23:15:18 -09:00
1a9aa4255f
Some refactoring and bug fixes
...
Still much to do.
Inventory desyncing when crafting will be fixed soon.
2020-01-30 16:05:57 -09:00
5e5aeed578
Merge remote-tracking branch 'remotes/upstream/master' into inventory
2020-01-30 12:08:39 -09:00
e0f6c8a170
Fix chests and potentially other block entities
2020-01-25 23:51:29 -06:00
6bb478bda4
Merge branch 'master' into block-entities
2020-01-19 22:35:33 -06:00
52b23950ea
Merge branch 'master' into plugin (should fix building)
2020-01-18 16:46:07 -06:00
Arktisfox
rtm516
RednedEpic
Camotoy
Creeperface01
James Harrison
Luke
ForceUpdate1
Gerrygames
DoctorMacc
Jason
Artuto
OnlyBMan
rtm516
MrPowerGamerBR
Jason Ho
endevrr
Ender
AJ Ferguson
SupremeMortal