From bbd4df418c9b2ac2971399f4350949d9cb93b766 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Mon, 16 May 2016 12:01:25 +0200 Subject: [PATCH] add support for blocks with submodels --- src/main/kotlin/mods/betterfoliage/loader/Refs.kt | 2 ++ .../mods/octarinecore/client/resource/ModelDataInspector.kt | 3 +++ 2 files changed, 5 insertions(+) diff --git a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt index 9dcabaf..8ca3a3c 100644 --- a/src/main/kotlin/mods/betterfoliage/loader/Refs.kt +++ b/src/main/kotlin/mods/betterfoliage/loader/Refs.kt @@ -64,6 +64,8 @@ object Refs { val model_WPW = FieldRef(WeightedPartWrapper, "model", IModel) val WeightedRandomModel = ClassRef("net.minecraftforge.client.model.ModelLoader\$WeightedRandomModel") val models_WRM = FieldRef(WeightedRandomModel, "models", List) + val MultiModel = ClassRef("net.minecraftforge.client.model.MultiModel") + val base_MM = FieldRef(MultiModel, "base", IModel) // Better Foliage val BetterFoliageHooks = ClassRef("mods.betterfoliage.client.Hooks") diff --git a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt index bbbcd20..e16f9e7 100644 --- a/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt +++ b/src/main/kotlin/mods/octarinecore/client/resource/ModelDataInspector.kt @@ -110,6 +110,9 @@ val IModel.modelBlockAndLoc: Pair? get() { it.modelBlockAndLoc.let { if (it != null) return it } } } + else if (Refs.MultiModel.isInstance(this)) Refs.base_MM.get(this)?.let { + return (it as IModel).modelBlockAndLoc + } return null }