diff --git a/resources/assets/tinker/manuals/firstday.xml b/resources/assets/tinker/manuals/firstday.xml index 7692d419659..013dc4c5546 100644 --- a/resources/assets/tinker/manuals/firstday.xml +++ b/resources/assets/tinker/manuals/firstday.xml @@ -225,7 +225,21 @@ Note: The Smeltery is required to process all metals, including iron. -The following armor modifiers seem to be missing names or in flux. No word is available on the accuracy or new home of these pages. +Armor Modifiers + +The following armor modifiers seem to be missing names or in flux. No word is available on the accuracy or new home of these pages. + + + +Night Vision +Apparently carrots and juice are not only good for your eyes, but for your goggles as well. +The Night Vision Potion also helps. + +Effects: +- Night Vision + +Type: Single-use +Stackable: No @@ -233,49 +247,66 @@ Note: The Smeltery is required to process all metals, including iron. nightvision - -Dodge - - dodge - two - + +Perfect Dodge +Ninja ninja. + +Effects: +- You're harder to hit + +Type: Single-use +Stackable: yes - -Corrupted Sight - - stealth - two - + +travelvest +dodge + + + +Stealth +? + +Effects: +- Unknown + +Type: Single-use +Stackable: No -travelwings -doublejump +travelvest +stealth - -Freefall - - doublejump - two - + +Feather Fall +You already got wings. If chicken can do it, so can you. +Any slime variant can be used. + +Effects: +- Allows you to glide down slowly in air + +Type: Single-use +Stackable: yes - -Aer - - featherfall - three - + +travelwings +featherfall - -Travel - - doublejumpboots - two - + +Water Walk +If I put these things on my boots, I'm sure I can walk over water too. What could go wrong? + +Effects: +- Allows you to walk over water +- Sneak to sink +- Does not come with a halo + +Type: Single-use +Stackable: no @@ -283,24 +314,89 @@ Note: The Smeltery is required to process all metals, including iron. waterwalk + +Lead boots +This iron block has served me well. I want to take it with me, to the bottom of the ocean. +Perfect if you want to see where your pet-fish sleeps. + +Effects: +- Allows you to walk under water +- Prevents you from swimming +- Blub. + +Type: Single-use +Stackable: no + + travelboots leadboots + +Slimy Soles +When I jump on slime, I bounce and don't take damage. I should be able to replicate that effect by putting the slime onto my soles. + +Effects: +- Dampens the fall impact +- Reduces fall damage taken + +Type: Single-use +Stackable: yes + + travelboots slimysoles + +Speed +Putting redstone on my weapon makes it faster. So why don't I put it on my hands directly! + +Effects: +- Increases mining speed + +Type: Multi-use +Stackable: yes + + -travelgloves -glovehaste +travelglove +redstonemod + + + +Auto-Repair +Attaching moss to an armor infuses it with life. The tool appears to be capable of regenerating wear and tear. + +Effects: +- The tool slowly repairs itself +- Sunlight speeds up the process + +Type: Single-use +Stackable: yes + + + +travelmulti +mossmod + + + +Double Jump +Infused with the power of a ghast tear and some slime and piston mechanics, I should be able to repel myself even further into the air. + +Effects: +- Jump during jumping to jump + +Type: Single-use +Stackable: yes -travelgloves -gloveknuckles +travelmulti +mossmod \ No newline at end of file diff --git a/src/main/java/tconstruct/armor/ArmorProxyClient.java b/src/main/java/tconstruct/armor/ArmorProxyClient.java index feac356655c..5d3da38d37b 100644 --- a/src/main/java/tconstruct/armor/ArmorProxyClient.java +++ b/src/main/java/tconstruct/armor/ArmorProxyClient.java @@ -32,6 +32,7 @@ import tconstruct.common.TProxyCommon; import tconstruct.library.accessory.IAccessoryModel; import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.crafting.ModifyBuilder; import tconstruct.world.TinkerWorld; public class ArmorProxyClient extends ArmorProxyCommon @@ -50,38 +51,48 @@ public void initialize () { registerGuiHandler(); registerKeys(); + registerManualIcons(); registerManualRecipes(); MinecraftForge.EVENT_BUS.register(this); FMLCommonHandler.instance().bus().register(new ArmorAbilitiesClient(mc, controlInstance)); } + private void registerManualIcons () + { + MantleClientRegistry.registerManualIcon("travelgoggles", TinkerArmor.travelGoggles.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelvest", TinkerArmor.travelVest.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelwings", TinkerArmor.travelWings.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelboots", TinkerArmor.travelBoots.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelbelt", TinkerArmor.travelBelt.getDefaultItem()); + MantleClientRegistry.registerManualIcon("travelglove", TinkerArmor.travelGlove.getDefaultItem()); + } + private void registerManualRecipes () { ItemStack feather = new ItemStack(Items.feather); ItemStack redstone = new ItemStack(Items.redstone); ItemStack goggles = TinkerArmor.travelGoggles.getDefaultItem(); - MantleClientRegistry.registerManualSmallRecipe("nightvision", goggles.copy(), new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot), null); + //MantleClientRegistry.registerManualSmallRecipe("nightvision", goggles.copy(), new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot), null); + ItemStack g2 = goggles.copy(); + + g2 = ModifyBuilder.instance.modifyItem(g2, new ItemStack[] { new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 0), new ItemStack(Items.golden_carrot)}); + MantleClientRegistry.registerManualSmallRecipe("nightvision", g2, new ItemStack(Items.flint_and_steel), new ItemStack(Items.potionitem, 1, 8198), new ItemStack(Items.golden_carrot), null); ItemStack vest = TinkerArmor.travelVest.getDefaultItem(); - System.out.println("Travel Vest Item: " + vest); - MantleClientRegistry.registerManualIcon("travelvest", vest); MantleClientRegistry.registerManualSmallRecipe("dodge", vest.copy(), new ItemStack(Items.ender_eye), new ItemStack(Items.ender_pearl), new ItemStack(Items.sugar), null); MantleClientRegistry.registerManualSmallRecipe("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)); ItemStack wings = new ItemStack(TinkerArmor.travelWings); - MantleClientRegistry.registerManualIcon("travelwings", wings); MantleClientRegistry.registerManualSmallRecipe("doublejump", 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); ItemStack boots = TinkerArmor.travelBoots.getDefaultItem(); - MantleClientRegistry.registerManualIcon("travelboots", boots); MantleClientRegistry.registerManualSmallRecipe("doublejumpboots", boots.copy(), new ItemStack(Items.ghast_tear), new ItemStack(TinkerWorld.slimeGel, 1, 1), new ItemStack(Blocks.piston), null); TConstructClientRegistry.registerManualModifier("waterwalk", boots.copy(), new ItemStack(Blocks.waterlily), new ItemStack(Blocks.waterlily)); TConstructClientRegistry.registerManualModifier("leadboots", boots.copy(), new ItemStack(Blocks.iron_block)); TConstructClientRegistry.registerManualModifier("slimysoles", boots.copy(), new ItemStack(TinkerWorld.slimePad, 1, 0), new ItemStack(TinkerWorld.slimePad, 1, 0)); ItemStack gloves = TinkerArmor.travelGlove.getDefaultItem(); - MantleClientRegistry.registerManualIcon("travelgloves", gloves); TConstructClientRegistry.registerManualModifier("glovehaste", gloves.copy(), redstone, new ItemStack(Blocks.redstone_block)); //MantleClientRegistry.registerManualSmallRecipe("gloveclimb", gloves.copy(), new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25), null); TConstructClientRegistry.registerManualModifier("gloveknuckles", gloves.copy(), new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE)); diff --git a/src/main/java/tconstruct/armor/TinkerArmor.java b/src/main/java/tconstruct/armor/TinkerArmor.java index 94abe48f27f..81504286e73 100644 --- a/src/main/java/tconstruct/armor/TinkerArmor.java +++ b/src/main/java/tconstruct/armor/TinkerArmor.java @@ -245,7 +245,7 @@ private void registerModifiers () //Glove ModifyBuilder.registerModifier(new GloveSpeed(1, new ItemStack[] { redstoneItem, redstoneBlock }, new int[] { 1, 9 })); //ModifyBuilder.registerModifier(new GloveClimb(new ItemStack[] { new ItemStack(Items.slime_ball), new ItemStack(Blocks.web), new ItemStack(TinkerTools.materials, 1, 25) })); - this.modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50, "Accessory"); - ModifyBuilder.registerModifier(this.modAttackGlove); + modAttackGlove = new ModAttack("Quartz", 2, new ItemStack[] { new ItemStack(Items.quartz), new ItemStack(Blocks.quartz_block, 1, Short.MAX_VALUE) }, new int[] { 1, 4 }, 50, 50, "Accessory"); + ModifyBuilder.registerModifier(modAttackGlove); } } diff --git a/src/main/java/tconstruct/client/pages/ModifierPage.java b/src/main/java/tconstruct/client/pages/ModifierPage.java index 0d8989032c8..24b8f0aef3b 100644 --- a/src/main/java/tconstruct/client/pages/ModifierPage.java +++ b/src/main/java/tconstruct/client/pages/ModifierPage.java @@ -39,6 +39,18 @@ public void renderContentLayer (int localWidth, int localHeight, boolean isTrans ItemStack toolstack = MantleClientRegistry.getManualIcon("ironpick"); if (type.equals("weapon")) toolstack = MantleClientRegistry.getManualIcon("ironlongsword"); + if(type.equals("travelgoggles")) + toolstack = MantleClientRegistry.getManualIcon("travelgoggles"); + if(type.equals("travelvest")) + toolstack = MantleClientRegistry.getManualIcon("travelvest"); + if(type.equals("travelwings")) + toolstack = MantleClientRegistry.getManualIcon("travelwings"); + if(type.equals("travelboots")) + toolstack = MantleClientRegistry.getManualIcon("travelboots"); + if(type.equals("travelbelt")) + toolstack = MantleClientRegistry.getManualIcon("travelbelt"); + if(type.equals("travelglove")) + toolstack = MantleClientRegistry.getManualIcon("travelglove"); manual.renderitem.zLevel = 100; manual.renderitem.renderItemAndEffectIntoGUI(manual.fonts, manual.getMC().renderEngine, toolstack, (localWidth + 54) / 2, (localHeight + 54) / 2); diff --git a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java index ff41b15ef49..310e6aabcdd 100644 --- a/src/main/java/tconstruct/world/TinkerWorldProxyClient.java +++ b/src/main/java/tconstruct/world/TinkerWorldProxyClient.java @@ -62,8 +62,8 @@ void registerManualRecipes () MantleClientRegistry.registerManualFurnaceRecipe("consecratedsoil", consecratedsoil, graveyardsoil); // Traps - ItemStack reed = new ItemStack(Items.sugar); - MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji), reed, null, reed, null, reed, null, reed, null, reed); + ItemStack reed = new ItemStack(Items.reeds); + MantleClientRegistry.registerManualLargeRecipe("punji", new ItemStack(TinkerWorld.punji, 5), reed, null, reed, null, reed, null, reed, null, reed); MantleClientRegistry.registerManualSmallRecipe("barricade", new ItemStack(TinkerWorld.barricadeOak), null, log, null, log); }