keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Fix issues with ZombieVillagers Closes #3398 

1.11 doesn't intertwine zombie types anymore so our edits to split them out for custom professions are not needed.
This commit is contained in:
LexManos 2016-11-17 11:37:08 -08:00
parent f028ba88f5
commit 85a2a2e661
4 changed files with 22 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/minecraft/net/minecraft/entity/monster/EntityZombie.java.patch
View File

@ -1,14 +1,6 @@
--- ../src-base/minecraft/net/minecraft/entity/monster/EntityZombie.java
+++ ../src-work/minecraft/net/minecraft/entity/monster/EntityZombie.java
@@ -60,6 +60,7 @@
private static final DataParameter<Boolean> field_184737_bv = EntityDataManager.<Boolean>func_187226_a(EntityZombie.class, DataSerializers.field_187198_h);
private static final DataParameter<Integer> field_184738_bw = EntityDataManager.<Integer>func_187226_a(EntityZombie.class, DataSerializers.field_187192_b);
private static final DataParameter<Boolean> field_184740_by = EntityDataManager.<Boolean>func_187226_a(EntityZombie.class, DataSerializers.field_187198_h);
+ private static final DataParameter<String> VILLAGER_TYPE_STR = EntityDataManager.<String>func_187226_a(EntityZombie.class, DataSerializers.field_187194_d);
private final EntityAIBreakDoor field_146075_bs = new EntityAIBreakDoor(this);
private boolean field_146076_bu;
private float field_146074_bv = -1.0F;
@@ -98,7 +99,7 @@
@@ -98,7 +98,7 @@
this.func_110148_a(SharedMonsterAttributes.field_111263_d).func_111128_a(0.23000000417232513D);
this.func_110148_a(SharedMonsterAttributes.field_111264_e).func_111128_a(3.0D);
this.func_110148_a(SharedMonsterAttributes.field_188791_g).func_111128_a(2.0D);
@ -17,15 +9,7 @@
}
protected void func_70088_a()
@@ -106,6 +107,7 @@
super.func_70088_a();
this.func_184212_Q().func_187214_a(field_184737_bv, Boolean.valueOf(false));
this.func_184212_Q().func_187214_a(field_184738_bw, Integer.valueOf(0));
+ this.func_184212_Q().func_187214_a(VILLAGER_TYPE_STR, "");
this.func_184212_Q().func_187214_a(field_184740_by, Boolean.valueOf(false));
}
@@ -239,12 +241,24 @@
@@ -239,12 +239,24 @@
entitylivingbase = (EntityLivingBase)p_70097_1_.func_76346_g();
}
@ -55,7 +39,7 @@
for (int l = 0; l < 50; ++l)
{
@@ -252,14 +266,14 @@
@@ -252,14 +264,14 @@
int j1 = j + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);
int k1 = k + MathHelper.func_76136_a(this.field_70146_Z, 7, 40) * MathHelper.func_76136_a(this.field_70146_Z, -1, 1);

2
patches/minecraft/net/minecraft/entity/monster/EntityZombieVillager.java.patch
View File

@ -16,7 +16,7 @@
+ public void setForgeProfession(net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession prof)
+ {
+ this.prof = prof;
+ net.minecraftforge.fml.common.registry.VillagerRegistry.onSetProfession(this, prof);
+ this.func_190733_a(net.minecraftforge.fml.common.registry.VillagerRegistry.getId(prof));
+ }
+
+ public net.minecraftforge.fml.common.registry.VillagerRegistry.VillagerProfession getForgeProfession()

53
patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch
View File

File diff suppressed because one or more lines are too long

28
src/main/java/net/minecraftforge/fml/common/registry/VillagerRegistry.java
View File

@ -323,10 +323,7 @@ public class VillagerRegistry
List<VillagerProfession> entries = INSTANCE.professions.getValues();
entity.setProfession(entries.get(rand.nextInt(entries.size())));
}
public static void setRandomProfession(EntityZombieVillager entity, Random rand)
{
List<VillagerProfession> entries = INSTANCE.professions.getValues();
}
@ -335,17 +332,6 @@ public class VillagerRegistry
//Below this is INTERNAL USE ONLY DO NOT USE MODDERS
public static void onSetProfession(EntityVillager entity, VillagerProfession prof)
{
int network = INSTANCE.professions.getId(prof);
if (network == -1 || prof != INSTANCE.professions.getObjectById(network))
{
throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof);
}
if (network != entity.getProfession())
entity.setProfession(network);
}
public static void onSetProfession(EntityVillager entity, int network)
{
VillagerProfession prof = INSTANCE.professions.getObjectById(network);
@ -358,18 +344,12 @@ public class VillagerRegistry
entity.setProfession(prof);
}
@SuppressWarnings("deprecation")
public static void onSetProfession(EntityZombieVillager entity, VillagerProfession prof)
{
}
public static void onSetProfession(EntityZombieVillager entity, int network)
{
int realID = network;
VillagerProfession prof = INSTANCE.professions.getObjectById(realID);
if (prof == null && network != 0 || INSTANCE.professions.getId(prof) != realID)
VillagerProfession prof = INSTANCE.professions.getObjectById(network);
if (prof == null && network != -1 || INSTANCE.professions.getId(prof) != network)
{
throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + realID + " " + prof);
throw new RuntimeException("Attempted to set villager profession to unregistered profession: " + network + " " + prof);
}
if (prof != entity.getForgeProfession())