diff options
Diffstat (limited to 'src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java')
| -rw-r--r-- | src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java index c0684b6227..8f47cb0243 100644 --- a/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java +++ b/src/Java/gtPlusPlus/plugin/villagers/VillagerObject.java @@ -2,28 +2,37 @@ package gtPlusPlus.plugin.villagers; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import gtPlusPlus.api.objects.data.Pair; +import gtPlusPlus.core.lib.CORE; import gtPlusPlus.core.util.Utils; import gtPlusPlus.plugin.villagers.entity.EntityBaseVillager; import net.minecraft.util.ResourceLocation; public class VillagerObject { - + public final int mID; public final String mName; - - public VillagerObject(int aID, String aName, Object aProfession, Object aCareer, ResourceLocation aSkin, IVillageTradeHandler aCustomTrade) { - + + public VillagerObject(int aID, String aName, Object aProfession, Object aCareer, Object aSkin, IVillageTradeHandler aCustomTrade) { + mID = aID; mName = aName; - + //Register Custom Trade to Registry. if (aCustomTrade != null) { Core_VillagerAdditions.mVillagerTrades.put(new Pair<Integer, IVillageTradeHandler>(aID, aCustomTrade)); } //Register Skin to Registry. if (aSkin != null) { - Core_VillagerAdditions.mVillagerSkins.put(aID, aSkin); + + if (aSkin instanceof String) { + String s = (String) aSkin; + aSkin = new ResourceLocation(CORE.MODID+":"+"textures/entity/villager/"+s+".png"); + } + if (aSkin instanceof ResourceLocation) { + Core_VillagerAdditions.mVillagerSkins.put(aID, (ResourceLocation) aSkin); + } + } VillagerUtils.registerNewVillager(aID, this); } |