Update dependency and little edit on lobbyscene

Author: SlejmUr

EIV_Game.csproj

@@ -46,16 +46,13 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="EIV_Common" Version="0.0.1.3" />
+    <PackageReference Include="EIV_Common" Version="0.0.1.8" />
     <PackageReference Include="EIV_DataPack" Version="1.0.3.1" />
-    <PackageReference Include="EIV_JsonLib" Version="2.0.1" />
+    <PackageReference Include="EIV_JsonLib" Version="2.0.4.1" />
     <PackageReference Include="ini-parser-netstandard" Version="2.5.2" />
-    <PackageReference Include="ModAPI" Version="0.0.1.1" />
+    <PackageReference Include="ModAPI" Version="0.0.2.1" />
     <PackageReference Include="SemanticVersioning" Version="2.0.2" />
   </ItemGroup>
-  <ItemGroup>
-    <Folder Include="csharp\Modding\Item\" />
-  </ItemGroup>
   <ItemGroup>
     <None Include="license.txt">
       <Pack>True</Pack>

csharp/Data/BuildEnums.cs

@@ -13,22 +13,11 @@ public abstract partial class GunBase : InventoryItemBase
 {
     Marker3D BulletSpawner;
     public virtual Gun Gun { get; set; }
-    public virtual List<Ammo> Ammos { get; set; } = [];
 
     public bool IsJammed { get; internal set; } = false;
     public override void _Ready()
     {
         BulletSpawner = GetNode<Marker3D>("BulletSpawner");
-        if (Gun.Magazine != null)
-        {
-            foreach (var item in Gun.Magazine.Ammunitions)
-            {
-                var ammo = ItemMaker.CreateItem<Ammo>(item);
-                if (ammo == null)
-                    continue;
-                Ammos.Add(ammo);
-            }
-        }
     }
 
     public virtual void Shoot()
@@ -37,9 +26,9 @@ public virtual void Shoot()
             return;
         if (IsJammed)
             return;
-        if (Ammos.Count > 0)
+        if (Gun.Magazine.Ammunitions.Count > 0)
         {
-            var ammo = Ammos.First();
+            var ammo = Gun.Magazine.Ammunitions.First();
             // Ammo doesnt have 3D representation of itself :(
             if (!ammo.HasValidAssetPath())
             {
@@ -51,7 +40,7 @@ public virtual void Shoot()
             Rpc("ShootBullet", (int)id, MemoryPackSerializer.Serialize(ammo), BulletSpawnTransform);
             GetNode<AnimationPlayer>("AnimationPlayer").Play("Shoot");
             // UI update here
-            Ammos.Remove(ammo);
+            Gun.Magazine.Ammunitions.Remove(ammo);
         }
     }
 

csharp/Data/ModData.cs

@@ -1,5 +1,6 @@
 using EIV_Common.JsonStuff;
 using EIV_JsonLib;
+using EIV_JsonLib.Extension;
 using ExtractIntoVoid.Modules;
 
 namespace ExtractIntoVoid.Items;

csharp/Data/Permissions.cs

@@ -0,0 +1,11 @@
+using EIV_JsonLib.Base;
+
+namespace ExtractIntoVoid.Items;
+
+public static class ItemExt
+{
+    public static bool HasValidAssetPath(this CoreItem item)
+    {
+        return Godot.FileAccess.FileExists(item.AssetPath) || Godot.ResourceLoader.Exists(item.AssetPath);
+    }
+}

csharp/Items/GunBase.cs

@@ -1,5 +1,5 @@
-using EIV_Common.JsonStuff;
-using EIV_JsonLib;
+using EIV_JsonLib;
+using EIV_JsonLib.Extension;
 
 namespace ExtractIntoVoid.Items;
 

csharp/Items/HealingBase.cs

@@ -6,7 +6,7 @@ namespace ExtractIntoVoid.Items;
 public abstract partial class UsableBase : InventoryItemBase
 {
     AnimationPlayer Animation;
-    public UsableItemBase UsableItem { get; set; }
+    public CoreUsable UsableItem { get; set; }
     bool IsInUse = false;
     decimal UseTime = 0;
 

csharp/Items/ItemExt.cs

@@ -1,4 +1,5 @@
-using Godot;
+using EIV_JsonLib;
+using Godot;
 using System;
 using System.IO;