Commit: 4cf6a65e323e65253acee704faa2562996d12ac0 - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Revision: 4cf6a65e323e65253acee704faa2562996d12ac0 (tree)
• Zeit: 2020-12-01 16:20:09
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

Updates for V1.14 *WIP*

Ändern Zusammenfassung

• modified: AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
• modified: AnvilMetalRecovery/assets/fma/itemtypes/shavings/metal_shavings.json
• modified: AnvilMetalRecovery/modinfo.json
• delete: Assorted/BlockEntityClasses/CollapsingBlockEntity.cs

Diff

--- a/AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
+++ b/AnvilMetalRecovery/BlockEntities/MetalRecovery_BlockEntityAnvil.cs
@@ -40,9 +40,10 @@ namespace AnvilMetalRecovery
 
 		public override void OnSplit(Vec3i voxelPos)
 		{
-		if (!this.IsIronBloom && Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) {
+
+		if (this.IsShavable && Voxels[voxelPos.X, voxelPos.Y, voxelPos.Z] == ( byte )EnumVoxelMaterial.Metal) {
 		#if DEBUG
-		Logger.VerboseDebug("Split some {0} @{1}, Total:{2}", this.BaseMaterial.Collectible.LastCodePart( ), voxelPos, SplitCount);
+				Logger.VerboseDebug("Split some {0} @{1}, Total:{2}", this.BaseMaterial.Collectible.LastCodePart( ), voxelPos, SplitCount);
 		#endif
 		SplitCount++;
 		}
@@ -55,7 +56,7 @@ namespace AnvilMetalRecovery
 		{
 		int splitTemp = SplitCount;
 		base.CheckIfFinished(byPlayer);
-		// base.MatchesRecipe( ) -- Private; argh
+		// base.MatchesRecipe( ) -- Private; still in V1.14.... :\
 		/*
 		 this.Voxels = new byte[16, 6, 16];
 		this.workItemStack = null;
@@ -85,5 +86,30 @@ namespace AnvilMetalRecovery
 			}
 		}
 		}
+
+		protected bool IsShavable {
+			get { 
+				//this.SelectedRecipe <-- things that are recoverable?
+				return this.WorkItemStack?.Collectible?.FirstCodePart( ).Equals("ironbloom") == false; 
+			}
+		}
+
+		protected IAnvilWorkable AnvilWorkpiece {
+			get
+			{
+			if (this.WorkItemStack != null && this.WorkItemStack.Collectible is IAnvilWorkable) 
+			{ return this.WorkItemStack.Collectible as IAnvilWorkable; }
+
+			return null;
+			}
+		}
+
+		protected ItemStack BaseMaterial 
+		{
+			get
+			{
+			return AnvilWorkpiece.GetBaseMaterial(this.WorkItemStack);//Right??
+			}
+		}
 	}
 }
\ No newline at end of file

--- a/AnvilMetalRecovery/assets/fma/itemtypes/shavings/metal_shavings.json
+++ b/AnvilMetalRecovery/assets/fma/itemtypes/shavings/metal_shavings.json
@@ -5,12 +5,12 @@
 	attributes: {		
 		handbook: {
 			excludeByType: {
-				"*-chromium": true,
-				"*-platinum": true,
-				"*-titanium": true,
-				"*-rhodium": true,
-				"*-stainlessteel": true,
-				"*-uranium": true
+			"*-chromium": true,
+			"*-platinum": true,
+			"*-titanium": true,
+			"*-rhodium": true,
+			"*-stainlessteel": true,
+			"*-uranium": true
 			}
 		}		
 	},
@@ -31,6 +31,9 @@
 		"*-bismuthbronze": 7900,
 		"*-blackbronze": 9000,
 		"*-iron": 7870,
+		"*-meteoriciron": 7800,
+		"*-steel": 7820,
+		"*-blistersteel": 7720,
 		"*-gold": 19300,
 		"*-lead": 11300,
 		"*-tin": 7260,
@@ -79,6 +82,24 @@
 			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,

--- a/AnvilMetalRecovery/modinfo.json
+++ b/AnvilMetalRecovery/modinfo.json
@@ -4,9 +4,9 @@
   "description" : "Get back lost scrap and smithing discards.",
   "authors": ["Melchior"],
   "ModID":"metalrecovery",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "dependencies": { 
-	"game": "1.13.0",
+	"game": "1.14.0",
 	"survival": ""
   },
   "website": "http://nowebsite.nope"

--- a/Assorted/BlockEntityClasses/CollapsingBlockEntity.cs
+++ /dev/null
@@ -1,89 +0,0 @@
-using System;
-using System.Text;
-
-using Vintagestory.API.Common;
-using Vintagestory.API.Config;
-using Vintagestory.API.Datastructures;
-
-namespace FirstMachineAge
-{
-	public class CollapsingBlockEntity : BlockEntity
-	{
-
-		public override void Initialize(ICoreAPI api)
-		{
-		base.Initialize(api);
-		//origlightHsv = Block.LightHsv;
-		//lightHsv = ( byte[ ] )Block.LightHsv.Clone( );
-		}
-
-		public void UponPlacement(string camo )
-		{
-		this.Camo = camo;
-		
-		}
-
-		public string Camo { get; protected set;}
-
-		public override void GetBlockInfo(IPlayer forPlayer, StringBuilder sb)
-		{
-		//Mirror whatever tooltip for this material normally?
-		//sb.AppendLine(Lang.Get("{0} with {1} lining and {2} glass panels", material.UcFirst( ), lining.UcFirst( ), glass));
-		}
-
-		public override void FromTreeAtributes(ITreeAttribute tree, IWorldAccessor worldForResolving)
-		{
-		base.FromTreeAtributes(tree, worldForResolving);
-
-		this.Camo = tree.GetString(CollapsingBlock.CamoKey, "dirt");
-		
-		if (Api != null && Api.Side == EnumAppSide.Client) 
-		{ MarkDirty(true);}
-
-		}
-
-
-		public override void ToTreeAttributes(ITreeAttribute tree)
-		{
-		base.ToTreeAttributes(tree);
-
-		tree.SetString(CollapsingBlock.CamoKey, this.Camo);		
-		}
-
-		/*
-		private MeshData getMesh(ITesselatorAPI tesselator)
-		{
-		Dictionary<string, MeshData> lanternMeshes = ObjectCacheUtil.GetOrCreate(Api, "blockLanternBlockMeshes", ( ) => new Dictionary<string, MeshData>( ));
-
-		MeshData mesh = null;
-		BlockLantern block = Api.World.BlockAccessor.GetBlock(Pos) as BlockLantern;
-		if (block == null) return null;
-
-		string orient = block.LastCodePart( );
-
-		if (lanternMeshes.TryGetValue(material + "-" + lining + "-" + orient + "-" + glass, out mesh)) {
-		return mesh;
-		}
-
-		return lanternMeshes[material + "-" + lining + "-" + orient + "-" + glass] = block.GenMesh(Api as ICoreClientAPI, material, lining, glass, null, tesselator);
-		}
-
-		public override bool OnTesselation(ITerrainMeshPool mesher, ITesselatorAPI tesselator)
-		{
-		MeshData mesh = getMesh(tesselator);
-
-		if (mesh == null) return false;
-
-		string part = Block.LastCodePart( );
-		if (part == "up" || part == "down") {
-		mesh = mesh.Clone( ).Rotate(new Vec3f(0.5f, 0.5f, 0.5f), 0, MeshAngle, 0);
-		}
-
-		mesher.AddMeshData(mesh);
-
-		return true;
-		}
-		*/
-	}
-}
-