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

Merge branch 'kotlin-1.8' into kotlin-1.8.8

Browse Source
This commit is contained in:
octarine-noise
2016-02-21 12:15:09 +01:00
parent f68f0e5edd 8e251dc038
commit aaca43fe2c
4 changed files with 12 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.3" version = "2.0.4"
archivesBaseName = rootProject.name + '-MC1.8.x' archivesBaseName = rootProject.name + '-MC1.8.x'
buildscript { buildscript {

8
src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt
View File

@@ -32,7 +32,13 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) {
} }
} }
val columnTextures = ColumnTextures(Config.blocks.logs) val columnTextures = object : ColumnTextures(Config.blocks.logs) {
init {
matchClassAndModel(matcher, "plantmegapack:block/_cube_column", listOf("end", "end", "side"))
matchClassAndModel(matcher, "plantmegapack:block/_column_side", listOf("end", "end", "side"))
matchClassAndModel(matcher, "cookingplus:block/palmlog", listOf("top", "top", "texture"))
}
}
override val blockPredicate = { state: IBlockState -> Config.blocks.logs.matchesID(state.block) } override val blockPredicate = { state: IBlockState -> Config.blocks.logs.matchesID(state.block) }
override val surroundPredicate = { state: IBlockState -> state.block.isOpaqueCube && !Config.blocks.logs.matchesID(state.block) } override val surroundPredicate = { state: IBlockState -> state.block.isOpaqueCube && !Config.blocks.logs.matchesID(state.block) }

2
src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt
View File

@@ -13,7 +13,7 @@ class TextureMatcher() {
fun matches(icon: TextureAtlasSprite): Boolean { fun matches(icon: TextureAtlasSprite): Boolean {
val iconLocation = ResourceLocation(icon.iconName) val iconLocation = ResourceLocation(icon.iconName)
return (domain == null || domain == iconLocation.resourceDomain) && return (domain == null || domain == iconLocation.resourceDomain) &&
iconLocation.resourcePath.stripStart("blocks/").contains(path) iconLocation.resourcePath.stripStart("blocks/").contains(path, ignoreCase = true)
} }
} }

2
src/main/resources/assets/betterfoliage/LogDefault.cfg
View File

@@ -23,4 +23,6 @@ com.bioxx.tfc.Blocks.Flora.BlockLogVert
com.bioxx.tfc.Blocks.Flora.BlockLogNatural com.bioxx.tfc.Blocks.Flora.BlockLogNatural
// The Agricultural Revolution a.k.a. Cooking Plus // The Agricultural Revolution a.k.a. Cooking Plus
CookingPlus.blocks.CookingPlusPalmLog
CookingPlus.blocks.CookingPlusTangleLog CookingPlus.blocks.CookingPlusTangleLog
CookingPlus.blocks.CookingPlusTangleHeart