From 07b1f36594c241235cd312647ef003dc992bb538 Mon Sep 17 00:00:00 2001 From: Nick Date: Fri, 30 Oct 2015 22:07:06 -0700 Subject: [PATCH] Okay... They render now... --- .../registry/ModBlocks.java | 3 +++ .../util/helper/InventoryRenderHelper.java | 13 ++++++----- .../blockstates/BlockRitualHome.json | 22 ++----------------- .../assets/alchemicalwizardry/lang/en_US.lang | 3 +++ .../models/block/BlockRitualHome0.json | 6 +++++ .../models/block/BlockRitualHome1.json | 6 +++++ .../models/item/BlockRitualHome0.json | 10 +++++++++ .../models/item/BlockRitualHome1.json | 10 +++++++++ 8 files changed, 47 insertions(+), 26 deletions(-) create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome0.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome1.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome0.json create mode 100644 src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome1.json diff --git a/src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java b/src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java index cd44c943..c124065d 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java +++ b/src/main/java/WayofTime/alchemicalWizardry/registry/ModBlocks.java @@ -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; diff --git a/src/main/java/WayofTime/alchemicalWizardry/util/helper/InventoryRenderHelper.java b/src/main/java/WayofTime/alchemicalWizardry/util/helper/InventoryRenderHelper.java index 98d129e0..d3386f81 100644 --- a/src/main/java/WayofTime/alchemicalWizardry/util/helper/InventoryRenderHelper.java +++ b/src/main/java/WayofTime/alchemicalWizardry/util/helper/InventoryRenderHelper.java @@ -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(); + } } diff --git a/src/main/resources/assets/alchemicalwizardry/blockstates/BlockRitualHome.json b/src/main/resources/assets/alchemicalwizardry/blockstates/BlockRitualHome.json index a68e4d31..76900457 100644 --- a/src/main/resources/assets/alchemicalwizardry/blockstates/BlockRitualHome.json +++ b/src/main/resources/assets/alchemicalwizardry/blockstates/BlockRitualHome.json @@ -1,24 +1,6 @@ { - "forge_marker": 1, - "defaults": { - "textures": { - "all": "alchemicalwizardry:blocks/MasterRitualStone" - }, - "model": "cube_all", - "uvlock": true - }, "variants": { - "meta": { - 0: { - "textures": { - "all": "alchemicalwizardry:blocks/MasterRitualStone" - } - }, - 1: { - "textures": { - "all": "alchemicalwizardry:blocks/ImperfectRitualStone" - } - } - } + "meta=0": { "model": "alchemicalwizardry:BlockRitualHome0" }, + "meta=1": { "model": "alchemicalwizardry:BlockRitualHome1" } } } \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang index 8d6fdbcd..b29c231c 100644 --- a/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang +++ b/src/main/resources/assets/alchemicalwizardry/lang/en_US.lang @@ -58,6 +58,9 @@ item.AlchemicalWizardry.sigil.divination.name=Divination Sigil # Blocks tile.AlchemicalWizardry.fluid.lifeEssence.name=Life Essence +tile.AlchemicalWizardry.stone.ritual.master.name=Master Ritual Stone +tile.AlchemicalWizardry.stone.ritual.imperfect.name=Imperfect Ritual Stone +tile.AlchemicalWizardry.altar.name=Blood Altar # Tooltips tooltip.AlchemicalWizardry.orb.desc=Stores raw Life Essence diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome0.json b/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome0.json new file mode 100644 index 00000000..08e4040e --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome0.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/MasterRitualStone" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome1.json b/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome1.json new file mode 100644 index 00000000..cbcd97de --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/block/BlockRitualHome1.json @@ -0,0 +1,6 @@ +{ + "parent": "block/cube_all", + "textures": { + "all": "alchemicalwizardry:blocks/ImperfectRitualStone" + } +} diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome0.json b/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome0.json new file mode 100644 index 00000000..a6c70f96 --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome0.json @@ -0,0 +1,10 @@ +{ + "parent": "alchemicalwizardry:block/BlockRitualHome0", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file diff --git a/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome1.json b/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome1.json new file mode 100644 index 00000000..a195b24f --- /dev/null +++ b/src/main/resources/assets/alchemicalwizardry/models/item/BlockRitualHome1.json @@ -0,0 +1,10 @@ +{ + "parent": "alchemicalwizardry:block/BlockRitualHome1", + "display": { + "thirdperson": { + "rotation": [ 10, -45, 170 ], + "translation": [ 0, 1.5, -2.75 ], + "scale": [ 0.375, 0.375, 0.375 ] + } + } +} \ No newline at end of file