Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Overhaul craft data patcher and handlers (#524)
* Create RecipeExtensions.cs * Use RecipeExtensions * Overhaul CraftData.Get Patch
- Loading branch information
1 parent
21c42bc
commit d27d803
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,231 @@ | ||
| namespace Nautilus.Extensions; | ||
|
|
||
| using Nautilus.Crafting; | ||
| using Nautilus.Utility; | ||
| using System; | ||
| using System.Collections.Generic; | ||
|
|
||
| /// <summary> | ||
| /// Contains extensions that are specific to the <see cref="RecipeData"/> and <see cref="ITechData"/> classes. | ||
| /// </summary> | ||
| public static class RecipeExtensions | ||
| { | ||
|
|
||
| #if SUBNAUTICA | ||
| /// <summary> | ||
| /// Converts a <see cref="RecipeData"/> to an <see cref="ITechData"/>. | ||
| /// </summary> | ||
| /// <param name="techData"> the original data to convert.</param> | ||
| /// <param name="techType"> The Techtype </param> | ||
| /// <returns><see cref="CraftData.TechData"/></returns> | ||
|
|
||
| public static CraftData.TechData ConvertToTechData(this ITechData techData, TechType techType) | ||
| { | ||
| var techDataInstance = new CraftData.TechData | ||
| { | ||
| _techType = techType, | ||
| _craftAmount = techData?.craftAmount ?? 0 | ||
| }; | ||
|
|
||
| var ingredientsList = new CraftData.Ingredients(); | ||
|
|
||
| if (techData?.ingredientCount > 0) | ||
| { | ||
| for (int i = 0; i < techData.ingredientCount; i++) | ||
| { | ||
| IIngredient customIngredient = techData.GetIngredient(i); | ||
|
|
||
| var ingredient = new CraftData.Ingredient(customIngredient.techType, customIngredient.amount); | ||
| ingredientsList.Add(customIngredient.techType, customIngredient.amount); | ||
| } | ||
| techDataInstance._ingredients = ingredientsList; | ||
| } | ||
|
|
||
| if (techData?.linkedItemCount > 0) | ||
| { | ||
| var linkedItems = new List<TechType>(); | ||
| for (int l = 0; l < techData.linkedItemCount; l++) | ||
| { | ||
| linkedItems.Add(techData.GetLinkedItem(l)); | ||
| } | ||
| techDataInstance._linkedItems = linkedItems; | ||
| } | ||
|
|
||
| return techDataInstance; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Converts the games ITechData into Nautilus RecipeData. | ||
| /// </summary> | ||
| /// <param name="iTechData"></param> | ||
| public static RecipeData ConvertToRecipeData(this ITechData iTechData) | ||
| { | ||
| var recipeData = new RecipeData() { craftAmount = iTechData.craftAmount }; | ||
|
|
||
| for (int i = 0; i < iTechData.ingredientCount; i++) | ||
| { | ||
| IIngredient ingredient = iTechData.GetIngredient(i); | ||
| var customIngredient = new CraftData.Ingredient(ingredient.techType, ingredient.amount); | ||
| recipeData.Ingredients.Add(customIngredient); | ||
| } | ||
|
|
||
| for (int i = 0; i < iTechData.linkedItemCount; i++) | ||
| { | ||
| recipeData.LinkedItems.Add(iTechData.GetLinkedItem(i)); | ||
| } | ||
|
|
||
| return recipeData; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Checks if the two ITechData are equal. | ||
| /// </summary> | ||
| /// <param name="originalTechData"></param> | ||
| /// <param name="techData"></param> | ||
| /// <returns></returns> | ||
| public static bool SameAs(this ITechData originalTechData, ITechData techData) | ||
| { | ||
| if (originalTechData.craftAmount != techData.craftAmount || | ||
| originalTechData.ingredientCount != techData.ingredientCount || | ||
| originalTechData.linkedItemCount != techData.linkedItemCount) | ||
| return false; | ||
|
|
||
| for (int i = 0; i < originalTechData.ingredientCount; i++) | ||
| { | ||
| if (originalTechData.GetIngredient(i).techType != techData.GetIngredient(i).techType) | ||
| { | ||
| return false; | ||
| } | ||
| if (originalTechData.GetIngredient(i).amount != techData.GetIngredient(i).amount) | ||
| { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| for (int i = 0; i < originalTechData.linkedItemCount; i++) | ||
| { | ||
| if (originalTechData.GetLinkedItem(i) != techData.GetLinkedItem(i)) | ||
| { | ||
| return false; | ||
| } | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| #elif BELOWZERO | ||
|
|
||
| /// <summary> | ||
| /// Converts the Games JsonValue data into Nautilus RecipeData. | ||
| /// </summary> | ||
| /// <param name="techData"></param> | ||
| public static RecipeData ConvertToRecipeData(this JsonValue techData) | ||
| { | ||
| try | ||
| { | ||
| RecipeData currentRecipeData = new() | ||
| { | ||
| craftAmount = techData.GetInt(TechData.propertyCraftAmount, out int craftAmount, 0) ? craftAmount : TechData.defaultCraftAmount | ||
| }; | ||
|
|
||
| if (techData.GetArray(TechData.propertyIngredients, out JsonValue jsonValue, null)) | ||
| { | ||
| for (int i = 0; i < jsonValue.Count; i++) | ||
| { | ||
| JsonValue jsonValue2 = jsonValue[i]; | ||
| TechType techType = (TechType) jsonValue2.GetInt(TechData.propertyTechType, 0); | ||
| int int2 = jsonValue2.GetInt(TechData.propertyAmount, 0); | ||
| if (techType != TechType.None && int2 > 0) | ||
| { | ||
| if (currentRecipeData.Ingredients == null) | ||
| { | ||
| currentRecipeData.Ingredients = new List<Ingredient>(); | ||
| } | ||
| currentRecipeData.Ingredients.Add(new Ingredient(techType, int2)); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| if (techData.GetArray(TechData.propertyLinkedItems, out JsonValue jsonValue3, null)) | ||
| { | ||
| for (int j = 0; j < jsonValue3.Count; j++) | ||
| { | ||
| TechType techType1 = (TechType) jsonValue3[j].GetInt(0); | ||
| if (currentRecipeData.LinkedItems == null) | ||
| { | ||
| currentRecipeData.LinkedItems = new List<TechType>(); | ||
| } | ||
| currentRecipeData.LinkedItems.Add(techType1); | ||
| } | ||
| } | ||
| return currentRecipeData; | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| InternalLogger.Error($"Error converting TechData to RecipeData: {e.Message}"); | ||
| return null; | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Converts the Nautilus RecipeData into the Games JsonValue data. | ||
| /// </summary> | ||
| /// <param name="recipeData"></param> | ||
| /// <param name="techType"></param> | ||
| /// <returns><see cref="JsonValue"/> or null</returns> | ||
| public static JsonValue ConvertToJsonValue(this RecipeData recipeData, TechType techType) | ||
| { | ||
| try | ||
| { | ||
| JsonValue jsonValue = new JsonValue | ||
| { | ||
| { TechData.PropertyToID("techType"), new JsonValue((int)techType) }, | ||
| { TechData.PropertyToID("craftAmount"), new JsonValue(recipeData.craftAmount) } | ||
| }; | ||
|
|
||
| if (recipeData.ingredientCount > 0) | ||
| { | ||
| jsonValue[TechData.PropertyToID("ingredients")] = new JsonValue(JsonValue.Type.Array); | ||
| JsonValue ingredientslist = jsonValue[TechData.PropertyToID("ingredients")]; | ||
|
|
||
| int amount = TechData.PropertyToID("amount"); | ||
| int tech = TechData.PropertyToID("techType"); | ||
| int current = 0; | ||
|
|
||
| foreach (Ingredient i in recipeData.Ingredients) | ||
| { | ||
| ingredientslist.Add(new JsonValue(current)); | ||
| ingredientslist[current] = new JsonValue(JsonValue.Type.Object) | ||
| { | ||
| { amount, new JsonValue(i.amount) }, | ||
| { tech, new JsonValue((int)i.techType) } | ||
| }; | ||
| current++; | ||
| } | ||
| } | ||
|
|
||
| if (recipeData.linkedItemCount > 0) | ||
| { | ||
| jsonValue[TechData.PropertyToID("linkedItems")] = new JsonValue(JsonValue.Type.Array); | ||
| JsonValue linkedItems = jsonValue[TechData.PropertyToID("linkedItems")]; | ||
|
|
||
| int current = 0; | ||
|
|
||
| foreach (TechType techType1 in recipeData.LinkedItems) | ||
| { | ||
| linkedItems.Add(new JsonValue(current)); | ||
| linkedItems[current] = new JsonValue((int)techType1); | ||
| current++; | ||
| } | ||
| } | ||
|
|
||
| return jsonValue; | ||
| } | ||
| catch (Exception e) | ||
| { | ||
| InternalLogger.Error($"Error converting RecipeData to JsonValue: {e.Message}"); | ||
| return null; | ||
| } | ||
| } | ||
| #endif | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.