diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/core/item')
9 files changed, 22 insertions, 8 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java index 0060d370b0..0ac31ef30b 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/BaseBauble.java @@ -13,14 +13,13 @@ import net.minecraft.util.DamageSource; import net.minecraft.world.World; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import com.google.common.collect.HashMultimap; +import com.google.common.collect.Multimap; + import baubles.api.BaubleType; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; - -import com.google.common.collect.HashMultimap; -import com.google.common.collect.Multimap; - import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java index db422692e7..703fb7c5bb 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/HealthBoostBauble.java @@ -12,10 +12,10 @@ import net.minecraft.util.DamageSource; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; -import baubles.api.BaubleType; - import com.google.common.collect.Multimap; +import baubles.api.BaubleType; + public class HealthBoostBauble extends BaseBauble { public HealthBoostBauble() { diff --git a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java index 51dcb4ea29..63a812e8ca 100644 --- a/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java +++ b/src/main/java/gtPlusPlus/core/item/bauble/ModularBauble.java @@ -19,10 +19,9 @@ import net.minecraft.util.IIcon; import org.lwjgl.input.Keyboard; -import baubles.api.BaubleType; - import com.google.common.collect.Multimap; +import baubles.api.BaubleType; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import gtPlusPlus.core.util.minecraft.ModularArmourUtils; diff --git a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java index e67ff32d85..d2ae1efca0 100644 --- a/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java +++ b/src/main/java/gtPlusPlus/core/item/food/BaseItemMetaFood.java @@ -226,16 +226,19 @@ public class BaseItemMetaFood extends ItemFood { } // Heal Amount + @Override public int func_150905_g(ItemStack aStack) { return mHealAmountMap.get(getMetaKey(aStack)); } // Saturation Amount + @Override public float func_150906_h(ItemStack aStack) { return mSaturationAmountMap.get(getMetaKey(aStack)); } // Whether wolves like this food, sadly doesn't support meta items + @Override public boolean isWolfsFavoriteMeat() { return false; } diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java index e7c38d043d..8cd9970625 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemGiantEgg.java @@ -87,6 +87,7 @@ public class ItemGiantEgg extends BaseItemTickable { return mCorrectStemCells; } + @Override protected int getMaxTicks(ItemStack aStack) { if (aStack != null && aStack.hasTagCompound() && aStack.getTagCompound().hasKey("mEggAge")) { return NBTUtils.getInteger(aStack, "mEggAge"); diff --git a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java index 9889bdbd06..e8ff40a5fc 100644 --- a/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java +++ b/src/main/java/gtPlusPlus/core/item/general/ItemMagicFeather.java @@ -68,6 +68,7 @@ public class ItemMagicFeather extends CoreItem { list.add("Range is beacon level * 10 + 10"); } + @Override public boolean hasCustomEntity(ItemStack stack) { return true; } diff --git a/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java index c46552298a..3f24ba5e29 100644 --- a/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java +++ b/src/main/java/gtPlusPlus/core/item/tool/misc/box/ContainerBoxBase.java @@ -133,6 +133,7 @@ public class ContainerBoxBase extends Container { /** * Called when a player shift-clicks on a slot. You must override this or you will crash when someone does that. */ + @Override public ItemStack transferStackInSlot(EntityPlayer par1EntityPlayer, int index) { ItemStack itemstack = null; Slot slot = (Slot) this.inventorySlots.get(index); diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java index 6a9cb7c3dc..f3972fb400 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/hazmat/ArmourHazmat.java @@ -28,6 +28,7 @@ public class ArmourHazmat extends BaseArmourHelm { super(ArmourLoader.TinFoilArmour, 0); } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); @@ -38,19 +39,23 @@ public class ArmourHazmat extends BaseArmourHelm { return 0; } + @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1) { return this.iconHelm; } + @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } + @Override public EnumRarity getRarity(ItemStack itemstack) { return EnumRarity.rare; } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return false; } diff --git a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java index e703efebc2..5f61f4cf86 100644 --- a/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java +++ b/src/main/java/gtPlusPlus/core/item/wearable/armour/tinfoil/ArmourTinFoilHat.java @@ -40,6 +40,7 @@ public class ArmourTinFoilHat extends BaseArmourHelm { super(ArmourLoader.TinFoilArmour, 0); } + @Override @SideOnly(Side.CLIENT) public void registerIcons(IIconRegister ir) { this.iconHelm = ir.registerIcon(GTPlusPlus.ID + ":itemHatTinFoil"); @@ -50,19 +51,23 @@ public class ArmourTinFoilHat extends BaseArmourHelm { return 0; } + @Override @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int par1) { return this.iconHelm; } + @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { return GTPlusPlus.ID + ":textures/models/TinFoil.png"; } + @Override public EnumRarity getRarity(ItemStack itemstack) { return EnumRarity.uncommon; } + @Override public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) { return false; } |