From 8e4dadcb9c3e23dad8be461290d81407f3667864 Mon Sep 17 00:00:00 2001 From: Mister_Nebula <41904486+misternebula@users.noreply.github.com> Date: Fri, 21 Jan 2022 22:38:41 +0000 Subject: [PATCH] add the stuffz --- Mirror/where-allocations.dll | Bin 0 -> 5632 bytes QSB/Menus/MenuManager.cs | 8 +++++++- QSB/QSBCore.cs | 2 ++ QSB/QSBNetworkManager.cs | 15 ++++++++++++--- QSB/Utility/DebugSettings.cs | 6 ++++++ QSB/debugsettings.json | 4 +++- 6 files changed, 30 insertions(+), 5 deletions(-) create mode 100644 Mirror/where-allocations.dll diff --git a/Mirror/where-allocations.dll b/Mirror/where-allocations.dll new file mode 100644 index 0000000000000000000000000000000000000000..459ef688b688f843dac8e42a7605b8127c65841e GIT binary patch literal 5632 zcmeHLYiJzT6+U^dmaF{LCWDQO@O$e%!)goe-t8bU%Sv?jDMl>TT9O`xRxkwT#@U!(Myy@v>*D1P2NzWU$?fCkv)ZIl}H*LLtG^dxGf=qAQmb@=?JvKmeN<^sbdw(=4 zv;Beg>RUtx&cTTX+}|F?UB{KhMbxNpEr^>L9KRZ?fZ+3pQ1)?F<-giJB$1$Z1D*7~ z0B|wlAe!W!2k&uLlsZ#SATiMfP|*qIN{?z06;ePZ<1O(PCk3q?=YHcfs36mUZK?&wTB+5#kb=vWRNvZ_YMDZ3+6;PGT*$E>bwBU8>&3(03giirKQ%gtFnRI8Sv*S1jJSP_54HS3Z zqeT4(>@~)7zH8b=k2OAy5q*S8@0-lg`&eOK+kGb{hx&2<3+O1zdM#&`l`&v0&TiKT z%S`ky(Md=QDug<6-U??KKhg+P=~eiwN3=-<_c&dmr$n4yR`8b!7U{BRrq`elr|&9G zxAq`(MzpBE-3hkVEkhRpHn&{SbtnWL5x2PT+ORy=UP1`8tHeUSL_DP zzeeh!UeOLLig_2rlQgEY^0SaU4Q{zgy+E7j+aa|dvLwBzsH;1dMK`qHtWqaXkzXt7 z8vPxw^Idc!q-N+csApRV;~GuSG;OCB6?K*J+Do9gijyd`MrA}Ep()@|`ZxG7`V}~F zTH<9`r?ZjsX;ybD&yOn)_4rn8Gc99nngC<;MTNHlCaD9kk$UKuxLd&o01F~R=fUp= zT)StadLa7MxHG(tW_S5dBY<3m&qNms{}TAv@X z{mvuQJ?s<~E%{{{mw9O}$wAjCO^-NskHsB3C+)(7Q=^B*2JFI^W7>XI#g@M38+O5P z3v@#ICk=1D58Ej9xzg|@^~>4CV$qnjWRH&*aCQ;AfeXI0Jrk2uSqMhDwqbc^OwWY! zgj19CIi<2`89ofgrDa@Dm{*gJFWSCYlB@>NtZAA4N=;gn{&dc~D3Ob68Wv-oB2_z} z<$3AKc7wAG{H6<*MQk+W%My7NB)8%*T~{SK%ciPM%948A;$lhK{=kL2EOWGB`3Qz( znq8cmlP;z6zT;BhE!}S#MceUwGw)ScVKV6;Y3U;BB{MI*u#o6rSTK+|C%+*5LCZi# z^Xl+wZM}`D(a=~=q2NldVqT#F2NlYw=%|#_BhpU?vw1Y=xFy4<(b=!dyk7|!3Sl^5 zB;?G^p>POUmiwIYO6{p3SC$-KRvscMJFc&aJ!q6nYek`97$Ik9Z0T5!jctyWC&?y{ z7O9M%LoS|oNd>$w9;iGmfb#hr#m@zfvfyo5PY>b^Ea7dl@K!zq%S)8O8y`P-Q{hgmMd-{;TL%_q0jw{xGGgia?^Y9|rANAuJN%>p=WbO3>y;OR(1 zhjdN_?*boJsYpndfDNJ`4ie`?`+;$Bbm-0l)4`uc+ViltsR$02)Q5$simHR_fYxal zcNb;mnQRoWq-aTBAsXTm$(u^3(`V&02QM3!0?YifU0v_Kb)@CgOD}gu60d&vJVkU8 zQC)~c44`Q{qYcqbB6VP^9!uWBkPbtTxa z1B|BQaf&oF?AitIi5O`>;W&mlG)%-=U6FXIE3RXnR7c{yOU-N7+dnuBUdJ|yCsM7! z#Hp>DDWa&%J%DTKFfJSy$8-HT{~J%PU3p}+=j!}B z;%h(u^E0g1_t4a&CtYu9*|aQks$Y5wzEhqWHeJ_orzX&@rZ$FCF3iI8|7PS)_8jRt zMqzn6u7%~{GGAVszdCv4ADb^e^T_#EP|C{q1><^!T7R#6ss!BWKF961tYO2nspRDy zS4y?7DCydMIN>AbopDPQ;4`Z_U$3q=>L7%GWo`J3l?OH4uY#Fr+{|mu~k5Jk0F6km-1M!almOx{R zR$B`1zU@k4AuB%nR`TN=xd03PK5J8Po`P;s>GHN##V|6Dtm-Wj)B0X_Ji Q(T(ogb#TY-f4Ktx0YgpVivR!s literal 0 HcmV?d00001 diff --git a/QSB/Menus/MenuManager.cs b/QSB/Menus/MenuManager.cs index 44fbe907..9b4ff3c0 100644 --- a/QSB/Menus/MenuManager.cs +++ b/QSB/Menus/MenuManager.cs @@ -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; diff --git a/QSB/QSBCore.cs b/QSB/QSBCore.cs index 1c23afb0..17e0ae1d 100644 --- a/QSB/QSBCore.cs +++ b/QSB/QSBCore.cs @@ -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; diff --git a/QSB/QSBNetworkManager.cs b/QSB/QSBNetworkManager.cs index 52035422..78e4bded 100644 --- a/QSB/QSBNetworkManager.cs +++ b/QSB/QSBNetworkManager.cs @@ -63,9 +63,18 @@ namespace QSB gameObject.SetActive(false); - var fizzy = gameObject.AddComponent(); - fizzy.SteamAppID = "753640"; - transport = fizzy; + if (QSBCore.UseKcpTransport) + { + transport = gameObject.AddComponent(); + } + else + { + var fizzy = gameObject.AddComponent(); + fizzy.SteamAppID = QSBCore.OverrideAppId == -1 + ? "753640" + : $"{QSBCore.OverrideAppId}"; + transport = fizzy; + } gameObject.SetActive(true); diff --git a/QSB/Utility/DebugSettings.cs b/QSB/Utility/DebugSettings.cs index b71805cc..18800e64 100644 --- a/QSB/Utility/DebugSettings.cs +++ b/QSB/Utility/DebugSettings.cs @@ -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; } diff --git a/QSB/debugsettings.json b/QSB/debugsettings.json index ce6eeea8..13b8ab49 100644 --- a/QSB/debugsettings.json +++ b/QSB/debugsettings.json @@ -1,5 +1,7 @@ { - "debugMode": false, + "useKcpTransport": false, + "overrideAppId": -1, + "debugMode": true, "drawLines": false, "showQuantumVisibilityObjects": false, "showDebugLabels": false,