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

actually fix #36

Browse Source
This commit is contained in:
octarine-noise
2016-01-16 08:35:30 +01:00
parent 3716804ffb
commit e926f018e7
2 changed files with 5 additions and 3 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" version = "2.0.2"
archivesBaseName = rootProject.name + '-MC1.8' archivesBaseName = rootProject.name + '-MC1.8'
buildscript { buildscript {

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

@@ -3,6 +3,7 @@ package mods.betterfoliage.client.texture
import mods.octarinecore.client.resource.resourceManager import mods.octarinecore.client.resource.resourceManager
import mods.octarinecore.client.resource.get import mods.octarinecore.client.resource.get
import mods.octarinecore.client.resource.getLines import mods.octarinecore.client.resource.getLines
import mods.octarinecore.stripStart
import net.minecraft.client.renderer.texture.TextureAtlasSprite import net.minecraft.client.renderer.texture.TextureAtlasSprite
import net.minecraft.util.ResourceLocation import net.minecraft.util.ResourceLocation
@@ -11,7 +12,8 @@ class TextureMatcher() {
data class Mapping(val domain: String?, val path: String, val type: String) { data class Mapping(val domain: String?, val path: String, val type: String) {
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) && 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) { if (line2.size == 2) {
val mapping = line2[0].trim().split(':') val mapping = line2[0].trim().split(':')
if (mapping.size == 1) mappings.add(Mapping(null, mapping[0].trim(), line2[1].trim())) 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()))
} }
} }
} }