From 7c40cc2f5a7340c6a6469a2fc5c60e03f0ee9e9b Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 13 Sep 2013 22:18:07 -0400 Subject: [PATCH] Added flippers --- common/biomesoplenty/api/Items.java | 3 +- common/biomesoplenty/armor/ArmorFlippers.java | 37 ++++++++++++++++++ .../configuration/BOPConfiguration.java | 4 +- .../biomesoplenty/configuration/BOPItems.java | 4 ++ resources/assets/biomesoplenty/lang/en_US.xml | 1 + .../biomesoplenty/textures/armor/flippers.png | Bin 0 -> 528 bytes .../textures/armor/wadingboots.png | Bin 1185 -> 527 bytes .../biomesoplenty/textures/items/flippers.png | Bin 0 -> 310 bytes 8 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 common/biomesoplenty/armor/ArmorFlippers.java create mode 100644 resources/assets/biomesoplenty/textures/armor/flippers.png create mode 100644 resources/assets/biomesoplenty/textures/items/flippers.png diff --git a/common/biomesoplenty/api/Items.java b/common/biomesoplenty/api/Items.java index e8455b6ef..c121c74cd 100644 --- a/common/biomesoplenty/api/Items.java +++ b/common/biomesoplenty/api/Items.java @@ -48,5 +48,6 @@ public class Items public static Optional soulManipulator = Optional.absent(); public static Optional flowerBand = Optional.absent(); - public static Optional wadingBoots = Optional.absent(); + public static Optional wadingBoots = Optional.absent(); + public static Optional flippers = Optional.absent(); } diff --git a/common/biomesoplenty/armor/ArmorFlippers.java b/common/biomesoplenty/armor/ArmorFlippers.java new file mode 100644 index 000000000..4634375de --- /dev/null +++ b/common/biomesoplenty/armor/ArmorFlippers.java @@ -0,0 +1,37 @@ +package biomesoplenty.armor; + +import net.minecraft.client.renderer.texture.IconRegister; +import net.minecraft.entity.Entity; +import net.minecraft.item.EnumArmorMaterial; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import biomesoplenty.BiomesOPlenty; +import biomesoplenty.api.Items; + +public class ArmorFlippers extends ItemArmor +{ + public int textureID = 0; + + public ArmorFlippers(int par1, EnumArmorMaterial par2EnumArmorMaterial, int par3, int par4) + { + super(par1, par2EnumArmorMaterial, par3, par4); + textureID = par4; + setMaxDamage(0); + setCreativeTab(BiomesOPlenty.tabBiomesOPlenty); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) + { + if (stack.itemID == Items.flippers.get().itemID) + return "biomesoplenty:textures/armor/flippers.png"; + + return null; + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + if (textureID == 3) { itemIcon = iconRegister.registerIcon("biomesoplenty:flippers"); } + } +} diff --git a/common/biomesoplenty/configuration/BOPConfiguration.java b/common/biomesoplenty/configuration/BOPConfiguration.java index 86c881e21..2a593ff84 100644 --- a/common/biomesoplenty/configuration/BOPConfiguration.java +++ b/common/biomesoplenty/configuration/BOPConfiguration.java @@ -675,7 +675,8 @@ public class BOPConfiguration public static int flowerBandID; public static int wadingBootsID; - + public static int flippersID; + //Liquid IDs public static int springWaterStillID; public static int liquidPoisonStillID; @@ -973,6 +974,7 @@ public class BOPConfiguration scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt(); wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt(); + flippersID = config.getItem("Flippers ID", 21089).getInt(); //Liquid Ids springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt(); diff --git a/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java index 81a17686f..fc90f6f74 100644 --- a/common/biomesoplenty/configuration/BOPItems.java +++ b/common/biomesoplenty/configuration/BOPItems.java @@ -11,6 +11,7 @@ import net.minecraftforge.common.MinecraftForge; import biomesoplenty.BiomesOPlenty; import biomesoplenty.api.Items; import biomesoplenty.armor.ArmorAmethyst; +import biomesoplenty.armor.ArmorFlippers; import biomesoplenty.armor.ArmorFlowerBand; import biomesoplenty.armor.ArmorMuddy; import biomesoplenty.armor.ArmorWadingBoots; @@ -47,6 +48,7 @@ public class BOPItems { public static EnumToolMaterial EnumToolMaterialAmethyst; public static EnumArmorMaterial EnumArmorMaterialFlowerBand; public static EnumArmorMaterial EnumArmorMaterialWadingBoots; + public static EnumArmorMaterial EnumArmorMaterialFlippers; public static int clearItem(Item var1) { @@ -90,6 +92,7 @@ public class BOPItems { EnumToolMaterialAmethyst = EnumHelper.addToolMaterial("AMETHYST", 4, 2013, 15.0F, 5, 16); EnumArmorMaterialFlowerBand = EnumHelper.addArmorMaterial("FLOWERBAND", -1, new int[]{0, 0, 0, 0}, 0); EnumArmorMaterialWadingBoots = EnumHelper.addArmorMaterial("WADINGBOOTS", -1, new int[]{0, 0, 0, 0}, 0); + EnumArmorMaterialFlippers = EnumHelper.addArmorMaterial("FLIPPERS", -1, new int[]{0, 0, 0, 0}, 0); initializeItems(); @@ -145,5 +148,6 @@ public class BOPItems { Items.flowerBand = Optional.of((new ArmorFlowerBand(BOPConfiguration.IDs.flowerBandID, EnumArmorMaterialFlowerBand, BiomesOPlenty.proxy.addArmor("flowerBand"), 0)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flowerBand")); Items.wadingBoots = Optional.of((new ArmorWadingBoots(BOPConfiguration.IDs.wadingBootsID, EnumArmorMaterialWadingBoots, BiomesOPlenty.proxy.addArmor("wadingBoots"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.wadingBoots")); + Items.flippers = Optional.of((new ArmorFlippers(BOPConfiguration.IDs.flippersID, EnumArmorMaterialFlippers, BiomesOPlenty.proxy.addArmor("flippers"), 3)).setCreativeTab(BiomesOPlenty.tabBiomesOPlenty).setUnlocalizedName("bop.flippers")); } } diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 7ac0ac757..bb1602e02 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -356,6 +356,7 @@ Exotic Flower Band Wading Boots + Flippers Amethyst Bucket diff --git a/resources/assets/biomesoplenty/textures/armor/flippers.png b/resources/assets/biomesoplenty/textures/armor/flippers.png new file mode 100644 index 0000000000000000000000000000000000000000..9b349aa2fa1a714472160737e0c6f73131f91305 GIT binary patch literal 528 zcmeAS@N?(olHy`uVBq!ia0vp^4nVBH!3HE3&8=$zQY`6?zK#qG8~eHcB(eheoCO|{ z#S9F5dqJ4d{r7~mKtZVz*NBqf{Irtt#G+J&fW*wa5hJyShHL-)^4<_rvs zJ)SO(AsNn3r{DED>>%LwIi|_WVXcUBc0H4q>&B3*>?2iyu7a$hAt52Z_GO>D@I{H| ziBkAs9+^$QRcj13Z$7EUrMSaQ)OKOlyZ~4K6^qnEE())D!5R9cMXSmQUAXhs!kJNv zjK2BJKm6{Z^9`#R+}@Rw; z+@2qbXI$lEyw&CH1s~l&Ym;E_D|~0K2yJzS3JIF_%RjZgFLCGeR*BCiZ@)=X^jrUw z;fUmd%1>Knt>3QZbn}9gpy$$?P75UF{E$#TeErXDd+zL$9?#ZZoPEY~UghsMv3FTU-w?&}Qyd&gd8Y3K!6G8D4SuzAv5S++;VL^w)$;fm(_oeF73 zgykQSW67EG5$}@yfcl@Lr~eb> z?zzCZhdHB=>zPE4<(+LpEwhT9E~p14Zzu8eP!P;r=;(^_Ty hfhV>hub#W*3IB`FD-QH1-cn`&0#8>zmvv4FO#snM%H;q6 delta 1104 zcmV-W1h4y#1fdC#JPN-601m$aI0aKAkwz$g1RY64K~!i%?U;FM6hRQh_j8FF7ITs8 zn%!I)H6|#6h>D76P(;N84Js;r-?n~l>J1YN$zQX(nOIOv-(AP+s_yBXMxz(=W%bcq zS%1A$hR^zCe6Ucq-ma9<%lSfI4(l$V?43W`HSho0EPFpT%Kpzy86$^vmyQ_V_m&uc z1MGYn3I#c=yJQ34@!O#|%HRC5R&ISAmF4>vyKjKC=T~aQ_r9-}-NTW*zx!=`K4JjM z`s{-Oag=F0KS40hJqUn71Z_JXhut>-kseQrBj|DNhfn*e58|7{&MvJyo-3Slm^{Dn zW?AVCWl8mxOopt$oznL%~iq&Z@ z7^pklp``n1C-4#dZ+yP0U}(ka`8m%q0s}SEDD#=;U?M6?oV1Km?FDkLr{)y_l~ z0Ug`#BC^NV$K|*Sj@x~!#EYC`WrwKeu$malnvBQzT00cxt4xxyK!5sr(G0~h^Vxe?s+jWlkQUc;%AGEA9qt~1W_Vb8CB`(td1&>kU# z?)hl|gth?uO}4-&EU$)F^lpecUTThK4Lzu`&RjgKzL<0E{i^0uuhy&3<9@H-tf!dm z5keq1O0l6828!JODf0%Pj)Cx^A5N4lupVO3riWDC8j19Hm@<2?ese#=-1B&)dOeu= zDQ0_ALsZY_g&Kkg1mg*R1m=rzEU=FRN@yHof>9O&FkZ(Y=ZIr3jNq74#gNJVGGS2 z0L#11-yWFpZ6YAWY>!Y%3Ixj-d4`DAKx*OM1=aNfBkJ;C)aAi{fZCZy07@Y&0#@i0fiD9Ps8BRu2ufhTHM2Uk$7(u|LTy+!-Pywn=?dVc|H Wb!#dlSP3-%0000!lvI6;>1s;*b z3=DkBL6|Xgws$vBkiEpy*OmP?8#AY<_@sQ7IG~VJiEBhjaDG}zd16s2LqK9?UWuNc zYluRbv7V`(p`rU{Cv%{x`JOJ0Ar}5yCv4V+v@6lm}!Zh_i=$U6RkFHSo(PL z|Js@B7ax4MBzVpA&%sl+?E7Xibw9_t(~EChTpZyolJMisy{ARHf3qI7@oGpEad{@m zD)Vd(_xY}yd(^oMQZzfxJhNS1&sZlmZ|ZIZquJjz7^PU1H&^nr7ItX0)p=-T_}4v( zIC^0{(;f%Qpq||669O;rnaXIic^o`HQ+P=UL-OlmTZ2@k8 Ba4Y}- literal 0 HcmV?d00001