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

Added some rudimentary path blocks for the tranquility altar - textures pending.

Browse source
This commit is contained in:
WayofTime 2016-01-26 19:39:39 -05:00
parent f4d0b18521
commit cc1e11f09f
17 changed files with 216 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,6 +19,7 @@ import WayofTime.bloodmagic.block.BlockItemRoutingNode;
import WayofTime.bloodmagic.block.BlockLifeEssence;
import WayofTime.bloodmagic.block.BlockMasterRoutingNode;
import WayofTime.bloodmagic.block.BlockOutputRoutingNode;
import WayofTime.bloodmagic.block.BlockPath;
import WayofTime.bloodmagic.block.BlockPedestal;
import WayofTime.bloodmagic.block.BlockPhantom;
import WayofTime.bloodmagic.block.BlockRitualController;
@ -30,6 +31,7 @@ import WayofTime.bloodmagic.block.BlockTestSpellBlock;
import WayofTime.bloodmagic.item.block.ItemBlockBloodRune;
import WayofTime.bloodmagic.item.block.ItemBlockBloodStoneBrick;
import WayofTime.bloodmagic.item.block.ItemBlockCrystal;
import WayofTime.bloodmagic.item.block.ItemBlockPath;
import WayofTime.bloodmagic.item.block.ItemBlockPedestal;
import WayofTime.bloodmagic.item.block.ItemBlockRitualController;
import WayofTime.bloodmagic.item.block.ItemBlockRitualStone;
@ -69,6 +71,7 @@ public class ModBlocks
public static Block crystal;
public static Block bloodStoneBrick;
public static Block pathBlock;
public static Block masterRoutingNode;
public static Block inputRoutingNode;
@ -99,6 +102,7 @@ public class ModBlocks
outputRoutingNode = registerBlock(new BlockOutputRoutingNode());
itemRoutingNode = registerBlock(new BlockItemRoutingNode());
incenseAltar = registerBlock(new BlockIncenseAltar());
pathBlock = registerBlock(new BlockPath(), ItemBlockPath.class);
initTiles();
}
@ -157,6 +161,9 @@ public class ModBlocks
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(inputRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(itemRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(incenseAltar));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 2);
}
private static Block registerBlock(Block block, Class<? extends ItemBlock> itemBlock, String name)

4
src/main/java/WayofTime/bloodmagic/registry/ModPotions.java
View file

@ -2,6 +2,7 @@ package WayofTime.bloodmagic.registry;
import net.minecraft.potion.Potion;
import net.minecraft.util.ResourceLocation;
import WayofTime.bloodmagic.api.util.helper.PlayerSacrificeHelper;
import WayofTime.bloodmagic.potion.PotionBloodMagic;
import WayofTime.bloodmagic.potion.PotionEventHandlers;
@ -13,6 +14,7 @@ public class ModPotions
public static Potion whirlwind;
public static Potion planarBinding;
public static Potion soulSnare;
public static Potion soulFray;
public static void init()
{
@ -33,6 +35,8 @@ public class ModPotions
whirlwind = new PotionBloodMagic("Whirlwind", new ResourceLocation("whirlwind"), false, 0, 0, 0);
planarBinding = new PotionBloodMagic("Planar Binding", new ResourceLocation("planarBinding"), false, 0, 0, 0);
soulSnare = new PotionBloodMagic("Soul Snare", new ResourceLocation("soulSnare"), false, 0xFFFFFF, 0, 0);
soulFray = new PotionBloodMagic("Soul Fray", new ResourceLocation("soulFray"), true, 0xFFFFFF, 0, 0);
PlayerSacrificeHelper.soulFrayId = soulFray;
// heavyHeart = new PotionBloodMagic("Heavy Heart", new
// ResourceLocation(resourceLocation +
// heavyHeart.getName().toLowerCase()), true, 0, 0, 0);