Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
140 changes: 85 additions & 55 deletions AtlasServerManager/AtlasServerManager.Designer.cs

Large diffs are not rendered by default.

231 changes: 216 additions & 15 deletions AtlasServerManager/AtlasServerManager.cs

Large diffs are not rendered by default.

9 changes: 8 additions & 1 deletion AtlasServerManager/AtlasServerManager.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
Expand All @@ -25,7 +26,6 @@
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
Expand Down Expand Up @@ -57,6 +57,9 @@
<StartupObject>AtlasServerManager.Program</StartupObject>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Deployment" />
Expand Down Expand Up @@ -128,6 +131,10 @@
<DesignTime>True</DesignTime>
</Compile>
<None Include="app.config" />
<None Include="Language\zh_cn.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="packages.config" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
Expand Down
21 changes: 19 additions & 2 deletions AtlasServerManager/Includes/Registry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,28 @@ public static void LoadRegConfig(AtlasServerManager AtlasMgr)
AtlasMgr.ServerPath = (string)key.GetValue("ServerDataPath", string.Empty);
AtlasMgr.ServerUpdateMessage.Text = (string)key.GetValue("ServerUpdateMessage", AtlasMgr.ServerUpdateMessage.Text);
AtlasMgr.ServerUpdatingMessage.Text = (string)key.GetValue("ServerUpdatingMessage", AtlasMgr.ServerUpdatingMessage.Text);
//AtlasMgr.SetLanguage((string)key.GetValue("Language", "en"));

LoadRegServers(AtlasMgr);
}
}
catch (Exception e) { System.Windows.Forms.MessageBox.Show("Failed To Load Setting: " + e.StackTrace); }
}

public static void SaveRegkey(string keystring, string value)
{
key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey("SOFTWARE\\AtlasServerManager", true);
if (key != null)
{
key.SetValue(keystring, value, Microsoft.Win32.RegistryValueKind.String);
}
}
public static object LoadRegkey(string keystring)
{
key = Microsoft.Win32.Registry.CurrentUser.OpenSubKey("SOFTWARE\\AtlasServerManager", true);
if (key == null) return null;
return key.GetValue(keystring);
}
public static void SaveRegConfig(AtlasServerManager AtlasMgr)
{
try
Expand Down Expand Up @@ -81,7 +96,7 @@ public static void SaveRegConfig(AtlasServerManager AtlasMgr)
key.SetValue("ServerDataPath", AtlasMgr.ServerPath, Microsoft.Win32.RegistryValueKind.String);
key.SetValue("ServerUpdateMessage", AtlasMgr.ServerUpdateMessage.Text, Microsoft.Win32.RegistryValueKind.String);
key.SetValue("ServerUpdatingMessage", AtlasMgr.ServerUpdatingMessage.Text, Microsoft.Win32.RegistryValueKind.String);

key.SetValue("Language", AtlasMgr.GetLanguage(), Microsoft.Win32.RegistryValueKind.String);
SaveRegServers(AtlasMgr);
key.Close();
}
Expand Down Expand Up @@ -126,6 +141,7 @@ public static AtlasServerData LoadRegServer(string Srv)
if (key != null)
{
/* BOOL */

Asd.Rcon = (int)key.GetValue("Rcon", Asd.Rcon ? 1 : 0) == 1 ? true : false;
Asd.WildWipe = (int)key.GetValue("WildWipe", Asd.WildWipe ? 1 : 0) == 1 ? true : false;
Asd.PVP = (int)key.GetValue("PVP", Asd.PVP ? 1 : 0) == 1 ? true : false;
Expand Down Expand Up @@ -213,7 +229,7 @@ public static bool SaveRegServer(AtlasServerData Asd, int ActIndex, bool Default
{
key.SetValue("ProcessAffinity" + i, Asd.ProcessAffinity[i] ? 1 : 0, Microsoft.Win32.RegistryValueKind.DWord);
}

/* INT */
key.SetValue("ServerPort", Asd.ServerPort, Microsoft.Win32.RegistryValueKind.DWord);
key.SetValue("QueryPort", Asd.QueryPort, Microsoft.Win32.RegistryValueKind.DWord);
Expand All @@ -226,6 +242,7 @@ public static bool SaveRegServer(AtlasServerData Asd, int ActIndex, bool Default
key.SetValue("ProcessPriority", Asd.ProcessPriority, Microsoft.Win32.RegistryValueKind.DWord);

/* STRING */
key.SetValue("RCONIP", Asd.RCONIP, Microsoft.Win32.RegistryValueKind.String);
key.SetValue("Pass", Asd.Pass, Microsoft.Win32.RegistryValueKind.String);
key.SetValue("CustomArgs", Asd.CustomArgs, Microsoft.Win32.RegistryValueKind.String);
key.SetValue("CustomAfterArgs", Asd.CustomAfterArgs, Microsoft.Win32.RegistryValueKind.String);
Expand Down
9 changes: 7 additions & 2 deletions AtlasServerManager/Includes/Worker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,14 @@ public static void AddWorker(WorkerType Index, AtlasServerManager AtlasMgr)
public static void Init(AtlasServerManager AtlasMgr, bool StartUpdateCheck)
{
AddWorker(WorkerType.StatusUpdate, AtlasMgr);
AddWorker(WorkerType.ServerMonitor, AtlasMgr);
if (StartUpdateCheck)
if (StartUpdateCheck) {
ServerUpdater.Updating = true;
AddWorker(WorkerType.ServerUpdate, AtlasMgr);
}

AddWorker(WorkerType.ServerMonitor, AtlasMgr);


}

public static void StopUpdating()
Expand Down
3 changes: 2 additions & 1 deletion AtlasServerManager/Includes/Workers/ServerMonitor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ public static void CheckServerStatus(AtlasServerManager AtlasMgr, CancellationTo
bool SavedAfterLaunch = false;
while (true)
{
AtlasMgr.Log("123");
if (token.IsCancellationRequested) break;
AtlasMgr.Invoke((System.Windows.Forms.MethodInvoker)delegate ()
{
{
if (!ServerUpdater.Updating && AtlasMgr.BootWhenOffCheck.Checked)
{
foreach (ArkServerListViewItem ASLVI in AtlasMgr.ServerList.Items)
Expand Down
6 changes: 3 additions & 3 deletions AtlasServerManager/Includes/Workers/ServerUpdater.cs
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ private static int GetCurrentBuildID(AtlasServerManager AtlasMgr)
string UpdatePath = ASLVI.GetServerData().ServerPath;
if (UpdatePath.StartsWith("./") || UpdatePath.StartsWith(@".\")) UpdatePath = UpdatePath.Replace("./", System.AppDomain.CurrentDomain.BaseDirectory).Replace(@".\", System.AppDomain.CurrentDomain.BaseDirectory).Replace("//", "/").Replace(@"\\", @"\");

if (!Directory.Exists(Path.GetDirectoryName(UpdatePath))) Directory.CreateDirectory(Path.GetDirectoryName(UpdatePath));
if (!Directory.Exists(UpdatePath)) Directory.CreateDirectory(UpdatePath);

if (UpdatePath.Contains(@"ShooterGame\Binaries\Win64")) UpdatePath = Regex.Split(UpdatePath, "\\ShooterGame")[0];

Expand Down Expand Up @@ -178,7 +178,7 @@ private static int GetCurrentBuildID(AtlasServerManager AtlasMgr)
}
}
}
UpdatePaths.Clear();
//UpdatePaths.Clear();
return Version;
}

Expand Down Expand Up @@ -246,7 +246,7 @@ private static void UpdateAtlas(AtlasServerManager AtlasMgr, string UpdateVersio
if (!AtlasMgr.SteamWindowCheck.Checked) UpdateProcess.BeginOutputReadLine();
UpdateProcess.WaitForExit();
}
UpdatePaths.Clear();
// UpdatePaths.Clear();
}

private static void StartServers(AtlasServerManager AtlasMgr)
Expand Down
16 changes: 8 additions & 8 deletions AtlasServerManager/InputDialog.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

99 changes: 99 additions & 0 deletions AtlasServerManager/Language/zh_cn.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
{
"MainsplitContainer1-splitContainer1--menuStrip1-serverToolStripMenuItem1":"������",
"MainsplitContainer1-splitContainer1--menuStrip1-serverToolStripMenuItem1-addToolStripMenuItem1":"����",
"MainsplitContainer1-splitContainer1--menuStrip1-serverToolStripMenuItem1-removeToolStripMenuItem1":"�Ƴ�",
"MainsplitContainer1-splitContainer1--menuStrip1-serverToolStripMenuItem1-editSettingsToolStripMenuItem1":"�༭",
"MainsplitContainer1-splitContainer1--menuStrip1-managerToolStripMenuItem":"����",
"MainsplitContainer1-splitContainer1--menuStrip1-managerToolStripMenuItem-startToolStripMenuItem1":"����",
"MainsplitContainer1-splitContainer1--menuStrip1-managerToolStripMenuItem-stopToolStripMenuItem1":"�ر�",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem":"RCONѡ��",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-broadcastToolStripMenuItem2":"֪ͨ",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-saveWorldToolStripMenuItem2":"��������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-closeSaveWorldToolStripMenuItem2":"�رղ���������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-customCommandToolStripMenuItem2":"�Զ�������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-loadPluginToolStripMenuItem2":"���ز��",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONSelecteToolStripMenuItem-unloadPluginToolStripMenuItem2":"ж�ز��",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1":"RCONȫ��",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-broadcastToolStripMenuItem3":"֪ͨ",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-saveWorldToolStripMenuItem3":"��������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-closeSaveWorldToolStripMenuItem3":"�رղ���������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-customCommandToolStripMenuItem3":"�Զ�������",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-loadPluginToolStripMenuItem3":"���ز��",
"MainsplitContainer1-splitContainer1--menuStrip1-rCONAllToolStripMenuItem1-unloadPluginToolStripMenuItem3":"ж�ز��",
"MainsplitContainer1-splitContainer1--menuStrip1-languageToolStripMenuItem":"����",
"MainsplitContainer1-splitContainer1--tabControl1-tabControl1":"",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1":"������",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2":"ѡ��",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-ClearConfigButton":"��շ�����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-button1":"ǿ�Ƹ���",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3":"�������Զ�����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3":"���",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1":"�Զ�������˹��������ʾ��",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage4":"�����滻��",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage4-groupBox2":"�ڷ���������ʱ�Զ��滻����",
"MainsplitContainer1-splitContainer1--menuStrip1-menuStrip1":"menuStrip1",
"MainsplitContainer1-splitContainer1--menuStrip1-languageToolStripMenuItem-en":"English",
"MainsplitContainer1-splitContainer1--menuStrip1-languageToolStripMenuItem-zh_cn":"����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1-":"������Ŀ¼",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1--":"��Ϸ����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1---":"������������",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1----":"������������",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1-----":"״̬",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage1------":"�������",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3-label4":"ÿ��(����)���һ��",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3-label5":"���¾���(����)",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1-label3":"ÿ̨������֮��������ӳ�(��)",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1-label1":"ÿ��(��)���һ�� ",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage4-groupBox2-label2":"ȷ�������ٰ���һ��Backup INI��DB Config��",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage4-groupBox2-BackupButton":"����INI��DB Config",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3-DebugCheck":"����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3-SteamWindowCheck":"��ʾ SteamCMD(�����޸�Windows 7�ϵĸ��´���)",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage2-groupBox3-checkAutoServerUpdate":"�Զ����·�����",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1-GamePortCheck":"�����Ϸ�˿�",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1-QueryPortCheck":"��齻��˿�",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage3-groupBox1-BootWhenOffCheck":"������������",
"MainsplitContainer1-splitContainer1--tabControl1-tabPage4-groupBox2-ConfigReplaceCheck":"�ڷ���������ʱ�滻����",
"AddServergroupBox7-groupBox7":"������·��",
"AddServergroupBox7-groupBox7-BrowseButton":"����ۿ�",
"AddServerResetDefaultButton-ResetDefaultButton":"����Ĭ��",
"AddServerCloseButton-CloseButton":"�ر�",
"AddServerAddServerButton-AddServerButton":"��������",
"AddServergroupBox2-groupBox2":"Rcon����",
"AddServergroupBox2-groupBox2-label13":"�������еڶ���NICʱ����Ҫ����",
"AddServergroupBox2-groupBox2-label12":"RconIP:",
"AddServergroupBox2-groupBox2-checkBox3":"������(����֪ͨ��Ҫ)",
"AddServergroupBox2-groupBox2-label7":"Rcon�˿�:",
"AddServergroupBox1-groupBox1":"����������",
"AddServergroupBox1-groupBox1-label14":"���������������������(��-��ͷ�IJ���)",
"AddServergroupBox1-groupBox1-BattleEyeCheck":"BattleEye",
"AddServergroupBox1-groupBox1-UPNPCheck":"UPnP-�Զ��˿�ת��(����·����ѡ���ȷ����·������������UPnP)",
"AddServergroupBox1-groupBox1-label11":"���������ȼ�:",
"AddServergroupBox1-groupBox1-label10":"������IP��DNS:",
"AddServergroupBox1-groupBox1-label9":"������������:",
"AddServergroupBox1-groupBox1-label1":"������Ա:",
"AddServergroupBox1-groupBox1-label2":"������������:",
"AddServergroupBox1-groupBox1-ProcessAffinityButton":"�����׺���",
"AddServergroupBox1-groupBox1-label17":"��һ��ѡ��Save Directory",
"AddServergroupBox1-groupBox1-checkBox17":"�����ı���",
"AddServergroupBox1-groupBox1-checkBox16":"�κ��˵�ӡ��",
"AddServergroupBox1-groupBox1-checkBox15":"����",
"AddServergroupBox1-groupBox1-checkBox14":"����˹����",
"AddServergroupBox1-groupBox1-checkBox13":"3RD��",
"AddServergroupBox1-groupBox1-checkBox12":"����Gamma",
"AddServergroupBox1-groupBox1-checkBox11":"MAP��ַ",
"AddServergroupBox1-groupBox1-checkBox10":"PVP",
"AddServergroupBox1-groupBox1-label8":"������������������(���磺��globalVoiceChat=true��compityChat=true)",
"AddServergroupBox1-groupBox1-label6":"����Ա����:",
"AddServergroupBox1-groupBox1-label5":"��ѯ�˿�:",
"AddServergroupBox1-groupBox1-label4":"��Ϸ�˿�:",
"AddServergroupBox1-groupBox1-checkBox1":"������ҵ��Ұ��ŵ������",
"AddServergroupBox1-groupBox1-label3":"������:",
"RemoveServer-caption":"Delete ServerX:{0}, ServerY: {1}, Port: {2}?",
"RemoveServer-text":"Are you sure you want to delete ServerX: {0}, ServerY: {1}, Port: {2} ?\n Press 'Yes' To Delete!",
"Removed":"Removed!",
"Edited":"Edited!",
"Started":"Started!",
"Stopped":"Stopped!",
"Please_select_a_server":"Please select a server!!!",
"SavedWorld":"Saved World!"
}
22 changes: 21 additions & 1 deletion AtlasServerManager/Program.cs
Original file line number Diff line number Diff line change
@@ -1,11 +1,16 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Windows.Forms;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;

namespace AtlasServerManager
{
static class Program
{
public static JObject LanguageJObject;

/// <summary>
/// The main entry point for the application.
/// </summary>
Expand All @@ -14,7 +19,22 @@ static void Main()
{
Application.EnableVisualStyles();
Application.SetCompatibleTextRenderingDefault(false);
Application.Run(new AtlasServerManager());
string language = Includes.Registry.LoadRegkey("Language") != null ? Includes.Registry.LoadRegkey("Language").ToString() : "en";
string arkManagerPath = Path.GetDirectoryName(Application.ExecutablePath).TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar).Replace("/", @"\") + Path.DirectorySeparatorChar;
if (File.Exists(Path.GetFullPath(arkManagerPath + "/Language/" + language + ".json")))
{
//System.IO.StreamReader file1=new StreamReader(Path.GetFullPath(arkManagerPath + "/Language/" + language + ".json"),System.Text.Encoding.Default)
//using (System.IO.StreamReader file = System.IO.File.OpenText(Path.GetFullPath(arkManagerPath + "/Language/" + language + ".json"),e))
using (System.IO.StreamReader file = new StreamReader(Path.GetFullPath(arkManagerPath + "/Language/" + language + ".json"), System.Text.Encoding.Default))
{
using (JsonTextReader reader = new JsonTextReader(file))
{
LanguageJObject = (JObject)JToken.ReadFrom(reader);
}
}
}

Application.Run(new AtlasServerManager(arkManagerPath, language));
}
}
}
Loading