diff --git a/src/game/java/net/minecraft/entity/player/EntityPlayer.java b/src/game/java/net/minecraft/entity/player/EntityPlayer.java index e3c14b65..7643e24a 100644 --- a/src/game/java/net/minecraft/entity/player/EntityPlayer.java +++ b/src/game/java/net/minecraft/entity/player/EntityPlayer.java @@ -5,7 +5,7 @@ import java.util.List; import com.google.common.base.Charsets; import com.google.common.collect.Lists; -import net.starlikeclient.minecraft.util.EnergyStats; + import net.lax1dude.eaglercraft.v1_8.EaglercraftUUID; import net.lax1dude.eaglercraft.v1_8.mojang.authlib.GameProfile; import net.minecraft.block.Block; @@ -186,7 +186,6 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS * + The food object of the player, the general hunger logic. */ protected FoodStats foodStats = new FoodStats(); - protected EnergyStats energyStats = new EnergyStats(); protected int flyToggleTimer; public float prevCameraYaw; public float cameraYaw; @@ -2020,7 +2019,6 @@ public abstract class EntityPlayer extends EntityLivingBase implements ICommandS switch (itemStackIn.getItemUseAction()) { case DRINK: this.playSound("random.drink", 0.5F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); - energyStats.addEnergy(itemStackIn.getEnergyStat()); break; case EAT: for (int i = 0; i < parInt1; ++i) { diff --git a/src/game/java/net/minecraft/item/Item.java b/src/game/java/net/minecraft/item/Item.java index 5abffd4a..6aeb2f99 100644 --- a/src/game/java/net/minecraft/item/Item.java +++ b/src/game/java/net/minecraft/item/Item.java @@ -71,14 +71,6 @@ import net.starlikeclient.minecraft.init.ItemsStarlike; * */ public class Item { - private int energyStat = 0; - public int getEnergyStat(){ - return energyStat; - } - public void setEnergyStat(int stat){ - energyStat = stat; - } - public static enum ToolMaterial { // MATERIAL(HARVEST_LEVEL, DURABILITY, EFFICIENCY, DAMAGE, ENCHANTABILITY) ZERO(0, 0, 0.0F, 0.0F, 0), WOOD(0, 59, 2.0F, 0.0F, 15), STONE(1, 131, 4.0F, 1.0F, 5), @@ -93,7 +85,7 @@ public class Item { private final float efficiencyOnProperMaterial; private final float damageVsEntity; private final int enchantability; - + private ToolMaterial(int harvestLevel, int maxUses, float efficiency, float damageVsEntity, int enchantability) { this.harvestLevel = harvestLevel; diff --git a/src/game/java/net/minecraft/item/ItemPotion.java b/src/game/java/net/minecraft/item/ItemPotion.java index e6bebfb6..5356b68b 100644 --- a/src/game/java/net/minecraft/item/ItemPotion.java +++ b/src/game/java/net/minecraft/item/ItemPotion.java @@ -74,9 +74,8 @@ public class ItemPotion extends Item { this.setHasSubtypes(true); this.setMaxDamage(0); this.setCreativeTab(CreativeTabs.tabBrewing); - this.setEnergyStat(3); } - + /** * + allows items to add custom lines of information to the mouseover * description diff --git a/src/game/java/net/minecraft/item/ItemStack.java b/src/game/java/net/minecraft/item/ItemStack.java index 82ef0201..c2004eca 100644 --- a/src/game/java/net/minecraft/item/ItemStack.java +++ b/src/game/java/net/minecraft/item/ItemStack.java @@ -691,9 +691,6 @@ public final class ItemStack { : (!this.stackTagCompound.hasKey("display", 10) ? false : this.stackTagCompound.getCompoundTag("display").hasKey("Name", 8)); } - public int getEnergyStat(){ - return this.item.getEnergyStat(); - } public boolean hasEffect() { return this.getItem().hasEffect(this);