Make network servers configurable #487
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Nightly build for this pull request:
|
SadPencil
force-pushed
the
feat-custom-master-list
branch
from
9188da5 to
8c4f3f4
Compare
SadPencil
force-pushed
the
feat-custom-master-list
branch
from
8c4f3f4 to
7b00124
Compare
SadPencil
force-pushed
the
feat-custom-master-list
branch
3 times, most recently
from
94a806e to
f67e253
Compare
SadPencil
changed the title
SadPencil
force-pushed
the
feat-custom-master-list
branch
from
f67e253 to
4115094
Compare
Metadorius
requested changes
Mar 15, 2024
Co-authored-by: Kerbiter <crabiter@vivaldi.net>
…l/xna-cncnet-client into feat-custom-master-list
Metadorius
reviewed
Mar 15, 2024
ClientCore/ClientConfiguration.cs
Outdated
| throw new FileNotFoundException($"Couldn't find {CLIENT_DEFS} at {baseResourceDirectory}. Please verify that you're running the client from the correct directory."); | ||
|
|
||
| clientDefinitionsIni = new IniFile(clientDefinitionsFile.FullName); | ||
|
|
||
| DTACnCNetClient_ini = new IniFile(SafePath.CombineFilePath(ProgramConstants.GetResourcePath(), CLIENT_SETTINGS)); | ||
|
|
||
| gameOptions_ini = new IniFile(SafePath.CombineFilePath(baseResourceDirectory.FullName, GAME_OPTIONS)); | ||
|
|
||
| networkDefinitionIni = new IniFile(SafePath.CombineFilePath(ProgramConstants.GetResourcePath(), NETWORK_DEFS)); |
There was a problem hiding this comment.
networkDefinitionsIni, forgot the s for consistency
Metadorius
approved these changes
Mar 15, 2024
SadPencil
added a commit
to SadPencil/xna-cncnet-client
that referenced
this pull request
Oct 4, 2024
* Make network servers configurable * Remove duplicated IRC servers * Apply suggestions from code review Co-authored-by: Kerbiter <crabiter@vivaldi.net> * Make methods as properties * Use Invariant culture in Server.Serialize() * Log when Download URL is not configured * networkDefinitionIni -> networkDefinitionsIni --------- Co-authored-by: Kerbiter <crabiter@vivaldi.net>
SadPencil
added a commit
to SadPencil/xna-cncnet-client
that referenced
this pull request
Oct 4, 2024
* Make network servers configurable * Remove duplicated IRC servers * Apply suggestions from code review Co-authored-by: Kerbiter <crabiter@vivaldi.net> * Make methods as properties * Use Invariant culture in Server.Serialize() * Log when Download URL is not configured * networkDefinitionIni -> networkDefinitionsIni --------- Co-authored-by: Kerbiter <crabiter@vivaldi.net>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #479 and #489
This PR removes all servers but
irc.gamesurge.net--- the rest domains are (almost) duplicated. See #489 for more details.This PR defines a new configuration file
NetworkDefinitions.ini. This file is optional, so if it is missing everything goes well as if this PR were not merged -- except removing all servers butirc.gamesurge.netThe following urls are configurable:
Also, setting a url to empty means do not fetch these resources online. This is meaningful if either:
Add an option
DisableDiscordIntegrationto enable Chinese players disabling discord integration even before the first client launch. (DiscordIntegrationinUserINISettingsdefaults to true!)Allow specifying IRC servers in
[IRCServers]section.Example
NetworkDefinitions.inifile: