diff --git a/resources/assets/enderio/lang/en_US.lang b/resources/assets/enderio/lang/en_US.lang index 98721307..d9636113 100644 --- a/resources/assets/enderio/lang/en_US.lang +++ b/resources/assets/enderio/lang/en_US.lang @@ -505,6 +505,13 @@ 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 on block to select +item.itemCoordsCard.tooltip.detailed.line3=the block adjacent on that side. +item.itemCoordsCard.tooltip.detailed.line4=Shift right click on block to +item.itemCoordsCard.tooltip.detailed.line5=select that specific block. + //Painter tile.blockPainter.name=Painting Machine enderio.blockPainter.paintedWith=Painted with: diff --git a/resources/assets/enderio/textures/items/itemCoordsCard.png b/resources/assets/enderio/textures/items/itemCoordsCard.png new file mode 100644 index 00000000..a9526d10 Binary files /dev/null and b/resources/assets/enderio/textures/items/itemCoordsCard.png differ diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index d4ca1f34..2a6de852 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -154,6 +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.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") @@ -191,6 +192,7 @@ public class EnderIO { //Teleporting public static BlockTravelAnchor blockTravelPlatform; public static BlockTelePad blockTelePad; + public static ItemCoordsCard itemCoordsCard; public static ItemTravelStaff itemTravelStaff; // Painter @@ -343,6 +345,7 @@ public class EnderIO { blockEnderIo = BlockEnderIO.create(); blockTravelPlatform = BlockTravelAnchor.create(); blockTelePad = BlockTelePad.create(); + itemCoordsCard = ItemCoordsCard.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 9d5157b9..6a7122ae 100644 --- a/src/main/java/crazypants/enderio/ModObject.java +++ b/src/main/java/crazypants/enderio/ModObject.java @@ -96,6 +96,7 @@ public enum ModObject { blockTravelAnchor, blockTelePad, + itemCoordsCard, itemTravelStaff, itemMagnet, itemGliderWing, diff --git a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java index 1eab7e4c..fd25b6c5 100644 --- a/src/main/java/crazypants/enderio/api/teleport/ITelePad.java +++ b/src/main/java/crazypants/enderio/api/teleport/ITelePad.java @@ -2,7 +2,9 @@ package crazypants.enderio.api.teleport; import javax.annotation.Nullable; -public interface ITelePad { +import crazypants.util.BlockCoord; + +public interface ITelePad extends ITravelAccessable { /** * If this piece of the telepad is the master, meaning it is connected on all @@ -10,7 +12,7 @@ public interface ITelePad { * * @return True if this TE is the master TE, false otherwise. */ - public boolean isMaster(); + boolean isMaster(); /** * Gets the master telepad that this one is connected to. @@ -19,7 +21,7 @@ public interface ITelePad { * it is the master. */ @Nullable - public ITelePad getMaster(); + ITelePad getMaster(); /** * If this telepad piece is in a network, meaning it is connected and in a @@ -27,7 +29,7 @@ public interface ITelePad { * * @return True if this TE is in a network, false otherwise. */ - public boolean inNetwork(); + boolean inNetwork(); /** * The X coordinate stored in this telepad network. Always 0 if this is @@ -35,7 +37,7 @@ public interface ITelePad { * * @return The target X coordinate. */ - public int getX(); + int getX(); /** * The Y coordinate stored in this telepad network. Always 0 if this is @@ -43,7 +45,7 @@ public interface ITelePad { * * @return The target Y coordinate. */ - public int getY(); + int getY(); /** * The Z coordinate stored in this telepad network. Always 0 if this is @@ -51,7 +53,7 @@ public interface ITelePad { * * @return The target Z coordinate. */ - public int getZ(); + int getZ(); /** * Sets the target X coordinate of the network. Has no effect if @@ -59,7 +61,7 @@ public interface ITelePad { * * @return The master telepad TE. DOES NOT ALWAYS return itself. */ - public ITelePad setX(int x); + ITelePad setX(int x); /** * Sets the target Y coordinate of the network. Has no effect if @@ -67,7 +69,7 @@ public interface ITelePad { * * @return The master telepad TE. DOES NOT ALWAYS return itself. */ - public ITelePad setY(int y); + ITelePad setY(int y); /** * Sets the target Z coordinate of the network. Has no effect if @@ -75,5 +77,17 @@ public interface ITelePad { * * @return The master telepad TE. DOES NOT ALWAYS return itself. */ - public ITelePad setZ(int z); + ITelePad setZ(int z); + + /** + * Util method to set all coords using a {@link BlockCoord} object. + * + * @see #setX(int) + * @see #setY(int) + * @see #setZ(int) + * + * @param coords + * The coords to set this telepad to. + */ + void setCoords(BlockCoord coords); } diff --git a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java index 108f11f8..5f97fed9 100644 --- a/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java +++ b/src/main/java/crazypants/enderio/enderface/BlockEnderIO.java @@ -1,12 +1,10 @@ package crazypants.enderio.enderface; -import net.minecraft.block.Block; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -22,8 +20,7 @@ import crazypants.enderio.api.teleport.ITravelAccessable; import crazypants.enderio.enderface.te.MeProxy; import crazypants.enderio.gui.IResourceTooltipProvider; import crazypants.enderio.network.PacketHandler; -import crazypants.util.Lang; -import net.minecraftforge.common.UsernameCache; +import crazypants.enderio.teleport.anchor.BlockTravelAnchor; public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { @@ -95,10 +92,7 @@ public class BlockEnderIO extends BlockEio implements IResourceTooltipProvider { if(ta.canUiBeAccessed(entityPlayer)) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote && !entityPlayer.isSneaking()) { - entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + UsernameCache.getLastKnownUsername(ta.getPlacedBy()) + " " - + Lang.localize("gui.travelAccessable.privateBlock2"))); - } + BlockTravelAnchor.sendPrivateChatMessage(entityPlayer, ta.getPlacedBy()); } return true; } diff --git a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java index a7a7beea..9eb1ad4c 100644 --- a/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java +++ b/src/main/java/crazypants/enderio/teleport/anchor/BlockTravelAnchor.java @@ -1,5 +1,7 @@ package crazypants.enderio.teleport.anchor; +import java.util.UUID; + import net.minecraft.block.Block; import net.minecraft.block.ITileEntityProvider; import net.minecraft.client.renderer.texture.IIconRegister; @@ -9,6 +11,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; @@ -127,7 +130,7 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt } } } - + @Override public boolean openGui(World world, int x, int y, int z, EntityPlayer entityPlayer, int side) { TileEntity te = world.getTileEntity(x, y, z); @@ -136,15 +139,20 @@ public class BlockTravelAnchor extends BlockEio implements IGuiHandler, ITileEnt if(ta.canUiBeAccessed(entityPlayer)) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TRAVEL_ACCESSABLE, world, x, y, z); } else { - if(world.isRemote && !entityPlayer.isSneaking()) { - entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + UsernameCache.getLastKnownUsername(ta.getPlacedBy()) + " " - + Lang.localize("gui.travelAccessable.privateBlock2"))); - } + sendPrivateChatMessage(entityPlayer, ta.getPlacedBy()); } } return true; } + public static void sendPrivateChatMessage(EntityPlayer player, UUID owner) { + if(player.worldObj.isRemote && !player.isSneaking()) { + player.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + + EnumChatFormatting.RED + UsernameCache.getLastKnownUsername(owner) + EnumChatFormatting.WHITE + " " + + Lang.localize("gui.travelAccessable.privateBlock2"))); + } + } + @Override public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) { TileEntity te = world.getTileEntity(x, y, z); diff --git a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java index 8538804a..011be8d7 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/BlockTelePad.java @@ -5,11 +5,9 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -import net.minecraftforge.common.UsernameCache; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import crazypants.enderio.EnderIO; @@ -21,7 +19,6 @@ import crazypants.enderio.teleport.ContainerTravelAccessable; import crazypants.enderio.teleport.ContainerTravelAuth; import crazypants.enderio.teleport.GuiTravelAuth; import crazypants.enderio.teleport.anchor.BlockTravelAnchor; -import crazypants.util.Lang; public class BlockTelePad extends BlockTravelAnchor { @@ -99,10 +96,7 @@ public class BlockTelePad extends BlockTravelAnchor { if(tp.canUiBeAccessed(entityPlayer)) { entityPlayer.openGui(EnderIO.instance, GuiHandler.GUI_ID_TELEPAD, world, x, y, z); } else { - if(world.isRemote && !entityPlayer.isSneaking()) { - entityPlayer.addChatComponentMessage(new ChatComponentText(Lang.localize("gui.travelAccessable.privateBlock1") + " " + UsernameCache.getLastKnownUsername(tp.getPlacedBy()) + " " - + Lang.localize("gui.travelAccessable.privateBlock2"))); - } + sendPrivateChatMessage(entityPlayer, tp.getPlacedBy()); } } return true; diff --git a/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java new file mode 100644 index 00000000..b93e10c1 --- /dev/null +++ b/src/main/java/crazypants/enderio/teleport/telepad/ItemCoordsCard.java @@ -0,0 +1,110 @@ +package crazypants.enderio.teleport.telepad; + +import java.util.List; + +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIOTab; +import crazypants.enderio.ModObject; +import crazypants.enderio.api.teleport.ITelePad; +import crazypants.enderio.gui.IResourceTooltipProvider; +import crazypants.enderio.teleport.anchor.BlockTravelAnchor; +import crazypants.util.BlockCoord; + +public class ItemCoordsCard extends Item implements IResourceTooltipProvider { + + public static ItemCoordsCard create() { + ItemCoordsCard ret = new ItemCoordsCard(); + GameRegistry.registerItem(ret, ModObject.itemCoordsCard.unlocalisedName); + return ret; + } + + private ItemCoordsCard() { + setCreativeTab(EnderIOTab.tabEnderIO); + setUnlocalizedName(ModObject.itemCoordsCard.unlocalisedName); + setTextureName("EnderIO:" + ModObject.itemCoordsCard.unlocalisedName); + setMaxStackSize(1); + } + + @SuppressWarnings("unchecked") + @Override + public void getSubItems(Item item, CreativeTabs p_150895_2_, @SuppressWarnings("rawtypes") List list) { + ItemStack stack = new ItemStack(item); + init(stack); + list.add(stack); + } + + @Override + public void onCreated(ItemStack stack, World world, EntityPlayer player) { + super.onCreated(stack, world, player); + init(stack); + } + + private void init(ItemStack stack) { + stack.stackTagCompound = new NBTTagCompound(); + new BlockCoord().writeToNBT(stack.stackTagCompound); + } + + @Override + public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) { + if(!world.isRemote) { + BlockCoord bc = new BlockCoord(player); + setCoords(stack, bc); + onCoordsChanged(player, bc); + } + player.swingItem(); + return super.onItemRightClick(stack, world, player); + } + + @Override + public boolean onItemUseFirst(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float hitX, float hitY, float hitZ) { + TileEntity te = world.getTileEntity(x, y, z); + if(te instanceof ITelePad) { + ITelePad tp = (ITelePad) te; + if(tp.canBlockBeAccessed(player)) { + BlockCoord bc = getCoords(stack); + BlockCoord cur = new BlockCoord(tp.getX(), tp.getY(), tp.getZ()); + if(!bc.equals(cur)) { + tp.setCoords(getCoords(stack)); + player.addChatMessage(new ChatComponentText("Set Coords: " + bc.chatString())); + } + } else { + BlockTravelAnchor.sendPrivateChatMessage(player, tp.getPlacedBy()); + } + } else { + BlockCoord bc = new BlockCoord(x, y, z); + if(!player.isSneaking()) { + ForgeDirection dir = ForgeDirection.VALID_DIRECTIONS[side]; + bc = bc.getLocation(dir); + } + setCoords(stack, bc); + onCoordsChanged(player, bc); + } + return true; + } + + private void onCoordsChanged(EntityPlayer player, BlockCoord bc) { + player.addChatMessage(new ChatComponentText("New Coords: " + bc.chatString())); + } + + public void setCoords(ItemStack stack, BlockCoord bc) { + bc.writeToNBT(stack.stackTagCompound); + } + + public BlockCoord getCoords(ItemStack stack) { + return new BlockCoord().readFromNBT(stack.stackTagCompound); + } + + @Override + public String getUnlocalizedNameForTooltip(ItemStack itemStack) { + return getUnlocalizedName(); + } +} diff --git a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java index 2a8c64b3..19dd0037 100644 --- a/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java +++ b/src/main/java/crazypants/enderio/teleport/telepad/TileTelePad.java @@ -45,9 +45,6 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei updateConnectedState(true); autoUpdate = false; } - if (isMaster() && !worldObj.isRemote) { - System.out.println(inNetwork() + " " + this); - } } public void updateConnectedState(boolean fromBlock) { @@ -235,6 +232,13 @@ public class TileTelePad extends TileTravelAnchor implements IInternalPowerRecei } return null; } + + @Override + public void setCoords(BlockCoord coords) { + if(inNetwork()) { + target = new BlockCoord(coords); + } + } /* ITravelAccessable overrides */ diff --git a/src/main/java/crazypants/util/BlockCoord.java b/src/main/java/crazypants/util/BlockCoord.java index 5d5dd20e..e68e3720 100644 --- a/src/main/java/crazypants/util/BlockCoord.java +++ b/src/main/java/crazypants/util/BlockCoord.java @@ -7,6 +7,7 @@ import net.minecraft.block.Block; import net.minecraft.entity.Entity; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.MathHelper; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; @@ -109,6 +110,15 @@ public final class BlockCoord { return "BlockCoord [x=" + x + ", y=" + y + ", z=" + z + "]"; } + public String chatString() { + return String.format( + "x%s%d%s y%s%d%s z%s%d", + EnumChatFormatting.GREEN, x, EnumChatFormatting.WHITE, + EnumChatFormatting.GREEN, y, EnumChatFormatting.WHITE, + EnumChatFormatting.GREEN, z + ); + } + public boolean equals(int xCoord, int yCoord, int zCoord) { return x == xCoord && y == yCoord && z == zCoord; }