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

Update Forge + mappings

Browse source
This commit is contained in:
Nicholas Ignoffo 2016-04-24 10:06:28 -07:00
parent b408234ab0
commit d550513f0a
98 changed files with 313 additions and 296 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/WayofTime/bloodmagic/block/BlockAlchemyArray.java
View file

@ -32,7 +32,7 @@ public class BlockAlchemyArray extends BlockContainer
public BlockAlchemyArray()
{
super(Material.cloth);
super(Material.CLOTH);
setUnlocalizedName(Constants.Mod.MODID + ".alchemyArray");
setHardness(0.1f);

2
src/main/java/WayofTime/bloodmagic/block/BlockAltar.java
View file

@ -37,7 +37,7 @@ public class BlockAltar extends BlockContainer implements IVariantProvider
{
public BlockAltar()
{
super(Material.rock);
super(Material.ROCK);
setUnlocalizedName(Constants.Mod.MODID + ".altar");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodLight.java
View file

@ -26,7 +26,7 @@ public class BlockBloodLight extends Block
public BlockBloodLight()
{
super(Material.cloth);
super(Material.CLOTH);
setUnlocalizedName(Constants.Mod.MODID + ".bloodLight");
}

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodRune.java
View file

@ -22,7 +22,7 @@ public class BlockBloodRune extends BlockString implements IVariantProvider
public BlockBloodRune()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".rune.");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodStoneBrick.java
View file

@ -19,7 +19,7 @@ public class BlockBloodStoneBrick extends BlockString implements IVariantProvide
public BlockBloodStoneBrick()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".bloodstonebrick.");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockBloodTank.java
View file

@ -30,7 +30,7 @@ public class BlockBloodTank extends BlockContainer
{
public BlockBloodTank()
{
super(Material.iron);
super(Material.IRON);
setUnlocalizedName(Constants.Mod.MODID + ".bloodTank");
setHardness(2.0F);

2
src/main/java/WayofTime/bloodmagic/block/BlockCrystal.java
View file

@ -19,7 +19,7 @@ public class BlockCrystal extends BlockString implements IVariantProvider
public BlockCrystal()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".crystal.");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrucible.java
View file

@ -31,7 +31,7 @@ public class BlockDemonCrucible extends BlockContainer implements IVariantProvid
{
public BlockDemonCrucible()
{
super(Material.rock);
super(Material.ROCK);
setUnlocalizedName(Constants.Mod.MODID + ".demonCrucible");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystal.java
View file

@ -39,7 +39,7 @@ public class BlockDemonCrystal extends BlockContainer
public BlockDemonCrystal()
{
super(Material.rock);
super(Material.ROCK);
this.setDefaultState(this.blockState.getBaseState().withProperty(TYPE, EnumDemonWillType.DEFAULT).withProperty(ATTACHED, EnumFacing.UP));
setUnlocalizedName(Constants.Mod.MODID + ".demonCrystal");

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonCrystallizer.java
View file

@ -25,7 +25,7 @@ public class BlockDemonCrystallizer extends BlockContainer implements IVariantPr
{
public BlockDemonCrystallizer()
{
super(Material.rock);
super(Material.ROCK);
setUnlocalizedName(Constants.Mod.MODID + ".demonCrystallizer");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockDemonPylon.java
View file

@ -24,7 +24,7 @@ public class BlockDemonPylon extends BlockContainer implements IVariantProvider
{
public BlockDemonPylon()
{
super(Material.rock);
super(Material.ROCK);
setUnlocalizedName(Constants.Mod.MODID + ".demonPylon");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockDimensionalPortal.java
View file

@ -32,7 +32,7 @@ public class BlockDimensionalPortal extends BlockIntegerContainer
public BlockDimensionalPortal()
{
super(Material.portal, 2);
super(Material.PORTAL, 2);
setUnlocalizedName(Constants.Mod.MODID + ".dimensionalPortal");
setBlockUnbreakable();
setResistance(2000);

2
src/main/java/WayofTime/bloodmagic/block/BlockIncenseAltar.java
View file

@ -27,7 +27,7 @@ public class BlockIncenseAltar extends BlockContainer implements IVariantProvide
public BlockIncenseAltar()
{
super(Material.rock);
super(Material.ROCK);
setUnlocalizedName(Constants.Mod.MODID + ".incenseAltar");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockLifeEssence.java
View file

@ -22,7 +22,7 @@ public class BlockLifeEssence extends BlockFluidClassic
public BlockLifeEssence()
{
super(lifeEssence, Material.water);
super(lifeEssence, Material.WATER);
setUnlocalizedName(Constants.Mod.MODID + ".fluid.lifeEssence");
lifeEssence.setBlock(this);

2
src/main/java/WayofTime/bloodmagic/block/BlockPath.java
View file

@ -27,7 +27,7 @@ public class BlockPath extends BlockString implements IIncensePath, IVariantProv
public BlockPath()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".path.");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockPedestal.java
View file

@ -23,7 +23,7 @@ public class BlockPedestal extends BlockStringContainer
public BlockPedestal()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockPhantom.java
View file

@ -30,7 +30,7 @@ public class BlockPhantom extends BlockContainer implements IVariantProvider
{
public BlockPhantom()
{
super(Material.cloth);
super(Material.CLOTH);
setUnlocalizedName(Constants.Mod.MODID + ".phantom");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockRitualController.java
View file

@ -38,7 +38,7 @@ public class BlockRitualController extends BlockStringContainer implements IVari
public BlockRitualController()
{
super(Material.rock, names);
super(Material.ROCK, names);
setUnlocalizedName(Constants.Mod.MODID + ".stone.ritual.");
setCreativeTab(BloodMagic.tabBloodMagic);

2
src/main/java/WayofTime/bloodmagic/block/BlockRitualStone.java
View file

@ -29,7 +29,7 @@ public class BlockRitualStone extends BlockString implements IRitualStone, IVari
public BlockRitualStone()
{
super(Material.iron, names);
super(Material.IRON, names);
setUnlocalizedName(Constants.Mod.MODID + ".ritualStone.");
setCreativeTab(BloodMagic.tabBloodMagic);

4
src/main/java/WayofTime/bloodmagic/block/BlockRoutingNode.java
View file

@ -31,7 +31,7 @@ public abstract class BlockRoutingNode extends BlockContainer
public BlockRoutingNode()
{
super(Material.rock);
super(Material.ROCK);
setCreativeTab(BloodMagic.tabBloodMagic);
setHardness(2.0F);
@ -78,7 +78,7 @@ public abstract class BlockRoutingNode extends BlockContainer
}
@Override
public boolean canRenderInLayer(BlockRenderLayer layer)
public boolean canRenderInLayer(IBlockState state, BlockRenderLayer layer)
{
return layer == BlockRenderLayer.CUTOUT_MIPPED || layer == BlockRenderLayer.TRANSLUCENT;
}

2
src/main/java/WayofTime/bloodmagic/block/BlockSoulForge.java
View file

@ -32,7 +32,7 @@ public class BlockSoulForge extends BlockContainer implements IVariantProvider
public BlockSoulForge()
{
super(Material.iron);
super(Material.IRON);
setUnlocalizedName(Constants.Mod.MODID + ".soulForge");
setHardness(2.0F);

2
src/main/java/WayofTime/bloodmagic/block/BlockSpectral.java
View file

@ -28,7 +28,7 @@ public class BlockSpectral extends BlockContainer implements IVariantProvider
public BlockSpectral()
{
super(Material.cloth);
super(Material.CLOTH);
setUnlocalizedName(Constants.Mod.MODID + ".spectral");
}

2
src/main/java/WayofTime/bloodmagic/block/BlockTeleposer.java
View file

@ -28,7 +28,7 @@ public class BlockTeleposer extends BlockContainer implements IVariantProvider
{
public BlockTeleposer()
{
super(Material.rock);
super(Material.ROCK);
setCreativeTab(BloodMagic.tabBloodMagic);
setUnlocalizedName(Constants.Mod.MODID + ".teleposer");

2
src/main/java/WayofTime/bloodmagic/block/base/BlockInteger.java
View file

@ -84,7 +84,7 @@ public class BlockInteger extends Block
@Override
public BlockStateContainer createBlockState()
{
return Blocks.air.getBlockState();
return Blocks.AIR.getBlockState();
}
@Override