From bbd4df418c9b2ac2971399f4350949d9cb93b766 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Mon, 16 May 2016 12:01:25 +0200
Subject: [PATCH 1/3] 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<ModelBlock, ResourceLocation>? 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
 }
 

From 9a544b1b535c9ca6cbf20d65d15443e6867b61f1 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Mon, 16 May 2016 12:05:54 +0200
Subject: [PATCH 2/3] support leaves that don't use the model
 minecraft:block/leaves

---
 .../kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt     | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt b/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
index 8aa08b9..be5b6ef 100644
--- a/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/texture/LeafRegistry.kt
@@ -50,6 +50,7 @@ object LeafRegistry : BlockTextureInspector<TextureAtlasSprite>() {
 
     init {
         matchClassAndModel(Config.blocks.leaves, "minecraft:block/leaves", listOf("all"))
+        matchClassAndModel(Config.blocks.leaves, "minecraft:block/cube_all", listOf("all"))
     }
 
     operator fun get(state: IBlockState, world: IBlockAccess, pos: BlockPos, face: EnumFacing): LeafInfo? {

From 6903bd2de22339204c4a8798f2f159a5e3cc0439 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Mon, 16 May 2016 12:12:43 +0200
Subject: [PATCH 3/3] bump version

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index b1b228f..2188e0c 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ apply plugin: "net.minecraftforge.gradle.forge"
 apply plugin: 'kotlin'
 
 group = 'com.github.octarine-noise'
-version = "2.0.9"
+version = "2.0.11"
 archivesBaseName = rootProject.name + '-MC1.8'
 
 buildscript {