提交: 266e3e3fbc60bc37e3e76954998ebd35f1616c84 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修订版: 266e3e3fbc60bc37e3e76954998ebd35f1616c84 (tree)
• 时间: 2021-05-04 06:17:02
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. Almost working harmonized B.E.A.

更改概述

• modified: AnvilMetalRecovery/AnvilMetalRecovery.csproj
• modified: AnvilMetalRecovery/Harmony/AnvilDaptor.cs
• modified: AnvilMetalRecovery/Items/SmartSmeltableItem.cs
• modified: AnvilMetalRecovery/Items/VariableMetalItem.cs
• modified: AnvilMetalRecovery/MetalRecoverySystem.cs
• modified: AnvilMetalRecovery/assets/fma/shapes/item/metal/fragments.json

差异

--- a/AnvilMetalRecovery/AnvilMetalRecovery.csproj
+++ b/AnvilMetalRecovery/AnvilMetalRecovery.csproj
@@ -72,7 +72,6 @@
   <ItemGroup>
     <Compile Include="MetalRecoverySystem.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="BlockEntities\MetalRecovery_BlockEntityAnvil.cs" />
     <Compile Include="Helpers.cs" />
     <Compile Include="EntityBehaviors\HotbarObserverBehavior.cs" />
     <Compile Include="EntityBehaviors\HotbarObserverData.cs" />
@@ -110,6 +109,7 @@
     <None Include="assets\fma\itemtypes\metal\fragments.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="BlockEntities\MetalRecovery_BlockEntityAnvil.cs" />
   </ItemGroup>
   <ItemGroup>
     <Folder Include="assets\" />

--- a/AnvilMetalRecovery/Harmony/AnvilDaptor.cs
+++ b/AnvilMetalRecovery/Harmony/AnvilDaptor.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using System.Text;
 
 using HarmonyLib;
@@ -11,7 +12,7 @@ using Vintagestory.GameContent;
 namespace AnvilMetalRecovery
 {
 	/// <summary>
-	/// Harmony patcher class to generate Bus-Events from Anvil, and other-effects
+	/// Harmony patcher class to wrap B.E. Anvil class
 	/// </summary>
 	[HarmonyPatch(typeof(BlockEntityAnvil))]
 	public class AnvilDaptor 
@@ -21,9 +22,9 @@ namespace AnvilMetalRecovery
 	[HarmonyPatch(nameof(BlockEntityAnvil.OnSplit))]	
 	private static void Prefix_OnSplit(Vec3i voxelPos, BlockEntityAnvil __instance)
 	{
-	SmithAssist anvil = __instance as SmithAssist;	
+	var anvil = new SmithAssist(__instance);
 
-	if (anvil.IsShavable && anvil.Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) {
+	if (anvil.IsShavable && anvil.Voxel(voxelPos.X, voxelPos.Y, voxelPos.Z) == EnumVoxelMaterial.Metal) {
 	#if DEBUG
 	anvil.Logger.VerboseDebug("Split some {0} @{1}, Total:{2}", anvil.BaseMetal, voxelPos, anvil.SplitCount);
 	#endif
@@ -34,31 +35,53 @@ namespace AnvilMetalRecovery
 
 	[HarmonyPostfix]
 	[HarmonyPatch(nameof(BlockEntityAnvil.GetBlockInfo))]
-	private static void Postfix_GetBlockInfo(IPlayer forPlayer, StringBuilder dsc, BlockEntityAnvil __instance)
+	private static void Postfix_GetBlockInfo(IPlayer forPlayer, ref StringBuilder dsc, BlockEntityAnvil __instance)
 	{	
-	SmithAssist anvil = __instance as SmithAssist;
+	var anvil = new SmithAssist(__instance);
 
-	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}"));
+		if (anvil.BaseMaterial != null && anvil.IsShavable && anvil.SplitCount > 0) 
+		{
+		dsc.AppendFormat("[ {0} ÷ {1} ] : {2}", anvil.SplitCount, SmithAssist.shavingValue, Lang.GetUnformatted($"fma:item-metal_shaving-{anvil.BaseMetal}"));
+		}
 	}
 
+	[HarmonyPrefix]
+	[HarmonyPatch(nameof(BlockEntityAnvil.CheckIfFinished))]
+	private static void Prefix_CheckIfFinished(IPlayer byPlayer, BlockEntityAnvil __instance)
+	{
+	var anvil = new SmithAssist(__instance);
+		if (anvil.WorkMatchesRecipe( )) 
+		{
+		anvil.IssueShavings(byPlayer );						
+		}
 	}
 
+	/* [HarmonyReversePatch] 
+	private bool MatchesRecipe() //But faster?
+	*/
+		 
 
 	}
 
 	/// <summary>
 	/// Special tools for handling the Anvil's data/state, ect...
 	/// </summary>
-	internal class SmithAssist : BlockEntityAnvil
+	internal class SmithAssist
 	{
+		private readonly BlockEntityAnvil bea;
+
 		internal const string splitCountKey = @"splitCount";
-		internal const uint splitValue = 5;
+		internal const uint shavingValue = 5;
+
+		internal SmithAssist(BlockEntityAnvil a)
+		{
+		this.bea = a;
+		}
 
 		internal ILogger Logger {
 			get
 			{
-			return Api.World.Logger;
+			return bea.Api.World.Logger;
 			}
 		}
 
@@ -69,15 +92,21 @@ namespace AnvilMetalRecovery
 			}
 		}
 
+		// public byte[,,] Voxels = new byte[16, 6, 16];
+		internal EnumVoxelMaterial Voxel( int X , int Y , int Z ) 
+		{		
+		return (EnumVoxelMaterial)bea.Voxels[X, Y, Z]; 
+		}
+
 
 		internal int SplitCount {
 			get
 			{
-			return this.WorkItemStack?.Attributes.TryGetInt(splitCountKey) ?? 0;
+			return bea.WorkItemStack?.Attributes.TryGetInt(splitCountKey) ?? 0;
 			}
 			set
 			{
-			this.WorkItemStack?.Attributes.SetInt(splitCountKey, value);
+			bea.WorkItemStack?.Attributes.SetInt(splitCountKey, value);
 			}
 		}
 
@@ -85,14 +114,14 @@ namespace AnvilMetalRecovery
 			get
 			{
 			//this.SelectedRecipe <-- things that are recoverable?
-			return this.WorkItemStack?.Collectible?.FirstCodePart( ).Equals(@"ironbloom") == false;
+			return bea.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; }
+			if (bea.WorkItemStack != null && bea.WorkItemStack.Collectible is IAnvilWorkable) { return bea.WorkItemStack.Collectible as IAnvilWorkable; }
 
 			return null;
 			}
@@ -101,7 +130,7 @@ namespace AnvilMetalRecovery
 		internal ItemStack BaseMaterial {
 			get
 			{
-			if (this.WorkItemStack != null) return AnvilWorkpiece.GetBaseMaterial(this.WorkItemStack);//Right??
+			if (bea.WorkItemStack != null) return AnvilWorkpiece.GetBaseMaterial(bea.WorkItemStack);//Right??
 			return null;
 			}
 		}
@@ -112,6 +141,63 @@ namespace AnvilMetalRecovery
 			return this?.BaseMaterial?.Collectible.LastCodePart( );
 			}
 		}
+
+		internal int MetalVoxelCount {
+			get { return bea.Voxels.OfType<byte>( ).Count(vox => vox == (byte)EnumVoxelMaterial.Metal); }
+		}
+
+
+		internal void IssueShavings(IPlayer byPlayer )
+		{
+		if (this.SplitCount > 0) {
+		int shavingsCount = ( int )(SplitCount / shavingValue);
+
+		if (shavingsCount > 0) 
+			{
+			#if DEBUG
+			Logger.VerboseDebug("RecoveryAnvil: Smithing done - recover: {0} shavings of {1}", shavingsCount, BaseMaterial);
+			#endif
+
+			Item metalShavingsItem = bea.Api.World.GetItem(MetalShavingsCode.WithPathAppendix("-" + BaseMaterial));
+
+			if (metalShavingsItem != null) 
+			{
+				ItemStack metalShavingsStack = new ItemStack(metalShavingsItem, shavingsCount);
+
+				if (byPlayer != null) {
+				if (byPlayer.InventoryManager.TryGiveItemstack(metalShavingsStack, false) == false) { byPlayer.Entity.World.SpawnItemEntity(metalShavingsStack, byPlayer.Entity.Pos.XYZ); }
+				}
+			}
+			else 
+				{
+				Logger.Warning("Missing or Invalid Item: {0} ", MetalShavingsCode.WithPathAppendix("-" + BaseMaterial));
+				}
+				this.SplitCount = 0;
+			}
+		}
+		}
+
+		/// <summary>
+		/// Copy-Paste, from 'BEAnvil.cs'
+		/// </summary>
+		/// <returns>The matches recipe.</returns>
+		internal bool WorkMatchesRecipe()
+		{
+		if (bea.SelectedRecipe == null) return false;
+
+		int ymax = Math.Min(6, bea.SelectedRecipe.QuantityLayers);//Why ignore higher layers?
+
+		var theRecipie = bea.recipeVoxels; //RotatedRecipeVoxels
+
+		for (int x = 0; x < 16; x++) {
+		for (int y = 0; y < ymax; y++) {
+		for (int z = 0; z < 16; z++) {
+		byte desiredMat = ( byte )(theRecipie[x, y, z] ? EnumVoxelMaterial.Metal : EnumVoxelMaterial.Empty);
+
+		if (bea.Voxels[x, y, z] != desiredMat) { return false;	}	}	}	}
+
+		return true;
+		}
 	}
 }
 

--- a/AnvilMetalRecovery/Items/SmartSmeltableItem.cs
+++ b/AnvilMetalRecovery/Items/SmartSmeltableItem.cs
@@ -27,13 +27,13 @@ namespace AnvilMetalRecovery
 
 		protected void RegenerateCombustablePropsByVariant(ItemSlot slot)
 		{
-		if (this.CombustibleProps != null || slot.Itemstack.Collectible.CombustibleProps != null) return;
+		if (this.CombustibleProps != null || ( slot.Empty == false && 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) 
+		if ((ingotEntry != null || !ingotEntry.IsMissing) && metalSmeltProps != null) 
 			{		
 			metalSmeltProps.SmeltedRatio = Ratio;
 
@@ -46,7 +46,7 @@ namespace AnvilMetalRecovery
 			else 
 			{
 			#if DEBUG
-			api.Logger.VerboseDebug("Non-existant Ingot: {0}", ingotAssetCode.ToString( ));
+			api.Logger.VerboseDebug("Non-existant Ingot or C.Props: {0}", ingotAssetCode.ToString( ));
 			#endif
 			}		
 		}

--- a/AnvilMetalRecovery/Items/VariableMetalItem.cs
+++ b/AnvilMetalRecovery/Items/VariableMetalItem.cs
@@ -42,7 +42,7 @@ namespace AnvilMetalRecovery
 		protected string MetalName(ItemStack itemStack)
 		{
 		//TODO: generic 'material' Language entries...
-		if (itemStack == null || itemStack.Attributes == null) return String.Empty;
+		if (itemStack == null || itemStack.Attributes == null) return @"?";
 		var sliced = Lang.GetUnformatted("item-"+MetalCode(itemStack).Path).Split(' ');
 		return String.Join(" ", sliced.Take(sliced.Length - 1));
 		}
@@ -129,7 +129,7 @@ namespace AnvilMetalRecovery
 
 		public override void OnModifiedInInventorySlot(IWorldAccessor world, ItemSlot slot, ItemStack extractedStack = null)
 		{
-		RegenerateCombustablePropsFromStack(slot.Itemstack);			
+		if (!slot.Empty) RegenerateCombustablePropsFromStack(slot.Itemstack);			
 		}
 
 		//Merge (same) metal piles together? Upto 100 units.
@@ -155,8 +155,10 @@ namespace AnvilMetalRecovery
 
 		if (metalCode != null )
 		{
-		var sourceMetalItem = api.World.GetItem(metalCode);	
-						
+		var sourceMetalItem = api.World.GetItem(metalCode);
+
+		if (sourceMetalItem == null || sourceMetalItem.IsMissing || sourceMetalItem.CombustibleProps == null) return;
+
 		CombustibleProps = new CombustibleProperties( ) {
 			SmeltingType = EnumSmeltType.Smelt,
 			MeltingPoint = sourceMetalItem.CombustibleProps.MeltingPoint,
@@ -169,7 +171,7 @@ namespace AnvilMetalRecovery
 		contStack.Collectible.CombustibleProps = CombustibleProps.Clone( );
 
 		#if DEBUG
-				api.Logger.VerboseDebug("Melt point: {0}, Duration: {1}, Ratio: {2}, Out.stk: {3} * {4}", this.CombustibleProps.MeltingPoint,this.CombustibleProps.MeltingDuration,this.CombustibleProps.SmeltedRatio, this.CombustibleProps.SmeltedStack.ResolvedItemstack.Item.Code.ToString(),this.CombustibleProps.SmeltedStack.StackSize );
+		api.Logger.VerboseDebug("Melt point: {0}, Duration: {1}, Ratio: {2}, Out.stk: {3} * {4}", this.CombustibleProps.MeltingPoint,this.CombustibleProps.MeltingDuration,this.CombustibleProps.SmeltedRatio, this.CombustibleProps.SmeltedStack.ResolvedItemstack.Item.Code.ToString(),this.CombustibleProps.SmeltedStack.StackSize );
 		#endif
 		}		
 

--- a/AnvilMetalRecovery/MetalRecoverySystem.cs
+++ b/AnvilMetalRecovery/MetalRecoverySystem.cs
@@ -1,16 +1,13 @@
-using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
-using System.Linq.Expressions;
+
+using HarmonyLib;
 
 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
 {
@@ -71,7 +68,11 @@ namespace AnvilMetalRecovery
 
 		RegisterItemMappings( );
 
-		//TODO: Setup HARMONY Patches
+		#if DEBUG
+		//Harmony.DEBUG = true;
+		#endif
+		var harmony = new Harmony(this.Mod.Info.ModID);
+		harmony.PatchAll( );
 
 		base.Start(api);
 		}
@@ -89,9 +90,7 @@ namespace AnvilMetalRecovery
 		return;
 		}
 
-		//ServerAPI.ClassRegistry.GetBlockEntityClass
-		//ServerAPI.RegisterBlockEntityClass(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));		
-		ServerCore.ClassRegistryNative.ReplaceBlockEntityType(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));
+		//ServerCore.ClassRegistryNative.ReplaceBlockEntityType(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));
 
 		ServerCore.Event.ServerRunPhase(EnumServerRunPhase.GameReady, MaterialDataGathering);		
 
@@ -118,7 +117,7 @@ namespace AnvilMetalRecovery
 		return;
 		}
 
-		ClientCore.ClassRegistryNative.ReplaceBlockEntityType(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));
+		//ClientCore.ClassRegistryNative.ReplaceBlockEntityType(anvilKey, typeof(MetalRecovery_BlockEntityAnvil));
 
 		Mod.Logger.VerboseDebug("Anvil Metal Recovery - should be installed...");
 		}

--- a/AnvilMetalRecovery/assets/fma/shapes/item/metal/fragments.json
+++ b/AnvilMetalRecovery/assets/fma/shapes/item/metal/fragments.json
@@ -8,7 +8,7 @@
 	"textureSizes": {
 	},
 	"textures": {
-		"metal": "game:block/metal/plate/copper"
+		"metal": "block/metal/ingot/lead"
 	},
 	"elements": [
 		{
@@ -16,12 +16,12 @@
 			"from": [ 5.0, 0.0, 5.0 ], 
 			"to": [ 9.0, 2.0, 8.0 ], 
 			"faces": {
-				"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 4.0, 2.0 ] },
-				"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.0, 2.0 ] },
-				"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 4.0, 2.0 ] },
-				"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.0, 2.0 ] },
-				"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 4.0, 3.0 ] },
-				"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 4.0, 3.0 ] }
+				"north": { "texture": "#metal", "uv": [ 1.0, 2.5, 5.0, 4.5 ] },
+				"east": { "texture": "#metal", "uv": [ 5.5, 5.5, 8.5, 7.5 ] },
+				"south": { "texture": "#metal", "uv": [ 8.5, 3.0, 12.5, 5.0 ] },
+				"west": { "texture": "#metal", "uv": [ 10.0, 7.0, 13.0, 9.0 ] },
+				"up": { "texture": "#metal", "uv": [ 7.0, 8.5, 11.0, 11.5 ] },
+				"down": { "texture": "#metal", "uv": [ 8.0, 3.0, 12.0, 6.0 ] }
 			},
 			"children": [
 				{
@@ -32,12 +32,12 @@
 					"rotationX": 51.0,
 					"rotationY": 3.0,
 					"faces": {
-						"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 8.0, 1.0 ] },
-						"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-						"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 8.0, 1.0 ] },
-						"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.0, 1.0 ] },
-						"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 8.0, 1.0 ] },
-						"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 8.0, 1.0 ] }
+						"north": { "texture": "#metal", "uv": [ 7.5, 12.5, 15.5, 13.5 ] },
+						"east": { "texture": "#metal", "uv": [ 7.0, 8.0, 8.0, 9.0 ] },
+						"south": { "texture": "#metal", "uv": [ 1.5, 3.0, 9.5, 4.0 ] },
+						"west": { "texture": "#metal", "uv": [ 6.5, 6.0, 7.5, 7.0 ] },
+						"up": { "texture": "#metal", "uv": [ 4.0, 4.5, 12.0, 5.5 ] },
+						"down": { "texture": "#metal", "uv": [ 2.5, 6.5, 10.5, 7.5 ] }
 					}
 				},
 				{
@@ -78,12 +78,12 @@
 					"rotationX": -14.0,
 					"rotationZ": -25.0,
 					"faces": {
-						"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 1.5 ] },
-						"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 6.0, 1.5 ] },
-						"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 1.5 ] },
-						"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 6.0, 1.5 ] },
-						"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 6.0 ] },
-						"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 1.5, 6.0 ] }
+						"north": { "texture": "#metal", "uv": [ 9.5, 3.5, 11.0, 5.0 ] },
+						"east": { "texture": "#metal", "uv": [ 5.5, 5.5, 11.5, 7.0 ] },
+						"south": { "texture": "#metal", "uv": [ 8.5, 9.5, 10.0, 11.0 ] },
+						"west": { "texture": "#metal", "uv": [ 5.0, 7.0, 11.0, 8.5 ] },
+						"up": { "texture": "#metal", "uv": [ 12.0, 5.5, 13.5, 11.5 ] },
+						"down": { "texture": "#metal", "uv": [ 1.0, 5.5, 2.5, 11.5 ] }
 					}
 				},
 				{
@@ -93,12 +93,12 @@
 					"rotationOrigin": [ -1.0, 0.0, -1.0 ],
 					"rotationY": -53.0,
 					"faces": {
-						"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-						"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.5, 0.5 ] },
-						"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-						"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.5, 0.5 ] },
-						"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 3.5 ] },
-						"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 3.5 ] }
+						"north": { "texture": "#metal", "uv": [ 3.5, 3.0, 4.0, 3.5 ] },
+						"east": { "texture": "#metal", "uv": [ 7.5, 5.0, 11.0, 5.5 ] },
+						"south": { "texture": "#metal", "uv": [ 4.5, 4.5, 5.0, 5.0 ] },
+						"west": { "texture": "#metal", "uv": [ 7.0, 7.0, 10.5, 7.5 ] },
+						"up": { "texture": "#metal", "uv": [ 6.5, 9.0, 7.0, 12.5 ] },
+						"down": { "texture": "#metal", "uv": [ 6.0, 6.5, 6.5, 10.0 ] }
 					}
 				},
 				{
@@ -169,11 +169,11 @@
 					"rotationY": 174.0,
 					"faces": {
 						"north": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-						"east": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.5, 0.5 ] },
+						"east": { "texture": "#metal", "uv": [ 5.5, 3.5, 9.0, 4.0 ] },
 						"south": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
-						"west": { "texture": "#metal", "uv": [ 0.0, 0.0, 3.5, 0.5 ] },
-						"up": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 3.5 ] },
-						"down": { "texture": "#metal", "uv": [ 0.0, 0.0, 0.5, 3.5 ] }
+						"west": { "texture": "#metal", "uv": [ 4.5, 6.0, 8.0, 6.5 ] },
+						"up": { "texture": "#metal", "uv": [ 6.5, 9.0, 7.0, 12.5 ] },
+						"down": { "texture": "#metal", "uv": [ 4.5, 5.5, 5.0, 9.0 ] }
 					}
 				},
 				{