Performance Commit --Too lazy to do the Altar recipe
This commit is contained in:
Arcaratus
parent
013367cffa
commit
e5b795fddc
217 changed files with 840 additions and 1244 deletions
|
|
@ -34,7 +34,7 @@ public class Vector3
|
|||
@Override
|
||||
public boolean equals(Object object)
|
||||
{
|
||||
return object == this ? true : (object instanceof Vector3 ? canEqual(this) && this.x == ((Vector3) object).x && this.y == ((Vector3) object).y && this.z == ((Vector3) object).z : false);
|
||||
return object == this || object instanceof Vector3 && canEqual(this) && this.x == ((Vector3) object).x && this.y == ((Vector3) object).y && this.z == ((Vector3) object).z;
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ public class AlchemyRecipe
|
|||
return false;
|
||||
}
|
||||
|
||||
ItemStack[] recipe = new ItemStack[5];
|
||||
ItemStack[] recipe;
|
||||
|
||||
if (items.length < 5)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ import net.minecraft.world.World;
|
|||
|
||||
public interface IAlchemyGoggles
|
||||
{
|
||||
public boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player);
|
||||
boolean showIngameHUD(World world, ItemStack stack, EntityPlayer player);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,15 +2,15 @@ package WayofTime.alchemicalWizardry.api.alchemy.energy;
|
|||
|
||||
public interface IReagentContainer
|
||||
{
|
||||
public ReagentStack getReagent();
|
||||
ReagentStack getReagent();
|
||||
|
||||
public int getReagentStackAmount();
|
||||
int getReagentStackAmount();
|
||||
|
||||
public int getCapacity();
|
||||
int getCapacity();
|
||||
|
||||
public int fill(ReagentStack resource, boolean doFill);
|
||||
int fill(ReagentStack resource, boolean doFill);
|
||||
|
||||
public ReagentStack drain(int maxDrain, boolean doDrain);
|
||||
ReagentStack drain(int maxDrain, boolean doDrain);
|
||||
|
||||
public ReagentContainerInfo getInfo();
|
||||
ReagentContainerInfo getInfo();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@ import java.util.Map;
|
|||
|
||||
public interface ISegmentedReagentHandler extends IReagentHandler
|
||||
{
|
||||
public int getNumberOfTanks();
|
||||
int getNumberOfTanks();
|
||||
|
||||
public int getTanksTunedToReagent(Reagent reagent);
|
||||
int getTanksTunedToReagent(Reagent reagent);
|
||||
|
||||
public void setTanksTunedToReagent(Reagent reagent, int total);
|
||||
void setTanksTunedToReagent(Reagent reagent, int total);
|
||||
|
||||
public Map<Reagent, Integer> getAttunedTankMap();
|
||||
Map<Reagent, Integer> getAttunedTankMap();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,6 +47,6 @@ public class Reagent
|
|||
@Override
|
||||
public boolean equals(Object o)
|
||||
{
|
||||
return o instanceof Reagent ? this == o && name.equals(((Reagent) o).name) : false;
|
||||
return o instanceof Reagent && this == o && name.equals(((Reagent) o).name);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -259,7 +259,7 @@ public class TileSegmentedReagentHandler extends TileEntity implements ISegmente
|
|||
return;
|
||||
}
|
||||
|
||||
this.attunedTankMap.put(reagent, new Integer(total));
|
||||
this.attunedTankMap.put(reagent, total);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ public class AltarRecipe
|
|||
NBTBase comparedBaseTag = comparedTag.getTag(str);
|
||||
if(comparedBaseTag instanceof NBTTagCompound)
|
||||
{
|
||||
if(!this.areTagsEqual((NBTTagCompound) tag, comparedTag))
|
||||
if(!this.areTagsEqual(tag, comparedTag))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.api.altarRecipeRegistry;
|
|||
|
||||
public interface IFadedRune
|
||||
{
|
||||
public int getAltarTierLimit(int meta);
|
||||
int getAltarTierLimit(int meta);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -15,12 +15,7 @@ public class BindingRecipe
|
|||
|
||||
public boolean doesRequiredItemMatch(ItemStack testStack)
|
||||
{
|
||||
if (testStack == null || this.requiredItem == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.requiredItem.isItemEqual(testStack);
|
||||
return !(testStack == null || this.requiredItem == null) && this.requiredItem.isItemEqual(testStack);
|
||||
}
|
||||
|
||||
public ItemStack getResult(ItemStack inputItem)
|
||||
|
|
|
|||
|
|
@ -15,12 +15,7 @@ public class UnbindingRecipe
|
|||
|
||||
public boolean doesRequiredItemMatch(ItemStack testStack)
|
||||
{
|
||||
if (testStack == null || this.requiredItem == null)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
return this.requiredItem.isItemEqual(testStack);
|
||||
return !(testStack == null || this.requiredItem == null) && this.requiredItem.isItemEqual(testStack);
|
||||
}
|
||||
|
||||
public ItemStack getResult(ItemStack inputItem)
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ public class CompressionRegistry
|
|||
*/
|
||||
public static void registerItemThreshold(ItemStack stack, int threshold)
|
||||
{
|
||||
thresholdMap.put(stack, new Integer(threshold));
|
||||
thresholdMap.put(stack, threshold);
|
||||
}
|
||||
|
||||
public static ItemStack compressInventory(ItemStack[] inv, World world)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ public class PageAltarRecipe extends PageBase {
|
|||
guiBase.drawCenteredString(fontRenderer, StatCollector.translateToLocal("text.recipe.altar"), guiLeft + guiBase.xSize / 2, guiTop + 12, 0);
|
||||
|
||||
int inputX = (1 + 1) * 20 + (guiLeft + guiBase.xSize / 7);
|
||||
int inputY = (1 * 20) + (guiTop + guiBase.ySize / 5);
|
||||
int inputY = (20) + (guiTop + guiBase.ySize / 5); //1 * 20
|
||||
GuiHelper.drawItemStack(input, inputX, inputY);
|
||||
if (GuiHelper.isMouseBetween(mouseX, mouseY, inputX, inputY, 15, 15)) {
|
||||
guiBase.renderToolTip(input, mouseX, mouseY);
|
||||
|
|
@ -52,7 +52,7 @@ public class PageAltarRecipe extends PageBase {
|
|||
output = new ItemStack(Blocks.fire);
|
||||
}
|
||||
int outputX = (5 * 20) + (guiLeft + guiBase.xSize / 7);
|
||||
int outputY = (1 * 20) + (guiTop + guiBase.xSize / 5);
|
||||
int outputY = (20) + (guiTop + guiBase.xSize / 5); // 1 * 20
|
||||
GuiHelper.drawItemStack(output, outputX, outputY);
|
||||
if (GuiHelper.isMouseBetween(mouseX, mouseY, outputX, outputY, 15, 15)) {
|
||||
guiBase.renderToolTip(output, outputX, outputY);
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public class PageMultiBlock extends PageBase
|
|||
blockCount += perLvl;
|
||||
}
|
||||
tick= (showLayer==-1?blockCount:countPerLevel[showLayer])*40;
|
||||
int yOff = (structureHeight-1)*12+structureWidth*5+structureLength*5+16;
|
||||
// int yOff = (structureHeight-1)*12+structureWidth*5+structureLength*5+16;
|
||||
// pageButtons.add(new GuiButtonManualNavigation(gui, 100, x+4,y+yOff/2-5, 10,10, 4));
|
||||
// pageButtons.add(new GuiButtonManualNavigation(gui, 101, x+4,y+yOff/2-8-16, 10,16, 3));
|
||||
// pageButtons.add(new GuiButtonManualNavigation(gui, 102, x+4,y+yOff/2+8, 10,16, 2));
|
||||
|
|
@ -90,7 +90,7 @@ public class PageMultiBlock extends PageBase
|
|||
|
||||
int xHalf = (structureWidth*5 - structureLength*5);
|
||||
int yOffPartial = (structureHeight-1)*12+structureWidth*5+structureLength*5;
|
||||
int yOffTotal = yOffPartial+16;
|
||||
// int yOffTotal = yOffPartial+16;
|
||||
|
||||
GL11.glDisable(GL11.GL_DEPTH_TEST);
|
||||
|
||||
|
|
|
|||
|
|
@ -16,5 +16,5 @@ public interface IHarvestHandler
|
|||
* @param meta meta at this given location
|
||||
* @return true if successfully harvested, false if not
|
||||
*/
|
||||
public boolean harvestAndPlant(World world, int xCoord, int yCoord, int zCoord, Block block, int meta);
|
||||
boolean harvestAndPlant(World world, int xCoord, int yCoord, int zCoord, Block block, int meta);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ public class ShapedBloodOrbRecipe implements IRecipe
|
|||
if (in instanceof IBloodOrb || (in instanceof ItemStack && ((ItemStack) in).getItem() instanceof IBloodOrb))
|
||||
{ //If the item is an instanceof IBloodOrb then save the level of the orb
|
||||
if (in instanceof ItemStack)
|
||||
itemMap.put(chr, (Integer) (((IBloodOrb) ((ItemStack) in).getItem()).getOrbLevel()));
|
||||
else itemMap.put(chr, (Integer) (((IBloodOrb) in).getOrbLevel()));
|
||||
itemMap.put(chr, ((IBloodOrb) ((ItemStack) in).getItem()).getOrbLevel());
|
||||
else itemMap.put(chr, ((IBloodOrb) in).getOrbLevel());
|
||||
} else if (in instanceof ItemStack)
|
||||
{
|
||||
itemMap.put(chr, ((ItemStack) in).copy());
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ import net.minecraft.world.World;
|
|||
public interface ArmourUpgrade
|
||||
{
|
||||
//Called when the armour ticks
|
||||
public void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack);
|
||||
void onArmourUpdate(World world, EntityPlayer player, ItemStack thisItemStack);
|
||||
|
||||
public boolean isUpgrade();
|
||||
boolean isUpgrade();
|
||||
|
||||
public int getEnergyForTenSeconds();
|
||||
int getEnergyForTenSeconds();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package WayofTime.alchemicalWizardry.api.items.interfaces;
|
|||
|
||||
public interface IBloodOrb
|
||||
{
|
||||
public int getMaxEssence();
|
||||
int getMaxEssence();
|
||||
|
||||
public int getOrbLevel();
|
||||
int getOrbLevel();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,39 +6,39 @@ import net.minecraft.world.World;
|
|||
|
||||
public interface IMasterRitualStone extends ISegmentedReagentHandler
|
||||
{
|
||||
public void performRitual(World world, int x, int y, int z, String ritualID);
|
||||
void performRitual(World world, int x, int y, int z, String ritualID);
|
||||
|
||||
public String getOwner();
|
||||
String getOwner();
|
||||
|
||||
public void setCooldown(int newCooldown);
|
||||
void setCooldown(int newCooldown);
|
||||
|
||||
public int getCooldown();
|
||||
int getCooldown();
|
||||
|
||||
public void setVar1(int newVar1);
|
||||
void setVar1(int newVar1);
|
||||
|
||||
public int getVar1();
|
||||
int getVar1();
|
||||
|
||||
public void setActive(boolean active);
|
||||
void setActive(boolean active);
|
||||
|
||||
public int getDirection();
|
||||
int getDirection();
|
||||
|
||||
public World getWorld();
|
||||
World getWorld();
|
||||
|
||||
public int getXCoord();
|
||||
int getXCoord();
|
||||
|
||||
public int getYCoord();
|
||||
int getYCoord();
|
||||
|
||||
public int getZCoord();
|
||||
int getZCoord();
|
||||
|
||||
public NBTTagCompound getCustomRitualTag();
|
||||
NBTTagCompound getCustomRitualTag();
|
||||
|
||||
public void setCustomRitualTag(NBTTagCompound tag);
|
||||
void setCustomRitualTag(NBTTagCompound tag);
|
||||
|
||||
public boolean areTanksEmpty();
|
||||
boolean areTanksEmpty();
|
||||
|
||||
public int getRunningTime();
|
||||
int getRunningTime();
|
||||
|
||||
public LocalRitualStorage getLocalStorage();
|
||||
LocalRitualStorage getLocalStorage();
|
||||
|
||||
public void setLocalStorage(LocalRitualStorage storage);
|
||||
void setLocalStorage(LocalRitualStorage storage);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -14,5 +14,5 @@ public interface IRitualStone
|
|||
* @param runeType
|
||||
* @return
|
||||
*/
|
||||
public boolean isRuneType(World world, int x, int y, int z, int meta, int runeType);
|
||||
boolean isRuneType(World world, int x, int y, int z, int meta, int runeType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,5 +2,5 @@ package WayofTime.alchemicalWizardry.api.rituals;
|
|||
|
||||
public interface ITileRitualStone
|
||||
{
|
||||
public boolean isRuneType(int runeType);
|
||||
boolean isRuneType(int runeType);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -126,12 +126,7 @@ public class Rituals
|
|||
{
|
||||
int direction = Rituals.getDirectionOfRitual(world, x, y, z, ritualID);
|
||||
|
||||
if (direction != -1)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
return direction != -1;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -149,8 +144,8 @@ public class Rituals
|
|||
return false;
|
||||
}
|
||||
|
||||
Block test = null;
|
||||
TileEntity te = null;
|
||||
Block test;
|
||||
TileEntity te;
|
||||
|
||||
for (RitualComponent rc : ritual)
|
||||
{
|
||||
|
|
@ -292,11 +287,6 @@ public class Rituals
|
|||
}
|
||||
}
|
||||
|
||||
public static int getNumberOfRituals()
|
||||
{
|
||||
return ritualMap.size();
|
||||
}
|
||||
|
||||
public String getRitualName()
|
||||
{
|
||||
return this.name;
|
||||
|
|
|
|||
|
|
@ -4,18 +4,18 @@ import net.minecraft.item.ItemStack;
|
|||
|
||||
public interface IIncense
|
||||
{
|
||||
public int getMinLevel(ItemStack stack);
|
||||
int getMinLevel(ItemStack stack);
|
||||
|
||||
public int getMaxLevel(ItemStack stack);
|
||||
int getMaxLevel(ItemStack stack);
|
||||
|
||||
public int getIncenseDuration(ItemStack stack);
|
||||
int getIncenseDuration(ItemStack stack);
|
||||
|
||||
/**
|
||||
* @param stack
|
||||
* @return a float from 0 to 1
|
||||
*/
|
||||
public float getRedColour(ItemStack stack);
|
||||
public float getGreenColour(ItemStack stack);
|
||||
public float getBlueColour(ItemStack stack);
|
||||
float getRedColour(ItemStack stack);
|
||||
float getGreenColour(ItemStack stack);
|
||||
float getBlueColour(ItemStack stack);
|
||||
float getTickRate(ItemStack stack);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -95,7 +95,7 @@ public class PlayerSacrificeHandler
|
|||
|
||||
public static IBloodAltar getAltar(World world, int x, int y, int z)
|
||||
{
|
||||
TileEntity tileEntity = null;
|
||||
TileEntity tileEntity;
|
||||
|
||||
for (int i = -2; i <= 2; i++)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package WayofTime.alchemicalWizardry.api.soulNetwork;
|
||||
|
||||
import java.util.UUID;
|
||||
|
||||
import net.minecraft.entity.player.EntityPlayer;
|
||||
import net.minecraft.item.ItemStack;
|
||||
import net.minecraft.nbt.NBTTagCompound;
|
||||
|
|
@ -16,26 +14,11 @@ import WayofTime.alchemicalWizardry.api.event.ItemBindEvent;
|
|||
import WayofTime.alchemicalWizardry.api.event.ItemDrainInContainerEvent;
|
||||
import WayofTime.alchemicalWizardry.api.event.ItemDrainNetworkEvent;
|
||||
|
||||
import com.mojang.authlib.GameProfile;
|
||||
|
||||
import cpw.mods.fml.common.eventhandler.Event;
|
||||
import cpw.mods.fml.common.eventhandler.Event.Result;
|
||||
|
||||
public class SoulNetworkHandler
|
||||
{
|
||||
public static UUID getUUIDFromPlayer(EntityPlayer player)
|
||||
{
|
||||
return player.getPersistentID();
|
||||
}
|
||||
|
||||
public static EntityPlayer getPlayerFromUUID(UUID uuid)
|
||||
{
|
||||
MinecraftServer server = MinecraftServer.getServer();
|
||||
GameProfile gameProfile;
|
||||
gameProfile = server.func_152358_ax().func_152652_a(uuid);
|
||||
return null;
|
||||
}
|
||||
|
||||
public static boolean syphonFromNetworkWhileInContainer(ItemStack ist, int damageToBeDone)
|
||||
{
|
||||
String ownerName = "";
|
||||
|
|
@ -204,10 +187,6 @@ public class SoulNetworkHandler
|
|||
World world = player.worldObj;
|
||||
if (world != null)
|
||||
{
|
||||
double posX = player.posX;
|
||||
double posY = player.posY;
|
||||
double posZ = player.posZ;
|
||||
|
||||
world.playSoundEffect((double) ((float) player.posX + 0.5F), (double) ((float) player.posY + 0.5F), (double) ((float) player.posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -4,5 +4,5 @@ import net.minecraft.entity.Entity;
|
|||
|
||||
public interface IProjectileUpdateEffect
|
||||
{
|
||||
public void onUpdateEffect(Entity projectile);
|
||||
void onUpdateEffect(Entity projectile);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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,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();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell;
|
|||
|
||||
public class SpellEnhancementCost extends SpellEnhancement
|
||||
{
|
||||
|
||||
public SpellEnhancementCost()
|
||||
{
|
||||
super(SpellEnhancement.EFFICIENCY);
|
||||
|
|
|
|||
|
|
@ -6,5 +6,4 @@ public class SpellEnhancementPotency extends SpellEnhancement
|
|||
{
|
||||
super(SpellEnhancement.POTENCY);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ package WayofTime.alchemicalWizardry.api.spell;
|
|||
|
||||
public class SpellEnhancementPower extends SpellEnhancement
|
||||
{
|
||||
|
||||
public SpellEnhancementPower()
|
||||
{
|
||||
super(SpellEnhancement.POWER);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -5,39 +5,38 @@ package WayofTime.alchemicalWizardry.api.tile;
|
|||
*/
|
||||
public interface IBloodAltar
|
||||
{
|
||||
int getCapacity();
|
||||
|
||||
public int getCapacity();
|
||||
int getCurrentBlood();
|
||||
|
||||
public int getCurrentBlood();
|
||||
int getTier();
|
||||
|
||||
public int getTier();
|
||||
int getProgress();
|
||||
|
||||
public int getProgress();
|
||||
float getSacrificeMultiplier();
|
||||
|
||||
public float getSacrificeMultiplier();
|
||||
float getSelfSacrificeMultiplier();
|
||||
|
||||
public float getSelfSacrificeMultiplier();
|
||||
float getOrbMultiplier();
|
||||
|
||||
public float getOrbMultiplier();
|
||||
float getDislocationMultiplier();
|
||||
|
||||
public float getDislocationMultiplier();
|
||||
int getBufferCapacity();
|
||||
|
||||
public int getBufferCapacity();
|
||||
void sacrificialDaggerCall(int amount, boolean b);
|
||||
|
||||
public void sacrificialDaggerCall(int amount, boolean b);
|
||||
|
||||
public void startCycle();
|
||||
void startCycle();
|
||||
|
||||
/**
|
||||
* Will set the altar to initiate a cooldown cycle after it crafts before starting to craft again, giving the user time to interact with the altar.
|
||||
* This can only be set while the altar is not active.
|
||||
* @param amount
|
||||
*/
|
||||
public void requestPauseAfterCrafting(int amount);
|
||||
void requestPauseAfterCrafting(int amount);
|
||||
|
||||
public void addToDemonBloodDuration(int dur);
|
||||
void addToDemonBloodDuration(int dur);
|
||||
|
||||
public boolean hasDemonBlood();
|
||||
boolean hasDemonBlood();
|
||||
|
||||
public void decrementDemonBlood();
|
||||
void decrementDemonBlood();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,5 +6,5 @@ import net.minecraft.world.World;
|
|||
|
||||
public interface ISpellParadigmTile extends ISpellTile
|
||||
{
|
||||
public void castSpell(World world, EntityPlayer entity, ItemStack spellCasterStack);
|
||||
void castSpell(World world, EntityPlayer entity, ItemStack spellCasterStack);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@ import WayofTime.alchemicalWizardry.api.spell.SpellParadigm;
|
|||
|
||||
public interface ISpellTile
|
||||
{
|
||||
public void modifySpellParadigm(SpellParadigm parad);
|
||||
void modifySpellParadigm(SpellParadigm parad);
|
||||
|
||||
public boolean canInputRecieveOutput(ForgeDirection output);
|
||||
boolean canInputRecieveOutput(ForgeDirection output);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue