Merge upstream release 248

Updates to internal handler and icons
Build 248
2026-10-26 22:34:08 +00:00 · 2016-01-08 12:34:51 -06:00 · 2016-01-08 12:33:49 -06:00 · 2016-01-08 18:22:07 +00:00 · 2016-01-08 12:00:01 -06:00 · 2016-01-08 11:29:03 -06:00
235 changed files with 3399 additions and 844 deletions
@@ -10,7 +10,7 @@ Anyways, vanilla removed it from their method so we follow suit.
 * Multiblock system reworked to use states and blockposes
 * Magnet blacklist still uses metas instead of states because they need to support the short maxvalue wildcard.
 * Now includes a way for addons to pass the Botania loader the models they want to use to render their subtile with
-* IRelic changed to use UUIDs
+* Removed icon methods from SubTileSignature

 -- Other --
 * Most things left untouched to make patches from upstream easier
@@ -25,12 +25,4 @@ sorry :/ The systems needed to dynamically switch out the textures like that is
 * Quartz stair textures may be assigned incorrectly - resource pack authors check me
 * Glass pane inner faces are not getting culled (vanilla bug?)
 * Some item forms of technical/non-user blocks are removed
-    * Full list: [all double slab items, all solid vine items]
-
-- Todo --
-* JSON models for everything (tedious/med-hard)
-* Migrate the PlayerRender events (baubles, etc.) to LayerRenderers (med)
-* For rendering arbitrary icons (that DO NOT HAVE AN ITEM) in a 3D style (manaResource icons, etc.)
-    - Sub to texture stitch and bake our own model there to use?
-    - This remains the largest portion of what is left
-    - Where is the method to render an arbitrary baked model?
+    * Full list: [all double slab items, all solid vine items]
@@ -1,14 +0,0 @@
-altar
-up-down
-west-south-east-north
-
-base textures         pillar tex
-
-
-
-						northsouth face cup (1 always faces south)
-						eastwest face cup (blue always faces east)
-						cupbase 2
-						cubbase
-
-						water-lava texture simply one level below top of cup
@@ -21,6 +21,9 @@ repositories {
        name = "chickenbones"
        url = "http://chickenbones.net/maven/"
    }
+    maven {
+        url "http://dvs1.progwml6.com/files/maven"
+    }
 }

 apply plugin: 'net.minecraftforge.gradle.forge'
@@ -46,6 +49,7 @@ minecraft {
    replace 'GRADLE:VERSION', config.version

    replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here.
+    useDepAts = true
 }

 //This here is for SCP
@@ -67,6 +71,8 @@ dependencies {
    //compile "codechicken:NotEnoughItems:1.8-1.0.5.104:dev"
    //compile "codechicken:ForgeMultipart:1.7.10-1.1.1.320:dev"

+    deobfCompile "mezz.jei:jei_1.8.9:2.13.7.64"
+
    //and a bit more for SCP
    sshAntTask "org.apache.ant:ant-jsch:1.7.1", "jsch:jsch:0.1.29"
 }
@@ -1,9 +1,9 @@
 #
-#Wed Dec 30 00:21:06 GMT 2015
+#Fri Jan 08 18:17:27 GMT 2016
 version=r1.8
 dir_output=../Build Output/Botania/
-dir_repo=./
-forge_version=11.15.0.1656
+forge_version=11.15.0.1688
 mc_version=1.8.9
-build_number=248
+dir_repo=./
+build_number=249
 mod_name=Botania
@@ -11,7 +11,6 @@ Hey there. Looks like you want to contribute with an issue. Great. Here's what y

 The following "bugs" are not accepted:
 * Intended Behaviour
-  * The e in Excaliber
  * Double tall flowers need be harvested with shears to not clutter the inventory
 * Already fixed but people keep reporting it for some reason
  * Wearing a Ring of Loki or Ring of the Aesir shows a wireframe below bedrock
@@ -23,7 +22,6 @@ The following "bugs" are not accepted:
  * Mana Bursts get destroyed on Cauldron by the ClearLagg plugin (add botania:manaBurst to the ClearLagg blacklist)
  * Force Relays destroy blocks when used very fast (Can't fix due to the nature of the block)
  * Terrasteel crafting won't start (make sure your checkerboard is correct, there's Livingrock under the plate)
-  * The speed tooltip on Excaliber scales with the Sharpness enchant (Vanilla bug)
  * The Horn of the Canopy doesn't break Thaumcraft leaves (Thaumcraft doesn't use the typical class or material)
  * Some Baubles don't work properly on LAN (Baubles bug)

@@ -51,3 +51,5 @@ _bloop=0
 kgevans=15
 l0nekitsune=14
 swiftlileagle=14
+gryphonn=11
+loraanicus=10
@@ -0,0 +1,75 @@
+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;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import vazkii.botania.api.subtile.SubTileEntity;
+
+import java.util.Collections;
+import java.util.Map;
+
+/**
+ * Class for API calls that must be made clientside
+ */
+@SideOnly(Side.CLIENT)
+public final class BotaniaAPIClient {
+
+    private static final Map<String, ModelResourceLocation> queuedBlockModels = Maps.newHashMap();
+    private static final Map<String, ModelResourceLocation> queuedItemModels = Maps.newHashMap();
+
+    /**
+     * Register your model for the given subtile class here.
+     * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work.
+     * Your model json must specify key "tintindex" in all the faces it wants tint applied.
+     * Tint is applied whenever a player recolors the flower using floral dye
+     *
+     * @param subTileName The String ID of the subtile
+     * @param model A path to a blockstate json and variant to be used for this subtile
+     * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form
+     */
+    public static void registerSubtileModel(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) {
+        queuedBlockModels.put(subTileName, model);
+        queuedItemModels.put(subTileName, itemModel);
+    }
+
+    /**
+     * Register your model for the given subtile class here.
+     * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work.
+     * Your model json must specify key "tintindex" in all the faces it wants tint applied.
+     * Tint is applied whenever a player recolors the flower using floral dye
+     *
+     * @param subTileName The String ID of the subtile
+     * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory"
+     */
+    public static void registerSubtileModel(String subTileName, ModelResourceLocation model) {
+        registerSubtileModel(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory"));
+    }
+
+    // Convenience overloads for the above two calls
+    public static void registerSubtileModel(Class<? extends SubTileEntity> clazz, ModelResourceLocation model) {
+        registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model);
+    }
+
+    public static void registerSubtileModel(Class<? extends SubTileEntity> clazz, ModelResourceLocation model, ModelResourceLocation itemModel) {
+        registerSubtileModel(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel);
+    }
+
+    /**
+     * @return An immutable view of the registered subtile block model map
+     */
+    public static Map<String, ModelResourceLocation> getRegisteredSubtileBlockModels() {
+        return Collections.unmodifiableMap(queuedBlockModels);
+    }
+
+    /**
+     * @return An immutable view of the registered subtile item model map
+     */
+    public static Map<String, ModelResourceLocation> getRegisteredSubtileItemModels() {
+        return Collections.unmodifiableMap(queuedItemModels);
+    }
+
+    private BotaniaAPIClient() {}
+
+}
@@ -15,6 +15,7 @@ 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;
 import net.minecraft.init.Blocks;
@@ -27,6 +28,8 @@ 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;
@@ -134,13 +137,13 @@ public class DummyMethodHandler implements IInternalMethodHandler {
 	}

 	@Override
-	public TextureAtlasSprite getSubTileIconForName(String name) {
-		return null; //todo 1.8 return Blocks.red_flower.getIcon(0, 0);
+	public ModelResourceLocation getSubTileBlockModelForName(String name) {
+		return new ModelResourceLocation("builtin/missing", "missing");
 	}

 	@Override
-	public void registerBasicSignatureIcons(String name, TextureMap map) {
-		// NO-OP
+	public ModelResourceLocation getSubTileItemModelForName(String name) {
+		return new ModelResourceLocation("builtin/missing", "missing");
 	}

 	@Override
@@ -15,6 +15,7 @@ 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;
 import net.minecraft.inventory.IInventory;
@@ -85,10 +86,11 @@ public interface IInternalMethodHandler {

 	public String getStackSubTileKey(ItemStack stack);

-	// todo 1.8 evaluate need for these two
-	public TextureAtlasSprite getSubTileIconForName(String name);
+	@SideOnly(Side.CLIENT)
+	public ModelResourceLocation getSubTileBlockModelForName(String name);

-	public void registerBasicSignatureIcons(String name, TextureMap map);
+	@SideOnly(Side.CLIENT)
+	public ModelResourceLocation getSubTileItemModelForName(String name);

 	public boolean shouldForceCheck();

@@ -13,8 +13,6 @@ package vazkii.botania.api.item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.stats.Achievement;

-import java.util.UUID;
-
 /**
 * An item that implements this counts as a Relic item. This is purely for interaction
 * and other mod items should not implement this interface.
@@ -22,14 +20,14 @@ import java.util.UUID;
 public interface IRelic {

 	/**
-	 * Binds to the player UUID passed in.
+	 * Binds to the player name passed in.
 	 */
-	public void bindToUuid(UUID playerName, ItemStack stack);
+	public void bindToUsername(String playerName, ItemStack stack);

 	/**
-	 * Gets the UUID of the person this relic is bound to.
+	 * Gets the username of the person this relic is bound to.
 	 */
-	public UUID getSoulbindUuid(ItemStack stack);
+	public String getSoulbindUsername(ItemStack stack);

 	/**
 	 * Sets the achievement that this relic binds to.
@@ -185,4 +185,5 @@ public class Multiblock {
 	public MultiblockComponent getComponentForLocation(BlockPos pos) {
 		return locationCache.get(pos);
 	}
+
 }
@@ -35,4 +35,5 @@ public class MultiblockSet {
 	public Multiblock getForFacing(EnumFacing facing) {
 		return mbs.get(facing);
 	}
+
 }
@@ -24,13 +24,10 @@ import vazkii.botania.api.BotaniaAPI;
 */
 public class ColorSwitchingComponent extends MultiblockComponent {

-	private final PropertyEnum colorProp;
+	private final PropertyEnum<EnumDyeColor> colorProp;

-	public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum colorProp) {
+	public ColorSwitchingComponent(BlockPos relPos, Block block, PropertyEnum<EnumDyeColor> colorProp) {
 		super(relPos, block.getDefaultState());
-		if (colorProp.getValueClass() != EnumDyeColor.class) {
-			throw new IllegalArgumentException("Must be EnumDyeColor");
-		}
 		this.colorProp = colorProp;
 	}

@@ -88,4 +88,5 @@ public class MultiblockComponent {
 	public boolean shouldDoFancyRender() {
 		return doFancyRender;
 	}
+
 }
@@ -44,7 +44,7 @@ public class RecipePureDaisy {
 		if(input instanceof Block)
 			return state.getBlock() == input;

-		ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().getMetaFromState(state));
+		ItemStack stack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state));
 		String oredict = (String) input;
 		return isOreDict(stack, oredict);
 	}
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state;

 import com.google.common.base.Predicate;
@@ -11,9 +19,6 @@ import net.minecraft.block.properties.PropertyInteger;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.util.EnumFacing;
 import vazkii.botania.api.state.enums.*;
-import vazkii.botania.common.block.decor.IFloatingFlower;
-
-import javax.annotation.Nullable;

 /**
 * Holds all Botania block state properties. Use these to set botania blockstates
@@ -162,5 +167,9 @@ public class BotaniaStateProps {
    // BlockStorage
    public static final PropertyEnum<StorageVariant> STORAGE_VARIANT = PropertyEnum.create("variant", StorageVariant.class);

+    // BlockTinyPotato
+    public static final PropertyEnum<PotatoVariant> POTATO_VARIANT = PropertyEnum.create("variant", PotatoVariant.class);
+
    private BotaniaStateProps() {}
+
 }
@@ -1,7 +1,14 @@
+/**
+ * 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.api.state;

 import net.minecraftforge.common.property.IUnlistedProperty;
-import vazkii.botania.api.subtile.SubTileEntity;

 public class PropertyString implements IUnlistedProperty<String> {

@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -13,4 +21,5 @@ public enum AlfPortalState implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -16,4 +24,5 @@ public enum AltGrassVariant implements IStringSerializable {
    public String getName() {
        return this.name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -20,4 +28,5 @@ public enum AltarVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -26,4 +34,5 @@ public enum BiomeBrickVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -26,4 +34,5 @@ public enum BiomeStoneVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -12,4 +20,5 @@ public enum CrateVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -26,4 +34,5 @@ public enum CustomBrickVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -13,4 +21,5 @@ public enum DrumVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -14,4 +22,5 @@ public enum EndBrickVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -26,4 +34,5 @@ public enum FutureStoneVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -15,4 +23,5 @@ public enum LivingRockVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -16,4 +24,5 @@ public enum LivingWoodVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -12,4 +20,5 @@ public enum LuminizerVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -13,4 +21,5 @@ public enum PlatformVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -14,4 +22,5 @@ public enum PoolVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -0,0 +1,24 @@
+/**
+ * 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.api.state.enums;
+
+import net.minecraft.util.IStringSerializable;
+
+import java.util.Locale;
+
+public enum PotatoVariant implements IStringSerializable {
+    DEFAULT,
+    HALLOWEEN,
+    GRAYSCALE;
+
+    @Override
+    public String getName() {
+        return name().toLowerCase(Locale.ROOT);
+    }
+}
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -13,4 +21,5 @@ public enum PrismarineVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -13,4 +21,5 @@ public enum PylonVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -15,4 +23,5 @@ public enum QuartzVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -14,4 +22,5 @@ public enum SpreaderVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -1,3 +1,11 @@
+/**
+ * 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.api.state.enums;

 import net.minecraft.util.IStringSerializable;
@@ -15,4 +23,5 @@ public enum StorageVariant implements IStringSerializable {
    public String getName() {
        return name().toLowerCase(Locale.ROOT);
    }
+
 }
@@ -17,6 +17,7 @@ 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;
 import net.minecraft.item.ItemStack;
@@ -94,11 +95,19 @@ public class SubTileEntity {
 	}

 	/**
-	 * Gets the icon for this SubTileEntity, this is a block icon.
+	 * Gets the block model path for this subtile
 	 */
-	@SideOnly(Side.CLIENT) // todo 1.8 reevaluate need
-	public TextureAtlasSprite getIcon() {
-		return BotaniaAPI.internalHandler.getSubTileIconForName(getUnlocalizedName());
+	@SideOnly(Side.CLIENT)
+	public ModelResourceLocation getBlockModel() {
+		return BotaniaAPI.internalHandler.getSubTileBlockModelForName(getUnlocalizedName());
+	}
+
+	/**
+	 * Gets the item model path for this subtile
+	 */
+	@SideOnly(Side.CLIENT)
+	public ModelResourceLocation getItemModel() {
+		return BotaniaAPI.internalHandler.getSubTileItemModelForName(getUnlocalizedName());
 	}

 	/**
@@ -10,15 +10,11 @@
 */
 package vazkii.botania.api.subtile.signature;

-
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.item.ItemStack;

 import java.util.List;

 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumChatFormatting;
 import net.minecraft.util.StatCollector;

@@ -38,16 +34,6 @@ public class BasicSignature extends SubTileSignature {
 		this.name = name;
 	}

-	@Override
-	public void registerIcons(TextureMap register) {
-		BotaniaAPI.internalHandler.registerBasicSignatureIcons(name, register);
-	}
-
-	@Override
-	public TextureAtlasSprite getIconForStack(ItemStack stack) {
-		return BotaniaAPI.internalHandler.getSubTileIconForName(name);
-	}
-
 	@Override
 	public String getUnlocalizedNameForStack(ItemStack stack) {
 		return unlocalizedName("");
@@ -24,16 +24,6 @@ public abstract class SubTileSignature {

 	public static final String SPECIAL_FLOWER_PREFIX = "flower.";

-	/**
-	 * Equivalent to Block.registerBlockIcons.
-	 */
-	public abstract void registerIcons(TextureMap map);
-	// todo 1.8 evaluate need for these two
-	/**
-	 * Gets the icon to display for the flower item.
-	 */
-	public abstract TextureAtlasSprite getIconForStack(ItemStack stack);
-
 	/**
 	 * Gets the display name for the flower item.
 	 */
@@ -56,7 +56,7 @@ public class SimpleWikiProvider implements IWikiProvider {
 		ItemStack stack = block.getPickBlock(pos, world, bPos, null);

 		if(stack == null || stack.getItem() == null)
-			stack = new ItemStack(block, 1, block.getMetaFromState(world.getBlockState(bPos)));
+			stack = new ItemStack(block, 1, block.getDamageValue(world, bPos));

 		if(stack.getItem() == null)
 			return null;
@@ -150,27 +150,27 @@ public class LightningHandler {
 			int b = (color & 0xFF);
 			int a = (int) (mainalpha * rendersegment.light * new Color(color).getAlpha());

-			tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex();
-			tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex();
+			tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+			tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();

 			if(rendersegment.next == null) {
 				Vector3 roundend = rendersegment.endpoint.point.copy().add(rendersegment.diff.copy().normalize().multiply(width));

-				tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(roundend.x - diff2.x, roundend.y - diff2.y, roundend.z - diff2.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(endvec.x - diff2.x, endvec.y - diff2.y, endvec.z - diff2.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(endvec.x + diff2.x, endvec.y + diff2.y, endvec.z + diff2.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(roundend.x + diff2.x, roundend.y + diff2.y, roundend.z + diff2.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
 			}

 			if(rendersegment.prev == null) {
 				Vector3 roundend = rendersegment.startpoint.point.copy().subtract(rendersegment.diff.copy().normalize().multiply(width));

-				tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).lightmap(0xF0, 0xF0).tex(0, 0).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).lightmap(0xF0, 0xF0).tex(0, 1).color(r, g, b, a).endVertex();
-				tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).lightmap(0xF0, 0xF0).tex(0.5, 1).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(startvec.x - diff1.x, startvec.y - diff1.y, startvec.z - diff1.z).tex(0.5, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(roundend.x - diff1.x, roundend.y - diff1.y, roundend.z - diff1.z).tex(0, 0).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(roundend.x + diff1.x, roundend.y + diff1.y, roundend.z + diff1.z).tex(0, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
+				tessellator.getWorldRenderer().pos(startvec.x + diff1.x, startvec.y + diff1.y, startvec.z + diff1.z).tex(0.5, 1).lightmap(0xF0, 0xF0).color(r, g, b, a).endVertex();
 			}
 		}
 	}
@@ -1,30 +1,44 @@
+/**
+ * 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.core.handler;

 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Iterables;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockDoublePlant;
 import net.minecraft.block.BlockFlower;
-import net.minecraft.block.BlockRailPowered;
 import net.minecraft.block.BlockSlab;
 import net.minecraft.block.BlockWall;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.ItemMeshDefinition;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
 import net.minecraft.client.renderer.block.statemap.StateMap;
 import net.minecraft.client.renderer.block.statemap.StateMapperBase;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.resources.IReloadableResourceManager;
+import net.minecraft.client.resources.model.IBakedModel;
 import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.minecraft.item.EnumDyeColor;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.IStringSerializable;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.ForgeHooksClient;
+import net.minecraftforge.client.model.ISmartItemModel;
 import net.minecraftforge.client.model.ModelLoader;
 import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.client.model.obj.OBJLoader;
 import net.minecraftforge.fml.common.registry.GameData;
-import vazkii.botania.api.render.SpecialFlowerModel;
+import vazkii.botania.api.BotaniaAPIClient;
+import vazkii.botania.client.render.SpecialFlowerModel;
 import vazkii.botania.api.state.BotaniaStateProps;
 import vazkii.botania.api.state.enums.AltGrassVariant;
 import vazkii.botania.api.state.enums.AltarVariant;
@@ -38,9 +52,11 @@ import vazkii.botania.api.state.enums.FutureStoneVariant;
 import vazkii.botania.api.state.enums.LivingRockVariant;
 import vazkii.botania.api.state.enums.LivingWoodVariant;
 import vazkii.botania.api.state.enums.LuminizerVariant;
+import vazkii.botania.api.state.enums.PoolVariant;
 import vazkii.botania.api.state.enums.PrismarineVariant;
 import vazkii.botania.api.state.enums.PylonVariant;
 import vazkii.botania.api.state.enums.StorageVariant;
+import vazkii.botania.client.core.proxy.ClientProxy;
 import vazkii.botania.client.model.FloatingFlowerModel;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.ModFluffBlocks;
@@ -87,8 +103,18 @@ import vazkii.botania.common.block.subtile.generating.SubTileNightshade;
 import vazkii.botania.common.block.subtile.generating.SubTileRafflowsia;
 import vazkii.botania.common.block.subtile.generating.SubTileSpectrolus;
 import vazkii.botania.common.block.subtile.generating.SubTileThermalily;
+import vazkii.botania.common.block.tile.TileAvatar;
+import vazkii.botania.common.block.tile.TileBrewery;
+import vazkii.botania.common.block.tile.TileGaiaHead;
+import vazkii.botania.common.block.tile.TileHourglass;
+import vazkii.botania.common.block.tile.TileTeruTeruBozu;
+import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
+import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;
+import vazkii.botania.common.block.tile.mana.TileBellows;
+import vazkii.botania.common.block.tile.mana.TilePump;
 import vazkii.botania.common.item.ItemManaGun;
 import vazkii.botania.common.item.ItemSpawnerMover;
+import vazkii.botania.common.item.ModItems;
 import vazkii.botania.common.item.brew.ItemBrewBase;
 import vazkii.botania.common.item.equipment.bauble.ItemFlightTiara;
 import vazkii.botania.common.item.equipment.bauble.ItemMagnetRing;
@@ -100,15 +126,12 @@ import vazkii.botania.common.lib.LibMisc;

 import static vazkii.botania.common.item.ModItems.*;

-import java.util.Collection;
 import java.util.List;
 import java.util.Locale;

 public final class ModelHandler {

-    // Very hardocode-y right now. Will be refactored after things work.
-    // In addition, many of the jsons currently use the vanilla format (simple and verified bug-free).
-    // Once things settle down, we'll move to forge jsons, which will drastically cut down on the number of json files
+    // todo reorganize, alphabetize
    public static void registerModels() {
        ModelLoaderRegistry.registerLoader(SpecialFlowerModel.Loader.INSTANCE);
        OBJLoader.instance.addDomain(LibMisc.MOD_ID.toLowerCase(Locale.ROOT));
@@ -135,6 +158,7 @@ public final class ModelHandler {

        /** Normal Items **/
        registerStandardItems();
+        registerTESRItems();
        registerManaResources();
        registerRunes();
        registerBows();
@@ -167,9 +191,9 @@ public final class ModelHandler {
            @Override
            public ModelResourceLocation getModelLocation(ItemStack stack) {
                if (ItemSpawnerMover.hasData(stack)) {
-                    return new ModelResourceLocation("botania:spawnerMover", "inventory");
-                } else {
                    return new ModelResourceLocation("botania:spawnerMoverFull", "inventory");
+                } else {
+                    return new ModelResourceLocation("botania:spawnerMover", "inventory");
                }
            }
        });
@@ -236,64 +260,112 @@ public final class ModelHandler {
                        : new ModelResourceLocation("botania:magnetRingGreaterOff", "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.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.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.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");
+            }
+        });
    }

    private static void registerSubtiles() {
-        SpecialFlowerModel.register(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR));
-        SpecialFlowerModel.register(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY));
+        BotaniaAPIClient.registerSubtileModel(SubTileManastar.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MANASTAR));
+        BotaniaAPIClient.registerSubtileModel(SubTilePureDaisy.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_PUREDAISY));

-        SpecialFlowerModel.register(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM));
-        SpecialFlowerModel.register(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor"));
-        SpecialFlowerModel.register(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
-        SpecialFlowerModel.register(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME));
-        SpecialFlowerModel.register(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS));
-        SpecialFlowerModel.register(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor"));
-        SpecialFlowerModel.register(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY));
-        SpecialFlowerModel.register(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE));
-        SpecialFlowerModel.register(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor"));
-        SpecialFlowerModel.register(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME));
-        SpecialFlowerModel.register(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE));
-        SpecialFlowerModel.register(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW));
-        SpecialFlowerModel.register(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM));
-        SpecialFlowerModel.register(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS));
-        SpecialFlowerModel.register(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS));
-        SpecialFlowerModel.register(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS));
-        SpecialFlowerModel.register(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS));
-        SpecialFlowerModel.register(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON));
-        SpecialFlowerModel.register(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA));
+        BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM));
+        BotaniaAPIClient.registerSubtileModel(SubTileDecor.Daybloom.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM + "Decor"));
+        BotaniaAPIClient.registerSubtileModel(SubTileDaybloom.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAYBLOOM_PRIME));
+        BotaniaAPIClient.registerSubtileModel(SubTileEndoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENDOFLAME));
+        BotaniaAPIClient.registerSubtileModel(SubTileHydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS));
+        BotaniaAPIClient.registerSubtileModel(SubTileDecor.Hydroangeas.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYDROANGEAS + "Decor"));
+        BotaniaAPIClient.registerSubtileModel(SubTileThermalily.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_THERMALILY));
+        BotaniaAPIClient.registerSubtileModel(SubTileNightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE));
+        BotaniaAPIClient.registerSubtileModel(SubTileDecor.Nightshade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE + "Decor"));
+        BotaniaAPIClient.registerSubtileModel(SubTileNightshade.Prime.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NIGHTSHADE_PRIME));
+        BotaniaAPIClient.registerSubtileModel(SubTileArcaneRose.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ARCANE_ROSE));
+        BotaniaAPIClient.registerSubtileModel(SubTileMunchdew.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MUNCHDEW));
+        BotaniaAPIClient.registerSubtileModel(SubTileEntropinnyum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ENTROPINNYUM));
+        BotaniaAPIClient.registerSubtileModel(SubTileKekimurus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_KEKIMURUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileGourmaryllis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_GOURMARYLLIS));
+        BotaniaAPIClient.registerSubtileModel(SubTileNarslimmus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_NARSLIMMUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileSpectrolus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTROLUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileDandelifeon.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DANDELIFEON));
+        BotaniaAPIClient.registerSubtileModel(SubTileRafflowsia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RAFFLOWSIA));

-        SpecialFlowerModel.register(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN));
-        SpecialFlowerModel.register(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi"));
-        SpecialFlowerModel.register(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN));
-        SpecialFlowerModel.register(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM));
-        SpecialFlowerModel.register(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE));
-        SpecialFlowerModel.register(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS));
-        SpecialFlowerModel.register(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID));
-        SpecialFlowerModel.register(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM));
-        SpecialFlowerModel.register(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE));
-        SpecialFlowerModel.register(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME));
-        SpecialFlowerModel.register(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION));
-        SpecialFlowerModel.register(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi"));
-        SpecialFlowerModel.register(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK));
-        SpecialFlowerModel.register(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi"));
-        SpecialFlowerModel.register(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE));
-        SpecialFlowerModel.register(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA));
-        SpecialFlowerModel.register(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS));
-        SpecialFlowerModel.register(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi"));
-        SpecialFlowerModel.register(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS));
-        SpecialFlowerModel.register(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC));
-        SpecialFlowerModel.register(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA));
-        SpecialFlowerModel.register(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM));
-        SpecialFlowerModel.register(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL));
-        SpecialFlowerModel.register(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS));
-        SpecialFlowerModel.register(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM));
-        SpecialFlowerModel.register(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE));
-        SpecialFlowerModel.register(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS));
-        SpecialFlowerModel.register(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi"));
-        SpecialFlowerModel.register(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL));
-        SpecialFlowerModel.register(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi"));
-        SpecialFlowerModel.register(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA));
-        SpecialFlowerModel.register(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN));
+        BotaniaAPIClient.registerSubtileModel(SubTileBellethorn.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BELLETHORN + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileDreadthorn.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DREADTHORN));
+        BotaniaAPIClient.registerSubtileModel(SubTileHeiseiDream.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HEISEI_DREAM));
+        BotaniaAPIClient.registerSubtileModel(SubTileTigerseye.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TIGERSEYE));
+        BotaniaAPIClient.registerSubtileModel(SubTileJadedAmaranthus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JADED_AMARANTHUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileOrechid.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID));
+        BotaniaAPIClient.registerSubtileModel(SubTileOrechidIgnem.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_ORECHID_IGNEM));
+        BotaniaAPIClient.registerSubtileModel(SubTileFallenKanade.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_FALLEN_KANADE));
+        BotaniaAPIClient.registerSubtileModel(SubTileExoflame.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_EXOFLAME));
+        BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION));
+        BotaniaAPIClient.registerSubtileModel(SubTileAgricarnation.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_AGRICARNATION + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK));
+        BotaniaAPIClient.registerSubtileModel(SubTileHopperhock.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HOPPERHOCK + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileTangleberrie.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_TANGLEBERRIE));
+        BotaniaAPIClient.registerSubtileModel(SubTileJiyuulia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_JIYUULIA));
+        BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileRannuncarpus.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_RANNUNCARPUS + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileHyacidus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_HYACIDUS));
+        BotaniaAPIClient.registerSubtileModel(SubTilePollidisiac.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_POLLIDISIAC));
+        BotaniaAPIClient.registerSubtileModel(SubTileClayconia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_CLAYCONIA));
+        BotaniaAPIClient.registerSubtileModel(SubTileLoonuim.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_LOONIUM));
+        BotaniaAPIClient.registerSubtileModel(SubTileDaffomill.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_DAFFOMILL));
+        BotaniaAPIClient.registerSubtileModel(SubTileVinculotus.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_VINCULOTUS));
+        BotaniaAPIClient.registerSubtileModel(SubTileSpectranthemum.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SPECTRANTHEMUM));
+        BotaniaAPIClient.registerSubtileModel(SubTileMedumone.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MEDUMONE));
+        BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS));
+        BotaniaAPIClient.registerSubtileModel(SubTileMarimorphosis.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_MARIMORPHOSIS + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileBubbell.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL));
+        BotaniaAPIClient.registerSubtileModel(SubTileBubbell.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_BUBBELL + "Chibi"));
+        BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA));
+        BotaniaAPIClient.registerSubtileModel(SubTileSolegnolia.Mini.class, new ModelResourceLocation("botania:" + LibBlockNames.SUBTILE_SOLEGNOLIA + "Chibi"));
    }

    private static void registerStandardBlocks() {
@@ -344,10 +416,16 @@ public final class ModelHandler {
        registerItemModel(ModBlocks.alfPortal);
        registerItemModel(ModBlocks.root);
        registerItemModel(ModBlocks.cacophonium);
+        registerItemModel(ModBlocks.tinyPotato);
+        registerItemModel(ModBlocks.spawnerClaw);
+        registerItemModel(ModBlocks.turntable);
+        registerItemModel(ModBlocks.manaFlame);
+        registerItemModel(ModBlocks.incensePlate);

+        // Register all metas to variant inventory, so the smartmodel can take over from there. See RenderEventHandler
+        registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.pylon), PylonVariant.values().length);
        registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.floatingFlower), EnumDyeColor.values().length);

-
        // Item models which all use the same base model and recolored by render layer
        registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.unstableBlock), EnumDyeColor.values().length);
        registerItemModelAllMeta(Item.getItemFromBlock(ModBlocks.petalBlock), EnumDyeColor.values().length);
@@ -356,7 +434,6 @@ public final class ModelHandler {
        // Blocks which share models with their item, and have only one variant to switch over
        registerVariantsDefaulted(ModBlocks.altGrass, AltGrassVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.storage, StorageVariant.class, "variant");
-        registerVariantsDefaulted(ModBlocks.pylon, PylonVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.forestDrum, DrumVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.livingrock, LivingRockVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.livingwood, LivingWoodVariant.class, "variant");
@@ -368,6 +445,7 @@ public final class ModelHandler {
        registerVariantsDefaulted(ModBlocks.openCrate, CrateVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.customBrick, CustomBrickVariant.class, "variant");
        registerVariantsDefaulted(ModBlocks.prismarine, PrismarineVariant.class, "variant");
+        registerVariantsDefaulted(ModBlocks.pool, PoolVariant.class, "variant");
    }

    private static void registerStandardItems() {
@@ -378,6 +456,7 @@ public final class ModelHandler {
        registerItemModel(manaCookie);

        registerItemModel(manasteelHelm);
+        registerItemModel(manasteelHelmRevealing);
        registerItemModel(manasteelChest);
        registerItemModel(manasteelLegs);
        registerItemModel(manasteelBoots);
@@ -388,6 +467,7 @@ public final class ModelHandler {
        registerItemModel(manasteelShears);

        registerItemModel(elementiumHelm);
+        registerItemModel(elementiumHelmRevealing);
        registerItemModel(elementiumChest);
        registerItemModel(elementiumLegs);
        registerItemModel(elementiumBoots);
@@ -398,11 +478,6 @@ public final class ModelHandler {
        registerItemModel(elementiumShears);
        registerItemModel(elementiumSword);

-        registerItemModel(manaweaveHelm);
-        registerItemModel(manaweaveChest);
-        registerItemModel(manaweaveLegs);
-        registerItemModel(manaweaveBoots);
-
        registerItemModel(terrasteelHelm);
        registerItemModel(terrasteelHelmRevealing);
        registerItemModel(terrasteelChest);
@@ -495,7 +570,8 @@ public final class ModelHandler {
        registerItemModel(flightTiara);
        registerItemModel(divaCharm);
        registerItemModel(manaMirror);
-        // magnet ring and greater version - custom mesher
+        registerItemModel(manaInkwell);
+        registerItemModel(waterBowl);

        registerItemModelAllMeta(flightTiara, ItemFlightTiara.WING_TYPES);
        registerItemModelAllMeta(laputaShard, 20);
@@ -519,6 +595,36 @@ public final class ModelHandler {
        registerItemModelMetas(grassHorn, LibItemNames.GRASS_HORN, 3);
    }

+    // Only for models that absolutely can't be converted to JSON. Use VERY sparingly
+    private static void registerTESRItems() {
+        registerItemModel(ModBlocks.corporeaCrystalCube);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaCrystalCube), 0, TileCorporeaCrystalCube.class);
+
+        registerItemModel(ModBlocks.corporeaIndex);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.corporeaIndex), 0, TileCorporeaIndex.class);
+
+        registerItemModel(ModBlocks.avatar);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.avatar), 0, TileAvatar.class);
+
+        registerItemModel(ModBlocks.teruTeruBozu);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.teruTeruBozu), 0, TileTeruTeruBozu.class);
+
+        registerItemModel(ModBlocks.brewery);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.brewery), 0, TileBrewery.class);
+
+        registerItemModel(ModItems.gaiaHead);
+        ForgeHooksClient.registerTESRItemStack(ModItems.gaiaHead, 0, TileGaiaHead.class);
+
+        registerItemModel(ModBlocks.bellows);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.bellows), 0, TileBellows.class);
+
+        registerItemModel(ModBlocks.pump);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.pump), 0, TilePump.class);
+
+        registerItemModel(ModBlocks.hourglass);
+        ForgeHooksClient.registerTESRItemStack(Item.getItemFromBlock(ModBlocks.hourglass), 0, TileHourglass.class);
+    }
+
    private static void registerManaResources() {
        Item item = manaResource;
        for (int i = 0; i < LibItemNames.MANA_RESOURCE_NAMES.length; i++) {
@@ -961,4 +1067,5 @@ public final class ModelHandler {
    }

    private ModelHandler() {}
+
 }
@@ -11,6 +11,7 @@ import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import org.apache.commons.lang3.text.WordUtils;
 import vazkii.botania.client.core.helper.IconHelper;
 import vazkii.botania.client.model.FloatingFlowerModel;
+import vazkii.botania.client.model.PylonItemModel;
 import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.integration.buildcraft.TriggerManaLevel;
 import vazkii.botania.common.item.ItemSparkUpgrade;
@@ -65,11 +66,13 @@ public class RenderEventHandler {
        evt.modelRegistry.putObject(new ModelResourceLocation("botania:miniIsland", "inventory"), FloatingFlowerModel.INSTANCE);
        evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "normal"), FloatingFlowerModel.INSTANCE);
        evt.modelRegistry.putObject(new ModelResourceLocation("botania:floatingSpecialFlower", "inventory"), FloatingFlowerModel.INSTANCE);
+
+        // Pylon item model
+        evt.modelRegistry.putObject(new ModelResourceLocation("botania:pylon", "inventory"), new PylonItemModel());
    }

    @SubscribeEvent
    public void onTextureStitch(TextureStitchEvent.Pre evt) {
-        System.out.println("CALLING TEXTURE STITCH");
        alfPortalTex = IconHelper.forName(evt.map, "alfheimPortalInside", "blocks");
        lightRelayWorldIcon = IconHelper.forName(evt.map, "lightRelay1", "blocks");
        lightRelayWorldIconRed = IconHelper.forName(evt.map, "lightRelay3", "blocks");
@@ -34,16 +34,12 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldSettings.GameType;
-import net.minecraftforge.client.MinecraftForgeClient;
-import net.minecraftforge.client.model.ModelLoaderRegistry;
 import net.minecraftforge.common.MinecraftForge;
 import vazkii.botania.api.item.IExtendedPlayerController;
 import vazkii.botania.api.lexicon.LexiconEntry;
-import vazkii.botania.api.lexicon.multiblock.IMultiblockRenderHook;
 import vazkii.botania.api.lexicon.multiblock.Multiblock;
 import vazkii.botania.api.lexicon.multiblock.MultiblockSet;
 import vazkii.botania.api.lexicon.multiblock.component.AnyComponent;
-import vazkii.botania.api.render.SpecialFlowerModel;
 import vazkii.botania.api.wiki.IWikiProvider;
 import vazkii.botania.api.wiki.WikiHooks;
 import vazkii.botania.client.challenge.ModChallenges;
@@ -106,8 +102,6 @@ import vazkii.botania.client.render.tile.RenderTileTerraPlate;
 import vazkii.botania.client.render.tile.RenderTileTeruTeruBozu;
 import vazkii.botania.client.render.tile.RenderTileTinyPotato;
 import vazkii.botania.client.render.world.SkyblockRenderEvents;
-import vazkii.botania.common.Botania;
-import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileAlfPortal;
 import vazkii.botania.common.block.tile.TileAltar;
 import vazkii.botania.common.block.tile.TileAvatar;
@@ -160,7 +154,6 @@ import vazkii.botania.common.lexicon.LexiconData;
 import vazkii.botania.common.lib.LibObfuscation;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.client.registry.RenderingRegistry;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 import net.minecraftforge.fml.common.FMLLog;
 import net.minecraftforge.fml.common.Optional;
 import net.minecraftforge.fml.common.event.FMLInitializationEvent;
@@ -232,65 +225,6 @@ public class ClientProxy extends CommonProxy {
 	}

 	private void initRenderers() {
-//		LibRenderIDs.idAltar = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idSpecialFlower = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idSpreader = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idPool = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idPylon = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idMiniIsland = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idTinyPotato = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idSpawnerClaw = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idBrewery = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idCorporeaIndex = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idPump = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idDoubleFlower = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idCorporeaCrystalCybe = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idIncensePlate = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idHourglass = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idCocoon = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idLightRelay = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idBellows = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idTeruTeruBozu = RenderingRegistry.getNextAvailableRenderId();
-//		LibRenderIDs.idAvatar = RenderingRegistry.getNextAvailableRenderId();
-//
-//		RenderSpecialFlower specialFlowerRender = new RenderSpecialFlower(LibRenderIDs.idSpecialFlower);
-//		RenderingRegistry.registerBlockHandler(new RenderAltar());
-//		RenderingRegistry.registerBlockHandler(specialFlowerRender);
-//		RenderingRegistry.registerBlockHandler(new RenderSpreader());
-//		RenderingRegistry.registerBlockHandler(new RenderPool());
-//		RenderingRegistry.registerBlockHandler(new RenderPylon());
-//		RenderingRegistry.registerBlockHandler(new RenderFloatingFlower());
-//		RenderingRegistry.registerBlockHandler(new RenderTinyPotato());
-//		RenderingRegistry.registerBlockHandler(new RenderSpawnerClaw());
-//		RenderingRegistry.registerBlockHandler(new RenderBrewery());
-//		RenderingRegistry.registerBlockHandler(new RenderCorporeaIndex());
-//		RenderingRegistry.registerBlockHandler(new RenderPump());
-//		RenderingRegistry.registerBlockHandler(new RenderDoubleFlower());
-//		RenderingRegistry.registerBlockHandler(new RenderCorporeaCrystalCube());
-//		RenderingRegistry.registerBlockHandler(new RenderIncensePlate());
-//		RenderingRegistry.registerBlockHandler(new RenderHourglass());
-//		RenderingRegistry.registerBlockHandler(new RenderCocoon());
-//		RenderingRegistry.registerBlockHandler(new RenderBellows());
-//		RenderingRegistry.registerBlockHandler(new RenderTeruTeruBozu());
-//		RenderingRegistry.registerBlockHandler(new RenderAvatar());
-
-//		IMultiblockRenderHook.renderHooks.put(ModBlocks.flower, specialFlowerRender);
-//		IMultiblockRenderHook.renderHooks.put(ModBlocks.shinyFlower, specialFlowerRender);
-
-//		RenderTransparentItem renderTransparentItem = new RenderTransparentItem();
-//		RenderFloatingFlowerItem renderFloatingFlower = new RenderFloatingFlowerItem();
-//		RenderBow renderBow = new RenderBow();
-//
-//		MinecraftForgeClient.registerItemRenderer(ModItems.lens, new RenderLens());
-//		if(ConfigHandler.lexicon3dModel)
-//			MinecraftForgeClient.registerItemRenderer(ModItems.lexicon, new RenderLexicon());
-//		MinecraftForgeClient.registerItemRenderer(ModItems.glassPick, renderTransparentItem);
-//		MinecraftForgeClient.registerItemRenderer(ModItems.spark, renderTransparentItem);
-//		MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingFlower), renderFloatingFlower);
-//		MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.floatingSpecialFlower), renderFloatingFlower);
-//		MinecraftForgeClient.registerItemRenderer(ModItems.livingwoodBow, renderBow);
-//		MinecraftForgeClient.registerItemRenderer(ModItems.crystalBow, renderBow);
-
 		RenderTileFloatingFlower renderTileFloatingFlower = new RenderTileFloatingFlower();
 		ClientRegistry.bindTileEntitySpecialRenderer(TileAltar.class, new RenderTileAltar());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileSpreader.class, new RenderTileSpreader());
@@ -302,7 +236,7 @@ public class ClientProxy extends CommonProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingFlower.class, renderTileFloatingFlower);
 		ClientRegistry.bindTileEntitySpecialRenderer(TileFloatingSpecialFlower.class, renderTileFloatingFlower);
 		ClientRegistry.bindTileEntitySpecialRenderer(TileTinyPotato.class, new RenderTileTinyPotato());
-		ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw());
+		// ClientRegistry.bindTileEntitySpecialRenderer(TileSpawnerClaw.class, new RenderTileSpawnerClaw());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileStarfield.class, new RenderTileStarfield());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileBrewery.class, new RenderTileBrewery());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileTerraPlate.class, new RenderTileTerraPlate());
@@ -317,7 +251,7 @@ public class ClientProxy extends CommonProxy {
 		ClientRegistry.bindTileEntitySpecialRenderer(TileCocoon.class, new RenderTileCocoon());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileLightRelay.class, new RenderTileLightRelay());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileBellows.class, new RenderTileBellows());
-		// todo 1.8.8 awaiting forge issue ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileGaiaHead.class, new RenderTileSkullOverride());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileTeruTeruBozu.class, new RenderTileTeruTeruBozu());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileAvatar.class, new RenderTileAvatar());

@@ -474,7 +408,7 @@ public class ClientProxy extends CommonProxy {
 		}
 	}

-	private static boolean noclipEnabled = true;
+	private static boolean noclipEnabled = false;
 	private static boolean corruptSparkle = false;

 	@Override
@@ -93,7 +93,7 @@ public class FXWisp extends EntityFX {

 		if(!queuedDepthIgnoringRenders.isEmpty()) {
 			GlStateManager.disableDepth();
-			tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_LMAP_COLOR);
+			tessellator.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 			for(FXWisp wisp : queuedDepthIgnoringRenders)
 				wisp.renderQueued(tessellator, false);
 			tessellator.draw();
@@ -0,0 +1,80 @@
+/**
+ * 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.integration.jei;
+
+import mezz.jei.api.IItemRegistry;
+import mezz.jei.api.IJeiHelpers;
+import mezz.jei.api.IModPlugin;
+import mezz.jei.api.IModRegistry;
+import mezz.jei.api.IRecipeRegistry;
+import mezz.jei.api.JEIPlugin;
+import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.client.integration.jei.brewery.BreweryRecipeCategory;
+import vazkii.botania.client.integration.jei.brewery.BreweryRecipeHandler;
+import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeCategory;
+import vazkii.botania.client.integration.jei.elventrade.ElvenTradeRecipeHandler;
+import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeCategory;
+import vazkii.botania.client.integration.jei.manapool.ManaPoolRecipeHandler;
+import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeCategory;
+import vazkii.botania.client.integration.jei.petalapothecary.PetalApothecaryRecipeHandler;
+import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeCategory;
+import vazkii.botania.client.integration.jei.puredaisy.PureDaisyRecipeHandler;
+import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeCategory;
+import vazkii.botania.client.integration.jei.runicaltar.RunicAltarRecipeHandler;
+
+@JEIPlugin
+public class JEIBotaniaPlugin implements IModPlugin {
+
+    private IJeiHelpers jeiHelpers;
+
+    @Override
+    public boolean isModLoaded() {
+        return true;
+    }
+
+    @Override
+    public void onJeiHelpersAvailable(IJeiHelpers jeiHelpers) {
+        this.jeiHelpers = jeiHelpers;
+    }
+
+    @Override
+    public void onItemRegistryAvailable(IItemRegistry itemRegistry) {}
+
+    @Override
+    public void register(IModRegistry registry) {
+        registry.addRecipeCategories(
+                new BreweryRecipeCategory(jeiHelpers.getGuiHelper()),
+                new PureDaisyRecipeCategory(jeiHelpers.getGuiHelper()),
+                new PetalApothecaryRecipeCategory(jeiHelpers.getGuiHelper()),
+                new ElvenTradeRecipeCategory(jeiHelpers.getGuiHelper()),
+                new RunicAltarRecipeCategory(jeiHelpers.getGuiHelper()),
+                new ManaPoolRecipeCategory(jeiHelpers.getGuiHelper())
+        );
+
+        registry.addRecipeHandlers(
+                new BreweryRecipeHandler(),
+                new PureDaisyRecipeHandler(),
+                new PetalApothecaryRecipeHandler(),
+                new ElvenTradeRecipeHandler(),
+                new RunicAltarRecipeHandler(),
+                new ManaPoolRecipeHandler()
+        );
+
+        registry.addRecipes(BotaniaAPI.brewRecipes);
+        registry.addRecipes(BotaniaAPI.pureDaisyRecipes);
+        registry.addRecipes(BotaniaAPI.petalRecipes);
+        registry.addRecipes(BotaniaAPI.elvenTradeRecipes);
+        registry.addRecipes(BotaniaAPI.runeAltarRecipes);
+        registry.addRecipes(BotaniaAPI.manaInfusionRecipes);
+    }
+
+    @Override
+    public void onRecipeRegistryAvailable(IRecipeRegistry recipeRegistry) {}
+
+}
@@ -0,0 +1,92 @@
+/**
+ * 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.integration.jei.brewery;
+
+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;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.List;
+
+public class BreweryRecipeCategory implements IRecipeCategory {
+
+    private final IDrawableStatic background;
+    private final String localizedName;
+
+    public BreweryRecipeCategory(IGuiHelper guiHelper) {
+        ResourceLocation location = new ResourceLocation("botania", "textures/gui/neiBrewery.png");
+        background = guiHelper.createDrawable(location, 0, 0, 166, 65, 0, 0, 0, 0);
+        localizedName = StatCollector.translateToLocal("botania.nei.brewery");
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.brewery";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {}
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {}
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof BreweryRecipeWrapper))
+            return;
+        BreweryRecipeWrapper wrapper = ((BreweryRecipeWrapper) recipeWrapper);
+
+        List inputs = wrapper.getInputs();
+
+        recipeLayout.getItemStacks().init(0, true, 39, 41);
+        if (inputs.get(0) instanceof ItemStack) {
+            recipeLayout.getItemStacks().set(0, ((ItemStack) inputs.get(0)));
+        } else {
+            recipeLayout.getItemStacks().set(0, ((Collection<ItemStack>) inputs.get(0)));
+        }
+
+        int index = 1, posX = 60;
+        for (Object o : wrapper.getInputs()) {
+            recipeLayout.getItemStacks().init(index, true, posX, 6);
+            if (o instanceof ItemStack) {
+                recipeLayout.getItemStacks().set(index, ((ItemStack) o));
+            } else if (o instanceof Collection) {
+                recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) o));
+            }
+            index++;
+            posX += 18;
+        }
+
+        recipeLayout.getItemStacks().init(7, false, 87, 41);
+        recipeLayout.getItemStacks().set(7, wrapper.getOutputs().get(0));
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.brewery;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipeBrew;
+
+import javax.annotation.Nonnull;
+
+public class BreweryRecipeHandler implements IRecipeHandler<RecipeBrew> {
+
+    @Nonnull
+    @Override
+    public Class<RecipeBrew> getRecipeClass() {
+        return RecipeBrew.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.brewery";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeBrew recipe) {
+        return new BreweryRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipeBrew recipe) {
+        return recipe.getInputs().size() <= 6;
+    }
+
+}
@@ -0,0 +1,67 @@
+/**
+ * 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.integration.jei.brewery;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+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;
+import java.util.List;
+
+public class BreweryRecipeWrapper implements IRecipeWrapper {
+
+    private final List input;
+    private final ItemStack output;
+
+    public BreweryRecipeWrapper(RecipeBrew recipeBrew) {
+        ImmutableList.Builder builder = ImmutableList.builder();
+        builder.add(new ItemStack(ModItems.vial));
+        for (Object o : recipeBrew.getInputs()) {
+            if (o instanceof ItemStack) {
+                builder.add(o);
+            }
+            if (o instanceof String) {
+                builder.add(OreDictionary.getOres(((String) o)));
+            }
+        }
+
+        input = builder.build();
+        output = recipeBrew.getOutput(new ItemStack(ModItems.vial)).copy();
+    }
+
+    @Override
+    public List getInputs() {
+        return input;
+    }
+
+    @Override
+    public List<ItemStack> getOutputs() {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() { return ImmutableList.of(); }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() { return ImmutableList.of(); }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -0,0 +1,111 @@
+/**
+ * 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.integration.jei.elventrade;
+
+import mezz.jei.api.IGuiHelper;
+import mezz.jei.api.gui.IDrawable;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.IRecipeCategory;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.WorldRenderer;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import org.lwjgl.opengl.GL11;
+import vazkii.botania.client.core.handler.RenderEventHandler;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+
+public class ElvenTradeRecipeCategory implements IRecipeCategory {
+
+    private final String localizedName;
+    private final IDrawable background;
+    private final IDrawable overlay;
+
+    public ElvenTradeRecipeCategory(IGuiHelper guiHelper) {
+        localizedName = StatCollector.translateToLocal("botania.nei.elvenTrade");
+        background = guiHelper.createBlankDrawable(145, 95);
+        overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/elvenTradeOverlay.png"), 0, 15, 140, 90);
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.elvenTrade";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        overlay.draw(minecraft, 0, 4);
+        GlStateManager.disableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {
+        minecraft.renderEngine.bindTexture(TextureMap.locationBlocksTexture);
+        TextureAtlasSprite sprite = RenderEventHandler.INSTANCE.alfPortalTex;
+        Tessellator tess = Tessellator.getInstance();
+        WorldRenderer wr = tess.getWorldRenderer();
+        wr.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
+        int startX = 22;
+        int startY = 25;
+        int stopX = 70;
+        int stopY = 73;
+        wr.pos(startX, startY, 0).tex(sprite.getMinU(), sprite.getMinV()).endVertex();
+        wr.pos(startX, stopY, 0).tex(sprite.getMinU(), sprite.getMaxV()).endVertex();
+        wr.pos(stopX, stopY, 0).tex(sprite.getMaxU(), sprite.getMaxV()).endVertex();
+        wr.pos(stopX, startY, 0).tex(sprite.getMaxU(), sprite.getMinV()).endVertex();
+        tess.draw();
+    }
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof ElvenTradeRecipeWrapper))
+            return;
+        ElvenTradeRecipeWrapper wrapper = ((ElvenTradeRecipeWrapper) recipeWrapper);
+
+        int index = 0, posX = 42;
+        for (Object o : wrapper.getInputs()) {
+            recipeLayout.getItemStacks().init(index, true, posX, 0);
+            if (o instanceof Collection) {
+                recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) o));
+            } else {
+                recipeLayout.getItemStacks().set(index, ((ItemStack) o));
+            }
+            index++;
+            posX += 18;
+        }
+
+        recipeLayout.getItemStacks().init(index, false, 93, 41);
+        recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0));
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.elventrade;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipeElvenTrade;
+
+import javax.annotation.Nonnull;
+
+public class ElvenTradeRecipeHandler implements IRecipeHandler<RecipeElvenTrade> {
+
+    @Nonnull
+    @Override
+    public Class<RecipeElvenTrade> getRecipeClass() {
+        return RecipeElvenTrade.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.elvenTrade";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeElvenTrade recipe) {
+        return new ElvenTradeRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipeElvenTrade recipe) {
+        return true;
+    }
+
+}
@@ -0,0 +1,67 @@
+/**
+ * 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.integration.jei.elventrade;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import vazkii.botania.api.recipe.RecipeElvenTrade;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+public class ElvenTradeRecipeWrapper implements IRecipeWrapper {
+
+    private final List input;
+    private final ItemStack output;
+
+    public ElvenTradeRecipeWrapper(RecipeElvenTrade recipe) {
+        ImmutableList.Builder builder = ImmutableList.builder();
+        for (Object o : recipe.getInputs()) {
+            if (o instanceof ItemStack) {
+                builder.add(o);
+            }
+            if (o instanceof String) {
+                builder.add(OreDictionary.getOres(((String) o)));
+            }
+        }
+        input = builder.build();
+        output = recipe.getOutput();
+    }
+
+    @Override
+    public List getInputs() {
+        return input;
+    }
+
+    @Override
+    public List<ItemStack> getOutputs() {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -0,0 +1,105 @@
+/**
+ * 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.integration.jei.manapool;
+
+import mezz.jei.api.IGuiHelper;
+import mezz.jei.api.gui.IDrawable;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.IRecipeCategory;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import vazkii.botania.common.block.ModBlocks;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+
+public class ManaPoolRecipeCategory implements IRecipeCategory {
+
+    private final IDrawable background;
+    private final String localizedName;
+    private final IDrawable overlay;
+
+    public ManaPoolRecipeCategory(IGuiHelper guiHelper) {
+        background = guiHelper.createBlankDrawable(168, 64);
+        localizedName = StatCollector.translateToLocal("botania.nei.manaPool");
+        overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"),
+                0, 0, 64, 46);
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.manaPool";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        overlay.draw(minecraft, 48, 0);
+        GlStateManager.disableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {}
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof ManaPoolRecipeWrapper))
+            return;
+
+        ManaPoolRecipeWrapper wrapper = ((ManaPoolRecipeWrapper) recipeWrapper);
+        int index = 0;
+
+        recipeLayout.getItemStacks().init(index, true, 40, 12);
+        if (wrapper.getInputs().get(0) instanceof Collection) {
+            recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) wrapper.getInputs().get(0)));
+        } else {
+            recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(0)));
+        }
+
+        index++;
+
+        if (wrapper.getInputs().size() > 1) {
+            // Has catalyst
+            recipeLayout.getItemStacks().init(index, true, 20, 12);
+            recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getInputs().get(1)));
+            index++;
+        }
+
+        recipeLayout.getItemStacks().init(index, true, 70, 12);
+        recipeLayout.getItemStacks().set(index, new ItemStack(ModBlocks.pool, 1, 0));
+        index++;
+
+        recipeLayout.getItemStacks().init(index, false, 99, 12);
+        if (wrapper.getOutputs().get(0) instanceof Collection) {
+            recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) wrapper.getOutputs().get(0)));
+        } else {
+            recipeLayout.getItemStacks().set(index, ((ItemStack) wrapper.getOutputs().get(0)));
+        }
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.manapool;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipeManaInfusion;
+
+import javax.annotation.Nonnull;
+
+public class ManaPoolRecipeHandler implements IRecipeHandler<RecipeManaInfusion> {
+
+    @Nonnull
+    @Override
+    public Class<RecipeManaInfusion> getRecipeClass() {
+        return RecipeManaInfusion.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.manaPool";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeManaInfusion recipe) {
+        return new ManaPoolRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipeManaInfusion recipe) {
+        return recipe.getManaToConsume() <= 100000;
+    }
+
+}
@@ -0,0 +1,82 @@
+/**
+ * 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.integration.jei.manapool;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import vazkii.botania.api.recipe.RecipeManaInfusion;
+import vazkii.botania.client.core.handler.HUDHandler;
+import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.tile.mana.TilePool;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+public class ManaPoolRecipeWrapper implements IRecipeWrapper {
+
+    private final List input;
+    private final ItemStack output;
+    private final int mana;
+
+    public ManaPoolRecipeWrapper(RecipeManaInfusion recipe) {
+        ImmutableList.Builder builder = ImmutableList.builder();
+
+        if (recipe.getInput() instanceof ItemStack) {
+            builder.add(recipe.getInput());
+        } else if (recipe.getInput() instanceof String) {
+            builder.add(OreDictionary.getOres(((String) recipe.getInput())));
+        }
+
+        if (recipe.isAlchemy()) {
+            builder.add(new ItemStack(ModBlocks.alchemyCatalyst));
+        } else if (recipe.isConjuration()) {
+            builder.add(new ItemStack(ModBlocks.conjurationCatalyst));
+        }
+
+        input = builder.build();
+        output = recipe.getOutput();
+        mana = recipe.getManaToConsume();
+    }
+
+    @Override
+    public List getInputs() {
+        return input;
+    }
+
+    @Override
+    public List getOutputs() {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
+        GlStateManager.enableAlpha();
+        HUDHandler.renderManaBar(28, 50, 0x0000FF, 0.75F, mana, TilePool.MAX_MANA / 10);
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -0,0 +1,109 @@
+/**
+ * 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.integration.jei.petalapothecary;
+
+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;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.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.*;
+import java.util.Collection;
+
+public class PetalApothecaryRecipeCategory implements IRecipeCategory {
+
+    private final IDrawableStatic background;
+    private final String localizedName;
+    private final IDrawableStatic overlay;
+
+    public PetalApothecaryRecipeCategory(IGuiHelper guiHelper) {
+        background = guiHelper.createBlankDrawable(150, 110);
+        localizedName = StatCollector.translateToLocal("botania.nei.petalApothecary");
+        overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"),
+                0, 0, 150, 110);
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.petals";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        overlay.draw(minecraft);
+        GlStateManager.disableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {}
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof PetalApothecaryRecipeWrapper))
+            return;
+        PetalApothecaryRecipeWrapper wrapper = ((PetalApothecaryRecipeWrapper) recipeWrapper);
+
+        recipeLayout.getItemStacks().init(0, true, 64, 52);
+        recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.altar));
+
+        int index = 1;
+        double angleBetweenEach = 360.0 / wrapper.getInputs().size();
+        Point point = new Point(64, 20), center = new Point(64, 52);
+
+        for (Object o : wrapper.getInputs()) {
+            recipeLayout.getItemStacks().init(index, true, point.x, point.y);
+            if (o instanceof Collection) {
+                recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) o));
+            }
+            if (o instanceof ItemStack) {
+                recipeLayout.getItemStacks().set(index, ((ItemStack) o));
+            }
+            index += 1;
+            point = rotatePointAbout(point, center, angleBetweenEach);
+        }
+
+        recipeLayout.getItemStacks().init(index, false, 103, 17);
+        recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0));
+    }
+
+    private Point rotatePointAbout(Point in, Point about, double degrees) {
+        double rad = degrees * Math.PI / 180.0;
+        double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x;
+        double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y;
+        return new Point(((int) newX), ((int) newY));
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.petalapothecary;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipePetals;
+
+import javax.annotation.Nonnull;
+
+public class PetalApothecaryRecipeHandler implements IRecipeHandler<RecipePetals> {
+
+    @Nonnull
+    @Override
+    public Class<RecipePetals> getRecipeClass() {
+        return RecipePetals.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.petals";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePetals recipe) {
+        return new PetalApothecaryRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipePetals recipe) {
+        return recipe.getInputs().size() <= 16;
+    }
+
+}
@@ -0,0 +1,67 @@
+/**
+ * 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.integration.jei.petalapothecary;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import vazkii.botania.api.recipe.RecipePetals;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+public class PetalApothecaryRecipeWrapper implements IRecipeWrapper {
+
+    private final List input;
+    private final ItemStack output;
+
+    public PetalApothecaryRecipeWrapper(RecipePetals recipe) {
+        ImmutableList.Builder builder = ImmutableList.builder();
+        for (Object o : recipe.getInputs()) {
+            if (o instanceof ItemStack) {
+                builder.add(o);
+            }
+            if (o instanceof String) {
+                builder.add(OreDictionary.getOres(((String) o)));
+            }
+        }
+        input = builder.build();
+        output = recipe.getOutput();
+    }
+
+    @Override
+    public List getInputs() {
+        return input;
+    }
+
+    @Override
+    public List<ItemStack> getOutputs() {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -0,0 +1,109 @@
+/**
+ * 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.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;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import vazkii.botania.common.item.block.ItemBlockSpecialFlower;
+import vazkii.botania.common.lib.LibBlockNames;
+
+import javax.annotation.Nonnull;
+import java.util.Collection;
+
+public class PureDaisyRecipeCategory implements IRecipeCategory {
+
+    private final IDrawable background;
+    private final String localizedName;
+    private final IDrawable overlay;
+
+    public PureDaisyRecipeCategory(IGuiHelper guiHelper) {
+        background = guiHelper.createBlankDrawable(168, 64);
+        localizedName = StatCollector.translateToLocal("botania.nei.pureDaisy");
+        overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/pureDaisyOverlay.png"),
+                0, 0, 64, 46);
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.pureDaisy";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        overlay.draw(minecraft, 48, 0);
+        GlStateManager.disableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {}
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof PureDaisyRecipeWrapper))
+            return;
+
+        PureDaisyRecipeWrapper wrapper = ((PureDaisyRecipeWrapper) recipeWrapper);
+        boolean inputFluid = wrapper.getInputs().isEmpty();
+        boolean outputFluid = wrapper.getOutputs().isEmpty();
+
+
+        if (inputFluid) {
+            recipeLayout.getFluidStacks().init(0, true, 40, 12, 16, 16, 1000, false, null);
+            recipeLayout.getFluidStacks().set(0, wrapper.getFluidInputs().get(0));
+        } else {
+            recipeLayout.getItemStacks().init(0, true, 40, 12);
+            if (wrapper.getInputs().get(0) instanceof Collection) {
+                recipeLayout.getItemStacks().set(0, ((Collection<ItemStack>) wrapper.getInputs().get(0)));
+            } else {
+                recipeLayout.getItemStacks().set(0, ((ItemStack) wrapper.getInputs().get(0)));
+            }
+        }
+
+        recipeLayout.getItemStacks().init(1, true, 70, 12);
+        recipeLayout.getItemStacks().set(1, ItemBlockSpecialFlower.ofType(LibBlockNames.SUBTILE_PUREDAISY));
+
+        if (outputFluid) {
+            recipeLayout.getFluidStacks().init(2, false, 99, 12, 16, 16, 1000, false, null);
+            recipeLayout.getFluidStacks().set(2, wrapper.getFluidOutputs().get(0));
+        } else {
+            recipeLayout.getItemStacks().init(2, false, 99, 12);
+            if (wrapper.getOutputs().get(0) instanceof Collection) {
+                recipeLayout.getItemStacks().set(2, ((Collection<ItemStack>) wrapper.getOutputs().get(0)));
+            } else {
+                recipeLayout.getItemStacks().set(2, ((ItemStack) wrapper.getOutputs().get(0)));
+            }
+        }
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.puredaisy;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipePureDaisy;
+
+import javax.annotation.Nonnull;
+
+public class PureDaisyRecipeHandler implements IRecipeHandler<RecipePureDaisy> {
+
+    @Nonnull
+    @Override
+    public Class<RecipePureDaisy> getRecipeClass() {
+        return RecipePureDaisy.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.pureDaisy";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipePureDaisy recipe) {
+        return new PureDaisyRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipePureDaisy recipe) {
+        return true;
+    }
+
+}
@@ -0,0 +1,77 @@
+/**
+ * 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.integration.jei.puredaisy;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidRegistry;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import vazkii.botania.api.recipe.RecipePureDaisy;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+public class PureDaisyRecipeWrapper implements IRecipeWrapper {
+
+    private List inputs = ImmutableList.of();
+    private List outputs = ImmutableList.of();
+    private List<FluidStack> fluidInputs = ImmutableList.of();
+    private List<FluidStack> fluidOutputs = ImmutableList.of();
+
+    public PureDaisyRecipeWrapper(RecipePureDaisy recipe) {
+        if (recipe.getInput() instanceof String) {
+            inputs = ImmutableList.of(OreDictionary.getOres(((String) recipe.getInput())));
+        } else if (recipe.getInput() instanceof Block) {
+            Block b = ((Block) recipe.getInput());
+            if (FluidRegistry.lookupFluidForBlock(b) != null) {
+                fluidInputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(b), 1000));
+            } else {
+                inputs = ImmutableList.of(new ItemStack(b, 1, b.getMetaFromState(b.getDefaultState())));
+            }
+        }
+
+        Block outBlock = recipe.getOutputState().getBlock();
+        if (FluidRegistry.lookupFluidForBlock(outBlock) != null) {
+            fluidOutputs = ImmutableList.of(new FluidStack(FluidRegistry.lookupFluidForBlock(outBlock), 1000));
+        } else {
+            outputs = ImmutableList.of(new ItemStack(outBlock, 1, outBlock.getMetaFromState(recipe.getOutputState())));
+        }
+    }
+
+    @Override
+    public List getInputs() {
+        return inputs;
+    }
+
+    @Override
+    public List getOutputs() {
+        return outputs;
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() {
+        return fluidInputs;
+    }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() {
+        return fluidOutputs;
+    }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -0,0 +1,106 @@
+/**
+ * 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.integration.jei.runicaltar;
+
+import mezz.jei.api.IGuiHelper;
+import mezz.jei.api.gui.IDrawable;
+import mezz.jei.api.gui.IRecipeLayout;
+import mezz.jei.api.recipe.IRecipeCategory;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+import vazkii.botania.common.block.ModBlocks;
+
+import javax.annotation.Nonnull;
+import java.awt.*;
+import java.util.Collection;
+
+public class RunicAltarRecipeCategory implements IRecipeCategory {
+
+    private final IDrawable background;
+    private final String localizedName;
+    private final IDrawable overlay;
+
+    public RunicAltarRecipeCategory(IGuiHelper guiHelper) {
+        background = guiHelper.createBlankDrawable(150, 110);
+        localizedName = StatCollector.translateToLocal("botania.nei.runicAltar");
+        overlay = guiHelper.createDrawable(new ResourceLocation("botania", "textures/gui/petalOverlay.png"),
+                0, 0, 150, 110);
+    }
+
+    @Nonnull
+    @Override
+    public String getUid() {
+        return "botania.runicAltar";
+    }
+
+    @Nonnull
+    @Override
+    public String getTitle() {
+        return localizedName;
+    }
+
+    @Nonnull
+    @Override
+    public IDrawable getBackground() {
+        return background;
+    }
+
+    @Override
+    public void drawExtras(Minecraft minecraft) {
+        GlStateManager.enableAlpha();
+        GlStateManager.enableBlend();
+        overlay.draw(minecraft);
+        GlStateManager.disableBlend();
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(Minecraft minecraft) {}
+
+    @Override
+    public void setRecipe(@Nonnull IRecipeLayout recipeLayout, @Nonnull IRecipeWrapper recipeWrapper) {
+        if (!(recipeWrapper instanceof RunicAltarRecipeWrapper))
+            return;
+        RunicAltarRecipeWrapper wrapper = ((RunicAltarRecipeWrapper) recipeWrapper);
+
+        recipeLayout.getItemStacks().init(0, true, 64, 52);
+        recipeLayout.getItemStacks().set(0, new ItemStack(ModBlocks.runeAltar));
+
+        int index = 1;
+        double angleBetweenEach = 360.0 / wrapper.getInputs().size();
+        Point point = new Point(64, 20), center = new Point(64, 52);
+
+        for (Object o : wrapper.getInputs()) {
+            recipeLayout.getItemStacks().init(index, true, point.x, point.y);
+            if (o instanceof Collection) {
+                recipeLayout.getItemStacks().set(index, ((Collection<ItemStack>) o));
+            }
+            if (o instanceof ItemStack) {
+                recipeLayout.getItemStacks().set(index, ((ItemStack) o));
+            }
+            index += 1;
+            point = rotatePointAbout(point, center, angleBetweenEach);
+        }
+
+        recipeLayout.getItemStacks().init(index, false, 103, 17);
+        recipeLayout.getItemStacks().set(index, wrapper.getOutputs().get(0));
+    }
+
+    private Point rotatePointAbout(Point in, Point about, double degrees) {
+        double rad = degrees * Math.PI / 180.0;
+        double newX = Math.cos(rad) * (in.x - about.x) - Math.sin(rad) * (in.y - about.y) + about.x;
+        double newY = Math.sin(rad) * (in.x - about.x) + Math.cos(rad) * (in.y - about.y) + about.y;
+        return new Point(((int) newX), ((int) newY));
+    }
+
+}
@@ -0,0 +1,42 @@
+/**
+ * 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.integration.jei.runicaltar;
+
+import mezz.jei.api.recipe.IRecipeHandler;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import vazkii.botania.api.recipe.RecipeRuneAltar;
+
+import javax.annotation.Nonnull;
+
+public class RunicAltarRecipeHandler implements IRecipeHandler<RecipeRuneAltar> {
+
+    @Nonnull
+    @Override
+    public Class<RecipeRuneAltar> getRecipeClass() {
+        return RecipeRuneAltar.class;
+    }
+
+    @Nonnull
+    @Override
+    public String getRecipeCategoryUid() {
+        return "botania.runicAltar";
+    }
+
+    @Nonnull
+    @Override
+    public IRecipeWrapper getRecipeWrapper(@Nonnull RecipeRuneAltar recipe) {
+        return new RunicAltarRecipeWrapper(recipe);
+    }
+
+    @Override
+    public boolean isRecipeValid(@Nonnull RecipeRuneAltar recipe) {
+        return recipe.getInputs().size() <= 16;
+    }
+
+}
@@ -0,0 +1,76 @@
+/**
+ * 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.integration.jei.runicaltar;
+
+import com.google.common.collect.ImmutableList;
+import mezz.jei.api.recipe.IRecipeWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+import net.minecraftforge.oredict.OreDictionary;
+import vazkii.botania.api.recipe.RecipeRuneAltar;
+import vazkii.botania.client.core.handler.HUDHandler;
+import vazkii.botania.common.block.tile.mana.TilePool;
+
+import javax.annotation.Nonnull;
+import java.util.List;
+
+public class RunicAltarRecipeWrapper implements IRecipeWrapper {
+
+    private final List input;
+    private final ItemStack output;
+    private final int manaUsage;
+
+    public RunicAltarRecipeWrapper(RecipeRuneAltar recipe) {
+        ImmutableList.Builder builder = ImmutableList.builder();
+        for (Object o : recipe.getInputs()) {
+            if (o instanceof ItemStack) {
+                builder.add(o);
+            }
+            if (o instanceof String) {
+                builder.add(OreDictionary.getOres(((String) o)));
+            }
+        }
+        input = builder.build();
+        output = recipe.getOutput();
+        manaUsage = recipe.getManaUsage();
+    }
+
+    @Override
+    public List getInputs() {
+        return input;
+    }
+
+    @Override
+    public List<ItemStack> getOutputs() {
+        return ImmutableList.of(output);
+    }
+
+    @Override
+    public List<FluidStack> getFluidInputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public List<FluidStack> getFluidOutputs() {
+        return ImmutableList.of();
+    }
+
+    @Override
+    public void drawInfo(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {
+        GlStateManager.enableAlpha();
+        HUDHandler.renderManaBar(28, 113, 0x0000FF, 0.75F, manaUsage, TilePool.MAX_MANA / 10);
+        GlStateManager.disableAlpha();
+    }
+
+    @Override
+    public void drawAnimations(@Nonnull Minecraft minecraft, int recipeWidth, int recipeHeight) {}
+
+}
@@ -1,3 +1,11 @@
+/**
+ * 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.model;

 import com.google.common.base.Function;
@@ -42,6 +50,7 @@ import java.util.List;
 import java.util.Map;

 public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, IResourceManagerReloadListener {
+
    public static final FloatingFlowerModel INSTANCE = new FloatingFlowerModel();

    private static Table<IFloatingFlower.IslandType, String, CompositeBakedModel> CACHE = HashBasedTable.create();
@@ -87,6 +96,7 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I
        return getModel(islandType, identifier);
    }

+    // Get the model for this islandtype + flower type combination. If it's not cached already, generate it.
    private CompositeBakedModel getModel(IFloatingFlower.IslandType islandType, String identifier) {
        ModelManager modelManager = Minecraft.getMinecraft().getRenderItem().getItemModelMesher().getModelManager();

@@ -168,58 +178,35 @@ public class FloatingFlowerModel implements ISmartItemModel, ISmartBlockModel, I
            genQuads = genBuilder.build();
        }

-        @Override
-        public List<BakedQuad> getGeneralQuads() {
+        // Forward all to flower model
+        @Override public List<BakedQuad> getGeneralQuads() {
            return genQuads;
        }
-
-        @Override
-        public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); }
-
-        @Override
-        public boolean isAmbientOcclusion() {
+        @Override public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); }
+        @Override public boolean isAmbientOcclusion() {
            return base.isAmbientOcclusion();
        }
-
-        @Override
-        public boolean isGui3d() {
+        @Override public boolean isGui3d() {
            return true;
        }
-
-        @Override
-        public boolean isBuiltInRenderer() {
+        @Override public boolean isBuiltInRenderer() {
            return base.isBuiltInRenderer();
        }
-
-        @Override
-        public TextureAtlasSprite getParticleTexture() {
+        @Override public TextureAtlasSprite getParticleTexture() {
            return base.getParticleTexture();
        }
-
-        @Override
-        public ItemCameraTransforms getItemCameraTransforms() {
+        @Override public ItemCameraTransforms getItemCameraTransforms() {
            return base.getItemCameraTransforms();
        }
    }

-    @Override
-    public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); }
+    // Dummy results
+    @Override public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); }
+    @Override public List<BakedQuad> getGeneralQuads() { return ImmutableList.of(); }
+    @Override public boolean isAmbientOcclusion() { return false; }
+    @Override public boolean isGui3d() { return true; }
+    @Override public boolean isBuiltInRenderer() { return false; }
+    @Override public TextureAtlasSprite getParticleTexture() { return null; }
+    @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }

-    @Override
-    public List<BakedQuad> getGeneralQuads() { return ImmutableList.of(); }
-
-    @Override
-    public boolean isAmbientOcclusion() { return false; }
-
-    @Override
-    public boolean isGui3d() { return true; }
-
-    @Override
-    public boolean isBuiltInRenderer() { return false; }
-
-    @Override
-    public TextureAtlasSprite getParticleTexture() { return null; }
-
-    @Override
-    public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
 }
@@ -51,13 +51,14 @@ public class ModelBrewery extends ModelBase {
 		float f = 1F / 16F;

 		float offset = (float) Math.sin(time / 40) * 0.1F + 0.05F;
-		int plates = render.brewery.getSizeInventory() - 1;
+		boolean hasTile = render.brewery != null;
+		int plates = hasTile ? render.brewery.getSizeInventory() - 1 : 7;
 		float deg = (float) time / 16F;
 		float polerot = -deg * 25F;

 		GlStateManager.translate(0F, offset, 0F);
 		GlStateManager.rotate(polerot, 0F, 1F, 0F);
-		if(render.brewery.getStackInSlot(0) != null) {
+		if(hasTile && render.brewery.getStackInSlot(0) != null) {
 			GlStateManager.rotate(180F, 1F, 0F, 0F);
 			GlStateManager.translate(0, -0.45, 0);
 			//GlStateManager.translate(-1F / 8F, -0.5F, 1F / 128F);
@@ -80,7 +81,7 @@ public class ModelBrewery extends ModelBase {
 				offset1 = 0F;

 			GlStateManager.translate(0F, offset1, 0F);
-			if(render.brewery.getStackInSlot(i + 1) != null) {
+			if(hasTile && render.brewery.getStackInSlot(i + 1) != null) {
 				float rot = Plate.rotateAngleY * 180F / (float) Math.PI;
 				float transX = 0.3125F;
 				float transY = 1.06F;
@@ -16,6 +16,7 @@ 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;
 import net.minecraft.client.renderer.WorldRenderer;
 import net.minecraft.client.renderer.block.model.BakedQuad;
@@ -63,32 +64,31 @@ public class ModelPylon implements IPylonModel {

 	public ModelPylon() {
 		try {
+			// Load the OBJ
 			OBJModel model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj")));

+			// Apply the texture and flip the v's of the model
 			IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true"));
 			IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true"));
 			IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true"));

-			// Turn off all except "Crystal"
-			manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			// All groups are off by default
+			// (OBJState constructor is derp, so the boolean condition is inverted - pass false to turn on a group)

-			// Turn off all except "Crystal_Ring", and "Ring_Panel0x"
-			manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			// Turn on "Crystal"
+			manaCrystal = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			naturaCrystal = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			gaiaCrystal = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);

-			// Turn off all except "Ring_Gem0x"
-			manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
-			gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal", "Crystal_Ring", "Ring_Panel01", "Ring_Panel02",
-					"Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			// Turn on "Crystal_Ring", and "Ring_Panel0x"
+			manaRingsAndPanes = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			naturaRingsAndPanes = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			gaiaRingsAndPanes = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal_Ring", "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+
+			// Turn on "Ring_Gem0x"
+			manaGems = manaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			naturaGems = naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
+			gaiaGems = gaiaModel.bake(new OBJModel.OBJState(ImmutableList.of("Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04"), false), Attributes.DEFAULT_BAKED_FORMAT, TEXTUREGETTER);
 		} catch (IOException e) {
 			throw new ReportedException(new CrashReport("Error making pylon submodels for TESR!", e));
 		}
@@ -105,20 +105,24 @@ public class ModelPylon implements IPylonModel {

 	@Override
 	public void renderRing(PylonVariant variant) {
+		GlStateManager.disableLighting();
 		switch (variant) {
 			case MANA: renderModel(manaRingsAndPanes); break;
 			case NATURA: renderModel(naturaRingsAndPanes); break;
 			case GAIA: renderModel(gaiaRingsAndPanes); break;
 		}
+		GlStateManager.enableLighting();
 	}

 	@Override
 	public void renderGems(PylonVariant variant) {
+		GlStateManager.disableLighting();
 		switch (variant) {
 			case MANA: renderModel(manaGems); break;
 			case NATURA: renderModel(naturaGems); break;
 			case GAIA: renderModel(gaiaGems); break;
 		}
+		GlStateManager.enableLighting();
 	}

 	private void renderModel(IFlexibleBakedModel model)
@@ -141,4 +145,5 @@ public class ModelPylon implements IPylonModel {
 		for (BakedQuad bakedquad : quads)
 			LightUtil.renderQuadColor(renderer, bakedquad, color);
 	}
+
 }
@@ -0,0 +1,132 @@
+package vazkii.botania.client.model;
+
+import com.google.common.base.Function;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableMap;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.VertexFormat;
+import net.minecraft.client.resources.model.IBakedModel;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.client.model.Attributes;
+import net.minecraftforge.client.model.IFlexibleBakedModel;
+import net.minecraftforge.client.model.IModel;
+import net.minecraftforge.client.model.IPerspectiveAwareModel;
+import net.minecraftforge.client.model.ISmartItemModel;
+import net.minecraftforge.client.model.TRSRTransformation;
+import net.minecraftforge.client.model.obj.OBJLoader;
+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;
+import javax.vecmath.Vector3f;
+import java.io.IOException;
+import java.util.List;
+
+public class PylonItemModel implements ISmartItemModel {
+
+    private IBakedModel mana;
+    private IBakedModel natura;
+    private IBakedModel gaia;
+    private boolean cached = false;
+
+    @Override
+    public IBakedModel handleItemState(ItemStack stack) {
+        if (!cached) {
+            cacheModels();
+        }
+
+        switch (stack.getItemDamage()) {
+            case 2: return gaia;
+            case 1: return natura;
+            case 0: return mana;
+            default: 
+                return Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
+        }
+    }
+
+    private void cacheModels() {
+        // Load the OBJ
+        OBJModel model = null;
+        try {
+            model = ((OBJModel) OBJLoader.instance.loadModel(new ResourceLocation("botania:models/block/pylon.obj")));
+        } catch (IOException e) {
+            FMLLog.log(Level.ERROR, "[Botania]: Error loading pylon item model, substituting missing model");
+            mana = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
+            natura = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
+            gaia = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel();
+            cached = true;
+            return;
+        }
+
+        // Apply the texture and flip the v's of the model
+        IModel manaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon"))).process(ImmutableMap.of("flip-v", "true"));
+        IModel naturaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon1"))).process(ImmutableMap.of("flip-v", "true"));
+        IModel gaiaModel = ((OBJModel) model.retexture(ImmutableMap.of("#pylon", "botania:model/pylon2"))).process(ImmutableMap.of("flip-v", "true"));
+
+        // 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());
+            }
+        };
+
+        ImmutableList<String> standardGroups = ImmutableList.of("Crystal", "Crystal_Ring",
+                "Ring_Panel01", "Ring_Panel02", "Ring_Panel03", "Ring_Panel04",
+                "Ring_Gem01", "Ring_Gem02", "Ring_Gem03", "Ring_Gem04");
+
+        mana = new PerspectiveWrapper(manaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
+        // Natura model is just the crystal
+        natura = new PerspectiveWrapper(naturaModel.bake(new OBJModel.OBJState(ImmutableList.of("Crystal"), false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
+        gaia = new PerspectiveWrapper(gaiaModel.bake(new OBJModel.OBJState(standardGroups, false), Attributes.DEFAULT_BAKED_FORMAT, textureGetter));
+        cached = true;
+    }
+
+    @Override public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return ImmutableList.of(); }
+    @Override public List<BakedQuad> getGeneralQuads() { return ImmutableList.of(); }
+    @Override public boolean isAmbientOcclusion() { return false; }
+    @Override public boolean isGui3d() { return true; }
+    @Override public boolean isBuiltInRenderer() { return false; }
+    @Override public TextureAtlasSprite getParticleTexture() { return null; }
+    @Override public ItemCameraTransforms getItemCameraTransforms() { return ItemCameraTransforms.DEFAULT; }
+
+    // Wrapper to transform the model before rendering it, so it looks right in the inventory
+    private class PerspectiveWrapper implements IPerspectiveAwareModel {
+
+        private final IFlexibleBakedModel parent;
+
+        public PerspectiveWrapper(IBakedModel pylonModel) {
+            this.parent = new IFlexibleBakedModel.Wrapper(pylonModel, Attributes.DEFAULT_BAKED_FORMAT);
+        }
+
+        @Override
+        public Pair<? extends IFlexibleBakedModel, Matrix4f> handlePerspective(ItemCameraTransforms.TransformType cameraTransformType) {
+            switch(cameraTransformType) {
+                case FIRST_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, 0, 0.4F), null, new Vector3f(0.75F, 0.75F, 0.75F), null).getMatrix());
+                case GUI: return ImmutablePair.of(parent, TRSRTransformation.blockCenterToCorner(new TRSRTransformation(new Vector3f(0.5F, 0.1F, 0), null, null, null)).getMatrix());
+                case THIRD_PERSON: return ImmutablePair.of(parent, new TRSRTransformation(new Vector3f(0, -0.2F, 0.5F), null, null, null).getMatrix());
+                default: return ImmutablePair.of(parent, TRSRTransformation.identity().getMatrix());
+            }
+        }
+
+        @Override public VertexFormat getFormat() { return Attributes.DEFAULT_BAKED_FORMAT; }
+        @Override public List<BakedQuad> getFaceQuads(EnumFacing p_177551_1_) { return parent.getFaceQuads(p_177551_1_); }
+        @Override public List<BakedQuad> getGeneralQuads() { return parent.getGeneralQuads(); }
+        @Override public boolean isAmbientOcclusion() { return parent.isAmbientOcclusion(); }
+        @Override public boolean isGui3d() { return parent.isGui3d(); }
+        @Override public boolean isBuiltInRenderer() { return parent.isBuiltInRenderer(); }
+        @Override public TextureAtlasSprite getParticleTexture() { return parent.getParticleTexture(); }
+        @Override public ItemCameraTransforms getItemCameraTransforms() { return parent.getItemCameraTransforms(); }
+    }
+}
@@ -211,21 +211,21 @@ public class ModelArmorElementium extends ModelBiped {

 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		helm.showModel = slot == 0;
-		body.showModel = slot == 1;
-		armR.showModel = slot == 1;
-		armL.showModel = slot == 1;
-		legR.showModel = slot == 2;
-		legL.showModel = slot == 2;
-		bootL.showModel = slot == 3;
-		bootR.showModel = slot == 3;
+		helm.showModel = slot == 3; // 1.8: now reversed. Yay mojang.
+		body.showModel = slot == 2;
+		armR.showModel = slot == 2;
+		armL.showModel = slot == 2;
+		legR.showModel = slot == 1;
+		legL.showModel = slot == 1;
+		bootL.showModel = slot == 0;
+		bootR.showModel = slot == 0;
 		bipedHeadwear.showModel = false;

 		bipedHead = helm;
 		bipedBody = body;
 		bipedRightArm = armR;
 		bipedLeftArm = armL;
-		if(slot == 2) {
+		if(slot == 1) {
 			bipedRightLeg = legR;
 			bipedLeftLeg = legL;
 		} else {
@@ -240,6 +240,7 @@ public class ModelArmorElementium extends ModelBiped {
 	public void prepareForRender(Entity entity) {
 		EntityLivingBase living = (EntityLivingBase) entity;
 		isSneak = living != null ? living.isSneaking() : false;
+		isChild = living != null ? living.isChild() : false;
 		if(living != null && living instanceof EntityPlayer) {
 			EntityPlayer player = (EntityPlayer) living;

@@ -141,21 +141,21 @@ public class ModelArmorManasteel extends ModelBiped {

 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		helm.showModel = slot == 0;
-		body.showModel = slot == 1;
-		armR.showModel = slot == 1;
-		armL.showModel = slot == 1;
-		legR.showModel = slot == 2;
-		legL.showModel = slot == 2;
-		bootL.showModel = slot == 3;
-		bootR.showModel = slot == 3;
+		helm.showModel = slot == 3; // 1.8: now reversed. yay mojang.
+		body.showModel = slot == 2;
+		armR.showModel = slot == 2;
+		armL.showModel = slot == 2;
+		legR.showModel = slot == 1;
+		legL.showModel = slot == 1;
+		bootL.showModel = slot == 0;
+		bootR.showModel = slot == 0;
 		bipedHeadwear.showModel = false;

 		bipedHead = helm;
 		bipedBody = body;
 		bipedRightArm = armR;
 		bipedLeftArm = armL;
-		if(slot == 2) {
+		if(slot == 1) {
 			bipedRightLeg = legR;
 			bipedLeftLeg = legL;
 		} else {
@@ -170,6 +170,7 @@ public class ModelArmorManasteel extends ModelBiped {
 	public void prepareForRender(Entity entity) {
 		EntityLivingBase living = (EntityLivingBase) entity;
 		isSneak = living != null ? living.isSneaking() : false;
+		isChild = living != null ? living.isChild() : false;
 		if(living != null && living instanceof EntityPlayer) {
 			EntityPlayer player = (EntityPlayer) living;

@@ -141,21 +141,21 @@ public class ModelArmorManaweave extends ModelBiped {

 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		helm.showModel = slot == 0;
-		body.showModel = slot == 1;
-		armR.showModel = slot == 1;
-		armL.showModel = slot == 1;
-		legR.showModel = slot == 2;
-		legL.showModel = slot == 2;
-		bootL.showModel = slot == 3;
-		bootR.showModel = slot == 3;
+		helm.showModel = slot == 3; // 1.8: now reversed. yay mojang.
+		body.showModel = slot == 2;
+		armR.showModel = slot == 2;
+		armL.showModel = slot == 2;
+		legR.showModel = slot == 1;
+		legL.showModel = slot == 1;
+		bootL.showModel = slot == 0;
+		bootR.showModel = slot == 0;
 		bipedHeadwear.showModel = false;

 		bipedHead = helm;
 		bipedBody = body;
 		bipedRightArm = armR;
 		bipedLeftArm = armL;
-		if(slot == 2) {
+		if(slot == 1) {
 			bipedRightLeg = legR;
 			bipedLeftLeg = legL;
 		} else {
@@ -170,6 +170,7 @@ public class ModelArmorManaweave extends ModelBiped {
 	public void prepareForRender(Entity entity) {
 		EntityLivingBase living = (EntityLivingBase) entity;
 		isSneak = living != null ? living.isSneaking() : false;
+		isChild = living != null ? living.isChild() : false;
 		if(living != null && living instanceof EntityPlayer) {
 			EntityPlayer player = (EntityPlayer) living;

@@ -232,21 +232,21 @@ public class ModelArmorTerrasteel extends ModelBiped {

 	@Override
 	public void render(Entity entity, float f, float f1, float f2, float f3, float f4, float f5) {
-		helm.showModel = slot == 0;
-		body.showModel = slot == 1;
-		armr.showModel = slot == 1;
-		armL.showModel = slot == 1;
-		legR.showModel = slot == 2;
-		legL.showModel = slot == 2;
-		bootL.showModel = slot == 3;
-		bootR.showModel = slot == 3;
+		helm.showModel = slot == 3; // 1.8: now reversed. yay mojang.
+		body.showModel = slot == 2;
+		armr.showModel = slot == 2;
+		armL.showModel = slot == 2;
+		legR.showModel = slot == 1;
+		legL.showModel = slot == 1;
+		bootL.showModel = slot == 0;
+		bootR.showModel = slot == 0;
 		bipedHeadwear.showModel = false;

 		bipedHead = helm;
 		bipedBody = body;
 		bipedRightArm = armr;
 		bipedLeftArm = armL;
-		if(slot == 2) {
+		if(slot == 1) {
 			bipedRightLeg = legR;
 			bipedLeftLeg = legL;
 		} else {
@@ -261,6 +261,7 @@ public class ModelArmorTerrasteel extends ModelBiped {
 	public void prepareForRender(Entity entity) {
 		EntityLivingBase living = (EntityLivingBase) entity;
 		isSneak = living != null ? living.isSneaking() : false;
+		isChild = living != null ? living.isChild() : false;
 		if(living != null && living instanceof EntityPlayer) {
 			EntityPlayer player = (EntityPlayer) living;

@@ -1,11 +1,18 @@
-package vazkii.botania.api.render;
+/**
+ * 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;

 import com.google.common.base.Function;
 import com.google.common.base.Optional;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
-import com.google.common.collect.Maps;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
 import net.minecraft.block.state.IBlockState;
@@ -33,9 +40,8 @@ import net.minecraftforge.client.model.TRSRTransformation;
 import net.minecraftforge.common.property.IExtendedBlockState;
 import net.minecraftforge.fml.common.FMLLog;
 import org.apache.commons.lang3.tuple.Pair;
-import vazkii.botania.api.BotaniaAPI;
+import vazkii.botania.api.BotaniaAPIClient;
 import vazkii.botania.api.state.BotaniaStateProps;
-import vazkii.botania.api.subtile.SubTileEntity;
 import vazkii.botania.common.block.decor.IFloatingFlower;
 import vazkii.botania.common.item.block.ItemBlockSpecialFlower;

@@ -48,53 +54,8 @@ import java.util.Map;

 public class SpecialFlowerModel implements IModelCustomData {

-    /**
-     * Register your model for the given subtile class here.
-     * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work.
-     * Your model json must specify key "tintindex" in all the faces it wants tint applied.
-     * Tint is applied whenever a player recolors the flower using floral dye
-     * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process
-     *
-     * @param subTileName The String ID of the subtile
-     * @param model A path to a blockstate json and variant to be used for this subtile
-     * @param itemModel A path to a blockstate json and variant to be used for this subtile's item form
-     */
-    public static void register(String subTileName, ModelResourceLocation model, ModelResourceLocation itemModel) {
-        queuedBlockModels.put(subTileName, model);
-        queuedItemModels.put(subTileName, itemModel);
-    }
-
-    /**
-     * Register your model for the given subtile class here.
-     * Call this DURING PREINIT. Calling it anytime after blockModels have already baked does not guarantee that your model will work.
-     * Your model json must specify key "tintindex" in all the faces it wants tint applied.
-     * Tint is applied whenever a player recolors the flower using floral dye
-     * todo 1.8.8 move this elsewhere or otherwise make it fit better with the rest of the subtile registration process
-     *
-     * @param subTileName The String ID of the subtile
-     * @param model A path to a blockstate json and variant to be used the block. The item model will be drawn from the same blockstate json, from variant "inventory"
-     */
-    public static void register(String subTileName, ModelResourceLocation model) {
-        register(subTileName, model, new ModelResourceLocation(model.getResourceDomain() + ":" + model.getResourcePath(), "inventory"));
-    }
-
-    public static void register(Class<? extends SubTileEntity> clazz, ModelResourceLocation model) {
-        register(BotaniaAPI.getSubTileStringMapping(clazz), model);
-    }
-
-    public static void register(Class<? extends SubTileEntity> clazz, ModelResourceLocation model, ModelResourceLocation itemModel) {
-        register(BotaniaAPI.getSubTileStringMapping(clazz), model, itemModel);
-    }
-
-    /**
-     * Internal implementation
-     **/
    // SpecialFlowerModel for when there are no blockModels registered for a subtile
    public static final SpecialFlowerModel INSTANCE = new SpecialFlowerModel(ImmutableMap.<Optional<String>, ModelResourceLocation>of(), ImmutableMap.<Optional<String>, ModelResourceLocation>of());
-    // Models registered from the externel API thus far
-    private static final Map<String, ModelResourceLocation> queuedBlockModels = Maps.newHashMap();
-    private static final Map<String, ModelResourceLocation> queuedItemModels = Maps.newHashMap();
-

    private final ImmutableMap<Optional<String>, ModelResourceLocation> blockModels;
    private final ImmutableMap<Optional<String>, ModelResourceLocation> itemModels;
@@ -111,7 +72,7 @@ public class SpecialFlowerModel implements IModelCustomData {
        builder.addAll(blockModels.values());
        builder.addAll(itemModels.values());

-        // Force mini island model to be loaded and baked, for use elsewhere. See <TODO>
+        // Force mini island model to be loaded and baked, for use elsewhere. See FloatingFlowerModel
        for (IFloatingFlower.IslandType i : IFloatingFlower.IslandType.values()) {
            builder.add(new ModelResourceLocation("botania:miniIsland", "variant=" + i.name().toLowerCase(Locale.ROOT)));
        }
@@ -147,10 +108,10 @@ public class SpecialFlowerModel implements IModelCustomData {
            }
        }

-        for (Map.Entry<String, ModelResourceLocation> e : queuedBlockModels.entrySet()) {
+        for (Map.Entry<String, ModelResourceLocation> e : BotaniaAPIClient.getRegisteredSubtileBlockModels().entrySet()) {
            blockBuilder.put(Optional.of(e.getKey()), e.getValue());
        }
-        for (Map.Entry<String, ModelResourceLocation> e : queuedItemModels.entrySet()) {
+        for (Map.Entry<String, ModelResourceLocation> e : BotaniaAPIClient.getRegisteredSubtileItemModels().entrySet()) {
            itemBuilder.put(Optional.of(e.getKey()), e.getValue());
        }

@@ -214,6 +175,7 @@ public class SpecialFlowerModel implements IModelCustomData {

        private void refreshBakedModels() {
            if (baseModel == null) {
+                // If not done already, steal all the real baked models and cache them
                ModelManager manager = Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager();
                baseModel = getBlockModel(manager, Optional.<String>absent());

@@ -327,9 +289,6 @@ public class SpecialFlowerModel implements IModelCustomData {
            refreshBakedModels();
            IExtendedBlockState extendedState = ((IExtendedBlockState) state);
            IBakedModel ret = bakedBlockModels.get(extendedState.getValue(BotaniaStateProps.SUBTILE_ID));
-            if (ret == null) {
-                System.out.println("Warning: no flower model for subtile: " + extendedState.getValue(BotaniaStateProps.SUBTILE_ID));
-            }
            return ret == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : ret;
        }

@@ -346,14 +305,13 @@ public class SpecialFlowerModel implements IModelCustomData {
        @Override
        public IBakedModel handleItemState(ItemStack stack) {
            refreshBakedModels();
-            //System.out.println("calling smart item");
            IBakedModel item = bakedItemModels.get(ItemBlockSpecialFlower.getType(stack));
            if (item == null) {
-                System.out.println("Missing item model, selecting block model");
                item = bakedBlockModels.get(ItemBlockSpecialFlower.getType(stack));
            }

            return item == null ? Minecraft.getMinecraft().getBlockRendererDispatcher().getBlockModelShapes().getModelManager().getMissingModel() : item;
        }
    }
+
 }
@@ -99,12 +99,14 @@ public class RenderLexicon implements IItemRenderer {
 			font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover0"), 0, 0, 0x79ff92);

 			GlStateManager.translate(0F, 10F, 0F);
-			font.drawString(EnumChatFormatting.UNDERLINE + StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);
+			font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover1"), 0, 0, 0x79ff92);

 			GlStateManager.translate(0F, 50F, 0F);
 			font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover2"), 0, 0, 0x79ff92);
+
 			GlStateManager.translate(0F, 10F, 0F);
-			font.drawString(EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
+			font.drawString(EnumChatFormatting.UNDERLINE + "" + EnumChatFormatting.ITALIC + StatCollector.translateToLocal("botaniamisc.lexiconcover3"), 0, 0, 0x79ff92);
+
 			if(bevo || saice) {
 				GlStateManager.translate(0F, 10F, 0F);
 				font.drawString(StatCollector.translateToLocal("botaniamisc.lexiconcover" + (bevo ? 4 : 5)), 0, 0, 0x79ff92);
@@ -21,18 +21,26 @@ import net.minecraft.tileentity.TileEntity;

 import org.lwjgl.opengl.GL11;

+import vazkii.botania.api.state.BotaniaStateProps;
+import vazkii.botania.api.state.enums.AlfPortalState;
 import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.handler.RenderEventHandler;
 import vazkii.botania.common.block.BlockAlfPortal;
+import vazkii.botania.common.block.ModBlocks;
 import vazkii.botania.common.block.tile.TileAlfPortal;

-public class RenderTileAlfPortal extends TileEntitySpecialRenderer {
+public class RenderTileAlfPortal extends TileEntitySpecialRenderer<TileAlfPortal> {

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileAlfPortal portal = (TileAlfPortal) tileentity;
-		int meta = portal.getBlockMetadata();
-		if(meta == 0)
+	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(state == AlfPortalState.OFF)
 			return;

 		GlStateManager.pushMatrix();
@@ -49,7 +57,7 @@ public class RenderTileAlfPortal extends TileEntitySpecialRenderer {

 		Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);

-		if(meta == 2) {
+		if(state == AlfPortalState.ON_X) {
 			GlStateManager.translate(1.25F, 0F, 1.75F);
 			GlStateManager.rotate(90F, 0F, 1F, 0F);
 		}
@@ -38,7 +38,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelAltar;
 import vazkii.botania.common.block.tile.TileAltar;

-public class RenderTileAltar extends TileEntitySpecialRenderer {
+public class RenderTileAltar extends TileEntitySpecialRenderer<TileAltar> {

 	private static final ResourceLocation[] textures = new ResourceLocation[] {
 		new ResourceLocation(LibResources.MODEL_ALTAR),
@@ -58,9 +58,7 @@ public class RenderTileAltar extends TileEntitySpecialRenderer {
 	public static int forceMeta = -1;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
-		TileAltar altar = (TileAltar) tileentity;
-
+	public void renderTileEntityAt(TileAltar altar, double d0, double d1, double d2, float pticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
@@ -33,7 +33,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelAvatar;
 import vazkii.botania.common.block.tile.TileAvatar;

-public class RenderTileAvatar extends TileEntitySpecialRenderer {
+public class RenderTileAvatar extends TileEntitySpecialRenderer<TileAvatar> {

 	private static final float[] ROTATIONS = new float[] {
 		180F, 0F, 90F, 270F
@@ -43,22 +43,28 @@ public class RenderTileAvatar extends TileEntitySpecialRenderer {
 	private static final ModelAvatar model = new ModelAvatar();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
-		TileAvatar avatar = (TileAvatar) tileentity;
-
+	public void renderTileEntityAt(TileAvatar avatar, double d0, double d1, double d2, float pticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		int meta = avatar.getWorld() != null ? avatar.getBlockMetadata() : 0;
+		int meta = avatar != null && avatar.getWorld() != null ? avatar.getBlockMetadata() : 0;

 		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);
 		model.render();

+		if (avatar == null) {
+			GlStateManager.color(1F, 1F, 1F);
+			GlStateManager.scale(1F, -1F, -1F);
+			GlStateManager.enableRescaleNormal();
+			GlStateManager.popMatrix();
+			return;
+		}
+
 		ItemStack stack = avatar.getStackInSlot(0);
 		if(stack != null) {
 			GlStateManager.pushMatrix();
@@ -23,7 +23,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelBellows;
 import vazkii.botania.common.block.tile.mana.TileBellows;

-public class RenderTileBellows extends TileEntitySpecialRenderer {
+public class RenderTileBellows extends TileEntitySpecialRenderer<TileBellows> {

 	private static final float[] ROTATIONS = new float[] {
 		180F, 0F, 90F, 270F
@@ -33,21 +33,19 @@ public class RenderTileBellows extends TileEntitySpecialRenderer {
 	private static final ModelBellows model = new ModelBellows();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileBellows bellows = (TileBellows) tileentity;
-
+	public void renderTileEntityAt(TileBellows bellows, double d0, double d1, double d2, float f, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		int meta = bellows.getWorld() != null ? bellows.getBlockMetadata() : 0;
+		int meta = bellows != null && bellows.getWorld() != null ? bellows.getBlockMetadata() : 0;

 		GlStateManager.translate(0.5F, 1.5F, 0.5F);
 		GlStateManager.scale(1F, -1F, -1F);
 		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, meta - 2), 0)], 0F, 1F, 0F);
-		model.render(Math.max(0.1F, 1F - (bellows.movePos + bellows.moving * f + 0.1F)));
+		model.render(Math.max(0.1F, 1F - (bellows == null ? 0 : (bellows.movePos + bellows.moving * f + 0.1F))));
 		GlStateManager.color(1F, 1F, 1F);
 		GlStateManager.scale(1F, -1F, -1F);
 		GlStateManager.enableRescaleNormal();
@@ -35,7 +35,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelBrewery;
 import vazkii.botania.common.block.tile.TileBrewery;

-public class RenderTileBrewery extends TileEntitySpecialRenderer {
+public class RenderTileBrewery extends TileEntitySpecialRenderer<TileBrewery> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_BREWERY);
 	ModelBrewery model = new ModelBrewery();
@@ -43,8 +43,8 @@ public class RenderTileBrewery extends TileEntitySpecialRenderer {
 	public static boolean rotate = true;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		brewery = (TileBrewery) tileentity;
+	public void renderTileEntityAt(TileBrewery brewery, double d0, double d1, double d2, float f, int digProgress) {
+		this.brewery = brewery;
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
@@ -23,15 +23,13 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelCocoon;
 import vazkii.botania.common.block.tile.TileCocoon;

-public class RenderTileCocoon extends TileEntitySpecialRenderer {
+public class RenderTileCocoon extends TileEntitySpecialRenderer<TileCocoon> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_COCOON);
 	ModelCocoon model = new ModelCocoon();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileCocoon cocoon = (TileCocoon) tileentity;
-
+	public void renderTileEntityAt(TileCocoon cocoon, double d0, double d1, double d2, float f, int digProgress) {
 		float rot = 0F;
 		float modval = 60F - (float) cocoon.timePassed / (float) TileCocoon.TOTAL_TIME * 30F;
 		if(cocoon.timePassed % modval < 10) {
@@ -32,25 +32,26 @@ import vazkii.botania.client.model.ModelCrystalCube;
 import vazkii.botania.common.block.tile.corporea.TileCorporeaCrystalCube;
 import vazkii.botania.common.lib.LibObfuscation;

-public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer {
+public class RenderTileCorporeaCrystalCube extends TileEntitySpecialRenderer<TileCorporeaCrystalCube> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_CRYSTAL_CUBE);
 	ModelCrystalCube model = new ModelCrystalCube();
 	EntityItem entity = null;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileCorporeaCrystalCube cube = (TileCorporeaCrystalCube) tileentity;
+	public void renderTileEntityAt(TileCorporeaCrystalCube cube, double d0, double d1, double d2, float f, int digProgress) {
+		ItemStack stack = null;
+		if (cube != null) {
+			if(entity == null)
+                entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));

-		if(entity == null)
-			entity = new EntityItem(cube.getWorld(), cube.getPos().getX(), cube.getPos().getY(), cube.getPos().getZ(), new ItemStack(Blocks.stone));
-
-		ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE);
-		ItemStack stack = cube.getRequestTarget();
-		entity.setEntityItemStack(stack);
+			ObfuscationReflectionHelper.setPrivateValue(EntityItem.class, entity, ClientTickHandler.ticksInGame, LibObfuscation.AGE);
+			stack = cube.getRequestTarget();
+			entity.setEntityItemStack(stack);
+		}

 		double time = ClientTickHandler.ticksInGame + f;
-		double worldTicks = tileentity.getWorld() == null ? 0 : time;
+		double worldTicks = cube == null || cube.getWorld() == null ? 0 : time;

 		Minecraft mc = Minecraft.getMinecraft();
 		GlStateManager.pushMatrix();
@@ -23,15 +23,15 @@ import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.common.block.tile.corporea.TileCorporeaIndex;

-public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer {
+public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer<TileCorporeaIndex> {

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

 	@Override
-	public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partticks, int digProgress) {
-		TileCorporeaIndex index = (TileCorporeaIndex) tile;
+	public void renderTileEntityAt(TileCorporeaIndex index, double x, double y, double z, float partticks, int digProgress) {
+		move = index != null;

 		GlStateManager.pushMatrix();
 		GlStateManager.translate(x + 0.5, y, z + 0.5);
@@ -44,7 +44,7 @@ public class RenderTileCorporeaIndex extends TileEntitySpecialRenderer {
 		crystal.render(null, 0F, rotation, translation, 0F, 0F, 1F / 16F);
 		GlStateManager.scale(1F / scale, 1F / scale, 1F / scale);

-		if(index.closeby > 0F) {
+		if(index != null && index.closeby > 0F) {
 			float starScale = 0.02F;
 			float starRadius = (float) TileCorporeaIndex.RADIUS * index.closeby + (index.closeby == 1F ? 0F : index.hasCloseby ? partticks : -partticks) * 0.2F;
 			double rads = (index.ticksWithCloseby + partticks) * 2 * Math.PI / 180;
@@ -34,13 +34,12 @@ import vazkii.botania.common.block.mana.BlockEnchanter;
 import vazkii.botania.common.block.tile.TileEnchanter;
 import vazkii.botania.common.lib.LibObfuscation;

-public class RenderTileEnchanter extends TileEntitySpecialRenderer {
+public class RenderTileEnchanter extends TileEntitySpecialRenderer<TileEnchanter> {

 	EntityItem item;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileEnchanter enchanter = (TileEnchanter) tileentity;
+	public void renderTileEntityAt(TileEnchanter enchanter, double d0, double d1, double d2, float f, int digProgress) {
 		float alphaMod = 0F;

 		if(enchanter.stage == 2)
@@ -33,6 +33,7 @@ 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 {

@@ -26,43 +26,41 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelHourglass;
 import vazkii.botania.common.block.tile.TileHourglass;

-public class RenderTileHourglass extends TileEntitySpecialRenderer {
+public class RenderTileHourglass extends TileEntitySpecialRenderer<TileHourglass> {

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

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) {
-		TileHourglass hourglass = (TileHourglass) tileentity;
-
+	public void renderTileEntityAt(TileHourglass hourglass, double d0, double d1, double d2, float ticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);
 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-
-		int wtime = tileentity.getWorld() == null ? 0 : ClientTickHandler.ticksInGame;
+		boolean hasWorld = hourglass != null && hourglass.getWorld() != null;
+		int wtime = !hasWorld ? 0 : ClientTickHandler.ticksInGame;
 		if(wtime != 0)
-			wtime += new Random(tileentity.getPos().hashCode()).nextInt(360);
+			wtime += new Random(hourglass.getPos().hashCode()).nextInt(360);

 		float time = wtime == 0 ? 0 : wtime + ticks;
 		float x = 0.5F + (float) Math.cos(time * 0.05F) * 0.025F;
 		float y = 0.55F + (float) (Math.sin(time * 0.04F) + 1F) * 0.05F;
 		float z = 0.5F + (float) Math.sin(time * 0.05F) * 0.025F;
-		ItemStack stack = hourglass.getStackInSlot(0);
+		ItemStack stack = hasWorld ? hourglass.getStackInSlot(0) : null;

 		float fract1 = stack == null ? 0 : hourglass.timeFraction;
 		float fract2 = stack == null ? 0 : 1F - hourglass.timeFraction;
 		GlStateManager.translate(x, y, z);

-		float rot = hourglass.flip ? 180F : 1F;
-		if(hourglass.flipTicks > 0)
+		float rot = hasWorld && hourglass.flip ? 180F : 1F;
+		if(hasWorld && hourglass.flipTicks > 0)
 			rot += (hourglass.flipTicks - ticks) * (180F / 4F);
 		GlStateManager.rotate(rot, 0F, 0F, 1F);

 		GlStateManager.scale(1F, -1F, -1F);
-		model.render(fract1, fract2, hourglass.flip, hourglass.getColor());
+		model.render(fract1, fract2, hasWorld && hourglass.flip, hasWorld ? hourglass.getColor() : 0);
 		GlStateManager.scale(1F, -1F, -1F);
 		GlStateManager.popMatrix();
 	}
@@ -32,7 +32,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelIncensePlate;
 import vazkii.botania.common.block.tile.TileIncensePlate;

-public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
+public class RenderTileIncensePlate extends TileEntitySpecialRenderer<TileIncensePlate> {

 	private static final float[] ROTATIONS = new float[] {
 		180F, 0F, 90F, 270F
@@ -42,9 +42,7 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
 	ModelIncensePlate model = new ModelIncensePlate();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) {
-		TileIncensePlate plate = (TileIncensePlate) tileentity;
-
+	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;

 		GlStateManager.pushMatrix();
@@ -53,11 +51,11 @@ public class RenderTileIncensePlate extends TileEntitySpecialRenderer {
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);
-		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+		// Minecraft.getMinecraft().renderEngine.bindTexture(texture);
 		GlStateManager.translate(0.5F, 1.5F, 0.5F);
 		GlStateManager.scale(1F, -1F, -1F);
 		GlStateManager.rotate(ROTATIONS[Math.max(Math.min(ROTATIONS.length, facing.getIndex() - 2), 0)], 0F, 1F, 0F);
-		model.render();
+		// model.render();
 		GlStateManager.scale(1F, -1F, -1F);

 		ItemStack stack = plate.getStackInSlot(0);
@@ -27,11 +27,12 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
 import vazkii.botania.client.core.handler.RenderEventHandler;
 import vazkii.botania.client.core.helper.ShaderHelper;
 import vazkii.botania.common.block.BlockLightRelay;
+import vazkii.botania.common.block.tile.TileLightRelay;

-public class RenderTileLightRelay extends TileEntitySpecialRenderer {
+public class RenderTileLightRelay extends TileEntitySpecialRenderer<TileLightRelay> {

 	@Override
-	public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float pticks, int digProgress) {
+	public void renderTileEntityAt(TileLightRelay tile, double x, double y, double z, float pticks, int digProgress) {
 		Minecraft mc = Minecraft.getMinecraft();
 		TextureAtlasSprite iicon = tile.getBlockMetadata() > 0 ? RenderEventHandler.INSTANCE.lightRelayWorldIconRed : RenderEventHandler.INSTANCE.lightRelayWorldIcon;

@@ -87,13 +88,12 @@ public class RenderTileLightRelay extends TileEntitySpecialRenderer {
 		float f5 = 0.5F;
 		float f6 = 0.25F;

-		p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX);
-		//p_77026_1_.getWorldRenderer().putNormal(0.0F, 1.0F, 0.0F);
+		p_77026_1_.getWorldRenderer().begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_NORMAL);
 		//p_77026_1_.getWorldRenderer().setBrightness(240);
-		p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).endVertex();
-		p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).endVertex();
-		p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).endVertex();
-		p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).endVertex();
+		p_77026_1_.getWorldRenderer().pos(0.0F - f5, 0.0F - f6, 0.0D).tex(f, f3).normal(0, 1, 0).endVertex();
+		p_77026_1_.getWorldRenderer().pos(f4 - f5, 0.0F - f6, 0.0D).tex(f1, f3).normal(0, 1, 0).endVertex();
+		p_77026_1_.getWorldRenderer().pos(f4 - f5, f4 - f6, 0.0D).tex(f1, f2).normal(0, 1, 0).endVertex();
+		p_77026_1_.getWorldRenderer().pos(0.0F - f5, f4 - f6, 0.0D).tex(f, f2).normal(0, 1, 0).endVertex();
 		p_77026_1_.draw();

 	}
@@ -36,7 +36,7 @@ import vazkii.botania.client.model.ModelPool;
 import vazkii.botania.common.block.mana.BlockPool;
 import vazkii.botania.common.block.tile.mana.TilePool;

-public class RenderTilePool extends TileEntitySpecialRenderer {
+public class RenderTilePool extends TileEntitySpecialRenderer<TilePool> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_POOL);
 	private static final ResourceLocation textureInf = new ResourceLocation(LibResources.MODEL_INFINITE_POOL);
@@ -49,9 +49,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
 	public static int forceManaNumber = -1;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TilePool pool = (TilePool) tileentity;
-
+	public void renderTileEntityAt(TilePool pool, double d0, double d1, double d2, float f, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableBlend();
 		GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
@@ -60,9 +58,9 @@ public class RenderTilePool extends TileEntitySpecialRenderer {

 		GlStateManager.color(1F, 1F, 1F, a);
 		GlStateManager.translate(d0, d1, d2);
-		boolean inf = tileentity.getWorld() == null ? forceMeta == 1 : tileentity.getBlockMetadata() == 1;
-		boolean dil = tileentity.getWorld() == null ? forceMeta == 2 : tileentity.getBlockMetadata() == 2;
-		boolean fab = tileentity.getWorld() == null ? forceMeta == 3 : tileentity.getBlockMetadata() == 3;
+		boolean inf = pool.getWorld() == null ? forceMeta == 1 : pool.getBlockMetadata() == 1;
+		boolean dil = pool.getWorld() == null ? forceMeta == 2 : pool.getBlockMetadata() == 2;
+		boolean fab = pool.getWorld() == null ? forceMeta == 3 : pool.getBlockMetadata() == 3;

 		Minecraft.getMinecraft().renderEngine.bindTexture(inf ? textureInf : dil ? textureDil : texture);

@@ -70,8 +68,8 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
 		GlStateManager.scale(1F, -1F, -1F);
 		if(fab) {
 			float time = ClientTickHandler.ticksInGame + ClientTickHandler.partialTicks;
-			if(tileentity != null)
-				time += new Random(tileentity.getPos().hashCode()).nextInt(100000);
+			if(pool != null)
+				time += new Random(pool.getPos().hashCode()).nextInt(100000);

 			Color color = Color.getHSBColor(time * 0.005F, 0.6F, 1F);
 			GL11.glColor4ub((byte) color.getRed(), (byte) color.getGreen(), (byte) color.getBlue(), (byte) 255);
@@ -84,7 +82,7 @@ public class RenderTilePool extends TileEntitySpecialRenderer {
 		}

 		model.render();
-		GlStateManager.color(1F, 1F, 1F, a);
+		GL11.glColor4f(1F, 1F, 1F, a); // Use GL11 manually since we call color4ub above, and GlStateManager doesn't know that, so the color leaks
 		GlStateManager.scale(1F, -1F, -1F);
 		GlStateManager.enableRescaleNormal();

@@ -25,11 +25,10 @@ import vazkii.botania.client.core.handler.ClientTickHandler;
 //import vazkii.botania.client.render.item.RenderLens;
 import vazkii.botania.common.block.tile.mana.TilePrism;

-public class RenderTilePrism extends TileEntitySpecialRenderer {
+public class RenderTilePrism extends TileEntitySpecialRenderer<TilePrism> {

 	@Override
-	public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float partTicks, int digProgress) {
-		TilePrism prism = (TilePrism) tile;
+	public void renderTileEntityAt(TilePrism prism, double x, double y, double z, float partTicks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.translate(x, y, z);
 		float pos = (float) Math.sin((ClientTickHandler.ticksInGame + partTicks) * 0.05F) * 0.5F * (1F - 1F / 16F) - 0.5F;
@@ -39,7 +38,6 @@ public class RenderTilePrism extends TileEntitySpecialRenderer {
 		if(stack != null) {
 			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
 			if(stack.getItem() instanceof ILens) {
-				ILens lens = (ILens) stack.getItem();
 				GlStateManager.pushMatrix();
 				GlStateManager.rotate(90F, 1F, 0F, 0F);
 				GlStateManager.translate(0.5F, 0.5F, pos);
@@ -23,7 +23,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelPump;
 import vazkii.botania.common.block.tile.mana.TilePump;

-public class RenderTilePump extends TileEntitySpecialRenderer {
+public class RenderTilePump extends TileEntitySpecialRenderer<TilePump> {

 	private static final float[] ROTATIONS = new float[] {
 		180F, 0F, 90F, 270F
@@ -33,21 +33,19 @@ public class RenderTilePump extends TileEntitySpecialRenderer {
 	private static final ModelPump model = new ModelPump();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TilePump pump = (TilePump) tileentity;
-
+	public void renderTileEntityAt(TilePump pump, double d0, double d1, double d2, float f, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(d0, d1, d2);

 		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
-		int meta = pump.getWorld() != null ? pump.getBlockMetadata() : 0;
+		int meta = pump != null && pump.getWorld() != null ? pump.getBlockMetadata() : 0;

 		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);
-		model.render(Math.max(0F, Math.min(8F, pump.innerRingPos + pump.moving * f)));
+		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);
 		GlStateManager.enableRescaleNormal();
@@ -34,9 +34,11 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.IPylonModel;
 import vazkii.botania.client.model.ModelPylon;
 import vazkii.botania.client.model.ModelPylonOld;
+import vazkii.botania.common.block.ModBlocks;
+import vazkii.botania.common.block.tile.TilePylon;
 import vazkii.botania.common.core.handler.ConfigHandler;

-public class RenderTilePylon extends TileEntitySpecialRenderer {
+public class RenderTilePylon extends TileEntitySpecialRenderer<TilePylon> {

 	private static final ResourceLocation textureOld = new ResourceLocation(LibResources.MODEL_PYLON_OLD);
 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_PYLON);
@@ -52,7 +54,7 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
 	public static boolean pink = false;

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
+	public void renderTileEntityAt(TilePylon pylon, double d0, double d1, double d2, float pticks, int digProgress) {
 		if(model == null)
 			model = ConfigHandler.oldPylonModel ? new ModelPylonOld() : new ModelPylon();

@@ -63,8 +65,8 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
 			float a = MultiblockRenderHandler.rendering ? 0.6F : 1F;
 			GlStateManager.color(1F, 1F, 1F, a);
 			PylonVariant variant = null;
-			if(tileentity.getWorld() != null) {
-				variant = ((PylonVariant) tileentity.getWorld().getBlockState(tileentity.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT));
+			if(pylon.getWorld() != null && pylon.getWorld().getBlockState(pylon.getPos()).getBlock() == ModBlocks.pylon) {
+				variant = pylon.getWorld().getBlockState(pylon.getPos()).getValue(BotaniaStateProps.PYLON_VARIANT);
 				green = variant == PylonVariant.NATURA;
 				pink = variant == PylonVariant.GAIA;
 			}
@@ -73,10 +75,10 @@ public class RenderTilePylon extends TileEntitySpecialRenderer {
 				Minecraft.getMinecraft().renderEngine.bindTexture(pink ? texturePinkOld : green ? textureGreenOld : textureOld);
 			else Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);

-			double worldTime = tileentity.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks);
+			double worldTime = pylon.getWorld() == null ? 0 : (double) (ClientTickHandler.ticksInGame + pticks);

-			if(tileentity != null)
-				worldTime += new Random(tileentity.getPos().hashCode()).nextInt(360);
+			if(pylon != null)
+				worldTime += new Random(pylon.getPos().hashCode()).nextInt(360);

 			if(ConfigHandler.oldPylonModel) {
 				GlStateManager.translate(d0 + 0.5, d1 + 2.2, d2 + 0.5);
@@ -15,11 +15,10 @@ import net.minecraft.tileentity.TileEntity;
 import vazkii.botania.client.core.handler.RedStringRenderer;
 import vazkii.botania.common.block.tile.string.TileRedString;

-public class RenderTileRedString extends TileEntitySpecialRenderer {
+public class RenderTileRedString extends TileEntitySpecialRenderer<TileRedString> {

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) {
-		TileRedString trs = (TileRedString) tileentity;
+	public void renderTileEntityAt(TileRedString trs, double x, double y, double z, float partticks, int digProgress) {
 		RedStringRenderer.redStringTiles.add(trs);
 	}
 }
@@ -33,14 +33,12 @@ import vazkii.botania.client.core.helper.RenderHelper;
 import vazkii.botania.client.model.ModelSpinningCubes;
 import vazkii.botania.common.block.tile.TileRuneAltar;

-public class RenderTileRuneAltar extends TileEntitySpecialRenderer {
+public class RenderTileRuneAltar extends TileEntitySpecialRenderer<TileRuneAltar> {

 	ModelSpinningCubes cubes = new ModelSpinningCubes();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double x, double y, double z, float partticks, int digProgress) {
-		TileRuneAltar altar = (TileRuneAltar) tileentity;
-
+	public void renderTileEntityAt(TileRuneAltar altar, double x, double y, double z, float partticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.color(1F, 1F, 1F, 1F);
 		GlStateManager.translate(x, y, z);
@@ -39,14 +39,15 @@ public class RenderTileSkullOverride extends TileEntitySkullRenderer {

 	@Override
 	public void renderTileEntityAt(TileEntitySkull p_147500_1_, double p_147500_2_, double p_147500_4_, double p_147500_6_, float p_147500_8_, int digProgress) {
-		if (p_147500_1_ instanceof TileEntitySkull) {
-			TileEntitySkull skull = ((TileEntitySkull) p_147500_1_);
-			render(skull, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, skull.getSkullRotation() * 360 / 16.0F, skull.getSkullType(), skull.getPlayerProfile(), digProgress);
+		if (p_147500_1_ != null) {
+			render(p_147500_1_, (float) p_147500_2_, (float) p_147500_4_, (float) p_147500_6_, EnumFacing.getFront(p_147500_1_.getBlockMetadata() & 7) /*todo 1.8*/, p_147500_1_.getSkullRotation() * 360 / 16.0F, p_147500_1_.getSkullType(), p_147500_1_.getPlayerProfile(), digProgress);
+		} else {
+			render(null, ((float) p_147500_2_), ((float) p_147500_4_), ((float) p_147500_6_), EnumFacing.NORTH, 0, 3, null, 0);
 		}
 	}

 	public void render(TileEntitySkull skull, float par1, float par2, float par3, EnumFacing par4, float par5, int par6, GameProfile gameProfile, int digProgress) {
-		boolean gaia = skull instanceof TileGaiaHead;
+		boolean gaia = skull == null || skull instanceof TileGaiaHead;
 		if(par6 == 3 || gaia) {
 			ResourceLocation resourcelocation = DefaultPlayerSkin.getDefaultSkinLegacy();
 			Minecraft minecraft = Minecraft.getMinecraft();
@@ -26,16 +26,16 @@ import org.lwjgl.opengl.GL11;

 import vazkii.botania.common.block.tile.TileSparkChanger;

-public class RenderTileSparkChanger extends TileEntitySpecialRenderer {
+public class RenderTileSparkChanger extends TileEntitySpecialRenderer<TileSparkChanger> {

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
+	public void renderTileEntityAt(TileSparkChanger tileentity, double d0, double d1, double d2, float pticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.translate(d0, d1, d2);
 		GlStateManager.rotate(90F, 1F, 0F, 0F);
 		GlStateManager.translate(0.8F, 0.2F, -0.22F);
 		GlStateManager.color(1F, 1F, 1F, 1F);
-		ItemStack stack = ((TileSparkChanger) tileentity).getStackInSlot(0);
+		ItemStack stack = tileentity.getStackInSlot(0);
 		if(stack != null) {
 			GlStateManager.pushMatrix();
 			Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.locationBlocksTexture);
@@ -34,7 +34,7 @@ import vazkii.botania.client.lib.LibResources;
 import vazkii.botania.client.model.ModelSpreader;
 import vazkii.botania.common.block.tile.mana.TileSpreader;

-public class RenderTileSpreader extends TileEntitySpecialRenderer {
+public class RenderTileSpreader extends TileEntitySpecialRenderer<TileSpreader> {

 	private static final ResourceLocation texture = new ResourceLocation(LibResources.MODEL_SPREADER);
 	private static final ResourceLocation textureRs = new ResourceLocation(LibResources.MODEL_SPREADER_REDSTONE);
@@ -47,8 +47,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer {
 	private static final ModelSpreader model = new ModelSpreader();

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float ticks, int digProgress) {
-		TileSpreader spreader = (TileSpreader) tileentity;
+	public void renderTileEntityAt(TileSpreader spreader, double d0, double d1, double d2, float ticks, int digProgress) {
 		GlStateManager.pushMatrix();
 		GlStateManager.enableRescaleNormal();
 		GlStateManager.color(1F, 1F, 1F, 1F);
@@ -77,7 +76,7 @@ public class RenderTileSpreader extends TileEntitySpecialRenderer {
 		GlStateManager.color(1F, 1F, 1F);

 		GlStateManager.pushMatrix();
-		double worldTicks = tileentity.getWorld() == null ? 0 : time;
+		double worldTicks = spreader.getWorld() == null ? 0 : time;
 		GlStateManager.rotate((float) worldTicks % 360, 0F, 1F, 0F);
 		GlStateManager.translate(0F, (float) Math.sin(worldTicks / 20.0) * 0.05F, 0F);
 		model.renderCube();
@@ -23,27 +23,28 @@ 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
 // OH GOD
 // I HAVE NO IDEA WHAT I'M DOING
 // SO MUCH STUFF I DON'T UNDERSTAND D:
 // HELP
-public class RenderTileStarfield extends TileEntitySpecialRenderer {
+public class RenderTileStarfield extends TileEntitySpecialRenderer<TileStarfield> {

 	private static final ResourceLocation END_SKY_TEXTURE = new ResourceLocation("textures/environment/end_sky.png");
 	private static final ResourceLocation END_PORTAL_TEXTURE = new ResourceLocation("textures/entity/end_portal.png");
 	private static final Random field_147527_e = new Random(31100L);
 	FloatBuffer field_147528_b = GLAllocation.createDirectFloatBuffer(16);

-	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float partialTicks, int destroyStage)
+	public void renderTileEntityAt(TileStarfield starfield, double x, double y, double z, float partialTicks, int destroyStage)
 	{
 		float f = (float)this.rendererDispatcher.entityX;
 		float f1 = (float)this.rendererDispatcher.entityY;
 		float f2 = (float)this.rendererDispatcher.entityZ;
 		GlStateManager.disableLighting();
 		field_147527_e.setSeed(31100L);
-		float f3 = 0.24F;
+		float f3 = 0.24F; // Botania: move to bottom of block space

 		for (int i = 0; i < 16; ++i)
 		{
@@ -116,6 +117,7 @@ public class RenderTileStarfield extends TileEntitySpecialRenderer {
 				f11 = f12 = f13 = 1.0F * f6;
 			}

+			// Botania: change color based on time
 			Color color = Color.getHSBColor(Minecraft.getSystemTime() / 20F % 360 / 360F, 1F, 1F);
 			f11 = color.getRed() / 255F;
 			f12 = color.getGreen() / 255F;
@@ -28,12 +28,10 @@ import vazkii.botania.client.core.helper.ShaderHelper;
 import vazkii.botania.common.block.mana.BlockTerraPlate;
 import vazkii.botania.common.block.tile.TileTerraPlate;

-public class RenderTileTerraPlate extends TileEntitySpecialRenderer {
+public class RenderTileTerraPlate extends TileEntitySpecialRenderer<TileTerraPlate> {

 	@Override
-	public void renderTileEntityAt(TileEntity tileentity, double d0, double d1, double d2, float f, int digProgress) {
-		TileTerraPlate plate = (TileTerraPlate) tileentity;
-
+	public void renderTileEntityAt(TileTerraPlate plate, double d0, double d1, double d2, float f, int digProgress) {
 		float max = TileTerraPlate.MAX_MANA / 10F;
 		float alphaMod = Math.min(max, plate.getCurrentMana()) / max;
 		GlStateManager.pushMatrix();
Author	SHA1	Message	Date
Vincent Lee	a1aa50b532	Merge upstream release 248	2016-01-08 12:34:51 -06:00
Vincent Lee	972943a9ac	Updates to internal handler and icons	2016-01-08 12:33:49 -06:00
Vasco Lavos	6374b01762	Build 248	2016-01-08 18:22:07 +00:00
Vincent Lee	a4a77fb20f	Merge upstream	2016-01-08 12:00:01 -06:00
Vincent Lee	3a54166954	Revert "Tentatively change relics to use UUID. Still use playernames for display" due to a better solution being merged upstream. This reverts commit `0687f56c32`.	2016-01-08 11:29:03 -06:00
Vasco Lavos	bf55ee4a60	Fixed the Hopperhock calling inventory methods on the client side, and thus, crashing when used alongside a BetterStorage Crate.	2016-01-08 14:41:05 +00:00
Vasco Lavos	68ea0b213e	Fixed alternate grass types not breaking faster with a shovel and not being able to sustain sugar cane. Closes #1711	2016-01-08 14:35:06 +00:00
Vasco Lavos	6b66163958	Fixed the Ring of Odin Fire Resistance config not changing its extinguish behaviour.	2016-01-08 14:32:29 +00:00
Vasco Lavos	c8517f565b	Fixed Mana Flashes not having a lexicon binding. Closes #1719	2016-01-08 14:30:55 +00:00
Vasco Lavos	8268c79353	New name	2016-01-08 14:27:53 +00:00
Vasco Lavos	c00bb80529	Merge pull request #1712 from Lazersmoke/18-oredictstonefix Add oredict support 1.8 stone recipes, closes #1660	2016-01-08 14:22:48 +00:00
Vincent Lee	cd77b41d31	Incense plate converted to json	2016-01-07 21:19:39 -06:00
Vincent Lee	20b5743221	Safety guards for blockstates, remove all useless casts	2016-01-07 19:55:54 -06:00
Vincent Lee	e58eb1b345	Fix alfportal derp	2016-01-07 17:03:28 -06:00
Vincent Lee	064fd20edb	Mana flash and water bowl items	2016-01-07 16:56:03 -06:00
Vincent Lee	85102dea89	Mana inkwell item model. Pylon models fully working	2016-01-07 14:32:38 -06:00
Vincent Lee	baf14c361b	Fix third person render	2016-01-07 11:59:22 -06:00
Vincent Lee	3b7d7628cf	Derp	2016-01-07 11:46:36 -06:00
Vincent Lee	8155dc3059	Life imbuer model complete	2016-01-07 11:35:41 -06:00
Vincent Lee	0494c0eba2	Generify stuff, fix gaia head render, hourglass inventory model	2016-01-07 10:32:51 -06:00
Vincent Lee	12dfecb8ac	Add a bunch of dirty, dirty tesr item hook items. Also fix fabulous mana pool leaking its fabulousness	2016-01-07 08:52:58 -06:00
Vincent Lee	92aaa9f70a	Spreader turntable model	2016-01-06 21:40:18 -06:00
Vincent Lee	929860f8fa	Partial claw model. Fix cell block being a debug floating island. Fix a pure daisy oredict bug by checking for drops instead of state	2016-01-06 20:56:25 -06:00
Vincent Lee	383cd059cc	Fix hourglass having inverted redstone power. How come no one caught this?!	2016-01-06 20:16:22 -06:00
Vasco Lavos	b108af404f	Update contributors.properties	2016-01-06 22:23:28 +00:00
Vincent Lee	2ddf71d76f	Cleanup	2016-01-05 21:41:07 -06:00
Vincent Lee	34fae04641	Made API dediserver-safe. Remove icon methods from SubTileSignature.	2016-01-05 21:39:56 -06:00
Vincent Lee	dc6af948d9	Don't use a sideonly client method. Closes #18	2016-01-05 21:23:50 -06:00
Vincent Lee	3fe2a0006c	Change crystal bow draw animation to better reflect when it's fully charged	2016-01-05 19:51:41 -06:00
Vincent Lee	89dac440c8	Change starfield item model to match upstream	2016-01-05 19:27:54 -06:00
Vincent Lee	5797d18d9b	Fix a bunch of coloring mistakes. Fix flower particles because I'm dumb	2016-01-05 19:24:30 -06:00
Vincent Lee	52cf3df27e	Fix tessellator bugs, fix alf portal crash	2016-01-05 17:15:22 -06:00
Vincent Lee	b976ed5df1	Cleanup JEI integration, add copyleft.	2016-01-05 17:01:46 -06:00
Vincent Lee	e727cb7f2b	Merge branch 'jei' into MC18	2016-01-05 16:51:18 -06:00
Vincent Lee	8e6dc7c637	JEI integration complete (runic altar, mana infusion)	2016-01-05 16:51:03 -06:00
Vincent Lee	28249d1e33	Elven trade integration	2016-01-05 15:36:10 -06:00
Vincent Lee	b24585b13d	Update a bunch of recipes to take vanilla blocks and items. Also remove prismarine lex entry and move infusion recipe to mana pool page.	2016-01-05 12:25:53 -06:00
Jonathan Smith	d7f94bfc00	Merge pull request #1715 from yrsegal/master Make the render color for camo blocks work with meta	2016-01-05 16:30:26 +00:00
Vincent Lee	86880bfd49	Fix helmet of revealing inv model	2016-01-05 00:05:09 -06:00
Vincent Lee	c8c50f9af0	Future is now part 1: conversions recipes to vanilla	2016-01-04 23:29:50 -06:00
Vincent Lee	0e301a4e33	Fix apothecary light level crash, tiny potato render crash. Closes #17	2016-01-04 22:47:47 -06:00
Vincent Lee	10d095d656	Finish pure daisy integration	2016-01-04 22:46:24 -06:00
Vincent Lee	9bf2e0c555	Semi working petal apothecary itnegration	2016-01-04 22:34:45 -06:00
Vincent Lee	95118696ce	Half complete petal apothecary	2016-01-04 20:57:14 -06:00
Vincent Lee	ab4f6f6433	workaround for pylon enchant power. closes #16	2016-01-04 19:58:54 -06:00
yrsegal	69eac1f12e	Make the render color for camo blocks work with meta before, blocks which required meta colors for determining their render color would use the meta of the Platform itself	2016-01-04 19:39:50 -05:00
Vincent Lee	46c13be698	Fix rotations and nameplates for tiny potato	2016-01-04 14:09:18 -06:00
Vincent Lee	ad58fb1855	Partial tiny potato	2016-01-04 12:18:19 -06:00
Vincent Lee	12ae7ed3d1	Fix thaumcraft integration crashing	2016-01-04 10:01:04 -06:00
Jonathan Smith	0cd4722c1c	Merge pull request #1710 from Lazersmoke/pane-lighting Added light to all panes, closing #1697	2016-01-04 10:14:52 +00:00
Jonathan Smith	e89322083d	Merge pull request #1713 from Lazersmoke/lens-recipe-fix Fixes mana lens dyeing, closing #1708	2016-01-04 10:14:21 +00:00
Vincent Lee	6cf82eb98d	Rudimentary pure daisy integration	2016-01-03 23:43:24 -06:00
Vincent Lee	b10a642297	Brewery recipe support	2016-01-03 22:02:02 -06:00
Vincent Lee	75ab210227	Item models fully working. TESRs may be changed in future	2016-01-03 19:59:27 -06:00
Vincent Lee	0b27d9d0b5	Attempt at json pool model	2016-01-03 19:29:09 -06:00
Vincent Lee	3c102bbc75	Move mc dep ver out of @Mod	2016-01-02 23:32:55 -06:00
Vincent Lee	4e1065855e	Some formatting cleanups. Add copyleft header to all new classes	2016-01-02 23:21:55 -06:00
Sam Quinn	f9ce3676e1	Fixes mana lens dyeing, closing #1708 Fixes having extra items beyond a dye and a lens messing everything up	2016-01-02 22:48:51 -06:00
Sam Quinn	17ddae20af	Add oredict support 1.8 stone recipes, closes #1660 the code was copy-pastaed from the addStairsAndSlabs helper function to hack in oredict support, feel free to just add it to the helper function if you want though. Looking at other Botania code, this is what comes to mind though. see #1703 There is also a very big problem that I marked with a comment that says "very big problem", where on many many different stone types (end, metamorph, 1.8) the recipe for stone bricks and for chisled is the same, so usually you can't craft chisled. sorry for long commit message	2016-01-02 21:38:26 -06:00
Sam Quinn	124f8bb173	Added light to all panes, closing #1697 All the full glass blocks had lightning, so now these can too!	2016-01-02 20:14:44 -06:00
Vincent Lee	3eb67e3fea	Corporea index and cube item model	2016-01-02 19:43:41 -06:00
Vincent Lee	5d80b7d9ce	Fix thaumcraft 5 goggles of revealing integration. closes #14	2016-01-02 19:07:52 -06:00
Vasco Lavos	820c042f40	Update contributors.properties	2016-01-02 23:42:17 +00:00
Vincent Lee	f7e5054bf4	Fix armor rendering - thanks primetoxinz for the find!	2016-01-01 16:05:17 -06:00
Vincent Lee	906fb74ec0	Fix santaweave inv icons	2016-01-01 15:35:08 -06:00
Vasco Lavos	0f9bc9fc53	Merge pull request #1706 from Lazersmoke/patch-7 Removed references to Excaliber	2016-01-01 16:43:58 +00:00
Sam Quinn	9036e24365	Removed references to Excaliber The Excalibru doesn't even exist anymore, so it doesn't make sense to talk about it in contributing, as you should be working with latest version anyway	2016-01-01 09:52:51 -06:00