Global safety checks for blockstates while chunks are unloading

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

@@ -62,34 +62,34 @@ import net.minecraftforge.fml.common.Loader;
 
 public final class BotaniaAPI {
 
-	private static List<LexiconCategory> categories = new ArrayList<LexiconCategory>();
-	private static List<LexiconEntry> allEntries = new ArrayList<LexiconEntry>();
+	private static List<LexiconCategory> categories = new ArrayList<>();
+	private static List<LexiconEntry> allEntries = new ArrayList<>();
 
-	public static Map<String, KnowledgeType> knowledgeTypes = new HashMap<String, KnowledgeType>();
+	public static Map<String, KnowledgeType> knowledgeTypes = new HashMap<>();
 
-	public static Map<String, Brew> brewMap = new LinkedHashMap<String, Brew>();
+	public static Map<String, Brew> brewMap = new LinkedHashMap<>();
 
-	public static List<RecipePetals> petalRecipes = new ArrayList<RecipePetals>();
-	public static List<RecipePureDaisy> pureDaisyRecipes = new ArrayList<RecipePureDaisy>();
-	public static List<RecipeManaInfusion> manaInfusionRecipes = new ArrayList<RecipeManaInfusion>();
-	public static List<RecipeRuneAltar> runeAltarRecipes = new ArrayList<RecipeRuneAltar>();
-	public static List<RecipeElvenTrade> elvenTradeRecipes = new ArrayList<RecipeElvenTrade>();
-	public static List<RecipeBrew> brewRecipes = new ArrayList<RecipeBrew>();
-	public static List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<RecipeManaInfusion>();
+	public static List<RecipePetals> petalRecipes = new ArrayList<>();
+	public static List<RecipePureDaisy> pureDaisyRecipes = new ArrayList<>();
+	public static List<RecipeManaInfusion> manaInfusionRecipes = new ArrayList<>();
+	public static List<RecipeRuneAltar> runeAltarRecipes = new ArrayList<>();
+	public static List<RecipeElvenTrade> elvenTradeRecipes = new ArrayList<>();
+	public static List<RecipeBrew> brewRecipes = new ArrayList<>();
+	public static List<RecipeManaInfusion> miniFlowerRecipes = new ArrayList<>();
 
 	private static BiMap<String, Class<? extends SubTileEntity>> subTiles = HashBiMap.<String, Class<? extends SubTileEntity>> create();
-	private static Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<Class<? extends SubTileEntity>, SubTileSignature>();
+	private static Map<Class<? extends SubTileEntity>, SubTileSignature> subTileSignatures = new HashMap<>();
 	public static Set<String> subtilesForCreativeMenu = new LinkedHashSet();
-	public static Map<String, String> subTileMods = new HashMap<String, String>();
+	public static Map<String, String> subTileMods = new HashMap<>();
 	public static BiMap<String, String> miniFlowers = HashBiMap.<String, String> create();
 
-	public static Map<String, Integer> oreWeights = new HashMap<String, Integer>();
-	public static Map<String, Integer> oreWeightsNether = new HashMap<String, Integer>();
+	public static Map<String, Integer> oreWeights = new HashMap<>();
+	public static Map<String, Integer> oreWeightsNether = new HashMap<>();
 	public static Map<Item, Block> seeds = new HashMap();
 
-	public static Set<Item> looniumBlacklist = new LinkedHashSet<Item>();
-	public static Map<Block, PropertyEnum<EnumDyeColor>> paintableBlocks = new LinkedHashMap<Block, PropertyEnum<EnumDyeColor>>();
-	public static Set<String> magnetBlacklist = new LinkedHashSet<String>();
+	public static Set<Item> looniumBlacklist = new LinkedHashSet<>();
+	public static Map<Block, PropertyEnum<EnumDyeColor>> paintableBlocks = new LinkedHashMap<>();
+	public static Set<String> magnetBlacklist = new LinkedHashSet<>();
 
 
 	public static ArmorMaterial manasteelArmorMaterial = EnumHelper.addArmorMaterial("MANASTEEL", "manasteel", 16, new int[] { 2, 6, 5, 2 }, 18);

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

@@ -1,6 +1,5 @@
 package vazkii.botania.api;
 
-import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Maps;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraftforge.fml.relauncher.Side;

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

@@ -33,7 +33,7 @@ public final class CorporeaHelper {
 
 	private static final List<IInventory> empty = Collections.unmodifiableList(new ArrayList());
 	private static final WeakHashMap<List<ICorporeaSpark>, List<IInventory>> cachedNetworks = new WeakHashMap();
-	private static final List<ICorporeaAutoCompleteController> autoCompleteControllers = new ArrayList<ICorporeaAutoCompleteController>();
+	private static final List<ICorporeaAutoCompleteController> autoCompleteControllers = new ArrayList<>();
 
 	private static final Pattern patternControlCode = Pattern.compile("(?i)\\u00A7[0-9A-FK-OR]");
 

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

@@ -13,8 +13,6 @@ package vazkii.botania.api.internal;
 import java.util.List;
 
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
@@ -28,8 +26,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import vazkii.botania.api.boss.IBotaniaBoss;
 import vazkii.botania.api.lexicon.LexiconPage;
 import vazkii.botania.api.lexicon.multiblock.MultiblockSet;

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

@@ -13,8 +13,6 @@ package vazkii.botania.api.internal;
 import java.util.List;
 
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -10,14 +10,11 @@
  */
 package vazkii.botania.api.item;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 
-import org.lwjgl.opengl.GL11;
-
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 

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

@@ -20,7 +20,7 @@ public class LexiconCategory implements Comparable<LexiconCategory> {
 	private static int count = 0;
 
 	public final String unlocalizedName;
-	public final List<LexiconEntry> entries = new ArrayList<LexiconEntry>();
+	public final List<LexiconEntry> entries = new ArrayList<>();
 	private final int sortingId;
 	private ResourceLocation icon;
 	private int priority = 5;

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

@@ -27,7 +27,7 @@ public class LexiconEntry implements Comparable<LexiconEntry> {
 
 	private KnowledgeType type = BotaniaAPI.basicKnowledge;
 
-	public List<LexiconPage> pages = new ArrayList<LexiconPage>();
+	public List<LexiconPage> pages = new ArrayList<>();
 	private boolean priority = false;
 	private ItemStack icon = null;
 	

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

@@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock;
 
 import java.util.*;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockPos;
@@ -33,7 +32,7 @@ public class Multiblock {
 	public BlockPos maxPos = BlockPos.ORIGIN;
 	public BlockPos offPos = BlockPos.ORIGIN;
 
-	public HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<BlockPos, MultiblockComponent>();
+	public HashMap<BlockPos, MultiblockComponent> locationCache = new HashMap<>();
 
 	/**
 	 * Adds a multiblock component to this multiblock. The component's x y z
@@ -125,7 +124,7 @@ public class Multiblock {
 	 * orientations.
 	 */
 	public Map<EnumFacing, Multiblock> createRotations() {
-		Map<EnumFacing, Multiblock> ret = new EnumMap<EnumFacing, Multiblock>(EnumFacing.class);
+		Map<EnumFacing, Multiblock> ret = new EnumMap<>(EnumFacing.class);
 
 		ret.put(EnumFacing.SOUTH, this);
 

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

@@ -12,7 +12,6 @@ package vazkii.botania.api.lexicon.multiblock;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.MathHelper;
 
 import java.util.Collections;
 import java.util.Map;

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

@@ -10,7 +10,6 @@
  */
 package vazkii.botania.api.lexicon.multiblock.component;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;

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

@@ -1,8 +1,6 @@
 package vazkii.botania.api.lexicon.multiblock.component;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 

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

@@ -65,12 +65,9 @@ public class BotaniaStateProps {
     public static final PropertyEnum<FutureStoneVariant> FUTURESTONE_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class);
 
     // Block18StoneWall
-    public static final PropertyEnum<FutureStoneVariant> FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, new Predicate<FutureStoneVariant>() {
-        @Override
-        public boolean apply(FutureStoneVariant variant) {
-            // Just the four kinds (no polished, chiseled, etc.)
-            return variant.ordinal() >= 0 && variant.ordinal() <= 3;
-        }
+    public static final PropertyEnum<FutureStoneVariant> FUTURESTONEWALL_VARIANT = PropertyEnum.create("variant", FutureStoneVariant.class, variant -> {
+        // Just the four kinds (no polished, chiseled, etc.)
+        return variant.ordinal() >= 0 && variant.ordinal() <= 3;
     });
 
     // BlockAlfPortal
@@ -89,12 +86,7 @@ public class BotaniaStateProps {
     public static final PropertyEnum<BiomeBrickVariant> BIOMEBRICK_VARIANT = PropertyEnum.create("variant", BiomeBrickVariant.class);
 
     // BlockBiomeStoneWall
-    public static final PropertyEnum<BiomeStoneVariant> BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, new Predicate<BiomeStoneVariant>() {
-        @Override
-        public boolean apply(BiomeStoneVariant input) {
-            return input.getName().contains("cobble");
-        }
-    });
+    public static final PropertyEnum<BiomeStoneVariant> BIOMESTONEWALL_VARIANT = PropertyEnum.create("variant", BiomeStoneVariant.class, input -> input.getName().contains("cobble"));
 
     // BlockCustomBrick
     public static final PropertyEnum<CustomBrickVariant> CUSTOMBRICK_VARIANT = PropertyEnum.create("variant", CustomBrickVariant.class);
@@ -120,36 +112,21 @@ public class BotaniaStateProps {
     // BlockLivingRock
     public static final PropertyEnum<LivingRockVariant> LIVINGROCK_VARIANT = PropertyEnum.create("variant", LivingRockVariant.class);
 
-    // BlockModDoubleFlower
-    public static final PropertyEnum<EnumDyeColor> DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate<EnumDyeColor>() {
-        @Override
-        public boolean apply(EnumDyeColor input) {
-            // White to gray
-            return input.ordinal() >= 0 && input.ordinal() <= 7;
-        }
-    });
+    // BlockModDoubleFlower (white to gray)
+    public static final PropertyEnum<EnumDyeColor> DOUBLEFLOWER_VARIANT_1 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 0 && input.ordinal() <= 7);
 
-    public static final PropertyEnum<EnumDyeColor> DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, new Predicate<EnumDyeColor>() {
-        @Override
-        public boolean apply(EnumDyeColor input) {
-            // Silver to black
-            return input.ordinal() >= 8 && input.ordinal() <= 15;
-        }
-    });
+    // (silver to black)
+    public static final PropertyEnum<EnumDyeColor> DOUBLEFLOWER_VARIANT_2 = PropertyEnum.create("variant", EnumDyeColor.class, input -> input.ordinal() >= 8 && input.ordinal() <= 15);
 
     // BlockOpenCrate
     public static final PropertyEnum<CrateVariant> CRATE_VARIANT = PropertyEnum.create("variant", CrateVariant.class);
     public static final PropertyEnum<CratePattern> CRATE_PATTERN = PropertyEnum.create("pattern", CratePattern.class);
 
     // BlockPavement
-    public static final PropertyEnum<EnumDyeColor> PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, new Predicate<EnumDyeColor>() {
-        @Override
-        public boolean apply(EnumDyeColor color) {
-            return color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK
-                    || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED
-                    || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN;
-        }
-    });
+    public static final PropertyEnum<EnumDyeColor> PAVEMENT_COLOR = PropertyEnum.create("color", EnumDyeColor.class, color ->
+            color == EnumDyeColor.WHITE || color == EnumDyeColor.BLACK
+            || color == EnumDyeColor.BLUE || color == EnumDyeColor.RED
+            || color == EnumDyeColor.YELLOW || color == EnumDyeColor.GREEN);
 
     // BlockPlatform
     public static final PropertyEnum<PlatformVariant> PLATFORM_VARIANT = PropertyEnum.create("variant", PlatformVariant.class);

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

@@ -10,13 +10,11 @@
  */
 package vazkii.botania.api.subtile;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;

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

@@ -11,7 +11,6 @@
 package vazkii.botania.api.subtile;
 
 import java.awt.Color;
-import java.util.ArrayList;
 import java.util.List;
 
 import net.minecraft.block.Block;

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

@@ -12,8 +12,6 @@ package vazkii.botania.api.subtile.signature;
 
 import java.util.List;
 
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 

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

@@ -10,13 +10,9 @@
  */
 package vazkii.botania.client.core.handler;
 
-import java.awt.Color;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.entity.player.EntityPlayer;
@@ -25,8 +21,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.potion.Potion;
 import net.minecraftforge.client.event.RenderPlayerEvent;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.api.item.IBaubleRender;
 import vazkii.botania.api.item.IBaubleRender.Helper;
 import vazkii.botania.api.item.IBaubleRender.RenderType;

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

@@ -21,7 +21,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiChat;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiTextField;
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ChatComponentText;
@@ -39,23 +38,17 @@ public class CorporeaAutoCompleteHandler {
 
 	boolean isAutoCompleted = false;
 	String originalString = "";
-	List<CompletionData> completions = new ArrayList<CompletionData>();
+	List<CompletionData> completions = new ArrayList<>();
 	int position;
 
-	static TreeSet<String> itemNames = new TreeSet<String>(
-			new Comparator<String>() {
-				@Override
-				public int compare(String arg0, String arg1) {
-					return arg0.compareToIgnoreCase(arg1);
-				}
-			});
+	static TreeSet<String> itemNames = new TreeSet<>(String::compareToIgnoreCase);
 
 	private boolean tabLastTick = false;
 
 	public static void updateItemList() {
 		itemNames.clear();
 		Iterator<Item> iterator = Item.itemRegistry.iterator();
-		ArrayList<ItemStack> curList = new ArrayList<ItemStack>();
+		ArrayList<ItemStack> curList = new ArrayList<>();
 
 		while(iterator.hasNext()) {
 			Item item = iterator.next();
@@ -146,7 +139,7 @@ public class CorporeaAutoCompleteHandler {
 		if(s.isEmpty())
 			return new ArrayList();
 				
-		TreeSet<CompletionData> result = new TreeSet<CompletionData>();
+		TreeSet<CompletionData> result = new TreeSet<>();
 		String[] words = s.split(" ");
 		int i = words.length - 1;
 		String curPrefix = words[i];
@@ -156,11 +149,11 @@ public class CorporeaAutoCompleteHandler {
 			if(i >= 0)
 				curPrefix = words[i] + " " + curPrefix;
 		}
-		return new ArrayList<CompletionData>(result);
+		return new ArrayList<>(result);
 	}
 
 	private List<CompletionData> getNamesStartingWith(String prefix) {
-		ArrayList<CompletionData> result = new ArrayList<CompletionData>();
+		ArrayList<CompletionData> result = new ArrayList<>();
 		int length = prefix.length();
 		SortedSet<String> after = itemNames.tailSet(prefix);
 		for(String str : after) {

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

@@ -21,7 +21,6 @@ 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.renderer.entity.RenderItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;
 import net.minecraft.item.Item;
@@ -36,7 +35,6 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.ILexicon;

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

@@ -16,13 +16,11 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;

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

@@ -177,11 +177,11 @@ public class LightningHandler {
 
 	public static class LightningBolt {
 
-		public ArrayList<Segment> segments = new ArrayList<Segment>();
+		public ArrayList<Segment> segments = new ArrayList<>();
 		public Vector3 start;
 		public Vector3 end;
 		BlockPos target;
-		HashMap<Integer, Integer> splitparents = new HashMap<Integer, Integer>();
+		HashMap<Integer, Integer> splitparents = new HashMap<>();
 
 		public double length;
 		public int numsegments0;
@@ -198,7 +198,7 @@ public class LightningHandler {
 		private World world;
 		private Entity source;
 
-		public static ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<LightningBolt>();
+		public static ConcurrentLinkedQueue<LightningBolt> boltlist = new ConcurrentLinkedQueue<>();
 
 		public float speed = 1.5F;
 		public static final int fadetime = 20;
@@ -350,7 +350,7 @@ public class LightningHandler {
 				return;
 
 			ArrayList<Segment> oldsegments = segments;
-			segments = new ArrayList<Segment>();
+			segments = new ArrayList<>();
 
 			Segment prev = null;
 
@@ -431,7 +431,7 @@ public class LightningHandler {
 		}
 
 		private void calculateCollisionAndDiffs() {
-			HashMap<Integer, Integer> lastactivesegment = new HashMap<Integer, Integer>();
+			HashMap<Integer, Integer> lastactivesegment = new HashMap<>();
 
 			Collections.sort(segments, new SegmentSorter());
 

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

@@ -168,165 +168,116 @@ public final class ModelHandler {
         ModelLoader.registerItemVariants(infiniteFruit,
                 new ModelResourceLocation("botania:infiniteFruit", "inventory"),
                 new ModelResourceLocation("botania:infiniteFruitBoot", "inventory"));
-        ModelLoader.setCustomMeshDefinition(infiniteFruit, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ItemInfiniteFruit.isBoot(stack) ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")
-                        : new ModelResourceLocation("botania:infiniteFruit", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(infiniteFruit, stack ->
+                ItemInfiniteFruit.isBoot(stack)
+                    ? new ModelResourceLocation("botania:infiniteFruitBoot", "inventory")
+                    : new ModelResourceLocation("botania:infiniteFruit", "inventory"));
 
         ModelLoader.registerItemVariants(magnetRing,
                 new ModelResourceLocation("botania:magnetRingOn", "inventory"),
                 new ModelResourceLocation("botania:magnetRingOff", "inventory"));
-        ModelLoader.setCustomMeshDefinition(magnetRing, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingOn", "inventory")
-                        : new ModelResourceLocation("botania:magnetRingOff", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(magnetRing, stack ->
+                ItemMagnetRing.getCooldown(stack) <= 0
+                    ? new ModelResourceLocation("botania:magnetRingOn", "inventory")
+                    : new ModelResourceLocation("botania:magnetRingOff", "inventory"));
 
         ModelLoader.registerItemVariants(magnetRingGreater,
                 new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory"),
                 new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"));
-        ModelLoader.setCustomMeshDefinition(magnetRingGreater, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ItemMagnetRing.getCooldown(stack) <= 0 ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory")
-                        : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(magnetRingGreater, stack ->
+                ItemMagnetRing.getCooldown(stack) <= 0
+                    ? new ModelResourceLocation("botania:magnetRingGreaterOn", "inventory")
+                    : new ModelResourceLocation("botania:magnetRingGreaterOff", "inventory"));
 
         ModelLoader.registerItemVariants(manaGun,
                 new ModelResourceLocation("botania:manaGun", "inventory"),
                 new ModelResourceLocation("botania:manaGunClip", "inventory"),
                 new ModelResourceLocation("botania:desuGun", "inventory"),
                 new ModelResourceLocation("botania:desuGunClip", "inventory"));
-        ModelLoader.setCustomMeshDefinition(manaGun, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                String name;
-                if (((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack)) {
-                    name = ItemManaGun.hasClip(stack) ? "botania:desuGunClip" : "botania:desuGun";
-                } else {
-                    name = ItemManaGun.hasClip(stack) ? "botania:manaGunClip": "botania:manaGun";
-                }
-                return new ModelResourceLocation(name, "inventory");
-            }
+        ModelLoader.setCustomMeshDefinition(manaGun, stack -> {
+            String name = ((ItemManaGun) manaGun).isSugoiKawaiiDesuNe(stack) ? "botania:desuGun" : "botania:manaGun";
+            return new ModelResourceLocation(name + (ItemManaGun.hasClip(stack) ? "Clip" : ""), "inventory");
         });
 
         ModelLoader.registerItemVariants(tornadoRod,
                 new ModelResourceLocation("botania:tornadoRod", "inventory"),
                 new ModelResourceLocation("botania:tornadoRod_flying", "inventory"));
-        ModelLoader.setCustomMeshDefinition(tornadoRod, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack) ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory") : new ModelResourceLocation("botania:tornadoRod", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(tornadoRod, stack ->
+                ((ItemTornadoRod) ModItems.tornadoRod).isFlying(stack)
+                    ? new ModelResourceLocation("botania:tornadoRod_flying", "inventory")
+                    : new ModelResourceLocation("botania:tornadoRod", "inventory"));
 
         ModelLoader.registerItemVariants(twigWand,
                 new ModelResourceLocation("botania:twigWand", "inventory"),
                 new ModelResourceLocation("botania:twigWand_bind", "inventory"));
-        ModelLoader.setCustomMeshDefinition(twigWand, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                String path = "botania:twigWand";
-                return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory");
-            }
+        ModelLoader.setCustomMeshDefinition(twigWand, stack -> {
+            String path = "botania:twigWand";
+            return new ModelResourceLocation(path + (ItemTwigWand.getBindMode(stack) ? "_bind" : ""), "inventory");
         });
 
         ModelLoader.registerItemVariants(manaweaveBoots,
                 new ModelResourceLocation("botania:manaweaveBoots", "inventory"),
                 new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory"));
 
-        ModelLoader.setCustomMeshDefinition(manaweaveBoots, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")
-                        : new ModelResourceLocation("botania:manaweaveBoots", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(manaweaveBoots, stack ->
+                ClientProxy.jingleTheBells
+                    ? new ModelResourceLocation("botania:manaweaveBootsHoliday", "inventory")
+                    : new ModelResourceLocation("botania:manaweaveBoots", "inventory"));
 
         ModelLoader.registerItemVariants(manaweaveChest,
                 new ModelResourceLocation("botania:manaweaveChest", "inventory"),
                 new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory"));
 
-        ModelLoader.setCustomMeshDefinition(manaweaveChest, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")
-                        : new ModelResourceLocation("botania:manaweaveChest", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(manaweaveChest, stack ->
+                ClientProxy.jingleTheBells
+                    ? new ModelResourceLocation("botania:manaweaveChestHoliday", "inventory")
+                    : new ModelResourceLocation("botania:manaweaveChest", "inventory"));
 
         ModelLoader.registerItemVariants(manaweaveHelm,
                 new ModelResourceLocation("botania:manaweaveHelm", "inventory"),
                 new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory"));
 
-        ModelLoader.setCustomMeshDefinition(manaweaveHelm, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")
-                        : new ModelResourceLocation("botania:manaweaveHelm", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(manaweaveHelm, stack ->
+                ClientProxy.jingleTheBells
+                    ? new ModelResourceLocation("botania:manaweaveHelmHoliday", "inventory")
+                    : new ModelResourceLocation("botania:manaweaveHelm", "inventory"));
 
         ModelLoader.registerItemVariants(manaweaveLegs,
                 new ModelResourceLocation("botania:manaweaveLegs", "inventory"),
                 new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory"));
 
-        ModelLoader.setCustomMeshDefinition(manaweaveLegs, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return ClientProxy.jingleTheBells ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")
-                        : new ModelResourceLocation("botania:manaweaveLegs", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(manaweaveLegs, stack ->
+                ClientProxy.jingleTheBells
+                    ? new ModelResourceLocation("botania:manaweaveLegsHoliday", "inventory")
+                    : new ModelResourceLocation("botania:manaweaveLegs", "inventory"));
 
         ModelLoader.registerItemVariants(manasteelSword,
                 new ModelResourceLocation("botania:manasteelSword", "inventory"),
                 new ModelResourceLocation("botania:elucidator", "inventory"));
-        ModelLoader.setCustomMeshDefinition(manasteelSword, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                return "the elucidator".equals(stack.getDisplayName().toLowerCase().trim()) ? new ModelResourceLocation("botania:elucidator", "inventory")
-                        : new ModelResourceLocation("botania:manasteelSword", "inventory");
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(manasteelSword, stack ->
+                "the elucidator".equals(stack.getDisplayName().toLowerCase().trim())
+                    ? new ModelResourceLocation("botania:elucidator", "inventory")
+                    : new ModelResourceLocation("botania:manasteelSword", "inventory"));
 
         ModelLoader.registerItemVariants(spawnerMover,
                 new ModelResourceLocation("botania:spawnerMover", "inventory"),
                 new ModelResourceLocation("botania:spawnerMoverFull", "inventory"));
-        ModelLoader.setCustomMeshDefinition(spawnerMover, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                if (ItemSpawnerMover.hasData(stack)) {
-                    return new ModelResourceLocation("botania:spawnerMoverFull", "inventory");
-                } else {
-                    return new ModelResourceLocation("botania:spawnerMover", "inventory");
-                }
-            }
-        });
+        ModelLoader.setCustomMeshDefinition(spawnerMover, stack -> new ModelResourceLocation("botania:spawnerMover" + (ItemSpawnerMover.hasData(stack) ? "Full" : ""), "inventory"));
 
         ModelLoader.registerItemVariants(terraPick,
                 new ModelResourceLocation("botania:terraPick", "inventory"),
                 new ModelResourceLocation("botania:terraPickEnabled", "inventory"),
                 new ModelResourceLocation("botania:terraPickTipped", "inventory"),
                 new ModelResourceLocation("botania:terraPickTippedEnabled", "inventory"));
-        ModelLoader.setCustomMeshDefinition(terraPick, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                String name = "botania:terraPick";
-                if (ItemTerraPick.isTipped(stack)) {
-                    name += "Tipped";
-                }
-                if (ItemTerraPick.isEnabled(stack)) {
-                    name += "Enabled";
-                }
-                return new ModelResourceLocation(name, "inventory");
+        ModelLoader.setCustomMeshDefinition(terraPick, stack -> {
+            String name = "botania:terraPick";
+            if (ItemTerraPick.isTipped(stack)) {
+                name += "Tipped";
             }
+            if (ItemTerraPick.isEnabled(stack)) {
+                name += "Enabled";
+            }
+            return new ModelResourceLocation(name, "inventory");
         });
     }
 
@@ -692,24 +643,18 @@ public final class ModelHandler {
             ModelLoader.registerItemVariants(brewFlask, new ModelResourceLocation("botania:flask1_" + i, "inventory"));
         }
 
-        ModelLoader.setCustomMeshDefinition(brewFlask, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack);
-                return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory");
-            }
+        ModelLoader.setCustomMeshDefinition(brewFlask, stack -> {
+            int swigsTaken = 6 - ((ItemBrewBase) brewFlask).getSwigsLeft(stack);
+            return new ModelResourceLocation("botania:flask1_" + swigsTaken, "inventory");
         });
 
         for (int i = 0; i < 4; i++) {
             ModelLoader.registerItemVariants(brewVial, new ModelResourceLocation("botania:vial1_" + i, "inventory"));
         }
 
-        ModelLoader.setCustomMeshDefinition(brewVial, new ItemMeshDefinition() {
-            @Override
-            public ModelResourceLocation getModelLocation(ItemStack stack) {
-                int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack);
-                return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory");
-            }
+        ModelLoader.setCustomMeshDefinition(brewVial, stack -> {
+            int swigsTaken = 4 - ((ItemBrewBase) brewVial).getSwigsLeft(stack);
+            return new ModelResourceLocation("botania:vial1_" + swigsTaken, "inventory");
         });
     }
 

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

@@ -10,7 +10,6 @@
  */
 package vazkii.botania.client.core.handler;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;

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

@@ -10,17 +10,14 @@
  */
 package vazkii.botania.client.core.handler;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.resources.model.IBakedModel;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
 import net.minecraft.world.IBlockAccess;
@@ -37,7 +34,6 @@ import vazkii.botania.api.lexicon.multiblock.Multiblock;
 import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
 import vazkii.botania.api.lexicon.multiblock.component.MultiblockComponent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.lib.LibObfuscation;
 

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

@@ -21,7 +21,6 @@ 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.renderer.entity.RenderItem;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;

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

@@ -17,7 +17,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.item.ItemStack;

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

@@ -72,6 +72,7 @@ import vazkii.botania.client.render.entity.RenderManaStorm;
 import vazkii.botania.client.render.entity.RenderPinkWither;
 import vazkii.botania.client.render.entity.RenderPixie;
 import vazkii.botania.client.render.entity.RenderPoolMinecart;
+import vazkii.botania.client.render.entity.RenderSnowballStack;
 import vazkii.botania.client.render.entity.RenderSpark;
 import vazkii.botania.client.render.entity.RenderThornChakram;
 import vazkii.botania.client.render.tile.RenderTileAlfPortal;
@@ -179,12 +180,15 @@ public class ClientProxy extends CommonProxy {
 
 		MinecraftForge.EVENT_BUS.register(MiscellaneousIcons.INSTANCE);
 		ModelHandler.registerModels();
+		initRenderers();
 	}
 
 	@Override
 	public void init(FMLInitializationEvent event) {
 		super.init(event);
 
+		initAuxiliaryRender();
+
 		ModChallenges.init();
 
 		MinecraftForge.EVENT_BUS.register(new ClientTickHandler());
@@ -213,7 +217,6 @@ public class ClientProxy extends CommonProxy {
 				dootDoot = true;
 		}
 
-		initRenderers();
 	}
 
 	@Override
@@ -255,20 +258,23 @@ public class ClientProxy extends CommonProxy {
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntitySkull.class, new RenderTileSkullOverride());
 
-		RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, new RenderPixie());
-		RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, new RenderSnowball<EntityVineBall>(Minecraft.getMinecraft().getRenderManager(), ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, new RenderDoppleganger(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, new RenderSpark(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, new RenderThornChakram(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, new RenderCorporeaSpark(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, new RenderSnowball<EntityEnderAirBottle>(Minecraft.getMinecraft().getRenderManager(), ModItems.manaResource, Minecraft.getMinecraft().getRenderItem()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, new RenderPoolMinecart(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, new RenderPinkWither(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, new RenderManaStorm(Minecraft.getMinecraft().getRenderManager()));
-		RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, new RenderBabylonWeapon(Minecraft.getMinecraft().getRenderManager()));
+		RenderingRegistry.registerEntityRenderingHandler(EntityPixie.class, RenderPixie::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityDoppleganger.class, RenderDoppleganger::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntitySpark.class, RenderSpark::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityThornChakram.class, RenderThornChakram::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityCorporeaSpark.class, RenderCorporeaSpark::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityPoolMinecart.class, RenderPoolMinecart::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityPinkWither.class, RenderPinkWither::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityManaStorm.class, RenderManaStorm::new);
+		RenderingRegistry.registerEntityRenderingHandler(EntityBabylonWeapon.class, RenderBabylonWeapon::new);
+
+		RenderingRegistry.registerEntityRenderingHandler(EntityVineBall.class, renderManager -> new RenderSnowball(renderManager, ModItems.vineBall, Minecraft.getMinecraft().getRenderItem()));
+		RenderingRegistry.registerEntityRenderingHandler(EntityEnderAirBottle.class, renderManager -> new RenderSnowballStack(renderManager, new ItemStack(ModItems.manaResource, 1, 15), Minecraft.getMinecraft().getRenderItem()));
 
 		ShaderHelper.initShaders();
+	}
 
+	private void initAuxiliaryRender() {
 		Map<String, RenderPlayer> skinMap = Minecraft.getMinecraft().getRenderManager().getSkinMap();
 		RenderPlayer render = skinMap.get("default");
 		render.addLayer(new ContributorFancinessHandler());

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

@@ -20,7 +20,6 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 

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

@@ -10,7 +10,6 @@
  */
 package vazkii.botania.client.gui;
 
-import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.achievement.GuiAchievements;
 import net.minecraft.stats.StatFileWriter;

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

@@ -15,7 +15,6 @@ import java.util.List;
 import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
@@ -23,8 +22,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.ModBlocks;
 

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

@@ -17,8 +17,6 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.lib.LibResources;
 
 public class GuiBaubleBox extends InventoryEffectRenderer {

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

@@ -17,8 +17,6 @@ import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.world.World;
 
-import org.lwjgl.opengl.GL11;
-
 // This is pretty much a copypasta of GuiCrafting >_>
 public class GuiCraftingHalo extends GuiContainer {
 

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

@@ -13,14 +13,10 @@ 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.renderer.entity.RenderItem;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.challenge.Challenge;
 import vazkii.botania.client.challenge.ModChallenges;
 import vazkii.botania.client.core.handler.ClientTickHandler;

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

@@ -19,7 +19,6 @@ 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.renderer.entity.RenderItem;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -27,8 +26,6 @@ import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
 import org.lwjgl.input.Mouse;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.api.BotaniaAPI;
 import vazkii.botania.api.lexicon.ILexicon;

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -17,8 +17,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -16,13 +16,9 @@ import java.util.List;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.challenge.Challenge;
 
 public class GuiButtonChallengeIcon extends GuiButtonLexicon {

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -15,14 +15,11 @@ import java.util.List;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.common.item.ModItems;
 

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

@@ -13,13 +13,11 @@ package vazkii.botania.client.gui.lexicon.button;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.RenderHelper;
-import net.minecraft.client.renderer.entity.RenderItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.handler.PersistentVariableHelper;

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -16,8 +16,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.handler.PersistentVariableHelper;
 import vazkii.botania.client.core.helper.RenderHelper;

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

@@ -18,8 +18,6 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.gui.lexicon.GuiLexicon;
 

src/main/java/vazkii/botania/client/integration/jei/brewery/BreweryRecipeWrapper.java

@@ -15,7 +15,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.oredict.OreDictionary;
 import vazkii.botania.api.recipe.RecipeBrew;
-import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.item.ModItems;
 
 import javax.annotation.Nonnull;

src/main/java/vazkii/botania/client/integration/jei/petalapothecary/PetalApothecaryRecipeCategory.java

@@ -20,8 +20,6 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.StatCollector;
 import vazkii.botania.common.block.ModBlocks;
-import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
-import vazkii.botania.common.lib.LibBlockNames;
 
 import javax.annotation.Nonnull;
 import java.awt.*;

src/main/java/vazkii/botania/client/integration/jei/puredaisy/PureDaisyRecipeCategory.java

@@ -10,7 +10,6 @@ package vazkii.botania.client.integration.jei.puredaisy;
 
 import mezz.jei.api.IGuiHelper;
 import mezz.jei.api.gui.IDrawable;
-import mezz.jei.api.gui.IDrawableStatic;
 import mezz.jei.api.gui.IRecipeLayout;
 import mezz.jei.api.recipe.IRecipeCategory;
 import mezz.jei.api.recipe.IRecipeWrapper;

src/main/java/vazkii/botania/client/model/FloatingFlowerModel.java

@@ -12,7 +12,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.HashBasedTable;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Maps;
 import com.google.common.collect.Table;
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -36,7 +35,6 @@ import net.minecraftforge.client.model.pipeline.IVertexConsumer;
 import net.minecraftforge.client.model.pipeline.UnpackedBakedQuad;
 import net.minecraftforge.client.model.pipeline.VertexTransformer;
 import net.minecraftforge.common.property.IExtendedBlockState;
-import org.apache.commons.lang3.tuple.Pair;
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.decor.BlockFloatingFlower;
@@ -47,7 +45,7 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 import javax.vecmath.Vector3f;
 import javax.vecmath.Vector4f;
 import java.util.List;
-import java.util.Map;
+import java.util.stream.Collectors;
 
 public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener {
 
@@ -164,9 +162,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I
             }
 
             for (EnumFacing e : EnumFacing.VALUES) {
-                genBuilder.addAll(Iterables.transform(flower.getFaceQuads(e), new Function<BakedQuad, BakedQuad>() {
-                    @Override public BakedQuad apply(BakedQuad input) { return transform(input, transform); }
-                }));
+                genBuilder.addAll(flower.getFaceQuads(e).stream().map(input -> transform(input, transform)).collect(Collectors.toList()));
             }
 
             // Add island quads

src/main/java/vazkii/botania/client/model/ModelBellows.java

@@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 
 import net.minecraft.client.renderer.GlStateManager;
-import org.lwjgl.opengl.GL11;
 
 public class ModelBellows extends ModelBase {
 

src/main/java/vazkii/botania/client/model/ModelBrewery.java

@@ -14,7 +14,6 @@ import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 
 import net.minecraft.client.renderer.GlStateManager;
-import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.client.render.tile.RenderTileBrewery;
 

src/main/java/vazkii/botania/client/model/ModelPump.java

@@ -17,10 +17,10 @@ import net.minecraft.client.model.ModelRenderer;
 
 public class ModelPump extends ModelBase{
 
-	private ArrayList<ModelRenderer> parts = new ArrayList<ModelRenderer>();
+	private ArrayList<ModelRenderer> parts = new ArrayList<>();
 
-	private ArrayList<ModelRenderer> innerRing = new ArrayList<ModelRenderer>();
-	private ArrayList<ModelRenderer> outerRing = new ArrayList<ModelRenderer>();
+	private ArrayList<ModelRenderer> innerRing = new ArrayList<>();
+	private ArrayList<ModelRenderer> outerRing = new ArrayList<>();
 
 	public ModelPump() {
 		textureWidth = 64;

src/main/java/vazkii/botania/client/model/ModelPylon.java

@@ -14,7 +14,6 @@ import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Sets;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
@@ -22,7 +21,6 @@ import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.crash.CrashReport;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ReportedException;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.model.Attributes;
@@ -52,12 +50,7 @@ public class ModelPylon implements IPylonModel {
 	private IFlexibleBakedModel gaiaRingsAndPanes;
 	private IFlexibleBakedModel gaiaGems;
 
-	private static final Function<ResourceLocation, TextureAtlasSprite> TEXTUREGETTER = new Function<ResourceLocation, TextureAtlasSprite>() {
-		@Override
-		public TextureAtlasSprite apply(ResourceLocation input) {
-			return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString());
-		}
-	};
+	private static final Function<ResourceLocation, TextureAtlasSprite> TEXTUREGETTER = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString());
 
 	private static final Set<String> GROUP_NAMES = ImmutableSet.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
 			"Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04");

src/main/java/vazkii/botania/client/model/PylonItemModel.java

@@ -31,7 +31,6 @@ import net.minecraftforge.client.model.obj.OBJModel;
 import net.minecraftforge.fml.common.FMLLog;
 import org.apache.commons.lang3.tuple.ImmutablePair;
 import org.apache.commons.lang3.tuple.Pair;
-import org.apache.http.annotation.Immutable;
 import org.apache.logging.log4j.Level;
 
 import javax.vecmath.Matrix4f;
@@ -83,12 +82,7 @@ public class PylonItemModel implements ISmartItemModel {
         // All groups are off by default
         // OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group
 
-        final Function<ResourceLocation, TextureAtlasSprite> textureGetter = new Function<ResourceLocation, TextureAtlasSprite>() {
-            @Override
-            public TextureAtlasSprite apply(ResourceLocation input) {
-                return Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString());
-            }
-        };
+        final Function<ResourceLocation, TextureAtlasSprite> textureGetter = input -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(input.toString());
 
         ImmutableList<String> standardGroups = ImmutableList.of("Crystal", "Crystal_Ring",
                 "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04",

src/main/java/vazkii/botania/client/render/entity/RenderDoppleganger.java

@@ -10,13 +10,10 @@
  */
 package vazkii.botania.client.render.entity;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.model.ModelPlayer;
 import net.minecraft.client.renderer.entity.RenderBiped;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.resources.DefaultPlayerSkin;
-import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.ARBShaderObjects;

src/main/java/vazkii/botania/client/render/entity/RenderManaStorm.java

@@ -13,12 +13,8 @@ package vazkii.botania.client.render.entity;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.common.entity.EntityManaStorm;
 

src/main/java/vazkii/botania/client/render/entity/RenderPinkWither.java

@@ -12,7 +12,6 @@ package vazkii.botania.client.render.entity;
 
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderWither;
-import net.minecraft.entity.Entity;
 import net.minecraft.entity.boss.BossStatus;
 import net.minecraft.entity.boss.EntityWither;
 import net.minecraft.util.ResourceLocation;

src/main/java/vazkii/botania/client/render/entity/RenderPixie.java

@@ -10,12 +10,10 @@
  */
 package vazkii.botania.client.render.entity;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.ARBShaderObjects;
@@ -43,8 +41,8 @@ public class RenderPixie extends RenderLiving<EntityPixie> {
 		}
 	};
 
-	public RenderPixie() {
-		super(Minecraft.getMinecraft().getRenderManager(), new ModelPixie(), 0.25F);
+	public RenderPixie(RenderManager renderManager) {
+		super(renderManager, new ModelPixie(), 0.25F);
 		//setRenderPassModel(new ModelPixie());
 		shadowSize = 0.0F;
 	}

src/main/java/vazkii/botania/client/render/entity/RenderPoolMinecart.java

@@ -10,11 +10,9 @@
  */
 package vazkii.botania.client.render.entity;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.entity.RenderMinecart;
-import net.minecraft.entity.item.EntityMinecart;
 import vazkii.botania.client.render.tile.RenderTilePool;
 import vazkii.botania.common.entity.EntityPoolMinecart;
 

src/main/java/vazkii/botania/client/render/entity/RenderSnowballStack.java

@@ -0,0 +1,32 @@
+/**
+ * This class was created by <williewillus>. It's distributed as
+ * part of the Botania Mod. Get the Source Code in github:
+ * https://github.com/Vazkii/Botania
+ *
+ * Botania is Open Source and distributed under the
+ * Botania License: http://botaniamod.net/license.php
+ */
+package vazkii.botania.client.render.entity;
+
+import net.minecraft.client.renderer.entity.RenderItem;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderSnowball;
+import net.minecraft.entity.Entity;
+import net.minecraft.item.ItemStack;
+
+// Same as RenderSnowball, but ItemStack sensitive
+public class RenderSnowballStack<T extends Entity> extends RenderSnowball<T> {
+
+    private final ItemStack stack;
+
+    public RenderSnowballStack(RenderManager renderManagerIn, ItemStack stack, RenderItem render) {
+        super(renderManagerIn, stack.getItem(), render);
+        this.stack = stack;
+    }
+
+    @Override
+    public ItemStack func_177082_d(T entity) {
+        return stack;
+    }
+
+}

src/main/java/vazkii/botania/client/render/entity/RenderThornChakram.java

@@ -17,14 +17,11 @@ import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.entity.Entity;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.common.entity.EntityThornChakram;
-import vazkii.botania.common.item.ModItems;
 
 // Basically a bit of an extension of RenderSnowball
 public class RenderThornChakram extends Render<EntityThornChakram> {

src/main/java/vazkii/botania/client/render/tile/RenderTileAlfPortal.java

@@ -31,13 +31,12 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal
 
 	@Override
 	public void renderTileEntityAt(TileAlfPortal portal, double d0, double d1, double d2, float f, int digProgress) {
-		AlfPortalState state;
-		if (portal.getWorld().getBlockState(portal.getPos()).getBlock() != ModBlocks.alfPortal) {
-			state = AlfPortalState.OFF;
-		} else {
-			state = portal.getWorld().getBlockState(portal.getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE);
+		if (portal != null && portal.getWorld() != null && !portal.getWorld().isBlockLoaded(portal.getPos(), false)) {
+			return;
 		}
 
+		AlfPortalState state = portal.getWorld().getBlockState(portal.getPos()).getValue(BotaniaStateProps.ALFPORTAL_STATE);
+
 		if(state == AlfPortalState.OFF)
 			return;
 

src/main/java/vazkii/botania/client/render/tile/RenderTileAltar.java

@@ -10,28 +10,20 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
-import net.minecraft.client.renderer.entity.RenderItem;
 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.init.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.lib.LibResources;
@@ -59,6 +51,10 @@ public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {
 
 	@Override
 	public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) {
+		if (altar != null && altar.getWorld() != null && !altar.getWorld().isBlockLoaded(altar.getPos(), false)) {
+			return;
+		}
+
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);

src/main/java/vazkii/botania/client/render/tile/RenderTileAvatar.java

@@ -10,24 +10,20 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.api.item.IAvatarWieldable;
+import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelAvatar;
@@ -44,17 +40,23 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {
 
 	@Override
 	public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) {
+		if (avatar != null && avatar.getWorld() != null && !avatar.getWorld().isBlockLoaded(avatar.getPos(), false)) {
+			return;
+		}
+
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0;
+		EnumFacing facing = avatar != null && avatar.getWorld() != null
+				? avatar.getWorld().getBlockState(avatar.getPos()).getValue(BotaniaStateProps.CARDINALS)
+				: EnumFacing.SOUTH;
 
 		GlStateManager.translate(0.5F, 1.6F, 0.5F);
 		GlStateManager.scale(1F, -1F, -1F);
-		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F);
+		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
 		model.render();
 
 		if (avatar == null) {

src/main/java/vazkii/botania/client/render/tile/RenderTileBellows.java

@@ -13,12 +13,8 @@ package vazkii.botania.client.render.tile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelBellows;
 import vazkii.botania.common.block.tile.mana.TileBellows;
@@ -34,6 +30,10 @@ public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {
 
 	@Override
 	public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) {
+		if (bellows != null && bellows.getWorld() != null && !bellows.getWorld().isBlockLoaded(bellows.getPos(), false)) {
+			return;
+		}
+		
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);

src/main/java/vazkii/botania/client/render/tile/RenderTileBrewery.java

@@ -10,25 +10,13 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.client.ForgeHooksClient;
-
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.lib.LibResources;

src/main/java/vazkii/botania/client/render/tile/RenderTileCocoon.java

@@ -13,11 +13,9 @@ package vazkii.botania.client.render.tile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelCocoon;

src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaCrystalCube.java

@@ -13,18 +13,15 @@ package vazkii.botania.client.render.tile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.Render;
-import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.lib.LibResources;

src/main/java/vazkii/botania/client/render/tile/RenderTileCorporeaIndex.java

@@ -14,11 +14,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelEnderCrystal;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;

src/main/java/vazkii/botania/client/render/tile/RenderTileFloatingFlower.java

@@ -16,24 +16,15 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.resources.model.IBakedModel;
-import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 
-import net.minecraft.util.BlockPos;
-import net.minecraftforge.client.model.ISmartBlockModel;
-import org.lwjgl.opengl.GL11;
-
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.model.FloatingFlowerModel;
 import vazkii.botania.client.model.ModelMiniIsland;
 import vazkii.botania.common.block.decor.IFloatingFlower;
-import vazkii.botania.common.block.tile.TileFloatingFlower;
 
 public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
 
@@ -41,6 +32,10 @@ public class RenderTileFloatingFlower extends TileEntitySpecialRenderer {
 
 	@Override
 	public void renderTileEntityAt(TileEntity tile, double d0, double d1, double d2, float t, int digProgress) {
+		if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) {
+			return;
+		}
+
 		BlockRendererDispatcher brd = Minecraft.getMinecraft().getBlockRendererDispatcher();
 		IFloatingFlower flower = (IFloatingFlower) tile;
 		GlStateManager.pushMatrix();

src/main/java/vazkii/botania/client/render/tile/RenderTileHourglass.java

@@ -16,7 +16,6 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;

src/main/java/vazkii/botania/client/render/tile/RenderTileIncensePlate.java

@@ -10,22 +10,16 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.client.lib.LibResources;
@@ -43,7 +37,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncens
 
 	@Override
 	public void renderTileEntityAt(TileIncensePlate plate, double d0, double d1, double d2, float ticks, int digProgress) {
-		EnumFacing facing = plate.getWorld() != null ? plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH;
+		if (plate != null && plate.getWorld() != null && !plate.getWorld().isBlockLoaded(plate.getPos(), false)) {
+			return;
+		}
+		
+		EnumFacing facing = plate.getWorld().getBlockState(plate.getPos()).getValue(BotaniaStateProps.CARDINALS);
 
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();

src/main/java/vazkii/botania/client/render/tile/RenderTileLightRelay.java

@@ -29,6 +29,10 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRel
 
 	@Override
 	public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) {
+		if (tile != null && tile.getWorld() != null && !tile.getWorld().isBlockLoaded(tile.getPos(), false)) {
+			return;
+		}
+		
 		Minecraft mc = Minecraft.getMinecraft();
 		TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? MiscellaneousIcons.INSTANCE.lightRelayWorldIconRed : MiscellaneousIcons.INSTANCE.lightRelayWorldIcon;
 

src/main/java/vazkii/botania/client/render/tile/RenderTilePool.java

@@ -52,6 +52,10 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
 
 	@Override
 	public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) {
+		if (pool != null && pool.getWorld() != null && !pool.getWorld().isBlockLoaded(pool.getPos(), false)) {
+			return;
+		}
+
 		GlStateManager.pushMatrix();
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -92,6 +96,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {
 
 		tess.draw();
 
+		GlStateManager.enableLighting();
+
 		GlStateManager.translate(0.5F, 1.5F, 0.5F);
 		GlStateManager.color(1, 1, 1, a);
 		GlStateManager.enableRescaleNormal();

src/main/java/vazkii/botania/client/render/tile/RenderTilePrism.java

@@ -16,9 +16,6 @@ import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-
-import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.api.mana.ILens;
 import vazkii.botania.client.core.handler.ClientTickHandler;

src/main/java/vazkii/botania/client/render/tile/RenderTilePump.java

@@ -13,12 +13,10 @@ package vazkii.botania.client.render.tile;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
+import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelPump;
 import vazkii.botania.common.block.tile.mana.TilePump;
@@ -34,17 +32,21 @@ public class RenderTilePump extends TileEntitySpecialRenderer<TilePump> {
 
 	@Override
 	public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) {
+		if (pump != null && pump.getWorld() != null && !pump.getWorld().isBlockLoaded(pump.getPos(), false)) {
+			return;
+		}
+		
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);
 
 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0;
+		EnumFacing facing = pump != null && pump.getWorld() != null ? pump.getWorld().getBlockState(pump.getPos()).getValue(BotaniaStateProps.CARDINALS) : EnumFacing.SOUTH;
 
 		GlStateManager.translate(0.5F, 0.5F, 0.5F);
 		GlStateManager.scale(1F, -1F, -1F);
-		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, meta - 2), 0)], 0F, 1F, 0F);
+		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length - 1, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
 		model.render(Math.max(0F, Math.min(8F, pump == null ? 8 : pump.innerRingPos + pump.moving * f)));
 		GlStateManager.color(1F, 1F, 1F);
 		GlStateManager.scale(1F, -1F, -1F);

src/main/java/vazkii/botania/client/render/tile/RenderTilePylon.java

@@ -17,13 +17,9 @@ import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.state.enums.PylonVariant;
@@ -55,6 +51,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> {
 
 	@Override
 	public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) {
+		if (pylon != null && pylon.getWorld() != null && !pylon.getWorld().isBlockLoaded(pylon.getPos(), false)) {
+			return;
+		}
+		
 		if(model == null)
 			model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon();
 

src/main/java/vazkii/botania/client/render/tile/RenderTileRedString.java

@@ -11,7 +11,6 @@
 package vazkii.botania.client.render.tile;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import vazkii.botania.client.core.handler.RedStringRenderer;
 import vazkii.botania.common.block.tile.string.TileRedString;
 

src/main/java/vazkii/botania/client/render/tile/RenderTileRuneAltar.java

@@ -10,23 +10,12 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
-import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraftforge.client.ForgeHooksClient;
-
-import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.helper.RenderHelper;

src/main/java/vazkii/botania/client/render/tile/RenderTileSkullOverride.java

@@ -13,18 +13,13 @@ package vazkii.botania.client.render.tile;
 import java.util.Map;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.AbstractClientPlayer;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySkullRenderer;
 import net.minecraft.client.resources.DefaultPlayerSkin;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntitySkull;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.core.helper.ShaderHelper;
 import vazkii.botania.client.model.ModelSkullOverride;
 import vazkii.botania.client.render.entity.RenderDoppleganger;

src/main/java/vazkii/botania/client/render/tile/RenderTileSparkChanger.java

@@ -10,19 +10,12 @@
  */
 package vazkii.botania.client.render.tile;
 
-import java.awt.Color;
-
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.ItemRenderer;
-import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-
-import org.lwjgl.opengl.GL11;
 
 import vazkii.botania.common.block.tile.TileSparkChanger;
 

src/main/java/vazkii/botania/client/render/tile/RenderTileSpawnerClaw.java

@@ -16,9 +16,6 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelSpawnerClaw;
 

src/main/java/vazkii/botania/client/render/tile/RenderTileSpreader.java

@@ -13,7 +13,6 @@ package vazkii.botania.client.render.tile;
 import java.awt.Color;
 import java.util.Random;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.BlockCarpet;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -24,12 +23,8 @@ import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
-
 import vazkii.botania.api.mana.ILens;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.proxy.ClientProxy;
@@ -51,6 +46,10 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader>
 
 	@Override
 	public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) {
+		if (spreader != null && spreader.getWorld() != null && !spreader.getWorld().isBlockLoaded(spreader.getPos(), false)) {
+			return;
+		}
+		
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);

src/main/java/vazkii/botania/client/render/tile/RenderTileStarfield.java

@@ -18,11 +18,8 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.*;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityEndPortal;
 import net.minecraft.util.ResourceLocation;
 
-import org.lwjgl.opengl.GL11;
 import vazkii.botania.common.block.tile.TileStarfield;
 
 // THIS CODE WAS STOLEN FROM THE END PORTAL

src/main/java/vazkii/botania/client/render/tile/RenderTileTeruTeruBozu.java

@@ -15,11 +15,9 @@ import java.util.Random;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
-import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL12;
 
 import vazkii.botania.client.core.proxy.ClientProxy;
 import vazkii.botania.client.lib.LibResources;

src/main/java/vazkii/botania/client/render/tile/RenderTileTinyPotato.java

@@ -50,6 +50,10 @@ public class RenderTileTinyPotato extends TileEntitySpecialRenderer<TileTinyPota
 
 	@Override
 	public void renderTileEntityAt(TileTinyPotato potato, double d0, double d1, double d2, float var8, int digProgress) {
+		if (potato != null && potato.getWorld() != null && !potato.getWorld().isBlockLoaded(potato.getPos(), false)) {
+			return;
+		}
+		
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);

src/main/java/vazkii/botania/common/achievement/ModAchievements.java

@@ -22,7 +22,6 @@ import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
 import vazkii.botania.common.lib.LibAchievementNames;
 import vazkii.botania.common.lib.LibBlockNames;
 import vazkii.botania.common.lib.LibMisc;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 public final class ModAchievements {
 

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

@@ -13,7 +13,6 @@ package vazkii.botania.common.block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -21,15 +20,11 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.state.enums.AlfPortalState;
 import vazkii.botania.api.wand.IWandable;
-import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.achievement.ModAchievements;
 import vazkii.botania.common.block.tile.TileAlfPortal;
 import vazkii.botania.common.lexicon.LexiconData;

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

@@ -42,7 +42,6 @@ import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.mana.ManaItemHandler;
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.state.enums.AltarVariant;
-import vazkii.botania.client.lib.LibRenderIDs;
 import vazkii.botania.common.Botania;
 import vazkii.botania.common.block.tile.TileAltar;
 import vazkii.botania.common.block.tile.TileSimpleInventory;

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

@@ -15,7 +15,6 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -25,18 +24,13 @@ import net.minecraft.util.EnumWorldBlockLayer;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.common.MinecraftForge;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.common.block.tile.TileBifrost;
 import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.lexicon.LexiconData;
-import vazkii.botania.common.lexicon.page.PageBrew;
 import vazkii.botania.common.lib.LibBlockNames;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class BlockBifrost extends BlockModContainer implements ILexiconable {
 

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

@@ -25,7 +25,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import vazkii.botania.api.state.BotaniaStateProps;
-import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.block.tile.TileCacophonium;
 import vazkii.botania.common.lib.LibBlockNames;
 

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

@@ -10,9 +10,6 @@
  */
 package vazkii.botania.common.block;
 
-import java.util.Arrays;
-import java.util.List;
-
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDirectional;
 import net.minecraft.block.material.Material;

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

@@ -16,7 +16,6 @@ import java.util.List;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;

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

@@ -19,8 +19,6 @@ import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.block.statemap.StateMapperBase;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
@@ -33,15 +31,9 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.ModelBakeEvent;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.property.ExtendedBlockState;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.common.property.IUnlistedProperty;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.oredict.RecipeSorter;
 import net.minecraftforge.oredict.RecipeSorter.Category;
 import vazkii.botania.api.BotaniaAPI;
@@ -51,7 +43,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.subtile.ISpecialFlower;
 import vazkii.botania.api.wand.IWandHUD;
 import vazkii.botania.api.wand.IWandable;
-import vazkii.botania.client.model.FloatingFlowerModel;
 import vazkii.botania.common.block.decor.BlockFloatingFlower;
 import vazkii.botania.common.block.decor.IFloatingFlower;
 import vazkii.botania.common.block.tile.TileFloatingSpecialFlower;

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

@@ -18,7 +18,6 @@ import net.minecraft.util.BlockPos;
 import net.minecraft.world.World;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.block.tile.TileForestEye;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;

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

@@ -17,7 +17,6 @@ import java.util.Random;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockSkull;
 import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
@@ -27,7 +26,6 @@ import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 import vazkii.botania.common.block.tile.TileGaiaHead;
 import vazkii.botania.common.item.ModItems;
-import vazkii.botania.common.item.block.ItemBlockMod;
 import vazkii.botania.common.lib.LibBlockNames;
 import net.minecraftforge.fml.common.registry.GameRegistry;
 import net.minecraftforge.fml.relauncher.Side;
@@ -54,7 +52,7 @@ public class BlockGaiaHead extends BlockSkull {
 
     @Override
     public List<ItemStack> getDrops(IBlockAccess p_149749_1_, BlockPos pos, IBlockState state, int fortune) {
-        ArrayList<ItemStack> ret = new ArrayList<ItemStack>();
+        ArrayList<ItemStack> ret = new ArrayList<>();
         
         if(!state.getValue(NODROP)) {
             ItemStack itemstack = new ItemStack(ModItems.gaiaHead, 1);

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

@@ -14,7 +14,6 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockRailBase;
 import net.minecraft.block.BlockRailPowered;
 import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.properties.PropertyEnum;
 import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -27,15 +26,12 @@ import net.minecraftforge.event.entity.minecart.MinecartUpdateEvent;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
 import vazkii.botania.api.state.BotaniaStateProps;
-import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.common.core.BotaniaCreativeTab;
 import vazkii.botania.common.item.block.ItemBlockMod;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import net.minecraftforge.fml.common.registry.GameRegistry;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
 
 public class BlockGhostRail extends BlockRailBase implements ILexiconable {
 

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

@@ -12,7 +12,6 @@ package vazkii.botania.common.block;
 
 import java.util.Random;
 
-import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.BlockState;
 import net.minecraft.block.state.IBlockState;

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

@@ -26,7 +26,6 @@ import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.internal.VanillaPacketDispatcher;
 import vazkii.botania.api.lexicon.ILexiconable;
 import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.client.lib.LibRenderIDs;
 import vazkii.botania.common.block.tile.TileIncensePlate;
 import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibBlockNames;