diff --git a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java index cd570836..0796005b 100644 --- a/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java +++ b/src/main/java/binnie/botany/ceramic/BlockStainedGlass.java @@ -138,13 +138,13 @@ public class BlockStainedGlass extends Block implements IBlockMetadata, IColored } @Override - public String getDisplayName(final ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getDisplayName(final ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); return EnumFlowerColor.get(meta).getColourName() + " " + Binnie.LANGUAGE.localise("tile.botany.pigmented.glass.name"); } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { for (final EnumFlowerColor c : EnumFlowerColor.values()) { itemList.add(TileEntityMetadata.getItemStack(this, c.ordinal())); } diff --git a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java index ccc07938..946bf4f9 100644 --- a/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java +++ b/src/main/java/binnie/botany/ceramic/brick/BlockCeramicBrick.java @@ -102,7 +102,7 @@ public class BlockCeramicBrick extends Block implements IMultipassBlock itemList) { + public void getSubBlocks(Item item, final CreativeTabs tab, final NonNullList itemList) { for (final EnumFlowerColor color : EnumFlowerColor.values()) { itemList.add(new CeramicBrickPair(color, color, CeramicBrickType.Tile).getStack(1)); } diff --git a/src/main/java/binnie/botany/flower/ItemBotany.java b/src/main/java/binnie/botany/flower/ItemBotany.java index 68f1efda..27489fa2 100644 --- a/src/main/java/binnie/botany/flower/ItemBotany.java +++ b/src/main/java/binnie/botany/flower/ItemBotany.java @@ -148,7 +148,7 @@ public class ItemBotany extends Item implements IColoredItem, IItemModelRegister } @Override - public void getSubItems(final Item item, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubItems(final Item item, final CreativeTabs tab, final NonNullList itemList) { this.addCreativeItems(itemList, true); } diff --git a/src/main/java/binnie/botany/gardening/BlockSoil.java b/src/main/java/binnie/botany/gardening/BlockSoil.java index fb456c19..47541fc9 100644 --- a/src/main/java/binnie/botany/gardening/BlockSoil.java +++ b/src/main/java/binnie/botany/gardening/BlockSoil.java @@ -109,9 +109,9 @@ public class BlockSoil extends Block implements IBlockSoil, IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubBlocks(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList list) { for (int i = 0; i < 9; ++i) { - par3List.add(new ItemStack(this, 1, i)); + list.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/binnie/botany/genetics/ItemDictionary.java b/src/main/java/binnie/botany/genetics/ItemDictionary.java index 421a5778..9affa4c9 100644 --- a/src/main/java/binnie/botany/genetics/ItemDictionary.java +++ b/src/main/java/binnie/botany/genetics/ItemDictionary.java @@ -27,9 +27,9 @@ public class ItemDictionary extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { + super.getSubItems(itemIn, tab, subItems); + subItems.add(new ItemStack(itemIn, 1, 1)); } @Override diff --git a/src/main/java/binnie/core/block/BlockMetadata.java b/src/main/java/binnie/core/block/BlockMetadata.java index 8f4cb657..c7cfa6cd 100644 --- a/src/main/java/binnie/core/block/BlockMetadata.java +++ b/src/main/java/binnie/core/block/BlockMetadata.java @@ -53,7 +53,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata { /* IBLOCKMETADATA */ @Override - public String getDisplayName(final ItemStack par1ItemStack) { + public String getDisplayName(final ItemStack itemStack) { return this.getLocalizedName(); } diff --git a/src/main/java/binnie/core/block/ItemMetadata.java b/src/main/java/binnie/core/block/ItemMetadata.java index f0f31e08..b4512f0b 100644 --- a/src/main/java/binnie/core/block/ItemMetadata.java +++ b/src/main/java/binnie/core/block/ItemMetadata.java @@ -17,7 +17,7 @@ public class ItemMetadata extends ItemBlock { } @Override - public int getMetadata(final int par1) { + public int getMetadata(final int damage) { return 0; } diff --git a/src/main/java/binnie/core/block/TileEntityMetadata.java b/src/main/java/binnie/core/block/TileEntityMetadata.java index d202a969..8b463cc5 100644 --- a/src/main/java/binnie/core/block/TileEntityMetadata.java +++ b/src/main/java/binnie/core/block/TileEntityMetadata.java @@ -24,9 +24,9 @@ public class TileEntityMetadata extends TileEntity { } @Override - public boolean receiveClientEvent(final int par1, final int par2) { - if (par1 == 42) { - this.meta = par2; + public boolean receiveClientEvent(final int id, final int type) { + if (id == 42) { + this.meta = type; markDirty(); } return true; diff --git a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java index 5db0d52b..7854f296 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/ContainerCraftGUI.java @@ -82,18 +82,18 @@ public class ContainerCraftGUI extends Container { } @Override - public void onContainerClosed(final EntityPlayer par1EntityPlayer) { - this.crafters.remove(par1EntityPlayer); - super.onContainerClosed(par1EntityPlayer); + public void onContainerClosed(final EntityPlayer playerIn) { + this.crafters.remove(playerIn); + super.onContainerClosed(playerIn); WindowInventory inventory = this.window.getWindowInventory(); for (int i = 0; i < inventory.getSizeInventory(); ++i) { if (inventory.dispenseOnClose(i)) { ItemStack stack = inventory.getStackInSlot(i); if (!stack.isEmpty()) { - TransferRequest transferRequest = new TransferRequest(stack, par1EntityPlayer.inventory); + TransferRequest transferRequest = new TransferRequest(stack, playerIn.inventory); stack = transferRequest.transfer(true); if (!stack.isEmpty()) { - par1EntityPlayer.dropItem(stack, false); + playerIn.dropItem(stack, false); } } } diff --git a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java index 131f461e..527ff6d2 100644 --- a/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java +++ b/src/main/java/binnie/core/craftgui/minecraft/GuiCraftGUI.java @@ -70,7 +70,7 @@ public class GuiCraftGUI extends GuiContainer { } @Override - public void drawScreen(final int mouseX, final int mouseY, final float par3) { + public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) { this.window.setMousePosition(mouseX - this.window.getPosition().x(), mouseY - this.window.getPosition().y()); this.drawDefaultBackground(); GlStateManager.disableRescaleNormal(); diff --git a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java index 8c68837d..4edcba70 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemHiveFrame.java @@ -22,7 +22,7 @@ public class ItemHiveFrame extends Item implements IHiveFrame, IBeeModifier, IIt private final EnumHiveFrame frame; @Override - public String getItemStackDisplayName(final ItemStack par1ItemStack) { + public String getItemStackDisplayName(final ItemStack itemStack) { return this.frame.getName(); } diff --git a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java index 0842e138..0d28513a 100644 --- a/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java +++ b/src/main/java/binnie/extrabees/apiary/ItemIndustrialFrame.java @@ -21,13 +21,13 @@ public class ItemIndustrialFrame extends Item { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { for (final IndustrialFrame frame : IndustrialFrame.values()) { final ItemStack stack = new ItemStack(this); final NBTTagCompound nbt = new NBTTagCompound(); nbt.setInteger("frame", frame.ordinal()); stack.setTagCompound(nbt); - par3List.add(stack); + subItems.add(stack); } } @@ -44,7 +44,7 @@ public class ItemIndustrialFrame extends Item { } @Override - public String getItemStackDisplayName(final ItemStack par1ItemStack) { + public String getItemStackDisplayName(final ItemStack itemStack) { return "Industrial Frame"; } diff --git a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java index 6792631b..11aea9f7 100644 --- a/src/main/java/binnie/extrabees/core/ExtraBeeItems.java +++ b/src/main/java/binnie/extrabees/core/ExtraBeeItems.java @@ -145,7 +145,7 @@ public enum ExtraBeeItems implements IItemMiscProvider { // } @Override - public void addInformation(final List par3List) { + public void addInformation(final List tooltip) { } @Override diff --git a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java index d840bfb6..7075b73a 100644 --- a/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java +++ b/src/main/java/binnie/extrabees/genetics/effect/EntityBeeLightning.java @@ -19,8 +19,8 @@ public class EntityBeeLightning extends EntityLightningBolt { super(world, 0, 0, 0, true); } - public EntityBeeLightning(final World par1World, final double par2, final double par4, final double par6) { - super(par1World, par2, par4, par6, false); + public EntityBeeLightning(final World world, final double x, final double y, final double z) { + super(world, x, y, z, false); this.lightningState = 2; this.boltLivingTime = this.rand.nextInt(3) + 1; } diff --git a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java index afd1ba63..41a35fb8 100644 --- a/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java +++ b/src/main/java/binnie/extrabees/genetics/items/ItemDictionary.java @@ -38,9 +38,9 @@ public class ItemDictionary extends Item implements IItemModelRegister { @Override @SideOnly(Side.CLIENT) - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList par3List) { - super.getSubItems(par1, par2CreativeTabs, par3List); - par3List.add(new ItemStack(par1, 1, 1)); + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { + super.getSubItems(itemIn, tab, subItems); + subItems.add(new ItemStack(itemIn, 1, 1)); } @Override diff --git a/src/main/java/binnie/extrabees/products/ItemProduct.java b/src/main/java/binnie/extrabees/products/ItemProduct.java index 7a567ef3..1d716aa3 100644 --- a/src/main/java/binnie/extrabees/products/ItemProduct.java +++ b/src/main/java/binnie/extrabees/products/ItemProduct.java @@ -34,10 +34,10 @@ public class ItemProduct extends Item implements IItemModelRegister { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { for (final IItemEnum type : this.types) { if (type.isActive()) { - itemList.add(new ItemStack(this, 1, type.ordinal())); + subItems.add(new ItemStack(this, 1, type.ordinal())); } } } diff --git a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java index f3227fcf..d5dd09cd 100644 --- a/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java +++ b/src/main/java/binnie/extrabees/worldgen/BlockExtraBeeHive.java @@ -30,12 +30,12 @@ public class BlockExtraBeeHive extends Block { this.setCreativeTab(Tabs.tabApiculture); } - public String getUnlocalizedName(final ItemStack par1ItemStack) { - return "extrabees.block.hive." + par1ItemStack.getItemDamage(); + public String getUnlocalizedName(final ItemStack itemStack) { + return "extrabees.block.hive." + itemStack.getItemDamage(); } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { for (int i = 0; i < EnumHiveType.values().length; ++i) { itemList.add(new ItemStack(this, 1, i)); } diff --git a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java index b8230c78..ef6bbdae 100644 --- a/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java +++ b/src/main/java/binnie/extrabees/worldgen/ItemBeehive.java @@ -21,9 +21,9 @@ public class ItemBeehive extends ItemBlock { } @Override - public void getSubItems(final Item par1, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubItems(final Item itemIn, final CreativeTabs tab, final NonNullList subItems) { for (int i = 0; i < EnumHiveType.values().length; ++i) { - itemList.add(new ItemStack(this, 1, i)); + subItems.add(new ItemStack(this, 1, i)); } } diff --git a/src/main/java/binnie/extratrees/block/BlockETDoor.java b/src/main/java/binnie/extratrees/block/BlockETDoor.java index 22ecb66f..1ab5c78a 100644 --- a/src/main/java/binnie/extratrees/block/BlockETDoor.java +++ b/src/main/java/binnie/extratrees/block/BlockETDoor.java @@ -228,8 +228,8 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit } @Override - public String getDisplayName(ItemStack par1ItemStack) { - final int meta = TileEntityMetadata.getItemDamage(par1ItemStack); + public String getDisplayName(ItemStack itemStack) { + final int meta = TileEntityMetadata.getItemDamage(itemStack); final String typeName = getDoorType(meta).getName(); final String woodName = WoodManager.getPlankType(meta & 0xFF).getName(); if (typeName.equals("")) { @@ -239,7 +239,7 @@ public class BlockETDoor extends BlockDoor implements IBlockMetadata, ITileEntit } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { for (final IPlankType type : PlankType.ExtraTreePlanks.values()) { itemList.add(WoodManager.getDoor(type, DoorType.Standard)); } diff --git a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java index 76d8aa78..ece3374f 100644 --- a/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java +++ b/src/main/java/binnie/extratrees/block/decor/BlockMultiFence.java @@ -172,7 +172,7 @@ public class BlockMultiFence extends BlockFence implements IBlockMetadata, IStat @SideOnly(Side.CLIENT) @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { for (FenceType type : FenceType.values()) { itemList.add(WoodManager.getFence(PlankType.VanillaPlanks.SPRUCE, PlankType.VanillaPlanks.BIRCH, type, 1)); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java index eb361f13..77d47620 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockCarpentryPanel.java @@ -25,7 +25,7 @@ public class BlockCarpentryPanel extends BlockCarpentry { } @Override - public void getSubBlocks(final Item itemIn, final CreativeTabs par2CreativeTabs, final NonNullList itemList) { + public void getSubBlocks(final Item itemIn, final CreativeTabs tab, final NonNullList itemList) { } @Override @@ -60,8 +60,8 @@ public class BlockCarpentryPanel extends BlockCarpentry { } @Override - public String getDisplayName(final ItemStack stack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public String getDisplayName(final ItemStack itemStack) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); return Binnie.LANGUAGE.localise(ExtraTrees.instance, "block.woodenpanel.name", block.getDesign().getName()); } diff --git a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java index 2ed12b2c..4f8eb182 100644 --- a/src/main/java/binnie/extratrees/carpentry/BlockDesign.java +++ b/src/main/java/binnie/extratrees/carpentry/BlockDesign.java @@ -102,8 +102,8 @@ public abstract class BlockDesign extends BlockMetadata implements IMultipassBlo } @Override - public String getDisplayName(final ItemStack stack) { - final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(stack)); + public String getDisplayName(final ItemStack itemStack) { + final DesignBlock block = ModuleCarpentry.getDesignBlock(this.getDesignSystem(), TileEntityMetadata.getItemDamage(itemStack)); return this.getBlockName(block); } diff --git a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java index 541bdac2..c6149f4b 100644 --- a/src/main/java/binnie/extratrees/item/ExtraTreeItems.java +++ b/src/main/java/binnie/extratrees/item/ExtraTreeItems.java @@ -36,7 +36,7 @@ public enum ExtraTreeItems implements IItemMiscProvider { } @Override - public void addInformation(final List par3List) { + public void addInformation(final List tooltip) { } @Override diff --git a/src/main/java/binnie/extratrees/item/Food.java b/src/main/java/binnie/extratrees/item/Food.java index ba62f535..651c040d 100644 --- a/src/main/java/binnie/extratrees/item/Food.java +++ b/src/main/java/binnie/extratrees/item/Food.java @@ -119,7 +119,7 @@ public enum Food implements IItemMiscProvider { } @Override - public void addInformation(final List par3List) { + public void addInformation(final List tooltip) { } public void addJuice(final Juice juice, final int time, final int amount, final int mulch) { diff --git a/src/main/java/binnie/genetics/item/GeneticsItems.java b/src/main/java/binnie/genetics/item/GeneticsItems.java index 211a6482..14c769a9 100644 --- a/src/main/java/binnie/genetics/item/GeneticsItems.java +++ b/src/main/java/binnie/genetics/item/GeneticsItems.java @@ -34,7 +34,7 @@ public enum GeneticsItems implements IItemMiscProvider { } @Override - public void addInformation(final List par3List) { + public void addInformation(final List tooltip) { } @Override