diff --git a/App.config b/App.config
deleted file mode 100644
index ecdcf8a..0000000
--- a/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/Config/ConfigManager.cs b/Config/ConfigManager.cs
index 686f580..55c5397 100644
--- a/Config/ConfigManager.cs
+++ b/Config/ConfigManager.cs
@@ -1,47 +1,52 @@
-using System;
-
-namespace FikaServerTools.Config
+namespace FikaServerTools.Config
{
public static class ConfigManager
{
-
- public static FikaServerToolsConfig Load(string[] args)
+ public static FikaServerToolsConfig LoadFromArgs(string[] args)
{
- FikaServerToolsConfig config = new FikaServerToolsConfig();
+ if(args.Length == 0)
+ {
+ Console.WriteLine("No arguments provided.");
+ return null;
+ }
+
+ FikaServerToolsConfig config = new();
- try
+ string serviceName = args[0];
+
+ switch(serviceName)
{
- for (int i = 0; i < args.Length; i++)
- {
- string argName = args[i];
- string argValue = args[i + 1];
+ case "-NatPunchServer":
+ config.NatPunchServer.Enable = true;
- switch (argName)
+ for (int i = 1; i < args.Length; i++)
{
- case "-NatPunchServer":
- config.NatPunchServer.Enable = true;
- break;
- case "-IP":
- config.NatPunchServer.IP = argValue;
- i++;
- break;
- case "-Port":
- config.NatPunchServer.Port = int.Parse(argValue);
- i++;
- break;
- case "-NatIntroduceAmount":
- config.NatPunchServer.NatIntroduceAmount = int.Parse(argValue);
- i++;
- break;
- default:
- Logger.LogError($"Invalid argument provided: {argName}");
- break;
+ string arg = args[i];
+
+ switch (arg)
+ {
+ case "-IP":
+ config.NatPunchServer.IP = args[i + 1];
+ i++;
+ break;
+ case "-Port":
+ config.NatPunchServer.Port = int.Parse(args[i + 1]);
+ i++;
+ break;
+ case "-NatIntroduceAmount":
+ config.NatPunchServer.NatIntroduceAmount = int.Parse(args[i + 1]);
+ i++;
+ break;
+ default:
+ Console.WriteLine($"Unknown argument provided: {arg}");
+ break;
+ }
}
- }
- }
- catch (Exception ex)
- {
- Logger.LogError(ex.Message);
+ break;
+ default:
+ Console.WriteLine($"Unknown service name provided: {serviceName}");
+ break;
+
}
return config;
diff --git a/FikaServerTools.cs b/FikaServerTools.cs
index e81e3c3..0895380 100644
--- a/FikaServerTools.cs
+++ b/FikaServerTools.cs
@@ -1,32 +1,34 @@
using FikaServerTools.Config;
using FikaServerTools.Networking;
-using System.Threading;
namespace FikaServerTools
{
internal class FikaServerTools
{
- public static FikaServerToolsConfig Config { get; set; }
+ public static FikaServerToolsConfig Config;
private static FikaNatPunchServer _fikaNatPunchServer;
static void Main(string[] args)
{
- Config = ConfigManager.Load(args);
+ Config = ConfigManager.LoadFromArgs(args);
- Logger.LogInfo("FikaServerTools started!");
+ if (Config == null)
+ {
+ Console.WriteLine("Unable to load configuration from arguments.");
+ return;
+ }
- if(Config.NatPunchServer.Enable)
+ if (Config.NatPunchServer.Enable)
{
_fikaNatPunchServer = new FikaNatPunchServer(Config.NatPunchServer);
_fikaNatPunchServer.Start();
- }
- // Main thread loop
- while(true)
- {
- _fikaNatPunchServer?.PollEvents();
- Thread.Sleep(10);
+ while (true)
+ {
+ _fikaNatPunchServer.PollEvents();
+ Thread.Sleep(10);
+ }
}
}
}
-}
\ No newline at end of file
+}
diff --git a/FikaServerTools.csproj b/FikaServerTools.csproj
index aa93b06..cdd80cd 100644
--- a/FikaServerTools.csproj
+++ b/FikaServerTools.csproj
@@ -1,98 +1,12 @@
-
-
-
+
+
- Debug
- AnyCPU
- {4C300ECA-8244-4B95-94DD-03A9339B5C5B}
Exe
+ net8.0
FikaServerTools
- FikaServerTools
- v4.7.2
- 512
- true
- true
-
-
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
- true
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
+ enable
+ disable
true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
+
+
diff --git a/FikaServerTools.sln b/FikaServerTools.sln
index 9435614..3246944 100644
--- a/FikaServerTools.sln
+++ b/FikaServerTools.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.8.34316.72
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FikaServerTools", "FikaServerTools.csproj", "{4C300ECA-8244-4B95-94DD-03A9339B5C5B}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FikaServerTools", "FikaServerTools.csproj", "{33C237C6-FA39-4ECC-B3E0-56AB8066EDDC}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -11,15 +11,15 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {4C300ECA-8244-4B95-94DD-03A9339B5C5B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4C300ECA-8244-4B95-94DD-03A9339B5C5B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4C300ECA-8244-4B95-94DD-03A9339B5C5B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4C300ECA-8244-4B95-94DD-03A9339B5C5B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {33C237C6-FA39-4ECC-B3E0-56AB8066EDDC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {33C237C6-FA39-4ECC-B3E0-56AB8066EDDC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {33C237C6-FA39-4ECC-B3E0-56AB8066EDDC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {33C237C6-FA39-4ECC-B3E0-56AB8066EDDC}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {05334491-DF7D-4076-8190-0E823AEB8FA6}
+ SolutionGuid = {0EEC13BF-D8EB-45ED-A35A-48AD08CEC215}
EndGlobalSection
EndGlobal
diff --git a/LICENSE.md b/LICENSE.md
deleted file mode 100644
index cbe5ad1..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,437 +0,0 @@
-Attribution-NonCommercial-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
- Considerations for licensors: Our public licenses are
- intended for use by those authorized to give the public
- permission to use material in ways otherwise restricted by
- copyright and certain other rights. Our licenses are
- irrevocable. Licensors should read and understand the terms
- and conditions of the license they choose before applying it.
- Licensors should also secure all rights necessary before
- applying our licenses so that the public can reuse the
- material as expected. Licensors should clearly mark any
- material not subject to the license. This includes other CC-
- licensed material, or material used under an exception or
- limitation to copyright. More considerations for licensors:
- wiki.creativecommons.org/Considerations_for_licensors
-
- Considerations for the public: By using one of our public
- licenses, a licensor grants the public permission to use the
- licensed material under specified terms and conditions. If
- the licensor's permission is not necessary for any reason--for
- example, because of any applicable exception or limitation to
- copyright--then that use is not regulated by the license. Our
- licenses grant only permissions under copyright and certain
- other rights that a licensor has authority to grant. Use of
- the licensed material may still be restricted for other
- reasons, including because others have copyright or other
- rights in the material. A licensor may make special requests,
- such as asking that all changes be marked or described.
- Although not required by our licenses, you are encouraged to
- respect those requests where reasonable. More considerations
- for the public:
- wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-NonCommercial-ShareAlike 4.0 International
-Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-NonCommercial-ShareAlike 4.0 International Public License
-("Public License"). To the extent this Public License may be
-interpreted as a contract, You are granted the Licensed Rights in
-consideration of Your acceptance of these terms and conditions, and the
-Licensor grants You such rights in consideration of benefits the
-Licensor receives from making the Licensed Material available under
-these terms and conditions.
-
-
-Section 1 -- Definitions.
-
- a. Adapted Material means material subject to Copyright and Similar
- Rights that is derived from or based upon the Licensed Material
- and in which the Licensed Material is translated, altered,
- arranged, transformed, or otherwise modified in a manner requiring
- permission under the Copyright and Similar Rights held by the
- Licensor. For purposes of this Public License, where the Licensed
- Material is a musical work, performance, or sound recording,
- Adapted Material is always produced where the Licensed Material is
- synched in timed relation with a moving image.
-
- b. Adapter's License means the license You apply to Your Copyright
- and Similar Rights in Your contributions to Adapted Material in
- accordance with the terms and conditions of this Public License.
-
- c. BY-NC-SA Compatible License means a license listed at
- creativecommons.org/compatiblelicenses, approved by Creative
- Commons as essentially the equivalent of this Public License.
-
- d. Copyright and Similar Rights means copyright and/or similar rights
- closely related to copyright including, without limitation,
- performance, broadcast, sound recording, and Sui Generis Database
- Rights, without regard to how the rights are labeled or
- categorized. For purposes of this Public License, the rights
- specified in Section 2(b)(1)-(2) are not Copyright and Similar
- Rights.
-
- e. Effective Technological Measures means those measures that, in the
- absence of proper authority, may not be circumvented under laws
- fulfilling obligations under Article 11 of the WIPO Copyright
- Treaty adopted on December 20, 1996, and/or similar international
- agreements.
-
- f. Exceptions and Limitations means fair use, fair dealing, and/or
- any other exception or limitation to Copyright and Similar Rights
- that applies to Your use of the Licensed Material.
-
- g. License Elements means the license attributes listed in the name
- of a Creative Commons Public License. The License Elements of this
- Public License are Attribution, NonCommercial, and ShareAlike.
-
- h. Licensed Material means the artistic or literary work, database,
- or other material to which the Licensor applied this Public
- License.
-
- i. Licensed Rights means the rights granted to You subject to the
- terms and conditions of this Public License, which are limited to
- all Copyright and Similar Rights that apply to Your use of the
- Licensed Material and that the Licensor has authority to license.
-
- j. Licensor means the individual(s) or entity(ies) granting rights
- under this Public License.
-
- k. NonCommercial means not primarily intended for or directed towards
- commercial advantage or monetary compensation. For purposes of
- this Public License, the exchange of the Licensed Material for
- other material subject to Copyright and Similar Rights by digital
- file-sharing or similar means is NonCommercial provided there is
- no payment of monetary compensation in connection with the
- exchange.
-
- l. Share means to provide material to the public by any means or
- process that requires permission under the Licensed Rights, such
- as reproduction, public display, public performance, distribution,
- dissemination, communication, or importation, and to make material
- available to the public including in ways that members of the
- public may access the material from a place and at a time
- individually chosen by them.
-
- m. Sui Generis Database Rights means rights other than copyright
- resulting from Directive 96/9/EC of the European Parliament and of
- the Council of 11 March 1996 on the legal protection of databases,
- as amended and/or succeeded, as well as other essentially
- equivalent rights anywhere in the world.
-
- n. You means the individual or entity exercising the Licensed Rights
- under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
- a. License grant.
-
- 1. Subject to the terms and conditions of this Public License,
- the Licensor hereby grants You a worldwide, royalty-free,
- non-sublicensable, non-exclusive, irrevocable license to
- exercise the Licensed Rights in the Licensed Material to:
-
- a. reproduce and Share the Licensed Material, in whole or
- in part, for NonCommercial purposes only; and
-
- b. produce, reproduce, and Share Adapted Material for
- NonCommercial purposes only.
-
- 2. Exceptions and Limitations. For the avoidance of doubt, where
- Exceptions and Limitations apply to Your use, this Public
- License does not apply, and You do not need to comply with
- its terms and conditions.
-
- 3. Term. The term of this Public License is specified in Section
- 6(a).
-
- 4. Media and formats; technical modifications allowed. The
- Licensor authorizes You to exercise the Licensed Rights in
- all media and formats whether now known or hereafter created,
- and to make technical modifications necessary to do so. The
- Licensor waives and/or agrees not to assert any right or
- authority to forbid You from making technical modifications
- necessary to exercise the Licensed Rights, including
- technical modifications necessary to circumvent Effective
- Technological Measures. For purposes of this Public License,
- simply making modifications authorized by this Section 2(a)
- (4) never produces Adapted Material.
-
- 5. Downstream recipients.
-
- a. Offer from the Licensor -- Licensed Material. Every
- recipient of the Licensed Material automatically
- receives an offer from the Licensor to exercise the
- Licensed Rights under the terms and conditions of this
- Public License.
-
- b. Additional offer from the Licensor -- Adapted Material.
- Every recipient of Adapted Material from You
- automatically receives an offer from the Licensor to
- exercise the Licensed Rights in the Adapted Material
- under the conditions of the Adapter's License You apply.
-
- c. No downstream restrictions. You may not offer or impose
- any additional or different terms or conditions on, or
- apply any Effective Technological Measures to, the
- Licensed Material if doing so restricts exercise of the
- Licensed Rights by any recipient of the Licensed
- Material.
-
- 6. No endorsement. Nothing in this Public License constitutes or
- may be construed as permission to assert or imply that You
- are, or that Your use of the Licensed Material is, connected
- with, or sponsored, endorsed, or granted official status by,
- the Licensor or others designated to receive attribution as
- provided in Section 3(a)(1)(A)(i).
-
- b. Other rights.
-
- 1. Moral rights, such as the right of integrity, are not
- licensed under this Public License, nor are publicity,
- privacy, and/or other similar personality rights; however, to
- the extent possible, the Licensor waives and/or agrees not to
- assert any such rights held by the Licensor to the limited
- extent necessary to allow You to exercise the Licensed
- Rights, but not otherwise.
-
- 2. Patent and trademark rights are not licensed under this
- Public License.
-
- 3. To the extent possible, the Licensor waives any right to
- collect royalties from You for the exercise of the Licensed
- Rights, whether directly or through a collecting society
- under any voluntary or waivable statutory or compulsory
- licensing scheme. In all other cases the Licensor expressly
- reserves any right to collect such royalties, including when
- the Licensed Material is used other than for NonCommercial
- purposes.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
- a. Attribution.
-
- 1. If You Share the Licensed Material (including in modified
- form), You must:
-
- a. retain the following if it is supplied by the Licensor
- with the Licensed Material:
-
- i. identification of the creator(s) of the Licensed
- Material and any others designated to receive
- attribution, in any reasonable manner requested by
- the Licensor (including by pseudonym if
- designated);
-
- ii. a copyright notice;
-
- iii. a notice that refers to this Public License;
-
- iv. a notice that refers to the disclaimer of
- warranties;
-
- v. a URI or hyperlink to the Licensed Material to the
- extent reasonably practicable;
-
- b. indicate if You modified the Licensed Material and
- retain an indication of any previous modifications; and
-
- c. indicate the Licensed Material is licensed under this
- Public License, and include the text of, or the URI or
- hyperlink to, this Public License.
-
- 2. You may satisfy the conditions in Section 3(a)(1) in any
- reasonable manner based on the medium, means, and context in
- which You Share the Licensed Material. For example, it may be
- reasonable to satisfy the conditions by providing a URI or
- hyperlink to a resource that includes the required
- information.
- 3. If requested by the Licensor, You must remove any of the
- information required by Section 3(a)(1)(A) to the extent
- reasonably practicable.
-
- b. ShareAlike.
-
- In addition to the conditions in Section 3(a), if You Share
- Adapted Material You produce, the following conditions also apply.
-
- 1. The Adapter's License You apply must be a Creative Commons
- license with the same License Elements, this version or
- later, or a BY-NC-SA Compatible License.
-
- 2. You must include the text of, or the URI or hyperlink to, the
- Adapter's License You apply. You may satisfy this condition
- in any reasonable manner based on the medium, means, and
- context in which You Share Adapted Material.
-
- 3. You may not offer or impose any additional or different terms
- or conditions on, or apply any Effective Technological
- Measures to, Adapted Material that restrict exercise of the
- rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
- a. for the avoidance of doubt, Section 2(a)(1) grants You the right
- to extract, reuse, reproduce, and Share all or a substantial
- portion of the contents of the database for NonCommercial purposes
- only;
-
- b. if You include all or a substantial portion of the database
- contents in a database in which You have Sui Generis Database
- Rights, then the database in which You have Sui Generis Database
- Rights (but not its individual contents) is Adapted Material,
- including for purposes of Section 3(b); and
-
- c. You must comply with the conditions in Section 3(a) if You Share
- all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
- a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
- EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
- AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
- ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
- IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
- WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
- PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
- ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
- KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
- ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
- b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
- TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
- NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
- INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
- COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
- USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
- ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
- DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
- IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
- c. The disclaimer of warranties and limitation of liability provided
- above shall be interpreted in a manner that, to the extent
- possible, most closely approximates an absolute disclaimer and
- waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
- a. This Public License applies for the term of the Copyright and
- Similar Rights licensed here. However, if You fail to comply with
- this Public License, then Your rights under this Public License
- terminate automatically.
-
- b. Where Your right to use the Licensed Material has terminated under
- Section 6(a), it reinstates:
-
- 1. automatically as of the date the violation is cured, provided
- it is cured within 30 days of Your discovery of the
- violation; or
-
- 2. upon express reinstatement by the Licensor.
-
- For the avoidance of doubt, this Section 6(b) does not affect any
- right the Licensor may have to seek remedies for Your violations
- of this Public License.
-
- c. For the avoidance of doubt, the Licensor may also offer the
- Licensed Material under separate terms or conditions or stop
- distributing the Licensed Material at any time; however, doing so
- will not terminate this Public License.
-
- d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
- License.
-
-
-Section 7 -- Other Terms and Conditions.
-
- a. The Licensor shall not be bound by any additional or different
- terms or conditions communicated by You unless expressly agreed.
-
- b. Any arrangements, understandings, or agreements regarding the
- Licensed Material not stated herein are separate from and
- independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
- a. For the avoidance of doubt, this Public License does not, and
- shall not be interpreted to, reduce, limit, restrict, or impose
- conditions on any use of the Licensed Material that could lawfully
- be made without permission under this Public License.
-
- b. To the extent possible, if any provision of this Public License is
- deemed unenforceable, it shall be automatically reformed to the
- minimum extent necessary to make it enforceable. If the provision
- cannot be reformed, it shall be severed from this Public License
- without affecting the enforceability of the remaining terms and
- conditions.
-
- c. No term or condition of this Public License will be waived and no
- failure to comply consented to unless expressly agreed to by the
- Licensor.
-
- d. Nothing in this Public License constitutes or may be interpreted
- as a limitation upon, or waiver of, any privileges and immunities
- that apply to the Licensor or You, including from the legal
- processes of any jurisdiction or authority.
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/Logger.cs b/Logger.cs
deleted file mode 100644
index e1af8f4..0000000
--- a/Logger.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace FikaServerTools
-{
- public static class EscapeSequences
- {
- public static string NORMAL = Console.IsOutputRedirected ? "" : "\x1b[39m";
- public static string RED = Console.IsOutputRedirected ? "" : "\x1b[91m";
- public static string GREEN = Console.IsOutputRedirected ? "" : "\x1b[92m";
- public static string YELLOW = Console.IsOutputRedirected ? "" : "\x1b[93m";
- public static string BLUE = Console.IsOutputRedirected ? "" : "\x1b[94m";
- public static string MAGENTA = Console.IsOutputRedirected ? "" : "\x1b[95m";
- public static string CYAN = Console.IsOutputRedirected ? "" : "\x1b[96m";
- public static string GREY = Console.IsOutputRedirected ? "" : "\x1b[97m";
- public static string BOLD = Console.IsOutputRedirected ? "" : "\x1b[1m";
- public static string NOBOLD = Console.IsOutputRedirected ? "" : "\x1b[22m";
- public static string UNDERLINE = Console.IsOutputRedirected ? "" : "\x1b[4m";
- public static string NOUNDERLINE = Console.IsOutputRedirected ? "" : "\x1b[24m";
- public static string REVERSE = Console.IsOutputRedirected ? "" : "\x1b[7m";
- public static string NOREVERSE = Console.IsOutputRedirected ? "" : "\x1b[27m";
- }
-
- public static class Logger
- {
- public static void LogInfo(string message)
- {
- Console.WriteLine($"{EscapeSequences.NORMAL}{message}");
- }
-
- public static void LogSuccess(string message)
- {
- Console.WriteLine($"{EscapeSequences.GREEN}{message}");
- }
-
- public static void LogWarning(string message)
- {
- Console.WriteLine($"{EscapeSequences.YELLOW}{message}");
- }
-
- public static void LogError(string message)
- {
- Console.WriteLine($"{EscapeSequences.RED}{message}");
- }
- }
-}
diff --git a/Networking/FikaNatPunchServer.cs b/Networking/FikaNatPunchServer.cs
index 76d054c..09e718f 100644
--- a/Networking/FikaNatPunchServer.cs
+++ b/Networking/FikaNatPunchServer.cs
@@ -50,11 +50,11 @@ public void Start()
_netServer.Start(_config.IP, "", _config.Port);
_netServer.NatPunchModule.Init(this);
- Logger.LogSuccess($"NatPunchServer started on {_config.IP}:{NetServer.LocalPort}");
+ Console.WriteLine($"NatPunchServer started on {_config.IP}:{NetServer.LocalPort}");
}
catch (Exception ex)
{
- Logger.LogError($"NatPunchServer failed to start: {ex.Message}");
+ Console.WriteLine($"NatPunchServer failed to start: {ex.Message}");
}
}
@@ -82,7 +82,7 @@ public void OnNatIntroductionRequest(IPEndPoint localEndPoint, IPEndPoint remote
}
catch(Exception ex)
{
- Logger.LogError($"Error when parsing NatIntroductionRequest: {ex.Message}");
+ Console.WriteLine($"Error when parsing NatIntroductionRequest: {ex.Message}");
return;
}
@@ -91,7 +91,7 @@ public void OnNatIntroductionRequest(IPEndPoint localEndPoint, IPEndPoint remote
case "server":
if (!_servers.TryGetValue(sessionId, out sPeer))
{
- Logger.LogInfo($"Added {sessionId} ({remoteEndPoint}) to server list.");
+ Console.WriteLine($"Added {sessionId} ({remoteEndPoint}) to server list.");
}
_servers[sessionId] = new ServerPeer(localEndPoint, remoteEndPoint);
@@ -100,7 +100,7 @@ public void OnNatIntroductionRequest(IPEndPoint localEndPoint, IPEndPoint remote
case "client":
if (_servers.TryGetValue(sessionId, out sPeer))
{
- Logger.LogInfo($"Introducing server {sessionId} ({sPeer.ExternalAddr}) to client ({remoteEndPoint})");
+ Console.WriteLine($"Introducing server {sessionId} ({sPeer.ExternalAddr}) to client ({remoteEndPoint})");
for(int i = 0; i < _config.NatIntroduceAmount; i++)
{
@@ -115,12 +115,12 @@ public void OnNatIntroductionRequest(IPEndPoint localEndPoint, IPEndPoint remote
}
else
{
- Logger.LogError($"Unknown ServerId provided by client.");
+ Console.WriteLine($"Unknown ServerId provided by client.");
}
break;
default:
- Logger.LogError($"Unknown request received: {token}");
+ Console.WriteLine($"Unknown request received: {token}");
break;
}
diff --git a/Networking/LiteNetLib/NatPunchModule.cs b/Networking/LiteNetLib/NatPunchModule.cs
index 476d9ef..895c09a 100644
--- a/Networking/LiteNetLib/NatPunchModule.cs
+++ b/Networking/LiteNetLib/NatPunchModule.cs
@@ -1,5 +1,6 @@
using LiteNetLib.Utils;
using System.Collections.Concurrent;
+using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Net.Sockets;
diff --git a/Networking/LiteNetLib/Utils/NetPacketProcessor.cs b/Networking/LiteNetLib/Utils/NetPacketProcessor.cs
index 9c240d1..b26252c 100644
--- a/Networking/LiteNetLib/Utils/NetPacketProcessor.cs
+++ b/Networking/LiteNetLib/Utils/NetPacketProcessor.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
namespace LiteNetLib.Utils
{
diff --git a/Networking/LiteNetLib/Utils/NetSerializer.cs b/Networking/LiteNetLib/Utils/NetSerializer.cs
index 975b2b5..3566087 100644
--- a/Networking/LiteNetLib/Utils/NetSerializer.cs
+++ b/Networking/LiteNetLib/Utils/NetSerializer.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
using System.Net;
using System.Reflection;
using System.Runtime.Serialization;
diff --git a/Properties/AssemblyInfo.cs b/Properties/AssemblyInfo.cs
deleted file mode 100644
index b3915d3..0000000
--- a/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("FikaNatPunchServer")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("FikaNatPunchServer")]
-[assembly: AssemblyCopyright("Copyright © 2024")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("4c300eca-8244-4b95-94dd-03a9339b5c5b")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/README.md b/README.md
deleted file mode 100644
index 315cb2c..0000000
--- a/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-# Fika-ServerTools
-C# LiteNetLib server for features such as NAT Punching, relay networking, etc.
diff --git a/packages.config b/packages.config
deleted file mode 100644
index e46d5a8..0000000
--- a/packages.config
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
-
-
\ No newline at end of file