From d177361fdc2a2e863dd02a1dc7a2226c8445f91e Mon Sep 17 00:00:00 2001 From: HellFirePvP <01ecs01m> Date: Wed, 4 Nov 2015 21:04:42 +0100 Subject: [PATCH] - Warpy warpy Familiars --- .../common/items/baubles/ItemFamiliar.java | 16 ++++++++++++++++ .../registration/RegisteredResearches.java | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java index 8bf3b63..2b2550d 100644 --- a/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java +++ b/src/main/java/makeo/gadomancy/common/items/baubles/ItemFamiliar.java @@ -13,6 +13,7 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; import thaumcraft.api.aspects.Aspect; +import thaumcraft.common.Thaumcraft; import java.util.List; @@ -106,6 +107,7 @@ public class ItemFamiliar extends Item implements IBauble { @Override public void onWornTick(ItemStack itemStack, EntityLivingBase entity) { + if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { Gadomancy.proxy.familiarHandler.equippedTick(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); } @@ -113,13 +115,27 @@ public class ItemFamiliar extends Item implements IBauble { @Override public void onEquipped(ItemStack itemStack, EntityLivingBase entity) { + if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { Gadomancy.proxy.familiarHandler.notifyEquip(((EntityPlayer) entity).worldObj, itemStack, (EntityPlayer) entity); + + if(((EntityPlayer) entity).worldObj.isRemote) return; + + int probability = 0; + if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_2)) probability += 1; + if(hasUpgrade(itemStack, FamiliarUpgrade.ATTACK_3)) probability += 1; + if(probability > 0) { + int rand = itemRand.nextInt(20000 / probability); + if(rand == 42) { + Thaumcraft.addWarpToPlayer((EntityPlayer) entity, 1 + itemRand.nextInt(4), true); + } + } } } @Override public void onUnequipped(ItemStack itemStack, EntityLivingBase entity) { + if(itemStack == null) return; if(entity instanceof EntityPlayer && itemStack.getItem() instanceof ItemFamiliar) { Gadomancy.proxy.familiarHandler.notifyUnequip(((EntityPlayer) entity).worldObj, (EntityPlayer) entity); } diff --git a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java index 8cdb179..0dff42c 100644 --- a/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java +++ b/src/main/java/makeo/gadomancy/common/registration/RegisteredResearches.java @@ -84,6 +84,7 @@ public class RegisteredResearches { ResearchItem researchEleToolPick = PseudoResearchItem.create("ELEMENTALPICK", 5, -9).registerResearchItem(); ResearchItem researchEleToolShovel = PseudoResearchItem.create("ELEMENTALSHOVEL", 6, -8).registerResearchItem(); ResearchItem researchEleSword = PseudoResearchItem.create("ELEMENTALSWORD", 7, -7).registerResearchItem(); + ResearchItem researchCoreGuard = PseudoResearchItem.create("COREGUARD", 7, -5).registerResearchItem(); researchGolemCoreBreak = new SimpleResearchItem("GOLEMCOREBREAK", 5, -6, 3, new ItemStack(RegisteredItems.itemGolemCoreBreak), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ENTROPY, 8).add(Aspect.MECHANISM, 8)) @@ -94,7 +95,7 @@ public class RegisteredResearches { researchGolemCoreBodyguard = new SimpleResearchItem("GOLEMCOREBODYGUARD", 5, -4, 2, new ItemStack(RegisteredItems.itemGolemCoreBreak, 1, 1), new AspectList().add(Aspect.TOOL, 8).add(Aspect.ORDER, 8).add(Aspect.MECHANISM, 10).add(Aspect.ARMOR, 8).add(Aspect.WEAPON, 8)) - .setParents(researchBootsTraveller.key, researchEleSword.key).setConcealed() + .setParents(researchBootsTraveller.key, researchEleSword.key, researchCoreGuard.key).setConcealed() .setPages(new ResearchPage("gadomancy.research_page.GOLEMCOREBODYGUARD.1"), new ResearchPage(RegisteredRecipes.recipeGolemCoreBodyguard)).registerResearchItem(); ResearchItem researchFocusPrimal = PseudoResearchItem.create("FOCUSPRIMAL", -7, -10).registerResearchItem();