13
0
geforkt von Mirrors/Velocity
Commit graph

1181 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
93724b7b33 Do not emit errors for kicks from servers 2021-06-14 00:04:18 -04:00
Andrew Steinborn
1dfe294b96 Remove GenericArgumentPropertySerializer
This was only used for boolean argument tyoes
2021-06-13 06:55:24 -04:00
Andrew Steinborn
5a337afb00 Include compatible protocol versions in the incompatible version message
Fixes #519
2021-06-13 05:17:09 -04:00
Andrew Steinborn
83dff50bc7
Merge pull request #520 from hugmanrique/feat/3-command-impl-cleanup
[3.0] Command system implementation refactor
2021-06-13 09:12:06 +00:00
Andrew Steinborn
ebd0fcc6b1 Remove unnecessary slicing of uncompressed packets 2021-06-13 04:00:48 -04:00
Andrew Steinborn
c33f9e0466 Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/Player.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-12 20:13:52 -04:00
Andrew Steinborn
c2b82f878b Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/Player.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-12 20:12:31 -04:00
Andrew Steinborn
1b32f56168
Merge pull request #523 from Artuto/dev/1.1.0
Add support for retrieving the Player's client brand
2021-06-12 23:11:41 +00:00
Artuto
f2b20e6398
Remove usage of Optional 2021-06-12 13:48:42 -05:00
lexikiq
72408d5bd8
Remove display name 2021-06-12 12:12:04 -04:00
Andrew Steinborn
b0da4b60c7 Do not check if a plugin message channel is registered before forwarding it
This fixes issues with Servux and probably a crap ton of other bad mods. Purity on this front serves no real purpose than to say we're pedantic.

A future commit may remove all tracking of registered channels altogether. There's strong evidence (back to Minecraft 1.8, at least) that we don't have to track this data and only need to send channels for plugin message channels registered by Velocity itself. This will likely involve more testing to see if this uncovers client bugs with older versions of the game.
2021-06-12 10:30:46 -04:00
Artuto
c8d50f3fdd
Add support for retrieving the Player's client brand 2021-06-11 23:44:51 -05:00
lexikiq
8356b812c3
Cache permission pointers 2021-06-11 23:44:59 -04:00
lexikiq
4003666c27
Cache pointers 2021-06-11 23:32:49 -04:00
lexikiq
19f80bd618
Don't directly implement PermissionChecker 2021-06-11 21:49:40 -04:00
lexikiq
29b409b9f1
Move #pointers to Player
It uses fully API methods so it makes sense to me to use it in Player, open to criticism though
2021-06-11 21:33:15 -04:00
lexikiq
db7e3262a6
Optimize imports 2021-06-11 21:25:51 -04:00
lexikiq
3c4312056b
Switch to #pointers
Ensures that Pointered#getOrDefault[From] works
2021-06-11 21:12:44 -04:00
lexikiq
f59516165f
Rebase onto feature/adventure-pointers 2021-06-11 21:06:59 -04:00
Hugo Manrique
61480544f5
Apply suggested future-related changes
Co-authored-by: A248 <theanandbeh@gmail.com>
2021-06-11 14:03:38 +02:00
Hugo Manrique
f6e6f02a84
Fix checkstyle violations 2021-06-10 20:35:36 +02:00
Hugo Manrique
fb7aafe8ae
Fix Brigadier command alias redirects 2021-06-10 20:25:52 +02:00
Hugo Manrique
b18e78eac7
Add more tests and clean up 2021-06-10 20:00:33 +02:00
Riley Park
f579725002
Provide access to Pointer values 2021-06-10 01:08:27 -07:00
Hugo Manrique
ba34e4729b
Add more suggestion tests 2021-06-09 22:22:15 +02:00
Hugo Manrique
bcb68c8d0f
Test suggestion exception handling 2021-06-09 21:00:17 +02:00
Hugo Manrique
a9d40f3ca3
Fix alias typo in suggestion merge test 2021-06-09 19:15:27 +02:00
Andrew Steinborn
445688b9a1 Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	build.gradle
2021-06-09 01:29:51 -04:00
Andrew Steinborn
e1af30e0fa whoops 2021-06-08 15:42:20 -04:00
Andrew Steinborn
8892e2a5c6 We don't need the hash to go along with the resource pack response 2021-06-08 15:41:54 -04:00
Andrew Steinborn
a65f720f9d Merge branch 'dev/1.1.0' into dev/3.0.0
# Conflicts:
#	build.gradle
2021-06-07 15:32:52 -04:00
Andrew Steinborn
496372d7af Check if the resource pack hash looks like it might be a SHA-1 hash 2021-06-07 15:32:36 -04:00
Hugo Manrique
46b1bee83a
Test suggestions 2021-06-07 15:15:48 +02:00
Hugo Manrique
ea716c15c6
Test CommandManager 2021-06-07 14:36:41 +02:00
Hugo Manrique
d429d8383d
Test execution and injection 2021-06-07 14:13:32 +02:00
A248
6e42f225e2 Bump to Caffeine 3 2021-06-06 08:09:42 -04:00
Andrew Steinborn
ef7aeae4ed Merge remote-tracking branch 'origin/dev/3.0.0' into dev/3.0.0 2021-06-06 03:52:03 -04:00
Andrew Steinborn
9d54a03a4b Force SpotBugs to shut up here
This method is indeed called...
2021-06-06 03:51:42 -04:00
Andrew Steinborn
b1b3882fab Merge branch 'Xernium-future/1.17' into dev/3.0.0
# Conflicts:
#	api/src/main/java/com/velocitypowered/api/proxy/ProxyServer.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ConnectedPlayer.java
2021-06-06 03:48:49 -04:00
Hugo Manrique
ff506dfdf8
Add license headers 2021-06-05 23:20:01 +02:00
Hugo Manrique
703b91e0fa
Command implementation refactor 2021-06-05 23:19:01 +02:00
Hugo Manrique
ff504c21ef
Suggestions provider 2021-06-05 18:31:00 +02:00
FivePB
59b29a075e
Improve new Resource-pack API 2021-06-05 16:07:24 +02:00
Andrew Steinborn
7fbfdb2f23
Merge pull request #513 from CoreyShupe/feature/Allow-Raw-Registered-Server-Creation
Initial implementation of raw registered server creation.
2021-06-01 13:12:41 +00:00
CoreyShupe
61c0c0d083 Initial change to allow for server info equality. 2021-06-01 02:17:35 -04:00
CoreyShupe
150808b4b0 Initial implementation of raw registered server creation. 2021-06-01 02:07:06 -04:00
A248
2cfa3f743f Remove Add-Opens from manifest 2021-05-24 12:02:35 -04:00
Andrew Steinborn
64d30fba81 AsyncEventExecutor -> AwaitingEventExecutor 2021-05-23 17:51:07 -04:00
Andrew Steinborn
e14ea36150 We don't rely on kyori/event any more 2021-05-23 15:52:09 -04:00
Seppe Volkaerts
821ca02ee7 Backport Velocity Polymer's async event API, with changes.
This commit backports the event manager from Velocity Polymer, with some changes for Velocity 1.1.x API compatibility:

- All event handlers run asynchronously. (While EventTask.async() exists, it is not useful in 3.0.0, but is provided as a migration aid for Polymer.)
- Event ordering is currently limited to the 5 levels available in Velocity 1.x.x.
2021-05-23 15:39:06 -04:00
Andrew Steinborn
3f50964f36 Fix CommandManager method naming so that it is in sync with the 1.1.0 API 2021-05-23 14:20:59 -04:00
Andrew Steinborn
977300cc66 Remove text 3.x API and associated deprecated APIs 2021-05-23 14:13:51 -04:00
Andrew Steinborn
569bb4a16b Just import the entire command manager from Polymer, without changing any names 2021-05-23 13:58:27 -04:00
Andrew Steinborn
590f18dbe0 Convert to Java 11 compressor 2021-05-23 13:58:01 -04:00
Andrew Steinborn
d6dcb115f1 Remove remaining deprecated APIs 2021-05-23 13:49:06 -04:00
Andrew Steinborn
6816c15385 Remove bad test 2021-05-23 13:47:20 -04:00
Andrew Steinborn
2f0ee15051 Remove deprecated Velocity 1.0.0 Command API. 2021-05-23 13:46:47 -04:00
FivePB
18466bb595
Snapshot 21w19a 2021-05-13 23:50:00 +02:00
FivePB
8def411b2b
Snapshot 21w15a 2021-05-13 23:49:55 +02:00
Five (Xer)
581303a54c
Snaphot 21w10a 2021-05-12 21:42:27 +02:00
Five (Xer)
6207647aae
Remove leftovers 2021-05-12 21:42:27 +02:00
Five (Xer)
22bc759044
Snapshot 21w08a 2021-05-12 21:42:27 +02:00
Five (Xer)
b19cf16345
Snapshot 21w07a 2021-05-12 21:42:27 +02:00
FivePB
f0d9a445ed
Snapshot 21w03a 2021-05-12 21:42:27 +02:00
Five (Xer)
040cc29c34
Snapshot 20w49a 2021-05-12 21:42:27 +02:00
Five (Xer)
d8a39fc438
Snapshot 20w46a 2021-05-12 21:42:27 +02:00
Five (Xer)
7f0964155c
Snapshot 20w45a 2021-05-12 21:42:27 +02:00
Andrew Steinborn
11ed4b46e4 whoops 2021-05-09 02:57:52 -04:00
Andrew Steinborn
5170da8fd7 Improve writeVarInt inlining by peeling the two most common cases 2021-05-09 02:57:01 -04:00
Andrew Steinborn
150fd9a9cf Add highly-optimized VarInt writing method 2021-05-08 23:26:43 -04:00
Andrew Steinborn
6369a95ec9 Readd safe and slow compression handling and hide it behind a system property 2021-05-08 18:40:23 -04:00
Leymooo
a8e0516d18 Also do not copy memory in case when packet needs to compress 2021-05-07 19:36:30 +03:00
Andrew Steinborn
37a4199d43 Combine VarInt prefix encoding with compression
This saves us a memory copy in the common "there is no need to compress this packet" case.
2021-05-06 19:56:45 -04:00
Andrew Steinborn
fb3f21abc6 More bitshifting magic 2021-05-06 00:48:19 -04:00
Andrew Steinborn
1cef82d54d Unroll the VarInt writing loop
This is about as optimized as it can get. Thanks to @Leymooo for the idea, I simply expanded on it. We optimize for the common 1-3 byte cases, and punt more "complicated" cases to the original VarInt writing function we had before.
2021-05-05 22:13:54 -04:00
Andrew Steinborn
d42cc4f984 Force a flush after a certain threshold of packets have been queued for sending
Fixes #486.
2021-05-04 18:51:01 -04:00
Nicolas RAYNAUD
e0153267db
Fixed copyright year (#490) 2021-05-04 18:22:50 -04:00
Andrew Steinborn
7c76ae9a27 Make sure to check not only the entire array but also how much was written 2021-05-04 16:32:37 -04:00
Andrew Steinborn
3dc8e25ec7 Fix varint writing (for real!)
Thanks to @Leymooo for reporting and providing test cases. (I also added one of my own tests which proved the most useful to debugging the issue.)
2021-05-04 16:30:32 -04:00
Riley Park
2713831f77 Revert "Avoid calling writeVarInt in the (very) common uncompressed packet case"
This reverts commit c041bea1b6.
2021-05-03 19:38:39 -07:00
Andrew Steinborn
c041bea1b6 Avoid calling writeVarInt in the (very) common uncompressed packet case 2021-05-03 20:17:51 -04:00
Andrew Steinborn
0debb81392 I was nagged to make it more consistent 2021-05-03 20:08:16 -04:00
Andrew Steinborn
0811ebb312 Gotta add the license header to the test file 2021-05-03 19:18:06 -04:00
Andrew Steinborn
4ca97a6df9 Reapply "Optimize varint writing"
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.

This includes a test to ensure that the behavior is as expected and fixes the initialization loop so that the correct results will be given. Much thanks to @octylFractal for acting as my duck while trying to figure this out.
2021-05-03 19:14:48 -04:00
Andrew Steinborn
e531cdb373 Revert "Optimize varint writing"
This reverts commit 3db2fe8d63.
2021-05-03 18:07:25 -04:00
Andrew Steinborn
3db2fe8d63 Optimize varint writing
Inspired by the approach described at the bottom of https://richardstartin.github.io/posts/dont-use-protobuf-for-telemetry

Given that we do a lot of varint writing as well, this should provide a small performance boost for larger/complex packets whilst not regressing hard on smaller packets.
2021-05-03 17:31:32 -04:00
Andrew Steinborn
347853b945 Disable hinting test for now 2021-04-25 10:18:58 -04:00
Andrew Steinborn
81311e7516 Don't attempt to decode empty buffers (fixes #482)
Stuff like this makes me want to drop support for <=1.13 versions of Minecraft.
2021-04-25 10:14:13 -04:00
Andrew Steinborn
ce26ae76c2 Fix case-sensitivity for ping passthrough 2021-04-22 11:23:42 -04:00
Andrew Steinborn
ca52f8989e Load forced hosts as lowercase too, see #464 2021-04-18 08:22:36 -04:00
Andrew Steinborn
ff54622663 Forced hosts should be case-insensitive. Fixes #464 2021-04-18 08:20:04 -04:00
Andrew Steinborn
f1cb3eb1a2 Move timeout handler to after frame decoder
Mitigates attacks like the one described in SpigotMC/BungeeCord#3066. This cannot be considered a full protection, only a mitigation that expects full packets. The attack described is essentially the infamous Slowloris attack.
2021-04-15 22:56:37 -04:00
Andrew Steinborn
c51359e893 Move away from deprecated percent() method.
Also fixed another small nit.
2021-04-15 04:23:59 -04:00
Andrew Steinborn
4de71fe942 Fix color and overlay packets for Adventure boss bar
Someone discovered this bug but decided not to tell anyone. For the record, I'm the one who was brain-damaged... well, I made that particular copy-paste error.
2021-04-15 04:22:44 -04:00
Cubxity
5ea6728d1a
Added ListenerBoundEvent and ListenerCloseEvent. (#454) 2021-04-02 13:24:45 -04:00
Rocco
c34aee76ae
Fix Forge/Client Proxy Connections mismatch in config (#456) 2021-04-02 12:36:32 -04:00
A248
7ba2318506
Fix one more case of a possibly swallowed exception (#455)
Maybe spotbugs will add a rule for this in the future
2021-04-02 01:45:58 -04:00
Andrew Steinborn
c747120b20
Relicense the Velocity proxy under the terms of GPLv3 (#448) 2021-03-31 16:04:06 -04:00
Andrew Steinborn
514115a85c Do not use an ASCII string for handshake 2021-03-30 12:10:55 -04:00
Andrew Steinborn
f88283f127 Revert "Revert strict handshake hostname checks"
This reverts commit 4f80d2b261.

Experience elsewhere (Waterfall PR) and confirmation from TCPShield means
this ought to work. Let's hope.
2021-03-30 12:08:08 -04:00