Mirrors/Velocity
3
0
Fork 1
Mirror von https://github.com/PaperMC/Velocity.git synchronisiert 2024-11-17 13:30:17 +01:00
Code Issues Pakete Projekte Releases Wiki Aktivität
787 Commits 20 Branches 0 Tags 20 MiB
321b42d225
Commit graph

501 Commits

Autor SHA1 Nachricht Datum
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