Leahnaya/FairyFactions
1
0
Fork 0
mirror of https://github.com/allaryin/FairyFactions.git synced 2026-09-09 02:45:11 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/github/master'

Browse Source 
Conflicts:
	gradle.properties
This commit is contained in:
Ammon Lauritzen
2016-02-29 13:04:13 -06:00
parent ecb82c8f2a 09a402a6ef
commit ecfe73c855
2 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/fairies/ai/FairyJob.java
View File

@@ -27,6 +27,11 @@ import net.minecraftforge.common.IPlantable;
import net.minecraftforge.fml.relauncher.ReflectionHelper;
public class FairyJob {
// Obfuscated name lookups
private static final String[] MCP_FLEEINGTICK = { "fleeingTick", "field_70788_c" };
private static final String[] MCP_BREEDING = { "breeding", "field_70882_e" };
private static final String[] MCP_INLOVE = { "inLove", "field_70881_d" };
public FairyJob( final EntityFairy entityfairy ) {
fairy = entityfairy;
}
@@ -110,7 +115,7 @@ public class FairyJob {
for ( int i = 0; i < list.size(); i++ ) {
final EntityAnimal entity1 = (EntityAnimal) list.get( i );
final int fleeingTick = ReflectionHelper.getPrivateValue(EntityCreature.class, entity1, "fleeingTick");
final int fleeingTick = ReflectionHelper.getPrivateValue(EntityCreature.class, entity1, MCP_FLEEINGTICK);
if ( fairy.peacefulAnimal( entity1 ) && fairy.canEntityBeSeen( entity1 ) && entity1.getHealth() > 0
&& entity1.getEntityToAttack() == null && fleeingTick <= 0 && !entity1.isInLove()
&& entity1.getGrowingAge() == 0 ) {
@@ -144,7 +149,7 @@ public class FairyJob {
for ( int i = 0; i < list.size(); i++ ) {
final EntitySheep entity1 = (EntitySheep) list.get( i );
final int fleeingTick = ReflectionHelper.getPrivateValue(EntityCreature.class, entity1, "fleeingTick");
final int fleeingTick = ReflectionHelper.getPrivateValue(EntityCreature.class, entity1, MCP_FLEEINGTICK);
if ( fairy.canEntityBeSeen( entity1 ) && entity1.getHealth() > 0 && entity1.getEntityToAttack() == null
&& fleeingTick <= 0 && entity1.getGrowingAge() >= 0 && !entity1.getSheared() ) {
list2.add( entity1 );
@@ -524,7 +529,7 @@ public class FairyJob {
for ( int i = 0; i < animals.size() && count < 3 && stack.stackSize > 0; i++ ) {
final EntityAnimal entity = (EntityAnimal) animals.get( i );
int isBreedingCounter = ReflectionHelper.getPrivateValue(EntityAnimal.class, entity, "breeding");
int isBreedingCounter = ReflectionHelper.getPrivateValue(EntityAnimal.class, entity, MCP_BREEDING);
// skip unbreedable animals
if (!entity.isBreedingItem(stack) // can't breed with this item
|| entity.getGrowingAge() != 0 // is juvenile (negative) or recently proceated (positive)
@@ -534,8 +539,7 @@ public class FairyJob {
triedBreeding = true;
if ( fairy.getDistanceToEntity( entity ) < 3F ) {
ReflectionHelper.setPrivateValue(EntityAnimal.class, entity, 600, "inLove");
ReflectionHelper.setPrivateValue(EntityAnimal.class, entity, 600, MCP_INLOVE);
count++;
stack.stackSize--;
}

8
src/main/java/fairies/entity/EntityFairy.java
View File

@@ -116,6 +116,10 @@ public class EntityFairy extends EntityAnimal {
this.setCower(rand.nextBoolean());
this.postX = this.postY = this.postZ = -1;
}
// Obfuscated name lookups
private static final String[] MCP_ISJUMPING = { "isJumping", "field_70703_bu" };
private static final String[] MCP_ONIMPACT = { "onImpact", "func_70184_a" };
// DataWatcher object indices
protected final static int B_FLAGS = 17;
@@ -335,7 +339,7 @@ public class EntityFairy extends EntityAnimal {
}
final boolean isJumping = ReflectionHelper.getPrivateValue(EntityLivingBase.class,
(EntityLivingBase)ridingEntity, "isJumping");
(EntityLivingBase)ridingEntity, MCP_ISJUMPING);
if (isJumping && ridingEntity.motionY < FairyConfig.DEF_FLAP_RATE && canFlap()) {
ridingEntity.motionY = FairyConfig.DEF_FLAP_RATE;
}
@@ -1409,7 +1413,7 @@ public class EntityFairy extends EntityAnimal {
// potion.onImpact(new MovingObjectPosition(guy));
try {
final Method onImpact = ReflectionHelper.findMethod(
EntityPotion.class, potion, new String[] { "onImpact" },
EntityPotion.class, potion, MCP_ONIMPACT,
MovingObjectPosition.class);
onImpact.invoke(potion, new MovingObjectPosition(guy));
} catch (Exception e) {