diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 3d08ca59..895c644d 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -505,15 +505,15 @@ item.itemTravelStaff.tooltip.detailed.line4=Shift-R-Click will teleport the item.itemTravelStaff.tooltip.detailed.line5=player a short distance enderio.itemTravelStaff.notEnoughPower=Not enough power -item.itemCoordsCard.name=Coords Card -item.itemCoordsCard.tooltip.detailed.line1=Stores coordinates of a block. -item.itemCoordsCard.tooltip.detailed.line2=Right click at block to select -item.itemCoordsCard.tooltip.detailed.line3=the block adjacent on that side. -item.itemCoordsCard.tooltip.detailed.line4=Shift right click at a block to -item.itemCoordsCard.tooltip.detailed.line5=select that specific block. -item.itemCoordsCard.tooltip.detailed.line6=Can select from a distance. -enderio.itemCoordsCard.chat.newCoords=New Coords: %s -enderio.itemCoordsCard.chat.setCoords=Set Coords: %s +item.itemCoordSelector.name=Coordinate Selector +item.itemCoordSelector.tooltip.detailed.line1=Stores coordinates of a block. +item.itemCoordSelector.tooltip.detailed.line2=Right click at block to select +item.itemCoordSelector.tooltip.detailed.line3=the block adjacent on that side. +item.itemCoordSelector.tooltip.detailed.line4=Shift right click at a block to +item.itemCoordSelector.tooltip.detailed.line5=select that specific block. +item.itemCoordSelector.tooltip.detailed.line6=Can select from a distance. +enderio.itemCoordSelector.chat.newCoords=New Coords: %s +enderio.itemCoordSelector.chat.setCoords=Set Coords: %s //Painter tile.blockPainter.name=Painting Machine diff --git a/resources/assets/enderio/textures/items/itemCoordSelector.png b/resources/assets/enderio/textures/items/itemCoordSelector.png new file mode 100644 index 00000000..a8a67a78 Binary files /dev/null and b/resources/assets/enderio/textures/items/itemCoordSelector.png differ diff --git a/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png b/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png new file mode 100644 index 00000000..29da0841 Binary files /dev/null and b/resources/assets/enderio/textures/items/itemCoordSelector_alt1.png differ diff --git a/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png b/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png new file mode 100644 index 00000000..5a354b7d Binary files /dev/null and b/resources/assets/enderio/textures/items/itemCoordSelector_alt2.png differ diff --git a/resources/assets/enderio/textures/items/itemCoordsCard.png b/resources/assets/enderio/textures/items/itemCoordsCard.png deleted file mode 100644 index 82c93671..00000000 Binary files a/resources/assets/enderio/textures/items/itemCoordsCard.png and /dev/null differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 2a6de852..125c5a2e 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -154,7 +154,7 @@ import crazypants.enderio.teleport.TeleportRecipes; import crazypants.enderio.teleport.TravelController; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; import crazypants.enderio.teleport.telepad.BlockTelePad; -import crazypants.enderio.teleport.telepad.ItemCoordsCard; +import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.util.EntityUtil; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "required-after:Forge@10.13.0.1150,);after:MineFactoryReloaded;after:Waila@[1.5.8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") @@ -192,7 +192,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; public static BlockTelePad blockTelePad; - public static ItemCoordsCard itemCoordsCard; + public static ItemCoordSelector itemCoordsCard; public static ItemTravelStaff itemTravelStaff; // Painter @@ -345,7 +345,7 @@ public class EnderIO { blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); blockTelePad = BlockTelePad.create(); - itemCoordsCard = ItemCoordsCard.create(); + itemCoordsCard = ItemCoordSelector.create(); blockSliceAndSplice = BlockSliceAndSplice.create(); blockSoulFuser = BlockSoulBinder.create(); diff --git a/src/main/java/crazypants/enderio/ModObject.java b/src/main/java/crazypants/enderio/ModObject.java index 6a7122ae..1b674676 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -96,7 +96,7 @@ public enum ModObject { blockTravelAnchor, blockTelePad, - itemCoordsCard, + itemCoordSelector, itemTravelStaff, itemMagnet, itemGliderWing, diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java similarity index 90% rename from src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java rename to src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java index 4371d2d5..b77a5c43 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordSelector.java @@ -28,18 +28,18 @@ import crazypants.util.Lang; import crazypants.util.Util; import crazypants.vecmath.Vector3d; -public class ItemCoordsCard extends Item implements IResourceTooltipProvider { +public class ItemCoordSelector extends Item implements IResourceTooltipProvider { - public static ItemCoordsCard create() { - ItemCoordsCard ret = new ItemCoordsCard(); - GameRegistry.registerItem(ret, ModObject.itemCoordsCard.unlocalisedName); + public static ItemCoordSelector create() { + ItemCoordSelector ret = new ItemCoordSelector(); + GameRegistry.registerItem(ret, ModObject.itemCoordSelector.unlocalisedName); return ret; } - private ItemCoordsCard() { + private ItemCoordSelector() { setCreativeTab(EnderIOTab.tabEnderIO); - setUnlocalizedName(ModObject.itemCoordsCard.unlocalisedName); - setTextureName("EnderIO:" + ModObject.itemCoordsCard.unlocalisedName); + setUnlocalizedName(ModObject.itemCoordSelector.unlocalisedName); + setTextureName("EnderIO:" + ModObject.itemCoordSelector.unlocalisedName); setMaxStackSize(1); } @@ -86,11 +86,6 @@ public class ItemCoordsCard extends Item implements IResourceTooltipProvider { if (!rayTraceCoords(stack, world, player)) { return false; } - - if(world.isRemote) { - sendItemUsePacket(stack, player, world, x, y, z, side, hitX, hitY, hitZ); - return true; - } TileEntity te = world.getTileEntity(x, y, z); if(te instanceof ITelePad) { @@ -101,7 +96,7 @@ public class ItemCoordsCard extends Item implements IResourceTooltipProvider { if(!bc.equals(cur)) { tp.setCoords(getCoords(stack)); if(!world.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordsCard.chat.setCoords", bc.chatString()))); + player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.setCoords", bc.chatString()))); } } else { return false; @@ -110,6 +105,12 @@ public class ItemCoordsCard extends Item implements IResourceTooltipProvider { BlockTravelAnchor.sendPrivateChatMessage(player, tp.getPlacedBy()); } } + + + if(world.isRemote) { + sendItemUsePacket(stack, player, world, x, y, z, side, hitX, hitY, hitZ); + } + return true; } @@ -153,7 +154,7 @@ public class ItemCoordsCard extends Item implements IResourceTooltipProvider { private void onCoordsChanged(EntityPlayer player, BlockCoord bc) { if(!player.worldObj.isRemote) { - player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordsCard.chat.newCoords", bc.chatString()))); + player.addChatMessage(new ChatComponentText(Lang.localize("itemCoordSelector.chat.newCoords", bc.chatString()))); } }