Update to 0.5.2.1

Author: purepelmen

MoreCommands-Plugin/Commands/GiveItemSpawnerCommand.cs

@@ -1,6 +1,7 @@
 using FacilityManager;
 using FacilityManager.Behaviours;
 using FacilityManager.Server;
+using MoreCommands_Plugin.Items;
 
 namespace MoreCommands_Plugin.Commands
 {
@@ -17,21 +18,19 @@ public override void Execute(CommandContext commandContext, CommandReader reader
             }
 
             Player player = Context.PlayerSpawner.GetPlayer(commandContext.Sender);
-            if (player.TryGetComponent(out HumanPlayer humanPlayer))
+            if (!player.TryGetComponent(out HumanPlayer humanPlayer))
             {
-                if (humanPlayer.Inventory.HasFreeSpace == false)
-                    commandContext.ResponseError("You don't have free space in inventory.\n");
-
-                ItemData itemData = new ItemData();
-                itemData.SetInt("item_to_spawn", itemId);
+                commandContext.ResponseError("Your player object doesn't have inventory.\n");
+            }
 
-                humanPlayer.Inventory.AddItem(Context.ItemRegistry.GetItemInfo(2), itemData);
-                commandContext.Response("Item spawner was added to your inventory.\n");
+            if (!humanPlayer.Inventory.HasFreeSpace)
+                commandContext.ResponseError("You don't have free space in inventory.\n");
 
-                return;
-            }
+            var metadata = new ModifiedKeycardMetadata();
+            metadata.ItemToSpawn = itemId;
 
-            commandContext.ResponseError("Your player object doesn't have inventory.\n");
+            humanPlayer.Inventory.AddItem(Context.ItemRegistry.GetItemInfo(2), metadata);
+            commandContext.Response("Item spawner was added to your inventory.\n");
         }
     }
 }

MoreCommands-Plugin/Commands/SetLightColorCommand.cs

@@ -6,6 +6,13 @@
 
 namespace MoreCommands_Plugin.Items
 {
+    public class ModifiedKeycardMetadata : ItemMetadata
+    {
+        public bool IsItemDefined => ItemToSpawn != -1;
+
+        public int ItemToSpawn = -1;
+    }
+
     public class ModifiedKeycard : Keycard
     {
         public ModifiedKeycard(short varaintId) : base(varaintId)
@@ -15,13 +22,20 @@ public ModifiedKeycard(short varaintId) : base(varaintId)
         public override void OnUse(HumanPlayer player, ItemUseType useType)
         {
             base.OnUse(player, useType);
-            ItemData itemData = GetItemData(player);
+            var metadata = GetMetadata<ModifiedKeycardMetadata>(player);
 
-            if (itemData.GetInt("item_to_spawn", -1) == -1) return;
-            GameObject prefab = Context.ItemRegistry.GetItemInfo(itemData.GetInt("item_to_spawn")).Prefab;
+            if (metadata.IsItemDefined)
+            {
+                GameObject prefab = Context.ItemRegistry.GetItemInfo(metadata.ItemToSpawn).Prefab;
 
-            GameObject spawnedObject = Object.Instantiate(prefab, player.transform.position + Vector3.up, Quaternion.identity);
-            NetworkServer.Spawn(spawnedObject);
+                GameObject spawnedObject = Object.Instantiate(prefab, player.transform.position + Vector3.up, Quaternion.identity);
+                NetworkServer.Spawn(spawnedObject);
+            }
+        }
+
+        public override ItemMetadata CreateMetadata()
+        {
+            return new ModifiedKeycardMetadata();
         }
     }
 }

MoreCommands-Plugin/Commands/SpawnItemCommand.cs

@@ -55,8 +55,6 @@
     <Compile Include="Commands\CloseDoorsCommand.cs" />
     <Compile Include="Commands\GiveItemSpawnerCommand.cs" />
     <Compile Include="Commands\OpenDoorsCommand.cs" />
-    <Compile Include="Commands\SetLightColorCommand.cs" />
-    <Compile Include="Commands\SpawnItemCommand.cs" />
     <Compile Include="Items\ModifiedKeycard.cs" />
     <Compile Include="MoreCommandsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

MoreCommands-Plugin/Items/ModifiedKeycard.cs

@@ -20,18 +20,16 @@ public override PluginInfo GetInfo()
 
         public override void Initialize(GameContext context)
         {
-            var commandRegistry = context.GetController<CommandRegistry>();
+            var commandRegistry = context.Get<CommandRegistry>();
 
             commandRegistry.Register("addspeed", new AddSpeedCommand());
             commandRegistry.Register("addjump", new AddJumpHeightCommand());
             commandRegistry.Register("opendoors", new OpenDoorsCommand());
             commandRegistry.Register("closedoors", new CloseDoorsCommand());
             commandRegistry.Register("itemspawner", new GiveItemSpawnerCommand());
-            commandRegistry.Register("spawnitem", new SpawnItemCommand());
-            commandRegistry.Register("lightcolor", new SetLightColorCommand());
 
-            var itemRegistry = context.GetController<ItemRegistry>();
-            itemRegistry.RegisterItem(2, new ModifiedKeycard(2));
+            var itemRegistry = context.Get<ItemRegistry>();
+            itemRegistry.RegisterItem(2, new ModifiedKeycard(1));
         }
     }
 }