update 2.8.x deps

Co-authored-by: glowredman <35727266+glowredman@users.noreply.github.com>

dependencies.gradle

@@ -1,14 +1,14 @@
 // Add your dependencies here
 
 dependencies {
-    api('com.github.GTNewHorizons:Baubles-Expanded:2.1.15-GTNH:dev')
+    api('com.github.GTNewHorizons:Baubles-Expanded:2.1.16-GTNH:dev')
     api('com.github.GTNewHorizons:GTNHLib:0.6.40:dev')
 
-    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.44:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.45:api') {transitive=false}
     compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.6.8:dev') {transitive=false}
-    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.90-GTNH:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:NotEnoughItems:2.7.91-GTNH:dev')
     compileOnly('com.github.GTNewHorizons:Railcraft:9.16.33:api') {transitive=false}
-    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.8-GTNH:api') {transitive=false}
+    compileOnly('com.github.GTNewHorizons:StorageDrawers:2.1.9-GTNH:api') {transitive=false}
     compileOnly('curse.maven:cofh-lib-220333:2388748')
     compileOnly('curse.maven:minefactory-reloaded-66672:2366150')
     compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')

gradle.properties

@@ -45,7 +45,7 @@ enableModernJavaSyntax = true
 
 # Enables injecting missing generics into the decompiled source code for a better coding experience.
 # Turns most publicly visible List, Map, etc. into proper List<E>, Map<K, V> types.
-enableGenericInjection = false
+enableGenericInjection = true
 
 # Generate a class with a String field for the mod version named as defined below.
 # If generateGradleTokenClass is empty or not missing, no such class will be generated.

settings.gradle

@@ -17,7 +17,7 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.43'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.44'
 }
 
 

src/main/java/vazkii/botania/api/BotaniaAPI.java

@@ -60,8 +60,8 @@ import cpw.mods.fml.common.Loader;
 
 public final class BotaniaAPI {
 
-	private static List<LexiconCategory> categories = new ArrayList<>();
-	private static List<LexiconEntry> allEntries = new ArrayList<>();
+	private static final List<LexiconCategory> categories = new ArrayList<>();
+	private static final List<LexiconEntry> allEntries = new ArrayList<>();
 
 	public static Map<String, KnowledgeType> knowledgeTypes = new HashMap<>();
 
@@ -78,11 +78,11 @@ public final class BotaniaAPI {
 	public static List<RecipeBrew> brewRecipes = new ArrayList<>();
 	public static List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<>();
 
-	private static BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.<String, Class<? extends SubTileEntity>> create();
-	private static Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<>();
+	private static final BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.create();
+	private static final Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<>();
 	public static Set<String> subtilesForCreativeMenu = new LinkedHashSet<>();
 	public static Map<String, String> subTileMods = new HashMap<>();
-	public static BiMap<String, String> miniFlowers = HashBiMap.<String, String> create();
+	public static BiMap<String, String> miniFlowers = HashBiMap.create();
 
 	public static Map<String, Integer> oreWeights = new HashMap<>();
 	public static Map<String, Integer> oreWeightsNether = new HashMap<>();
@@ -108,7 +108,7 @@ public final class BotaniaAPI {
 	public static KnowledgeType basicKnowledge;
 	public static KnowledgeType elvenKnowledge;
 
-	// This is here for completeness sake, but you shouldn't use it
+	// This is here for completeness’s sake, but you shouldn't use it
 	public static KnowledgeType relicKnowledge;
 
 	// All of these categories are initialized during botania's PreInit stage.
@@ -290,14 +290,14 @@ public final class BotaniaAPI {
 		return fallbackBrew;
 	}
 
-	/*
+	/**
 	 * Registers a Block as disposable using its Ore Dictionary Name.
 	 */
 	public static void registerDisposableBlock(String oreDictName) {
 		disposableBlocks.add(oreDictName);
 	}
 	
-	/*
+	/**
 	 * Registers a Block as semi disposable using its Ore Dictionary Name.
 	 * This means it will not be trashed when sneaking.
 	 */
@@ -313,7 +313,7 @@ public final class BotaniaAPI {
 		return paintable;
 	}
 
-	/*
+	/**
 	 * Blacklists an Entity from being affected by the Rod of the Shaded Mesa.
 	 * Pass in the class for the Entity, e.g. EntityCow.class
 	 */
@@ -321,7 +321,7 @@ public final class BotaniaAPI {
 		gravityRodBlacklist.add(entity);
 	}
 	
-	/*
+	/**
 	 * Checks if the provided Entity is contained in the Blacklist.
 	 * Pass in the class for the Entity, e.g. entity.getClass()
 	 */
@@ -476,7 +476,7 @@ public final class BotaniaAPI {
 	/**
 	 * Registers a Brew Recipe (for the Botanical Brewery).
 	 * @param brew The brew in to be set in this recipe.
-	 * @inputs The items used in the recipe, no more than 6.
+	 * @param inputs The items used in the recipe, no more than 6.
 	 */
 	public static RecipeBrew registerBrewRecipe(Brew brew, Object... inputs) {
 		RecipeBrew recipe = new RecipeBrew(brew, inputs);
@@ -592,7 +592,7 @@ public final class BotaniaAPI {
 	 * https://gist.github.com/Vazkii/9493322
 	 */
 	public static void addOreWeightNether(String ore, int weight) {
-		if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).size() == 0)
+		if(ore.contains("Nether") && OreDictionary.getOres(ore.replace("Nether", "")).isEmpty())
 			return;
 
 		oreWeightsNether.put(ore, weight);

src/main/java/vazkii/botania/api/mana/spark/SparkHelper.java

@@ -23,10 +23,9 @@ public final class SparkHelper {
 		return SparkHelper.getEntitiesAround(ISparkEntity.class, world, x, y, z);
 	}
 
-	public static <T> List<T> getEntitiesAround(Class<? extends T> clazz, World world, double x, double y, double z) {
+	public static <T> List<T> getEntitiesAround(Class<T> clazz, World world, double x, double y, double z) {
 		int r = SPARK_SCAN_RANGE;
-		List<T> entities = world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r));
-		return entities;
+        return world.getEntitiesWithinAABB(clazz, AxisAlignedBB.getBoundingBox(x - r, y - r, z - r, x + r, y + r, z + r));
 	}
 
 }

src/main/java/vazkii/botania/client/core/proxy/ClientProxy.java

@@ -383,7 +383,8 @@ public class ClientProxy extends CommonProxy {
 		super.setExtraReach(entity, reach);
 		Minecraft mc = Minecraft.getMinecraft();
 		EntityPlayer player = mc.thePlayer;
-		if(entity == player) {
+		// Player object might have changed, need to check the UUID.
+		if(entity.worldObj.isRemote && entity.getUniqueID().equals(player.getUniqueID())) {
 			if(!(mc.playerController instanceof IExtendedPlayerController)) {
 				GameType type = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.CURRENT_GAME_TYPE);
 				NetHandlerPlayClient net = ReflectionHelper.getPrivateValue(PlayerControllerMP.class, mc.playerController, LibObfuscation.NET_CLIENT_HANDLER);

src/main/java/vazkii/botania/client/gui/SlotLocked.java

@@ -27,7 +27,7 @@ public class SlotLocked extends Slot {
 	}
 
 	@Override
-	public boolean isItemValid(ItemStack p_75214_1_) {
+	public boolean isItemValid(ItemStack stack) {
 		return false;
 	}
 

src/main/java/vazkii/botania/client/gui/bags/ContainerMagicPlantBag.java

@@ -51,15 +51,15 @@ public abstract class ContainerMagicPlantBag extends Container {
     }
 
     @Override
-    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) {
+    public ItemStack transferStackInSlot(EntityPlayer player, int index) {
         ItemStack itemstack = null;
-        Slot slot = (Slot)inventorySlots.get(p_82846_2_);
+        Slot slot = (Slot)inventorySlots.get(index);
 
         if(slot != null && slot.getHasStack()) {
             ItemStack itemstack1 = slot.getStack();
             itemstack = itemstack1.copy();
 
-            if(p_82846_2_ < 16) {
+            if(index < 16) {
                 if(!mergeItemStack(itemstack1, 16, 52, true))
                     return null;
             } else {
@@ -78,7 +78,7 @@ public abstract class ContainerMagicPlantBag extends Container {
             if(itemstack1.stackSize == itemstack.stackSize)
                 return null;
 
-            slot.onPickupFromSlot(p_82846_1_, itemstack1);
+            slot.onPickupFromSlot(player, itemstack1);
         }
 
         return itemstack;

src/main/java/vazkii/botania/client/gui/bags/GuiMagicPlantBag.java

@@ -24,14 +24,14 @@ public abstract class GuiMagicPlantBag extends GuiContainer {
     }
 
     @Override
-    protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
         String s = StatCollector.translateToLocal(getLocalizedNameKey());
         fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
         fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
     }
 
     @Override
-    protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
         GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
         mc.getTextureManager().bindTexture(texture);
         int k = (width - xSize) / 2;
@@ -55,7 +55,7 @@ public abstract class GuiMagicPlantBag extends GuiContainer {
     }
 
     @Override
-    protected boolean checkHotbarKeys(int p_146983_1_) {
+    protected boolean checkHotbarKeys(int keyCode) {
         return false;
     }
 

src/main/java/vazkii/botania/client/gui/box/ContainerBaubleBox.java

@@ -89,16 +89,16 @@ public class ContainerBaubleBox extends Container {
 	}
 
 	@Override
-	public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int p_82846_2_) {
+	public ItemStack transferStackInSlot(EntityPlayer player, int index) {
 		ItemStack itemstack = null;
-		Slot slot = (Slot)inventorySlots.get(p_82846_2_);
+		Slot slot = (Slot)inventorySlots.get(index);
 
 		if(slot != null && slot.getHasStack()) {
 			ItemStack itemstack1 = slot.getStack();
 			itemstack = itemstack1.copy();
 
-			System.out.println(p_82846_2_ + " " + itemstack);
-			if(p_82846_2_ < 28) {
+			System.out.println(index + " " + itemstack);
+			if(index < 28) {
 				if(!mergeItemStack(itemstack1, 28, 64, true))
 					return null;
 			} else {
@@ -113,7 +113,7 @@ public class ContainerBaubleBox extends Container {
 			if(itemstack1.stackSize == itemstack.stackSize)
 				return null;
 
-			slot.onPickupFromSlot(p_82846_1_, itemstack1);
+			slot.onPickupFromSlot(player, itemstack1);
 		}
 
 		return itemstack;

src/main/java/vazkii/botania/client/gui/box/GuiBaubleBox.java

@@ -29,12 +29,12 @@ public class GuiBaubleBox extends InventoryEffectRenderer {
 	}
 
 	@Override
-	protected boolean checkHotbarKeys(int p_146983_1_) {
+	protected boolean checkHotbarKeys(int keyCode) {
 		return false;
 	}
 
 	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+	protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.getTextureManager().bindTexture(texture);
 		int k = (width - xSize) / 2;
@@ -47,7 +47,7 @@ public class GuiBaubleBox extends InventoryEffectRenderer {
 				drawTexturedModalRect(k+slot.xDisplayPosition, l+slot.yDisplayPosition, 200, 0, 16, 16);
 		}
 
-		GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - p_146976_2_, guiTop + 45 - 30 - p_146976_3_, mc.thePlayer);
+		GuiInventory.func_147046_a(guiLeft + 43, guiTop + 61, 20, guiLeft + 43 - mouseX, guiTop + 45 - 30 - mouseY, mc.thePlayer);
 	}
 
 }

src/main/java/vazkii/botania/client/gui/crafting/ContainerCraftingHalo.java

@@ -57,7 +57,7 @@ public class ContainerCraftingHalo extends ContainerWorkbench {
 	}
 
 	@Override
-	public boolean canInteractWith(EntityPlayer p_75145_1_) {
+	public boolean canInteractWith(EntityPlayer player) {
 		return true;
 	}
 }

src/main/java/vazkii/botania/client/gui/crafting/GuiCraftingHalo.java

@@ -28,13 +28,13 @@ public class GuiCraftingHalo extends GuiContainer {
 	}
 
 	@Override
-	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
+	protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
 		fontRendererObj.drawString(I18n.format("container.crafting", new Object[0]), 28, 6, 4210752);
 		fontRendererObj.drawString(I18n.format("container.inventory", new Object[0]), 8, ySize - 96 + 2, 4210752);
 	}
 
 	@Override
-	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+	protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
 		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
 		mc.getTextureManager().bindTexture(craftingTableGuiTextures);
 		int k = (width - xSize) / 2;

src/main/java/vazkii/botania/client/gui/lexicon/button/GuiButtonLexicon.java

@@ -17,13 +17,13 @@ import net.minecraft.util.ResourceLocation;
 
 public class GuiButtonLexicon extends GuiButton {
 
-	public GuiButtonLexicon(int p_i1021_1_, int p_i1021_2_, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) {
-		super(p_i1021_1_, p_i1021_2_, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_);
+	public GuiButtonLexicon(int stateName, int id, int p_i1021_3_, int p_i1021_4_, int p_i1021_5_, String p_i1021_6_) {
+		super(stateName, id, p_i1021_3_, p_i1021_4_, p_i1021_5_, p_i1021_6_);
 	}
 
 	@Override
-	public void func_146113_a(SoundHandler p_146113_1_)  {
-		p_146113_1_.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
+	public void func_146113_a(SoundHandler soundHandlerIn)  {
+		soundHandlerIn.playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("botania:lexiconPage"), 1.0F));
 	}
 
 }

src/main/java/vazkii/botania/common/block/BlockAlfPortal.java

@@ -39,10 +39,10 @@ public class BlockAlfPortal extends BlockModContainer<TileAlfPortal> implements
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		iconOff = IconHelper.forBlock(par1IconRegister, this, 0);
-		iconOn = IconHelper.forBlock(par1IconRegister, this, 1);
-		portalTex = IconHelper.forBlock(par1IconRegister, this, "Inside");
+	public void registerBlockIcons(IIconRegister register) {
+		iconOff = IconHelper.forBlock(register, this, 0);
+		iconOn = IconHelper.forBlock(register, this, 1);
+		portalTex = IconHelper.forBlock(register, this, "Inside");
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockAltGrass.java

@@ -56,9 +56,9 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
 	}
 	
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -67,16 +67,16 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 6; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES * 2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
@@ -102,8 +102,8 @@ public class BlockAltGrass extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-		return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_);
+	public Item getItemDropped(int meta, Random random, int fortune) {
+		return Blocks.dirt.getItemDropped(0, random, fortune);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockAltar.java

@@ -65,7 +65,7 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -75,23 +75,23 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 9; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) {
-		if(par5Entity instanceof EntityItem) {
-			TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4);
+	public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity collider) {
+		if(collider instanceof EntityItem) {
+			TileAltar tile = (TileAltar) world.getTileEntity(x, y, z);
 			if (tile == null) return;
-			if(tile.collideEntityItem((EntityItem) par5Entity))
+			if(tile.collideEntityItem((EntityItem) collider))
 				VanillaPacketDispatcher.dispatchTEToNearbyPlayers(tile);
 		}
 	}
@@ -104,61 +104,61 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
-		ItemStack stack = par5EntityPlayer.getCurrentEquippedItem();
-		TileAltar tile = (TileAltar) par1World.getTileEntity(par2, par3, par4);
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) {
+		ItemStack stack = player.getCurrentEquippedItem();
+		TileAltar tile = (TileAltar) world.getTileEntity(x, y, z);
 		if (tile == null) return false;
 
-		if(par5EntityPlayer.isSneaking()) {
+		if(player.isSneaking()) {
 			for(int i = tile.getSizeInventory() - 1; i >= 0; i--) {
 				ItemStack stackAt = tile.getStackInSlot(i);
 				if(stackAt != null) {
 					ItemStack copy = stackAt.copy();
-					if(!par5EntityPlayer.inventory.addItemStackToInventory(copy))
-						par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false);
+					if(!player.inventory.addItemStackToInventory(copy))
+						player.dropPlayerItemWithRandomChoice(copy, false);
 					tile.setInventorySlotContents(i, null);
-					par1World.func_147453_f(par2, par3, par4, this);
+					world.func_147453_f(x, y, z, this);
 					break;
 				}
 			}
 		} else if(tile.isEmpty() && tile.hasWater && stack == null)
-			tile.trySetLastRecipe(par5EntityPlayer);
+			tile.trySetLastRecipe(player);
 		else {
-			if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, false))) {
+			if(stack != null && (isValidWaterContainer(stack) || stack.getItem() == ModItems.waterRod && ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, false))) {
 				if(!tile.hasWater) {
 					if(stack.getItem() == ModItems.waterRod)
-						ManaItemHandler.requestManaExact(stack, par5EntityPlayer, ItemWaterRod.COST, true);
-					else if(!par5EntityPlayer.capabilities.isCreativeMode)
-						par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
+						ManaItemHandler.requestManaExact(stack, player, ItemWaterRod.COST, true);
+					else if(!player.capabilities.isCreativeMode)
+						player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack));
 
 					tile.setWater(true);
-					par1World.func_147453_f(par2, par3, par4, this);
+					world.func_147453_f(x, y, z, this);
 				}
 
 				return true;
 			} else if(stack != null && stack.getItem() == Items.lava_bucket) {
-				if(!par5EntityPlayer.capabilities.isCreativeMode)
-					par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, getContainer(stack));
+				if(!player.capabilities.isCreativeMode)
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, getContainer(stack));
 
 				tile.setLava(true);
 				tile.setWater(false);
-				par1World.func_147453_f(par2, par3, par4, this);
+				world.func_147453_f(x, y, z, this);
 
 				return true;
 			} else if(stack != null && stack.getItem() == Items.bucket && (tile.hasWater || tile.hasLava) && !Botania.gardenOfGlassLoaded) {
 				ItemStack bucket = tile.hasLava ? new ItemStack(Items.lava_bucket) : new ItemStack(Items.water_bucket);
 				if(stack.stackSize == 1)
-					par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, bucket);
+					player.inventory.setInventorySlotContents(player.inventory.currentItem, bucket);
 				else {
-					if(!par5EntityPlayer.inventory.addItemStackToInventory(bucket))
-						par5EntityPlayer.dropPlayerItemWithRandomChoice(bucket, false);
+					if(!player.inventory.addItemStackToInventory(bucket))
+						player.dropPlayerItemWithRandomChoice(bucket, false);
 					stack.stackSize--;
 				}
 
 				if(tile.hasLava)
 					tile.setLava(false);
 				else tile.setWater(false);
-				par1World.func_147453_f(par2, par3, par4, this);
+				world.func_147453_f(x, y, z, this);
 
 				return true;
 			}
@@ -212,8 +212,8 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return par2 == 0 ? Blocks.cobblestone.getIcon(par1, par2) : ModFluffBlocks.biomeStoneA.getIcon(par1, par2 + 7);
+	public IIcon getIcon(int side, int meta) {
+		return meta == 0 ? Blocks.cobblestone.getIcon(side, meta) : ModFluffBlocks.biomeStoneA.getIcon(side, meta + 7);
 	}
 
 	@Override
@@ -237,8 +237,8 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -249,14 +249,14 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -268,10 +268,10 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override
@@ -280,8 +280,8 @@ public class BlockAltar extends BlockModContainer<TileAltar> implements ILexicon
 	}
 
 	@Override
-	public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
-		TileAltar altar = (TileAltar) par1World.getTileEntity(par2, par3, par4);
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
+		TileAltar altar = (TileAltar) world.getTileEntity(x, y, z);
 		if (altar == null) return 0;
 		return altar.hasWater ? 15 : 0;
 	}

src/main/java/vazkii/botania/common/block/BlockAvatar.java

@@ -91,8 +91,8 @@ public class BlockAvatar extends BlockModContainer<TileAvatar> implements ILexic
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -103,14 +103,14 @@ public class BlockAvatar extends BlockModContainer<TileAvatar> implements ILexic
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -122,16 +122,16 @@ public class BlockAvatar extends BlockModContainer<TileAvatar> implements ILexic
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override
-	public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) {
-		int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2);
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2);
 	}
 
 	@Override
@@ -140,7 +140,7 @@ public class BlockAvatar extends BlockModContainer<TileAvatar> implements ILexic
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/BlockBifrost.java

@@ -61,15 +61,15 @@ public class BlockBifrost extends BlockModContainer<TileBifrost> implements ILex
 		return new ItemStack(ModItems.rainbowRod);
 	}
 
-	public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_);
+	public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) {
+		Block block = worldIn.getBlock(x, y, z);
 
-		return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
+		return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side);
 	}
 
 	@Override
-	public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_);
+	public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) {
+		return shouldSideBeRendered1(worldIn, x, y, z, 1 - side);
 	}
 
 	@Override
@@ -93,7 +93,7 @@ public class BlockBifrost extends BlockModContainer<TileBifrost> implements ILex
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/BlockBifrostPerm.java

@@ -44,7 +44,7 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -53,15 +53,15 @@ public class BlockBifrostPerm extends BlockMod implements ILexiconable {
 		return false;
 	}
 
-	public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_);
+	public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) {
+		Block block = worldIn.getBlock(x, y, z);
 
-		return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
+		return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side);
 	}
 
 	@Override
-	public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_);
+	public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) {
+		return shouldSideBeRendered1(worldIn, x, y, z, 1 - side);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockCacophonium.java

@@ -72,9 +72,9 @@ public class BlockCacophonium extends BlockModContainer<TileCacophonium> {
 	}
 
 	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-		if(!par6EntityPlayer.capabilities.isCreativeMode)
-			dropBlockAsItem(par1World, par2, par3, par4, par5, 0);
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode)
+			dropBlockAsItem(world, x, y, z, meta, 0);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockCamo.java

@@ -31,8 +31,8 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
 
 	static List<Integer> validRenderTypes = Arrays.asList(0, 31, 39);
 
-	protected BlockCamo(Material par2Material) {
-		super(par2Material);
+	protected BlockCamo(Material material) {
+		super(material);
 	}
 
 	@Override
@@ -59,12 +59,12 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
 	}
 
 	@Override
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
-		TileEntity tile = par1World.getTileEntity(par2, par3, par4);
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) {
+		TileEntity tile = world.getTileEntity(x, y, z);
 
 		if(tile instanceof TileCamo) {
 			TileCamo camo = (TileCamo) tile;
-			ItemStack currentStack = par5EntityPlayer.getCurrentEquippedItem();
+			ItemStack currentStack = player.getCurrentEquippedItem();
 
 			if(currentStack == null)
 				currentStack = new ItemStack(Block.getBlockFromName("air"), 1, 0);
@@ -87,7 +87,7 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
 			if(doChange && currentStack.getItem() != null) {
 				int metadata = currentStack.getItemDamage();
 				if(block instanceof BlockDirectional) {
-					switch (par6) {
+					switch (side) {
 					case 0:
 					case 1:
 						break;
@@ -107,7 +107,7 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
 				}
 				camo.camo = Block.getBlockFromItem(currentStack.getItem());
 				camo.camoMeta = metadata;
-				par1World.markBlockForUpdate(par2,par3,par4);
+				world.markBlockForUpdate(x,y,z);
 
 				return true;
 			}
@@ -128,8 +128,8 @@ public abstract class BlockCamo extends BlockModContainer<TileCamo> {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public int colorMultiplier(IBlockAccess par1World, int par2, int par3, int par4) {
-		TileEntity tile = par1World.getTileEntity(par2, par3, par4);
+	public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) {
+		TileEntity tile = worldIn.getTileEntity(x, y, z);
 		if(tile instanceof TileCamo) {
 			TileCamo camo = (TileCamo) tile;
 			Block block = camo.camo;

src/main/java/vazkii/botania/common/block/BlockCocoon.java

@@ -41,12 +41,12 @@ public class BlockCocoon extends BlockModContainer<TileCocoon> implements ILexic
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
+	public IIcon getIcon(int side, int meta) {
 		return Blocks.web.getBlockTextureFromSide(0);
 	}
 

src/main/java/vazkii/botania/common/block/BlockEnchantedSoil.java

@@ -55,7 +55,7 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -79,8 +79,8 @@ public class BlockEnchantedSoil extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
-		return Blocks.dirt.getItemDropped(0, p_149650_2_, p_149650_3_);
+	public Item getItemDropped(int meta, Random random, int fortune) {
+		return Blocks.dirt.getItemDropped(0, random, fortune);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockEnderEye.java

@@ -37,9 +37,9 @@ public class BlockEnderEye extends BlockModContainer<TileEnderEye> implements IL
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		iconOff = IconHelper.forBlock(par1IconRegister, this, 0);
-		iconOn = IconHelper.forBlock(par1IconRegister, this, 1);
+	public void registerBlockIcons(IIconRegister register) {
+		iconOff = IconHelper.forBlock(register, this, 0);
+		iconOn = IconHelper.forBlock(register, this, 1);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockFakeAir.java

@@ -51,7 +51,7 @@ public class BlockFakeAir extends BlockModContainer<TileFakeAir> {
 	}
 
 	@Override
-	public int tickRate(World p_149738_1_) {
+	public int tickRate(World world) {
 		return 4;
 	}
 
@@ -76,7 +76,7 @@ public class BlockFakeAir extends BlockModContainer<TileFakeAir> {
 	}
 
 	@Override
-	public boolean canCollideCheck(int par1, boolean par2) {
+	public boolean canCollideCheck(int meta, boolean includeLiquid) {
 		return false;
 	}
 
@@ -86,7 +86,7 @@ public class BlockFakeAir extends BlockModContainer<TileFakeAir> {
 	}
 
 	@Override
-	public boolean canDropFromExplosion(Explosion par1Explosion) {
+	public boolean canDropFromExplosion(Explosion explosion) {
 		return false;
 	}
 
@@ -96,7 +96,7 @@ public class BlockFakeAir extends BlockModContainer<TileFakeAir> {
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) {
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
 		return null;
 	}
 

src/main/java/vazkii/botania/common/block/BlockFelPumpkin.java

@@ -49,38 +49,38 @@ public class BlockFelPumpkin extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
-		return p_149691_1_ == 1 ? top : p_149691_1_ == 0 ? top : p_149691_2_ == 2 && p_149691_1_ == 2 ? face : p_149691_2_ == 3 && p_149691_1_ == 5 ? face : p_149691_2_ == 0 && p_149691_1_ == 3 ? face : p_149691_2_ == 1 && p_149691_1_ == 4 ? face : blockIcon;
+	public IIcon getIcon(int side, int meta) {
+		return side == 1 ? top : side == 0 ? top : meta == 2 && side == 2 ? face : meta == 3 && side == 5 ? face : meta == 0 && side == 3 ? face : meta == 1 && side == 4 ? face : blockIcon;
 	}
 
 	@Override
-	public void onBlockAdded(World p_149726_1_, int p_149726_2_, int p_149726_3_, int p_149726_4_) {
-		super.onBlockAdded(p_149726_1_, p_149726_2_, p_149726_3_, p_149726_4_);
+	public void onBlockAdded(World world, int x, int y, int z) {
+		super.onBlockAdded(world, x, y, z);
 
-		if(!p_149726_1_.isRemote && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_) == Blocks.iron_bars && p_149726_1_.getBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_) == Blocks.iron_bars) {
-			p_149726_1_.setBlock(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0), 0, 2);
-			p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0), 0, 2);
-			p_149726_1_.setBlock(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0), 0, 2);
-			EntityBlaze blaze = new EntityBlaze(p_149726_1_);
-			blaze.setLocationAndAngles(p_149726_2_ + 0.5D, p_149726_3_ - 1.95D, p_149726_4_ + 0.5D, 0.0F, 0.0F);
+		if(!world.isRemote && world.getBlock(x, y - 1, z) == Blocks.iron_bars && world.getBlock(x, y - 2, z) == Blocks.iron_bars) {
+			world.setBlock(x, y, z, getBlockById(0), 0, 2);
+			world.setBlock(x, y - 1, z, getBlockById(0), 0, 2);
+			world.setBlock(x, y - 2, z, getBlockById(0), 0, 2);
+			EntityBlaze blaze = new EntityBlaze(world);
+			blaze.setLocationAndAngles(x + 0.5D, y - 1.95D, z + 0.5D, 0.0F, 0.0F);
 			blaze.getEntityData().setBoolean(TAG_FEL_SPAWNED, true);
-			p_149726_1_.spawnEntityInWorld(blaze);
-			p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_, p_149726_4_, getBlockById(0));
-			p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 1, p_149726_4_, getBlockById(0));
-			p_149726_1_.notifyBlockChange(p_149726_2_, p_149726_3_ - 2, p_149726_4_, getBlockById(0));
+			world.spawnEntityInWorld(blaze);
+			world.notifyBlockChange(x, y, z, getBlockById(0));
+			world.notifyBlockChange(x, y - 1, z, getBlockById(0));
+			world.notifyBlockChange(x, y - 2, z, getBlockById(0));
 		}
 	}
 
 	@Override
-	public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) {
-		int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 2.5D) & 3;
-		p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, l, 2);
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 2.5D) & 3;
+		world.setBlockMetadataWithNotify(x, y, z, l, 2);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister p_149651_1_)  {
-		face = IconHelper.forBlock(p_149651_1_, this);
+	public void registerBlockIcons(IIconRegister register)  {
+		face = IconHelper.forBlock(register, this);
 		top = Blocks.pumpkin.getIcon(0, 0);
 		blockIcon = Blocks.pumpkin.getIcon(2, 0);
 	}

src/main/java/vazkii/botania/common/block/BlockFloatingSpecialFlower.java

@@ -87,16 +87,16 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
 		// NO-OP
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(String s : BotaniaAPI.subtilesForCreativeMenu) {
-			par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), s));
+			list.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), s));
 			if(BotaniaAPI.miniFlowers.containsKey(s))
-				par3List.add(ItemBlockSpecialFlower.ofType(new ItemStack(par1), BotaniaAPI.miniFlowers.get(s)));
+				list.add(ItemBlockSpecialFlower.ofType(new ItemStack(item), BotaniaAPI.miniFlowers.get(s)));
 		}
 	}
 
@@ -107,10 +107,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
 	}
 
 	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-		if(!par6EntityPlayer.capabilities.isCreativeMode) {
-			dropBlockAsItem(par1World, par2, par3, par4, par5, 0);
-			((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer);
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode) {
+			dropBlockAsItem(world, x, y, z, meta, 0);
+			((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockHarvested(world, x, y, z, meta, player);
 		}
 	}
 
@@ -129,10 +129,10 @@ public class BlockFloatingSpecialFlower extends BlockFloatingFlower implements I
 	}
 
 	@Override
-	public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) {
-		super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
-		TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
-		return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false;
+	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventData) {
+		super.onBlockEventReceived(world, x, y, z, eventId, eventData);
+		TileEntity tileentity = world.getTileEntity(x, y, z);
+		return tileentity != null ? tileentity.receiveClientEvent(eventId, eventData) : false;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockForestEye.java

@@ -37,15 +37,15 @@ public class BlockForestEye extends BlockModContainer<TileForestEye> implements
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[6];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(icons.length - 1, par1)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(icons.length - 1, side)];
 	}
 
 	@Override
@@ -64,8 +64,8 @@ public class BlockForestEye extends BlockModContainer<TileForestEye> implements
 	}
 
 	@Override
-	public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
-		TileForestEye eye = (TileForestEye) par1World.getTileEntity(par2, par3, par4);
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
+		TileForestEye eye = (TileForestEye) world.getTileEntity(x, y, z);
 		return Math.min(15, Math.max(0, eye.entities - 1));
 	}
 

src/main/java/vazkii/botania/common/block/BlockGaiaHead.java

@@ -39,29 +39,29 @@ public class BlockGaiaHead extends BlockSkull {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public Item getItem(World p_149694_1_, int p_149694_2_, int p_149694_3_, int p_149694_4_) {
+	public Item getItem(World world, int x, int y, int z) {
 		return ModItems.gaiaHead;
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister p_149651_1_) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public ArrayList<ItemStack> getDrops(World p_149749_1_, int p_149749_2_, int p_149749_3_, int p_149749_4_, int p_149749_6_, int fortune) {
+	public ArrayList<ItemStack> getDrops(World world, int x, int y, int z, int meta, int fortune) {
 		ArrayList<ItemStack> ret = new ArrayList<>();
 
-		if((p_149749_6_ & 8) == 0) {
+		if((meta & 8) == 0) {
 			ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1);
-			TileEntitySkull tileentityskull = (TileEntitySkull)p_149749_1_.getTileEntity(p_149749_2_, p_149749_3_, p_149749_4_);
+			TileEntitySkull tileentityskull = (TileEntitySkull)world.getTileEntity(x, y, z);
 
 			if(tileentityskull == null)
 				return ret;
@@ -72,29 +72,29 @@ public class BlockGaiaHead extends BlockSkull {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return ModItems.gaiaHead;
 	}
 
 	@Override
-	public int getDamageValue(World p_149643_1_, int p_149643_2_, int p_149643_3_, int p_149643_4_)  {
+	public int getDamageValue(World world, int x, int y, int z)  {
 		return 0;
 	}
 
 	@Override
-	public int damageDropped(int p_149692_1_) {
+	public int damageDropped(int meta) {
 		return 0;
 	}
 
 	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
+	public TileEntity createNewTileEntity(World world, int meta) {
 		return new TileGaiaHead();
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
-		return Blocks.coal_block.getBlockTextureFromSide(p_149691_1_);
+	public IIcon getIcon(int side, int meta) {
+		return Blocks.coal_block.getBlockTextureFromSide(side);
 	}
 
 }

src/main/java/vazkii/botania/common/block/BlockGhostRail.java

@@ -43,15 +43,15 @@ public class BlockGhostRail extends BlockRailBase implements ILexiconable {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this);
 	}
 
 	public void onMinecartUpdate(MinecartUpdateEvent event) {

src/main/java/vazkii/botania/common/block/BlockHourglass.java

@@ -109,8 +109,8 @@ public class BlockHourglass extends BlockModContainer<TileHourglass> implements
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -121,14 +121,14 @@ public class BlockHourglass extends BlockModContainer<TileHourglass> implements
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -140,19 +140,19 @@ public class BlockHourglass extends BlockModContainer<TileHourglass> implements
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
+	public IIcon getIcon(int side, int meta) {
 		return ModBlocks.manaGlass.getIcon(0, 0);
 	}
 

src/main/java/vazkii/botania/common/block/BlockIncensePlate.java

@@ -79,9 +79,9 @@ public class BlockIncensePlate extends BlockModContainer<TileIncensePlate> imple
 	}
 
 	@Override
-	public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) {
-		int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2);
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2);
 	}
 
 	@Override
@@ -116,12 +116,12 @@ public class BlockIncensePlate extends BlockModContainer<TileIncensePlate> imple
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
+	public IIcon getIcon(int side, int meta) {
 		return ModBlocks.livingwood.getIcon(0, 0);
 	}
 

src/main/java/vazkii/botania/common/block/BlockLightLauncher.java

@@ -53,7 +53,7 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) {
+	public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) {
 		return false;
 	}
 
@@ -74,17 +74,15 @@ public class BlockLightLauncher extends BlockMod implements ILexiconable {
 		List<TileLightRelay> relays = new ArrayList<>();
 		for(ForgeDirection dir : LibMisc.CARDINAL_DIRECTIONS) {
 			TileEntity tile = world.getTileEntity(x + dir.offsetX, y, z + dir.offsetZ);
-			if(tile instanceof TileLightRelay) {
-				TileLightRelay relay = (TileLightRelay) tile;
-				if(relay.getBinding() != null)
+			if(tile instanceof TileLightRelay relay) {
+                if(relay.getBinding() != null)
 					relays.add(relay);
 			}
 		}
 
 		if(!relays.isEmpty()) {
 			AxisAlignedBB aabb = AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 1, z + 1);
-			List<Entity> entities = world.getEntitiesWithinAABB(EntityLivingBase.class, aabb);
-			entities.addAll(world.getEntitiesWithinAABB(EntityItem.class, aabb));
+			List<Entity> entities = world.selectEntitiesWithinAABB(Entity.class, aabb, e -> e instanceof EntityLivingBase || e instanceof EntityItem);
 
 			if(!entities.isEmpty()) {
 				for(Entity entity : entities) {

src/main/java/vazkii/botania/common/block/BlockLightRelay.java

@@ -47,9 +47,9 @@ public class BlockLightRelay extends BlockModContainer<TileLightRelay> implement
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		register(par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		register(name);
+		return super.setBlockName(name);
 	}
 
 	void register(String name) {
@@ -57,7 +57,7 @@ public class BlockLightRelay extends BlockModContainer<TileLightRelay> implement
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 2; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
@@ -73,7 +73,7 @@ public class BlockLightRelay extends BlockModContainer<TileLightRelay> implement
 	}
 
 	@Override
-	public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) {
+	public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) {
 		return false;
 	}
 
@@ -84,12 +84,12 @@ public class BlockLightRelay extends BlockModContainer<TileLightRelay> implement
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) {
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
 		return null;
 	}
 
 	@Override
-	public int tickRate(World p_149738_1_) {
+	public int tickRate(World world) {
 		return 2;
 	}
 
@@ -110,11 +110,11 @@ public class BlockLightRelay extends BlockModContainer<TileLightRelay> implement
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		invIcon = IconHelper.forBlock(par1IconRegister, this, 0);
-		worldIcon = IconHelper.forBlock(par1IconRegister, this, 1);
-		invIconRed = IconHelper.forBlock(par1IconRegister, this, 2);
-		worldIconRed = IconHelper.forBlock(par1IconRegister, this, 3);
+	public void registerBlockIcons(IIconRegister register) {
+		invIcon = IconHelper.forBlock(register, this, 0);
+		worldIcon = IconHelper.forBlock(register, this, 1);
+		invIconRed = IconHelper.forBlock(register, this, 2);
+		worldIconRed = IconHelper.forBlock(register, this, 3);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockLivingrock.java

@@ -49,32 +49,32 @@ public class BlockLivingrock extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < TYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[TYPES];
 		for(int i = 0; i < TYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(TYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(TYPES - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockLivingwood.java

@@ -53,14 +53,14 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		register(par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		register(name);
+		return super.setBlockName(name);
 	}
 
 	void register(String name) {
@@ -68,21 +68,21 @@ public class BlockLivingwood extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < TYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[TYPES];
 		for(int i = 0; i < TYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(TYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(TYPES - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockMod.java

@@ -29,17 +29,17 @@ public class BlockMod extends Block {
 
 	public int originalLight;
 
-	public BlockMod(Material par2Material) {
-		super(par2Material);
+	public BlockMod(Material material) {
+		super(material);
 		if(registerInCreative())
 			setCreativeTab(BotaniaCreativeTab.INSTANCE);
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
+	public Block setBlockName(String name) {
 		if(shouldRegisterInNameSet())
-			GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemCubeMod.class, par1Str);
-		return super.setBlockName(par1Str);
+			GameRegistry.registerBlock(this, this instanceof IElvenItem ? ItemBlockElven.class : ItemCubeMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	protected boolean shouldRegisterInNameSet() {
@@ -47,15 +47,15 @@ public class BlockMod extends Block {
 	}
 
 	@Override
-	public Block setLightLevel(float p_149715_1_) {
-		originalLight = (int) (p_149715_1_ * 15);
-		return super.setLightLevel(p_149715_1_);
+	public Block setLightLevel(float value) {
+		originalLight = (int) (value * 15);
+		return super.setLightLevel(value);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this);
 	}
 
 	boolean registerInCreative() {

src/main/java/vazkii/botania/common/block/BlockModContainer.java

@@ -30,17 +30,17 @@ public abstract class BlockModContainer<T extends TileEntity> extends BlockConta
 
 	public int originalLight;
 
-	protected BlockModContainer(Material par2Material) {
-		super(par2Material);
+	protected BlockModContainer(Material material) {
+		super(material);
 		if(registerInCreative())
 			setCreativeTab(BotaniaCreativeTab.INSTANCE);
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
+	public Block setBlockName(String name) {
 		if(shouldRegisterInNameSet())
-			GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
-		return super.setBlockName(par1Str);
+			GameRegistry.registerBlock(this, ItemBlockMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	protected boolean shouldRegisterInNameSet() {
@@ -48,15 +48,15 @@ public abstract class BlockModContainer<T extends TileEntity> extends BlockConta
 	}
 
 	@Override
-	public Block setLightLevel(float p_149715_1_) {
-		originalLight = (int) (p_149715_1_ * 15);
-		return super.setLightLevel(p_149715_1_);
+	public Block setLightLevel(float value) {
+		originalLight = (int) (value * 15);
+		return super.setLightLevel(value);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this);
 	}
 
 	public boolean registerInCreative() {

src/main/java/vazkii/botania/common/block/BlockModDoubleFlower.java

@@ -64,20 +64,20 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		if(!par1Str.equals("doublePlant"))
-			GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		if(!name.equals("doublePlant"))
+			GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return null;
 	}
 
 	@Override
-	public int damageDropped(int p_149692_1_) {
-		return p_149692_1_ & 7;
+	public int damageDropped(int meta) {
+		return meta & 7;
 	}
 
 	@Override
@@ -87,74 +87,74 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
 	}
 
 	@Override
-	public void func_149889_c(World p_149889_1_, int p_149889_2_, int p_149889_3_, int p_149889_4_, int p_149889_5_, int p_149889_6_) {
-		p_149889_1_.setBlock(p_149889_2_, p_149889_3_, p_149889_4_, this, p_149889_5_, p_149889_6_);
-		p_149889_1_.setBlock(p_149889_2_, p_149889_3_ + 1, p_149889_4_, this, p_149889_5_ | 8, p_149889_6_);
+	public void func_149889_c(World world, int x, int y, int z, int baseMeta, int flags) {
+		world.setBlock(x, y, z, this, baseMeta, flags);
+		world.setBlock(x, y + 1, z, this, baseMeta | 8, flags);
 	}
 
 	@Override
-	public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) {
-		p_149689_1_.setBlock(p_149689_2_, p_149689_3_ + 1, p_149689_4_, this, p_149689_6_.getItemDamage() | 8, 2);
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		world.setBlock(x, y + 1, z, this, itemIn.getItemDamage() | 8, 2);
 	}
 
 	@Override
-	public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) {
+	public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) {
 		return false;
 	}
 
 	@Override
-	public void harvestBlock(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) {
-		if(p_149636_1_.isRemote || p_149636_2_.getCurrentEquippedItem() == null || p_149636_2_.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(p_149636_6_))
-			harvestBlockCopy(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_);
+	public void harvestBlock(World world, EntityPlayer player, int x, int y, int z, int meta) {
+		if(world.isRemote || player.getCurrentEquippedItem() == null || player.getCurrentEquippedItem().getItem() != Items.shears || func_149887_c(meta))
+			harvestBlockCopy(world, player, x, y, z, meta);
 	}
 
 	// This is how I get around encapsulation
-	public void harvestBlockCopy(World p_149636_1_, EntityPlayer p_149636_2_, int p_149636_3_, int p_149636_4_, int p_149636_5_, int p_149636_6_) {
-		p_149636_2_.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1);
-		p_149636_2_.addExhaustion(0.025F);
+	public void harvestBlockCopy(World world, EntityPlayer player, int x, int y, int z, int meta) {
+		player.addStat(StatList.mineBlockStatArray[getIdFromBlock(this)], 1);
+		player.addExhaustion(0.025F);
 
-		if(this.canSilkHarvest(p_149636_1_, p_149636_2_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_) && EnchantmentHelper.getSilkTouchModifier(p_149636_2_)) {
+		if(this.canSilkHarvest(world, player, x, y, z, meta) && EnchantmentHelper.getSilkTouchModifier(player)) {
 			ArrayList<ItemStack> items = new ArrayList<>();
-			ItemStack itemstack = createStackedBlock(p_149636_6_);
+			ItemStack itemstack = createStackedBlock(meta);
 
 			if(itemstack != null)
 				items.add(itemstack);
 
-			ForgeEventFactory.fireBlockHarvesting(items, p_149636_1_, this, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, 0, 1.0f, true, p_149636_2_);
+			ForgeEventFactory.fireBlockHarvesting(items, world, this, x, y, z, meta, 0, 1.0f, true, player);
 			for(ItemStack is : items)
-				this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, is);
+				this.dropBlockAsItem(world, x, y, z, is);
 		} else {
-			harvesters.set(p_149636_2_);
-			int i1 = EnchantmentHelper.getFortuneModifier(p_149636_2_);
-			this.dropBlockAsItem(p_149636_1_, p_149636_3_, p_149636_4_, p_149636_5_, p_149636_6_, i1);
+			harvesters.set(player);
+			int i1 = EnchantmentHelper.getFortuneModifier(player);
+			this.dropBlockAsItem(world, x, y, z, meta, i1);
 			harvesters.set(null);
 		}
 	}
 
 	@Override
-	public void onBlockHarvested(World p_149681_1_, int p_149681_2_, int p_149681_3_, int p_149681_4_, int p_149681_5_, EntityPlayer p_149681_6_) {
-		if(func_149887_c(p_149681_5_)) {
-			if(p_149681_1_.getBlock(p_149681_2_, p_149681_3_ - 1, p_149681_4_) == this) {
-				if(!p_149681_6_.capabilities.isCreativeMode) {
-					int i1 = p_149681_1_.getBlockMetadata(p_149681_2_, p_149681_3_ - 1, p_149681_4_);
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(func_149887_c(meta)) {
+			if(world.getBlock(x, y - 1, z) == this) {
+				if(!player.capabilities.isCreativeMode) {
+					int i1 = world.getBlockMetadata(x, y - 1, z);
 					int j1 = func_149890_d(i1);
 
 					if(j1 != 3 && j1 != 2);
-					//p_149681_1_.func_147480_a(p_149681_2_, p_149681_3_ - 1, p_149681_4_, true);
+					//world.func_147480_a(x, y - 1, z, true);
 					else {
-						/*if (!p_149681_1_.isRemote && p_149681_6_.getCurrentEquippedItem() != null && p_149681_6_.getCurrentEquippedItem().getItem() == Items.shears)
+						/*if (!world.isRemote && player.getCurrentEquippedItem() != null && player.getCurrentEquippedItem().getItem() == Items.shears)
                         {
-                            this.func_149886_b(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, i1, p_149681_6_);
+                            this.func_149886_b(world, x, y, z, i1, player);
                         }*/
 
-						p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_);
+						world.setBlockToAir(x, y - 1, z);
 					}
-				} else p_149681_1_.setBlockToAir(p_149681_2_, p_149681_3_ - 1, p_149681_4_);
+				} else world.setBlockToAir(x, y - 1, z);
 			}
-		} else if(p_149681_6_.capabilities.isCreativeMode && p_149681_1_.getBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_) == this)
-			p_149681_1_.setBlock(p_149681_2_, p_149681_3_ + 1, p_149681_4_, Blocks.air, 0, 2);
+		} else if(player.capabilities.isCreativeMode && world.getBlock(x, y + 1, z) == this)
+			world.setBlock(x, y + 1, z, Blocks.air, 0, 2);
 
-		//super.onBlockHarvested(p_149681_1_, p_149681_2_, p_149681_3_, p_149681_4_, p_149681_5_, p_149681_6_);
+		//super.onBlockHarvested(world, x, y, z, meta, player);
 	}
 
 	@Override
@@ -175,9 +175,9 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
 	}
 
 	@Override
-	public IIcon getIcon(int p_149691_1_, int p_149691_2_) {
-		boolean top = func_149887_c(p_149691_2_);
-		return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[p_149691_2_ & 7];
+	public IIcon getIcon(int side, int meta) {
+		boolean top = func_149887_c(meta);
+		return (ConfigHandler.altFlowerTextures ? top ? doublePlantTopIconsAlt : doublePlantBottomIconsAlt : top ? doublePlantTopIcons : doublePlantBottomIcons)[meta & 7];
 	}
 
 	@Override
@@ -211,9 +211,9 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
 	}
 
 	@Override
-	public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < COUNT; ++i)
-			p_149666_3_.add(new ItemStack(p_149666_1_, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
@@ -222,12 +222,12 @@ public class BlockModDoubleFlower extends BlockDoublePlant implements ILexiconab
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int meta = world.getBlockMetadata(x, y, z);
 		float[] color = EntitySheep.fleeceColorTable[offset(meta & 7)];
 
-		if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency)
-			Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
+		if(random.nextDouble() < ConfigHandler.flowerParticleFrequency)
+			Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockModFlower.java

@@ -70,38 +70,38 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(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 Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[17];
 		iconsAlt = new IIcon[17];
 
 		for(int i = 0; i < icons.length; i++) {
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
-			iconsAlt[i] = IconHelper.forBlock(par1IconRegister, this, i, ALT_DIR);
+			icons[i] = IconHelper.forBlock(register, this, i);
+			iconsAlt[i] = IconHelper.forBlock(register, this, i, ALT_DIR);
 		}
 	}
 
 	@Override
-	public Block setLightLevel(float p_149715_1_) {
-		originalLight = (int) (p_149715_1_ * 15);
-		return super.setLightLevel(p_149715_1_);
+	public Block setLightLevel(float value) {
+		originalLight = (int) (value * 15);
+		return super.setLightLevel(value);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
@@ -110,17 +110,17 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int meta = world.getBlockMetadata(x, y, z);
 		float[] color = EntitySheep.fleeceColorTable[meta];
 
-		if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency)
-			Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
+		if(random.nextDouble() < ConfigHandler.flowerParticleFrequency)
+			Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5);
 	}
 
 	@Override
@@ -134,7 +134,7 @@ public class BlockModFlower extends BlockFlower implements ILexiconable, IPickup
 	}
 
 	@Override
-	public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) {
+	public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) {
 		return world.isAirBlock(x, y + 1, z);
 	}
 

src/main/java/vazkii/botania/common/block/BlockOpenCrate.java

@@ -75,15 +75,15 @@ public class BlockOpenCrate extends BlockModContainer<TileOpenCrate> implements
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < SUBTYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
@@ -98,14 +98,14 @@ public class BlockOpenCrate extends BlockModContainer<TileOpenCrate> implements
 	}
 
 	@Override
-	public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
-		TileOpenCrate crate = (TileOpenCrate) par1World.getTileEntity(par2, par3, par4);
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
+		TileOpenCrate crate = (TileOpenCrate) world.getTileEntity(x, y, z);
 		return crate.getSignal();
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -116,14 +116,14 @@ public class BlockOpenCrate extends BlockModContainer<TileOpenCrate> implements
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -135,22 +135,22 @@ public class BlockOpenCrate extends BlockModContainer<TileOpenCrate> implements
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		iconSide = IconHelper.forBlock(par1IconRegister, this, 0);
-		iconBottom = IconHelper.forBlock(par1IconRegister, this, 1);
-		iconSideCraft = IconHelper.forBlock(par1IconRegister, this, 2);
-		iconBottomCraft = IconHelper.forBlock(par1IconRegister, this, 3);
+	public void registerBlockIcons(IIconRegister register) {
+		iconSide = IconHelper.forBlock(register, this, 0);
+		iconBottom = IconHelper.forBlock(register, this, 1);
+		iconSideCraft = IconHelper.forBlock(register, this, 2);
+		iconBottomCraft = IconHelper.forBlock(register, this, 3);
 
 		sidePatternIcons = new IIcon[TileCraftCrate.PATTERNS.length];
 		for(int i = 0; i < sidePatternIcons.length; i++)
-			sidePatternIcons[i] = IconHelper.forName(par1IconRegister, "ocPattern" + i);
+			sidePatternIcons[i] = IconHelper.forName(register, "ocPattern" + i);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockPistonRelay.java

@@ -76,8 +76,8 @@ public class BlockPistonRelay extends BlockMod implements IWandable, ILexiconabl
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		mapCoords(par1World.provider.dimensionId, par2, par3, par4, 2);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		mapCoords(world.provider.dimensionId, x, y, z, 2);
 	}
 
 	public static String getCoordsAsString(int world, int x, int y, int z) {

src/main/java/vazkii/botania/common/block/BlockPlatform.java

@@ -53,45 +53,45 @@ public class BlockPlatform extends BlockCamo implements ILexiconable, IWandable
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < SUBTYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < SUBTYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(SUBTYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(SUBTYPES - 1, meta)];
 	}
 
 	@Override
-	public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
-		if(meta == 2 || meta == 0 && par7Entity != null && par7Entity.posY > par3 + (par7Entity instanceof EntityPlayer ? 2 : 0) && (!(par7Entity instanceof EntityPlayer) || !par7Entity.isSneaking()))
-			super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
+	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collider) {
+		int meta = world.getBlockMetadata(x, y, z);
+		if(meta == 2 || meta == 0 && collider != null && collider.posY > y + (collider instanceof EntityPlayer ? 2 : 0) && (!(collider instanceof EntityPlayer) || !collider.isSneaking()))
+			super.addCollisionBoxesToList(world, x, y, z, mask, list, collider);
 	}
 
 	@Override
-	public float getBlockHardness(World par1World, int par2, int par3, int par4) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
-		return meta == 2 ? -1F : super.getBlockHardness(par1World, par2, par3, par4);
+	public float getBlockHardness(World world, int x, int y, int z) {
+		int meta = world.getBlockMetadata(x, y, z);
+		return meta == 2 ? -1F : super.getBlockHardness(world, x, y, z);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockPylon.java

@@ -53,30 +53,30 @@ public class BlockPylon extends BlockModContainer<TilePylon> implements ILexicon
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 3; i++)
-			par3.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return par2 == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, par2);
+	public IIcon getIcon(int side, int meta) {
+		return meta == 0 ? Blocks.diamond_block.getIcon(0, 0) : ModBlocks.storage.getIcon(0, meta);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockRoot.java

@@ -34,12 +34,12 @@ public class BlockRoot extends BlockMod implements ILexiconable {
 
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return ModItems.manaResource;
 	}
 
 	@Override
-	public int damageDropped(int p_149692_1_) {
+	public int damageDropped(int meta) {
 		return 20;
 	}
 

src/main/java/vazkii/botania/common/block/BlockSolidVines.java

@@ -45,14 +45,14 @@ public class BlockSolidVines extends BlockVine implements ILexiconable {
 	}
 
 	@Override
-	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) {
+	public void updateTick(World world, int x, int y, int z, Random random) {
 		// NO-OP
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockSparkChanger.java

@@ -58,20 +58,20 @@ public class BlockSparkChanger extends BlockModContainer<TileSparkChanger> imple
 	}
 
 	@Override
-	public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) {
+	public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) {
 		return false;
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[3];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(2, par1)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(2, side)];
 	}
 
 	@Override
@@ -115,8 +115,8 @@ public class BlockSparkChanger extends BlockModContainer<TileSparkChanger> imple
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -127,14 +127,14 @@ public class BlockSparkChanger extends BlockModContainer<TileSparkChanger> imple
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -146,10 +146,10 @@ public class BlockSparkChanger extends BlockModContainer<TileSparkChanger> imple
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockSpecialFlower.java

@@ -154,25 +154,25 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockSpecialFlower.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(String s : BotaniaAPI.subtilesForCreativeMenu) {
-			par3List.add(ItemBlockSpecialFlower.ofType(s));
+			list.add(ItemBlockSpecialFlower.ofType(s));
 			if(BotaniaAPI.miniFlowers.containsKey(s))
-				par3List.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s)));
+				list.add(ItemBlockSpecialFlower.ofType(BotaniaAPI.miniFlowers.get(s)));
 		}
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		for(String s : BotaniaAPI.getAllSubTiles())
 			if(!s.isEmpty())
-				BotaniaAPI.getSignatureForName(s).registerIcons(par1IconRegister);
+				BotaniaAPI.getSignatureForName(s).registerIcons(register);
 	}
 
 	@Override
@@ -198,10 +198,10 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
 	}
 
 	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-		if(!par6EntityPlayer.capabilities.isCreativeMode) {
-			dropBlockAsItem(par1World, par2, par3, par4, par5, 0);
-			((TileSpecialFlower) par1World.getTileEntity(par2, par3, par4)).onBlockHarvested(par1World, par2, par3, par4, par5, par6EntityPlayer);
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode) {
+			dropBlockAsItem(world, x, y, z, meta, 0);
+			((TileSpecialFlower) world.getTileEntity(x, y, z)).onBlockHarvested(world, x, y, z, meta, player);
 		}
 	}
 
@@ -220,10 +220,10 @@ public class BlockSpecialFlower extends BlockFlower implements ITileEntityProvid
 	}
 
 	@Override
-	public boolean onBlockEventReceived(World par1World, int par2, int par3, int par4, int par5, int par6) {
-		super.onBlockEventReceived(par1World, par2, par3, par4, par5, par6);
-		TileEntity tileentity = par1World.getTileEntity(par2, par3, par4);
-		return tileentity != null ? tileentity.receiveClientEvent(par5, par6) : false;
+	public boolean onBlockEventReceived(World world, int x, int y, int z, int eventId, int eventData) {
+		super.onBlockEventReceived(world, x, y, z, eventId, eventData);
+		TileEntity tileentity = world.getTileEntity(x, y, z);
+		return tileentity != null ? tileentity.receiveClientEvent(eventId, eventData) : false;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockStorage.java

@@ -47,15 +47,15 @@ public class BlockStorage extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < SUBTYPES; i++)
-			par3.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockStorage.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockStorage.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -70,15 +70,15 @@ public class BlockStorage extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[SUBTYPES];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(icons.length - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/BlockTeruTeruBozu.java

@@ -96,7 +96,7 @@ public class BlockTeruTeruBozu extends BlockModContainer<TileTeruTeruBozu> imple
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/ModBlocks.java

@@ -525,9 +525,9 @@ public final class ModBlocks {
 	private static void registerSubTileWithMini(String key, Class<? extends SubTileEntity> clazz) {
 		BotaniaAPI.registerSubTile(key, clazz);
 
-		for(Class innerClazz : clazz.getDeclaredClasses())
+		for(final var innerClazz : clazz.getDeclaredClasses())
 			if(innerClazz.getSimpleName().equals("Mini"))
-				BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz, key);
+				BotaniaAPI.registerMiniSubTile(key + "Chibi", innerClazz.asSubclass(SubTileEntity.class), key);
 	}
 
 	private static void registerSubTileWithDecor(String key, Class<? extends SubTileEntity> clazz, Class<? extends SubTileEntity> decor) {

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaBase.java

@@ -39,8 +39,8 @@ public abstract class BlockCorporeaBase extends BlockModContainer<TileCorporeaBa
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -51,14 +51,14 @@ public abstract class BlockCorporeaBase extends BlockModContainer<TileCorporeaBa
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -70,10 +70,10 @@ public abstract class BlockCorporeaBase extends BlockModContainer<TileCorporeaBa
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaCrystalCube.java

@@ -71,7 +71,7 @@ public class BlockCorporeaCrystalCube extends BlockCorporeaBase implements ILexi
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaFunnel.java

@@ -36,10 +36,10 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
@@ -56,8 +56,8 @@ public class BlockCorporeaFunnel extends BlockCorporeaBase implements ILexiconab
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[par1 > 1 ? 1 : 0];
+	public IIcon getIcon(int side, int meta) {
+		return icons[side > 1 ? 1 : 0];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaIndex.java

@@ -44,7 +44,7 @@ public class BlockCorporeaIndex extends BlockCorporeaBase implements ILexiconabl
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaInterceptor.java

@@ -38,15 +38,15 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[par1 > 1 ? 1 : 0];
+	public IIcon getIcon(int side, int meta) {
+		return icons[side > 1 ? 1 : 0];
 	}
 
 	@Override
@@ -65,7 +65,7 @@ public class BlockCorporeaInterceptor extends BlockCorporeaBase implements ILexi
 	}
 
 	@Override
-	public int tickRate(World p_149738_1_) {
+	public int tickRate(World world) {
 		return 2;
 	}
 

src/main/java/vazkii/botania/common/block/corporea/BlockCorporeaRetainer.java

@@ -44,8 +44,9 @@ public class BlockCorporeaRetainer extends BlockModContainer<TileCorporeaRetaine
 		if(power && !powered) {
 			((TileCorporeaRetainer) world.getTileEntity(x, y, z)).fulfilRequest();
 			world.setBlockMetadataWithNotify(x, y, z, meta | 8, 4);
-		} else if(!power && powered)
+		} else if(!power && powered) {
 			world.setBlockMetadataWithNotify(x, y, z, meta & -9, 4);
+		}
 	}
 
 	@Override
@@ -54,7 +55,7 @@ public class BlockCorporeaRetainer extends BlockModContainer<TileCorporeaRetaine
 	}
 
 	@Override
-	public int getComparatorInputOverride(World world, int x, int y, int z, int s) {
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
 		return ((TileCorporeaRetainer) world.getTileEntity(x, y, z)).hasPendingRequest() ? 15 : 0;
 	}
 

src/main/java/vazkii/botania/common/block/decor/Block18Stone.java

@@ -50,7 +50,7 @@ public class Block18Stone extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
@@ -66,14 +66,14 @@ public class Block18Stone extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockBuriedPetals.java

@@ -41,12 +41,12 @@ public class BlockBuriedPetals extends BlockModFlower {
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int meta = world.getBlockMetadata(x, y, z);
 		float[] color = EntitySheep.fleeceColorTable[meta];
 
 		Botania.proxy.setSparkleFXNoClip(true);
-		Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.1 + par5Random.nextFloat() * 0.1, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
+		Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.1 + random.nextFloat() * 0.1, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5);
 		Botania.proxy.setSparkleFXNoClip(false);
 	}
 
@@ -56,17 +56,17 @@ public class BlockBuriedPetals extends BlockModFlower {
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
+	public IIcon getIcon(int side, int meta) {
 		return blockIcon;
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return ModItems.petal;
 	}
 

src/main/java/vazkii/botania/common/block/decor/BlockCustomBrick.java

@@ -50,32 +50,32 @@ public class BlockCustomBrick extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < TYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[TYPES];
 		for(int i = 0; i < TYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(TYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(TYPES - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockDirtPath.java

@@ -60,9 +60,11 @@ public class BlockDirtPath extends BlockMod implements ILexiconable {
 	@Override
 	public void setBlockBoundsBasedOnState(IBlockAccess world, int x, int y, int z) {
 		Block blockAbove = world.getBlock(x, y + 1, z);
-		if(!blockAbove.isAir(world, x, y + 1, z))
+		if(!blockAbove.isAir(world, x, y + 1, z)) {
 			setBlockBounds(0F, 0F, 0F, 1F, 1, 1F);
-		else setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F);
+		} else {
+			setBlockBounds(0F, 0F, 0F, 1F, 15F / 16F, 1F);
+		}
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockElfGlass.java

@@ -35,11 +35,11 @@ public class BlockElfGlass extends BlockManaGlass implements IElvenItem, ILexico
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[ICON_COUNT];
 		for(int i = 0; i < ICON_COUNT; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
-		blockIcon = IconHelper.forBlock(par1IconRegister, this);
+			icons[i] = IconHelper.forBlock(register, this, i);
+		blockIcon = IconHelper.forBlock(register, this);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockEndStoneBrick.java

@@ -51,7 +51,7 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 4; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
@@ -67,14 +67,14 @@ public class BlockEndStoneBrick extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockFloatingFlower.java

@@ -75,9 +75,9 @@ public class BlockFloatingFlower extends BlockModContainer<TileMod> implements I
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		register(par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		register(name);
+		return super.setBlockName(name);
 	}
 
 	protected void register(String name) {
@@ -85,28 +85,28 @@ public class BlockFloatingFlower extends BlockModContainer<TileMod> implements I
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int meta = world.getBlockMetadata(x, y, z);
 		float[] color = EntitySheep.fleeceColorTable[meta];
 
-		if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency)
-			Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
+		if(random.nextDouble() < ConfigHandler.flowerParticleFrequency)
+			Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5);
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2, List par3) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
-			par3.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
@@ -120,8 +120,8 @@ public class BlockFloatingFlower extends BlockModContainer<TileMod> implements I
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return Blocks.dirt.getIcon(par1, par2);
+	public IIcon getIcon(int side, int meta) {
+		return Blocks.dirt.getIcon(side, meta);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockManaBeacon.java

@@ -49,27 +49,27 @@ public class BlockManaBeacon extends BlockModContainer<TileManaBeacon> implement
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < 2; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[par1 == 1 ? 1 : 0];
+	public IIcon getIcon(int side, int meta) {
+		return icons[side == 1 ? 1 : 0];
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(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 Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -88,19 +88,19 @@ public class BlockManaBeacon extends BlockModContainer<TileManaBeacon> implement
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public int getRenderColor(int par1) {
-		float[] color = EntitySheep.fleeceColorTable[par1];
+	public int getRenderColor(int meta) {
+		float[] color = EntitySheep.fleeceColorTable[meta];
 		return new Color(color[0], color[1], color[2]).getRGB();
 	}
 
 	@Override
-	public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) {
-		return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4));
+	public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) {
+		return getRenderColor(worldIn.getBlockMetadata(x, y, z));
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockManaFlame.java

@@ -55,7 +55,7 @@ public class BlockManaFlame extends BlockModContainer<TileManaFlame> implements
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -75,17 +75,17 @@ public class BlockManaFlame extends BlockModContainer<TileManaFlame> implements
 	}
 
 	@Override
-	public boolean getBlocksMovement(IBlockAccess p_149655_1_, int p_149655_2_, int p_149655_3_, int p_149655_4_) {
+	public boolean getBlocksMovement(IBlockAccess worldIn, int x, int y, int z) {
 		return true;
 	}
 
 	@Override
-	public AxisAlignedBB getCollisionBoundingBoxFromPool(World p_149668_1_, int p_149668_2_, int p_149668_3_, int p_149668_4_) {
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
 		return null;
 	}
 
 	@Override
-	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float xs, float ys, float zs) {
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int s, float subX, float subY, float subZ) {
 		if(WorldTypeSkyblock.isWorldSkyblock(world)) {
 			ItemStack stack = player.getCurrentEquippedItem();
 			if(stack != null && stack.getItem() == Item.getItemFromBlock(Blocks.sapling) && !player.inventory.hasItem(ModItems.lexicon)) {

src/main/java/vazkii/botania/common/block/decor/BlockManaGlass.java

@@ -41,15 +41,15 @@ public class BlockManaGlass extends BlockMod implements ILexiconable {
 		return false;
 	}
 
-	public boolean shouldSideBeRendered1(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		Block block = p_149646_1_.getBlock(p_149646_2_, p_149646_3_, p_149646_4_);
+	public boolean shouldSideBeRendered1(IBlockAccess worldIn, int x, int y, int z, int side) {
+		Block block = worldIn.getBlock(x, y, z);
 
-		return block == this ? false : super.shouldSideBeRendered(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, p_149646_5_);
+		return block == this ? false : super.shouldSideBeRendered(worldIn, x, y, z, side);
 	}
 
 	@Override
-	public boolean shouldSideBeRendered(IBlockAccess p_149646_1_, int p_149646_2_, int p_149646_3_, int p_149646_4_, int p_149646_5_) {
-		return shouldSideBeRendered1(p_149646_1_, p_149646_2_, p_149646_3_, p_149646_4_, 1 - p_149646_5_);
+	public boolean shouldSideBeRendered(IBlockAccess worldIn, int x, int y, int z, int side) {
+		return shouldSideBeRendered1(worldIn, x, y, z, 1 - side);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockModMushroom.java

@@ -60,45 +60,45 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis
 	}
 
 	@Override
-	public void updateTick(World p_149674_1_, int p_149674_2_, int p_149674_3_, int p_149674_4_, Random p_149674_5_) {
+	public void updateTick(World world, int x, int y, int z, Random random) {
 		// NO-OP, to prevent spreading
 	}
 
 	@Override
-	public boolean canBlockStay(World p_149718_1_, int p_149718_2_, int p_149718_3_, int p_149718_4_) {
-		if(p_149718_3_ >= 0 && p_149718_3_ < 256) {
-			Block block = p_149718_1_.getBlock(p_149718_2_, p_149718_3_ - 1, p_149718_4_);
-			return block == Blocks.mycelium || block == Blocks.dirt && p_149718_1_.getBlockMetadata(p_149718_2_, p_149718_3_ - 1, p_149718_4_) == 2 || block.canSustainPlant(p_149718_1_, p_149718_2_, p_149718_3_ - 1, p_149718_4_, ForgeDirection.UP, this);
+	public boolean canBlockStay(World world, int x, int y, int z) {
+		if(y >= 0 && y < 256) {
+			Block block = world.getBlock(x, y - 1, z);
+			return block == Blocks.mycelium || block == Blocks.dirt && world.getBlockMetadata(x, y - 1, z) == 2 || block.canSustainPlant(world, x, y - 1, z, ForgeDirection.UP, this);
 		}
 
 		return false;
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(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 Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[16];
 
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public Block setLightLevel(float p_149715_1_) {
-		originalLight = (int) (p_149715_1_ * 15);
-		return super.setLightLevel(p_149715_1_);
+	public Block setLightLevel(float value) {
+		originalLight = (int) (value * 15);
+		return super.setLightLevel(value);
 	}
 
 	@Override
@@ -108,22 +108,22 @@ public class BlockModMushroom extends BlockMushroom implements IInfusionStabilis
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[par2];
+	public IIcon getIcon(int side, int meta) {
+		return icons[meta];
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int meta = par1World.getBlockMetadata(par2, par3, par4);
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int meta = world.getBlockMetadata(x, y, z);
 		float[] color = EntitySheep.fleeceColorTable[meta];
 
-		if(par5Random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F)
-			Botania.proxy.sparkleFX(par1World, par2 + 0.3 + par5Random.nextFloat() * 0.5, par3 + 0.5 + par5Random.nextFloat() * 0.5, par4 + 0.3 + par5Random.nextFloat() * 0.5, color[0], color[1], color[2], par5Random.nextFloat(), 5);
+		if(random.nextDouble() < ConfigHandler.flowerParticleFrequency * 0.25F)
+			Botania.proxy.sparkleFX(world, x + 0.3 + random.nextFloat() * 0.5, y + 0.5 + random.nextFloat() * 0.5, z + 0.3 + random.nextFloat() * 0.5, color[0], color[1], color[2], random.nextFloat(), 5);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockPavement.java

@@ -48,33 +48,33 @@ public class BlockPavement extends BlockMod {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < TYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[TYPES];
 		for(int i = 0; i < TYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(TYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(TYPES - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockPetalBlock.java

@@ -40,7 +40,7 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
@@ -51,9 +51,9 @@ public class BlockPetalBlock extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockPrismarine.java

@@ -58,28 +58,28 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < TYPES; i++)
-			par3List.add(new ItemStack(par1, 1, i));
+			list.add(new ItemStack(item, 1, i));
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[TYPES];
 		for(int i = 1; i < TYPES; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@SideOnly(Side.CLIENT)
@@ -92,8 +92,8 @@ public class BlockPrismarine extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(TYPES - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(TYPES - 1, meta)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockReeds.java

@@ -43,16 +43,16 @@ public class BlockReeds extends BlockRotatedPillar implements ILexiconable {
 
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this, 0);
-		topIcon = IconHelper.forBlock(par1IconRegister, this, 1);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this, 0);
+		topIcon = IconHelper.forBlock(register, this, 1);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockShimmerrock.java

@@ -50,7 +50,7 @@ public class BlockShimmerrock extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/decor/BlockShimmerwoodPlanks.java

@@ -49,7 +49,7 @@ public class BlockShimmerwoodPlanks  extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/decor/BlockShinyFlower.java

@@ -55,8 +55,8 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return (ConfigHandler.altFlowerTextures ? iconsAlt : icons)[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
@@ -65,7 +65,7 @@ public class BlockShinyFlower extends BlockModFlower implements IInfusionStabili
 	}
 
 	@Override
-	public boolean func_149851_a(World world, int x, int y, int z, boolean fuckifiknow) {
+	public boolean func_149851_a(World world, int x, int y, int z, boolean isClient) {
 		return false;
 	}
 

src/main/java/vazkii/botania/common/block/decor/BlockStarfield.java

@@ -39,15 +39,15 @@ public class BlockStarfield extends BlockModContainer<TileStarfield> implements
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[3];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(2, par1)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(2, side)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockTinyPotato.java

@@ -45,9 +45,9 @@ public class BlockTinyPotato extends BlockModContainer<TileTinyPotato> implement
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockTinyPotato.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -56,7 +56,7 @@ public class BlockTinyPotato extends BlockModContainer<TileTinyPotato> implement
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -66,29 +66,29 @@ public class BlockTinyPotato extends BlockModContainer<TileTinyPotato> implement
 	}
 
 	@Override
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
-		TileEntity tile = par1World.getTileEntity(par2, par3, par4);
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) {
+		TileEntity tile = world.getTileEntity(x, y, z);
 		if(tile instanceof TileTinyPotato) {
 			((TileTinyPotato) tile).interact();
-			par5EntityPlayer.addStat(ModAchievements.tinyPotatoPet, 1);
-			par1World.spawnParticle("heart", par2 + minX + Math.random() * (maxX - minX), par3 + maxY, par4 + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0);
+			player.addStat(ModAchievements.tinyPotatoPet, 1);
+			world.spawnParticle("heart", x + minX + Math.random() * (maxX - minX), y + maxY, z + minZ + Math.random() * (maxZ - minZ), 0, 0 ,0);
 		}
 		return true;
 	}
 
 	@Override
-	public void onBlockPlacedBy(World par1World, int par2, int par3, int par4, EntityLivingBase par5EntityLiving, ItemStack par6ItemStack) {
-		int l1 = MathHelper.floor_double(par5EntityLiving.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		int l1 = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
 
-		par1World.setBlockMetadataWithNotify(par2, par3, par4, l1, 2);
-		if (par6ItemStack.hasDisplayName())
-			((TileTinyPotato) par1World.getTileEntity(par2, par3, par4)).name = par6ItemStack.getDisplayName();
+		world.setBlockMetadataWithNotify(x, y, z, l1, 2);
+		if (itemIn.hasDisplayName())
+			((TileTinyPotato) world.getTileEntity(x, y, z)).name = itemIn.getDisplayName();
 	}
 
 	@Override
-	public void onBlockHarvested(World par1World, int par2, int par3, int par4, int par5, EntityPlayer par6EntityPlayer) {
-		if(!par6EntityPlayer.capabilities.isCreativeMode)
-			dropBlockAsItem(par1World, par2, par3, par4, par5, 0);
+	public void onBlockHarvested(World world, int x, int y, int z, int meta, EntityPlayer player) {
+		if(!player.capabilities.isCreativeMode)
+			dropBlockAsItem(world, x, y, z, meta, 0);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/BlockUnstable.java

@@ -45,15 +45,15 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item par1, CreativeTabs par2CreativeTabs, List par3List) {
+	public void getSubBlocks(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 Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -72,30 +72,30 @@ public class BlockUnstable extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void randomDisplayTick(World par1World, int par2, int par3, int par4, Random par5Random) {
-		int color = getRenderColor(par1World.getBlockMetadata(par2, par3, par4));
+	public void randomDisplayTick(World world, int x, int y, int z, Random random) {
+		int color = getRenderColor(world.getBlockMetadata(x, y, z));
 		int colorBright = new Color(color).brighter().getRGB();
 		int colorDark = new Color(color).darker().getRGB();
 
-		Vector3 origVector = new Vector3(par2 + 0.5, par3 + 0.5, par4 + 0.5);
-		Vector3 endVector = origVector.copy().add(par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1, par1World.rand.nextDouble() * 2 - 1);
-		Botania.proxy.lightningFX(par1World, origVector, endVector, 5F, colorDark, colorBright);
+		Vector3 origVector = new Vector3(x + 0.5, y + 0.5, z + 0.5);
+		Vector3 endVector = origVector.copy().add(world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1, world.rand.nextDouble() * 2 - 1);
+		Botania.proxy.lightningFX(world, origVector, endVector, 5F, colorDark, colorBright);
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public int getRenderColor(int par1) {
-		float[] color = EntitySheep.fleeceColorTable[par1];
+	public int getRenderColor(int meta) {
+		float[] color = EntitySheep.fleeceColorTable[meta];
 		return new Color(color[0], color[1], color[2]).getRGB();
 	}
 
 	@Override
-	public int colorMultiplier(IBlockAccess par1iBlockAccess, int par2, int par3, int par4) {
-		return getRenderColor(par1iBlockAccess.getBlockMetadata(par2, par3, par4));
+	public int colorMultiplier(IBlockAccess worldIn, int x, int y, int z) {
+		return getRenderColor(worldIn.getBlockMetadata(x, y, z));
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStone.java

@@ -53,7 +53,7 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 16; i++)
 			list.add(new ItemStack(item, 1, i));
 	}
@@ -69,17 +69,18 @@ public class BlockBiomeStone extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1;
+	public int damageDropped(int meta) {
+		return meta;
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
+	@SuppressWarnings("deprecation") // Necessary for backwards compatibility with WAILA & some other mods.
 	public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z) {
 		int meta = world.getBlockMetadata(x, y, z);
 		return new ItemStack(this, 1, meta);

src/main/java/vazkii/botania/common/block/decor/biomestone/BlockBiomeStoneA.java

@@ -19,8 +19,8 @@ public class BlockBiomeStoneA extends BlockBiomeStone {
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1 % 8 + 8;
+	public int damageDropped(int meta) {
+		return meta % 8 + 8;
 	}
 
 }

src/main/java/vazkii/botania/common/block/decor/panes/BlockModPane.java

@@ -42,9 +42,9 @@ public class BlockModPane extends BlockPane {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartz.java

@@ -51,9 +51,9 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockSpecialQuartz.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -71,51 +71,51 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int par1, int par2) {
-		if (par2 != 2 && par2 != 3 && par2 != 4) {
-			if (par1 != 1 && (par1 != 0 || par2 != 1)) {
-				if (par1 == 0)
+	public IIcon getIcon(int side, int meta) {
+		if (meta != 2 && meta != 3 && meta != 4) {
+			if (side != 1 && (side != 0 || meta != 1)) {
+				if (side == 0)
 					return specialQuartzTopIcon;
 				else {
-					if (par2 < 0 || par2 >= specialQuartzIcons.length)
-						par2 = 0;
+					if (meta < 0 || meta >= specialQuartzIcons.length)
+						meta = 0;
 
-					return specialQuartzIcons[par2];
+					return specialQuartzIcons[meta];
 				}
-			} else return par2 == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon;
+			} else return meta == 1 ? chiseledSpecialQuartzIcon : specialQuartzTopIcon;
 		} else
-			return par2 == 2 && (par1 == 1 || par1 == 0) ? pillarSpecialQuartzIcon : par2 == 3 && (par1 == 5 || par1 == 4) ? pillarSpecialQuartzIcon : par2 == 4 && (par1 == 2 || par1 == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[par2];
+			return meta == 2 && (side == 1 || side == 0) ? pillarSpecialQuartzIcon : meta == 3 && (side == 5 || side == 4) ? pillarSpecialQuartzIcon : meta == 4 && (side == 2 || side == 3) ? pillarSpecialQuartzIcon : specialQuartzIcons[meta];
 	}
 
 	@Override
-	public int onBlockPlaced(World par1World, int par2, int par3, int par4, int par5, float par6, float par7, float par8, int par9) {
-		if (par9 == 2) {
-			switch (par5) {
+	public int onBlockPlaced(World world, int x, int y, int z, int side, float subX, float subY, float subZ, int meta) {
+		if (meta == 2) {
+			switch (side) {
 			case 0:
 			case 1:
-				par9 = 2;
+				meta = 2;
 				break;
 			case 2:
 			case 3:
-				par9 = 4;
+				meta = 4;
 				break;
 			case 4:
 			case 5:
-				par9 = 3;
+				meta = 3;
 			}
 		}
 
-		return par9;
+		return meta;
 	}
 
 	@Override
-	public int damageDropped(int par1) {
-		return par1 != 3 && par1 != 4 ? par1 : 2;
+	public int damageDropped(int meta) {
+		return meta != 3 && meta != 4 ? meta : 2;
 	}
 
 	@Override
-	public ItemStack createStackedBlock(int par1) {
-		return par1 != 3 && par1 != 4 ? super.createStackedBlock(par1) : new ItemStack(this, 1, 2);
+	public ItemStack createStackedBlock(int meta) {
+		return meta != 3 && meta != 4 ? super.createStackedBlock(meta) : new ItemStack(this, 1, 2);
 	}
 
 	@Override
@@ -125,26 +125,26 @@ public class BlockSpecialQuartz extends BlockMod implements ILexiconable {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void getSubBlocks(Item item, CreativeTabs tab, List par3List) {
-		par3List.add(new ItemStack(this, 1, 0));
-		par3List.add(new ItemStack(this, 1, 1));
-		par3List.add(new ItemStack(this, 1, 2));
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
+		list.add(new ItemStack(this, 1, 0));
+		list.add(new ItemStack(this, 1, 1));
+		list.add(new ItemStack(this, 1, 2));
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		specialQuartzIcons = new IIcon[iconNames.length];
 
 		for (int i = 0; i < specialQuartzIcons.length; ++i) {
 			if (iconNames[i] == null)
 				specialQuartzIcons[i] = specialQuartzIcons[i - 1];
-			else specialQuartzIcons[i] = IconHelper.forName(par1IconRegister, iconNames[i]);
+			else specialQuartzIcons[i] = IconHelper.forName(register, iconNames[i]);
 		}
 
-		specialQuartzTopIcon = IconHelper.forName(par1IconRegister, "block"  + type + "Quartz1");
-		chiseledSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "chiseled" + type + "Quartz1");
-		pillarSpecialQuartzIcon = IconHelper.forName(par1IconRegister, "pillar" + type + "Quartz1");
+		specialQuartzTopIcon = IconHelper.forName(register, "block"  + type + "Quartz1");
+		chiseledSpecialQuartzIcon = IconHelper.forName(register, "chiseled" + type + "Quartz1");
+		pillarSpecialQuartzIcon = IconHelper.forName(register, "pillar" + type + "Quartz1");
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/quartz/BlockSpecialQuartzSlab.java

@@ -33,8 +33,8 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
 
 	Block source;
 
-	public BlockSpecialQuartzSlab(Block source, boolean par2) {
-		super(par2, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (par2 ? "Full" : "Half"));
+	public BlockSpecialQuartzSlab(Block source, boolean full) {
+		super(full, Material.rock, "quartzSlab" + ((BlockSpecialQuartz) source).type + (full ? "Full" : "Half"));
 		setHardness(0.8F);
 		setResistance(10F);
 		this.source = source;
@@ -87,23 +87,23 @@ public class BlockSpecialQuartzSlab extends BlockModSlab {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int par1, int par2) {
-		return source.getBlockTextureFromSide(par1);
+	public IIcon getIcon(int side, int meta) {
+		return source.getBlockTextureFromSide(side);
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return Item.getItemFromBlock(getSingleBlock());
 	}
 
 	@Override
-	public ItemStack createStackedBlock(int par1) {
+	public ItemStack createStackedBlock(int meta) {
 		return new ItemStack(getSingleBlock());
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/decor/slabs/BlockLivingSlab.java

@@ -19,8 +19,8 @@ public abstract class BlockLivingSlab extends BlockModSlab {
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public IIcon getIcon(int par1, int par2) {
-		return source.getIcon(par1, meta);
+	public IIcon getIcon(int side, int meta) {
+		return source.getIcon(side, this.meta);
 	}
 
 }

src/main/java/vazkii/botania/common/block/decor/slabs/BlockModSlab.java

@@ -46,7 +46,7 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return Item.getItemFromBlock(getSingleBlock());
 	}
 
@@ -56,13 +56,13 @@ public abstract class BlockModSlab extends BlockSlab implements ILexiconable {
 	}
 
 	@Override
-	public ItemStack createStackedBlock(int par1) {
+	public ItemStack createStackedBlock(int meta) {
 		return new ItemStack(getSingleBlock());
 	}
 
 	@Override
 	@SideOnly(Side.CLIENT)
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/decor/stairs/BlockModStairs.java

@@ -22,9 +22,9 @@ public class BlockModStairs extends BlockStairs implements ILexiconable {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemCubeMod.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemCubeMod.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/decor/walls/BlockModWall.java

@@ -45,9 +45,9 @@ public class BlockModWall extends BlockWall implements ILexiconable {
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		register(par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		register(name);
+		return super.setBlockName(name);
 	}
 
 	public void register(String name) {
@@ -55,7 +55,7 @@ public class BlockModWall extends BlockWall implements ILexiconable {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tabs, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> list) {
 		list.add(new ItemStack(item));
 	}
 
@@ -70,7 +70,7 @@ public class BlockModWall extends BlockWall implements ILexiconable {
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister p_149651_1_) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/decor/walls/BlockVariantWall.java

@@ -41,7 +41,7 @@ public class BlockVariantWall extends BlockModWall {
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tabs, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tabs, List<ItemStack> list) {
 		for(int i = 0; i < metaStates; i++)
 			list.add(new ItemStack(item, 1, i));
 	}

src/main/java/vazkii/botania/common/block/dispenser/BehaviourPoolMinecart.java

@@ -25,15 +25,15 @@ import vazkii.botania.common.entity.EntityPoolMinecart;
 public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem {
 
 	@Override
-	public ItemStack dispenseStack(IBlockSource p_82487_1_, ItemStack p_82487_2_) {
-		EnumFacing enumfacing = BlockDispenser.func_149937_b(p_82487_1_.getBlockMetadata());
-		World world = p_82487_1_.getWorld();
-		double d0 = p_82487_1_.getX() + enumfacing.getFrontOffsetX() * 1.125F;
-		double d1 = p_82487_1_.getY() + enumfacing.getFrontOffsetY() * 1.125F;
-		double d2 = p_82487_1_.getZ() + enumfacing.getFrontOffsetZ() * 1.125F;
-		int i = p_82487_1_.getXInt() + enumfacing.getFrontOffsetX();
-		int j = p_82487_1_.getYInt() + enumfacing.getFrontOffsetY();
-		int k = p_82487_1_.getZInt() + enumfacing.getFrontOffsetZ();
+	public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+		EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata());
+		World world = source.getWorld();
+		double d0 = source.getX() + facing.getFrontOffsetX() * 1.125F;
+		double d1 = source.getY() + facing.getFrontOffsetY() * 1.125F;
+		double d2 = source.getZ() + facing.getFrontOffsetZ() * 1.125F;
+		int i = source.getXInt() + facing.getFrontOffsetX();
+		int j = source.getYInt() + facing.getFrontOffsetY();
+		int k = source.getZInt() + facing.getFrontOffsetZ();
 		Block block = world.getBlock(i, j, k);
 		double d3;
 
@@ -41,24 +41,24 @@ public class BehaviourPoolMinecart extends BehaviorDefaultDispenseItem {
 			d3 = 0.0D;
 		else {
 			if(block.getMaterial() != Material.air || !BlockRailBase.func_150051_a(world.getBlock(i, j - 1, k)))
-				return super.dispenseStack(p_82487_1_, p_82487_2_);
+				return super.dispenseStack(source, stack);
 
 			d3 = -1.0D;
 		}
 
 		EntityMinecart entityminecart = new EntityPoolMinecart(world, d0, d1 + d3, d2);
 
-		if(p_82487_2_.hasDisplayName())
-			entityminecart.setMinecartName(p_82487_2_.getDisplayName());
+		if(stack.hasDisplayName())
+			entityminecart.setMinecartName(stack.getDisplayName());
 
 		world.spawnEntityInWorld(entityminecart);
-		p_82487_2_.splitStack(1);
-		return p_82487_2_;
+		stack.splitStack(1);
+		return stack;
 	}
 
 	@Override
-	protected void playDispenseSound(IBlockSource p_82485_1_) {
-		p_82485_1_.getWorld().playAuxSFX(1000, p_82485_1_.getXInt(), p_82485_1_.getYInt(), p_82485_1_.getZInt(), 0);
+	protected void playDispenseSound(IBlockSource source) {
+		source.getWorld().playAuxSFX(1000, source.getXInt(), source.getYInt(), source.getZInt(), 0);
 	}
 
 }

src/main/java/vazkii/botania/common/block/dispenser/BehaviourSeeds.java

@@ -27,20 +27,20 @@ public class BehaviourSeeds extends BehaviorDefaultDispenseItem {
 	}
 
 	@Override
-	public ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) {
-		EnumFacing facing = BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata());
-		int x = par1IBlockSource.getXInt() + facing.getFrontOffsetX();
-		int y = par1IBlockSource.getYInt() + facing.getFrontOffsetY();
-		int z = par1IBlockSource.getZInt() + facing.getFrontOffsetZ();
-		World world = par1IBlockSource.getWorld();
+	public ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+		EnumFacing facing = BlockDispenser.func_149937_b(source.getBlockMetadata());
+		int x = source.getXInt() + facing.getFrontOffsetX();
+		int y = source.getYInt() + facing.getFrontOffsetY();
+		int z = source.getZInt() + facing.getFrontOffsetZ();
+		World world = source.getWorld();
 
 		if(world.getBlock(x, y, z).isAir(world, x, y, z) && block.canBlockStay(world, x, y, z)) {
 			world.setBlock(x, y, z, block);
-			par2ItemStack.stackSize--;
-			return par2ItemStack;
+			stack.stackSize--;
+			return stack;
 		}
 
-		return super.dispenseStack(par1IBlockSource, par2ItemStack);
+		return super.dispenseStack(source, stack);
 	}
 
 }

src/main/java/vazkii/botania/common/block/dispenser/BehaviourWand.java

@@ -22,19 +22,19 @@ import vazkii.botania.api.wand.IWandable;
 public class BehaviourWand extends BehaviorDefaultDispenseItem {
 
 	@Override
-	protected ItemStack dispenseStack(IBlockSource par1IBlockSource, ItemStack par2ItemStack) {
-		ForgeDirection facing = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(par1IBlockSource.getBlockMetadata()).ordinal());
-		int x = par1IBlockSource.getXInt() + facing.offsetX;
-		int y = par1IBlockSource.getYInt() + facing.offsetY;
-		int z = par1IBlockSource.getZInt() + facing.offsetZ;
-		World world = par1IBlockSource.getWorld();
+	protected ItemStack dispenseStack(IBlockSource source, ItemStack stack) {
+		ForgeDirection facing = ForgeDirection.getOrientation(BlockDispenser.func_149937_b(source.getBlockMetadata()).ordinal());
+		int x = source.getXInt() + facing.offsetX;
+		int y = source.getYInt() + facing.offsetY;
+		int z = source.getZInt() + facing.offsetZ;
+		World world = source.getWorld();
 		Block block = world.getBlock(x, y, z);
 		if(block instanceof IWandable) {
-			((IWandable) block).onUsedByWand(null, par2ItemStack, world, x, y, z, facing.getOpposite().ordinal());
-			return par2ItemStack;
+			((IWandable) block).onUsedByWand(null, stack, world, x, y, z, facing.getOpposite().ordinal());
+			return stack;
 		}
 
-		return super.dispenseStack(par1IBlockSource, par2ItemStack);
+		return super.dispenseStack(source, stack);
 	}
 
 }

src/main/java/vazkii/botania/common/block/mana/BlockAlchemyCatalyst.java

@@ -42,15 +42,15 @@ public class BlockAlchemyCatalyst extends BlockMod implements ILexiconable, IPoo
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[4];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(2, par1)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(2, side)];
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/mana/BlockBellows.java

@@ -43,13 +43,13 @@ public class BlockBellows extends BlockModContainer<TileBellows> implements ILex
 	}
 
 	@Override
-	public void onBlockPlacedBy(World p_149689_1_, int p_149689_2_, int p_149689_3_, int p_149689_4_, EntityLivingBase p_149689_5_, ItemStack p_149689_6_) {
-		int l = MathHelper.floor_double(p_149689_5_.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		p_149689_1_.setBlockMetadataWithNotify(p_149689_2_, p_149689_3_, p_149689_4_, META_ROTATIONS[l], 2);
+	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn) {
+		int l = MathHelper.floor_double(placer.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
+		world.setBlockMetadataWithNotify(x, y, z, META_ROTATIONS[l], 2);
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 
@@ -71,8 +71,8 @@ public class BlockBellows extends BlockModContainer<TileBellows> implements ILex
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return ModBlocks.livingwood.getIcon(par1, 0);
+	public IIcon getIcon(int side, int meta) {
+		return ModBlocks.livingwood.getIcon(side, 0);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/mana/BlockBrewery.java

@@ -56,33 +56,33 @@ public class BlockBrewery extends BlockModContainer<TileBrewery> implements ILex
 	}
 
 	@Override
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
-		TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4);
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) {
+		TileBrewery brew = (TileBrewery) world.getTileEntity(x, y, z);
 
-		if(par5EntityPlayer.isSneaking()) {
-			if(brew.recipe == null && par1World.getBlockMetadata(par2, par3, par4) == 0)
+		if(player.isSneaking()) {
+			if(brew.recipe == null && world.getBlockMetadata(x, y, z) == 0)
 				for(int i = brew.getSizeInventory() - 1; i >= 0; i--) {
 					ItemStack stackAt = brew.getStackInSlot(i);
 					if(stackAt != null) {
 						ItemStack copy = stackAt.copy();
-						if(!par5EntityPlayer.inventory.addItemStackToInventory(copy))
-							par5EntityPlayer.dropPlayerItemWithRandomChoice(copy, false);
+						if(!player.inventory.addItemStackToInventory(copy))
+							player.dropPlayerItemWithRandomChoice(copy, false);
 						brew.setInventorySlotContents(i, null);
-						par1World.func_147453_f(par2, par3, par4, this);
+						world.func_147453_f(x, y, z, this);
 						break;
 					}
 				}
 		} else {
-			ItemStack stack = par5EntityPlayer.getCurrentEquippedItem();
+			ItemStack stack = player.getCurrentEquippedItem();
 			if(stack != null)
-				return brew.addItem(par5EntityPlayer, stack);
+				return brew.addItem(player, stack);
 		}
 		return false;
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileSimpleInventory inv = (TileSimpleInventory) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileSimpleInventory inv = (TileSimpleInventory) world.getTileEntity(x, y, z);
 
 		if (inv != null) {
 			for (int j1 = 0; j1 < inv.getSizeInventory(); ++j1) {
@@ -93,14 +93,14 @@ public class BlockBrewery extends BlockModContainer<TileBrewery> implements ILex
 					float f1 = random.nextFloat() * 0.8F + 0.1F;
 					EntityItem entityitem;
 
-					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+					for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 						int k1 = random.nextInt(21) + 10;
 
 						if (k1 > itemstack.stackSize)
 							k1 = itemstack.stackSize;
 
 						itemstack.stackSize -= k1;
-						entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+						entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 						float f3 = 0.05F;
 						entityitem.motionX = (float)random.nextGaussian() * f3;
 						entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -112,10 +112,10 @@ public class BlockBrewery extends BlockModContainer<TileBrewery> implements ILex
 				}
 			}
 
-			par1World.func_147453_f(par2, par3, par4, par5);
+			world.func_147453_f(x, y, z, blockBroken);
 		}
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override
@@ -124,13 +124,13 @@ public class BlockBrewery extends BlockModContainer<TileBrewery> implements ILex
 	}
 
 	@Override
-	public int getComparatorInputOverride(World par1World, int par2, int par3, int par4, int par5) {
-		TileBrewery brew = (TileBrewery) par1World.getTileEntity(par2, par3, par4);
+	public int getComparatorInputOverride(World world, int x, int y, int z, int side) {
+		TileBrewery brew = (TileBrewery) world.getTileEntity(x, y, z);
 		return brew.signal;
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		// NO-OP
 	}
 

src/main/java/vazkii/botania/common/block/mana/BlockDistributor.java

@@ -38,14 +38,14 @@ public class BlockDistributor extends BlockModContainer<TileDistributor> impleme
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		iconTop = IconHelper.forBlock(par1IconRegister, this, 0);
-		iconSide = IconHelper.forBlock(par1IconRegister, this, 1);
+	public void registerBlockIcons(IIconRegister register) {
+		iconTop = IconHelper.forBlock(register, this, 0);
+		iconSide = IconHelper.forBlock(register, this, 1);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return par1 == 0 ? ModBlocks.livingrock.getIcon(0, 0) : par1 == 1 ? iconTop : iconSide;
+	public IIcon getIcon(int side, int meta) {
+		return side == 0 ? ModBlocks.livingrock.getIcon(0, 0) : side == 1 ? iconTop : iconSide;
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/mana/BlockEnchanter.java

@@ -60,9 +60,9 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		super.registerBlockIcons(par1IconRegister);
-		overlay = IconHelper.forBlock(par1IconRegister, this, "Overlay");
+	public void registerBlockIcons(IIconRegister register) {
+		super.registerBlockIcons(register);
+		overlay = IconHelper.forBlock(register, this, "Overlay");
 	}
 
 	@Override
@@ -71,7 +71,7 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 	}
 
 	@Override
-	public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) {
+	public Item getItemDropped(int meta, Random random, int fortune) {
 		return Item.getItemFromBlock(Blocks.lapis_block);
 	}
 
@@ -81,9 +81,9 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 	}
 
 	@Override
-	public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5EntityPlayer, int par6, float par7, float par8, float par9) {
-		TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4);
-		ItemStack stack = par5EntityPlayer.getCurrentEquippedItem();
+	public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float subX, float subY, float subZ) {
+		TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(x, y, z);
+		ItemStack stack = player.getCurrentEquippedItem();
 		if(stack != null && stack.getItem() == ModItems.twigWand)
 			return false;
 
@@ -92,22 +92,22 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 		if(enchanter.itemToEnchant == null) {
 			if(stackEnchantable) {
 				enchanter.itemToEnchant = stack.copy();
-				par5EntityPlayer.inventory.setInventorySlotContents(par5EntityPlayer.inventory.currentItem, null);
+				player.inventory.setInventorySlotContents(player.inventory.currentItem, null);
 				enchanter.sync();
 			}
 		} else if(enchanter.stage == 0) {
-			if(par5EntityPlayer.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) {
+			if(player.inventory.addItemStackToInventory(enchanter.itemToEnchant.copy())) {
 				enchanter.itemToEnchant = null;
 				enchanter.sync();
-			} else par5EntityPlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.invFull"));
+			} else player.addChatMessage(new ChatComponentTranslation("botaniamisc.invFull"));
 		}
 
 		return true;
 	}
 
 	@Override
-	public void breakBlock(World par1World, int par2, int par3, int par4, Block par5, int par6) {
-		TileEnchanter enchanter = (TileEnchanter) par1World.getTileEntity(par2, par3, par4);
+	public void breakBlock(World world, int x, int y, int z, Block blockBroken, int meta) {
+		TileEnchanter enchanter = (TileEnchanter) world.getTileEntity(x, y, z);
 
 		ItemStack itemstack = enchanter.itemToEnchant;
 
@@ -116,14 +116,14 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 			float f1 = random.nextFloat() * 0.8F + 0.1F;
 			EntityItem entityitem;
 
-			for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; par1World.spawnEntityInWorld(entityitem)) {
+			for (float f2 = random.nextFloat() * 0.8F + 0.1F; itemstack.stackSize > 0; world.spawnEntityInWorld(entityitem)) {
 				int k1 = random.nextInt(21) + 10;
 
 				if (k1 > itemstack.stackSize)
 					k1 = itemstack.stackSize;
 
 				itemstack.stackSize -= k1;
-				entityitem = new EntityItem(par1World, par2 + f, par3 + f1, par4 + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
+				entityitem = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(itemstack.getItem(), k1, itemstack.getItemDamage()));
 				float f3 = 0.05F;
 				entityitem.motionX = (float)random.nextGaussian() * f3 * 0.5;
 				entityitem.motionY = (float)random.nextGaussian() * f3 + 0.2F;
@@ -134,9 +134,9 @@ public class BlockEnchanter extends BlockModContainer<TileEnchanter> implements
 			}
 		}
 
-		par1World.func_147453_f(par2, par3, par4, par5);
+		world.func_147453_f(x, y, z, blockBroken);
 
-		super.breakBlock(par1World, par2, par3, par4, par5, par6);
+		super.breakBlock(world, x, y, z, blockBroken, meta);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/mana/BlockForestDrum.java

@@ -63,9 +63,9 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
 	}
 
 	@Override
-	public Block setBlockName(String par1Str) {
-		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, par1Str);
-		return super.setBlockName(par1Str);
+	public Block setBlockName(String name) {
+		GameRegistry.registerBlock(this, ItemBlockWithMetadataAndName.class, name);
+		return super.setBlockName(name);
 	}
 
 	@Override
@@ -84,17 +84,17 @@ public class BlockForestDrum extends BlockMod implements IManaTrigger, ILexicona
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		iconBases = IconHelper.forBlock(par1IconRegister, this, 0);
-		iconFaces = IconHelper.forBlock(par1IconRegister, this, 1);
-		iconBasesA = IconHelper.forBlock(par1IconRegister, this, 2);
-		iconFacesA = IconHelper.forBlock(par1IconRegister, this, 3);
-		iconBasesB = IconHelper.forBlock(par1IconRegister, this, 4);
-		iconFacesB = IconHelper.forBlock(par1IconRegister, this, 5);
+	public void registerBlockIcons(IIconRegister register) {
+		iconBases = IconHelper.forBlock(register, this, 0);
+		iconFaces = IconHelper.forBlock(register, this, 1);
+		iconBasesA = IconHelper.forBlock(register, this, 2);
+		iconFacesA = IconHelper.forBlock(register, this, 3);
+		iconBasesB = IconHelper.forBlock(register, this, 4);
+		iconFacesB = IconHelper.forBlock(register, this, 5);
 	}
 
 	@Override
-	public void getSubBlocks(Item item, CreativeTabs tab, List list) {
+	public void getSubBlocks(Item item, CreativeTabs tab, List<ItemStack> list) {
 		for(int i = 0; i < 3; i++)
 			list.add(new ItemStack(item, 1, i));
 	}

src/main/java/vazkii/botania/common/block/mana/BlockManaDetector.java

@@ -44,15 +44,15 @@ public class BlockManaDetector extends BlockModContainer<TileManaDetector> imple
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
+	public void registerBlockIcons(IIconRegister register) {
 		icons = new IIcon[2];
 		for(int i = 0; i < icons.length; i++)
-			icons[i] = IconHelper.forBlock(par1IconRegister, this, i);
+			icons[i] = IconHelper.forBlock(register, this, i);
 	}
 
 	@Override
-	public IIcon getIcon(int par1, int par2) {
-		return icons[Math.min(icons.length - 1, par2)];
+	public IIcon getIcon(int side, int meta) {
+		return icons[Math.min(icons.length - 1, meta)];
 	}
 
 	@Override
@@ -61,14 +61,14 @@ public class BlockManaDetector extends BlockModContainer<TileManaDetector> imple
 	}
 
 	@Override
-	public int isProvidingWeakPower(IBlockAccess par1iBlockAccess, int par2, int par3, int par4, int par5) {
-		return par1iBlockAccess.getBlockMetadata(par2, par3, par4) != 0 ? 15 : 0;
+	public int isProvidingWeakPower(IBlockAccess worldIn, int x, int y, int z, int side) {
+		return worldIn.getBlockMetadata(x, y, z) != 0 ? 15 : 0;
 	}
 
 	@Override
-	public void addCollisionBoxesToList(World par1World, int par2, int par3, int par4, AxisAlignedBB par5AxisAlignedBB, List par6List, Entity par7Entity) {
-		if(par7Entity != null && !(par7Entity instanceof IManaBurst))
-			super.addCollisionBoxesToList(par1World, par2, par3, par4, par5AxisAlignedBB, par6List, par7Entity);
+	public void addCollisionBoxesToList(World world, int x, int y, int z, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collider) {
+		if(collider != null && !(collider instanceof IManaBurst))
+			super.addCollisionBoxesToList(world, x, y, z, mask, list, collider);
 	}
 
 	@Override

src/main/java/vazkii/botania/common/block/mana/BlockManaVoid.java

@@ -39,9 +39,9 @@ public class BlockManaVoid extends BlockModContainer<TileManaVoid> implements IL
 	}
 
 	@Override
-	public void registerBlockIcons(IIconRegister par1IconRegister) {
-		blockIcon = IconHelper.forBlock(par1IconRegister, this, 0);
-		overlay = IconHelper.forBlock(par1IconRegister, this, 1);
+	public void registerBlockIcons(IIconRegister register) {
+		blockIcon = IconHelper.forBlock(register, this, 0);
+		overlay = IconHelper.forBlock(register, this, 1);
 	}
 
 	@Override