13
0
geforkt von Mirrors/Velocity
Commit graph

326 Commits

Autor SHA1 Nachricht Datum
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
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
Thomas Vanmellaerts
d71f863045
Fire Event on spoofChatInput 2018-09-26 18:25:32 +02:00
Thomas Vanmellaerts
7598918d93
Add chat event 2018-09-26 13:07:03 +02:00
Andrew Steinborn
db5645f80e
Merge pull request #74 from Leymooo/properties
Allow to edit GameProfile properties.
2018-09-25 01:53:15 -04:00
Leymooo
46c02c9895 merge upstream 2018-09-24 12:40:48 +03:00
DoNotSpamPls
8242353934 Add an option in the config to change the query map 2018-09-24 11:34:17 +03:00
Andrew Steinborn
c89f3ea468 Remove scoreboard packets
We don't use these any more, and to be frank, it's kind of scary to
update anyway.
2018-09-24 02:04:12 -04:00
Andrew Steinborn
6c61aa49f3 Sanity: reset ping ID after getting the right KeepAlive 2018-09-22 20:38:59 -04:00
Andrew Steinborn
9e999e1e5a Maintain keep alives on the server connection, not on the client. 2018-09-21 23:19:12 -04:00
Luck
ea42f47c7b
Properly initialise console permissions using the PermissionsSetupEvent 2018-09-21 21:24:54 +01:00
Andrew Steinborn
ef578ff69b
Merge pull request #99 from lucko/feature/command-permissions
Implement optional permission check method for commands
2018-09-21 16:06:50 -04:00
Andrew Steinborn
ee917682e0
Title API (#95) 2018-09-21 15:58:47 -04:00
Andrew Steinborn
284f90183f Add missing null check here 2018-09-20 22:44:26 -04:00
Andrew Steinborn
d06028e0f8 ProxyServer#broadcast() 2018-09-20 22:43:58 -04:00
Luck
b805891d1f
Implement Player#spoofChatInput method 2018-09-20 21:51:22 +01:00
Luck
97e4ff91e7
Implement optional permission check method for commands
This allows plugins to customize which players can use their commands. For players without permission, the command is effectively invisible, and the handling is passed through to the backend server.
2018-09-20 21:48:14 +01:00
Andrew Steinborn
8763573ae6 Major improvements to tab complete support.
- Removed half-baked 1.13 support that didn't even work anyway. Perhaps
  in the future we could restore it by rewriting the available commands
  packet.
- Proxy commands now show up in tab complete responses where possible.
2018-09-20 16:39:50 -04:00
Andrew Steinborn
e577d6b6f5 Fix typo from PR. 2018-09-20 16:09:46 -04:00
Andrew Steinborn
95c761479f Make connections more robust 2018-09-19 21:29:07 -04:00
Andrew Steinborn
5c3e1adee2 Fix this annoying wart 2018-09-19 14:57:53 -04:00
Andrew Steinborn
50c27066e2 Import cleanup 2018-09-19 14:56:49 -04:00
Andrew Steinborn
1be508ed5e Merge branch 'master' into merged 2018-09-19 14:54:44 -04:00
Andrew Steinborn
50316f2f1c Merge branch 'master' into merged 2018-09-19 14:54:03 -04:00
Andrew Steinborn
c29b92c1bf Merge branch 'plugin-message-event' into merged 2018-09-19 14:52:28 -04:00
Andrew Steinborn
6bd3c70015
Merge pull request #93 from VelocityPowered/remove-legacychatcolorutils
Remove LegacyChatColorUtils
2018-09-18 17:27:38 -04:00
Andrew Steinborn
9016162a49 Optimize and clarify GS4 query handler. 2018-09-18 17:24:28 -04:00
Andrew Steinborn
d796f079f0 I forgot this. 2018-09-18 17:01:26 -04:00
Andrew Steinborn
c38b73863a Fix more scheduler issues 2018-09-18 16:59:13 -04:00
Andrew Steinborn
717c2afeb3 Update for changes in master. 2018-09-18 16:50:33 -04:00
Andrew Steinborn
89b5da25be Merge branch 'master' into registered-server 2018-09-18 16:50:13 -04:00
Andrew Steinborn
2bfb7061ee Turn StatusRequest into a singleton. 2018-09-18 16:48:21 -04:00
Andrew Steinborn
44b1b82b09 Try to avoid locking, use an actual concurrent data structure 2018-09-18 16:40:51 -04:00
Andrew Steinborn
a60c55007a Remove LegacyChatColorUtils
In most cases, you should only work with legacy text to deserialize or
serialize it for backwards compatibility or user configurations only.
2018-09-17 16:11:23 -04:00
Andrew Steinborn
037dceb599 Fix potential race 2018-09-16 15:35:25 -04:00
Andrew Steinborn
2a842bffbe Add missing null check 2018-09-16 15:32:51 -04:00
Andrew Steinborn
291069af80 Implement RegisteredServer#ping() 2018-09-16 13:59:44 -04:00
Andrew Steinborn
1f8152c3a5 ProxyServer#getServerInfo -> ProxyServer#getServer 2018-09-16 13:16:16 -04:00
Andrew Steinborn
8b94fe6ed2 Readd missing check 2018-09-16 02:41:35 -04:00
Andrew Steinborn
5ff36f1ae7 Merge branch 'master' into plugin-message-event
# Conflicts:
#	proxy/src/main/java/com/velocitypowered/proxy/connection/backend/BackendPlaySessionHandler.java
#	proxy/src/main/java/com/velocitypowered/proxy/connection/client/ClientPlaySessionHandler.java
2018-09-16 02:35:38 -04:00
Andrew Steinborn
e1b2dc0d43 Introduce RegisteredServer API
This interface roughly maps the BungeeCord ServerInfo API. Accordingly,
this is a breaking API change, as many of the server-related events and
methods working with server info instances now provide/expect the
RegisteredServer interface instead.
2018-09-16 02:26:29 -04:00
Andrew Steinborn
88b7407aaf Fix rare NPE during server transition. Fixes #87 2018-09-15 13:37:30 -04:00
Andrew Steinborn
ab568405dd Cleaned up client plugin message logic. 2018-09-15 02:22:52 -04:00
Andrew Steinborn
84947564e4 Handle unexpected disconnects without a reason. 2018-09-15 01:46:28 -04:00
Andrew Steinborn
871319d679 Allow custom connection and read timeouts. 2018-09-15 01:26:54 -04:00
Andrew Steinborn
2b1d55a0fc Expose original server in ServerPreConnectEvent 2018-09-15 01:16:26 -04:00
Andrew Steinborn
e9568e1b6c Do not write plugin messages from the server if the player hasn't joined 2018-09-14 15:26:51 -04:00
Andrew Steinborn
9776675b70 Queue mod plugin messages instead. 2018-09-14 14:16:32 -04:00