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

Okay... They render now...

Browse source
This commit is contained in:
Nick 2015-10-30 22:07:06 -07:00
parent b45172294d
commit 07b1f36594
8 changed files with 47 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java
View file

@ -8,7 +8,10 @@ import WayofTime.alchemicalWizardry.block.BlockRitualHome;
import WayofTime.alchemicalWizardry.item.block.ItemBlockRitualHome;
import WayofTime.alchemicalWizardry.util.helper.InventoryRenderHelper;
import net.minecraft.block.Block;
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraftforge.client.model.ModelLoader;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fml.common.registry.GameRegistry;

13
src/main/java/WayofTime/alchemicalWizardry/util/helper/InventoryRenderHelper.java
View file

@ -45,9 +45,6 @@ public class InventoryRenderHelper {
* @param name - Name of the model JSON
*/
public void itemRender(Item item, int meta, String name) {
if (item instanceof ItemBlock && name.startsWith("ItemBlock"))
name = name.replace("Item", "");
String resName = domain + name;
ModelBakery.addVariantName(item, resName);
@ -61,7 +58,7 @@ public class InventoryRenderHelper {
* @param meta - Meta of Item
*/
public void itemRender(Item item, int meta) {
itemRender(item, meta, item.getClass().getSimpleName() + meta);
itemRender(item, meta, getClassName(item) + meta);
}
public void itemRender(Item item, String name) {
@ -74,7 +71,7 @@ public class InventoryRenderHelper {
* @param item - Item to register Model for
*/
public void itemRender(Item item) {
itemRender(item, 0, item.getClass().getSimpleName());
itemRender(item, 0, getClassName(item));
}
/**
@ -88,7 +85,7 @@ public class InventoryRenderHelper {
ModelLoader.setCustomMeshDefinition(item, new ItemMeshDefinition() {
@Override
public ModelResourceLocation getModelLocation(ItemStack stack) {
return new ModelResourceLocation(domain + toRender.getClass().getSimpleName(), "inventory");
return new ModelResourceLocation(domain + getClassName(toRender), "inventory");
}
});
}
@ -125,4 +122,8 @@ public class InventoryRenderHelper {
public static Item getItemFromBlock(Block block) {
return Item.getItemFromBlock(block);
}
private static String getClassName(Item item) {
return item instanceof ItemBlock ? Block.getBlockFromItem(item).getClass().getSimpleName() : item.getClass().getSimpleName();
}
}