Tim203
cf149b58e0
Fixed remaining merge conflicts
2021-02-02 00:46:46 +01:00
Tim203
5ad2510b87
Merge remote-tracking branch 'origin/master' into floodgate-2.0
...
# Conflicts:
# connector/src/main/java/org/geysermc/connector/command/defaults/SettingsCommand.java
# connector/src/main/java/org/geysermc/connector/network/UpstreamPacketHandler.java
# connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
# connector/src/main/java/org/geysermc/connector/network/session/cache/WindowCache.java
# connector/src/main/java/org/geysermc/connector/utils/LoginEncryptionUtils.java
# connector/src/main/java/org/geysermc/connector/utils/StatisticsUtils.java
2021-02-01 12:02:49 +01:00
Camotoy
74a136628f
Merge branch 'floodgate-2.0' of https://github.com/Tim203/Geyser into floodgate-2.0
2021-01-31 15:11:30 -05:00
Camotoy
a0db56ba87
Fix lightning bolt sound ( #1889 )
2021-01-31 14:22:26 -05:00
Camotoy
454896a7ad
Start work on using the world block for inventories
2021-01-30 16:05:27 -05:00
AJ Ferguson
4a8d93752b
Handle DESTROY creative action
2021-01-29 03:34:56 -09:00
Camotoy
2d37d3f276
Add more debug logging
2021-01-29 00:36:43 -05:00
Camotoy
3b847d93b3
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory
2021-01-29 00:32:35 -05:00
rtm516
498f7653d3
Fix NPE when link entity not found and use non-deprecated constructor ( #1706 )
...
* Fix NPE when link entity not found and use non-deprecated constructor
* Extract method call to variable
* Update PlayerEntity.java
* Fix indentation
2021-01-28 11:33:26 -05:00
rtm516
462e9b8b0d
Fix beehive direction being flipped ( #1880 )
...
* Fix beehive direction being flipped
* Update submodule
2021-01-28 11:08:20 -05:00
YHDiamond
aec08e7d3c
Add images to statistics menu ( #1719 )
...
Co-authored-by: YHDiamond <47502993+yehudahrrs@users.noreply.github.com>
2021-01-28 00:23:27 +00:00
7man7LMYT
ce6055460e
Bedrock doesn't support custom armor stand poses ( #1873 )
...
Added the line that states that custom armor stand poses aren't possible in bedrock.
2021-01-27 19:21:47 -05:00
YHDiamond
f56663456d
Update CONTRIBUTING.md ( #1787 )
...
* Update CONTRIBUTING.md
* Update CONTRIBUTING.md
Ok that works to but i meant for that to mean 'put all your annotation stuff here' obviously it wont compile, but this works too
Co-authored-by: theminecoder <theminecoder@users.noreply.github.com>
Co-authored-by: YHDiamond <47502993+yehudahrrs@users.noreply.github.com>
Co-authored-by: theminecoder <theminecoder@users.noreply.github.com>
2021-01-28 00:20:27 +00:00
Tim203
ad7ffabb6d
Make the identifier more unique
2021-01-24 01:29:47 +01:00
Camotoy
1676242c4f
Add precaution if lectern container is not open
2021-01-22 13:36:27 -05:00
Camotoy
3dc5890649
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory
2021-01-22 13:36:06 -05:00
Camotoy
5a8604fe54
Skin fixes and optimizations ( #1856 )
...
- Fix self-assigned player skins getting overwritten
- Fix players with no skin silently throwing an exception, and properly handle it instead
- CRITICAL bug fix of handling Deadmau5's skin - it's not handled by his UUID but by his username
2021-01-21 19:03:46 -05:00
ScxLore1216
0b9b3eb127
Update bungeecord-api to 1.16-R0.4-SNAPSHOT ( #1857 )
2021-01-21 18:00:18 -05:00
Camotoy
b93ce33b38
Localize Done in the OAuth prompt ( #1851 )
...
Oops.
2021-01-21 22:54:18 +00:00
Camotoy
787e6fe5f7
Fix enchantments when there are less than three options
2021-01-20 18:46:04 -05:00
AJ Ferguson
5d4b368e51
Fix inventory bug when respawning
2021-01-20 11:09:28 -09:00
Camotoy
ca620d6dd8
Add some comments and fix book editing in creative
2021-01-19 19:01:51 -05:00
Camotoy
2304c1375e
[ci skip] Clarify strip NBT comment
2021-01-19 18:22:07 -05:00
Camotoy
75ae28f460
Merge branch 'server-inventory' of https://github.com/GeyserMC/Geyser into server-inventory
2021-01-17 11:12:47 -05:00
Camotoy
f7822e07eb
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory
2021-01-17 11:12:38 -05:00
Camotoy
2d9baf1bfc
Send message to Java if command is Bedrock-only ( #1834 )
...
* Send message to Java if command is Bedrock-only
If a Java player attempts to use a Bedrock-only command, such as `geyser statistics`, they will get an error message stating that this command is only for Bedrock players.
This commit also cleans up Velocity Adventure dependency usage. Issues were caused because of the way relocation works and because Velocity also uses Adventure.
* Only look for a session if we have to
* Update languages submodule
2021-01-16 22:18:13 -05:00
RednedEpic
da512da511
Include 1.16.5 in version command too
2021-01-15 21:59:41 -06:00
Redned
12fb0b6d6d
Include 1.16.5 in README as a supported Java version
2021-01-15 21:50:35 -06:00
AJ Ferguson
234c6542bb
Refactor creative request translator and fix bugs
2021-01-14 19:45:59 -09:00
AJ Ferguson
95703d2ea7
Update inventory if request was rejected
2021-01-13 19:59:11 -09:00
AJ Ferguson
4ee3143fe9
Add delay to legacy recipe detection
...
Workaround for an issue which will be properly fixed later.
2021-01-13 19:40:01 -09:00
AJ Ferguson
5ddb189b48
Use server-inventory mappings
2021-01-13 19:19:37 -09:00
AJ Ferguson
196c9f5c17
Remove debug lines
2021-01-13 19:19:01 -09:00
AJ Ferguson
e87ae8f0dd
Merge remote-tracking branch 'remotes/upstream/master' into server-inventory-upstream
...
# Conflicts:
# connector/src/main/java/org/geysermc/connector/network/session/GeyserSession.java
2021-01-13 18:49:20 -09:00
Camotoy
feae0573de
Merge branch 'server-inventory' of https://github.com/Camotoy/Geyser into server-inventory
2021-01-13 21:34:57 -05:00
Camotoy
454fd102d6
Add better destroy support
2021-01-13 21:34:47 -05:00
rtm516
16fdf51d76
Disable build notifications for sub-builds and build GeyserConnect ( #1838 )
...
Co-authored-by: EasyClifton <63668444+EasyClifton@users.noreply.github.com>
2021-01-14 00:15:00 +00:00
James
8e5a6efa04
Update TODO inventory-blocks: grindstone ( #1827 )
...
Re:
https://github.com/GeyserMC/Geyser/issues/1087
https://github.com/GeyserMC/Geyser/issues/1670
This is seemingly not yet fixed on 1.2.0-SNAPSHOT-561
2021-01-13 14:29:34 -05:00
Camotoy
6fdfcfb35c
Clarify that we do support 1.16.201 ( #1836 )
2021-01-13 14:28:39 -05:00
AJ Ferguson
d3cb069594
WIP. Autocrafting without java recipe book
2021-01-12 16:37:12 -09:00
Extollite
c0a64659c2
Close en_us.hash stream ( #1833 )
2021-01-12 15:41:15 -05:00
Extollite
dd0b4bafe8
Close locale streams ( #1832 )
...
* Close locale streams
* Fix formatting
2021-01-12 15:06:48 -05:00
Tim203
ce2734d3b9
Allow BedrockData and LinkedPlayer cloning
2021-01-12 20:55:11 +01:00
Camotoy
af405f320a
Prevent CME when adding players' emotes ( #1831 )
2021-01-12 14:42:53 -05:00
YHDiamond
fb283fcce8
Add advancements GUI ( #1579 )
...
Using /geyser advancements, Bedrock clients can get a visual on their progress.
Co-authored-by: yehudahrrs <47502993+yehudahrrs@users.noreply.github.com>
Co-authored-by: Olivia <chew@chew.pw>
Co-authored-by: rtm516 <rtm516@users.noreply.github.com>
Co-authored-by: DoctorMacc <toy.fighter1@gmail.com>
Co-authored-by: rtm516 <ryantmilner@hotmail.co.uk>
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2021-01-11 21:23:09 -05:00
Camotoy
6a9d4cd071
Implement 1.16.100 anvil renaming support
2021-01-11 20:06:55 -05:00
Camotoy
4db9ec92bf
Merge branch 'master' of https://github.com/GeyserMC/Geyser into server-inventory
2021-01-11 19:46:39 -05:00
rtm516
1c0cc4622a
Microsoft account authentication ( #1808 )
...
Microsoft accounts can now use Geyser, while maintaining full backwards compatibility with Mojang accounts.
Co-authored-by: Camotoy <20743703+Camotoy@users.noreply.github.com>
2021-01-11 15:52:02 -05:00
Camotoy
6aa74a2322
Allow server pong to appear if MOTDs are too long ( #1445 )
...
* Prevent server pong from appearing if MOTDs are too long
If the server MOTDs are 340 characters or longer, they will not appear. If this is the case, we trim each.
* Implement a more exact fix
2021-01-11 15:37:37 -05:00
Camotoy
2cc8726c12
Shade in the entire net.kyori package ( #1826 )
2021-01-11 14:11:21 -05:00
