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

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAlchemicCalcinator.java
View file

@ -147,7 +147,7 @@ public class BlockAlchemicCalcinator extends BlockContainer
tileEntity.setInventorySlotContents(1, newItem);
}
} else if (playerItem == null)
} else
{
if (tileEntity.getStackInSlot(1) != null)
{

11
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -26,13 +26,11 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockAltar extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockAltar()
{
@ -48,7 +46,6 @@ public class BlockAltar extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Top");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom");
}
@ -89,7 +86,7 @@ public class BlockAltar extends BlockContainer
int maxEssence = bloodOrb.getMaxEssence();
int currentEssence = bloodOrb.getCurrentEssence(stack);
int level = currentEssence * 15 / maxEssence;
return ((int) (Math.min(15, level))) % 16;
return Math.min(15, level) % 16;
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java
View file

@ -51,7 +51,7 @@ public class BlockBloodLightSource extends Block
{
if (rand.nextInt(3) != 0)
{
float f = (float) 1.0F;
float f = 1.0F;
float f1 = f * 0.6F + 0.4F;
float f2 = f * f * 0.7F - 0.5F;
float f3 = f * f * 0.6F - 0.7F;

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java
View file

@ -13,13 +13,11 @@ import net.minecraft.world.World;
public class BlockConduit extends BlockOrientable
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockConduit()
{
@ -35,7 +33,6 @@ public class BlockConduit extends BlockOrientable
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Top");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom");
}

6
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrucible.java
View file

@ -24,11 +24,11 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockCrucible extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon;
private IIcon sideIcon;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockCrucible()
{

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockCrystal.java
View file

@ -17,7 +17,9 @@ import java.util.List;
public class BlockCrystal extends Block
{
//private Icon bloodRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon fullIcon;
@SideOnly(Side.CLIENT)
private IIcon brickIcon;

6
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockEnchantmentGlyph.java
View file

@ -17,8 +17,10 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockEnchantmentGlyph extends Block implements IEnchantmentGlyph
{
public IIcon enchantability;
public IIcon enchantmentLevel;
@SideOnly(Side.CLIENT)
private IIcon enchantability;
@SideOnly(Side.CLIENT)
private IIcon enchantmentLevel;
public BlockEnchantmentGlyph()
{

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java
View file

@ -17,9 +17,12 @@ import net.minecraft.world.World;
public class BlockHomHeart extends BlockContainer
{
public IIcon bottomIcon;
public IIcon topIcon;
public IIcon sideIcon;
@SideOnly(Side.CLIENT)
private IIcon bottomIcon;
@SideOnly(Side.CLIENT)
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private IIcon sideIcon;
public BlockHomHeart()
{

1
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockOrientable.java
View file

@ -34,7 +34,6 @@ public class BlockOrientable extends BlockContainer
return false;
}
ForgeDirection sideClicked = ForgeDirection.getOrientation(side);
TileEntity tile = world.getTileEntity(x, y, z);
if (tile instanceof TEOrientable)

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java
View file

@ -22,13 +22,11 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockPedestal extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockPedestal()
{
@ -46,7 +44,6 @@ public class BlockPedestal extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePedestal");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
}

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java
View file

@ -22,13 +22,11 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockPlinth extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockPlinth()
{
@ -46,7 +44,6 @@ public class BlockPlinth extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:ArcanePlinth");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
}

2
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSchematicSaver.java
View file

@ -15,7 +15,7 @@ public class BlockSchematicSaver extends BlockContainer
super(Material.rock);
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
// setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("schematicSaver");
}

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java
View file

@ -23,13 +23,11 @@ import java.util.Random;
public class BlockSocket extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockSocket()
{
@ -46,7 +44,6 @@ public class BlockSocket extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodSocket");
}

1
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java
View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
import java.util.List;
public class BlockSpellEnhancement extends BlockOrientable
{
public BlockSpellEnhancement()

1
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java
View file

@ -12,7 +12,6 @@ import net.minecraft.world.World;
import java.util.List;
public class BlockSpellModifier extends BlockOrientable
{
public BlockSpellModifier()

3
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java
View file

@ -17,9 +17,6 @@ import java.util.List;
public class BlockSpellParadigm extends BlockOrientable
{
public static final float minPos = (3f / 16f);
public static final float maxPos = (13f / 16f);
public BlockSpellParadigm()
{
super();

3
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockStabilityGlyph.java
View file

@ -17,7 +17,8 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockStabilityGlyph extends Block implements IStabilityGlyph
{
public IIcon stability1;
@SideOnly(Side.CLIENT)
private IIcon stability1;
public BlockStabilityGlyph()
{

19
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java
View file

@ -33,13 +33,11 @@ import cpw.mods.fml.relauncher.SideOnly;
public class BlockTeleposer extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockTeleposer()
{
@ -55,7 +53,6 @@ public class BlockTeleposer extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Top");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:Teleposer_Side");
}
@ -219,17 +216,15 @@ public class BlockTeleposer extends BlockContainer
worldF.setTileEntity(xf, yf, zf, tileToSet);
}
Block initialBlock = blockI;
if (initialBlock != null)
if (blockI != null)
{
TileEntity tileToSet = initialBlock.createTileEntity(worldI, metaI);
TileEntity tileToSet = blockI.createTileEntity(worldI, metaI);
worldI.setTileEntity(xi, yi, zi, tileToSet);
}
//TILES CLEARED
worldF.setBlock(xf, yf, zf, initialBlock, metaI, flag);
worldF.setBlock(xf, yf, zf, blockI, metaI, flag);
if (tileEntityI != null)
{
@ -292,6 +287,6 @@ public class BlockTeleposer extends BlockContainer
@Optional.Method(modid = "ForgeMultipart")
public static void sendDescriptorOfTile(World world, TileEntity tile)
{
MultipartHelper.sendDescPacket(world, (TileMultipart)tile);
MultipartHelper.sendDescPacket(world, tile);
}
}

9
src/main/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java
View file

@ -25,13 +25,11 @@ import java.util.Random;
public class BlockWritingTable extends BlockContainer
{
@SideOnly(Side.CLIENT)
private static IIcon topIcon;
private IIcon topIcon;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon1;
private IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon sideIcon2;
@SideOnly(Side.CLIENT)
private static IIcon bottomIcon;
private IIcon bottomIcon;
public BlockWritingTable()
{
@ -47,7 +45,6 @@ public class BlockWritingTable extends BlockContainer
public void registerBlockIcons(IIconRegister iconRegister)
{
this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:AlchemicChemistrySet");
this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1");
this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2");
this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom");
}

5
src/main/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java
View file

@ -17,10 +17,15 @@ import java.util.List;
public class BloodRune extends Block
{
//private Icon bloodRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon altarCapacityRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon dislocationRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon orbCapacityRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon betterCapacityRuneIcon;
@SideOnly(Side.CLIENT)
private IIcon accelerationRuneIcon;
public BloodRune()

8
src/main/java/WayofTime/alchemicalWizardry/common/block/IOrientable.java
View file

@ -4,11 +4,11 @@ import net.minecraftforge.common.util.ForgeDirection;
public interface IOrientable
{
public ForgeDirection getInputDirection();
ForgeDirection getInputDirection();
public ForgeDirection getOutputDirection();
ForgeDirection getOutputDirection();
public void setInputDirection(ForgeDirection direction);
void setInputDirection(ForgeDirection direction);
public void setOutputDirection(ForgeDirection direction);
void setOutputDirection(ForgeDirection direction);
}

14
src/main/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java
View file

@ -38,22 +38,12 @@ public class LifeEssenceBlock extends BlockFluidClassic
@Override
public boolean canDisplace(IBlockAccess world, int x, int y, int z)
{
if (world.getBlock(x, y, z).getMaterial().isLiquid())
{
return false;
}
return super.canDisplace(world, x, y, z);
return !world.getBlock(x, y, z).getMaterial().isLiquid() && super.canDisplace(world, x, y, z);
}
@Override
public boolean displaceIfPossible(World world, int x, int y, int z)
{
if (world.getBlock(x, y, z).getMaterial().isLiquid())
{
return false;
}
return super.displaceIfPossible(world, x, y, z);
return !world.getBlock(x, y, z).getMaterial().isLiquid() && super.displaceIfPossible(world, x, y, z);
}
}

2
src/main/java/WayofTime/alchemicalWizardry/common/block/MimicBlock.java
View file

@ -45,7 +45,7 @@ public class MimicBlock extends BlockContainer
Block block = mimic.getBlock();
return block != null ? block.shouldSideBeRendered(world, x, y, z, side) : true;
return block == null || block.shouldSideBeRendered(world, x, y, z, side);
}
@SideOnly(Side.CLIENT)

14
src/main/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java
View file

@ -17,19 +17,19 @@ import net.minecraft.world.World;
public class RitualStone extends Block implements IRitualStone
{
@SideOnly(Side.CLIENT)
private static IIcon blankIcon;
private IIcon blankIcon;
@SideOnly(Side.CLIENT)
private static IIcon waterStoneIcon;
private IIcon waterStoneIcon;
@SideOnly(Side.CLIENT)
private static IIcon fireStoneIcon;
private IIcon fireStoneIcon;
@SideOnly(Side.CLIENT)
private static IIcon earthStoneIcon;
private IIcon earthStoneIcon;
@SideOnly(Side.CLIENT)
private static IIcon airStoneIcon;
private IIcon airStoneIcon;
@SideOnly(Side.CLIENT)
private static IIcon duskStoneIcon;
private IIcon duskStoneIcon;
@SideOnly(Side.CLIENT)
private static IIcon dawnStoneIcon;
private IIcon dawnStoneIcon;
public RitualStone()
{

2
src/main/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java
View file

@ -60,7 +60,7 @@ public class SpectralBlock extends BlockContainer
return false;
}
return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
return block != this && super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
}
@SideOnly(Side.CLIENT)