Merge pull request #764 from openmod/fix/unturned-warnings

Fix Unturned warnings
openmod · Oct 29, 2023 · d42835f · d42835f
2 parents 9e9e620 + 6445d04
commit d42835f
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 29 deletions.
diff --git a/unturned/OpenMod.Unturned/Building/UnturnedBuildableDirectory.cs b/unturned/OpenMod.Unturned/Building/UnturnedBuildableDirectory.cs
@@ -14,15 +14,16 @@ public class UnturnedBuildableDirectory : IBuildableDirectory
     {
         public Task<IReadOnlyCollection<IBuildableAsset>> GetBuildableAssetsAsync()
         {
-            var barricadeAssets = Assets.find(EAssetType.ITEM)
-                .Where(k => k is ItemBarricadeAsset || k is ItemStructureAsset)
-                .Select(d =>
+            var assets = new List<ItemPlaceableAsset>();
+            Assets.find(assets);
+
+            var barricadeAssets = assets
+                .ConvertAll(d =>
                 {
                     if (d is ItemBarricadeAsset barricadeAsset)
                         return new UnturnedBuildableAsset(barricadeAsset);
                     return new UnturnedBuildableAsset((ItemStructureAsset)d);
-                })
-                .ToList();
+                });
 
             return Task.FromResult<IReadOnlyCollection<IBuildableAsset>>(barricadeAssets);
         }

diff --git a/unturned/OpenMod.Unturned/Entities/UnturnedEntityDirectory.cs b/unturned/OpenMod.Unturned/Entities/UnturnedEntityDirectory.cs
@@ -1,4 +1,5 @@
 using Cysharp.Threading.Tasks;
+using MoreLinq;
 using OpenMod.API.Ioc;
 using OpenMod.API.Prioritization;
 using OpenMod.Extensions.Games.Abstractions.Entities;
@@ -36,20 +37,16 @@ public async Task<IReadOnlyCollection<IEntity>> GetEntitiesAsync()
             return entities;
         }
 
-        public async Task<IReadOnlyCollection<IEntityAsset>> GetEntityAssetsAsync()
+        public Task<IReadOnlyCollection<IEntityAsset>> GetEntityAssetsAsync()
         {
-            await UniTask.SwitchToMainThread();
-
-            var assets = new List<IEntityAsset>();
-
-            assets.AddRange(Assets.find(EAssetType.ANIMAL)
-                .Cast<AnimalAsset>()
-                .Select(d => new UnturnedAnimalAsset(d)));
+            var list = new List<AnimalAsset>();
+            Assets.find(list);
 
+            var assets = list.ConvertAll<IEntityAsset>(a => new UnturnedAnimalAsset(a));
             assets.Add(UnturnedPlayerAsset.Instance);
             assets.Add(UnturnedZombieAsset.Instance);
 
-            return assets;
+            return Task.FromResult<IReadOnlyCollection<IEntityAsset>>(assets);
         }
     }
 }
diff --git a/unturned/OpenMod.Unturned/Items/UnturnedClothingItem.cs b/unturned/OpenMod.Unturned/Items/UnturnedClothingItem.cs
@@ -58,7 +58,7 @@ async UniTask<bool> DestroyClothingPieceTask()
                 var method = GetInstanceMethod(ClothingType);
 
                 method.InvokeAndLoopback(playerClothing.GetNetId(), ENetReliability.Reliable,
-                    Provider.EnumerateClients_Remote(), Guid.Empty, 0, Array.Empty<byte>(), true);
+                    Provider.GatherRemoteClientConnections(), Guid.Empty, 0, Array.Empty<byte>(), true);
 
                 return true;
             }

diff --git a/unturned/OpenMod.Unturned/Items/UnturnedItemDirectory.cs b/unturned/OpenMod.Unturned/Items/UnturnedItemDirectory.cs
@@ -13,10 +13,11 @@ public class UnturnedItemDirectory : IItemDirectory
     {
         public Task<IReadOnlyCollection<IItemAsset>> GetItemAssetsAsync()
         {
-            var items = Assets.find(EAssetType.ITEM)
-                .Cast<ItemAsset>()
-                .Select(d => new UnturnedItemAsset(d))
-                .ToList();
+            var assets = new List<ItemAsset>();
+            Assets.find(assets);
+
+            var items = assets
+                .ConvertAll(d => new UnturnedItemAsset(d));
 
             return Task.FromResult<IReadOnlyCollection<IItemAsset>>(items);
         }

diff --git a/unturned/OpenMod.Unturned/Items/UnturnedItemDrop.cs b/unturned/OpenMod.Unturned/Items/UnturnedItemDrop.cs
@@ -77,7 +77,7 @@ async UniTask<bool> DestroyTask()
                 }
 
                 s_SendDestroyItem.Invoke(ENetReliability.Reliable,
-                    Regions.EnumerateClients(RegionX, RegionY, ItemManager.ITEM_REGIONS),
+                    Regions.GatherClientConnections(RegionX, RegionY, ItemManager.ITEM_REGIONS),
                     RegionX, RegionY, m_ItemData.instanceID, false);
 
                 return true;

diff --git a/unturned/OpenMod.Unturned/Items/UnturnedItemSpawner.cs b/unturned/OpenMod.Unturned/Items/UnturnedItemSpawner.cs
@@ -158,7 +158,7 @@ private bool TryAddItem(ItemAsset itemAsset, Item? item, UnturnedPlayerInventory
                 }
 
                 itemJar = inventory.items[page].getItem((byte)(inventory.items[page].getItemCount() - 1));
-                if (!player.equipment.isSelected && itemAsset.slot.canEquipInPage(page) && itemAsset.canPlayerEquip)
+                if (!player.equipment.HasValidUseable && itemAsset.slot.canEquipInPage(page) && itemAsset.canPlayerEquip)
                 {
                     player.equipment.ServerEquip(page, itemJar.x, itemJar.y);
                 }
@@ -180,7 +180,7 @@ private bool TryAddItemEquip(UnturnedPlayerInventory playerInventory, Item item,
             }
 
             player.equipment.sendSlot(page);
-            if (!player.equipment.isSelected)
+            if (!player.equipment.HasValidUseable)
             {
                 player.equipment.ServerEquip(page, 0, 0);
             }

diff --git a/unturned/OpenMod.Unturned/Locations/UnturnedLocation.cs b/unturned/OpenMod.Unturned/Locations/UnturnedLocation.cs
@@ -7,7 +7,7 @@ namespace OpenMod.Unturned.Locations
 {
     public class UnturnedLocation
     {
-        [Obsolete("Use constructor with " + nameof(LocationDevkitNode) + " parameter")]
+        [Obsolete("Use constructor with " + nameof(LocationDevkitNode) + " parameter", true)]
         public UnturnedLocation(LocationNode node)
         {
             throw new Exception($"Use constructor with {nameof(LocationDevkitNode)} parameter");

diff --git a/unturned/OpenMod.Unturned/OpenMod.Unturned.csproj b/unturned/OpenMod.Unturned/OpenMod.Unturned.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenMod.Unturned.Redist" Version="3.23.8">
+    <PackageReference Include="OpenMod.Unturned.Redist" Version="3.23.12-preview">
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1">

diff --git a/unturned/OpenMod.Unturned/Vehicles/UnturnedVehicleDirectory.cs b/unturned/OpenMod.Unturned/Vehicles/UnturnedVehicleDirectory.cs
@@ -3,7 +3,6 @@
 using OpenMod.Extensions.Games.Abstractions.Vehicles;
 using SDG.Unturned;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace OpenMod.Unturned.Vehicles
@@ -13,10 +12,11 @@ public class UnturnedVehicleDirectory : IVehicleDirectory
     {
         public Task<IReadOnlyCollection<IVehicleAsset>> GetVehicleAssetsAsync()
         {
-            var items = Assets.find(EAssetType.VEHICLE)
-                .Cast<VehicleAsset>()
-                .Select(d => new UnturnedVehicleAsset(d))
-                .ToList();
+            var assets = new List<VehicleAsset>();
+            Assets.find(assets);
+
+            var items = assets
+                .ConvertAll(d => new UnturnedVehicleAsset(d));
 
             return Task.FromResult<IReadOnlyCollection<IVehicleAsset>>(items);
         }