From 2e74bbd5e68a6c76147cee5f8c767f62581d2f68 Mon Sep 17 00:00:00 2001 From: tterrag1098 Date: Fri, 13 Feb 2015 23:21:41 -0500 Subject: [PATCH] Add new coord selector textures and rename to fit more appropriately --- resources/assets/enderio/lang/en_US.lang | 18 +++++------ .../textures/items/itemCoordSelector.png | Bin 0 -> 1525 bytes .../textures/items/itemCoordSelector_alt1.png | Bin 0 -> 1561 bytes .../textures/items/itemCoordSelector_alt2.png | Bin 0 -> 1620 bytes .../enderio/textures/items/itemCoordsCard.png | Bin 512 -> 0 bytes src/main/java/crazypants/enderio/EnderIO.java | 6 ++-- .../java/crazypants/enderio/ModObject.java | 2 +- ...CoordsCard.java => ItemCoordSelector.java} | 29 +++++++++--------- 8 files changed, 28 insertions(+), 27 deletions(-) create mode 100644 resources/assets/enderio/textures/items/itemCoordSelector.png create mode 100644 resources/assets/enderio/textures/items/itemCoordSelector_alt1.png create mode 100644 resources/assets/enderio/textures/items/itemCoordSelector_alt2.png delete mode 100644 resources/assets/enderio/textures/items/itemCoordsCard.png rename src/main/java/crazypants/enderio/teleport/telepad/{ItemCoordsCard.java => ItemCoordSelector.java} (90%) 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 0000000000000000000000000000000000000000..a8a67a78059707e918e872c45c2a82e46a5bf463 GIT binary patch literal 1525 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|?WrGbT$lbMsTo2#LrtBIwli-nt^tBa$n ziJ7aRkrPa>OMY@`Zfaf$Om7N8uQ^V=pp=kX0JPa9wJ5VJHN~wcKUV?lW2;QuZZW}W z9#n4%Znv1?)TVL91WY_2COp*wIq-C!ng>kmMZi>D7H*l%z`&H{>Eakt zaqCHVe78`bi2dUpV`b9?8maXOr&U`H#J))6{>uD=ciJ1(4~}AnEpgvYn#Z@q32jy= zh`%;{Q+w*d^#YvTEh!4RVQW0p)RY$US-qW;*|w9J`|Yw9yV&{mTb94uTYSF1`X7(# zX`?g2ItJ-8e=#~OoY1yuk$8V&aXG`QErA04#|sZ;m^f7%%~UYraZcEM*G+__QQ~~s z<||1?0(|XfLjqcz9LhrRGf6 zze_Jml)hEj9ufboAIioeS5|iaV4fcP((|eb7Hq$g>YoZHuzVU&hRk05GED6Q@SfkN9@W<*T&}uwPfmkbe)$u%~*butMP`_ zl<%htl5?N>lskwAizsZ;S?#wiU_;S+u|FF1?rQUFYI)Ajf6K7{I~!kIz2o}V^85#j z>qYm;Uin&+@TE>Iu;A&r(1QDWE&uvRbh;EIDF`^+ep|MBOR-F2SG$R?^Zxtp(IT!# zyp}qpoG7uf-ECta*PkBFE!4@PH$lboZbQ)ezGoXxKXsDfYjg zj=tDo>{MbQ<05+1YJS>g&oA7kFAL97o$94%CdGT_#Otp@wav#`KCSgp+uXu4LshEx p)Uj2WYc`2DHx_?S|Ki@j$Z$dDi$2Hs6-l6i*wfX|Wt~$(69B)3HL?Hz literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..29da084125c042d34bb6b2f28ad1f10c70664659 GIT binary patch literal 1561 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%!-*I5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij|3zle2+=xrLLln~R~LtBIqVp{c96tErKT zi=`z{6sFfDKe;qFHLnDwHwB^B5~p5JO2{n$+U$~Alv$RV;#QQOs{r<~RVHq?nBg=J zsy79$15=-;i(^Q| ztvA#BJA?{Fj^DR` z?@evz_;kfG%7gP_^A<0~N2?~b7qT6nxw7)Gj`hUb%Z@$U#4jgbU+;GB{qNs@@BJ3+ zT6AEGSf|UE{?4S07FX+MJm`3<(lD8!qdCt}YwDqc7c*LNBd1Liag{t_z%%K2<&z2< zv!3TgmPs2$Jk%!NkmPIU)lQGRcHx@k$z6B#HifPB4S94zbV1#9OBuecFMOhE{LSWP zRqtJ*=`ep0?`PFOqX3aD#=^Tde{)~@&!2Ton0AqYghbf6TM-o-zjAH+RC!}v9`n(F z10Q832yt>LH{Wz>GLSg<{n~*7?k~|LFBtfe|IKDxFg@detDJ~mWByt_7y0{b)1~tn zqm0#*Op~taigE9nX}Wl_3FrBF`3LrXEwxae-f;mx0B8&#}}n`0}wx_Y^l z@8uUQoecMR?Q3-F9aZJ*su;?zzdL-Y_4S9s&3tODecuW3&SG_-Z@r_tHrZkCxPkUWhk)TXuT_|Ccir0e9`?Djl}FC@p*we&At&!seSg f8wl3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8K--E^(yW49+@N*=dA3R!B_#z``ugSN z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0;1ij}jGnUkBNxucV@n~R~LtBIqFnW?LrxuLVO zfwPl^i7`yCOMY@`Zfaf$Om7N8uMVL91WY_2COp*wIq-C!ng>kmMZi=o>dO9tfr06yr;B4q z#jQ7C=d*$jK=wE)~$PVes7h@uZa8EyVo_8 zxET3_h+aM571=*C;)~|T0|yv3-py0j6XBYzwWD67z(R)2|L3W-e%kZ;_a2F`>09X^ zY;ZbF#M`xF6^HM-LrKDcdLbW-gKvCcw`r4-lIpnp^2;;6oTD~%`YO9yCIvNxU72t` zrSR=T(LEje*o=1Txaho>%rTQbn6y>E#q-GI^uRlOtq<0jDO+#nPz`s}+uCtWPv35z z*TPj90=h~IWAub~Y_vMKVbdlj4YBSP-Qx}0*YkdUzyIZJrIQn6#bWs4Ti#5WFvllJ z&9FIGJgO|dE3!2?VQP<~0cXbBj}MOf%$l;}{{y|eJ5o;9XXg3zpF6mubHA-n#?_Vl zpFe!t7C8H@rL*09^#a$qe(H^>tmk`VQx6v2=bU3xFEwx9=IUyRttHzZ{VvJcTmLSL zePzMQ#q!6+`X9ZXt^eUm)wTJX%WulaG57ZNvdA%edwaL!9%nF)Um&}A^2u2r&*!H< ze4YQ_ytKhx@B6#B=dufmA77cA|7uRXIe&dI|DWsC3s$YN)8A33^=Z%Z`=?Wk+6uSd z-uu~VLtI;E>HBxghYue%S)kGNuSr2-N@iA;(z&NaM|3vLOx+xrH2t*eo;`bVcE}g7 oKKl5>ZZE%#)rb35AG{kF8Gc8ZK1=1RNC%bkp00i_>zopr09DIpj{pDw literal 0 HcmV?d00001 diff --git a/resources/assets/enderio/textures/items/itemCoordsCard.png b/resources/assets/enderio/textures/items/itemCoordsCard.png deleted file mode 100644 index 82c936717ac1b055a676403bfba34388cdc2f0ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 512 zcmV+b0{{JqP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0hLKaK~z{r?bORk zLQxb3;GV`e5E19SLZrviKpHe^5Dh{}#M07K6!UU2Me>p2$`5dsyNG2&ZJ= z#Yi*)$y5?D*$kW(@^Drx4B$EM@q3)Zx!l7NFTi)Z1(JCQviTg8E9Y>j)Zyy7F@Wce zT_@P=+YpoEz`5cE@Wn##@%0IbWCE(SDku#FZXfQT`Pc-1FaX|w4|uOwE&=CoF88p+ z4WKs}fdNXDGVFNV;P&ll=e}?}0*lKM>>YSu`T{(?y+He?4eb9*`~a??7oOi= zL2K25>2Mx&ejN<=qt4lL4ufzHOWXjO4GpyJZJ^px!Eit7oIU4ouDAiLPCKlwuYqCH z0IskZ)Mhmd_oL3)TkIC#T<&3s6JSy`3ozjT-R>{fE)6_sj9pm(0000)yuz 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()))); } }