From 003bfa5c164c203d0f5dea5cfe83632dcb078a26 Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Tue, 14 Mar 2017 19:03:35 -0500 Subject: [PATCH] Make a blockstate json for animated torch to silence log errors, move item json to right place --- .../botania/common/block/BlockAnimatedTorch.java | 8 ++++++++ .../assets/botania/blockstates/animatedtorch.json | 12 ++++++++++++ .../models/item/{ => itemblock}/animatedtorch.json | 0 3 files changed, 20 insertions(+) create mode 100644 src/main/resources/assets/botania/blockstates/animatedtorch.json rename src/main/resources/assets/botania/models/item/{ => itemblock}/animatedtorch.json (100%) diff --git a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java index 6c17f7f19..f2df5f130 100644 --- a/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java +++ b/src/main/java/vazkii/botania/common/block/BlockAnimatedTorch.java @@ -33,6 +33,7 @@ import vazkii.botania.api.lexicon.LexiconEntry; import vazkii.botania.api.mana.IManaTrigger; import vazkii.botania.api.wand.IWandHUD; import vazkii.botania.api.wand.IWandable; +import vazkii.botania.client.core.handler.ModelHandler; import vazkii.botania.common.block.tile.TileAnimatedTorch; import vazkii.botania.common.lexicon.LexiconData; import vazkii.botania.common.lib.LibBlockNames; @@ -141,4 +142,11 @@ public class BlockAnimatedTorch extends BlockMod implements IWandable, IManaTrig return LexiconData.animatedTorch; } + @SideOnly(Side.CLIENT) + @Override + public void registerModels() { + super.registerModels(); + ModelHandler.registerCustomItemblock(this, "animatedtorch"); + } + } diff --git a/src/main/resources/assets/botania/blockstates/animatedtorch.json b/src/main/resources/assets/botania/blockstates/animatedtorch.json new file mode 100644 index 000000000..2e7eaff0d --- /dev/null +++ b/src/main/resources/assets/botania/blockstates/animatedtorch.json @@ -0,0 +1,12 @@ +{ + "forge_marker": 1, + "defaults": { + "model": "botania:dummy", + "textures": { + "particle": "minecraft:blocks/redstone_torch_on" + } + }, + "variants": { + "normal": [{}] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/botania/models/item/animatedtorch.json b/src/main/resources/assets/botania/models/item/itemblock/animatedtorch.json similarity index 100% rename from src/main/resources/assets/botania/models/item/animatedtorch.json rename to src/main/resources/assets/botania/models/item/itemblock/animatedtorch.json