Moving configuration & figuredata to a config folder.

Sledmore · Dec 18, 2017 · 7f9c1a6 · 7f9c1a6
1 parent 87782d4
commit 7f9c1a6
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 3 deletions.
diff --git a/Config/config.ini b/Config/config.ini
@@ -0,0 +1,27 @@
+## MySQL Configuration
+db.hostname=127.0.0.1
+db.port=3306
+db.username=root
+db.password=password
+db.name=plus
+
+## MySQL pooling setup (controls amount of connections)
+db.pool.minsize=5
+db.pool.maxsize=65
+
+## Game TCP/IP Configuration
+game.tcp.bindip=127.0.0.1
+game.tcp.port=1232
+game.tcp.conlimit=100000
+game.tcp.conperip=50000
+game.tcp.enablenagles=true
+
+## MUS TCP/IP Configuration
+rcon.tcp.bindip=127.0.0.1
+rcon.tcp.port=30001
+rcon.tcp.allowedaddr=localhost;127.0.0.1
+
+## Client configuration
+client.ping.enabled=1
+client.ping.interval=30000
+client.maxrequests=300
diff --git a/Config/figuredata.xml b/Config/figuredata.xml
diff --git a/Core/FigureData/FigureDataManager.cs b/Core/FigureData/FigureDataManager.cs
@@ -7,6 +7,7 @@
 using System.Xml;
 using Plus.HabboHotel.Catalog.Clothing;
 using Plus.HabboHotel.Users.Clothing.Parts;
+using System.IO;
 
 namespace Plus.Core.FigureData
 {
@@ -38,8 +39,11 @@ public void Init()
             if (this._setTypes.Count > 0)
                 this._setTypes.Clear();
 
+
+            string projectSolutionPath = Path.GetDirectoryName(Path.GetDirectoryName(Directory.GetCurrentDirectory()));
+
             XmlDocument xDoc = new XmlDocument();
-            xDoc.Load(@"extra/figuredata.xml");
+            xDoc.Load(projectSolutionPath + "\\Config\\figuredata.xml");
 
             XmlNodeList Colors = xDoc.GetElementsByTagName("colors");
             foreach (XmlNode Node in Colors)

diff --git a/Plus Emulator.csproj b/Plus Emulator.csproj
@@ -1074,12 +1074,14 @@
     </BootstrapperPackage>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Config\figuredata.xml" />
     <Content Include="icon.ico" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config">
       <SubType>Designer</SubType>
     </None>
+    <None Include="Config\config.ini" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>

diff --git a/PlusEnvironment.cs b/PlusEnvironment.cs
@@ -92,7 +92,9 @@ public static void Initialize()
 
             try
             {
-                _configuration = new ConfigurationData(Path.Combine(Application.StartupPath, @"config.ini"));
+                string projectSolutionPath = Path.GetDirectoryName(Path.GetDirectoryName(Directory.GetCurrentDirectory()));
+
+                _configuration = new ConfigurationData(projectSolutionPath + "\\Config\\config.ini");
 
                 var connectionString = new MySqlConnectionStringBuilder
                 {
@@ -146,7 +148,7 @@ public static void Initialize()
                 HabboEncryptionV2.Initialize(new RSAKeys());
 
                 //Make sure Rcon is connected before we allow clients to connect.
-                _Rcon = new RconSocket(GetConfig().data["Rcon.tcp.bindip"], int.Parse(GetConfig().data["Rcon.tcp.port"]), GetConfig().data["Rcon.tcp.allowedaddr"].Split(Convert.ToChar(";")));
+                _Rcon = new RconSocket(GetConfig().data["rcon.tcp.bindip"], int.Parse(GetConfig().data["rcon.tcp.port"]), GetConfig().data["rcon.tcp.allowedaddr"].Split(Convert.ToChar(";")));
 
                 //Accept connections.
                 _connectionManager = new ConnectionHandling(int.Parse(GetConfig().data["game.tcp.port"]), int.Parse(GetConfig().data["game.tcp.conlimit"]), int.Parse(GetConfig().data["game.tcp.conperip"]), GetConfig().data["game.tcp.enablenagles"].ToLower() == "true");