Merge branch 'kotlin-1.8' into kotlin-1.8.8

build.gradle

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

src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt

@@ -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 surroundPredicate = { state: IBlockState -> state.block.isOpaqueCube && !Config.blocks.logs.matchesID(state.block) }

src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt

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

src/main/resources/assets/betterfoliage/LogDefault.cfg

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