SteamWar/Velocity
13
0
Fork 0
geforkt von Mirrors/Velocity
Code Issues Pull-Requests Aktivität
1.608 Commits 1 Branch 0 Tags 13 MiB
6eb2432e88
Commit graph

1073 Commits

Autor SHA1 Nachricht Datum
Hugo Manrique
d722422947
Only finish non-repeating tasks 2020-03-13 18:52:15 +01:00
Hugo Manrique
6ec6beedbd
Remove tasks from lookup map upon completion 2020-03-13 18:17:06 +01:00
Andrew Steinborn
ae7f0143de Do not trim the args for string-based command APIs 2020-02-28 16:54:46 -05:00
Andrew Steinborn
29bedf0943 Do not trim the args for string-based command APIs 2020-02-28 16:54:25 -05:00
Andrew Steinborn
65acb13dca Checkstyle 2020-02-21 18:51:41 -05:00
Andrew Steinborn
3e053d63b4 Allow ping passthrough for descriptions too 2020-02-21 18:36:10 -05:00
Andrew Steinborn
932f3bc2bf Merge branch 'dev/1.1.0' into decode-multiple 2020-02-17 20:52:19 -05:00
Andrew Steinborn
c63bd4cd02 Fix checkstyle error 2020-02-17 20:35:28 -05:00
Andrew Steinborn
8ae7945b9f Upon connection exception, discard all incoming packets instead 2020-02-17 19:34:22 -05:00
Andrew Steinborn
37994449d7 Fix regressions with plugin dependency loading from #272 
This is a quick and dirty fix because it's late. I'll need to
commit a better fix later.
 2020-02-16 03:19:13 -05:00
Andrew Steinborn
3b6f8e2421 Use more obvious/broken-down test cases for topological sort tests 2020-02-16 00:29:35 -05:00
Andrew Steinborn
5c6163d8cd Use more obvious/broken-down test cases for topological sort tests 2020-02-13 19:20:53 -05:00
Andrew Steinborn
e558b7ca1f Update to new bStats revision 2020-02-13 12:58:24 -05:00
Andrew Steinborn
29168ae549 Update to new bStats revision 2020-02-13 12:57:48 -05:00
Crypnotic
8fba9d7438 Add cleanServerName to VelocityConfiguration to remove quotes and other unforeseen characters from server names before registration 2020-02-09 13:40:15 -06:00
alexstaeding
da8cee2260
Make PluginContainer injectable (#272) 2020-02-07 16:22:47 -05:00
Andrew Steinborn
77526d9bf4
Merge pull request #266 from alex11441/dev/1.1.0 
Allow users to specify a reason in the shutdown command
 2020-01-24 16:01:23 -05:00
Andrew Steinborn
0c7a995767 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:44 -05:00
Andrew Steinborn
c7bac69290 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-24 01:22:32 -05:00
Andrew Steinborn
53c951bc52 Revert "Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content" 
This reverts commit 92571a65db.

It looks like c3fab89bd7 nabbed it at last.
 2020-01-24 01:21:50 -05:00
Andrew Steinborn
c3fab89bd7 Don't attempt to retain the buffer if it goes to a closed connection 2020-01-20 17:37:21 -05:00
Andrew Steinborn
92571a65db Another experiment for memory leaks: Create a brand-new buffer for passthrough uncompressed content 2020-01-14 22:18:05 -05:00
Andrew Steinborn
c14ceb315d Return the magic-3 loop again... :( 2020-01-01 10:14:15 -05:00
Andrew Steinborn
a15c8ecc2b Merge branch 'dev/1.1.0' into decode-multiple 2019-12-31 21:43:11 -05:00
Andrew Steinborn
08df080771 Try to diagnose memory leak 2019-12-31 21:43:02 -05:00
Alex
9f340347b6 Allow users to specify a reason in the shutdown command 2019-12-30 23:20:55 -07:00
Alex
941800ce96 Add VelocityServer#shutdown(boolean, TextComponent) 2019-12-30 23:20:25 -07:00
Andrew Steinborn
fb0446f4fc Add DisconnectEvent#disconnectedDuringLogin() 2019-12-24 23:56:39 -05:00
Andrew Steinborn
deede70070 Rename mystery field in JoinGame 2019-12-17 13:57:48 -05:00
Andrew Steinborn
c3068ea26b Rename mystery field in JoinGame 2019-12-14 17:45:54 -05:00
Andrew Steinborn
fa489f6014 Rename mystery field in JoinGame 2019-12-14 17:45:10 -05:00
Andrew Steinborn
b56302b17e Minecraft 1.15 (backport from 1.1.0) 2019-12-10 12:22:24 -05:00
Andrew Steinborn
97da6753b5 Merge branch 'dev/1.1.0' into decode-multiple 2019-12-06 03:10:25 -05:00
Andrew Steinborn
8c3f7e2ecc Optimize DNS resolution logic for AsyncHttpClient 2019-12-01 15:17:17 -05:00
Andrew Steinborn
75359256b3 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:27:27 -05:00
Andrew Steinborn
e06e2e4cf9 Introduce velocity.natives-tmpdir property for properly handling noexec /tmp 2019-11-29 14:26:59 -05:00
Andrew Steinborn
667610c251 Fix command block tab complete on <=1.12.2 2019-11-28 15:28:02 -05:00
Andrew Steinborn
d137d6ce46 Fix command block tab complete on <=1.12.2 2019-11-28 15:22:26 -05:00
Andrew Steinborn
d1acd5b6d5 Merge branch 'dev/1.1.0' into decode-multiple 2019-11-28 13:23:46 -05:00
Andrew Steinborn
50b50f3cbb Fix 1.13+ tab complete for server commands 2019-11-28 13:12:53 -05:00
Andrew Steinborn
ae82bb21af Merge branch 'dev/1.1.0' into decode-multiple 2019-11-27 01:09:21 -05:00
Andrew Steinborn
68e5372b2e QuietException should be a RuntimeException 2019-11-27 01:04:48 -05:00
Andrew Steinborn
467fe34da3 Provide useful information for "unexpectedly disconnected from server" 
Fixes #233
 2019-11-27 01:01:50 -05:00
Andrew Steinborn
0c14eabe6b Fix Checkstyle issues 2019-11-26 16:32:50 -05:00
Andrew Steinborn
87ad188f92 Finalize integrated BungeeQuack 2019-11-26 16:27:30 -05:00
Andrew Steinborn
b08f27b5c4 Merge branch 'dev/1.1.0' into bungeequack-integrate 2019-11-26 15:52:53 -05:00
Andrew Steinborn
0b6fc06e67 Initial 1.15-pre2 support 2019-11-26 15:10:22 -05:00
Andrew Steinborn
bfeca40b17 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:08:16 -05:00
Andrew Steinborn
2baa162d91 Make sure we only tab-complete commands for which we have access to 2019-11-26 14:07:55 -05:00
Andrew Steinborn
893391202b Manually backport e29e20b from Velocity 1.1.0 2019-11-26 13:47:58 -05:00
Andrew Steinborn
e29e20b1e8 Fix 1.13+ tab-complete with command but no arguments 
As a nice side-effect, this simplifies the tab complete code
a bit.
 2019-11-26 13:44:21 -05:00
Andrew Steinborn
ae14eb8ccb Fix potential UDP speculative reflection attack 2019-11-23 01:07:29 -05:00
Andrew Steinborn
da63406ee7 Fix potential UDP speculative reflection attack 2019-11-23 01:06:00 -05:00
Andrew Steinborn
8725178d6d Flush queued packets to the client in case we can't write 2019-11-17 14:52:12 -05:00
Andrew Steinborn
3eeea8e8f8 Add limited flush consolidation, if the remote server supports it. 2019-11-17 11:14:56 -05:00
Andrew Steinborn
d2b8271eb4 Allow running Velocity without any servers. 
This is a niche setup, however if your network is 100% dynamically configured, this is a handy feature to have available.

To support this functionality, a new PlayerChooseInitialServerEvent event was added to allow the initial server to connect to be changed as desired.
 2019-11-16 23:17:09 -05:00
Andrew Steinborn
e12f970684 Fix fresh 1.1.0 velocity.toml generation. 2019-11-16 22:34:30 -05:00
Andrew Steinborn
010a10f50f Do not try to prevent people from running Velocity behind Velocity. 
This commit absolutely does not change our support policy on this: this
is a completely unsupported setup. In any event, there is an existing
forwarding check in Velocity that covers this case quite well.

I am making this change to make the login process less "chatty" for
higher-latency links and 1.13+ servers.
 2019-11-15 01:35:44 -05:00
Andrew Steinborn
ba8629ca0e Try to decode multiple packets at once 2019-11-15 00:39:11 -05:00
Andrew Steinborn
d333eb30b8 Always create the length buffer using the best possible native buffer 2019-11-09 22:07:54 -05:00
Andrew Steinborn
8c98f5a4a6 Simplify and harden Netty handlers 2019-11-05 20:07:47 -05:00
Andrew Steinborn
09d33de03e
Merge pull request #256 from Gabik21/previous-server-in-event 
Add previous server to ServerConnectedEvent
 2019-10-31 19:51:32 -04:00
Gabik21
7c0a402cca
Add previous server to ServerConnectedEvent 2019-10-28 14:45:13 +01:00
Andrew Steinborn
3f321a5219 Indicate plugin loads 2019-10-26 21:10:38 -04:00
Andrew Steinborn
9d5930d96b Integrate BungeeQuack functionality into Velocity 2019-10-20 00:58:55 -04:00
Andrew Steinborn
19e1e05bbc Bring back kqueue transport from the dead 
My PR to AsyncHttpClient was accepted and 2.10.4 was released with it
included.
 2019-10-20 00:27:31 -04:00
Andrew Steinborn
6ff5cac4d3 Fix issues with decoding and Java fallback native 2019-10-19 23:56:44 -04:00
Joe Hirschfeld
a16684564b Make AES crypto operations use one buffer 
All AES implementations being used are 'copy safe', where the source and
destination arrays may be the same. Lets save ourself a copy and reap
the performance wins!
 2019-10-19 19:55:02 -07:00
james58899
bd35c6835e
Allow set redirect message 2019-10-17 08:32:50 +08:00
Andrew Steinborn
7747679ee1 Implement optimized compression for Java 11+ 
Using the fact that the Java Deflater/Inflater API now supports
ByteBuffers as of Java 11, we can provide performance benefits equivalent
to the Velocity 1.0.x native compression on servers running Java 11+ on
non-macOS and non-Linux platforms (such as Windows).
 2019-10-04 17:08:14 -04:00
Andrew Steinborn
39e48c9467 Implement #149 to send just one respawn packet 2019-09-28 00:29:51 -04:00
Andrew Steinborn
62cd2c661a Clean up HandshakeSessionHandler 2019-09-27 22:39:16 -04:00
Andrew Steinborn
17e6944dae Clean up HandshakeSessionHandler 2019-09-27 22:37:42 -04:00
Andrew Steinborn
546307b0d6 Suppress invalid protocol spam 2019-09-27 22:24:21 -04:00
Andrew Steinborn
1824c7ad7e Suppress invalid protocol spam 2019-09-27 22:23:40 -04:00
Andrew Steinborn
9b570ff599 Revert this entirely for now. 2019-09-17 09:38:12 -04:00
Andrew Steinborn
8dea7567d8 Correctly handle 0-length packet 2019-09-17 09:33:43 -04:00
Andrew Steinborn
009c9afe09 Decode multiple VarInt-prefixed packets 
If the remote server does flush consolidation, Velocity will be able to
frame the packets all at once instead of having to constantly decode
packets. This should provide a modest performance boost for them whilst
not impacting un-optimized servers.
 2019-09-16 20:01:38 -04:00
Andrew Steinborn
138a887d73 Fix "all" not appearing in the tab-complete for /server 2019-09-15 19:55:04 -04:00
Andrew Steinborn
aff06164cd Fix "all" not appearing in the tab-complete for /server 2019-09-15 19:54:33 -04:00
Andrew Steinborn
9c9fa1c5ae Remove flush consolidation for now 
This is still highly experimental
 2019-09-09 00:47:42 -04:00
Andrew Steinborn
63dcc56735 Also sort servers for /glist all 2019-09-07 17:09:36 -04:00
Andrew Steinborn
08173c50ef Refactor and improve ServerCommand 
The code has been cleaned up and reorganized. As a small quality of life
change, the server names are now sorted in alphabetical order.
 2019-09-07 17:06:10 -04:00
Andrew Steinborn
983f3012a6 Merge branch 'dev/1.1.0' into feature/flush-consolidation-v2 2019-09-07 00:34:08 -04:00
Andrew Steinborn
ecfb14411d Merge remote-tracking branch 'origin/dev/1.1.0' into dev/1.1.0 2019-09-07 00:15:34 -04:00
Andrew Steinborn
35856fec04 Merge branch 'dev/1.1.0' into natives-java-improvements 
# Conflicts:
#	native/src/main/java/com/velocitypowered/natives/encryption/JavaVelocityCipher.java
 2019-09-07 00:06:13 -04:00
Gabik21
aef0f2ca8c
Fix name mapping not being cleared on switch 
This fixes a bug where tablist would be messed up for 1.7 clients due to
an internal misconception.
 2019-09-05 12:17:19 +02:00
Leymooo
fd367c6efd Add method to determine if player is in OnlineMode 2019-09-04 01:44:40 +03:00
Gabik21
592517b9f3
Remove unnessecary diff 2019-08-29 19:58:00 +02:00
Gabik21
18a56d8b1d
Merge remote-tracking branch 'upstream/dev/1.1.0' 2019-08-29 19:47:04 +02:00
Andrew Steinborn
dbfbd1e2a9 Rename ConnectedPlayer#minecraftConnection -> ConnectedPlayer#connection 
This is consistent with VelocityServerConnection
 2019-08-17 20:17:12 -04:00
Gabik21
ca81b05551
Remove no longer used imports 2019-08-16 11:50:49 +02:00
Andrew Steinborn
b3ca066a17 Lower write water mark to 1MB 2019-08-10 14:08:45 -04:00
Andrew Steinborn
7cb86067bc Lower the explicit flush count 
Initial testing suggests this makes flush consolidation stable, although
the CPU usage will be increased as we are more aggressive in flushing
messages to the channels.
 2019-08-08 18:39:22 -04:00
Andrew Steinborn
ca3426033f Revert "Revert "Merge branch 'feature/flush-consolidation' into dev/1.1.0"" 
This reverts commit e476ee815a.
 2019-08-08 18:00:52 -04:00
Andrew Steinborn
c64d16326c Fix bug where connect() wouldn't reset in-flight connections 2019-08-08 17:22:55 -04:00
Andrew Steinborn
648c149872 Fix bug where connect() wouldn't reset in-flight connections 2019-08-08 17:22:38 -04:00
Andrew Steinborn
e476ee815a Revert "Merge branch 'feature/flush-consolidation' into dev/1.1.0" 
This reverts commit f72f50819d, reversing
changes made to 3b9db94ce9.
 2019-08-08 08:22:37 -04:00
Andrew Steinborn
f72f50819d Merge branch 'feature/flush-consolidation' into dev/1.1.0 2019-08-07 21:17:52 -04:00
Andrew Steinborn
3b9db94ce9 Explicitly parse IP addresses before using an unresolved address 
This allows plugins to more correctly use InetSocketAddress#getAddress(),
however "gotchas" remain.
 2019-08-07 16:22:07 -04:00
Andrew Steinborn
7c2cbdbf1f Explicitly parse IP addresses before using an unresolved address 
This allows plugins to more correctly use InetSocketAddress#getAddress(),
however "gotchas" remain.
 2019-08-07 16:21:15 -04:00
Andrew Steinborn
32ef77f954 Flush consolidation tweaks 2019-08-07 16:04:34 -04:00
Andrew Steinborn
195a506117 Flush consolidation 2019-08-07 15:02:48 -04:00
Andrew Steinborn
2c3b30fff2
Merge pull request #240 from VelocityPowered/feature/ping-passthrough 
Ping passthrough
 2019-08-07 12:21:50 -04:00
Andrew Steinborn
e3c75a7fcc Silence TCP_FASTOPEN warnings when not using epoll and fast open enabled 2019-08-06 06:43:27 -04:00
Andrew Steinborn
62c6adb204 Consider forced hosts in ping passthrough 2019-08-06 03:26:55 -04:00
Andrew Steinborn
d8fb7c11e7 Clean up slightly, don't use streams 2019-08-06 03:16:24 -04:00
Andrew Steinborn
ca9a4492c4 Add support for ping pass-through 
By default, ping pass-through is not enabled. However, you can use
ping passthrough to pass through just mods (great for modded servers)
or everything.
 2019-08-06 02:06:53 -04:00
Andrew Steinborn
9f3d1a2390 Fix Checkstyle, again 2019-08-05 11:01:18 -04:00
Andrew Steinborn
b4e62443c9 Add arbitrary chat tab complete event. Fixes #236 2019-08-05 10:30:55 -04:00
Andrew Steinborn
19cec571d0 Clean up some junk 2019-08-05 09:53:18 -04:00
Andrew Steinborn
4940f6b447 Allow certain mangled large packets to pass through 2019-07-30 17:11:26 -04:00
Andrew Steinborn
7db757cd04 Allow certain mangled large packets to pass through 2019-07-30 17:10:10 -04:00
Andrew Steinborn
121ab41d96 Introduce TCP_FASTOPEN support 
For best results, use Linux 4.11+ and a server modified to set the
TCP_FASTOPEN flag.

This should in particular benefit users of legacy forwarding.
 2019-07-29 17:32:56 -04:00
Andrew Steinborn
0acb1ed7d4 Send disconnect message on getting kicked from the server 2019-07-29 14:27:40 -04:00
Andrew Steinborn
03c9729e63 Don't disconnect the player if the connection unexpectedly closes 2019-07-29 14:19:21 -04:00
Andrew Steinborn
04efd16a83 Avoid a memory copy in creating modern-style forwarding data 2019-07-29 06:04:37 -04:00
Andrew Steinborn
1da51b8ffb Batch handshake and server login/ping packets 2019-07-29 05:25:29 -04:00
Andrew Steinborn
d65e371038 Fix up the Travis build... 2019-07-29 00:24:57 -04:00
Andrew Steinborn
ead8a21362 Most proper clean way of using a DnsAddressResolverGroup with AHC 
Let us never speak of this again.
 2019-07-29 00:19:15 -04:00
Andrew Steinborn
bf035bce73 Properly use non-blocking DNS in AsyncHttpClient 2019-07-28 23:40:23 -04:00
Andrew Steinborn
454b3c9bee Add flag to disable native transports 2019-07-26 01:34:21 -04:00
Andrew Steinborn
d1736bf94c Move from custom HTTP client to Async HTTP Client 
The most significant advantage is that Velocity gets a well-tested
HTTP client implementation which also includes a connection pool,
allowing us to avoid the overhead of TCP and TLS handshakes upon each
login.

Unfortunately, Async HTTP Client does not work with the kqueue transport.
Since almost nobody runs a production Velocity server on macOS, we have
decided to remove kqueue support. The benefits that Async HTTP Client
provides outweigh the disadvantages of not having a macOS native transport.
macOS is adequately supported by the normal NIO transport.
 2019-07-26 01:29:51 -04:00
Minecrell
fde5ec36e7 Update TerminalConsoleAppender to 1.2.0 
Add log4j.skipJansi to prevent Log4j from initializing a Jansi
terminal. It is redundant because this is handled by TCA and it
will be only active for a few seconds until TCA is loaded.
 2019-07-21 16:51:08 +02:00
Andrew Steinborn
2b5b14e4ec Switch to new TCA version and jansi 2019-07-20 14:25:47 -04:00
Andrew Steinborn
6d5bacb262 Minor Netty cleanup 2019-07-20 00:30:44 -04:00
Andrew Steinborn
85e5fb4827 Allow existing players to be kicked from server if in online-mode 
Fixes #226
 2019-07-19 13:25:04 -04:00
Andrew Steinborn
58b52cce0c Add flag to disable native transports 2019-07-12 14:32:37 -04:00
Andrew Steinborn
40c8343494 Help smoke out some internal concurrency issues 2019-07-08 21:28:18 -04:00
Gabik21
3a1b5099c9
Merge branch 'dev/1.1.0' of github.com:VelocityPowered/Velocity 2019-07-06 01:08:21 +02:00
Andrew Steinborn
2671590ad2 Clean up LoginPluginResponse and use DeferredByteBufHolder too 2019-07-05 12:53:17 -04:00
Gabik21
d0ad0fac36
Merge branch 'dev/1.1.0' of github.com:VelocityPowered/Velocity 2019-07-05 10:59:29 +02:00
Seppe Volkaerts
145dfa8ac6 Wait for player disconnect events on shutdown. (#229) 2019-07-05 00:54:23 -04:00
Andrew Steinborn
8bf9e0e829 Improve backwards-compatibility with 1.0.x due to RawCommand changes 2019-07-04 23:53:04 -04:00
Seppe Volkaerts
6d2e1bf379 Wait for player disconnect events on shutdown. (#229) 2019-07-04 23:49:40 -04:00
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
5b518eaf20 Remove kqueue bug workaround since the issue is now fixed upstream 
See https://github.com/netty/netty/pull/9149
 2019-07-02 02:37:15 -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
Andrew Steinborn
e71bac2028 Fix ProtocolUtil#readString() to respect Unicode. 
This brings Velocity's to conformance to what Mojang does in
PacketDataSerializer.
 2018-12-24 05:25:58 -05:00
Andrew Steinborn
267d306569 Remove all uses of (mark|reset)ReaderIndex() 
This is removed in Netty 5.x: netty/netty#8636
 2018-12-23 23:30:26 -05:00
Andrew Steinborn
11daaa986a Add readable checks. 2018-12-23 18:50:02 -05:00
Andrew Steinborn
3a87e47796 Remove validation check since these usernames exist anyway. 2018-12-17 15:35:14 -05:00
Andrew Steinborn
5be64565e9 Print exception in task 2018-12-16 13:41:23 -05:00
Andrew Steinborn
ca915a44a9 Bump write mark, to see if it improves #152 2018-12-15 21:13:52 -05:00
Andrew Steinborn
4b5664ec91 Remove redundant check. 2018-12-14 15:09:52 -05:00
Andrew Steinborn
2884c2ea90 Strictly validate usernames for online mode. 2018-12-14 15:04:21 -05:00
Andrew Steinborn
10293aa542 Fix login with IPv6 and other potential security issues 2018-12-14 14:41:46 -05:00
Andrew Steinborn
9a15a80627
Merge pull request #161 from VelocityPowered/anonymize-user-disconnect-messages 
Anonymize all exception/connection-related errors from the user.
 2018-12-14 13:11:51 -05:00
Andrew Steinborn
cc5a7dba9b Clean up PluginDependencyUtilsTest 2018-12-14 01:47:43 -05:00
Andrew Steinborn
2d54a2c15b Record circular dependencies 2018-12-13 19:44:25 -05:00
Andrew Steinborn
da12008736 Fix more formatting issues. 2018-12-13 04:53:45 -05:00
Andrew Steinborn
0100cdd244 More comment on the plugin dependency stuff. 2018-12-13 04:50:08 -05:00
Andrew Steinborn
fc76a027de Rewrite dependency plugin resolving. 
Velocity now resolves plugin dependencies using a depth-first search
(DFS), instead of using Kahn's algorithm like before. This properly handles duplicate indirect dependencies.

Thanks to @creeper123123321 for noticing this issue!
 2018-12-13 04:06:43 -05:00
Andrew Steinborn
f9843057ba Anonymize all exception/connection-related errors from the user. 
We still print these out in the logs.
 2018-12-11 01:50:29 -05:00
Andrew Steinborn
ce6b061b79 Make Velocity's server list ping behavior more conformant. 
This fixes pinging with 1.7.x and with certain ping libraries that send
the -1 protocol version.
 2018-12-07 17:24:41 -05:00
Luck
6ff9180987
Remove redundant extra lambda in EventManager#fire implementation 2018-12-04 00:03:47 +00:00
Luck
3d3d6adf04
Remove redundant null check in VelocityMethodScanner 2018-12-03 23:55:39 +00:00
Luck
cfae542dd2
Slightly optimize SimpleEventBus usage in VelocityEventManager 2018-12-03 23:53:50 +00:00
Luck
43da3d4541
Allow the same EventHandler to be registered with different PostOrders 
The #equals implementations in KyoriToVelocityHandler silently prevented this previously.
 2018-12-03 23:53:06 +00:00
Andrew Steinborn
5b9a8f160b Fallback to plugin ID. 2018-12-02 01:59:46 -05:00
Andrew Steinborn
65ca41cdb5 Warn when using Guava Subscribe annotation. 
Additionally, registration of listeners will not be fatal if an
exception was thrown.
 2018-12-02 01:58:21 -05:00
Andrew Steinborn
a3bfa292c6
Merge pull request #139 from VelocityPowered/reload-command 
Reload command
 2018-12-01 18:04:09 -05:00
Andrew Steinborn
bb01dc9edf Revert "Revert "Refactor Forge support to track the handshake & include keepalives"" 
This reverts commit dc67ee99ed.
 2018-12-01 17:11:41 -05:00
Andrew Steinborn
a9ae53e527 Introduce ConsoleCommandSource. See #155 2018-12-01 17:08:34 -05:00
Andrew Steinborn
dc67ee99ed
Revert "Refactor Forge support to track the handshake & include keepalives" 2018-12-01 14:04:14 -05:00
Andrew Steinborn
ed4994a792
Merge pull request #136 from dualspiral/forge-handshake 
Refactor Forge support to track the handshake & include keepalives
 2018-12-01 14:03:16 -05:00
Andrew Steinborn
6e37fa5f33 When handling TabCompleteResponse, check if we have a command. 
Fixes #154
 2018-11-30 19:14:51 -05:00
Andrew Steinborn
d3d683dfc0 Document velocity.toml more carefully. 2018-11-30 16:17:36 -05:00
Daniel Naylor
9260d1071a Fix from API breakage 2018-11-25 10:30:14 +00:00
Daniel Naylor
a4852d7264 Silly me... 2018-11-25 10:19:46 +00:00
Daniel Naylor
2b49bb96bf This goes here 2018-11-25 10:19:46 +00:00
Daniel Naylor
9bab6b8c8e Update for master changes and comments 2018-11-25 10:19:46 +00:00
Daniel Naylor
3adf36f712 Fix comments. We still seem to have a plugin message coming though on login, 
can't see why...
 2018-11-25 10:19:46 +00:00
Daniel Naylor
8716e09d21 Don't use a magic string 2018-11-25 10:19:16 +00:00
Daniel Naylor
ccd37e5b9c Track the forge handshake and re-engineer Forge support 
The system is now organised into connection types and phases. Most of the core Velocity logic is now isolated from the Forge logic to allow for simpler maintainance and to try to support future loaders (Forge 1.13?) in a cleaner fashion.

There are a couple of points where Forge specific calls are in the main body, but these have been minimised.

Also send keepalives from Velocity to during backend server switch and after Forge handshake, to try to help Forge clients
 2018-11-25 10:18:48 +00:00
Andrew Steinborn
8f859b980c
Merge pull request #135 from Crypnotic/protocol-constants-rework 
Expose ProtocolConstants to the API
 2018-11-25 01:27:17 -05:00
Andrew Steinborn
5eeca16f7e Apply final modifier 2018-11-24 21:42:08 -05:00
Andrew Steinborn
a083dfd3a4 Merge branch 'master' into reload-command 
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/VelocityServer.java
 2018-11-24 21:41:12 -05:00
Andrew Steinborn
9a9b6f9ab3 Rename ConnectionManager#shutdown(ISA) -> ConnectionManager#close(ISA) 2018-11-24 21:38:26 -05:00
Andrew Steinborn
bb4945b513 Fix awkward disconnection issues. 2018-11-24 20:12:29 -05:00
js6pak
97725ed906
Fix GS4 k, v section 
Add "plugins" key before plugins list
 2018-11-24 22:36:03 +01:00
Andrew Steinborn
d9be210fe3 Fix this up 2018-11-23 18:54:53 -05:00
Andrew Steinborn
436c1624bc Make sure to mark the in-flight connection. 2018-11-23 18:42:14 -05:00
Andrew Steinborn
e2ad6b740a Do not allow connections till JoinGame is received. 2018-11-23 18:42:14 -05:00
Andrew Steinborn
81d8c8374e Fix up Checkstyle styles from PR 2018-11-23 03:23:45 -05:00
Andrew Steinborn
38f460d56c
Merge pull request #141 from VelocityPowered/options 
Allow specifying bind port via command line
 2018-11-23 03:19:03 -05:00
Andrew Steinborn
40e7ef784f Enhance /velocity command. Closes #145 2018-11-22 19:29:02 -05:00
kashike
960f2cf890
Merge pull request #147 from LartyHD/Bug-Fix-#146 
Bug Fix #146
 2018-11-22 16:04:32 -08:00
Lars Artmann
f241023282
Bug Fix #146 2018-11-22 22:51:19 +01:00
Lars Artmann
9dad1a7020
Removed a unnecessary check 
In "hasPermission" is the removed check already included
 2018-11-22 05:54:05 +01:00
Andrew Steinborn
1515c5069b Fix up some stuff 2018-11-21 23:36:47 -05:00
Andrew Steinborn
904e1367a2 Must count down here. 2018-11-21 16:01:58 -05:00
Andrew Steinborn
402398010e Handle changing server addresses in config (not tested). 2018-11-21 15:57:21 -05:00
kashike
7da847bfac Allow specifying bind port via command line 
adds #140
 2018-11-20 21:56:34 -08:00
Andrew Steinborn
01503be4fa Handle switching bind (MC and GS4). 2018-11-20 22:30:52 -05:00
Crypnotic
6b4c809c39 Rework and expose ProtocolVersion to the API 2018-11-20 17:15:48 -06:00
Andrew Steinborn
0d94080c74 Remove unneeded null checks 2018-11-20 12:23:28 -05:00
Andrew Steinborn
8685b04772 Initial reload command support. 
What is missing:
- Changing/removing servers "in-flight"
- Query stuff
- A way to preserve existing user connections while closing the old port
 2018-11-19 23:46:22 -05:00
Andrew Steinborn
74ee716480 Revert "If we failed to unregister, don't fire the disconnect event" 
This reverts commit 5822cc31d8.
 2018-11-17 17:25:49 -05:00
Andrew Steinborn
5822cc31d8 If we failed to unregister, don't fire the disconnect event 2018-11-17 17:03:31 -05:00
Andrew Steinborn
d1473ed938 Move registration to be performed earlier. 2018-11-17 00:04:44 -05:00
Andrew Steinborn
866067bbed Further cleanup. 2018-11-15 20:49:30 -05:00
Andrew Steinborn
480f87a760 API breakage: Revamped some login stuff. 
I have cleaned up some logic in the client login session handler and
revamped the GameProfile class somewhat. The most notable breaking
change is that Velocity now returns an UUID for getId() instead of an
undashed UUID, which was moved to a getUndashedId() method.
 2018-11-15 19:54:55 -05:00
Andrew Steinborn
868976e09c Add Javadoc and remove all Checkstyle issues from API and natives. 2018-11-15 19:04:39 -05:00
Andrew Steinborn
a4cdc4884a
Merge pull request #132 from Yeregorix/master 
Optimize GameProfile
 2018-11-15 18:34:58 -05:00
Yeregorix
3cba196ba7 Remove Identifiable 2018-11-15 17:02:26 +01:00
Andrew Steinborn
17a5afcc9a Fix up some checkstyle stuff and include vendor in brand. 2018-11-15 02:36:48 -05:00
Andrew Steinborn
66f47ecff1 Filter out subcommands in /velocity that users can't access. 2018-11-15 02:17:59 -05:00
Andrew Steinborn
2b0daa2122 Explicitly exit the proxy if required. 2018-11-14 01:07:34 -05:00
Andrew Steinborn
5e0b9d09e7 Fix ServerPreConnectEvent not allowing overriding of servers. 2018-11-14 00:55:20 -05:00
Andrew Steinborn
6354f10874 Correct technical typo. 2018-11-14 00:29:51 -05:00
Yeregorix
da259951c7 Change 'set' prefixes to 'with' and add javadoc 2018-11-12 21:34:57 +01:00
Yeregorix
b6bb4ad1a1 Optimize GameProfile and add Identifiable interface 2018-11-12 19:50:52 +01:00
Andrew Steinborn
c94794a845 Properly register client channels. 2018-11-10 23:20:33 -05:00
Andrew Steinborn
762d9a3efb Fix plugin message forwarding from server to client. 2018-11-07 01:28:24 -05:00
Andrew Steinborn
73e3e1752a Plural. 2018-11-04 10:45:55 -05:00
Andrew Steinborn
70726bd07b Add /velocity plugins command. 2018-11-04 03:44:07 -05:00
Andrew Steinborn
a378ccdee0 Refactored rate-limiting. 
If rate-limiting is disabled, we now use a simple stub implementation
that is simpler to reason with.
 2018-11-03 17:36:00 -04:00
Andrew Steinborn
89e51bbcb9 Fix up some more code style issues. 2018-11-03 01:54:26 -04:00
Andrew Steinborn
e2389d96e9 Include implementation in the user-agent. 2018-11-03 01:39:28 -04:00
Andrew Steinborn
f423169449 Fix issues with server connections. 2018-10-29 19:25:51 -04:00
Andrew Steinborn
2b53d14461 Simplify and fix bug in setConnectedServer() 
Also, while I'm here, fix a typo from a recent PR.
 2018-10-29 02:58:29 -04:00
Andrew Steinborn
826eddc754 Disconnect obsolete server connections as quickly as possible. 2018-10-28 23:00:26 -04:00
Mark Vainomaa
e0330e9f27
Move and rename key escaping methods while I'm here 2018-10-28 18:18:44 +02:00
Mark Vainomaa
0c86f02c49
Save configuration after loading to ensure new options being present in file 
For example if you had `[forced-hosts]` section missing, and `[servers]`
section not having entries similar to default forced hosts ones, then
new configuration would fail at validation and new options wouldn't be
saved to file at all.
 2018-10-28 18:15:34 +02:00
Andrew Steinborn
070631902a Fix some suboptimal behavior in invoking KickedFromServerEvent. 
Previously, the event would only fire when a player was kicked from the
current server they were on. Now, under certain cases, it can be fired
even if the player was already connected to a server.

To faciliate this, a new result (Notify) was introduced. This result
will "do the right thing" if the player is kicked from the current
server or is trying to connect to a different server than the one they
were on.
 2018-10-28 03:32:18 -04:00
Andrew Steinborn
1310cd2c53 Mix of Checkstyle and SonarLint. 2018-10-28 03:18:15 -04:00
Andrew Steinborn
9806d57a13 More Checkstyle. 2018-10-28 02:36:03 -04:00
Andrew Steinborn
64380de497 Fix startup. 2018-10-28 01:45:20 -04:00
Andrew Steinborn
65ff9ebb39 Tiny legacy player info forwarding forwarding micro-optimization. 2018-10-28 01:10:23 -04:00
Andrew Steinborn
8a9d1b1ac9 Fixed even more Checkstyle issues, this time in the proxy components. 2018-10-28 01:02:54 -04:00
Andrew Steinborn
25b5e00125 Reformat with Google code style and enforce Checkstyle. 
Fixes #125
 2018-10-27 23:45:36 -04:00
Andrew Steinborn
53aa92db92 Fix some low-hanging code smells using SonarLint. 2018-10-27 22:18:30 -04:00
Andrew Steinborn
32829c5637
Checker Framework integration (#126) 2018-10-27 21:45:42 -04:00
Mark Vainomaa
25f6ca410c
Make servers list option more readable 2018-10-27 22:54:10 +03:00
Mark Vainomaa
2b4b77ef95
Fix missing constructor parameter and not loading show-plugins option from configuration 2018-10-27 22:52:04 +03:00
Mark Vainomaa
b86622b849
Improve comments 2018-10-27 22:50:05 +03:00
Mark Vainomaa
1e0ec8ad66
Better description, make class abstract 2018-10-27 22:49:38 +03:00
Mark Vainomaa
85e43727cf
Improve code style, grammar and other fixes 2018-10-27 22:49:37 +03:00
Mark Vainomaa
fdc83261cb
Add missing constructor parameter 2018-10-27 22:48:18 +03:00
Mark Vainomaa
793477b898
Improve code style 2018-10-27 22:48:18 +03:00
Mark Vainomaa
ff6a6ad40b
Add native forced hosts support 2018-10-27 22:36:52 +03:00
Mark Vainomaa
447e7d1d50
Adapt to upcoming Checker framework related changes 2018-10-27 21:38:20 +03:00
Mark Vainomaa
ea43b8ff60
Add Query event 2018-10-27 19:57:48 +03:00
Andrew Steinborn
a0e24ca247 Remove redundant ternary here. 2018-10-25 02:09:35 -04:00
Andrew Steinborn
3f612fb5c2 Update /velocity version so implementation stuff can be changed. 2018-10-25 01:56:41 -04:00
Andrew Steinborn
c977ddec61 Introduce a "modular" /velocity command. 2018-10-25 01:43:11 -04:00
Andrew Steinborn
a98fcc28fe Fix up console tab-completion again. 2018-10-25 01:42:57 -04:00
creeper123123321
782a10f36d
Separate protocol version for new proxy <-> server connections 2018-10-23 16:07:42 -03:00
Andrew Steinborn
bcf7761380 Disable auto-read temporarily as well 2018-10-23 13:51:33 -04:00
Andrew Steinborn
174cd4659b Fire ServerConnectedEvent and delay setting the server. 
For ViaVersion
 2018-10-23 13:49:50 -04:00
Andrew Steinborn
fcef623847 Respect server protocol version when writing packets to the server. 
Needed for ViaVersion.
 2018-10-23 13:06:54 -04:00
Leymooo
35736d7a94 1.13.2 2018-10-22 17:22:28 +03:00
Andrew Steinborn
f6cac0f50a Relax registration checks for same servers somewhat. 
If a server with the same ServerInfo is attempting to be re-registered,
we will return the existing registered server, which is less surprising
behavior than before.
 2018-10-21 20:03:38 -04:00
Andrew Steinborn
3bd48dec99 Add convenience connectWithIndication() method. 2018-10-21 17:49:51 -04:00
Andrew Steinborn
8d97e98920 Fix forwarding secrets being reset to default 2018-10-20 13:47:37 -04:00
Andrew Steinborn
a6e57f89aa Fix #117 2018-10-18 21:16:20 -04:00
Andrew Steinborn
19956a2ed7 Include forwarding version in modern forwarding 
This is currently version 1.
 2018-10-18 14:42:10 -04:00
Andrew Steinborn
d3b1bc9e34 Remove debug code that accidentally slipped in. 2018-10-15 21:29:33 -04:00
Andrew Steinborn
8ec273050b Remove redundant obsolete connection-checking code. 2018-10-15 17:06:37 -04:00
Andrew Steinborn
8eb7ecba83 Actually populate ForgeConstants 2018-10-15 17:02:19 -04:00
Andrew Steinborn
51c402e3d3 Create a specific Forge-related package 2018-10-15 17:01:18 -04:00
Andrew Steinborn
b7d7e3cc89 Switch forwarding mode to none by default 2018-10-15 14:27:50 -04:00
kashike
dcef9e4803 Fix NPE from last commit 2018-10-13 01:17:20 -07:00
kashike
78abba56af Change player info action enum to int 
Read & write server id
Fix javadocs
 2018-10-13 00:18:21 -07:00
Andrew Steinborn
33f333d8cc Clean up FML/handshake stuff from virtual host. 2018-10-13 02:34:53 -04:00
Andrew Steinborn
2f0ba42fa0 Also make sure tab list completion doesn't crash the proxy 2018-10-12 22:12:15 -04:00
Alex Thomson
64682027a5 Prevent commands run from console crashing the entire instance 2018-10-13 14:40:00 +13:00
kashike
46a7b52a13 Extract channel initialiser and transport type out 2018-10-12 16:41:12 -07:00
Alex Thomson
245828e337 Make changes based on PR comments 2018-10-11 10:41:40 +13:00
Alex Thomson
c5a27bb135 Add Forge mod list support 2018-10-10 19:52:22 +13:00
Andrew Steinborn
7578aa27a9 More reliably tear down connections and fire DisconnectEvent. Fixes #111 2018-10-09 19:02:15 -04:00
Andrew Steinborn
222e90a9f0 Unbreak Forge logic. 2018-10-05 19:04:10 -04:00
Alex Thomson
6ed772ba14 Add PROXY protocol support (#108) 2018-10-04 14:33:26 -04:00
Andrew Steinborn
d6fb3a210e Shorten connection errors to a more reasonable length. Fixes #58 2018-10-04 10:09:14 -04:00
Crypnotic
aa34977f3e Added ProxyConfig interface and implemented in VelocityConfiguration 2018-09-30 23:56:53 -05:00
Andrew Steinborn
b6a9299f9f Do tab list clearing into one packet 2018-09-30 18:27:07 -04:00
Desetude
3e65000ab3 Clear tab list on server connect 2018-09-30 21:40:22 +01:00
Desetude
61bd178591 Initial tablist implementation 2018-09-30 21:01:01 +01:00
Andrew Steinborn
732caa2d40 Remove RecordingThreadFactory since it's actually a terrible idea 2018-09-30 00:05:48 -04:00
Andrew Steinborn
2d2258d667 Misc cleanup 2018-09-29 23:57:40 -04:00
Andrew Steinborn
eddf01fc32 Reduce duplication between annotation processor and proxy. 2018-09-29 23:28:44 -04:00
Andrew Steinborn
33a2cb7bad Less verbose version 2018-09-29 14:54:46 -04:00
Andrew Steinborn
5af09f906a Fix a bug where it would try to register legacy channels(!) on 1.13+ 2018-09-29 14:53:04 -04:00
Andrew Steinborn
a44bb3b048 Remove more junk 2018-09-29 14:37:42 -04:00
Andrew Steinborn
75c3bb5ee6 Clean up vestigal stuff 2018-09-29 03:32:44 -04:00
Andrew Steinborn
97d541d146 Warn if someone tries to register the plugin instance as a listener 2018-09-29 03:15:49 -04:00
Andrew Steinborn
79d566bcee Finished the port to new session handler stuff 2018-09-29 02:55:52 -04:00
Andrew Steinborn
c7bd0d100e Started refactoring session handlers 2018-09-29 02:16:34 -04:00
Andrew Steinborn
6cd0a6b148 Introduce Channel#eventLoop() shorthand 
This is such a common call that it makes a lot of sense to go ahead
and expose this.
 2018-09-29 01:38:30 -04:00
Andrew Steinborn
5ab346a02b Don't tediously hardcode the names of channels if we can help it 2018-09-29 01:34:45 -04:00
Andrew Steinborn
f04599ae68 Clean up some plugin message channel code 2018-09-29 01:28:07 -04:00
Andrew Steinborn
f569a07b2e Move channel registrar to util 2018-09-29 01:25:24 -04:00
Andrew Steinborn
e6c178aae7 Cleaned up Java plugin loader 2018-09-27 15:52:31 -04:00
Andrew Steinborn
8c98395d51 Remove redundant contains check 2018-09-27 15:20:24 -04:00
Andrew Steinborn
731186ca10 Redesigned the /velocity command somewhat 2018-09-27 02:44:45 -04:00
Andrew Steinborn
d4910d9edc Remove potentially high-frequency usages of streams 2018-09-27 02:37:53 -04:00
Andrew Steinborn
63f22dc2de Extra clarity for server/MinecraftConnection naming 2018-09-27 02:35:10 -04:00
Andrew Steinborn
403fec13d8 Move UuidUtils test to api module 2018-09-27 02:33:47 -04:00
Andrew Steinborn
d639e47fbf Fix a number of issues with dependency resolution and add unit tests 2018-09-27 00:51:33 -04:00
Thomas Vanmellaerts
6f4b2c83b2
Delete EventUtil 2018-09-26 19:56:47 +02:00
Thomas Vanmellaerts
3acc00de5e
Move ChatResult to PlayerChatEvent and don't call event on spoofChatInput() 2018-09-26 19:50:36 +02:00