Anvil crafting values fixes and heated item tooltip fix

build.prop

@@ -1,6 +1,6 @@
 minecraft_version=1.7.10
 forge_version=10.13.4.1558-1.7.10
 tfc_version=0.79.27
-mod_version=1.09
+mod_version=1.10
 mod_id=TerraFirmaPunkTweaks
 group_name=com.JAWolfe.TerraFirmaPunkTweaks

builds/Minetweaker Instructions.zs

@@ -2,6 +2,21 @@
 //							Heating items
 //========================================================================
 
+//Heat increases at a base rate of 1C per tick. Specific heat is just a multiplier on this rate. 
+//This means that a meltTemp of 100C will be reached in 5 seconds with a Specific Heat of 1.0 and 10 seconds at 2.0
+
+//Reference Melting Temps and Specific Heats:
+//----------------------
+//Bismuth: 270C at 0.14                 Iron: 1535C at 0.35                 Sterling Silver: 900C at 0.35
+//Bismuth Bronze: 985C at 0.35          Lead: 328C at 0.22                  Tin: 230C at 0.14
+//Black Bronze: 1070C at 0.35           Nickel: 1453C at 0.48               Zinc: 420C at 0.21
+//Black Steel: 1485C at 0.35            Pig Iron: 1500C at 0.35             Sand: 600C at 1
+//Blue Steel: 1540C at 0.35             Platinum: 1730 at 0.35              Cook Food: 600C at 1
+//Brass: 930C at 0.35                   Red Steel: 1540 at 0.35             Incinerate Food: 1200C at 1
+//Bronze: 950C at 0.35                  Rose Gold: 960C at 0.35             Ignite stick: 40C at 1
+//Copper: 1080C at 0.35                 Silver: 961C at 0.48
+//Gold: 1060C at 0.6                    Steel: 1540C at 0.35
+
 //-----------------------------------------------
 //Add Recipe
 //-----------------------------------------------
@@ -138,11 +153,11 @@
 //-----------------------------------------------
 //Add Anvil Recipe
 //-----------------------------------------------
-//OutputStack, InputStack1, InputStack2, PlanName, AnvilType
+//OutputStack, InputStack1, InputStack2, PlanName, AnvilType, CraftingValue (Range 0-50)
-//mods.tfptweaks.Anvil.addAnvilRecipe(<minecraft:shears>, <terrafirmacraft:item.Steel Knife Blade>, <terrafirmacraft:item.Steel Knife Blade>, "shears", 3);
+//mods.tfptweaks.Anvil.addAnvilRecipe(<minecraft:shears>, <terrafirmacraft:item.Steel Knife Blade>, <terrafirmacraft:item.Steel Knife Blade>, "shears", 3, 35);
 
-//OutputStack, InputStack, PlanName, AnvilType
+//OutputStack, InputStack, PlanName, AnvilType, CraftingValue (Range 0-50)
-//mods.tfptweaks.Anvil.addAnvilRecipe(<minecraft:iron_sword>, <minecraft:iron_ingot>, "sword", 3);
+//mods.tfptweaks.Anvil.addAnvilRecipe(<minecraft:iron_sword>, <minecraft:iron_ingot>, "sword", 3, 35);
 
 //-----------------------------------------------
 //Remove Anvil Recipe
@@ -167,11 +182,19 @@
 
 //-----------------------------------------------
 //Add Plan Recipe
-//(Works but will not show proper localized plan 
-// name if a custom plan is created)
 //-----------------------------------------------
 
-//Plan Rules: Any=1, BendAny=2, BendLast=3, BendLastTwo=4, BendNotLast=5,  BendSecondFromLast=6, BendThirdFromLast=7, DrawAny=8, DrawLast=9, DrawLastTwo=10, DrawNotLast=11,
+//To show proper custom plan name, use the minetweaker methods to add localization:
+//----------------------------------------------------------------------------------
+// Set translation but only if language is en_US
+//game.setLocalization("en_US", "gui.plans.vanillasword", "Vanilla Sword");
+
+//KEY, TEXT - You will want to use this one most of the time, it overrides no matter the language
+//game.setLocalization("gui.plans.vanillasword", "Vanilla Sword");
+
+//Plan Rules: 
+//----------------------------------------------------------------------------------
+//Any=1, BendAny=2, BendLast=3, BendLastTwo=4, BendNotLast=5,  BendSecondFromLast=6, BendThirdFromLast=7, DrawAny=8, DrawLast=9, DrawLastTwo=10, DrawNotLast=11,
 // DrawSecondFromLast=12, DrawThirdFromLast=13, HitAny=14, HitLast=15, HitLastTwo=16, HitNotLast=17, HitSecondFromLast=18, HitThirdFromLast=19, PunchAny=20, PunchLast=21,
 // PunchLastTwo=22, PunchNotLast=23, PunchSecondFromLast=24, PunchThridFromLast=25, ShrinkAny=26, ShrinkLast=27, ShrinkLastTwo=28, ShrinkNotLast=29, ShrinkSecondFromLast=30,
 // ShrinkThirdFromLast=31, UpsetAny=32, UpetLast=33, UpsetLastTwo=34, UpsetNotLast=35, UpsetSecondFromLast=36, UpsetThirdFromLast=37

changelog.txt

@@ -1,9 +1,16 @@
 Changelog
 =================================================
 -------------------------------------------------
+TFP Tweaks 1.10
+-------------------------------------------------
+Bug Fixes
++Fixed tooltips for some heated TFC items not showing "Can Work", "Can Weld" and "Danger"
++Fixed Anvil recipes having different crafting values between the client and server. The minetweaker recipe now requires a crafting value to be specified in the recipe.
++Fixed Anvil recipes have a crafting value that is impossible to craft
+-------------------------------------------------
 TFP Tweaks 1.09
 -------------------------------------------------
-Bug Fix
+Hot Fix
 +Fixed crash from improper casting with mob damage from projectiles
 -------------------------------------------------
 TFP Tweaks 1.08

src/main/java/com/JAWolfe/terrafirmapunktweaks/handlers/PlayerInteractionHandler.java

@@ -7,7 +7,12 @@ import com.JAWolfe.terrafirmapunktweaks.items.TFPItems;
 import com.JAWolfe.terrafirmapunktweaks.reference.ConfigSettings;
 import com.JAWolfe.terrafirmapunktweaks.reference.ReferenceLists;
 import com.bioxx.tfc.Core.TFC_Core;
+import com.bioxx.tfc.Items.ItemBloom;
+import com.bioxx.tfc.Items.ItemIngot;
+import com.bioxx.tfc.Items.ItemMetalSheet;
 import com.bioxx.tfc.Items.ItemTerra;
+import com.bioxx.tfc.Items.ItemUnfinishedArmor;
+import com.bioxx.tfc.Items.ItemBlocks.ItemTerraBlock;
 import com.bioxx.tfc.TileEntities.TEAnvil;
 import com.bioxx.tfc.api.HeatIndex;
 import com.bioxx.tfc.api.HeatRegistry;
@@ -47,7 +52,7 @@ public class PlayerInteractionHandler
 			event.toolTip.add("\u2696" + TFC_Core.translate("gui.Weight." + EnumWeight.LIGHT.getName()) + " \u21F2" + 
 				TFC_Core.translate("gui.Size." + EnumSize.VERYSMALL.getName().replace(" ", "")));*/
 		
-		if(!(object.getItem() instanceof ItemTerra))
+		if(!(object.getItem() instanceof ItemTerra || object.getItem() instanceof ItemTerraBlock))
 		{
 			if (object.hasTagCompound())
 			{
@@ -63,6 +68,20 @@ public class PlayerInteractionHandler
 					{
 						event.toolTip.add(TFC_ItemHeat.getHeatColor(temp, meltTemp));
 					}
+				}
+			}
+		}
+		
+		if(!(object.getItem() instanceof ItemIngot ||
+			object.getItem() instanceof ItemMetalSheet ||
+			object.getItem() instanceof ItemUnfinishedArmor ||
+			object.getItem() instanceof ItemBloom ||
+			object.getItem() == TFCItems.wroughtIronKnifeHead))
+		{
+			if (object.hasTagCompound())
+			{
+				if(TFC_ItemHeat.hasTemp(object))
+				{
 					
 					if(ReferenceLists.getInstance().isAnvilInged(object))
 					{
@@ -86,7 +105,13 @@ public class PlayerInteractionHandler
 							event.toolTip.add(s);
 					}
 				}
+			}
+		}
 		
+		if(!(object.getItem() instanceof ItemTerra))
+		{
+			if (object.hasTagCompound())
+			{
 				if (object.getTagCompound().hasKey(TEAnvil.ITEM_CRAFTING_VALUE_TAG) || object.getTagCompound().hasKey(TEAnvil.ITEM_CRAFTING_RULE_1_TAG))
 					event.toolTip.add(TFC_Core.translate("gui.ItemWorked"));
 			}

src/main/java/com/JAWolfe/terrafirmapunktweaks/minetweaker/TFC/Anvil.java

@@ -22,7 +22,7 @@ import stanhebben.zenscript.annotations.ZenMethod;
 public class Anvil 
 {
 	@ZenMethod
-	public static void addAnvilRecipe(IItemStack Output, IItemStack Input1, IItemStack Input2, String plan, int AnvilReq)
+	public static void addAnvilRecipe(IItemStack Output, IItemStack Input1, IItemStack Input2, String plan, int AnvilReq, int craftingValue)
 	{
 		ItemStack result = MineTweakerMC.getItemStack(Output);
 		ItemStack input1 = MineTweakerMC.getItemStack(Input1);
@@ -30,13 +30,13 @@ public class Anvil
 		if(Input2 != null)
 			input2 = MineTweakerMC.getItemStack(Input2);
 		
-		MineTweakerAPI.apply(new addAnvilRecipeAction(result, input1, input2, plan, AnvilReq));
+		MineTweakerAPI.apply(new addAnvilRecipeAction(result, input1, input2, plan, AnvilReq, craftingValue));
 	}
 	
 	@ZenMethod
-	public static void addAnvilRecipe(IItemStack Output, IItemStack Input1, String plan, int AnvilReq)
+	public static void addAnvilRecipe(IItemStack Output, IItemStack Input1, String plan, int AnvilReq, int craftingValue)
 	{
-		addAnvilRecipe(Output, Input1, null, plan, AnvilReq);
+		addAnvilRecipe(Output, Input1, null, plan, AnvilReq, craftingValue);
 	}
 	
 	@ZenMethod
@@ -91,7 +91,6 @@ public class Anvil
 	
 	private static class addAnvilRecipeAction implements IUndoableAction 
 	{
-		Random r = new Random();
 		ItemStack input1;
 		ItemStack input2;
 		ItemStack result;
@@ -99,14 +98,14 @@ public class Anvil
 		int craftingvalue;
 		int anvilReq;
 		
-		public addAnvilRecipeAction(ItemStack result, ItemStack input1, ItemStack input2, String plan, int anvilReq)
+		public addAnvilRecipeAction(ItemStack result, ItemStack input1, ItemStack input2, String plan, int anvilReq, int craftingValue)
 		{
 			this.input1 = input1;
 			this.input2 = input2;
 			this.result = result;
 			this.plan = plan;
-			this.craftingvalue = 70 + r.nextInt(50);
 			this.anvilReq = anvilReq;
+			this.craftingvalue = 50 + craftingValue;
 		}
 		
 		@Override

src/main/java/com/JAWolfe/terrafirmapunktweaks/reference/ReferenceLists.java

@@ -35,15 +35,13 @@ public class ReferenceLists
 			ItemStack listIS = anvilIngredList.get(i);
 			if(is != null && listIS != null)
 			{
-				if(is.getItem() != listIS.getItem())
+				if(is.getItem() == listIS.getItem())
-					return false;
+				{
-				
+					if(is.getItemDamage() == listIS.getItemDamage())
-				if(is.getItemDamage() != listIS.getItemDamage())
-					return false;
-			}
-			else if(is == null && listIS != null || is != null && listIS == null)
-				return false;
-		}
 						return true;
 				}
+			}
+		}
+		return false;
+	}
 }