From 5cd8db45518da6d46331ce6408f468f3254fbfa5 Mon Sep 17 00:00:00 2001 From: Progwml6 Date: Wed, 5 Feb 2014 20:06:41 -0500 Subject: [PATCH] fix several compile errors from remapping --- src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java | 4 ++-- .../common/eventhandler/entity/FlippersEventHandler.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java index 2c681394b..403a45c9e 100644 --- a/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java +++ b/src/main/java/biomesoplenty/client/gui/StartupWarningGUI.java @@ -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 diff --git a/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java b/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java index 368ce96e6..8228a482a 100644 --- a/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java +++ b/src/main/java/biomesoplenty/common/eventhandler/entity/FlippersEventHandler.java @@ -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()) {