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

More changes

Browse source
This commit is contained in:
WayofTime 2014-02-19 17:03:56 -05:00
parent 9aaa65feb4
commit d5ba110323
56 changed files with 1250 additions and 618 deletions
Download patch file Download diff file Expand all files Collapse all files

1
1.7.2/java/WayofTime/alchemicalWizardry/common/block/ArmourForge.java
View file

@ -38,6 +38,7 @@ public class ArmourForge extends Block
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("armourForge");
//setUnlocalizedName("armourForge");
// TODO Auto-generated constructor stub
}

9
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockAltar.java
View file

@ -43,6 +43,7 @@ public class BlockAltar extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("bloodAltar");
//setUnlocalizedName("blockAltar");
//func_111022_d("AlchemicalWizardry:blocks");
}
@ -99,6 +100,9 @@ public class BlockAltar extends BlockContainer
if (player.worldObj.isRemote)
{
world.markBlockForUpdate(x, y, z);
}else
{
tileEntity.sendChatInfoToPlayer(player);
}
return true;
@ -111,8 +115,11 @@ public class BlockAltar extends BlockContainer
if (player.worldObj.isRemote)
{
world.markBlockForUpdate(x, y, z);
}else
{
tileEntity.sendChatInfoToPlayer(player);
}
return true;
}
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockBloodLightSource.java
View file

@ -19,7 +19,7 @@ public class BlockBloodLightSource extends Block
{
super(Material.cloth);
//setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//this.setUnlocalizedName("blockBloodLightSource");
this.setBlockName("blockBloodLightSource");
}
@Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockConduit.java
View file

@ -27,7 +27,7 @@ public class BlockConduit extends BlockOrientable
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("blockConduit");
this.setBlockName("blockConduit");
//func_111022_d("AlchemicalWizardry:blocks");
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockHomHeart.java
View file

@ -27,7 +27,7 @@ public class BlockHomHeart extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("blockHomHeart");
this.setBlockName("blockHomHeart");
}
@Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockMasterStone.java
View file

@ -22,7 +22,7 @@ public class BlockMasterStone extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("blockMasterStone");
this.setBlockName("blockMasterStone");
// TODO Auto-generated constructor stub
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockPedestal.java
View file

@ -38,7 +38,7 @@ public class BlockPedestal extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("bloodPedestal");
this.setBlockName("bloodPedestal");
//func_111022_d("AlchemicalWizardry:blocks");
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockPlinth.java
View file

@ -38,7 +38,7 @@ public class BlockPlinth extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("bloodPlinth");
this.setBlockName("bloodPlinth");
//func_111022_d("AlchemicalWizardry:blocks");
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockSocket.java
View file

@ -37,7 +37,7 @@ public class BlockSocket extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("bloodSocket");
this.setBlockName("bloodSocket");
//func_111022_d("AlchemicalWizardry:blocks");
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEffect.java
View file

@ -18,7 +18,7 @@ public class BlockSpellEffect extends BlockOrientable
public BlockSpellEffect()
{
super();
//setUnlocalizedName("blockSpellEffect");
this.setBlockName("blockSpellEffect");
}
@Override

20
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockSpellEnhancement.java
View file

@ -20,7 +20,7 @@ public class BlockSpellEnhancement extends BlockOrientable
public BlockSpellEnhancement()
{
super();
//setUnlocalizedName("blockSpellEnhancement");
this.setBlockName("blockSpellEnhancement");
}
@Override
@ -29,6 +29,24 @@ public class BlockSpellEnhancement extends BlockOrientable
return new TESpellEnhancementBlock();
}
@Override
public boolean renderAsNormalBlock()
{
return false;
}
@Override
public int getRenderType()
{
return -1;
}
@Override
public boolean isOpaqueCube()
{
return false;
}
@SideOnly(Side.CLIENT)
public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List)
{

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockSpellModifier.java
View file

@ -19,7 +19,7 @@ public class BlockSpellModifier extends BlockOrientable
public BlockSpellModifier()
{
super();
//setUnlocalizedName("blockSpellModifier");
this.setBlockName("blockSpellModifier");
}
@Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockSpellParadigm.java
View file

@ -27,7 +27,7 @@ public class BlockSpellParadigm extends BlockOrientable
public BlockSpellParadigm()
{
super();
//setUnlocalizedName("blockSpellParadigm");
this.setBlockName("blockSpellParadigm");
//setBlockBounds(minPos, minPos, minPos, maxPos, maxPos, maxPos);
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockTeleposer.java
View file

@ -41,7 +41,7 @@ public class BlockTeleposer extends BlockContainer
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("bloodTeleposer");
this.setBlockName("bloodTeleposer");
//func_111022_d("AlchemicalWizardry:blocks");
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BlockWritingTable.java
View file

@ -38,7 +38,7 @@ public class BlockWritingTable extends BlockContainer
super(Material.wood);
setHardness(2.0F);
setResistance(5.0F);
//setUnlocalizedName("blockWritingTable");
this.setBlockName("blockWritingTable");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BloodRune.java
View file

@ -26,7 +26,7 @@ public class BloodRune extends Block
public BloodRune()
{
super(Material.iron);
//setUnlocalizedName("bloodRune");
this.setBlockName("bloodRune");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/BloodStoneBrick.java
View file

@ -15,7 +15,7 @@ public class BloodStoneBrick extends Block
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("bloodStoneBrick");
this.setBlockName("bloodStoneBrick");
}
@Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/EfficiencyRune.java
View file

@ -10,7 +10,7 @@ public class EfficiencyRune extends BloodRune
public EfficiencyRune()
{
super();
//setUnlocalizedName("efficiencyRune");
this.setBlockName("efficiencyRune");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/EmptySocket.java
View file

@ -15,7 +15,7 @@ public class EmptySocket extends Block
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("emptySocket");
this.setBlockName("emptySocket");
// TODO Auto-generated constructor stub
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/ImperfectRitualStone.java
View file

@ -25,7 +25,7 @@ public class ImperfectRitualStone extends Block
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("imperfectRitualStone");
this.setBlockName("imperfectRitualStone");
// TODO Auto-generated constructor stub
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/LargeBloodStoneBrick.java
View file

@ -15,7 +15,7 @@ public class LargeBloodStoneBrick extends Block
setHardness(2.0F);
setResistance(5.0F);
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
//setUnlocalizedName("largeBloodStoneBrick");
this.setBlockName("largeBloodStoneBrick");
}
@Override

3
1.7.2/java/WayofTime/alchemicalWizardry/common/block/LifeEssenceBlock.java
View file

@ -17,6 +17,7 @@ public class LifeEssenceBlock extends BlockFluidClassic
super(AlchemicalWizardry.lifeEssenceFluid, Material.water);
AlchemicalWizardry.lifeEssenceFluid.setBlock(this);
//setCreativeTab(AlchemicalWizardry.tabBloodMagic);
this.setBlockName("lifeEssenceFluidBlock");
}
@Override
@ -31,7 +32,7 @@ public class LifeEssenceBlock extends BlockFluidClassic
public void registerBlockIcons(IIconRegister iconRegister)
{
this.blockIcon = iconRegister.registerIcon("AlchemicalWizardry:lifeEssenceStill");
this.getFluid().setIcons(blockIcon);
//this.getFluid().setIcons(blockIcon);
}
@Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/RitualStone.java
View file

@ -35,7 +35,7 @@ public class RitualStone extends Block
super(Material.iron);
setHardness(2.0F);
setResistance(5.0F);
//setUnlocalizedName("ritualStone");
this.setBlockName("ritualStone");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
}

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/RuneOfSacrifice.java
View file

@ -10,7 +10,7 @@ public class RuneOfSacrifice extends BloodRune
public RuneOfSacrifice()
{
super();
//setUnlocalizedName("runeOfSacrifice");
this.setBlockName("runeOfSacrifice");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/RuneOfSelfSacrifice.java
View file

@ -10,7 +10,7 @@ public class RuneOfSelfSacrifice extends BloodRune
public RuneOfSelfSacrifice()
{
super();
//setUnlocalizedName("runeOfSelfSacrifice");
this.setBlockName("runeOfSelfSacrifice");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/SpectralBlock.java
View file

@ -17,7 +17,7 @@ public class SpectralBlock extends Block
public SpectralBlock()
{
super(Material.rock);
//this.setUnlocalizedName("spectralBlock");
this.setBlockName("spectralBlock");
}
// @Override

2
1.7.2/java/WayofTime/alchemicalWizardry/common/block/SpeedRune.java
View file

@ -10,7 +10,7 @@ public class SpeedRune extends BloodRune
public SpeedRune()
{
super();
//setUnlocalizedName("speedRune");
this.setBlockName("speedRune");
setCreativeTab(AlchemicalWizardry.tabBloodMagic);
setHardness(2.0F);
setResistance(5.0F);