From b5d87bb148666237c88298720cdb6ca2e12dcc94 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Thu, 6 Jul 2017 09:10:38 +0200
Subject: [PATCH] fix rubber tree integration to work with single resource
 loading pass

---
 .../client/integration/RubberIntegration.kt         | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt b/src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt
index 2bb3c70..b7a0cfc 100644
--- a/src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt
@@ -13,10 +13,7 @@ import mods.betterfoliage.loader.Refs
 import mods.octarinecore.client.render.Quad
 import mods.octarinecore.client.render.ShadingContext
 import mods.octarinecore.client.render.blockContext
-import mods.octarinecore.client.resource.ModelProcessor
-import mods.octarinecore.client.resource.derivesFrom
-import mods.octarinecore.client.resource.get
-import mods.octarinecore.client.resource.modelBlockAndLoc
+import mods.octarinecore.client.resource.*
 import mods.octarinecore.common.rotate
 import mods.octarinecore.metaprog.ClassRef
 import mods.octarinecore.metaprog.MethodRef
@@ -114,13 +111,13 @@ abstract class RubberLogSupportBase : ModelProcessor<RubberLogModelInfo, IColumn
     init { MinecraftForge.EVENT_BUS.register(this) }
 
     override fun processStitch(state: IBlockState, key: RubberLogModelInfo, atlas: TextureMap): IColumnTextureInfo? {
-        val topTex = atlas[key.textures[0]] ?: return null
-        val bottomTex = atlas[key.textures[1]] ?: return null
-        val sideTex = atlas[key.textures[2]] ?: return null
+        val topTex = atlas.registerSprite(key.textures[0])
+        val bottomTex = atlas.registerSprite(key.textures[1])
+        val sideTex = atlas.registerSprite(key.textures[2])
         if (key.spotDir == null)
             return StaticColumnInfo(key.axis, topTex, bottomTex, sideTex)
         else {
-            val spotTex = atlas[key.textures[3]] ?: return null
+            val spotTex = atlas.registerSprite(key.textures[3])
             return RubberLogColumnInfo(key.axis, key.spotDir, topTex, bottomTex, sideTex, spotTex)
         }
     }