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/SpellMinion.java
+5 -5
View File
@@ -4,9 +4,9 @@ import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.living.ISummonedCreature;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
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.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.IEntityLivingData;
@@ -148,7 +148,7 @@ public class SpellMinion<T extends EntityLiving & ISummonedCreature> extends Spe
int range = getProperty(SUMMON_RADIUS).intValue();
// Try and find a nearby floor space
BlockPos pos = WizardryUtilities.findNearbyFloorSpace(caster, range, range*2);
BlockPos pos = BlockUtils.findNearbyFloorSpace(caster, range, range*2);
if(flying){
if(pos != null){
@@ -174,10 +174,10 @@ public class SpellMinion<T extends EntityLiving & ISummonedCreature> extends Spe
minion.setLifetime((int)(getProperty(MINION_LIFETIME).floatValue() * modifiers.get(WizardryItems.duration_upgrade)));
IAttributeInstance attribute = minion.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE);
if(attribute != null) attribute.applyModifier( // Apparently some things don't have an attack damage
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));
// This is only used for artefacts, but it's a nice example of custom spell modifiers
minion.getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).applyModifier(
new AttributeModifier(HEALTH_MODIFIER, modifiers.get(HEALTH_MODIFIER) - 1, Operations.MULTIPLY_CUMULATIVE));
new AttributeModifier(HEALTH_MODIFIER, modifiers.get(HEALTH_MODIFIER) - 1, EntityUtils.Operations.MULTIPLY_CUMULATIVE));
minion.setHealth(minion.getMaxHealth()); // Need to set this because we may have just modified the value
this.addMinionExtras(minion, pos, caster, modifiers, i);