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

TEMPORARY fix for MCP mapping issue.

Browse source
This commit is contained in:
LexManos 2013-07-03 06:26:12 -07:00
parent 7e5560e60d
commit 02e857827d
4 changed files with 128 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
patches/minecraft/net/minecraft/entity/boss/BossStatus.java.patch Normal file
View file

@ -0,0 +1,11 @@
--- ../src_base/minecraft/net/minecraft/entity/boss/BossStatus.java
+++ ../src_work/minecraft/net/minecraft/entity/boss/BossStatus.java
@@ -13,7 +13,7 @@
public static void func_82824_a(IBossDisplayData par0IBossDisplayData, boolean par1)
{
- healthScale = par0IBossDisplayData.func_110183_aJ() / par0IBossDisplayData.getMaxHealth();
+ healthScale = par0IBossDisplayData.func_110143_aJ() / par0IBossDisplayData.func_110138_aP();
statusBarLength = 100;
bossName = par0IBossDisplayData.getEntityName();
field_82825_d = par1;

57
patches/minecraft/net/minecraft/entity/boss/EntityDragon.java.patch
View file

@ -1,5 +1,45 @@
--- ../src_base/minecraft/net/minecraft/entity/boss/EntityDragon.java
+++ ../src_work/minecraft/net/minecraft/entity/boss/EntityDragon.java
@@ -75,7 +75,7 @@
{
super(par1World);
this.dragonPartArray = new EntityDragonPart[] {this.dragonPartHead = new EntityDragonPart(this, "head", 6.0F, 6.0F), this.dragonPartBody = new EntityDragonPart(this, "body", 8.0F, 8.0F), this.dragonPartTail1 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartTail2 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartTail3 = new EntityDragonPart(this, "tail", 4.0F, 4.0F), this.dragonPartWing1 = new EntityDragonPart(this, "wing", 4.0F, 4.0F), this.dragonPartWing2 = new EntityDragonPart(this, "wing", 4.0F, 4.0F)};
- this.setEntityHealth(this.getMaxHealth());
+ this.setEntityHealth(this.func_110138_aP());
this.setSize(16.0F, 8.0F);
this.noClip = true;
this.isImmuneToFire = true;
@@ -100,7 +100,7 @@
*/
public double[] getMovementOffsets(int par1, float par2)
{
- if (this.func_110183_aJ() <= 0.0F)
+ if (this.func_110143_aJ() <= 0.0F)
{
par2 = 0.0F;
}
@@ -142,7 +142,7 @@
this.prevAnimTime = this.animTime;
float f2;
- if (this.func_110183_aJ() <= 0.0F)
+ if (this.func_110143_aJ() <= 0.0F)
{
f = (this.rand.nextFloat() - 0.5F) * 8.0F;
f1 = (this.rand.nextFloat() - 0.5F) * 4.0F;
@@ -396,9 +396,9 @@
this.healingEnderCrystal = null;
}
- else if (this.ticksExisted % 10 == 0 && this.func_110183_aJ() < this.getMaxHealth())
- {
- this.setEntityHealth(this.func_110183_aJ() + 1.0F);
+ else if (this.ticksExisted % 10 == 0 && this.func_110143_aJ() < this.func_110138_aP())
+ {
+ this.setEntityHealth(this.func_110143_aJ() + 1.0F);
}
}
@@ -527,10 +527,11 @@
for (int i2 = k; i2 <= j1; ++i2)
{
@ -15,3 +55,20 @@
{
flag1 = this.worldObj.setBlockToAir(k1, l1, i2) || flag1;
}
@@ -753,16 +754,4 @@
{
return 5.0F;
}
-
- @Override
- public float getMaxHealth()
- {
- return 0.0f;
- }
-
- @Override
- public float func_110183_aJ()
- {
- return 0.0f;
- }
}

46
patches/minecraft/net/minecraft/entity/boss/EntityWither.java.patch Normal file
View file

@ -0,0 +1,46 @@
--- ../src_base/minecraft/net/minecraft/entity/boss/EntityWither.java
+++ ../src_work/minecraft/net/minecraft/entity/boss/EntityWither.java
@@ -45,7 +45,7 @@
public EntityWither(World par1World)
{
super(par1World);
- this.setEntityHealth(this.getMaxHealth());
+ this.setEntityHealth(this.func_110138_aP());
this.setSize(0.9F, 4.0F);
this.isImmuneToFire = true;
this.getNavigator().setCanSwim(true);
@@ -380,7 +380,7 @@
public void func_82206_m()
{
this.func_82215_s(220);
- this.setEntityHealth(this.getMaxHealth() / 3.0F);
+ this.setEntityHealth(this.func_110138_aP() / 3.0F);
}
/**
@@ -633,7 +633,7 @@
*/
public boolean isArmored()
{
- return this.func_110183_aJ() <= this.getMaxHealth() / 2.0F;
+ return this.func_110143_aJ() <= this.func_110138_aP() / 2.0F;
}
/**
@@ -651,16 +651,4 @@
{
this.ridingEntity = null;
}
-
- @Override
- public float getMaxHealth()
- {
- return 0.0f;
- }
-
- @Override
- public float func_110183_aJ()
- {
- return 0.0f;
- }
}

14
patches/minecraft/net/minecraft/entity/boss/IBossDisplayData.java.patch Normal file
View file

@ -0,0 +1,14 @@
--- ../src_base/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
+++ ../src_work/minecraft/net/minecraft/entity/boss/IBossDisplayData.java
@@ -2,9 +2,9 @@
public interface IBossDisplayData
{
- float getMaxHealth();
+ float func_110138_aP();
- float func_110183_aJ();
+ float func_110143_aJ();
/**
* Gets the username of the entity.