Skip to content

Commit 8913b2a

Browse files
committed
UI Rename, Old Database removal
1 parent cf2eb6d commit 8913b2a

19 files changed

+1256
-173
lines changed

BHD-ServerManager/Classes/InstanceManagers/banInstanceManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace BHD_ServerManager.Classes.InstanceManagers
1212
{
1313
public static class banInstanceManager
1414
{
15-
private static ServerManager thisServer => Program.ServerManagerUI!;
15+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1616
private static theInstance theInstance => CommonCore.theInstance!;
1717
private static banInstance instanceBans => CommonCore.instanceBans!;
1818

BHD-ServerManager/Classes/InstanceManagers/theInstanceManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace BHD_ServerManager.Classes.InstanceManagers
1414
{
1515
public static class theInstanceManager
1616
{
17-
private static ServerManager thisServer => Program.ServerManagerUI!;
17+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1818
private static theInstance thisInstance => CommonCore.theInstance!;
1919

2020
public static string lastKnownSettingsPath = Path.Combine(CommonCore.AppDataPath, "lastKnownSettings.json");

BHD-ServerManager/Classes/Instances/banInstance.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public class banInstance
1313
public List<banInstancePlayerName> ConnectionHistory { get; set; } = new();
1414
public List<banInstancePlayerIP> IPConnectionHistory { get; set; } = new();
1515
public List<proxyRecord> ProxyRecords { get; set; } = new();
16+
public List<proxyCountry> ProxyBlockedCountries { get; set; } = new();
1617
}
1718

1819
public class banInstancePlayerName
@@ -59,12 +60,17 @@ public class proxyRecord
5960
public DateTime LastChecked { get; set; }
6061
}
6162

63+
public class proxyCountry
64+
{
65+
public required string CountryCode { get; set; } // Country ISO Code
66+
public required string CountryName { get; set; } // Country Name
67+
}
68+
6269
public enum banInstanceRecordType
6370
{
64-
Information = 0, // Just log, no action
65-
Temporary = 1, // Expires after time
66-
Permanent = 2, // Never expires
67-
Whitelist = 3 // Bypass all checks
71+
Information = 0, // Just log, no action
72+
Temporary = 1, // Expires after time
73+
Permanent = 2 // Never expires
6874
}
6975

7076
public enum RecordCategory

BHD-ServerManager/Classes/StatsManagement/StatFunctions.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static class StatFunctions
1414
{
1515
private static theInstance theInstance = CommonCore.theInstance!;
1616
private static statInstance instanceStats = CommonCore.instanceStats!;
17-
private static ServerManager thisServer => Program.ServerManagerUI!;
17+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1818

1919
// Throttle updates to once every 15 seconds
2020
private static DateTime _lastPlayerStatsUpdate = DateTime.MinValue;
@@ -326,7 +326,7 @@ public static void ResetPlayerStats()
326326

327327
// --- ASYNC NETWORK METHODS WITH UI INVOKE FIXES ---
328328

329-
public static async Task SendImportData(ServerManager thisServer)
329+
public static async Task SendImportData(ServerManagerUI thisServer)
330330

331331
{
332332
if (!theInstance.WebStatsEnabled || string.IsNullOrEmpty(theInstance.WebStatsProfileID) || string.IsNullOrEmpty(theInstance.WebStatsServerPath))
@@ -359,7 +359,7 @@ public static async Task SendImportData(ServerManager thisServer)
359359
}
360360
}
361361

362-
public static async Task SendUpdateData(ServerManager thisServer)
362+
public static async Task SendUpdateData(ServerManagerUI thisServer)
363363
{
364364
string POST_URL = theInstance.WebStatsServerPath + "status_update.php";
365365
Dictionary<string, string> DATA = new Dictionary<string, string>
@@ -385,7 +385,7 @@ public static async Task SendUpdateData(ServerManager thisServer)
385385
}
386386
}
387387

388-
public static async Task<string> SendReportData(ServerManager thisServer)
388+
public static async Task<string> SendReportData(ServerManagerUI thisServer)
389389
{
390390
string POST_URL = theInstance.WebStatsServerPath + "status_report.php";
391391
Dictionary<string, string> DATA = new Dictionary<string, string>
@@ -484,7 +484,7 @@ public static async Task<string> SendBabstatsData(string url, Dictionary<string,
484484

485485
// --- UI THREAD-SAFE HELPERS ---
486486

487-
private static void AddStatsLogRowSafe(ServerManager thisServer, string dateTime, string message)
487+
private static void AddStatsLogRowSafe(ServerManagerUI thisServer, string dateTime, string message)
488488
{
489489
if (thisServer.StatsTab.dg_statsLog.InvokeRequired)
490490
{

BHD-ServerManager/Classes/Tickers/tickerBanManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class tickerBanManagement
1414
// Global Variables
1515
private static theInstance thisInstance => CommonCore.theInstance!;
1616
private static banInstance banInstance => CommonCore.instanceBans!;
17-
private static ServerManager thisServer => Program.ServerManagerUI!;
17+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1818

1919
// Helper for UI thread safety
2020
private static void SafeInvoke(Control control, Action action)

BHD-ServerManager/Classes/Tickers/tickerChatManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public static class tickerChatManagement
1111
{
1212
private static theInstance thisInstance => CommonCore.theInstance!;
1313
private static chatInstance instanceChat => CommonCore.instanceChat!;
14-
private static ServerManager thisServer => Program.ServerManagerUI!;
14+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1515

1616
private static readonly object tickerLock = new();
1717
private static bool _autoMessageRecoveryDone = false;

BHD-ServerManager/Classes/Tickers/tickerNetLimiterMonitor.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public static class tickerNetLimiterMonitor
1414
{
1515
// Global Variables
1616
private static theInstance thisInstance => CommonCore.theInstance!;
17-
private static ServerManager thisServer => Program.ServerManagerUI!;
17+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1818
private static int _appId;
1919
public static bool IsInitialized = false;
2020

BHD-ServerManager/Classes/Tickers/tickerPlayerManagement.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace BHD_ServerManager.Classes.Tickers
1212
public class tickerPlayerManagement
1313
{
1414
// Global Variables
15-
private static ServerManager thisServer => Program.ServerManagerUI!;
15+
private static ServerManagerUI thisServer => Program.ServerManagerUI!;
1616
private static theInstance thisInstance => CommonCore.theInstance!;
1717

1818
// Helper for UI thread safety

BHD-ServerManager/Classes/Tickers/tickerServerManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public class tickerServerManager
1717
private static chatInstance instanceChat => CommonCore.instanceChat!;
1818
private static banInstance instanceBans => CommonCore.instanceBans!;
1919
private static statInstance instanceStats => CommonCore.instanceStats!;
20-
private static ServerManager? thisServer => Program.ServerManagerUI;
20+
private static ServerManagerUI? thisServer => Program.ServerManagerUI;
2121

2222
// Lock for thread safety (if needed for shared resources)
2323
private static int isTickerRunning = 0;

BHD-ServerManager/DataStores/defaultMapsBHD.csv

Lines changed: 0 additions & 123 deletions
This file was deleted.

0 commit comments

Comments
 (0)