Commit: 49d682d12fb187a68433fd53c3deae330f504e4f - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Révision: 49d682d12fb187a68433fd53c3deae330f504e4f (tree)
• l'heure: 2021-05-03 07:53:55
• Auteur: melchior <melchior@user...>
• Commiter: melchior

Message de Log

W.I.P. Harmony RT patcher alternative implimentation

Change Summary

• modified: AnvilMetalRecovery/AnvilMetalRecovery.csproj
• add: AnvilMetalRecovery/Harmony/AnvilDaptor.cs
• modified: AnvilMetalRecovery/Items/VariableMetalItem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• add: AnvilMetalRecovery/MetalRecoverySystem_Components.cs

Modification

--- a/AnvilMetalRecovery/AnvilMetalRecovery.csproj
+++ b/AnvilMetalRecovery/AnvilMetalRecovery.csproj
@@ -64,6 +64,10 @@
       <HintPath>vs_libs\Newtonsoft.Json.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="0Harmony">
+      <HintPath>vs_libs\0Harmony.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MetalRecoverySystem.cs" />
@@ -75,6 +79,8 @@
     <Compile Include="Data\RecoveryEntry.cs" />
     <Compile Include="Items\VariableMetalItem.cs" />
     <Compile Include="Items\SmartSmeltableItem.cs" />
+    <Compile Include="Harmony\AnvilDaptor.cs" />
+    <Compile Include="MetalRecoverySystem_Components.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="modinfo.json">
@@ -124,6 +130,7 @@
     <Folder Include="assets\fma\patches\" />
     <Folder Include="Data\" />
     <Folder Include="Items\" />
+    <Folder Include="Harmony\" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- /dev/null
+++ b/AnvilMetalRecovery/Harmony/AnvilDaptor.cs
@@ -0,0 +1,117 @@
+using System;
+using System.Text;
+
+using HarmonyLib;
+
+using Vintagestory.API.Common;
+using Vintagestory.API.Config;
+using Vintagestory.API.MathTools;
+using Vintagestory.GameContent;
+
+namespace AnvilMetalRecovery
+{
+	/// <summary>
+	/// Harmony patcher class to generate Bus-Events from Anvil, and other-effects
+	/// </summary>
+	[HarmonyPatch(typeof(BlockEntityAnvil))]
+	public class AnvilDaptor 
+	{
+	 
+	[HarmonyPrefix]
+	[HarmonyPatch(nameof(BlockEntityAnvil.OnSplit))]	
+	private static void Prefix_OnSplit(Vec3i voxelPos, BlockEntityAnvil __instance)
+	{
+	SmithAssist anvil = __instance as SmithAssist;	
+
+	if (anvil.IsShavable && anvil.Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) {
+	#if DEBUG
+	anvil.Logger.VerboseDebug("Split some {0} @{1}, Total:{2}", anvil.BaseMetal, voxelPos, anvil.SplitCount);
+	#endif
+	anvil.SplitCount++;
+	}
+		
+	}
+
+	[HarmonyPostfix]
+	[HarmonyPatch(nameof(BlockEntityAnvil.GetBlockInfo))]
+	private static void Postfix_GetBlockInfo(IPlayer forPlayer, StringBuilder dsc, BlockEntityAnvil __instance)
+	{	
+	SmithAssist anvil = __instance as SmithAssist;
+
+	if (anvil.IsShavable && anvil.SplitCount > 0 && anvil.BaseMaterial != null) {
+	dsc.AppendFormat("[ {0} ÷ {1} ] = {2}", anvil.SplitCount, SmithAssist.splitValue, Lang.GetUnformatted($"fma:item-metal_shaving-{anvil.BaseMetal}"));
+	}
+
+	}
+
+
+	}
+
+	/// <summary>
+	/// Special tools for handling the Anvil's data/state, ect...
+	/// </summary>
+	internal class SmithAssist : BlockEntityAnvil
+	{
+		internal const string splitCountKey = @"splitCount";
+		internal const uint splitValue = 5;
+
+		internal ILogger Logger {
+			get
+			{
+			return Api.World.Logger;
+			}
+		}
+
+		internal static AssetLocation MetalShavingsCode {
+			get
+			{
+			return new AssetLocation(@"fma", @"metal_shaving");
+			}
+		}
+
+
+		internal int SplitCount {
+			get
+			{
+			return this.WorkItemStack?.Attributes.TryGetInt(splitCountKey) ?? 0;
+			}
+			set
+			{
+			this.WorkItemStack?.Attributes.SetInt(splitCountKey, value);
+			}
+		}
+
+		internal bool IsShavable {
+			get
+			{
+			//this.SelectedRecipe <-- things that are recoverable?
+			return this.WorkItemStack?.Collectible?.FirstCodePart( ).Equals(@"ironbloom") == false;
+			}
+		}
+
+		internal IAnvilWorkable AnvilWorkpiece {
+			get
+			{
+			if (this.WorkItemStack != null && this.WorkItemStack.Collectible is IAnvilWorkable) { return this.WorkItemStack.Collectible as IAnvilWorkable; }
+
+			return null;
+			}
+		}
+
+		internal ItemStack BaseMaterial {
+			get
+			{
+			if (this.WorkItemStack != null) return AnvilWorkpiece.GetBaseMaterial(this.WorkItemStack);//Right??
+			return null;
+			}
+		}
+
+		internal string BaseMetal {
+			get
+			{
+			return this?.BaseMaterial?.Collectible.LastCodePart( );
+			}
+		}
+	}
+}
+

--- a/AnvilMetalRecovery/Items/VariableMetalItem.cs
+++ b/AnvilMetalRecovery/Items/VariableMetalItem.cs
@@ -62,16 +62,17 @@ namespace AnvilMetalRecovery
 		LoadedTexture texturePlaceholder = new LoadedTexture(capi);
 		var ingotCode = MetalCode(itemstack);
 		var textureDonatorItem = capi.World.GetItem(ingotCode);
+		if (textureDonatorItem != null) {
 		var newTexture = textureDonatorItem.FirstTexture.Base.WithPathAppendixOnce(".png");
 
 		//#if DEBUG
 		//capi.Logger.VerboseDebug("VariableMetalItem Txr: {0}", newTexture);
-      	//#endif			                  
-		
+		//#endif			                  
+
 		capi.Render.GetOrLoadTexture(newTexture, ref texturePlaceholder);
 
 		renderinfo.TextureId = texturePlaceholder.TextureId;
-
+		}
 		//Cache TextId# on TempAttributes ?
 		}
 

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -69,9 +69,10 @@ namespace AnvilMetalRecovery
 		{
 		this.CoreAPI = api;
 
-
 		RegisterItemMappings( );
 
+		//TODO: Setup HARMONY Patches
+
 		base.Start(api);
 		}
 
@@ -136,167 +137,7 @@ namespace AnvilMetalRecovery
 		ServerCore.Event.RegisterEventBusListener(HotbarEventReciever, 1.0f, HotbarObserverBehavior.HotbarChannelName);
 		}
 
-		private void MaterialDataGathering( )
-		{
-		//Count out Voxels in smthing recipes for all metal-ingot(?) derived items;
-		var examineList = ServerAPI.World.SmithingRecipes.Where(sr => sr.Enabled && sr.Ingredient.Type == EnumItemClass.Item && sr.Output.Type == EnumItemClass.Item);
-
-		foreach (var recipie in examineList) 
-		{		
-			CollectibleObject metalObject =  recipie.Ingredient.Type == EnumItemClass.Item ? ServerAPI.World.GetItem(recipie.Ingredient.Code) : ServerAPI.World.GetBlock(recipie.Ingredient.Code) as CollectibleObject;
-			Item outputItem = ServerAPI.World.GetItem(recipie.Output.Code);
-
-			if (metalObject.CombustibleProps != null && metalObject.CombustibleProps.SmeltingType == EnumSmeltType.Smelt && metalObject.CombustibleProps.SmeltedRatio > 0) {
-			//Item Input Has a metal Unit value...(Smeltable)	
-			//Resolve?
-			int setVoxels = 0;
-			setVoxels = recipie.Voxels.OfType<bool>( ).Count(vox => vox);
-
-			#if DEBUG
-			Mod.Logger.VerboseDebug($"{recipie.Output.Quantity}* '{outputItem.Code}' -> {setVoxels}x '{metalObject.Code}' voxel = ~{setVoxels * IngotVoxelEquivalent:F1} metal Units");
-			#endif
-			//Direct output *IS* tool or tool-like Durability type item (chisel )
-			if (outputItem.Tool.HasValue || outputItem.Durability > 1) 
-			{
-				itemToVoxelLookup.Add(outputItem.Code.Clone( ), new RecoveryEntry(metalObject.Code, 
-						                                                          ( uint )(setVoxels / recipie.Output.Quantity),
-						              												metalObject.CombustibleProps.MeltingDuration,
-						                                                          metalObject.CombustibleProps.MeltingPoint)
-						             );
-				#if DEBUG
-				Mod.Logger.VerboseDebug($"Mapped: ('tool') '{outputItem.Code}' -> ('tool') '{outputItem.Code}'");
-				#endif
-			}
-			else 
-			{
-			//Tool-head map to Tool item; decode
-			var itemToolCode = ServerAPI.World.GridRecipes.FirstOrDefault(gr => gr.Ingredients.Any(crg => crg.Value.Code.Equals(outputItem.Code)) && gr.Enabled && gr.Output.Type == EnumItemClass.Item)?.Output.Code;
-				if (itemToolCode != null) 
-				{
-					var itemTool = ServerAPI.World.GetItem(itemToolCode);
-					if (itemTool.Tool.HasValue) 
-					{
-					itemToVoxelLookup.Add(itemToolCode.Clone( ), new RecoveryEntry(metalObject.Code,
-																				  ( uint )(setVoxels / recipie.Output.Quantity),
-																					  metalObject.CombustibleProps.MeltingDuration,
-																				  metalObject.CombustibleProps.MeltingPoint)
-									 );
-					#if DEBUG
-					Mod.Logger.VerboseDebug($"Mapped: (head) '{outputItem.Code}' -> (tool) '{itemToolCode}'");
-					#endif
-					}
-				}
-			}
-		}		
-		}
-
-		}
-
-		private void HotbarEventReciever(string eventName, ref EnumHandling handling, IAttribute data)
-		{
-		handling = EnumHandling.PassThrough;
-		HotbarObserverData hotbarData = data as HotbarObserverData;
-
-		#if DEBUG
-		Mod.Logger.VerboseDebug("HotbarEvent Rx: Item:{0} Slot#{1} PlayerUID:{2}", hotbarData.ItemCode.ToString( ), hotbarData.SlotID, hotbarData.PlayerUID);
-		#endif
-
-		if (ItemFilterList.Contains(hotbarData.ItemCode)) {
-		#if DEBUG
-		RecoveryEntry rec = itemToVoxelLookup[hotbarData.ItemCode];
-		Mod.Logger.VerboseDebug("broken-tool/weap. {0} WORTH: {1:F1}*{2} units", hotbarData.ItemCode.ToString( ),(rec.Quantity*IngotVoxelEquivalent), rec.IngotCode.ToShortString() );
-		#endif
-
-		var playerTarget = ServerAPI.World.PlayerByUid(hotbarData.PlayerUID);
-		var hotbarInv = playerTarget.InventoryManager.GetHotbarInventory( );
-		var hotSlot = hotbarInv[hotbarData.SlotID];
-		var spim = playerTarget.InventoryManager as ServerPlayerInventoryManager;
-
-
-		if (hotSlot.Empty) 
-			{
-			#if DEBUG
-			Mod.Logger.VerboseDebug("Directly inserting fragments into hotbar slot# {0}", hotbarData.SlotID);
-			#endif
-
-			VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
-			ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
-			variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack);
-			hotSlot.Itemstack = metalFragmentsStack;
-			hotSlot.Itemstack.ResolveBlockOrItem(ServerAPI.World);
-			hotSlot.MarkDirty( );
-			spim.NotifySlot(playerTarget, hotSlot);
-			}
-		else 
-			{
-			#if DEBUG
-			Mod.Logger.VerboseDebug("Occupied Hotbar slot# {0}; shoving item in general direction of player...", hotbarData.SlotID);
-			#endif
-
-			VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
-			ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
-			variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack);
-			spim.TryGiveItemstack(metalFragmentsStack, true);			
-			}
-		}
-
-		}
-
-
-
-		private void EditDurability(IServerPlayer player, int groupId, CmdArgs args)
-		{
-		if (!player.Entity.RightHandItemSlot.Empty &&
-			player.Entity.RightHandItemSlot.Itemstack.Class == EnumItemClass.Item) {
-		var number = args.PopInt( );
-
-		player.Entity.RightHandItemSlot.Itemstack.Hitpoints(number ?? 10);
-		player.Entity.RightHandItemSlot.MarkDirty( );
-		}
-
-		}
-
-		/// <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
-			}
-		}
-
-		}
 	}
 
 

--- /dev/null
+++ b/AnvilMetalRecovery/MetalRecoverySystem_Components.cs
@@ -0,0 +1,173 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+
+using Vintagestory.API.Client;
+using Vintagestory.API.Common;
+using Vintagestory.API.Datastructures;
+using Vintagestory.API.Server;
+using Vintagestory.Client.NoObf;
+using Vintagestory.Common;
+using Vintagestory.Server;
+using Vintagestory.ServerMods;
+
+namespace AnvilMetalRecovery
+{
+	public partial class MetalRecoverySystem : ModSystem
+	{
+		private void MaterialDataGathering( )
+		{
+		//Count out Voxels in smthing recipes for all metal-ingot(?) derived items;
+		var examineList = ServerAPI.World.SmithingRecipes.Where(sr => sr.Enabled && sr.Ingredient.Type == EnumItemClass.Item && sr.Output.Type == EnumItemClass.Item);
+
+		foreach (var recipie in examineList) {
+		CollectibleObject metalObject = recipie.Ingredient.Type == EnumItemClass.Item ? ServerAPI.World.GetItem(recipie.Ingredient.Code) : ServerAPI.World.GetBlock(recipie.Ingredient.Code) as CollectibleObject;
+		Item outputItem = ServerAPI.World.GetItem(recipie.Output.Code);
+
+		if (metalObject.CombustibleProps != null && metalObject.CombustibleProps.SmeltingType == EnumSmeltType.Smelt && metalObject.CombustibleProps.SmeltedRatio > 0) {
+		//Item Input Has a metal Unit value...(Smeltable)	
+		//Resolve?
+		int setVoxels = 0;
+		setVoxels = recipie.Voxels.OfType<bool>( ).Count(vox => vox);
+
+		#if DEBUG
+		Mod.Logger.VerboseDebug($"{recipie.Output.Quantity}* '{outputItem.Code}' -> {setVoxels}x '{metalObject.Code}' voxel = ~{setVoxels * IngotVoxelEquivalent:F1} metal Units");
+		#endif
+		//Direct output *IS* tool or tool-like Durability type item (chisel )
+		if (outputItem.Tool.HasValue || outputItem.Durability > 1) {
+		itemToVoxelLookup.Add(outputItem.Code.Clone( ), new RecoveryEntry(metalObject.Code,
+																		  ( uint )(setVoxels / recipie.Output.Quantity),
+																			  metalObject.CombustibleProps.MeltingDuration,
+																		  metalObject.CombustibleProps.MeltingPoint)
+							 );
+		#if DEBUG
+		Mod.Logger.VerboseDebug($"Mapped: ('tool') '{outputItem.Code}' -> ('tool') '{outputItem.Code}'");
+		#endif
+		}
+		else {
+		//Tool-head map to Tool item; decode
+		var itemToolCode = ServerAPI.World.GridRecipes.FirstOrDefault(gr => gr.Ingredients.Any(crg => crg.Value.Code.Equals(outputItem.Code)) && gr.Enabled && gr.Output.Type == EnumItemClass.Item)?.Output.Code;
+		if (itemToolCode != null) {
+		var itemTool = ServerAPI.World.GetItem(itemToolCode);
+		if (itemTool.Tool.HasValue) {
+		itemToVoxelLookup.Add(itemToolCode.Clone( ), new RecoveryEntry(metalObject.Code,
+																	  ( uint )(setVoxels / recipie.Output.Quantity),
+																		  metalObject.CombustibleProps.MeltingDuration,
+																	  metalObject.CombustibleProps.MeltingPoint)
+						 );
+		#if DEBUG
+		Mod.Logger.VerboseDebug($"Mapped: (head) '{outputItem.Code}' -> (tool) '{itemToolCode}'");
+		#endif
+		}
+		}
+		}
+		}
+		}
+
+		}
+
+		private void HotbarEventReciever(string eventName, ref EnumHandling handling, IAttribute data)
+		{
+		handling = EnumHandling.PassThrough;
+		HotbarObserverData hotbarData = data as HotbarObserverData;
+
+		#if DEBUG
+		Mod.Logger.VerboseDebug("HotbarEvent Rx: Item:{0} Slot#{1} PlayerUID:{2}", hotbarData.ItemCode.ToString( ), hotbarData.SlotID, hotbarData.PlayerUID);
+		#endif
+
+		if (ItemFilterList.Contains(hotbarData.ItemCode)) {
+		#if DEBUG
+		RecoveryEntry rec = itemToVoxelLookup[hotbarData.ItemCode];
+		Mod.Logger.VerboseDebug("broken-tool/weap. {0} WORTH: {1:F1}*{2} units", hotbarData.ItemCode.ToString( ), (rec.Quantity * IngotVoxelEquivalent), rec.IngotCode.ToShortString( ));
+		#endif
+
+		var playerTarget = ServerAPI.World.PlayerByUid(hotbarData.PlayerUID);
+		var hotbarInv = playerTarget.InventoryManager.GetHotbarInventory( );
+		var hotSlot = hotbarInv[hotbarData.SlotID];
+		var spim = playerTarget.InventoryManager as ServerPlayerInventoryManager;
+
+
+		if (hotSlot.Empty) {
+		#if DEBUG
+		Mod.Logger.VerboseDebug("Directly inserting fragments into hotbar slot# {0}", hotbarData.SlotID);
+		#endif
+
+		VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
+		ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
+		variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack);
+		hotSlot.Itemstack = metalFragmentsStack;
+		hotSlot.Itemstack.ResolveBlockOrItem(ServerAPI.World);
+		hotSlot.MarkDirty( );
+		spim.NotifySlot(playerTarget, hotSlot);
+		}
+		else {
+		#if DEBUG
+		Mod.Logger.VerboseDebug("Occupied Hotbar slot# {0}; shoving item in general direction of player...", hotbarData.SlotID);
+		#endif
+
+		VariableMetalItem variableMetal = ServerAPI.World.GetItem(new AssetLocation(metalFragmentsCode)) as VariableMetalItem;
+		ItemStack metalFragmentsStack = new ItemStack(variableMetal, 1);
+		variableMetal.ApplyMetalProperties(rec, ref metalFragmentsStack);
+		spim.TryGiveItemstack(metalFragmentsStack, true);
+		}
+		}
+
+		}
+
+
+
+		private void EditDurability(IServerPlayer player, int groupId, CmdArgs args)
+		{
+		if (!player.Entity.RightHandItemSlot.Empty &&
+			player.Entity.RightHandItemSlot.Itemstack.Class == EnumItemClass.Item) {
+		var number = args.PopInt( );
+
+		player.Entity.RightHandItemSlot.Itemstack.Hitpoints(number ?? 10);
+		player.Entity.RightHandItemSlot.MarkDirty( );
+		}
+
+		}
+
+		/// <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
+		}
+		}
+
+		}
+	}
+}
+