From 838de266502f4a338b71e485731210ae4126ba9a Mon Sep 17 00:00:00 2001 From: Ellpeck Date: Mon, 13 Jul 2015 00:30:24 +0200 Subject: [PATCH] Added Paxel Localization & Textures --- .../items/tools/ItemAllToolAA.java | 5 +-- .../assets/actuallyadditions/lang/en_US.lang | 34 +++++++++++++----- .../textures/items/paxelMTBronze.png | Bin 0 -> 496 bytes .../textures/items/paxelMTGlowstone.png | Bin 0 -> 492 bytes .../textures/items/paxelMTLapisLazuli.png | Bin 0 -> 501 bytes .../textures/items/paxelMTObsidian.png | Bin 0 -> 456 bytes .../textures/items/paxelMTOsmium.png | Bin 0 -> 497 bytes .../textures/items/paxelMTSteel.png | Bin 0 -> 503 bytes .../textures/items/paxelTFBronze.png | Bin 0 -> 496 bytes .../textures/items/paxelTFCopper.png | Bin 0 -> 495 bytes .../textures/items/paxelTFElectrum.png | Bin 0 -> 495 bytes .../textures/items/paxelTFInvar.png | Bin 0 -> 500 bytes .../textures/items/paxelTFLead.png | Bin 0 -> 501 bytes .../textures/items/paxelTFNickel.png | Bin 0 -> 496 bytes .../textures/items/paxelTFPlatinum.png | Bin 0 -> 507 bytes .../textures/items/paxelTFSilver.png | Bin 0 -> 479 bytes .../textures/items/paxelTFTin.png | Bin 0 -> 503 bytes 17 files changed, 29 insertions(+), 10 deletions(-) create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTGlowstone.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTLapisLazuli.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTObsidian.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTOsmium.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelMTSteel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFInvar.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFPlatinum.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFSilver.png create mode 100644 src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png diff --git a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java index c12b3a532..aa9a46ca0 100644 --- a/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java +++ b/src/main/java/ellpeck/actuallyadditions/items/tools/ItemAllToolAA.java @@ -46,7 +46,7 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{ private String repairItem; public ItemAllToolAA(ToolMaterial toolMat, String repairItem, String unlocalizedName, EnumRarity rarity){ - super(5.0F, toolMat, allSet); + super(4.0F, toolMat, allSet); this.repairItem = repairItem; this.name = unlocalizedName; @@ -70,7 +70,8 @@ public class ItemAllToolAA extends ItemTool implements INameableItem{ @SideOnly(Side.CLIENT) public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean isHeld) { if(KeyUtil.isShiftPressed()){ - list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc")); + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc.1")); + list.add(StatCollector.translateToLocal("tooltip."+ModUtil.MOD_ID_LOWER+".paxel.desc.2")); list.add(StatCollector.translateToLocal("tooltip." + ModUtil.MOD_ID_LOWER + ".durability.desc") + ": " + (this.getMaxDamage()-this.getDamage(stack)) + "/" + this.getMaxDamage()); } else list.add(ItemUtil.shiftForInfo()); diff --git a/src/main/resources/assets/actuallyadditions/lang/en_US.lang b/src/main/resources/assets/actuallyadditions/lang/en_US.lang index 6a37326bf..dcc8be7c7 100644 --- a/src/main/resources/assets/actuallyadditions/lang/en_US.lang +++ b/src/main/resources/assets/actuallyadditions/lang/en_US.lang @@ -123,14 +123,32 @@ tooltip.actuallyadditions.blockMiscLavaFactoryCase.desc=Helps the Lava Factory C tile.actuallyadditions.blockFluidPlacer.name=Fluid Placer tooltip.actuallyadditions.blockFluidPlacer.desc=Places Fluids stored inside it -tooltip.actuallyadditions.paxel.desc=It's an Axe, Shovel, Sword, Hoe and Pickaxe! Combined! -item.actuallyadditions.woodenPaxel.name=Wooden Paxelordoe -item.actuallyadditions.stonePaxel.name=Stone Paxelordoe -item.actuallyadditions.ironPaxel.name=Iron Paxelordoe -item.actuallyadditions.goldPaxel.name=Golden Paxelordoe -item.actuallyadditions.diamondPaxel.name=Diamond Paxelordoe -item.actuallyadditions.emeraldPaxel.name=Emerald Paxelordoe -item.actuallyadditions.obsidianPaxel.name=Obsidian Paxelordoe +tooltip.actuallyadditions.paxel.desc.1=It's an All-In-One-Tool! +tooltip.actuallyadditions.paxel.desc.2=Pickaxe, Axe, Shovel, Sword AND Hoe! In One Tool! +item.actuallyadditions.woodenPaxel.name=Wooden AIOT +item.actuallyadditions.stonePaxel.name=Stone AIOT +item.actuallyadditions.ironPaxel.name=Iron AIOT +item.actuallyadditions.goldPaxel.name=Golden AIOT +item.actuallyadditions.diamondPaxel.name=Diamond AIOT +item.actuallyadditions.emeraldPaxel.name=Emerald AIOT +item.actuallyadditions.obsidianPaxel.name=Obsidian AIOT + +item.actuallyadditions.paxelTFCopper.name=TF Copper AIOT +item.actuallyadditions.paxelTFTin.name=TF Tin AIOT +item.actuallyadditions.paxelTFLead.name=TF Lead AIOT +item.actuallyadditions.paxelTFSilver.name=TF Silver AIOT +item.actuallyadditions.paxelTFElectrum.name=TF Electrum AIOT +item.actuallyadditions.paxelTFNickel.name=TF Ferrous AIOT +item.actuallyadditions.paxelTFBronze.name=TF Bronze AIOT +item.actuallyadditions.paxelTFPlatinum.name=TF Shiny AIOT +item.actuallyadditions.paxelTFInvar.name=TF Invar AIOT + +item.actuallyadditions.paxelMTObsidian.name=MT Obsidian AIOT +item.actuallyadditions.paxelMTGlowstone.name=MT Glowstone AIOT +item.actuallyadditions.paxelMTLapisLazuli.name=MT Lapis Lazuli AIOT +item.actuallyadditions.paxelMTOsmium.name=MT Osmium AIOT +item.actuallyadditions.paxelMTBronze.name=MT Bronze AIOT +item.actuallyadditions.paxelMTSteel.name=MT Steel AIOT tile.actuallyadditions.blockFluidCollector.name=Fluid Collector tooltip.actuallyadditions.blockFluidCollector.desc=Stores Fluids in front of it inside it diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelMTBronze.png new file mode 100644 index 0000000000000000000000000000000000000000..26e5bb41b6e06a87be1897b155bfbb2ccc28342a GIT binary patch literal 496 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFBronze.png new file mode 100644 index 0000000000000000000000000000000000000000..5443785130717da2a61d53fb7efaa4fe2259ebb4 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)X5oEak-aeD5gz21idM2?>Kj{d!7N!G$83s!cs9N%Hl zt?_8lg9ne4c36Dt7ho?eULUX`_Ri5q545aO1hizmGT*j$g-We`8NP1v(pe_Q=6&4v zyZZT^-*Sfqfl;$!7zeliuv+mk1|Wz9LD$dQX`_vXJBm@$X7fOoyD#Qk`u zzgv4^Rx&cIxN6OCiiN>0@ z;90w^^NQ=z=^P9*WvF)I#blP+Ila}kH;NkPUK2YMQfa(lw_&TF_=7q|_Kz}M z{cOw(5A`e5jJOUP6wWx&{Cn-&CgD96@`t8=Yx;fY_<<#H>dz;CZkI2pIKaVjT4e|PYJ0gTe~DWM4fJB!I( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFCopper.png new file mode 100644 index 0000000000000000000000000000000000000000..a17df28de6df4d8b87118d946ab2d464b9cc089a GIT binary patch literal 495 zcmVWFU8GbZ8()Nlj2>E@cM*00C1;L_t(I%bk)zC`UNb1Swy^kI(TJy#pcyoa_`wXfXf)002ovPDHLkV1oQ{(0%{_ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFElectrum.png new file mode 100644 index 0000000000000000000000000000000000000000..f8fd4936de5a16561840ef84792d57a7523de982 GIT binary patch literal 495 zcmVWFU8GbZ8()Nlj2>E@cM*00C1;L_t(I%bk)zC`UNb1Swy^kI(TJy#pcyoa_`wXfXf)002ovPDHLkV1mpoqPQgC)skL4mO!=2?Xf9+iz}vmzbpUz zPIV@M2+)Nms5Z?>N}KOTPSk>YmhW*~wjb=ZdYrUZZxwn%((vi*T1>;!tJxC8ReMF1qHsRtDnm{r-UW|4%*7! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFLead.png new file mode 100644 index 0000000000000000000000000000000000000000..c12a7b28f9c6079c40da1f7dba12aee6fc76c085 GIT binary patch literal 501 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7(6m%K~wSD=t=W=KSdbAE1aYF-JD%fR4Vl$uzQ znxasiS(2gP?&%wlqL<3fz`z*k>Eak-aeD5g{oYK8636$yuhbG1l_*b%y>*h;mtEJF zmsQu)WDD!1JO7njyn|g___7>x^*EhOxE@{TKRqGj*FsrV(K4^^CaTxwUVmC%bMN`* zy8Y)r@8hxcm>BA`J}71CC(GVRztxwV(E6As+qIM_IAv9~_G=hKhKz9m>#s2RzTjyinirPAF{^u;`ec30ReZ50xf4T1|Ys>e`R@*;tNRW`5 zSM2xTiH)IVQo)M*mCwFD74U6k(^;>`CA9RBq!4Roj_{6|mWz5KyB8@;)bNO%TmSu* n*k{Y$9RApj(x&_KAKU+8(lMPir!-qc5ES~Ju6{1-oD!M<9xuVn literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFNickel.png new file mode 100644 index 0000000000000000000000000000000000000000..9272ffbe431d77b480d5cf3c8ff208d1221a6d79 GIT binary patch literal 496 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)X%Eu*-b^wKBGeaUuobz*YQ}arITm}Z`qSVBa z)D(sC%#sWRcTeAd6une-1_s6uPZ!4!i_>!_?e#t!AaeA)cl7TyOR^R&S+KI3<@gSZ zZjDEa9z1xYw8P?CzW{q-@%n%jv3HI>dZ1;MBA_MfmHD>4D^zOj%kXuRm(DUdHt*xU z-__6W{FXZ`5F|R$U`>eY5+5r!^OLDS-kvGPp1-$EJCGN*N z{oUFVvyzcv#Z_yDQ!EU=ds*aqlB}n-OuH)iy4}CO{6cR1qLtzk^+P^}WFJ&HkTLTE z2hZAVomX6!PUm2lG5cxGT9*UvEGDzm&greTy;0OS_nO$DkV@kXyA50Y#2?f#vVWB6 z>StqSc&J~YX2f;apm4^C=HF}IHVN;skUuo_Ths4D#}6!tQ-41BbGv*&#Ub|o19OBe zEdAY^B*bga8NXlao~dV*R>>RrsAP7OYUHDo*$2*^X`GOxdrC+>@)7gg`tP^Ij9*IJ jl-ninnti|h@%k^UheBouxxUz+1qygiS3j3^P6)xxOIhkxRI?c8@?}jODoYkF*mIOe(6`sasQHr3n|E7XpH+6<|M>S_ z`}^;EkM}QR_w4d|5jts6(AssuZ_IorEfTuF);X-(*fa3uqc0NIPui$8FJ@r4$JHa} z`r*Tmrj&IoN=_?3brv@;D186Zw!q(^qK-3C_uP&6h}~9)-F@Akt?Zfoo2hGQ`HW?q zS$i4P&p-6eR}j1V-}lNCh1ExA8tu;5IcMiqUki)2{KGj-j18qxw~B6fYt}Mpzm7KG zVa}T_+`jvEh3*nbhJv{d4tU7NOtp6TR`#IGGP=sbx+3vdbHt*akbSqzH1nU=6a?io z)!tM5z<18Bac;4O0nhn_{eRC$udd_z$sV;%vBM}<%}AxgC{pc3+OwA*H(pz$a7v}4 vDEj&Tz0;0H#j2k^u6Km7A%5PgpXL7;+&O2T7uYLdk03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00BcuL_t(I%bk<4OF~f? z#eetm-VnJcgb7cZg4UMi1_^>|{sDJ&=uhzAP52gyiLM- zz0P<%W;7ZhBFyJ=00Edzr{wc_YPA|+7%KHw+-x?9qKL_4!f-fbHk%ZLi~J$%H(*=!cAb$Ws{=R%=CCX-2@`SzwH zXQji$HjFXS@At(RBO4R!GIOz5OmJ%bW1wHR7G{i*_4;C@b1o5WS7?B0wYv9pegiw; Vp^i0@5qtmu002ovPDHLkV1n$<$u9r^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png b/src/main/resources/assets/actuallyadditions/textures/items/paxelTFTin.png new file mode 100644 index 0000000000000000000000000000000000000000..07e82efe6dcba40c209eb8de26a2119e4e2e2a97 GIT binary patch literal 503 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~JC7)nbm^D1>_8#e%#er@=ltB<)VvZPmw~~#C^fMp zHASI3vm`^o-P1Q9MK2YokTKfR#WBR<^xVm|-iHGuTF?6itq7HAN)o-is9Q)WDWI^Y zTcDjw@7&!l?i_th`yIO<1PI8)FewSmaam&Fk@+_-*HKqgr0egl+Pgm z^8L;jHvS;q$qzzTB?iqc-sNFCF>8iO>FWtwbeBn~&6Pb`SUSB`ii?RsMg2oTz4*%- z#+P@bJ2+a`3ju?`W`BKxjYUK2(@>S%?v48k9zBs*TExn~-c{w@<`d%f2c=uyXYty3 zy6g-(npyMSJTSOvNv>h7=A(#nkD^2t9SC^5hm(!r+Den+x(P;&k!xJc4@k4@_jk&v z7S=Zh$~dW8$h>iU{85J8I{L%!C~NUM3CV74wXrT*(OI)Yii-OpcdAvmyldC!ddGQZ zj=EdB!gtm?<#GKj8Aexbf0F82cKK;;n~1OaahAJpY((YqWVL4bbuHUo`mg?aVZ`$} lGW@$IFfb%vE}mEaoIfF9&ddgj7Yd;8_jL7hS?83{1OOB0yz~G7 literal 0 HcmV?d00001