diff --git a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java index e52fef7e0..7022ad86f 100644 --- a/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java +++ b/src/main/java/vazkii/botania/common/block/subtile/functional/SubTileHeiseiDream.java @@ -71,7 +71,6 @@ public class SubTileHeiseiDream extends SubTileFunctional { messWithGetTargetAI((EntityAINearestAttackableTarget) entry.action, (EntityLiving) newTarget); did = true; } else if(entry.action instanceof EntityAIAttackMelee) { - messWithAttackOnCollideAI((EntityAIAttackMelee) entry.action); did = true; } @@ -86,11 +85,6 @@ public class SubTileHeiseiDream extends SubTileFunctional { private static void messWithGetTargetAI(EntityAINearestAttackableTarget aiEntry, EntityLivingBase target) { ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Entity.class, LibObfuscation.TARGET_CLASS); ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, Predicates.equalTo(target), LibObfuscation.TARGET_ENTITY_SELECTOR); // todo 1.8 will this leak `target`? - ReflectionHelper.setPrivateValue(EntityAINearestAttackableTarget.class, aiEntry, target, LibObfuscation.TARGET_ENTITY); - } - - private static void messWithAttackOnCollideAI(EntityAIAttackMelee aiEntry) { - ReflectionHelper.setPrivateValue(EntityAIAttackMelee.class, aiEntry, IMob.class, LibObfuscation.CLASS_TARGET); } @Override diff --git a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java index 70beb7b3c..568396bcd 100644 --- a/src/main/java/vazkii/botania/common/lib/LibObfuscation.java +++ b/src/main/java/vazkii/botania/common/lib/LibObfuscation.java @@ -29,12 +29,8 @@ public final class LibObfuscation { // EntityAINearestAttackableTarget public static final String[] TARGET_CLASS = new String[] { "targetClass", "field_75307_b", "a" }; - public static final String[] TARGET_ENTITY = new String[] { "targetEntity", "field_75309_a", "d" }; public static final String[] TARGET_ENTITY_SELECTOR = new String[] { "targetEntitySelector", "field_82643_g", "c" }; - // EntityAIAttackMelee todo 1.9 - public static final String[] CLASS_TARGET = new String[] { "classTarget", "field_75444_h", "g" }; - // EntityAIAvoidEntity public static final String[] TARGET_ENTITY_CLASS = new String[] { "classToAvoid", "field_181064_i", "i" }; @@ -107,7 +103,4 @@ public final class LibObfuscation { public static final String[] PREV_EQUIPPED_PROGRESS = { "prevEquippedProgress", "field_78451_d", "f" }; public static final String[] EQUIPPED_PROGRESS = { "equippedProgress", "field_78454_c", "e" }; - // SoundEvent - public static final String[] REGISTER_SOUND = { "registerSound", "func_187502_a", "a" }; - }