Commit: 805ec5fd2154c0bbf23e660dc649b52d6c1fd5b7 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Revision: 805ec5fd2154c0bbf23e660dc649b52d6c1fd5b7 (tree)
• Time: 2022-03-28 04:19:40
• Author: melchior <melchior@user...>
• Commiter: melchior

Log Message

AMR 0.1.17

3rd party Smithery mods API exposure; boog fxeis for Broken Metal
Fragments Tooltip

Change Summary

• modified: AnvilMetalRecovery/AnvilMetalRecovery.csproj
• modified: AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
• modified: AnvilMetalRecovery/Data/RecoveryEntry.cs
• add: AnvilMetalRecovery/Data/RecoveryEntryTable.cs
• modified: AnvilMetalRecovery/Harmony/GenericItemMortalityDetector.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem_Components.cs
• modified: AnvilMetalRecovery/modinfo.json

Incremental Difference

--- a/AnvilMetalRecovery/AnvilMetalRecovery.csproj
+++ b/AnvilMetalRecovery/AnvilMetalRecovery.csproj
@@ -85,6 +85,7 @@
     <Compile Include="MetalRecoverySystem_Components.cs" />
     <Compile Include="Harmony\GenericItemMortalityDetector.cs" />
     <Compile Include="Data\AMR_Config.cs" />
+    <Compile Include="Data\RecoveryEntryTable.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">

--- a/AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
+++ b/AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
@@ -67,6 +67,7 @@ namespace AnvilMetalRecovery
 
 		base.MarkDirty (false);	
 		 */
+					
 
 		if (splitTemp > 0 && this.WorkItemStack == null && this.SelectedRecipe == null) 
 		{

--- a/AnvilMetalRecovery/Data/RecoveryEntry.cs
+++ b/AnvilMetalRecovery/Data/RecoveryEntry.cs
@@ -6,6 +6,7 @@ namespace AnvilMetalRecovery
 {
 	public struct RecoveryEntry
 	{
+		public readonly AssetLocation CollectableCode;
 		public AssetLocation IngotCode;
 		/// <summary>
 		/// Metal Quantity (VOXELS)
@@ -14,9 +15,10 @@ namespace AnvilMetalRecovery
 		public float Melting_Duration;
 		public int Melting_Point;
 
-		public RecoveryEntry(AssetLocation ig, uint qty, float dur, int point)
+		public RecoveryEntry(AssetLocation coll, AssetLocation ingot, uint qty, float dur, int point)
 		{
-		IngotCode = ig.Clone();
+		CollectableCode = coll.Clone();
+		IngotCode = ingot.Clone();
 		Quantity = qty;
 		Melting_Duration = dur;
 		Melting_Point = point;

--- /dev/null
+++ b/AnvilMetalRecovery/Data/RecoveryEntryTable.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+using Vintagestory.API.Common;
+
+namespace AnvilMetalRecovery
+{
+	public class RecoveryEntryTable : KeyedCollection<AssetLocation, RecoveryEntry>
+	{
+		protected override AssetLocation GetKeyForItem(RecoveryEntry item) => item.CollectableCode;
+
+		public void AddReplace(RecoveryEntry entry)
+		{
+		if (Contains(entry.CollectableCode)) { Remove(entry.CollectableCode); }
+		Add(entry);
+		}
+
+		public ICollection<AssetLocation> Keys 
+		{
+			get
+			{
+			return this.Dictionary.Keys;
+			}
+		}
+
+		public bool ContainsKey(AssetLocation code)
+		{
+		if (this.Dictionary == null || this.Dictionary.Keys == null ) return false;
+		return this.Dictionary.ContainsKey(code);
+		}
+	}
+}
+

--- a/AnvilMetalRecovery/Harmony/GenericItemMortalityDetector.cs
+++ b/AnvilMetalRecovery/Harmony/GenericItemMortalityDetector.cs
@@ -74,7 +74,7 @@ namespace AnvilMetalRecovery.Patches
 			return true;
 			}
 
-			Dictionary<AssetLocation, RecoveryEntry> itemToVoxelLookup = ( Dictionary<AssetLocation, RecoveryEntry> )world.Api.ObjectCache[MetalRecoverySystem.itemFilterListCacheKey];
+			var itemToVoxelLookup = MetalRecoverySystem.GetCachedLookupTable(world);
 
 			if (itemToVoxelLookup.ContainsKey(that.Code)) return false;
 

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -25,7 +25,7 @@ namespace AnvilMetalRecovery
 		internal IServerNetworkChannel _ConfigDownlink;
 		internal IClientNetworkChannel _ConfigUplink;
 
-		private Dictionary<AssetLocation, RecoveryEntry> itemToVoxelLookup = new Dictionary<AssetLocation, RecoveryEntry>();//Ammount & Material?
+		private RecoveryEntryTable itemToVoxelLookup = new RecoveryEntryTable();//Item Asset Code to: Ammount & Material
 
 		private ICoreAPI CoreAPI;
 		private ICoreServerAPI ServerAPI;
@@ -48,13 +48,16 @@ namespace AnvilMetalRecovery
 			get { return CoreAPI.ModLoader.GetModSystem<RecipeRegistrySystem>( ).SmithingRecipes; }
         }
 
+		public static RecoveryEntryTable GetCachedLookupTable(IWorldAccessor world )
+		{
+			return ( RecoveryEntryTable )world.Api.ObjectCache[MetalRecoverySystem.itemFilterListCacheKey];
+		}
 
-
-	/// <summary>
-	/// Valid Items that are 'recoverable' (Asset Codes) only
-	/// </summary>
-	/// <value>The item filter list.</value>
-	public List<AssetLocation> ItemFilterList {
+		/// <summary>
+		/// Valid Items that are 'recoverable' (Asset Codes) only
+		/// </summary>
+		/// <value>The item filter list.</value>
+		public List<AssetLocation> ItemFilterList {
 			get
 			{
 			return itemToVoxelLookup.Keys.ToList( );
@@ -62,14 +65,18 @@ namespace AnvilMetalRecovery
 		}
 
 		/// <summary>
-		/// ALL Items that have were derivable from smithing recipies (and are tool / durable)
+		/// ALL Items that have were derivable from smithing recipies (and are 'tool' / have durability property)
 		/// </summary>/
 		/// <value>The item filter list.</value>
-		public Dictionary<AssetLocation, RecoveryEntry> ItemRecoveryTable {
+		public RecoveryEntryTable ItemRecoveryTable {
 			get
 			{
 			return itemToVoxelLookup;
 			}
+			set
+			{
+			itemToVoxelLookup = value;
+			}
 		}
 
 		public override bool AllowRuntimeReload {
@@ -126,8 +133,7 @@ namespace AnvilMetalRecovery
 		#if DEBUG
 		ServerAPI.RegisterCommand("durability", "edit durability of item", " (Held tool) and #", EditDurability, Privilege.give);
 		#endif
-
-		
+					
 		}
 
 		public override void StartClientSide(ICoreClientAPI api)

--- a/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
@@ -56,7 +56,7 @@ namespace AnvilMetalRecovery
 		Mod.Logger.Warning($"Duplicate recipie '{recipie.Name}' output item: '{outputItem.Code.ToString()}'");				
 		}
 		else {
-		itemToVoxelLookup.Add(outputItem.Code.Clone( ), new RecoveryEntry(metalObject.Code,
+		itemToVoxelLookup.Add(new RecoveryEntry(outputItem.Code, metalObject.Code,
 							                                              ( uint )(setVoxels / recipie.Output.Quantity),
 																			  metalObject.CombustibleProps.MeltingDuration,
 																		  metalObject.CombustibleProps.MeltingPoint)
@@ -84,7 +84,7 @@ namespace AnvilMetalRecovery
 		Mod.Logger.Warning($"Duplicate recipie '{recipie.Name}' output tool-item: '{itemToolCode.ToString( )}'");
 		}
 		else
-		itemToVoxelLookup.Add(itemToolCode.Clone( ), new RecoveryEntry(metalObject.Code,
+		itemToVoxelLookup.Add( new RecoveryEntry(itemToolCode.Clone( ), metalObject.Code,
 																	  ( uint )(setVoxels / recipie.Output.Quantity),
 																		  metalObject.CombustibleProps.MeltingDuration,
 																	  metalObject.CombustibleProps.MeltingPoint)
@@ -99,7 +99,9 @@ namespace AnvilMetalRecovery
 		}
 
 		//Cache list too		
-		ServerAPI.ObjectCache.Add(itemFilterListCacheKey, itemToVoxelLookup);		
+		ServerAPI.ObjectCache.Add(itemFilterListCacheKey, itemToVoxelLookup);
+
+		Mod.Logger.Event("tallied {0} smithables totaling {1} metal units from {2} smithing recipies!", itemToVoxelLookup.Count, itemToVoxelLookup.Sum(ie => ie.Quantity), this.SmithingRecipies.Count);
 		}
 
 		private bool SmithingRecipieValidator(SmithingRecipe aRecipie )

--- a/AnvilMetalRecovery/modinfo.json
+++ b/AnvilMetalRecovery/modinfo.json
@@ -4,9 +4,9 @@
   "description" : "Get back lost scrap and smithing discards. Plus more.",
   "authors": ["Melchior"],
   "ModID":"metalrecovery",
-  "version": "0.1.16",
+  "version": "0.1.17",
   "dependencies": { 
-	"game": "1.16.0",
+	"game": "1.16.4",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"