From b1ced53150f610ae2fc38b72550a5ea577fac42e Mon Sep 17 00:00:00 2001 From: Jeremy Diamond Date: Mon, 20 Jul 2015 17:22:36 -0700 Subject: [PATCH] Ugly Armor --- .../spiteful/avaritia/LudicrousEvents.java | 9 +++ .../avaritia/items/ItemArmorInfinity.java | 62 ++++++++++++++++++ .../avaritia/items/LudicrousItems.java | 13 ++++ .../resources/assets/avaritia/lang/en_US.lang | 4 ++ .../textures/items/infinity_armor_0.png | Bin 0 -> 256 bytes .../textures/items/infinity_armor_1.png | Bin 0 -> 282 bytes .../textures/items/infinity_armor_2.png | Bin 0 -> 247 bytes .../textures/items/infinity_armor_3.png | Bin 0 -> 265 bytes .../textures/models/infinity_armor.png | Bin 0 -> 1359 bytes .../textures/models/infinity_pants.png | Bin 0 -> 748 bytes 10 files changed, 88 insertions(+) create mode 100644 src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java create mode 100644 src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png create mode 100644 src/main/resources/assets/avaritia/textures/items/infinity_armor_1.png create mode 100644 src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png create mode 100644 src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png create mode 100644 src/main/resources/assets/avaritia/textures/models/infinity_armor.png create mode 100644 src/main/resources/assets/avaritia/textures/models/infinity_pants.png diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index a93c5f8..899ccca 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -1,6 +1,7 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import fox.spiteful.avaritia.items.ItemArmorInfinity; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; import net.minecraft.block.Block; @@ -108,6 +109,14 @@ public class LudicrousEvents { EntityPlayer player = (EntityPlayer)event.entityLiving; if(player.getHeldItem() != null && player.getHeldItem().getItem() == LudicrousItems.infinity_sword && player.isUsingItem()) event.setCanceled(true); + if(player.getEquipmentInSlot(1) != null && player.getEquipmentInSlot(2) != null && player.getEquipmentInSlot(3) != null + && player.getEquipmentInSlot(4) != null){ + if(player.getEquipmentInSlot(1).getItem() instanceof ItemArmorInfinity && + player.getEquipmentInSlot(2).getItem() instanceof ItemArmorInfinity && + player.getEquipmentInSlot(3).getItem() instanceof ItemArmorInfinity && + player.getEquipmentInSlot(4).getItem() instanceof ItemArmorInfinity) + event.setCanceled(true); + } } @SubscribeEvent diff --git a/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java new file mode 100644 index 0000000..7d06f45 --- /dev/null +++ b/src/main/java/fox/spiteful/avaritia/items/ItemArmorInfinity.java @@ -0,0 +1,62 @@ +package fox.spiteful.avaritia.items; + +import fox.spiteful.avaritia.Avaritia; +import fox.spiteful.avaritia.Lumberjack; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; +import net.minecraftforge.common.util.EnumHelper; +import org.apache.logging.log4j.Level; + +public class ItemArmorInfinity extends ItemArmor { + + public static final ArmorMaterial infinite_armor = EnumHelper.addArmorMaterial("infinity", 9999, new int[]{6, 16, 12, 6}, 1000); + + public ItemArmorInfinity(int slot){ + super(infinite_armor, 0, slot); + setCreativeTab(Avaritia.tab); + setUnlocalizedName("infinity_armor_" + slot); + setTextureName("avaritia:infinity_armor_" + slot); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) + { + if(slot == 2) + return "avaritia:textures/models/infinity_pants.png"; + else + return "avaritia:textures/models/infinity_armor.png"; + } + + @Override + public void setDamage(ItemStack stack, int damage){ + super.setDamage(stack, 0); + } + + public void onArmorTick(World world, EntityPlayer player, ItemStack itemStack) + { + if(armorType == 0){ + player.setAir(300); + player.getFoodStats().setFoodLevel(20); + player.getFoodStats().setFoodSaturationLevel(20F); + } + else if(armorType == 1){ + player.capabilities.allowFlying = true; + } + else if(armorType == 2){ + if(player.isBurning()) + player.extinguish(); + } + } + + @Override + public EnumRarity getRarity(ItemStack stack) + { + return LudicrousItems.cosmic; + } + +} diff --git a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java index d05ac1c..0d27dfa 100644 --- a/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java +++ b/src/main/java/fox/spiteful/avaritia/items/LudicrousItems.java @@ -26,6 +26,11 @@ public class LudicrousItems { public static Item cosmic_meatballs; public static Item endest_pearl; + public static Item infinity_helm; + public static Item infinity_armor; + public static Item infinity_pants; + public static Item infinity_shoes; + public static Item akashic_record; public static Item armok_orb; @@ -50,5 +55,13 @@ public class LudicrousItems { GameRegistry.registerItem(cosmic_meatballs, "Cosmic_Meatballs"); endest_pearl = new ItemEndestPearl(); GameRegistry.registerItem(endest_pearl, "Endest_Pearl"); + infinity_helm = new ItemArmorInfinity(0); + GameRegistry.registerItem(infinity_helm, "Infinity_Helm"); + infinity_armor = new ItemArmorInfinity(1); + GameRegistry.registerItem(infinity_armor, "Infinity_Chest"); + infinity_pants = new ItemArmorInfinity(2); + GameRegistry.registerItem(infinity_pants, "Infinity_Pants"); + infinity_shoes = new ItemArmorInfinity(3); + GameRegistry.registerItem(infinity_shoes, "Infinity_Shoes"); } } diff --git a/src/main/resources/assets/avaritia/lang/en_US.lang b/src/main/resources/assets/avaritia/lang/en_US.lang index a47dd63..033b383 100644 --- a/src/main/resources/assets/avaritia/lang/en_US.lang +++ b/src/main/resources/assets/avaritia/lang/en_US.lang @@ -26,6 +26,10 @@ item.orb_armok.name=Blood Orb of Armok item.avaritia_stew.name=Ultimate Stew item.avaritia_meatballs.name=Cosmic Meatballs item.avaritia_endest_pearl.name=Endest Pearl +item.infinity_armor_0.name=Infinity Helmet +item.infinity_armor_1.name=Infinity Breastplate +item.infinity_armor_2.name=Infinity Pants +item.infinity_armor_3.name=Infinity Boots # # Blocks tile.compressed_workbench.name=Compressed Crafting Table diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_0.png new file mode 100644 index 0000000000000000000000000000000000000000..d99d543b6eac7b3dd24bb14ae697fee10aac0cfa GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|KvnskE{-7<{(Jilaxy6Lu)Nh}y%G0n6UXh2caCz$M9;|HNtTnmb}%Vz z{sJTBsgf&l)=DbBJD_H;W^3MxRbTHtPr0k#ZZ9^mT_Ry(a)a$Yz9}mk+5hb0bGc;C u@R9vL3xkrx+>YN*D?nP$I6SotWBaRkL;TF_P5eNs89ZJ6T-G@yGywqfq|KvkWdE{-7<{!1qu`>_$z+OhE4f_1h3*RD+|V@S1Y0?Oyp9Sd?wjIpX+GHPIf&D=XKJy Xug`tEU(A>VbQFW9tDnm{r-UW|{1aj5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_2.png new file mode 100644 index 0000000000000000000000000000000000000000..1eebaeaaea1a7624cea292df9cbd63aed8471065 GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvij;E{-7<{%?CO@*Ys&V7=SR7}38|qRBKPUbu5>)Z%ZO<)=S5U3v2E z_KZGb8@AA|=2`#0H5@n->vH7mn-F$JrCm3;9Q0;#J@KD#Fld2DwRH#cpT>Ts2~myL l_#QC`D5khscO>)rv-`V!jXM8Mss(5xgQu&X%Q~loCID9QQgQ$Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png b/src/main/resources/assets/avaritia/textures/items/infinity_armor_3.png new file mode 100644 index 0000000000000000000000000000000000000000..8b15d0a84b121de0b7f67ae93456f520094e0227 GIT binary patch literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL8%hgh?3y^w370~qEv=}#LT=BJwMkFg)(D3 zQ$0gN_s>q|Kvflue4V(h>@rIr0KsPXWy85}Sb4q9e E0B#psdjJ3c literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/avaritia/textures/models/infinity_armor.png b/src/main/resources/assets/avaritia/textures/models/infinity_armor.png new file mode 100644 index 0000000000000000000000000000000000000000..0c3f665a43ca87ddf1dd355b6727262b758a9437 GIT binary patch literal 1359 zcmV-V1+e;wP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizyJUazyWI3i3tDz02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A000EONklC|<@WZrY;SLu)6>(k zzrSDB*VoIz!9lTB^A8$YiA_*;W@hFW#>dCY)YMd&n3xD-)ck{nR$>!rfRT}rGB!3A zV1T8irHF!>f6&lMY$6T7E75;Kx6o4_>k12wg_gM%<1lscQa+jrj-=LtC*n~>Y)1c_d`}6bjm|t96 zbXnT>4GKCpH#bF|gL{5sVQ+Tie^)i+%ttVXvp2;qvmbJUl$a z(;4W__00Eu2Lncg-`WgTwIJ|cyx3W3g!OXmoEmdY3X82aY{cwKbN(&wb+X;nsVK_@9*zn zMDJoi=Zh#2Qw!8@v=V<3T8T{v*X#qJUhg-^l0ArYs@Ho(E3pYhQuumGhkCu=kTz~3 zj`@tQ(NqZ>W5;Q{YbsuD_V(7@V?>(-=S!UL@D5^{fv}sCH4Z*;ReX> z00wJoaFU)~B`?ZjX=PsXCf)`JVdR8m+`$;JTBOkcHBi z(8)tMjZYRX>soGt=l+Z|*KeM|I1FnH#`toMulfGmpL4t^!|%{a>;)+-7!x|@I>i*2 z!VJMHIzn?^YVw1RDNo-N_VTc~4svyMHTIiR6wIA#Ji>;>1DG?A(9I90OdC8t#L%o|*QnC-urVIzdmqKSe4VZV)r3xWU&p-rl^XM|@#0UG z{k6O`T8X`YLcGOuDO?%^c*5M1aVSjDObJnd4-Zh50q{F3_W*-20($qo{#HpZPViCZ zhS1uJ%BVR|%Uh$B*b7*hu!PQnl*%)TP`93+$BcwdQM|(195Mp%5NoMW8o~bbIK}ZBGeAZVo{Sjsd`74DPl#*G%e>T> z5eRC|OUCIDV-b_WGERLUpi?9vI-FheB^biFj3?E+hf!<3uRyexJOmFNsoPmKU z!_&nvB*XdXwEWYBjsnNNcMEoPOzCh@5n0%w5nuQ2x4CKg`OVLIt@6*!6b~<3KlkqD z>wls>U7QZ9Djy^oJ#4;_W40+mC&g;+sSJ}}OaH~Mm$K`)nx%R-FMQV7We<94_GbN1 zP@CL&CCilcF__~~-*WzWv7+>+ud5Ve^~5dbpWhU>KGi}d>+ktAW6}M0^S1Jo?Vfu} zrr(`)+ZXm|kViKMv{uPn2aQgP17uDJEft2dnI*O3;|^xY!p`$h1KOyd-GgluDTXuO}e$z>Y*_;1W*wmf>z^}(GwCGJg|G5p}jEydT z{?@(z%rPUn^M3l{*CCV{oy7tpQHnv#4L{}2ne3h zly*^;o0!7!%|*O#*73$S$1`sj9~UbK`?ohq@g;ki*43r23&i&VQznC_tDnm{r-UW| Daf3(I literal 0 HcmV?d00001