From e926f018e784a1263bf425784a4643b0c2601c38 Mon Sep 17 00:00:00 2001
From: octarine-noise <octarine.noise@gmail.com>
Date: Sat, 16 Jan 2016 08:35:30 +0100
Subject: [PATCH] actually fix #36

---
 build.gradle                                                | 2 +-
 .../mods/betterfoliage/client/texture/TextureMatcher.kt     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/build.gradle b/build.gradle
index 8dc4bd2..1c88d27 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"
+version = "2.0.2"
 archivesBaseName = rootProject.name + '-MC1.8'
 
 buildscript {
diff --git a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt b/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt
index 1791f99..7f2ef10 100644
--- a/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt
+++ b/src/main/kotlin/mods/betterfoliage/client/texture/TextureMatcher.kt
@@ -3,6 +3,7 @@ package mods.betterfoliage.client.texture
 import mods.octarinecore.client.resource.resourceManager
 import mods.octarinecore.client.resource.get
 import mods.octarinecore.client.resource.getLines
+import mods.octarinecore.stripStart
 import net.minecraft.client.renderer.texture.TextureAtlasSprite
 import net.minecraft.util.ResourceLocation
 
@@ -11,7 +12,8 @@ class TextureMatcher() {
     data class Mapping(val domain: String?, val path: String, val type: String) {
         fun matches(icon: TextureAtlasSprite): Boolean {
             val iconLocation = ResourceLocation(icon.iconName)
-            return (domain == null || domain == iconLocation.resourceDomain) && iconLocation.resourcePath.contains(path)
+            return (domain == null || domain == iconLocation.resourceDomain) &&
+                iconLocation.resourcePath.stripStart("blocks/").contains(path)
         }
     }
 
@@ -27,7 +29,7 @@ class TextureMatcher() {
                 if (line2.size == 2) {
                     val mapping = line2[0].trim().split(':')
                     if (mapping.size == 1) mappings.add(Mapping(null, mapping[0].trim(), line2[1].trim()))
-                    else if (mapping.size == 2) mappings.add(Mapping(mapping[1].trim(), mapping[0].trim(), line2[1].trim()))
+                    else if (mapping.size == 2) mappings.add(Mapping(mapping[0].trim(), mapping[1].trim(), line2[1].trim()))
                 }
             }
         }