From 6032a120d8ca70ff38e8d2fdf5026d15ee8d4aaa Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 21 Feb 2016 11:08:19 +0100 Subject: [PATCH 1/4] support Plant Mega Pack log blocks --- .../kotlin/mods/betterfoliage/client/render/RenderLog.kt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt index b65d462..29158ec 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt @@ -35,7 +35,12 @@ 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")) + } + } 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) } From efb49125b80f2a70897cc0b9f888cd40dbc7db88 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 21 Feb 2016 11:09:45 +0100 Subject: [PATCH 2/4] support Cooking Plus log blocks --- src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt | 1 + src/main/resources/assets/betterfoliage/LogDefault.cfg | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt index 29158ec..7e2d7cf 100644 --- a/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt +++ b/src/main/kotlin/mods/betterfoliage/client/render/RenderLog.kt @@ -39,6 +39,7 @@ class RenderLog : AbstractRenderColumn(BetterFoliageMod.MOD_ID) { 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")) } } diff --git a/src/main/resources/assets/betterfoliage/LogDefault.cfg b/src/main/resources/assets/betterfoliage/LogDefault.cfg index 4c52606..ca9f809 100644 --- a/src/main/resources/assets/betterfoliage/LogDefault.cfg +++ b/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 \ No newline at end of file +CookingPlus.blocks.CookingPlusPalmLog +CookingPlus.blocks.CookingPlusTangleLog +CookingPlus.blocks.CookingPlusTangleHeart From 1a6ffb251b4ee74dccccd3e3ed6121327f176ff5 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 21 Feb 2016 11:57:59 +0100 Subject: [PATCH 3/4] bump version to 2.0.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index e5fcdb1..9a66e56 100644 --- a/build.gradle +++ b/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' buildscript { From 8e251dc03839dd5c6a68da1cbdc79339ec8cd196 Mon Sep 17 00:00:00 2001 From: octarine-noise Date: Sun, 21 Feb 2016 12:12:38 +0100 Subject: [PATCH 4/4] make particle type definitions case insensitive --- .../kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt b/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt index 54ea3b4..827dd46 100644 --- a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt +++ b/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) } }