3
0
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 05:20:14 +01:00
Commit graph

637 Commits

Autor SHA1 Nachricht Datum
Andrew Steinborn
a053ab6c34 Remove resource leak detection level setting 2019-07-03 22:46:47 -04:00
Andrew Steinborn
fba3bfb0be Forge is confirmed working 2019-07-03 22:45:25 -04:00
Andrew Steinborn
11a86e9bb9 Convert Velocity to use ByteBuf-derived plugin message packets
Only tested with 1.12.2, not 1.13 or Forge
2019-07-03 09:20:32 -04:00
Andrew Steinborn
39c505f6fd Readd missing null check. Fixes #228 2019-07-02 13:25:17 -04:00
Andrew Steinborn
a63e905edf Use custom ThreadFactory that does FastThreadLocal wrapping for us
This primarily has the benefit of not giving threads strange names
2019-07-02 09:10:00 -04:00
Andrew Steinborn
190f2fee75 Remove kqueue bug workaround since the issue is now fixed upstream
See https://github.com/netty/netty/pull/9149
2019-07-02 02:36:46 -04:00
Andrew Steinborn
dab9c9a382 Use Netty thread factory to take advantage of FastThreadLocal
This should reduce CPU usage slightly.
2019-07-02 02:19:52 -04:00
Andrew Steinborn
c0becce276 Remove debug code 2019-07-02 00:33:25 -04:00
Andrew Steinborn
7834acd67f Reduce duplicated code used to support RawCommand. Fixes #227 2019-07-02 00:25:43 -04:00
Gabik21
5c314c9068
Add 1.7 Protocol Support 2019-07-01 08:56:22 +02:00
Andrew Steinborn
f0ba7e1eea Add method to check if an entry already exists in the tab list. 2019-07-01 00:07:20 -04:00
Andrew Steinborn
275685f45f Merge branch 'master' into dev/1.1.0
# Conflicts:
#	build.gradle
2019-06-30 23:52:22 -04:00
Andrew Steinborn
226074a0df Add suggestion for reconnecting for "not online-mode" message 2019-06-29 14:35:28 -04:00
Andrew Steinborn
81840abc86 Enforce at least one parameter in CommandManager#register()
The old register method has been deprecated.
2019-06-22 21:13:20 -04:00
Andrew Steinborn
04a23e3622 Introduce raw String-based command API 2019-06-18 00:13:49 -04:00
Andrew Steinborn
1fd2bd9ee4 Avoid sending duplicate set latency/gamemode/display name packets 2019-06-15 17:08:05 -04:00
kashike
335c34a679 Explicity bind the main plugin class in the singleton scope 2019-06-14 01:06:08 -07:00
Andrew Steinborn
d7e4e20c76 This is Velocity 1.0.0 2019-06-12 18:10:33 -04:00
Andrew Steinborn
cc6d060fc5 Clarify error message 2019-06-12 00:43:30 -04:00
Andrew Steinborn
b19d36e939 Strictly enforce packet size limits for incoming compressed packets 2019-06-09 04:25:13 -04:00
Vjatšeslav Maspanov
f64b44ec21 Remove protocol linking (#212) 2019-06-02 19:44:23 -04:00
Andrew Steinborn
8d61e7ffd0 Removed redundant (non-)nullable annotations from boss bar. 2019-06-02 17:57:31 -04:00
kashike
0a53343547 Rename some bossbar-related fields and methods 2019-06-02 14:47:41 -07:00
MrIvanPlays
20b34447f8 Add BossBar API (#213) 2019-06-02 15:02:43 -04:00
Andrew Steinborn
dfe210707f Replace uses of deprecated LegacyComponentSerializer.INSTANCE 2019-05-31 15:50:46 -04:00
Andrew Steinborn
4e71788aba Work around kqueue transport bug with fallback connections. 2019-05-27 14:00:20 -04:00
Leymooo
85c6238d68 1.14.2 support 2019-05-27 17:20:42 +03:00
Andrew Steinborn
b5f099824d Remove debug. 2019-05-26 18:37:33 -04:00
Andrew Steinborn
4d6e836890 Fix Checkstyle 2019-05-26 18:14:54 -04:00
Andrew Steinborn
deeb068825 Merge branch 'metrics' 2019-05-26 18:10:56 -04:00
Andrew Steinborn
9d14af5a8b Add Metrics to Velocity
Velocity will send metrics to bStats.org. These statistics are
publicly viewable at https://bstats.org/plugin/server-implementation/Velocity

You can always opt-out by disabling metrics in your velocity.toml.
There is no obligation to allow us to collect metrics, but you can
show your support by leaving metrics on.
2019-05-26 18:10:44 -04:00
Andrew Steinborn
df9883cc6c Reduce unnecessary memory copies in StatusSessionHandler
Take advantage of the fact that Java has mutable strings when writing
out server ping responses, which Netty can work with when writing out
UTF-8 character sequences. This reduces the memory allocation impact of
server list ping responses by ~31%.
2019-05-24 06:55:19 -04:00
Andrew Steinborn
3cee15a9cb Move proxy shutdown to take place in a new thread. 2019-05-23 15:09:11 -04:00
Andrew Steinborn
df7eb4ade0 Ensure the proxy doesn't shut down too early if stdin is EOF. 2019-05-23 14:50:58 -04:00
Andrew Steinborn
b09331b79b Small optimization for writing packets to the client from the server
The layers of indirection to get to the MinecraftConnection causes a
small, but not insignificant hit to performance.
2019-05-21 00:33:35 -04:00
Andrew Steinborn
a684aaa325 Make sure to complete the result too 2019-05-19 21:56:09 -04:00
Andrew Steinborn
321b42d225 Add some exception logging to the transition session handler. 2019-05-19 21:55:38 -04:00
Andrew Steinborn
5524f3b720 Ensure empty (un)register packets are never sent.
Bukkit 1.13+, in particular, doesn't seem to like it very much. This was
also a bug in ViaVersion.
2019-05-17 18:16:28 -04:00
Andrew Steinborn
40b2c9993b Clean up some connection checks 2019-05-17 06:27:19 -04:00
Luck
72c668c048
Only unregister event handlers/listeners if the correct matching plugin is given
Currently, unregister will succeed & unregister a handler/listener if any valid plugin is given, not necessarily the one the handler was registered with.
2019-05-17 10:59:35 +01:00
Luck
21a79d8142
Correctly register Event handlers in the registeredHandlersByPlugin map 2019-05-17 10:58:11 +01:00
Andrew Steinborn
3ec67a7d4d Optimize VelocityEventManager#fireAndForget()
There isn't a need to create a CompletableFuture when firing an event
and we do not want to know when it is completed.
2019-05-16 17:29:55 -04:00
Andrew Steinborn
9e6e1856e6 Add /glist command.
A much-needed base command, this is now available in Velocity directly.
It is partially inspired by the RedisBungee /glist command, which I also
created.

By default, /glist only provides the player count of the proxy. You can
view the player list for an individual server with /glist <server>, or
you can view the information for all players with /glist all.
2019-05-16 01:46:54 -04:00
Andrew Steinborn
4ab02cb636 Clean this up a bit 2019-05-15 19:02:31 -04:00
Andrew Steinborn
a21eaa085a Do a better job of passing channel (un)registration to the client.
Also fixes a regression related to WDLCompanion.
2019-05-15 18:59:28 -04:00
Andrew Steinborn
552f02ed60 Fix Checkstyle 2019-05-15 17:10:07 -04:00
Andrew Steinborn
6d42a3c37c Explicitly rewrite legacy plugin message channels for 1.13+ clients. 2019-05-15 17:04:45 -04:00
Andrew Steinborn
d805f79d9b Try to unbreak ViaVersion a little bit. 2019-05-15 15:52:07 -04:00
Andrew Steinborn
742865bf0a
Merge pull request #204 from VelocityPowered/plugin-message-cleanups
Plugin message handling cleanup and fixes
2019-05-15 06:31:18 -04:00
Andrew Steinborn
6eabf82513 Fix inaccurate comment. 2019-05-14 04:26:16 -04:00
Andrew Steinborn
d7136150fd Get rid of the Guava Subscribe annotation check
I think we can trust that if you're working with Velocity, you can find
the right Velocity subscribe annotation.
2019-05-14 04:18:18 -04:00
Andrew Steinborn
5bd9f0a96f CappedSet.newCappedSet() -> CappedSet.create() 2019-05-14 04:11:49 -04:00
Andrew Steinborn
57085feb42 Better document what plugin channels we need to forward onto clients. 2019-05-12 11:09:50 -04:00
Andrew Steinborn
3c9cc2c4a8 Remove unrelated change 2019-05-12 10:48:47 -04:00
Andrew Steinborn
16d557a109 Fix checkstyle 2019-05-12 10:46:11 -04:00
Andrew Steinborn
b5fcf685be Kill debug 2019-05-12 10:06:01 -04:00
Andrew Steinborn
adfb33ad21 Fix server-sent plugin message channels, fixing WDLCompanion and similar
Closes #203
2019-05-12 10:05:22 -04:00
Andrew Steinborn
5f0470fb0b Checkstyle, CappedCollection -> CappedSet 2019-05-10 07:42:47 -04:00
Andrew Steinborn
74afcee9ba Suspect this is the fix to #203, but I'm unsure 2019-05-10 04:53:57 -04:00
Andrew Steinborn
c26dc75c44 More robust check 2019-05-10 04:44:01 -04:00
Andrew Steinborn
01be943c3f Initial work on cleaning up plugin message handling in Velocity 2019-05-10 04:32:29 -04:00
Andrew Steinborn
37999ed32e Support 1.14-pre2 2019-05-10 02:51:00 -04:00
kashike
3800610f66 Bump text to 3.0.0 2019-05-06 19:34:53 -07:00
Andrew Steinborn
472f45df08 Don't resolve IP addresses in the config except for the bind one. 2019-04-29 01:59:55 -04:00
Andrew Steinborn
de51ea18cc Forward other client-known plugin messages during the transition as well
Fixes #197
2019-04-29 00:52:06 -04:00
Andrew Steinborn
8517d58673 Reduce erroneous DNS lookups for Velocity in Kubernetes. 2019-04-27 20:37:31 -04:00
Andrew Steinborn
e9950da0c5 Enable multi-release flag to improve Java 9+ compatibility 2019-04-25 19:12:22 -04:00
Andrew Steinborn
cbd922764e Fix Checkstyle (again) 2019-04-24 21:39:15 -04:00
Andrew Steinborn
632d0b6ba8 Handle plugin channel registrations during initial connect as well.
Fixes #193
2019-04-24 21:28:43 -04:00
Andrew Steinborn
1661cece2d
An Easter basket bearing gifts! (#191)
* Delay switch to new server until after JoinGame is sent.

Unfortunately, in some cases (especially vanilla Minecraft) some login
disconnects are sent after ServerLoginSuccess but before JoinGame.
We've been using ServerLoginSuccess but it has caused too many problems.
Now Velocity will switch to a stripped-down version of the play session
handler until JoinGame is received. This handler does very little by
itself: it simply forwards plugin messages (for Forge) and waits for the
JoinGame packet from the server.

This is an initial version: only vanilla Minecraft 1.12.2 was tested.
However this is the way Waterfall without entity rewriting does server
switches (which, in turn, is inherited from BungeeCord).

* Move to Gradle 5 and Error Prone.
2019-04-24 14:36:49 -04:00
Andrew Steinborn
c8e33eef60 Properly compare against MIN/MAX_VALUE 2019-04-23 13:52:03 -04:00
Leymooo
877532d3b8 fix brigadier on 1.14 2019-04-23 16:26:32 +03:00
Leymooo
ac192c281c 1.14-pre5 2019-04-18 22:45:17 +03:00
Andrew Steinborn
564cb99861 Add Player#getGameProfile() to make tab list plugins easier to make. 2019-03-29 15:01:52 -04:00
Andrew Steinborn
118574e535 Updated log4j and Checker Framework
Updating Checker Framework flagged numerous warnings, which have been
corrected. These probably involve type declarations lacking a nullness
annotation that appeared elsewhere.
2019-03-28 22:27:51 -04:00
Andrew Steinborn
9491f948f8 Upgraded Gradle Shadow plugin to 4.0.4 (last Gradle 4.x version) 2019-03-28 22:01:33 -04:00
Andrew Steinborn
611a31b7bb Attempt to allow Eclipse to import the Gradle project. 2019-03-28 21:46:45 -04:00
Andrew Steinborn
b369256400 Merge branch 'master' of https://github.com/creeper123123321/Velocity into creeper123123321-master 2019-03-24 13:57:26 -04:00
Andrew Steinborn
07b775d892 Notify on read-timeout instead of emitting exception 2019-03-17 19:44:22 -04:00
Andrew Steinborn
45574ce952 Remove connection pool for HTTP connections for now.
The upstream feature this relies on will be gone in Netty 5.x and there
is probably more benefit in using the connection's event loop to connect
to Mojang's authentication servers.
2019-03-10 23:40:18 -04:00
Andrew Steinborn
432d570474 Allow fallback to other server connections in the event of an exception.
Also removes some debugging code.
2019-03-10 14:11:24 -04:00
Hugo Manrique
8bb118022d
Fix implementation of #176
As @creeper123123321 noted on Discord, the javadoc specifies "Matches all {@link Player}s whose names start with the provided partial name.".

With the current implementation, if there were two online players named Notch and Notch2, only Notch would be returned as a singleton Collection. This PR fixes this behavior by removing the `exactMatch` code.
2019-03-09 21:02:41 +01:00
Andrew Steinborn
e2fa06fa17
Merge pull request #176 from Crypnotic/master
Add matchPlayer and matchServer
2019-03-09 00:15:07 -05:00
Andrew Steinborn
c7a379ebb8 Include server that we attempted to connect to in the result. 2019-03-08 23:51:47 -05:00
creeper123123321
30df2ad04b
Request read after setting auto-read to true 2019-03-08 08:48:03 -03:00
creeper123123321
b5d228028c
untested control handler 2019-03-08 08:33:28 -03:00
Andrew Steinborn
fa9d5f6499 Fire ProxyShutdownEvent _after_ the event manager thread pool shuts down
Fixes #177
2019-03-06 22:51:39 -05:00
Andrew Steinborn
5ccf22c5c4 Relax (i.e. remove all checks) on the hostname.
While validating this is a good idea, it causes too many issues in
practice. We will still clean the server address but no validation is
performed on the address.
2019-03-06 17:45:38 -05:00
Crypnotic
b35fd05d2e Add matchPlayer and matchServer 2019-03-03 09:57:19 -06:00
Andrew Steinborn
c8e3e7ff94 Initializing the handshake registry explicitly is redundant. 2019-02-20 21:19:04 -05:00
Andrew Steinborn
3c8055019e Actually use the correct time units for read timeouts. Fixes #174 2019-02-20 21:05:32 -05:00
Andrew Steinborn
c6dcba36c3 Fix another case where an in-flight connection would be retained. 2019-02-20 13:55:27 -05:00
Andrew Steinborn
1ec070069f Fix misplaced connection in flight reset. Fixes #173 2019-02-19 15:09:58 -05:00
Andrew Steinborn
6a8345e045 Forgot to include equals/hashCode on the object key 2019-02-16 16:20:50 -05:00
Andrew Steinborn
b3c87ef756 Remove an errant semicolon 2019-02-16 16:17:33 -05:00
Andrew Steinborn
f4a10e64e0 More proper host/SSL setup. See #172 2019-02-16 16:16:28 -05:00
Andrew Steinborn
332f931534 More accurate length setting 2019-02-15 17:48:36 -05:00
Andrew Steinborn
f042d214d3 Update copyright year in /velocity version 2019-02-15 16:09:37 -05:00
Andrew Steinborn
a0e1359557 Fix build 2019-02-15 16:07:19 -05:00
Andrew Steinborn
02a725035c Another round of improvements to tab complete. Fix fallback servers. 2019-02-15 16:03:15 -05:00
Andrew Steinborn
12f5bdfc48 Properly implement fallback support. 2019-02-15 15:07:38 -05:00
Slava Maspanov
c5fefd55ed register player connection only when switched to PLAY state (#169) 2019-01-29 16:17:07 -05:00
Andrew Steinborn
7d4d81fff1 Improve HandshakeSessionHandler#cleanVhost() 2019-01-28 00:34:51 -05:00
Andrew Steinborn
6eb6c99fa7 Simplify MinecraftConnection release logic. 2019-01-27 22:57:40 -05:00
Andrew Steinborn
56873712ec Use the player's event loop for their server connections.
This approach reduces context switching, giving us that much extra boost
in throughput.
2019-01-19 03:21:46 -05:00
Andrew Steinborn
865f9e5ef9 Bump the pool buffer size to 4MiB temporarily 2019-01-19 03:02:50 -05:00
Andrew Steinborn
e2f93c6ac6 Set Netty pooled buffer size to 2MiB 2019-01-19 02:48:11 -05:00
Andrew Steinborn
0b0fa0a352 Substantially-improved ancient server list ping support.
Velocity now flawlessly supports 1.6 and below server list pings along
with a notice to reconnect with a more modern version of Minecraft if
possible.
2019-01-19 01:07:30 -05:00
Andrew Steinborn
078d0ebc96 Fix bad Respawn packet ID, which broke 1.12.1 2019-01-19 00:09:18 -05:00
creeper123123321
7d6fa11a83
Don't use ByteBuf, fix varint with 0 ending 2019-01-13 08:57:54 -02:00
Andrew Steinborn
c7b6afe5b8 Fix merge checkstyle issues 2019-01-12 10:52:02 -05:00
xxDark
bc70c76aec Some fixes (#165) 2019-01-12 10:47:46 -05:00
Andrew Steinborn
564b87de1d Avoid ByteBuf#slice(). We can simply reset the reader index. 2019-01-12 00:25:11 -05:00
Andrew Steinborn
1a2b162353 Cleaner and more correct to use ByteBufs directly. 2019-01-11 18:32:03 -05:00
Andrew Steinborn
1e041963f0 Use just one byte array in the varint frame decoder. 2019-01-11 18:04:51 -05:00
Andrew Steinborn
f77384d32e Ensure that Velocity will always resolve DNS names for HTTP async. 2019-01-11 17:51:29 -05:00
Andrew Steinborn
2b7b33bd42 Reduce object allocations in MinecraftVarintFrameDecoder. 2019-01-11 17:46:57 -05:00
Andrew Steinborn
5dbe6aa808 Rename connection field in ConnectedPlayer.
This sounds stupid, but YourKit really casts its net wide when it tries
to instrument usages of JDBC. Velocity doesn't use JDBC, and yet if you
run Velocity with YourKit (even without profiling active) you pay a
significant cost.
2019-01-11 17:46:33 -05:00
Andrew Steinborn
e240dac55b No need to bring in Gson instance, when toString() does the same thing. 2019-01-06 08:47:29 -05:00
Andrew Steinborn
c30974a148 Clarifications in ProtocolUtils. 2019-01-05 14:55:01 -05:00
Andrew Steinborn
221ee510ff Minor cleanup. 2019-01-01 04:34:31 -05:00
Andrew Steinborn
0906a436e3 Fix bug with tab-completing names on 1.12 and lower. 2019-01-01 04:34:13 -05:00
Andrew Steinborn
696b6549e5 Stronger TLS settings.
Velocity will now validate the hostname and use TLSv1.2 only.
2018-12-30 11:13:58 -05:00
Andrew Steinborn
8588e7f1fe Optimize native handling further.
We now try to work within the boundaries given by the native. In the
case of Java natives, we work with byte arrays. With natives, always use
direct buffers.

However, the numbers do favor the natives, since they work with direct
byte buffers, without any copying. For the most part, this commit is
intended to improve the lives of Velocity users on Windows.
2018-12-30 06:16:04 -05:00
Andrew Steinborn
095a478440 Always ensure we don't pass a heap ByteBuf to the natives. 2018-12-30 04:53:47 -05:00
Andrew Steinborn
977d29ffa0 Fix Checkstyle errors 2018-12-30 03:58:50 -05:00
Andrew Steinborn
5bf936d1b9 Add unit tests 2018-12-30 03:57:05 -05:00
Andrew Steinborn
9ce4294e6e Fix forced hosts with SRV records. 2018-12-30 03:52:50 -05:00
Andrew Steinborn
abc5ef7f5e Full Checkstyle compliance at last. 2018-12-30 03:28:45 -05:00
Andrew Steinborn
20c3966f6f Make PluginDependencyUtils test more consistent. 2018-12-30 03:05:26 -05:00
Andrew Steinborn
89bcc9a100 Grab most of the low-hanging fruit. 2018-12-29 17:22:36 -05:00
Andrew Steinborn
f898b766f1 Fix resource pack sending on <= Minecraft 1.9.4 2018-12-29 16:41:58 -05:00
Andrew Steinborn
0ca0c2a297 Resource pack API 2018-12-29 15:21:47 -05:00
Andrew Steinborn
68fde1e795 Adapt System.(out|err) to log4j. 2018-12-29 13:30:50 -05:00
Andrew Steinborn
1113266823 Merge branch '1.13-tab-complete' 2018-12-29 12:27:26 -05:00
Andrew Steinborn
0cc8a2a14f Tab-completing arguments works now. 2018-12-29 12:24:10 -05:00
Andrew Steinborn
10c440af83 Consistently display disconnects. 2018-12-29 11:46:54 -05:00
Andrew Steinborn
5f3c31bc48 Fix Checkstyle issues. 2018-12-29 11:07:45 -05:00
Andrew Steinborn
76fc39660c Merge branch 'master' into 1.13-tab-complete 2018-12-29 11:01:41 -05:00
Andrew Steinborn
256978fc15 Solve a bunch of Checkstyle warnings. 2018-12-29 10:57:55 -05:00
Andrew Steinborn
21b20d5dc3 Obfuscate exceptions from user connection. 2018-12-29 10:13:38 -05:00
Andrew Steinborn
09fe7cee1e Include more of fastutil to allow us to use Object2IntLinkedOpenHashMap 2018-12-29 09:48:09 -05:00
Andrew Steinborn
2cedb457ce [WIP] Inject commands for Minecraft 1.13+ 2018-12-29 09:28:24 -05:00
Andrew Steinborn
b6944bbec2 Use EnumSet in StateRegistry.PacketRegistry. 2018-12-28 13:08:22 -05:00
Andrew Steinborn
9bbe25fc90 Improve efficiency of Java implementation of natives. 2018-12-28 13:02:46 -05:00
Andrew Steinborn
566a306d18 Clarity improvements. 2018-12-28 13:02:46 -05:00
Andrew Steinborn
3f7da5e416 Don't need to shade in checker-qual 2018-12-25 09:32:11 -05:00
Andrew Steinborn
e34d68e81a Resolve some warnings. 2018-12-25 01:47:36 -05:00
Andrew Steinborn
1c2235af5a Explicitly find and complain about BungeeCord and Bukkit plugins.
They aren't supported with Velocity and will never be.
2018-12-24 09:44:26 -05:00
Andrew Steinborn
4a872ffabe Add asynchronous DNS resolution. 2018-12-24 07:37:59 -05:00