From a8e081602a06004f4c3030f4f81728e3eb5c44c2 Mon Sep 17 00:00:00 2001 From: recroom2016 Date: Mon, 21 Feb 2022 23:11:06 -0500 Subject: [PATCH] 0.3.5 --- APIServer.cs | 8 ++++++-- GameSessions.cs | 35 ++++++++++++----------------------- OpenRec_.csproj | 17 +++++++++++++++++ Program.cs | 23 +++++++++++++++++++---- Setup.cs | 4 ++++ icon.ico | Bin 0 -> 93062 bytes icon2.ico | Bin 0 -> 93062 bytes 7 files changed, 58 insertions(+), 29 deletions(-) create mode 100644 icon.ico create mode 100644 icon2.ico diff --git a/APIServer.cs b/APIServer.cs index 0db767a..30ff45a 100644 --- a/APIServer.cs +++ b/APIServer.cs @@ -192,7 +192,7 @@ namespace server } if (Url == "images/v2/named") { - s = ImagesV2Named; + s = BracketResponse; } if (Url == "PlayerReporting/v1/moderationBlockDetails") { @@ -278,7 +278,11 @@ namespace server { s = gamesessions2018.GameSessions.JoinRandom(text); } - if (rawUrl == "//api/images/v4/uploadtransient?gameSessionId=2018") + if (Url == "gamesessions/v2/create") + { + s = gamesessions2018.GameSessions.Create(text); + } + if (rawUrl.Contains("images/v4/uploadtransient?gameSessionId=2018")) { File.WriteAllBytes("SaveData\\Images\\image" + Convert.ToString(int.Parse(File.ReadAllText("SaveData\\Images\\count.txt") + 1)) + ".png", Encoding.UTF8.GetBytes(text.Remove(0, 50).Remove(text.Length - 48, 48))); } diff --git a/GameSessions.cs b/GameSessions.cs index fedc49f..433e029 100644 --- a/GameSessions.cs +++ b/GameSessions.cs @@ -11,17 +11,21 @@ namespace gamesessions2018 // Token: 0x060000BE RID: 190 RVA: 0x00004C08 File Offset: 0x00002E08 public static string JoinRandom(string jsonData) { + long gamesessionid = 2018L; bool sandboxmode = false; GameSessions.JoinRandomRequest joinRandomRequest = JsonConvert.DeserializeObject(jsonData); if (File.ReadAllText("SaveData\\App\\sandbox.txt") == "Enabled") { sandboxmode = true; } - - { + if (File.ReadAllText("SaveData\\App\\privatedorm.txt") == "Enabled") + { + gamesessionid = new Random().Next(0, 100); + } + { Config.localGameSession = new GameSessions.SessionInstance { - GameSessionId = 2018L, + GameSessionId = gamesessionid, RegionId = "us", RoomId = joinRandomRequest.ActivityLevelIds[0], RecRoomId = null, @@ -38,7 +42,6 @@ namespace gamesessions2018 IsFull = false }; } - return JsonConvert.SerializeObject(new GameSessions.JoinResult { Result = 0, @@ -61,13 +64,12 @@ namespace gamesessions2018 // Token: 0x060000C0 RID: 192 RVA: 0x00004D24 File Offset: 0x00002F24 public static string Create(string jsonData) { - Console.WriteLine("[API][GameSession] Creating Room..."); + Console.WriteLine("Custom Room Test..."); GameSessions.CreateRequest createRequest = JsonConvert.DeserializeObject(jsonData); - { Config.localGameSession = new GameSessions.SessionInstance { - GameSessionId = 2017L, + GameSessionId = 1L, RegionId = "us", RoomId = createRequest.ActivityLevelIds, RecRoomId = null, @@ -84,7 +86,6 @@ namespace gamesessions2018 IsFull = false }; } - return JsonConvert.SerializeObject(new GameSessions.JoinResult { Result = 0, @@ -272,25 +273,13 @@ namespace gamesessions2018 // Token: 0x02000025 RID: 37 public class CreateRequest { - // Token: 0x17000055 RID: 85 - // (get) Token: 0x060000F2 RID: 242 RVA: 0x0000271C File Offset: 0x0000091C - // (set) Token: 0x060000F3 RID: 243 RVA: 0x00002724 File Offset: 0x00000924 + public bool IsSandbox { get; set; } + public string ActivityLevelIds { get; set; } - - // Token: 0x17000056 RID: 86 - // (get) Token: 0x060000F4 RID: 244 RVA: 0x0000272D File Offset: 0x0000092D - // (set) Token: 0x060000F5 RID: 245 RVA: 0x00002735 File Offset: 0x00000935 + public ulong[] ExpectedPlayerIds { get; set; } - // Token: 0x17000057 RID: 87 - // (get) Token: 0x060000F6 RID: 246 RVA: 0x0000273E File Offset: 0x0000093E - // (set) Token: 0x060000F7 RID: 247 RVA: 0x00002746 File Offset: 0x00000946 public GameSessions.RegionPing[] RegionPings { get; set; } - - // Token: 0x17000058 RID: 88 - // (get) Token: 0x060000F8 RID: 248 RVA: 0x0000274F File Offset: 0x0000094F - // (set) Token: 0x060000F9 RID: 249 RVA: 0x00002757 File Offset: 0x00000957 - public bool IsSandbox { get; set; } } // Token: 0x02000026 RID: 38 diff --git a/OpenRec_.csproj b/OpenRec_.csproj index 8446c6a..3d21215 100644 --- a/OpenRec_.csproj +++ b/OpenRec_.csproj @@ -3,6 +3,16 @@ Exe netcoreapp3.1 + icon2.ico + OpenRec + OpenRec + recroom2016 + icon2.png + + https://github.com/recroom2016/OpenRec + https://discord.gg/daC8QUhnFP + OpenRec + 0.4.0 @@ -15,4 +25,11 @@ + + + True + + + + diff --git a/Program.cs b/Program.cs index 1bcbbfe..b0307bd 100644 --- a/Program.cs +++ b/Program.cs @@ -16,6 +16,7 @@ namespace start goto Start; Start: + Console.ForegroundColor = ConsoleColor.Green; Console.WriteLine("OpenRec - Open source RecNet server software. (Version: " + version + ")"); Console.WriteLine("Made and provided by RecRoom 2016."); Console.WriteLine("Download source code here: https://github.com/recroom2016/OpenRec"); @@ -31,8 +32,8 @@ namespace start Console.Clear(); goto Settings; - Settings: - Console.WriteLine("1) Sandbox Mode: " + File.ReadAllText("SaveData\\App\\sandbox.txt") + Environment.NewLine + "2) Go Back"); + Settings: //SaveData\\App\\privatedorm.txt + Console.WriteLine("1) Sandbox Mode: " + File.ReadAllText("SaveData\\App\\sandbox.txt") + Environment.NewLine + "2) Private Dorm: " + File.ReadAllText("SaveData\\App\\privatedorm.txt") + Environment.NewLine + "3) Go Back"); string readline4 = Console.ReadLine(); if (readline4 == "1") { @@ -49,6 +50,20 @@ namespace start goto Settings; } else if (readline4 == "2") + { + if (File.ReadAllText("SaveData\\App\\privatedorm.txt") == "Disabled") + { + File.WriteAllText("SaveData\\App\\privatedorm.txt", "Enabled"); + } + else + { + File.WriteAllText("SaveData\\App\\privatedorm.txt", "Disabled"); + } + Console.Clear(); + Console.WriteLine("Success!"); + goto Settings; + } + else if (readline4 == "3") { Console.Clear(); goto Start; @@ -139,7 +154,7 @@ namespace start } if (readline == "3") { - Console.WriteLine("Please select the version of RecRoom the server should host: (2018)"); + Console.WriteLine("Please select the version of RecRoom the server should host: (2017, 2018)"); string readline2 = Console.ReadLine(); if (readline2 == "2016") { @@ -170,7 +185,7 @@ namespace start } } - public static string version = "0.3"; + public static string version = "0.3.5"; } } diff --git a/Setup.cs b/Setup.cs index 4a6fa31..b19fb4b 100644 --- a/Setup.cs +++ b/Setup.cs @@ -54,6 +54,10 @@ namespace start { File.WriteAllText("SaveData\\App\\sandbox.txt", "Disabled"); } + if (!(File.Exists("SaveData\\App\\privatedorm.txt"))) + { + File.WriteAllText("SaveData\\App\\privatedorm.txt", "Disabled"); + } if (!(File.Exists("SaveData\\Images\\count.txt"))) { File.WriteAllText("SaveData\\Images\\count.txt", "0"); diff --git a/icon.ico b/icon.ico new file mode 100644 index 0000000000000000000000000000000000000000..2954838c9b6d8f09df580b5bfbe458786d14c126 GIT binary patch literal 93062 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 literal 0 HcmV?d00001 diff --git a/icon2.ico b/icon2.ico new file mode 100644 index 0000000000000000000000000000000000000000..dbe84fa18e949fff0a5ff2c0b3c335fcb3497546 GIT binary patch literal 93062 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 KK7MH*HvbPYHJj@I literal 0 HcmV?d00001