From 2755884288cbebf13243976231726f185366dc9f Mon Sep 17 00:00:00 2001 From: Bernhard Bonigl Date: Wed, 10 Sep 2014 00:08:57 +0200 Subject: [PATCH] Stealth Modifier description and armor modifier recipe fixes. --- resources/assets/tinker/manuals/firstday.xml | 6 +++--- src/main/java/tconstruct/armor/ArmorProxyClient.java | 4 ++-- src/main/java/tconstruct/armor/TinkerArmor.java | 2 +- src/main/java/tconstruct/client/pages/ModifierPage.java | 4 +++- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/firstday.xml index 757360d66c7..132ada2de03 100644 --- a/resources/assets/tinker/manuals/firstday.xml +++ b/resources/assets/tinker/manuals/firstday.xml @@ -265,10 +265,10 @@ Stackable: yes Stealth -? +Travelling gear is not very protective. Therefore I mixed some magical items and an Invisibility Potion together, to make myself stealthier! Effects: -- Unknown +- Turn invisible while sneaking Type: Single-use Stackable: No @@ -292,7 +292,7 @@ Stackable: yes -Tool Station + Forge +Tinker Table featherfall three diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index aae4bdb6238..ead8dd57fa6 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -78,11 +78,11 @@ private void registerManualRecipes () ItemStack vest = TinkerArmor.travelVest.getDefaultItem(); TConstructClientRegistry.registerManualModifier("dodge", vest.copy(), new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar), null); - TConstructClientRegistry.registerManualModifier("stealth", vest.copy(), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot)); + TConstructClientRegistry.registerManualModifier("stealth", vest.copy(), new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 8206), new ItemStack(Items.golden_carrot)); ItemStack wings = TinkerArmor.travelWings.getDefaultItem(); TConstructClientRegistry.registerManualModifier("doublejumpwings", wings.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 0), new ItemStack(Blocks.piston), null); - MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, feather, wings.copy(), feather, feather, new ItemStack(Items.ender_pearl), feather); + MantleClientRegistry.registerManualLargeRecipe("featherfall", wings.copy(), feather, new ItemStack(TinkerWorld.slimeGel, 1, 0), feather, feather, wings.copy(), feather, feather, new ItemStack(Items.ender_pearl), feather); ItemStack boots = TinkerArmor.travelBoots.getDefaultItem(); TConstructClientRegistry.registerManualModifier("doublejumpboots", boots.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston), null); diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 368587666d7..6e46f8997cf 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -230,7 +230,7 @@ private void registerModifiers () //Chest ModifyBuilder.registerModifier(new AModInteger(0, "Perfect Dodge", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar) }, 1, "\u00a7d", "Perfect Dodge")); - ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth")); + ModifyBuilder.registerModifier(new AModBoolean(1, "Stealth", EnumSet.of(ArmorPart.Chest), new ItemStack[] { new ItemStack(Items.fermented_spider_eye), new ItemStack(Items.ender_eye), new ItemStack(Items.potionitem, 1, 8206), new ItemStack(Items.golden_carrot) }, "\u00a78", "Stealth")); //Wings ItemStack feather = new ItemStack(Items.feather); diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 607cbbe3bcf..15c803d1a14 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -66,8 +66,10 @@ public void readPageFromXML (Element element) public void renderContentLayer (int localWidth, int localHeight, boolean isTranslatable) { String tStation = new String("Tool Station"); + if(icons.length > 4) + tStation = "Tinker Table"; if(icons.length > 3) - tStation = new String("Tool Forge"); + tStation = "Tool Forge"; if (isTranslatable) tStation = StatCollector.translateToLocal(tStation); manual.fonts.drawString("\u00a7n" + tStation, localWidth + 60, localHeight + 4, 0);