lauchmelder/BloodMagic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Performance Commit --Too lazy to do the Altar recipe

Browse source
This commit is contained in:
Arcaratus 2015-07-02 11:05:07 -04:00
parent 013367cffa
commit e5b795fddc
217 changed files with 840 additions and 1244 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/WayofTime/alchemicalWizardry/api/spell/APISpellHelper.java
View file

@ -238,12 +238,11 @@ public class APISpellHelper
float f6 = MathHelper.sin(-f1 * 0.017453292F);
float f7 = f4 * f5;
float f8 = f3 * f5;
double d3 = range;
if (player instanceof EntityPlayerMP)
// if (player instanceof EntityPlayerMP)
{
// d3 = ((EntityPlayerMP) player).theItemInWorldManager.getBlockReachDistance();
}
Vec3 vec31 = vec3.addVector((double) f7 * d3, (double) f6 * d3, (double) f8 * d3);
Vec3 vec31 = vec3.addVector((double) f7 * range, (double) f6 * range, (double) f8 * range);
return world.func_147447_a(vec3, vec31, par3, !par3, par3);
}

10
src/main/java/WayofTime/alchemicalWizardry/api/spell/EntitySpellProjectile.java
View file

@ -83,7 +83,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile
@Override
protected void entityInit()
{
dataWatcher.addObject(16, Byte.valueOf((byte) 0));
dataWatcher.addObject(16, 0);
}
/**
@ -200,7 +200,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile
Block var18 = worldObj.getBlock(xTile, yTile, zTile);
int var19 = worldObj.getBlockMetadata(xTile, yTile, zTile);
if (var18.equals(Block.getBlockById(inTile)) && var19 == inData)
// if (var18.equals(Block.getBlockById(inTile)) && var19 == inData)
{
// this.groundImpact();
// this.setDead();
@ -353,7 +353,7 @@ public class EntitySpellProjectile extends Entity implements IProjectile
List<SpellEffect> spellEffectList = new LinkedList();
for (int i = 0; i < tagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i);
NBTTagCompound tag = tagList.getCompoundTagAt(i);
SpellEffect eff = SpellEffect.getEffectFromTag(tag);
if (eff != null)
@ -420,10 +420,10 @@ public class EntitySpellProjectile extends Entity implements IProjectile
byte var2 = dataWatcher.getWatchableObjectByte(16);
if (par1)
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 | 1)));
dataWatcher.updateObject(16, var2 | 1);
} else
{
dataWatcher.updateObject(16, Byte.valueOf((byte) (var2 & -2)));
dataWatcher.updateObject(16, var2 & -2);
}
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IDigAreaEffect.java
View file

@ -8,5 +8,5 @@ import net.minecraft.world.World;
public interface IDigAreaEffect
{
public abstract int digSurroundingArea(ItemStack container, World world, EntityPlayer player, MovingObjectPosition blockPos, String usedToolClass, float blockHardness, int harvestLvl, ItemSpellMultiTool itemTool);
int digSurroundingArea(ItemStack container, World world, EntityPlayer player, MovingObjectPosition blockPos, String usedToolClass, float blockHardness, int harvestLvl, ItemSpellMultiTool itemTool);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/ILeftClickEffect.java
View file

@ -5,5 +5,5 @@ import net.minecraft.item.ItemStack;
public interface ILeftClickEffect
{
public abstract int onLeftClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder);
int onLeftClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellEntityEffect.java
View file

@ -5,5 +5,5 @@ import net.minecraft.world.World;
public interface IMeleeSpellEntityEffect
{
public void onEntityImpact(World world, EntityPlayer entityPlayer);
void onEntityImpact(World world, EntityPlayer entityPlayer);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IMeleeSpellWorldEffect.java
View file

@ -5,5 +5,5 @@ import net.minecraft.world.World;
public interface IMeleeSpellWorldEffect
{
public void onWorldEffect(World world, EntityPlayer entityPlayer);
void onWorldEffect(World world, EntityPlayer entityPlayer);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBanishTool.java
View file

@ -6,5 +6,5 @@ import net.minecraft.world.World;
public interface IOnBanishTool
{
public abstract int onBanishTool(ItemStack toolStack, World world, Entity entity, int invSlot, boolean inHand);
int onBanishTool(ItemStack toolStack, World world, Entity entity, int invSlot, boolean inHand);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnBreakBlock.java
View file

@ -8,5 +8,5 @@ import net.minecraftforge.common.util.ForgeDirection;
public interface IOnBreakBlock
{
public abstract int onBlockBroken(ItemStack container, World world, EntityPlayer player, Block block, int meta, int x, int y, int z, ForgeDirection sideBroken);
int onBlockBroken(ItemStack container, World world, EntityPlayer player, Block block, int meta, int x, int y, int z, ForgeDirection sideBroken);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IOnSummonTool.java
View file

@ -6,5 +6,5 @@ import net.minecraft.world.World;
public interface IOnSummonTool
{
public abstract int onSummonTool(ItemStack toolStack, World world, Entity entity);
int onSummonTool(ItemStack toolStack, World world, Entity entity);
}

4
src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileImpactEffect.java
View file

@ -6,7 +6,7 @@ import net.minecraft.world.World;
public interface IProjectileImpactEffect
{
public void onEntityImpact(Entity mop, Entity projectile);
void onEntityImpact(Entity mop, Entity projectile);
public void onTileImpact(World world, MovingObjectPosition mop);
void onTileImpact(World world, MovingObjectPosition mop);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IProjectileUpdateEffect.java
View file

@ -4,5 +4,5 @@ import net.minecraft.entity.Entity;
public interface IProjectileUpdateEffect
{
public void onUpdateEffect(Entity projectile);
void onUpdateEffect(Entity projectile);
}

4
src/main/java/WayofTime/alchemicalWizardry/api/spell/IRightClickEffect.java
View file

@ -9,7 +9,7 @@ public interface IRightClickEffect
{
//public abstract int onRightClickEntity(ItemStack stack, EntityLivingBase attacked, EntityLivingBase weilder);
public abstract int onRightClickBlock(ItemStack stack, EntityLivingBase weilder, World world, MovingObjectPosition mop);
int onRightClickBlock(ItemStack stack, EntityLivingBase weilder, World world, MovingObjectPosition mop);
public abstract int onRightClickAir(ItemStack stack, EntityLivingBase weilder);
int onRightClickAir(ItemStack stack, EntityLivingBase weilder);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/ISelfSpellEffect.java
View file

@ -5,5 +5,5 @@ import net.minecraft.world.World;
public interface ISelfSpellEffect
{
public void onSelfUse(World world, EntityPlayer player);
void onSelfUse(World world, EntityPlayer player);
}

4
src/main/java/WayofTime/alchemicalWizardry/api/spell/ISpecialDamageEffect.java
View file

@ -4,7 +4,7 @@ import net.minecraft.entity.Entity;
public interface ISpecialDamageEffect
{
public float getDamageForEntity(Entity entity);
float getDamageForEntity(Entity entity);
public String getKey();
String getKey();
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/IToolUpdateEffect.java
View file

@ -6,5 +6,5 @@ import net.minecraft.world.World;
public interface IToolUpdateEffect
{
public abstract int onUpdate(ItemStack toolStack, World world, Entity par3Entity, int invSlot, boolean inHand);
int onUpdate(ItemStack toolStack, World world, Entity par3Entity, int invSlot, boolean inHand);
}

2
src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancement.java
View file

@ -6,7 +6,7 @@ public class SpellEnhancement
public static final int EFFICIENCY = 1;
public static final int POTENCY = 2;
private int state = this.POWER;
private int state = POWER;
protected SpellEnhancement(int state)
{

1
src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementCost.java
View file

@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell;
public class SpellEnhancementCost extends SpellEnhancement
{
public SpellEnhancementCost()
{
super(SpellEnhancement.EFFICIENCY);

1
src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPotency.java
View file

@ -6,5 +6,4 @@ public class SpellEnhancementPotency extends SpellEnhancement
{
super(SpellEnhancement.POTENCY);
}
}

1
src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellEnhancementPower.java
View file

@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell;
public class SpellEnhancementPower extends SpellEnhancement
{
public SpellEnhancementPower()
{
super(SpellEnhancement.POWER);

3
src/main/java/WayofTime/alchemicalWizardry/api/spell/SpellParadigmTool.java
View file

@ -30,7 +30,6 @@ public class SpellParadigmTool extends SpellParadigm
private List<IDigAreaEffect> digAreaEffectList;
private List<ISpecialDamageEffect> specialDamageEffectList;
private float maxDamage;
private HashMap<String, Integer> harvestLevel;
private HashMap<String, Float> digSpeed;
private HashMap<String, Float> maxDamageHash;
@ -62,8 +61,6 @@ public class SpellParadigmTool extends SpellParadigm
this.toolInfoString = new HashMap();
this.critChanceHash = new HashMap();
this.maxDamage = 5;
this.harvestLevel = new HashMap();
this.harvestLevel.put("pickaxe", -1);
this.harvestLevel.put("shovel", -1);