From 202552a96708a9f88747b4049a21637fa1cec007 Mon Sep 17 00:00:00 2001 From: Electroblob77 <35599699+Electroblob77@users.noreply.github.com> Date: Thu, 2 Jul 2020 23:47:36 +0100 Subject: [PATCH] Add cursed helm --- .../wizardry/client/model/WizardryModels.java | 1 + .../entity/living/EntitySkeletonMinion.java | 5 +++++ .../entity/living/EntityZombieMinion.java | 8 ++++++++ .../wizardry/registry/WizardryItems.java | 2 ++ .../resources/assets/ebwizardry/lang/en_gb.lang | 2 ++ .../resources/assets/ebwizardry/lang/en_us.lang | 2 ++ .../models/item/charm_undead_helmets.json | 6 ++++++ .../textures/items/charm_undead_helmets.png | Bin 0 -> 1944 bytes 8 files changed, 26 insertions(+) create mode 100644 src/main/resources/assets/ebwizardry/models/item/charm_undead_helmets.json create mode 100644 src/main/resources/assets/ebwizardry/textures/items/charm_undead_helmets.png diff --git a/src/main/java/electroblob/wizardry/client/model/WizardryModels.java b/src/main/java/electroblob/wizardry/client/model/WizardryModels.java index d0519405..04ddaac8 100644 --- a/src/main/java/electroblob/wizardry/client/model/WizardryModels.java +++ b/src/main/java/electroblob/wizardry/client/model/WizardryModels.java @@ -288,6 +288,7 @@ public final class WizardryModels { registerItemModel(WizardryItems.charm_storm); registerItemModel(WizardryItems.charm_minion_health); registerItemModel(WizardryItems.charm_minion_variants); + registerItemModel(WizardryItems.charm_undead_helmets); registerItemModel(WizardryItems.charm_flight); registerItemModel(WizardryItems.charm_growth); registerItemModel(WizardryItems.charm_abseiling); diff --git a/src/main/java/electroblob/wizardry/entity/living/EntitySkeletonMinion.java b/src/main/java/electroblob/wizardry/entity/living/EntitySkeletonMinion.java index 0310c397..50f26bbd 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntitySkeletonMinion.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntitySkeletonMinion.java @@ -1,6 +1,8 @@ package electroblob.wizardry.entity.living; import electroblob.wizardry.Wizardry; +import electroblob.wizardry.item.ItemArtefact; +import electroblob.wizardry.registry.WizardryItems; import electroblob.wizardry.util.EntityUtils; import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; @@ -117,6 +119,9 @@ public class EntitySkeletonMinion extends AbstractSkeleton implements ISummonedC @Override public void onSpawn(){ this.spawnParticleEffect(); + if(getCaster() instanceof EntityPlayer && ItemArtefact.isArtefactActive((EntityPlayer)getCaster(), WizardryItems.charm_undead_helmets)){ + setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(Items.LEATHER_HELMET)); + } } @Override diff --git a/src/main/java/electroblob/wizardry/entity/living/EntityZombieMinion.java b/src/main/java/electroblob/wizardry/entity/living/EntityZombieMinion.java index 27891d9a..f08661c2 100644 --- a/src/main/java/electroblob/wizardry/entity/living/EntityZombieMinion.java +++ b/src/main/java/electroblob/wizardry/entity/living/EntityZombieMinion.java @@ -1,6 +1,8 @@ package electroblob.wizardry.entity.living; import electroblob.wizardry.Wizardry; +import electroblob.wizardry.item.ItemArtefact; +import electroblob.wizardry.registry.WizardryItems; import net.minecraft.entity.EntityFlying; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIHurtByTarget; @@ -8,6 +10,8 @@ import net.minecraft.entity.ai.EntityAIMoveThroughVillage; import net.minecraft.entity.ai.EntityAINearestAttackableTarget; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.init.Items; +import net.minecraft.inventory.EntityEquipmentSlot; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -84,6 +88,10 @@ public class EntityZombieMinion extends EntityZombie implements ISummonedCreatur @Override public void onSpawn(){ if(this.dataManager.get(SPAWN_PARTICLES)) this.spawnParticleEffect(); + if(shouldBurnInDay() && getCaster() instanceof EntityPlayer + && ItemArtefact.isArtefactActive((EntityPlayer)getCaster(), WizardryItems.charm_undead_helmets)){ + setItemStackToSlot(EntityEquipmentSlot.HEAD, new ItemStack(Items.LEATHER_HELMET)); + } } @Override diff --git a/src/main/java/electroblob/wizardry/registry/WizardryItems.java b/src/main/java/electroblob/wizardry/registry/WizardryItems.java index a37e48d8..21c31594 100644 --- a/src/main/java/electroblob/wizardry/registry/WizardryItems.java +++ b/src/main/java/electroblob/wizardry/registry/WizardryItems.java @@ -272,6 +272,7 @@ public final class WizardryItems { public static final Item charm_storm = placeholder(); public static final Item charm_minion_health = placeholder(); public static final Item charm_minion_variants = placeholder(); + public static final Item charm_undead_helmets = placeholder(); public static final Item charm_flight = placeholder(); public static final Item charm_growth = placeholder(); public static final Item charm_abseiling = placeholder(); @@ -635,6 +636,7 @@ public final class WizardryItems { registerItem(registry, "charm_storm", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.CHARM)); registerItem(registry, "charm_minion_health", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.CHARM)); registerItem(registry, "charm_minion_variants", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.CHARM)); + registerItem(registry, "charm_undead_helmets", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.CHARM)); registerItem(registry, "charm_flight", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.CHARM)); registerItem(registry, "charm_growth", new ItemArtefact(EnumRarity.UNCOMMON, ItemArtefact.Type.CHARM)); registerItem(registry, "charm_abseiling", new ItemArtefact(EnumRarity.RARE, ItemArtefact.Type.CHARM)); diff --git a/src/main/resources/assets/ebwizardry/lang/en_gb.lang b/src/main/resources/assets/ebwizardry/lang/en_gb.lang index ecf8acd4..78fb8596 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_gb.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_gb.lang @@ -382,6 +382,8 @@ item.ebwizardry\:charm_minion_health.name=Obsidian Zombie Head item.ebwizardry\:charm_minion_health.desc=Summoned creatures are 25%% stronger item.ebwizardry\:charm_minion_variants.name=Talisman of Transformation item.ebwizardry\:charm_minion_variants.desc=Summoned zombies are husks; summoned skeletons are strays +item.ebwizardry\:charm_undead_helmets.name=Cursed Helm +item.ebwizardry\:charm_undead_helmets.desc=Summoned zombies and skeletons have leather caps to protect them from sunlight item.ebwizardry\:charm_flight.name=Emerald Beetle Wing item.ebwizardry\:charm_flight.desc=Flight and Glide are 50%% faster item.ebwizardry\:charm_growth.name=Crystal Flower Charm diff --git a/src/main/resources/assets/ebwizardry/lang/en_us.lang b/src/main/resources/assets/ebwizardry/lang/en_us.lang index 4651daee..38d598e1 100644 --- a/src/main/resources/assets/ebwizardry/lang/en_us.lang +++ b/src/main/resources/assets/ebwizardry/lang/en_us.lang @@ -382,6 +382,8 @@ item.ebwizardry\:charm_minion_health.name=Obsidian Zombie Head item.ebwizardry\:charm_minion_health.desc=Summoned creatures are 25%% stronger item.ebwizardry\:charm_minion_variants.name=Talisman of Transformation item.ebwizardry\:charm_minion_variants.desc=Summoned zombies are husks; summoned skeletons are strays +item.ebwizardry\:charm_undead_helmets.name=Cursed Helm +item.ebwizardry\:charm_undead_helmets.desc=Summoned zombies and skeletons have leather caps to protect them from sunlight item.ebwizardry\:charm_flight.name=Emerald Beetle Wing item.ebwizardry\:charm_flight.desc=Flight and Glide are 50%% faster item.ebwizardry\:charm_growth.name=Crystal Flower Charm diff --git a/src/main/resources/assets/ebwizardry/models/item/charm_undead_helmets.json b/src/main/resources/assets/ebwizardry/models/item/charm_undead_helmets.json new file mode 100644 index 00000000..af4fea86 --- /dev/null +++ b/src/main/resources/assets/ebwizardry/models/item/charm_undead_helmets.json @@ -0,0 +1,6 @@ +{ + "parent": "item/generated", + "textures": { + "layer0": "ebwizardry:items/charm_undead_helmets" + } +} \ No newline at end of file diff --git a/src/main/resources/assets/ebwizardry/textures/items/charm_undead_helmets.png b/src/main/resources/assets/ebwizardry/textures/items/charm_undead_helmets.png new file mode 100644 index 0000000000000000000000000000000000000000..bf951c99f975570b17099722c776c8e5ed056420 GIT binary patch literal 1944 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s-v#UZPN`ey06$*;-(=u~X z6-p`#QWa7wGSe6sDsHU}kDT_{jOWjD%_0^ig&i{Ov+teeE&3xOellzO-N!y|n_Re< z95-+=q+b62^S43$!vrxiKj$wetGf@YPPbSr{MPEzp2?-3_sPGx`BTaKI(M7Lg;P~M zb*HVL@YLS>wCiokiLYrIU;i$ushzl8v9G$R_?Yd)3$qU79ahVCK2)8yectJ)Xp{3%cQqT=NxpUP(6{GI(wzbKqdVf*8h+?eAR9~FMty6cV2v^U=uom+ZF?#n5M z?7mMH%z9f38*Int$bJhwgZ>quAkeOymkF4&@Ub zG3*B)9rI*o_q?Ri^r)*qz~kqq)@NHX{lYbq9=TmqsNy)r;r#DNP<3)fwaYn?vs48_pAf=P2b*ey>mo#{1fT&AV1Z^)(C z5%7_XQ}SQ{TjV*-N9sE|Bu;6)3b~qnVTI>raeJdPzaO}}o^@>Ema5@UY!lhkDHMC< zMRJGXvKhkajz_Py)c6=KonowZcEcP)D`&;$hg`d~qiQ%+r-c-y1~1*U>gx4?WM5PB zyh{^~pWS{T$y>Ml701$dyUOl6_uGE0QMkfqd1qm}{UO2rl)jpc+cN)_{bRqDvH95K zl?x^Gt|{<7G;v%!=fwk_o{h=^a%{{hX>U9QYbF-k%#faQ(}ZiG(VQ!eev1!ENR-Tt z;NP{Q+F&`G>*xLtX$~y^IiHA1Tv-Wmf{fI!F+qXAOB8s{l^?#T}rPZ9c?o@hpwT4@Z zIM3pH_c~@= zM0l#YZb)iVmaAsX4cqYYtMN-a&eOsXpH1!LAMR}2nBP3-mfN{*zn-LHY@)C4=?1X9 z+WLdTJFiz zy{~j=%ib@{uO|5k)l3k5qj>Y-t?ZI_f$8_!@2-zpw_9XM;{7$J7F7#3>tB6+&&A={ z;`-Ewvrm}se|&oNwVLuG#y=t3<6OR8zxK!L;pK1q5{Ja)|Gk@C&*&{J?#aA0%a(zG zfi20~-G#vc1ebr)Ph((U;4JWnEM{QPQwCwiilz2t3=9nHC7!;n>`&Mk#iS(L3y#iU zU|^6eag8W(&d<$F%`0JWE=o--Nlj5G&n(GMaQE~L2yf&QXJBCL^mK6yu{gbT@^o{+;!3p~9Q*TG#I9`1ElTw_> z4qna=7CD_87G7KzbVfv_VNv9wi|f>kHPg60UBA|NC+6akska}0zp1+X`18(mZl120 zO=~1n|LuvJ{ClJJq$g~7&eK9Cul~n;ccnH%&}Y_dx4T8o&)1x#%JAkuXM@&9P3v8r zzu&rr^$3YBW^ss|`;=?->pRxIHVeC0ITto2PJa7sMenRBp~BV$C$z1$22Ni0`~hbu zkJ{W6hK7QmIgxP}cfPWBVVJVx*`}g{*OXR2{rbOo?Wu`AUlf+?*C{J8zUkt+ z`H1Uszqs28^|jKqv(jGlOa4m!k~ym@@DSgeeqWXo%X&EW&Tm(L^lsa^%ctXSeoeb> zzP|pUERUKjo5Chd=7!z3t