Commit Graph

1560 Commits

Author SHA1 Message Date
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