feat: add Serverlist editor to the Patcher by Tondorian · Pull Request #527 · thepeacockproject/Peacock

Tondorian · 2024-10-25T21:11:39Z

This will fix #428

Scope

Add a button to the patcher to open a new Dialog to edit the serverList
This pull request also added a dependency to Newtonsoft.Json
Also updated .NetFramework to 4.8 since 4.6 is EoL since April 22

Test Plan

Clicked the new button
edit the entries and save them
changes are stored in "Servers.json"

Checklist

I have run Prettier to reformat any changed files
I have verified my changes work

This also added a dependency to Newtonsoft.Json Also updated .NetFramework to 4.8 since 4.6 is EoL since April 22

riisikumi · 2024-10-25T21:14:10Z

Doesn't this already have an equivalent in the LocalGhost Patcher? I wonder why it hasn't been added to the Peacock one

grappigegovert

Noted some issues and other points.
Also, it would be preferable if this didn't use Newtonsoft.Json, as it would mean having to include a dll file along with the patcher exe.

patcher/.gitignore

patcher/MainForm.cs

grappigegovert · 2024-10-31T01:02:01Z

patcher/MainForm.cs

        {
-            if (!servers.TryGetValue(serverUrlComboBox.Text, out string hostname))
+            string hostname = "";
+            var result = gameServers.FirstOrDefault(server => server.ServerName == serverUrlComboBox.Text);


This result isn't actually used anywhere, and this function will now always return "127.0.0.1" unless you manually type something into the server combobox.

grappigegovert · 2024-10-31T01:10:18Z

patcher/MainForm.cs

        {
-            if (!serversReverse.TryGetValue(input, out string result))
+            GameServer server = null;
+            if (input == "localhost" || input == "127.0.0.1")


I don't really understand why this if-statement is here - I think you always want to compare against the ServerAddress, and then return the corresponding ServerName.

I think I introduced this check for the edge case a user used a custom name for "Peacock Local" at the moment the program starts. At the moment it shows 127.0.0.1 or "Peacock Local"

LennardF1989 · 2024-10-31T11:12:52Z

I think we should first move to patcher-core. That is a more modern setup (.NET instead of .NET Framework, UI separated from logic) and has support for DPI and Steam Deck (through CLI). And for size reasons, it can still back-compile to .NET 4.8.

Also, couldn't we just get the actual serverlist editor from @grappigegovert version back in the source?

add the newline back Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>

Tondorian · 2024-10-31T11:56:14Z

I think we should first move to patcher-core. That is a more modern setup (.NET instead of .NET Framework, UI separated from logic) and has support for DPI and Steam Deck (through CLI). And for size reasons, it can still back-compile to .NET 4.8.

Also, couldn't we just get the actual serverlist editor from @grappigegovert version back in the source?

I just checked out the ghostmod patchers menu, in my opinion it does not resolve the issue, because it is hidden in the options menu and not easy to find or understand how it works

Also, it would be preferable if this didn't use Newtonsoft.Json, as it would mean having to include a dll file along with the patcher exe.

I used JSON because it is easy to read and understand and most typescript devs know it. but if an additional dll is not wanted I can use another format to

LennardF1989 · 2024-10-31T15:05:36Z

I used JSON because it is easy to read and understand and most typescript devs know it. but if an additional dll is not wanted I can use another format to

You mean C# right :P?

As for the replacement: https://www.nuget.org/packages/system.text.json - this is part of .NET (not .NET Framework) by default now. For simple situations, there is no need to use Newtonsoft anymore. Another reason why I feel we should first adopt the core version, then reapply this.

LennardF1989 · 2024-10-31T15:06:11Z

patcher/MainForm.cs

-            {
-                gameServers = CreateDefautServerList();
-            }
+            configLocation = $@"{appData}\PeacockProject\";


Please always use Path.Combine.

I had stolen this line from Settings.cs :P

Yea, there are quite a few weird things in the code that make my hands itch. But if we make sure newly added stuff to be correct, the rest will follow, haha.

LennardF1989 · 2024-10-31T15:06:35Z

patcher/MainForm.cs

            }
+            try
+            {
+                var fileContent = File.ReadAllText($@"{configLocation}\Servers.json", Encoding.UTF8);


LennardF1989

As for the editor itself, we can easily port that over to the new version.

LennardF1989 · 2024-10-31T15:08:01Z

patcher/ServerListEditor.cs

+                .SpecialFolder
+                .ApplicationData);
+
+            var folder = $@"{appData}\PeacockProject\";


I also feel there should just be a single static readonly in a file with the path to the configuration and server.json.

LennardF1989 · 2024-10-31T15:08:17Z

patcher/MainForm.cs

            var serverList = JsonConvert.SerializeObject(gameServers);
-            File.WriteAllText("Servers.json", serverList, Encoding.UTF8);
+
+            File.WriteAllText($@"{configLocation}Servers.json", serverList, Encoding.UTF8);


LennardF1989 · 2024-10-31T15:08:24Z

patcher/ServerListEditor.cs

+            var folder = $@"{appData}\PeacockProject\";
            var serverString = JsonConvert.SerializeObject(GameServers);
-            File.WriteAllText("Servers.json", serverString, Encoding.UTF8);
+            File.WriteAllText(@$"{folder}Servers.json", serverString, Encoding.UTF8);


LennardF1989 · 2024-10-31T15:16:59Z

Also, please change the version to 4.6. This is pre-installed on all Windows 10 and up, preventing players from having to install .NET Framework.

Tondorian · 2024-10-31T16:26:43Z

You mean C# right :P?
I really mean Typescript because the core project is typescript :)
I was not aware of the patcher-core branch before

Also, please change the version to 4.6. This is pre-installed on all Windows 10 and up, preventing players from having to install .NET Framework.

I updated to 4.8 because Microsoft do not support 4.6 anymore, but will revert this change

Introduce static ConfigLocation string use Path.Combine instead of string operations

Tondorian · 2024-10-31T16:59:30Z

Also, please change the version to 4.6. This is pre-installed on all Windows 10 and up, preventing players from having to install .NET Framework.

On my win 11 Pc 4.6 is not available to compile the project is 4.6.2 okay, too?
@LennardF1989

remove Newtonsoft.Json

LennardF1989 · 2024-10-31T22:07:24Z

Also, please change the version to 4.6. This is pre-installed on all Windows 10 and up, preventing players from having to install .NET Framework.

On my win 11 Pc 4.6 is not available to compile the project is 4.6.2 okay, too? @LennardF1989

https://learn.microsoft.com/en-us/dotnet/framework/install/guide-for-developers

I had a reason for targeting 4.6.1 for the patcher-core. Pretty sure it was related to something that was simply unavailable in .NET 4.6 and/or more trouble than it's worth to backport. Can you target that? Get this: https://dotnet.microsoft.com/en-us/download/dotnet-framework/thank-you/net461-developer-pack-offline-installer

Tondorian · 2024-10-31T22:35:55Z

I managed to find the target installer for 4.6 was a bit hidden

Added an option to edit the default ServerList.

ca39b48

This also added a dependency to Newtonsoft.Json Also updated .NetFramework to 4.8 since 4.6 is EoL since April 22

RDIL requested review from LennardF1989 and grappigegovert October 30, 2024 03:13

RDIL changed the title ~~feat add Serverlist editor to the Patcher~~ feat: add Serverlist editor to the Patcher Oct 30, 2024

grappigegovert requested changes Oct 31, 2024

View reviewed changes

Update patcher/.gitignore

ecf5aed

add the newline back Co-authored-by: Govert de Gans <grappigegovert@hotmail.com>

server.json is saved to "%appdata%\Peackock" now

629ce36

LennardF1989 reviewed Oct 31, 2024

View reviewed changes

Location refactoring

9a9f474

Introduce static ConfigLocation string use Path.Combine instead of string operations

Tondorian and others added 3 commits October 31, 2024 18:38

revert .Net Framework version back to 4.6

9103eae

Remove Json and use a CSV format

ee57e29

remove Newtonsoft.Json

Merge branch 'master' into master

a64450a

Tondorian requested a review from grappigegovert October 31, 2024 18:11

prevent users from destroying the config file by replacing ';'

4cd6ab7

Uh oh!

Conversation

Tondorian commented Oct 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Scope

Test Plan

Checklist

Uh oh!

riisikumi commented Oct 25, 2024

Uh oh!

grappigegovert left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

grappigegovert Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LennardF1989 commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Tondorian commented Oct 31, 2024

Uh oh!

LennardF1989 commented Oct 31, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LennardF1989 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

LennardF1989 commented Oct 31, 2024

Uh oh!

Tondorian commented Oct 31, 2024

Uh oh!

Tondorian commented Oct 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LennardF1989 commented Oct 31, 2024

Uh oh!

Tondorian commented Oct 31, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Tondorian commented Oct 25, 2024 •

edited

Loading

grappigegovert Oct 31, 2024 •

edited

Loading

LennardF1989 commented Oct 31, 2024 •

edited

Loading

Tondorian commented Oct 31, 2024 •

edited

Loading