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

Finished (almost) everything !items

Browse source
This commit is contained in:
Arcaratus 2015-07-30 14:52:39 -04:00
parent 8eed901fcb
commit a9507b3b68
145 changed files with 1261 additions and 2156 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAnimalGrowth.java
View file

@ -133,7 +133,7 @@ public class RitualEffectAnimalGrowth extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> animalGrowthRitual = new ArrayList();
ArrayList<RitualComponent> animalGrowthRitual = new ArrayList<RitualComponent>();
animalGrowthRitual.add(new RitualComponent(0, 0, 2, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(2, 0, 0, RitualComponent.DUSK));
animalGrowthRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectApiaryOverclock.java
View file

@ -57,7 +57,7 @@ public class RitualEffectApiaryOverclock extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> apiaryRitual = new ArrayList();
ArrayList<RitualComponent> apiaryRitual = new ArrayList<RitualComponent>();
apiaryRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
apiaryRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
apiaryRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));

19
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectAutoAlchemy.java
View file

@ -45,7 +45,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
int flag = 0;
TileEntity topEntity = world.getTileEntity(pos.offsetUp());
if (!(topEntity instanceof IBloodAltar) || !(topEntity instanceof IBloodAltar))
if (!(topEntity instanceof IBloodAltar))
{
return;
}
@ -88,7 +88,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
} else if (southEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEChemistrySet) southEntity;
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
outputInv = (IInventory) northEntity;
}
@ -107,26 +107,26 @@ public class RitualEffectAutoAlchemy extends RitualEffect
{
outputInv = (IInventory) westEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
if (southEntity instanceof IInventory)
{
inputInv2 = (IInventory) southEntity;
}
} else if (westEntity instanceof TEChemistrySet)
{
alchemyEntity = (TEChemistrySet) westEntity;
if (eastEntity instanceof IInventory && !(eastEntity instanceof TEChemistrySet))
if (eastEntity instanceof IInventory)
{
outputInv = (IInventory) eastEntity;
}
if (northEntity instanceof IInventory && !(northEntity instanceof TEChemistrySet))
if (northEntity instanceof IInventory)
{
inputInv1 = (IInventory) northEntity;
}
if (southEntity instanceof IInventory && !(southEntity instanceof TEChemistrySet))
if (southEntity instanceof IInventory)
{
inputInv2 = (IInventory) southEntity;
}
@ -135,7 +135,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
return;
}
if (alchemyEntity != null && hasPotentia)
if (hasPotentia)
{
alchemyEntity.setAccelerationTime(5);
if (alchemyEntity.isWorking())
@ -239,7 +239,6 @@ public class RitualEffectAutoAlchemy extends RitualEffect
break;
}
}
continue;
}
}
@ -404,7 +403,7 @@ public class RitualEffectAutoAlchemy extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> autoAlchemyRitual = new ArrayList();
ArrayList<RitualComponent> autoAlchemyRitual = new ArrayList<RitualComponent>();
autoAlchemyRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
autoAlchemyRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));
autoAlchemyRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBinding.java
View file

@ -159,7 +159,7 @@ public class RitualEffectBinding extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> boundSoulRitual = new ArrayList();
ArrayList<RitualComponent> boundSoulRitual = new ArrayList<RitualComponent>();
boundSoulRitual.add(new RitualComponent(3, 0, 0, 2));
boundSoulRitual.add(new RitualComponent(-3, 0, 0, 2));
boundSoulRitual.add(new RitualComponent(0, 0, 3, 2));

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectBiomeChanger.java
View file

@ -215,8 +215,6 @@ public class RitualEffectBiomeChanger extends RitualEffect
}
}
boolean wantsSnow = false;
boolean wantsRain = true;
int biomeID = 1;
BiomeGenBase[] biomeList = BiomeGenBase.getBiomeGenArray();
int iteration = 0;
@ -290,7 +288,7 @@ public class RitualEffectBiomeChanger extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> biomeChangerRitual = new ArrayList();
ArrayList<RitualComponent> biomeChangerRitual = new ArrayList<RitualComponent>();
biomeChangerRitual.add(new RitualComponent(1, 0, -2, RitualComponent.AIR));
biomeChangerRitual.add(new RitualComponent(1, 0, -3, RitualComponent.AIR));
biomeChangerRitual.add(new RitualComponent(2, 0, -1, RitualComponent.AIR));

3
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectContainment.java
View file

@ -44,7 +44,6 @@ public class RitualEffectContainment extends RitualEffect
List<Entity> entityList = SpellHelper.getEntitiesInRange(world, pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, d0, d0);
boolean flag = false;
boolean hasCrepitous = this.canDrainReagent(ritualStone, ReagentRegistry.crepitousReagent, crepitousDrain, false);
boolean hasTerrae = this.canDrainReagent(ritualStone, ReagentRegistry.terraeReagent, terraeDrain, false);
boolean hasMagicales = this.canDrainReagent(ritualStone, ReagentRegistry.magicalesReagent, magicalesDrain, false);
for (Entity entity : entityList)
@ -108,7 +107,7 @@ public class RitualEffectContainment extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> containmentRitual = new ArrayList();
ArrayList<RitualComponent> containmentRitual = new ArrayList<RitualComponent>();
containmentRitual.add(new RitualComponent(1, 0, 0, 3));
containmentRitual.add(new RitualComponent(-1, 0, 0, 3));
containmentRitual.add(new RitualComponent(0, 0, 1, 3));

10
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrafting.java
View file

@ -98,7 +98,7 @@ public class RitualEffectCrafting extends RitualEffect
{
if(((IInventory) inv).getSizeInventory() <= slotDesignation || !((IInventory) inv).isItemValidForSlot(slotDesignation, ((IInventory) inv).getStackInSlot(slotDesignation)))
{
continue;
}else
{
ItemStack invStack = ((IInventory) inv).getStackInSlot(slotDesignation);
@ -131,7 +131,7 @@ public class RitualEffectCrafting extends RitualEffect
IInventory outputInv = null;
List<IInventory> invList = new ArrayList();
List<IInventory> invList = new ArrayList<IInventory>();
TileEntity northEntity = world.getTileEntity(pos.add(0, -1, -2));
TileEntity southEntity = world.getTileEntity(pos.add(0, -1, 2));
@ -250,7 +250,7 @@ public class RitualEffectCrafting extends RitualEffect
invList.add(outputInv);
}
Map<Integer, Map<Integer, Integer>> syphonMap = new HashMap(); //Inventory, Slot, how much claimed
Map<Integer, Map<Integer, Integer>> syphonMap = new HashMap<Integer, Map<Integer, Integer>>(); //Inventory, Slot, how much claimed
for(int n = 0; n < recipe.length; n++) //Look for the correct items
{
@ -299,7 +299,7 @@ public class RitualEffectCrafting extends RitualEffect
Map<Integer, Integer> slotMap = syphonMap.get(i);
if(slotMap == null)
{
slotMap = new HashMap();
slotMap = new HashMap<Integer, Integer>();
syphonMap.put(i, slotMap);
}
@ -389,7 +389,7 @@ public class RitualEffectCrafting extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> autoCraftingRitual = new ArrayList();
ArrayList<RitualComponent> autoCraftingRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(autoCraftingRitual, 1, 1, RitualComponent.EARTH);
this.addParallelRunes(autoCraftingRitual, 1, 1, RitualComponent.EARTH);

17
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectCrushing.java
View file

@ -82,7 +82,6 @@ public class RitualEffectCrushing extends RitualEffect
boolean hasVirtus = this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false);
boolean hasIncendium = this.canDrainReagent(ritualStone, ReagentRegistry.incendiumReagent, incendiumDrain, false);
boolean isSilkTouch = hasCrystallos;
int fortuneLevel = 0;
if (hasOrbisTerrae)
{
@ -117,17 +116,17 @@ public class RitualEffectCrushing extends RitualEffect
continue;
}
if (block != null && !world.isAirBlock(newPos))
if (!world.isAirBlock(newPos))
{
if ((block.equals(ModBlocks.ritualStone) || block.equals(ModBlocks.blockMasterStone)) || SpellHelper.isBlockFluid(block))
{
continue;
}
if (isSilkTouch && block.canSilkHarvest(world, newPos, state, null))
if (hasCrystallos && block.canSilkHarvest(world, newPos, state, null))
{
ItemStack item = new ItemStack(block, 1, block.getMetaFromState(state));
ItemStack copyStack = item.copyItemStack(item);
ItemStack copyStack = ItemStack.copyItemStack(item);
SpellHelper.insertStackIntoInventory(copyStack, tileEntity, EnumFacing.DOWN);
@ -151,7 +150,7 @@ public class RitualEffectCrushing extends RitualEffect
for (ItemStack item : itemDropList)
{
hasIncendium = hasIncendium && this.canDrainReagent(ritualStone, ReagentRegistry.incendiumReagent, incendiumDrain, false);
ItemStack copyStack = item.copyItemStack(item);
ItemStack copyStack = ItemStack.copyItemStack(item);
if (this.usesIncendium(copyStack))
{
@ -206,9 +205,6 @@ public class RitualEffectCrushing extends RitualEffect
{
return true;
}
} else
{
}
}
return false;
@ -233,9 +229,6 @@ public class RitualEffectCrushing extends RitualEffect
copyStack = new ItemStack(Blocks.netherrack, stackSize, 0);
}
}
} else
{
}
return copyStack;
@ -252,7 +245,7 @@ public class RitualEffectCrushing extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> crushingRitual = new ArrayList();
ArrayList<RitualComponent> crushingRitual = new ArrayList<RitualComponent>();
crushingRitual.add(new RitualComponent(0, 0, 1, RitualComponent.EARTH));
crushingRitual.add(new RitualComponent(1, 0, 0, RitualComponent.EARTH));
crushingRitual.add(new RitualComponent(0, 0, -1, RitualComponent.EARTH));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectDemonPortal.java
View file

@ -4,6 +4,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBelljar;
import net.minecraft.entity.effect.EntityLightningBolt;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
@ -21,7 +22,6 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.demonVillage.tileEntity.TEDemonPortal;
import WayofTime.alchemicalWizardry.api.tile.IBloodAltar;
import WayofTime.alchemicalWizardry.common.tileEntity.TEBellJar;
public class RitualEffectDemonPortal extends RitualEffect
{
@ -136,7 +136,7 @@ public class RitualEffectDemonPortal extends RitualEffect
for(Int3 pos : jarLocations)
{
if(!(ritualStone.getWorldObj().getTileEntity(position.add(pos.xCoord, pos.yCoord, pos.zCoord)) instanceof TEBellJar))
if(!(ritualStone.getWorldObj().getTileEntity(position.add(pos.xCoord, pos.yCoord, pos.zCoord)) instanceof TEBelljar))
{
return false;
}
@ -148,7 +148,7 @@ public class RitualEffectDemonPortal extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> demonRitual = new ArrayList();
ArrayList<RitualComponent> demonRitual = new ArrayList<RitualComponent>();
this.addParallelRunes(demonRitual, 3, 0, RitualComponent.FIRE);
this.addParallelRunes(demonRitual, 5, 0, RitualComponent.FIRE);
this.addCornerRunes(demonRitual, 2, 0, RitualComponent.AIR);

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEllipsoid.java
View file

@ -192,7 +192,7 @@ public class RitualEffectEllipsoid extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList();
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList<RitualComponent>();
ellipsoidRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));
ellipsoidRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectEvaporation.java
View file

@ -138,7 +138,7 @@ public class RitualEffectEvaporation extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList();
ArrayList<RitualComponent> ellipsoidRitual = new ArrayList<RitualComponent>();
ellipsoidRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.DUSK));
ellipsoidRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.DUSK));

21
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectExpulsion.java
View file

@ -163,14 +163,14 @@ public class RitualEffectExpulsion extends RitualEffect
double z = entityLiving.posZ;
Random rand = new Random();
double d0 = x + (rand.nextDouble() - 0.5D) * distance;
double d1 = y + (double) (rand.nextInt((int) distance) - (distance) / 2);
double d1 = y + (rand.nextInt((int) distance) - (distance) / 2);
double d2 = z + (rand.nextDouble() - 0.5D) * distance;
int i = 0;
while (!teleportTo(entityLiving, d0, d1, d2, x, y, z) && i < 100)
{
d0 = x + (rand.nextDouble() - 0.5D) * distance;
d1 = y + (double) (rand.nextInt((int) distance) - (distance) / 2);
d1 = y + (rand.nextInt((int) distance) - (distance) / 2);
d2 = z + (rand.nextDouble() - 0.5D) * distance;
i++;
}
@ -192,9 +192,6 @@ public class RitualEffectExpulsion extends RitualEffect
return false;
}
double d3 = lastX;
double d4 = lastY;
double d5 = lastZ;
SpellTeleport.moveEntityViaTeleport(entityLiving, event.targetX, event.targetY, event.targetZ);
boolean flag = false;
@ -237,7 +234,7 @@ public class RitualEffectExpulsion extends RitualEffect
if (!flag)
{
SpellTeleport.moveEntityViaTeleport(entityLiving, d3, d4, d5);
SpellTeleport.moveEntityViaTeleport(entityLiving, lastX, lastY, lastZ);
return false;
} else
{
@ -249,9 +246,9 @@ public class RitualEffectExpulsion extends RitualEffect
float f = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
float f1 = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
float f2 = (entityLiving.worldObj.rand.nextFloat() - 0.5F) * 0.2F;
double d7 = d3 + (entityLiving.posX - d3) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d8 = d4 + (entityLiving.posY - d4) * d6 + entityLiving.worldObj.rand.nextDouble() * (double) entityLiving.height;
double d9 = d5 + (entityLiving.posZ - d5) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d7 = lastX + (entityLiving.posX - lastX) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
double d8 = lastY + (entityLiving.posY - lastY) * d6 + entityLiving.worldObj.rand.nextDouble() * (double) entityLiving.height;
double d9 = lastZ + (entityLiving.posZ - lastZ) * d6 + (entityLiving.worldObj.rand.nextDouble() - 0.5D) * (double) entityLiving.width * 2.0D;
entityLiving.worldObj.spawnParticle(EnumParticleTypes.PORTAL, d7, d8, d9, (double) f, (double) f1, (double) f2);
}
return true;
@ -262,7 +259,7 @@ public class RitualEffectExpulsion extends RitualEffect
{
if (entityLiving instanceof EntityPlayer)
{
if (entityLiving != null && entityLiving instanceof EntityPlayerMP)
if (entityLiving instanceof EntityPlayerMP)
{
EntityPlayerMP entityplayermp = (EntityPlayerMP) entityLiving;
@ -274,7 +271,7 @@ public class RitualEffectExpulsion extends RitualEffect
{
if (entityLiving.isRiding())
{
entityLiving.mountEntity((Entity) null);
entityLiving.mountEntity(null);
}
entityLiving.setPositionAndUpdate(event.targetX, event.targetY, event.targetZ);
}
@ -289,7 +286,7 @@ public class RitualEffectExpulsion extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> expulsionRitual = new ArrayList();
ArrayList<RitualComponent> expulsionRitual = new ArrayList<RitualComponent>();
expulsionRitual.add(new RitualComponent(2, 0, 2, RitualComponent.EARTH));
expulsionRitual.add(new RitualComponent(2, 0, 1, RitualComponent.EARTH));
expulsionRitual.add(new RitualComponent(1, 0, 2, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredEarth.java
View file

@ -102,7 +102,7 @@ public class RitualEffectFeatheredEarth extends RitualEffect //Nullifies all fal
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> featheredEarthRitual = new ArrayList();
ArrayList<RitualComponent> featheredEarthRitual = new ArrayList<RitualComponent>();
featheredEarthRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
featheredEarthRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
featheredEarthRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFeatheredKnife.java
View file

@ -135,7 +135,7 @@ public class RitualEffectFeatheredKnife extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> featheredKnifeRitual = new ArrayList();
ArrayList<RitualComponent> featheredKnifeRitual = new ArrayList<RitualComponent>();
featheredKnifeRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
featheredKnifeRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
featheredKnifeRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFlight.java
View file

@ -95,7 +95,7 @@ public class RitualEffectFlight extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> flightRitual = new ArrayList();
ArrayList<RitualComponent> flightRitual = new ArrayList<RitualComponent>();
flightRitual.add(new RitualComponent(1, 0, 0, RitualComponent.DUSK));
flightRitual.add(new RitualComponent(-1, 0, 0, RitualComponent.DUSK));
flightRitual.add(new RitualComponent(0, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectFullStomach.java
View file

@ -113,7 +113,7 @@ public class RitualEffectFullStomach extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> fullRitual = new ArrayList();
ArrayList<RitualComponent> fullRitual = new ArrayList<RitualComponent>();
fullRitual.add(new RitualComponent(0, 0, 3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(0, 0, -3, RitualComponent.FIRE));
fullRitual.add(new RitualComponent(3, 0, 0, RitualComponent.FIRE));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectGrowth.java
View file

@ -111,7 +111,7 @@ public class RitualEffectGrowth extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> growthRitual = new ArrayList();
ArrayList<RitualComponent> growthRitual = new ArrayList<RitualComponent>();
growthRitual.add(new RitualComponent(1, 0, 0, 1));
growthRitual.add(new RitualComponent(-1, 0, 0, 1));
growthRitual.add(new RitualComponent(0, 0, 1, 1));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHarvest.java
View file

@ -109,7 +109,7 @@ public class RitualEffectHarvest extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> harvestRitual = new ArrayList();
ArrayList<RitualComponent> harvestRitual = new ArrayList<RitualComponent>();
harvestRitual.add(new RitualComponent(1, 0, 1, RitualComponent.DUSK));
harvestRitual.add(new RitualComponent(1, 0, -1, RitualComponent.DUSK));

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectHealing.java
View file

@ -82,7 +82,7 @@ public class RitualEffectHealing extends RitualEffect
if (livingEntity.getHealth() + 0.1f < livingEntity.getMaxHealth())
{
PotionEffect effect = livingEntity.getActivePotionEffect(Potion.regeneration);
if (effect == null || (effect != null && effect.getAmplifier() <= potency && effect.getDuration() <= timeDelay))
if (effect == null || (effect.getAmplifier() <= potency && effect.getDuration() <= timeDelay))
{
if (!hasVirtus || (this.canDrainReagent(ritualStone, ReagentRegistry.virtusReagent, virtusDrain, false)))
{
@ -128,7 +128,7 @@ public class RitualEffectHealing extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> healingRitual = new ArrayList();
ArrayList<RitualComponent> healingRitual = new ArrayList<RitualComponent>();
healingRitual.add(new RitualComponent(4, 0, 0, RitualComponent.AIR));
healingRitual.add(new RitualComponent(5, 0, -1, RitualComponent.AIR));
healingRitual.add(new RitualComponent(5, 0, 1, RitualComponent.AIR));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectInterdiction.java
View file

@ -123,7 +123,7 @@ public class RitualEffectInterdiction extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> interdictionRitual = new ArrayList();
ArrayList<RitualComponent> interdictionRitual = new ArrayList<RitualComponent>();
interdictionRitual.add(new RitualComponent(1, 0, 0, 4));
interdictionRitual.add(new RitualComponent(-1, 0, 0, 4));
interdictionRitual.add(new RitualComponent(0, 0, 1, 4));

23
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemRouting.java
View file

@ -1,10 +1,7 @@
package WayofTime.alchemicalWizardry.common.rituals;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ISidedInventory;
@ -19,21 +16,17 @@ import WayofTime.alchemicalWizardry.api.RoutingFocusPosAndFacing;
import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone;
import WayofTime.alchemicalWizardry.api.rituals.RitualComponent;
import WayofTime.alchemicalWizardry.api.rituals.RitualEffect;
import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler;
import WayofTime.alchemicalWizardry.common.items.routing.InputRoutingFocus;
import WayofTime.alchemicalWizardry.common.items.routing.OutputRoutingFocus;
import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper;
public class RitualEffectItemRouting extends RitualEffect
{
Random rand = new Random();
@Override
public void performEffect(IMasterRitualStone ritualStone)
{
String owner = ritualStone.getOwner();
int currentEssence = SoulNetworkHandler.getCurrentEssence(owner);
World world = ritualStone.getWorldObj();
BlockPos pos = ritualStone.getPosition();
@ -42,9 +35,7 @@ public class RitualEffectItemRouting extends RitualEffect
return;
}
Map<Int3, IInventory> tileMap = new HashMap();
List<IInventory> outputList = new ArrayList();
List<IInventory> outputList = new ArrayList<IInventory>();
for(int i=0; i<4; i++) //Check output foci chests, return if none available
{
Int3 outputFocusChest = this.getOutputBufferChestLocation(i);
@ -64,7 +55,7 @@ public class RitualEffectItemRouting extends RitualEffect
for(IInventory outputFocusInventory : outputList)
{
{
OutputRoutingFocus outputFocus;;
OutputRoutingFocus outputFocus;
RoutingFocusParadigm parad = new RoutingFocusParadigm();
@ -168,7 +159,7 @@ public class RitualEffectItemRouting extends RitualEffect
if(parad.doesItemMatch(keyStack, syphonedStack))
{
ItemStack newStack = null;
ItemStack newStack;
if(parad.maximumAmount <= 0)
{
newStack = SpellHelper.insertStackIntoInventory(syphonedStack, outputChestInventory, inputDirection);
@ -181,9 +172,7 @@ public class RitualEffectItemRouting extends RitualEffect
continue;
}
int numberSyphoned = size - newStack.stackSize;
if(newStack != null && newStack.stackSize <= 0)
if(newStack.stackSize <= 0)
{
size = newStack.stackSize;
newStack = null;
@ -246,7 +235,7 @@ public class RitualEffectItemRouting extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.BLANK);
this.addOffsetRunes(omegaRitual, 2, 1, 0, RitualComponent.FIRE);
@ -256,6 +245,4 @@ public class RitualEffectItemRouting extends RitualEffect
return omegaRitual;
}
}

8
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectItemSuction.java
View file

@ -21,8 +21,6 @@ public class RitualEffectItemSuction extends RitualEffect
{
public static final int reductusDrain = 1;
public static final int timeDelayMin = 60;
@Override
public void performEffect(IMasterRitualStone ritualStone)
{
@ -61,8 +59,6 @@ public class RitualEffectItemSuction extends RitualEffect
if (itemDropList != null)
{
int invSize = tileEntity.getSizeInventory();
for (EntityItem itemEntity : itemDropList)
{
// hasReductus = hasReductus && this.canDrainReagent(ritualStone, ReagentRegistry.reductusReagent, reductusDrain, false);
@ -70,7 +66,6 @@ public class RitualEffectItemSuction extends RitualEffect
// {
// continue;
// }
ItemStack item = itemEntity.getEntityItem();
ItemStack copyStack = itemEntity.getEntityItem().copy();
int pastAmount = copyStack.stackSize;
@ -100,7 +95,6 @@ public class RitualEffectItemSuction extends RitualEffect
if (count > 0)
{
SoulNetworkHandler.syphonFromNetwork(owner, this.getCostPerRefresh() * Math.min(count, 100));
return;
}
}
}
@ -114,7 +108,7 @@ public class RitualEffectItemSuction extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> suctionRitual = new ArrayList();
ArrayList<RitualComponent> suctionRitual = new ArrayList<RitualComponent>();
suctionRitual.add(new RitualComponent(2, 0, 0, RitualComponent.AIR));
suctionRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.AIR));
suctionRitual.add(new RitualComponent(0, 0, 2, RitualComponent.AIR));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectJumping.java
View file

@ -18,8 +18,8 @@ import java.util.List;
public class RitualEffectJumping extends RitualEffect
{
public static final int aetherDrain = 10;
public static final int terraeDrain = 10;
public final int aetherDrain = 10;
public final int terraeDrain = 10;
@Override
public void performEffect(IMasterRitualStone ritualStone)
@ -98,7 +98,7 @@ public class RitualEffectJumping extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> jumpingRitual = new ArrayList();
ArrayList<RitualComponent> jumpingRitual = new ArrayList<RitualComponent>();
for (int i = -1; i <= 1; i++)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLava.java
View file

@ -115,8 +115,6 @@ public class RitualEffectLava extends RitualEffect
}
}
}
}
@Override
@ -128,7 +126,7 @@ public class RitualEffectLava extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> lavaRitual = new ArrayList();
ArrayList<RitualComponent> lavaRitual = new ArrayList<RitualComponent>();
lavaRitual.add(new RitualComponent(1, 0, 0, 2));
lavaRitual.add(new RitualComponent(-1, 0, 0, 2));
lavaRitual.add(new RitualComponent(0, 0, 1, 2));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLeap.java
View file

@ -208,7 +208,7 @@ public class RitualEffectLeap extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> leapingRitual = new ArrayList();
ArrayList<RitualComponent> leapingRitual = new ArrayList<RitualComponent>();
leapingRitual.add(new RitualComponent(0, 0, -2, RitualComponent.DUSK));
leapingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.AIR));
leapingRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.AIR));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectLifeConduit.java
View file

@ -97,7 +97,7 @@ public class RitualEffectLifeConduit extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> conduitRitual = new ArrayList();
ArrayList<RitualComponent> conduitRitual = new ArrayList<RitualComponent>();
conduitRitual.add(new RitualComponent(-1, 0, -1, RitualComponent.FIRE));
conduitRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE));

3
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectMagnetic.java
View file

@ -172,7 +172,6 @@ public class RitualEffectMagnetic extends RitualEffect
j = pos.getY() - 1;
this.setLastPosition(ritualStone.getCustomRitualTag(), new Int3(i, j, k));
return;
}
}
}
@ -204,7 +203,7 @@ public class RitualEffectMagnetic extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> magneticRitual = new ArrayList();
ArrayList<RitualComponent> magneticRitual = new ArrayList<RitualComponent>();
magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectOmegaStalling.java
View file

@ -72,7 +72,7 @@ public class RitualEffectOmegaStalling extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.FIRE);
this.addOffsetRunes(omegaRitual, 2, 1, 0, RitualComponent.DUSK);

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectOmegaTest.java
View file

@ -67,7 +67,7 @@ public class RitualEffectOmegaTest extends RitualEffect
Reagent reagent = null;
Map<Reagent, Integer> reagentMap = new HashMap();
Map<Reagent, Integer> reagentMap = new HashMap<Reagent, Integer>();
for(int i=0; i<4; i++)
{
Int3 jarLoc = this.getJarLocation(i);
@ -133,7 +133,7 @@ public class RitualEffectOmegaTest extends RitualEffect
if(!isTesting)
{
int drainLeft = this.drainTotal;
int drainLeft = drainTotal;
for(int i = 0; i < 4; i++)
{
if(drainLeft <= 0)
@ -173,7 +173,7 @@ public class RitualEffectOmegaTest extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> omegaRitual = new ArrayList();
ArrayList<RitualComponent> omegaRitual = new ArrayList<RitualComponent>();
this.addCornerRunes(omegaRitual, 1, 0, RitualComponent.DUSK);
this.addCornerRunes(omegaRitual, 2, 0, RitualComponent.DUSK);
this.addCornerRunes(omegaRitual, 3, 0, RitualComponent.BLANK);

14
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSpawnWard.java
View file

@ -34,9 +34,9 @@ public class RitualEffectSpawnWard extends RitualEffect
int dimension = world.provider.getDimensionId();
if (AlchemicalWizardryEventHooks.respawnMap.containsKey(new Integer(dimension)))
if (AlchemicalWizardryEventHooks.respawnMap.containsKey(dimension))
{
List<CoordAndRange> list = AlchemicalWizardryEventHooks.respawnMap.get(new Integer(dimension));
List<CoordAndRange> list = AlchemicalWizardryEventHooks.respawnMap.get(dimension);
if (list != null)
{
if (!list.contains(new CoordAndRange(pos, horizRange, vertRange)))
@ -55,15 +55,15 @@ public class RitualEffectSpawnWard extends RitualEffect
}
} else
{
list = new LinkedList();
list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.respawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.respawnMap.put(dimension, list);
}
} else
{
List<CoordAndRange> list = new LinkedList();
List<CoordAndRange> list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.respawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.respawnMap.put(dimension, list);
}
@ -80,7 +80,7 @@ public class RitualEffectSpawnWard extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> wardRitualRitual = new ArrayList();
ArrayList<RitualComponent> wardRitualRitual = new ArrayList<RitualComponent>();
for (int i = 2; i <= 4; i++)
{

4
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSphereCreator.java
View file

@ -170,8 +170,6 @@ public class RitualEffectSphereCreator extends RitualEffect
ritualStone.setActive(false);
this.setLastPosition(ritualStone.getCustomRitualTag(), new Int3(i, j, k));
return;
}
}
@ -203,7 +201,7 @@ public class RitualEffectSphereCreator extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> magneticRitual = new ArrayList();
ArrayList<RitualComponent> magneticRitual = new ArrayList<RitualComponent>();
magneticRitual.add(new RitualComponent(1, 0, 1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(1, 0, -1, RitualComponent.EARTH));
magneticRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.EARTH));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSummonMeteor.java
View file

@ -103,7 +103,7 @@ public class RitualEffectSummonMeteor extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> meteorRitual = new ArrayList();
ArrayList<RitualComponent> meteorRitual = new ArrayList<RitualComponent>();
meteorRitual.add(new RitualComponent(2, 0, 0, RitualComponent.FIRE));
meteorRitual.add(new RitualComponent(-2, 0, 0, RitualComponent.FIRE));
meteorRitual.add(new RitualComponent(0, 0, 2, RitualComponent.FIRE));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectSupression.java
View file

@ -123,7 +123,7 @@ public class RitualEffectSupression extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> supressionRitual = new ArrayList();
ArrayList<RitualComponent> supressionRitual = new ArrayList<RitualComponent>();
supressionRitual.add(new RitualComponent(2, 0, 2, RitualComponent.WATER));
supressionRitual.add(new RitualComponent(2, 0, -2, RitualComponent.WATER));
supressionRitual.add(new RitualComponent(-2, 0, 2, RitualComponent.WATER));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectUnbinding.java
View file

@ -166,7 +166,7 @@ public class RitualEffectUnbinding extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> unbindingRitual = new ArrayList();
ArrayList<RitualComponent> unbindingRitual = new ArrayList<RitualComponent>();
unbindingRitual.add(new RitualComponent(-2, 0, 0, 4));
unbindingRitual.add(new RitualComponent(2, 0, 0, 4));
unbindingRitual.add(new RitualComponent(0, 0, 2, 4));

14
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectVeilOfEvil.java
View file

@ -34,9 +34,9 @@ public class RitualEffectVeilOfEvil extends RitualEffect
int dimension = world.provider.getDimensionId();
if (AlchemicalWizardryEventHooks.forceSpawnMap.containsKey(new Integer(dimension)))
if (AlchemicalWizardryEventHooks.forceSpawnMap.containsKey(dimension))
{
List<CoordAndRange> list = AlchemicalWizardryEventHooks.forceSpawnMap.get(new Integer(dimension));
List<CoordAndRange> list = AlchemicalWizardryEventHooks.forceSpawnMap.get(dimension);
if (list != null)
{
if (!list.contains(new CoordAndRange(pos, horizRange, vertRange)))
@ -57,15 +57,15 @@ public class RitualEffectVeilOfEvil extends RitualEffect
}
} else
{
list = new LinkedList();
list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.forceSpawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.forceSpawnMap.put(dimension, list);
}
} else
{
List<CoordAndRange> list = new LinkedList();
List<CoordAndRange> list = new LinkedList<CoordAndRange>();
list.add(new CoordAndRange(pos, horizRange, vertRange));
AlchemicalWizardryEventHooks.forceSpawnMap.put(new Integer(dimension), list);
AlchemicalWizardryEventHooks.forceSpawnMap.put(dimension, list);
}
@ -82,7 +82,7 @@ public class RitualEffectVeilOfEvil extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> veilRitual = new ArrayList();
ArrayList<RitualComponent> veilRitual = new ArrayList<RitualComponent>();
veilRitual.add(new RitualComponent(1, 0, 2, RitualComponent.DUSK));
veilRitual.add(new RitualComponent(2, 0, 1, RitualComponent.DUSK));

2
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWater.java
View file

@ -193,7 +193,7 @@ public class RitualEffectWater extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> waterRitual = new ArrayList();
ArrayList<RitualComponent> waterRitual = new ArrayList<RitualComponent>();
waterRitual.add(new RitualComponent(-1, 0, 1, 1));
waterRitual.add(new RitualComponent(-1, 0, -1, 1));
waterRitual.add(new RitualComponent(1, 0, -1, 1));

6
src/main/java/WayofTime/alchemicalWizardry/common/rituals/RitualEffectWellOfSuffering.java
View file

@ -35,7 +35,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
World world = ritualStone.getWorldObj();
BlockPos pos = ritualStone.getPosition();
if (world.getWorldTime() % this.timeDelay != 0)
if (world.getWorldTime() % timeDelay != 0)
{
return;
}
@ -95,7 +95,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
entityCount++;
tileAltar.sacrificialDaggerCall(this.amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
tileAltar.sacrificialDaggerCall(amount * (hasTennebrae ? 2 : 1) * (hasOffensa ? 2 : 1), true);
}
}
@ -117,7 +117,7 @@ public class RitualEffectWellOfSuffering extends RitualEffect
@Override
public List<RitualComponent> getRitualComponentList()
{
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList();
ArrayList<RitualComponent> wellOfSufferingRitual = new ArrayList<RitualComponent>();
wellOfSufferingRitual.add(new RitualComponent(1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(-1, 0, 1, RitualComponent.FIRE));
wellOfSufferingRitual.add(new RitualComponent(1, 0, -1, RitualComponent.FIRE));