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

Add player animation system!

Browse Source 
- Hooks into ModelRenderer by wrapping it in an extended version that allows modification of angles after the model has set them
- Is compatible with pretty much everything, yay (even modded armour!)
- Adds property overrides to ItemWand so that gets animated too
- Adds a system for generating override models from a template at runtime so I don't have to duplicate all the wand models
- Tweaks particles and ray spells so they line up with the end of the newly-animated wand
- Fixes a long-standing bug where wand usage actions would stop immediately for all non-continuous spells
This commit is contained in:
Electroblob77
2020-05-09 20:17:15 +01:00
parent cf38a16f49
commit be250e218e
146 changed files with 1531 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/electroblob/wizardry/spell/Arc.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
import electroblob.wizardry.util.ParticleBuilder;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -19,7 +19,7 @@ import net.minecraft.world.World;
public class Arc extends SpellRay {
public Arc(){
super("arc", false, EnumAction.NONE);
super("arc", false, SpellActions.POINT);
this.aimAssist(0.6f);
this.soundValues(1, 1.7f, 0.2f);
this.addProperties(DAMAGE);
src/main/java/electroblob/wizardry/spell/ArcaneJammer.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.event.SpellCastEvent;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.ParticleBuilder;
@@ -11,7 +12,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntitySpellcasterIllager;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -35,7 +35,7 @@ public class ArcaneJammer extends SpellRay {
}
public ArcaneJammer(){
super("arcane_jammer", false, EnumAction.NONE);
super("arcane_jammer", false, SpellActions.POINT);
this.soundValues(0.7f, 1, 0.4f);
this.addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/ArcaneLock.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.AllyDesignationSystem;
import electroblob.wizardry.util.NBTExtras;
import electroblob.wizardry.util.SpellModifiers;
@@ -9,7 +10,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.server.MinecraftServer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityDispenser;
@@ -29,7 +29,7 @@ public class ArcaneLock extends SpellRay {
public static final String NBT_KEY = "arcaneLockOwner";
public ArcaneLock(){
super("arcane_lock", false, EnumAction.NONE);
super("arcane_lock", false, SpellActions.POINT);
}
@Override public boolean requiresPacket(){ return true; }
src/main/java/electroblob/wizardry/spell/Banish.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@@ -23,7 +23,7 @@ public class Banish extends SpellRay {
public static final String MAXIMUM_TELEPORT_DISTANCE = "maximum_teleport_distance";
public Banish(){
super("banish", false, EnumAction.NONE);
super("banish", false, SpellActions.POINT);
this.addProperties(MINIMUM_TELEPORT_DISTANCE, MAXIMUM_TELEPORT_DISTANCE);
}
src/main/java/electroblob/wizardry/spell/Blink.java
+2 -3
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.RayTracer;
import electroblob.wizardry.util.SpellModifiers;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
public class Blink extends Spell {
public Blink(){
super("blink", EnumAction.NONE, false);
super("blink", SpellActions.POINT, false);
addProperties(RANGE);
}
@@ -73,7 +73,6 @@ public class Blink extends Spell {
if(!world.isRemote) caster.setPositionAndUpdate(pos.getX() + 0.5, pos.getY(), pos.getZ() + 0.5);
this.playSound(world, caster, ticksInUse, -1, modifiers);
caster.swingArm(hand);
return true;
}
src/main/java/electroblob/wizardry/spell/Bubble.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.construct.EntityBubble;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.SoundEvent;
@@ -21,7 +21,7 @@ import net.minecraft.world.World;
public class Bubble extends SpellRay {
public Bubble(){
super("bubble", false, EnumAction.NONE);
super("bubble", false, SpellActions.POINT);
this.soundValues(0.5f, 1.1f, 0.2f);
addProperties(DURATION);
}
src/main/java/electroblob/wizardry/spell/ChainLightning.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
import electroblob.wizardry.util.ParticleBuilder.Type;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -28,7 +28,7 @@ public class ChainLightning extends SpellRay {
public static final String TERTIARY_MAX_TARGETS = "tertiary_max_targets"; // This is per secondary target
public ChainLightning(){
super("chain_lightning", false, EnumAction.NONE);
super("chain_lightning", false, SpellActions.POINT);
this.aimAssist(0.6f);
this.soundValues(1, 1.7f, 0.2f);
addProperties(PRIMARY_DAMAGE, SECONDARY_DAMAGE, TERTIARY_DAMAGE, SECONDARY_RANGE, TERTIARY_RANGE,
src/main/java/electroblob/wizardry/spell/Charge.java
+2 -2
View File
@@ -3,6 +3,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.data.IVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.Spells;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
@@ -13,7 +14,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.Vec3d;
@@ -37,7 +37,7 @@ public class Charge extends Spell {
private static final double EXTRA_HIT_MARGIN = 1;
public Charge(){
super("charge", EnumAction.NONE, false);
super("charge", SpellActions.POINT, false);
addProperties(CHARGE_SPEED, DURATION, DAMAGE, KNOCKBACK_STRENGTH);
this.soundValues(0.6f, 1, 0);
}
src/main/java/electroblob/wizardry/spell/Clairvoyance.java
+2 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.data.IStoredVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.ISpellCastingItem;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.misc.WizardryPathFinder;
import electroblob.wizardry.packet.PacketClairvoyance;
import electroblob.wizardry.packet.WizardryPacketHandler;
@@ -17,7 +18,6 @@ import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.monster.EntityZombie;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.pathfinding.Path;
import net.minecraft.pathfinding.PathNodeType;
@@ -41,7 +41,7 @@ public class Clairvoyance extends Spell {
public static final IStoredVariable<Integer> DIMENSION_KEY = IStoredVariable.StoredVariable.ofInt("clairvoyanceDimension", Persistence.ALWAYS);
public Clairvoyance(){
super("clairvoyance", EnumAction.BOW, false);
super("clairvoyance", SpellActions.POINT_UP, false);
addProperties(RANGE, DURATION);
WizardData.registerStoredVariables(LOCATION_KEY, DIMENSION_KEY);
}
src/main/java/electroblob/wizardry/spell/Cobwebs.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.tileentity.TileEntityTimer;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -19,7 +19,7 @@ import java.util.List;
public class Cobwebs extends SpellRay {
public Cobwebs(){
super("cobwebs", false, EnumAction.NONE);
super("cobwebs", false, SpellActions.POINT);
this.ignoreLivingEntities(true);
addProperties(EFFECT_RADIUS, DURATION);
}
src/main/java/electroblob/wizardry/spell/ConjureBlock.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.tileentity.TileEntityTimer;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -20,7 +20,7 @@ public class ConjureBlock extends SpellRay {
private static final String BLOCK_LIFETIME = "block_lifetime";
public ConjureBlock(){
super("conjure_block", false, EnumAction.NONE);
super("conjure_block", false, SpellActions.POINT);
this.ignoreLivingEntities(true);
addProperties(BLOCK_LIFETIME);
}
src/main/java/electroblob/wizardry/spell/Containment.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.ParticleBuilder;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class Containment extends SpellRay {
public Containment(){
super("containment", false, EnumAction.NONE);
super("containment", false, SpellActions.POINT);
this.soundValues(1, 1, 0.2f);
addProperties(EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/CurseOfEnfeeblement.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.ParticleBuilder;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class CurseOfEnfeeblement extends SpellRay {
public CurseOfEnfeeblement(){
super("curse_of_enfeeblement", false, EnumAction.NONE);
super("curse_of_enfeeblement", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
addProperties(EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/CurseOfSoulbinding.java
+2 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.data.IStoredVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.integration.DamageSafetyChecker;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.registry.WizardrySounds;
import electroblob.wizardry.util.*;
@@ -12,7 +13,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.potion.PotionEffect;
@@ -42,7 +42,7 @@ public class CurseOfSoulbinding extends SpellRay {
Persistence.DIMENSION_CHANGE);
public CurseOfSoulbinding(){
super("curse_of_soulbinding", false, EnumAction.NONE);
super("curse_of_soulbinding", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
WizardData.registerStoredVariables(TARGETS_KEY);
}
src/main/java/electroblob/wizardry/spell/CurseOfUndeath.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -7,7 +8,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -17,7 +17,7 @@ import net.minecraft.world.World;
public class CurseOfUndeath extends SpellRay {
public CurseOfUndeath(){
super("curse_of_undeath", false, EnumAction.NONE);
super("curse_of_undeath", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
addProperties(EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/Decoy.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.living.EntityDecoy;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -16,7 +16,7 @@ public class Decoy extends Spell {
public static final String MOB_TRICK_CHANCE = "mob_trick_chance";
public Decoy(){
super("decoy", EnumAction.BOW, false);
super("decoy", SpellActions.SUMMON, false);
this.soundValues(1, 0.9f, 0.2f);
addProperties(DECOY_LIFETIME, MOB_TRICK_CHANCE);
}
src/main/java/electroblob/wizardry/spell/Detonate.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -7,7 +8,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@@ -22,7 +22,7 @@ public class Detonate extends SpellRay {
public static final String MAX_DAMAGE = "max_damage";
public Detonate(){
super("detonate", false, EnumAction.NONE);
super("detonate", false, SpellActions.POINT);
this.soundValues(4, 0.7f, 0.14f);
this.ignoreLivingEntities(true);
addProperties(MAX_DAMAGE, BLAST_RADIUS);
src/main/java/electroblob/wizardry/spell/Disintegration.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.projectile.EntityEmber;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -11,7 +12,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
@@ -26,7 +26,7 @@ public class Disintegration extends SpellRay {
public static final String EMBER_LIFETIME = "ember_lifetime";
public Disintegration(){
super("disintegration", false, EnumAction.NONE);
super("disintegration", false, SpellActions.POINT);
addProperties(DAMAGE, BURN_DURATION, EMBER_LIFETIME, EMBER_COUNT);
}
src/main/java/electroblob/wizardry/spell/Divination.java
+2 -3
View File
@@ -3,6 +3,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Settings;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.block.BlockCrystalOre;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.RelativeFacing;
@@ -13,7 +14,6 @@ import net.minecraft.block.BlockOre;
import net.minecraft.block.BlockRedstoneOre;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.util.EnumFacing;
@@ -22,7 +22,6 @@ import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.Pair;
import java.util.Arrays;
import java.util.Comparator;
@@ -33,7 +32,7 @@ public class Divination extends Spell {
private static final float NUDGE_SPEED = 0.2f;
public Divination(){
super("divination", EnumAction.NONE, false);
super("divination", SpellActions.THRUST, false);
addProperties(RANGE);
}
src/main/java/electroblob/wizardry/spell/Earthquake.java
+2 -2
View File
@@ -2,6 +2,7 @@
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.construct.EntityEarthquake;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
@@ -9,7 +10,6 @@
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.world.World;
@@ -19,7 +19,7 @@
public static final String SPREAD_SPEED = "spread_speed";
public Earthquake(){
super("earthquake", EnumAction.NONE, EntityEarthquake::new, true);
super("earthquake", SpellActions.POINT_DOWN, EntityEarthquake::new, true);
this.soundValues(2, 1, 0);
this.overlap(true);
this.floor(true);
src/main/java/electroblob/wizardry/spell/EmpoweringPresence.java
+2 -2
View File
@@ -3,6 +3,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.event.SpellCastEvent;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.AllyDesignationSystem;
@@ -11,7 +12,6 @@ import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.MathHelper;
@@ -26,7 +26,7 @@ import java.util.List;
public class EmpoweringPresence extends Spell {
public EmpoweringPresence(){
super("empowering_presence", EnumAction.BOW, false);
super("empowering_presence", SpellActions.POINT_UP, false);
addProperties(EFFECT_RADIUS, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/Entrapment.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.construct.EntityBubble;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@@ -22,7 +22,7 @@ public class Entrapment extends SpellRay {
public static final String DAMAGE_INTERVAL = "damage_interval";
public Entrapment(){
super("entrapment", false, EnumAction.NONE);
super("entrapment", false, SpellActions.POINT);
this.soundValues(1, 0.85f, 0.3f);
addProperties(EFFECT_DURATION, DAMAGE_INTERVAL);
}
src/main/java/electroblob/wizardry/spell/FireBreath.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -11,7 +12,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -22,7 +22,7 @@ import net.minecraft.world.World;
public class FireBreath extends SpellRay {
public FireBreath(){
super("fire_breath", true, EnumAction.NONE);
super("fire_breath", true, SpellActions.POINT);
this.particleVelocity(1);
this.particleJitter(0.3);
this.particleSpacing(0.25);
src/main/java/electroblob/wizardry/spell/FlameRay.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -21,7 +21,7 @@ import net.minecraft.world.World;
public class FlameRay extends SpellRay {
public FlameRay(){
super("flame_ray", true, EnumAction.NONE);
super("flame_ray", true, SpellActions.POINT);
this.particleVelocity(1);
this.particleSpacing(0.5);
addProperties(DAMAGE, BURN_DURATION);
src/main/java/electroblob/wizardry/spell/FlamingWeapon.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryEnchantments;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class FlamingWeapon extends Spell {
public FlamingWeapon(){
super("flaming_weapon", EnumAction.BOW, false);
super("flaming_weapon", SpellActions.IMBUE, false);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/Flight.java
+2 -2
View File
@@ -1,11 +1,11 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -17,7 +17,7 @@ public class Flight extends Spell {
private static final double Y_NUDGE_ACCELERATION = 0.075;
public Flight(){
super("flight", EnumAction.NONE, true);
super("flight", SpellActions.POINT, true);
addProperties(SPEED, ACCELERATION);
}
src/main/java/electroblob/wizardry/spell/FontOfMana.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.event.SpellCastEvent;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.AllyDesignationSystem;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.MathHelper;
@@ -22,7 +22,7 @@ import java.util.List;
public class FontOfMana extends Spell {
public FontOfMana(){
super("font_of_mana", EnumAction.BOW, false);
super("font_of_mana", SpellActions.POINT_UP, false);
this.soundValues(0.7f, 1.2f, 0.4f);
addProperties(EFFECT_RADIUS, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/Forcefield.java
+2 -2
View File
@@ -1,16 +1,16 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.construct.EntityForcefield;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
public class Forcefield extends SpellConstruct<EntityForcefield> {
public Forcefield(){
super("forcefield", EnumAction.BOW, EntityForcefield::new, false);
super("forcefield", SpellActions.THRUST, EntityForcefield::new, false);
addProperties(Spell.EFFECT_RADIUS);
}
src/main/java/electroblob/wizardry/spell/ForestOfThorns.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.block.BlockThorns;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.tileentity.TileEntityPlayerSaveTimed;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
@@ -25,7 +25,7 @@ import java.util.List;
public class ForestOfThorns extends Spell {
public ForestOfThorns(){
super("forest_of_thorns", EnumAction.BOW, false);
super("forest_of_thorns", SpellActions.SUMMON, false);
addProperties(EFFECT_RADIUS, DURATION, DAMAGE);
}
src/main/java/electroblob/wizardry/spell/ForestsCurse.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -9,14 +10,13 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.world.World;
public class ForestsCurse extends SpellAreaEffect {
public ForestsCurse(){
super("forests_curse", EnumAction.BOW);
super("forests_curse", SpellActions.POINT_UP);
this.soundValues(1, 1.1f, 0.2f);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/Freeze.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.MagicDamage;
@@ -14,7 +15,6 @@ import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.monster.EntityMagmaCube;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
public class Freeze extends SpellRay {
public Freeze(){
super("freeze", false, EnumAction.NONE);
super("freeze", false, SpellActions.POINT);
this.soundValues(1, 1.4f, 0.4f);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
this.hitLiquids(true);
src/main/java/electroblob/wizardry/spell/FreezingWeapon.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryEnchantments;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -24,7 +24,7 @@ public class FreezingWeapon extends Spell {
public static final String FREEZING_ARROW_NBT_KEY = "frostLevel";
public FreezingWeapon(){
super("freezing_weapon", EnumAction.BOW, false);
super("freezing_weapon", SpellActions.IMBUE, false);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/FrostRay.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.MagicDamage;
@@ -13,7 +14,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntityBlaze;
import net.minecraft.entity.monster.EntityMagmaCube;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
@@ -25,7 +25,7 @@ import net.minecraft.world.World;
public class FrostRay extends SpellRay {
public FrostRay(){
super("frost_ray", true, EnumAction.NONE);
super("frost_ray", true, SpellActions.POINT);
this.particleVelocity(1);
this.particleSpacing(0.5);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
src/main/java/electroblob/wizardry/spell/Glide.java
+2 -2
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardrySounds;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -18,7 +18,7 @@ public class Glide extends Spell {
public static final String ACCELERATION = "acceleration";
public Glide(){
super("glide", EnumAction.NONE, true);
super("glide", SpellActions.POINT_DOWN, true);
addProperties(SPEED, FALL_SPEED, ACCELERATION);
}
src/main/java/electroblob/wizardry/spell/Grapple.java
+2 -2
View File
@@ -5,6 +5,7 @@ import electroblob.wizardry.data.IVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.Spells;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -17,7 +18,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.network.play.server.SPacketEntityVelocity;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
@@ -54,7 +54,7 @@ public class Grapple extends Spell {
protected static final double PARTICLE_JITTER = 0.04;
public Grapple(){
super("grapple", EnumAction.NONE, true);
super("grapple", SpellActions.GRAPPLE, true);
addProperties(RANGE, EXTENSION_SPEED, REEL_SPEED);
}
src/main/java/electroblob/wizardry/spell/GreaterTelekinesis.java
+2 -2
View File
@@ -3,6 +3,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.EntityLevitatingBlock;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -14,7 +15,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityTNTPrimed;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.network.play.server.SPacketEntityVelocity;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
@@ -35,7 +35,7 @@ public class GreaterTelekinesis extends SpellRay {
private static final float UNDERSHOOT = 0.2f;
public GreaterTelekinesis(){
super("greater_telekinesis", true, EnumAction.NONE);
super("greater_telekinesis", true, SpellActions.POINT);
this.aimAssist(0.4f);
this.particleSpacing(1);
this.particleJitter(0.05);
src/main/java/electroblob/wizardry/spell/GroupHeal.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.AllyDesignationSystem;
import electroblob.wizardry.util.ParticleBuilder;
@@ -7,7 +8,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
@@ -16,7 +16,7 @@ import java.util.List;
public class GroupHeal extends Spell {
public GroupHeal(){
super("group_heal", EnumAction.BOW, false);
super("group_heal", SpellActions.POINT_UP, false);
this.soundValues(0.7f, 1.2f, 0.4f);
addProperties(EFFECT_RADIUS, HEALTH);
}
src/main/java/electroblob/wizardry/spell/GrowthAura.java
+2 -2
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.block.IGrowable;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemDye;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
@@ -18,7 +18,7 @@ import java.util.List;
public class GrowthAura extends Spell {
public GrowthAura(){
super("growth_aura", EnumAction.NONE, false);
super("growth_aura", SpellActions.POINT_DOWN, false);
addProperties(EFFECT_RADIUS);
soundValues(0.7f, 1.2f, 0.2f);
}
src/main/java/electroblob/wizardry/spell/HealAlly.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -15,7 +15,7 @@ import net.minecraft.world.World;
public class HealAlly extends SpellRay {
public HealAlly(){
super("heal_ally", false, EnumAction.NONE);
super("heal_ally", false, SpellActions.POINT);
this.soundValues(0.7f, 1.2f, 0.4f);
addProperties(HEALTH);
}
src/main/java/electroblob/wizardry/spell/IceAge.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.block.BlockStatue;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardrySounds;
@@ -11,7 +12,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
@@ -22,7 +22,7 @@ import java.util.List;
public class IceAge extends Spell {
public IceAge(){
super("ice_age", EnumAction.BOW, false);
super("ice_age", SpellActions.POINT_DOWN, false);
this.soundValues(0.7f, 1.0f, 0);
addProperties(EFFECT_RADIUS, EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/IceStatue.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.block.BlockStatue;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -19,7 +19,7 @@ import net.minecraft.world.World;
public class IceStatue extends SpellRay {
public IceStatue(){
super("ice_statue", false, EnumAction.NONE);
super("ice_statue", false, SpellActions.POINT);
this.soundValues(1, 1.4f, 0.4f);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/Ignite.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -9,7 +10,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
public class Ignite extends SpellRay {
public Ignite(){
super("ignite", false, EnumAction.NONE);
super("ignite", false, SpellActions.POINT);
this.soundValues(1, 1, 0.4f);
addProperties(BURN_DURATION);
}
src/main/java/electroblob/wizardry/spell/ImbueWeapon.java
+2 -5
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.Settings;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryEnchantments;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -12,20 +13,16 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemBow;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
import org.apache.commons.lang3.tuple.Pair;
import java.util.Arrays;
public class ImbueWeapon extends Spell {
public ImbueWeapon(){
super("imbue_weapon", EnumAction.BOW, false);
super("imbue_weapon", SpellActions.IMBUE, false);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/Intimidate.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.ParticleBuilder;
@@ -11,7 +12,6 @@ import net.minecraft.entity.EntityCreature;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.ai.RandomPositionGenerator;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.pathfinding.PathPoint;
import net.minecraft.potion.PotionEffect;
@@ -36,7 +36,7 @@ public class Intimidate extends Spell {
private static final double AVOID_DISTANCE_PER_LEVEL = 4;
public Intimidate(){
super("intimidate", EnumAction.BOW, false);
super("intimidate", SpellActions.SUMMON, false);
addProperties(EFFECT_RADIUS, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/InvigoratingPresence.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.AllyDesignationSystem;
import electroblob.wizardry.util.ParticleBuilder;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.MathHelper;
@@ -20,7 +20,7 @@ import java.util.List;
public class InvigoratingPresence extends Spell {
public InvigoratingPresence(){
super("invigorating_presence", EnumAction.BOW, false);
super("invigorating_presence", SpellActions.POINT_UP, false);
this.soundValues(0.7f, 1.2f, 0.4f);
addProperties(EFFECT_RADIUS, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/InvokeWeather.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.text.TextComponentTranslation;
import net.minecraft.world.World;
@@ -18,7 +18,7 @@ public class InvokeWeather extends Spell {
public static final String THUNDERSTORM_CHANCE = "thunderstorm_chance";
public InvokeWeather(){
super("invoke_weather", EnumAction.BOW, false);
super("invoke_weather", SpellActions.POINT_UP, false);
addProperties(THUNDERSTORM_CHANCE);
soundValues(0.5f, 1, 0);
}
src/main/java/electroblob/wizardry/spell/Levitation.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundEvent;
import net.minecraft.world.World;
@@ -17,7 +17,7 @@ public class Levitation extends Spell {
public static final String ACCELERATION = "acceleration";
public Levitation(){
super("levitation", EnumAction.BOW, true);
super("levitation", SpellActions.POINT_DOWN, true);
addProperties(SPEED, ACCELERATION);
soundValues(0.5f, 1, 0);
}
src/main/java/electroblob/wizardry/spell/LifeDrain.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
import electroblob.wizardry.util.ParticleBuilder;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -20,7 +20,7 @@ public class LifeDrain extends SpellRay {
public static final String HEAL_FACTOR = "heal_factor";
public LifeDrain(){
super("life_drain", true, EnumAction.NONE);
super("life_drain", true, SpellActions.POINT);
this.particleVelocity(-0.5);
this.particleSpacing(0.4);
addProperties(DAMAGE, HEAL_FACTOR);
src/main/java/electroblob/wizardry/spell/Light.java
+3 -4
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.tileentity.TileEntityTimer;
import electroblob.wizardry.util.RayTracer;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.RayTraceResult;
@@ -16,7 +16,7 @@ import net.minecraft.world.World;
public class Light extends Spell {
public Light(){
super("light", EnumAction.NONE, false);
super("light", SpellActions.POINT, false);
addProperties(RANGE, DURATION);
}
@@ -47,7 +47,6 @@ public class Light extends Spell {
}
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
@@ -68,7 +67,7 @@ public class Light extends Spell {
((TileEntityTimer)world.getTileEntity(pos)).setLifetime(lifetime);
}
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
src/main/java/electroblob/wizardry/spell/LightningBolt.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -20,7 +20,7 @@ public class LightningBolt extends SpellRay {
public static final String NBT_KEY = "summoningPlayer";
public LightningBolt(){
super("lightning_bolt", false, EnumAction.NONE);
super("lightning_bolt", false, SpellActions.POINT);
this.ignoreLivingEntities(true);
}
src/main/java/electroblob/wizardry/spell/LightningPulse.java
+3 -4
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -7,7 +8,6 @@ import electroblob.wizardry.util.ParticleBuilder.Type;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.network.play.server.SPacketEntityVelocity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.SoundEvent;
@@ -21,7 +21,7 @@ public class LightningPulse extends Spell {
public static final String REPULSION_VELOCITY = "repulsion_velocity";
public LightningPulse(){
super("lightning_pulse", EnumAction.NONE, false);
super("lightning_pulse", SpellActions.POINT_DOWN, false);
addProperties(EFFECT_RADIUS, DAMAGE, REPULSION_VELOCITY);
this.soundValues(2, 1, 0);
}
@@ -74,8 +74,7 @@ public class LightningPulse extends Spell {
+ WizardryUtilities.ANTI_Z_FIGHTING_OFFSET, caster.posZ)
.scale(modifiers.get(WizardryItems.blast_upgrade)).spawn(world);
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
src/main/java/electroblob/wizardry/spell/LightningRay.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
import electroblob.wizardry.util.ParticleBuilder;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -20,7 +20,7 @@ import net.minecraft.world.World;
public class LightningRay extends SpellRay {
public LightningRay(){
super("lightning_ray", true, EnumAction.NONE);
super("lightning_ray", true, SpellActions.POINT);
this.aimAssist(0.6f);
addProperties(DAMAGE);
}
src/main/java/electroblob/wizardry/spell/LightningWeb.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
import electroblob.wizardry.util.ParticleBuilder.Type;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -29,7 +29,7 @@ public class LightningWeb extends SpellRay {
public static final String TERTIARY_MAX_TARGETS = "tertiary_max_targets"; // This is per secondary target
public LightningWeb(){
super("lightning_web", true, EnumAction.NONE);
super("lightning_web", true, SpellActions.POINT);
this.aimAssist(0.6f);
addProperties(PRIMARY_DAMAGE, SECONDARY_DAMAGE, TERTIARY_DAMAGE, SECONDARY_RANGE, TERTIARY_RANGE,
SECONDARY_MAX_TARGETS, TERTIARY_MAX_TARGETS);
src/main/java/electroblob/wizardry/spell/Metamorphosis.java
+2 -2
View File
@@ -4,6 +4,7 @@ import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.living.*;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.NBTExtras;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -14,7 +15,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.*;
import net.minecraft.entity.passive.*;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -49,7 +49,7 @@ public class Metamorphosis extends SpellRay {
}
public Metamorphosis(){
super("metamorphosis", false, EnumAction.NONE);
super("metamorphosis", false, SpellActions.POINT);
this.soundValues(0.5f, 1f, 0);
}
src/main/java/electroblob/wizardry/spell/Meteor.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.EntityMeteor;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -18,7 +18,7 @@ public class Meteor extends SpellRay {
public static final String BLAST_STRENGTH = "blast_strength";
public Meteor(){
super("meteor", false, EnumAction.NONE);
super("meteor", false, SpellActions.POINT);
this.soundValues(3, 1, 0);
this.ignoreLivingEntities(true);
addProperties(BLAST_STRENGTH);
src/main/java/electroblob/wizardry/spell/MindControl.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.living.EntityEvilWizard;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.registry.WizardrySounds;
@@ -15,7 +16,6 @@ import net.minecraft.entity.item.EntityArmorStand;
import net.minecraft.entity.passive.EntitySheep;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.SoundEvents;
import net.minecraft.item.EnumAction;
import net.minecraft.item.EnumDyeColor;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.potion.PotionEffect;
@@ -40,7 +40,7 @@ public class MindControl extends SpellRay {
public static final String NBT_KEY = "controllingEntity";
public MindControl(){
super("mind_control", false, EnumAction.NONE);
super("mind_control", false, SpellActions.POINT);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/MindTrick.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.ParticleBuilder;
@@ -11,7 +12,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -26,7 +26,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
public class MindTrick extends SpellRay {
public MindTrick(){
super("mind_trick", false, EnumAction.NONE);
super("mind_trick", false, SpellActions.POINT);
this.soundValues(0.7f, 1, 0.4f);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/Mine.java
+2 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.ISpellCastingItem;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -15,7 +16,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@@ -39,7 +39,7 @@ public class Mine extends SpellRay {
}
public Mine(){
super("mine", false, EnumAction.NONE);
super("mine", false, SpellActions.POINT);
this.ignoreLivingEntities(true);
this.particleSpacing(0.5);
}
src/main/java/electroblob/wizardry/spell/Paralysis.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.Spells;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
@@ -13,7 +14,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -34,7 +34,7 @@ public class Paralysis extends SpellRay {
private static final String CRITICAL_HEALTH = "critical_health";
public Paralysis(){
super("paralysis", false, EnumAction.NONE);
super("paralysis", false, SpellActions.POINT);
addProperties(DAMAGE, EFFECT_DURATION, CRITICAL_HEALTH);
}
src/main/java/electroblob/wizardry/spell/Petrify.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.block.BlockStatue;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -21,7 +21,7 @@ public class Petrify extends SpellRay {
public static final String MINIMUM_EFFECT_DURATION = "minimum_effect_duration";
public Petrify(){
super("petrify", false, EnumAction.NONE);
super("petrify", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
addProperties(MINIMUM_EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/PhaseStep.java
+2 -3
View File
@@ -2,12 +2,12 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.RayTracer;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -21,7 +21,7 @@ public class PhaseStep extends Spell {
public static final String WALL_THICKNESS = "wall_thickness";
public PhaseStep(){
super("phase_step", EnumAction.NONE, false);
super("phase_step", SpellActions.POINT, false);
addProperties(RANGE, WALL_THICKNESS);
}
@@ -78,7 +78,6 @@ public class PhaseStep extends Spell {
caster.setPositionAndUpdate(pos1.getX() + 0.5, pos1.getY() + 0.5, pos1.getZ() + 0.5);
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
src/main/java/electroblob/wizardry/spell/PlagueOfDarkness.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -9,7 +10,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -20,7 +20,7 @@ import java.util.List;
public class PlagueOfDarkness extends Spell {
public PlagueOfDarkness(){
super("plague_of_darkness", EnumAction.BOW, false);
super("plague_of_darkness", SpellActions.POINT_DOWN, false);
addProperties(EFFECT_RADIUS, DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
soundValues(1, 1.1f, 0.2f);
}
src/main/java/electroblob/wizardry/spell/PocketFurnace.java
+6 -2
View File
@@ -2,10 +2,14 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Settings;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.*;
import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack;
import net.minecraft.item.ItemSword;
import net.minecraft.item.ItemTool;
import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -16,7 +20,7 @@ public class PocketFurnace extends Spell {
public static final String ITEMS_SMELTED = "items_smelted";
public PocketFurnace(){
super("pocket_furnace", EnumAction.BOW, false);
super("pocket_furnace", SpellActions.IMBUE, false);
addProperties(ITEMS_SMELTED);
soundValues(1, 0.75f, 0);
}
src/main/java/electroblob/wizardry/spell/PocketWorkbench.java
+2 -2
View File
@@ -2,16 +2,16 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.WizardryGuiHandler;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
public class PocketWorkbench extends Spell {
public PocketWorkbench(){
super("pocket_workbench", EnumAction.BOW, false);
super("pocket_workbench", SpellActions.IMBUE, false);
}
@Override
src/main/java/electroblob/wizardry/spell/Poison.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -12,7 +13,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -23,7 +23,7 @@ import net.minecraft.world.World;
public class Poison extends SpellRay {
public Poison(){
super("poison", false, EnumAction.NONE);
super("poison", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
}
src/main/java/electroblob/wizardry/spell/Possession.java
+3 -3
View File
@@ -11,6 +11,7 @@ import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.entity.living.*;
import electroblob.wizardry.entity.projectile.*;
import electroblob.wizardry.integration.DamageSafetyChecker;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.packet.PacketControlInput;
import electroblob.wizardry.packet.PacketPossession;
import electroblob.wizardry.packet.WizardryPacketHandler;
@@ -38,7 +39,6 @@ import net.minecraft.init.Enchantments;
import net.minecraft.init.Items;
import net.minecraft.init.PotionTypes;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemBow;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagList;
@@ -121,7 +121,7 @@ public class Possession extends SpellRay {
}
public Possession(){
super("possession", false, EnumAction.NONE);
super("possession", false, SpellActions.POINT);
addProperties(EFFECT_DURATION, CRITICAL_HEALTH);
}
@@ -146,7 +146,7 @@ public class Possession extends SpellRay {
if(!shootSpell(world, origin, look, caster, ticksInUse, modifiers)) return false;
if(casterSwingsArm(world, caster, hand, ticksInUse, modifiers)) caster.swingArm(hand);
// if(casterSwingsArm(world, caster, hand, ticksInUse, modifiers)) caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers, "possess"); // TODO: There must be a better way...
return true;
}
src/main/java/electroblob/wizardry/spell/RayOfPurification.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -11,7 +12,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
@@ -27,7 +27,7 @@ public class RayOfPurification extends SpellRay {
public static final String UNDEAD_DAMAGE_MULTIPLIER = "undead_damage_multiplier";
public RayOfPurification(){
super("ray_of_purification", true, EnumAction.NONE);
super("ray_of_purification", true, SpellActions.POINT);
addProperties(DAMAGE, EFFECT_DURATION, BURN_DURATION, UNDEAD_DAMAGE_MULTIPLIER);
}
src/main/java/electroblob/wizardry/spell/Resurrection.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.ISpellCastingItem;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.packet.PacketResurrection;
import electroblob.wizardry.packet.WizardryPacketHandler;
import electroblob.wizardry.registry.Spells;
@@ -10,7 +11,6 @@ import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.MathHelper;
@@ -28,7 +28,7 @@ public class Resurrection extends Spell {
private static final String POTION_CORE_FIX_NBT_KEY = "Potion Core - Health Fix";
public Resurrection(){
super("resurrection", EnumAction.NONE, false);
super("resurrection", SpellActions.SUMMON, false);
addProperties(EFFECT_RADIUS, WAIT_TIME);
}
src/main/java/electroblob/wizardry/spell/Reversal.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
@@ -24,7 +24,7 @@ public class Reversal extends SpellRay {
public static final String REVERSED_EFFECTS = "reversed_effects";
public Reversal(){
super("reversal", false, EnumAction.NONE);
super("reversal", false, SpellActions.POINT);
addProperties(REVERSED_EFFECTS);
}
src/main/java/electroblob/wizardry/spell/Shockwave.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -11,7 +12,6 @@ import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.network.play.server.SPacketEntityVelocity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.EnumParticleTypes;
@@ -27,7 +27,7 @@ public class Shockwave extends Spell {
private static final double EPICENTRE_RADIUS = 1;
public Shockwave(){
super("shockwave", EnumAction.BOW, false);
super("shockwave", SpellActions.POINT_DOWN, false);
this.soundValues(2, 0.5f, 0);
addProperties(BLAST_RADIUS, DAMAGE, MAX_REPULSION_VELOCITY);
}
src/main/java/electroblob/wizardry/spell/ShulkerBullet.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.NBTExtras;
import electroblob.wizardry.util.SpellModifiers;
@@ -10,7 +11,6 @@ import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityArmorStand;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.projectile.EntityShulkerBullet;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTUtil;
import net.minecraft.tileentity.TileEntityDispenser;
@@ -26,7 +26,7 @@ import java.util.List;
public class ShulkerBullet extends Spell {
public ShulkerBullet(){
super("shulker_bullet", EnumAction.NONE, false);
super("shulker_bullet", SpellActions.POINT_DOWN, false);
this.soundValues(2, 1, 0.3f);
addProperties(RANGE);
}
src/main/java/electroblob/wizardry/spell/SixthSense.java
+2 -2
View File
@@ -2,11 +2,11 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.constants.Constants;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ResourceLocation;
@@ -22,7 +22,7 @@ public class SixthSense extends Spell {
public static final ResourceLocation SHADER = new ResourceLocation(Wizardry.MODID, "shaders/post/sixth_sense.json");
public SixthSense(){
super("sixth_sense", EnumAction.BOW, false);
super("sixth_sense", SpellActions.POINT_UP, false);
addProperties(EFFECT_DURATION, EFFECT_RADIUS);
soundValues(1, 1.1f, 0.2f);
}
src/main/java/electroblob/wizardry/spell/Slime.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.living.EntityMagicSlime;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -10,7 +11,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.monster.EntitySlime;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
import net.minecraft.util.math.BlockPos;
@@ -21,7 +21,7 @@ import net.minecraft.world.World;
public class Slime extends SpellRay {
public Slime(){
super("slime", false, EnumAction.NONE);
super("slime", false, SpellActions.POINT);
addProperties(DURATION);
}
src/main/java/electroblob/wizardry/spell/Snare.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.tileentity.TileEntityPlayerSave;
import electroblob.wizardry.util.ParticleBuilder;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.Vec3d;
@@ -17,7 +17,7 @@ import net.minecraft.world.World;
public class Snare extends SpellRay {
public Snare(){
super("snare", false, EnumAction.NONE);
super("snare", false, SpellActions.POINT);
this.soundValues(1, 1.4f, 0.4f);
this.ignoreLivingEntities(true);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
src/main/java/electroblob/wizardry/spell/SpectralPathway.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.tileentity.TileEntityTimer;
@@ -7,7 +8,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.Blocks;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumFacing.AxisDirection;
import net.minecraft.util.EnumHand;
@@ -20,7 +20,7 @@ public class SpectralPathway extends Spell {
public static final String LENGTH = "length";
public SpectralPathway(){
super("spectral_pathway", EnumAction.BOW, false);
super("spectral_pathway", SpellActions.POINT, false);
addProperties(LENGTH, DURATION);
}
src/main/java/electroblob/wizardry/spell/SpeedTime.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.SpellModifiers;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.EnumHand;
import net.minecraft.util.ITickable;
@@ -32,7 +32,7 @@ public class SpeedTime extends Spell {
public static final String EXTRA_TICKS = "extra_ticks";
public SpeedTime(){
super("speed_time", EnumAction.BOW, true);
super("speed_time", SpellActions.POINT_UP, true);
addProperties(EFFECT_RADIUS, TIME_INCREMENT, EXTRA_TICKS);
}
src/main/java/electroblob/wizardry/spell/SpellArrow.java
+2 -4
View File
@@ -4,13 +4,13 @@ import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.living.ISpellCaster;
import electroblob.wizardry.entity.projectile.EntityMagicArrow;
import electroblob.wizardry.entity.projectile.EntityMagicProjectile;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@@ -56,7 +56,7 @@ public class SpellArrow<T extends EntityMagicArrow> extends Spell {
}
public SpellArrow(String modID, String name, Function<World, T> arrowFactory){
super(modID, name, EnumAction.NONE, false);
super(modID, name, SpellActions.POINT, false);
this.arrowFactory = arrowFactory;
this.addProperties(RANGE);
this.npcSelector((e, o) -> true);
@@ -101,8 +101,6 @@ public class SpellArrow<T extends EntityMagicArrow> extends Spell {
// Spawns the projectile in the world
world.spawnEntity(projectile);
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
src/main/java/electroblob/wizardry/spell/SpellBuff.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -8,7 +9,6 @@ import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.Potion;
import net.minecraft.potion.PotionEffect;
import net.minecraft.tileentity.TileEntityDispenser;
@@ -63,7 +63,7 @@ public class SpellBuff extends Spell {
@SafeVarargs
public SpellBuff(String modID, String name, float r, float g, float b, Supplier<Potion>... effects){
super(modID, name, EnumAction.BOW, false);
super(modID, name, SpellActions.POINT_UP, false);
this.effects = effects;
this.r = r;
this.g = g;
src/main/java/electroblob/wizardry/spell/SpellConjuration.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.IConjuredItem;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumHand;
@@ -46,7 +46,7 @@ public class SpellConjuration extends Spell {
}
public SpellConjuration(String modID, String name, Item item){
super(modID, name, EnumAction.BOW, false);
super(modID, name, SpellActions.IMBUE, false);
this.item = item;
addProperties(ITEM_LIFETIME);
}
src/main/java/electroblob/wizardry/spell/SpellConstructRanged.java
+3 -4
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.construct.EntityMagicConstruct;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.RayTracer;
import electroblob.wizardry.util.SpellModifiers;
@@ -9,7 +10,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@@ -53,7 +53,7 @@ public class SpellConstructRanged<T extends EntityMagicConstruct> extends SpellC
}
public SpellConstructRanged(String modID, String name, Function<World, T> constructFactory, boolean permanent){
super(modID, name, EnumAction.NONE, constructFactory, permanent);
super(modID, name, SpellActions.POINT, constructFactory, permanent);
this.addProperties(RANGE);
this.npcSelector((e, o) -> true);
}
@@ -118,8 +118,7 @@ public class SpellConstructRanged<T extends EntityMagicConstruct> extends SpellC
}else{
return false;
}
caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
src/main/java/electroblob/wizardry/spell/SpellMinion.java
+2 -2
View File
@@ -2,6 +2,7 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.entity.living.ISummonedCreature;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
@@ -13,7 +14,6 @@ import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.IAttributeInstance;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.tileentity.TileEntityDispenser;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@@ -64,7 +64,7 @@ public class SpellMinion<T extends EntityLiving & ISummonedCreature> extends Spe
}
public SpellMinion(String modID, String name, Function<World, T> minionFactory){
super(modID, name, EnumAction.BOW, false);
super(modID, name, SpellActions.SUMMON, false);
this.minionFactory = minionFactory;
addProperties(MINION_LIFETIME, MINION_COUNT, SUMMON_RADIUS);
this.npcSelector((e, o) -> true);
src/main/java/electroblob/wizardry/spell/SpellRay.java
+7 -3
View File
@@ -161,10 +161,13 @@ public abstract class SpellRay extends Spell {
Vec3d look = caster.getLookVec();
Vec3d origin = new Vec3d(caster.posX, caster.getEntityBoundingBox().minY + caster.getEyeHeight() - Y_OFFSET, caster.posZ);
if(!this.isContinuous && world.isRemote && !Wizardry.proxy.isFirstPerson(caster)){
origin = origin.add(look.scale(1.2));
}
if(!shootSpell(world, origin, look, caster, ticksInUse, modifiers)) return false;
if(casterSwingsArm(world, caster, hand, ticksInUse, modifiers)) caster.swingArm(hand);
//if(casterSwingsArm(world, caster, hand, ticksInUse, modifiers)) caster.swingArm(hand);
this.playSound(world, caster, ticksInUse, -1, modifiers);
return true;
}
@@ -249,7 +252,7 @@ public abstract class SpellRay extends Spell {
protected boolean casterSwingsArm(World world, EntityLivingBase caster, EnumHand hand, int ticksInUse, SpellModifiers modifiers){
return !this.isContinuous;
}
/** Takes care of the shared stuff for the three casting methods. This is mainly for internal use. */
protected boolean shootSpell(World world, Vec3d origin, Vec3d direction, @Nullable EntityLivingBase caster, int ticksInUse, SpellModifiers modifiers){
@@ -267,6 +270,7 @@ public abstract class SpellRay extends Spell {
// Doesn't matter which way round these are, they're mutually exclusive
if(rayTrace.typeOfHit == RayTraceResult.Type.ENTITY){
// Do whatever the spell does when it hits an entity
// FIXME: Some spells (e.g. lightning web) seem to not render when aimed at item frames
flag = onEntityHit(world, rayTrace.entityHit, rayTrace.hitVec, caster, origin, ticksInUse, modifiers);
// If the spell succeeded, clip the particles to the correct distance so they don't go through the entity
if(flag) range = origin.distanceTo(rayTrace.hitVec);
src/main/java/electroblob/wizardry/spell/SummonIronGolem.java
+2 -2
View File
@@ -1,12 +1,12 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.monster.EntityIronGolem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -14,7 +14,7 @@ import net.minecraft.world.World;
public class SummonIronGolem extends Spell {
public SummonIronGolem(){
super("summon_iron_golem", EnumAction.BOW, false);
super("summon_iron_golem", SpellActions.SUMMON, false);
addProperties(SpellMinion.SUMMON_RADIUS);
soundValues(1, 1.1f, 0.2f);
}
src/main/java/electroblob/wizardry/spell/SummonSnowGolem.java
+2 -2
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.ParticleBuilder;
import electroblob.wizardry.util.ParticleBuilder.Type;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.monster.EntitySnowman;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -15,7 +15,7 @@ import net.minecraft.world.World;
public class SummonSnowGolem extends Spell {
public SummonSnowGolem(){
super("summon_snow_golem", EnumAction.BOW, false);
super("summon_snow_golem", SpellActions.SUMMON, false);
this.soundValues(1, 1, 0.4f);
addProperties(SpellMinion.SUMMON_RADIUS);
}
src/main/java/electroblob/wizardry/spell/SummonSpiritHorse.java
+2 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.data.IStoredVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.entity.living.EntitySpiritHorse;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import electroblob.wizardry.util.WizardryUtilities.Operations;
@@ -13,7 +14,6 @@ import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.ai.attributes.IAttribute;
import net.minecraft.entity.passive.AbstractHorse;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -36,7 +36,7 @@ public class SummonSpiritHorse extends Spell {
public static final IStoredVariable<UUID> UUID_KEY = IStoredVariable.StoredVariable.ofUUID("spiritHorseUUID", Persistence.ALWAYS);
public SummonSpiritHorse(){
super("summon_spirit_horse", EnumAction.BOW, false);
super("summon_spirit_horse", SpellActions.SUMMON, false);
addProperties(SpellMinion.SUMMON_RADIUS);
soundValues(0.7f, 1.2f, 0.4f);
WizardData.registerStoredVariables(UUID_KEY);
src/main/java/electroblob/wizardry/spell/SummonSpiritWolf.java
+2 -2
View File
@@ -4,6 +4,7 @@ import electroblob.wizardry.data.IStoredVariable;
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.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import electroblob.wizardry.util.WizardryUtilities.Operations;
@@ -11,7 +12,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.SharedMonsterAttributes;
import net.minecraft.entity.ai.attributes.AttributeModifier;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;
@@ -26,7 +26,7 @@ public class SummonSpiritWolf extends Spell {
public static final IStoredVariable<UUID> UUID_KEY = IStoredVariable.StoredVariable.ofUUID("spiritWolfUUID", Persistence.ALWAYS);
public SummonSpiritWolf(){
super("summon_spirit_wolf", EnumAction.BOW, false);
super("summon_spirit_wolf", SpellActions.SUMMON, false);
addProperties(SpellMinion.SUMMON_RADIUS);
soundValues(0.7f, 1.2f, 0.4f);
WizardData.registerStoredVariables(UUID_KEY);
src/main/java/electroblob/wizardry/spell/Telekinesis.java
+2 -2
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.item.ItemStack;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumHand;
@@ -18,7 +18,7 @@ import net.minecraft.world.World;
public class Telekinesis extends SpellRay {
public Telekinesis(){
super("telekinesis", false, EnumAction.NONE);
super("telekinesis", false, SpellActions.POINT);
}
@Override public boolean requiresPacket(){ return false; }
src/main/java/electroblob/wizardry/spell/Thunderstorm.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.*;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -8,7 +9,6 @@ import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
@@ -32,7 +32,7 @@ public class Thunderstorm extends Spell {
private static final float CENTRE_RADIUS_FRACTION = 0.5f;
public Thunderstorm(){
super("thunderstorm", EnumAction.BOW, false);
super("thunderstorm", SpellActions.POINT_UP, false);
this.soundValues(1, 1.7f, 0.2f);
addProperties(EFFECT_RADIUS, LIGHTNING_BOLTS, SECONDARY_DAMAGE, TERTIARY_DAMAGE, SECONDARY_RANGE,
TERTIARY_RANGE, SECONDARY_MAX_TARGETS, TERTIARY_MAX_TARGETS);
src/main/java/electroblob/wizardry/spell/Tornado.java
+2 -2
View File
@@ -1,9 +1,9 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.entity.construct.EntityTornado;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.Vec3d;
@@ -13,7 +13,7 @@ public class Tornado extends SpellConstruct<EntityTornado> {
public static final String UPWARD_ACCELERATION = "upward_acceleration";
public Tornado(){
super("tornado", EnumAction.NONE, EntityTornado::new, false);
super("tornado", SpellActions.POINT, EntityTornado::new, false);
addProperties(EFFECT_RADIUS, SPEED, DAMAGE, UPWARD_ACCELERATION);
}
src/main/java/electroblob/wizardry/spell/Transience.java
+2 -2
View File
@@ -1,13 +1,13 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardryPotions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.DamageSource;
import net.minecraft.util.EnumHand;
@@ -26,7 +26,7 @@ public class Transience extends Spell {
public static final ResourceLocation SHADER = new ResourceLocation(Wizardry.MODID, "shaders/post/transience.json");
public Transience(){
super("transience", EnumAction.BOW, false);
super("transience", SpellActions.POINT_UP, false);
addProperties(EFFECT_DURATION);
}
src/main/java/electroblob/wizardry/spell/Transportation.java
+2 -2
View File
@@ -5,6 +5,7 @@ import electroblob.wizardry.data.IStoredVariable;
import electroblob.wizardry.data.Persistence;
import electroblob.wizardry.data.WizardData;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.packet.PacketTransportation;
import electroblob.wizardry.packet.WizardryPacketHandler;
import electroblob.wizardry.registry.WizardryItems;
@@ -14,7 +15,6 @@ import electroblob.wizardry.util.SpellModifiers;
import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumHand;
@@ -41,7 +41,7 @@ public class Transportation extends Spell {
public static final IStoredVariable<Integer> COUNTDOWN_KEY = IStoredVariable.StoredVariable.ofInt("tpCountdown", Persistence.NEVER).withTicker(Transportation::update);
public Transportation(){
super("transportation", EnumAction.BOW, false);
super("transportation", SpellActions.POINT_UP, false);
addProperties(TELEPORT_COUNTDOWN);
WizardData.registerStoredVariables(LOCATIONS_KEY, COUNTDOWN_KEY);
}
src/main/java/electroblob/wizardry/spell/VanishingBox.java
+2 -2
View File
@@ -1,16 +1,16 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.InventoryEnderChest;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumHand;
import net.minecraft.world.World;
public class VanishingBox extends Spell {
public VanishingBox(){
super("vanishing_box", EnumAction.BOW, false);
super("vanishing_box", SpellActions.POINT_UP, false);
}
@Override public boolean requiresPacket(){ return false; }
src/main/java/electroblob/wizardry/spell/WallOfFrost.java
+2 -2
View File
@@ -1,6 +1,7 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.block.BlockStatue;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryBlocks;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.registry.WizardrySounds;
@@ -11,7 +12,6 @@ import electroblob.wizardry.util.WizardryUtilities;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.item.EnumAction;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.SoundEvent;
import net.minecraft.util.math.BlockPos;
@@ -23,7 +23,7 @@ public class WallOfFrost extends SpellRay {
private static final int MINIMUM_PLACEMENT_RANGE = 2;
public WallOfFrost(){
super("wall_of_frost", true, EnumAction.NONE);
super("wall_of_frost", true, SpellActions.POINT);
this.particleVelocity(1);
this.particleSpacing(0.5);
addProperties(DURATION);
src/main/java/electroblob/wizardry/spell/Whirlwind.java
+2 -2
View File
@@ -2,13 +2,13 @@ package electroblob.wizardry.spell;
import electroblob.wizardry.Wizardry;
import electroblob.wizardry.item.ItemArtefact;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.SpellModifiers;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.EnumAction;
import net.minecraft.network.play.server.SPacketEntityVelocity;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.EnumParticleTypes;
@@ -22,7 +22,7 @@ public class Whirlwind extends SpellRay {
public static final String REPULSION_VELOCITY = "repulsion_velocity";
public Whirlwind(){
super("whirlwind", false, EnumAction.NONE);
super("whirlwind", false, SpellActions.POINT);
this.soundValues(0.8f, 0.7f, 0.2f);
addProperties(REPULSION_VELOCITY);
}
src/main/java/electroblob/wizardry/spell/Wither.java
+2 -2
View File
@@ -1,5 +1,6 @@
package electroblob.wizardry.spell;
import electroblob.wizardry.item.SpellActions;
import electroblob.wizardry.registry.WizardryItems;
import electroblob.wizardry.util.MagicDamage;
import electroblob.wizardry.util.MagicDamage.DamageType;
@@ -11,7 +12,6 @@ import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.init.MobEffects;
import net.minecraft.item.EnumAction;
import net.minecraft.potion.PotionEffect;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
@@ -22,7 +22,7 @@ import net.minecraft.world.World;
public class Wither extends SpellRay {
public Wither(){
super("wither", false, EnumAction.NONE);
super("wither", false, SpellActions.POINT);
this.soundValues(1, 1.1f, 0.2f);
addProperties(DAMAGE, EFFECT_DURATION, EFFECT_STRENGTH);
}