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

Begin new model system

Browse source 
Includes some examples for both ways.
This commit is contained in:
Nick 2016-03-15 22:48:01 -07:00
parent 5c2ba20a32
commit ba0b24d231
28 changed files with 332 additions and 104 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package WayofTime.bloodmagic.registry;
import WayofTime.bloodmagic.item.block.*;
import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;
@ -233,16 +232,11 @@ public class ModBlocks
return block;
}
if (!ConfigHandler.blockBlacklist.contains(block.getRegistryName().split(":")[1]))
String blockName = block.getRegistryName().split(":")[1];
if (!ConfigHandler.blockBlacklist.contains(blockName)) {
GameRegistry.registerBlock(block, itemBlock);
return block;
}
private static Block registerBlock(Block block, String name)
{
if (!ConfigHandler.blockBlacklist.contains(name))
GameRegistry.registerBlock(block, name);
BloodMagic.proxy.tryHandleBlockModel(block, blockName);
}
return block;
}
@ -255,8 +249,11 @@ public class ModBlocks
return null;
}
if (!ConfigHandler.blockBlacklist.contains(block.getRegistryName().split(":")[1]))
String blockName = block.getRegistryName().split(":")[1];
if (!ConfigHandler.blockBlacklist.contains(blockName)) {
GameRegistry.registerBlock(block);
BloodMagic.proxy.tryHandleBlockModel(block, blockName);
}
return block;
}

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

@ -259,12 +259,6 @@ public class ModItems
renderHelperV2.registerRender(soulGem, 4, "grand");
renderHelperV2.registerRender(soulSnare, "soulSnare");
renderHelperV2.registerRender(slate, 0, "blank");
renderHelperV2.registerRender(slate, 1, "reinforced");
renderHelperV2.registerRender(slate, 2, "imbued");
renderHelperV2.registerRender(slate, 3, "demonic");
renderHelperV2.registerRender(slate, 4, "ethereal");
renderHelperV2.registerRender(inscriptionTool, 1, EnumRuneType.WATER.name());
renderHelperV2.registerRender(inscriptionTool, 2, EnumRuneType.FIRE.name());
renderHelperV2.registerRender(inscriptionTool, 3, EnumRuneType.EARTH.name());
@ -379,8 +373,6 @@ public class ModItems
renderHelper.itemRender(sigilTeleposition);
renderHelper.itemRender(sigilTransposition);
renderHelper.customItemRender(sentientSword, 0);
renderHelper.customItemRender(sentientSword, 1);
renderHelper.itemRender(sentientBow, 0, "ItemSentientBow");
renderHelper.itemRender(sentientBow, 1, "ItemSentientBow_pulling_0");
renderHelper.itemRender(sentientBow, 2, "ItemSentientBow_pulling_1");
@ -393,7 +385,10 @@ public class ModItems
private static Item registerItem(Item item, String name)
{
if (!ConfigHandler.itemBlacklist.contains(name))
{
GameRegistry.registerItem(item, name);
BloodMagic.proxy.tryHandleItemModel(item, name);
}
return item;
}
@ -406,8 +401,12 @@ public class ModItems
return item;
}
if (!ConfigHandler.itemBlacklist.contains(item.getRegistryName().split(":")[1]))
String itemName = item.getRegistryName().split(":")[1];
if (!ConfigHandler.itemBlacklist.contains(itemName))
{
GameRegistry.registerItem(item);
BloodMagic.proxy.tryHandleItemModel(item, itemName);
}
return item;
}