提交: a88406ebaaa318aed3c2e00da9b28d674eb8dc44 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• 修訂: a88406ebaaa318aed3c2e00da9b28d674eb8dc44 (tree)
• 時間: 2020-06-25 06:13:34
• 作者: melchior <melchior@user...>
• Commiter: melchior

Log Message

W.I.P. added shape, changes for Recipie patcher

Change Summary

• modified: ElementalTools/Assignments.cs
• modified: ElementalTools/ElementalTools.csproj
• add: ElementalTools/assets/fma/shapes/item/tools/bit_brace.json

差異

--- a/ElementalTools/Assignments.cs
+++ b/ElementalTools/Assignments.cs
@@ -14,40 +14,37 @@ namespace ElementalTools
 {
 	public partial class ElementalToolsSystem : ModSystem
 	{
-		
+
 		internal const string malletItemKey = @"ItemMallet";
 		internal const string malletAssetKey = @"mallet";
+		internal const string hammerAssetKey = @"hammer";
 		internal const string fmaKey = @"fma";
 
-		private void RegisterItemClasses()
+		private void RegisterItemClasses( )
 		{
-			CoreAPI.RegisterItemClass(malletItemKey, typeof(ItemMallet));
+		CoreAPI.RegisterItemClass(malletItemKey, typeof(ItemMallet));
 		}
 
 
 		private void ManipulateGridRecipies( )
 		{
-		uint malletizedCount = 0;
-		//Thread.Sleep(1000);
 		Mod.Logger.VerboseDebug($"Total GridRecipies: {CoreAPI.World.GridRecipes.Count}");
 
 
-		var alternateQuery = from gridRecipie in CoreAPI.World.GridRecipes
-							 where gridRecipie.Ingredients.Any(gi => gi.Value.IsTool && gi.Value.Code.BeginsWith(GlobalConstants.DefaultDomain, @"hammer"))
+		var nonCrushingHammerRecipies = from gridRecipie in CoreAPI.World.GridRecipes
+							 where gridRecipie.Ingredients.Any(gi => gi.Value.IsTool && gi.Value.Code.BeginsWith(GlobalConstants.DefaultDomain, hammerAssetKey))
 							 where gridRecipie.Output.Code.BeginsWith(GlobalConstants.DefaultDomain, @"nugget") == false
 							 where gridRecipie.Output.Code.BeginsWith(GlobalConstants.DefaultDomain, @"lime") == false
 							 select gridRecipie;
 
-		Mod.Logger.VerboseDebug($"Found {alternateQuery.Count( )} Recipies using Hammer, (non ore)");
-
-		if (alternateQuery.Any( )) {
-		foreach (var recipieToClone in alternateQuery.ToArray( )) 
-		{
-		var cloneRecipie = recipieToClone.Clone( );
-
-		cloneRecipie.Name = new AssetLocation("fma", $"clone_{malletizedCount}");
-
-		var hammerIngredient = cloneRecipie.Ingredients.First(gi => gi.Value.IsTool && gi.Value.Code.BeginsWith(GlobalConstants.DefaultDomain, @"hammer"));
+		CraftingRecipeIngredient hammerIngredient = new CraftingRecipeIngredient {
+			Type = EnumItemClass.Item,
+			//Name = "hammer",
+			IsTool = true,
+			Code = new AssetLocation(GlobalConstants.DefaultDomain, hammerAssetKey),
+			Quantity = 1,
+			//IsWildCard = false,			
+		};
 
 		CraftingRecipeIngredient malletIngredient = new CraftingRecipeIngredient {
 			Type = EnumItemClass.Item,
@@ -57,57 +54,46 @@ namespace ElementalTools
 			Quantity = 1,
 			//IsWildCard = false,			
 		};
-		cloneRecipie.Ingredients[hammerIngredient.Key] = malletIngredient;
 
-		cloneRecipie.ResolveIngredients(ServerCore.World);
-		ServerCore.RegisterCraftingRecipe(cloneRecipie);
-		malletizedCount++;
-		}
+		var results = SingleSwapinReplicas(nonCrushingHammerRecipies, hammerIngredient, malletIngredient);
+
+
+		Mod.Logger.VerboseDebug($"Added {results} Mallet recipies");
 
-		Mod.Logger.VerboseDebug($"Added {malletizedCount} Mallet recipies");
-
-
-		/*
-		GridRecipe testRecipie = new GridRecipe {
-			IngredientPattern = "M\tF",
-			Name = new AssetLocation("fma","LogToSticks"),
-			Height = 2,
-			Width = 1,
-			Ingredients =
-				new Dictionary<string, CraftingRecipeIngredient>{
-					{"M", new CraftingRecipeIngredient{ 
-						Name = "mallet",
-						Type = EnumItemClass.Item,
-						Code = new AssetLocation(fmaKey, malletAssetKey),
-						IsTool = true,						
-						Quantity = 1,} 
-					},
-					{"F", new CraftingRecipeIngredient{ 
-						Name = "wood",
-						Type = EnumItemClass.Item,
-						Code = new AssetLocation(GlobalConstants.DefaultDomain,"firewood"),												
-						Quantity = 1,}
-					},
-				},
-				Output = new CraftingRecipeIngredient{ 
-					Type = EnumItemClass.Item,
-					Quantity = 3,
-					Code = new AssetLocation(GlobalConstants.DefaultDomain,"stick"),
-				},
-		};//Needs: ResolvedItemstack <- for Non-wildcard !!!!
-		testRecipie.ResolveIngredients(ServerCore.World);
-
-		ServerCore.RegisterCraftingRecipe(testRecipie);
-		*/
 
 		}
 
-		//TODO: Recycling assignment of Smeltable properties from all smith/grid/recipe forms...
 
 
-		}
+		private uint SingleSwapinReplicas(IEnumerable<GridRecipe> sourceRecipies, CraftingRecipeIngredient target, CraftingRecipeIngredient replacement)
+		{
+		uint replicaCount = 0;
+
+		if (sourceRecipies.Any( )) 
+		{
+		foreach (var recipieToClone in sourceRecipies.ToArray( )) {
+		var cloneRecipie = recipieToClone.Clone( );
+
+		cloneRecipie.Name = new AssetLocation(fmaKey, $"clone_{replacement.Code.Path}_{replicaCount}");
 
+		var targetTag = cloneRecipie.Ingredients.FirstOrDefault(gi => gi.Value.Type == target.Type &&
+															  gi.Value.IsTool == target.IsTool &&
+															  gi.Value.Code == target.Code &&
+															  gi.Value.Quantity == target.Quantity
+															 );
+		if (targetTag.Key != null && targetTag.Value != null) {
+		cloneRecipie.Ingredients[targetTag.Key] = replacement;
 
+		cloneRecipie.ResolveIngredients(ServerCore.World);
+		ServerCore.RegisterCraftingRecipe(cloneRecipie);
+		replicaCount++;
+		}
+		else Mod.Logger.Warning("Recipe replacement - fails to locate target| {0}", target.Code);		
+
+		}				
+		}		
+		return replicaCount;
+		}
+		//TODO: Recycling assignment of Smeltable properties from all smith/grid/recipe forms...
 	}
 }
-

--- a/ElementalTools/ElementalTools.csproj
+++ b/ElementalTools/ElementalTools.csproj
@@ -92,6 +92,9 @@
     <None Include="assets\fma\shapes\item\tools\mallet.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="assets\fma\shapes\item\tools\bit_brace.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file

--- /dev/null
+++ b/ElementalTools/assets/fma/shapes/item/tools/bit_brace.json
@@ -0,0 +1,150 @@
+{
+	"editor": {
+		"allAngles": false,
+		"entityTextureMode": false
+	},
+	"textureWidth": 16,
+	"textureHeight": 16,
+	"textureSizes": {
+	},
+	"textures": {
+		"steel": "block/metal/plate/steel",
+		"tinbronze": "item/tool/material/tinbronze",
+		"wood": "item/tool/material/wood",
+		"brass": "item/tool/material/brass"
+	},
+	"elements": [
+		{
+			"name": "BraceC",
+			"from": [ 5.0, 9.0, 5.0 ], 
+			"to": [ 13.0, 10.25, 6.25 ], 
+			"rotationOrigin": [ 15.0, 8.5, 9.25 ],
+			"faces": {
+				"north": { "texture": "#tinbronze", "uv": [ 6.75, 15.0, 14.75, 16.0 ] },
+				"east": { "texture": "#tinbronze", "uv": [ 4.5, 9.0, 5.75, 10.0 ] },
+				"south": { "texture": "#tinbronze", "uv": [ 3.0, 15.0, 11.0, 16.0 ] },
+				"west": { "texture": "#tinbronze", "uv": [ 4.25, 9.5, 5.5, 10.5 ] },
+				"up": { "texture": "#tinbronze", "uv": [ 7.75, 15.0, 15.75, 16.0 ] },
+				"down": { "texture": "#tinbronze", "uv": [ 2.0, 15.0, 10.0, 16.0 ] }
+			},
+			"children": [
+				{
+					"name": "BraceU",
+					"from": [ 6.75, 0.0, 1.25 ], 
+					"to": [ 8.0, 1.25, 4.25 ], 
+					"faces": {
+						"north": { "texture": "#tinbronze", "uv": [ 5.0, 1.0, 6.25, 2.0 ] },
+						"east": { "texture": "#tinbronze", "uv": [ 4.0, 1.0, 7.0, 2.0 ] },
+						"south": { "texture": "#tinbronze", "uv": [ 4.75, 2.0, 6.0, 3.0 ] },
+						"west": { "texture": "#tinbronze", "uv": [ 3.75, 1.0, 6.75, 2.0 ] },
+						"up": { "texture": "#tinbronze", "uv": [ 4.5, 0.0, 5.75, 3.0 ] },
+						"down": { "texture": "#tinbronze", "uv": [ 5.0, 0.5, 6.25, 3.5 ] }
+					}
+				},
+				{
+					"name": "BraceL",
+					"from": [ 0.0, 0.0, 1.0 ], 
+					"to": [ 1.25, 1.25, 4.0 ], 
+					"faces": {
+						"north": { "texture": "#tinbronze", "uv": [ 4.25, 10.5, 5.5, 11.5 ] },
+						"east": { "texture": "#tinbronze", "uv": [ 2.5, 8.0, 5.5, 9.0 ] },
+						"south": { "texture": "#tinbronze", "uv": [ 4.5, 10.0, 5.75, 11.0 ] },
+						"west": { "texture": "#tinbronze", "uv": [ 2.75, 8.0, 5.75, 9.0 ] },
+						"up": { "texture": "#tinbronze", "uv": [ 4.75, 8.0, 6.0, 11.0 ] },
+						"down": { "texture": "#tinbronze", "uv": [ 4.25, 8.0, 5.5, 11.0 ] }
+					}
+				},
+				{
+					"name": "BraceUT",
+					"from": [ 8.0, 0.0, 3.0 ], 
+					"to": [ 10.0, 1.25, 4.25 ], 
+					"faces": {
+						"north": { "texture": "#tinbronze", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+						"east": { "texture": "#tinbronze", "uv": [ 4.75, 1.5, 6.0, 2.5 ] },
+						"south": { "texture": "#tinbronze", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+						"west": { "texture": "#tinbronze", "uv": [ 4.75, 1.5, 6.0, 2.5 ] },
+						"up": { "texture": "#tinbronze", "uv": [ 4.0, 1.0, 6.0, 2.0 ] },
+						"down": { "texture": "#tinbronze", "uv": [ 4.5, 1.5, 6.5, 2.5 ] }
+					}
+				},
+				{
+					"name": "BraceLT",
+					"from": [ -2.0, 0.0, 2.75 ], 
+					"to": [ 0.0, 1.25, 4.0 ], 
+					"faces": {
+						"north": { "texture": "#tinbronze", "uv": [ 3.5, 9.0, 5.5, 10.0 ] },
+						"east": { "texture": "#tinbronze", "uv": [ 5.25, 8.5, 6.5, 9.5 ] },
+						"south": { "texture": "#tinbronze", "uv": [ 4.0, 9.0, 6.0, 10.0 ] },
+						"west": { "texture": "#tinbronze", "uv": [ 4.25, 9.0, 5.5, 10.0 ] },
+						"up": { "texture": "#tinbronze", "uv": [ 3.75, 10.5, 5.75, 11.5 ] },
+						"down": { "texture": "#tinbronze", "uv": [ 4.0, 9.0, 6.0, 10.0 ] }
+					},
+					"children": [
+						{
+							"name": "BitHolder",
+							"from": [ -2.0, -0.4, -0.4 ], 
+							"to": [ 0.0, 1.6, 1.6 ], 
+							"rotationOrigin": [ 0.0, 0.5, 0.5 ],
+							"faces": {
+								"north": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
+								"east": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
+								"south": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
+								"west": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
+								"up": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] },
+								"down": { "texture": "#brass", "uv": [ 0.0, 0.0, 2.0, 2.0 ] }
+							},
+							"children": [
+								{
+									"name": "Shaft_1",
+									"from": [ -3.0, 0.75, 0.75 ], 
+									"to": [ 0.0, 1.25, 1.25 ], 
+									"rotationOrigin": [ -1.0, 1.0, 1.0 ],
+									"faces": {
+										"north": { "texture": "#steel", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"east": { "texture": "#steel", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"south": { "texture": "#steel", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"west": { "texture": "#steel", "uv": [ 0.0, 0.0, 0.5, 0.5 ] },
+										"up": { "texture": "#steel", "uv": [ 0.0, 0.0, 3.0, 0.5 ] },
+										"down": { "texture": "#steel", "uv": [ 0.0, 0.0, 3.0, 0.5 ] }
+									},
+									"children": [
+										{
+											"name": "CuttingBit_1",
+											"from": [ -0.27, 0.12, -0.12 ], 
+											"to": [ 0.13, 0.37, 0.28 ], 
+											"rotationOrigin": [ -0.2, 0.25, 0.25 ],
+											"rotationX": -45.0,
+											"rotationY": -45.0,
+											"faces": {
+												"north": { "texture": "#steel", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false },
+												"east": { "texture": "#steel", "uv": [ 0.0, 0.0, 0.5, 0.5 ], "enabled": false },
+												"south": { "texture": "#steel", "uv": [ 4.5, 8.5, 5.0, 9.0 ] },
+												"west": { "texture": "#steel", "uv": [ 5.0, 8.5, 5.5, 9.0 ] },
+												"up": { "texture": "#steel", "uv": [ 5.5, 8.5, 6.0, 9.0 ] },
+												"down": { "texture": "#steel", "uv": [ 6.0, 8.5, 6.5, 9.0 ] }
+											}
+										}
+									]
+								}
+							]
+						}
+					]
+				},
+				{
+					"name": "TopCap",
+					"from": [ 10.0, -1.0, 2.0 ], 
+					"to": [ 11.25, 2.0, 5.0 ], 
+					"rotationOrigin": [ 10.0, 0.25, 3.75 ],
+					"rotationX": 44.999992699547086,
+					"faces": {
+						"north": { "texture": "#wood", "uv": [ 3.75, 0.0, 5.0, 3.0 ] },
+						"east": { "texture": "#wood", "uv": [ 2.5, 0.0, 5.5, 3.0 ] },
+						"south": { "texture": "#wood", "uv": [ 2.5, 0.0, 3.75, 3.0 ] },
+						"west": { "texture": "#wood", "uv": [ 2.5, 0.0, 5.5, 3.0 ] },
+						"up": { "texture": "#wood", "uv": [ 3.25, 0.0, 4.5, 3.0 ] },
+						"down": { "texture": "#wood", "uv": [ 3.25, 0.0, 4.5, 3.0 ] }
+					}
+				}
+			]
+		}
+	]}
\ No newline at end of file