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

Most blocks are done

Browse source
This commit is contained in:
Nick 2016-03-16 15:37:55 -07:00
parent 9de1f6e43e
commit b1db7c5152
85 changed files with 221 additions and 637 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -165,49 +165,15 @@ public class ModBlocks
InventoryRenderHelperV2 renderHelperV2 = BloodMagic.proxy.getRenderHelperV2();
renderHelper.fluidRender(lifeEssence);
for (int i = 0; i < BlockBloodRune.names.length; i++)
{
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodRune), i);
}
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(altar));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualController), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualController), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 2);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 3);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 4);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 5);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(ritualStone), 6);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodStoneBrick), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodStoneBrick), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(crystal), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(crystal), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(bloodLight));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pedestal), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(teleposer));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(alchemyArray));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(spectralBlock));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(phantomBlock));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(soulForge));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(outputRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(inputRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(masterRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(itemRoutingNode));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(incenseAltar));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonCrucible));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonCrystallizer));
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 0);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 1);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 2);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 3);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 4);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 5);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 6);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(pathBlock), 7);
renderHelper.itemRender(InventoryRenderHelper.getItemFromBlock(demonPylon));
renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 0, "ItemBlockDemonCrystal", "default");
renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 1, "ItemBlockDemonCrystal", "corrosive");
renderHelperV2.registerRender(InventoryRenderHelper.getItemFromBlock(demonCrystal), 2, "ItemBlockDemonCrystal", "destructive");
@ -219,8 +185,10 @@ public class ModBlocks
private static Block registerBlock(Block block, Class<? extends ItemBlock> itemBlock, String name)
{
if (!ConfigHandler.blockBlacklist.contains(name))
GameRegistry.registerBlock(block, itemBlock, name);
if (!ConfigHandler.blockBlacklist.contains(name)) {
GameRegistry.registerBlock(block, itemBlock);
BloodMagic.proxy.tryHandleBlockModel(block, name);
}
return block;
}

31
src/main/java/WayofTime/bloodmagic/registry/ModItems.java
View file

@ -266,37 +266,6 @@ public class ModItems
renderHelper.itemRender(bucketEssence);
// renderHelper.itemRender(sigilDivination);
// renderHelper.itemRender(sigilAir);
// renderHelper.itemRender(sigilWater);
// renderHelper.itemRender(sigilLava);
// renderHelper.itemRender(sigilVoid);
// renderHelper.itemRender(sigilGreenGrove, 0);
// renderHelper.itemRender(sigilGreenGrove, 1);
// renderHelper.itemRender(sigilBloodLight);
// renderHelper.itemRender(sigilElementalAffinity, 0);
// renderHelper.itemRender(sigilElementalAffinity, 1);
// renderHelper.itemRender(sigilMagnetism, 0);
// renderHelper.itemRender(sigilMagnetism, 1);
// renderHelper.itemRender(sigilSuppression, 0);
// renderHelper.itemRender(sigilSuppression, 1);
// renderHelper.itemRender(sigilHaste, 0);
// renderHelper.itemRender(sigilHaste, 1);
// renderHelper.itemRender(sigilFastMiner, 0);
// renderHelper.itemRender(sigilFastMiner, 1);
// renderHelper.itemRender(sigilSeer);
// renderHelper.itemRender(sigilPhantomBridge, 0);
// renderHelper.itemRender(sigilPhantomBridge, 1);
// renderHelper.itemRender(sigilWhirlwind, 0);
// renderHelper.itemRender(sigilWhirlwind, 1);
// renderHelper.itemRender(sigilCompression, 0);
// renderHelper.itemRender(sigilCompression, 1);
// renderHelper.itemRender(sigilEnderSeverance, 0);
// renderHelper.itemRender(sigilEnderSeverance, 1);
//
// renderHelper.itemRender(sigilTeleposition);
// renderHelper.itemRender(sigilTransposition);
renderHelper.itemRender(sentientBow, 0, "ItemSentientBow");
renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0");
renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1");