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

fix CTM textures

Browse Source 
bump version to 2.0.10
This commit is contained in:
octarine-noise
2016-04-21 19:55:06 +02:00
parent 66ed1c098f
commit 626bc69dad
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -2,7 +2,7 @@ apply plugin: "net.minecraftforge.gradle.forge"
apply plugin: 'kotlin' apply plugin: 'kotlin'
group = 'com.github.octarine-noise' group = 'com.github.octarine-noise'
version = "2.0.9" version = "2.0.10"
archivesBaseName = rootProject.name + '-MC1.9' archivesBaseName = rootProject.name + '-MC1.9'
buildscript { buildscript {

2
src/main/kotlin/mods/betterfoliage/client/integration/OptifineCTM.kt
View File

@@ -48,7 +48,7 @@ object OptifineCTM {
if (state !is BlockStateBase) return result if (state !is BlockStateBase) return result
connectedProperties.forEach { cp -> connectedProperties.forEach { cp ->
if (Refs.CPmatchesBlock.invoke(cp, state) as Boolean && if (Refs.CPmatchesBlock.invoke(cp, Refs.getBlockId.invoke(state), Refs.getMetadata.invoke(state)) as Boolean &&
Refs.CPmatchesIcon.invoke(cp, icon) as Boolean) { Refs.CPmatchesIcon.invoke(cp, icon) as Boolean) {
Client.log(INFO, "Match for block: ${state.toString()}, icon: ${icon.iconName} -> CP: ${cp.toString()}") Client.log(INFO, "Match for block: ${state.toString()}, icon: ${icon.iconName} -> CP: ${cp.toString()}")
result.addAll(Refs.CPtileIcons.get(cp) as Array<TextureAtlasSprite>) result.addAll(Refs.CPtileIcons.get(cp) as Array<TextureAtlasSprite>)

5
src/main/kotlin/mods/betterfoliage/loader/Refs.kt
View File

@@ -80,6 +80,9 @@ object Refs {
// Optifine // Optifine
val OptifineClassTransformer = ClassRef("optifine.OptiFineClassTransformer") val OptifineClassTransformer = ClassRef("optifine.OptiFineClassTransformer")
val getBlockId = MethodRef(BlockStateBase, "getBlockId", ClassRef.int);
val getMetadata = MethodRef(BlockStateBase, "getMetadata", ClassRef.int);
val RenderEnv = ClassRef("RenderEnv") val RenderEnv = ClassRef("RenderEnv")
val RenderEnv_reset = MethodRef(RenderEnv, "reset", ClassRef.void, IBlockAccess, IBlockState, BlockPos) val RenderEnv_reset = MethodRef(RenderEnv, "reset", ClassRef.void, IBlockAccess, IBlockState, BlockPos)
val ConnectedTextures = ClassRef("ConnectedTextures") val ConnectedTextures = ClassRef("ConnectedTextures")
@@ -89,7 +92,7 @@ object Refs {
val ConnectedProperties = ClassRef("ConnectedProperties") val ConnectedProperties = ClassRef("ConnectedProperties")
val CPtileIcons = FieldRef(ConnectedProperties, "tileIcons", null) val CPtileIcons = FieldRef(ConnectedProperties, "tileIcons", null)
val CPmatchesBlock = MethodRef(ConnectedProperties, "matchesBlock", ClassRef.boolean, BlockStateBase) val CPmatchesBlock = MethodRef(ConnectedProperties, "matchesBlock", ClassRef.boolean, ClassRef.int, ClassRef.int)
val CPmatchesIcon = MethodRef(ConnectedProperties, "matchesIcon", ClassRef.boolean, TextureAtlasSprite) val CPmatchesIcon = MethodRef(ConnectedProperties, "matchesIcon", ClassRef.boolean, TextureAtlasSprite)
// ShadersMod // ShadersMod

2
src/main/kotlin/mods/octarinecore/metaprog/Reflection.kt
View File

@@ -125,7 +125,7 @@ class MethodRef(val parentClass: ClassRef,
} }
/** Invoke this method using reflection. */ /** Invoke this method using reflection. */
fun invoke(receiver: Any, vararg args: Any) = element?.invoke(receiver, *args) fun invoke(receiver: Any, vararg args: Any?) = element?.invoke(receiver, *args)
/** Invoke this static method using reflection. */ /** Invoke this static method using reflection. */
fun invokeStatic(vararg args: Any) = element?.invoke(null, *args) fun invokeStatic(vararg args: Any) = element?.invoke(null, *args)