mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-17 19:15:32 +00:00
36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
--- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java
|
|
+++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java
|
|
@@ -1,5 +1,6 @@
|
|
package net.minecraft.entity.passive;
|
|
|
|
+import cpw.mods.fml.common.registry.VillagerRegistry;
|
|
import cpw.mods.fml.relauncher.Side;
|
|
import cpw.mods.fml.relauncher.SideOnly;
|
|
import java.util.Collections;
|
|
@@ -241,7 +242,7 @@
|
|
case 4:
|
|
return "/mob/villager/butcher.png";
|
|
default:
|
|
- return super.func_70073_O();
|
|
+ return VillagerRegistry.getVillagerSkin(this.func_70946_n(), super.func_70073_O());
|
|
}
|
|
}
|
|
|
|
@@ -422,6 +423,7 @@
|
|
|
|
MerchantRecipeList merchantrecipelist;
|
|
merchantrecipelist = new MerchantRecipeList();
|
|
+ VillagerRegistry.manageVillagerTrades(merchantrecipelist, this, this.func_70946_n(), this.field_70146_Z);
|
|
int j;
|
|
label50:
|
|
|
|
@@ -637,7 +639,7 @@
|
|
|
|
public void func_82163_bD()
|
|
{
|
|
- this.func_70938_b(this.field_70170_p.field_73012_v.nextInt(5));
|
|
+ VillagerRegistry.applyRandomTrade(this, field_70170_p.field_73012_v);
|
|
}
|
|
|
|
public void func_82187_q()
|