Lots of name substitutions

build.gradle

@@ -43,7 +43,7 @@ minecraft {
     version = "${config.mc_version}-${config.forge_version}"
     runDir = "eclipse/assets"
 
-    mappings = "snapshot_20151229"
+    mappings = "snapshot_20160318"
     //This, does the token replacement.
     //Though, I reccomend this to be replaced with a token such as @VERSION@
     replace 'GRADLE:BUILD', config.build_number
@@ -234,4 +234,4 @@ curseforge {
 }
 
 //defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload'
-defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge'
+defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge'

build.properties

@@ -2,8 +2,8 @@
 #Sat Mar 12 17:00:04 CST 2016
 version=r1.8
 dir_output=../Build Output/Botania/
-forge_version=11.15.1.1763
-mc_version=1.8.9
+forge_version=12.16.0.1767-1.9
+mc_version=1.9
 dir_repo=./
 build_number=300
 mod_name=Botania

src/api/java/buildcraft/api/core/BuildCraftAPI.java

@@ -12,7 +12,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 
 import net.minecraft.block.Block;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public final class BuildCraftAPI {

src/api/java/buildcraft/api/core/EnumColor.java

@@ -10,8 +10,8 @@ import java.util.Random;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
 
+import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 
@@ -117,7 +117,7 @@ public enum EnumColor implements IStringSerializable {
     }
 
     public String getLocalizedName() {
-        return StatCollector.translateToLocal(getTag());
+        return I18n.translateToLocal(getTag());
     }
 
     public String getDye() {

src/api/java/buildcraft/api/core/IAreaProvider.java

@@ -4,7 +4,7 @@
  * should be located as "LICENSE.API" in the BuildCraft source code distribution. */
 package buildcraft.api.core;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /** To be implemented by TileEntities able to provide a square area on the world, typically BuildCraft markers. */
 public interface IAreaProvider {

src/api/java/buildcraft/api/core/IBox.java

@@ -4,7 +4,8 @@
  * should be located as "LICENSE.API" in the BuildCraft source code distribution. */
 package buildcraft.api.core;
 
-import net.minecraft.util.BlockPos;
+
+import net.minecraft.util.math.BlockPos;
 
 public interface IBox extends IZone {
     IBox expand(int amount);

src/api/java/buildcraft/api/core/IPathProvider.java

@@ -2,7 +2,7 @@ package buildcraft.api.core;
 
 import java.util.List;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /** To be implemented by TileEntities able to provide a path on the world, typically BuildCraft path markers. */
 public interface IPathProvider {

src/api/java/buildcraft/api/core/IWorldProperty.java

@@ -4,7 +4,7 @@
  * should be located as "LICENSE.API" in the BuildCraft source code distribution. */
 package buildcraft.api.core;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public interface IWorldProperty {

src/api/java/buildcraft/api/core/IZone.java

@@ -6,12 +6,12 @@ package buildcraft.api.core;
 
 import java.util.Random;
 
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.Vec3;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 
 public interface IZone {
     /** Returns the smallest possible distance that the index would have to be changed by in order for
-     * {@link #contains(Vec3)} to return true. If the position is already inside then this will return 0 */
+     * {@link #contains(Vec3d)} to return true. If the position is already inside then this will return 0 */
     double distanceTo(BlockPos index);
 
     /** Returns {@link #distanceTo(BlockPos)} but squared. Usually this will be quicker to calculate. */
@@ -19,8 +19,8 @@ public interface IZone {
 
     /** Returns true if the point is enclosed by this zone, such that none of the coordinates lie outside the range
      * specified by this zone. */
-    boolean contains(Vec3 point);
+    boolean contains(Vec3d point);
 
-    /** Gets a random position that {@link #contains(Vec3)} will return true. */
+    /** Gets a random position that {@link #contains(Vec3d)} will return true. */
     BlockPos getRandomBlockPos(Random rand);
 }

src/api/java/buildcraft/api/core/render/ICullable.java

@@ -4,8 +4,8 @@
  * of the license located in http://www.mod-buildcraft.com/MMPL-1.0.txt */
 package buildcraft.api.core.render;
 
-import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 
 /* This interface designates a block as a state machine responsible for culling For implementation details look into

src/api/java/buildcraft/api/transport/ICustomPipeConnection.java

@@ -1,7 +1,7 @@
 package buildcraft.api.transport;
 
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 

src/api/java/buildcraft/api/transport/IStripesHandler.java

@@ -6,7 +6,7 @@ package buildcraft.api.transport;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 

src/api/java/buildcraft/api/transport/PipeConnectionAPI.java

@@ -6,7 +6,7 @@ import com.google.common.collect.Maps;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 

src/api/java/buildcraft/api/transport/PipeManager.java

@@ -11,7 +11,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 import buildcraft.api.transport.pluggable.PipePluggable;

src/api/java/buildcraft/api/transport/pluggable/PipePluggable.java

@@ -5,7 +5,7 @@
 package buildcraft.api.transport.pluggable;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/api/java/thaumcraft/api/crafting/IInfusionStabiliser.java

@@ -1,6 +1,6 @@
 package thaumcraft.api.crafting;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

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

@@ -37,7 +37,7 @@ import net.minecraft.item.ItemArmor.ArmorMaterial;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.CraftingManager;
 import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.common.util.EnumHelper;
 import net.minecraftforge.fml.common.LoaderState;
 import net.minecraftforge.oredict.OreDictionary;
@@ -114,7 +114,7 @@ public final class BotaniaAPI {
 
 	public static ArmorMaterial manaweaveArmorMaterial = EnumHelper.addArmorMaterial("MANAWEAVE", "manaweave", 5, new int[] { 1, 2, 2, 1 }, 18);
 
-	public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", EnumChatFormatting.GOLD, "Relic");
+	public static EnumRarity rarityRelic = EnumHelper.addRarity("RELIC", TextFormatting.GOLD, "Relic");
 
 	public static KnowledgeType basicKnowledge;
 	public static KnowledgeType elvenKnowledge;
@@ -139,9 +139,9 @@ public final class BotaniaAPI {
 	static {
 		registerSubTile("", DummySubTile.class);
 
-		basicKnowledge = registerKnowledgeType("minecraft", EnumChatFormatting.RESET, true);
-		elvenKnowledge = registerKnowledgeType("alfheim", EnumChatFormatting.DARK_GREEN, false);
-		relicKnowledge = registerKnowledgeType("relic", EnumChatFormatting.DARK_PURPLE, false);
+		basicKnowledge = registerKnowledgeType("minecraft", TextFormatting.RESET, true);
+		elvenKnowledge = registerKnowledgeType("alfheim", TextFormatting.DARK_GREEN, false);
+		relicKnowledge = registerKnowledgeType("relic", TextFormatting.DARK_PURPLE, false);
 
 		addOreWeight("oreAluminum", 3940); // Tinkers' Construct
 		addOreWeight("oreAmber", 2075); // Thaumcraft
@@ -277,7 +277,7 @@ public final class BotaniaAPI {
 	 * @param id The ID for this knowledge type.
 	 * @param color The color to display this knowledge type as.
 	 */
-	public static KnowledgeType registerKnowledgeType(String id, EnumChatFormatting color, boolean autoUnlock) {
+	public static KnowledgeType registerKnowledgeType(String id, TextFormatting color, boolean autoUnlock) {
 		KnowledgeType type = new KnowledgeType(id, color, autoUnlock);
 		knowledgeTypes.put(id, type);
 		return type;

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

@@ -10,7 +10,7 @@ package vazkii.botania.api;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Maps;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraftforge.fml.common.Loader;
 import net.minecraftforge.fml.common.LoaderState;
 import net.minecraftforge.fml.relauncher.Side;

src/main/java/vazkii/botania/api/corporea/CorporeaHelper.java

@@ -23,8 +23,8 @@ import net.minecraft.inventory.IInventory;
 import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import net.minecraftforge.common.MinecraftForge;

src/main/java/vazkii/botania/api/corporea/InvWithLocation.java

@@ -1,6 +1,6 @@
 package vazkii.botania.api.corporea;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandler;
 

src/main/java/vazkii/botania/api/internal/DummyManaNetwork.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.mana.TileSignature;
 

src/main/java/vazkii/botania/api/internal/DummyMethodHandler.java

@@ -13,7 +13,7 @@ package vazkii.botania.api.internal;
 import java.util.List;
 
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -22,7 +22,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;

src/main/java/vazkii/botania/api/internal/IInternalMethodHandler.java

@@ -13,7 +13,7 @@ package vazkii.botania.api.internal;
 import java.util.List;
 
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
@@ -21,7 +21,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;

src/main/java/vazkii/botania/api/internal/IManaBurst.java

@@ -13,7 +13,7 @@ package vazkii.botania.api.internal;
 import java.util.UUID;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * Interface for the Mana Burst entity. This can safely be casted to EntityThrowable.

src/main/java/vazkii/botania/api/internal/IManaNetwork.java

@@ -13,7 +13,7 @@ package vazkii.botania.api.internal;
 import java.util.List;
 
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.mana.TileSignature;
 

src/main/java/vazkii/botania/api/internal/VanillaPacketDispatcher.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public final class VanillaPacketDispatcher {

src/main/java/vazkii/botania/api/item/IExtendedWireframeCoordinateListProvider.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.item;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * An extension of IWireframeCoordinateListProvider that allows for

src/main/java/vazkii/botania/api/item/IFlowerPlaceable.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.item;
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import vazkii.botania.api.subtile.SubTileEntity;
 
 /**

src/main/java/vazkii/botania/api/item/IGrassHornExcempt.java

@@ -10,7 +10,7 @@
  */
 package vazkii.botania.api.item;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/item/IHornHarvestable.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.item;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/item/ISequentialBreaker.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.item;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 
 /**

src/main/java/vazkii/botania/api/item/IWireframeCoordinateListProvider.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

src/main/java/vazkii/botania/api/lexicon/ILexiconable.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.lexicon;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/lexicon/KnowledgeType.java

@@ -1,14 +1,14 @@
 package vazkii.botania.api.lexicon;
 
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 
 public class KnowledgeType {
 
 	public final String id;
-	public final EnumChatFormatting color;
+	public final TextFormatting color;
 	public final boolean autoUnlock;
 
-	public KnowledgeType(String id, EnumChatFormatting color, boolean autoUnlock) {
+	public KnowledgeType(String id, TextFormatting color, boolean autoUnlock) {
 		this.id = id;
 		this.color = color;
 		this.autoUnlock = autoUnlock;

src/main/java/vazkii/botania/api/lexicon/LexiconEntry.java

@@ -15,7 +15,7 @@ import java.util.Arrays;
 import java.util.List;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.api.BotaniaAPI;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
@@ -122,7 +122,7 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
 	}
 
 	public final String getNameForSorting() {
-		return (priority ? 0 : 1) + StatCollector.translateToLocal(getUnlocalizedName());
+		return (priority ? 0 : 1) + I18n.translateToLocal(getUnlocalizedName());
 	}
 
 	public List<ItemStack> getDisplayedRecipes() {

src/main/java/vazkii/botania/api/lexicon/multiblock/Multiblock.java

@@ -14,7 +14,7 @@ import java.util.*;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
 

src/main/java/vazkii/botania/api/lexicon/multiblock/component/AnyComponent.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.lexicon.multiblock.component;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/lexicon/multiblock/component/ColorSwitchingComponent.java

@@ -14,7 +14,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.EnumDyeColor;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.BotaniaAPI;
 

src/main/java/vazkii/botania/api/lexicon/multiblock/component/FlowerComponent.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.lexicon.multiblock.component;
 
 import net.minecraft.block.Block;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.state.BotaniaStateProps;

src/main/java/vazkii/botania/api/lexicon/multiblock/component/MultiblockComponent.java

@@ -13,7 +13,7 @@ package vazkii.botania.api.lexicon.multiblock.component;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

src/main/java/vazkii/botania/api/lexicon/multiblock/component/StateInsensitiveComponent.java

@@ -1,7 +1,7 @@
 package vazkii.botania.api.lexicon.multiblock.component;
 
 import net.minecraft.block.Block;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 // Multiblock component that only compares blocks, not blockstates

src/main/java/vazkii/botania/api/mana/ILaputaImmobile.java

@@ -10,7 +10,7 @@
  */
 package vazkii.botania.api.mana;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/mana/ILensEffect.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.mana;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.RayTraceResult;
 import vazkii.botania.api.internal.IManaBurst;
 
 /**
@@ -31,7 +31,7 @@ public interface ILensEffect {
 	 * any block. This is called after the collision is handled.
 	 * @return True to kill the burst. False to keep it alive.
 	 */
-	public boolean collideBurst(IManaBurst burst, MovingObjectPosition pos, boolean isManaBlock, boolean dead, ItemStack stack);
+	public boolean collideBurst(IManaBurst burst, RayTraceResult pos, boolean isManaBlock, boolean dead, ItemStack stack);
 
 	/**
 	 * Called when a mana burst fired from a mana spreader with this focus is updated.

src/main/java/vazkii/botania/api/mana/IManaTrigger.java

@@ -10,7 +10,7 @@
  */
 package vazkii.botania.api.mana;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.internal.IManaBurst;
 

src/main/java/vazkii/botania/api/mana/IPoolOverlayProvider.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.mana;
 
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 import com.google.common.base.Predicates;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.world.World;
 
 public final class SparkHelper {

src/main/java/vazkii/botania/api/recipe/ElvenPortalUpdateEvent.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraftforge.fml.common.eventhandler.Event;
 
 /**

src/main/java/vazkii/botania/api/recipe/RecipePureDaisy.java

@@ -18,7 +18,7 @@ import com.google.common.base.Preconditions;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.oredict.OreDictionary;
 import vazkii.botania.api.subtile.SubTileEntity;

src/main/java/vazkii/botania/api/state/BotaniaStateProps.java

@@ -17,7 +17,7 @@ import net.minecraft.block.properties.PropertyBool;
 import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.EnumDyeColor;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import vazkii.botania.api.item.IFloatingFlower;

src/main/java/vazkii/botania/api/subtile/RadiusDescriptor.java

@@ -10,8 +10,8 @@
  */
 package vazkii.botania.api.subtile;
 
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 
 /**
  * This object describes the Radius of a SubTileEntity. It can either be

src/main/java/vazkii/botania/api/subtile/SubTileEntity.java

@@ -15,13 +15,13 @@ import java.util.List;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 import vazkii.botania.api.BotaniaAPI;
@@ -182,14 +182,14 @@ public class SubTileEntity {
 	}
 
 	/**
-	 * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing)
+	 * @see IWandBindable#canSelect(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing)
 	 */
 	public boolean canSelect(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
 		return false;
 	}
 
 	/**
-	 * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.BlockPos, net.minecraft.util.EnumFacing)
+	 * @see IWandBindable#bindTo(EntityPlayer, ItemStack, net.minecraft.util.math.BlockPos, net.minecraft.util.EnumFacing)
 	 */
 	public boolean bindTo(EntityPlayer player, ItemStack wand, BlockPos pos, EnumFacing side) {
 		return false;

src/main/java/vazkii/botania/api/subtile/SubTileFunctional.java

@@ -18,9 +18,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.internal.IManaNetwork;
 import vazkii.botania.api.mana.IManaPool;
@@ -211,7 +211,7 @@ public class SubTileFunctional extends SubTileEntity {
 
 	@Override
 	public void renderHUD(Minecraft mc, ScaledResolution res) {
-		String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
+		String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
 		int color = getColor();
 		BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
 	}

src/main/java/vazkii/botania/api/subtile/SubTileGenerating.java

@@ -23,9 +23,9 @@ import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.internal.IManaNetwork;
@@ -301,7 +301,7 @@ public class SubTileGenerating extends SubTileEntity {
 
 	@Override
 	public void renderHUD(Minecraft mc, ScaledResolution res) {
-		String name = StatCollector.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
+		String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
 		int color = getColor();
 		BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
 	}

src/main/java/vazkii/botania/api/subtile/signature/BasicSignature.java

@@ -15,8 +15,8 @@ import net.minecraft.item.ItemStack;
 import java.util.List;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.subtile.SubTileEntity;
@@ -68,7 +68,7 @@ public class BasicSignature extends SubTileSignature {
 
 	@Override
 	public void addTooltip(ItemStack stack, EntityPlayer player, List<String> tooltip) {
-		tooltip.add(EnumChatFormatting.BLUE + StatCollector.translateToLocal(getType()));
+		tooltip.add(TextFormatting.BLUE + I18n.translateToLocal(getType()));
 	}
 
 	private String unlocalizedName(String end) {

src/main/java/vazkii/botania/api/wand/ICoordBoundItem.java

@@ -1,7 +1,7 @@
 package vazkii.botania.api.wand;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

src/main/java/vazkii/botania/api/wand/ITileBound.java

@@ -10,7 +10,7 @@
  */
 package vazkii.botania.api.wand;
 
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

src/main/java/vazkii/botania/api/wand/IWandBindable.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.wand;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 
 /**

src/main/java/vazkii/botania/api/wand/IWandHUD.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.wand;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/wand/IWandable.java

@@ -12,7 +12,7 @@ package vazkii.botania.api.wand;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.World;
 

src/main/java/vazkii/botania/api/wand/IWireframeAABBProvider.java

@@ -10,8 +10,8 @@
  */
 package vazkii.botania.api.wand;
 
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 /**

src/main/java/vazkii/botania/api/wiki/IWikiProvider.java

@@ -11,7 +11,7 @@
 package vazkii.botania.api.wiki;
 
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 
 /**
@@ -24,16 +24,16 @@ public interface IWikiProvider {
 	/**
 	 * Gets the name of the block being looked at for display.
 	 */
-	public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player);
+	public String getBlockName(World world, RayTraceResult pos, EntityPlayer player);
 
 	/**
 	 * Gets the URL to open when the block is clicked.
 	 */
-	public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player);
+	public String getWikiURL(World world, RayTraceResult pos, EntityPlayer player);
 
 	/**
 	 * Gets the name of the wiki for display.
 	 */
-	public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player);
+	public String getWikiName(World world, RayTraceResult pos, EntityPlayer player);
 
 }

src/main/java/vazkii/botania/api/wiki/SimpleWikiProvider.java

@@ -13,8 +13,8 @@ package vazkii.botania.api.wiki;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 
 import org.apache.commons.lang3.text.WordUtils;
@@ -47,7 +47,7 @@ public class SimpleWikiProvider implements IWikiProvider {
 	}
 
 	@Override
-	public String getBlockName(World world, MovingObjectPosition pos, EntityPlayer player) {
+	public String getBlockName(World world, RayTraceResult pos, EntityPlayer player) {
 		BlockPos bPos = pos.getBlockPos();
 
 		Block block = world.getBlockState(bPos).getBlock();
@@ -70,7 +70,7 @@ public class SimpleWikiProvider implements IWikiProvider {
 	}
 
 	@Override
-	public String getWikiURL(World world, MovingObjectPosition pos, EntityPlayer player) {
+	public String getWikiURL(World world, RayTraceResult pos, EntityPlayer player) {
 		String name = getBlockName(world, pos, player);
 		if(name == null)
 			return null;
@@ -83,7 +83,7 @@ public class SimpleWikiProvider implements IWikiProvider {
 	}
 
 	@Override
-	public String getWikiName(World world, MovingObjectPosition pos, EntityPlayer player) {
+	public String getWikiName(World world, RayTraceResult pos, EntityPlayer player) {
 		return name;
 	}
 

src/main/java/vazkii/botania/client/core/handler/BoundTileRenderer.java

@@ -21,8 +21,8 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 
@@ -45,7 +45,7 @@ public final class BoundTileRenderer {
 		GlStateManager.disableTexture2D();
 		GlStateManager.enableBlend();
 
-		// todo 1.8 Tessellator.renderingWorldRenderer = false;
+		// todo 1.8 Tessellator.renderingVertexBuffer = false;
 
 		EntityPlayer player = Minecraft.getMinecraft().thePlayer;
 		ItemStack stack = player.getCurrentEquippedItem();
@@ -151,42 +151,42 @@ public final class BoundTileRenderer {
 		double ay = aabb.maxY;
 		double az = aabb.maxZ;
 
-		tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
-		tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
+		tessellator.getBuffer().pos(ix, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ix, ay, iz).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex();
+		tessellator.getBuffer().pos(ix, ay, iz).endVertex();
+		tessellator.getBuffer().pos(ax, ay, iz).endVertex();
 
-		tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ax, ay, iz).endVertex();
+		tessellator.getBuffer().pos(ax, iy, iz).endVertex();
 
-		tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ax, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ix, iy, iz).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, iy, az).endVertex();
-		tessellator.getWorldRenderer().pos(ix, ay, az).endVertex();
+		tessellator.getBuffer().pos(ix, iy, az).endVertex();
+		tessellator.getBuffer().pos(ix, ay, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, iy, az).endVertex();
-		tessellator.getWorldRenderer().pos(ax, iy, az).endVertex();
+		tessellator.getBuffer().pos(ix, iy, az).endVertex();
+		tessellator.getBuffer().pos(ax, iy, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ax, iy, az).endVertex();
-		tessellator.getWorldRenderer().pos(ax, ay, az).endVertex();
+		tessellator.getBuffer().pos(ax, iy, az).endVertex();
+		tessellator.getBuffer().pos(ax, ay, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, ay, az).endVertex();
-		tessellator.getWorldRenderer().pos(ax, ay, az).endVertex();
+		tessellator.getBuffer().pos(ix, ay, az).endVertex();
+		tessellator.getBuffer().pos(ax, ay, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, iy, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ix, iy, az).endVertex();
+		tessellator.getBuffer().pos(ix, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ix, iy, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ix, ay, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ix, ay, az).endVertex();
+		tessellator.getBuffer().pos(ix, ay, iz).endVertex();
+		tessellator.getBuffer().pos(ix, ay, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ax, iy, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ax, iy, az).endVertex();
+		tessellator.getBuffer().pos(ax, iy, iz).endVertex();
+		tessellator.getBuffer().pos(ax, iy, az).endVertex();
 
-		tessellator.getWorldRenderer().pos(ax, ay, iz).endVertex();
-		tessellator.getWorldRenderer().pos(ax, ay, az).endVertex();
+		tessellator.getBuffer().pos(ax, ay, iz).endVertex();
+		tessellator.getBuffer().pos(ax, ay, az).endVertex();
 
 		tessellator.draw();
 	}

src/main/java/vazkii/botania/client/core/handler/CorporeaAutoCompleteHandler.java

@@ -23,7 +23,7 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
+import net.minecraft.util.text.TextComponentString;
 
 import org.lwjgl.input.Keyboard;
 
@@ -129,7 +129,7 @@ public class CorporeaAutoCompleteHandler {
 				stringbuilder.append(", ");
 		}
 
-		Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new ChatComponentText(stringbuilder.toString()), 1);
+		Minecraft.getMinecraft().ingameGUI.getChatGUI().printChatMessageWithOptionalDeletion(new TextComponentString(stringbuilder.toString()), 1);
 		isAutoCompleted = true;
 		originalString = inputField.getText();
 	}

src/main/java/vazkii/botania/client/core/handler/DebugHandler.java

@@ -13,7 +13,7 @@ package vazkii.botania.client.core.handler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 
@@ -33,7 +33,7 @@ import java.util.UUID;
 
 public final class DebugHandler {
 
-	private static final String PREFIX = EnumChatFormatting.GREEN + "[Botania] " + EnumChatFormatting.RESET;
+	private static final String PREFIX = TextFormatting.GREEN + "[Botania] " + TextFormatting.RESET;
 
 	@SubscribeEvent
 	public void onDrawDebugText(RenderGameOverlayEvent.Text event) {

src/main/java/vazkii/botania/client/core/handler/HUDHandler.java

@@ -27,10 +27,10 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 
@@ -98,11 +98,11 @@ public final class HUDHandler {
 
 		if(event.type == ElementType.ALL) {
 			profiler.startSection("botania-hud");
-			MovingObjectPosition pos = mc.objectMouseOver;
+			RayTraceResult pos = mc.objectMouseOver;
 
 			if(pos != null) {
-				Block block = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null;
-				TileEntity tile = pos.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null;
+				Block block = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getBlockState(pos.getBlockPos()).getBlock() : null;
+				TileEntity tile = pos.typeOfHit == RayTraceResult.MovingObjectType.BLOCK ? mc.theWorld.getTileEntity(pos.getBlockPos()) : null;
 
 				if(equippedStack != null) {
 					if(pos != null && equippedStack.getItem() == ModItems.twigWand) {
@@ -135,7 +135,7 @@ public final class HUDHandler {
 
 			if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) {
 				profiler.startSection("multiblockRightClick");
-				String s = StatCollector.translateToLocal("botaniamisc.rightClickToAnchor");
+				String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor");
 				mc.fontRendererObj.drawStringWithShadow(s, event.resolution.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.resolution.getScaledHeight() / 2 - 30, 0xFFFFFF);
 				profiler.endSection();
 			}
@@ -225,7 +225,7 @@ public final class HUDHandler {
 		if(ticks > 0) {
 			int alpha = Math.min(255, (int) (ticks * 256.0F / 10.0F));
 			int color = 0x00CC00 + (alpha << 24);
-			String disp = StatCollector.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem()));
+			String disp = I18n.translateToLocal(ItemTwigWand.getModeString(mc.thePlayer.getCurrentEquippedItem()));
 
 			int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2;
 			int y = res.getScaledHeight() - 70;
@@ -332,7 +332,7 @@ public final class HUDHandler {
 		profiler.endSection();
 	}
 
-	private void drawLexiconHUD(ItemStack stack, Block block, MovingObjectPosition pos, ScaledResolution res) {
+	private void drawLexiconHUD(ItemStack stack, Block block, RayTraceResult pos, ScaledResolution res) {
 		Minecraft mc = Minecraft.getMinecraft();
 		Profiler profiler = mc.mcProfiler;
 
@@ -353,8 +353,8 @@ public final class HUDHandler {
 				if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType()))
 					font = mc.standardGalacticFontRenderer;
 
-				drawStr = StatCollector.translateToLocal(entry.getUnlocalizedName());
-				secondLine = EnumChatFormatting.ITALIC + StatCollector.translateToLocal(entry.getTagline());
+				drawStr = I18n.translateToLocal(entry.getUnlocalizedName());
+				secondLine = TextFormatting.ITALIC + I18n.translateToLocal(entry.getTagline());
 				draw = true;
 			}
 		}
@@ -367,7 +367,7 @@ public final class HUDHandler {
 				if(url != null && !url.isEmpty()) {
 					String name = provider.getBlockName(mc.theWorld, pos, mc.thePlayer);
 					String wikiName = provider.getWikiName(mc.theWorld, pos, mc.thePlayer);
-					drawStr = name + " @ " + EnumChatFormatting.AQUA + wikiName;
+					drawStr = name + " @ " + TextFormatting.AQUA + wikiName;
 					draw = true;
 				}
 			}
@@ -388,7 +388,7 @@ public final class HUDHandler {
 
 			if(!mc.thePlayer.isSneaking()) {
 				GlStateManager.scale(0.5F, 0.5F, 1F);
-				mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
+				mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", (sx + 10) * 2 - 16, (sy + 8) * 2 + 20, 0xFFFFFFFF);
 				GlStateManager.scale(2F, 2F, 1F);
 			}
 		}
@@ -400,9 +400,9 @@ public final class HUDHandler {
 
 	private void renderNearIndexDisplay(ScaledResolution res) {
 		Minecraft mc = Minecraft.getMinecraft();
-		String txt0 = StatCollector.translateToLocal("botaniamisc.nearIndex0");
-		String txt1 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex1");
-		String txt2 = EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.nearIndex2");
+		String txt0 = I18n.translateToLocal("botaniamisc.nearIndex0");
+		String txt1 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex1");
+		String txt2 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex2");
 
 		int l = Math.max(mc.fontRendererObj.getStringWidth(txt0), Math.max(mc.fontRendererObj.getStringWidth(txt1), mc.fontRendererObj.getStringWidth(txt2))) + 20;
 		int x = res.getScaledWidth() - l - 20;
@@ -435,7 +435,7 @@ public final class HUDHandler {
 		renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana);
 
 		if(mana < 0) {
-			String text = StatCollector.translateToLocal("botaniamisc.statusUnknown");
+			String text = I18n.translateToLocal("botaniamisc.statusUnknown");
 			x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2;
 			y -= 1;
 			mc.fontRendererObj.drawString(text, x, y, color);

src/main/java/vazkii/botania/client/core/handler/ItemsRemainingRenderHandler.java

@@ -18,7 +18,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 
 import org.lwjgl.opengl.GL11;
 
@@ -61,7 +61,7 @@ public final class ItemsRemainingRenderHandler {
 			GlStateManager.color(1F, 1F, 1F, 1F);
 			GlStateManager.enableBlend();
 
-			String text = EnumChatFormatting.GREEN + stack.getDisplayName();
+			String text = TextFormatting.GREEN + stack.getDisplayName();
 			if(count >= 0) {
 				int max = stack.getMaxStackSize();
 				int stacks = count / max;
@@ -69,7 +69,7 @@ public final class ItemsRemainingRenderHandler {
 
 				if(stacks == 0)
 					text = "" + count;
-				else text = count + " (" + EnumChatFormatting.AQUA + stacks + EnumChatFormatting.RESET + "*" + EnumChatFormatting.GRAY + max + EnumChatFormatting.RESET + "+" + EnumChatFormatting.YELLOW + rem + EnumChatFormatting.RESET + ")";
+				else text = count + " (" + TextFormatting.AQUA + stacks + TextFormatting.RESET + "*" + TextFormatting.GRAY + max + TextFormatting.RESET + "+" + TextFormatting.YELLOW + rem + TextFormatting.RESET + ")";
 			} else if(count == -1)
 				text = "\u221E";
 

src/main/java/vazkii/botania/client/core/handler/LightningHandler.java

@@ -29,9 +29,9 @@ import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
 import net.minecraft.profiler.Profiler;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
@@ -88,13 +88,13 @@ public class LightningHandler {
 		ParticleRenderDispatcher.lightningCount = 0;
 
 		render.bindTexture(outsideResource);
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
 		for(LightningBolt bolt : LightningBolt.boltlist)
 			renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 0, false);
 		tessellator.draw();
 
 		render.bindTexture(insideResource);
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
 		for(LightningBolt bolt : LightningBolt.boltlist)
 			renderBolt(bolt, tessellator, frame, ActiveRenderInfo.getRotationX(), ActiveRenderInfo.getRotationXZ(), ActiveRenderInfo.getRotationZ(), ActiveRenderInfo.getRotationXY(), 1, true);
 		tessellator.draw();
@@ -150,27 +150,27 @@ public class LightningHandler {
 			int b = (color & 0xFF);
 			int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha());
 
-			tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
 
 			if(rendersegment.next == null) {
 				Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width));
 
-				tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
 			}
 
 			if(rendersegment.prev == null) {
 				Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width));
 
-				tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getBuffer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
 			}
 		}
 	}
@@ -415,12 +415,12 @@ public class LightningHandler {
 		}
 
 		private float rayTraceResistance(Vector3 start, Vector3 end, float prevresistance) {
-			MovingObjectPosition mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D());
+			RayTraceResult mop = world.rayTraceBlocks(start.toVec3D(), end.toVec3D());
 
 			if(mop == null)
 				return prevresistance;
 
-			if(mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) {
+			if(mop.typeOfHit == RayTraceResult.MovingObjectType.BLOCK) {
 				Block block = world.getBlockState(mop.getBlockPos()).getBlock();
 
 				if(world.isAirBlock(mop.getBlockPos()))

src/main/java/vazkii/botania/client/core/handler/MiscellaneousIcons.java

@@ -18,8 +18,8 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.renderer.vertex.VertexFormat;
-import net.minecraft.client.resources.model.IBakedModel;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.launchwrapper.Launch;
 import net.minecraft.util.EnumFacing;
 import net.minecraftforge.client.event.ModelBakeEvent;

src/main/java/vazkii/botania/client/core/handler/ModelHandler.java

@@ -24,7 +24,7 @@ import net.minecraft.client.renderer.block.statemap.DefaultStateMapper;
 import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.client.renderer.block.statemap.StateMapperBase;
 import net.minecraft.client.resources.IReloadableResourceManager;
-import net.minecraft.client.resources.model.ModelResourceLocation;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

src/main/java/vazkii/botania/client/core/handler/MultiblockBlockAccess.java

@@ -13,7 +13,7 @@ package vazkii.botania.client.core.handler;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.WorldType;

src/main/java/vazkii/botania/client/core/handler/MultiblockRenderHandler.java

@@ -15,7 +15,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.client.renderer.block.model.IBakedModel;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
@@ -108,7 +108,7 @@ public final class MultiblockRenderHandler {
 		}
 	}
 
-	private void renderPlayerLook(EntityPlayer player, MovingObjectPosition src) {
+	private void renderPlayerLook(EntityPlayer player, RayTraceResult src) {
 		if(currentMultiblock != null && dimension == player.worldObj.provider.getDimensionId()) {
 			BlockPos anchorPos = anchor != null ? anchor : src.getBlockPos();
 
@@ -132,7 +132,7 @@ public final class MultiblockRenderHandler {
 			
 			if(!didAny) {
 				setMultiblock(null);
-				player.addChatComponentMessage(new ChatComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GREEN)));
+				player.addChatComponentMessage(new TextComponentTranslation("botaniamisc.structureComplete").setChatStyle(new ChatStyle().setColor(TextFormatting.GREEN)));
 			}
 		}
 	}

src/main/java/vazkii/botania/client/core/handler/RedStringRenderer.java

@@ -19,7 +19,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 
 import org.lwjgl.opengl.GL11;
@@ -43,7 +43,7 @@ public final class RedStringRenderer {
 			GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 			GlStateManager.color(1F, 0F, 0F, sizeAlpha);
 
-			// todo 1.8 Tessellator.renderingWorldRenderer = false;
+			// todo 1.8 Tessellator.renderingVertexBuffer = false;
 			TileRedString tile;
 			while((tile = redStringTiles.poll()) != null)
 				renderTile(tile);
@@ -91,7 +91,7 @@ public final class RedStringRenderer {
 
 			Tessellator tessellator = Tessellator.getInstance();
 			GL11.glLineWidth(1F);
-			tessellator.getWorldRenderer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
+			tessellator.getBuffer().begin(GL11.GL_LINES, DefaultVertexFormats.POSITION);
 
 			double len = (double) -ClientTickHandler.ticksInGame / 100F + new Random(dir.ordinal() ^ tile.getPos().hashCode()).nextInt(10000);
 			double add = vecMag.mag();
@@ -118,7 +118,7 @@ public final class RedStringRenderer {
 		double y = ypos + Math.cos(l * freq) * ampl * Math.abs(Math.abs(dir.getFrontOffsetY()) - 1) + rand * randMul;
 		double z = zpos + (dir.getFrontOffsetY() == 0 ? Math.sin(l * freq) : Math.cos(l * freq)) * ampl * Math.abs(Math.abs(dir.getFrontOffsetZ()) - 1) + rand * randMul;
 
-		tess.getWorldRenderer().pos(x, y, z).endVertex();
+		tess.getBuffer().pos(x, y, z).endVertex();
 	}
 
 }

src/main/java/vazkii/botania/client/core/handler/RenderLexicon.java

@@ -9,11 +9,11 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.client.event.RenderHandEvent;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -160,30 +160,30 @@ public class RenderLexicon {
             if(Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem() != null)
                 title = Minecraft.getMinecraft().thePlayer.getCurrentEquippedItem().getDisplayName();
             if(title.equals(origTitle) && bevo)
-                title = StatCollector.translateToLocal("item.botania:lexicon.bevo");
+                title = I18n.translateToLocal("item.botania:lexicon.bevo");
             if(title.equals(origTitle) && saice)
-                title = StatCollector.translateToLocal("item.botania:lexicon.saice");
+                title = I18n.translateToLocal("item.botania:lexicon.saice");
 
             font.drawString(font.trimStringToWidth(title, 80), 0, 0, 0xD69700);
             GlStateManager.translate(0F, 10F, 0F);
             GlStateManager.scale(0.6F, 0.6F, 0.6F);
-            font.drawString(EnumChatFormatting.ITALIC + "" + EnumChatFormatting.BOLD + String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100);
+            font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100);
 
             GlStateManager.translate(0F, 15F, 0F);
-            font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);
+            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);
 
             GlStateManager.translate(0F, 10F, 0F);
-            font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
+            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
 
             GlStateManager.translate(0F, 50F, 0F);
-            font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);
+            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);
 
             GlStateManager.translate(0F, 10F, 0F);
-            font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
+            font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
 
             if(bevo || saice) {
                 GlStateManager.translate(0F, 10F, 0F);
-                font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
+                font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
             }
         }
 

src/main/java/vazkii/botania/client/core/handler/SubTileRadiusRenderHandler.java

@@ -18,9 +18,9 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.AxisAlignedBB;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
 
 import org.lwjgl.opengl.GL11;
@@ -38,7 +38,7 @@ public final class SubTileRadiusRenderHandler {
 	@SubscribeEvent
 	public void onWorldRenderLast(RenderWorldLastEvent event) {
 		Minecraft mc = Minecraft.getMinecraft();
-		MovingObjectPosition pos = mc.objectMouseOver;
+		RayTraceResult pos = mc.objectMouseOver;
 
 		if(!Botania.proxy.isClientPlayerWearingMonocle() || pos == null || pos.entityHit != null)
 			return;
@@ -69,7 +69,7 @@ public final class SubTileRadiusRenderHandler {
 		GlStateManager.disableLighting();
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-		// todo 1.8 Tessellator.renderingWorldRenderer = false;
+		// todo 1.8 Tessellator.renderingVertexBuffer = false;
 
 		if(descriptor.isCircle())
 			renderCircle(descriptor.getSubtileCoords(), descriptor.getCircleRadius());
@@ -104,22 +104,22 @@ public final class SubTileRadiusRenderHandler {
 		double z = aabb.maxZ - aabb.minZ - f;
 
 		Tessellator tessellator = Tessellator.getInstance();
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
-		tessellator.getWorldRenderer().pos(x, f, f).endVertex();
-		tessellator.getWorldRenderer().pos(f, f, f).endVertex();
-		tessellator.getWorldRenderer().pos(f, f, z).endVertex();
-		tessellator.getWorldRenderer().pos(x, f, z).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
+		tessellator.getBuffer().pos(x, f, f).endVertex();
+		tessellator.getBuffer().pos(f, f, f).endVertex();
+		tessellator.getBuffer().pos(f, f, z).endVertex();
+		tessellator.getBuffer().pos(x, f, z).endVertex();
 		tessellator.draw();
 
 		x += f;
 		z += f;
 		double f1 = f + f / 4F;
 		GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64);
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
-		tessellator.getWorldRenderer().pos(x, f1, 0).endVertex();
-		tessellator.getWorldRenderer().pos(0, f1, 0).endVertex();
-		tessellator.getWorldRenderer().pos(0, f1, z).endVertex();
-		tessellator.getWorldRenderer().pos(x, f1, z).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION);
+		tessellator.getBuffer().pos(x, f1, 0).endVertex();
+		tessellator.getBuffer().pos(0, f1, 0).endVertex();
+		tessellator.getBuffer().pos(0, f1, z).endVertex();
+		tessellator.getBuffer().pos(x, f1, z).endVertex();
 		tessellator.draw();
 
 		GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255));
@@ -155,29 +155,29 @@ public final class SubTileRadiusRenderHandler {
 
 		radius -= f;
 		Tessellator tessellator = Tessellator.getInstance();
-		tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION);
-		tessellator.getWorldRenderer().pos(0, f, 0).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION);
+		tessellator.getBuffer().pos(0, f, 0).endVertex();
 		for(int i = 0; i < totalAngles + 1; i += step) {
 			double rad = (totalAngles - i) * Math.PI / 180.0;
 			double xp = Math.cos(rad) * radius;
 			double zp = Math.sin(rad) * radius;
-			tessellator.getWorldRenderer().pos(xp, f, zp).endVertex();
+			tessellator.getBuffer().pos(xp, f, zp).endVertex();
 		}
-		tessellator.getWorldRenderer().pos(0, f, 0).endVertex();
+		tessellator.getBuffer().pos(0, f, 0).endVertex();
 		tessellator.draw();
 
 		radius += f;
 		double f1 = f + f / 4F;
 		GL11.glColor4ub((byte) colorRGB.getRed(), (byte) colorRGB.getGreen(), (byte) colorRGB.getBlue(), (byte) 64);
-		tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION);
-		tessellator.getWorldRenderer().pos(0, f1, 0).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION);
+		tessellator.getBuffer().pos(0, f1, 0).endVertex();
 		for(int i = 0; i < totalAngles + 1; i += step) {
 			double rad = (totalAngles - i) * Math.PI / 180.0;
 			double xp = Math.cos(rad) * radius;
 			double zp = Math.sin(rad) * radius;
-			tessellator.getWorldRenderer().pos(xp, f1, zp).endVertex();
+			tessellator.getBuffer().pos(xp, f1, zp).endVertex();
 		}
-		tessellator.getWorldRenderer().pos(0, f1, 0).endVertex();
+		tessellator.getBuffer().pos(0, f1, 0).endVertex();
 		tessellator.draw();
 		GL11.glColor4ub(((byte) 255), ((byte) 255), ((byte) 255), ((byte) 255));
 		GlStateManager.popMatrix();

src/main/java/vazkii/botania/client/core/handler/TooltipAdditionDisplayHandler.java

@@ -24,8 +24,8 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -159,7 +159,7 @@ public final class TooltipAdditionDisplayHandler {
 							GlStateManager.scale(0.5F, 0.5F, 1F);
 							boolean mac = Minecraft.isRunningOnMac;
 
-							mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF);
+							mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + (ConfigHandler.useShiftForQuickLookup ? "Shift" : mac ? "Cmd" : "Ctrl"), (x + 10) * 2 - 16, (y + 8) * 2 + 20, 0xFFFFFFFF);
 							GlStateManager.scale(2F, 2F, 1F);
 
 
@@ -187,13 +187,13 @@ public final class TooltipAdditionDisplayHandler {
 			Gui.drawRect(mouseX + offx + i, mouseY - offy - height, mouseX + offx + i + 1, mouseY - offy, Color.HSBtoRGB(hueOff + huePer * i, 1F, 1F));
 		Gui.drawRect(mouseX + offx + rainbowWidth, mouseY - offy - height, mouseX + offx + width, mouseY - offy, 0xFF555555);
 
-		String rank = StatCollector.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7");
+		String rank = I18n.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7");
 
 		GL11.glPushAttrib(GL11.GL_LIGHTING);
 		GL11.glDisable(GL11.GL_LIGHTING);
 		font.drawStringWithShadow(rank, mouseX + offx, mouseY - offy - 12, 0xFFFFFF);
 		if(!ss) {
-			rank = StatCollector.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
+			rank = I18n.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
 			font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF);
 		}
 

src/main/java/vazkii/botania/client/core/handler/TooltipHandler.java

@@ -12,7 +12,7 @@ package vazkii.botania.client.core.handler;
 
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import vazkii.botania.common.core.helper.ItemNBTHelper;
 import vazkii.botania.common.item.ItemKeepIvy;
@@ -25,15 +25,15 @@ public final class TooltipHandler {
 	@SubscribeEvent(priority = EventPriority.HIGHEST)
 	public void onTooltipEvent(ItemTooltipEvent event) {
 		if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.dirt) && event.itemStack.getItemDamage() == 1) {
-			event.toolTip.add(StatCollector.translateToLocal("botaniamisc.coarseDirt0"));
-			event.toolTip.add(StatCollector.translateToLocal("botaniamisc.coarseDirt1"));
+			event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt0"));
+			event.toolTip.add(I18n.translateToLocal("botaniamisc.coarseDirt1"));
 		} else if(event.itemStack.getItem() == Item.getItemFromBlock(Blocks.mob_spawner) && event.entityPlayer.capabilities.isCreativeMode)
-			event.toolTip.add(StatCollector.translateToLocal("botaniamisc.spawnerTip"));
+			event.toolTip.add(I18n.translateToLocal("botaniamisc.spawnerTip"));
 
 		if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemRegenIvy.TAG_REGEN, false))
-			event.toolTip.add(StatCollector.translateToLocal("botaniamisc.hasIvy"));
+			event.toolTip.add(I18n.translateToLocal("botaniamisc.hasIvy"));
 		if(ItemNBTHelper.detectNBT(event.itemStack) && ItemNBTHelper.getBoolean(event.itemStack, ItemKeepIvy.TAG_KEEP, false))
-			event.toolTip.add(StatCollector.translateToLocal("botaniamisc.hasKeepIvy"));
+			event.toolTip.add(I18n.translateToLocal("botaniamisc.hasKeepIvy"));
 	}
 
 }

src/main/java/vazkii/botania/client/core/helper/IconHelper.java

@@ -11,7 +11,7 @@
 package vazkii.botania.client.core.helper;
 
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
@@ -34,7 +34,7 @@ public final class IconHelper {
 	 * Adapted from ItemRenderer.renderItemIn2D, 1.7.10
 	 */
 	public static void renderIconIn3D(Tessellator tess, float p_78439_1_, float p_78439_2_, float p_78439_3_, float p_78439_4_, int width, int height, float thickness) {
-        WorldRenderer wr = tess.getWorldRenderer();
+        VertexBuffer wr = tess.getBuffer();
         wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL);
         wr.pos(0.0D, 0.0D, 0.0D).tex(p_78439_1_, p_78439_4_).normal(0, 0, 1).endVertex();
         wr.pos(1.0D, 0.0D, 0.0D).tex(p_78439_3_, p_78439_4_).normal(0, 0, 1).endVertex();

src/main/java/vazkii/botania/client/core/helper/RenderHelper.java

@@ -113,11 +113,11 @@ public final class RenderHelper {
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		GlStateManager.shadeModel(GL11.GL_SMOOTH);
 		Tessellator var15 = Tessellator.getInstance();
-		var15.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
-		var15.getWorldRenderer().pos(par3, par2, z).color(var8, var9, var10, var7).endVertex();
-		var15.getWorldRenderer().pos(par1, par2, z).color(var8, var9, var10, var7).endVertex();
-		var15.getWorldRenderer().pos(par1, par4, z).color(var12, var13, var14, var11).endVertex();
-		var15.getWorldRenderer().pos(par3, par4, z).color(var12, var13, var14, var11).endVertex();
+		var15.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
+		var15.getBuffer().pos(par3, par2, z).color(var8, var9, var10, var7).endVertex();
+		var15.getBuffer().pos(par1, par2, z).color(var8, var9, var10, var7).endVertex();
+		var15.getBuffer().pos(par1, par4, z).color(var12, var13, var14, var11).endVertex();
+		var15.getBuffer().pos(par3, par4, z).color(var12, var13, var14, var11).endVertex();
 		var15.draw();
 		GlStateManager.shadeModel(GL11.GL_FLAT);
 		GlStateManager.disableBlend();
@@ -131,11 +131,11 @@ public final class RenderHelper {
 
 	public static void drawTexturedModalRect(int par1, int par2, float z, int par3, int par4, int par5, int par6, float f, float f1) {
 		Tessellator tessellator = Tessellator.getInstance();
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
-		tessellator.getWorldRenderer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex();
-		tessellator.getWorldRenderer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex();
-		tessellator.getWorldRenderer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex();
-		tessellator.getWorldRenderer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex();
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+		tessellator.getBuffer().pos(par1 + 0, par2 + par6, z).tex((par3 + 0) * f, (par4 + par6) * f1).endVertex();
+		tessellator.getBuffer().pos(par1 + par5, par2 + par6, z).tex((par3 + par5) * f, (par4 + par6) * f1).endVertex();
+		tessellator.getBuffer().pos(par1 + par5, par2 + 0, z).tex((par3 + par5) * f, (par4 + 0) * f1).endVertex();
+		tessellator.getBuffer().pos(par1 + 0, par2 + 0, z).tex((par3 + 0) * f, (par4 + 0) * f1).endVertex();
 		tessellator.draw();
 	}
 
@@ -169,17 +169,17 @@ public final class RenderHelper {
 			GlStateManager.rotate(random.nextFloat() * 360F, 1F, 0F, 0F);
 			GlStateManager.rotate(random.nextFloat() * 360F, 0F, 1F, 0F);
 			GlStateManager.rotate(random.nextFloat() * 360F + f1 * 90F, 0F, 0F, 1F);
-			tessellator.getWorldRenderer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR);
+			tessellator.getBuffer().begin(GL11.GL_TRIANGLE_FAN, DefaultVertexFormats.POSITION_COLOR);
 			float f3 = random.nextFloat() * 20F + 5F + f2 * 10F;
 			float f4 = random.nextFloat() * 2F + 1F + f2 * 2F;
 			float r = ((color & 0xFF0000) >> 16) / 255F;
 			float g = ((color & 0xFF00) >> 8) / 255F;
 			float b = (color & 0xFF) / 255F;
-			tessellator.getWorldRenderer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex();
-			tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
-			tessellator.getWorldRenderer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
-			tessellator.getWorldRenderer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex();
-			tessellator.getWorldRenderer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
+			tessellator.getBuffer().pos(0, 0, 0).color(r, g, b, 1F - f2).endVertex();
+			tessellator.getBuffer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
+			tessellator.getBuffer().pos(0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
+			tessellator.getBuffer().pos(0, f3, 1F * f4).color(0, 0, 0, 0).endVertex();
+			tessellator.getBuffer().pos(-0.866D * f4, f3, -0.5F * f4).color(0, 0, 0, 0).endVertex();
 			tessellator.draw();
 		}
 

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

@@ -29,9 +29,9 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemRecord;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MovingObjectPosition;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings.GameType;
 import net.minecraftforge.client.model.animation.AnimationTESR;
@@ -338,7 +338,7 @@ public class ClientProxy extends CommonProxy {
 	}
 
 	@Override
-	public boolean openWikiPage(World world, Block block, MovingObjectPosition pos) {
+	public boolean openWikiPage(World world, Block block, RayTraceResult pos) {
 		IWikiProvider wiki = WikiHooks.getWikiFor(block);
 		String url = wiki.getWikiURL(world, pos, Minecraft.getMinecraft().thePlayer);
 		if(url != null && !url.isEmpty()) {

src/main/java/vazkii/botania/client/fx/FXSparkle.java

@@ -17,11 +17,11 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.BlockPos;
-import net.minecraft.util.MathHelper;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
@@ -73,13 +73,13 @@ public class FXSparkle extends EntityFX {
 		GlStateManager.color(1.0F, 1.0F, 1.0F, 0.75F);
 		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles);
 
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 		for(FXSparkle sparkle : queuedRenders)
 			sparkle.renderQueued(tessellator);
 		tessellator.draw();
 
 		ShaderHelper.useShader(ShaderHelper.filmGrain);
-		tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+		tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 		for(FXSparkle sparkle : queuedCorruptRenders)
 			sparkle.renderQueued(tessellator);
 		tessellator.draw();
@@ -107,15 +107,15 @@ public class FXSparkle extends EntityFX {
 		float var15 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ);
 		float var16 = 1.0F;
 
-		tessellator.getWorldRenderer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
-		tessellator.getWorldRenderer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
-		tessellator.getWorldRenderer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
-		tessellator.getWorldRenderer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
+		tessellator.getBuffer().pos(var13 - f1 * var12 - f4 * var12, var14 - f2 * var12, var15 - f3 * var12 - f5 * var12).tex(var9, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
+		tessellator.getBuffer().pos(var13 - f1 * var12 + f4 * var12, var14 + f2 * var12, var15 - f3 * var12 + f5 * var12).tex(var9, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
+		tessellator.getBuffer().pos(var13 + f1 * var12 + f4 * var12, var14 + f2 * var12, var15 + f3 * var12 + f5 * var12).tex(var8, var10).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
+		tessellator.getBuffer().pos(var13 + f1 * var12 - f4 * var12, var14 - f2 * var12, var15 + f3 * var12 - f5 * var12).tex(var8, var11).color(particleRed * var16, particleGreen * var16, particleBlue * var16, 1).endVertex();
 
 	}
 
 	@Override
-	public void renderParticle(WorldRenderer worldRendererIn, Entity p_180434_2_, float f, float f1, float f2, float f3, float f4, float f5) {
+	public void renderParticle(VertexBuffer worldRendererIn, Entity p_180434_2_, float f, float f1, float f2, float f3, float f4, float f5) {
 		this.f = f;
 		this.f1 = f1;
 		this.f2 = f2;

src/main/java/vazkii/botania/client/fx/FXWisp.java

@@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.particle.EntityFX;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
@@ -85,7 +85,7 @@ public class FXWisp extends EntityFX {
 		Minecraft.getMinecraft().renderEngine.bindTexture(ConfigHandler.matrixMode ? ObfuscationHelper.getParticleTexture() : particles);
 
 		if(!queuedRenders.isEmpty()) {
-			tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+			tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 			for(FXWisp wisp : queuedRenders)
 				wisp.renderQueued(tessellator, true);
 			tessellator.draw();
@@ -93,7 +93,7 @@ public class FXWisp extends EntityFX {
 
 		if(!queuedDepthIgnoringRenders.isEmpty()) {
 			GlStateManager.disableDepth();
-			tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+			tessellator.getBuffer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 			for(FXWisp wisp : queuedDepthIgnoringRenders)
 				wisp.renderQueued(tessellator, false);
 			tessellator.draw();
@@ -121,14 +121,14 @@ public class FXWisp extends EntityFX {
 		float f12 = (float)(prevPosY + (posY - prevPosY) * f - interpPosY);
 		float f13 = (float)(prevPosZ + (posZ - prevPosZ) * f - interpPosZ);
 		// todo 1.8.8 setbrightness call?
-		tessellator.getWorldRenderer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
-		tessellator.getWorldRenderer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
-		tessellator.getWorldRenderer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
-		tessellator.getWorldRenderer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
+		tessellator.getBuffer().pos(f11 - f1 * f10 - f4 * f10, f12 - f2 * f10, f13 - f3 * f10 - f5 * f10).tex(0, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
+		tessellator.getBuffer().pos(f11 - f1 * f10 + f4 * f10, f12 + f2 * f10, f13 - f3 * f10 + f5 * f10).tex(1, 1).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
+		tessellator.getBuffer().pos(f11 + f1 * f10 + f4 * f10, f12 + f2 * f10, f13 + f3 * f10 + f5 * f10).tex(1, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
+		tessellator.getBuffer().pos(f11 + f1 * f10 - f4 * f10, f12 - f2 * f10, f13 + f3 * f10 - f5 * f10).tex(0, 0).color(particleRed, particleGreen, particleBlue, 0.5F).endVertex();
 	}
 
 	@Override
-	public void renderParticle(WorldRenderer wr, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
+	public void renderParticle(VertexBuffer wr, Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
 		this.f = f;
 		this.f1 = f1;
 		this.f2 = f2;

src/main/java/vazkii/botania/client/gui/bag/GuiFlowerBag.java

@@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.ModBlocks;
@@ -35,7 +35,7 @@ public class GuiFlowerBag extends GuiContainer {
 
 	@Override
 	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
-		String s = StatCollector.translateToLocal("item.botania:flowerBag.name");
+		String s = I18n.translateToLocal("item.botania:flowerBag.name");
 		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);
 	}

src/main/java/vazkii/botania/client/gui/bag/InventoryFlowerBag.java

@@ -13,8 +13,8 @@ package vazkii.botania.client.gui.bag;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.ITextComponent;
 import vazkii.botania.common.item.ItemFlowerBag;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lib.LibItemNames;
@@ -162,8 +162,8 @@ public class InventoryFlowerBag implements IInventory {
 	}
 
 	@Override
-	public IChatComponent getDisplayName() {
-		return new ChatComponentText(getName());
+	public ITextComponent getDisplayName() {
+		return new TextComponentString(getName());
 	}
 
 	@Override

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

@@ -13,8 +13,8 @@ package vazkii.botania.client.gui.box;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ChatComponentText;
-import net.minecraft.util.IChatComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.ITextComponent;
 import vazkii.botania.common.item.ItemBaubleBox;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lib.LibItemNames;
@@ -161,8 +161,8 @@ public class InventoryBaubleBox implements IInventory {
 	}
 
 	@Override
-	public IChatComponent getDisplayName() {
-		return new ChatComponentText(getName());
+	public ITextComponent getDisplayName() {
+		return new TextComponentString(getName());
 	}
 
 	@Override

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

@@ -15,7 +15,7 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.ContainerWorkbench;
 import net.minecraft.inventory.Slot;
 import net.minecraft.inventory.SlotCrafting;
-import net.minecraft.util.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
 public class ContainerCraftingHalo extends ContainerWorkbench {

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexicon.java

@@ -31,9 +31,9 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatAllowedCharacters;
-import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.common.MinecraftForge;
 
 import org.lwjgl.input.Keyboard;
@@ -247,7 +247,7 @@ public class GuiLexicon extends GuiScreen {
 				GlStateManager.disableBlend();
 				GlStateManager.popMatrix();
 
-				RenderHelper.renderTooltip(par1, par2, Arrays.asList(EnumChatFormatting.GOLD + "#goldfishchris", EnumChatFormatting.AQUA + "IT SAYS MANUAL"));
+				RenderHelper.renderTooltip(par1, par2, Arrays.asList(TextFormatting.GOLD + "#goldfishchris", TextFormatting.AQUA + "IT SAYS MANUAL"));
 			}
 		}
 
@@ -282,7 +282,7 @@ public class GuiLexicon extends GuiScreen {
 		if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10)
 			noteDisplay += "&r_";
 
-		fontRendererObj.drawString(StatCollector.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666);
+		fontRendererObj.drawString(I18n.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666);
 
 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.setUnicodeFlag(true);
@@ -337,9 +337,9 @@ public class GuiLexicon extends GuiScreen {
 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.drawString(title, left + 18, top + 13, color);
 		fontRendererObj.setUnicodeFlag(true);
-		fontRendererObj.drawString(String.format(StatCollector.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color);
+		fontRendererObj.drawString(String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color);
 
-		String s = EnumChatFormatting.BOLD + categoryHighlight;
+		String s = TextFormatting.BOLD + categoryHighlight;
 		fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0);
 
 		fontRendererObj.setUnicodeFlag(unicode);
@@ -478,9 +478,9 @@ public class GuiLexicon extends GuiScreen {
 			GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i);
 			LexiconCategory category = i_ >= categoryList.size() ? null : categoryList.get(i_);
 			if(category != null)
-				button.displayString = StatCollector.translateToLocal(category.getUnlocalizedName());
+				button.displayString = I18n.translateToLocal(category.getUnlocalizedName());
 			else {
-				button.displayString = StatCollector.translateToLocal("botaniamisc.lexiconIndex");
+				button.displayString = I18n.translateToLocal("botaniamisc.lexiconIndex");
 				break;
 			}
 		}
@@ -508,9 +508,9 @@ public class GuiLexicon extends GuiScreen {
 		}
 
 		if(isMainPage())
-			buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, StatCollector.translateToLocal("botaniamisc.history"), this));
+			buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.history"), this));
 		else if(isChallenge())
-			buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, StatCollector.translateToLocal("botaniamisc.info"), this));
+			buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.info"), this));
 	}
 
 	public static void startTutorial() {

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallenge.java

@@ -14,8 +14,8 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.challenge.Challenge;
 import vazkii.botania.client.challenge.ModChallenges;
@@ -45,7 +45,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
 	}
 
 	public void setTitle() {
-		title = challenge == null ? "(null)" : StatCollector.translateToLocal(challenge.unlocalizedName);
+		title = challenge == null ? "(null)" : I18n.translateToLocal(challenge.unlocalizedName);
 	}
 
 	@Override
@@ -70,8 +70,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
 
 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.setUnicodeFlag(true);
-		fontRendererObj.drawString(EnumChatFormatting.BOLD + StatCollector.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0);
-		fontRendererObj.drawString(StatCollector.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? EnumChatFormatting.DARK_GREEN : EnumChatFormatting.DARK_RED) + StatCollector.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
+		fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(challenge.unlocalizedName), left + 38, top + 13, 0);
+		fontRendererObj.drawString(I18n.translateToLocal(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.translateToLocal(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);
 
 		int width = guiWidth - 30;
 		int x = left + 16;
@@ -117,7 +117,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
 	}
 
 	void setCompleteButtonTitle() {
-		completeButton.displayString = StatCollector.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted");
+		completeButton.displayString = I18n.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted");
 	}
 
 	void back() {

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconChallengesList.java

@@ -14,8 +14,8 @@ import java.io.IOException;
 import java.util.List;
 
 import net.minecraft.client.gui.GuiButton;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.client.challenge.Challenge;
 import vazkii.botania.client.challenge.EnumChallengeLevel;
 import vazkii.botania.client.challenge.ModChallenges;
@@ -30,13 +30,13 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
 
 	public GuiLexiconChallengesList() {
 		parent = new GuiLexicon();
-		title = StatCollector.translateToLocal("botaniamisc.challenges");
+		title = I18n.translateToLocal("botaniamisc.challenges");
 	}
 
 	@Override
 	public void onInitGui() {
 		super.onInitGui();
-		title = StatCollector.translateToLocal("botaniamisc.challenges");
+		title = I18n.translateToLocal("botaniamisc.challenges");
 
 		buttonList.add(backButton = new GuiButtonBack(12, left + guiWidth / 2 - 8, top + guiHeight + 2));
 
@@ -67,7 +67,7 @@ public class GuiLexiconChallengesList extends GuiLexicon implements IParented {
 				if(c.complete)
 					complete++;
 
-			fontRendererObj.drawString(EnumChatFormatting.BOLD + StatCollector.translateToLocal(level.getName()) + EnumChatFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
+			fontRendererObj.drawString(TextFormatting.BOLD + I18n.translateToLocal(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
 		}
 		fontRendererObj.setUnicodeFlag(unicode);
 	}

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconEntry.java

@@ -19,10 +19,10 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ChatComponentTranslation;
+import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.ChatStyle;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import org.lwjgl.input.Mouse;
 
@@ -68,9 +68,9 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
 			return;
 		}
 
-		title = StatCollector.translateToLocal(entry.getUnlocalizedName());
+		title = I18n.translateToLocal(entry.getUnlocalizedName());
 		if(entry instanceof IAddonEntry)
-			subtitle = StatCollector.translateToLocal(((IAddonEntry) entry).getSubtitle());
+			subtitle = I18n.translateToLocal(((IAddonEntry) entry).getSubtitle());
 		else subtitle = null;
 	}
 
@@ -116,7 +116,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
 
 	@Override
 	String getTitle() {
-		return String.format("%s " + EnumChatFormatting.ITALIC + "(%s/%s)", title, page + 1, entry.pages.size());
+		return String.format("%s " + TextFormatting.ITALIC + "(%s/%s)", title, page + 1, entry.pages.size());
 	}
 
 	@Override
@@ -214,7 +214,7 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
 				tutorial.poll();
 				positionTutorialArrow();
 				if(tutorial.isEmpty()) {
-					mc.thePlayer.addChatMessage(new ChatComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)));
+					mc.thePlayer.addChatMessage(new TextComponentTranslation("botaniamisc.tutorialEnded").setChatStyle(new ChatStyle().setColor(TextFormatting.RED)));
 					hasTutorialArrow = false;
 				}
 			}

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconHistory.java

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.api.lexicon.ILexicon;
 import vazkii.botania.api.lexicon.LexiconEntry;
 
@@ -24,7 +24,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex {
 
 	public GuiLexiconHistory() {
 		super(null);
-		title = StatCollector.translateToLocal("botaniamisc.historyLong");
+		title = I18n.translateToLocal("botaniamisc.historyLong");
 	}
 
 	@Override
@@ -33,7 +33,7 @@ public class GuiLexiconHistory extends GuiLexiconIndex {
 		ILexicon lex = (ILexicon) stackUsed.getItem();
 		for(int i = history.size() - 1; i >= 0; i--) {
 			LexiconEntry entry = history.get(i);
-			if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && StatCollector.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim()))
+			if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim()))
 				entriesToDisplay.add(entry);
 		}
 	}

src/main/java/vazkii/botania/client/gui/lexicon/GuiLexiconIndex.java

@@ -22,8 +22,8 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import org.lwjgl.input.Mouse;
 
@@ -69,7 +69,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 	}
 
 	public void setTitle() {
-		title = StatCollector.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName());
+		title = I18n.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName());
 	}
 
 	@Override
@@ -137,7 +137,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			return true;
 		
 		search = search.toLowerCase();
-		if(StatCollector.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search))
+		if(I18n.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search))
 			return true;
 		
 		for(ItemStack stack : e.getDisplayedRecipes()) {
@@ -157,7 +157,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			GuiButtonInvisible button = (GuiButtonInvisible) buttonList.get(i - page * 12);
 			LexiconEntry entry = i >= entriesToDisplay.size() ? null : entriesToDisplay.get(i);
 			if(entry != null) {
-				button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? EnumChatFormatting.ITALIC : "") + StatCollector.translateToLocal(entry.getUnlocalizedName());
+				button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.translateToLocal(entry.getUnlocalizedName());
 				button.displayStack = entry.getIcon();
 				if(entry == tutEntry)
 					tutPage = page;
@@ -188,14 +188,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			if(entriesToDisplay.size() == 1) {
 				boolean unicode = mc.fontRendererObj.getUnicodeFlag();
 				mc.fontRendererObj.setUnicodeFlag(true);
-				String s = StatCollector.translateToLocal("botaniamisc.enterToView");
+				String s = I18n.translateToLocal("botaniamisc.enterToView");
 				mc.fontRendererObj.drawString(s, left + guiWidth / 2 - mc.fontRendererObj.getStringWidth(s) / 2, top + 30, 0x666666);
 				mc.fontRendererObj.setUnicodeFlag(unicode);
 			}
 		} else {
 			boolean unicode = mc.fontRendererObj.getUnicodeFlag();
 			mc.fontRendererObj.setUnicodeFlag(true);
-			String s = StatCollector.translateToLocal("botaniamisc.typeToSearch");
+			String s = I18n.translateToLocal("botaniamisc.typeToSearch");
 			mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666);
 			mc.fontRendererObj.setUnicodeFlag(unicode);
 		}
@@ -216,7 +216,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 
 				mc.fontRendererObj.drawStringWithShadow("?", x, y, 0xFFFFFF);
 				GlStateManager.scale(0.5F, 0.5F, 1F);
-				mc.fontRendererObj.drawStringWithShadow(EnumChatFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
+				mc.fontRendererObj.drawStringWithShadow(TextFormatting.BOLD + "Shift", x * 2 - 6, y * 2 + 20, 0xFFFFFF);
 				GlStateManager.scale(2F, 2F, 1F);
 			}
 		}
@@ -226,7 +226,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 
 			int x = currentButton.xPosition;
 			int y = currentButton.yPosition;
-			String s = StatCollector.translateToLocal(currentEntry.getTagline());
+			String s = I18n.translateToLocal(currentEntry.getTagline());
 			boolean unicode = mc.fontRendererObj.getUnicodeFlag();
 			mc.fontRendererObj.setUnicodeFlag(true);
 			int width = mc.fontRendererObj.getStringWidth(s);

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

@@ -15,8 +15,8 @@ import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
@@ -37,7 +37,7 @@ public class GuiButtonAchievement extends GuiButtonLexicon {
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 109 : 98, 191, 11, 11);
 
 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.achievements"));
+		tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.achievements"));
 
 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)

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

@@ -16,7 +16,7 @@ import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
@@ -45,7 +45,7 @@ public class GuiButtonBack extends GuiButtonLexicon {
 	}
 
 	public List<String> getTooltip() {
-		return Collections.singletonList(StatCollector.translateToLocal("botaniamisc.back"));
+		return Collections.singletonList(I18n.translateToLocal("botaniamisc.back"));
 	}
 
 }

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

@@ -13,8 +13,8 @@ package vazkii.botania.client.gui.lexicon.button;
 import java.util.Arrays;
 import java.util.List;
 
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 public class GuiButtonBackWithShift extends GuiButtonBack {
 
@@ -24,7 +24,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack {
 
 	@Override
 	public List<String> getTooltip() {
-		return Arrays.asList(StatCollector.translateToLocal("botaniamisc.back"), EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToIndex"));
+		return Arrays.asList(I18n.translateToLocal("botaniamisc.back"), TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToIndex"));
 	}
 
 }

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

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 
@@ -26,11 +26,11 @@ public class GuiButtonBookmark extends GuiButtonLexicon {
 
 		List<String> tooltip = new ArrayList<>();
 		if(displayString.equals("+"))
-			tooltip.add(StatCollector.translateToLocal("botaniamisc.clickToAdd"));
+			tooltip.add(I18n.translateToLocal("botaniamisc.clickToAdd"));
 		else {
-			tooltip.add(String.format(StatCollector.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1));
-			tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.clickToSee"));
-			tooltip.add(EnumChatFormatting.GRAY + StatCollector.translateToLocal("botaniamisc.shiftToRemove"));
+			tooltip.add(String.format(I18n.translateToLocal("botaniamisc.bookmark"), id - GuiLexicon.BOOKMARK_START + 1));
+			tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToSee"));
+			tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.shiftToRemove"));
 		}
 
 		int tooltipY = (tooltip.size() + 1) * 5;

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

@@ -15,7 +15,7 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 
 import org.lwjgl.opengl.ARBMultitexture;
 import org.lwjgl.opengl.ARBShaderObjects;
@@ -122,7 +122,7 @@ public class GuiButtonCategory extends GuiButtonLexicon {
 		GlStateManager.popMatrix();
 
 		if(inside)
-			gui.categoryHighlight = StatCollector.translateToLocal(getTooltipText());
+			gui.categoryHighlight = I18n.translateToLocal(getTooltipText());
 	}
 
 	String getTooltipText() {

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

@@ -16,8 +16,8 @@ import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.challenge.Challenge;
 
@@ -50,7 +50,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {
 
 
 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(EnumChatFormatting.AQUA + StatCollector.translateToLocal(challenge.unlocalizedName));
+		tooltip.add(TextFormatting.AQUA + I18n.translateToLocal(challenge.unlocalizedName));
 
 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)

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

@@ -14,7 +14,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 
@@ -34,7 +34,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon {
 		int k = getHoverState(hovered);
 
 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(StatCollector.translateToLocal("botaniamisc.challengeInfo"));
+		tooltip.add(I18n.translateToLocal("botaniamisc.challengeInfo"));
 
 		int tooltipY = (tooltip.size() + 1) * 5;
 		if(k == 2)

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

@@ -15,8 +15,8 @@ import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.EnumChatFormatting;
-import net.minecraft.util.StatCollector;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.translation.I18n;
 
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
@@ -37,7 +37,7 @@ public class GuiButtonChallenges extends GuiButtonLexicon {
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 131 : 120, 180, 11, 11);
 
 		List<String> tooltip = new ArrayList();
-		tooltip.add(EnumChatFormatting.YELLOW + StatCollector.translateToLocal("botaniamisc.challenges"));
+		tooltip.add(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.challenges"));
 
 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)