Great Renaming, Part 2 - Items (#107)

src/main/java/vazkii/botania/common/item/Item16Colors.java

@@ -27,11 +27,11 @@ public class Item16Colors extends ItemMod {
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par1ItemStack.getItemDamage() >= EntitySheep.fleeceColorTable.length)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(stack.getItemDamage() >= EntitySheep.fleeceColorTable.length)
 			return 0xFFFFFF;
 
-		float[] color = EntitySheep.fleeceColorTable[par1ItemStack.getItemDamage()];
+		float[] color = EntitySheep.fleeceColorTable[stack.getItemDamage()];
 		return new Color(color[0], color[1], color[2]).getRGB();
 	}
 
@@ -42,12 +42,12 @@ public class Item16Colors extends ItemMod {
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 
 }

src/main/java/vazkii/botania/common/item/ItemAncientWill.java

@@ -48,19 +48,19 @@ public class ItemAncientWill extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return icons[Math.min(icons.length - 1, dmg)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		addStringToTooltip(StatCollector.translateToLocal("botaniamisc.craftToAddWill"), infoList);
 		addStringToTooltip(StatCollector.translateToLocal("botania.armorset.will" + stack.getItemDamage() + ".shortDesc"), infoList);
 	}
@@ -70,8 +70,8 @@ public class ItemAncientWill extends ItemMod {
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 

src/main/java/vazkii/botania/common/item/ItemAutocraftingHalo.java

@@ -28,12 +28,11 @@ public class ItemAutocraftingHalo extends ItemCraftingHalo {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) {
-		super.onUpdate(stack, world, entity, pos, equipped);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		super.onUpdate(stack, world, entity, invSlot, isHeld);
 
-		if(entity instanceof EntityPlayer && !equipped) {
-			EntityPlayer player = (EntityPlayer) entity;
-			IInventory inv = getFakeInv(player);
+		if(entity instanceof EntityPlayer player && !isHeld) {
+            IInventory inv = getFakeInv(player);
 
 			for(int i = 1; i < SEGMENTS; i++)
 				tryCraft(player, stack, i, false, inv, false);

src/main/java/vazkii/botania/common/item/ItemBlackHoleTalisman.java

@@ -61,39 +61,38 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(getBlock(par1ItemStack) != Blocks.air && par3EntityPlayer.isSneaking()) {
-			int dmg = par1ItemStack.getItemDamage();
-			par1ItemStack.setItemDamage(~dmg & 1);
-			par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(getBlock(stack) != Blocks.air && player.isSneaking()) {
+			int dmg = stack.getItemDamage();
+			stack.setItemDamage(~dmg & 1);
+			world.playSoundAtEntity(player, "random.orb", 0.3F, 0.1F);
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		Block block = par3World.getBlock(par4, par5, par6);
-		int meta = par3World.getBlockMetadata(par4, par5, par6);
-		boolean set = setBlock(par1ItemStack, block, meta);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		Block block = world.getBlock(x, y, z);
+		int meta = world.getBlockMetadata(x, y, z);
+		boolean set = setBlock(stack, block, meta);
 
 		if(!set) {
-			Block bBlock = getBlock(par1ItemStack);
-			int bmeta = getBlockMeta(par1ItemStack);
+			Block bBlock = getBlock(stack);
+			int bmeta = getBlockMeta(stack);
 
-			TileEntity tile = par3World.getTileEntity(par4, par5, par6);
-			if(tile != null && tile instanceof IInventory) {
-				IInventory inv = (IInventory) tile;
-				int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(par7) : InventoryHelper.buildSlotsForLinearInventory(inv);
+			TileEntity tile = world.getTileEntity(x, y, z);
+			if(tile instanceof IInventory inv) {
+                int[] slots = inv instanceof ISidedInventory ? ((ISidedInventory) inv).getAccessibleSlotsFromSide(side) : InventoryHelper.buildSlotsForLinearInventory(inv);
 				for(int slot : slots) {
 					ItemStack stackInSlot = inv.getStackInSlot(slot);
 					if(stackInSlot == null) {
-						ItemStack stack = new ItemStack(bBlock, 1, bmeta);
-						int maxSize = stack.getMaxStackSize();
-						stack.stackSize = remove(par1ItemStack, maxSize);
-						if(stack.stackSize != 0) {
-							if(inv.isItemValidForSlot(slot, stack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stack, par7))) {
-								inv.setInventorySlotContents(slot, stack);
+						ItemStack blockStack = new ItemStack(bBlock, 1, bmeta);
+						int maxSize = blockStack.getMaxStackSize();
+						blockStack.stackSize = remove(stack, maxSize);
+						if(blockStack.stackSize != 0) {
+							if(inv.isItemValidForSlot(slot, blockStack) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, blockStack, side))) {
+								inv.setInventorySlotContents(slot, blockStack);
 								inv.markDirty();
 								set = true;
 							}
@@ -101,40 +100,39 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
 					} else if(stackInSlot.getItem() == Item.getItemFromBlock(bBlock) && stackInSlot.getItemDamage() == bmeta) {
 						int maxSize = stackInSlot.getMaxStackSize();
 						int missing = maxSize - stackInSlot.stackSize;
-						if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, par7))) {
-							stackInSlot.stackSize += remove(par1ItemStack, missing);
+						if(inv.isItemValidForSlot(slot, stackInSlot) && (!(inv instanceof ISidedInventory) || ((ISidedInventory) inv).canInsertItem(slot, stackInSlot, side))) {
+							stackInSlot.stackSize += remove(stack, missing);
 							inv.markDirty();
 							set = true;
 						}
 					}
 				}
 			} else {
-				ForgeDirection dir = ForgeDirection.getOrientation(par7);
-				int entities = par3World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par4 + dir.offsetX, par5 + dir.offsetY, par6 + dir.offsetZ, par4 + dir.offsetX + 1, par5 + dir.offsetY + 1, par6 + dir.offsetZ + 1)).size();
+				ForgeDirection dir = ForgeDirection.getOrientation(side);
+				int entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, x + dir.offsetX + 1, y + dir.offsetY + 1, z + dir.offsetZ + 1)).size();
 
 				if(entities == 0) {
-					int remove = par2EntityPlayer.capabilities.isCreativeMode ? 1 : remove(par1ItemStack, 1);
+					int remove = player.capabilities.isCreativeMode ? 1 : remove(stack, 1);
 					if(remove > 0) {
-						ItemStack stack = new ItemStack(bBlock, 1, bmeta);
-						ItemsRemainingRenderHandler.set(stack, getBlockCount(par1ItemStack));
+						ItemStack blockStack = new ItemStack(bBlock, 1, bmeta);
+						ItemsRemainingRenderHandler.set(blockStack, getBlockCount(stack));
 
-						Item.getItemFromBlock(bBlock).onItemUse(stack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
+						Item.getItemFromBlock(bBlock).onItemUse(blockStack, player, world, x, y, z, side, subX, subY, subZ);
 						set = true;
 					}
 				}
 			}
 		}
 
-		par2EntityPlayer.setCurrentItemOrArmor(0, par1ItemStack);
+		player.setCurrentItemOrArmor(0, stack);
 		return set;
 	}
 
 	@Override
-	public void onUpdate(ItemStack itemstack, World worldIn, Entity entity, int p_77663_4_, boolean p_77663_5_) {
+	public void onUpdate(ItemStack itemstack, World world, Entity entity, int invSlot, boolean isHeld) {
 		Block block = getBlock(itemstack);
-		if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) entity;
-			int meta = getBlockMeta(itemstack);
+		if(!entity.worldObj.isRemote && itemstack.getItemDamage() == 1 && block != Blocks.air && entity instanceof EntityPlayer player) {
+            int meta = getBlockMeta(itemstack);
 
 			int highest = -1;
 			int[] counts = new int[player.inventory.getSizeInventory() - player.inventory.armorInventory.length];
@@ -187,12 +185,12 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
 	}
 
 	@Override
-	public String getItemStackDisplayName(ItemStack par1ItemStack) {
-		Block block = getBlock(par1ItemStack);
-		int meta = getBlockMeta(par1ItemStack);
-		ItemStack stack = new ItemStack(block, 1, meta);
+	public String getItemStackDisplayName(ItemStack stack) {
+		Block block = getBlock(stack);
+		int meta = getBlockMeta(stack);
+		ItemStack blockStack = new ItemStack(block, 1, meta);
 
-		return super.getItemStackDisplayName(par1ItemStack) + (stack == null || stack.getItem() == null ? "" : " (" + EnumChatFormatting.GREEN + stack.getDisplayName() + EnumChatFormatting.RESET + ")");
+		return super.getItemStackDisplayName(stack) + (blockStack == null || blockStack.getItem() == null ? "" : " (" + EnumChatFormatting.GREEN + blockStack.getDisplayName() + EnumChatFormatting.RESET + ")");
 	}
 
 	@Override
@@ -218,7 +216,7 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
 	}
 
 	@Override
-	public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) {
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
 		return false;
 	}
 
@@ -238,20 +236,20 @@ public class ItemBlackHoleTalisman extends ItemMod implements IBlockProvider {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		enabledIcon = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
+		enabledIcon = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int par1) {
-		return par1 == 1 ? enabledIcon : itemIcon;
+	public IIcon getIconFromDamage(int meta) {
+		return meta == 1 ? enabledIcon : itemIcon;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		Block block = getBlock(stack);
 		if(block != null && block != Blocks.air) {
 			int count = getBlockCount(stack);

src/main/java/vazkii/botania/common/item/ItemBlackLotus.java

@@ -42,13 +42,13 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
 	}
 
 	@Override
-	public boolean hasEffect(ItemStack par1ItemStack, int pass) {
-		return par1ItemStack.getItemDamage() > 0;
+	public boolean hasEffect(ItemStack stack, int pass) {
+		return stack.getItemDamage() > 0;
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 	@Override
@@ -82,7 +82,7 @@ public class ItemBlackLotus extends ItemMod implements IManaDissolvable {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		infoList.add(StatCollector.translateToLocal("botaniamisc.lotusDesc"));
 	}
 

src/main/java/vazkii/botania/common/item/ItemBottledMana.java

@@ -115,9 +115,8 @@ public class ItemBottledMana extends ItemMod {
 			for(int i = 256; i > 0; i--) {
 				Block block = player.worldObj.getBlock(x, i, z);
 				if(!block.isAir(player.worldObj, x, i, z)) {
-					if(player instanceof EntityPlayerMP) {
-						EntityPlayerMP mp = (EntityPlayerMP) player;
-						mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch);
+					if(player instanceof EntityPlayerMP mp) {
+                        mp.playerNetServerHandler.setPlayerLocation(player.posX, i + 1.6, player.posZ, player.rotationYaw, player.rotationPitch);
 					}
 					break;
 				}
@@ -182,8 +181,8 @@ public class ItemBottledMana extends ItemMod {
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		getSeed(par1ItemStack);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		getSeed(stack);
 	}
 
 	public void randomEffect(EntityPlayer player, ItemStack stack) {
@@ -204,46 +203,46 @@ public class ItemBottledMana extends ItemMod {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		infoList.add(StatCollector.translateToLocal("botaniamisc.bottleTooltip"));
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[6];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
-		return par1ItemStack;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		player.setItemInUse(stack, getMaxItemUseDuration(stack));
+		return stack;
 	}
 
 	@Override
-	public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		randomEffect(par3EntityPlayer, par1ItemStack);
-		par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() + 1);
-		randomSeed(par1ItemStack);
+	public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) {
+		randomEffect(player, stack);
+		stack.setItemDamage(stack.getItemDamage() + 1);
+		randomSeed(stack);
 
-		if(par1ItemStack.getItemDamage() == 6)
+		if(stack.getItemDamage() == 6)
 			return new ItemStack(Items.glass_bottle);
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 20;
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.drink;
 	}
 

src/main/java/vazkii/botania/common/item/ItemCacophonium.java

@@ -48,9 +48,8 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement {
 
 	@Override
 	public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) {
-		if(entity instanceof EntityLiving) {
-			EntityLiving living = (EntityLiving) entity;
-			String sound = null;
+		if(entity instanceof EntityLiving living) {
+            String sound = null;
 			try {
 				if(living instanceof EntityCreeper)
 					sound = "creeper.primed";
@@ -82,7 +81,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		boolean can = isDOIT(stack);
 		if(!can) {
 			String sound = ItemNBTHelper.getString(stack, TAG_SOUND, "");
@@ -105,7 +104,7 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(isDOIT(stack))
 			infoList.add(StatCollector.translateToLocal("botaniamisc.justDoIt"));
 		else if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false))
@@ -113,20 +112,20 @@ public class ItemCacophonium extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.block;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 72000;
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(ItemNBTHelper.getBoolean(par1ItemStack, TAG_HAS_SOUND, false) || isDOIT(par1ItemStack))
-			par3EntityPlayer.setItemInUse(par1ItemStack, 72000);
-		return par1ItemStack;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(ItemNBTHelper.getBoolean(stack, TAG_HAS_SOUND, false) || isDOIT(stack))
+			player.setItemInUse(stack, 72000);
+		return stack;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/ItemCorporeaSpark.java

@@ -42,7 +42,7 @@ public class ItemCorporeaSpark extends ItemMod {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		TileEntity tile = world.getTileEntity(x, y, z);
 		if(tile instanceof IInventory && !CorporeaHelper.doesBlockHaveSpark(world, x, y, z)) {
 			stack.stackSize--;
@@ -60,17 +60,17 @@ public class ItemCorporeaSpark extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		invIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		worldIcon = IconHelper.forItem(par1IconRegister, this, 1);
-		invIconMaster = IconHelper.forItem(par1IconRegister, this, 2);
-		worldIconMaster = IconHelper.forItem(par1IconRegister, this, 3);
-		iconColorStar = IconHelper.forItem(par1IconRegister, this, "Star");
+	public void registerIcons(IIconRegister register) {
+		invIcon = IconHelper.forItem(register, this, 0);
+		worldIcon = IconHelper.forItem(register, this, 1);
+		invIconMaster = IconHelper.forItem(register, this, 2);
+		worldIconMaster = IconHelper.forItem(register, this, 3);
+		iconColorStar = IconHelper.forItem(register, this, "Star");
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/ItemCraftPattern.java

@@ -35,11 +35,10 @@ public class ItemCraftPattern extends ItemMod {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer p, World world, int x, int y, int z, int s, float xs, float ys, float zs) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		TileEntity tile = world.getTileEntity(x, y, z);
-		if(tile != null && tile instanceof TileCraftCrate && !world.isRemote) {
-			TileCraftCrate crate = (TileCraftCrate) tile;
-			crate.pattern = stack.getItemDamage();
+		if(tile instanceof TileCraftCrate crate && !world.isRemote) {
+            crate.pattern = stack.getItemDamage();
 			world.markBlockForUpdate(x, y, z);
 		}
 		return false;
@@ -52,20 +51,20 @@ public class ItemCraftPattern extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[TileCraftCrate.PATTERNS.length];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return icons[Math.min(icons.length - 1, dmg)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 }

src/main/java/vazkii/botania/common/item/ItemCraftingHalo.java

@@ -114,12 +114,12 @@ public class ItemCraftingHalo extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int pos, boolean equipped) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
 		boolean eqLastTick = wasEquipped(stack);
-		if(eqLastTick != equipped)
-			setEquipped(stack, equipped);
+		if(eqLastTick != isHeld)
+			setEquipped(stack, isHeld);
 
-		if(!equipped && entity instanceof EntityLivingBase) {
+		if(!isHeld && entity instanceof EntityLivingBase) {
 			int angles = 360;
 			int segAngles = angles / SEGMENTS;
 			float shift = segAngles / 2;

src/main/java/vazkii/botania/common/item/ItemFertilizer.java

@@ -29,38 +29,38 @@ public class ItemFertilizer extends ItemMod {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		final int range = 3;
-		if(!par3World.isRemote) {
+		if(!world.isRemote) {
 			List<ChunkCoordinates> validCoords = new ArrayList<>();
 
 			for(int i = -range - 1; i < range; i++)
 				for(int j = -range - 1; j < range; j++) {
 					for(int k = 2; k >= -2; k--) {
-						int x = par4 + i + 1;
-						int y = par5 + k + 1;
-						int z = par6 + j + 1;
-						if(par3World.isAirBlock(x, y, z) && (!par3World.provider.hasNoSky || y < 255) && ModBlocks.flower.canBlockStay(par3World, x, y, z))
-							validCoords.add(new ChunkCoordinates(x, y, z));
+						int tryX = x + i + 1;
+						int tryY = y + k + 1;
+						int tryZ = z + j + 1;
+						if(world.isAirBlock(tryX, tryY, tryZ) && (!world.provider.hasNoSky || tryY < 255) && ModBlocks.flower.canBlockStay(world, tryX, tryY, tryZ))
+							validCoords.add(new ChunkCoordinates(tryX, tryY, tryZ));
 					}
 				}
 
-			int flowerCount = Math.min(validCoords.size(), par3World.rand.nextBoolean() ? 3 : 4);
+			int flowerCount = Math.min(validCoords.size(), world.rand.nextBoolean() ? 3 : 4);
 			for(int i = 0; i < flowerCount; i++) {
-				ChunkCoordinates coords = validCoords.get(par3World.rand.nextInt(validCoords.size()));
+				ChunkCoordinates coords = validCoords.get(world.rand.nextInt(validCoords.size()));
 				validCoords.remove(coords);
-				par3World.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, par3World.rand.nextInt(16), 1 | 2);
+				world.setBlock(coords.posX, coords.posY, coords.posZ, ModBlocks.flower, world.rand.nextInt(16), 1 | 2);
 			}
-			par1ItemStack.stackSize--;
+			stack.stackSize--;
 		} else {
 			for(int i = 0; i < 15; i++) {
-				double x = par4 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random();
-				double y = par5 + 1;
-				double z = par6 - range + par3World.rand.nextInt(range * 2 + 1) + Math.random();
+				double px = x - range + world.rand.nextInt(range * 2 + 1) + Math.random();
+				double py = y + 1;
+				double pz = z - range + world.rand.nextInt(range * 2 + 1) + Math.random();
 				float red = (float) Math.random();
 				float green = (float) Math.random();
 				float blue = (float) Math.random();
-				Botania.proxy.wispFX(par3World, x, y, z, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F);
+				Botania.proxy.wispFX(world, px, py, pz, red, green, blue, 0.15F + (float) Math.random() * 0.25F, -(float) Math.random() * 0.1F - 0.05F);
 			}
 		}
 

src/main/java/vazkii/botania/common/item/ItemGaiaHead.java

@@ -30,7 +30,7 @@ public class ItemGaiaHead extends ItemMod {
 
 	// I couldn't deal with it.
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float sideX, float sideY, float sideZ) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		// The side of the wall the head is being used on.
 		ForgeDirection sideDir = ForgeDirection.getOrientation(side);
 
@@ -80,7 +80,7 @@ public class ItemGaiaHead extends ItemMod {
 		// Update the skull's orientation if it lets us.
 		TileEntity tileentity = world.getTileEntity(x, y, z);
 
-		if (tileentity != null && tileentity instanceof TileEntitySkull) {
+		if (tileentity instanceof TileEntitySkull) {
 			((TileEntitySkull) tileentity).func_145903_a(headAngle);
 			((BlockSkull) Blocks.skull).func_149965_a(world, x, y, z, (TileEntitySkull) tileentity);
 		}

src/main/java/vazkii/botania/common/item/ItemGrassHorn.java

@@ -57,16 +57,16 @@ public class ItemGrassHorn extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
-		vuvuzelaIcon = IconHelper.forName(par1IconRegister, "vuvuzela");
+			icons[i] = IconHelper.forItem(register, this, i);
+		vuvuzelaIcon = IconHelper.forName(register, "vuvuzela");
 	}
 
 	@Override
-	public IIcon getIconIndex(ItemStack par1ItemStack) {
-		return par1ItemStack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(par1ItemStack);
+	public IIcon getIconIndex(ItemStack stack) {
+		return stack.getDisplayName().toLowerCase().contains("vuvuzela") ? vuvuzelaIcon : super.getIconIndex(stack);
 	}
 
 	@Override
@@ -75,33 +75,33 @@ public class ItemGrassHorn extends ItemMod {
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.bow;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 72000;
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
-		return par1ItemStack;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		player.setItemInUse(stack, getMaxItemUseDuration(stack));
+		return stack;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/ItemGrassSeeds.java

@@ -13,7 +13,6 @@ package vazkii.botania.common.item;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -73,16 +72,16 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < SUBTYPES; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
@@ -91,19 +90,19 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		Block block = par3World.getBlock(par4, par5, par6);
-		int bmeta = par3World.getBlockMetadata(par4, par5, par6);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		Block block = world.getBlock(x, y, z);
+		int bmeta = world.getBlockMetadata(x, y, z);
 
-		if((block == Blocks.dirt || block == Blocks.grass && par1ItemStack.getItemDamage() != 0) && bmeta == 0) {
-			int meta = par1ItemStack.getItemDamage();
+		if((block == Blocks.dirt || block == Blocks.grass && stack.getItemDamage() != 0) && bmeta == 0) {
+			int meta = stack.getItemDamage();
 
-			BlockSwapper swapper = addBlockSwapper(par3World, par4, par5, par6, meta);
-			par3World.setBlock(par4, par5, par6, swapper.blockToSet, swapper.metaToSet, 1 | 2);
+			BlockSwapper swapper = addBlockSwapper(world, x, y, z, meta);
+			world.setBlock(x, y, z, swapper.blockToSet, swapper.metaToSet, 1 | 2);
 			for(int i = 0; i < 50; i++) {
-				double x = (Math.random() - 0.5) * 3;
-				double y = Math.random() - 0.5 + 1;
-				double z = (Math.random() - 0.5) * 3;
+				double dx = (Math.random() - 0.5) * 3;
+				double dy = Math.random() - 0.5 + 1;
+				double dz = (Math.random() - 0.5) * 3;
 
 				float r = 0F;
 				float g = 0.4F;
@@ -161,10 +160,10 @@ public class ItemGrassSeeds extends ItemMod implements IFloatingFlowerVariant {
 
 				float velMul = 0.025F;
 
-				Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul);
+				Botania.proxy.wispFX(world, x + 0.5 + dx, y + 0.5 + dy, z + 0.5 + dz, r, g, b, (float) Math.random() * 0.15F + 0.15F, (float) -dx * velMul, (float) -dy * velMul, (float) -dz * velMul);
 			}
 
-			par1ItemStack.stackSize--;
+			stack.stackSize--;
 		}
 
 		return true;

src/main/java/vazkii/botania/common/item/ItemLaputaShard.java

@@ -66,18 +66,18 @@ public class ItemLaputaShard extends ItemMod implements ILensEffect, ITinyPlanet
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.shardLevel"), StatCollector.translateToLocal("botania.roman" + (stack.getItemDamage() + 1))));
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		if(par5 < 160 && !par3World.provider.isHellWorld) {
-			par3World.playSound(par4 + 0.5D, par5 + 0.5D, par6 + 0.5D, "botania:laputaStart", 1.0F + par3World.rand.nextFloat(), par3World.rand.nextFloat() * 0.7F + 1.3F, false);
-			spawnBurstFirst(par3World, par4, par5, par6, par1ItemStack);
-			par1ItemStack.stackSize--;
-			if(par1ItemStack.getItemDamage() == 19)
-				par2EntityPlayer.addStat(ModAchievements.l20ShardUse, 1);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(y < 160 && !world.provider.isHellWorld) {
+			world.playSound(x + 0.5D, y + 0.5D, z + 0.5D, "botania:laputaStart", 1.0F + world.rand.nextFloat(), world.rand.nextFloat() * 0.7F + 1.3F, false);
+			spawnBurstFirst(world, x, y, z, stack);
+			stack.stackSize--;
+			if(stack.getItemDamage() == 19)
+				player.addStat(ModAchievements.l20ShardUse, 1);
 		}
 
 		return true;

src/main/java/vazkii/botania/common/item/ItemLexicon.java

@@ -55,23 +55,23 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		if(par2EntityPlayer.isSneaking()) {
-			Block block = par3World.getBlock(par4, par5, par6);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(player.isSneaking()) {
+			Block block = world.getBlock(x, y, z);
 
 			if(block != null) {
 				if(block instanceof ILexiconable) {
-					LexiconEntry entry = ((ILexiconable) block).getEntry(par3World, par4, par5, par6, par2EntityPlayer, par1ItemStack);
-					if(entry != null && isKnowledgeUnlocked(par1ItemStack, entry.getKnowledgeType())) {
+					LexiconEntry entry = ((ILexiconable) block).getEntry(world, x, y, z, player, stack);
+					if(entry != null && isKnowledgeUnlocked(stack, entry.getKnowledgeType())) {
 						Botania.proxy.setEntryToOpen(entry);
-						Botania.proxy.setLexiconStack(par1ItemStack);
+						Botania.proxy.setLexiconStack(stack);
 
-						openBook(par2EntityPlayer, par1ItemStack, par3World, false);
+						openBook(player, stack, world, false);
 						return true;
 					}
-				} else if(par3World.isRemote) {
-					MovingObjectPosition pos = new MovingObjectPosition(par4, par5, par6, par7, Vec3.createVectorHelper(par8, par9, par10));
-					return Botania.proxy.openWikiPage(par3World, block, pos);
+				} else if(world.isRemote) {
+					MovingObjectPosition pos = new MovingObjectPosition(x, y, z, side, Vec3.createVectorHelper(subX, subY, subZ));
+					return Botania.proxy.openWikiPage(world, block, pos);
 				}
 			}
 		}
@@ -91,7 +91,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(GuiScreen.isShiftKeyDown()) {
 			String edition = EnumChatFormatting.GOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), getEdition());
 			if(!edition.isEmpty())
@@ -122,20 +122,20 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		String force = getForcedPage(par1ItemStack);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		String force = getForcedPage(stack);
 		if(force != null && !force.isEmpty()) {
-			LexiconEntry entry = getEntryFromForce(par1ItemStack);
+			LexiconEntry entry = getEntryFromForce(stack);
 			if(entry != null)
 				Botania.proxy.setEntryToOpen(entry);
-			else par3EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
-			setForcedPage(par1ItemStack, "");
+			else player.addChatMessage(new ChatComponentTranslation("botaniamisc.cantOpen").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
+			setForcedPage(stack, "");
 		}
 
-		openBook(par3EntityPlayer, par1ItemStack, par2World, skipSound);
+		openBook(player, stack, world, skipSound);
 		skipSound = false;
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	public static void openBook(EntityPlayer player, ItemStack stack, World world, boolean skipSound) {
@@ -160,7 +160,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int idk, boolean something) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
 		int ticks = getQueueTicks(stack);
 		if(ticks > 0 && entity instanceof EntityPlayer) {
 			skipSound = ticks < 5;
@@ -172,7 +172,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem {
 	}
 
 	@Override
-	public EnumRarity getRarity(ItemStack par1ItemStack) {
+	public EnumRarity getRarity(ItemStack stack) {
 		return EnumRarity.uncommon;
 	}
 

src/main/java/vazkii/botania/common/item/ItemManaCookie.java

@@ -39,20 +39,20 @@ public class ItemManaCookie extends ItemFood {
 	}
 
 	@Override
-	protected void onFoodEaten(ItemStack p_77849_1_, World p_77849_2_, EntityPlayer p_77849_3_) {
-		super.onFoodEaten(p_77849_1_, p_77849_2_, p_77849_3_);
-		p_77849_3_.addStat(ModAchievements.manaCookieEat, 1);
+	protected void onFoodEaten(ItemStack stack, World world, EntityPlayer player) {
+		super.onFoodEaten(stack, world, player);
+		player.addStat(ModAchievements.manaCookieEat, 1);
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
@@ -67,9 +67,9 @@ public class ItemManaCookie extends ItemFood {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
-		totalBiscuitIcon = IconHelper.forName(par1IconRegister, "totalBiscuit");
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
+		totalBiscuitIcon = IconHelper.forName(register, "totalBiscuit");
 	}
 
 }

src/main/java/vazkii/botania/common/item/ItemManaGun.java

@@ -73,51 +73,51 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
 		int effCd = COOLDOWN;
-		PotionEffect effect = par3EntityPlayer.getActivePotionEffect(Potion.digSpeed);
+		PotionEffect effect = player.getActivePotionEffect(Potion.digSpeed);
 		if(effect != null)
 			effCd -= (effect.getAmplifier() + 1) * 8;
 
-		if(par3EntityPlayer.isSneaking() && hasClip(par1ItemStack)) {
-			rotatePos(par1ItemStack);
-			par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F);
-			if(par2World.isRemote)
-				par3EntityPlayer.swingItem();
-			ItemStack lens = getLens(par1ItemStack);
+		if(player.isSneaking() && hasClip(stack)) {
+			rotatePos(stack);
+			world.playSoundAtEntity(player, "random.click", 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
+			if(world.isRemote)
+				player.swingItem();
+			ItemStack lens = getLens(stack);
 			ItemsRemainingRenderHandler.set(lens, -2);
-			par1ItemStack.setItemDamage(effCd);
-		} else if(par1ItemStack.getItemDamage() == 0) {
-			EntityManaBurst burst = getBurst(par3EntityPlayer, par1ItemStack, true);
-			if(burst != null && ManaItemHandler.requestManaExact(par1ItemStack, par3EntityPlayer, burst.getMana(), true)) {
-				if(!par2World.isRemote) {
-					par2World.playSoundAtEntity(par3EntityPlayer, "botania:manaBlaster", 0.6F, 1F);
-					par3EntityPlayer.addStat(ModAchievements.manaBlasterShoot, 1);
-					if(isSugoiKawaiiDesuNe(par1ItemStack))
-						par3EntityPlayer.addStat(ModAchievements.desuGun, 1);
-					par2World.spawnEntityInWorld(burst);
+			stack.setItemDamage(effCd);
+		} else if(stack.getItemDamage() == 0) {
+			EntityManaBurst burst = getBurst(player, stack, true);
+			if(burst != null && ManaItemHandler.requestManaExact(stack, player, burst.getMana(), true)) {
+				if(!world.isRemote) {
+					world.playSoundAtEntity(player, "botania:manaBlaster", 0.6F, 1F);
+					player.addStat(ModAchievements.manaBlasterShoot, 1);
+					if(isSugoiKawaiiDesuNe(stack))
+						player.addStat(ModAchievements.desuGun, 1);
+					world.spawnEntityInWorld(burst);
 				} else {
-					par3EntityPlayer.swingItem();
-					par3EntityPlayer.motionX -= burst.motionX * 0.1;
-					par3EntityPlayer.motionY -= burst.motionY * 0.3;
-					par3EntityPlayer.motionZ -= burst.motionZ * 0.1;
+					player.swingItem();
+					player.motionX -= burst.motionX * 0.1;
+					player.motionY -= burst.motionY * 0.3;
+					player.motionZ -= burst.motionZ * 0.1;
 				}
-				par1ItemStack.setItemDamage(effCd);
-			} else if(!par2World.isRemote)
-				par2World.playSoundAtEntity(par3EntityPlayer, "random.click", 0.6F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F);
+				stack.setItemDamage(effCd);
+			} else if(!world.isRemote)
+				world.playSoundAtEntity(player, "random.click", 0.6F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		int states = 3;
 		icons = new IIcon[states * 2];
 
 		for(int i = 0; i < states; i++) {
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
-			icons[states + i] = IconHelper.forName(par1IconRegister, "desuGun" + i);
+			icons[i] = IconHelper.forItem(register, this, i);
+			icons[states + i] = IconHelper.forName(register, "desuGun" + i);
 		}
 	}
 
@@ -156,11 +156,11 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par2 == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
-		EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, par1ItemStack, false);
+		EntityManaBurst burst = getBurst(Minecraft.getMinecraft().thePlayer, stack, false);
 		Color color = new Color(burst == null ? 0x20FF20 : burst.getColor());
 
 		float mul = (float) (Math.sin((double) ClientTickHandler.ticksInGame / 5) * 0.15F);
@@ -180,7 +180,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 	}
 
 	@Override
-	public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) {
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
 		return false;
 	}
 
@@ -216,7 +216,7 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		boolean clip = hasClip(stack);
 		if(clip && !GuiScreen.isShiftKeyDown()) {
 			addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList);
@@ -250,9 +250,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 	}
 
 	@Override
-	public String getItemStackDisplayName(ItemStack par1ItemStack) {
-		ItemStack lens = getLens(par1ItemStack);
-		return super.getItemStackDisplayName(par1ItemStack) + (lens == null ? "" : " (" + EnumChatFormatting.GREEN + lens.getDisplayName() + EnumChatFormatting.RESET + ")");
+	public String getItemStackDisplayName(ItemStack stack) {
+		ItemStack lens = getLens(stack);
+		return super.getItemStackDisplayName(stack) + (lens == null ? "" : " (" + EnumChatFormatting.GREEN + lens.getDisplayName() + EnumChatFormatting.RESET + ")");
 	}
 
 	public static boolean hasClip(ItemStack stack) {
@@ -335,9 +335,9 @@ public class ItemManaGun extends ItemMod implements IManaUsingItem {
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		if(par1ItemStack.isItemDamaged())
-			par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(stack.isItemDamaged())
+			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/ItemManaMirror.java

@@ -53,9 +53,9 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		float mana = getMana(par1ItemStack);
-		return par2 == 1 ? Color.HSBtoRGB(0.528F,  mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF;
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		float mana = getMana(stack);
+		return renderPass == 1 ? Color.HSBtoRGB(0.528F,  mana / TilePool.MAX_MANA, 1F) : 0xFFFFFF;
 	}
 
 	@Override
@@ -70,10 +70,10 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -87,29 +87,29 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		if(par2World.isRemote)
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(world.isRemote)
 			return;
 
-		IManaPool pool = getManaPool(par1ItemStack);
+		IManaPool pool = getManaPool(stack);
 		if(!(pool instanceof DummyPool)) {
 			if(pool == null)
-				setMana(par1ItemStack, 0);
+				setMana(stack, 0);
 			else {
-				pool.recieveMana(getManaBacklog(par1ItemStack));
-				setManaBacklog(par1ItemStack, 0);
-				setMana(par1ItemStack, pool.getCurrentMana());
+				pool.recieveMana(getManaBacklog(stack));
+				setManaBacklog(stack, 0);
+				setMana(stack, pool.getCurrentMana());
 			}
 		}
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		if(par2EntityPlayer.isSneaking() && !par3World.isRemote) {
-			TileEntity tile = par3World.getTileEntity(par4, par5, par6);
-			if(tile != null && tile instanceof IManaPool) {
-				bindPool(par1ItemStack, tile);
-				par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(player.isSneaking() && !world.isRemote) {
+			TileEntity tile = world.getTileEntity(x, y, z);
+			if(tile instanceof IManaPool) {
+				bindPool(stack, tile);
+				world.playSoundAtEntity(player, "botania:ding", 1F, 1F);
 				return true;
 			}
 		}
@@ -201,7 +201,7 @@ public class ItemManaMirror extends ItemMod implements IManaItem, ICoordBoundIte
 
 		if(world != null) {
 			TileEntity tile = world.getTileEntity(coords.posX, coords.posY, coords.posZ);
-			if(tile != null && tile instanceof IManaPool)
+			if(tile instanceof IManaPool)
 				return (IManaPool) tile;
 		}
 

src/main/java/vazkii/botania/common/item/ItemManaTablet.java

@@ -65,9 +65,9 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		float mana = getMana(par1ItemStack);
-		return par2 == 1 ? Color.HSBtoRGB(0.528F,  mana / MAX_MANA, 1F) : 0xFFFFFF;
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		float mana = getMana(stack);
+		return renderPass == 1 ? Color.HSBtoRGB(0.528F,  mana / MAX_MANA, 1F) : 0xFFFFFF;
 	}
 
 	@Override
@@ -81,10 +81,10 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -93,7 +93,7 @@ public class ItemManaTablet extends ItemMod implements IManaItem, ICreativeManaP
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(isStackCreative(stack))
 			infoList.add(StatCollector.translateToLocal("botaniamisc.creative"));
 	}

src/main/java/vazkii/botania/common/item/ItemMod.java

@@ -28,19 +28,19 @@ public class ItemMod extends Item {
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 }

src/main/java/vazkii/botania/common/item/ItemObedienceStick.java

@@ -32,9 +32,9 @@ public class ItemObedienceStick extends ItemMod {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		TileEntity tileAt = world.getTileEntity(x, y, z);
-		if(tileAt != null && (tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) {
+		if((tileAt instanceof IManaPool || tileAt instanceof IManaCollector)) {
 			boolean pool = tileAt instanceof IManaPool;
 			Actuator act = pool ? Actuator.functionalActuator : Actuator.generatingActuator;
 			int range = pool ? SubTileFunctional.RANGE : SubTileGenerating.RANGE;

src/main/java/vazkii/botania/common/item/ItemOpenBucket.java

@@ -25,37 +25,37 @@ public class ItemOpenBucket extends ItemMod {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(par2World, par3EntityPlayer, true);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(world, player, true);
 
 		if(movingobjectposition == null)
-			return par1ItemStack;
+			return stack;
 		else {
 			if(movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
 				int i = movingobjectposition.blockX;
 				int j = movingobjectposition.blockY;
 				int k = movingobjectposition.blockZ;
 
-				if(!par2World.canMineBlock(par3EntityPlayer, i, j, k))
-					return par1ItemStack;
+				if(!world.canMineBlock(player, i, j, k))
+					return stack;
 
-				if(!par3EntityPlayer.canPlayerEdit(i, j, k, movingobjectposition.sideHit, par1ItemStack))
-					return par1ItemStack;
+				if(!player.canPlayerEdit(i, j, k, movingobjectposition.sideHit, stack))
+					return stack;
 
-				Material material = par2World.getBlock(i, j, k).getMaterial();
-				int l = par2World.getBlockMetadata(i, j, k);
+				Material material = world.getBlock(i, j, k).getMaterial();
+				int l = world.getBlockMetadata(i, j, k);
 
 				if((material == Material.lava || material == Material.water) && l == 0) {
-					par2World.setBlockToAir(i, j, k);
+					world.setBlockToAir(i, j, k);
 					
 					for(int x = 0; x < 5; x++)
-						par2World.spawnParticle("explode", i + Math.random(), j + Math.random(), k + Math.random(), 0, 0, 0);
+						world.spawnParticle("explode", i + Math.random(), j + Math.random(), k + Math.random(), 0, 0, 0);
 					
-					return par1ItemStack;
+					return stack;
 				}
 			}
 
-			return par1ItemStack;
+			return stack;
 		}
 	}
 

src/main/java/vazkii/botania/common/item/ItemOvergrowthSeed.java

@@ -25,7 +25,7 @@ public class ItemOvergrowthSeed extends ItemMod {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		Block block = world.getBlock(x, y, z);
 		ItemStack blockStack = new ItemStack(block);
 		int[] ids = OreDictionary.getOreIDs(blockStack);

src/main/java/vazkii/botania/common/item/ItemPinkinator.java

@@ -54,7 +54,7 @@ public class ItemPinkinator extends ItemMod {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		infoList.add(StatCollector.translateToLocal("botaniamisc.pinkinatorDesc"));
 	}
 

src/main/java/vazkii/botania/common/item/ItemPoolMinecart.java

@@ -36,18 +36,18 @@ public class ItemPoolMinecart extends ItemMod implements ICraftAchievement, IMin
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
-		if(BlockRailBase.func_150051_a(p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_))) {
-			if(!p_77648_3_.isRemote) {
-				EntityMinecart entityminecart = new EntityPoolMinecart(p_77648_3_, p_77648_4_ + 0.5, p_77648_5_ + 0.5, p_77648_6_ + 0.5);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(BlockRailBase.func_150051_a(world.getBlock(x, y, z))) {
+			if(!world.isRemote) {
+				EntityMinecart entityminecart = new EntityPoolMinecart(world, x + 0.5, y + 0.5, z + 0.5);
 
-				if(p_77648_1_.hasDisplayName())
-					entityminecart.setMinecartName(p_77648_1_.getDisplayName());
+				if(stack.hasDisplayName())
+					entityminecart.setMinecartName(stack.getDisplayName());
 
-				p_77648_3_.spawnEntityInWorld(entityminecart);
+				world.spawnEntityInWorld(entityminecart);
 			}
 
-			--p_77648_1_.stackSize;
+			--stack.stackSize;
 			return true;
 		}
 

src/main/java/vazkii/botania/common/item/ItemSextant.java

@@ -44,12 +44,12 @@ public class ItemSextant extends ItemMod {
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.bow;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 72000;
 	}
 
@@ -90,23 +90,23 @@ public class ItemSextant extends ItemMod {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
 		Botania.proxy.removeSextantMultiblock();
 
-		if(!par3EntityPlayer.isSneaking()) {
-			MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3EntityPlayer, false, 128);
+		if(!player.isSneaking()) {
+			MovingObjectPosition pos = ToolCommons.raytraceFromEntity(world, player, false, 128);
 			if(pos != null && pos.entityHit == null) {
-				if(!par2World.isRemote) {
-					ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_X, pos.blockX);
-					ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, pos.blockY);
-					ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Z, pos.blockZ);
+				if(!world.isRemote) {
+					ItemNBTHelper.setInt(stack, TAG_SOURCE_X, pos.blockX);
+					ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, pos.blockY);
+					ItemNBTHelper.setInt(stack, TAG_SOURCE_Z, pos.blockZ);
 				}
-			} else ItemNBTHelper.setInt(par1ItemStack, TAG_SOURCE_Y, -1);
+			} else ItemNBTHelper.setInt(stack, TAG_SOURCE_Y, -1);
 
-			par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
+			player.setItemInUse(stack, getMaxItemUseDuration(stack));
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	public static double calculateRadius(ItemStack stack, EntityPlayer player) {

src/main/java/vazkii/botania/common/item/ItemSignalFlare.java

@@ -54,47 +54,47 @@ public class ItemSignalFlare extends ItemMod {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(par1ItemStack.getItemDamage() == 0) {
-			if(par2World.isRemote)
-				par3EntityPlayer.swingItem();
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(stack.getItemDamage() == 0) {
+			if(world.isRemote)
+				player.swingItem();
 			else {
-				EntitySignalFlare flare = new EntitySignalFlare(par2World);
-				flare.setPosition(par3EntityPlayer.posX, par3EntityPlayer.posY, par3EntityPlayer.posZ);
-				flare.setColor(getColor(par1ItemStack));
-				par2World.playSoundAtEntity(par3EntityPlayer, "random.explode", 40F, (1.0F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.2F) * 0.7F);
+				EntitySignalFlare flare = new EntitySignalFlare(world);
+				flare.setPosition(player.posX, player.posY, player.posZ);
+				flare.setColor(getColor(stack));
+				world.playSoundAtEntity(player, "random.explode", 40F, (1.0F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.2F) * 0.7F);
 
-				par2World.spawnEntityInWorld(flare);
+				world.spawnEntityInWorld(flare);
 
 				int stunned = 0;
 				int range = 5;
-				List<EntityLivingBase> entities = par2World.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(par3EntityPlayer.posX - range, par3EntityPlayer.posY - range, par3EntityPlayer.posZ - range, par3EntityPlayer.posX + range, par3EntityPlayer.posY + range, par3EntityPlayer.posZ + range));
+				List<EntityLivingBase> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range));
 				for(EntityLivingBase entity : entities)
-					if(entity != par3EntityPlayer && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) {
+					if(entity != player && (!(entity instanceof EntityPlayer) || MinecraftServer.getServer() == null || MinecraftServer.getServer().isPVPEnabled())) {
 						entity.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 50, 5));
 						stunned++;
 					}
 
 				if(stunned >= 100)
-					par3EntityPlayer.addStat(ModAchievements.signalFlareStun, 1);
+					player.addStat(ModAchievements.signalFlareStun, 1);
 			}
-			par1ItemStack.damageItem(200, par3EntityPlayer);
+			stack.damageItem(200, player);
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		if(par1ItemStack.isItemDamaged())
-			par1ItemStack.setItemDamage(par1ItemStack.getItemDamage() - 1);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(stack.isItemDamaged())
+			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -103,22 +103,22 @@ public class ItemSignalFlare extends ItemMod {
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par2 == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
-		int colorv = getColor(par1ItemStack);
+		int colorv = getColor(stack);
 		if(colorv >= EntitySheep.fleeceColorTable.length || colorv < 0)
 			return 0xFFFFFF;
 
-		float[] color = EntitySheep.fleeceColorTable[getColor(par1ItemStack)];
+		float[] color = EntitySheep.fleeceColorTable[getColor(stack)];
 		return new Color(color[0], color[1], color[2]).getRGB();
 	}
 
 	@Override
-	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+	public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
-			par3List.add(forColor(i));
+			list.add(forColor(i));
 	}
 
 	@Override
@@ -127,7 +127,7 @@ public class ItemSignalFlare extends ItemMod {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer p, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		int storedColor = getColor(stack);
 		infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.flareColor"), StatCollector.translateToLocal("botania.color" + storedColor)));
 	}

src/main/java/vazkii/botania/common/item/ItemSlimeBottle.java

@@ -31,18 +31,18 @@ public class ItemSlimeBottle extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		activeIcon = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
+		activeIcon = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return dmg == 0 ? itemIcon : activeIcon;
+	public IIcon getIconFromDamage(int meta) {
+		return meta == 0 ? itemIcon : activeIcon;
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int something, boolean somethingelse) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
 		if(!world.isRemote) {
 			int x = MathHelper.floor_double(entity.posX);
 			int z = MathHelper.floor_double(entity.posZ);

src/main/java/vazkii/botania/common/item/ItemSlingshot.java

@@ -25,50 +25,50 @@ public class ItemSlingshot extends ItemMod {
 	}
 
 	@Override
-	public void onPlayerStoppedUsing(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer, int par4) {
-		int j = getMaxItemUseDuration(par1ItemStack) - par4;
+	public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) {
+		int j = getMaxItemUseDuration(stack) - itemInUseCount;
 
-		if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall)) {
+		if(player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.vineBall)) {
 			float f = j / 20.0F;
 			f = (f * f + f * 2.0F) / 3.0F;
 
 			if(f < 1F)
 				return;
 
-			if(!par3EntityPlayer.capabilities.isCreativeMode)
-				par3EntityPlayer.inventory.consumeInventoryItem(ModItems.vineBall);
+			if(!player.capabilities.isCreativeMode)
+				player.inventory.consumeInventoryItem(ModItems.vineBall);
 
-			if(!par2World.isRemote) {
-				EntityVineBall ball = new EntityVineBall(par3EntityPlayer, false);
+			if(!world.isRemote) {
+				EntityVineBall ball = new EntityVineBall(player, false);
 				ball.motionX *= 1.6;
 				ball.motionY *= 1.6;
 				ball.motionZ *= 1.6;
-				par2World.spawnEntityInWorld(ball);
+				world.spawnEntityInWorld(ball);
 			}
 		}
 	}
 
 	@Override
-	public ItemStack onEaten(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		return par1ItemStack;
+	public ItemStack onEaten(ItemStack stack, World world, EntityPlayer player) {
+		return stack;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 72000;
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.bow;
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(par3EntityPlayer.capabilities.isCreativeMode || par3EntityPlayer.inventory.hasItem(ModItems.vineBall))
-			par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(player.capabilities.isCreativeMode || player.inventory.hasItem(ModItems.vineBall))
+			player.setItemInUse(stack, getMaxItemUseDuration(stack));
 
-		return par1ItemStack;
+		return stack;
 	}
 
 }

src/main/java/vazkii/botania/common/item/ItemSpark.java

@@ -36,11 +36,10 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float xv, float yv, float zv) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		TileEntity tile = world.getTileEntity(x, y, z);
-		if(tile instanceof ISparkAttachable) {
-			ISparkAttachable attach = (ISparkAttachable) tile;
-			if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) {
+		if(tile instanceof ISparkAttachable attach) {
+            if(attach.canAttachSpark(stack) && attach.getAttachedSpark() == null) {
 				stack.stackSize--;
 				if(!world.isRemote) {
 					EntitySpark spark = new EntitySpark(world);
@@ -56,13 +55,13 @@ public class ItemSpark extends ItemMod implements ICraftAchievement, IManaGiving
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		invIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		worldIcon = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		invIcon = IconHelper.forItem(register, this, 0);
+		worldIcon = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int p_77617_1_) {
+	public IIcon getIconFromDamage(int meta) {
 		return invIcon;
 	}
 

src/main/java/vazkii/botania/common/item/ItemSparkUpgrade.java

@@ -33,12 +33,12 @@ public class ItemSparkUpgrade extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		worldIcons = new IIcon[VARIANTS];
 		invIcons = new IIcon[VARIANTS];
 		for(int i = 0; i < VARIANTS; i++) {
-			worldIcons[i] = IconHelper.forItem(par1IconRegister, this, "L" + i);
-			invIcons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			worldIcons[i] = IconHelper.forItem(register, this, "L" + i);
+			invIcons[i] = IconHelper.forItem(register, this, i);
 		}
 	}
 
@@ -54,11 +54,11 @@ public class ItemSparkUpgrade extends ItemMod {
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 }

src/main/java/vazkii/botania/common/item/ItemSpawnerMover.java

@@ -42,9 +42,9 @@ public class ItemSpawnerMover extends ItemMod {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		iconNormal = IconHelper.forItem(par1IconRegister, this, 0);
-		iconSpawner = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		iconNormal = IconHelper.forItem(register, this, 0);
+		iconSpawner = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
@@ -53,8 +53,8 @@ public class ItemSpawnerMover extends ItemMod {
 	}
 
 	@Override
-	public IIcon getIconIndex(ItemStack par1ItemStack) {
-		return hasData(par1ItemStack) ? iconSpawner : iconNormal;
+	public IIcon getIconIndex(ItemStack stack) {
+		return hasData(stack) ? iconSpawner : iconNormal;
 	}
 
 	public static NBTTagCompound getSpawnerTag(ItemStack stack) {
@@ -90,31 +90,31 @@ public class ItemSpawnerMover extends ItemMod {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advancedTooltips) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		String id = getEntityId(stack);
 		if (id != null)
 			infoList.add(StatCollector.translateToLocal("entity." + id + ".name"));
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity entity, int par4, boolean par5) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
 		NBTTagCompound tag = stack.getTagCompound();
 		if(tag != null && tag.hasKey(TAG_PLACE_DELAY) && tag.getInteger(TAG_PLACE_DELAY) > 0)
 			tag.setInteger(TAG_PLACE_DELAY, tag.getInteger(TAG_PLACE_DELAY) - 1);
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack itemstack, EntityPlayer player, World world, int x, int y, int z, int side, float xOffset, float yOffset, float zOffset) {
-		if(getEntityId(itemstack) == null) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(getEntityId(stack) == null) {
 			if(world.getBlock(x, y, z).equals(Blocks.mob_spawner)) {
 				TileEntity te = world.getTileEntity(x, y, z);
 				NBTTagCompound tag = new NBTTagCompound();
 				tag.setTag(TAG_SPAWNER, new NBTTagCompound());
 				te.writeToNBT(tag.getCompoundTag(TAG_SPAWNER));
 				tag.setInteger(TAG_PLACE_DELAY, 20);
-				itemstack.setTagCompound(tag);
+				stack.setTagCompound(tag);
 				world.setBlockToAir(x, y, z);
-				player.renderBrokenItemStack(itemstack);
+				player.renderBrokenItemStack(stack);
 				for(int i = 0; i < 50; i++) {
 					float red = (float) Math.random();
 					float green = (float) Math.random();
@@ -124,7 +124,7 @@ public class ItemSpawnerMover extends ItemMod {
 				return true;
 			} else return false;
 		} else {
-			if(getDelay(itemstack) <= 0 && placeBlock(itemstack, player, world, x, y, z, side, xOffset, yOffset, zOffset))
+			if(getDelay(stack) <= 0 && placeBlock(stack, player, world, x, y, z, side, subX, subY, subZ))
 				return true;
 			return false;
 		}

src/main/java/vazkii/botania/common/item/ItemSpellCloth.java

@@ -35,8 +35,8 @@ public class ItemSpellCloth extends ItemMod {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		return Color.HSBtoRGB(0.55F, ((float) par1ItemStack.getMaxDamage() - (float) par1ItemStack.getItemDamage()) / par1ItemStack.getMaxDamage() * 0.5F, 1F);
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		return Color.HSBtoRGB(0.55F, ((float) stack.getMaxDamage() - (float) stack.getItemDamage()) / stack.getMaxDamage() * 0.5F, 1F);
 	}
 
 	@Override
@@ -52,7 +52,7 @@ public class ItemSpellCloth extends ItemMod {
 	}
 
 	@Override
-	public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) {
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
 		return false;
 	}
 

src/main/java/vazkii/botania/common/item/ItemTemperanceStone.java

@@ -35,30 +35,30 @@ public class ItemTemperanceStone extends ItemMod {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		int dmg = par1ItemStack.getItemDamage();
-		par1ItemStack.setItemDamage(~dmg & 1);
-		par2World.playSoundAtEntity(par3EntityPlayer, "random.orb", 0.3F, 0.1F);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		int dmg = stack.getItemDamage();
+		stack.setItemDamage(~dmg & 1);
+		world.playSoundAtEntity(player, "random.orb", 0.3F, 0.1F);
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		enabledIcon = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
+		enabledIcon = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int par1) {
-		return par1 == 1 ? enabledIcon : itemIcon;
+	public IIcon getIconFromDamage(int meta) {
+		return meta == 1 ? enabledIcon : itemIcon;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer p, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(stack.getItemDamage() == 1)
 			addStringToTooltip(StatCollector.translateToLocal("botaniamisc.active"), infoList);
 		else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.inactive"), infoList);

src/main/java/vazkii/botania/common/item/ItemThornChakram.java

@@ -43,14 +43,14 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		iconFire = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
+		iconFire = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return dmg == 0 ? itemIcon : iconFire;
+	public IIcon getIconFromDamage(int meta) {
+		return meta == 0 ? itemIcon : iconFire;
 	}
 
 	@Override
@@ -59,19 +59,19 @@ public class ItemThornChakram extends ItemMod implements ICraftAchievement {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player)  {
-		--itemStackIn.stackSize;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player)  {
+		--stack.stackSize;
 
-		worldIn.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
 
-		if(!worldIn.isRemote) {
-			EntityThornChakram c = new EntityThornChakram(worldIn, player);
-			c.setFire(itemStackIn.getItemDamage() != 0);
-			worldIn.spawnEntityInWorld(c);
+		if(!world.isRemote) {
+			EntityThornChakram c = new EntityThornChakram(world, player);
+			c.setFire(stack.getItemDamage() != 0);
+			world.spawnEntityInWorld(c);
 		}
 
 
-		return itemStackIn;
+		return stack;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/ItemTwigWand.java

@@ -64,86 +64,86 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		Block block = par3World.getBlock(par4, par5, par6);
-		ChunkCoordinates boundTile = getBoundTile(par1ItemStack);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		Block block = world.getBlock(x, y, z);
+		ChunkCoordinates boundTile = getBoundTile(stack);
 
-		if(boundTile.posY != -1 && par2EntityPlayer.isSneaking() && (boundTile.posX != par4 || boundTile.posY != par5 || boundTile.posZ != par6)) {
-			TileEntity tile = par3World.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ);
+		if(boundTile.posY != -1 && player.isSneaking() && (boundTile.posX != x || boundTile.posY != y || boundTile.posZ != z)) {
+			TileEntity tile = world.getTileEntity(boundTile.posX, boundTile.posY, boundTile.posZ);
 			if(tile instanceof IWandBindable) {
-				if(((IWandBindable) tile).bindTo(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) {
+				if(((IWandBindable) tile).bindTo(player, stack, x, y, z, side)) {
 					Vector3 orig = new Vector3(boundTile.posX + 0.5, boundTile.posY + 0.5, boundTile.posZ + 0.5);
-					Vector3 end = new Vector3(par4 + 0.5, par5 + 0.5, par6 + 0.5);
-					doParticleBeam(par3World, orig, end);
+					Vector3 end = new Vector3(x + 0.5, y + 0.5, z + 0.5);
+					doParticleBeam(world, orig, end);
 
-					VanillaPacketDispatcher.dispatchTEToNearbyPlayers(par3World, boundTile.posX, boundTile.posY, boundTile.posZ);
-					setBoundTile(par1ItemStack, 0, -1, 0);
+					VanillaPacketDispatcher.dispatchTEToNearbyPlayers(world, boundTile.posX, boundTile.posY, boundTile.posZ);
+					setBoundTile(stack, 0, -1, 0);
 				}
 
 				return true;
-			} else setBoundTile(par1ItemStack, 0, -1, 0);
-		} else if(par2EntityPlayer.isSneaking()) {
-			block.rotateBlock(par3World, par4, par5, par6, ForgeDirection.getOrientation(par7));
-			if(par3World.isRemote)
-				par2EntityPlayer.swingItem();
+			} else setBoundTile(stack, 0, -1, 0);
+		} else if(player.isSneaking()) {
+			block.rotateBlock(world, x, y, z, ForgeDirection.getOrientation(side));
+			if(world.isRemote)
+				player.swingItem();
 		}
 
 		if(block == Blocks.lapis_block && ConfigHandler.enchanterEnabled) {
 			int meta = -1;
-			if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 0))
+			if(TileEnchanter.canEnchanterExist(world, x, y, z, 0))
 				meta = 0;
-			else if(TileEnchanter.canEnchanterExist(par3World, par4, par5, par6, 1))
+			else if(TileEnchanter.canEnchanterExist(world, x, y, z, 1))
 				meta = 1;
 
-			if(meta != -1 && !par3World.isRemote) {
-				par3World.setBlock(par4, par5, par6, ModBlocks.enchanter, meta, 1 | 2);
-				par2EntityPlayer.addStat(ModAchievements.enchanterMake, 1);
-				par3World.playSoundEffect(par4, par5, par6, "botania:enchanterBlock", 0.5F, 0.6F);
+			if(meta != -1 && !world.isRemote) {
+				world.setBlock(x, y, z, ModBlocks.enchanter, meta, 1 | 2);
+				player.addStat(ModAchievements.enchanterMake, 1);
+				world.playSoundEffect(x, y, z, "botania:enchanterBlock", 0.5F, 0.6F);
 				for(int i = 0; i < 50; i++) {
 					float red = (float) Math.random();
 					float green = (float) Math.random();
 					float blue = (float) Math.random();
 
-					double x = (Math.random() - 0.5) * 6;
-					double y = (Math.random() - 0.5) * 6;
-					double z = (Math.random() - 0.5) * 6;
+					double dx = (Math.random() - 0.5) * 6;
+					double dy = (Math.random() - 0.5) * 6;
+					double dz = (Math.random() - 0.5) * 6;
 
 					float velMul = 0.07F;
 
-					Botania.proxy.wispFX(par3World, par4 + 0.5 + x, par5 + 0.5 + y, par6 + 0.5 + z, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -x * velMul, (float) -y * velMul, (float) -z * velMul);
+					Botania.proxy.wispFX(world, x + 0.5 + dx, y + 0.5 + dy, z + 0.5 + dz, red, green, blue, (float) Math.random() * 0.15F + 0.15F, (float) -dx * velMul, (float) -dy * velMul, (float) -dz * velMul);
 				}
 			}
 		} else if(block instanceof IWandable) {
-			TileEntity tile = par3World.getTileEntity(par4, par5, par6);
+			TileEntity tile = world.getTileEntity(x, y, z);
 			boolean bindable = tile instanceof IWandBindable;
 
 			boolean wanded = false;
-			if(getBindMode(par1ItemStack) && bindable && par2EntityPlayer.isSneaking() && ((IWandBindable) tile).canSelect(par2EntityPlayer, par1ItemStack, par4, par5, par6, par7)) {
-				if(boundTile.posX == par4 && boundTile.posY == par5 && boundTile.posZ == par6)
-					setBoundTile(par1ItemStack, 0, -1, 0);
-				else setBoundTile(par1ItemStack, par4, par5, par6);
+			if(getBindMode(stack) && bindable && player.isSneaking() && ((IWandBindable) tile).canSelect(player, stack, x, y, z, side)) {
+				if(boundTile.posX == x && boundTile.posY == y && boundTile.posZ == z)
+					setBoundTile(stack, 0, -1, 0);
+				else setBoundTile(stack, x, y, z);
 
-				if(par3World.isRemote)
-					par2EntityPlayer.swingItem();
-				par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 0.1F, 1F);
+				if(world.isRemote)
+					player.swingItem();
+				world.playSoundAtEntity(player, "botania:ding", 0.1F, 1F);
 
 				wanded = true;
 			} else {
-				wanded = ((IWandable) block).onUsedByWand(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par7);
-				if(wanded && par3World.isRemote)
-					par2EntityPlayer.swingItem();
+				wanded = ((IWandable) block).onUsedByWand(player, stack, world, x, y, z, side);
+				if(wanded && world.isRemote)
+					player.swingItem();
 			}
 
 			return wanded;
-		} else if(BlockPistonRelay.playerPositions.containsKey(par2EntityPlayer.getCommandSenderName()) && !par3World.isRemote) {
-			String bindPos = BlockPistonRelay.playerPositions.get(par2EntityPlayer.getCommandSenderName());
-			String currentPos = BlockPistonRelay.getCoordsAsString(par3World.provider.dimensionId, par4, par5, par6);
+		} else if(BlockPistonRelay.playerPositions.containsKey(player.getCommandSenderName()) && !world.isRemote) {
+			String bindPos = BlockPistonRelay.playerPositions.get(player.getCommandSenderName());
+			String currentPos = BlockPistonRelay.getCoordsAsString(world.provider.dimensionId, x, y, z);
 
-			BlockPistonRelay.playerPositions.remove(par2EntityPlayer.getCommandSenderName());
+			BlockPistonRelay.playerPositions.remove(player.getCommandSenderName());
 			BlockPistonRelay.mappedPositions.put(bindPos, currentPos);
-			BlockPistonRelay.WorldData.get(par3World).markDirty();
+			BlockPistonRelay.WorldData.get(world).markDirty();
 
-			par3World.playSoundAtEntity(par2EntityPlayer, "botania:ding", 1F, 1F);
+			world.playSoundAtEntity(player, "botania:ding", 1F, 1F);
 		}
 
 		return false;
@@ -175,11 +175,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		ChunkCoordinates coords = getBoundTile(par1ItemStack);
-		TileEntity tile = par2World.getTileEntity(coords.posX, coords.posY, coords.posZ);
-		if(tile == null || !(tile instanceof IWandBindable))
-			setBoundTile(par1ItemStack, 0, -1, 0);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		ChunkCoordinates coords = getBoundTile(stack);
+		TileEntity tile = world.getTileEntity(coords.posX, coords.posY, coords.posZ);
+		if(!(tile instanceof IWandBindable))
+			setBoundTile(stack, 0, -1, 0);
 	}
 
 	@Override
@@ -198,10 +198,10 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[4];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -213,11 +213,11 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par2 == 0 || par2 == 3)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0 || renderPass == 3)
 			return 0xFFFFFF;
 
-		float[] color = EntitySheep.fleeceColorTable[par2 == 1 ? getColor1(par1ItemStack) : getColor2(par1ItemStack)];
+		float[] color = EntitySheep.fleeceColorTable[renderPass == 1 ? getColor1(stack) : getColor2(stack)];
 		return new Color(color[0], color[1], color[2]).getRGB();
 	}
 
@@ -238,17 +238,17 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack);
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack);
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer p, List<String> list, boolean adv) {
-		list.add(StatCollector.translateToLocal(getModeString(stack)));
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
+		infoList.add(StatCollector.translateToLocal(getModeString(stack)));
 	}
 
 	@Override
-	public EnumRarity getRarity(ItemStack par1ItemStack) {
+	public EnumRarity getRarity(ItemStack stack) {
 		return EnumRarity.rare;
 	}
 
@@ -302,7 +302,7 @@ public class ItemTwigWand extends Item16Colors implements ICoordBoundItem {
 		MovingObjectPosition pos = Minecraft.getMinecraft().objectMouseOver;
 		if(pos != null) {
 			TileEntity tile = Minecraft.getMinecraft().theWorld.getTileEntity(pos.blockX, pos.blockY, pos.blockZ);
-			if(tile != null && tile instanceof ITileBound) {
+			if(tile instanceof ITileBound) {
 				ChunkCoordinates coords = ((ITileBound) tile).getBinding();
 				return coords;
 			}

src/main/java/vazkii/botania/common/item/ItemVineBall.java

@@ -23,16 +23,16 @@ public class ItemVineBall extends ItemMod {
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(!par3EntityPlayer.capabilities.isCreativeMode)
-			--par1ItemStack.stackSize;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode)
+			--stack.stackSize;
 
-		par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (par2World.rand.nextFloat() * 0.4F + 0.8F));
+		world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F));
 
-		if(!par2World.isRemote)
-			par2World.spawnEntityInWorld(new EntityVineBall(par3EntityPlayer, true));
+		if(!world.isRemote)
+			world.spawnEntityInWorld(new EntityVineBall(player, true));
 
-		return par1ItemStack;
+		return stack;
 	}
 
 }

src/main/java/vazkii/botania/common/item/ItemVirus.java

@@ -49,11 +49,10 @@ public class ItemVirus extends ItemMod {
 	}
 
 	@Override
-	public boolean itemInteractionForEntity(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, EntityLivingBase par3EntityLivingBase) {
-		if(par3EntityLivingBase instanceof EntityHorse) {
-			EntityHorse horse = (EntityHorse) par3EntityLivingBase;
-			if(horse.getHorseType() != 3 && horse.getHorseType() != 4 && horse.isTame()) {
-				horse.setHorseType(3 + par1ItemStack.getItemDamage());
+	public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase entity) {
+		if(entity instanceof EntityHorse horse) {
+            if(horse.getHorseType() != 3 && horse.getHorseType() != 4 && horse.isTame()) {
+				horse.setHorseType(3 + stack.getItemDamage());
 				BaseAttributeMap attributes = horse.getAttributeMap();
 				IAttributeInstance movementSpeed = attributes.getAttributeInstance(SharedMonsterAttributes.movementSpeed);
 				IAttributeInstance health = attributes.getAttributeInstance(SharedMonsterAttributes.maxHealth);
@@ -61,9 +60,9 @@ public class ItemVirus extends ItemMod {
 				movementSpeed.applyModifier(new AttributeModifier("Ermergerd Virus D:", movementSpeed.getBaseValue(), 0));
 				IAttributeInstance jumpHeight = attributes.getAttributeInstance(ReflectionHelper.<IAttribute, EntityHorse>getPrivateValue(EntityHorse.class, null, LibObfuscation.HORSE_JUMP_STRENGTH));
 				jumpHeight.applyModifier(new AttributeModifier("Ermergerd Virus D:", jumpHeight.getBaseValue() * 0.5, 0));
-				par2EntityPlayer.worldObj.playSound(par3EntityLivingBase.posX + 0.5D, par3EntityLivingBase.posY + 0.5D, par3EntityLivingBase.posZ + 0.5D, "mob.zombie.remedy", 1.0F + par3EntityLivingBase.worldObj.rand.nextFloat(), par3EntityLivingBase.worldObj.rand.nextFloat() * 0.7F + 1.3F, false);
+				player.worldObj.playSound(entity.posX + 0.5D, entity.posY + 0.5D, entity.posZ + 0.5D, "mob.zombie.remedy", 1.0F + entity.worldObj.rand.nextFloat(), entity.worldObj.rand.nextFloat() * 0.7F + 1.3F, false);
 
-				par1ItemStack.stackSize--;
+				stack.stackSize--;
 				return true;
 			}
 		}
@@ -75,9 +74,8 @@ public class ItemVirus extends ItemMod {
 		if(entity.ridingEntity instanceof EntityLivingBase)
 			entity = (EntityLivingBase) entity.ridingEntity;
 
-		if(entity instanceof EntityHorse && event.source == DamageSource.fall) {
-			EntityHorse horse = (EntityHorse) entity;
-			if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame())
+		if(entity instanceof EntityHorse horse && event.source == DamageSource.fall) {
+            if((horse.getHorseType() == 3 || horse.getHorseType() == 4) && horse.isTame())
 				event.setCanceled(true);
 		}
 	}
@@ -91,25 +89,25 @@ public class ItemVirus extends ItemMod {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < SUBTYPES; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	public class EventHandler{

src/main/java/vazkii/botania/common/item/bag/ItemBagBase.java

@@ -79,12 +79,11 @@ public abstract class ItemBagBase extends ItemMod {
     }
 
     @Override
-    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float xs, float ys, float zs) {
+    public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float subX, float subY, float subZ) {
         TileEntity tile = world.getTileEntity(x, y, z);
-        if(tile != null && tile instanceof IInventory) {
+        if(tile instanceof IInventory inv) {
             if(!world.isRemote) {
                 ForgeDirection side = ForgeDirection.getOrientation(s);
-                IInventory inv = (IInventory) tile;
                 ItemStack[] stacks = loadStacks(stack);
                 ItemStack[] newStacks = new ItemStack[stacks.length];
                 boolean putAny = false;

src/main/java/vazkii/botania/common/item/block/ItemBlockElven.java

@@ -31,7 +31,7 @@ public class ItemBlockElven extends ItemBlockMod implements IElvenItem {
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if (ConfigHandler.noMobSpawnOnBlocks)
 			infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip"));
 	}

src/main/java/vazkii/botania/common/item/block/ItemBlockMod.java

@@ -28,8 +28,8 @@ public class ItemBlockMod extends ItemBlock implements IPickupAchievement, ICraf
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return getUnlocalizedNameInefficiently_(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return getUnlocalizedNameInefficiently_(stack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD);
 	}
 
 	public String getUnlocalizedNameInefficiently_(ItemStack stack) {

src/main/java/vazkii/botania/common/item/block/ItemBlockModSlab.java

@@ -22,16 +22,16 @@ import java.util.List;
 
 public class ItemBlockModSlab extends ItemSlab {
 
-	public ItemBlockModSlab(Block par1) {
-		super(par1, ((BlockModSlab)par1).getSingleBlock(), ((BlockModSlab)par1).getFullBlock(), false);
+	public ItemBlockModSlab(Block blockSlab) {
+		super(blockSlab, ((BlockModSlab)blockSlab).getSingleBlock(), ((BlockModSlab)blockSlab).getFullBlock(), false);
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
+	public String getUnlocalizedName(ItemStack stack) {
 		return field_150939_a.getUnlocalizedName().replaceAll("tile.", "tile.botania:");
 	}
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if (ConfigHandler.noMobSpawnOnBlocks)
 			infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip"));
 	}

src/main/java/vazkii/botania/common/item/block/ItemBlockPool.java

@@ -19,12 +19,12 @@ import net.minecraft.util.StatCollector;
 
 public class ItemBlockPool extends ItemBlockWithMetadataAndName {
 
-	public ItemBlockPool(Block par2Block) {
-		super(par2Block);
+	public ItemBlockPool(Block block) {
+		super(block);
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(stack.getItemDamage() == 1)
 			for(int i = 0; i < 2; i++)
 				infoList.add(StatCollector.translateToLocal("botaniamisc.creativePool" + i));

src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialFlower.java

@@ -56,9 +56,8 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
 		if(placed) {
 			String type = getType(stack);
 			TileEntity te = world.getTileEntity(x, y, z);
-			if(te instanceof TileSpecialFlower) {
-				TileSpecialFlower tile = (TileSpecialFlower) te;
-				tile.setSubTile(type);
+			if(te instanceof TileSpecialFlower tile) {
+                tile.setSubTile(type);
 				tile.onBlockAdded(world, x, y, z);
 				tile.onBlockPlacedBy(world, x, y, z, player, stack);
 				if(!world.isRemote)
@@ -75,12 +74,12 @@ public class ItemBlockSpecialFlower extends ItemBlockMod implements IRecipeKeyPr
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return getUnlocalizedNameInefficiently_(par1ItemStack);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return getUnlocalizedNameInefficiently_(stack);
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		String type = getType(stack);
 		SubTileSignature sig = BotaniaAPI.getSignatureForName(type);
 

src/main/java/vazkii/botania/common/item/block/ItemBlockSpecialQuartz.java

@@ -22,18 +22,18 @@ import java.util.List;
 
 public class ItemBlockSpecialQuartz extends ItemMultiTexture {
 
-	public ItemBlockSpecialQuartz(Block par1) {
-		super(par1, par1, new String[]{ "" });
+	public ItemBlockSpecialQuartz(Block block) {
+		super(block, block, new String[]{ "" });
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
+	public String getUnlocalizedName(ItemStack stack) {
         String[] names = ((BlockSpecialQuartz) field_150939_a).getNames();
-        return par1ItemStack.getItemDamage() >= names.length ? names[names.length - 1] : names[par1ItemStack.getItemDamage()];
+        return stack.getItemDamage() >= names.length ? names[names.length - 1] : names[stack.getItemDamage()];
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if (ConfigHandler.noMobSpawnOnBlocks)
 			infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip"));
 	}

src/main/java/vazkii/botania/common/item/block/ItemBlockTinyPotato.java

@@ -55,10 +55,9 @@ public class ItemBlockTinyPotato extends ItemBlockMod {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity e, int t, boolean idunno) {
-		if(!world.isRemote && e instanceof EntityPlayer && e.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().toLowerCase())) {
-			EntityPlayer player = (EntityPlayer) e;
-			int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer player && entity.ticksExisted % 30 == 0 && TYPOS.contains(stack.getDisplayName().toLowerCase())) {
+            int ticks = ItemNBTHelper.getInt(stack, TAG_TICKS, 0);
 			if(ticks < NOT_MY_NAME.length) {
 				player.addChatMessage(new ChatComponentText(EnumChatFormatting.RED + NOT_MY_NAME[ticks]));
 				ItemNBTHelper.setInt(stack, TAG_TICKS, ticks + 1);

src/main/java/vazkii/botania/common/item/block/ItemBlockWithMetadataAndName.java

@@ -23,18 +23,18 @@ import vazkii.botania.common.achievement.IPickupAchievement;
 
 public class ItemBlockWithMetadataAndName extends ItemBlockWithMetadata implements IPickupAchievement, ICraftAchievement {
 
-	public ItemBlockWithMetadataAndName(Block par2Block) {
-		super(par2Block, par2Block);
+	public ItemBlockWithMetadataAndName(Block block) {
+		super(block, block);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("tile.", "tile." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/block/ItemCubeMod.java

@@ -14,7 +14,7 @@ public class ItemCubeMod extends ItemBlockMod{
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advancedTooltips) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
         if (ConfigHandler.noMobSpawnOnBlocks)
             infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip"));
     }

src/main/java/vazkii/botania/common/item/block/ItemCubeWithMetadataAndName.java

@@ -10,12 +10,12 @@ import java.util.List;
 
 public class ItemCubeWithMetadataAndName extends ItemBlockWithMetadataAndName  {
 
-    public ItemCubeWithMetadataAndName(Block par2Block) {
-        super(par2Block);
+    public ItemCubeWithMetadataAndName(Block block) {
+        super(block);
     }
 
     @Override
-    public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advancedTooltips) {
+    public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
         if (ConfigHandler.noMobSpawnOnBlocks)
             infoList.add(StatCollector.translateToLocal("nomobspawnsonthisblock.tip"));
     }

src/main/java/vazkii/botania/common/item/brew/ItemBrewBase.java

@@ -63,7 +63,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack p_77626_1_) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return drinkSpeed;
 	}
 
@@ -73,9 +73,9 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) {
-		player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
-		return itemStackIn;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		player.setItemInUse(stack, getMaxItemUseDuration(stack));
+		return stack;
 	}
 
 	@Override
@@ -119,12 +119,12 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forName(par1IconRegister, texName + "0");
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forName(register, texName + "0");
 
 		icons = new IIcon[swigs];
 		for(int i = 0; i < swigs; i++)
-			icons[i] = IconHelper.forName(par1IconRegister, texName + "1_" + i);
+			icons[i] = IconHelper.forName(register, texName + "1_" + i);
 	}
 
 	@Override
@@ -138,8 +138,8 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack stack, int pass) {
-		if(pass == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
 		Color color = new Color(getBrew(stack).getColor(stack));
@@ -158,7 +158,7 @@ public abstract class ItemBrewBase extends ItemMod implements IBrewItem, IPickup
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		Brew brew = getBrew(stack);
 		for(PotionEffect effect : brew.getPotionEffects(stack)) {
 			Potion potion = Potion.potionTypes[effect.getPotionID()];

src/main/java/vazkii/botania/common/item/brew/ItemIncenseStick.java

@@ -56,10 +56,10 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -73,8 +73,8 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack stack, int pass) {
-		if(pass == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
 		Brew brew = getBrew(stack);
@@ -92,7 +92,7 @@ public class ItemIncenseStick extends ItemMod implements IBrewItem, IBrewContain
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		Brew brew = getBrew(stack);
 		if(brew == BotaniaAPI.fallbackBrew) {
 			addStringToTooltip(EnumChatFormatting.LIGHT_PURPLE + StatCollector.translateToLocal("botaniamisc.notInfused"), infoList);

src/main/java/vazkii/botania/common/item/brew/ItemVial.java

@@ -38,14 +38,14 @@ public class ItemVial extends ItemMod implements IBrewContainer {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		vialIcon = IconHelper.forName(par1IconRegister, LibItemNames.VIAL + "0");
-		flaskIcon = IconHelper.forName(par1IconRegister, LibItemNames.FLASK + "0");
+	public void registerIcons(IIconRegister register) {
+		vialIcon = IconHelper.forName(register, LibItemNames.VIAL + "0");
+		flaskIcon = IconHelper.forName(register, LibItemNames.FLASK + "0");
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int i) {
-		return i == 0 ? vialIcon : flaskIcon;
+	public IIcon getIconFromDamage(int meta) {
+		return meta == 0 ? vialIcon : flaskIcon;
 	}
 
 	@Override
@@ -55,8 +55,8 @@ public class ItemVial extends ItemMod implements IBrewContainer {
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/armor/elementium/ItemElementiumArmor.java

@@ -35,8 +35,8 @@ public abstract class ItemElementiumArmor extends ItemManasteelArmor implements
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 7 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 7 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	static ItemStack[] armorset;

src/main/java/vazkii/botania/common/item/equipment/armor/manasteel/ItemManasteelArmor.java

@@ -66,20 +66,20 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override
@@ -95,9 +95,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(player instanceof EntityPlayer)
-			onArmorTick(world, (EntityPlayer) player, stack);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(entity instanceof EntityPlayer)
+			onArmorTick(world, (EntityPlayer) entity, stack);
 	}
 
 	@Override
@@ -150,8 +150,8 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override
@@ -160,9 +160,9 @@ public class ItemManasteelArmor extends ItemArmor implements ISpecialArmor, IMan
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(GuiScreen.isShiftKeyDown())
-			addInformationAfterShift(stack, player, infoList, adv);
+			addInformationAfterShift(stack, player, infoList, advanced);
 		else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList);
 	}
 

src/main/java/vazkii/botania/common/item/equipment/armor/manaweave/ItemManaweaveArmor.java

@@ -49,9 +49,9 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi
 	}
 	
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		iconChristmas = IconHelper.forItem(par1IconRegister, this, "Holiday");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		iconChristmas = IconHelper.forItem(register, this, "Holiday");
 	}
 	
 	@Override
@@ -60,8 +60,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(dmg);
+	public IIcon getIconFromDamage(int meta) {
+		return ClientProxy.jingleTheBells ? iconChristmas : super.getIconFromDamage(meta);
 	}
 	
 	@Override
@@ -74,8 +74,8 @@ public class ItemManaweaveArmor extends ItemManasteelArmor implements ICraftAchi
 	}
 	
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 22 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 22 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	static ItemStack[] armorset;

src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelArmor.java

@@ -51,8 +51,8 @@ public class ItemTerrasteelArmor extends ItemManasteelArmor {
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/armor/terrasteel/ItemTerrasteelHelm.java

@@ -59,9 +59,9 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		willIcon = IconHelper.forName(par1IconRegister, "willFlame");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		willIcon = IconHelper.forName(register, "willFlame");
 	}
 
 	@Override
@@ -132,9 +132,8 @@ public class ItemTerrasteelHelm extends ItemTerrasteelArmor implements IManaDisc
 
 	public void onEntityAttacked(LivingHurtEvent event) {
 		Entity attacker = event.source.getEntity();
-		if (attacker instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) attacker;
-			if (hasArmorSet(player)) {
+		if (attacker instanceof EntityPlayer player) {
+            if (hasArmorSet(player)) {
 				boolean crit = player.fallDistance > 0.0F && !player.onGround && !player.isOnLadder() && !player.isInWater() && !player.isPotionActive(Potion.blindness) && player.ridingEntity == null;
 				ItemStack stack = player.inventory.armorItemInSlot(3);
 				if (crit && stack != null && stack.getItem() instanceof ItemTerrasteelHelm) {

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBauble.java

@@ -13,11 +13,9 @@ package vazkii.botania.common.item.equipment.bauble;
 import java.util.List;
 import java.util.UUID;
 
-import baubles.api.BaublesApi;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.StatCollector;
@@ -53,24 +51,24 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		if(!EntityDoppleganger.isTruePlayer(par3EntityPlayer))
-			return par1ItemStack;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(!EntityDoppleganger.isTruePlayer(player))
+			return stack;
 
-		if(canEquip(par1ItemStack, par3EntityPlayer)) {
-			InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(par3EntityPlayer);
+		if(canEquip(stack, player)) {
+			InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player);
 			for(int i = 0; i < baubles.getSizeInventory(); i++) {
-				if(baubles.isItemValidForSlot(i, par1ItemStack)) {
+				if(baubles.isItemValidForSlot(i, stack)) {
 					ItemStack stackInSlot = baubles.getStackInSlot(i);
-					if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, par3EntityPlayer)) {
-						if(!par2World.isRemote) {
-							baubles.setInventorySlotContents(i, par1ItemStack.copy());
-							if(!par3EntityPlayer.capabilities.isCreativeMode)
-								par3EntityPlayer.inventory.setInventorySlotContents(par3EntityPlayer.inventory.currentItem, null);
+					if(stackInSlot == null || ((IBauble) stackInSlot.getItem()).canUnequip(stackInSlot, player)) {
+						if(!world.isRemote) {
+							baubles.setInventorySlotContents(i, stack.copy());
+							if(!player.capabilities.isCreativeMode)
+								player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
 						}
 
 						if(stackInSlot != null) {
-							((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, par3EntityPlayer);
+							((IBauble) stackInSlot.getItem()).onUnequipped(stackInSlot, player);
 							return stackInSlot.copy();
 						}
 						break;
@@ -79,14 +77,14 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
 			}
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		if(GuiScreen.isShiftKeyDown())
-			addHiddenTooltip(stack, player, infoList, adv);
+			addHiddenTooltip(stack, player, infoList, advanced);
 		else addStringToTooltip(StatCollector.translateToLocal("botaniamisc.shiftinfo"), infoList);
 	}
 
@@ -181,7 +179,7 @@ public abstract class ItemBauble extends ItemMod implements IBauble, ICosmeticAt
 	}
 
 	@Override
-	public boolean doesContainerItemLeaveCraftingGrid(ItemStack p_77630_1_) {
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
 		return false;
 	}
 

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBaubleCosmetic.java

@@ -56,10 +56,10 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < SUBTYPES; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -69,13 +69,13 @@ public class ItemBaubleCosmetic extends ItemBauble implements ICosmeticBauble {
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int dmg) {
-		return icons[Math.min(SUBTYPES - 1, dmg)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(SUBTYPES - 1, meta)];
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return super.getUnlocalizedName(stack) + stack.getItemDamage();
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemBloodPendant.java

@@ -71,10 +71,10 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[4];
 		for(int i = 0; i < 4; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
@@ -88,8 +88,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack stack, int pass) {
-		if(pass == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
 		Brew brew = getBrew(stack);
@@ -132,9 +132,8 @@ public class ItemBloodPendant extends ItemBauble implements IBrewContainer, IBre
 	@Override
 	public void onWornTick(ItemStack stack, EntityLivingBase player) {
 		Brew brew = getBrew(stack);
-		if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer && !player.worldObj.isRemote) {
-			EntityPlayer eplayer = (EntityPlayer) player;
-			PotionEffect effect = brew.getPotionEffects(stack).get(0);
+		if(brew != BotaniaAPI.fallbackBrew && player instanceof EntityPlayer eplayer && !player.worldObj.isRemote) {
+            PotionEffect effect = brew.getPotionEffects(stack).get(0);
 			float cost = (float) brew.getManaCost(stack) / effect.getDuration() / (1 + effect.getAmplifier()) * 2.5F;
 			boolean doRand = cost < 1;
 			if(ManaItemHandler.requestManaExact(stack, eplayer, (int) Math.ceil(cost), false)) {

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemDivaCharm.java

@@ -50,9 +50,8 @@ public class ItemDivaCharm extends ItemBauble implements IManaUsingItem, IBauble
 	}
 
 	public void onEntityDamaged(LivingHurtEvent event) {
-		if(event.source.getEntity() instanceof EntityPlayer && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) {
-			EntityPlayer player = (EntityPlayer) event.source.getEntity();
-			ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
+		if(event.source.getEntity() instanceof EntityPlayer player && event.entityLiving instanceof EntityLiving && !event.entityLiving.worldObj.isRemote && Math.random() < 0.6F) {
+            ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
 			if(amulet != null && amulet.getItem() == this) {
 				final int cost = 250;
 				if(ManaItemHandler.requestManaExact(amulet, player, cost, false)) {

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemFlightTiara.java

@@ -102,11 +102,11 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
 		wingIcons = new IIcon[WING_TYPES];
 		for(int i = 0; i < WING_TYPES; i++)
-			wingIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1);
+			wingIcons[i] = IconHelper.forItem(register, this, i + 1);
 	}
 
 	@Override
@@ -165,9 +165,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
 	public void onWornTick(ItemStack stack, EntityLivingBase player) {
 		super.onWornTick(stack, player);
 
-		if(player instanceof EntityPlayer) {
-			EntityPlayer p = (EntityPlayer) player;
-			boolean flying = p.capabilities.isFlying;
+		if(player instanceof EntityPlayer p) {
+            boolean flying = p.capabilities.isFlying;
 
 			boolean wasSprting = ItemNBTHelper.getBoolean(stack, TAG_IS_SPRINTING, false);
 			boolean isSprinting = p.isSprinting();
@@ -220,9 +219,8 @@ public class ItemFlightTiara extends ItemBauble implements IManaUsingItem, IBaub
 	}
 
 	public void updatePlayerFlyStatus(LivingUpdateEvent event) {
-		if(event.entityLiving instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entityLiving;
-			ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
+		if(event.entityLiving instanceof EntityPlayer player) {
+            ItemStack tiara = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
 			int left = ItemNBTHelper.getInt(tiara, TAG_TIME_LEFT, MAX_FLY_TIME);
 
 			if(playersWithFlight.contains(playerStr(player))) {

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemGoldenLaurel.java

@@ -42,9 +42,8 @@ public class ItemGoldenLaurel extends ItemBauble implements IBaubleRender {
 	}
 
 	public void onPlayerDeath(LivingDeathEvent event) {
-		if(event.entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entity;
-			ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
+		if(event.entity instanceof EntityPlayer player) {
+            ItemStack amulet = PlayerHandler.getPlayerBaubles(player).getStackInSlot(0);
 
 			if(amulet != null && amulet.getItem() == ItemGoldenLaurel.this) {
 				event.setCanceled(true);

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemHolyCloak.java

@@ -53,13 +53,11 @@ public class ItemHolyCloak extends ItemBauble implements IBaubleRender {
 	}
 
 	public void onPlayerDamage(LivingHurtEvent event) {
-		if(event.entityLiving instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entityLiving;
-			InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player);
+		if(event.entityLiving instanceof EntityPlayer player) {
+            InventoryBaubles baubles = PlayerHandler.getPlayerBaubles(player);
 			ItemStack belt = baubles.getStackInSlot(3);
-			if(belt != null && belt.getItem() instanceof ItemHolyCloak && !isInEffect(belt)) {
-				ItemHolyCloak cloak = (ItemHolyCloak) belt.getItem();
-				int cooldown = getCooldown(belt);
+			if(belt != null && belt.getItem() instanceof ItemHolyCloak cloak && !isInEffect(belt)) {
+                int cooldown = getCooldown(belt);
 
 				// Used to prevent StackOverflows with mobs that deal damage when damaged
 				setInEffect(belt, true);

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemIcePendant.java

@@ -56,19 +56,18 @@ public class ItemIcePendant extends ItemBauble implements IBaubleRender {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		gemIcon = IconHelper.forItem(register, this, "Gem");
 	}
 
 	@Override
 	public void onWornTick(ItemStack stack, EntityLivingBase entity) {
 		super.onWornTick(stack, entity);
 
-		if(entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) entity;
+		if(entity instanceof EntityPlayer player) {
 
-			if(!player.worldObj.isRemote)
+            if(!player.worldObj.isRemote)
 				tickIceRemovers(player);
 
 			if(!player.isSneaking() && !player.isInsideOfMaterial(Material.water) && !player.worldObj.isRemote) {

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemItemFinder.java

@@ -63,9 +63,9 @@ public class ItemItemFinder extends ItemBauble implements IBaubleRender {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		gemIcon = IconHelper.forItem(register, this, "Gem");
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemLavaPendant.java

@@ -50,9 +50,9 @@ public class ItemLavaPendant extends ItemBauble implements IBaubleRender {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		gemIcon = IconHelper.forItem(register, this, "Gem");
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMagnetRing.java

@@ -64,9 +64,9 @@ public class ItemMagnetRing extends ItemBauble {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
-		iconOff = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
+		iconOff = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemMonocle.java

@@ -111,9 +111,8 @@ public class ItemMonocle extends ItemBauble implements IBurstViewerBauble, ICosm
 				if(item instanceof IBurstViewerBauble)
 					return true;
 
-				if(item instanceof ICosmeticAttachable) {
-					ICosmeticAttachable attach = (ICosmeticAttachable) item;
-					ItemStack cosmetic = attach.getCosmeticItem(stack);
+				if(item instanceof ICosmeticAttachable attach) {
+                    ItemStack cosmetic = attach.getCosmeticItem(stack);
 					if(cosmetic != null && cosmetic.getItem() instanceof IBurstViewerBauble)
 						return true;
 				}

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSuperLavaPendant.java

@@ -61,9 +61,9 @@ public class ItemSuperLavaPendant extends ItemBauble implements IBaubleRender {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		gemIcon = IconHelper.forItem(par1IconRegister, this, "Gem");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		gemIcon = IconHelper.forItem(register, this, "Gem");
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemSwapRing.java

@@ -30,17 +30,14 @@ public class ItemSwapRing extends ItemBauble {
 
 	@Override
 	public void onWornTick(ItemStack stack, EntityLivingBase entity) {
-		if(!(entity instanceof EntityPlayer))
+		if(!(entity instanceof EntityPlayer player))
 			return;
 
-		EntityPlayer player = (EntityPlayer) entity;
-		ItemStack currentStack = player.getCurrentEquippedItem();
-		if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool))
+        ItemStack currentStack = player.getCurrentEquippedItem();
+		if(currentStack == null || !(currentStack.getItem() instanceof ISortableTool tool))
 			return;
 
-		ISortableTool tool = (ISortableTool) currentStack.getItem();
-
-		MovingObjectPosition pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F);
+        MovingObjectPosition pos = ToolCommons.raytraceFromEntity(entity.worldObj, entity, true, 4.5F);
 		ToolType typeToFind = null;
 
 		if(player.isSwingInProgress && pos != null) {
@@ -66,9 +63,8 @@ public class ItemSwapRing extends ItemBauble {
 
 		for(int i = 0; i < player.inventory.getSizeInventory(); i++) {
 			ItemStack stackInSlot = player.inventory.getStackInSlot(i);
-			if (stackInSlot != null && stackInSlot.getItem() instanceof ISortableTool && stackInSlot != currentStack) {
-				ISortableTool toolInSlot = (ISortableTool) stackInSlot.getItem();
-				if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) {
+			if (stackInSlot != null && stackInSlot.getItem() instanceof ISortableTool toolInSlot && stackInSlot != currentStack) {
+                if(toolInSlot.getSortingType(stackInSlot).equals(typeToFind)) {
 					int priority = toolInSlot.getSortingPriority(stackInSlot);
 					if(priority > bestToolPriority) {
 						bestTool = stackInSlot;

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemTravelBelt.java

@@ -71,9 +71,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs
 	}
 
 	public void updatePlayerStepStatus(LivingUpdateEvent event) {
-		if(event.entityLiving instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entityLiving;
-			String s = playerStr(player);
+		if(event.entityLiving instanceof EntityPlayer player) {
+            String s = playerStr(player);
 
 			ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3);
 			if(playersWithStepup.contains(s)) {
@@ -117,9 +116,8 @@ public class ItemTravelBelt extends ItemBauble implements IBaubleRender, IManaUs
 	}
 
 	public void onPlayerJump(LivingJumpEvent event) {
-		if(event.entityLiving instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) event.entityLiving;
-			ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3);
+		if(event.entityLiving instanceof EntityPlayer player) {
+            ItemStack belt = PlayerHandler.getPlayerBaubles(player).getStackInSlot(3);
 
 			if(belt != null && belt.getItem() instanceof ItemTravelBelt && ManaItemHandler.requestManaExact(belt, player, COST, false)) {
 				player.motionY += ((ItemTravelBelt) belt.getItem()).jump;

src/main/java/vazkii/botania/common/item/equipment/bauble/ItemUnholyCloak.java

@@ -38,9 +38,8 @@ public class ItemUnholyCloak extends ItemHolyCloak {
 			int range = 6;
 			List<IMob> mobs = player.worldObj.getEntitiesWithinAABB(IMob.class, AxisAlignedBB.getBoundingBox(player.posX - range, player.posY - range, player.posZ - range, player.posX + range, player.posY + range, player.posZ + range));
 			for(IMob mob : mobs)
-				if(mob instanceof EntityLivingBase) {
-					EntityLivingBase entity = (EntityLivingBase) mob;
-					entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount);
+				if(mob instanceof EntityLivingBase entity) {
+                    entity.attackEntityFrom(DamageSource.causePlayerDamage(player), event.ammount);
 				}
 
 			player.worldObj.playSoundAtEntity(player, "botania:unholyCloak", 1F, 1F);

src/main/java/vazkii/botania/common/item/equipment/tool/ItemEnderDagger.java

@@ -38,9 +38,9 @@ public class ItemEnderDagger extends ItemManasteelSword {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		iconFront = IconHelper.forItem(par1IconRegister, this, 0);
-		iconOverlay = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		iconFront = IconHelper.forItem(register, this, 0);
+		iconOverlay = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
@@ -54,28 +54,28 @@ public class ItemEnderDagger extends ItemManasteelSword {
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par2 == 0)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0)
 			return 0xFFFFFF;
 
 		return Color.HSBtoRGB(0.75F, 1F, 1.5F - (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 100D) * 0.5 + 1.2F));
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.none;
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
-		if(par2EntityLivingBase instanceof EntityEnderman && par3EntityLivingBase instanceof EntityPlayer)
-			par2EntityLivingBase.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) par3EntityLivingBase), 20);
-		par1ItemStack.damageItem(1, par3EntityLivingBase);
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		if(victim instanceof EntityEnderman && attacker instanceof EntityPlayer)
+			victim.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), 20);
+		stack.damageItem(1, attacker);
 		return true;
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/item/equipment/tool/ItemGlassPick.java

@@ -45,8 +45,8 @@ public class ItemGlassPick extends ItemManasteelPick {
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == Item.getItemFromBlock(Blocks.glass) ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == Item.getItemFromBlock(Blocks.glass) ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/ItemStarSword.java

@@ -37,30 +37,29 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5);
-		if(par3Entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) par3Entity;
-			PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		super.onUpdate(stack, world, entity, invSlot, isHeld);
+		if(entity instanceof EntityPlayer player) {
+            PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed);
 			float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F;
 
-			if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) {
-				MovingObjectPosition pos = ToolCommons.raytraceFromEntity(par2World, par3Entity, true, 48);
+			if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) {
+				MovingObjectPosition pos = ToolCommons.raytraceFromEntity(world, entity, true, 48);
 				if(pos != null) {
 					Vector3 posVec = new Vector3(pos.blockX, pos.blockY, pos.blockZ);
 					Vector3 motVec = new Vector3((Math.random() - 0.5) * 18, 24, (Math.random() - 0.5) * 18);
 					posVec.add(motVec);
 					motVec.normalize().negate().multiply(1.5);
 
-					EntityFallingStar star = new EntityFallingStar(par2World, player);
+					EntityFallingStar star = new EntityFallingStar(world, player);
 					star.setPosition(posVec.x, posVec.y, posVec.z);
 					star.motionX = motVec.x;
 					star.motionY = motVec.y;
 					star.motionZ = motVec.z;
-					par2World.spawnEntityInWorld(star);
+					world.spawnEntityInWorld(star);
 
-					ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE);
-					par2World.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F);
+					ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE);
+					world.playSoundAtEntity(player, "botania:starcaller", 0.4F, 1.4F);
 				}
 			}
 		}
@@ -72,8 +71,8 @@ public class ItemStarSword extends ItemManasteelSword implements ICraftAchieveme
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/ItemThunderSword.java

@@ -42,8 +42,8 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack stack, EntityLivingBase entity, EntityLivingBase attacker) {
-		if(!(entity instanceof EntityPlayer) && entity != null) {
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		if(!(victim instanceof EntityPlayer) && victim != null) {
 			double range = 8;
 			final List<EntityLivingBase> alreadyTargetedEntities = new ArrayList<>();
 			int dmg = 5;
@@ -52,9 +52,9 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev
 			IEntitySelector selector = e -> e instanceof EntityLivingBase && e instanceof IMob && !(e instanceof EntityPlayer) && !alreadyTargetedEntities.contains(e);
 
 			Random rand = new Random(lightningSeed);
-			EntityLivingBase lightningSource = entity;
+			EntityLivingBase lightningSource = victim;
 			for(int i = 0; i < 4; i++) {
-				List<Entity> entities = entity.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector);
+				List<Entity> entities = victim.worldObj.getEntitiesWithinAABBExcludingEntity(lightningSource, AxisAlignedBB.getBoundingBox(lightningSource.posX - range, lightningSource.posY - range, lightningSource.posZ - range, lightningSource.posX + range, lightningSource.posY + range, lightningSource.posZ + range), selector);
 				if(entities.isEmpty())
 					break;
 
@@ -63,19 +63,19 @@ public class ItemThunderSword extends ItemManasteelSword implements ICraftAchiev
 					target.attackEntityFrom(DamageSource.causePlayerDamage((EntityPlayer) attacker), dmg);
 				else target.attackEntityFrom(DamageSource.causeMobDamage(attacker), dmg);
 
-				Botania.proxy.lightningFX(entity.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF);
+				Botania.proxy.lightningFX(victim.worldObj, Vector3.fromEntityCenter(lightningSource), Vector3.fromEntityCenter(target), 1, 0x0179C4, 0xAADFFF);
 
 				alreadyTargetedEntities.add(target);
 				lightningSource = target;
 				dmg--;
 			}
 
-			if(!entity.worldObj.isRemote)
-				ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, entity.worldObj.rand.nextLong());
+			if(!victim.worldObj.isRemote)
+				ItemNBTHelper.setLong(stack, TAG_LIGHTNING_SEED, victim.worldObj.rand.nextLong());
 		}
 
 
-		return super.hitEntity(stack, entity, attacker);
+		return super.hitEntity(stack, victim, attacker);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/ToolCommons.java

@@ -124,11 +124,10 @@ public final class ToolCommons {
 			return 0;
 
 		Item item = stack.getItem();
-		if(!(item instanceof ItemTool))
+		if(!(item instanceof ItemTool tool))
 			return 0;
 
-		ItemTool tool = (ItemTool) item;
-		ToolMaterial material = tool.func_150913_i();
+        ToolMaterial material = tool.func_150913_i();
 		int materialLevel = 0;
 		if(material == BotaniaAPI.manasteelToolMaterial)
 			materialLevel = 10;
@@ -148,7 +147,7 @@ public final class ToolCommons {
 	/**
 	 * @author mDiyo
 	 */
-	public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean par3, double range) {
+	public static MovingObjectPosition raytraceFromEntity(World world, Entity player, boolean includeLiquids, double range) {
 		float f = 1.0F;
 		float f1 = player.prevRotationPitch + (player.rotationPitch - player.prevRotationPitch) * f;
 		float f2 = player.prevRotationYaw + (player.rotationYaw - player.prevRotationYaw) * f;
@@ -166,7 +165,7 @@ public final class ToolCommons {
 		float f8 = f3 * f5;
 		double d3 = range;
 		Vec3 vec31 = vec3.addVector(f7 * d3, f6 * d3, f8 * d3);
-		return world.rayTraceBlocks(vec3, vec31, par3);
+		return world.rayTraceBlocks(vec3, vec31, includeLiquids);
 	}
 
 }

src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemCrystalBow.java

@@ -38,15 +38,15 @@ public class ItemCrystalBow extends ItemLivingwoodBow {
 	}
 
 	@Override
-	boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) {
-		int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_);
-		return ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity + 1), false);
+	boolean canFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) {
+		int infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack);
+		return ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity + 1), false);
 	}
 
 	@Override
-	void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) {
+	void onFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, boolean infinity, EntityArrow arrow) {
 		arrow.canBePickedUp = 2;
-		ManaItemHandler.requestManaExactForTool(p_77615_1_, p_77615_3_, ARROW_COST / (infinity ? 2 : 1), false);
+		ManaItemHandler.requestManaExactForTool(stack, player, ARROW_COST / (infinity ? 2 : 1), false);
 	}
 
 }

src/main/java/vazkii/botania/common/item/equipment/tool/bow/ItemLivingwoodBow.java

@@ -55,41 +55,41 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem {
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer player) {
-		ArrowNockEvent event = new ArrowNockEvent(player, itemStackIn);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		ArrowNockEvent event = new ArrowNockEvent(player, stack);
 		MinecraftForge.EVENT_BUS.post(event);
 		if(event.isCanceled())
 			return event.result;
 
-		if(canFire(itemStackIn, worldIn, player, 0))
-			player.setItemInUse(itemStackIn, getMaxItemUseDuration(itemStackIn));
+		if(canFire(stack, world, player, 0))
+			player.setItemInUse(stack, getMaxItemUseDuration(stack));
 
-		return itemStackIn;
+		return stack;
 	}
 
 	@Override
-	public void onPlayerStoppedUsing(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) {
-		int j = (int) ((getMaxItemUseDuration(p_77615_1_) - p_77615_4_) * chargeVelocityMultiplier());
+	public void onPlayerStoppedUsing(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) {
+		int j = (int) ((getMaxItemUseDuration(stack) - itemInUseCount) * chargeVelocityMultiplier());
 
-		ArrowLooseEvent event = new ArrowLooseEvent(p_77615_3_, p_77615_1_, j);
+		ArrowLooseEvent event = new ArrowLooseEvent(player, stack, j);
 		MinecraftForge.EVENT_BUS.post(event);
 		if(event.isCanceled())
 			return;
 		j = event.charge;
 
-		boolean flag = canFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_);
-		boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0;
+		boolean flag = canFire(stack, world, player, itemInUseCount);
+		boolean infinity = EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0;
 
 		if(flag) {
 			float f = j / 20.0F;
@@ -101,31 +101,31 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem {
 			if(f > 1.0F)
 				f = 1.0F;
 
-			EntityArrow entityarrow = makeArrow(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, f);
+			EntityArrow entityarrow = makeArrow(stack, world, player, itemInUseCount, f);
 
 			if(f == 1.0F)
 				entityarrow.setIsCritical(true);
 
-			int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, p_77615_1_);
+			int k = EnchantmentHelper.getEnchantmentLevel(Enchantment.power.effectId, stack);
 
 			if(k > 0)
 				entityarrow.setDamage(entityarrow.getDamage() + k * 0.5D + 0.5D);
 
-			int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, p_77615_1_);
+			int l = EnchantmentHelper.getEnchantmentLevel(Enchantment.punch.effectId, stack);
 
 			if(l > 0)
 				entityarrow.setKnockbackStrength(l);
 
-			if(EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, p_77615_1_) > 0)
+			if(EnchantmentHelper.getEnchantmentLevel(Enchantment.flame.effectId, stack) > 0)
 				entityarrow.setFire(100);
 
-			ToolCommons.damageItem(p_77615_1_, 1, p_77615_3_, MANA_PER_DAMAGE);
-			p_77615_2_.playSoundAtEntity(p_77615_3_, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
+			ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE);
+			world.playSoundAtEntity(player, "random.bow", 1.0F, 1.0F / (itemRand.nextFloat() * 0.4F + 1.2F) + f * 0.5F);
 
-			onFire(p_77615_1_, p_77615_2_, p_77615_3_, p_77615_4_, infinity, entityarrow);
+			onFire(stack, world, player, itemInUseCount, infinity, entityarrow);
 
-			if(!p_77615_2_.isRemote)
-				p_77615_2_.spawnEntityInWorld(entityarrow);
+			if(!world.isRemote)
+				world.spawnEntityInWorld(entityarrow);
 		}
 	}
 
@@ -137,37 +137,37 @@ public class ItemLivingwoodBow extends ItemBow implements IManaUsingItem {
 		return true;
 	}
 
-	EntityArrow makeArrow(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, float f) {
-		return new EntityArrow(p_77615_2_, p_77615_3_, f * 2.0F);
+	EntityArrow makeArrow(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, float f) {
+		return new EntityArrow(world, player, f * 2.0F);
 	}
 
-	boolean canFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_) {
-		return p_77615_3_.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, p_77615_1_) > 0 || p_77615_3_.inventory.hasItem(Items.arrow);
+	boolean canFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount) {
+		return player.capabilities.isCreativeMode || EnchantmentHelper.getEnchantmentLevel(Enchantment.infinity.effectId, stack) > 0 || player.inventory.hasItem(Items.arrow);
 	}
 
-	void onFire(ItemStack p_77615_1_, World p_77615_2_, EntityPlayer p_77615_3_, int p_77615_4_, boolean infinity, EntityArrow arrow) {
+	void onFire(ItemStack stack, World world, EntityPlayer player, int itemInUseCount, boolean infinity, EntityArrow arrow) {
 		if(infinity)
 			arrow.canBePickedUp = 2;
-		else p_77615_3_.inventory.consumeInventoryItem(Items.arrow);
+		else player.inventory.consumeInventoryItem(Items.arrow);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this, 0);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this, 0);
 		for(int i = 0; i < 3; i++)
-			pullIcons[i] = IconHelper.forItem(par1IconRegister, this, i + 1);
+			pullIcons[i] = IconHelper.forItem(register, this, i + 1);
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 3 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 3 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/elementium/ItemElementiumShears.java

@@ -32,31 +32,31 @@ public class ItemElementiumShears extends ItemManasteelShears {
 	}
 
 	@Override
-	public EnumAction getItemUseAction(ItemStack par1ItemStack) {
+	public EnumAction getItemUseAction(ItemStack stack) {
 		return EnumAction.bow;
 	}
 
 	@Override
-	public int getMaxItemUseDuration(ItemStack par1ItemStack) {
+	public int getMaxItemUseDuration(ItemStack stack) {
 		return 72000;
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		par3EntityPlayer.setItemInUse(par1ItemStack, getMaxItemUseDuration(par1ItemStack));
-		return par1ItemStack;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		player.setItemInUse(stack, getMaxItemUseDuration(stack));
+		return stack;
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		super.registerIcons(par1IconRegister);
-		dammitReddit = IconHelper.forName(par1IconRegister, "dammitReddit");
+	public void registerIcons(IIconRegister register) {
+		super.registerIcons(register);
+		dammitReddit = IconHelper.forName(register, "dammitReddit");
 	}
 
 	@Override
-	public IIcon getIconIndex(ItemStack par1ItemStack) {
-		return par1ItemStack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(par1ItemStack);
+	public IIcon getIconIndex(ItemStack stack) {
+		return stack.getDisplayName().equalsIgnoreCase("dammit reddit") ? dammitReddit : super.getIconIndex(stack);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelAxe.java

@@ -54,25 +54,25 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
-		ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage());
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		ToolCommons.damageItem(stack, 1, attacker, getManaPerDamage());
 		return true;
 	}
 
@@ -89,11 +89,11 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		for(int i = 0; i < player.inventory.getSizeInventory(); i++) {
 			ItemStack stackAt = player.inventory.getStackInSlot(i);
 			if(stackAt != null && SAPLING_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) {
-				boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz);
+				boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, side, subX, subY, subZ);
 				if(stackAt.stackSize == 0)
 					player.inventory.setInventorySlotContents(i, null);
 
@@ -107,14 +107,14 @@ public class ItemManasteelAxe extends ItemAxe implements IManaUsingItem, ISortab
 
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, getManaPerDamage() * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelPick.java

@@ -54,25 +54,25 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
-		ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDmg());
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		ToolCommons.damageItem(stack, 1, attacker, getManaPerDmg());
 		return true;
 	}
 
@@ -85,11 +85,11 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) {
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
 		for(int i = 0; i < player.inventory.getSizeInventory(); i++) {
 			ItemStack stackAt = player.inventory.getStackInSlot(i);
 			if(stackAt != null && TORCH_PATTERN.matcher(stackAt.getItem().getUnlocalizedName()).find()) {
-				boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, s, sx, sy, sz);
+				boolean did = stackAt.getItem().onItemUse(stackAt, player, world, x, y, z, side, subX, subY, subZ);
 				if(stackAt.stackSize == 0)
 					player.inventory.setInventorySlotContents(i, null);
 
@@ -106,14 +106,14 @@ public class ItemManasteelPick extends ItemPickaxe implements IManaUsingItem, IS
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShears.java

@@ -53,20 +53,20 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem {
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override
@@ -74,9 +74,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem {
 		if(entity.worldObj.isRemote)
 			return false;
 
-		if(entity instanceof IShearable) {
-			IShearable target = (IShearable)entity;
-			if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) {
+		if(entity instanceof IShearable target) {
+            if(target.isShearable(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ)) {
 				ArrayList<ItemStack> drops = target.onSheared(itemstack, entity.worldObj, (int) entity.posX, (int) entity.posY, (int) entity.posZ, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack));
 
 				Random rand = new Random();
@@ -102,9 +101,8 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem {
 			return false;
 
 		Block block = player.worldObj.getBlock(x, y, z);
-		if(block instanceof IShearable) {
-			IShearable target = (IShearable)block;
-			if(target.isShearable(itemstack, player.worldObj, x, y, z)) {
+		if(block instanceof IShearable target) {
+            if(target.isShearable(itemstack, player.worldObj, x, y, z)) {
 				ArrayList<ItemStack> drops = target.onSheared(itemstack, player.worldObj, x, y, z, EnchantmentHelper.getEnchantmentLevel(Enchantment.fortune.effectId, itemstack));
 				Random rand = new Random();
 
@@ -128,14 +126,14 @@ public class ItemManasteelShears extends ItemShears implements IManaUsingItem {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelShovel.java

@@ -52,25 +52,25 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
-		ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, MANA_PER_DAMAGE);
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		ToolCommons.damageItem(stack, 1, attacker, MANA_PER_DAMAGE);
 		return true;
 	}
 
@@ -83,30 +83,30 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack p_77648_1_, EntityPlayer p_77648_2_, World p_77648_3_, int p_77648_4_, int p_77648_5_, int p_77648_6_, int p_77648_7_, float p_77648_8_, float p_77648_9_, float p_77648_10_) {
-		if(!p_77648_2_.canPlayerEdit(p_77648_4_, p_77648_5_, p_77648_6_, p_77648_7_, p_77648_1_))
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(!player.canPlayerEdit(x, y, z, side, stack))
 			return false;
 		else {
-			UseHoeEvent event = new UseHoeEvent(p_77648_2_, p_77648_1_, p_77648_3_, p_77648_4_, p_77648_5_, p_77648_6_);
+			UseHoeEvent event = new UseHoeEvent(player, stack, world, x, y, z);
 			if(MinecraftForge.EVENT_BUS.post(event))
 				return false;
 
 			if(event.getResult() == Result.ALLOW) {
-				ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE);
+				ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE);
 				return true;
 			}
 
-			Block block = p_77648_3_.getBlock(p_77648_4_, p_77648_5_, p_77648_6_);
+			Block block = world.getBlock(x, y, z);
 
-			if(p_77648_7_ != 0 && p_77648_3_.getBlock(p_77648_4_, p_77648_5_ + 1, p_77648_6_).isAir(p_77648_3_, p_77648_4_, p_77648_5_ + 1, p_77648_6_) && (block == Blocks.grass || block == Blocks.dirt)) {
+			if(side != 0 && world.getBlock(x, y + 1, z).isAir(world, x, y + 1, z) && (block == Blocks.grass || block == Blocks.dirt)) {
 				Block block1 = Blocks.farmland;
-				p_77648_3_.playSoundEffect(p_77648_4_ + 0.5F, p_77648_5_ + 0.5F, p_77648_6_ + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F);
+				world.playSoundEffect(x + 0.5F, y + 0.5F, z + 0.5F, block1.stepSound.getStepResourcePath(), (block1.stepSound.getVolume() + 1.0F) / 2.0F, block1.stepSound.getPitch() * 0.8F);
 
-				if (p_77648_3_.isRemote)
+				if (world.isRemote)
 					return true;
 				else {
-					p_77648_3_.setBlock(p_77648_4_, p_77648_5_, p_77648_6_, block1);
-					ToolCommons.damageItem(p_77648_1_, 1, p_77648_2_, MANA_PER_DAMAGE);
+					world.setBlock(x, y, z, block1);
+					ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE);
 					return true;
 				}
 			}
@@ -116,14 +116,14 @@ public class ItemManasteelShovel extends ItemSpade implements IManaUsingItem, IS
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, MANA_PER_DAMAGE * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, MANA_PER_DAMAGE * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/manasteel/ItemManasteelSword.java

@@ -50,34 +50,34 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem {
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
-		elucidatorIcon = IconHelper.forName(par1IconRegister, "elucidator");
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
+		elucidatorIcon = IconHelper.forName(register, "elucidator");
 	}
 
 	@Override
-	public boolean hitEntity(ItemStack par1ItemStack, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase) {
-		if(usesMana(par1ItemStack))
-			ToolCommons.damageItem(par1ItemStack, 1, par3EntityLivingBase, getManaPerDamage());
+	public boolean hitEntity(ItemStack stack, EntityLivingBase victim, EntityLivingBase attacker) {
+		if(usesMana(stack))
+			ToolCommons.damageItem(stack, 1, attacker, getManaPerDamage());
 		return true;
 	}
 
 	@Override
-	public IIcon getIconIndex(ItemStack par1ItemStack) {
-		String name = par1ItemStack.getDisplayName().toLowerCase().trim();
-		return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(par1ItemStack);
+	public IIcon getIconIndex(ItemStack stack) {
+		String name = stack.getDisplayName().toLowerCase().trim();
+		return name.equals("the elucidator") ? elucidatorIcon : super.getIconIndex(stack);
 	}
 
 	@Override
@@ -94,8 +94,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem {
 	}
 
 	@Override
-	public void onUpdate(ItemStack stack, World world, Entity player, int par4, boolean par5) {
-		if(!world.isRemote && player instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) player, getManaPerDamage() * 2, true))
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		if(!world.isRemote && entity instanceof EntityPlayer && stack.getItemDamage() > 0 && ManaItemHandler.requestManaExactForTool(stack, (EntityPlayer) entity, getManaPerDamage() * 2, true))
 			stack.setItemDamage(stack.getItemDamage() - 1);
 	}
 
@@ -104,8 +104,8 @@ public class ItemManasteelSword extends ItemSword implements IManaUsingItem {
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 0 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 0 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraAxe.java

@@ -85,13 +85,13 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		iconOn = IconHelper.forItem(par1IconRegister, this, 0);
-		iconOff = IconHelper.forItem(par1IconRegister, this, 1);
+	public void registerIcons(IIconRegister register) {
+		iconOn = IconHelper.forItem(register, this, 0);
+		iconOff = IconHelper.forItem(register, this, 1);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int p_77617_1_) {
+	public IIcon getIconFromDamage(int meta) {
 		return iconOn;
 	}
 
@@ -396,10 +396,9 @@ public class ItemTerraAxe extends ItemManasteelAxe implements ISequentialBreaker
 			
 			@Override
 			public boolean equals(Object other) {
-				if(!(other instanceof SwapCandidate)) return false;
-				
-				SwapCandidate cand = (SwapCandidate) other;
-				return coordinates.equals(cand.coordinates) && range == cand.range;
+				if(!(other instanceof SwapCandidate cand)) return false;
+
+                return coordinates.equals(cand.coordinates) && range == cand.range;
 			}
 		}
 	}

src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraPick.java

@@ -86,43 +86,43 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer p, List<String> list, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		String rankFormat = StatCollector.translateToLocal("botaniamisc.toolRank");
 		String rank = StatCollector.translateToLocal("botania.rank" + getLevel(stack));
-		list.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7"));
+		infoList.add(String.format(rankFormat, rank).replaceAll("&", "\u00a7"));
 		if(getMana(stack) == Integer.MAX_VALUE)
-			list.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife"));
+			infoList.add(EnumChatFormatting.RED + StatCollector.translateToLocal("botaniamisc.getALife"));
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) {
-		getMana(par1ItemStack);
-		int level = getLevel(par1ItemStack);
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		getMana(stack);
+		int level = getLevel(stack);
 
 		if(level != 0) {
-			setEnabled(par1ItemStack, !isEnabled(par1ItemStack));
-			if(!par2World.isRemote)
-				par2World.playSoundAtEntity(par3EntityPlayer, "botania:terraPickMode", 0.5F, 0.4F);
+			setEnabled(stack, !isEnabled(stack));
+			if(!world.isRemote)
+				world.playSoundAtEntity(player, "botania:terraPickMode", 0.5F, 0.4F);
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int s, float sx, float sy, float sz) {
-		return player.isSneaking() && super.onItemUse(stack, player, world, x, y, z, s, sx, sy, sz);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		return player.isSneaking() && super.onItemUse(stack, player, world, x, y, z, side, subX, subY, subZ);
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5);
-		if(isEnabled(par1ItemStack)) {
-			int level = getLevel(par1ItemStack);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		super.onUpdate(stack, world, entity, invSlot, isHeld);
+		if(isEnabled(stack)) {
+			int level = getLevel(stack);
 
 			if(level == 0)
-				setEnabled(par1ItemStack, false);
-			else if(par3Entity instanceof EntityPlayer && !((EntityPlayer) par3Entity).isSwingInProgress)
-				addMana(par1ItemStack, -level);
+				setEnabled(stack, false);
+			else if(entity instanceof EntityPlayer && !((EntityPlayer) entity).isSwingInProgress)
+				addMana(stack, -level);
 		}
 	}
 
@@ -186,10 +186,10 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		iconTool = IconHelper.forItem(par1IconRegister, this, 0);
-		iconOverlay = IconHelper.forItem(par1IconRegister, this, 1);
-		iconTipped = IconHelper.forItem(par1IconRegister, this, 2);
+	public void registerIcons(IIconRegister register) {
+		iconTool = IconHelper.forItem(register, this, 0);
+		iconOverlay = IconHelper.forItem(register, this, 1);
+		iconTipped = IconHelper.forItem(register, this, 2);
 	}
 
 	@Override
@@ -221,8 +221,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par2 == 0 || !isEnabled(par1ItemStack))
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(renderPass == 0 || !isEnabled(stack))
 			return 0xFFFFFF;
 
 		return Color.HSBtoRGB(0.375F, (float) Math.min(1F, Math.sin(System.currentTimeMillis() / 200D) * 0.5 + 1F), 1F);
@@ -294,8 +294,8 @@ public class ItemTerraPick extends ItemManasteelPick implements IManaItem, ISequ
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/equipment/tool/terrasteel/ItemTerraSword.java

@@ -50,18 +50,17 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I
 	}
 
 	@Override
-	public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) {
-		super.onUpdate(par1ItemStack, par2World, par3Entity, par4, par5);
-		if(par3Entity instanceof EntityPlayer) {
-			EntityPlayer player = (EntityPlayer) par3Entity;
-			PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed);
+	public void onUpdate(ItemStack stack, World world, Entity entity, int invSlot, boolean isHeld) {
+		super.onUpdate(stack, world, entity, invSlot, isHeld);
+		if(entity instanceof EntityPlayer player) {
+            PotionEffect haste = player.getActivePotionEffect(Potion.digSpeed);
 			float check = haste == null ? 0.16666667F : haste.getAmplifier() == 1 ? 0.5F : 0.4F;
 
-			if(player.getCurrentEquippedItem() == par1ItemStack && player.swingProgress == check && !par2World.isRemote && par2World.rand.nextInt(2) == 0) {
-				EntityManaBurst burst = getBurst(player, par1ItemStack);
-				par2World.spawnEntityInWorld(burst);
-				ToolCommons.damageItem(par1ItemStack, 1, player, MANA_PER_DAMAGE);
-				par2World.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F);
+			if(player.getCurrentEquippedItem() == stack && player.swingProgress == check && !world.isRemote && world.rand.nextInt(2) == 0) {
+				EntityManaBurst burst = getBurst(player, stack);
+				world.spawnEntityInWorld(burst);
+				ToolCommons.damageItem(stack, 1, player, MANA_PER_DAMAGE);
+				world.playSoundAtEntity(player, "botania:terraBlade", 0.4F, 1.4F);
 			}
 		}
 	}
@@ -134,8 +133,8 @@ public class ItemTerraSword extends ItemManasteelSword implements ILensEffect, I
 	}
 
 	@Override
-	public boolean getIsRepairable(ItemStack par1ItemStack, ItemStack par2ItemStack) {
-		return par2ItemStack.getItem() == ModItems.manaResource && par2ItemStack.getItemDamage() == 4 ? true : super.getIsRepairable(par1ItemStack, par2ItemStack);
+	public boolean getIsRepairable(ItemStack stack, ItemStack repairMaterial) {
+		return repairMaterial.getItem() == ModItems.manaResource && repairMaterial.getItemDamage() == 4 ? true : super.getIsRepairable(stack, repairMaterial);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/lens/ItemLens.java

@@ -152,12 +152,12 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
-		iconGlass = IconHelper.forName(par1IconRegister, "lensInside");
+	public void registerIcons(IIconRegister register) {
+		iconGlass = IconHelper.forName(register, "lensInside");
 
 		ringIcons = new IIcon[SUBTYPES];
 		for(int i = 0; i < ringIcons.length; i++)
-			ringIcons[i] = IconHelper.forName(par1IconRegister, LibItemNames.LENS_NAMES[i]);
+			ringIcons[i] = IconHelper.forName(register, LibItemNames.LENS_NAMES[i]);
 	}
 
 	@Override
@@ -172,27 +172,27 @@ public class ItemLens extends ItemMod implements ILensControl, ICompositableLens
 	}
 
 	@Override
-	public IIcon getIconFromDamageForRenderPass(int par1, int par2) {
-		return par2 == 1 ? ringIcons[Math.min(SUBTYPES - 1, par1)] : iconGlass;
+	public IIcon getIconFromDamageForRenderPass(int meta, int renderPass) {
+		return renderPass == 1 ? ringIcons[Math.min(SUBTYPES - 1, meta)] : iconGlass;
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int par1) {
-		return getIconFromDamageForRenderPass(par1, 0);
+	public IIcon getIconFromDamage(int meta) {
+		return getIconFromDamageForRenderPass(meta, 0);
 	}
 
 	@Override
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		return par2 == 0 ? getLensColor(par1ItemStack) : 0xFFFFFF;
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		return renderPass == 0 ? getLensColor(stack) : 0xFFFFFF;
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, par1ItemStack.getItemDamage())];
+	public String getUnlocalizedName(ItemStack stack) {
+		return "item." + LibItemNames.LENS_NAMES[Math.min(SUBTYPES - 1, stack.getItemDamage())];
 	}
 
 	@Override
-	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean adv) {
+	public void addInformation(ItemStack stack, EntityPlayer player, List<String> infoList, boolean advanced) {
 		int storedColor = getStoredColor(stack);
 		if(storedColor != -1)
 			infoList.add(String.format(StatCollector.translateToLocal("botaniamisc.color"), StatCollector.translateToLocal("botania.color" + storedColor)));

src/main/java/vazkii/botania/common/item/lens/LensPaint.java

@@ -31,7 +31,7 @@ public class LensPaint extends Lens {
 	public boolean collideBurst(IManaBurst burst, EntityThrowable entity, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack) {
 		int storedColor = ItemLens.getStoredColor(stack);
 		if(!burst.isFake() && storedColor > -1 && storedColor < 17) {
-			if(pos.entityHit != null && pos.entityHit instanceof EntitySheep) {
+			if(pos.entityHit instanceof EntitySheep) {
 				int r = 20;
 				int sheepColor = ((EntitySheep) pos.entityHit).getFleeceColor();
 				List<EntitySheep> sheepList = entity.worldObj.getEntitiesWithinAABB(EntitySheep.class, AxisAlignedBB.getBoundingBox(pos.entityHit.posX - r, pos.entityHit.posY - r, pos.entityHit.posZ - r, pos.entityHit.posX + r, pos.entityHit.posY + r, pos.entityHit.posZ + r));

src/main/java/vazkii/botania/common/item/lens/LensRedirect.java

@@ -28,10 +28,9 @@ public class LensRedirect extends Lens {
 		ChunkCoordinates coords = burst.getBurstSourceChunkCoordinates();
 		if(!entity.worldObj.isRemote && pos.entityHit == null && coords.posY != -1 && (pos.blockX != coords.posX || pos.blockY != coords.posY || pos.blockZ != coords.posZ)) {
 			TileEntity tile = entity.worldObj.getTileEntity(pos.blockX, pos.blockY, pos.blockZ);
-			if(tile != null && tile instanceof IRedirectable) {
+			if(tile instanceof IRedirectable redir) {
 				if(!burst.isFake()) {
-					IRedirectable redir = (IRedirectable) tile;
-					Vector3 tileVec = Vector3.fromTileEntityCenter(tile);
+                    Vector3 tileVec = Vector3.fromTileEntityCenter(tile);
 					Vector3 sourceVec = new Vector3(coords.posX + 0.5, coords.posY + 0.5, coords.posZ + 0.5);
 
 					AxisAlignedBB axis = entity.worldObj.getBlock(coords.posX, coords.posY, coords.posZ).getCollisionBoundingBoxFromPool(entity.worldObj, coords.posX, coords.posY, coords.posZ);

src/main/java/vazkii/botania/common/item/material/ItemDye.java

@@ -29,21 +29,20 @@ public class ItemDye extends Item16Colors {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		Block block = par3World.getBlock(par4, par5, par6);
-		int meta = par1ItemStack.getItemDamage();
-		if(meta != par3World.getBlockMetadata(par4, par5, par6) && (block == Blocks.wool || block == Blocks.carpet)) {
-			par3World.setBlockMetadataWithNotify(par4, par5, par6, meta, 1 | 2);
-			par1ItemStack.stackSize--;
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		Block block = world.getBlock(x, y, z);
+		int meta = stack.getItemDamage();
+		if(meta != world.getBlockMetadata(x, y, z) && (block == Blocks.wool || block == Blocks.carpet)) {
+			world.setBlockMetadataWithNotify(x, y, z, meta, 1 | 2);
+			stack.stackSize--;
 			return true;
 		}
 		
-		TileEntity tile = par3World.getTileEntity(par4, par5, par6);
-		if(tile instanceof IDyablePool) {
-			IDyablePool dyable = (IDyablePool) tile;
-			if(meta != dyable.getColor()) {
+		TileEntity tile = world.getTileEntity(x, y, z);
+		if(tile instanceof IDyablePool dyable) {
+            if(meta != dyable.getColor()) {
 				dyable.setColor(meta);
-				par1ItemStack.stackSize--;
+				stack.stackSize--;
 				return true;
 			}
 		}
@@ -53,9 +52,8 @@ public class ItemDye extends Item16Colors {
 
 	@Override
 	public boolean itemInteractionForEntity(ItemStack stack, EntityPlayer player, EntityLivingBase target) {
-		if(target instanceof EntitySheep) {
-			EntitySheep entitysheep = (EntitySheep)target;
-			int i = stack.getItemDamage();
+		if(target instanceof EntitySheep entitysheep) {
+            int i = stack.getItemDamage();
 
 			if(!entitysheep.getSheared() && entitysheep.getFleeceColor() != i) {
 				entitysheep.setFleeceColor(i);

src/main/java/vazkii/botania/common/item/material/ItemManaResource.java

@@ -90,33 +90,33 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		if(par1ItemStack.getItemDamage() == 4 || par1ItemStack.getItemDamage() == 14)
-			return EntityDoppleganger.spawn(par2EntityPlayer, par1ItemStack, par3World, par4, par5, par6, par1ItemStack.getItemDamage() == 14);
-		else if(par1ItemStack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(par1ItemStack, par3World, par4, par5, par6, par2EntityPlayer)) {
-			if(!par3World.isRemote)
-				par3World.playAuxSFX(2005, par4, par5, par6, 0);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		if(stack.getItemDamage() == 4 || stack.getItemDamage() == 14)
+			return EntityDoppleganger.spawn(player, stack, world, x, y, z, stack.getItemDamage() == 14);
+		else if(stack.getItemDamage() == 20 && net.minecraft.item.ItemDye.applyBonemeal(stack, world, x, y, z, player)) {
+			if(!world.isRemote)
+				world.playAuxSFX(2005, x, y, z, 0);
 
 			return true;
 		}
 
-		return super.onItemUse(par1ItemStack, par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
+		return super.onItemUse(stack, player, world, x, y, z, side, subX, subY, subZ);
 	}
 
 	@Override
-	public ItemStack onItemRightClick(ItemStack par1ItemStack, World par3World, EntityPlayer par2EntityPlayer) {
-		if(par1ItemStack.getItemDamage() == 15) {
-			if(!par2EntityPlayer.capabilities.isCreativeMode)
-				--par1ItemStack.stackSize;
+	public ItemStack onItemRightClick(ItemStack stack, World world, EntityPlayer player) {
+		if(stack.getItemDamage() == 15) {
+			if(!player.capabilities.isCreativeMode)
+				--stack.stackSize;
 
-			par3World.playSoundAtEntity(par2EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
+			world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F));
 
-			if(!par3World.isRemote)
-				par3World.spawnEntityInWorld(new EntityEnderAirBottle(par3World, par2EntityPlayer));
-			else par2EntityPlayer.swingItem();
+			if(!world.isRemote)
+				world.spawnEntityInWorld(new EntityEnderAirBottle(world, player));
+			else player.swingItem();
 		}
 
-		return par1ItemStack;
+		return stack;
 	}
 
 	@Override
@@ -129,35 +129,35 @@ public class ItemManaResource extends ItemMod implements IFlowerComponent, IElve
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[types];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forName(par1IconRegister, LibItemNames.MANA_RESOURCE_NAMES[i]);
+			icons[i] = IconHelper.forName(register, LibItemNames.MANA_RESOURCE_NAMES[i]);
 
-		tailIcon = IconHelper.forName(par1IconRegister, "tail");
-		phiFlowerIcon = IconHelper.forName(par1IconRegister, "phiFlower");
-		goldfishIcon = IconHelper.forName(par1IconRegister, "goldfish");
-		nerfBatIcon = IconHelper.forName(par1IconRegister, "nerfBat");
+		tailIcon = IconHelper.forName(register, "tail");
+		phiFlowerIcon = IconHelper.forName(register, "phiFlower");
+		goldfishIcon = IconHelper.forName(register, "goldfish");
+		nerfBatIcon = IconHelper.forName(register, "nerfBat");
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int getColorFromItemStack(ItemStack par1ItemStack, int par2) {
-		if(par1ItemStack.getItemDamage() == 5 || par1ItemStack.getItemDamage() == 14)
+	public int getColorFromItemStack(ItemStack stack, int renderPass) {
+		if(stack.getItemDamage() == 5 || stack.getItemDamage() == 14)
 			return Color.HSBtoRGB(Botania.proxy.getWorldElapsedTicks() * 2 % 360 / 360F, 0.25F, 1F);
 
 		return 0xFFFFFF;
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, par1ItemStack.getItemDamage())];
+	public String getUnlocalizedName(ItemStack stack) {
+		return "item." + LibItemNames.MANA_RESOURCE_NAMES[Math.min(types - 1, stack.getItemDamage())];
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/material/ItemPestleAndMortar.java

@@ -24,7 +24,7 @@ public class ItemPestleAndMortar extends ItemMod {
 	}
 
 	@Override
-	public boolean doesContainerItemLeaveCraftingGrid(ItemStack par1ItemStack) {
+	public boolean doesContainerItemLeaveCraftingGrid(ItemStack stack) {
 		return false;
 	}
 

src/main/java/vazkii/botania/common/item/material/ItemPetal.java

@@ -26,13 +26,13 @@ public class ItemPetal extends Item16Colors implements IFlowerComponent {
 	}
 
 	@Override
-	public boolean onItemUse(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, World par3World, int par4, int par5, int par6, int par7, float par8, float par9, float par10) {
-		ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, par1ItemStack.getItemDamage());
-		stackToPlace.tryPlaceItemIntoWorld(par2EntityPlayer, par3World, par4, par5, par6, par7, par8, par9, par10);
+	public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side, float subX, float subY, float subZ) {
+		ItemStack stackToPlace = new ItemStack(ModBlocks.buriedPetals, 1, stack.getItemDamage());
+		stackToPlace.tryPlaceItemIntoWorld(player, world, x, y, z, side, subX, subY, subZ);
 
 		if(stackToPlace.stackSize == 0) {
-			if(!par2EntityPlayer.capabilities.isCreativeMode)
-				par1ItemStack.stackSize--;
+			if(!player.capabilities.isCreativeMode)
+				stack.stackSize--;
 
 			return true;
 		}

src/main/java/vazkii/botania/common/item/material/ItemQuartz.java

@@ -40,24 +40,24 @@ public class ItemQuartz extends ItemMod implements IElvenItem {
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/material/ItemRune.java

@@ -39,30 +39,30 @@ public class ItemRune extends ItemMod implements IFlowerComponent, IPickupAchiev
 	}
 
 	@Override
-	public void registerIcons(IIconRegister par1IconRegister) {
+	public void registerIcons(IIconRegister register) {
 		icons = new IIcon[16];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forItem(par1IconRegister, this, i);
+			icons[i] = IconHelper.forItem(register, this, i);
 	}
 
 	@Override
-	public IIcon getIconFromDamage(int par1) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIconFromDamage(int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
-	public void getSubItems(Item par1, CreativeTabs par2CreativeTabs, List<ItemStack> par3List) {
+	public void getSubItems(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public String getUnlocalizedName(ItemStack par1ItemStack) {
-		return getUnlocalizedNameLazy(par1ItemStack) + par1ItemStack.getItemDamage();
+	public String getUnlocalizedName(ItemStack stack) {
+		return getUnlocalizedNameLazy(stack) + stack.getItemDamage();
 	}
 
-	String getUnlocalizedNameLazy(ItemStack par1ItemStack) {
-		return super.getUnlocalizedName(par1ItemStack);
+	String getUnlocalizedNameLazy(ItemStack stack) {
+		return super.getUnlocalizedName(stack);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/item/record/ItemModRecord.java

@@ -35,20 +35,20 @@ public class ItemModRecord extends ItemRecord implements MusicRecordMetadataProv
 	}
 
 	@Override
-	public Item setUnlocalizedName(String par1Str) {
-		GameRegistry.registerItem(this, par1Str);
-		return super.setUnlocalizedName(par1Str);
+	public Item setUnlocalizedName(String name) {
+		GameRegistry.registerItem(this, name);
+		return super.setUnlocalizedName(name);
 	}
 
 	@Override
-	public String getUnlocalizedNameInefficiently(ItemStack par1ItemStack) {
-		return super.getUnlocalizedNameInefficiently(par1ItemStack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD);
+	public String getUnlocalizedNameInefficiently(ItemStack stack) {
+		return super.getUnlocalizedNameInefficiently(stack).replaceAll("item\\.", "item." + LibResources.PREFIX_MOD);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerIcons(IIconRegister par1IconRegister) {
-		itemIcon = IconHelper.forItem(par1IconRegister, this);
+	public void registerIcons(IIconRegister register) {
+		itemIcon = IconHelper.forItem(register, this);
 	}
 
 	@Override