Build 308

Remove loot debug -.-
Build 307
2026-10-26 14:24:22 +00:00 · 2016-05-28 11:09:08 -05:00 · 2016-05-28 11:04:40 -05:00 · 2016-05-27 20:55:48 -05:00 · 2016-05-27 20:26:54 -05:00 · 2016-05-27 19:56:07 -05:00
249 changed files with 1615 additions and 1073 deletions
@@ -75,6 +75,9 @@ compileJava {
    targetCompatibility = 1.8
 }

+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
 processResources {
    // replace stuff in mcmod.info, nothing else
    from(sourceSets.main.resources.srcDirs) {
@@ -221,8 +224,7 @@ curseforge {
 		    See https://github.com/williewillus/Botania/releases/tag/${version}
        """
        releaseType = "beta"
-        addGameVersion '1.9'
-        addGameVersion 'Java 8'
+        addGameVersion '1.9.4'
        relations {
            requiredLibrary 'baubles'
        }
@@ -1,9 +1,9 @@
 #
-#Tue May 10 23:24:10 CDT 2016
+#Sat May 28 11:07:09 CDT 2016
 version=r1.8
 dir_output=../Build Output/Botania/
-dir_repo=./
+forge_version=12.17.0.1922-1.9.4
 mc_version=1.9.4
-forge_version=12.17.0.1909-1.9.4
-build_number=306
+dir_repo=./
+build_number=309
 mod_name=Botania
@@ -56,3 +56,4 @@ loraanicus=10
 samerater=8
 coolcabbage16=13
 eladkay=3
+tobiasling=9
@@ -11,9 +11,7 @@
 package vazkii.botania.api.boss;

 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.BossInfo;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import vazkii.botania.api.internal.ShaderCallback;
@@ -10,8 +10,8 @@
 package vazkii.botania.api.corporea;

 public class CorporeaRequest {
-	public Object matcher;
-	public boolean checkNBT;
+	public final Object matcher;
+	public final boolean checkNBT;
 	public int count;
 	public int foundItems = 0;
 	public int extractedItems = 0;
@@ -25,7 +25,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraftforge.items.IItemHandlerModifiable;
-import vazkii.botania.api.boss.IBotaniaBoss;
 import vazkii.botania.api.corporea.IWrappedInventory;
 import vazkii.botania.api.corporea.InvWithLocation;
 import vazkii.botania.api.lexicon.LexiconPage;
@@ -26,7 +26,6 @@ import net.minecraft.world.World;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.items.IItemHandlerModifiable;
-import vazkii.botania.api.boss.IBotaniaBoss;
 import vazkii.botania.api.corporea.IWrappedInventory;
 import vazkii.botania.api.corporea.InvWithLocation;
 import vazkii.botania.api.lexicon.LexiconPage;
@@ -13,7 +13,6 @@ package vazkii.botania.api.internal;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.network.play.server.SPacketUpdateTileEntity;
-import net.minecraft.server.management.PlayerChunkMapEntry;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -24,17 +23,17 @@ public final class VanillaPacketDispatcher {
 	public static void dispatchTEToNearbyPlayers(TileEntity tile) {
 		if(tile.getWorld() instanceof WorldServer) {
 			WorldServer ws = ((WorldServer) tile.getWorld());
-			PlayerChunkMapEntry chunk = ws.getPlayerChunkMap().getEntry(tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4);
+			SPacketUpdateTileEntity packet = tile.getUpdatePacket();

-			if(chunk == null)
+			if(packet == null)
 				return;

 			for (EntityPlayer player : ws.playerEntities) {
 				EntityPlayerMP playerMP = ((EntityPlayerMP) player);

 				if (playerMP.getDistanceSq(tile.getPos()) < 64 * 64
-						&& chunk.containsPlayer(playerMP)) {
-					playerMP.connection.sendPacket(tile.getUpdatePacket());
+						&& ws.getPlayerChunkMap().isPlayerWatchingChunk(playerMP, tile.getPos().getX() >> 4, tile.getPos().getZ() >> 4)) {
+					playerMP.connection.sendPacket(packet);
 				}
 			}

@@ -23,7 +23,7 @@ public interface IFloatingFlower {
 	public void setIslandType(IslandType type);

 	public class IslandType {
-		private static HashMap<String, IslandType> registry = new HashMap<>();
+		private static final HashMap<String, IslandType> registry = new HashMap<>();

 		public static final IslandType GRASS = new IslandType("GRASS");
 		public static final IslandType PODZOL = new IslandType("PODZOL");
@@ -22,7 +22,7 @@ public interface IManaDissolvable {

 	/**
 	 * Called for every tick the item is on a mana pool. If the stack has stack
-	 * size 0 the item is killed. This is called in both the server and client.
+	 * size 0 the item is killed. This is called serverside.
 	 */
 	public void onDissolveTick(IManaPool pool, ItemStack stack, EntityItem item);

@@ -28,11 +28,11 @@ public class LexiconEntry implements Comparable<LexiconEntry> {

 	private KnowledgeType type = BotaniaAPI.basicKnowledge;

-	public List<LexiconPage> pages = new ArrayList<>();
+	public final List<LexiconPage> pages = new ArrayList<>();
 	private boolean priority = false;
 	private ItemStack icon = null;
 	
-	private List<ItemStack> extraDisplayedRecipes = new ArrayList<>();
+	private final List<ItemStack> extraDisplayedRecipes = new ArrayList<>();

 	/**
 	 * @param unlocalizedName The unlocalized name of this entry. This will be localized by the client display.
@@ -23,7 +23,7 @@ import java.util.Map;
 */
 public final class LexiconRecipeMappings {

-	private static Map<String, EntryData> mappings = new HashMap<>();
+	private static final Map<String, EntryData> mappings = new HashMap<>();

 	/**
 	 * Maps the given stack to the given page of the entry.
@@ -29,14 +29,14 @@ import java.util.Map;
 */
 public class Multiblock {

-	public List<MultiblockComponent> components = new ArrayList<>();
-	public List<ItemStack> materials = new ArrayList<>();
+	public final List<MultiblockComponent> components = new ArrayList<>();
+	public final List<ItemStack> materials = new ArrayList<>();

 	public BlockPos minPos = BlockPos.ORIGIN;
 	public BlockPos maxPos = BlockPos.ORIGIN;
 	public BlockPos offPos = BlockPos.ORIGIN;

-	public HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<>();
+	public final HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<>();

 	/**
 	 * Adds a multiblock component to this multiblock. The component's x y z
@@ -27,7 +27,7 @@ public class MultiblockComponent {
 	protected BlockPos relPos;
 	protected final IBlockState state;
 	protected final TileEntity tileEntity;
-	private boolean doFancyRender;
+	private final boolean doFancyRender;

 	public MultiblockComponent(BlockPos relPos, IBlockState state) {
 		this(relPos, state, null);
@@ -145,7 +145,7 @@ public final class ManaItemHandler {
 					if(stack.getItem() instanceof IManaItem && !((IManaItem) stack.getItem()).canExportManaToItem(stack, stackInSlot))
 						continue;

-					int received = 0;
+					int received;
 					if(manaItemSlot.getMana(stackInSlot) + manaToSend <= manaItemSlot.getMaxMana(stackInSlot))
 						received = manaToSend;
 					else received = manaToSend - (manaItemSlot.getMana(stackInSlot) + manaToSend - manaItemSlot.getMaxMana(stackInSlot));
@@ -12,6 +12,7 @@ package vazkii.botania.api.subtile;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -19,7 +20,8 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.internal.IManaNetwork;
 import vazkii.botania.api.mana.IManaPool;
@@ -211,9 +213,10 @@ public class SubTileFunctional extends SubTileEntity {
 		return linkedPool != null && linkedPool.hasWorldObj() && !linkedPool.isInvalid() && supertile.getWorld().isBlockLoaded(linkedPool.getPos(), false) && supertile.getWorld().getTileEntity(linkedPool.getPos()) == linkedPool;
 	}

+	@SideOnly(Side.CLIENT)
 	@Override
 	public void renderHUD(Minecraft mc, ScaledResolution res) {
-		String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
+		String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name");
 		int color = getColor();
 		BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
 	}
@@ -14,6 +14,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -23,8 +24,9 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraft.world.World;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.internal.IManaNetwork;
 import vazkii.botania.api.mana.IManaCollector;
@@ -302,9 +304,10 @@ public class SubTileGenerating extends SubTileEntity {
 		return linkedCollector != null && !linkedCollector.isInvalid() && supertile.getWorld().getTileEntity(linkedCollector.getPos()) == linkedCollector;
 	}

+	@SideOnly(Side.CLIENT)
 	@Override
 	public void renderHUD(Minecraft mc, ScaledResolution res) {
-		String name = I18n.translateToLocal("tile.botania:flower." + getUnlocalizedName() + ".name");
+		String name = I18n.format("tile.botania:flower." + getUnlocalizedName() + ".name");
 		int color = getColor();
 		BotaniaAPI.internalHandler.drawComplexManaHUD(color, knownMana, getMaxMana(), name, res, BotaniaAPI.internalHandler.getBindDisplayForFlowerType(this), isValidBinding());
 	}
@@ -17,7 +17,7 @@ public enum EnumChallengeLevel {
 	HARD("botania.challengelevel.hard"),
 	LUNATIC("botania.challengelevel.lunatic");

-	String name;
+	final String name;

 	private EnumChallengeLevel(String name) {
 		this.name = name;
@@ -25,7 +25,6 @@ import vazkii.botania.client.lib.LibResources;

 import java.awt.*;
 import java.util.Collections;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.UUID;
 import java.util.WeakHashMap;
@@ -40,7 +40,7 @@ public class CorporeaAutoCompleteHandler {
 	private List<CompletionData> completions = new ArrayList<>();
 	private int position;

-	static TreeSet<String> itemNames = new TreeSet<>(String::compareToIgnoreCase);
+	static final TreeSet<String> itemNames = new TreeSet<>(String::compareToIgnoreCase);

 	private boolean tabLastTick = false;

@@ -165,8 +165,8 @@ public class CorporeaAutoCompleteHandler {

 	private static class CompletionData implements Comparable<CompletionData> {

-		private String string;
-		private int prefixLength;
+		private final String string;
+		private final int prefixLength;

 		public CompletionData(String string, int prefixLength) {
 			this.string = string;
@@ -21,6 +21,7 @@ import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiIngame;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -30,14 +31,12 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import org.lwjgl.opengl.GL11;
-import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.ILexicon;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
@@ -137,7 +136,7 @@ public final class HUDHandler {

 			if(MultiblockRenderHandler.currentMultiblock != null && MultiblockRenderHandler.anchor == null) {
 				profiler.startSection("multiblockRightClick");
-				String s = I18n.translateToLocal("botaniamisc.rightClickToAnchor");
+				String s = I18n.format("botaniamisc.rightClickToAnchor");
 				mc.fontRendererObj.drawStringWithShadow(s, event.getResolution().getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(s) / 2, event.getResolution().getScaledHeight() / 2 - 30, 0xFFFFFF);
 				profiler.endSection();
 			}
@@ -167,44 +166,47 @@ public final class HUDHandler {
 			}

 			profiler.startSection("manaBar");
+
 			EntityPlayer player = mc.thePlayer;
-			int totalMana = 0;
-			int totalMaxMana = 0;
-			boolean anyRequest = false;
-			boolean creative = false;
+			if(!player.isSpectator()) {
+				int totalMana = 0;
+				int totalMaxMana = 0;
+				boolean anyRequest = false;
+				boolean creative = false;

-			IInventory mainInv = player.inventory;
-			IInventory baublesInv = PlayerHandler.getPlayerBaubles(player);
+				IInventory mainInv = player.inventory;
+				IInventory baublesInv = PlayerHandler.getPlayerBaubles(player);

-			int invSize = mainInv.getSizeInventory();
-			int size = invSize;
-			if(baublesInv != null)
-				size += baublesInv.getSizeInventory();
+				int invSize = mainInv.getSizeInventory();
+				int size = invSize;
+				if(baublesInv != null)
+					size += baublesInv.getSizeInventory();

-			for(int i = 0; i < size; i++) {
-				boolean useBaubles = i >= invSize;
-				IInventory inv = useBaubles ? baublesInv : mainInv;
-				ItemStack stack = inv.getStackInSlot(i - (useBaubles ? invSize : 0));
+				for(int i = 0; i < size; i++) {
+					boolean useBaubles = i >= invSize;
+					IInventory inv = useBaubles ? baublesInv : mainInv;
+					ItemStack stack = inv.getStackInSlot(i - (useBaubles ? invSize : 0));

-				if(stack != null) {
-					Item item = stack.getItem();
-					if(item instanceof IManaUsingItem)
-						anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack);
+					if(stack != null) {
+						Item item = stack.getItem();
+						if(item instanceof IManaUsingItem)
+							anyRequest = anyRequest || ((IManaUsingItem) item).usesMana(stack);

-					if(item instanceof IManaItem) {
-						if(!((IManaItem) item).isNoExport(stack)) {
-							totalMana += ((IManaItem) item).getMana(stack);
-							totalMaxMana += ((IManaItem) item).getMaxMana(stack);
+						if(item instanceof IManaItem) {
+							if(!((IManaItem) item).isNoExport(stack)) {
+								totalMana += ((IManaItem) item).getMana(stack);
+								totalMaxMana += ((IManaItem) item).getMaxMana(stack);
+							}
 						}
+
+						if(item instanceof ICreativeManaProvider && ((ICreativeManaProvider) item).isCreative(stack))
+							creative = true;
 					}
-
-					if(item instanceof ICreativeManaProvider && ((ICreativeManaProvider) item).isCreative(stack))
-						creative = true;
 				}
-			}

-			if(anyRequest)
-				renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana);
+				if(anyRequest)
+					renderManaInvBar(event.getResolution(), creative, totalMana, totalMaxMana);
+			}

 			profiler.endStartSection("itemsRemaining");
 			ItemsRemainingRenderHandler.render(event.getResolution(), event.getPartialTicks());
@@ -225,7 +227,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 = I18n.translateToLocal(ItemTwigWand.getModeString(stack));
+			String disp = I18n.format(ItemTwigWand.getModeString(stack));

 			int x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(disp) / 2;
 			int y = res.getScaledHeight() - 70;
@@ -272,36 +274,29 @@ public final class HUDHandler {
 		Profiler profiler = mc.mcProfiler;

 		profiler.startSection("poolRecipe");
-		for(RecipeManaInfusion recipe : BotaniaAPI.manaInfusionRecipes) {
-			if(recipe.matches(stack)) {
-				if(recipe.getCatalyst() == null || recipe.getCatalyst() == tile.getWorld().getBlockState(tile.getPos().down())) {
-					int x = res.getScaledWidth() / 2 - 11;
-					int y = res.getScaledHeight() / 2 + 10;
+		RecipeManaInfusion recipe = TilePool.getMatchingRecipe(stack, tile.getWorld().getBlockState(tile.getPos().down()));
+		if(recipe != null) {
+			int x = res.getScaledWidth() / 2 - 11;
+			int y = res.getScaledHeight() / 2 + 10;

-					int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22;
-					int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8;
+			int u = tile.getCurrentMana() >= recipe.getManaToConsume() ? 0 : 22;
+			int v = mc.thePlayer.getName().equals("haighyorkie") && mc.thePlayer.isSneaking() ? 23 : 8;

-					GlStateManager.enableBlend();
-					GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+			GlStateManager.enableBlend();
+			GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);

-					mc.renderEngine.bindTexture(manaBar);
-					RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15);
-					GlStateManager.color(1F, 1F, 1F, 1F);
+			mc.renderEngine.bindTexture(manaBar);
+			RenderHelper.drawTexturedModalRect(x, y, 0, u, v, 22, 15);
+			GlStateManager.color(1F, 1F, 1F, 1F);

-					net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
-					mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y);
-					mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y);
-					mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, "");
-					net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();
+			net.minecraft.client.renderer.RenderHelper.enableGUIStandardItemLighting();
+			mc.getRenderItem().renderItemAndEffectIntoGUI(stack, x - 20, y);
+			mc.getRenderItem().renderItemAndEffectIntoGUI(recipe.getOutput(), x + 26, y);
+			mc.getRenderItem().renderItemOverlayIntoGUI(mc.fontRendererObj, recipe.getOutput(), x + 26, y, "");
+			net.minecraft.client.renderer.RenderHelper.disableStandardItemLighting();

-
-					GlStateManager.disableLighting();
-					GlStateManager.disableBlend();
-
-
-					break;
-				}
-			}
+			GlStateManager.disableLighting();
+			GlStateManager.disableBlend();
 		}
 		profiler.endSection();
 	}
@@ -354,8 +349,8 @@ public final class HUDHandler {
 				if(!((ILexicon) stack.getItem()).isKnowledgeUnlocked(stack, entry.getKnowledgeType()))
 					font = mc.standardGalacticFontRenderer;

-				drawStr = I18n.translateToLocal(entry.getUnlocalizedName());
-				secondLine = TextFormatting.ITALIC + I18n.translateToLocal(entry.getTagline());
+				drawStr = I18n.format(entry.getUnlocalizedName());
+				secondLine = TextFormatting.ITALIC + I18n.format(entry.getTagline());
 				draw = true;
 			}
 		}
@@ -401,9 +396,9 @@ public final class HUDHandler {

 	private void renderNearIndexDisplay(ScaledResolution res) {
 		Minecraft mc = Minecraft.getMinecraft();
-		String txt0 = I18n.translateToLocal("botaniamisc.nearIndex0");
-		String txt1 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex1");
-		String txt2 = TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.nearIndex2");
+		String txt0 = I18n.format("botaniamisc.nearIndex0");
+		String txt1 = TextFormatting.GRAY + I18n.format("botaniamisc.nearIndex1");
+		String txt2 = TextFormatting.GRAY + I18n.format("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;
@@ -436,7 +431,7 @@ public final class HUDHandler {
 		renderManaBar(x, y, color, mana < 0 ? 0.5F : 1F, mana, maxMana);

 		if(mana < 0) {
-			String text = I18n.translateToLocal("botaniamisc.statusUnknown");
+			String text = I18n.format("botaniamisc.statusUnknown");
 			x = res.getScaledWidth() / 2 - mc.fontRendererObj.getStringWidth(text) / 2;
 			y -= 1;
 			mc.fontRendererObj.drawString(text, x, y, color);
@@ -25,8 +25,8 @@ import java.util.regex.Pattern;

 public final class ItemsRemainingRenderHandler {

-	private static int maxTicks = 30;
-	private static int leaveTicks = 20;
+	private static final int maxTicks = 30;
+	private static final int leaveTicks = 20;

 	private static ItemStack stack;
 	private static int ticks, count;
@@ -38,7 +38,6 @@ import java.awt.*;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
-import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Random;
 import java.util.concurrent.ConcurrentLinkedQueue;
@@ -115,7 +114,7 @@ public class LightningHandler {
 	private void renderBolt(LightningBolt bolt, Tessellator tessellator, float partialframe, float cosyaw, float cospitch, float sinyaw, float cossinpitch, int pass, boolean inner) {
 		ParticleRenderDispatcher.lightningCount++;
 		float boltage = bolt.particleAge < 0 ? 0 : (float) bolt.particleAge / (float) bolt.particleMaxAge;
-		float mainalpha = 1;
+		float mainalpha;
 		if(pass == 0)
 			mainalpha = (1 - boltage) * 0.4F;
 		else mainalpha = 1 - boltage * 0.5F;
@@ -173,24 +172,24 @@ public class LightningHandler {
 	public static class LightningBolt {

 		public ArrayList<Segment> segments = new ArrayList<>();
-		public Vector3 start;
-		public Vector3 end;
+		public final Vector3 start;
+		public final Vector3 end;
 		BlockPos target;
-		TIntIntHashMap splitparents = new TIntIntHashMap();
+		final TIntIntHashMap splitparents = new TIntIntHashMap();

-		public double length;
+		public final double length;
 		public int numsegments0;
 		private int numsplits;
 		private boolean finalized;
-		private Random rand;
-		public long seed;
+		private final Random rand;
+		public final long seed;

 		public int particleAge;
-		public int particleMaxAge;
+		public final int particleMaxAge;
 		public boolean isDead;
 		private AxisAlignedBB boundingBox;

-		private World world;
+		private final World world;
 		private Entity source;

 		public static final ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<>();
@@ -201,8 +200,8 @@ public class LightningHandler {
 		public static int playerdamage = 1;
 		public static int entitydamage = 1;

-		public int colorOuter;
-		public int colorInner;
+		public final int colorOuter;
+		public final int colorInner;

 		public static class BoltPoint {

@@ -212,9 +211,9 @@ public class LightningHandler {
 				this.offsetvec = offsetvec;
 			}

-			public Vector3 point;
-			Vector3 basepoint;
-			Vector3 offsetvec;
+			public final Vector3 point;
+			final Vector3 basepoint;
+			final Vector3 offsetvec;
 		}

 		private static final Comparator<Segment> SEGMENT_SORTER = (o1, o2) -> {
@@ -274,8 +273,8 @@ public class LightningHandler {
 				return startpoint.point.toString() + " " + endpoint.point.toString();
 			}

-			public BoltPoint startpoint;
-			public BoltPoint endpoint;
+			public final BoltPoint startpoint;
+			public final BoltPoint endpoint;

 			public Vector3 diff;

@@ -287,10 +286,10 @@ public class LightningHandler {

 			public float sinprev;
 			public float sinnext;
-			public float light;
+			public final float light;

-			public int segmentno;
-			public int splitno;
+			public final int segmentno;
+			public final int splitno;
 		}

 		public LightningBolt(World world, Vector3 sourcevec, Vector3 targetvec, float ticksPerMeter, long seed, int colorOuter, int colorInner) {
@@ -338,7 +337,7 @@ public class LightningHandler {
 			ArrayList<Segment> oldsegments = segments;
 			segments = new ArrayList<>();

-			Segment prev = null;
+			Segment prev;

 			for(Segment segment : oldsegments) {
 				prev = segment.prev;
@@ -63,7 +63,7 @@ public class MiscellaneousIcons {

    public TextureAtlasSprite[] sparkUpgradeIcons;
    public TextureAtlasSprite[] kingKeyWeaponIcons;
-    public Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
+    public final Map<TriggerManaLevel.State, TextureAtlasSprite> manaLevelTriggerIcons = Maps.newEnumMap(TriggerManaLevel.State.class);
    public TextureAtlasSprite[] tiaraWingIcons;

    // begin dank_memes
@@ -16,11 +16,9 @@ import net.minecraft.block.BlockFlower;
 import net.minecraft.block.BlockSkull;
 import net.minecraft.block.BlockSlab;
 import net.minecraft.block.BlockWall;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemMeshDefinition;
 import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.client.renderer.block.statemap.StateMap;
-import net.minecraft.client.resources.IReloadableResourceManager;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -52,7 +50,6 @@ import vazkii.botania.api.state.enums.PrismarineVariant;
 import vazkii.botania.api.state.enums.PylonVariant;
 import vazkii.botania.api.state.enums.SpreaderVariant;
 import vazkii.botania.api.state.enums.StorageVariant;
-import vazkii.botania.client.model.FloatingFlowerModel;
 import vazkii.botania.client.model.SpecialFlowerModel;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.ModFluffBlocks;
@@ -40,7 +40,7 @@ import vazkii.botania.common.block.ModBlocks;

 public final class MultiblockRenderHandler {

-	private static MultiblockBlockAccess blockAccess = new MultiblockBlockAccess();
+	private static final MultiblockBlockAccess blockAccess = new MultiblockBlockAccess();
 	private static int dimension;

 	public static boolean rendering = false;
@@ -8,6 +8,7 @@ import net.minecraft.client.model.ModelBook;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -15,7 +16,6 @@ import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.text.TextFormatting;
-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;
@@ -30,12 +30,12 @@ import vazkii.botania.common.item.ModItems;
 // Hacky way to render 3D lexicon, will be reevaluated in the future.
 public class RenderLexicon {

-    ModelBook model = new ModelBook();
-    ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);
+    final ModelBook model = new ModelBook();
+    final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_LEXICA);

    @SubscribeEvent
    public void renderItem(RenderHandEvent evt) {
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc;
        if(true || !ConfigHandler.lexicon3dModel || mc.gameSettings.thirdPersonView != 0 || !PlayerHelper.hasHeldItem(mc.thePlayer, ModItems.lexicon))
            return;
        evt.setCanceled(true);
@@ -127,8 +127,8 @@ public class RenderLexicon {
    private void doRender() {
        GlStateManager.pushMatrix();
        Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-        float opening = 0F;
-        float pageFlip = 0F;
+        float opening;
+        float pageFlip;

        float ticks = ClientTickHandler.ticksWithLexicaOpen;
        if(ticks > 0 && ticks < 10) {
@@ -164,30 +164,30 @@ public class RenderLexicon {
            if(stack != null)
                title = stack.getDisplayName();
            if(title.equals(origTitle) && bevo)
-                title = I18n.translateToLocal("item.botania:lexicon.bevo");
+                title = I18n.format("item.botania:lexicon.bevo");
            if(title.equals(origTitle) && saice)
-                title = I18n.translateToLocal("item.botania:lexicon.saice");
+                title = I18n.format("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(TextFormatting.ITALIC + "" + TextFormatting.BOLD + String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), 0, 0, 0xA07100);
+            font.drawString(TextFormatting.ITALIC + "" + TextFormatting.BOLD + I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), 0, 0, 0xA07100);

            GlStateManager.translate(0F, 15F, 0F);
-            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);
+            font.drawString(I18n.format("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);

            GlStateManager.translate(0F, 10F, 0F);
-            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
+            font.drawString(I18n.format("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);

            GlStateManager.translate(0F, 50F, 0F);
-            font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);
+            font.drawString(I18n.format("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);

            GlStateManager.translate(0F, 10F, 0F);
-            font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
+            font.drawString(TextFormatting.UNDERLINE + "" + TextFormatting.ITALIC + I18n.format("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);

            if(bevo || saice) {
                GlStateManager.translate(0F, 10F, 0F);
-                font.drawString(I18n.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
+                font.drawString(I18n.format("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
            }
        }

@@ -17,11 +17,11 @@ import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.fml.relauncher.ReflectionHelper;
 import org.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
@@ -185,13 +185,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 = I18n.translateToLocal("botania.rank" + level).replaceAll("&", "\u00a7");
+		String rank = I18n.format("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 = I18n.translateToLocal("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
+			rank = I18n.format("botania.rank" + (level + 1)).replaceAll("&", "\u00a7");
 			font.drawStringWithShadow(rank, mouseX + offx + width - font.getStringWidth(rank), mouseY - offy - 12, 0xFFFFFF);
 		}

@@ -10,9 +10,9 @@
 */
 package vazkii.botania.client.core.handler;

+import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.event.entity.player.ItemTooltipEvent;
 import net.minecraftforge.fml.common.eventhandler.EventPriority;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
@@ -25,15 +25,15 @@ public final class TooltipHandler {
 	@SubscribeEvent(priority = EventPriority.HIGHEST)
 	public void onTooltipEvent(ItemTooltipEvent event) {
 		if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.DIRT) && event.getItemStack().getItemDamage() == 1) {
-			event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt0"));
-			event.getToolTip().add(I18n.translateToLocal("botaniamisc.coarseDirt1"));
+			event.getToolTip().add(I18n.format("botaniamisc.coarseDirt0"));
+			event.getToolTip().add(I18n.format("botaniamisc.coarseDirt1"));
 		} else if(event.getItemStack().getItem() == Item.getItemFromBlock(Blocks.MOB_SPAWNER) && event.getEntityPlayer().capabilities.isCreativeMode)
-			event.getToolTip().add(I18n.translateToLocal("botaniamisc.spawnerTip"));
+			event.getToolTip().add(I18n.format("botaniamisc.spawnerTip"));

 		if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemRegenIvy.TAG_REGEN, false))
-			event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasIvy"));
+			event.getToolTip().add(I18n.format("botaniamisc.hasIvy"));
 		if(ItemNBTHelper.detectNBT(event.getItemStack()) && ItemNBTHelper.getBoolean(event.getItemStack(), ItemKeepIvy.TAG_KEEP, false))
-			event.getToolTip().add(I18n.translateToLocal("botaniamisc.hasKeepIvy"));
+			event.getToolTip().add(I18n.format("botaniamisc.hasKeepIvy"));
 	}

 }
@@ -92,7 +92,7 @@ public final class ShaderHelper {
 	// http://lwjgl.org/wiki/index.php?title=GLSL_Shaders_with_LWJGL

 	private static int createProgram(String vert, String frag) {
-		int vertId = 0, fragId = 0, program = 0;
+		int vertId = 0, fragId = 0, program;
 		if(vert != null)
 			vertId = createShader(vert, VERT);
 		if(frag != null)
@@ -490,5 +490,10 @@ public class ClientProxy extends CommonProxy {
 	public void removeBoss(IBotaniaBoss boss) {
 		BossBarHandler.bosses.remove(boss);
 	}
+
+	@Override
+	public int getClientRenderDistance() {
+		return Minecraft.getMinecraft().gameSettings.renderDistanceChunks;
+	}
 }

@@ -36,8 +36,8 @@ public class FXSparkle extends Particle {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_PARTICLES);

-	private static Queue<FXSparkle> queuedRenders = new ArrayDeque<>();
-	private static Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque<>();
+	private static final Queue<FXSparkle> queuedRenders = new ArrayDeque<>();
+	private static final Queue<FXSparkle> queuedCorruptRenders = new ArrayDeque<>();

 	// Queue values
 	private float f;
@@ -212,7 +212,6 @@ public class FXSparkle extends Particle {
 			}

 			if (var21 && 1.0D - var14 < var23) {
-				var23 = 1.0D - var14;
 				var22 = 5;
 			}

@@ -256,9 +255,9 @@ public class FXSparkle extends Particle {
 	public boolean corrupt = false;
 	public boolean fake = false;
 	private int multiplier = 2;
-	private boolean shrink = true;
-	public int particle = 16;
+	private final boolean shrink = true;
+	public final int particle = 16;
 	public boolean tinkle = false;
-	public boolean slowdown = true;
+	public final boolean slowdown = true;
 	public int currentColor = 0;
 }
@@ -34,8 +34,8 @@ public class FXWisp extends Particle {

 	public static final ResourceLocation particles = new ResourceLocation(LibResources.MISC_WISP_LARGE);

-	private static Queue<FXWisp> queuedRenders = new ArrayDeque<>();
-	private static Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque<>();
+	private static final Queue<FXWisp> queuedRenders = new ArrayDeque<>();
+	private static final Queue<FXWisp> queuedDepthIgnoringRenders = new ArrayDeque<>();

 	// Queue values
 	private float f;
@@ -171,8 +171,8 @@ public class FXWisp extends Particle {

 	private boolean depthTest = true;
 	public boolean distanceLimit = true;
-	private float moteParticleScale;
-	private int moteHalfLife;
+	private final float moteParticleScale;
+	private final int moteHalfLife;
 	public boolean tinkle = false;
 	public int blendmode = 1;
 }
@@ -21,7 +21,7 @@ import javax.annotation.Nonnull;

 public class ContainerFlowerBag extends Container {

-	InventoryFlowerBag flowerBagInv;
+	final InventoryFlowerBag flowerBagInv;

 	public ContainerFlowerBag(EntityPlayer player) {
 		int i;
@@ -13,11 +13,11 @@ package vazkii.botania.client.gui.bag;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.resources.I18n;
 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.text.translation.I18n;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.ModBlocks;

@@ -33,9 +33,9 @@ public class GuiFlowerBag extends GuiContainer {

 	@Override
 	protected void drawGuiContainerForegroundLayer(int p_146979_1_, int p_146979_2_) {
-		String s = I18n.translateToLocal("item.botania:flowerBag.name");
+		String s = I18n.format("item.botania:flowerBag.name");
 		fontRendererObj.drawString(s, xSize / 2 - fontRendererObj.getStringWidth(s) / 2, 6, 4210752);
-		fontRendererObj.drawString(I18n.translateToLocal("container.inventory"), 8, ySize - 96 + 2, 4210752);
+		fontRendererObj.drawString(I18n.format("container.inventory"), 8, ySize - 96 + 2, 4210752);
 	}

 	@Override
@@ -26,8 +26,8 @@ public class InventoryFlowerBag implements IInventory {

 	private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];

-	EntityPlayer player;
-	int slot;
+	final EntityPlayer player;
+	final int slot;
 	ItemStack[] stacks = null;

 	boolean invPushed = false;
@@ -17,8 +17,8 @@ import vazkii.botania.common.block.ModBlocks;

 public class SlotFlower extends Slot {

-	InventoryFlowerBag inv;
-	int color;
+	final InventoryFlowerBag inv;
+	final int color;

 	public SlotFlower(InventoryFlowerBag p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_, int color) {
 		super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
@@ -27,8 +27,8 @@ import javax.annotation.Nonnull;

 public class ContainerBaubleBox extends Container {

-	InventoryBaubleBox baubleBoxInv;
-	InventoryBaubles baubles;
+	final InventoryBaubleBox baubleBoxInv;
+	final InventoryBaubles baubles;

 	public ContainerBaubleBox(EntityPlayer player) {
 		int i;
@@ -26,8 +26,8 @@ public class InventoryBaubleBox implements IInventory {

 	private static final ItemStack[] FALLBACK_INVENTORY = new ItemStack[16];

-	EntityPlayer player;
-	int slot;
+	final EntityPlayer player;
+	final int slot;
 	ItemStack[] stacks = null;

 	boolean invPushed = false;
@@ -17,7 +17,7 @@ import vazkii.botania.api.mana.IManaItem;

 public class SlotAnyBauble extends Slot {

-	InventoryBaubleBox inv;
+	final InventoryBaubleBox inv;

 	public SlotAnyBauble(InventoryBaubleBox p_i1824_1_, int p_i1824_2_, int p_i1824_3_, int p_i1824_4_) {
 		super(p_i1824_1_, p_i1824_2_, p_i1824_3_, p_i1824_4_);
@@ -16,12 +16,12 @@ import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.ChatAllowedCharacters;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
 import net.minecraftforge.common.MinecraftForge;
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.opengl.GL11;
@@ -110,8 +110,8 @@ public class GuiLexicon extends GuiScreen {
 	List<LexiconCategory> allCategories;

 	String title;
-	int guiWidth = 146;
-	int guiHeight = 180;
+	final int guiWidth = 146;
+	final int guiHeight = 180;
 	int left, top;

 	@Override
@@ -155,7 +155,7 @@ public class GuiLexicon extends GuiScreen {
 		} else if(isCategoryIndex()) {
 			int categories = allCategories.size();
 			for(int i = 0; i < categories + 1; i++) {
-				LexiconCategory category = null;
+				LexiconCategory category;
 				category = i >= categories ? null : allCategories.get(i);
 				int perline = 5;
 				int x = i % perline;
@@ -285,7 +285,7 @@ public class GuiLexicon extends GuiScreen {
 		if(notesEnabled && ClientTickHandler.ticksInGame % 20 < 10)
 			noteDisplay += "&r_";

-		fontRendererObj.drawString(I18n.translateToLocal("botaniamisc.notes"), x + 5, y - 7, 0x666666);
+		fontRendererObj.drawString(I18n.format("botaniamisc.notes"), x + 5, y - 7, 0x666666);

 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.setUnicodeFlag(true);
@@ -340,7 +340,7 @@ public class GuiLexicon extends GuiScreen {
 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.drawString(title, left + 18, top + 13, color);
 		fontRendererObj.setUnicodeFlag(true);
-		fontRendererObj.drawString(String.format(I18n.translateToLocal("botaniamisc.edition"), ItemLexicon.getEdition()), left + 24, top + 22, color);
+		fontRendererObj.drawString(I18n.format("botaniamisc.edition", ItemLexicon.getEdition()), left + 24, top + 22, color);

 		String s = TextFormatting.BOLD + categoryHighlight;
 		fontRendererObj.drawString(s, left + guiWidth / 2 - fontRendererObj.getStringWidth(s) / 2, top + 36, 0);
@@ -481,9 +481,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 = I18n.translateToLocal(category.getUnlocalizedName());
+				button.displayString = I18n.format(category.getUnlocalizedName());
 			else {
-				button.displayString = I18n.translateToLocal("botaniamisc.lexiconIndex");
+				button.displayString = I18n.format("botaniamisc.lexiconIndex");
 				break;
 			}
 		}
@@ -511,9 +511,9 @@ public class GuiLexicon extends GuiScreen {
 		}

 		if(isMainPage())
-			buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.history"), this));
+			buttonList.add(new GuiButtonHistory(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.history"), this));
 		else if(isChallenge())
-			buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.translateToLocal("botaniamisc.info"), this));
+			buttonList.add(new GuiButtonChallengeInfo(BOOKMARK_START + MAX_BOOKMARK_COUNT, left + 138, top + guiHeight - 24, I18n.format("botaniamisc.info"), this));
 	}

 	public static void startTutorial() {
@@ -13,9 +13,9 @@ package vazkii.botania.client.gui.lexicon;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.nbt.NBTTagCompound;
 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;
 import vazkii.botania.client.core.handler.ClientTickHandler;
@@ -44,7 +44,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
 	}

 	public void setTitle() {
-		title = challenge == null ? "(null)" : I18n.translateToLocal(challenge.unlocalizedName);
+		title = challenge == null ? "(null)" : I18n.format(challenge.unlocalizedName);
 	}

 	@Override
@@ -69,8 +69,8 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {

 		boolean unicode = fontRendererObj.getUnicodeFlag();
 		fontRendererObj.setUnicodeFlag(true);
-		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);
+		fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(challenge.unlocalizedName), left + 38, top + 13, 0);
+		fontRendererObj.drawString(I18n.format(challenge.level.getName()) + " / " + (challenge.complete ? TextFormatting.DARK_GREEN : TextFormatting.DARK_RED) + I18n.format(challenge.complete ? "botaniamisc.completed" : "botaniamisc.notCompleted"), left + 38, top + 23, 0);

 		int width = guiWidth - 30;
 		int x = left + 16;
@@ -116,7 +116,7 @@ public class GuiLexiconChallenge extends GuiLexicon implements IParented {
 	}

 	void setCompleteButtonTitle() {
-		completeButton.displayString = I18n.translateToLocal(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted");
+		completeButton.displayString = I18n.format(challenge.complete ? "botaniamisc.markNotCompleted" : "botaniamisc.markCompleted");
 	}

 	void back() {
@@ -11,8 +11,8 @@
 package vazkii.botania.client.gui.lexicon;

 import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.resources.I18n;
 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 = I18n.translateToLocal("botaniamisc.challenges");
+		title = I18n.format("botaniamisc.challenges");
 	}

 	@Override
 	public void onInitGui() {
 		super.onInitGui();
-		title = I18n.translateToLocal("botaniamisc.challenges");
+		title = I18n.format("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(TextFormatting.BOLD + I18n.translateToLocal(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
+			fontRendererObj.drawString(TextFormatting.BOLD + I18n.format(level.getName()) + TextFormatting.RESET + " (" + complete + "/" + list.size() + ")", left + 20, top + 11 + level.ordinal() * 44, 0);
 		}
 		fontRendererObj.setUnicodeFlag(unicode);
 	}
@@ -13,11 +13,11 @@ package vazkii.botania.client.gui.lexicon;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.text.Style;
 import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
 import org.lwjgl.input.Mouse;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.internal.IGuiLexiconEntry;
@@ -66,9 +66,9 @@ public class GuiLexiconEntry extends GuiLexicon implements IGuiLexiconEntry, IPa
 			return;
 		}

-		title = I18n.translateToLocal(entry.getUnlocalizedName());
+		title = I18n.format(entry.getUnlocalizedName());
 		if(entry instanceof IAddonEntry)
-			subtitle = I18n.translateToLocal(((IAddonEntry) entry).getSubtitle());
+			subtitle = I18n.format(((IAddonEntry) entry).getSubtitle());
 		else subtitle = null;
 	}

@@ -10,8 +10,8 @@
 */
 package vazkii.botania.client.gui.lexicon;

+import net.minecraft.client.resources.I18n;
 import net.minecraft.nbt.NBTTagCompound;
-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 = I18n.translateToLocal("botaniamisc.historyLong");
+		title = I18n.format("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()) && I18n.translateToLocal(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim()))
+			if(lex.isKnowledgeUnlocked(stackUsed, entry.getKnowledgeType()) && I18n.format(entry.getUnlocalizedName()).toLowerCase().contains(searchField.getText().toLowerCase().trim()))
 				entriesToDisplay.add(entry);
 		}
 	}
@@ -14,11 +14,11 @@ import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
 import org.lwjgl.input.Mouse;
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.ILexicon;
@@ -54,7 +54,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 	LexiconEntry currentEntry;
 	float infoTime;

-	List<LexiconEntry> entriesToDisplay = new ArrayList<>();
+	final List<LexiconEntry> entriesToDisplay = new ArrayList<>();

 	public GuiLexiconIndex() {
 		parent = new GuiLexicon();
@@ -67,7 +67,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 	}

 	public void setTitle() {
-		title = I18n.translateToLocal(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName());
+		title = I18n.format(category == null ? "botaniamisc.lexiconIndex" : category.getUnlocalizedName());
 	}

 	@Override
@@ -135,7 +135,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			return true;
 		
 		search = search.toLowerCase();
-		if(I18n.translateToLocal(e.getUnlocalizedName()).toLowerCase().contains(search))
+		if(I18n.format(e.getUnlocalizedName()).toLowerCase().contains(search))
 			return true;
 		
 		for(ItemStack stack : e.getDisplayedRecipes()) {
@@ -155,7 +155,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() ? TextFormatting.ITALIC : "") + I18n.translateToLocal(entry.getUnlocalizedName());
+				button.displayString = entry.getKnowledgeType().color + "" + (entry.isPriority() ? TextFormatting.ITALIC : "") + I18n.format(entry.getUnlocalizedName());
 				button.displayStack = entry.getIcon();
 				if(entry == tutEntry)
 					tutPage = page;
@@ -186,14 +186,14 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			if(entriesToDisplay.size() == 1) {
 				boolean unicode = mc.fontRendererObj.getUnicodeFlag();
 				mc.fontRendererObj.setUnicodeFlag(true);
-				String s = I18n.translateToLocal("botaniamisc.enterToView");
+				String s = I18n.format("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 = I18n.translateToLocal("botaniamisc.typeToSearch");
+			String s = I18n.format("botaniamisc.typeToSearch");
 			mc.fontRendererObj.drawString(s, left + 120 - mc.fontRendererObj.getStringWidth(s), top + guiHeight - 18, 0x666666);
 			mc.fontRendererObj.setUnicodeFlag(unicode);
 		}
@@ -206,8 +206,8 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {
 			infoTime = Math.max(0, infoTime - timeDelta);

 			if(currentButton != null && infoTime == 0) {
-				int x = par1 + 10;
-				int y = par2;
+				int x;
+				int y;

 				x = currentButton.xPosition - 20;
 				y = currentButton.yPosition;
@@ -224,7 +224,7 @@ public class GuiLexiconIndex extends GuiLexicon implements IParented {

 			int x = currentButton.xPosition;
 			int y = currentButton.yPosition;
-			String s = I18n.translateToLocal(currentEntry.getTagline());
+			String s = I18n.format(currentEntry.getTagline());
 			boolean unicode = mc.fontRendererObj.getUnicodeFlag();
 			mc.fontRendererObj.setUnicodeFlag(true);
 			int width = mc.fontRendererObj.getStringWidth(s);
@@ -12,8 +12,8 @@ package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 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(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.achievements"));
+		tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.achievements"));

 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)
@@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -44,7 +44,7 @@ public class GuiButtonBack extends GuiButtonLexicon {
 	}

 	public List<String> getTooltip() {
-		return Collections.singletonList(I18n.translateToLocal("botaniamisc.back"));
+		return Collections.singletonList(I18n.format("botaniamisc.back"));
 	}

 }
@@ -11,7 +11,7 @@
 package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;

 import java.util.Arrays;
 import java.util.List;
@@ -24,7 +24,7 @@ public class GuiButtonBackWithShift extends GuiButtonBack {

 	@Override
 	public List<String> getTooltip() {
-		return Arrays.asList(I18n.translateToLocal("botaniamisc.back"), TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.clickToIndex"));
+		return Arrays.asList(I18n.format("botaniamisc.back"), TextFormatting.GRAY + I18n.format("botaniamisc.clickToIndex"));
 	}

 }
@@ -2,7 +2,7 @@ package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -12,7 +12,7 @@ import java.util.List;

 public class GuiButtonBookmark extends GuiButtonLexicon {

-	GuiLexicon gui;
+	final GuiLexicon gui;

 	public GuiButtonBookmark(int par1, int par2, int par3, GuiLexicon gui, String str) {
 		super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -27,11 +27,11 @@ public class GuiButtonBookmark extends GuiButtonLexicon {

 		List<String> tooltip = new ArrayList<>();
 		if(displayString.equals("+"))
-			tooltip.add(I18n.translateToLocal("botaniamisc.clickToAdd"));
+			tooltip.add(I18n.format("botaniamisc.clickToAdd"));
 		else {
-			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"));
+			tooltip.add(I18n.format("botaniamisc.bookmark", id - GuiLexicon.BOOKMARK_START + 1));
+			tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.clickToSee"));
+			tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.shiftToRemove"));
 		}

 		int tooltipY = (tooltip.size() + 1) * 5;
@@ -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.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import org.lwjgl.opengl.ARBMultitexture;
 import org.lwjgl.opengl.ARBShaderObjects;
 import org.lwjgl.opengl.GL11;
@@ -36,13 +36,13 @@ public class GuiButtonCategory extends GuiButtonLexicon {

 	private static boolean boundStencil = false;

-	GuiLexicon gui;
-	private LexiconCategory category;
+	final GuiLexicon gui;
+	private final LexiconCategory category;
 	private ResourceLocation resource = null;
 	private float ticksHovered = 0F;
-	private float time = 12F;
+	private final float time = 12F;

-	private ShaderCallback shaderCallback = shader -> {
+	private final ShaderCallback shaderCallback = shader -> {
 		TextureManager r = Minecraft.getMinecraft().renderEngine;
 		int heightMatchUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "heightMatch");
 		int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
@@ -122,7 +122,7 @@ public class GuiButtonCategory extends GuiButtonLexicon {
 		GlStateManager.popMatrix();

 		if(inside)
-			gui.categoryHighlight = I18n.translateToLocal(getTooltipText());
+			gui.categoryHighlight = I18n.format(getTooltipText());
 	}

 	private String getTooltipText() {
@@ -14,7 +14,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.challenge.Challenge;

 import javax.annotation.Nonnull;
@@ -23,7 +23,7 @@ import java.util.List;

 public class GuiButtonChallengeIcon extends GuiButtonLexicon {

-	public Challenge challenge;
+	public final Challenge challenge;

 	public GuiButtonChallengeIcon(int id, int x, int y, Challenge challenge) {
 		super(id, x, y, 16, 16, "");
@@ -50,7 +50,7 @@ public class GuiButtonChallengeIcon extends GuiButtonLexicon {


 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(TextFormatting.AQUA + I18n.translateToLocal(challenge.unlocalizedName));
+		tooltip.add(TextFormatting.AQUA + I18n.format(challenge.unlocalizedName));

 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)
@@ -11,7 +11,7 @@
 package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -21,7 +21,7 @@ import java.util.List;

 public class GuiButtonChallengeInfo extends GuiButtonLexicon {

-	GuiLexicon gui;
+	final GuiLexicon gui;

 	public GuiButtonChallengeInfo(int par1, int par2, int par3, String str, GuiLexicon gui) {
 		super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -35,7 +35,7 @@ public class GuiButtonChallengeInfo extends GuiButtonLexicon {
 		int k = getHoverState(hovered);

 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(I18n.translateToLocal("botaniamisc.challengeInfo"));
+		tooltip.add(I18n.format("botaniamisc.challengeInfo"));

 		int tooltipY = (tooltip.size() + 1) * 5;
 		if(k == 2)
@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.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(TextFormatting.YELLOW + I18n.translateToLocal("botaniamisc.challenges"));
+		tooltip.add(TextFormatting.YELLOW + I18n.format("botaniamisc.challenges"));

 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)
@@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -22,7 +22,7 @@ import java.util.List;

 public class GuiButtonHistory extends GuiButtonLexicon {

-	GuiLexicon gui;
+	final GuiLexicon gui;

 	public GuiButtonHistory(int par1, int par2, int par3, String str, GuiLexicon gui) {
 		super(par1, par2, par3, gui.bookmarkWidth(str) + 5, 11, str);
@@ -36,8 +36,8 @@ public class GuiButtonHistory extends GuiButtonLexicon {
 		int k = getHoverState(hovered);

 		List<String> tooltip = new ArrayList<>();
-		tooltip.add(I18n.translateToLocal("botaniamisc.historyLong"));
-		tooltip.add(TextFormatting.GRAY + I18n.translateToLocal("botaniamisc.historyDesc"));
+		tooltip.add(I18n.format("botaniamisc.historyLong"));
+		tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.historyDesc"));

 		int tooltipY = (tooltip.size() + 1) * 5;
 		if(k == 2)
@@ -30,7 +30,7 @@ public class GuiButtonInvisible extends GuiButtonLexicon {

 	private static final ResourceLocation dogResource = new ResourceLocation(LibResources.GUI_DOG);
 	
-	GuiLexiconIndex gui;
+	final GuiLexiconIndex gui;
 	public ItemStack displayStack = null;
 	public boolean dog = false;
 	float timeHover = 0;
@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -23,7 +23,7 @@ import java.util.List;

 public class GuiButtonNotes extends GuiButtonLexicon {

-	GuiLexicon parent;
+	final GuiLexicon parent;

 	public GuiButtonNotes(GuiLexicon parent, int id, int x, int y) {
 		super(id, x, y, 11, 11, "");
@@ -41,9 +41,9 @@ public class GuiButtonNotes extends GuiButtonLexicon {

 		List<String> tooltip = new ArrayList<>();
 		if(GuiLexicon.notesEnabled)
-			tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.hideNotes"));
+			tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.hideNotes"));
 		else {
-			tooltip.add(TextFormatting.GREEN + I18n.translateToLocal("botaniamisc.showNotes"));
+			tooltip.add(TextFormatting.GREEN + I18n.format("botaniamisc.showNotes"));
 			if(parent.note != null && !parent.note.isEmpty())
 				Minecraft.getMinecraft().fontRendererObj.drawStringWithShadow("!", xPosition + 10, yPosition, 0xFF0000);
 		}
@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -38,7 +38,7 @@ public class GuiButtonOptions extends GuiButtonLexicon {

 		List<String> tooltip = new ArrayList<>();
 		for(int i = 0; i < 3; i++)
-			tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.translateToLocal("botaniamisc.lexiconOptions" + i));
+			tooltip.add((i == 0 ? TextFormatting.RED : TextFormatting.GRAY) + I18n.format("botaniamisc.lexiconOptions" + i));

 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)
@@ -12,7 +12,7 @@ package vazkii.botania.client.gui.lexicon.button;

 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -21,7 +21,7 @@ import java.util.Collections;

 public class GuiButtonPage extends GuiButtonLexicon {

-	boolean right;
+	final boolean right;

 	public GuiButtonPage(int par1, int par2, int par3, boolean right) {
 		super(par1, par2, par3, 18, 10, "");
@@ -39,7 +39,7 @@ public class GuiButtonPage extends GuiButtonLexicon {
 			drawTexturedModalRect(xPosition, yPosition, k == 2 ? 18 : 0, right ? 180 : 190, 18, 10);

 			if(k == 2)
-				RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.translateToLocal(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage")));
+				RenderHelper.renderTooltip(par2, par3, Collections.singletonList(I18n.format(right ? "botaniamisc.nextPage" : "botaniamisc.prevPage")));
 		}
 	}

@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -43,6 +43,6 @@ public class GuiButtonShare extends GuiButtonLexicon {
 	}

 	public List<String> getTooltip() {
-		return Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.clickToShare"));
+		return Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.clickToShare"));
 	}
 }
@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.handler.PersistentVariableHelper;
 import vazkii.botania.client.core.helper.RenderHelper;
@@ -46,7 +46,7 @@ public class GuiButtonUpdateWarning extends GuiButtonLexicon {
 		List<String> tooltip = new ArrayList<>();
 		String version = PersistentVariableHelper.lastBotaniaVersion;
 		for(int i = 0; i < 6; i++) {
-			tooltip.add(TextFormatting.GRAY + String.format(I18n.translateToLocal("botaniamisc.changes" + i), version).replaceAll("&", "\u00a7"));
+			tooltip.add(TextFormatting.GRAY + I18n.format("botaniamisc.changes" + i, version).replaceAll("&", "\u00a7"));
 			if(i == 3)
 				tooltip.add("");
 		}
@@ -13,7 +13,7 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;

@@ -36,7 +36,7 @@ public class GuiButtonViewOnline extends GuiButtonLexicon {
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		drawTexturedModalRect(xPosition, yPosition, k == 2 ? 41 : 30, 200, 11, 11);

-		List<String> tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.translateToLocal("botaniamisc.viewOnline"));
+		List<String> tooltip = Collections.singletonList(TextFormatting.AQUA + I18n.format("botaniamisc.viewOnline"));
 		int tooltipY = (tooltip.size() - 1) * 10;
 		if(k == 2)
 			RenderHelper.renderTooltip(par2, par3 + tooltipY, tooltip);
@@ -33,7 +33,6 @@ import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory
 import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.item.block.ItemBlockFloatingSpecialFlower;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;

 import javax.annotation.Nonnull;
@@ -17,7 +17,7 @@ import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;

 import javax.annotation.Nonnull;
 import java.util.Collection;
@@ -32,7 +32,7 @@ public class BreweryRecipeCategory implements IRecipeCategory {
 	public BreweryRecipeCategory(IGuiHelper guiHelper) {
 		ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png");
 		background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0);
-		localizedName = I18n.translateToLocal("botania.nei.brewery");
+		localizedName = I18n.format("botania.nei.brewery");
 	}

 	@Nonnull
@@ -22,7 +22,7 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import org.lwjgl.opengl.GL11;
 import vazkii.botania.client.core.handler.MiscellaneousIcons;

@@ -37,7 +37,7 @@ public class ElvenTradeRecipeCategory implements IRecipeCategory {
 	private final IDrawable overlay;

 	public ElvenTradeRecipeCategory(IGuiHelper guiHelper) {
-		localizedName = I18n.translateToLocal("botania.nei.elvenTrade");
+		localizedName = I18n.format("botania.nei.elvenTrade");
 		background = guiHelper.createBlankDrawable(145, 95);
 		overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90);
 	}
@@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.core.helper.ItemNBTHelper;

@@ -34,7 +34,7 @@ public class ManaPoolRecipeCategory implements IRecipeCategory {

 	public ManaPoolRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(168, 64);
-		localizedName = I18n.translateToLocal("botania.nei.manaPool");
+		localizedName = I18n.format("botania.nei.manaPool");
 		overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"),
 				0, 0, 64, 46);
 		ItemNBTHelper.setBoolean(renderStack, "RenderFull", true);
@@ -18,7 +18,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.common.block.ModBlocks;

 import javax.annotation.Nonnull;
@@ -34,7 +34,7 @@ public class PetalApothecaryRecipeCategory implements IRecipeCategory {

 	public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(150, 110);
-		localizedName = I18n.translateToLocal("botania.nei.petalApothecary");
+		localizedName = I18n.format("botania.nei.petalApothecary");
 		overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"),
 				0, 0, 150, 110);
 	}
@@ -17,7 +17,7 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
+import net.minecraft.client.resources.I18n;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 import vazkii.botania.common.lib.LibBlockNames;

@@ -33,7 +33,7 @@ public class PureDaisyRecipeCategory implements IRecipeCategory {

 	public PureDaisyRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(168, 64);
-		localizedName = I18n.translateToLocal("botania.nei.pureDaisy");
+		localizedName = I18n.format("botania.nei.pureDaisy");
 		overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"),
 				0, 0, 64, 46);
 	}
@@ -15,9 +15,9 @@ import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.translation.I18n;
 import vazkii.botania.common.block.ModBlocks;

 import javax.annotation.Nonnull;
@@ -33,7 +33,7 @@ public class RunicAltarRecipeCategory implements IRecipeCategory {

 	public RunicAltarRecipeCategory(IGuiHelper guiHelper) {
 		background = guiHelper.createBlankDrawable(150, 110);
-		localizedName = I18n.translateToLocal("botania.nei.runicAltar");
+		localizedName = I18n.format("botania.nei.runicAltar");
 		overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"),
 				0, 0, 150, 110);
 	}
@@ -15,12 +15,12 @@ import net.minecraft.client.model.ModelRenderer;

 public class ModelAvatar extends ModelBase {

-	public ModelRenderer body;
-	public ModelRenderer rightarm;
-	public ModelRenderer leftarm;
-	public ModelRenderer rightleg;
-	public ModelRenderer leftleg;
-	public ModelRenderer head;
+	public final ModelRenderer body;
+	public final ModelRenderer rightarm;
+	public final ModelRenderer leftarm;
+	public final ModelRenderer rightleg;
+	public final ModelRenderer leftleg;
+	public final ModelRenderer head;

 	public ModelAvatar() {
 		textureWidth = 32;
@@ -16,13 +16,13 @@ import net.minecraft.client.renderer.GlStateManager;

 public class ModelBellows extends ModelBase {

-	ModelRenderer Base;
-	ModelRenderer Top;
-	ModelRenderer Funnel;
-	ModelRenderer Pipe;
-	ModelRenderer Handle1;
-	ModelRenderer Handle2;
-	ModelRenderer Handle3;
+	final ModelRenderer Base;
+	final ModelRenderer Top;
+	final ModelRenderer Funnel;
+	final ModelRenderer Pipe;
+	final ModelRenderer Handle1;
+	final ModelRenderer Handle2;
+	final ModelRenderer Handle3;

 	public ModelBellows() {
 		textureWidth = 64;
@@ -15,18 +15,18 @@ import net.minecraft.client.model.ModelRenderer;
 import net.minecraft.entity.Entity;

 public class ModelBlackHoleCube extends ModelBase {
-	public ModelRenderer shape1;
-	public ModelRenderer shape1_1;
-	public ModelRenderer shape1_2;
-	public ModelRenderer shape1_3;
-	public ModelRenderer shape1_4;
-	public ModelRenderer shape1_5;
-	public ModelRenderer shape1_6;
-	public ModelRenderer shape1_7;
-	public ModelRenderer shape1_8;
-	public ModelRenderer shape1_9;
-	public ModelRenderer shape1_10;
-	public ModelRenderer shape1_11;
+	public final ModelRenderer shape1;
+	public final ModelRenderer shape1_1;
+	public final ModelRenderer shape1_2;
+	public final ModelRenderer shape1_3;
+	public final ModelRenderer shape1_4;
+	public final ModelRenderer shape1_5;
+	public final ModelRenderer shape1_6;
+	public final ModelRenderer shape1_7;
+	public final ModelRenderer shape1_8;
+	public final ModelRenderer shape1_9;
+	public final ModelRenderer shape1_10;
+	public final ModelRenderer shape1_11;

 	public ModelBlackHoleCube() {
 		textureWidth = 36;
@@ -17,10 +17,10 @@ import vazkii.botania.client.render.tile.RenderTileBrewery;

 public class ModelBrewery extends ModelBase {

-	ModelRenderer Pole;
-	ModelRenderer Top;
-	ModelRenderer Bottom;
-	ModelRenderer Plate;
+	final ModelRenderer Pole;
+	final ModelRenderer Top;
+	final ModelRenderer Bottom;
+	final ModelRenderer Plate;

 	public ModelBrewery() {
 		textureWidth = 64;
@@ -14,9 +14,9 @@ import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;

 public class ModelCrystalCube extends ModelBase {
-	public ModelRenderer cube;
-	public ModelRenderer base1;
-	public ModelRenderer base2;
+	public final ModelRenderer cube;
+	public final ModelRenderer base1;
+	public final ModelRenderer base2;

 	public ModelCrystalCube() {
 		textureWidth = 48;
@@ -19,13 +19,13 @@ import java.awt.*;

 public class ModelHourglass extends ModelBase {

-	public ModelRenderer ring;
-	public ModelRenderer base1;
-	public ModelRenderer base2;
-	public ModelRenderer glass1;
-	public ModelRenderer sand1;
-	public ModelRenderer glass2;
-	public ModelRenderer sand2;
+	public final ModelRenderer ring;
+	public final ModelRenderer base1;
+	public final ModelRenderer base2;
+	public final ModelRenderer glass1;
+	public final ModelRenderer sand1;
+	public final ModelRenderer glass2;
+	public final ModelRenderer sand2;

 	public ModelHourglass() {
 		textureWidth = 48;
@@ -17,9 +17,9 @@ import net.minecraft.util.math.MathHelper;

 public class ModelPixie extends ModelBase {

-	ModelRenderer Body;
-	ModelRenderer LeftWing;
-	ModelRenderer RightWing;
+	final ModelRenderer Body;
+	final ModelRenderer LeftWing;
+	final ModelRenderer RightWing;

 	public ModelPixie() {
 		textureWidth = 64;
@@ -10,7 +10,6 @@
 */
 package vazkii.botania.client.model;

-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import net.minecraft.client.Minecraft;
@@ -33,6 +32,7 @@ import org.lwjgl.opengl.GL11;
 import vazkii.botania.api.state.enums.PylonVariant;

 import java.util.List;
+import java.util.function.Function;

 public class ModelPylon implements IPylonModel {

@@ -61,19 +61,19 @@ public class ModelPylon implements IPylonModel {
 			// (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group)

 			// Turn on "Crystal"
-			manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);

 			// Turn on "Crystal_Ring", and "Ring_Panel0x"
-			manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);

 			// Turn on "Ring_Gem0x"
-			manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
+			gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER::apply);
 		} catch(Exception e) {
 			throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e));
 		}
@@ -16,22 +16,22 @@ import vazkii.botania.api.state.enums.PylonVariant;

 public class ModelPylonOld extends ModelBase implements IPylonModel {

-	ModelRenderer crystal1;
-	ModelRenderer crystal2;
-	ModelRenderer crystal3;
-	ModelRenderer crystal4;
-	ModelRenderer crystal5;
-	ModelRenderer crystal6;
-	ModelRenderer crystal7;
-	ModelRenderer crystal8;
-	ModelRenderer outside1;
-	ModelRenderer outside2;
-	ModelRenderer outside3;
-	ModelRenderer outside4;
-	ModelRenderer outside5;
-	ModelRenderer outside6;
-	ModelRenderer outside7;
-	ModelRenderer outside8;
+	final ModelRenderer crystal1;
+	final ModelRenderer crystal2;
+	final ModelRenderer crystal3;
+	final ModelRenderer crystal4;
+	final ModelRenderer crystal5;
+	final ModelRenderer crystal6;
+	final ModelRenderer crystal7;
+	final ModelRenderer crystal8;
+	final ModelRenderer outside1;
+	final ModelRenderer outside2;
+	final ModelRenderer outside3;
+	final ModelRenderer outside4;
+	final ModelRenderer outside5;
+	final ModelRenderer outside6;
+	final ModelRenderer outside7;
+	final ModelRenderer outside8;

 	public ModelPylonOld() {
 		textureWidth = 64;
@@ -19,7 +19,7 @@ import vazkii.botania.client.core.handler.ClientTickHandler;

 public class ModelSpinningCubes extends ModelBase {

-	ModelRenderer spinningCube;
+	final ModelRenderer spinningCube;

 	public ModelSpinningCubes() {
 		spinningCube = new ModelRenderer(this, 42, 0);
@@ -15,16 +15,16 @@ import net.minecraft.client.model.ModelRenderer;

 public class ModelSpreader extends ModelBase {

-	ModelRenderer cubeSide1;
-	ModelRenderer cubeSide2;
-	ModelRenderer cubeSide3;
-	ModelRenderer cubeSide4;
-	ModelRenderer cubeSide5;
-	ModelRenderer cubeHole1;
-	ModelRenderer cubeHole2;
-	ModelRenderer cubeHole3;
-	ModelRenderer cubeHole4;
-	ModelRenderer cubeInside;
+	final ModelRenderer cubeSide1;
+	final ModelRenderer cubeSide2;
+	final ModelRenderer cubeSide3;
+	final ModelRenderer cubeSide4;
+	final ModelRenderer cubeSide5;
+	final ModelRenderer cubeHole1;
+	final ModelRenderer cubeHole2;
+	final ModelRenderer cubeHole3;
+	final ModelRenderer cubeHole4;
+	final ModelRenderer cubeInside;

 	public ModelSpreader() {
 		textureWidth = 64;
@@ -16,10 +16,10 @@ import net.minecraft.client.model.ModelRenderer;

 public class ModelTeruTeruBozu extends ModelBase {

-	public ModelRenderer thread;
-	public ModelRenderer cloth;
-	public ModelRenderer happyFace;
-	public ModelRenderer sadFace;
+	public final ModelRenderer thread;
+	public final ModelRenderer cloth;
+	public final ModelRenderer happyFace;
+	public final ModelRenderer sadFace;

 	public ModelTeruTeruBozu() {
 		textureWidth = 64;
@@ -15,7 +15,7 @@ import net.minecraft.client.model.ModelRenderer;

 public class ModelTinyPotato extends ModelBase {

-	ModelRenderer potato;
+	final ModelRenderer potato;

 	public ModelTinyPotato() {
 		textureWidth = 64;
@@ -22,36 +22,36 @@ import javax.annotation.Nonnull;

 public class ModelArmorElementium extends ModelBiped {

-	public ModelRenderer helm;
-	public ModelRenderer body;
-	public ModelRenderer armR;
-	public ModelRenderer armL;
-	public ModelRenderer belt;
-	public ModelRenderer bootR;
-	public ModelRenderer bootL;
-	public ModelRenderer helm1;
-	public ModelRenderer helm2;
-	public ModelRenderer helm3;
-	public ModelRenderer fairy;
-	public ModelRenderer helmWing1;
-	public ModelRenderer helmWing2;
-	public ModelRenderer helmWing3;
-	public ModelRenderer helmWing4;
-	public ModelRenderer body2;
-	public ModelRenderer armRpauldron;
-	public ModelRenderer wing1;
-	public ModelRenderer wing2;
-	public ModelRenderer armLpauldron;
-	public ModelRenderer wing1_1;
-	public ModelRenderer wing2_1;
-	public ModelRenderer legR;
-	public ModelRenderer legL;
-	public ModelRenderer bootR1;
-	public ModelRenderer wing1_2;
-	public ModelRenderer wing2_2;
-	public ModelRenderer bootL1;
-	public ModelRenderer wing1_3;
-	public ModelRenderer wing2_3;
+	public final ModelRenderer helm;
+	public final ModelRenderer body;
+	public final ModelRenderer armR;
+	public final ModelRenderer armL;
+	public final ModelRenderer belt;
+	public final ModelRenderer bootR;
+	public final ModelRenderer bootL;
+	public final ModelRenderer helm1;
+	public final ModelRenderer helm2;
+	public final ModelRenderer helm3;
+	public final ModelRenderer fairy;
+	public final ModelRenderer helmWing1;
+	public final ModelRenderer helmWing2;
+	public final ModelRenderer helmWing3;
+	public final ModelRenderer helmWing4;
+	public final ModelRenderer body2;
+	public final ModelRenderer armRpauldron;
+	public final ModelRenderer wing1;
+	public final ModelRenderer wing2;
+	public final ModelRenderer armLpauldron;
+	public final ModelRenderer wing1_1;
+	public final ModelRenderer wing2_1;
+	public final ModelRenderer legR;
+	public final ModelRenderer legL;
+	public final ModelRenderer bootR1;
+	public final ModelRenderer wing1_2;
+	public final ModelRenderer wing2_2;
+	public final ModelRenderer bootL1;
+	public final ModelRenderer wing1_3;
+	public final ModelRenderer wing2_3;

 	private final EntityEquipmentSlot slot;

@@ -23,25 +23,25 @@ import javax.annotation.Nonnull;
 public class ModelArmorManasteel extends ModelBiped {


-	public ModelRenderer helm;
-	public ModelRenderer body;
-	public ModelRenderer armR;
-	public ModelRenderer armL;
-	public ModelRenderer belt;
-	public ModelRenderer bootR;
-	public ModelRenderer bootL;
-	public ModelRenderer helm1;
-	public ModelRenderer helm2;
-	public ModelRenderer helm3;
-	public ModelRenderer helm4;
-	public ModelRenderer helm5;
-	public ModelRenderer helm6;
-	public ModelRenderer helm7;
-	public ModelRenderer body2;
-	public ModelRenderer armRpauldron;
-	public ModelRenderer armLpauldron;
-	public ModelRenderer legR;
-	public ModelRenderer legL;
+	public final ModelRenderer helm;
+	public final ModelRenderer body;
+	public final ModelRenderer armR;
+	public final ModelRenderer armL;
+	public final ModelRenderer belt;
+	public final ModelRenderer bootR;
+	public final ModelRenderer bootL;
+	public final ModelRenderer helm1;
+	public final ModelRenderer helm2;
+	public final ModelRenderer helm3;
+	public final ModelRenderer helm4;
+	public final ModelRenderer helm5;
+	public final ModelRenderer helm6;
+	public final ModelRenderer helm7;
+	public final ModelRenderer body2;
+	public final ModelRenderer armRpauldron;
+	public final ModelRenderer armLpauldron;
+	public final ModelRenderer legR;
+	public final ModelRenderer legL;

 	private final EntityEquipmentSlot slot;

@@ -22,26 +22,26 @@ import javax.annotation.Nonnull;

 public class ModelArmorManaweave extends ModelBiped {

-	public ModelRenderer helm;
-	public ModelRenderer body;
-	public ModelRenderer armR;
-	public ModelRenderer armL;
-	public ModelRenderer legR;
-	public ModelRenderer legL;
-	public ModelRenderer bootR;
-	public ModelRenderer bootL;
-	public ModelRenderer helm2;
-	public ModelRenderer helm3;
-	public ModelRenderer helm4;
-	public ModelRenderer helmSeam1;
-	public ModelRenderer helmSeam2;
-	public ModelRenderer helmSeam3;
-	public ModelRenderer helmSeam4;
-	public ModelRenderer body2;
-	public ModelRenderer armRpauldron;
-	public ModelRenderer armLpauldron;
-	public ModelRenderer skirtR;
-	public ModelRenderer skirtL;
+	public final ModelRenderer helm;
+	public final ModelRenderer body;
+	public final ModelRenderer armR;
+	public final ModelRenderer armL;
+	public final ModelRenderer legR;
+	public final ModelRenderer legL;
+	public final ModelRenderer bootR;
+	public final ModelRenderer bootL;
+	public final ModelRenderer helm2;
+	public final ModelRenderer helm3;
+	public final ModelRenderer helm4;
+	public final ModelRenderer helmSeam1;
+	public final ModelRenderer helmSeam2;
+	public final ModelRenderer helmSeam3;
+	public final ModelRenderer helmSeam4;
+	public final ModelRenderer body2;
+	public final ModelRenderer armRpauldron;
+	public final ModelRenderer armLpauldron;
+	public final ModelRenderer skirtR;
+	public final ModelRenderer skirtL;

 	private final EntityEquipmentSlot slot;

@@ -22,39 +22,39 @@ import javax.annotation.Nonnull;

 public class ModelArmorTerrasteel extends ModelBiped {

-	public ModelRenderer helm;
-	public ModelRenderer body;
-	public ModelRenderer armr;
-	public ModelRenderer armL;
-	public ModelRenderer belt;
-	public ModelRenderer bootR;
-	public ModelRenderer bootL;
-	public ModelRenderer helm2;
-	public ModelRenderer helm3;
-	public ModelRenderer helm4;
-	public ModelRenderer helmLeaf1;
-	public ModelRenderer helmLeaf2;
-	public ModelRenderer helmLeaf3;
-	public ModelRenderer helmLeaf4;
-	public ModelRenderer helmLeaf5;
-	public ModelRenderer helmLeaf6;
-	public ModelRenderer helmbranch1;
-	public ModelRenderer helmbranch2;
-	public ModelRenderer helmbranch3;
-	public ModelRenderer helmbranch4;
-	public ModelRenderer body2;
-	public ModelRenderer armRpauldron;
-	public ModelRenderer armRbranch1;
-	public ModelRenderer armRbranch2;
-	public ModelRenderer armLpauldron;
-	public ModelRenderer armLbranch1;
-	public ModelRenderer armLbranch2;
-	public ModelRenderer legR;
-	public ModelRenderer legL;
-	public ModelRenderer bootR1;
-	public ModelRenderer bootRbranch;
-	public ModelRenderer bootL2;
-	public ModelRenderer bootLbranch;
+	public final ModelRenderer helm;
+	public final ModelRenderer body;
+	public final ModelRenderer armr;
+	public final ModelRenderer armL;
+	public final ModelRenderer belt;
+	public final ModelRenderer bootR;
+	public final ModelRenderer bootL;
+	public final ModelRenderer helm2;
+	public final ModelRenderer helm3;
+	public final ModelRenderer helm4;
+	public final ModelRenderer helmLeaf1;
+	public final ModelRenderer helmLeaf2;
+	public final ModelRenderer helmLeaf3;
+	public final ModelRenderer helmLeaf4;
+	public final ModelRenderer helmLeaf5;
+	public final ModelRenderer helmLeaf6;
+	public final ModelRenderer helmbranch1;
+	public final ModelRenderer helmbranch2;
+	public final ModelRenderer helmbranch3;
+	public final ModelRenderer helmbranch4;
+	public final ModelRenderer body2;
+	public final ModelRenderer armRpauldron;
+	public final ModelRenderer armRbranch1;
+	public final ModelRenderer armRbranch2;
+	public final ModelRenderer armLpauldron;
+	public final ModelRenderer armLbranch1;
+	public final ModelRenderer armLbranch2;
+	public final ModelRenderer legR;
+	public final ModelRenderer legL;
+	public final ModelRenderer bootR1;
+	public final ModelRenderer bootRbranch;
+	public final ModelRenderer bootL2;
+	public final ModelRenderer bootLbranch;

 	private final EntityEquipmentSlot slot;

@@ -17,7 +17,6 @@ import net.minecraft.client.resources.DefaultPlayerSkin;
 import net.minecraft.util.ResourceLocation;
 import org.lwjgl.opengl.ARBShaderObjects;
 import vazkii.botania.api.internal.ShaderCallback;
-import vazkii.botania.client.core.handler.BossBarHandler;
 import vazkii.botania.client.core.helper.ShaderHelper;
 import vazkii.botania.common.entity.EntityDoppleganger;

@@ -14,9 +14,6 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderWither;
 import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import vazkii.botania.client.lib.LibResources;

 import javax.annotation.Nonnull;
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;

 public class RenderPixie extends RenderLiving<EntityPixie> {

-	ShaderCallback callback = shader -> {
+	final ShaderCallback callback = shader -> {
        // Frag Uniforms
        int disfigurationUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "disfiguration");
        ARBShaderObjects.glUniform1fARB(disfigurationUniform, 0.025F);
@@ -8,7 +8,6 @@
 */
 package vazkii.botania.client.render.entity;

-import com.google.common.base.Function;
 import net.minecraft.client.renderer.RenderItem;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderSnowball;
@@ -17,6 +16,7 @@ import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;

 import javax.annotation.Nonnull;
+import java.util.function.Function;

 // Same as RenderSnowball, but ItemStack sensitive
 public class RenderSnowballStack<T extends Entity> extends RenderSnowball<T> {
@@ -27,7 +27,7 @@ import javax.annotation.Nonnull;
 public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY);
-	ModelBrewery model = new ModelBrewery();
+	final ModelBrewery model = new ModelBrewery();
 	public TileBrewery brewery;

 	@Override
@@ -18,7 +18,6 @@ import net.minecraft.client.renderer.RenderHelper;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.VertexBuffer;
 import net.minecraft.client.renderer.block.model.IBakedModel;
-import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderEntityItem;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
@@ -39,7 +38,6 @@ import net.minecraftforge.common.property.Properties;
 import org.apache.commons.lang3.tuple.Pair;
 import org.lwjgl.opengl.GL11;
 import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.client.model.ModelCrystalCube;
 import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
 import vazkii.botania.common.core.handler.MethodHandles;

@@ -24,7 +24,7 @@ import javax.annotation.Nonnull;
 public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorporeaIndex> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CORPOREA_INDEX);
-	ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
+	final ModelEnderCrystal crystal = new ModelEnderCrystal(0F, false);
 	public static boolean move = true;

 	@Override
@@ -20,7 +20,6 @@ import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import vazkii.botania.client.core.handler.ClientTickHandler;
-import vazkii.botania.client.model.FloatingFlowerModel;

 import javax.annotation.Nonnull;
 import java.util.Random;
@@ -26,8 +26,8 @@ import java.util.Random;

 public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass> {

-	ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS);
-	ModelHourglass model = new ModelHourglass();
+	final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_HOURGLASS);
+	final ModelHourglass model = new ModelHourglass();

 	@Override
 	public void renderTileEntityAt(@Nonnull TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) {
@@ -19,7 +19,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.item.EnumDyeColor;
 import org.lwjgl.opengl.GL11;
 import vazkii.botania.api.mana.IPoolOverlayProvider;
 import vazkii.botania.api.state.BotaniaStateProps;
@@ -25,7 +25,7 @@ import javax.annotation.Nonnull;

 public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar> {

-	ModelSpinningCubes cubes = new ModelSpinningCubes();
+	final ModelSpinningCubes cubes = new ModelSpinningCubes();

 	@Override
 	public void renderTileEntityAt(@Nonnull TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) {
@@ -32,7 +32,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield
 	private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png");
 	private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png");
 	private static final Random field_147527_e = new Random(31100L);
-	FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);
+	final FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);

 	public void renderTileEntityAt(@Nonnull TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage)
 	{
@@ -111,7 +111,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield

 			if (i == 0)
 			{
-				f11 = f12 = f13 = 1.0F * f6;
+				f11 = f12 = 1.0F * f6;
 			}

 			// Botania: change color based on time
@@ -28,7 +28,7 @@ public class RenderTileTeruTeruBozu extends TileEntitySpecialRenderer<TileTeruTe

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU);
 	private static final ResourceLocation textureHalloween = new ResourceLocation(LibResources.MODEL_TERU_TERU_BOZU_HALLOWEEN);
-	ModelTeruTeruBozu model = new ModelTeruTeruBozu();
+	final ModelTeruTeruBozu model = new ModelTeruTeruBozu();

 	@Override
 	public void renderTileEntityAt(@Nonnull TileTeruTeruBozu tileentity, double d0, double d1, double d2, float f, int digProgress) {
@@ -11,12 +11,9 @@
 package vazkii.botania.common.block;

 import net.minecraft.block.Block;
-import net.minecraft.block.BlockDirectional;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumBlockRenderType;
@@ -26,9 +23,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.common.block.tile.TileCamo;

-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class BlockCamo extends BlockMod {

 	protected BlockCamo(Material par2Material, String name) {
Author	SHA1	Message	Date
Vincent Lee	4f0d63f5a0	Build 308	2016-05-28 11:09:08 -05:00
Vincent Lee	8ef557e51b	Remove loot debug -.-	2016-05-28 11:04:40 -05:00
Vincent Lee	974e8d0316	Build 307	2016-05-27 20:55:48 -05:00
Vincent Lee	cf82603f04	Update bow methods. Closes #300	2016-05-27 20:26:54 -05:00
Vincent Lee	1d54442e01	Fix axe digging closes #301	2016-05-27 19:56:07 -05:00
Vincent Lee	a07f7914ae	Add chest textures, update Forge	2016-05-27 19:51:59 -05:00
Vincent Lee	51c7d310a7	Moar clenaup	2016-05-26 23:22:50 -05:00
Vincent Lee	e3e6f8996f	Cleanup	2016-05-26 23:08:53 -05:00
Vincent Lee	7f759c1b88	Fix ender air bottle being underpowered	2016-05-24 21:16:18 -05:00
Vincent Lee	57e1fd5b41	Merge branch 'master' of https://github.com/Vazkii/Botania into MC19	2016-05-22 13:20:39 -05:00
Vincent Lee	8b88289789	Fix issues associated with last commit	2016-05-22 13:19:11 -05:00
Vincent Lee	ff2afbf037	Untested: replace most uses of common i18n with client one	2016-05-22 11:41:33 -05:00
Vincent Lee	41b3e6cd4f	Use all bits for effect packet args. Closes #296	2016-05-21 23:40:10 -05:00
Vincent Lee	930703b5c1	Workaround for 'global' particles at small render distances. Close #15 (mostly)	2016-05-21 23:38:17 -05:00
Vincent Lee	f52dca111f	Flower bag plays sound and animation. Closes #295	2016-05-21 22:55:30 -05:00
Vincent Lee	9694664922	Fix mana cookie lasting too short (thanks wiresegal)	2016-05-21 22:13:52 -05:00
Vincent Lee	e2e00f7ef1	Use chunk util method that exists instead of own thing	2016-05-21 12:13:37 -05:00
Vincent Lee	c9de3bcc03	Mana pools now try catalyst recipes first before recipes without catalyst specified. Also make mana bar not render in spectator. Closes #291	2016-05-20 14:36:28 -05:00
Vincent Lee	995c19c04a	Fix TE syncing on login, 2 minor optimizations	2016-05-19 14:07:52 -05:00
Vincent Lee	96983a1d6b	Merge branch 'MC19' of github.com:williewillus/Botania into MC19	2016-05-19 10:03:48 -05:00
Vincent Lee	8f00e9bdd6	Build 306	2016-05-19 10:03:24 -05:00
Jonathan Smith	5495271fa2	Merge pull request #1849 from NatsuArashi/patch-3 Update zh_TW.lang	2016-05-18 10:49:15 +01:00
NatsuArashi	588a02f385	Update zh_TW.lang *部分日本語使用原文	2016-05-18 17:39:27 +08:00
Vasco Lavos	da11e497fc	Update contributors.properties	2016-04-22 02:41:54 +01:00
Jonathan Smith	3fb76acf57	Merge pull request #1835 from elbo2525/master Update ja_JP.lang	2016-04-07 09:42:02 +01:00
elbo2525	2471642df7	Update ja_JP.lang	2016-04-07 15:53:52 +09:00