Optifine CTM support
This commit is contained in:
@@ -2,12 +2,19 @@ package mods.betterfoliage.client.texture
|
||||
|
||||
import mods.betterfoliage.client.Client
|
||||
import mods.betterfoliage.client.config.Config
|
||||
import mods.betterfoliage.client.integration.OptifineCTM
|
||||
import mods.octarinecore.client.render.BlockContext
|
||||
import mods.octarinecore.client.resource.BlockTextureInspector
|
||||
import mods.octarinecore.client.resource.IconSet
|
||||
import mods.octarinecore.client.resource.averageColor
|
||||
import mods.octarinecore.common.Int3
|
||||
import net.minecraft.block.state.IBlockState
|
||||
import net.minecraft.client.renderer.texture.TextureAtlasSprite
|
||||
import net.minecraft.client.renderer.texture.TextureMap
|
||||
import net.minecraft.util.BlockPos
|
||||
import net.minecraft.util.EnumFacing
|
||||
import net.minecraft.util.ResourceLocation
|
||||
import net.minecraft.world.IBlockAccess
|
||||
import net.minecraftforge.client.event.TextureStitchEvent
|
||||
import net.minecraftforge.common.MinecraftForge
|
||||
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent
|
||||
@@ -35,8 +42,9 @@ class LeafInfo(
|
||||
|
||||
/** Collects and manages rendering-related information for leaf blocks. */
|
||||
@SideOnly(Side.CLIENT)
|
||||
object LeafRegistry : BlockTextureInspector<LeafInfo>() {
|
||||
object LeafRegistry : BlockTextureInspector<TextureAtlasSprite>() {
|
||||
|
||||
val leaves: MutableMap<TextureAtlasSprite, LeafInfo> = hashMapOf()
|
||||
val particles: MutableMap<String, IconSet> = hashMapOf()
|
||||
val typeMappings = TextureMatcher()
|
||||
|
||||
@@ -44,6 +52,13 @@ object LeafRegistry : BlockTextureInspector<LeafInfo>() {
|
||||
matchClassAndModel(Config.blocks.leaves, "minecraft:block/leaves", listOf("all"))
|
||||
}
|
||||
|
||||
operator fun get(state: IBlockState, world: IBlockAccess, pos: BlockPos, face: EnumFacing): LeafInfo? {
|
||||
val baseTexture = get(state) ?: return null
|
||||
return leaves[OptifineCTM.override(baseTexture, world, pos, face)] ?: leaves[baseTexture]
|
||||
}
|
||||
|
||||
operator fun get(ctx: BlockContext, face: EnumFacing) = get(ctx.blockState(Int3.zero), ctx.world!!, ctx.pos, face)
|
||||
|
||||
override fun onAfterModelLoad() {
|
||||
super.onAfterModelLoad()
|
||||
Client.log(INFO, "Inspecting leaf textures")
|
||||
@@ -51,8 +66,14 @@ object LeafRegistry : BlockTextureInspector<LeafInfo>() {
|
||||
typeMappings.loadMappings(ResourceLocation("betterfoliage", "leafTextureMappings.cfg"))
|
||||
}
|
||||
|
||||
override fun processTextures(textures: List<TextureAtlasSprite>, atlas: TextureMap): LeafInfo {
|
||||
override fun processTextures(state: IBlockState, textures: List<TextureAtlasSprite>, atlas: TextureMap): TextureAtlasSprite {
|
||||
val texture = textures[0]
|
||||
registerLeaf(texture, atlas)
|
||||
OptifineCTM.getAllCTM(state, texture).forEach { registerLeaf(it, atlas) }
|
||||
return texture
|
||||
}
|
||||
|
||||
fun registerLeaf(texture: TextureAtlasSprite, atlas: TextureMap) {
|
||||
var leafType = typeMappings.getType(texture) ?: "default"
|
||||
val generated = atlas.registerSprite(
|
||||
Client.genLeaves.generatedResource(texture.iconName, "type" to leafType)
|
||||
@@ -69,6 +90,6 @@ object LeafRegistry : BlockTextureInspector<LeafInfo>() {
|
||||
}
|
||||
}
|
||||
|
||||
return LeafInfo(generated as TextureAtlasSprite, leafType)
|
||||
leaves[texture] = LeafInfo(generated, leafType)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user