PonyMirrors/MineLittlePony
1
0
Fork 0
mirror of https://github.com/MineLittlePony/MineLittlePony.git synced 2024-11-29 23:48:00 +01:00
Code Issues Projects Releases Packages Wiki Activity

Pass through the original type to mods (reported by Poly)

Browse source
This commit is contained in:
Sollace 2018-10-21 15:31:17 +02:00
parent 83c2550506
commit 032ce5f651
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/com/minelittlepony/model/armour/DefaultPonyArmorTextureResolver.java
View file

@ -8,6 +8,7 @@ import net.minecraft.item.ItemArmor;
import net.minecraft.item.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.util.ResourceLocation; import net.minecraft.util.ResourceLocation;
import com.google.common.base.Strings;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.minelittlepony.ForgeProxy; import com.minelittlepony.ForgeProxy;
import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer; import com.minelittlepony.model.armour.IEquestrianArmor.ArmorLayer;
@ -35,10 +36,10 @@ public class DefaultPonyArmorTextureResolver<T extends EntityLivingBase> impleme
texture = texture.substring(idx + 1); texture = texture.substring(idx + 1);
} }
type = type == null ? "" : String.format("_%s", type); String customType = type == null ? "" : String.format("_%s", type);
String ponyRes = String.format("%s:textures/models/armor/%s_layer_%s%s.png", domain, texture, layer.name().toLowerCase(), type); String ponyRes = String.format("%s:textures/models/armor/%s_layer_%s%s.png", domain, texture, layer.name().toLowerCase(), customType);
String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmorLayer.INNER ? 2 : 1, type); String oldPonyRes = String.format("%s:textures/models/armor/%s_layer_%d%s.png", domain, texture, layer == ArmorLayer.INNER ? 2 : 1, customType);
ResourceLocation human = getArmorTexture(entity, itemstack, ponyRes, slot, type); ResourceLocation human = getArmorTexture(entity, itemstack, ponyRes, slot, type);
ResourceLocation pony = ponifyResource(human); ResourceLocation pony = ponifyResource(human);