From 064fd20edb7ad42f2e98285b829a3d19480feb51 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 7 Jan 2016 16:56:03 -0600 Subject: [PATCH] Mana flash and water bowl items --- .../client/core/handler/ModelHandler.java | 2 ++ .../assets/botania/blockstates/manaFlame.json | 19 +++++++++++++++++++ .../assets/botania/models/item/waterBowl.json | 6 ++++++ 3 files changed, 27 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/manaFlame.json create mode 100644 src/main/resources/assets/botania/models/item/waterBowl.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 a93500f4a..e8e78b6ed 100644 --- a/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java +++ b/src/main/java/vazkii/botania/client/core/handler/ModelHandler.java @@ -419,6 +419,7 @@ public final class ModelHandler { registerItemModel(ModBlocks.tinyPotato); registerItemModel(ModBlocks.spawnerClaw); registerItemModel(ModBlocks.turntable); + registerItemModel(ModBlocks.manaFlame); // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length); @@ -569,6 +570,7 @@ public final class ModelHandler { registerItemModel(divaCharm); registerItemModel(manaMirror); registerItemModel(manaInkwell); + registerItemModel(waterBowl); registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES); registerItemModelAllMeta(laputaShard, 20); diff --git a/src/main/resources/assets/botania/blockstates/manaFlame.json b/src/main/resources/assets/botania/blockstates/manaFlame.json new file mode 100644 index 000000000..6e603cbb6 --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/manaFlame.json @@ -0,0 +1,19 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/fire_layer_0" + } + }, + "variants": { + "normal": [{}], + "inventory": [{ + "model": "builtin/generated", + "textures": { + "layer0": "minecraft:blocks/fire_layer_0" + }, + "transform": "forge:default-item" + }] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/waterBowl.json b/src/main/resources/assets/botania/models/item/waterBowl.json new file mode 100644 index 000000000..0aa3fc48b --- /dev/null +++ b/src/main/resources/assets/botania/models/item/waterBowl.json @@ -0,0 +1,6 @@ +{ + "parent": "botania:item/standard_item", + "textures": { + "layer0": "botania:items/waterBowl" + } +} \ No newline at end of file