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

Try to cope with other mods wrapping IModel instances in a generic way

Browse Source
This commit is contained in:
octarine-noise
2019-12-21 15:09:51 +01:00
parent d9cc03511a
commit f5cbf48dfa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/kotlin/mods/octarinecore/client/resource/Utils.kt
View File

@@ -4,6 +4,7 @@ package mods.octarinecore.client.resource
import mods.betterfoliage.loader.Refs import mods.betterfoliage.loader.Refs
import mods.octarinecore.PI2 import mods.octarinecore.PI2
import mods.octarinecore.client.render.HSB import mods.octarinecore.client.render.HSB
import mods.octarinecore.metaprog.reflectField
import mods.octarinecore.stripStart import mods.octarinecore.stripStart
import mods.octarinecore.tryDefault import mods.octarinecore.tryDefault
import net.minecraft.client.Minecraft import net.minecraft.client.Minecraft
@@ -108,11 +109,13 @@ val IModel.modelBlockAndLoc: List<Pair<ModelBlock, ResourceLocation>> get() {
else if (Refs.WeightedRandomModel.isInstance(this)) Refs.models_WRM.get(this)?.let { else if (Refs.WeightedRandomModel.isInstance(this)) Refs.models_WRM.get(this)?.let {
return (it as List<IModel>).flatMap(IModel::modelBlockAndLoc) return (it as List<IModel>).flatMap(IModel::modelBlockAndLoc)
} }
else if (Refs.MultiModel.isInstance(this)) Refs.base_MM.get(this)?.let {
return (it as IModel).modelBlockAndLoc
}
else if (Refs.MultipartModel.isInstance(this)) Refs.partModels_MPM.get(this)?.let { else if (Refs.MultipartModel.isInstance(this)) Refs.partModels_MPM.get(this)?.let {
return (it as Map<Any, IModel>).flatMap { it.value.modelBlockAndLoc } return (it as Map<Any, IModel>).flatMap { it.value.modelBlockAndLoc }
} else {
this::class.java.declaredFields.find { it.type.isInstance(IModel::class.java) }?.let { modelField ->
modelField.isAccessible = true
return (modelField.get(this) as IModel).modelBlockAndLoc
}
} }
return listOf() return listOf()
} }