From 1cc995c986b3c50513efc854ec20e78b11c4ac83 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Sat, 30 Jul 2016 10:56:14 -0500 Subject: [PATCH] Split black lotus metas --- .../botania/client/core/handler/ModelHandler.java | 15 ++++----------- .../botania/common/item/ItemBlackLotus.java | 3 +-- .../item/{blackLotus.json => blackLotus0.json} | 3 +-- .../assets/botania/models/item/blackLotus1.json | 6 ++++++ 4 files changed, 12 insertions(+), 15 deletions(-) rename src/main/resources/assets/botania/models/item/{blackLotus.json => blackLotus0.json} (80%) create mode 100644 src/main/resources/assets/botania/models/item/blackLotus1.json diff --git a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java index c28ce34a6..8b71b9c4d 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -102,15 +102,13 @@ public final class ModelHandler { registerStandardBlocks(); - for (Block block : Block.REGISTRY) { - if (block.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) - && block instanceof IModelRegister) + for(Block block : Block.REGISTRY) { + if(block instanceof IModelRegister) ((IModelRegister) block).registerModels(); } - for (Item item : Item.REGISTRY) { - if (item.getRegistryName().getResourceDomain().equalsIgnoreCase(LibMisc.MOD_ID) - && item instanceof IModelRegister) + for(Item item : Item.REGISTRY) { + if(item instanceof IModelRegister) ((IModelRegister) item).registerModels(); } } @@ -369,10 +367,5 @@ public final class ModelHandler { } } - public static void registerItemModel(Item i,int meta) { - ResourceLocation loc = i.getRegistryName(); - ModelLoader.setCustomModelResourceLocation(i, meta, new ModelResourceLocation(loc, "inventory")); - } - private ModelHandler() {} } diff --git a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java index 685946295..76d0c4bb5 100644 --- a/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java +++ b/src/main/java/vazkii/botania/common/item/ItemBlackLotus.java @@ -85,8 +85,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable { @SideOnly(Side.CLIENT) @Override public void registerModels() { - ModelHandler.registerItemModel(this, 0); - ModelHandler.registerItemModel(this, 1); + ModelHandler.registerItemAppendMeta(this, 2, LibItemNames.BLACK_LOTUS); } } diff --git a/src/main/resources/assets/botania/models/item/blackLotus.json b/src/main/resources/assets/botania/models/item/blackLotus0.json similarity index 80% rename from src/main/resources/assets/botania/models/item/blackLotus.json rename to src/main/resources/assets/botania/models/item/blackLotus0.json index 6a3582c0b..bfab19bc4 100644 --- a/src/main/resources/assets/botania/models/item/blackLotus.json +++ b/src/main/resources/assets/botania/models/item/blackLotus0.json @@ -1,7 +1,6 @@ { "parent": "minecraft:item/generated", - "textures": - { + "textures": { "layer0": "botania:items/blackLotus" } } \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/blackLotus1.json b/src/main/resources/assets/botania/models/item/blackLotus1.json new file mode 100644 index 000000000..94c1f6ae9 --- /dev/null +++ b/src/main/resources/assets/botania/models/item/blackLotus1.json @@ -0,0 +1,6 @@ +{ + "parent": "minecraft:item/generated", + "textures": { + "layer0": "botania:items/blackLotus" + } +} \ No newline at end of file