From 72bf5832e01af75f6f2a0482a2ef5a4bf090c2ad Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Wed, 13 May 2015 14:05:34 -0400 Subject: [PATCH] Add tooltip to telepad, add coord selector recipe --- resources/assets/enderio/lang/en_US.lang | 3 +++ src/main/java/crazypants/enderio/EnderIO.java | 4 ++-- .../java/crazypants/enderio/teleport/TeleportRecipes.java | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index f9da1c9d..2d96789d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -553,6 +553,9 @@ enderio.blockTravelPlatform.invalidTarget=Destination is Obstructed enderio.blockTravelPlatform.outOfRange=Destination out of range tile.blockTelePad.name=Telepad Block +tile.blockTelePad.tooltip.detailed.line1=Uses power to teleport entities +tile.blockTelePad.tooltip.detailed.line2=to a specific position and dimension. +tile.blockTelePad.tooltip.detailed.line3=Must be placed in a 3x1x3 multiblock. enderio.gui.telepad.teleport=Teleport! item.itemTravelStaff.name=Staff of Traveling diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index a2b2e03e..aea165b3 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -194,7 +194,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; public static BlockTelePad blockTelePad; - public static ItemCoordSelector itemCoordsCard; + public static ItemCoordSelector itemCoordSelector; public static ItemTravelStaff itemTravelStaff; // Painter @@ -353,7 +353,7 @@ public class EnderIO { blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); blockTelePad = BlockTelePad.create(); - itemCoordsCard = ItemCoordSelector.create(); + itemCoordSelector = ItemCoordSelector.create(); blockSliceAndSplice = BlockSliceAndSplice.create(); blockSoulFuser = BlockSoulBinder.create(); diff --git a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java index bd2af4ac..bd5af150 100644 --- a/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java +++ b/src/main/java/crazypants/enderio/teleport/TeleportRecipes.java @@ -43,5 +43,8 @@ public class TeleportRecipes { ItemStack fq = new ItemStack(EnderIO.blockFusedQuartz, 1, BlockFusedQuartz.Type.FUSED_QUARTZ.ordinal()); GameRegistry.addRecipe(new ShapedOreRecipe(telepad, "gSg", "dAd", "dod", 'g', fq, 'S', staff, 'd', "ingotDarkSteel", 'A', travelBlock, 'o', octadic)); } + + ItemStack coordSelector = new ItemStack(EnderIO.itemCoordSelector); + GameRegistry.addRecipe(new ShapedOreRecipe(coordSelector, "sps", " cs", " s", 's', "ingotElectricalSteel", 'p', Items.ender_pearl, 'c', Items.compass)); } }