fujin/Wizardry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split up and reorganise WizardryUtilities

Browse Source
This commit is contained in:
Electroblob77
2020-06-13 23:29:01 +01:00
parent 57e96458d5
commit 238b9d04bb
189 changed files with 1724 additions and 1731 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/SummonSpiritWolf.java
+6 -6
View File
@@ -5,9 +5,9 @@ import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.entity.living.EntitySpiritWolf;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.BlockUtils;
import electroblob.wizardry.util.EntityUtils;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import electroblob.wizardry.util.WizardryUtilities.Operations;
import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
@@ -44,11 +44,11 @@ public class SummonSpiritWolf extends Spell {
if(!world.isRemote){
Entity oldWolf = WizardryUtilities.getEntityByUUID(world, data.getVariable(UUID_KEY));
Entity oldWolf = EntityUtils.getEntityByUUID(world, data.getVariable(UUID_KEY));
if(oldWolf != null) oldWolf.setDead();
BlockPos pos = WizardryUtilities.findNearbyFloorSpace(caster, 2, 4);
BlockPos pos = BlockUtils.findNearbyFloorSpace(caster, 2, 4);
if(pos == null) return false;
EntitySpiritWolf wolf = new EntitySpiritWolf(world);
@@ -57,9 +57,9 @@ public class SummonSpiritWolf extends Spell {
wolf.setOwnerId(caster.getUniqueID());
// Potency gives the wolf more strength AND more health
wolf.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).applyModifier(
new AttributeModifier(POTENCY_ATTRIBUTE_MODIFIER, modifiers.get(SpellModifiers.POTENCY) - 1, Operations.MULTIPLY_CUMULATIVE));
new AttributeModifier(POTENCY_ATTRIBUTE_MODIFIER, modifiers.get(SpellModifiers.POTENCY) - 1, EntityUtils.Operations.MULTIPLY_CUMULATIVE));
wolf.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).applyModifier(
new AttributeModifier(POTENCY_ATTRIBUTE_MODIFIER, modifiers.amplified(SpellModifiers.POTENCY, 1.5f) - 1, Operations.MULTIPLY_CUMULATIVE));
new AttributeModifier(POTENCY_ATTRIBUTE_MODIFIER, modifiers.amplified(SpellModifiers.POTENCY, 1.5f) - 1, EntityUtils.Operations.MULTIPLY_CUMULATIVE));
wolf.setHealth(wolf.getMaxHealth());
world.spawnEntity(wolf);