Skip to content

Switch everything to file scoped namespace #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jouramie wants to merge 1 commit into
base: archipelago
Choose a base branch
from
Open

Switch everything to file scoped namespace #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,549 changes: 774 additions & 775 deletions APRandomizerMain.cs
View file
Open in desktop

Large diffs are not rendered by default.

849 changes: 424 additions & 425 deletions Archipelago/ArchipelagoClient.cs
View file
Open in desktop

Large diffs are not rendered by default.

223 changes: 111 additions & 112 deletions Archipelago/ArchipelagoData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,134 +5,133 @@
using MessengerRando.Utils;
using Newtonsoft.Json;

namespace MessengerRando.Archipelago
namespace MessengerRando.Archipelago;

public class ArchipelagoData
{
public class ArchipelagoData
{
public string Uri = "archipelago.gg";
public int Port = 38281;
public string SlotName = "";
public string Password = "";
public int Index;
public string SeedName = "Unknown";
public Dictionary<string, object> SlotData;
public static bool DeathLink = false;
public int PowerSealsCollected;
public List<string> DefeatedBosses;
public List<long> CheckedLocations;
public Dictionary<long, int> ReceivedItems;
public Dictionary<long, Dictionary<string, List<long>>> LocationData;
public List<bool> AvailableTeleports;
public string Uri = "archipelago.gg";
public int Port = 38281;
public string SlotName = "";
public string Password = "";
public int Index;
public string SeedName = "Unknown";
public Dictionary<string, object> SlotData;
public static bool DeathLink = false;
public int PowerSealsCollected;
public List<string> DefeatedBosses;
public List<long> CheckedLocations;
public Dictionary<long, int> ReceivedItems;
public Dictionary<long, Dictionary<string, List<long>>> LocationData;
public List<bool> AvailableTeleports;

public void StartNewSeed()
{
Console.WriteLine("Creating new seed data");
Index = ArchipelagoClient.OfflineReceivedItems;
PowerSealsCollected = 0;
DefeatedBosses = [];
CheckedLocations = [];
ReceivedItems = new Dictionary<long, int>();
AvailableTeleports = [false, false];
}
public void StartNewSeed()
{
Console.WriteLine("Creating new seed data");
Index = ArchipelagoClient.OfflineReceivedItems;
PowerSealsCollected = 0;
DefeatedBosses = [];
CheckedLocations = [];
ReceivedItems = new Dictionary<long, int>();
AvailableTeleports = [false, false];
}

public override string ToString()
{
return JsonConvert.SerializeObject(this);
}
public override string ToString()
{
return JsonConvert.SerializeObject(this);
}

public static bool LoadData(int slot)
{
if (ArchipelagoClient.Offline) return false;
Console.WriteLine($"Loading Archipelago data for slot {slot}");
ArchipelagoClient.ServerData ??= new ArchipelagoData();
return ArchipelagoClient.ServerData.loadData(slot);
}
public static bool LoadData(int slot)
{
if (ArchipelagoClient.Offline) return false;
Console.WriteLine($"Loading Archipelago data for slot {slot}");
ArchipelagoClient.ServerData ??= new ArchipelagoData();
return ArchipelagoClient.ServerData.loadData(slot);
}

// ReSharper disable once InconsistentNaming
private bool loadData(int slot)
// ReSharper disable once InconsistentNaming
private bool loadData(int slot)
{
if (!RandomizerStateManager.Instance.APSave.TryGetValue(slot, out var tempServerData) ||
tempServerData.SeedName == null || tempServerData.SeedName.Equals("Unknown"))
return false;
try
{
if (!RandomizerStateManager.Instance.APSave.TryGetValue(slot, out var tempServerData) ||
tempServerData.SeedName == null || tempServerData.SeedName.Equals("Unknown"))
return false;
try
var i = 0;
if (ArchipelagoClient.Authenticated)
{
var i = 0;
if (ArchipelagoClient.Authenticated)
//we're already connected to an archipelago server, but have a save file, so disconnect to clean up
ArchipelagoClient.Disconnect();
if (tempServerData.SeedName.Equals(SeedName) && tempServerData.SlotName.Equals(SlotName))
{
//we're already connected to an archipelago server, but have a save file, so disconnect to clean up
ArchipelagoClient.Disconnect();
if (tempServerData.SeedName.Equals(SeedName) && tempServerData.SlotName.Equals(SlotName))
{
//We're continuing an existing multiworld so likely a port change. Save the new data
Index = tempServerData.Index;
PowerSealsCollected = tempServerData.PowerSealsCollected;
CheckedLocations = tempServerData.CheckedLocations ?? [];
RandoBossManager.DefeatedBosses = DefeatedBosses =
tempServerData.DefeatedBosses ?? [];
ReceivedItems = tempServerData.ReceivedItems ?? [];
AvailableTeleports = tempServerData.AvailableTeleports ?? [false, false];
//We're continuing an existing multiworld so likely a port change. Save the new data
Index = tempServerData.Index;
PowerSealsCollected = tempServerData.PowerSealsCollected;
CheckedLocations = tempServerData.CheckedLocations ?? [];
RandoBossManager.DefeatedBosses = DefeatedBosses =
tempServerData.DefeatedBosses ?? [];
ReceivedItems = tempServerData.ReceivedItems ?? [];
AvailableTeleports = tempServerData.AvailableTeleports ?? [false, false];

ThreadPool.QueueUserWorkItem(_ =>
ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
CheckedLocations.ToArray()));
Console.WriteLine("connected from main menu, but continuing a seed.");
Console.WriteLine($"items in remote queue: {ArchipelagoClient.ItemQueue.Count}");
Console.WriteLine($"saved index: {Index}");
while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
{
ArchipelagoClient.ItemQueue.Dequeue();
i += 1;
}

Console.WriteLine($"Setting index to {ArchipelagoClient.OfflineReceivedItems}");
Index = ArchipelagoClient.OfflineReceivedItems;
RandomizerStateManager.OnMainMenu = false;
// reconnect
ArchipelagoClient.Connect();
return true;
ThreadPool.QueueUserWorkItem(_ =>
ArchipelagoClient.Session.Locations.CompleteLocationChecksAsync(null,
CheckedLocations.ToArray()));
Console.WriteLine("connected from main menu, but continuing a seed.");
Console.WriteLine($"items in remote queue: {ArchipelagoClient.ItemQueue.Count}");
Console.WriteLine($"saved index: {Index}");
while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
{
ArchipelagoClient.ItemQueue.Dequeue();
i += 1;
}
//There was archipelago save data and it doesn't match our current connection so abort.
return ArchipelagoClient.HasConnected = false;
}
//We aren't connected to an Archipelago server so attempt to use the found data
Uri = tempServerData.Uri;
Port = tempServerData.Port;
SlotName = tempServerData.SlotName;
Password = tempServerData.Password;
SeedName = tempServerData.SeedName;
Index = tempServerData.Index;
Console.WriteLine($"saved index: {Index}");
PowerSealsCollected = tempServerData.PowerSealsCollected;
CheckedLocations = tempServerData.CheckedLocations ?? [];
RandoBossManager.DefeatedBosses = DefeatedBosses = tempServerData.DefeatedBosses ?? [];
ReceivedItems = tempServerData.ReceivedItems ?? new Dictionary<long, int>();
SlotData = tempServerData.SlotData;
LocationData = tempServerData.LocationData;
AvailableTeleports = tempServerData.AvailableTeleports ?? [false, false];

//Attempt to connect to the server and save the new data
Console.WriteLine("Rando save found!");
if (Uri == "offline")
{
Console.WriteLine("continuing offline seed");
RandomizerStateManager.InitializeSeed();
return ArchipelagoClient.HasConnected = ArchipelagoClient.Offline = true;
Console.WriteLine($"Setting index to {ArchipelagoClient.OfflineReceivedItems}");
Index = ArchipelagoClient.OfflineReceivedItems;
RandomizerStateManager.OnMainMenu = false;
// reconnect
ArchipelagoClient.Connect();
return true;
}
//There was archipelago save data and it doesn't match our current connection so abort.
return ArchipelagoClient.HasConnected = false;
}
//We aren't connected to an Archipelago server so attempt to use the found data
Uri = tempServerData.Uri;
Port = tempServerData.Port;
SlotName = tempServerData.SlotName;
Password = tempServerData.Password;
SeedName = tempServerData.SeedName;
Index = tempServerData.Index;
Console.WriteLine($"saved index: {Index}");
PowerSealsCollected = tempServerData.PowerSealsCollected;
CheckedLocations = tempServerData.CheckedLocations ?? [];
RandoBossManager.DefeatedBosses = DefeatedBosses = tempServerData.DefeatedBosses ?? [];
ReceivedItems = tempServerData.ReceivedItems ?? new Dictionary<long, int>();
SlotData = tempServerData.SlotData;
LocationData = tempServerData.LocationData;
AvailableTeleports = tempServerData.AvailableTeleports ?? [false, false];

RandomizerStateManager.OnMainMenu = false;
ArchipelagoClient.Connect();
while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
{
ArchipelagoClient.ItemQueue.Dequeue();
i += 1;
}
return ArchipelagoClient.HasConnected = true;
//Attempt to connect to the server and save the new data
Console.WriteLine("Rando save found!");
if (Uri == "offline")
{
Console.WriteLine("continuing offline seed");
RandomizerStateManager.InitializeSeed();
return ArchipelagoClient.HasConnected = ArchipelagoClient.Offline = true;
}
catch (Exception ex)

RandomizerStateManager.OnMainMenu = false;
ArchipelagoClient.Connect();
while (ArchipelagoClient.ItemQueue.Count > 0 && i < Index)
{
Console.WriteLine(ex.ToString());
return false;
ArchipelagoClient.ItemQueue.Dequeue();
i += 1;
}
return ArchipelagoClient.HasConnected = true;
}
catch (Exception ex)
{
Console.WriteLine(ex.ToString());
return false;
}
}
}
Loading