提交: 868f21b19d98ca01b1ae699108861945fe9380b5 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修订版: 868f21b19d98ca01b1ae699108861945fe9380b5 (tree)
• 时间: 2021-05-01 09:17:19
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

Item self-applied Smeltable properties for regular (and custom)
Ingots

更改概述

• modified: AnvilMetalRecovery/AnvilMetalRecovery.csproj
• modified: AnvilMetalRecovery/Helpers.cs
• add: AnvilMetalRecovery/Items/SmartSmeltableItem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• modified: AnvilMetalRecovery/assets/fma/itemtypes/metal/metal_shavings.json

差异

--- a/AnvilMetalRecovery/AnvilMetalRecovery.csproj
+++ b/AnvilMetalRecovery/AnvilMetalRecovery.csproj
@@ -74,6 +74,7 @@
     <Compile Include="EntityBehaviors\HotbarObserverData.cs" />
     <Compile Include="Data\RecoveryEntry.cs" />
     <Compile Include="Items\VariableMetalItem.cs" />
+    <Compile Include="Items\SmartSmeltableItem.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">

--- a/AnvilMetalRecovery/Helpers.cs
+++ b/AnvilMetalRecovery/Helpers.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 
 using Vintagestory.API.Common;
 using Vintagestory.API.Common.Entities;
@@ -40,6 +41,18 @@ namespace AnvilMetalRecovery
 		if (itemStack.Attributes.HasAttribute(@"durability"))
 			 itemStack.Attributes.SetInt(@"durability", number);		
 		}
+
+		internal static bool BeginingOnly(this AssetLocation checkCode, string term)
+		{			
+			return checkCode.Valid && checkCode.Path.Split('-').First().Equals(term, StringComparison.OrdinalIgnoreCase);
+		}
+
+		internal static AssetLocation AppendPathVariant(this AssetLocation toAppend, string append)
+		{
+		var appendedCode = toAppend.Clone( );
+		appendedCode.Path += ("-" + append);
+		return appendedCode;
+		}
 	}
 }
 

--- /dev/null
+++ b/AnvilMetalRecovery/Items/SmartSmeltableItem.cs
@@ -0,0 +1,55 @@
+using System;
+using System.Linq;
+
+using Vintagestory.API.Client;
+using Vintagestory.API.Common;
+using Vintagestory.API.Util;
+
+
+namespace AnvilMetalRecovery
+{
+	/// <summary>
+	/// Applies Ingot-{metal} Combustable properties dynamically.
+	/// </summary>
+	public class SmartSmeltableItem : Item
+	{
+		internal static AssetLocation _ingotPrefix = new AssetLocation(@"game", @"ingot");
+		public string Metal 
+		{ get { return this?.Variant[@"metal"] ?? "copper"; } }
+
+		public int Ratio 
+		{ get { return this.Attributes[@"ratio"].AsInt(20); } }
+
+		public override void OnModifiedInInventorySlot(IWorldAccessor world, ItemSlot slot, ItemStack extractedStack = null)
+		{
+		RegenerateCombustablePropsByVariant(slot);
+		}
+
+		protected void RegenerateCombustablePropsByVariant(ItemSlot slot)
+		{
+		if (this.CombustibleProps != null || slot.Itemstack.Collectible.CombustibleProps != null) return;
+
+		var ingotAssetCode = _ingotPrefix.AppendPathVariant(Metal);//Wildcard find? excluding domain?
+		var ingotEntry = api.World.GetItem(ingotAssetCode);
+		var metalSmeltProps = ingotEntry?.CombustibleProps?.Clone( );
+
+		if (metalSmeltProps != null) 
+			{		
+			metalSmeltProps.SmeltedRatio = Ratio;
+
+			//Back-Inject source Input Item stack - as Firepit checks THAT	
+			slot.Itemstack.Collectible.CombustibleProps = metalSmeltProps.Clone( );
+			#if DEBUG
+			api.Logger.VerboseDebug("set SmeltProps, for: {0} from {1}", this.Code.ToString( ), ingotAssetCode.ToString());
+			#endif
+			}
+			else 
+			{
+			#if DEBUG
+			api.Logger.VerboseDebug("Non-existant Ingot: {0}", ingotAssetCode.ToString( ));
+			#endif
+			}		
+		}
+	}
+}
+

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -18,6 +18,7 @@ namespace AnvilMetalRecovery
 	{				
 		internal const string anvilKey = @"Anvil";
 		internal const string metalFragmentsCode = @"fma:metal_fragments";
+		internal const string metalShavingsCode = @"metal_shaving";
 		public const float IngotVoxelEquivalent = 2.38f;
 
 		private Dictionary<AssetLocation, RecoveryEntry> itemToVoxelLookup = new Dictionary<AssetLocation, RecoveryEntry>();//Ammount & Material?
@@ -61,7 +62,7 @@ namespace AnvilMetalRecovery
 
 		public override double ExecuteOrder( )
 		{
-		return 0.1d;
+		return 0.11d;
 		}
 
 		public override void Start(ICoreAPI api)
@@ -91,7 +92,7 @@ namespace AnvilMetalRecovery
 		//ServerAPI.RegisterBlockEntityClass(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));		
 		ServerCore.ClassRegistryNative.ReplaceBlockEntityType(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));
 
-		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);
+		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);		
 
 		SetupHotbarObserver( );
 
@@ -100,6 +101,8 @@ namespace AnvilMetalRecovery
 		#if DEBUG
 			ServerAPI.RegisterCommand("durability", "edit durability of item", " (Held tool) and #", EditDurability);
 		#endif
+
+		
 		}
 
 		public override void StartClientSide(ICoreClientAPI api)
@@ -122,32 +125,11 @@ namespace AnvilMetalRecovery
 
 		private void RegisterItemMappings( )
 		{
-		this.CoreAPI.RegisterItemClass("VariableMetalItem", typeof(VariableMetalItem));
-
+		this.CoreAPI.RegisterItemClass(@"VariableMetalItem", typeof(VariableMetalItem));
+		this.CoreAPI.RegisterItemClass(@"SmartSmeltableItem", typeof(SmartSmeltableItem));
 		}
 
 
-		/*
-		internal void GenerateMetalShavingsItems( )
-		{
-		//TODO: Automatic Generation of Item 'metal_shaving' by metal & alloy list at RUNTIME
-		var genericShaving = ServerAPI.World.ClassRegistry.CreateItem("metal_shaving");
-		//genericShaving.CombustibleProps.
-
-		var metalProperties = new Dictionary<AssetLocation, MetalProperty>( );
-
-		foreach (var entry in ServerAPI.Assets.GetMany<MetalProperty>(Mod.Logger, "worldproperties/")) {
-		AssetLocation loc = entry.Key.Clone( );
-		loc.Path = loc.Path.Replace("worldproperties/", "");
-		loc.RemoveEnding( );
-
-		entry.Value.Code.Domain = entry.Key.Domain;
-
-		metalProperties.Add(loc, entry.Value);
-
-		}
-		}
-		*/
 
 		private void SetupHotbarObserver( ){
 		ServerCore.RegisterEntityBehaviorClass(@"HotbarObserver", typeof(HotbarObserverBehavior));
@@ -273,6 +255,48 @@ namespace AnvilMetalRecovery
 		}
 
 		}
+
+		/// <summary>
+		/// Adds all smelting related 'combustibleProps' fields from known Ingot Codes; (matching variant keys)
+		/// </summary>
+		/// <returns>The combuastable properties by code variant.</returns>
+		/// <param name="updatingCode">PARTIAL Item code.</param>
+		private void ApplySmeltingPropertiesByCodeVariant(AssetLocation updatingCode,  int ratioOverride = 1 )
+		{
+		//ALL ????:'ingot-*' type items...
+		var ingotItems = ServerAPI.World.Items.Where(itm => itm.ItemId > 0 && itm.Code != null && itm.Code.BeginingOnly(@"ingot"));
+
+		#if DEBUG
+		this.Mod.Logger.VerboseDebug("found {0} Ingot type items", ingotItems.Count());
+		#endif
+
+		foreach (var ingotEntry in ingotItems) {
+		if (ingotEntry == null) continue;
+		string metalName = ingotEntry?.Variant[@"metal"];
+		var metalSmeltProps = ingotEntry?.CombustibleProps?.Clone( );
+		
+		if (metalSmeltProps == null) continue;//SHOULD BE NEVER !
+		if (string.IsNullOrEmpty(metalName)) continue;
+
+		metalSmeltProps.SmeltedRatio = ratioOverride;
+		AssetLocation shavingCode = updatingCode.AppendPathVariant(metalName);
+		var shavingEquivalentItem = ServerAPI.World.GetItem(shavingCode);
+		if (shavingEquivalentItem != null) 
+			{
+			shavingEquivalentItem.CombustibleProps = metalSmeltProps;
+			#if DEBUG
+			ServerAPI.Logger.VerboseDebug("Updated SmeltProps, for: {0}", shavingCode.ToString( ));
+			#endif
+			}
+			else 
+			{
+			#if DEBUG
+			ServerAPI.Logger.VerboseDebug("Non-existant item: {0}", shavingCode.ToString( ));
+			#endif
+			}
+		}
+
+		}
 	}
 
 

--- a/AnvilMetalRecovery/assets/fma/itemtypes/metal/metal_shavings.json
+++ b/AnvilMetalRecovery/assets/fma/itemtypes/metal/metal_shavings.json
@@ -1,6 +1,6 @@
 {
-	code: "metal_shaving",
-	
+	code: "metal_shaving",	
+	class: "SmartSmeltableItem",
 	maxstacksize: 128,
 	attributes: {		
 		handbook: {
@@ -13,7 +13,8 @@
             "*-blistersteel":true,
 			"*-uranium": true
 			}
-		}		
+		},	
+		ratio: 20,
 	},
 	variantgroups: [
 		{ code: "metal", states: ["blistersteel"], loadFromProperties: "game:block/metal" },
@@ -25,143 +26,7 @@
 		"metal": { base: "game:block/metal/ingot/{metal}" },
 	},
 	creativeinventory: { "general": ["*"], "items": ["*"] },
-	materialDensityByType: {
-		"*-copper": 8960,
-		"*-brass": 8500,
-		"*-tinbronze": 7600,
-		"*-bismuthbronze": 7900,
-		"*-blackbronze": 9000,
-		"*-iron": 7870,
-		"*-meteoriciron": 7800,
-		"*-steel": 7820,
-		"*-blistersteel": 7720,
-		"*-gold": 19300,
-		"*-lead": 11300,
-		"*-tin": 7260,
-		"*-chromium": 7150,
-		"*-platinum": 21500,
-		"*-titanium": 4510,
-		"*-zinc": 7140,
-		"*-silver": 10500,
-		"*-bismuth": 9790,
-		"*-molybdochalkos": 9600
-	},
-	combustiblePropsByType: {
-		"*-copper": {
-			meltingPoint: 1084,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-copper" }
-		},
-		"*-brass": {
-			meltingPoint: 920,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-brass" }
-		},
-		"*-tinbronze": {
-			meltingPoint: 950,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-tinbronze" }
-		},
-		"*-bismuthbronze": {
-			meltingPoint: 850,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-bismuthbronze" }
-		},
-		"*-blackbronze": {
-			meltingPoint: 1020,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-blackbronze" }
-		},
-		"*-iron": {
-			meltingPoint: 1482,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-iron" }
-		},
-		"*-meteoriciron": {
-			meltingPoint: 1476,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-meteoriciron" }
-		},
-		"*-steel": {
-			meltingPoint: 1502,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-steel" }
-		},
-		"*-blistersteel": {
-			meltingPoint: 1602,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-blistersteel" }
-		},
-		"*-gold": {
-			meltingPoint: 1063,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-gold", }
-		},
-		"*-lead": {
-			meltingPoint: 327,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-lead" }
-		},
-		"*-tin": {
-			meltingPoint: 232,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-tin" }
-		},
-		"*-chromium": {
-			meltingPoint: 1907,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-chromium" }
-		},
-		"*-platinum": {
-			meltingPoint: 1770,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-platinum" }
-		},
-		"*-titanium": {
-			meltingPoint: 1668,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-titanium" }
-		},
-		"*-zinc": {
-			meltingPoint: 419,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-zinc" }
-		},
-		"*-silver": {
-			meltingPoint: 961,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-silver" }
-		},
-		"*-bismuth": {
-			meltingPoint: 271,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-bismuth" }
-		},
-		"*-molybdochalkos": {
-			meltingPoint: 902,
-			meltingDuration: 30,
-			smeltedRatio: 20,
-			smeltedStack: { type: "item", code: "game:ingot-molybdochalkos" }
-		}
-	},
+	materialDensity: 9000,		
 	guiTransform: {
         rotate: true,
 		translation: { x: -3, y: 0, z: 0 },