mirror/quantum-space-buddies
1
0
Fork 0
mirror of https://github.com/misternebula/quantum-space-buddies.git synced 2025-02-19 12:40:56 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #462 from misternebula/add-kcp-back-in-lol

Browse Source 
Add KCP support back in as an option.
This commit is contained in:
_nebula 2022-01-21 22:55:26 +00:00 committed by GitHub
commit d33b2439f0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mirror/where-allocations.dll Normal file
View File

Binary file not shown.

8
QSB/Menus/MenuManager.cs
View File

@ -179,7 +179,8 @@ namespace QSB.Menus
private void CreateCommonPopups()
{
IPPopup = MenuApi.MakeInputFieldPopup("Steam ID", "Steam ID", "Connect", "Cancel");
var text = QSBCore.UseKcpTransport ? "Public IP Address" : "Steam ID";
IPPopup = MenuApi.MakeInputFieldPopup(text, text, "Connect", "Cancel");
IPPopup.OnPopupConfirm += Connect;
IPPopup.OnPopupValidate += Validate;
@ -334,6 +335,11 @@ namespace QSB.Menus
: "Are you sure you want to disconnect?\r\nThis will send you back to the main menu.";
DisconnectPopup._labelText.text = popupText;
if (QSBCore.UseKcpTransport)
{
return;
}
var steamId = ((FizzyFacepunch)Transport.activeTransport).GetSteamID();
PopupOK += () => GUIUtility.systemCopyBuffer = steamId;

2
QSB/QSBCore.cs
View File

@ -45,6 +45,8 @@ namespace QSB
public static IModHelper Helper { get; private set; }
public static IModUnityEvents UnityEvents => Helper.Events.Unity;
public static string DefaultServerIP { get; private set; }
public static bool UseKcpTransport => DebugSettings.UseKcpTransport;
public static int OverrideAppId => DebugSettings.OverrideAppId;
public static bool DebugMode => DebugSettings.DebugMode;
public static bool ShowLinesInDebug => DebugMode && DebugSettings.DrawLines;
public static bool ShowQuantumVisibilityObjects => DebugMode && DebugSettings.ShowQuantumVisibilityObjects;

15
QSB/QSBNetworkManager.cs
View File

@ -63,9 +63,18 @@ namespace QSB
gameObject.SetActive(false);
var fizzy = gameObject.AddComponent<FizzyFacepunch>();
fizzy.SteamAppID = "753640";
transport = fizzy;
if (QSBCore.UseKcpTransport)
{
transport = gameObject.AddComponent<kcp2k.KcpTransport>();
}
else
{
var fizzy = gameObject.AddComponent<FizzyFacepunch>();
fizzy.SteamAppID = QSBCore.OverrideAppId == -1
? "753640"
: $"{QSBCore.OverrideAppId}";
transport = fizzy;
}
gameObject.SetActive(true);

6
QSB/Utility/DebugSettings.cs
View File

@ -4,6 +4,12 @@ namespace QSB.Utility
{
public class DebugSettings
{
[JsonProperty("useKcpTransport")]
public bool UseKcpTransport { get; set; }
[JsonProperty("overrideAppId")]
public int OverrideAppId { get; set; }
[JsonProperty("debugMode")]
public bool DebugMode { get; set; }

4
QSB/debugsettings.json
View File

@ -1,5 +1,7 @@
{
"debugMode": false,
"useKcpTransport": false,
"overrideAppId": -1,
"debugMode": true,
"drawLines": false,
"showQuantumVisibilityObjects": false,
"showDebugLabels": false,