From 6e5952e36b45a5d13df9b11802a7b4d76fa2f9ef Mon Sep 17 00:00:00 2001 From: Vincent Lee Date: Thu, 5 Jan 2017 09:12:21 -0600 Subject: [PATCH] Fix special flower rendering --- .../vazkii/botania/client/model/SpecialFlowerModel.java | 6 +++--- .../resources/assets/botania/blockstates/specialflower.json | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java index 5330a5140..03f99cb29 100644 --- a/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java +++ b/src/main/java/vazkii/botania/client/model/SpecialFlowerModel.java @@ -147,9 +147,9 @@ public class SpecialFlowerModel implements IModelCustomData { @Override public boolean accepts(ResourceLocation modelLocation) { return modelLocation.getResourceDomain().equals("botania_special") && ( - modelLocation.getResourcePath().equals("specialFlower") || - modelLocation.getResourcePath().equals("models/block/specialFlower") || - modelLocation.getResourcePath().equals("models/item/specialFlower")); + modelLocation.getResourcePath().equals("specialflower") || + modelLocation.getResourcePath().equals("models/block/specialflower") || + modelLocation.getResourcePath().equals("models/item/specialflower")); } @Override diff --git a/src/main/resources/assets/botania/blockstates/specialflower.json b/src/main/resources/assets/botania/blockstates/specialflower.json index f50d3aac7..0712053f5 100644 --- a/src/main/resources/assets/botania/blockstates/specialflower.json +++ b/src/main/resources/assets/botania/blockstates/specialflower.json @@ -6,10 +6,10 @@ }, "variants": { "normal": [{ - "custom": { "base": "botania:specialFlower#basemodel" } + "custom": { "base": "botania:specialflower#basemodel" } }], "inventory": [{ - "custom": { "base": "botania:specialFlower#basemodel" } + "custom": { "base": "botania:specialflower#basemodel" } }], "basemodel": [{ "model": "minecraft:cross",