From 98ca75c400b822b9e144b2cf122bac4bf64bc864 Mon Sep 17 00:00:00 2001 From: Matt Caughey Date: Fri, 13 Sep 2013 19:28:11 -0400 Subject: [PATCH] Added wading boots --- common/biomesoplenty/api/Items.java | 1 + .../biomesoplenty/armor/ArmorWadingBoots.java | 37 +++++++++++++++++ common/biomesoplenty/blocks/BlockMud.java | 38 ++++++++++++++++-- .../configuration/BOPConfiguration.java | 3 ++ .../biomesoplenty/configuration/BOPItems.java | 4 ++ resources/assets/biomesoplenty/lang/en_US.xml | 2 + .../textures/armor/wadingboots.png | Bin 0 -> 1185 bytes .../textures/blocks/burningblossom.png | Bin 0 -> 655 bytes .../textures/items/wadingboots.png | Bin 0 -> 239 bytes 9 files changed, 82 insertions(+), 3 deletions(-) create mode 100644 common/biomesoplenty/armor/ArmorWadingBoots.java create mode 100644 resources/assets/biomesoplenty/textures/armor/wadingboots.png create mode 100644 resources/assets/biomesoplenty/textures/blocks/burningblossom.png create mode 100644 resources/assets/biomesoplenty/textures/items/wadingboots.png diff --git a/common/biomesoplenty/api/Items.java b/common/biomesoplenty/api/Items.java index c07dc97d9..e8455b6ef 100644 --- a/common/biomesoplenty/api/Items.java +++ b/common/biomesoplenty/api/Items.java @@ -48,4 +48,5 @@ public class Items public static Optional soulManipulator = Optional.absent(); public static Optional flowerBand = Optional.absent(); + public static Optional wadingBoots = Optional.absent(); } diff --git a/common/biomesoplenty/armor/ArmorWadingBoots.java b/common/biomesoplenty/armor/ArmorWadingBoots.java new file mode 100644 index 000000000..db96ac43a --- /dev/null +++ b/common/biomesoplenty/armor/ArmorWadingBoots.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 ArmorWadingBoots extends ItemArmor +{ + public int textureID = 0; + + public ArmorWadingBoots(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.wadingBoots.get().itemID) + return "biomesoplenty:textures/armor/wadingboots.png"; + + return null; + } + + @Override + public void registerIcons(IconRegister iconRegister) + { + if (textureID == 3) { itemIcon = iconRegister.registerIcon("biomesoplenty:wadingboots"); } + } +} diff --git a/common/biomesoplenty/blocks/BlockMud.java b/common/biomesoplenty/blocks/BlockMud.java index 019b6bc82..f9f1213f6 100644 --- a/common/biomesoplenty/blocks/BlockMud.java +++ b/common/biomesoplenty/blocks/BlockMud.java @@ -8,7 +8,13 @@ import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IconRegister; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.Icon; import net.minecraft.world.IBlockAccess; @@ -82,9 +88,35 @@ public class BlockMud extends Block { if (world.getBlockMetadata(x, y, z) == 0) { - entity.motionX *= 0.1D; - entity.motionZ *= 0.1D; - } else { + if (!world.isRemote) + { + if (entity instanceof EntityLivingBase) + { + if (entity instanceof EntityPlayer) + { + InventoryPlayer inventory = ((EntityPlayer)entity).inventory; + + if (inventory.armorInventory[0] != null && inventory.armorInventory[0].itemID != Items.wadingBoots.get().itemID) + { + entity.motionX *= 0.1D; + entity.motionZ *= 0.1D; + } + } + else + { + entity.motionX *= 0.1D; + entity.motionZ *= 0.1D; + } + } + else + { + entity.motionX *= 0.1D; + entity.motionZ *= 0.1D; + } + } + } + else + { entity.setInWeb(); } } diff --git a/common/biomesoplenty/configuration/BOPConfiguration.java b/common/biomesoplenty/configuration/BOPConfiguration.java index 4637cdd8c..86c881e21 100644 --- a/common/biomesoplenty/configuration/BOPConfiguration.java +++ b/common/biomesoplenty/configuration/BOPConfiguration.java @@ -674,6 +674,7 @@ public class BOPConfiguration public static int scytheAmethystID; public static int flowerBandID; + public static int wadingBootsID; //Liquid IDs public static int springWaterStillID; @@ -971,6 +972,8 @@ public class BOPConfiguration scytheMudID = config.getItem("Mud Scythe ID", 21086).getInt(); scytheAmethystID = config.getItem("Amethyst Scythe ID", 21087).getInt(); + wadingBootsID = config.getItem("Wading Boots ID", 21088).getInt(); + //Liquid Ids springWaterStillID = config.get("Liquid IDs", "Spring Water Still ID (ID before this must be free!)", 1971, null).getInt(); liquidPoisonStillID = config.get("Liquid IDs", "Liquid Poison Still ID (ID before this must be free!)", 1973, null).getInt(); diff --git a/common/biomesoplenty/configuration/BOPItems.java b/common/biomesoplenty/configuration/BOPItems.java index e19e781d5..81a17686f 100644 --- a/common/biomesoplenty/configuration/BOPItems.java +++ b/common/biomesoplenty/configuration/BOPItems.java @@ -13,6 +13,7 @@ import biomesoplenty.api.Items; import biomesoplenty.armor.ArmorAmethyst; import biomesoplenty.armor.ArmorFlowerBand; import biomesoplenty.armor.ArmorMuddy; +import biomesoplenty.armor.ArmorWadingBoots; import biomesoplenty.items.ItemBOP; import biomesoplenty.items.ItemBOPAncientStaff; import biomesoplenty.items.ItemBOPAxe; @@ -45,6 +46,7 @@ public class BOPItems { public static EnumArmorMaterial EnumArmorMaterialAmethyst; public static EnumToolMaterial EnumToolMaterialAmethyst; public static EnumArmorMaterial EnumArmorMaterialFlowerBand; + public static EnumArmorMaterial EnumArmorMaterialWadingBoots; public static int clearItem(Item var1) { @@ -87,6 +89,7 @@ public class BOPItems { EnumArmorMaterialAmethyst = EnumHelper.addArmorMaterial("AMETHYST", 40, new int[]{6, 12, 10, 6}, 20); 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); initializeItems(); @@ -141,5 +144,6 @@ public class BOPItems { Items.scytheAmethyst = Optional.of((new ItemBOPScythe(BOPConfiguration.IDs.scytheAmethystID, 2, EnumToolMaterialAmethyst, 6).setUnlocalizedName("bop.scytheAmethyst"))); 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")); } } diff --git a/resources/assets/biomesoplenty/lang/en_US.xml b/resources/assets/biomesoplenty/lang/en_US.xml index 83d08d12c..7ac0ac757 100644 --- a/resources/assets/biomesoplenty/lang/en_US.xml +++ b/resources/assets/biomesoplenty/lang/en_US.xml @@ -355,6 +355,8 @@ Lush Flower Band Exotic Flower Band + Wading Boots + Amethyst Bucket Spring Water Amethyst Bucket diff --git a/resources/assets/biomesoplenty/textures/armor/wadingboots.png b/resources/assets/biomesoplenty/textures/armor/wadingboots.png new file mode 100644 index 0000000000000000000000000000000000000000..923c688f172f96f5725cbfd2b58144f38a82c106 GIT binary patch literal 1185 zcmV;S1YY}zP)N2bPDNB8 zb~7$DE-^7j^FlWO00bRLL_t(&L+zM(YZO5c#rJcG8WwYr?3&$N8Z{;;f{2QWXi!AO z0}U!Fe&4o!Z|V&b49Q=!yO~%}Oy6C{>#FYQokpV<^JVqXTv>m;REE#`Wqhzuw%)Fk z(aZTlUk>Xoq3oSM+coe1+AMoNHp>3bO&KGHb(fA9;P;jo1MGYn3I#c=yJQ34@!O#| z%HRC5R&ISAmF4>vyKjKC=T~aQ_r9-}-NTW*zx!=`K4JjM`s{-Oag=F0KS40hJqUn7 z1Z_JXhut>-kseQrBj|DNhfn*e58|7{&MvJyo-3Slm^{DnW?AVCWlq+ zXvOOJInOZy12xkq^O@)4grQQ5=@DK*xVy;&IY)cEWRLQ7yW#KKAoGa}R-7`*f~eYn z#E(>*K2j;@NHL~ID2Y%6Gz3H`l*9Wd-GnKM0Q0Q&7;89#28@Yfunj;PMsu5tkj7$< zTxxoRl6VPTd3gCmfj|O~&g!v*!a_{O3f3i+!oE)^r3N>R*;%r2K>_gtLtOtb5Nc@8 zVcjQXfbh68M>hYbnJ3_?^PEu5=BW{~_zuEx%I5Y+K{A3FUtpZgQzHU3*$Br>iy;qFgbCYU16L~fG07sQ1HJ}pg7f+{2~D%H+J76BdG?;^6t*T?0!3y#};tHg_( zV`Yb^=dhX>%bJYG_*y#@=BrGSu|VlG*G3N3WsLX9<=P`|d%o&AP*QJRa}kbkU#?)hl|gth?uO}4-&EU$)F^lpec zUTThK4Lzu`&RjgKzL<0E{i^0uuhy&3<9@H-tf!dm5keq1O0l6828!JODf0%Pj)Cx^ zA5N4lupVO3riWDC8j19Hm@<2?ese#=-1B&)dOeu=DQ0_ALsZY_g&Kkg1mg(==8JJG zu#W^vXdGjLQ5FL*UdJKlh+{8|;Fwdzkjf|^g{%)q!XmT-l9kuL0iM_N zH(rOd3lT9ESPS;SMuB-E5OzcroPcDONqL-M3(Xw>%e&6s9+>fMA|ShfUJ<-vg3nMVLhAuIy2AzrmNr)l5baVV z8Fa9AcK<^df^{(-M~!_jYIe6vI+Nic7$o>iqcEPrIP{?eXOh?eA{cuTMDZ|3!YIk+ z*&{sT^noX8SO-^7tN2bPDNB8 zb~7$DE-^7j^FlWO00Ik1L_t(IPjypEPg7A49zh7f_&;2*GSS9>T@V}by+9L#Z0B-6sDA>4-?=yYKJimy{ z{eTAf^&+5B{&y#HOW$m_TCGYsdPOI@;UNAl1W}9(;>YlLkSUkWJo9S$I4oqk_5Y`RyuAxnz_17K>%rmeVGEVfa6w|N%v z$qu|(>q2ZyKvpa^Kx}q|0h3;(XhPnucVi+ZNXAd=J8AQupl!rH3n?2g&b{`!L(Aki zU23T+&wOx;3u>{-rdT8vZ*KJJW%16=tIMYl9uYiFbRqRp^hk`8k$E-CU^FaxUUoM= p-e;bkQ6?lZDwfUkRFBpG!lvI6;>1s;*b z3=Dj$K$tORwVDJ_kiEpy*OmP?8#AY<_@sQ7IG~VJiEBhjaDG}zd16s2LqK9?UWuNc zYluRbv7V`(p`rU{Cv%{x2u~Ns5DWigi8hDpu^;VuoLe_^C9*28-qil{uYKFizu_j+ z91Iy|Td+yIWIG`8(3qjkv1Ww`%Yy7LHj6f}TrdoowcyVL cHXa^^+l?y>?x?>P0ouXf>FVdQ&MBb@02lW~yZ`_I literal 0 HcmV?d00001