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

16
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEAltar.java
View file

@ -61,7 +61,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
protected FluidStack fluidOutput;
protected FluidStack fluidInput;
private int progress;
private int hasChanged = 0;
private int lockdownDuration;
private int demonBloodDuration;
@ -258,16 +257,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
return fluid;
}
public FluidStack getInputFluid()
{
return fluidInput;
}
public FluidStack getOutputFluid()
{
return fluidOutput;
}
@Override
public int getFluidAmount()
{
@ -490,7 +479,6 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
if (AlchemicalWizardry.lockdownAltar)
{
List<EntityPlayer> list = SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15);
boolean hasHighRegen = false;
for (EntityPlayer player : list)
{
PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration);
@ -582,7 +570,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
if (progress >= liquidRequired * stackSize)
{
ItemStack result = null;
ItemStack result;
result = AltarRecipeRegistry.getItemForItemAndTier(this.getStackInSlot(0), this.upgradeLevel);
if (result != null)
{
@ -714,7 +702,7 @@ public class TEAltar extends TEInventory implements IFluidTank, IFluidHandler, I
public int[] buildIntDataList()
{
int[] sortList = new int[1 * 3];
int[] sortList = new int[3]; //1 * 3
int pos = 0;
for (ItemStack is : inv)

5
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEInventory.java
View file

@ -28,11 +28,6 @@ public abstract class TEInventory extends TileEntity implements IInventory
return inv.length;
}
public ItemStack[] getSlots()
{
return inv;
}
@Override
public ItemStack getStackInSlot(int slot)
{

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPedestal.java
View file

@ -105,7 +105,7 @@ public class TEPedestal extends TEInventory
public int[] buildIntDataList()
{
int[] sortList = new int[1 * 3];
int[] sortList = new int[3]; //1 * 3
int pos = 0;
for (ItemStack is : inv)

16
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEPlinth.java
View file

@ -56,7 +56,7 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring1TagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) ring1TagList.getCompoundTagAt(i);
NBTTagCompound tag = ring1TagList.getCompoundTagAt(i);
int slot = tag.getByte("Slot");
if (slot >= 0 && slot < inv.length)
@ -69,7 +69,7 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring2TagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) ring2TagList.getCompoundTagAt(i);
NBTTagCompound tag = ring2TagList.getCompoundTagAt(i);
int slot = tag.getByte("Slot");
if (slot >= 0 && slot < inv.length)
@ -82,7 +82,7 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring3TagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) ring3TagList.getCompoundTagAt(i);
NBTTagCompound tag = ring3TagList.getCompoundTagAt(i);
int slot = tag.getByte("Slot");
if (slot >= 0 && slot < inv.length)
@ -105,8 +105,6 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring1Inv.length; i++)
{
ItemStack stack = ring1Inv[i];
if (ring1Inv[i] != null)
{
NBTTagCompound tag = new NBTTagCompound();
@ -121,8 +119,6 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring2Inv.length; i++)
{
ItemStack stack = ring2Inv[i];
if (ring2Inv[i] != null)
{
NBTTagCompound tag = new NBTTagCompound();
@ -137,8 +133,6 @@ public class TEPlinth extends TEInventory
for (int i = 0; i < ring3Inv.length; i++)
{
ItemStack stack = ring3Inv[i];
if (ring3Inv[i] != null)
{
NBTTagCompound tag = new NBTTagCompound();
@ -517,7 +511,7 @@ public class TEPlinth extends TEInventory
public int[] buildIntDataList()
{
int[] sortList = new int[1 * 3];
int[] sortList = new int[3]; //1 * 3
int pos = 0;
for (ItemStack is : inv)
@ -565,6 +559,4 @@ public class TEPlinth extends TEInventory
pedestalPositions.add(new PlinthComponent(-7, 2, -4, 3));
pedestalPositions.add(new PlinthComponent(-7, 2, 4, 3));
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESocket.java
View file

@ -104,7 +104,7 @@ public class TESocket extends TEInventory
public int[] buildIntDataList()
{
int[] sortList = new int[1 * 3];
int[] sortList = new int[3]; //1 * 3
int pos = 0;
for (ItemStack is : inv)

4
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpectralContainer.java
View file

@ -32,7 +32,7 @@ public class TESpectralContainer extends TileEntity
for (int i = 0; i < tagList.tagCount(); i++)
{
NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i);
NBTTagCompound tag = tagList.getCompoundTagAt(i);
int slot = tag.getByte("Slot");
if (slot >= 0 && slot < inv.length)
@ -52,8 +52,6 @@ public class TESpectralContainer extends TileEntity
for (int i = 0; i < inv.length; i++)
{
ItemStack stack = inv[i];
if (inv[i] != null)
{
NBTTagCompound tag = new NBTTagCompound();

2
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TESpellParadigmBlock.java
View file

@ -33,7 +33,7 @@ public class TESpellParadigmBlock extends TESpellBlock implements ISpellParadigm
@Override
protected void applySpellChange(SpellParadigm parad)
{
return;
}
public boolean canInputRecieve()

3
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TETeleposer.java
View file

@ -237,7 +237,7 @@ public class TETeleposer extends TEInventory
public int[] buildIntDataList()
{
int[] sortList = new int[1 * 3];
int[] sortList = new int[3]; //1 * 3
int pos = 0;
for (ItemStack is : inv)
@ -263,5 +263,4 @@ public class TETeleposer extends TEInventory
{
return itemstack.getItem() instanceof TelepositionFocus;
}
}

46
src/main/java/WayofTime/alchemicalWizardry/common/tileEntity/TEWritingTable.java
View file

@ -27,7 +27,6 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public static final int sizeInv = 7;
private int progress;
private int progressNeeded = 100;
private int amountUsed;
private int accelerationTime;
@ -162,13 +161,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsPotionFlask()
{
if (getPotionFlaskPosition() != -1)
{
return true;
} else
{
return false;
}
return getPotionFlaskPosition() != -1;
}
public int getPotionFlaskPosition()
@ -210,13 +203,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsRegisteredPotionIngredient()
{
if (getRegisteredPotionIngredientPosition() != -1)
{
return true;
} else
{
return false;
}
return getRegisteredPotionIngredientPosition() != -1;
}
public int getRegisteredPotionIngredientPosition()
@ -240,12 +227,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsCatalyst()
{
if (getCatalystPosition() != -1)
{
return true;
}
return false;
return getCatalystPosition() != -1;
}
public int getCatalystPosition()
@ -263,12 +245,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsBindingAgent()
{
if (getBindingAgentPosition() != -1)
{
return true;
}
return false;
return getBindingAgentPosition() != -1;
}
public int getBindingAgentPosition()
@ -286,12 +263,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsFillingAgent()
{
if (getFillingAgentPosition() != -1)
{
return true;
}
return false;
return getFillingAgentPosition() != -1;
}
public int getFillingAgentPosition()
@ -309,12 +281,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
public boolean containsBlankSlate()
{
if (getBlankSlatePosition() != -1)
{
return true;
}
return false;
return getBlankSlatePosition() != -1;
}
public int getBlankSlatePosition()
@ -333,6 +300,7 @@ public class TEWritingTable extends TEInventory implements ISidedInventory
@Override
public void updateEntity()
{
int progressNeeded = 100;
long worldTime = worldObj.getWorldTime();
if (worldObj.isRemote)