Add PeterO.CBOR

Oliver-makes-code · Dec 7, 2023 · 461de28 · 461de28
1 parent beb403b
commit 461de28
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 2 deletions.
diff --git a/Client/Client.csproj b/Client/Client.csproj
@@ -15,6 +15,7 @@
   <ItemGroup>
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
       <PackageReference Include="NLog" Version="5.2.7" />
+      <PackageReference Include="PeterO.Cbor" Version="4.5.2" />
       <PackageReference Include="Tomlyn" Version="0.16.2" />
   </ItemGroup>
 

diff --git a/Client/VoxelClient.cs b/Client/VoxelClient.cs
@@ -103,7 +103,7 @@ public override void OnTick() {
         //GameRenderer.WorldRenderer.ChunkRenderer.SetRenderPosition(camera.position);
 
         Retarget();
-        if (ConditionHelpers.IsNonNull(targetedBlock, out var tgt)) {
+        if (Conditions.IsNonNull(targetedBlock, out var tgt)) {
             if (Keybinds.Attack.justPressed) // Break
                 SetBlockAndRetarget(tgt.BlockPos, Blocks.Air);
             if (Keybinds.Use.justPressed) // Place

diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -16,6 +16,7 @@
         <PackageReference Include="FastNoiseOO" Version="1.0.0"/>
         <PackageReference Include="GlmSharp" Version="0.9.8"/>
         <PackageReference Include="NLog" Version="5.2.7" />
+        <PackageReference Include="PeterO.Cbor" Version="4.5.2" />
         <PackageReference Include="Tomlyn" Version="0.16.2"/>
     </ItemGroup>
 

diff --git a/Common/Util/ConditionHelpers.cs → Common/Util/Conditions.cs b/Common/Util/ConditionHelpers.cs → Common/Util/Conditions.cs
@@ -1,6 +1,8 @@
+using System.Diagnostics.CodeAnalysis;
+
 namespace Voxel.Common.Util; 
 
-public static class ConditionHelpers {
+public static class Conditions {
     public static bool IsNonNull<T>(T? value, out T newValue) where T : struct {
         if (value == null) {
             newValue = default;
@@ -9,4 +11,8 @@ public static bool IsNonNull<T>(T? value, out T newValue) where T : struct {
         newValue = value.Value;
         return true;
     }
+    public static bool IsNonNull<T>(T? value, [NotNullWhen(true)] out T? newValue) where T : class {
+        newValue = value;
+        return value != null;
+    }
 }
diff --git a/Test/Test.csproj b/Test/Test.csproj
@@ -18,6 +18,11 @@
 
     <ItemGroup>
       <PackageReference Include="NLog" Version="5.2.7" />
+      <PackageReference Include="PeterO.Cbor" Version="4.5.2" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Compile Remove="TestRegistry.cs" />
     </ItemGroup>
 
 </Project>