Commit: c172a508d24501b5c3e786ab56db6844fd09e2db - fma (git)

First Machine Age's Mods (Combined repo.)

Commit MetaInfo

• Revisión: c172a508d24501b5c3e786ab56db6844fd09e2db (tree)
• Tiempo: 2022-12-28 06:46:01
• Autor: melchior <melchior@user...>
• Commiter: melchior

Log Message

WIP; carburization less buggy

Cambiar Resumen

• modified: ElementalTools/Block/PackCarburization.cs
• modified: ElementalTools/ElementalTools.csproj
• modified: ElementalTools/General/SteelAspects.cs
• modified: ElementalTools/Renderers/PackCarburization_Renderer.cs
• modified: ElementalTools/assets/fma/lang/en.json
• add: ElementalTools/modicon.png
• modified: ElementalTools/modinfo.json

Diferencia incremental

--- a/ElementalTools/Block/PackCarburization.cs
+++ b/ElementalTools/Block/PackCarburization.cs
@@ -27,6 +27,8 @@ namespace ElementalTools
 
 		internal const float maxInnerTemperature = 1000f;
 
+		private PackCarburization_Renderer _cachedRenderer;
+
 		//Recipie Options #1: Charcoal & Bonemeal & Blue-clay
 		//Recipie Options #2: Leather & Fat & Blue-clay
 
@@ -393,13 +395,14 @@ namespace ElementalTools
 		#region Firepit
 
 		public IInFirepitRenderer GetRendererWhenInFirepit(ItemStack stack, BlockEntityFirepit firepit, bool forOutputSlot)
-		{
-		return new PackCarburization_Renderer(this.api as ICoreClientAPI, stack, firepit.Pos, forOutputSlot);
+		{			
+		_cachedRenderer = _cachedRenderer ?? new PackCarburization_Renderer(this.api as ICoreClientAPI, stack, firepit.Pos, forOutputSlot);
+		return _cachedRenderer;
 		}
 
 		public EnumFirepitModel GetDesiredFirepitModel(ItemStack stack, BlockEntityFirepit firepit, bool forOutputSlot)
 		{
-		return EnumFirepitModel.Normal;//Or Wide?
+		return EnumFirepitModel.Wide;
 		}
 
 		#endregion

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

--- a/ElementalTools/General/SteelAspects.cs
+++ b/ElementalTools/General/SteelAspects.cs
@@ -173,16 +173,19 @@ namespace ElementalTools
 		}					
 		var steelInfo = inSlot.Itemstack.AsSteelThing( );
 
-		dsc.AppendFormat(Lang.Get(@"prop-metal", Lang.GetUnformatted(@"metalname-" + steelInfo.BaseMetalName)));
+		dsc.AppendFormat(Lang.Get(@"fma:prop-metal", Lang.GetUnformatted(@"fma:metalname-" + steelInfo.BaseMetalName)));
 
 		if (steelInfo.Hardenable || steelInfo.Hardness != HardnessState.Soft) {
-			dsc.AppendFormat(Lang.Get(@"prop-temper", Lang.GetUnformatted(@"hardness-" +  (int)steelInfo.Hardness)));
-		}
-
-		if (steelInfo.Sharpenable) {		
-			dsc.AppendFormat(Lang.Get(@"prop-edge", Lang.GetUnformatted(@"sharpness-" + ( int )steelInfo.Sharpness)));
-		}
+			dsc.Append(@"<font color='#007F7F'>");
+			dsc.AppendFormat(Lang.Get(@"fma:prop-temper", Lang.GetUnformatted(@"fma:hardness-" +  (int)steelInfo.Hardness)));
+			dsc.Append("</font>");
+			}
 
+		if (steelInfo.Sharpenable) {
+			dsc.Append(@"<font color='#5C8282'>");
+			dsc.AppendFormat(Lang.Get(@"fma:prop-edge", Lang.GetUnformatted(@"fma:sharpness-" + ( int )steelInfo.Sharpness)));
+			dsc.Append("</font>");
+			}
 		}
 
 		/// <summary>

--- a/ElementalTools/Renderers/PackCarburization_Renderer.cs
+++ b/ElementalTools/Renderers/PackCarburization_Renderer.cs
@@ -100,7 +100,9 @@ namespace ElementalTools
 		shader.ModelMatrix = carbpack_ModelMatrix
 			.Identity( )
 			.Translate(pos.X - camPos.X + 0.001f, pos.Y - camPos.Y, pos.Z - camPos.Z - 0.001f)
-			.Translate(0f, 1 / 16f, 0f)
+			.Translate(0f, 1 / 16f, 0.05f)
+			.RotateZDeg(10f)//Tip Pack 'up' at angle
+			.RotateXDeg(10f)
 			.Values;
 
 		shader.ViewMatrix = renderAPI.CameraMatrixOriginf;
@@ -114,7 +116,7 @@ namespace ElementalTools
 
 		public void OnUpdate(float temperature)
 		{
-		//Correct GLOW INCANDESCENT level?
+		//FIX: make GLOW INCANDESCENT  !
 		this.glowLevel = ( int )(temperature / 100);
 		}
 	}

--- a/ElementalTools/assets/fma/lang/en.json
+++ b/ElementalTools/assets/fma/lang/en.json
@@ -41,11 +41,11 @@
 	"itemdesc-sharpening_stone":"Use in combination with _DULL_ steel items and grease to sharpen",
     "craftinginfo-primitive_steelmaking-title":"Steel making: (Pack Carburization process)",
 	"craftinginfo-primitive_steelmaking-text": "So, you want to make steel objects?\n\nYou'll need Lots and Lots of Charcoal!\nMore Iron than you know what to do with!\n\nFirst step: combine Charcoal, Bonemeal and crush by hammering - making <a href='handbook://fma:item-carburization_powder'>Carburization Powder</a>!\n Next make a Coffin or 'Pack' of blue-clay with lots of the previous steps powder packed around an iron item (tool-head, blade, ect...nothing too big). Then Fire it in a furnace or firepit for quite a long time - until it glows RED-HOT! \n\nTake out the 'pack' after its finished heating, and place the pack on any solid surface; break it open! Steel items can also be quenched. To improve edged steel - sharpen after hardening.",
-	"metalname-blister_steel":"Blister Steel",
-	"metalname-shear_steel":"Shear Steel",
-	"prop-metal":"Metal: {0},\n",
-	"prop-temper":"Temper: {0},\n",
-	"prop-edge":"Edge: {0},\n",
+	"metalname-Blister Steel":"Blister Steel",
+	"metalname-Shear Steel":"Shear Steel",
+	"prop-metal":"Metal: {0}, ",
+	"prop-temper":"Temper: {0}, ",
+	"prop-edge":"Edge: {0}, ",
 	"sharpness-0":"Rough",
 	"sharpness-1":"Dull",
 	"sharpness-2":"Honed",

Binary files /dev/null and b/ElementalTools/modicon.png differ

--- a/ElementalTools/modinfo.json
+++ b/ElementalTools/modinfo.json
@@ -1,12 +1,12 @@
 {
   "type": "code",
   "name": "Era of STEEL.",
-  "description" : "The OLD technique for making steel items and Quench-Hardening them.",
+  "description" : "Anchient methods for making steel tools & arms; plus Quench-Hardening",
   "authors": ["Melchior"],
   "ModID":"eraofsteel",
-  "version": "0.1.4",
+  "version": "0.1.4-pre.0",
   "dependencies": { 
-	"game": "1.17.0",
+	"game": "1.17.9",
 	"survival": ""
   },
   "website": ""