StateMc/BetterFoliage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix rubber tree integration to work with single resource loading pass

Browse Source
This commit is contained in:
octarine-noise
2017-07-06 09:10:38 +02:00
parent 6c98940d3e
commit b5d87bb148
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/kotlin/mods/betterfoliage/client/integration/RubberIntegration.kt
View File

@@ -13,10 +13,7 @@ import mods.betterfoliage.loader.Refs
import mods.octarinecore.client.render.Quad import mods.octarinecore.client.render.Quad
import mods.octarinecore.client.render.ShadingContext import mods.octarinecore.client.render.ShadingContext
import mods.octarinecore.client.render.blockContext import mods.octarinecore.client.render.blockContext
import mods.octarinecore.client.resource.ModelProcessor import mods.octarinecore.client.resource.*
import mods.octarinecore.client.resource.derivesFrom
import mods.octarinecore.client.resource.get
import mods.octarinecore.client.resource.modelBlockAndLoc
import mods.octarinecore.common.rotate import mods.octarinecore.common.rotate
import mods.octarinecore.metaprog.ClassRef import mods.octarinecore.metaprog.ClassRef
import mods.octarinecore.metaprog.MethodRef import mods.octarinecore.metaprog.MethodRef
@@ -114,13 +111,13 @@ abstract class RubberLogSupportBase : ModelProcessor<RubberLogModelInfo, IColumn
init { MinecraftForge.EVENT_BUS.register(this) } init { MinecraftForge.EVENT_BUS.register(this) }
override fun processStitch(state: IBlockState, key: RubberLogModelInfo, atlas: TextureMap): IColumnTextureInfo? { override fun processStitch(state: IBlockState, key: RubberLogModelInfo, atlas: TextureMap): IColumnTextureInfo? {
val topTex = atlas[key.textures[0]] ?: return null val topTex = atlas.registerSprite(key.textures[0])
val bottomTex = atlas[key.textures[1]] ?: return null val bottomTex = atlas.registerSprite(key.textures[1])
val sideTex = atlas[key.textures[2]] ?: return null val sideTex = atlas.registerSprite(key.textures[2])
if (key.spotDir == null) if (key.spotDir == null)
return StaticColumnInfo(key.axis, topTex, bottomTex, sideTex) return StaticColumnInfo(key.axis, topTex, bottomTex, sideTex)
else { 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) return RubberLogColumnInfo(key.axis, key.spotDir, topTex, bottomTex, sideTex, spotTex)
} }
} }