etc
/
BiomesOPlenty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #182 from progwml6/master 

fix names that were changed by MCP
This commit is contained in:
Adubbz 2014-02-06 12:18:27 +11:00
parent 69a5258466 4b1620619b
commit 6232506dce
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java
View File

@ -44,9 +44,9 @@ public class StartupWarningGUI extends GuiScreen
//TODO: buttonList
this.buttonList.clear();
//TODO: buttonList
this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height - 48, 350, 20, I18n.getStringParams("OK")));
this.buttonList.add(new GuiButton(0, this.width / 2 - 175, this.height - 48, 350, 20, I18n.format("OK")));
//TODO: buttonList
this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height - 24, 350, 20, I18n.getStringParams("Cancel")));
this.buttonList.add(new GuiButton(1, this.width / 2 - 175, this.height - 24, 350, 20, I18n.format("Cancel")));
}
@Override

2
src/main/java/biomesoplenty/common/entities/EntityGlob.java
View File

@ -49,7 +49,7 @@ public class EntityGlob extends EntityLiving implements IMob
this.dataWatcher.updateObject(16, new Byte((byte)par1));
this.setSize(0.6F * (float)par1, 0.6F * (float)par1);
this.setPosition(this.posX, this.posY, this.posZ);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute((double)(par1 * par1));
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue((double)(par1 * par1));
this.setHealth(this.getMaxHealth());
this.experienceValue = par1;
}

4
src/main/java/biomesoplenty/common/entities/EntityJungleSpider.java
View File

@ -22,9 +22,9 @@ public class EntityJungleSpider extends EntitySpider
{
super.applyEntityAttributes();
//Max health
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(6.0D);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(6.0D);
//Movement speed
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setAttribute(0.95D);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.95D);
}
@Override

4
src/main/java/biomesoplenty/common/entities/EntityPhantom.java
View File

@ -25,8 +25,8 @@ public class EntityPhantom extends EntityMob
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(20.0D);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setAttribute(0.45D);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(20.0D);
this.getEntityAttribute(SharedMonsterAttributes.movementSpeed).setBaseValue(0.45D);
}
@Override

2
src/main/java/biomesoplenty/common/entities/EntityRosester.java
View File

@ -59,7 +59,7 @@ public class EntityRosester extends EntityChicken
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setAttribute(4.0D);
this.getEntityAttribute(SharedMonsterAttributes.maxHealth).setBaseValue(4.0D);
}
@Override

2
src/main/java/biomesoplenty/common/entities/EntityWasp.java
View File

@ -31,7 +31,7 @@ public class EntityWasp extends EntityFlyingMob
protected void applyEntityAttributes()
{
super.applyEntityAttributes();
this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setAttribute(2.5D);
this.getEntityAttribute(SharedMonsterAttributes.attackDamage).setBaseValue(2.5D);
}
@Override

2
src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java
View File

@ -17,7 +17,7 @@ public class FlippersEventHandler
{
EntityLiving entity = (EntityLiving)event.entity;
ItemStack itemstack = entity.getCurrentItemOrArmor(1);
ItemStack itemstack = entity.getEquipmentInSlot(1);
if (entity.isInWater())
{