Commit graph

773 commits

Author SHA1 Message Date
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
DoctorMacc
2c75415dc8 Update Protocol to 2.5.5-SNAPSHOT 2020-04-12 14:38:47 -04: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
William Johnstone
8cab3cce26 Add falling blocks 2020-04-07 20:45:59 +01:00
DoctorMacc
9c282d2cb8 Quick map fix 2020-04-07 13:54:08 -04:00
DoctorMacc
2d2b4704dc Potential error spam fix 2020-04-06 20:57:26 -04:00
DoctorMacc
050098a498 Add legal message to BedBlockEntityTranslator.java 2020-04-06 16:33:30 -04:00
DoctorMacc
a392e54447 Fix requested changes 2020-04-06 16:27:09 -04:00
DoctorMacc
44a46d1872 Remove unnecessary code 2020-04-06 11:18:16 -04:00
DoctorMacc
81c9e4f165 Fix beds and signs 2020-04-06 11:16:16 -04:00
rtm516
41e0de4484 Cleaned up language 2020-04-06 14:35:18 +01:00
rtm516
c114f49e84 Fixed player count and removed debug code 2020-04-06 14:34:45 +01:00
rtm516
d4fa651427 Made the server kick all players before we shutdown and close the window when we finish on standalone. 2020-04-06 14:33:36 +01:00
rtm516
28217adfdf Added support for numbered param replacements 2020-04-05 23:37:41 +01:00
rtm516
9a6b537e89 Removed debugging line 2020-04-05 22:49:10 +01:00
rtm516
49df48fcf0 Fixed some strings getting missed 2020-04-05 22:47:03 +01:00
rtm516
18311e3c1c Added argument parsing to serverside language processing 2020-04-05 12:19:20 +01:00
rtm516
55b2fd0259 Kick the user on incorrect login info 2020-04-05 10:42:02 +01:00
rtm516
c809ddb618 Renamed translation method and cleaned up variable declaration 2020-04-05 10:13:47 +01:00
RednedEpic
b4cd6bacca Fix improperly named bedrock packet translator 2020-04-05 00:48:53 -05:00
MrPowerGamerBR
b92f36e2e3 Remove unused map info request translator
This was used for debugging purposes, to check if the map was correctly remapped to the client because, if it wasn't, it would've returned -1 as the map ID
2020-04-05 00:48:53 -05:00
MrPowerGamerBR
d635939c5b Add map item translators 2020-04-05 00:48:53 -05:00
RednedEpic
41f6d991a4 Fix improperly named bedrock packet translator 2020-04-05 00:47:04 -05:00
rtm516
845c914492 Moved loading and added default locale config option 2020-04-05 02:58:23 +01:00
rtm516
b5ce83bbe2 Missed changes 2020-04-05 02:37:39 +01:00
rtm516
7f1fb3d43c Added new locale loading system 2020-04-05 02:36:25 +01:00
RednedEpic
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
MrPowerGamerBR
3094fedd54 Remove unused map info request translator
This was used for debugging purposes, to check if the map was correctly remapped to the client because, if it wasn't, it would've returned -1 as the map ID
2020-04-04 17:28:59 -03:00
MrPowerGamerBR
de37046466 Add map item translators 2020-04-04 17:23:02 -03:00
rtm516
c1e00e3614 Moved to json file lang mapping 2020-04-04 19:39:14 +01:00
rtm516
7298e2ff3f Added a few more lang string translations 2020-04-04 17:44:41 +01:00
rtm516
65277dc82a Added java -> bedrock lang conversions 2020-04-04 17:25:38 +01:00
RednedEpic
392b0b5727 Merge branch 'master' into inventory 2020-04-04 03:12:23 -05:00
RednedEpic
7e54170473 Merge branch 'master' into inventory 2020-04-04 03:04:38 -05:00
RednedEpic
79906fae0a Fix NPE if banner had no patterns 2020-04-04 02:45:51 -05:00
RednedEpic
54fe7989cf Nitpicks 2020-04-04 02:08:50 -05:00
RednedEpic
b6c2592b5c Add missing import 2020-04-04 02:08:23 -05:00
Redned
ddf2f471ea
Merge branch 'master' into chunk-fix 2020-04-04 02:00:18 -05:00
RednedEpic
786f137e28 Add support for team prefixes, suffixes, and colors (Fixes #150) 2020-04-04 01:27:34 -05:00
RednedEpic
9b487d7d03 Fix combat by sending the animate packet after damage (Closes #260) 2020-04-03 17:20:14 -05:00
RednedEpic
3aa7b2ddad Use IntSet for JAVA_RUNTIME_WOOL_IDS 2020-04-02 18:09:09 -05:00
RednedEpic
e76b67265a Rebase 2020-04-02 17:53:45 -05:00
RednedEpic
be9396f585 Merge branch 'master' into inventory 2020-04-02 17:01:17 -05:00
Jason Ho
3721cc084e Add packet translators for Play, Stop, and Builtin sounds 2020-03-28 16:50:50 -07:00
Redned
4a8aeda677
Merge pull request #249 from endevrr/block-break-animations (Closes #153)
Block breaking animations
2020-03-28 13:58:44 -05:00
William Johnstone
eb707a71df Add requested changes 2020-03-28 16:03:09 +00:00
Redned
721761cc18
Merge pull request #248 from endevrr/inventory
Fix waterlogged blocks
2020-03-27 22:01:25 -05:00
endevrr
20e6c7fcbf
Merge branch 'inventory' into block-break-animations 2020-03-28 00:04:53 +00:00
William Johnstone
0caee67e43 Finalise block breaking, (water calculations omitted because of no access to server api) 2020-03-27 23:39:53 +00:00
William Johnstone
a00cf75bc7 Fix waterlogged blocks 2020-03-27 23:23:26 +00:00
Redned
00b93c5527
Merge pull request #243 from DoctorMacc/inventory
Implement bed colors (Closes #222)
2020-03-27 15:20:00 -05:00
BuildTools
7cbb0388e2 Update mappings submodule 2020-03-27 16:16:33 -04:00
BuildTools
7b5bb22321 Rename BEDCOLORS to BED_COLORS 2020-03-27 14:21:34 -04:00
BuildTools
17258dcaf6 Remove debugging code 2020-03-27 13:09:40 -04:00
BuildTools
7a402c40b3 Use mappings to generate bed colors 2020-03-27 13:08:21 -04:00
RednedEpic
03e11df58b Fix null potion type message in console (Addresses #227) 2020-03-26 23:29:16 -05:00
RednedEpic
5222232e72 Add rest of fixes for operator bug 2020-03-26 23:00:52 -05:00
BuildTools
e5766ef96a Store bed colors in Object2ByteOpenHashMap 2020-03-26 18:34:54 -04:00
BuildTools
22908c4de7 Remove whitespace 2020-03-26 10:31:57 -04:00
BuildTools
545ab0f268 Move bed-specific code to BedBlockEntityTranslator.java 2020-03-26 10:22:44 -04:00
BuildTools
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
Redned
bb601daf26
Merge pull request #239 from e3ndr/master
Make translators annotation based.
2020-03-25 01:01:37 -05:00
Ender
f8407eeb5a Add requested changes to PR 2020-03-25 00:55:09 -05:00
Ender
bbf6683bd8 Make all translators annotation based 2020-03-23 23:24:17 -05:00
Ender
13a58dc825 Begin making translators annotation based
Also, rename TranslatorsInit to Translators; makes alot more sense.
2020-03-23 23:03:33 -05:00
DoctorMacc
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
William Johnstone
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
William Johnstone
a0884596e3 Fix issue with players being able to update their own gamemode 2020-03-21 22:59:16 +00:00
William Johnstone
4b40b07bf8 Refactor code and improve sword breaking 2020-03-21 21:37:55 +00:00
William Johnstone
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
William Johnstone
350bb28c7c revert last commit as I'm starting over 2020-03-20 21:28:20 +00:00
William Johnstone
650a1e2ab1 Start block breaking animations (inventory is broken) 2020-03-20 20:34:16 +00:00
Tim203
8b824cccf7
Added VR as InputMode (fixes #219) 2020-03-19 12:51:14 +01:00
RednedEpic
0a3a4a9ee1 Merge remote-tracking branch 'origin/master' 2020-03-18 16:10:45 -05:00
Redned
62b183a387 Update bedrock protocol lib and remove trove 2020-03-18 16:10:28 -05:00
Ender
1f8a2c5765 Make the passthrough motd display correctly on clients
Before: https://i.e3ndr.xyz/?i=W63C
After: https://i.e3ndr.xyz/?i=SGKS
2020-03-17 17:55:11 -05:00
RednedEpic
51050e3868 Merge remote-tracking branch 'origin/master' 2020-03-17 11:43:28 -05:00
RednedEpic
21dc2e8362 Add Geyser reload command and commands for platforms (Closes #141) 2020-03-17 11:43:09 -05:00
RednedEpic
1bcee8d36f Merge branch 'master' into inventory 2020-03-15 13:21:37 -05:00
RednedEpic
16c9317a36 Fix flickering sky if time is too high (Closes #200)
This was caused because the max int size is 2,147,483,647, which is what Minecraft: Bedrock Edition uses in the time packet. In Minecraft: Java Edition, a long is used which has a max length of 9,223,372,036,854,775,807, thus causing the sky to bug out.

This commit uses the modulus operator with the max time value per-day of 24,000 to retrieve the remainder.
2020-03-15 13:20:55 -05:00
RednedEpic
e203cfd4a7 Move back to XUID for Floodgate
The normal identity UUID caused problems and caused the bedrock client to crash when using Floodgate. This was likely because on bedrock edition, it's a version 3 UUID opposed to java edition which uses version 4.
2020-03-14 14:03:44 -05:00
RednedEpic
105ce2b3b5 Add effect translations 2020-03-10 19:40:51 -05:00
RednedEpic
6eac178305 Merge branch 'master' into inventory 2020-03-10 18:46:27 -05:00
Tim203
37d377b483
Floodgate now uses identity instead of xuid 2020-03-09 21:32:19 +01:00
RednedEpic
acc30f2432 Move DeviceOS to common module 2020-03-08 11:45:00 -05:00
RednedEpic
9e203d48aa Fix running Geyser commands ingame 2020-03-06 19:37:35 -06:00
RednedEpic
0e355c1a95 Fix natural creeper explosion animation not showing up 2020-03-06 19:27:12 -06:00
RednedEpic
70d6a28c22 Merge branch 'master' into inventory 2020-03-06 17:30:46 -06:00
RednedEpic
7bd53c95c3 Work on a lot more entity flags 2020-03-06 17:29:11 -06:00
RednedEpic
e4c2f79bc5 Fix a couple minor entity bugs 2020-03-06 15:56:48 -06:00
RednedEpic
119f35b690 Fix chat getting cut off (Closes #188) 2020-03-06 15:44:49 -06:00
AJ Ferguson
f71c70224b Only translate full chunks 2020-03-05 17:55:22 -09:00
RednedEpic
b2d611e24c Fix some problems brought from merge conflicts 2020-03-05 20:53:58 -06:00
RednedEpic
418026dbe6 Merge branch 'block-entities' into inventory 2020-03-05 20:00:14 -06:00
AJ Ferguson
eaf45ff6f7 Fix chunk view position bugs on some servers 2020-03-05 16:26:36 -09:00
AJ Ferguson
223e94a31d Revert non-full chunk fix
This fix causes far too much lag on big non-full chunk updates
2020-03-05 10:45:50 -09:00
RednedEpic
6b22bcec2b Merge branch 'master' into inventory 2020-03-04 21:35:20 -06:00
RednedEpic
1670c77672 Only allow console to shut down Geyser with a command 2020-03-04 20:44:42 -06:00
RednedEpic
936cbad67d Get log4j2 working and fix commands 2020-03-04 20:35:23 -06:00
RednedEpic
e52a461a73 Attempt to get log4j2 working 2020-03-01 10:48:49 -06:00
AJ Ferguson
ebc81735c0 Merge remote-tracking branch 'remotes/origin/master' into inventory 2020-02-29 12:46:56 -09:00
Redned
773abc9fde
Update packetlib to 1.5-SNAPSHOT 2020-02-29 15:32:03 -06:00
RednedEpic
f9a1656b8e Merge remote-tracking branch 'origin/plugin' into plugin 2020-02-26 19:31:45 -06:00
RednedEpic
2bdf3d4d7f Merge branch 'master' into plugin 2020-02-26 19:31:19 -06:00
Tim203
b97fa2b1c8 Added a response to the PluginMessage packet in the Login state 2020-02-26 23:53:26 +01:00