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

Merge branch '1.8-Rewrite' of https://github.com/WayofTime/BloodMagic into 1.8-Rewrite

Browse source 
Conflicts:
	src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
This commit is contained in:
Arcaratus 2015-11-02 21:35:23 -05:00
commit 4734f1207a
24 changed files with 549 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/main/java/WayofTime/bloodmagic/registry/ModBlocks.java
View file

@ -7,7 +7,9 @@ import WayofTime.bloodmagic.block.BlockBloodRune;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.block.BlockRitualController;
import WayofTime.bloodmagic.item.block.ItemBlockBloodRune;
import WayofTime.bloodmagic.item.block.ItemBlockRitualHome;
import WayofTime.bloodmagic.item.block.ItemBlockRitualController;
import WayofTime.bloodmagic.tile.TileImperfectRitualStone;
import WayofTime.bloodmagic.tile.TileMasterRitualStone;
import WayofTime.bloodmagic.util.helper.InventoryRenderHelper;
import net.minecraft.block.Block;
import net.minecraft.item.ItemBlock;
@ -32,14 +34,15 @@ public class ModBlocks
altar = registerBlock(new BlockAltar());
blood_rune = registerBlock(new BlockBloodRune(), ItemBlockBloodRune.class);
ritualStone = registerBlock(new BlockRitualController(), ItemBlockRitualHome.class);
ritualStone = registerBlock(new BlockRitualController(), ItemBlockRitualController.class);
initTiles();
}
public static void initTiles()
{
GameRegistry.registerTileEntity(TileImperfectRitualStone.class, BloodMagic.MODID + ":" + TileImperfectRitualStone.class.getSimpleName());
GameRegistry.registerTileEntity(TileMasterRitualStone.class, BloodMagic.MODID + ":" + TileMasterRitualStone.class.getSimpleName());
}
public static void initRenders()