Reworked CompoundRecipe

Author: Ishigh1

CompoundRecipe.cs

@@ -2,70 +2,57 @@
 using System.Linq;
 using Terraria;
 using Terraria.ModLoader;
+using Terraria.ID;
 
 namespace RecursiveCraft
 {
-	public class CompoundRecipe
+	public class CompoundRecipe : ModRecipe
 	{
-		public Recipe CurrentRecipe;
-		public Dictionary<int, int> DropItems;
 		public RecipeInfo RecipeInfo;
 		public Recipe OverridenRecipe;
 		public int RecipeId;
 
-		public CompoundRecipe(int recipeId, RecipeInfo recipeInfo)
+		public CompoundRecipe(Mod mod) : base(mod)
+		{
+		}
+
+		public void Apply(int recipeId, RecipeInfo recipeInfo)
 		{
 			RecipeId = recipeId;
 			OverridenRecipe = Main.recipe[recipeId];
 
-			if (recipeInfo.UsedItems.Count > Recipe.maxRequirements)
-				Recipe.maxRequirements = recipeInfo.UsedItems.Count;//This may be a bit bigger than the needed value 
-			
-			CurrentRecipe = new Recipe
+			if (recipeInfo.UsedItems.Count > maxRequirements)
 			{
-				createItem = OverridenRecipe.createItem
-			};
-			DropItems = new Dictionary<int, int>();
+				maxRequirements = recipeInfo.UsedItems.Count; //This may be a bit bigger than the needed value
+				requiredItem = new Item[maxRequirements];
+				for (int j = 0; j < maxRequirements; j++) requiredItem[j] = new Item();
+			}
+
+			createItem = createItem = OverridenRecipe.createItem;
 			RecipeInfo = recipeInfo;
 
-			List<KeyValuePair<int, int>> keyValuePairs = recipeInfo.UsedItems.ToList();
+			List<KeyValuePair<int, int>> keyValuePairs = RecipeInfo.UsedItems.ToList();
 			int i = 0;
 			foreach (KeyValuePair<int, int> keyValuePair in keyValuePairs.Where(keyValuePair => keyValuePair.Value > 0))
 			{
-				CurrentRecipe.requiredItem[i] = new Item();
-				CurrentRecipe.requiredItem[i].SetDefaults(keyValuePair.Key);
-				CurrentRecipe.requiredItem[i].stack = keyValuePair.Value;
+				requiredItem[i].SetDefaults(keyValuePair.Key);
+				requiredItem[i].stack = keyValuePair.Value;
 				++i;
 			}
+
+			for (; i < maxRequirements; i++) requiredItem[i].type = ItemID.None;
 		}
 
-		public void BeforeCraft()
+		public override int ConsumeItem(int type, int numRequired)
 		{
-			List<KeyValuePair<int, int>> keyValuePairs = RecipeInfo.TrueUsedItems.ToList();
-			int i = 0;
-			foreach (KeyValuePair<int, int> keyValuePair in keyValuePairs)
-				if (keyValuePair.Value < 0)
-				{
-					DropItems.Add(keyValuePair.Key, -keyValuePair.Value);
-				}
-				else
-				{
-					CurrentRecipe.requiredItem[i] = new Item();
-					CurrentRecipe.requiredItem[i].SetDefaults(keyValuePair.Key);
-					CurrentRecipe.requiredItem[i].stack = keyValuePair.Value;
-					++i;
-				}
-
-			for (; i < RecipeInfo.UsedItems.Count; i++)
-			{
-				CurrentRecipe.requiredItem[i].stack = 0;
-			}
+			return RecipeInfo.TrueUsedItems.TryGetValue(type, out numRequired) ? numRequired : 0;
 		}
 
-		public void OnCraft()
+		public override void OnCraft(Item item)
 		{
-			foreach (KeyValuePair<int, int> keyValuePair in DropItems)
-				Main.player[Main.myPlayer].QuickSpawnItem(keyValuePair.Key, keyValuePair.Value);
+			List<KeyValuePair<int, int>> keyValuePairs = RecipeInfo.TrueUsedItems.ToList();
+			foreach (KeyValuePair<int, int> keyValuePair in keyValuePairs.Where(keyValuePair => keyValuePair.Value < 0))
+				Main.LocalPlayer.QuickSpawnItem(keyValuePair.Key, -keyValuePair.Value);
 
 			foreach (KeyValuePair<Recipe, int> keyValuePair in RecipeInfo.RecipeUsed)
 				for (int i = 0; i < keyValuePair.Value; i++)

RecursiveCraft.cs

@@ -17,7 +17,7 @@ public class RecursiveCraft : Mod
 	{
 		public static Dictionary<int, List<Recipe>> RecipeByResult;
 		public static Dictionary<Recipe, RecipeInfo> RecipeCache;
-		public static CompoundRecipe CurrentCompound;
+		public static CompoundRecipe CompoundRecipe;
 
 		public static int DepthSearch;
 		public static bool InventoryWasOpen;
@@ -28,7 +28,6 @@ public override void Load()
 			ILRecipe.FindRecipes += ApplyRecursiveSearch;
 			OnMain.DrawInventory += EditFocusRecipe;
 			OnMain.Update += ApplyKey;
-			On.Terraria.Recipe.Create += CraftCompoundRecipe;
 			RecipeByResult = new Dictionary<int, List<Recipe>>();
 			RecipeCache = new Dictionary<Recipe, RecipeInfo>();
 
@@ -46,18 +45,19 @@ public override void Unload()
 			ILRecipe.FindRecipes -= ApplyRecursiveSearch;
 			OnMain.DrawInventory -= EditFocusRecipe;
 			OnMain.Update -= ApplyKey;
-			On.Terraria.Recipe.Create -= CraftCompoundRecipe;
 			RecipeByResult = null;
 			RecipeCache = null;
 			Hotkeys = null;
 
-			if (CurrentCompound != null)
-				Main.recipe[CurrentCompound.RecipeId] = CurrentCompound.OverridenRecipe;
-			CurrentCompound = null;
+			if (CompoundRecipe.OverridenRecipe != null)
+				Main.recipe[CompoundRecipe.RecipeId] = CompoundRecipe.OverridenRecipe;
+			CompoundRecipe = null;
 		}
 
 		public override void PostAddRecipes()
 		{
+			CompoundRecipe = new CompoundRecipe(this);
+			
 			foreach (Recipe recipe in Main.recipe)
 			{
 				int type = recipe.createItem.type;
@@ -71,21 +71,6 @@ public override void PostAddRecipes()
 			}
 		}
 
-		public static void CraftCompoundRecipe(On.Terraria.Recipe.orig_Create orig, Recipe self)
-		{
-			if (CurrentCompound != null && self == CurrentCompound.CurrentRecipe)
-			{
-				CurrentCompound.BeforeCraft();
-				orig(self);
-				CurrentCompound.OnCraft();
-				Recipe.FindRecipes();
-			}
-			else
-			{
-				orig(self);
-			}
-		}
-
 		public void ApplyKey(OnMain.orig_Update orig, Main self, GameTime gameTime)
 		{
 			if (InventoryWasOpen != Main.playerInventory)
@@ -131,17 +116,17 @@ public void ApplyKey(OnMain.orig_Update orig, Main self, GameTime gameTime)
 
 		public static void EditFocusRecipe(OnMain.orig_DrawInventory orig, Main self)
 		{
-			if (CurrentCompound != null) Main.recipe[CurrentCompound.RecipeId] = CurrentCompound.OverridenRecipe;
+			if (CompoundRecipe.OverridenRecipe != null) Main.recipe[CompoundRecipe.RecipeId] = CompoundRecipe.OverridenRecipe;
 			int i = Main.availableRecipe[Main.focusRecipe];
 			Recipe recipe = Main.recipe[i];
 			if (RecipeCache.TryGetValue(recipe, out RecipeInfo recipeInfo))
 			{
-				CurrentCompound = new CompoundRecipe(i, recipeInfo);
-				Main.recipe[i] = CurrentCompound.CurrentRecipe;
+				CompoundRecipe.Apply(i, recipeInfo);
+				Main.recipe[i] = CompoundRecipe;
 			}
 			else
 			{
-				CurrentCompound = null;
+				CompoundRecipe.OverridenRecipe = null;
 			}
 
 			orig(self);
@@ -179,7 +164,9 @@ public static void RecursiveSearch(Dictionary<int, int> inventory)
 			CraftingSource craftingSource = new PlayerAsCraftingSource();
 			for (int n = 0; n < Recipe.maxRecipes && Main.recipe[n].createItem.type != ItemID.None; n++)
 			{
-				Recipe recipe = CurrentCompound?.RecipeId == n ? CurrentCompound.OverridenRecipe : Main.recipe[n];
+				Recipe recipe = Main.recipe[n];
+				if (recipe is CompoundRecipe compoundRecipe)
+					recipe = compoundRecipe.OverridenRecipe;
 				RecipeInfo recipeInfo = FindIngredientsForRecipe(inventory, craftingSource, recipe);
 				if (recipeInfo != null)
 				{
@@ -258,7 +245,7 @@ public static int AmountOfDoableRecipe(ref Dictionary<int, int> inventoryToUse,
 				int trueIngredientsNeeded = trueTimeCraft * ingredient.stack;
 				if (recipe.alchemy && craftingSource.AlchemyTable)
 					for (int i = 0; i < trueTimeCraft; i++)
-						if(Main.rand.Next(3) == 0)
+						if (Main.rand.Next(3) == 0)
 							trueIngredientsNeeded -= ingredient.stack;
 
 				#region UseIngredients

build.txt

@@ -1,4 +1,4 @@
 displayName = Recursive Craft
 author = Gaelyte
-version = 1.2
+version = 1.3
 homepage = https://github.com/Ishigh1/RecursiveCraft

changelog.md

@@ -1,3 +1,6 @@
+# 1.3
+* Changed the implementation of Compoundrecipe
+
 # 1.2
 * Fixed an issue with recipes needing more than 15 ingredients
 * Fixed an issue with OnCraft not being called