diff --git a/Directory.Build.props b/Directory.Build.props
index f4e7933..c18cbd4 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -7,5 +7,18 @@
true
true
+
+ 2.0.0
+ dev
+
+ NuclearPowered
+ icon.png
+ git
+ https://github.com/NuclearPowered/Reactor
+ LGPL-3.0-or-later
+
+
+
+
diff --git a/Reactor.Shared/Networking/Mod.cs b/Reactor.Networking.Shared/Mod.cs
similarity index 89%
rename from Reactor.Shared/Networking/Mod.cs
rename to Reactor.Networking.Shared/Mod.cs
index 2532ab8..7a600bb 100644
--- a/Reactor.Shared/Networking/Mod.cs
+++ b/Reactor.Networking.Shared/Mod.cs
@@ -8,7 +8,7 @@ using System.Text;
namespace Reactor.Networking;
-public struct Mod
+public readonly struct Mod
{
public Mod(string id, string version, ModFlags flags, string? name = null)
{
@@ -35,6 +35,16 @@ public struct Mod
return obj is Mod other && Equals(other);
}
+ public static bool operator ==(Mod left, Mod right)
+ {
+ return left.Equals(right);
+ }
+
+ public static bool operator !=(Mod left, Mod right)
+ {
+ return !(left == right);
+ }
+
public override int GetHashCode()
{
return HashCode.Combine(Id, Version);
diff --git a/Reactor.Shared/ModFlags.cs b/Reactor.Networking.Shared/ModFlags.cs
similarity index 93%
rename from Reactor.Shared/ModFlags.cs
rename to Reactor.Networking.Shared/ModFlags.cs
index d9f8c09..58c361f 100644
--- a/Reactor.Shared/ModFlags.cs
+++ b/Reactor.Networking.Shared/ModFlags.cs
@@ -1,6 +1,6 @@
using System;
-namespace Reactor;
+namespace Reactor.Networking;
[Flags]
public enum ModFlags : ushort
diff --git a/Reactor.Networking.Shared/Reactor.Networking.Shared.csproj b/Reactor.Networking.Shared/Reactor.Networking.Shared.csproj
new file mode 100644
index 0000000..9402022
--- /dev/null
+++ b/Reactor.Networking.Shared/Reactor.Networking.Shared.csproj
@@ -0,0 +1,34 @@
+
+
+
+
+ net6.0
+ Reactor.Networking
+
+ Shared sources for Reactor.Networking (Reactor and Reactor.Impostor)
+
+ contentFiles
+ true
+ false
+ false
+ false
+ true
+ true
+ true
+
+
+
+
+ true
+ $(ContentTargetFolders)\cs\any\$(PackageId)\%(RecursiveDir)\
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Reactor.Shared/Networking/ReactorGameDataFlag.cs b/Reactor.Networking.Shared/ReactorGameDataFlag.cs
similarity index 100%
rename from Reactor.Shared/Networking/ReactorGameDataFlag.cs
rename to Reactor.Networking.Shared/ReactorGameDataFlag.cs
diff --git a/Reactor.Shared/Networking/ReactorMessageFlags.cs b/Reactor.Networking.Shared/ReactorMessageFlags.cs
similarity index 100%
rename from Reactor.Shared/Networking/ReactorMessageFlags.cs
rename to Reactor.Networking.Shared/ReactorMessageFlags.cs
diff --git a/Reactor.Shared/Networking/ReactorProtocolVersion.cs b/Reactor.Networking.Shared/ReactorProtocolVersion.cs
similarity index 100%
rename from Reactor.Shared/Networking/ReactorProtocolVersion.cs
rename to Reactor.Networking.Shared/ReactorProtocolVersion.cs
diff --git a/Reactor.Networking.Shared/packages.lock.json b/Reactor.Networking.Shared/packages.lock.json
new file mode 100644
index 0000000..2fca7fd
--- /dev/null
+++ b/Reactor.Networking.Shared/packages.lock.json
@@ -0,0 +1,6 @@
+{
+ "version": 1,
+ "dependencies": {
+ "net6.0": {}
+ }
+}
\ No newline at end of file
diff --git a/Reactor.Shared/Reactor.Shared.projitems b/Reactor.Shared/Reactor.Shared.projitems
deleted file mode 100644
index 9c4059e..0000000
--- a/Reactor.Shared/Reactor.Shared.projitems
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/Reactor.Shared/Reactor.Shared.shproj b/Reactor.Shared/Reactor.Shared.shproj
deleted file mode 100644
index 43dae88..0000000
--- a/Reactor.Shared/Reactor.Shared.shproj
+++ /dev/null
@@ -1,3 +0,0 @@
-
-
-
diff --git a/Reactor.sln b/Reactor.sln
index 5733e5d..1d1945a 100644
--- a/Reactor.sln
+++ b/Reactor.sln
@@ -5,10 +5,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Debugger", "Reactor
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Example", "Reactor.Example\Reactor.Example.csproj", "{26A83466-26FE-4383-A35C-B8629902F909}"
EndProject
-Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Reactor.Shared", "Reactor.Shared\Reactor.Shared.shproj", "{8C1EEFE9-EF8A-47C4-810E-6D9BA1E7218B}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Benchmarks", "Reactor.Benchmarks\Reactor.Benchmarks.csproj", "{99B87307-3AEB-4A6A-BF45-871768308FDD}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Reactor.Networking.Shared", "Reactor.Networking.Shared\Reactor.Networking.Shared.csproj", "{1E68CA20-22EB-4E57-B525-81970BE6363D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -31,6 +31,10 @@ Global
{99B87307-3AEB-4A6A-BF45-871768308FDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{99B87307-3AEB-4A6A-BF45-871768308FDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{99B87307-3AEB-4A6A-BF45-871768308FDD}.Release|Any CPU.Build.0 = Release|Any CPU
+ {1E68CA20-22EB-4E57-B525-81970BE6363D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {1E68CA20-22EB-4E57-B525-81970BE6363D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {1E68CA20-22EB-4E57-B525-81970BE6363D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {1E68CA20-22EB-4E57-B525-81970BE6363D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
EndGlobalSection
diff --git a/Reactor/Reactor.csproj b/Reactor/Reactor.csproj
index b79f44f..7106a28 100644
--- a/Reactor/Reactor.csproj
+++ b/Reactor/Reactor.csproj
@@ -2,15 +2,8 @@
latest
- 2.0.0
- dev
Core mod and API for Among Us
- NuclearPowered
- icon.png
- git
- https://github.com/NuclearPowered/Reactor
- LGPL-3.0-or-later
true
@@ -21,14 +14,12 @@
+
-
-
-
diff --git a/Reactor/ReactorModFlagsAttribute.cs b/Reactor/ReactorModFlagsAttribute.cs
index 18e8b0e..1689c4c 100644
--- a/Reactor/ReactorModFlagsAttribute.cs
+++ b/Reactor/ReactorModFlagsAttribute.cs
@@ -1,6 +1,7 @@
using System;
using System.Linq;
using System.Reflection;
+using Reactor.Networking;
namespace Reactor;
diff --git a/Reactor/Assets/icon.png b/assets/icon.png
similarity index 100%
rename from Reactor/Assets/icon.png
rename to assets/icon.png