Fix CanCraft option

Author: RestoreMonarchy

BlacklistedItems/BlacklistedItems.csproj

@@ -3,7 +3,7 @@
 	<PropertyGroup>
 		<TargetFramework>net48</TargetFramework>
 		<LangVersion>latest</LangVersion>
-		<Version>1.0.0</Version>
+		<Version>1.0.1</Version>
 		<RootNamespace>RestoreMonarchy.BlacklistedItems</RootNamespace>
 	</PropertyGroup>
 

BlacklistedItems/BlacklistedItemsPlugin.cs

@@ -33,7 +33,7 @@ protected override void Load()
             MessageColor = UnturnedChat.GetColorFromName(Configuration.Instance.MessageColor, Color.green);
             ItemManager.onServerSpawningItemDrop += OnServerSpawningItemDrop;
             ItemManager.onTakeItemRequested += OnTakeItemRequested;
-            PlayerCrafting.onCraftBlueprintRequested += OnCraftBlueprintRequested;
+            PlayerCrafting.OnCraftBlueprintRequestedV2 += OnCraftingBlueprintRequested;
 
             Logger.Log($"{Name} {Assembly.GetName().Version} has been loadded!", ConsoleColor.Yellow);
         }
@@ -42,11 +42,32 @@ protected override void Unload()
         {
             ItemManager.onServerSpawningItemDrop -= OnServerSpawningItemDrop;
             ItemManager.onTakeItemRequested -= OnTakeItemRequested;
-            PlayerCrafting.onCraftBlueprintRequested -= OnCraftBlueprintRequested;
+            PlayerCrafting.OnCraftBlueprintRequestedV2 -= OnCraftingBlueprintRequested;
 
             Logger.Log($"{Name} has been unloaded!", ConsoleColor.Yellow);
         }
 
+        private void OnCraftingBlueprintRequested(PlayerCrafting crafting, ref Blueprint blueprint, ref bool shouldAllow)
+        {
+            UnturnedPlayer untPlayer = UnturnedPlayer.FromPlayer(crafting.player);
+            if (HasBypassPermission(untPlayer))
+            {
+                return;
+            }
+
+            IEnumerable<BlacklistItem> blacklistItems = Configuration.Instance.BlacklistItems.Where(x => !x.CanCraft);
+            foreach (BlueprintOutput output in blueprint.outputs)
+            {
+                ItemAsset outputItemAsset = output.FindItemAsset();
+                if (blacklistItems.Any(x => x.ItemId == outputItemAsset.id))
+                {
+                    shouldAllow = false;
+                    UnturnedChat.Say(untPlayer, Translate("CantBeCrafted", outputItemAsset.itemName), MessageColor);
+                    return;
+                }
+            }
+        }
+
         internal bool HasBypassPermission(UnturnedPlayer player)
         {
             if (!Configuration.Instance.EnableBypassPermission)
@@ -85,37 +106,6 @@ private void OnServerSpawningItemDrop(Item item, ref Vector3 location, ref bool
             }                
         }
 
-        private void OnCraftBlueprintRequested(PlayerCrafting crafting, ref ushort itemID, ref byte blueprintIndex, ref bool shouldAllow)
-        {
-            UnturnedPlayer untPlayer = UnturnedPlayer.FromPlayer(crafting.player);
-
-            if (HasBypassPermission(untPlayer))
-            {
-                return;
-            }
-
-            ItemAsset asset = Assets.find(EAssetType.ITEM, itemID) as ItemAsset;
-            BlueprintOutput[] ouputs = asset.blueprints[blueprintIndex].outputs;
-
-            IEnumerable<BlacklistItem> blacklistItems = Configuration.Instance.BlacklistItems.Where(x => !x.CanCraft);
-
-            foreach (BlueprintOutput output in ouputs)
-            {
-                if (blacklistItems.Any(x => x.ItemId == output.id))
-                {
-                    shouldAllow = false;
-
-                    ItemAsset asset2 = Assets.find(EAssetType.ITEM, itemID) as ItemAsset;
-                    if (asset2 != null)
-                    {
-                        UnturnedChat.Say(untPlayer, Translate("CantBeCrafted", asset2.itemName), MessageColor);
-                    }
-
-                    return;
-                }
-            }
-        }
-
         public override TranslationList DefaultTranslations => new TranslationList()
         {
             { "CantBeCrafted", "{0} can't be crafted!" },