Commit: b46e1569559926fa4b091f9baa49663a627914b8 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: b46e1569559926fa4b091f9baa49663a627914b8 (tree)
• l'heure: 2023-05-07 04:08:52
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

Updates for 1.18 W.I.P. Set I

Change Summary

• modified: AnvilMetalRecovery/AnvilMetalRecovery.csproj
• modified: AnvilMetalRecovery/BlockBehaviors/MoldDestructionRecovererBehavior.cs
• modified: AnvilMetalRecovery/Data/AMR_Config.cs
• add: AnvilMetalRecovery/Data/MetalInfo.cs
• modified: AnvilMetalRecovery/Data/RecoveryEntry.cs
• modified: AnvilMetalRecovery/Harmony/AnvilDaptor.cs
• modified: AnvilMetalRecovery/Items/VariableMetalItem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem_Components.cs
• modified: AnvilMetalRecovery/assets/fma/itemtypes/metal/fragments.json
• modified: AnvilMetalRecovery/assets/fma/lang/en.json
• add: AnvilMetalRecovery/assets/fma/patches/old_item_remapping.json
• modified: AnvilMetalRecovery/modinfo.json

Modification

--- a/AnvilMetalRecovery/AnvilMetalRecovery.csproj
+++ b/AnvilMetalRecovery/AnvilMetalRecovery.csproj
@@ -88,6 +88,7 @@
     <Compile Include="Data\RecoveryEntryTable.cs" />
     <Compile Include="BlockBehaviors\MoldDestructionRecovererBehavior.cs" />
     <Compile Include="Harmony\WateringCanDaptor.cs" />
+    <Compile Include="Data\MetalInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">
@@ -130,6 +131,8 @@
     <None Include="assets\fma\patches\wateringcan_behavior.json">
     </None>
     <None Include="Blocks\BlockWateringCanPlus.cs" />
+    <None Include="assets\fma\patches\old_item_remapping.json">
+    </None>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="assets\" />

--- a/AnvilMetalRecovery/BlockBehaviors/MoldDestructionRecovererBehavior.cs
+++ b/AnvilMetalRecovery/BlockBehaviors/MoldDestructionRecovererBehavior.cs
@@ -77,7 +77,7 @@ namespace AnvilMetalRecovery
 
 		internal void SpawnMetalBits(IWorldAccessor world, BlockPos pos, int unitQuantity, string baseMetalCode)
 		{	
-		if (unitQuantity > 0) 
+			if (unitQuantity > 0 && pos != null && !string.IsNullOrEmpty(baseMetalCode)) 
 			{
 			int shavingQty = unitQuantity / shavingValue;
 			Item metalShavingsItem = world.Api.World.GetItem(MetalBits_partial.AppendPathVariant(baseMetalCode));

--- a/AnvilMetalRecovery/Data/AMR_Config.cs
+++ b/AnvilMetalRecovery/Data/AMR_Config.cs
@@ -14,14 +14,14 @@ namespace AnvilMetalRecovery
 		{
 		ToolFragmentRecovery = true;
 		VoxelEquivalentValue = MetalRecoverySystem.IngotVoxelDefault;
-		ToolRecoveryRate = 0.95f;
+		ToolRecoveryRate = 0.85f;
 		}
 
 		public AMRConfig(bool setDefaultBL) 
 		{
 		ToolFragmentRecovery = true;
 		VoxelEquivalentValue = MetalRecoverySystem.IngotVoxelDefault;
-		ToolRecoveryRate = 0.95f;
+		ToolRecoveryRate = 0.85f;
 		if (setDefaultBL) {
 		BlackList = new List<AssetLocation> {					
 					new AssetLocation(@"game:metalplate"),

--- /dev/null
+++ b/AnvilMetalRecovery/Data/MetalInfo.cs
@@ -0,0 +1,41 @@
+using System;
+using System.ComponentModel;
+
+using Newtonsoft.Json;
+
+namespace AnvilMetalRecovery
+{
+	//Too outdated for...: [JsonObject(NamingStrategyType = typeof(CamelCaseNamingStrategy))]
+	[JsonObject(MemberSerialization.OptIn)]
+	public struct MetalInfo
+	{	
+		[JsonProperty("code", Required = Required.Always)]
+		public readonly string Code;
+
+		[JsonProperty("meltPoint")]
+		[DefaultValue(1000f)]
+		public readonly float MeltingPoint;
+
+		[JsonProperty("boilPoint")]
+		[DefaultValue(100f)]
+		public readonly float BoilingPoint;
+
+		[JsonIgnore]
+		[DefaultValue(30)]
+		public int MeltingDuration;
+
+		[JsonProperty("density")]
+		[DefaultValue(10000f)]
+		public readonly float Density;
+
+		[JsonProperty("specificHeatCapacity")]
+		[DefaultValue(1f)]
+		public readonly float SpecificHeatCapacity;
+
+		[JsonProperty("elemental")]
+		public readonly bool Elemental;
+
+		[JsonProperty("tier")]
+		public readonly int Tier;
+	}
+}
\ No newline at end of file

--- a/AnvilMetalRecovery/Data/RecoveryEntry.cs
+++ b/AnvilMetalRecovery/Data/RecoveryEntry.cs
@@ -1,27 +1,69 @@
 using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Linq;
 
 using Vintagestory.API.Common;
 
 namespace AnvilMetalRecovery
 {
-	public struct RecoveryEntry
+	public class RecoveryEntry
 	{
 		public readonly AssetLocation CollectableCode;
-		public AssetLocation IngotCode;
+		public Dictionary<AssetLocation, uint> MaterialComposition;//e.g. 50x Ingot-Copper, 10x Ingot-Zinc...
+
+		public AssetLocation PrimaryMaterial 
+		{
+			get {
+			return MaterialComposition.First().Key;
+			}
+		}
+
+		public uint FirstQuantity {
+			get
+			{
+			return MaterialComposition.First( ).Value;
+			}
+		}
+
+		public uint TotalQuantity 
+		{
+			get
+			{
+			return ( uint )MaterialComposition.Sum(mt => mt.Value);
+			}
+		}
+
+		public bool MultiComponent 
+		{
+			get
+			{
+			return MaterialComposition.Count > 1;
+			}
+		}
+
 		/// <summary>
-		/// Metal Quantity (VOXELS)
+		/// Initializes a singluar entry recovery entry for 1:1 items
 		/// </summary>
-		public uint Quantity;
-		public float Melting_Duration;//TODO: Replace with 1.17 MetalAlloy mappings
-		public int Melting_Point;//TODO: Replace with 1.17 MetalAlloy mappings
-
-		public RecoveryEntry(AssetLocation coll, AssetLocation ingot, uint qty, float dur, int point)
+		/// <param name="coll">Coll.</param>
+		/// <param name="ingot">Ingot.</param>
+		/// <param name="qty">Qty.</param>
+		public RecoveryEntry(AssetLocation coll, AssetLocation ingot, uint qty)
 		{
 		CollectableCode = coll.Clone();
-		IngotCode = ingot.Clone();
-		Quantity = qty;
-		Melting_Duration = dur;
-		Melting_Point = point;
+		MaterialComposition = new Dictionary<AssetLocation, uint>( );
+		MaterialComposition.Add(ingot, qty);
+		}
+
+		/// <summary>
+		/// Initializes a singluar entry recovery entry for 1:2 items
+		/// </summary>
+		public RecoveryEntry(AssetLocation coll, AssetLocation ingotA, uint qtyA,AssetLocation ingotB, uint qtyB)
+		{
+		CollectableCode = coll.Clone( );
+		MaterialComposition = new Dictionary<AssetLocation, uint>( );
+		MaterialComposition.Add(ingotA, qtyA);
+		MaterialComposition.Add(ingotB, qtyB);
 		}
 	}
 }

--- a/AnvilMetalRecovery/Harmony/AnvilDaptor.cs
+++ b/AnvilMetalRecovery/Harmony/AnvilDaptor.cs
@@ -91,6 +91,8 @@ namespace AnvilMetalRecovery.Patches
 		if (anvil.BaseMaterial != null && anvil.SplitCount > 0) 
 		{			
 		dsc.AppendFormat("[ {0} ] : {1} × {2}\n", anvil.SplitCount, Lang.GetUnformatted($"game:item-metalbit-{anvil.BaseMetal}"), anvil.ShavingQuantity);
+		} else 	if (anvil.IsShavable == false) {
+		dsc.AppendLine( Lang.GetUnformatted($"fma:cant_recover"));
 		}
 	}
 
@@ -317,13 +319,13 @@ namespace AnvilMetalRecovery.Patches
 				if (itemToVoxelLookup.ContainsKey(bea.SelectedRecipe.Output.Code)) {
 					var result = itemToVoxelLookup[bea.SelectedRecipe.Output.Code];
 					#if DEBUG
-					Logger.VerboseDebug("(old) Selected Recipe: {0} base-material: '{1}' worth {2} units; spawning", bea.SelectedRecipe.Output.Code, result.IngotCode, result.Quantity);
+					Logger.VerboseDebug("(old) Selected Recipe: {0} base-material: '{1}' worth {2} units; spawning", bea.SelectedRecipe.Output.Code, result.PrimaryMaterial, result.TotalQuantity);
 					#endif
 
-					int shavingQty = ( int )(result.Quantity / MetalRecoverySystem.IngotVoxelDefault);
+					int shavingQty = ( int )(result.TotalQuantity / MetalRecoverySystem.IngotVoxelDefault);
 
 					if (shavingQty > 0) {
-					Item metalShavingsItem = World.GetItem(MetalShavingsCode.AppendPathVariant(result.IngotCode.PathEnding()));
+					Item metalShavingsItem = World.GetItem(MetalShavingsCode.AppendPathVariant(result.PrimaryMaterial.PathEnding()));
 
 					if (metalShavingsItem != null) {
 					ItemStack metalShavingsStack = new ItemStack(metalShavingsItem, shavingQty);					

--- a/AnvilMetalRecovery/Items/VariableMetalItem.cs
+++ b/AnvilMetalRecovery/Items/VariableMetalItem.cs
@@ -14,6 +14,7 @@ namespace AnvilMetalRecovery
 	public class VariableMetalItem : Item
 	{
 		private const string default_IngotCode = @"game:ingot-copper";
+		private const string default_MetalbitCode = @"metalbit-";
 		private const string metalQuantityKey = @"metalQuantity";
 		private const string metalIngotCodeKey = @"metalIngotCode";
 
@@ -91,47 +92,43 @@ namespace AnvilMetalRecovery
 		var metalQuantity = ( int )Math.Floor(MetalQuantity(inSlot.Itemstack) * AnvilMetalRecoveryMod.CachedConfiguration.VoxelEquivalentValue);
 		var props = RegenerateCombustablePropsFromStack(inSlot.Itemstack);
 
+		base.GetHeldItemInfo(inSlot, dsc, world, withDebugInfo);
+
 		dsc.AppendLine(Lang.Get("fma:itemdesc-item-metal_fragments"));
 		dsc.AppendLine(Lang.Get("fma:metal_worth", metalQuantity, metalName));
 		}
 
-
-		//TODO: Merge - to the New metal V.S. stock metal bits...?
-		//TryMergeStacks ???
-		//virtual bool CanBePlacedInto(ItemStack stack, ItemSlot slot) //?
-		//virtual void OnModifiedInInventorySlot //Only for new-Inserts (?)
-
 		public void ApplyMetalProperties(RecoveryEntry recoveryData, ref ItemStack contStack, float percentAdjust = 1.0f)
 		{
-		contStack.Attributes.SetInt(metalQuantityKey, ( int )(recoveryData.Quantity * percentAdjust));
-		contStack.Attributes.SetString(metalIngotCodeKey, recoveryData.IngotCode.ToString( ));
+		contStack.Attributes.SetInt(metalQuantityKey, ( int )(recoveryData.TotalQuantity * percentAdjust));
+		contStack.Attributes.SetString(metalIngotCodeKey, recoveryData.PrimaryMaterial.ToString( ));
 
 		RegenerateCombustablePropsFromStack(contStack);
 		}
 
+		//Why is this actually done...? whole item isn't smeltable now...
 		protected CombustibleProperties RegenerateCombustablePropsFromStack(ItemStack contStack)
 		{
 		if (contStack == null ) return null;
 		//if (contStack.Class == EnumItemClass.Item && contStack.Item.CombustibleProps != null) return contStack.Item.CombustibleProps;
 
-		var metalCode = MetalIngotCode(contStack);
+		var metalAssetCode = MetalIngotCode(contStack);
 		var metalUnits = MetalQuantity(contStack);
 
-		if (metalCode != null || metalUnits > 0)
+		if (metalAssetCode != null && metalUnits > 0)				
+		if (MetalRecoverySystem.MetalProperties.ContainsKey(metalAssetCode.PathEnding()))
 		{
-		var sourceMetalItem = api.World.GetItem(metalCode);
+		var sourceInfo = MetalRecoverySystem.MetalProperties[metalAssetCode.PathEnding( )];//Mabey more...rustic lookup?
 
-		if (sourceMetalItem == null || sourceMetalItem.IsMissing || sourceMetalItem.CombustibleProps == null) return null;
-		
 		var aCombustibleProps = new CombustibleProperties( ) {
 			SmeltingType = EnumSmeltType.Smelt,
-			MeltingPoint = sourceMetalItem.CombustibleProps.MeltingPoint,
-			MeltingDuration = sourceMetalItem.CombustibleProps.MeltingDuration,
-			HeatResistance = sourceMetalItem.CombustibleProps.HeatResistance,
-			MaxTemperature = sourceMetalItem.CombustibleProps.MaxTemperature,
-			SmokeLevel = sourceMetalItem.CombustibleProps.SmokeLevel,
+			MeltingPoint = ( int )sourceInfo.MeltingPoint,
+			MeltingDuration = sourceInfo.MeltingDuration,
+			//HeatResistance = 500, //sourceInfo.SpecificHeatCapacity & Formula...?
+			MaxTemperature = ( int )sourceInfo.BoilingPoint,
+			//SmokeLevel = sourceInfo.SmokeLevel,
 			SmeltedRatio = 100,
-			SmeltedStack = new JsonItemStack( ) { Type = EnumItemClass.Item, Code = sourceMetalItem.Code.Clone( ), Quantity = (int)Math.Floor(metalUnits * AnvilMetalRecoveryMod.CachedConfiguration.VoxelEquivalentValue) }
+			SmeltedStack = new JsonItemStack( ) { Type = EnumItemClass.Item, Code = metalAssetCode.Clone( ), Quantity = (int)Math.Floor(metalUnits * AnvilMetalRecoveryMod.CachedConfiguration.VoxelEquivalentValue) }
 		};
 		aCombustibleProps.SmeltedStack.Resolve(api.World, "VariableMetalItem_regen", true);
 		
@@ -168,7 +165,9 @@ namespace AnvilMetalRecovery
 			var metalCode = MetalCode(inputStack);
 			var metalUnits = MetalQuantity(inputStack);
 
-			Item metalBits = api.World.GetItem(new AssetLocation(GlobalConstants.DefaultDomain, @"metalbit-" + metalCode));
+			//TODO: Smarter lookup here - allow for 3rd party metals
+			Item metalBits = api.World.GetItem(new AssetLocation(GlobalConstants.DefaultDomain, default_MetalbitCode + metalCode));
+			//This whole scenario can't work for multi-material items...spawn remainder of items in grid, or on craft?
 			if (metalBits != null) 
 				{
 				gridRecipe.Output.Quantity = ( int )(Math.Round(metalUnits * AnvilMetalRecoveryMod.CachedConfiguration.VoxelEquivalentValue) / 5);

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -15,8 +15,9 @@ using Vintagestory.Server;
 
 /* IDEAS / ISSUES
  * # DONE: Watering Can (molten-metal state) Ingot Cooling *Tssss*
- * # WIP : Ingot breaks -> Metal fragments / bits (or a blob?)
+ * # WIP : Mold breaks -> Metal fragments : bits...
  * # DONE: Tool-break configurable ratio
+ * # IDEA: Recycling Bench block/tool
 */
 namespace AnvilMetalRecovery
 {
@@ -36,7 +37,8 @@ namespace AnvilMetalRecovery
 
 		public event Action AMR_DataReady;
 
-		private RecoveryEntryTable itemToVoxelLookup = new RecoveryEntryTable();//Item Asset Code to: Ammount & Material
+		protected RecoveryEntryTable itemToVoxelLookup = new RecoveryEntryTable();//Item Asset Code to: Ammount & Material
+		public static Dictionary<string, MetalInfo> MetalProperties;//for easy lookup
 
 		private ICoreAPI CoreAPI;
 
@@ -115,7 +117,7 @@ namespace AnvilMetalRecovery
 		if (api.Side.IsServer()) 
 			{
 			if (api is ServerCoreAPI) {
-				ServerCore = api as ServerCoreAPI;
+				ServerCore = api as ServerCoreAPI;				
 				}
 			}
 		else 
@@ -138,7 +140,8 @@ namespace AnvilMetalRecovery
 		PrepareDownlinkChannel( );
 		ServerCore.Event.PlayerJoin += SendClientConfigMessage;
 		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.Shutdown, PersistServersideConfig);
-		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);				
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, UnravelMetalProperties);
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);		
 		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.RunGame, CacheRecoveryDataTable);		
 
 		SetupGeneralObservers( );		
@@ -172,9 +175,11 @@ namespace AnvilMetalRecovery
 		public override void AssetsFinalize(ICoreAPI api)
 		{
 		Mod.Logger.VerboseDebug("AssetsFinalize");
-					
-		//PerformBlockClassSwaps( );
-		AttachExtraBlockBehaviors( ); 
+
+		if (api.Side.IsServer()) 
+			{
+			AttachExtraBlockBehaviors( );
+			}
 		}
 
 		private void RegisterItemClassMappings( )
@@ -192,24 +197,7 @@ namespace AnvilMetalRecovery
 		this.CoreAPI.RegisterCollectibleBehaviorClass(MoldDestructionRecovererBehavior.BehaviorClassName, typeof(MoldDestructionRecovererBehavior));
 		}
 
-		/*
-		private void PerformBlockClassSwaps()
-		{
-		#if DEBUG
-		Mod.Logger.Debug("PerformBlockClassSwaps");
-		#endif
-		
-		if (ServerCore.World is ServerMain) {
-		var serverMain = ServerCore.World as ServerMain;
-		var wateringCanBlock = serverMain.GetBlock(BlockWateringCanPlus.TargetCode);
-		#if DEBUG
-		Mod.Logger.VerboseDebug("Change class from {0} to {1}", wateringCanBlock.Class, BlockWateringCanPlus.BlockClassName);
-		#endif
-		wateringCanBlock.Class = BlockWateringCanPlus.BlockClassName;
-		ServerCore.World.Blocks[wateringCanBlock.BlockId] = wateringCanBlock;//Mabey redundant?
-		}
 
-		}*/
 
 		private void AttachExtraBlockBehaviors()
 		{

--- a/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
@@ -1,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 
+using Newtonsoft.Json.Linq;
 
 using Vintagestory.API.Common;
 using Vintagestory.API.Config;
@@ -16,9 +18,37 @@ namespace AnvilMetalRecovery
 {
 	public partial class MetalRecoverySystem : ModSystem
 	{
+		private void UnravelMetalProperties( )
+		{
+		MetalProperties = new Dictionary<string, MetalInfo>( );
+		var metalAsset = ServerCore.Assets.TryGet("game:worldproperties/block/metal.json",true);
+		JObject originalJson = JObject.Parse(metalAsset.ToText());
+		var variants = originalJson.SelectToken(@"variants").Children( ).ToList( );
+
+		foreach (var variant in variants) 
+			{
+			var metalI = variant.ToObject<MetalInfo>();
+
+			if (!MetalProperties.ContainsKey(metalI.Code)) MetalProperties.Add(metalI.Code, metalI);
+
+				#if DEBUG
+				Mod.Logger.Debug($"parsed '{metalI.Code}' T:{metalI.Tier}, {(metalI.Elemental ?"Element":"Alloy")} Melt:{metalI.MeltingPoint}℃");
+				#endif
+			}
+
+
+		}
+
+		/// <summary>
+		/// Materials the data gathering.
+		/// </summary>
+		/// <remarks>
+		/// Sum, tally Voxels in smthing recipes for all 'metal'-ingot derived items
+		/// </remarks>
+		/// <returns>The data gathering.</returns>
 		private void MaterialDataGathering( )
 		{
-		//Count out Voxels in smthing recipes for all metal-ingot(?) derived items;
+		//TODO: FIX 3rd-PARTY MOD COMPATIBILITY !!!		
 		var examineList = this.SmithingRecipies.Where(sr => sr.Enabled && sr.Ingredient.Type == EnumItemClass.Item && sr.Output.Type == EnumItemClass.Item);
 
 		foreach (var recipie in examineList) {
@@ -43,7 +73,8 @@ namespace AnvilMetalRecovery
 		if (metalObject != null && metalObject.CombustibleProps != null && metalObject.CombustibleProps.SmeltingType == EnumSmeltType.Smelt && metalObject.CombustibleProps.SmeltedRatio > 0) {
 		//Item Input Has a metal Unit value...(Smeltable)	
 		//Resolve?
-		int setVoxels = 0;
+		int setVoxels = 0, meltPoint = 0;
+		float meltDur = 0;
 		setVoxels = recipie.Voxels.OfType<bool>( ).Count(vox => vox);							
 
 		#if DEBUG
@@ -56,16 +87,13 @@ namespace AnvilMetalRecovery
 		Mod.Logger.Warning($"Duplicate recipie '{recipie.Name}' output item: '{outputItem.Code.ToString()}'");				
 		}
 		else {
-		itemToVoxelLookup.Add(new RecoveryEntry(outputItem.Code, metalObject.Code,
-							                                              ( uint )(setVoxels / recipie.Output.Quantity),
-																			  metalObject.CombustibleProps.MeltingDuration,
-																		  metalObject.CombustibleProps.MeltingPoint)
-							 );
+		LookupMetalCode(metalObject.Code, out meltDur, out meltPoint);
+
+		itemToVoxelLookup.Add(new RecoveryEntry(outputItem.Code, metalObject.Code, ( uint )(setVoxels / recipie.Output.Quantity)));
 			#if DEBUG
 			Mod.Logger.VerboseDebug($"Mapped: ('tool') '{outputItem.Code}' -> ('tool') '{outputItem.Code}'");
 			#endif
-			}
-						
+			}						
 		}
 		else {
 		//Tool-head map to Tool item; decode
@@ -83,12 +111,10 @@ namespace AnvilMetalRecovery
 		if (itemToVoxelLookup.ContainsKey(itemToolCode)) {
 		Mod.Logger.Warning($"Duplicate recipie '{recipie.Name}' output tool-item: '{itemToolCode.ToString( )}'");
 		}
-		else
-		itemToVoxelLookup.Add( new RecoveryEntry(itemToolCode.Clone( ), metalObject.Code,
-																	  ( uint )(setVoxels / recipie.Output.Quantity),
-																		  metalObject.CombustibleProps.MeltingDuration,
-																	  metalObject.CombustibleProps.MeltingPoint)
-						 );
+		else {
+		LookupMetalCode(metalObject.Code, out meltDur, out meltPoint);
+		itemToVoxelLookup.Add(new RecoveryEntry(itemToolCode.Clone( ), metalObject.Code, ( uint )(setVoxels / recipie.Output.Quantity)));
+		}
 		#if DEBUG
 		Mod.Logger.VerboseDebug($"Mapped: (head) '{outputItem.Code}' -> (tool) '{itemToolCode}'");
 		#endif
@@ -98,7 +124,7 @@ namespace AnvilMetalRecovery
 		}
 		}
 
-		Mod.Logger.Event("tallied {0} smithables totaling {1} metal units from {2} smithing recipies!", itemToVoxelLookup.Count, itemToVoxelLookup.Sum(ie => ie.Quantity), this.SmithingRecipies.Count);
+		Mod.Logger.Event("tallied {0} smithables totaling {1} metal units from {2} smithing recipies!", itemToVoxelLookup.Count, itemToVoxelLookup.Sum(ie => ie.TotalQuantity), this.SmithingRecipies.Count);
 		}
 
 		private bool SmithingRecipieValidator(SmithingRecipe aRecipie )
@@ -127,7 +153,7 @@ namespace AnvilMetalRecovery
 				
 		RecoveryEntry rec = itemToVoxelLookup[hotbarData.ItemCode];
 		#if DEBUG
-		Mod.Logger.VerboseDebug("broken-item {0} abs. WORTH: {1:F1}*{2} units", hotbarData.ItemCode.ToString( ), (rec.Quantity * CachedConfiguration.VoxelEquivalentValue), rec.IngotCode.ToShortString( ));
+		Mod.Logger.VerboseDebug("broken-item {0} abs. WORTH: {1:F1}*{2} units", hotbarData.ItemCode.ToString( ), (rec.TotalQuantity * CachedConfiguration.VoxelEquivalentValue), rec.PrimaryMaterial.ToShortString( ));
 		#endif
 
 		if (String.IsNullOrEmpty(hotbarData.PlayerUID) || String.IsNullOrEmpty(hotbarData.InventoryID)) return;
@@ -223,6 +249,19 @@ namespace AnvilMetalRecovery
 		}
 
 		}
+
+		private bool LookupMetalCode(AssetLocation metalAssetCode, out float melting_duration, out int melting_point)
+		{
+		melting_duration = 30f;//same for ALL metals?
+		melting_point = 0;
+		string metalName = metalAssetCode.PathEnding();//Better be an Ingot!
+		if (MetalProperties.ContainsKey(metalName)) {		
+		melting_point = ( int )MetalProperties[metalName].MeltingPoint;
+		return true;
+		}
+
+		return false;
+		}
 	}
 }
 

--- a/AnvilMetalRecovery/assets/fma/itemtypes/metal/fragments.json
+++ b/AnvilMetalRecovery/assets/fma/itemtypes/metal/fragments.json
@@ -8,6 +8,7 @@
 		}        
 	},
 	storageFlags: 5,
+	dimensions: { width: 0.26, height: 0.26, length: 0.26 },
 	shape: { base: "fma:item/metal/fragments" },
 	textures: {
 		"metal": { base: "game:block/metal/plate/gold" },

--- a/AnvilMetalRecovery/assets/fma/lang/en.json
+++ b/AnvilMetalRecovery/assets/fma/lang/en.json
@@ -27,4 +27,5 @@
 	"fma:itemdesc-item-metal_fragments": "Try, chopping it apart with a Chisel...",
 	"fma:metal_worth":"Worth {0} units of {1}.",
     "fma:spray_cooler_text":"\n...mabey it can cool off hot things, too?",
+    "fma:cant_recover":"<font color=\"red\">This work isn't recoverable.</font>",
 }
\ No newline at end of file

--- /dev/null
+++ b/AnvilMetalRecovery/assets/fma/patches/old_item_remapping.json
@@ -0,0 +1,34 @@
+[
+{
+    "file": "game:config/remaps.json",
+    "op": "add",    
+    "side": "server",
+    "path": "/fma:v0.1.18-rc.3",
+    "value": [
+        	"/iir map fma:metal_shaving-copper game:metalbit-copper",			
+            "/iir map fma:metal_shaving-bismuth game:metalbit-bismuth ",
+            "/iir map fma:metal_shaving-bismuthbronze game:metalbit-bismuthbronze ",
+            "/iir map fma:metal_shaving-blackbronze game:metalbit-blackbronze ",
+            "/iir map fma:metal_shaving-brass game:metalbit-brass ",
+            "/iir map fma:metal_shaving-chromium game:metalbit-chromium ",
+            "/iir map fma:metal_shaving-gold game:metalbit-gold ",
+            "/iir map fma:metal_shaving-iron game:metalbit-iron ",
+            "/iir map fma:metal_shaving-meteoriciron game:metalbit-meteoriciron ",
+            "/iir map fma:metal_shaving-lead game:metalbit-lead ",
+            "/iir map fma:metal_shaving-molybdochalkos game:metalbit-molybdochalkos ",
+            "/iir map fma:metal_shaving-platinum game:metalbit-platinum ",
+            "/iir map fma:metal_shaving-rhodium game:metalbit-rhodium ",
+            "/iir map fma:metal_shaving-silver game:metalbit-silver ",
+            "/iir map fma:metal_shaving-stainlesssteel game:metalbit-stainlesssteel ",
+            "/iir map fma:metal_shaving-steel game:metalbit-steel ",
+            "/iir map fma:metal_shaving-tin game:metalbit-tin ",
+            "/iir map fma:metal_shaving-tinbronze game:metalbit-tinbronze ",
+            "/iir map fma:metal_shaving-titanium game:metalbit-titanium ",
+            "/iir map fma:metal_shaving-uranium game:metalbit-uranium ",
+            "/iir map fma:metal_shaving-zinc game:metalbit-zinc ",
+            "/iir map fma:metal_shaving-blistersteel game:metalbit-blistersteel ",
+            "/iir map fma:metal_shaving-leadsolder game:metalbit-leadsolder ",
+            "/iir map fma:metal_shaving-silversolder game:metalbit-silversolder "
+        ]
+}
+]
\ No newline at end of file

--- a/AnvilMetalRecovery/modinfo.json
+++ b/AnvilMetalRecovery/modinfo.json
@@ -4,9 +4,9 @@
   "description" : "Get back smithing discards, broken tool scrap, failed molds; and MORE!",
   "authors": ["Melchior"],
   "ModID":"metalrecovery",
-  "version": "0.1.18-rc.8",
+  "version": "0.1.19-pre.0",
   "dependencies": { 
-	"game": "1.17.0-rc.0",
+	"game": "1.18.0",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"