diff --git a/build.gradle b/build.gradle
index 3a1a350f..1e13db20 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,106 +1,85 @@
-buildscript {
-  repositories {
-    jcenter()
-    maven {
-      name 'forge'
-      url 'http://files.minecraftforge.net/maven/'
-    }
-    maven {
-      name = "sonatype"
-      url = "https://oss.sonatype.org/content/repositories/snapshots/"
-    }
-    maven {
-      name = 'sponge'
-      url = 'http://repo.spongepowered.org/maven'
-    }
-  }
-  dependencies {
-    classpath 'net.minecraftforge.gradle:ForgeGradle:' + project.forgeGradleVersion
-  }
+// Fabric build script
+// 03/06/2019
+// https://github.com/FabricMC/fabric-example-mod/blob/master/build.gradle
+
+plugins {
+    id 'java-library'
+    id 'fabric-loom' version '0.2.5-SNAPSHOT'
+    id 'maven-publish'
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
 
-def ver = "${project.buildType}${project.buildVersion}.${project.buildRevision}"
+targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_1_8
+
+version = "${project.minecraft_version}-${project.version}"
+
+if (project.release != 'RELEASE') {
+    version += "-${project.release}"
+}
 
-version = ver
 group = project.group
-description = project.description
+description = project.displayname
+archivesBaseName = project.name
 
 minecraft {
-  version = project.mcVersion + '-' + project.mcfVersion
-  mappings = project.mcMappings
-  runDir = 'run'
-  replace '@MODID@', project.modid
-  replace '@NAME@', project.name
-  replace '@AUTHOR@', project.author
-  replace '@VERSION@', ver
-  replace '@DESCRIPTION@', project.description
-}
-
-sourceCompatibility = 1.8
-targetCompatibility = 1.8
-
-sourceSets {
-  jei {
-    compileClasspath += main.compileClasspath
-    compileClasspath += main.output
-  }
-  external {
-    compileClasspath += main.compileClasspath
-  }
-  main {
-    compileClasspath += external.output
-    ext.refMap = project.refCore
-  }
+    refmapName = 'unicopia.mixin.refmap.json'
 }
 
 repositories {
-  flatDir {
-    dir 'lib'
-  }
-  maven {
-    // location of the maven that hosts JEI files
-    name = "Progwml6 maven"
-    url = "http://dvs1.progwml6.com/files/maven"
-  }
-  maven {
-    // location of a maven mirror for JEI files, as a fallback
-    name = "ModMaven"
-    url = "modmaven.k-4u.nl"
-  }
+    maven {
+        name = 'minelp'
+        url = 'http://repo.minelittlepony-mod.com/maven/snapshot'
+    }
+    maven {
+        name = 'minelp-release'
+        url = 'http://repo.minelittlepony-mod.com/maven/release'
+    }
 }
+
+// check for updates every build when on CI
+if (System.env.CI) {
+    configurations.all {
+        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+    }
+}
+
 dependencies {
-  deobfCompile('com.minelittlepony:jumpingcastle:1.12.2.1.0.0:universal')
-  // compile against the JEI API but do not include it at runtime
-  deobfProvided "mezz.jei:jei_${project.mcVersion}:${project.jeiVersion}:api"
-  // at runtime, use the full JEI jar
-  runtime "mezz.jei:jei_${project.mcVersion}:${project.jeiVersion}"
+    minecraft "com.mojang:minecraft:${project.minecraft_version}"
+    mappings "net.fabricmc:yarn:${project.yarn_mappings}"
+    modApi "net.fabricmc:fabric-loader:${project.loader_version}"
+
+    compileOnly "com.google.code.findbugs:jsr305:3.0.2"
+
+    //modApi "net.fabricmc.fabric-api:fabric-api-base:0.1.0+"
+    //modApi "net.fabricmc.fabric-api:fabric-events-lifecycle-v0:0.1.0+"
+    //modApi "net.fabricmc.fabric-api:fabric-resource-loader-v0:0.1.0+"
+
+	modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+
+    modApi "com.minelittlepony:Kirin:${project.kirin_version}"
+    include "com.minelittlepony:Kirin:${project.kirin_version}"
+
+    modImplementation "io.github.prospector.modmenu:ModMenu:1.6.2-93"
 }
 
 processResources {
-  def props = [
-    modid: project.modid,
-    name: project.title,
-    description: project.description,
-    version: ver,
-    revision: project.buildRevision,
-    mcversion: project.mcVersion,
-    author: project.author
-  ]
+    inputs.property "version", project.version
 
-  from(sourceSets.main.resources.srcDirs) {
-    include 'mcmod.info'
-    expand props
-  }
+    from(sourceSets.main.resources.srcDirs) {
+        include "fabric.mod.json"
+        expand "version": project.version
+    }
 
-  from(sourceSets.main.resources.srcDirs) {
-    exclude 'mcmod.info'
-  }
+    from(sourceSets.main.resources.srcDirs) {
+        exclude "fabric.mod.json"
+    }
 }
 
-jar {
-  from sourceSets.main.output
-  from sourceSets.external.output
-  from sourceSets.jei.output
-  baseName = "Unicopia-mc${project.mcVersion}"
+tasks.withType(JavaCompile) {
+    options.encoding = "UTF-8"
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = "sources"
+    from sourceSets.main.allSource
 }
diff --git a/gradle.properties b/gradle.properties
index 67f7ce43..82cefea0 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,20 @@
-modid=unicopia
-title=Unicopia Redux
-group=com.minelittlepony.unicopia
-author=Sollace
-description=Magical Abilities for Mine Little Pony!
-buildType=inDev
-buildVersion=2
-buildRevision=11
-mcVersion=1.12.2
-mcfVersion=14.23.5.2824
-jeiVersion=4.15.0.268
-mcMappings=stable_39
-refCore=mixins.unicopia.refmap.json
-forgeGradleVersion=2.3-SNAPSHOT
-mixinGradleVersion=0.6-SNAPSHOT
+org.gradle.jvmargs=-Xmx3G
+org.gradle.daemon=false
+
+# Fabric Properties
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.14.4
+	yarn_mappings=1.14.4+build.2
+	loader_version=0.4.8+
+
+# Mod Properties
+	group=com.minelittlepony
+	displayname=Unicopia Redux
+	authors=Sollace
+	description=Magical Abilities for Mine Little Pony!
+	version=3
+	release=SNAPSHOT
+
+# Dependencies
+	fabric_version=0.3.0+
+	kirin_version=1.14.4-1.4.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 758de960..7a3265ee 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 2d80b69a..1ac0eef4 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Apr 15 20:00:20 CAT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.8.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-bin.zip
diff --git a/lib/jumpingcastle-1.12.2.1.0.0-universal.jar b/lib/jumpingcastle-1.12.2.1.0.0-universal.jar
deleted file mode 100644
index d0392427..00000000
Binary files a/lib/jumpingcastle-1.12.2.1.0.0-universal.jar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..a5a8746d
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,11 @@
+pluginManagement {
+    repositories {
+        jcenter()
+        maven {
+            name = 'Fabric'
+            url = 'https://maven.fabricmc.net/'
+        }
+        gradlePluginPortal()
+    }
+}
+rootProject.name = 'Unicopia'
diff --git a/src/api/java/baubles/api/BaubleType.java b/src/api/java/baubles/api/BaubleType.java
deleted file mode 100644
index 06fa86f2..00000000
--- a/src/api/java/baubles/api/BaubleType.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package baubles.api;
-
-import org.apache.commons.lang3.NotImplementedException;
-
-/*
- * stub
- */
-public enum BaubleType {
-	AMULET, RING, BELT, TRINKET, HEAD, BODY, CHARM;
-
-	public int[] getValidSlots() {
-	    throw new NotImplementedException("getValidSlots");
-	}
-}
diff --git a/src/api/java/baubles/api/BaublesApi.java b/src/api/java/baubles/api/BaublesApi.java
deleted file mode 100644
index 9d0b3d66..00000000
--- a/src/api/java/baubles/api/BaublesApi.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package baubles.api;
-
-import org.apache.commons.lang3.NotImplementedException;
-
-import baubles.api.cap.IBaublesItemHandler;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-
-/*
- * stub
- */
-public class BaublesApi {
-	public static IBaublesItemHandler getBaublesHandler(EntityPlayer player) {
-	    throw new NotImplementedException("getBaublesHandler");
-	}
-
-	public static int isBaubleEquipped(EntityPlayer player, Item bauble) {
-		throw new NotImplementedException("isBaubleEquipped");
-	}
-}
diff --git a/src/api/java/baubles/api/IBauble.java b/src/api/java/baubles/api/IBauble.java
deleted file mode 100644
index 4694c968..00000000
--- a/src/api/java/baubles/api/IBauble.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package baubles.api;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-
-/**
- *
- * This interface should be extended by items that can be worn in bauble slots
- *
- * @author Azanor
- */
-public interface IBauble {
-
-	/**
-	 * This method return the type of bauble this is.
-	 * Type is used to determine the slots it can go into.
-	 */
-	public BaubleType getBaubleType(ItemStack itemstack);
-
-	/**
-	 * This method is called once per tick if the bauble is being worn by a player
-	 */
-	public default void onWornTick(ItemStack itemstack, EntityLivingBase player) {
-	}
-
-	/**
-	 * This method is called when the bauble is equipped by a player
-	 */
-	public default void onEquipped(ItemStack itemstack, EntityLivingBase player) {
-	}
-
-	/**
-	 * This method is called when the bauble is unequipped by a player
-	 */
-	public default void onUnequipped(ItemStack itemstack, EntityLivingBase player) {
-	}
-
-	/**
-	 * can this bauble be placed in a bauble slot
-	 */
-	public default boolean canEquip(ItemStack itemstack, EntityLivingBase player) {
-		return true;
-	}
-
-	/**
-	 * Can this bauble be removed from a bauble slot
-	 */
-	public default boolean canUnequip(ItemStack itemstack, EntityLivingBase player) {
-		return true;
-	}
-
-	/**
-	 * Will bauble automatically sync to client if a change is detected in its NBT or damage values?
-	 * Default is off, so override and set to true if you want to auto sync.
-	 * This sync is not instant, but occurs every 10 ticks (.5 seconds).
-	 */
-	public default boolean willAutoSync(ItemStack itemstack, EntityLivingBase player) {
-		return false;
-	}
-}
diff --git a/src/api/java/baubles/api/cap/IBaublesItemHandler.java b/src/api/java/baubles/api/cap/IBaublesItemHandler.java
deleted file mode 100644
index a7a0e36c..00000000
--- a/src/api/java/baubles/api/cap/IBaublesItemHandler.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package baubles.api.cap;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.items.IItemHandlerModifiable;
-
-/*
- * stub
- */
-public interface IBaublesItemHandler extends IItemHandlerModifiable {
-	boolean isItemValidForSlot(int slot, ItemStack stack, EntityLivingBase player);
-}
diff --git a/src/api/java/com/minelittlepony/MineLittlePony.java b/src/api/java/com/minelittlepony/MineLittlePony.java
deleted file mode 100644
index b9be83f2..00000000
--- a/src/api/java/com/minelittlepony/MineLittlePony.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.minelittlepony;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-@SideOnly(Side.CLIENT)
-public abstract class MineLittlePony {
-    public static MineLittlePony getInstance() {
-        throw new RuntimeException();
-    }
-}
diff --git a/src/api/java/com/minelittlepony/pony/data/IPony.java b/src/api/java/com/minelittlepony/pony/data/IPony.java
deleted file mode 100644
index b1597170..00000000
--- a/src/api/java/com/minelittlepony/pony/data/IPony.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.minelittlepony.pony.data;
-
-import net.minecraft.client.entity.AbstractClientPlayer;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-// Stub
-@SideOnly(Side.CLIENT)
-public interface IPony {
-
-    static IPony forPlayer(AbstractClientPlayer player) {
-        return null;
-    }
-
-    PonyRace getRace(boolean ignorePony);
-
-}
diff --git a/src/api/java/com/minelittlepony/pony/data/PonyRace.java b/src/api/java/com/minelittlepony/pony/data/PonyRace.java
deleted file mode 100644
index a7ef4eca..00000000
--- a/src/api/java/com/minelittlepony/pony/data/PonyRace.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.minelittlepony.pony.data;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-// Stub
-@SideOnly(Side.CLIENT)
-public enum PonyRace {
-    HUMAN,
-    EARTH,
-    PEGASUS,
-    UNICORN,
-    ALICORN,
-    CHANGELING,
-    ZEBRA,
-    REFORMED_CHANGELING,
-    GRIFFIN,
-    HIPPOGRIFF,
-    BATPONY,
-    SEAPONY;
-
-    public boolean hasHorn() {
-        return false;
-    }
-
-    public boolean hasWings() {
-        return false;
-    }
-
-    public boolean isHuman() {
-        return this == HUMAN;
-    }
-}
diff --git a/src/jei/java/com/minelittlepony/unicopia/jei/BlendedDrawable.java b/src/jei/java/com/minelittlepony/unicopia/jei/BlendedDrawable.java
deleted file mode 100644
index 0036e00c..00000000
--- a/src/jei/java/com/minelittlepony/unicopia/jei/BlendedDrawable.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.minelittlepony.unicopia.jei;
-
-import mezz.jei.api.gui.IDrawable;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GlStateManager;
-
-class BlendedDrawable implements IDrawable {
-
-    private final IDrawable wrapped;
-
-    public BlendedDrawable(IDrawable wrapped) {
-        this.wrapped = wrapped;
-    }
-
-    @Override
-    public int getWidth() {
-        return wrapped.getWidth();
-    }
-
-    @Override
-    public int getHeight() {
-        return wrapped.getHeight();
-    }
-
-    @Override
-    public void draw(Minecraft minecraft, int xOffset, int yOffset) {
-        GlStateManager.enableBlend();
-        wrapped.draw(minecraft, xOffset, yOffset);
-        GlStateManager.disableBlend();
-    }
-
-}
diff --git a/src/jei/java/com/minelittlepony/unicopia/jei/JEIUnicopia.java b/src/jei/java/com/minelittlepony/unicopia/jei/JEIUnicopia.java
deleted file mode 100644
index 3ea7682b..00000000
--- a/src/jei/java/com/minelittlepony/unicopia/jei/JEIUnicopia.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.minelittlepony.unicopia.jei;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.enchanting.SpecialRecipe;
-import com.minelittlepony.unicopia.enchanting.SpellRecipe;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import mezz.jei.api.IGuiHelper;
-import mezz.jei.api.IModPlugin;
-import mezz.jei.api.IModRegistry;
-import mezz.jei.api.ISubtypeRegistry;
-import mezz.jei.api.JEIPlugin;
-import mezz.jei.api.recipe.IRecipeCategoryRegistration;
-
-@JEIPlugin
-public class JEIUnicopia implements IModPlugin {
-
-    static IGuiHelper GUI_HELPER;
-
-    static final String RECIPE_UID = "unicopia:spellbook_2";
-
-    @Override
-    public void registerItemSubtypes(ISubtypeRegistry registry) {
-        registry.registerSubtypeInterpreter(UItems.spell, SpellRegistry::getKeyFromStack);
-        registry.registerSubtypeInterpreter(UItems.curse, SpellRegistry::getKeyFromStack);
-    }
-
-    @Override
-    public void registerCategories(IRecipeCategoryRegistration registry) {
-        registry.addRecipeCategories(new SpellbookCategory());
-    }
-
-    @Override
-    public void register(IModRegistry registry) {
-        GUI_HELPER = registry.getJeiHelpers().getGuiHelper();
-
-        registry.handleRecipes(SpellRecipe.class, SpellRecipeWrapper::new, RECIPE_UID);
-        registry.handleRecipes(SpecialRecipe.class, SpellRecipeWrapper::new, RECIPE_UID);
-        registry.addRecipes(Unicopia.getCraftingManager().getRecipes(), RECIPE_UID);
-    }
-}
diff --git a/src/jei/java/com/minelittlepony/unicopia/jei/SpellRecipeWrapper.java b/src/jei/java/com/minelittlepony/unicopia/jei/SpellRecipeWrapper.java
deleted file mode 100644
index 66e77950..00000000
--- a/src/jei/java/com/minelittlepony/unicopia/jei/SpellRecipeWrapper.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.minelittlepony.unicopia.jei;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import com.minelittlepony.unicopia.enchanting.AbstractSpecialRecipe;
-
-import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.ingredients.VanillaTypes;
-import mezz.jei.api.recipe.IRecipeWrapper;
-import net.minecraft.item.ItemStack;
-
-public class SpellRecipeWrapper implements IRecipeWrapper {
-
-    private final AbstractSpecialRecipe recipe;
-
-    public SpellRecipeWrapper(AbstractSpecialRecipe recipe) {
-        this.recipe = recipe;
-    }
-
-    public AbstractSpecialRecipe getRecipe() {
-        return recipe;
-    }
-
-    @Override
-    public void getIngredients(IIngredients ingredients) {
-
-        List<List<ItemStack>> ingreds = recipe.getSpellIngredients().stream().map(ingredient -> {
-            return ingredient.getStacks().collect(Collectors.toList());
-        }).collect(Collectors.toList());
-
-        ingredients.setInputLists(VanillaTypes.ITEM, ingreds);
-
-        ingredients.setOutput(VanillaTypes.ITEM, recipe.getRecipeOutput());
-    }
-
-}
diff --git a/src/jei/java/com/minelittlepony/unicopia/jei/SpellbookCategory.java b/src/jei/java/com/minelittlepony/unicopia/jei/SpellbookCategory.java
deleted file mode 100644
index b97ef241..00000000
--- a/src/jei/java/com/minelittlepony/unicopia/jei/SpellbookCategory.java
+++ /dev/null
@@ -1,66 +0,0 @@
-package com.minelittlepony.unicopia.jei;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.inventory.gui.GuiSpellBook;
-
-import mezz.jei.api.gui.IDrawable;
-import mezz.jei.api.gui.IGuiItemStackGroup;
-import mezz.jei.api.gui.IRecipeLayout;
-import mezz.jei.api.ingredients.IIngredients;
-import mezz.jei.api.ingredients.VanillaTypes;
-import mezz.jei.api.recipe.IRecipeCategory;
-import mezz.jei.api.recipe.IRecipeWrapper;
-import net.minecraft.util.ResourceLocation;
-
-public class SpellbookCategory implements IRecipeCategory<IRecipeWrapper> {
-
-    @Override
-    public String getUid() {
-        return JEIUnicopia.RECIPE_UID;
-    }
-
-    @Override
-    public String getTitle() {
-        return "Spellbook";
-    }
-
-    @Override
-    public IDrawable getIcon() {
-        return JEIUnicopia.GUI_HELPER.drawableBuilder(
-                new ResourceLocation(Unicopia.MODID, "textures/items/spellbook.png"), 0, 0, 16, 16)
-                .setTextureSize(16, 16)
-                .build();
-    }
-
-    @Override
-    public String getModName() {
-        return "Unicopia";
-    }
-
-    @Override
-    public IDrawable getBackground() {
-        return new BlendedDrawable(
-                JEIUnicopia.GUI_HELPER.drawableBuilder(GuiSpellBook.spellBookGuiTextures, 405, 0, 105, 108)
-                .setTextureSize(512, 256)
-                .build());
-    }
-
-    @Override
-    public void setRecipe(IRecipeLayout recipeLayout, IRecipeWrapper recipeWrapper, @Deprecated IIngredients unused) {
-        recipeLayout.setShapeless();
-
-        IGuiItemStackGroup stacks = recipeLayout.getItemStacks();
-
-        stacks.init(0, true, 29, 3);
-        stacks.init(1, true, 3, 46);
-        stacks.init(2, true, 30, 86);
-        stacks.init(3, true, 80, 72);
-        stacks.init(4, true, 82, 15);
-
-        stacks.init(5, false, 46, 44);
-
-        stacks.set(unused);
-
-        stacks.set(5, unused.getOutputs(VanillaTypes.ITEM).get(0));
-    }
-}
diff --git a/src/main/java/com/minelittlepony/gui/Button.java b/src/main/java/com/minelittlepony/gui/Button.java
deleted file mode 100644
index 57b5e4b4..00000000
--- a/src/main/java/com/minelittlepony/gui/Button.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package com.minelittlepony.gui;
-
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-
-public class Button extends GuiButton implements IGuiTooltipped<Button> {
-
-    private int tipX = 0;
-    private int tipY = 0;
-
-    protected IGuiAction<Button> action;
-
-    private List<String> tooltip = null;
-
-    @SuppressWarnings("unchecked")
-    public Button(int x, int y, int width, int height, String label, IGuiAction<? extends Button> callback) {
-        super(5000, x, y, width, height, GameGui.format(label));
-        action = (IGuiAction<Button>)callback;
-    }
-
-    public Button setEnabled(boolean enable) {
-        enabled = enable;
-        return this;
-    }
-
-    @Override
-    public Button setTooltip(List<String> tooltip) {
-        this.tooltip = tooltip;
-        return this;
-    }
-
-    protected List<String> getTooltip() {
-        return tooltip;
-    }
-
-    @Override
-    public void renderToolTip(Minecraft mc, int mouseX, int mouseY) {
-        List<String> tooltip = getTooltip();
-
-        if (visible && isMouseOver() && tooltip != null) {
-            mc.currentScreen.drawHoveringText(tooltip, mouseX + tipX, mouseY + tipY);
-        }
-    }
-
-    @Override
-    public Button setTooltipOffset(int x, int y) {
-        tipX = x;
-        tipY = y;
-        return this;
-    }
-
-    @Override
-    public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
-        if (super.mousePressed(mc, mouseX, mouseY)) {
-            action.perform(this);
-
-            return true;
-        }
-
-        return false;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/gui/GameGui.java b/src/main/java/com/minelittlepony/gui/GameGui.java
deleted file mode 100644
index 562526ee..00000000
--- a/src/main/java/com/minelittlepony/gui/GameGui.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.minelittlepony.gui;
-
-import org.apache.commons.lang3.text.WordUtils;
-
-import java.util.List;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.I18n;
-import net.minecraft.util.SoundEvent;
-
-public abstract class GameGui extends GuiScreen {
-
-    protected static String format(String string, Object... pars) {
-        return string == null ? null : I18n.format(string, pars);
-    }
-
-    /**
-     * Formats a translation string and returns it in a list wrapped to a given width.
-     * This can be safely used in initGui, where the fontRenderer is often still null.
-     */
-    protected List<String> formatMultiLine(String string, int width, Object...pars) {
-        FontRenderer fr = fontRenderer;
-
-        if (fr == null) {
-            fr = Minecraft.getMinecraft().fontRenderer;
-        }
-
-        return fr.listFormattedStringToWidth(format(string, pars), width);
-    }
-
-    protected void playSound(SoundEvent event) {
-        mc.getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(event, 1));
-    }
-
-    /**
-     * Converts a given string to title case regardless of initial case.
-     */
-    protected static String toTitleCase(String string) {
-        return WordUtils.capitalize(string.toLowerCase());
-    }
-
-    @Override
-    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-        drawContents(mouseX, mouseY, partialTicks);
-        postDrawContents(mouseX, mouseY, partialTicks);
-    }
-
-    protected void drawContents(int mouseX, int mouseY, float partialTicks) {
-        super.drawScreen(mouseX, mouseY, partialTicks);
-    }
-
-    protected void postDrawContents(int mouseX, int mouseY, float partialTicks) {
-        buttonList.forEach(button -> {
-            if (button instanceof IGuiTooltipped) {
-                ((IGuiTooltipped<?>)button).renderToolTip(mc, mouseX, mouseY);
-            }
-        });
-    }
-}
diff --git a/src/main/java/com/minelittlepony/gui/IGuiAction.java b/src/main/java/com/minelittlepony/gui/IGuiAction.java
deleted file mode 100644
index 3aa0ae2a..00000000
--- a/src/main/java/com/minelittlepony/gui/IGuiAction.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.minelittlepony.gui;
-
-/**
- * Response actions for UI events.
- */
-@FunctionalInterface
-public interface IGuiAction<T> {
-    /**
-     * Performs this action now.
-     *
-     * @param value    New Value of the field being changed
-     * @return Adjusted value the field must take on
-     */
-    void perform(T sender);
-}
diff --git a/src/main/java/com/minelittlepony/gui/IGuiCallback.java b/src/main/java/com/minelittlepony/gui/IGuiCallback.java
deleted file mode 100644
index 69da7620..00000000
--- a/src/main/java/com/minelittlepony/gui/IGuiCallback.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.minelittlepony.gui;
-
-/**
- * Response actions for UI events.
- */
-@FunctionalInterface
-public interface IGuiCallback<T> {
-    /**
-     * Performs this action now.
-     *
-     * @param value    New Value of the field being changed
-     * @return Adjusted value the field must take on
-     */
-    T perform(T value);
-}
diff --git a/src/main/java/com/minelittlepony/gui/IGuiTooltipped.java b/src/main/java/com/minelittlepony/gui/IGuiTooltipped.java
deleted file mode 100644
index e01e79fe..00000000
--- a/src/main/java/com/minelittlepony/gui/IGuiTooltipped.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.minelittlepony.gui;
-
-import net.minecraft.client.Minecraft;
-
-import com.google.common.base.Splitter;
-
-import java.util.List;
-
-public interface IGuiTooltipped<T extends IGuiTooltipped<T>> {
-
-    T setTooltip(List<String> tooltip);
-
-    T setTooltipOffset(int x, int y);
-
-    default T setTooltip(String tooltip) {
-        return setTooltip(Splitter.onPattern("\r?\n|\\\\n").splitToList(GameGui.format(tooltip)));
-    }
-
-    void renderToolTip(Minecraft mc, int mouseX, int mouseY);
-}
diff --git a/src/main/java/com/minelittlepony/gui/Label.java b/src/main/java/com/minelittlepony/gui/Label.java
deleted file mode 100644
index a136cd93..00000000
--- a/src/main/java/com/minelittlepony/gui/Label.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.minelittlepony.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-
-/**
- * A simple label for drawing text to a gui screen.
- *
- * @author Sollace
- *
- */
-public class Label extends GuiButton {
-
-    private boolean center;
-
-    private int color;
-
-    private String text;
-
-    public Label(int x, int y, String translationString, int color) {
-        this(x, y, translationString, color, false);
-    }
-
-    public Label(int x, int y, String translationString, int color, boolean center) {
-        super(0, x, y, "");
-        this.color = color;
-        this.center = center;
-        this.text = translationString;
-    }
-
-    @Override
-    public boolean mousePressed(Minecraft mc, int mouseX, int mouseY) {
-        return false;
-    }
-
-    @Override
-    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        if (center) {
-            drawCenteredString(mc.fontRenderer, GameGui.format(text), x, y, color);
-        } else {
-            drawString(mc.fontRenderer, GameGui.format(text), x, y, color);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/gui/Slider.java b/src/main/java/com/minelittlepony/gui/Slider.java
deleted file mode 100644
index d5436400..00000000
--- a/src/main/java/com/minelittlepony/gui/Slider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.minelittlepony.gui;
-
-import net.minecraft.client.gui.GuiSlider;
-import net.minecraft.client.gui.GuiPageButtonList.GuiResponder;
-
-/**
- * A slider for sliding.
- *
- * @author Sollace
- *
- */
-public class Slider extends GuiSlider {
-
-    private static Responder callback;
-
-    public Slider(int x, int y, float minIn, float maxIn, float defaultValue, GuiSlider.FormatHelper formatter, IGuiCallback<Float> action) {
-        super(callback = new Responder(action), 0, x, y, "", minIn, maxIn, defaultValue, formatter);
-        callback.owner = this;
-        callback = null;
-    }
-
-    private static final class Responder implements GuiResponder {
-
-        private final IGuiCallback<Float> action;
-
-        private Slider owner;
-
-        private Responder(IGuiCallback<Float> callback) {
-            action = callback;
-        }
-
-        @Override
-        public void setEntryValue(int id, boolean value) { }
-
-        @Override
-        public void setEntryValue(int id, float value) {
-            owner.setSliderValue(action.perform(value), false);
-        }
-
-        @Override
-        public void setEntryValue(int id, String value) { }
-
-    }
-}
diff --git a/src/main/java/com/minelittlepony/render/model/ModelQuads.java b/src/main/java/com/minelittlepony/render/model/ModelQuads.java
deleted file mode 100644
index febb3dd3..00000000
--- a/src/main/java/com/minelittlepony/render/model/ModelQuads.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.minelittlepony.render.model;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import com.minelittlepony.util.render.Box;
-
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.model.PositionTextureVertex;
-import net.minecraft.client.model.TexturedQuad;
-import net.minecraft.client.renderer.BufferBuilder;
-
-public class ModelQuads extends Box<ModelRenderer> {
-
-    public ModelQuads(ModelRenderer renderer) {
-        super(renderer, 0, 0, 0, 0, 0, 0, 0, 0, 0);
-    }
-
-    protected List<TexturedQuad> quadList = new ArrayList<TexturedQuad>();
-
-    public ModelQuads addFace(PositionTextureVertex... vertices) {
-        quadList.add(new TexturedShape2d(vertices));
-
-        return this;
-    }
-
-    public void render(BufferBuilder renderer, float scale) {
-        for (TexturedQuad i : quadList) {
-            i.draw(renderer, scale);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/render/model/TexturedShape2d.java b/src/main/java/com/minelittlepony/render/model/TexturedShape2d.java
deleted file mode 100644
index 890b9751..00000000
--- a/src/main/java/com/minelittlepony/render/model/TexturedShape2d.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package com.minelittlepony.render.model;
-
-import net.minecraft.client.model.PositionTextureVertex;
-import net.minecraft.client.model.TexturedQuad;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.math.Vec3d;
-
-public class TexturedShape2d extends TexturedQuad {
-
-    protected boolean invertNormal;
-
-    public TexturedShape2d(PositionTextureVertex... vertices) {
-        super(vertices);
-    }
-
-    public TexturedShape2d(PositionTextureVertex[] vertices, int texcoordU1, int texcoordV1, int texcoordU2, int texcoordV2, float textureWidth, float textureHeight) {
-        super(vertices, texcoordU1, texcoordV1, texcoordU2, texcoordV2, textureWidth, textureHeight);
-    }
-
-    public TexturedShape2d setInvertNormal() {
-        invertNormal = true;
-        return this;
-    }
-
-    public void drawQuad(BufferBuilder renderer, float scale) {
-        Vec3d vec3d = vertexPositions[1].vector3D.subtractReverse(vertexPositions[0].vector3D);
-        Vec3d vec3d1 = vertexPositions[1].vector3D.subtractReverse(vertexPositions[2].vector3D);
-        Vec3d vec3d2 = vec3d1.crossProduct(vec3d).normalize();
-        float f = (float)vec3d2.x;
-        float f1 = (float)vec3d2.y;
-        float f2 = (float)vec3d2.z;
-
-        if (invertNormal) {
-            f = -f;
-            f1 = -f1;
-            f2 = -f2;
-        }
-
-        renderer.begin(7, DefaultVertexFormats.OLDMODEL_POSITION_TEX_NORMAL);
-
-        for (int i = 0; i < nVertices; ++i) {
-            PositionTextureVertex positiontexturevertex = vertexPositions[i];
-            renderer.pos(positiontexturevertex.vector3D.x * (double)scale, positiontexturevertex.vector3D.y * (double)scale, positiontexturevertex.vector3D.z * (double)scale).tex((double)positiontexturevertex.texturePositionX, (double)positiontexturevertex.texturePositionY).normal(f, f1, f2).endVertex();
-        }
-
-        Tessellator.getInstance().draw();
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/ClientHooks.java b/src/main/java/com/minelittlepony/unicopia/ClientHooks.java
index 345487c7..495710c4 100644
--- a/src/main/java/com/minelittlepony/unicopia/ClientHooks.java
+++ b/src/main/java/com/minelittlepony/unicopia/ClientHooks.java
@@ -1,88 +1,63 @@
 package com.minelittlepony.unicopia;
 
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-import com.minelittlepony.unicopia.hud.UHud;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.IView;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.client.gui.UHud;
+import com.minelittlepony.unicopia.entity.player.ICamera;
+import com.mojang.blaze3d.platform.GlStateManager;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiOptions;
-import net.minecraft.client.gui.GuiShareToLan;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraftforge.client.event.EntityViewRenderEvent;
-import net.minecraftforge.client.event.FOVUpdateEvent;
-import net.minecraftforge.client.event.GuiScreenEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent;
-import net.minecraftforge.client.event.RenderLivingEvent;
-import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraft.client.MinecraftClient;
 
-@EventBusSubscriber(value = Side.CLIENT, modid = Unicopia.MODID)
 class ClientHooks {
     // This fixes lighting errors on the armour slots.
     // #MahjongPls
-    @FUF(reason = "Forge should fix this. Cancelling their event skips neccessary state resetting at the end of the render method")
-    @SubscribeEvent
-    public static void postEntityRender(RenderLivingEvent.Post<?> event) {
-        GlStateManager.enableAlpha();
+    public static void postEntityRender() {
+        GlStateManager.enableAlphaTest();
 
         UClient.instance().postRenderEntity(event.getEntity());
     }
 
-    @SubscribeEvent
-    public static void preEntityRender(RenderLivingEvent.Pre<?> event) {
+    public static void preEntityRender() {
         if (UClient.instance().renderEntity(event.getEntity(), event.getPartialRenderTick())) {
             event.setCanceled(true);
         }
     }
 
-    @SubscribeEvent
     public static void onDisplayGui(GuiScreenEvent.InitGuiEvent.Post event) {
         if (event.getGui() instanceof GuiOptions || event.getGui() instanceof GuiShareToLan) {
             UnicopiaClient.addUniButton(event.getButtonList());
         }
     }
 
-    @SubscribeEvent
     public static void onGameTick(TickEvent.ClientTickEvent event) {
         if (event.phase == Phase.END) {
             UClient.instance().tick();
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGHEST)
     public static void beforePreRenderHud(RenderGameOverlayEvent.Pre event) {
         GlStateManager.pushMatrix();
 
         if (event.getType() != ElementType.ALL) {
             IPlayer player = UClient.instance().getIPlayer();
 
-            if (player != null && Minecraft.getMinecraft().world != null) {
+            if (player != null && MinecraftClient.getInstance().world != null) {
                 UHud.instance.repositionElements(player, event.getResolution(), event.getType(), true);
             }
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.LOWEST, receiveCanceled = true)
     public static void afterPreRenderHud(RenderGameOverlayEvent.Pre event) {
         if (event.isCanceled()) {
             GlStateManager.popMatrix();
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.LOWEST)
     public static void postRenderHud(RenderGameOverlayEvent.Post event) {
 
         if (event.getType() == ElementType.ALL) {
             IPlayer player = UClient.instance().getIPlayer();
 
-            if (player != null && Minecraft.getMinecraft().world != null) {
+            if (player != null && MinecraftClient.getInstance().world != null) {
                 UHud.instance.renderHud(player, event.getResolution());
             }
         }
@@ -90,18 +65,21 @@ class ClientHooks {
         GlStateManager.popMatrix();
     }
 
-    @SubscribeEvent
-    public static void modifyFOV(FOVUpdateEvent event) {
-        event.setNewfov(PlayerSpeciesList.instance().getPlayer(event.getEntity()).getCamera().calculateFieldOfView(event.getFov()));
+    public static void registerItemColours(ColorHandlerEvent.Item event) {
+        UItems.registerColors(event.getItemColors());
+        UBlocks.registerColors(event.getItemColors(), event.getBlockColors());
+    }
+
+    public static void modifyFOV(FOVUpdateEvent event) {
+        event.setNewfov(SpeciesList.instance().getPlayer(event.getEntity()).getCamera().calculateFieldOfView(event.getFov()));
     }
 
-    @SubscribeEvent
     public static void setupPlayerCamera(EntityViewRenderEvent.CameraSetup event) {
 
         IPlayer player = UClient.instance().getIPlayer();
 
         if (player != null) {
-            IView view = player.getCamera();
+            ICamera view = player.getCamera();
 
             event.setRoll(view.calculateRoll());
             event.setPitch(view.calculatePitch(event.getPitch()));
diff --git a/src/main/java/com/minelittlepony/unicopia/CloudType.java b/src/main/java/com/minelittlepony/unicopia/CloudType.java
index a31ea125..e56e385a 100644
--- a/src/main/java/com/minelittlepony/unicopia/CloudType.java
+++ b/src/main/java/com/minelittlepony/unicopia/CloudType.java
@@ -3,8 +3,8 @@ package com.minelittlepony.unicopia;
 import com.minelittlepony.unicopia.entity.EntityCloud;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
 
 public enum CloudType {
     NORMAL,
@@ -20,22 +20,22 @@ public enum CloudType {
             return true;
         }
 
-        if (e instanceof EntityPlayer) {
+        if (e instanceof PlayerEntity) {
 
             if (this == PACKED) {
                 return true;
             }
 
-            return Predicates.INTERACT_WITH_CLOUDS.test((EntityPlayer)e)
-                || (Predicates.MAGI.test(e) && EntityCloud.getFeatherEnchantStrength((EntityPlayer)e) > 0);
+            return Predicates.INTERACT_WITH_CLOUDS.test((PlayerEntity)e)
+                || (Predicates.MAGI.test(e) && EntityCloud.getFeatherEnchantStrength((PlayerEntity)e) > 0);
         }
 
-        if (e instanceof EntityItem) {
-            return Predicates.ITEM_INTERACT_WITH_CLOUDS.test((EntityItem)e);
+        if (e instanceof ItemEntity) {
+            return Predicates.ITEM_INTERACT_WITH_CLOUDS.test((ItemEntity)e);
         }
 
-        if (e instanceof EntityCloud && e.isRiding()) {
-            return canInteract(e.getRidingEntity());
+        if (e instanceof EntityCloud && e.hasVehicle()) {
+            return canInteract(e.getVehicle());
         }
 
         return false;
diff --git a/src/main/java/com/minelittlepony/unicopia/Fixes.java b/src/main/java/com/minelittlepony/unicopia/Fixes.java
deleted file mode 100644
index 0b48289b..00000000
--- a/src/main/java/com/minelittlepony/unicopia/Fixes.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.minelittlepony.unicopia;
-
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.util.fixers.BlockFixer;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.datafix.DataFixer;
-import net.minecraft.util.datafix.FixTypes;
-import net.minecraft.util.datafix.IFixableData;
-import net.minecraftforge.common.util.CompoundDataFixer;
-import net.minecraftforge.common.util.ModFixs;
-
-public class Fixes {
-
-    static void init(DataFixer fixer) {
-
-        CompoundDataFixer forgeDataFixer = (CompoundDataFixer)fixer;
-
-        try {
-            ModFixs modfix = forgeDataFixer.init(Unicopia.MODID, 1343);
-
-            modfix.registerFix(FixTypes.CHUNK, new FixCloudBlocks());
-            modfix.registerFix(FixTypes.ITEM_INSTANCE, new FixCloudItems());
-            modfix.registerFix(FixTypes.ITEM_INSTANCE, new FixItems());
-
-        } catch (Throwable ignored) {
-            // no way to check if our fixer is already registered.
-            // so just do it anyway and ignore the error.
-            // @FUF(reason = "FUF")
-        }
-    }
-
-    static class FixItems implements IFixableData {
-
-        private final String[] cloud_spawners = new String[] {
-                "unicopia:racing_cloud_spawner",
-                "unicopia:construction_cloud_spawner",
-                "unicopia:wild_cloud_spawner"
-        };
-
-        @Override
-        public int getFixVersion() {
-            return 1343;
-        }
-
-        @Override
-        public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
-            if (compound.hasKey("id", 8)) {
-                String id = compound.getString("id");
-                int damage = compound.hasKey("Damage", 3) ? compound.getInteger("Damage") : 0;
-
-                if (id == "unicopia:cloud") {
-                    id = cloud_spawners[damage % cloud_spawners.length];
-                    damage = 0;
-                }
-
-                if (id == "unicopia:tomato" && damage == 1) {
-                    id = "unicopia:rotten_tomato";
-                    damage = 0;
-                }
-
-                if (id == "unicopia:cloudsdale_tomato" && damage == 1) {
-                    id = "unicopia:rotten_cloudsdale_tomato";
-                    damage = 0;
-                }
-
-                compound.setString("id", id);
-                compound.setInteger("Damage", 0);
-            }
-
-            return compound;
-        }
-
-    }
-
-    static class FixCloudItems implements IFixableData {
-        @Override
-        public int getFixVersion() {
-            return 1342;
-        }
-
-        @Override
-        public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
-
-            if (compound.hasKey("id", 8) && compound.hasKey("Damage", 3)) {
-                String id = compound.getString("id");
-                int damage = compound.getInteger("Damage");
-
-                if (id == "unicopia:cloud_block") {
-                    if (damage == 1) {
-                        damage = 0;
-                        id = "unicopia:packed_cloud_block";
-                    } else if (damage == 2) {
-                        damage = 0;
-                        id = "unicopia:enchanted_cloud_block";
-                    }
-                }
-
-                if (id == "unicopia:cloud_slab") {
-                    if (damage == 1) {
-                        damage = 0;
-                        id = "unicopia:packed_cloud_slab";
-                    } else if (damage == 2) {
-                        damage = 0;
-                        id = "unicopia:enchanted_cloud_slab";
-                    }
-                }
-
-                compound.setString("id", id);
-                compound.setInteger("Damage", 0);
-            }
-
-            return compound;
-        }
-    }
-
-    static class FixCloudBlocks extends BlockFixer {
-
-        @Override
-        public int getFixVersion() {
-            return 1342;
-        }
-
-        @Override
-        protected IBlockState fixBlockState(int id, int metadata) {
-            if (id == Block.getIdFromBlock(UBlocks.normal_cloud) && metadata != 0) {
-                if (metadata == 1) {
-                    return UBlocks.packed_cloud.getDefaultState();
-                }
-                if (metadata == 2) {
-                    return UBlocks.enchanted_cloud.getDefaultState();
-                }
-            }
-
-            int shifted = metadata % 8;
-
-            if (id == Block.getIdFromBlock(UBlocks.cloud_slab) && shifted != 0) {
-                if (shifted == 1) {
-                    return UBlocks.packed_cloud_slab.getStateFromMeta(metadata - shifted);
-                }
-                if (shifted == 2) {
-                    return UBlocks.enchanted_cloud_slab.getStateFromMeta(metadata - shifted);
-                }
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/extern/MineLP.java b/src/main/java/com/minelittlepony/unicopia/MineLP.java
similarity index 78%
rename from src/main/java/com/minelittlepony/unicopia/extern/MineLP.java
rename to src/main/java/com/minelittlepony/unicopia/MineLP.java
index 72650e23..94500a34 100644
--- a/src/main/java/com/minelittlepony/unicopia/extern/MineLP.java
+++ b/src/main/java/com/minelittlepony/unicopia/MineLP.java
@@ -1,11 +1,6 @@
-package com.minelittlepony.unicopia.extern;
+package com.minelittlepony.unicopia;
 
-import com.minelittlepony.MineLittlePony;
-import com.minelittlepony.pony.data.IPony;
-import com.minelittlepony.pony.data.PonyRace;
-import com.minelittlepony.unicopia.Race;
-
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.MinecraftClient;
 
 public final class MineLP {
     private static boolean checkComplete;
@@ -34,7 +29,7 @@ public final class MineLP {
             return Race.HUMAN;
         }
 
-        switch (IPony.forPlayer(Minecraft.getMinecraft().player).getRace(false)) {
+        switch (IPony.forPlayer(MinecraftClient.getInstance().player).getRace(false)) {
             case ALICORN:
                 return Race.ALICORN;
             case CHANGELING:
diff --git a/src/main/java/com/minelittlepony/unicopia/Predicates.java b/src/main/java/com/minelittlepony/unicopia/Predicates.java
index 724f1576..9c4d1bf4 100644
--- a/src/main/java/com/minelittlepony/unicopia/Predicates.java
+++ b/src/main/java/com/minelittlepony/unicopia/Predicates.java
@@ -1,50 +1,49 @@
 package com.minelittlepony.unicopia;
 
 import com.google.common.base.Predicate;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
 
 public final class Predicates {
-    public static final Predicate<EntityPlayer> INTERACT_WITH_CLOUDS = player -> {
-        return player != null && PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies().canInteractWithClouds();
+    public static final Predicate<PlayerEntity> INTERACT_WITH_CLOUDS = player -> {
+        return player != null && SpeciesList.instance().getPlayer(player).getSpecies().canInteractWithClouds();
     };
 
     public static final Predicate<Entity> MAGI = entity -> {
-        return entity instanceof EntityPlayer && PlayerSpeciesList.instance().getPlayer((EntityPlayer)entity).getPlayerSpecies().canCast();
+        return entity instanceof PlayerEntity && SpeciesList.instance().getPlayer((PlayerEntity)entity).getSpecies().canCast();
     };
 
     public static final Predicate<Entity> ITEMS = entity -> {
-        return entity instanceof EntityItem && entity.isEntityAlive() && entity.ticksExisted > 1;
+        return entity instanceof ItemEntity && entity.isAlive() && entity.age > 1;
     };
 
-    public static final Predicate<EntityItem> ITEM_INTERACT_WITH_CLOUDS = item -> {
-        return ITEMS.test(item) && PlayerSpeciesList.instance().getEntity(item).getPlayerSpecies().canInteractWithClouds();
+    public static final Predicate<ItemEntity> ITEM_INTERACT_WITH_CLOUDS = item -> {
+        return ITEMS.test(item) && SpeciesList.instance().getEntity(item).getSpecies().canInteractWithClouds();
     };
 
     public static final Predicate<Entity> ENTITY_INTERACT_WITH_CLOUDS = entity -> {
         return entity != null && (
-                    (entity instanceof EntityPlayer && INTERACT_WITH_CLOUDS.test((EntityPlayer)entity))
-                 || (entity instanceof EntityItem && ITEM_INTERACT_WITH_CLOUDS.test((EntityItem)entity))
+                    (entity instanceof PlayerEntity && INTERACT_WITH_CLOUDS.test((PlayerEntity)entity))
+                 || (entity instanceof ItemEntity && ITEM_INTERACT_WITH_CLOUDS.test((ItemEntity)entity))
               );
     };
 
     public static final Predicate<Entity> BUGGY = entity -> {
-        return entity instanceof EntityPlayer
-                && PlayerSpeciesList.instance().getPlayer((EntityPlayer)entity).getPlayerSpecies() == Race.CHANGELING;
+        return entity instanceof PlayerEntity
+                && SpeciesList.instance().getPlayer((PlayerEntity)entity).getSpecies() == Race.CHANGELING;
     };
 
-    public static EntityPlayer getPlayerFromEntity(Entity entity) {
-        if (entity instanceof EntityPlayer) {
-            return (EntityPlayer) entity;
+    public static PlayerEntity getPlayerFromEntity(Entity entity) {
+        if (entity instanceof PlayerEntity) {
+            return (PlayerEntity) entity;
         }
 
-        if (entity instanceof EntityItem) {
-            EntityItem item = (EntityItem)entity;
+        if (entity instanceof ItemEntity) {
+            ItemEntity item = (ItemEntity)entity;
             if (item.getOwner() != null) {
-                return item.getEntityWorld().getPlayerEntityByName(item.getOwner());
+                return item.getEntityWorld().getPlayerByUuid(item.getOwner());
             }
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/SpeciesList.java b/src/main/java/com/minelittlepony/unicopia/SpeciesList.java
new file mode 100644
index 00000000..e9f7f137
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/SpeciesList.java
@@ -0,0 +1,83 @@
+package com.minelittlepony.unicopia;
+
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.UConfig;
+import com.minelittlepony.unicopia.ducks.IRaceContainerHolder;
+import com.minelittlepony.unicopia.entity.IEntity;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+
+public class SpeciesList {
+
+    private static final SpeciesList instance = new SpeciesList();
+
+    public static SpeciesList instance() {
+        return instance;
+    }
+
+    public boolean whiteListRace(Race race) {
+        boolean result = UConfig.instance().getSpeciesWhiteList().add(race);
+
+        UConfig.instance().save();
+
+        return result;
+    }
+
+    public boolean unwhiteListRace(Race race) {
+        boolean result = UConfig.instance().getSpeciesWhiteList().remove(race);
+
+        UConfig.instance().save();
+
+        return result;
+    }
+
+    public boolean speciesPermitted(Race race, PlayerEntity sender) {
+        if (race.isOp() && (sender == null || !sender.abilities.creativeMode)) {
+            return false;
+        }
+
+        return race.isDefault() || UConfig.instance().getSpeciesWhiteList().isEmpty() || UConfig.instance().getSpeciesWhiteList().contains(race);
+    }
+
+    public Race validate(Race race, PlayerEntity sender) {
+        if (!speciesPermitted(race, sender)) {
+            race = Race.EARTH;
+
+            if (!speciesPermitted(race, sender)) {
+                race = Race.HUMAN;
+            }
+        }
+
+        return race;
+    }
+
+    @Nullable
+    public IPlayer getPlayer(@Nullable PlayerEntity player) {
+        return this.<IPlayer>getEntity(player);
+    }
+
+    @Nullable
+    public IPlayer getPlayer(UUID playerId) {
+        return getPlayer(IPlayer.fromServer(playerId));
+    }
+
+    @Nullable
+    public <T extends IEntity> T getEntity(Entity entity) {
+        return this.<Entity, T>getForEntity(entity)
+                .map(IRaceContainerHolder::getRaceContainer)
+                .orElse(null);
+    }
+
+    @SuppressWarnings("unchecked")
+    public <E extends Entity, T extends IEntity> Optional<IRaceContainerHolder<T>> getForEntity(Entity entity) {
+        if (entity instanceof IRaceContainerHolder) {
+            return Optional.of(((IRaceContainerHolder<T>)entity));
+        }
+        return Optional.empty();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/UBlocks.java
new file mode 100644
index 00000000..69d154e4
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/UBlocks.java
@@ -0,0 +1,124 @@
+package com.minelittlepony.unicopia;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.CloudType;
+import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.block.BlockAlfalfa;
+import com.minelittlepony.unicopia.block.ChiselledChitinBlock;
+import com.minelittlepony.unicopia.block.ChitinBlock;
+import com.minelittlepony.unicopia.block.FruitLeavesBlock;
+import com.minelittlepony.unicopia.block.GlowingGemBlock;
+import com.minelittlepony.unicopia.block.BlockGrowingCuccoon;
+import com.minelittlepony.unicopia.block.HiveWallBlock;
+import com.minelittlepony.unicopia.block.IColourful;
+import com.minelittlepony.unicopia.block.SlimeLayerBlock;
+import com.minelittlepony.unicopia.block.StickBlock;
+import com.minelittlepony.unicopia.block.BlockCloudAnvil;
+import com.minelittlepony.unicopia.block.BlockCloudBanister;
+import com.minelittlepony.unicopia.block.BlockCloudSlab;
+import com.minelittlepony.unicopia.block.BlockCloudStairs;
+import com.minelittlepony.unicopia.block.BlockDutchDoor;
+import com.minelittlepony.unicopia.block.SugarBlock;
+import com.minelittlepony.unicopia.block.UPot;
+import com.minelittlepony.unicopia.block.USapling;
+import com.minelittlepony.unicopia.block.BlockTomatoPlant;
+import com.minelittlepony.unicopia.item.ItemApple;
+import com.minelittlepony.unicopia.block.BlockCloudDoor;
+import com.minelittlepony.unicopia.block.BlockDiamondDoor;
+import com.minelittlepony.unicopia.block.BlockCloudFarm;
+import com.minelittlepony.unicopia.block.BlockCloudFence;
+import com.minelittlepony.unicopia.block.BlockCloud;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.Material;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.color.item.ItemColors;
+import net.minecraft.client.color.world.BiomeColors;
+import net.minecraft.client.color.world.GrassColors;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
+
+public class UBlocks {
+    public static final BlockCloud normal_cloud = register(new BlockCloud(UMaterials.cloud, CloudType.NORMAL, Unicopia.MODID, "cloud_block"));
+    public static final BlockCloud enchanted_cloud = register(new BlockCloud(UMaterials.cloud, CloudType.ENCHANTED, Unicopia.MODID, "enchanted_cloud_block"));
+    public static final BlockCloud packed_cloud = register(new BlockCloud(UMaterials.cloud, CloudType.PACKED, Unicopia.MODID, "packed_cloud_block"));
+
+    public static final BlockCloudStairs cloud_stairs = register(new BlockCloudStairs(normal_cloud.getDefaultState(), Unicopia.MODID, "cloud_stairs"));
+
+    public static final BlockCloudSlab.Single<?> cloud_slab = register(new BlockCloudSlab.Single<>(normal_cloud, UMaterials.cloud, Unicopia.MODID, "cloud_slab"));
+    public static final BlockCloudSlab.Single<?> enchanted_cloud_slab = register(new BlockCloudSlab.Single<>(enchanted_cloud, UMaterials.cloud, Unicopia.MODID, "enchanted_cloud_slab"));
+    public static final BlockCloudSlab.Single<?> packed_cloud_slab = register(new BlockCloudSlab.Single<>(enchanted_cloud, UMaterials.cloud, Unicopia.MODID, "packed_cloud_slab"));
+
+    public static final BlockCloudDoor mist_door = register(new BlockCloudDoor(UMaterials.cloud, Unicopia.MODID, "mist_door", () -> UItems.mist_door));
+    public static final Block library_door = register(new BlockDutchDoor(Material.WOOD, Unicopia.MODID, "library_door", () -> UItems.library_door)
+            .setSoundType(SoundType.WOOD)
+            .setHardness(3));
+    public static final Block bakery_door = register(new BlockDutchDoor(Material.WOOD, Unicopia.MODID, "bakery_door", () -> UItems.bakery_door)
+            .setSoundType(SoundType.WOOD)
+            .setHardness(3));
+    public static final Block diamond_door = register(new BlockDiamondDoor(Unicopia.MODID, "diamond_door", () -> UItems.diamond_door));
+
+    public static final GlowingGemBlock enchanted_torch = register(new GlowingGemBlock(Unicopia.MODID, "enchanted_torch"));
+
+    public static final BlockCloudAnvil anvil = register(new BlockCloudAnvil(Unicopia.MODID, "anvil"));
+
+    public static final BlockCloudFence cloud_fence = register(new BlockCloudFence(UMaterials.cloud, CloudType.NORMAL, Unicopia.MODID, "cloud_fence"));
+    public static final BlockCloudBanister cloud_banister = register(new BlockCloudBanister(UMaterials.cloud, Unicopia.MODID, "cloud_banister"));
+
+    public static final BlockAlfalfa alfalfa = register(new BlockAlfalfa(Unicopia.MODID, "alfalfa"));
+
+    public static final StickBlock stick = register(new StickBlock(Unicopia.MODID, "stick"));
+    public static final BlockTomatoPlant tomato_plant = register(new BlockTomatoPlant(Unicopia.MODID, "tomato_plant"));
+
+    public static final BlockCloudFarm cloud_farmland = register(new BlockCloudFarm(Unicopia.MODID, "cloud_farmland"));
+
+    public static final HiveWallBlock hive = register(new HiveWallBlock(Unicopia.MODID, "hive"));
+    public static final ChitinBlock chitin = register(new ChitinBlock(Unicopia.MODID, "chitin_block"));
+    public static final Block chissled_chitin = register(new ChiselledChitinBlock(Unicopia.MODID, "chissled_chitin"));
+
+    public static final BlockGrowingCuccoon cuccoon = register(new BlockGrowingCuccoon(Unicopia.MODID, "cuccoon"));
+    public static final SlimeLayerBlock slime_layer = register(new SlimeLayerBlock(Unicopia.MODID, "slime_layer"));
+
+    public static final Block sugar_block = register(new SugarBlock(Unicopia.MODID, "sugar_block"));
+    public static final UPot flower_pot = register(new UPot(), "flower_pot");
+
+    public static final USapling apple_tree = register(new USapling(Unicopia.MODID, "apple_sapling")
+            .setTreeGen((w, s, m) -> new WorldGenTrees(true, 5, Blocks.LOG.getDefaultState(), UBlocks.apple_leaves.getDefaultState(), false));
+    public static final Block apple_leaves = register(new FruitLeavesBlock()
+            .growthChance(1200)
+            .tint(0xFFEE81)
+            .fruit(ItemApple::getRandomItemStack)
+            .compost(w -> new ItemStack(UItems.rotten_apple))), "apple_leaves");
+
+
+    private static <T extends Block> T register(T block) {
+        return block;
+    }
+
+    static void registerColors(ItemColors items, BlockColors blocks) {
+        items.register((stack, tint) -> {
+            @SuppressWarnings("deprecation")
+            BlockState state = ((BlockItem)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata());
+
+            return blocks.getColorMultiplier(state, null, null, tint);
+        }, apple_leaves);
+        blocks.register((state, world, pos, tint) -> {
+            Block block = state.getBlock();
+
+            if (block instanceof IColourful) {
+                return ((IColourful)block).getCustomTint(state, tint);
+            }
+
+            if (world != null && pos != null) {
+                return BiomeColors.getGrassColor(world, pos);
+            }
+
+            return GrassColors.getColor(0.5D, 1);
+        }, apple_leaves);
+    }
+
+    static void bootstrap() { }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/UClient.java b/src/main/java/com/minelittlepony/unicopia/UClient.java
index 6b81956e..2d07eac1 100644
--- a/src/main/java/com/minelittlepony/unicopia/UClient.java
+++ b/src/main/java/com/minelittlepony/unicopia/UClient.java
@@ -6,25 +6,20 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.entity.EntityFakeServerPlayer;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.IInteractionObject;
-import net.minecraft.world.WorldServer;
+import net.minecraft.entity.player.PlayerEntity;
 
 public class UClient {
 
     private static UClient instance;
 
     public static boolean isClientSide() {
-        return net.minecraftforge.fml.common.FMLCommonHandler.instance().getSide().isClient();
+        return false;
     }
 
-    @FUF(reason = "Forced client Separation")
     public static UClient instance() {
         if (instance == null) {
             if (isClientSide()) {
@@ -37,30 +32,26 @@ public class UClient {
         return instance;
     }
 
-    @FUF(reason = "Forced client Separation")
-    public void displayGuiToPlayer(EntityPlayer player, IInteractionObject inventory) {
+    public void displayGuiToPlayer(PlayerEntity player, InteractionObject inventory) {
         player.displayGui(inventory);
     }
 
-    @FUF(reason = "Forced client Separation")
     @Nullable
-    public EntityPlayer getPlayer() {
+    public PlayerEntity getPlayer() {
         return null;
     }
 
     @Nullable
     public IPlayer getIPlayer() {
-        return PlayerSpeciesList.instance().getPlayer(getPlayer());
+        return SpeciesList.instance().getPlayer(getPlayer());
     }
 
-    @FUF(reason = "Forced client Separation")
     @Nullable
-    public EntityPlayer getPlayerByUUID(UUID playerId) {
+    public PlayerEntity getPlayerByUUID(UUID playerId) {
         return null;
     }
 
-    @FUF(reason = "Forced client Separation")
-    public boolean isClientPlayer(@Nullable EntityPlayer player) {
+    public boolean isClientPlayer(@Nullable PlayerEntity player) {
         return false;
     }
 
@@ -74,7 +65,7 @@ public class UClient {
      * Returns an implementation of EntityPlayer appropriate to the side being called on.
      */
     @Nonnull
-    public EntityPlayer createPlayer(Entity observer, GameProfile profile) {
+    public PlayerEntity createPlayer(Entity observer, GameProfile profile) {
         return new EntityFakeServerPlayer((WorldServer)observer.world, profile);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/UEffects.java b/src/main/java/com/minelittlepony/unicopia/UEffects.java
new file mode 100644
index 00000000..9ad4cffb
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/UEffects.java
@@ -0,0 +1,31 @@
+package com.minelittlepony.unicopia;
+
+import com.minelittlepony.unicopia.Unicopia;
+
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.effect.StatusEffect;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.potion.Potion;
+
+public class UEffects {
+
+    public static final DamageSource food_poisoning = new DamageSource("food_poisoning").bypassesArmor();
+
+    public static final StatusEffect FOOD_POISONING = new UPotion(Unicopia.MODID, "food_poisoning", true, 3484199)
+            .setIconIndex(3, 1)
+            .setSilent()
+            .setEffectiveness(0.25)
+            .setApplicator((p, e, i) -> {
+
+                StatusEffectInstance nausea = e.getActivePotionEffect(StatusEffects.NAUSEA);
+                if (nausea == null) {
+                    StatusEffect foodEffect = e.getActivePotionEffect(p);
+                    nausea = new StatusEffectInstance(StatusEffects.NAUSEA, foodEffect.getDuration(), foodEffect.getAmplifier(), foodEffect.getIsAmbient(), foodEffect.doesShowParticles());
+
+                    e.addPotionEffect(nausea);
+                }
+
+                e.attackEntityFrom(food_poisoning, i);
+            });
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UEntities.java b/src/main/java/com/minelittlepony/unicopia/UEntities.java
similarity index 75%
rename from src/main/java/com/minelittlepony/unicopia/init/UEntities.java
rename to src/main/java/com/minelittlepony/unicopia/UEntities.java
index f717a3bb..b55b1385 100644
--- a/src/main/java/com/minelittlepony/unicopia/init/UEntities.java
+++ b/src/main/java/com/minelittlepony/unicopia/UEntities.java
@@ -1,6 +1,14 @@
-package com.minelittlepony.unicopia.init;
+package com.minelittlepony.unicopia;
 
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.client.render.entity.ButterflyEntityRenderer;
+import com.minelittlepony.unicopia.client.render.entity.RenderCloud;
+import com.minelittlepony.unicopia.client.render.entity.RenderCuccoon;
+import com.minelittlepony.unicopia.client.render.entity.RenderGem;
+import com.minelittlepony.unicopia.client.render.entity.RenderProjectile;
+import com.minelittlepony.unicopia.client.render.entity.RenderRainbow;
+import com.minelittlepony.unicopia.client.render.entity.RenderSpear;
+import com.minelittlepony.unicopia.client.render.entity.RenderSpellbook;
 import com.minelittlepony.unicopia.entity.EntityButterfly;
 import com.minelittlepony.unicopia.entity.EntityCloud;
 import com.minelittlepony.unicopia.entity.EntityConstructionCloud;
@@ -8,20 +16,12 @@ import com.minelittlepony.unicopia.entity.EntityCuccoon;
 import com.minelittlepony.unicopia.entity.EntityRacingCloud;
 import com.minelittlepony.unicopia.entity.EntityRainbow;
 import com.minelittlepony.unicopia.entity.EntitySpear;
-import com.minelittlepony.unicopia.entity.EntitySpell;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
 import com.minelittlepony.unicopia.entity.EntitySpellbook;
-import com.minelittlepony.unicopia.entity.EntityProjectile;
 import com.minelittlepony.unicopia.entity.EntityWildCloud;
+import com.minelittlepony.unicopia.entity.item.AdvancedProjectileEntity;
 import com.minelittlepony.unicopia.forgebullshit.BiomeBS;
 import com.minelittlepony.unicopia.forgebullshit.EntityType;
-import com.minelittlepony.unicopia.render.RenderButterfly;
-import com.minelittlepony.unicopia.render.RenderCloud;
-import com.minelittlepony.unicopia.render.RenderCuccoon;
-import com.minelittlepony.unicopia.render.RenderGem;
-import com.minelittlepony.unicopia.render.RenderProjectile;
-import com.minelittlepony.unicopia.render.RenderRainbow;
-import com.minelittlepony.unicopia.render.RenderSpear;
-import com.minelittlepony.unicopia.render.RenderSpellbook;
 
 import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.world.biome.Biome;
@@ -45,24 +45,24 @@ public class UEntities {
                 builder.creature(EntityWildCloud.class, "wild_cloud"),
                 builder.creature(EntityRacingCloud.class, "racing_cloud"),
                 builder.creature(EntityConstructionCloud.class, "construction_cloud"),
-                builder.creature(EntitySpell.class, "magic_spell"),
+                builder.creature(SpellcastEntity.class, "magic_spell"),
                 builder.creature(EntitySpellbook.class, "spellbook"),
                 builder.creature(EntityRainbow.Spawner.class, "rainbow_spawner"),
                 builder.creature(EntityCuccoon.class, "cuccoon"),
                 builder.creature(EntityButterfly.class, "butterfly").withEgg(0x222200, 0xaaeeff),
                 builder.projectile(EntityRainbow.class, "rainbow", 500, 5),
-                builder.projectile(EntityProjectile.class, "thrown_item", 100, 10),
+                builder.projectile(AdvancedProjectileEntity.class, "thrown_item", 100, 10),
                 builder.projectile(EntitySpear.class, "spear", 100, 10)
         );
     }
 
     public static void preInit() {
         RenderingRegistry.registerEntityRenderingHandler(EntityCloud.class, RenderCloud::new);
-        RenderingRegistry.registerEntityRenderingHandler(EntitySpell.class, RenderGem::new);
-        RenderingRegistry.registerEntityRenderingHandler(EntityProjectile.class, RenderProjectile::new);
+        RenderingRegistry.registerEntityRenderingHandler(SpellcastEntity.class, RenderGem::new);
+        RenderingRegistry.registerEntityRenderingHandler(AdvancedProjectileEntity.class, RenderProjectile::new);
         RenderingRegistry.registerEntityRenderingHandler(EntitySpellbook.class, RenderSpellbook::new);
         RenderingRegistry.registerEntityRenderingHandler(EntityRainbow.class, RenderRainbow::new);
-        RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, RenderButterfly::new);
+        RenderingRegistry.registerEntityRenderingHandler(EntityButterfly.class, ButterflyEntityRenderer::new);
         RenderingRegistry.registerEntityRenderingHandler(EntityCuccoon.class, RenderCuccoon::new);
         RenderingRegistry.registerEntityRenderingHandler(EntitySpear.class, RenderSpear::new);
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UItems.java b/src/main/java/com/minelittlepony/unicopia/UItems.java
similarity index 96%
rename from src/main/java/com/minelittlepony/unicopia/init/UItems.java
rename to src/main/java/com/minelittlepony/unicopia/UItems.java
index 15fe3a0d..d3c27f3d 100644
--- a/src/main/java/com/minelittlepony/unicopia/init/UItems.java
+++ b/src/main/java/com/minelittlepony/unicopia/UItems.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.init;
+package com.minelittlepony.unicopia;
 
 import com.minelittlepony.unicopia.item.ItemAlicornAmulet;
 import com.minelittlepony.unicopia.item.ItemApple;
@@ -43,7 +43,7 @@ import net.minecraft.item.ItemFood;
 import net.minecraft.item.ItemSeedFood;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.crafting.FurnaceRecipes;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraftforge.fml.relauncher.Side;
 import net.minecraftforge.fml.relauncher.SideOnly;
 import net.minecraftforge.registries.IForgeRegistry;
@@ -288,12 +288,12 @@ public class UItems {
                 record_crusade, record_pet, record_popular, record_funk);
 
         if (UClient.isClientSide()) {
-            BuildInTexturesBakery.getBuiltInTextures().add(new ResourceLocation(Unicopia.MODID, "items/empty_slot_gem"));
+            BuildInTexturesBakery.getBuiltInTextures().add(new Identifier(Unicopia.MODID, "items/empty_slot_gem"));
         }
 
-        FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(zap_apple), new ItemStack(cooked_zap_apple), 0.1F);
-        FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(juice), new ItemStack(burned_juice), 0);
-        FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(cuccoon), new ItemStack(chitin_shell), 0.3F);
+        FurnaceRecipes.getInstance().addSmeltingRecipe(new ItemStack(zap_apple), new ItemStack(cooked_zap_apple), 0.1F);
+        FurnaceRecipes.getInstance().addSmeltingRecipe(new ItemStack(juice), new ItemStack(burned_juice), 0);
+        FurnaceRecipes.getInstance().addSmeltingRecipe(new ItemStack(cuccoon), new ItemStack(chitin_shell), 0.3F);
     }
 
     public static void fixRecipes() {
@@ -305,8 +305,8 @@ public class UItems {
     @SideOnly(Side.CLIENT)
     static void registerColors(ItemColors registry) {
         registry.registerItemColorHandler((stack, tint) -> {
-            if (MAGI.test(Minecraft.getMinecraft().player)) {
-                return SpellRegistry.instance().getSpellTintFromStack(stack);
+            if (MAGI.test(MinecraftClient.getInstance().player)) {
+                return SpellRegistry.getInstance().getSpellTintFromStack(stack);
             }
 
             return 0xffffff;
diff --git a/src/main/java/com/minelittlepony/unicopia/UMaterials.java b/src/main/java/com/minelittlepony/unicopia/UMaterials.java
new file mode 100644
index 00000000..34761a91
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/UMaterials.java
@@ -0,0 +1,9 @@
+package com.minelittlepony.unicopia;
+
+import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
+
+public class UMaterials {
+    public static final Material cloud = new Material.Builder(MaterialColor.WHITE).build();
+    public static final Material hive = new Material.Builder(MaterialColor.NETHER).build();
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/UParticles.java b/src/main/java/com/minelittlepony/unicopia/UParticles.java
new file mode 100644
index 00000000..2369b565
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/UParticles.java
@@ -0,0 +1,33 @@
+package com.minelittlepony.unicopia;
+
+import com.minelittlepony.unicopia.client.particle.ParticleChangelingMagic;
+import com.minelittlepony.unicopia.client.particle.ParticleDisk;
+import com.minelittlepony.unicopia.client.particle.ParticleRaindrops;
+import com.minelittlepony.unicopia.client.particle.ParticleSphere;
+import com.minelittlepony.unicopia.client.particle.ParticleUnicornMagic;
+
+import net.fabricmc.api.EnvType;
+import net.fabricmc.api.Environment;
+import net.fabricmc.fabric.api.particles.ParticleFactoryRegistry;
+import net.fabricmc.fabric.api.particles.ParticleTypeRegistry;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.util.Identifier;
+
+public class UParticles {
+    public static final DefaultParticleType UNICORN_MAGIC = ParticleTypeRegistry.getTnstance().register(new Identifier("unicopia", "unicorn_magic"));
+    public static final DefaultParticleType CHANGELING_MAGIC = ParticleTypeRegistry.getTnstance().register(new Identifier("unicopia", "changeling_magic"));
+
+    public static final DefaultParticleType RAIN_DROPS = ParticleTypeRegistry.getTnstance().register(new Identifier("unicopia", "rain_drops"));
+
+    public static final DefaultParticleType SPHERE = ParticleTypeRegistry.getTnstance().register(new Identifier("unicopia", "sphere"));
+    public static final DefaultParticleType DISK = ParticleTypeRegistry.getTnstance().register(new Identifier("unicopia", "disk"));
+
+    @Environment(EnvType.CLIENT)
+    public void onInitializeClient() {
+        ParticleFactoryRegistry.getInstance().register(UNICORN_MAGIC, ParticleUnicornMagic::new);
+        ParticleFactoryRegistry.getInstance().register(CHANGELING_MAGIC, ParticleChangelingMagic::new);
+        ParticleFactoryRegistry.getInstance().register(RAIN_DROPS, ParticleRaindrops::new);
+        ParticleFactoryRegistry.getInstance().register(SPHERE, ParticleSphere::new);
+        ParticleFactoryRegistry.getInstance().register(DISK, ParticleDisk::new);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/potion/UPotion.java b/src/main/java/com/minelittlepony/unicopia/UPotion.java
similarity index 85%
rename from src/main/java/com/minelittlepony/unicopia/potion/UPotion.java
rename to src/main/java/com/minelittlepony/unicopia/UPotion.java
index 5d07cc67..43aad008 100644
--- a/src/main/java/com/minelittlepony/unicopia/potion/UPotion.java
+++ b/src/main/java/com/minelittlepony/unicopia/UPotion.java
@@ -1,12 +1,12 @@
-package com.minelittlepony.unicopia.potion;
+package com.minelittlepony.unicopia;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffect;
 import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
 
-public class UPotion extends Potion {
+public class UPotion extends StatusEffect {
 
     private boolean isSilent;
     private int tickDelay = 40;
@@ -69,7 +69,7 @@ public class UPotion extends Potion {
     }
 
     @Override
-    public void performEffect(EntityLivingBase entity, int amplifier) {
+    public void performEffect(LivingEntity entity, int amplifier) {
         applicator.performEffect(this, entity, amplifier);
     }
 
@@ -95,6 +95,6 @@ public class UPotion extends Potion {
     public interface IEffectApplicator {
         IEffectApplicator NONE = (p, e, i) -> {};
 
-        void performEffect(Potion effect, EntityLivingBase target, int amplifier);
+        void performEffect(Potion effect, LivingEntity target, int amplifier);
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/USounds.java b/src/main/java/com/minelittlepony/unicopia/USounds.java
new file mode 100644
index 00000000..71f044a6
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/USounds.java
@@ -0,0 +1,29 @@
+package com.minelittlepony.unicopia;
+
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
+
+public class USounds {
+
+    public static final SoundEvent WING_FLAP = register("wing_flap");
+    public static final SoundEvent WIND_RUSH = register("wind_rush");
+
+    public static final SoundEvent INSECT = register("insect");
+    public static final SoundEvent CHANGELING_BUZZ = register("changeling_buzz");
+
+    public static final SoundEvent SLIME_ADVANCE = register("slime_advance");
+    public static final SoundEvent SLIME_RETRACT = register("slime_retract");
+
+    public static final SoundEvent RECORD_CRUSADE = register("record.crusade");
+    public static final SoundEvent RECORD_PET = register("record.pet");
+    public static final SoundEvent RECORD_POPULAR = register("record.popular");
+    public static final SoundEvent RECORD_FUNK = register("record.funk");
+
+    private static SoundEvent register(String name) {
+        Identifier id = new Identifier(Unicopia.MODID, name);
+        return Registry.register(Registry.SOUND_EVENT, id, new SoundEvent(id));
+    }
+
+    static void bootstrap() {}
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/Unicopia.java b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
index 975fbed7..8458960f 100644
--- a/src/main/java/com/minelittlepony/unicopia/Unicopia.java
+++ b/src/main/java/com/minelittlepony/unicopia/Unicopia.java
@@ -1,20 +1,8 @@
 package com.minelittlepony.unicopia;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.crafting.IRecipe;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
-import net.minecraftforge.fml.common.event.FMLServerAboutToStartEvent;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
-import net.minecraftforge.fml.common.network.IGuiHandler;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
 import java.util.Map;
 import java.util.function.Function;
 
@@ -22,33 +10,22 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import com.google.gson.JsonObject;
-import com.minelittlepony.jumpingcastle.api.IChannel;
-import com.minelittlepony.jumpingcastle.api.JumpingCastle;
+import com.minelittlepony.unicopia.ability.powers.PowersRegistry;
 import com.minelittlepony.unicopia.advancements.UAdvancements;
 import com.minelittlepony.unicopia.command.Commands;
 import com.minelittlepony.unicopia.enchanting.AffineIngredients;
 import com.minelittlepony.unicopia.enchanting.Pages;
 import com.minelittlepony.unicopia.enchanting.SpecialRecipe;
 import com.minelittlepony.unicopia.enchanting.SpellRecipe;
-import com.minelittlepony.unicopia.forgebullshit.FBS;
-import com.minelittlepony.unicopia.init.UEntities;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.inventory.gui.ContainerSpellBook;
+import com.minelittlepony.unicopia.inventory.gui.SpellBookContainer;
 import com.minelittlepony.unicopia.inventory.gui.GuiSpellBook;
 import com.minelittlepony.unicopia.network.MsgPlayerAbility;
 import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
 import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
-import com.minelittlepony.unicopia.power.PowersRegistry;
 import com.minelittlepony.unicopia.util.crafting.CraftingManager;
 import com.minelittlepony.unicopia.world.Hooks;
 import com.minelittlepony.unicopia.world.UWorld;
 
-@Mod(
-    modid = Unicopia.MODID,
-    name = Unicopia.NAME,
-    version = Unicopia.VERSION,
-    dependencies = "required-after:jumpingcastle;after:baubles"
-)
 public class Unicopia implements IGuiHandler {
     public static final String MODID = "unicopia";
     public static final String NAME = "@NAME@";
@@ -78,26 +55,20 @@ public class Unicopia implements IGuiHandler {
         return channel;
     }
 
-    @EventHandler
     public void preInit(FMLPreInitializationEvent event) {
         UConfig.init(event.getModConfigurationDirectory());
         UClient.instance().preInit();
         UWorld.instance().init();
-
-        MinecraftForge.TERRAIN_GEN_BUS.register(Hooks.class);
     }
 
-    @EventHandler
     public void onServerCreated(FMLServerAboutToStartEvent event) {
         Fixes.init(event.getServer().getDataFixer());
     }
 
-    @EventHandler
     public void onServerStart(FMLServerStartingEvent event) {
         Commands.init(event);
     }
 
-    @EventHandler
     public void init(FMLInitializationEvent event) {
         channel = JumpingCastle.subscribeTo(MODID, () -> {})
             .listenFor(MsgRequestCapabilities.class)
@@ -115,7 +86,6 @@ public class Unicopia implements IGuiHandler {
         UClient.instance().init();
     }
 
-    @EventHandler
     public void postInit(FMLPostInitializationEvent event) {
         craftingManager.load();
 
@@ -130,7 +100,7 @@ public class Unicopia implements IGuiHandler {
     @Override
     public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
         switch (ID) {
-            case 0: return new ContainerSpellBook(player.inventory, world, new BlockPos(x, y, z));
+            case 0: return new SpellBookContainer(player.inventory, world, new BlockPos(x, y, z));
             default: return null;
         }
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java b/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
index b81eb2af..957dfcab 100644
--- a/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
+++ b/src/main/java/com/minelittlepony/unicopia/UnicopiaClient.java
@@ -6,35 +6,20 @@ import java.util.UUID;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.minelittlepony.gui.Button;
-import com.minelittlepony.jumpingcastle.api.Target;
-import com.minelittlepony.unicopia.entity.EntityFakeClientPlayer;
-import com.minelittlepony.unicopia.extern.MineLP;
-import com.minelittlepony.unicopia.gui.GuiScreenSettings;
-import com.minelittlepony.unicopia.init.UEntities;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.input.Keyboard;
-import com.minelittlepony.unicopia.input.MouseControl;
-import com.minelittlepony.unicopia.input.MovementControl;
-import com.minelittlepony.unicopia.inventory.gui.GuiOfHolding;
+import com.minelittlepony.unicopia.ability.powers.render.DisguiseRenderer;
+import com.minelittlepony.unicopia.client.gui.SettingsScreen;
+import com.minelittlepony.unicopia.client.input.Keyboard;
+import com.minelittlepony.unicopia.client.input.MouseControl;
+import com.minelittlepony.unicopia.client.input.InversionAwareKeyboardInput;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 import com.minelittlepony.unicopia.network.MsgRequestCapabilities;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.render.DisguiseRenderer;
-import com.minelittlepony.util.gui.ButtonGridLayout;
-import com.minelittlepony.util.lang.ClientLocale;
 import com.mojang.authlib.GameProfile;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.MovementInput;
-import net.minecraft.world.IInteractionObject;
-
-import static com.minelittlepony.util.gui.ButtonGridLayout.*;
+import net.minecraft.entity.player.PlayerEntity;
 
 public class UnicopiaClient extends UClient {
 
@@ -50,7 +35,7 @@ public class UnicopiaClient extends UClient {
 
     private static Race getclientPlayerRace() {
         if (!UConfig.instance().ignoresMineLittlePony()
-                && Minecraft.getMinecraft().player != null) {
+                && MinecraftClient.getInstance().player != null) {
             Race race = MineLP.getPlayerPonyRace();
 
             if (!race.isDefault()) {
@@ -62,40 +47,11 @@ public class UnicopiaClient extends UClient {
         return UConfig.instance().getPrefferedRace();
     }
 
-    static void addUniButton(List<GuiButton> buttons) {
-        ButtonGridLayout layout = new ButtonGridLayout(buttons);
-
-        GuiButton uni = new Button(0, 0, 150, 20, ClientLocale.format("gui.unicopia"), b -> {
-            Minecraft mc = Minecraft.getMinecraft();
-
-            mc.displayGuiScreen(new GuiScreenSettings(mc.currentScreen));
-        });
-
-        List<Integer> possibleXCandidates = list(layout.getColumns());
-        List<Integer> possibleYCandidates = list(layout.getRows());
-
-        uni.y = last(possibleYCandidates, 1);
-
-        if (layout.getRows()
-                .filter(y -> layout.getRow(y).size() == 1).count() < 2) {
-            uni.y += 25;
-            uni.x = first(possibleXCandidates, 0);
-
-            layout.getRow(last(possibleYCandidates, 0)).forEach(button -> {
-                button.y = Math.max(button.y, uni.y + uni.height + 13);
-            });
-        } else {
-            uni.x = first(possibleXCandidates, 2);
-        }
-
-        layout.getElements().add(uni);
-    }
-
     @Override
     public void displayGuiToPlayer(EntityPlayer player, IInteractionObject inventory) {
         if (player instanceof EntityPlayerSP) {
             if ("unicopia:itemofholding".equals(inventory.getGuiID())) {
-                Minecraft.getMinecraft().displayGuiScreen(new GuiOfHolding(inventory));
+                MinecraftClient.getInstance().displayGuiScreen(new GuiOfHolding(inventory));
             }
         } else {
             super.displayGuiToPlayer(player, inventory);
@@ -105,13 +61,13 @@ public class UnicopiaClient extends UClient {
     @Override
     @Nullable
     public EntityPlayer getPlayer() {
-        return Minecraft.getMinecraft().player;
+        return MinecraftClient.getInstance().player;
     }
 
     @Override
     @Nullable
     public EntityPlayer getPlayerByUUID(UUID playerId) {
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc = MinecraftClient.getInstance();
 
         if (mc.player.getUniqueID().equals(playerId)) {
             return mc.player;
@@ -120,6 +76,7 @@ public class UnicopiaClient extends UClient {
         return mc.world.getPlayerEntityByUUID(playerId);
     }
 
+    @Override
     @Nonnull
     public EntityPlayer createPlayer(Entity observer, GameProfile profile) {
         return new EntityFakeClientPlayer(observer.world, profile);
@@ -140,13 +97,13 @@ public class UnicopiaClient extends UClient {
 
     @Override
     public int getViewMode() {
-        return Minecraft.getMinecraft().gameSettings.thirdPersonView;
+        return MinecraftClient.getInstance().gameSettings.thirdPersonView;
     }
 
     @Override
     public void postRenderEntity(Entity entity) {
         if (entity instanceof EntityPlayer) {
-            IPlayer iplayer = PlayerSpeciesList.instance().getPlayer((EntityPlayer)entity);
+            IPlayer iplayer = SpeciesList.instance().getPlayer((EntityPlayer)entity);
 
             if (iplayer.getGravity().getGravitationConstant() < 0) {
                 GlStateManager.translate(0, entity.height, 0);
@@ -160,12 +117,12 @@ public class UnicopiaClient extends UClient {
     @Override
     public boolean renderEntity(Entity entity, float renderPartialTicks) {
 
-        if (DisguiseRenderer.instance().renderDisguise(entity, renderPartialTicks)) {
+        if (DisguiseRenderer.getInstance().renderDisguise(entity, renderPartialTicks)) {
             return true;
         }
 
         if (entity instanceof EntityPlayer) {
-            IPlayer iplayer = PlayerSpeciesList.instance().getPlayer((EntityPlayer)entity);
+            IPlayer iplayer = SpeciesList.instance().getPlayer((EntityPlayer)entity);
 
             if (iplayer.getGravity().getGravitationConstant() < 0) {
                 GlStateManager.scale(1, -1, 1);
@@ -174,7 +131,7 @@ public class UnicopiaClient extends UClient {
                 entity.rotationPitch *= -1;
             }
 
-            if (DisguiseRenderer.instance().renderDisguiseToGui(iplayer)) {
+            if (DisguiseRenderer.getInstance().renderDisguiseToGui(iplayer)) {
                 return true;
             }
 
@@ -197,10 +154,11 @@ public class UnicopiaClient extends UClient {
         clientPlayerRace = getclientPlayerRace();
     }
 
+    @Override
     public void tick() {
-        EntityPlayer player = UClient.instance().getPlayer();
+        PlayerEntity player = UClient.instance().getPlayer();
 
-        if (player != null && !player.isDead) {
+        if (player != null && !player.removed) {
             Race newRace = getclientPlayerRace();
 
             if (newRace != clientPlayerRace) {
@@ -212,20 +170,20 @@ public class UnicopiaClient extends UClient {
 
         Keyboard.getKeyHandler().onKeyInput();
 
-        if (player instanceof EntityPlayerSP) {
-            EntityPlayerSP sp = (EntityPlayerSP)player;
+        MinecraftClient client = MinecraftClient.getInstance();
 
-            MovementInput movement = sp.movementInput;
+        if (player instanceof ClientPlayerEntity) {
+            ClientPlayerEntity sp = (ClientPlayerEntity)player;
 
-            if (!(movement instanceof MovementControl)) {
-                sp.movementInput = new MovementControl(movement);
+            Input movement = sp.input;
+
+            if (!(movement instanceof InversionAwareKeyboardInput)) {
+                sp.input = new InversionAwareKeyboardInput(client, movement);
             }
         }
 
-        Minecraft mc = Minecraft.getMinecraft();
-
-        if (!(mc.mouseHelper instanceof MouseControl)) {
-            mc.mouseHelper = new MouseControl();
+        if (!(client.mouse instanceof MouseControl)) {
+            client.mouse = new MouseControl(client);
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/Hit.java b/src/main/java/com/minelittlepony/unicopia/ability/Hit.java
new file mode 100644
index 00000000..0e878fd9
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/Hit.java
@@ -0,0 +1,5 @@
+package com.minelittlepony.unicopia.ability;
+
+public class Hit implements IData {
+
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IAbilityReceiver.java b/src/main/java/com/minelittlepony/unicopia/ability/IAbilityReceiver.java
similarity index 60%
rename from src/main/java/com/minelittlepony/unicopia/player/IAbilityReceiver.java
rename to src/main/java/com/minelittlepony/unicopia/ability/IAbilityReceiver.java
index 0f293e12..cf98e25b 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IAbilityReceiver.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/IAbilityReceiver.java
@@ -1,6 +1,6 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.ability;
 
-import com.minelittlepony.unicopia.power.IPower;
+import com.minelittlepony.unicopia.ability.IPower;
 
 public interface IAbilityReceiver {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/IData.java b/src/main/java/com/minelittlepony/unicopia/ability/IData.java
new file mode 100644
index 00000000..14f2be2e
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/IData.java
@@ -0,0 +1,5 @@
+package com.minelittlepony.unicopia.ability;
+
+public interface IData {
+
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IFlyingPredicate.java b/src/main/java/com/minelittlepony/unicopia/ability/IFlyingPredicate.java
similarity index 65%
rename from src/main/java/com/minelittlepony/unicopia/player/IFlyingPredicate.java
rename to src/main/java/com/minelittlepony/unicopia/ability/IFlyingPredicate.java
index 3b71f6a9..3830f07c 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IFlyingPredicate.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/IFlyingPredicate.java
@@ -1,4 +1,6 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.ability;
+
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 /**
  * Predicate for abilities to control whether a player can fly.
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IPlayerHeightPredicate.java b/src/main/java/com/minelittlepony/unicopia/ability/IHeightPredicate.java
similarity index 60%
rename from src/main/java/com/minelittlepony/unicopia/player/IPlayerHeightPredicate.java
rename to src/main/java/com/minelittlepony/unicopia/ability/IHeightPredicate.java
index d0abe22b..25a46daf 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IPlayerHeightPredicate.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/IHeightPredicate.java
@@ -1,11 +1,13 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.ability;
+
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 /**
  * Predicate for abilities to control what the player's physical height is.
  *
  * This overrides the default.
  */
-public interface IPlayerHeightPredicate {
+public interface IHeightPredicate {
     float getTargetEyeHeight(IPlayer player);
 
     float getTargetBodyHeight(IPlayer player);
diff --git a/src/main/java/com/minelittlepony/unicopia/power/IPower.java b/src/main/java/com/minelittlepony/unicopia/ability/IPower.java
similarity index 62%
rename from src/main/java/com/minelittlepony/unicopia/power/IPower.java
rename to src/main/java/com/minelittlepony/unicopia/ability/IPower.java
index 44e5fbe8..8f95af80 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/IPower.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/IPower.java
@@ -1,36 +1,14 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability;
 
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.input.IKeyBind;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.util.shape.IShape;
-import com.minelittlepony.util.shape.Sphere;
+import com.minelittlepony.unicopia.client.input.IKeyBindingHandler;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-public interface IPower<T extends IData> extends IKeyBind {
-
-    static void spawnParticles(int particleId, Entity entity, int count, int...args) {
-        double halfDist = entity.getEyeHeight() / 1.5;
-        double middle = entity.getEntityBoundingBox().minY + halfDist;
-
-        IShape shape = new Sphere(false, (float)halfDist + entity.width);
-
-        for (int i = 0; i < count; i++) {
-            Vec3d point = shape.computePoint(entity.getEntityWorld().rand);
-
-            Particles.instance().spawnParticle(particleId, false,
-                    entity.posX + point.x,
-                    middle + point.y,
-                    entity.posZ + point.z,
-                    0, 0, 0, args);
-        }
-    }
+public interface IPower<T extends IData> extends IKeyBindingHandler.IKeyBinding {
 
     @Override
     default String getKeyCategory() {
diff --git a/src/main/java/com/minelittlepony/unicopia/power/data/Location.java b/src/main/java/com/minelittlepony/unicopia/ability/Location.java
similarity index 84%
rename from src/main/java/com/minelittlepony/unicopia/power/data/Location.java
rename to src/main/java/com/minelittlepony/unicopia/ability/Location.java
index 9f9840b1..115783c4 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/data/Location.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/Location.java
@@ -1,7 +1,6 @@
-package com.minelittlepony.unicopia.power.data;
+package com.minelittlepony.unicopia.ability;
 
 import com.google.gson.annotations.Expose;
-import com.minelittlepony.unicopia.power.IData;
 
 import net.minecraft.util.math.BlockPos;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/power/data/Numeric.java b/src/main/java/com/minelittlepony/unicopia/ability/Numeric.java
similarity index 64%
rename from src/main/java/com/minelittlepony/unicopia/power/data/Numeric.java
rename to src/main/java/com/minelittlepony/unicopia/ability/Numeric.java
index 513bdaf8..1cec905d 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/data/Numeric.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/Numeric.java
@@ -1,7 +1,6 @@
-package com.minelittlepony.unicopia.power.data;
+package com.minelittlepony.unicopia.ability;
 
 import com.google.gson.annotations.Expose;
-import com.minelittlepony.unicopia.power.IData;
 
 public class Numeric implements IData {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerCarry.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCarry.java
similarity index 51%
rename from src/main/java/com/minelittlepony/unicopia/power/PowerCarry.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCarry.java
index 17b50ac5..716e1006 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerCarry.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCarry.java
@@ -1,18 +1,18 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability.powers;
 
-import org.lwjgl.input.Keyboard;
+import org.lwjgl.glfw.GLFW;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.entity.EntityCloud;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Hit;
-import com.minelittlepony.util.vector.VecHelper;
+import com.minelittlepony.unicopia.ability.Hit;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.VecHelper;
 
+import net.minecraft.client.network.packet.EntityPassengersSetS2CPacket;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.network.play.server.SPacketSetPassengers;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.world.World;
 
 public class PowerCarry implements IPower<Hit> {
@@ -24,7 +24,7 @@ public class PowerCarry implements IPower<Hit> {
 
     @Override
     public int getKeyCode() {
-        return Keyboard.KEY_K;
+        return GLFW.GLFW_KEY_K;
     }
 
     @Override
@@ -47,12 +47,12 @@ public class PowerCarry implements IPower<Hit> {
         return new Hit();
     }
 
-    protected EntityLivingBase findRider(EntityPlayer player, World w) {
+    protected LivingEntity findRider(PlayerEntity player, World w) {
         Entity hit = VecHelper.getLookedAtEntity(player, 10);
 
-        if (hit instanceof EntityLivingBase && !player.isRidingOrBeingRiddenBy(hit)) {
-            if (!(hit instanceof EntityCloud)) {
-                return (EntityLivingBase)hit;
+        if (hit instanceof LivingEntity && !player.isConnectedThroughVehicle(hit)) {
+            if (!(hit instanceof IPickupImmuned)) {
+                return (LivingEntity)hit;
             }
         }
 
@@ -66,17 +66,17 @@ public class PowerCarry implements IPower<Hit> {
 
     @Override
     public void apply(IPlayer iplayer, Hit data) {
-        EntityPlayer player = iplayer.getOwner();
-        EntityLivingBase rider = findRider(player, iplayer.getWorld());
+        PlayerEntity player = iplayer.getOwner();
+        LivingEntity rider = findRider(player, iplayer.getWorld());
 
         if (rider != null) {
             rider.startRiding(player, true);
         } else {
-            player.removePassengers();
+            player.removeAllPassengers();
         }
 
-        if (player instanceof EntityPlayerMP) {
-            ((EntityPlayerMP)player).getServerWorld().getEntityTracker().sendToTrackingAndSelf(player, new SPacketSetPassengers(player));
+        if (player instanceof ServerPlayerEntity) {
+            ((ServerPlayerEntity)player).networkHandler.sendPacket(new EntityPassengersSetS2CPacket(player));
         }
     }
 
@@ -87,4 +87,8 @@ public class PowerCarry implements IPower<Hit> {
     @Override
     public void postApply(IPlayer player) {
     }
+
+    public interface IPickupImmuned {
+
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerCloudBase.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCloudBase.java
similarity index 53%
rename from src/main/java/com/minelittlepony/unicopia/power/PowerCloudBase.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCloudBase.java
index be82a1a8..201fbff0 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerCloudBase.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerCloudBase.java
@@ -1,13 +1,17 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability.powers;
 
-import org.lwjgl.input.Keyboard;
+import java.util.Optional;
+
+import org.lwjgl.glfw.GLFW;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.entity.EntityCloud;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Numeric;
-import com.minelittlepony.util.vector.VecHelper;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.Numeric;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.VecHelper;
+
+import net.minecraft.entity.Entity;
 
 public class PowerCloudBase implements IPower<Numeric> {
 
@@ -18,7 +22,7 @@ public class PowerCloudBase implements IPower<Numeric> {
 
     @Override
     public int getKeyCode() {
-        return Keyboard.KEY_J;
+        return GLFW.GLFW_KEY_J;
     }
 
     @Override
@@ -38,16 +42,12 @@ public class PowerCloudBase implements IPower<Numeric> {
 
     @Override
     public Numeric tryActivate(IPlayer player) {
-        EntityCloud cloud = findTarget(player);
-
-        if (cloud != null) {
-            Numeric data = new Numeric(player.getOwner().inventory.currentItem + 1);
+        return findTarget(player).map(cloud -> {
+            Numeric data = new Numeric(player.getOwner().inventory.selectedSlot + 1);
             cloud.handlePegasusInteration(data.type);
 
             return data;
-        }
-
-        return null;
+        }).orElse(null);
     }
 
     @Override
@@ -57,25 +57,23 @@ public class PowerCloudBase implements IPower<Numeric> {
 
     @Override
     public void apply(IPlayer player, Numeric data) {
-        EntityCloud cloud = findTarget(player);
-
-        if (cloud != null) {
+        findTarget(player).ifPresent(cloud -> {
             cloud.handlePegasusInteration(data.type);
-        }
+        });
     }
 
-    protected EntityCloud findTarget(IPlayer player) {
-        if (player.getOwner().isRiding() && player.getOwner().getRidingEntity() instanceof EntityCloud) {
-            return (EntityCloud)player.getOwner().getRidingEntity();
+    protected Optional<ICloudEntity> findTarget(IPlayer player) {
+        if (player.getOwner().hasVehicle() && player.getOwner().getVehicle() instanceof ICloudEntity) {
+            return Optional.ofNullable((ICloudEntity)player.getOwner().getVehicle());
         }
 
-        Object e = VecHelper.getLookedAtEntity(player.getOwner(), 18);
+        Entity e = VecHelper.getLookedAtEntity(player.getOwner(), 18);
 
-        if (e instanceof EntityCloud) {
-            return (EntityCloud)e;
+        if (e instanceof ICloudEntity) {
+            return Optional.of((ICloudEntity)e);
         }
 
-        return null;
+        return Optional.empty();
     }
 
     @Override
@@ -87,4 +85,8 @@ public class PowerCloudBase implements IPower<Numeric> {
     public void postApply(IPlayer player) {
         player.spawnParticles(UParticles.RAIN_DROPS, 5);
     }
+
+    public interface ICloudEntity {
+        void handlePegasusInteration(int interationType);
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerDisguise.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerDisguise.java
new file mode 100644
index 00000000..26b4eef8
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerDisguise.java
@@ -0,0 +1,101 @@
+package com.minelittlepony.unicopia.ability.powers;
+
+
+import javax.annotation.Nullable;
+
+import org.lwjgl.glfw.GLFW;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.Hit;
+import com.minelittlepony.unicopia.entity.IInAnimate;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.spells.SpellDisguise;
+import com.minelittlepony.util.VecHelper;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.FallingBlockEntity;
+import net.minecraft.entity.LightningEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+
+public class PowerDisguise extends PowerFeed {
+
+    @Override
+    public String getKeyName() {
+        return "unicopia.power.disguise";
+    }
+
+    @Override
+    public int getKeyCode() {
+        return GLFW.GLFW_KEY_P;
+    }
+
+    @Nullable
+    @Override
+    public Hit tryActivate(IPlayer player) {
+        return new Hit();
+    }
+
+    @Override
+    public void apply(IPlayer iplayer, Hit data) {
+        PlayerEntity player = iplayer.getOwner();
+        HitResult trace = VecHelper.getObjectMouseOver(player, 10, 1);
+
+        Entity looked = null;
+
+        if (trace.getType() == HitResult.Type.BLOCK) {
+            BlockPos pos = ((BlockHitResult)trace).getBlockPos();
+
+            if (!iplayer.getWorld().isAir(pos)) {
+                BlockState state = iplayer.getWorld().getBlockState(pos);
+
+                looked = new FallingBlockEntity(player.getEntityWorld(), 0, 0, 0, state);
+            }
+        } else if (trace.getType() == HitResult.Type.ENTITY) {
+            looked = ((EntityHitResult)trace).getEntity();
+
+            if (looked instanceof PlayerEntity) {
+                looked = SpeciesList.instance().getPlayer((PlayerEntity)looked)
+                        .getEffect(SpellDisguise.class)
+                        .map(SpellDisguise::getDisguise)
+                        .orElse(looked);
+            }
+
+            if (looked instanceof LightningEntity
+            || (looked instanceof IInAnimate && !((IInAnimate)looked).canInteract(Race.CHANGELING))) {
+                looked = null;
+            }
+        }
+
+        player.getEntityWorld().playSound(null, player.getBlockPos(), SoundEvents.ENTITY_PARROT_IMITATE_POLAR_BEAR, SoundCategory.PLAYERS, 1.4F, 0.4F);
+
+        iplayer.getEffect(SpellDisguise.class).orElseGet(() -> {
+            SpellDisguise disc = new SpellDisguise();
+
+            iplayer.setEffect(disc);
+            return disc;
+        }).setDisguise(looked);
+
+        iplayer.sendCapabilities(true);
+    }
+
+    @Override
+    public void preApply(IPlayer player) {
+        player.addEnergy(2);
+        player.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
+    }
+
+    @Override
+    public void postApply(IPlayer player) {
+        player.setEnergy(0);
+        player.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerEngulf.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerEngulf.java
similarity index 69%
rename from src/main/java/com/minelittlepony/unicopia/power/PowerEngulf.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowerEngulf.java
index e2a4f6d7..815c38db 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerEngulf.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerEngulf.java
@@ -1,14 +1,13 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability.powers;
 
 import javax.annotation.Nullable;
 
-import org.lwjgl.input.Keyboard;
-
+import org.lwjgl.glfw.GLFW;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Hit;
-import com.minelittlepony.unicopia.spell.ITossedEffect;
-import com.minelittlepony.unicopia.spell.SpellChangelingTrap;
+import com.minelittlepony.unicopia.ability.Hit;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.spells.SpellChangelingTrap;
 
 public class PowerEngulf implements IPower<Hit> {
 
@@ -19,7 +18,7 @@ public class PowerEngulf implements IPower<Hit> {
 
     @Override
     public int getKeyCode() {
-        return Keyboard.KEY_L;
+        return GLFW.GLFW_KEY_L;
     }
 
     @Override
@@ -50,9 +49,7 @@ public class PowerEngulf implements IPower<Hit> {
 
     @Override
     public void apply(IPlayer player, Hit data) {
-        ITossedEffect effect = new SpellChangelingTrap();
-
-        effect.toss(player);
+        new SpellChangelingTrap().toss(player);
     }
 
     @Override
@@ -64,5 +61,4 @@ public class PowerEngulf implements IPower<Hit> {
     public void postApply(IPlayer player) {
 
     }
-
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerFeed.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerFeed.java
new file mode 100644
index 00000000..8ea041a4
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerFeed.java
@@ -0,0 +1,166 @@
+package com.minelittlepony.unicopia.ability.powers;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.lwjgl.glfw.GLFW;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.ability.Hit;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.MagicalDamageSource;
+import com.minelittlepony.util.VecHelper;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.mob.HostileEntity;
+import net.minecraft.entity.passive.AbstractTraderEntity;
+import net.minecraft.entity.passive.CowEntity;
+import net.minecraft.entity.passive.PigEntity;
+import net.minecraft.entity.passive.SheepEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.particle.ParticleTypes;
+
+public class PowerFeed implements IPower<Hit> {
+
+    @Override
+    public String getKeyName() {
+        return "unicopia.power.feed";
+    }
+
+    @Override
+    public int getKeyCode() {
+        return GLFW.GLFW_KEY_O;
+    }
+
+    @Override
+    public int getWarmupTime(IPlayer player) {
+        return 5;
+    }
+
+    @Override
+    public int getCooldownTime(IPlayer player) {
+        return canFeed(player) ? 15 : 80;
+    }
+
+    @Override
+    public boolean canUse(Race playerSpecies) {
+        return playerSpecies == Race.CHANGELING;
+    }
+
+    @Nullable
+    @Override
+    public Hit tryActivate(IPlayer player) {
+        if (canFeed(player)) {
+            if (!getTargets(player).isEmpty()) {
+                return new Hit();
+            }
+        }
+
+        return null;
+    }
+
+    private boolean canFeed(IPlayer player) {
+        return player.getOwner().getHealth() < player.getOwner().getHealthMaximum() || player.getOwner().canConsume(false);
+    }
+
+    private boolean canDrain(Entity e) {
+        return (e instanceof LivingEntity)
+            && (e instanceof CowEntity
+            || e instanceof AbstractTraderEntity
+            || e instanceof PlayerEntity
+            || e instanceof SheepEntity
+            || e instanceof PigEntity
+            || e instanceof HostileEntity);
+    }
+
+    @Override
+    public Class<Hit> getPackageType() {
+        return Hit.class;
+    }
+
+    protected List<LivingEntity> getTargets(IPlayer player) {
+        List<Entity> list = VecHelper.getWithinRange(player.getOwner(), 3, this::canDrain);
+
+        Entity looked = VecHelper.getLookedAtEntity(player.getOwner(), 17);
+        if (looked != null && !list.contains(looked) && canDrain(looked)) {
+            list.add(looked);
+        }
+
+        return list.stream().map(i -> (LivingEntity)i).collect(Collectors.toList());
+    }
+
+    @Override
+    public void apply(IPlayer iplayer, Hit data) {
+        PlayerEntity player = iplayer.getOwner();
+
+        float maximumHealthGain = player.getHealthMaximum() - player.getHealth();
+        int maximumFoodGain = player.canConsume(false) ? (20 - player.getHungerManager().getFoodLevel()) : 0;
+
+        if (maximumHealthGain > 0 || maximumFoodGain > 0) {
+
+            float healAmount = 0;
+
+            for (LivingEntity i : getTargets(iplayer)) {
+                healAmount += drainFrom(player, i);
+            }
+
+            int foodAmount = (int)Math.floor(Math.min(healAmount / 3, maximumFoodGain));
+
+            if (foodAmount > 0) {
+                healAmount -= foodAmount;
+                player.getHungerManager().add(foodAmount, 0.125f);
+            }
+
+            if (healAmount > 0) {
+                player.heal(Math.min(healAmount, maximumHealthGain));
+            }
+        }
+    }
+
+    public float drainFrom(PlayerEntity changeling, LivingEntity living) {
+        DamageSource d = MagicalDamageSource.causePlayerDamage("feed", changeling);
+
+        float damage = living.getHealth()/2;
+
+        if (damage > 0) {
+            living.damage(d, damage);
+        }
+
+        // TODO:
+        //ParticleTypeRegistry.spawnParticles(UParticles.CHANGELING_MAGIC, living, 7);
+
+        if (changeling.hasStatusEffect(StatusEffects.NAUSEA)) {
+            living.addPotionEffect(changeling.removePotionEffect(StatusEffects.NAUSEA));
+        } else if (changeling.getEntityWorld().random.nextInt(2300) == 0) {
+            living.addPotionEffect(new StatusEffectInstance(StatusEffects.WITHER, 20, 1));
+        }
+
+        if (living instanceof PlayerEntity) {
+            damage ++;
+            damage *= 1.6F;
+
+            if (!changeling.hasStatusEffect(StatusEffects.HEALTH_BOOST)) {
+                changeling.addPotionEffect(new StatusEffectInstance(StatusEffects.HEALTH_BOOST, 13000, 1));
+            }
+        }
+
+        return damage;
+    }
+
+    @Override
+    public void preApply(IPlayer player) {
+        player.addExertion(6);
+    }
+
+    @Override
+    public void postApply(IPlayer player) {
+        player.spawnParticles(ParticleTypes.HEART, 1);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerGrow.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerGrow.java
new file mode 100644
index 00000000..905d583d
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerGrow.java
@@ -0,0 +1,105 @@
+package com.minelittlepony.unicopia.ability.powers;
+
+import org.lwjgl.glfw.GLFW;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.Location;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.VecHelper;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.item.BoneMealItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+public class PowerGrow implements IPower<Location> {
+
+    @Override
+    public String getKeyName() {
+        return "unicopia.power.grow";
+    }
+
+    @Override
+    public int getKeyCode() {
+        return GLFW.GLFW_KEY_N;
+    }
+
+    @Override
+    public int getWarmupTime(IPlayer player) {
+        return 10;
+    }
+
+    @Override
+    public int getCooldownTime(IPlayer player) {
+        return 50;
+    }
+
+    @Override
+    public boolean canUse(Race playerSpecies) {
+        return playerSpecies == Race.EARTH;
+    }
+
+    @Override
+    public Location tryActivate(IPlayer player) {
+        HitResult ray = VecHelper.getObjectMouseOver(player.getOwner(), 3, 1);
+
+        if (ray instanceof BlockHitResult && ray.getType() == HitResult.Type.BLOCK) {
+            return new Location(((BlockHitResult)ray).getBlockPos());
+        }
+
+        return null;
+    }
+
+    @Override
+    public Class<Location> getPackageType() {
+        return Location.class;
+    }
+
+    @Override
+    public void apply(IPlayer player, Location data) {
+        int count = 0;
+
+        for (BlockPos pos : BlockPos.iterate(
+                new BlockPos(data.x - 2, data.y - 2, data.z - 2),
+                new BlockPos(data.x + 2, data.y + 2, data.z + 2))) {
+            count += applySingle(player.getWorld(), player.getWorld().getBlockState(pos), pos);
+        }
+
+        if (count > 0) {
+            player.subtractEnergyCost(count * 5);
+        }
+    }
+
+    protected int applySingle(World w, BlockState state, BlockPos pos) {
+
+        ItemStack stack = new ItemStack(Items.BONE_MEAL);
+
+        if (BoneMealItem.useOnFertilizable(stack, w, pos)
+            || BoneMealItem.useOnGround(stack, w, pos, Direction.UP)) {
+            return 1;
+        }
+
+        return 0;
+    }
+
+    @Override
+    public void preApply(IPlayer player) {
+        player.addExertion(3);
+
+        if (player.getWorld().isClient()) {
+            player.spawnParticles(UParticles.UNICORN_MAGIC, 1);
+        }
+    }
+
+    @Override
+    public void postApply(IPlayer player) {
+
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerMagic.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerMagic.java
similarity index 75%
rename from src/main/java/com/minelittlepony/unicopia/power/PowerMagic.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowerMagic.java
index f2c1a850..6525c3a8 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerMagic.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerMagic.java
@@ -1,12 +1,12 @@
-package com.minelittlepony.unicopia.power;
-
-import org.lwjgl.input.Keyboard;
+package com.minelittlepony.unicopia.ability.powers;
 
+import org.lwjgl.glfw.GLFW;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Hit;
-import com.minelittlepony.unicopia.spell.SpellShield;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.Hit;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.spells.SpellShield;
 
 public class PowerMagic implements IPower<Hit> {
 
@@ -17,7 +17,7 @@ public class PowerMagic implements IPower<Hit> {
 
     @Override
     public int getKeyCode() {
-        return Keyboard.KEY_P;
+        return GLFW.GLFW_KEY_P;
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerStomp.java
similarity index 57%
rename from src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowerStomp.java
index 0012873a..1189a3ff 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerStomp.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerStomp.java
@@ -1,54 +1,55 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability.powers;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map.Entry;
 
-import org.lwjgl.input.Keyboard;
+import org.lwjgl.glfw.GLFW;
 
 import com.google.common.collect.Lists;
 import com.google.gson.annotations.Expose;
 import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.Location;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 import com.minelittlepony.unicopia.item.ItemApple;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.power.data.Location;
 import com.minelittlepony.unicopia.world.UWorld;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.PosHelper;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.WorldEvent;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockLeaves;
-import net.minecraft.block.BlockLog;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.LogBlock;
+import net.minecraft.entity.EntityContext;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.particle.BlockStateParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.state.property.Property;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-import static net.minecraft.util.EnumFacing.*;
-
 public class PowerStomp implements IPower<PowerStomp.Data> {
 
     private final double rad = 4;
 
-    private final AxisAlignedBB areaOfEffect = new AxisAlignedBB(
+    private final Box areaOfEffect = new Box(
             -rad, -rad, -rad,
              rad,  rad,  rad
      );
@@ -60,7 +61,7 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
 
     @Override
     public int getKeyCode() {
-        return Keyboard.KEY_M;
+        return GLFW.GLFW_KEY_M;
     }
 
     @Override
@@ -80,12 +81,13 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
 
     @Override
     public PowerStomp.Data tryActivate(IPlayer player) {
-        RayTraceResult mop = VecHelper.getObjectMouseOver(player.getOwner(), 6, 1);
+        HitResult mop = VecHelper.getObjectMouseOver(player.getOwner(), 6, 1);
 
-        if (mop != null && mop.typeOfHit == RayTraceResult.Type.BLOCK) {
-            BlockPos pos = mop.getBlockPos();
-            IBlockState state = player.getWorld().getBlockState(pos);
-            if (state.getBlock() instanceof BlockLog) {
+        if (mop instanceof BlockHitResult && mop.getType() == HitResult.Type.BLOCK) {
+            BlockPos pos = ((BlockHitResult)mop).getBlockPos();
+            BlockState state = player.getWorld().getBlockState(pos);
+
+            if (state.getBlock() instanceof LogBlock) {
                 pos = getBaseOfTree(player.getWorld(), state, pos);
                 if (measureTree(player.getWorld(), state, pos) > 0) {
                     return new Data(pos.getX(), pos.getY(), pos.getZ(), 1);
@@ -93,7 +95,7 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
             }
         }
 
-        if (!player.getOwner().onGround && !player.getOwner().capabilities.isFlying) {
+        if (!player.getOwner().onGround && !player.getOwner().abilities.flying) {
             player.getOwner().addVelocity(0, -6, 0);
             return new Data(0, 0, 0, 0);
         }
@@ -106,9 +108,10 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
     }
 
     public static BlockPos getSolidBlockBelow(BlockPos pos, World w) {
-        while (w.isValid(pos)) {
+        while (World.isValid(pos)) {
             pos = pos.down();
-            if (w.getBlockState(pos).isSideSolid(w, pos, EnumFacing.UP)) {
+
+            if (Block.isFaceFullSquare(w.getBlockState(pos).getCollisionShape(w, pos, EntityContext.absent()), Direction.UP)) {
                 return pos;
             }
         }
@@ -119,30 +122,30 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
     @Override
     public void apply(IPlayer iplayer, Data data) {
 
-        EntityPlayer player = iplayer.getOwner();
+        PlayerEntity player = iplayer.getOwner();
 
         if (data.hitType == 0) {
-            BlockPos ppos = player.getPosition();
+            BlockPos ppos = player.getBlockPos();
             BlockPos pos = getSolidBlockBelow(ppos, player.getEntityWorld());
 
-            player.addVelocity(0, -(ppos.distanceSq(pos)), 0);
+            player.addVelocity(0, -(ppos.getSquaredDistance(pos)), 0);
 
-            iplayer.getWorld().getEntitiesWithinAABBExcludingEntity(player, areaOfEffect.offset(iplayer.getOriginVector())).forEach(i -> {
-                double dist = Math.sqrt(i.getDistanceSq(pos));
+            iplayer.getWorld().getEntities(player, areaOfEffect.offset(iplayer.getOriginVector())).forEach(i -> {
+                double dist = Math.sqrt(pos.getSquaredDistance(i.getBlockPos()));
 
                 if (dist <= rad + 3) {
                     double force = dist / 5;
                     i.addVelocity(
-                            -(player.posX - i.posX) / force,
-                            -(player.posY - i.posY - 2) / force + (dist < 1 ? dist : 0),
-                            -(player.posZ - i.posZ) / force);
+                            -(player.x - i.x) / force,
+                            -(player.y - i.y - 2) / force + (dist < 1 ? dist : 0),
+                            -(player.z - i.z) / force);
 
                     DamageSource damage = MagicalDamageSource.causePlayerDamage("smash", player);
 
-                    double amount = (4 * player.getEntityAttribute(SharedMonsterAttributes.ATTACK_DAMAGE).getAttributeValue()) / (float)dist;
+                    double amount = (4 * player.getAttributeInstance(EntityAttributes.ATTACK_DAMAGE).getValue()) / (float)dist;
 
-                    if (i instanceof EntityPlayer) {
-                        Race race = PlayerSpeciesList.instance().getPlayer((EntityPlayer)i).getPlayerSpecies();
+                    if (i instanceof PlayerEntity) {
+                        Race race = SpeciesList.instance().getPlayer((PlayerEntity)i).getSpecies();
                         if (race.canUseEarth()) {
                             amount /= 3;
                         }
@@ -152,12 +155,12 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
                         }
                     }
 
-                    i.attackEntityFrom(damage, (float)amount);
+                    i.damage(damage, (float)amount);
                 }
             });
 
-            BlockPos.getAllInBoxMutable(pos.add(-rad, -rad, -rad), pos.add(rad, rad, rad)).forEach(i -> {
-                if (i.distanceSqToCenter(player.posX, player.posY, player.posZ) <= rad*rad) {
+            BlockPos.iterate(pos.add(-rad, -rad, -rad), pos.add(rad, rad, rad)).forEach(i -> {
+                if (i.getSquaredDistance(player.x, player.y, player.z, true) <= rad*rad) {
                     spawnEffect(player.world, i);
                 }
             });
@@ -169,16 +172,16 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
             iplayer.subtractEnergyCost(rad);
         } else if (data.hitType == 1) {
 
-            boolean harmed = player.getHealth() < player.getMaxHealth();
+            boolean harmed = player.getHealth() < player.getHealthMaximum();
 
-            if (harmed && player.world.rand.nextInt(30) == 0) {
+            if (harmed && player.world.random.nextInt(30) == 0) {
                 iplayer.subtractEnergyCost(3);
                 return;
             }
 
-            if (harmed || player.world.rand.nextInt(5) == 0) {
+            if (harmed || player.world.random.nextInt(5) == 0) {
 
-                if (!harmed || player.world.rand.nextInt(30) == 0) {
+                if (!harmed || player.world.random.nextInt(30) == 0) {
                     UWorld.enqueueTask(w -> removeTree(w, data.pos()));
                 }
 
@@ -194,36 +197,34 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
     }
 
     private void spawnEffect(World w, BlockPos pos) {
-        IBlockState state = w.getBlockState(pos);
+        BlockState state = w.getBlockState(pos);
 
-        if (state.getBlock() != Blocks.AIR) {
-            if (w.getBlockState(pos.up()).getBlock() == Blocks.AIR) {
-                WorldEvent.DESTROY_BLOCK.play(w, pos, state);
-            }
+        if (!state.isAir() && w.getBlockState(pos.up()).isAir()) {
+            WorldEvent.DESTROY_BLOCK.play(w, pos, state);
         }
     }
 
     @Override
     public void preApply(IPlayer player) {
         player.addExertion(40);
-        player.getOwner().spawnRunningParticles();
+        player.getOwner().attemptSprintingParticles();
     }
 
     @Override
     public void postApply(IPlayer player) {
         int timeDiff = getCooldownTime(player) - player.getAbilities().getRemainingCooldown();
 
-        if (player.getOwner().getEntityWorld().getWorldTime() % 1 == 0 || timeDiff == 0) {
+        if (player.getOwner().getEntityWorld().getTime() % 1 == 0 || timeDiff == 0) {
             spawnParticleRing(player.getOwner(), timeDiff, 1);
         }
     }
 
-    private void spawnParticleRing(EntityPlayer player, int timeDiff) {
+    private void spawnParticleRing(PlayerEntity player, int timeDiff) {
         spawnParticleRing(player, timeDiff, 0);
     }
 
-    private void spawnParticleRing(EntityPlayer player, int timeDiff, double yVel) {
-        int animationTicks = (int)(timeDiff / 10);
+    private void spawnParticleRing(PlayerEntity player, int timeDiff, double yVel) {
+        int animationTicks = timeDiff / 10;
         if (animationTicks < 6) {
             IShape shape = new Sphere(true, animationTicks, 1, 0, 1);
 
@@ -232,28 +233,28 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
             yVel *= y * 5;
 
             for (int i = 0; i < shape.getVolumeOfSpawnableSpace(); i++) {
-                Vec3d point = shape.computePoint(player.getEntityWorld().rand);
-                Particles.instance().spawnParticle(EnumParticleTypes.BLOCK_CRACK.getParticleID(), false,
-                        player.posX + point.x,
-                        player.posY + y + point.y,
-                        player.posZ + point.z,
-                        0, yVel, 0,
-                        Block.getStateId(Blocks.DIRT.getDefaultState()));
+                Vec3d point = shape.computePoint(player.getEntityWorld().random);
+                player.world.addParticle(new BlockStateParticleEffect(ParticleTypes.BLOCK, Blocks.DIRT.getDefaultState()),
+                        player.x + point.x,
+                        player.y + y + point.y,
+                        player.z + point.z,
+                        0, yVel, 0
+                );
             }
         }
     }
 
     private void removeTree(World w, BlockPos pos) {
-        IBlockState log = w.getBlockState(pos);
-        int size = measureTree(w, log, pos);
-        if (size > 0) {
-            pos = ascendTrunk(new ArrayList<BlockPos>(), w, pos, log, 0);
+        BlockState log = w.getBlockState(pos);
 
-            removeTreePart( w, log, pos, 0);
+        int size = measureTree(w, log, pos);
+
+        if (size > 0) {
+            removeTreePart( w, log, ascendTrunk(new ArrayList<BlockPos>(), w, pos, log, 0), 0);
         }
     }
 
-    private BlockPos ascendTrunk(List<BlockPos> done, World w, BlockPos pos, IBlockState log, int level) {
+    private BlockPos ascendTrunk(List<BlockPos> done, World w, BlockPos pos, BlockState log, int level) {
         if (level < 3 && !done.contains(pos)) {
             done.add(pos);
 
@@ -280,26 +281,25 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
         return pos;
     }
 
-    private void removeTreePart(World w, IBlockState log, BlockPos pos, int level) {
+    private void removeTreePart(World w, BlockState log, BlockPos pos, int level) {
         if (level < 10 && isWoodOrLeaf(w, log, pos)) {
             if (level < 5) {
-                w.destroyBlock(pos, true);
+                w.breakBlock(pos, true);
             } else {
-                IBlockState state = w.getBlockState(pos);
-                state.getBlock().dropBlockAsItem(w, pos, state, 0);
+                Block.dropStacks(w.getBlockState(pos), w, pos);
                 w.setBlockState(pos, Blocks.AIR.getDefaultState(), 3);
             }
 
             PosHelper.all(pos, p -> {
                 removeTreePart(w, log, p, level + 1);
-            }, UP, NORTH, SOUTH, EAST, WEST);
+            }, Direction.UP, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST);
 
         }
     }
 
-    private BlockPos ascendTree(World w, IBlockState log, BlockPos pos, boolean remove) {
+    private BlockPos ascendTree(World w, BlockState log, BlockPos pos, boolean remove) {
         int breaks = 0;
-        IBlockState state;
+        BlockState state;
         while (variantAndBlockEquals(w.getBlockState(pos.up()), log)) {
             if (PosHelper.some(pos, p -> isLeaves(w.getBlockState(p), log), HORIZONTALS)) {
                 break;
@@ -307,10 +307,10 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
 
             if (remove) {
                 if (breaks < 10) {
-                    w.destroyBlock(pos, true);
+                    w.breakBlock(pos, true);
                 } else {
                     state = w.getBlockState(pos);
-                    state.getBlock().dropBlockAsItem(w, pos, state, 0);
+                    Block.dropStacks(state, w, pos);
                     w.setBlockState(pos, Blocks.AIR.getDefaultState(), 3);
                 }
                 breaks++;
@@ -321,17 +321,17 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
     }
 
     private int dropApples(World w, BlockPos pos) {
-        IBlockState log = w.getBlockState(pos);
+        BlockState log = w.getBlockState(pos);
         int size = measureTree(w, log, pos);
         if (size > 0) {
 
-            List<EntityItem> capturedDrops = Lists.newArrayList();
+            List<ItemEntity> capturedDrops = Lists.newArrayList();
 
             dropApplesPart(capturedDrops, new ArrayList<BlockPos>(), w, log, pos, 0);
 
             UWorld.enqueueTask(wo -> {
                 capturedDrops.forEach(item -> {
-                    item.setNoPickupDelay();
+                    item.setToDefaultPickupDelay();
                     wo.spawnEntity(item);
                 });
             });
@@ -342,48 +342,48 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
         return 0;
     }
 
-    private void dropApplesPart(List<EntityItem> drops, List<BlockPos> done, World w, IBlockState log, BlockPos pos, int level) {
+    private void dropApplesPart(List<ItemEntity> drops, List<BlockPos> done, World w, BlockState log, BlockPos pos, int level) {
         if (!done.contains(pos)) {
             done.add(pos);
             pos = ascendTree(w, log, pos, false);
             if (level < 10 && isWoodOrLeaf(w, log, pos)) {
-                IBlockState state = w.getBlockState(pos);
+                BlockState state = w.getBlockState(pos);
 
-                if (state.getBlock() instanceof BlockLeaves && w.getBlockState(pos.down()).getMaterial() == Material.AIR) {
+                if (state.getBlock() instanceof LeavesBlock && w.getBlockState(pos.down()).isAir()) {
                     WorldEvent.DESTROY_BLOCK.play(w, pos, state);
 
-                    EntityItem item = new EntityItem(w);
-                    item.setPosition(pos.getX() + w.rand.nextFloat(), pos.getY() - 0.5, pos.getZ() + w.rand.nextFloat());
-                    item.setItem(getApple(w, log));
+                    ItemEntity item = new ItemEntity(EntityType.ITEM, w);
+                    item.setPosition(pos.getX() + w.random.nextFloat(), pos.getY() - 0.5, pos.getZ() + w.random.nextFloat());
+                    item.setStack(getApple(w, log));
 
                     drops.add(item);
                 }
 
                 PosHelper.all(pos, p -> {
                     dropApplesPart(drops, done, w, log, p, level + 1);
-                }, UP, NORTH, SOUTH, EAST, WEST);
+                }, Direction.UP, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST);
             }
         }
     }
 
-    private ItemStack getApple(World w, IBlockState log) {
+    private ItemStack getApple(World w, BlockState log) {
         return ItemApple.getRandomItemStack(getVariant(log));
     }
 
-    private int measureTree(World w, IBlockState log, BlockPos pos) {
-        List<BlockPos> logs = new ArrayList<BlockPos>();
-        List<BlockPos> leaves = new ArrayList<BlockPos>();
+    private int measureTree(World w, BlockState log, BlockPos pos) {
+        List<BlockPos> logs = new ArrayList<>();
+        List<BlockPos> leaves = new ArrayList<>();
 
         countParts(logs, leaves, w, log, pos);
 
         return logs.size() <= (leaves.size() / 2) ? logs.size() + leaves.size() : 0;
     }
 
-    private BlockPos getBaseOfTree(World w, IBlockState log, BlockPos pos) {
+    private BlockPos getBaseOfTree(World w, BlockState log, BlockPos pos) {
         return getBaseOfTreePart(new ArrayList<BlockPos>(), w, log, pos);
     }
 
-    private BlockPos getBaseOfTreePart(List<BlockPos> done, World w, IBlockState log, BlockPos pos) {
+    private BlockPos getBaseOfTreePart(List<BlockPos> done, World w, BlockState log, BlockPos pos) {
         if (done.contains(pos) || !variantAndBlockEquals(w.getBlockState(pos), log)) {
             return null;
         }
@@ -421,20 +421,20 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
         return pos;
     }
 
-    private boolean isWoodOrLeaf(World w, IBlockState log, BlockPos pos) {
-        IBlockState state = w.getBlockState(pos);
-        return variantAndBlockEquals(state, log) || (isLeaves(state, log) && ((Boolean)state.getValue(BlockLeaves.DECAYABLE)).booleanValue());
+    private boolean isWoodOrLeaf(World w, BlockState log, BlockPos pos) {
+        BlockState state = w.getBlockState(pos);
+        return variantAndBlockEquals(state, log) || (isLeaves(state, log) && state.get(LeavesBlock.PERSISTENT));
     }
 
-    private void countParts(List<BlockPos> logs, List<BlockPos> leaves, World w, IBlockState log, BlockPos pos) {
+    private void countParts(List<BlockPos> logs, List<BlockPos> leaves, World w, BlockState log, BlockPos pos) {
         if (logs.contains(pos) || leaves.contains(pos)) {
             return;
         }
 
-        IBlockState state = w.getBlockState(pos);
+        BlockState state = w.getBlockState(pos);
         boolean yay = false;
 
-        if (state.getBlock() instanceof BlockLeaves && ((Boolean)state.getValue(BlockLeaves.DECAYABLE)).booleanValue() && variantEquals(state, log)) {
+        if (state.getBlock() instanceof LeavesBlock && state.get(LeavesBlock.PERSISTENT) && variantEquals(state, log)) {
             leaves.add(pos);
             yay = true;
         } else if (variantAndBlockEquals(state, log)) {
@@ -445,33 +445,31 @@ public class PowerStomp implements IPower<PowerStomp.Data> {
         if (yay) {
             PosHelper.all(pos, p -> {
                 countParts(logs, leaves, w, log, p);
-            }, UP, NORTH, SOUTH, EAST, WEST);
+            }, Direction.UP, Direction.NORTH, Direction.SOUTH, Direction.EAST, Direction.WEST);
         }
     }
 
-    private boolean isLeaves(IBlockState state, IBlockState log) {
-        return state.getBlock() instanceof BlockLeaves && variantEquals(state, log);
+    private boolean isLeaves(BlockState state, BlockState log) {
+        return state.getBlock() instanceof LeavesBlock && variantEquals(state, log);
     }
 
-    private boolean variantAndBlockEquals(IBlockState one, IBlockState two) {
+    private boolean variantAndBlockEquals(BlockState one, BlockState two) {
         return (one.getBlock() == two.getBlock()) && variantEquals(one, two);
     }
 
-    private boolean variantEquals(IBlockState one, IBlockState two) {
+    private boolean variantEquals(BlockState one, BlockState two) {
         return getVariant(one) == getVariant(two);
     }
 
-    private Object getVariant(IBlockState state) {
-        if (state.getBlock() instanceof BlockLeaves) {
-            return ((BlockLeaves)state.getBlock()).getWoodType(state.getBlock().getMetaFromState(state));
+    private Object getVariant(BlockState state) {
+        if (state.getBlock() instanceof LeavesBlock) {
+            return ((LeavesBlock)state.getBlock()).getWoodType(state);
         }
 
-        for (Entry<IProperty<?>, ?> i : state.getProperties().entrySet()) {
-            if (i.getKey().getName().contentEquals("variant")) {
-                return i.getValue();
-            }
-        }
-        return null;
+        return state.getEntries().entrySet().stream()
+                .filter(i -> i.getKey().getName().contentEquals("variant"))
+                .map(i -> i.getValue())
+                .findFirst().orElse(null);
     }
 
     protected static class Data extends Location {
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerTeleport.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerTeleport.java
new file mode 100644
index 00000000..92547264
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowerTeleport.java
@@ -0,0 +1,174 @@
+package com.minelittlepony.unicopia.ability.powers;
+
+import org.lwjgl.glfw.GLFW;
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.Location;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.VecHelper;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FenceBlock;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.WallBlock;
+import net.minecraft.client.network.packet.EntityPassengersSetS2CPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.World;
+
+public class PowerTeleport implements IPower<Location> {
+
+    @Override
+    public String getKeyName() {
+        return "unicopia.power.teleport";
+    }
+
+    @Override
+    public int getKeyCode() {
+        return GLFW.GLFW_KEY_O;
+    }
+
+    @Override
+    public int getWarmupTime(IPlayer player) {
+        return 20;
+    }
+
+    @Override
+    public int getCooldownTime(IPlayer player) {
+        return 50;
+    }
+
+    @Override
+    public boolean canUse(Race playerSpecies) {
+        return playerSpecies.canCast();
+    }
+
+    @Override
+    public Location tryActivate(IPlayer player) {
+        HitResult ray = VecHelper.getObjectMouseOver(player.getOwner(), 100, 1);
+
+        World w = player.getWorld();
+
+        if (ray.getType() == HitResult.Type.MISS) {
+            return null;
+        }
+
+        BlockPos pos;
+
+        if (ray.getType() == HitResult.Type.ENTITY) {
+            pos = new BlockPos(ray.getPos());
+        } else {
+            pos = ((BlockHitResult)ray).getBlockPos();
+        }
+
+        boolean airAbove = enterable(w, pos.up()) && enterable(w, pos.up(2));
+
+        if (exception(w, pos, player.getOwner())) {
+            Direction sideHit = ((BlockHitResult)ray).getSide();
+
+            if (player.getOwner().isSneaking()) {
+                sideHit = sideHit.getOpposite();
+            }
+
+            pos = pos.offset(sideHit);
+        }
+
+        if (enterable(w, pos.down())) {
+            pos = pos.down();
+
+            if (enterable(w, pos.down())) {
+                if (!airAbove) {
+                    return null;
+                }
+
+                pos = new BlockPos(
+                        ray.getPos().getX(),
+                        pos.getY() + 2,
+                        ray.getPos().getZ());
+            }
+        }
+
+        if ((!enterable(w, pos) && exception(w, pos, player.getOwner()))
+         || (!enterable(w, pos.up()) && exception(w, pos.up(), player.getOwner()))) {
+            return null;
+        }
+
+        return new Location(pos.getX(), pos.getY(), pos.getZ());
+    }
+
+
+
+    @Override
+    public Class<Location> getPackageType() {
+        return Location.class;
+    }
+
+    @Override
+    public void apply(IPlayer iplayer, Location data) {
+        iplayer.getWorld().playSound(null, iplayer.getOrigin(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 1, 1);
+
+        PlayerEntity player = iplayer.getOwner();
+        double distance = player.squaredDistanceTo(data.x, data.y, data.z) / 10;
+
+        if (player.hasVehicle()) {
+            Entity mount = player.getVehicle();
+
+            player.stopRiding();
+
+            if (mount instanceof ServerPlayerEntity) {
+                ((ServerPlayerEntity)player).networkHandler.sendPacket(new EntityPassengersSetS2CPacket(player));
+            }
+        }
+
+        player.setPosition(
+                data.x + (player.x - Math.floor(player.x)),
+                data.y,
+                data.z + (player.z - Math.floor(player.z)));
+        iplayer.subtractEnergyCost(distance);
+
+        player.fallDistance /= distance;
+
+        player.world.playSound(null, data.pos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 1, 1);
+    }
+
+    private boolean enterable(World w, BlockPos pos) {
+        BlockState state = w.getBlockState(pos);
+
+        Block block = state.getBlock();
+
+        return w.isAir(pos)
+                || !state.isOpaque()
+                || (block instanceof LeavesBlock);
+    }
+
+    private boolean exception(World w, BlockPos pos, PlayerEntity player) {
+        BlockState state = w.getBlockState(pos);
+
+        Block c = state.getBlock();
+        return state.hasSolidTopSurface(w, pos, player)
+                || state.getMaterial().isLiquid()
+                || (c instanceof WallBlock)
+                || (c instanceof FenceBlock)
+                || (c instanceof LeavesBlock);
+    }
+
+    @Override
+    public void preApply(IPlayer player) {
+        player.addExertion(3);
+        player.spawnParticles(UParticles.UNICORN_MAGIC, 5);
+    }
+
+    @Override
+    public void postApply(IPlayer player) {
+        player.spawnParticles(UParticles.UNICORN_MAGIC, 5);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowersRegistry.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowersRegistry.java
similarity index 89%
rename from src/main/java/com/minelittlepony/unicopia/power/PowersRegistry.java
rename to src/main/java/com/minelittlepony/unicopia/ability/powers/PowersRegistry.java
index 73bd37f8..4a86036b 100644
--- a/src/main/java/com/minelittlepony/unicopia/power/PowersRegistry.java
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/PowersRegistry.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.power;
+package com.minelittlepony.unicopia.ability.powers;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -7,7 +7,9 @@ import java.util.Map;
 import java.util.Optional;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.input.Keyboard;
+import com.minelittlepony.unicopia.ability.IData;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.client.input.Keyboard;
 
 public class PowersRegistry {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/ability/powers/render/DisguiseRenderer.java b/src/main/java/com/minelittlepony/unicopia/ability/powers/render/DisguiseRenderer.java
new file mode 100644
index 00000000..80f496d4
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ability/powers/render/DisguiseRenderer.java
@@ -0,0 +1,83 @@
+package com.minelittlepony.unicopia.ability.powers.render;
+
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.spells.SpellDisguise;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.entity.Entity;
+
+public class DisguiseRenderer {
+
+    private static final DisguiseRenderer INSTANCE = new DisguiseRenderer();
+
+    public static DisguiseRenderer getInstance() {
+        return INSTANCE;
+    }
+
+    private final MinecraftClient mc = MinecraftClient.getInstance();
+
+    private boolean rendering;
+
+    public boolean renderDisguise(Entity entity, float usedPartialTick) {
+
+        EntityRenderDispatcher renderMan = mc.getEntityRenderManager();
+
+        if (rendering) {
+            renderMan.setRenderShadows(true);
+            renderStaticDisguise(renderMan, entity);
+            renderMan.setRenderShadows(false);
+
+            return true;
+        } else {
+            renderMan.setRenderShadows(renderMan.shouldRenderShadows() || usedPartialTick != 1);
+        }
+
+        return false;
+    }
+
+    protected void renderStaticDisguise(EntityRenderDispatcher renderMan, Entity entity) {
+        Entity observer = mc.getCameraEntity();
+
+        double x = entity.x - observer.x;
+        double y = entity.y - observer.y;
+        double z = entity.z - observer.z;
+
+        renderDisguise(renderMan, entity, x, y, z);
+    }
+
+    public boolean renderDisguiseToGui(IPlayer player) {
+        SpellDisguise effect = player.getEffect(SpellDisguise.class, false);
+
+        if (effect == null || effect.getDead()) {
+            return false;
+        }
+
+        EntityRenderDispatcher renderMan = mc.getEntityRenderManager();
+
+        if (renderMan.shouldRenderShadows()) {
+            return false;
+        }
+
+        Entity e = effect.getDisguise();
+
+        // Check for a disguise and render it in our place.
+        if (e != null) {
+            effect.update(player);
+
+            e.setCustomNameVisible(false);
+            e.setInvisible(false);
+            e.y = player.getOwner().y;
+
+            renderDisguise(renderMan, e, 0, 0, 0);
+        }
+
+        return true;
+    }
+
+    protected void renderDisguise(EntityRenderDispatcher renderMan, Entity entity, double x, double y, double z) {
+        rendering = false;
+        renderMan.render(entity, x, y, z, 0, 1, false);
+        rendering = true;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java
new file mode 100644
index 00000000..469374ce
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/advancements/AbstractCriterion.java
@@ -0,0 +1,52 @@
+package com.minelittlepony.unicopia.advancements;
+
+import java.util.List;
+import java.util.Map;
+
+import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+
+import net.minecraft.advancement.PlayerAdvancementTracker;
+import net.minecraft.advancement.criterion.Criterion;
+import net.minecraft.advancement.criterion.CriterionConditions;
+
+public abstract class AbstractCriterion<E extends AbstractCriterion.Entry<T>, T extends CriterionConditions> implements Criterion<T> {
+
+    protected final Map<PlayerAdvancementTracker, E> listeners = Maps.newHashMap();
+
+    @Override
+    public void beginTrackingCondition(PlayerAdvancementTracker key, Criterion.ConditionsContainer<T> listener) {
+        listeners.computeIfAbsent(key, this::createEntry).listeners.add(listener);
+    }
+
+    @Override
+    public void endTrackingCondition(PlayerAdvancementTracker key, Criterion.ConditionsContainer<T> listener) {
+        if (listeners.containsKey(key)) {
+            E entry = listeners.get(key);
+
+            entry.listeners.remove(listener);
+            if (entry.listeners.isEmpty()) {
+                listeners.remove(key);
+            }
+        }
+    }
+
+    @Override
+    public void endTracking(PlayerAdvancementTracker key) {
+        if (listeners.containsKey(key)) {
+            listeners.remove(key);
+        }
+    }
+
+    protected abstract E createEntry(PlayerAdvancementTracker advancement);
+
+    protected static class Entry<T extends CriterionConditions> {
+        protected final PlayerAdvancementTracker advancement;
+
+        protected final List<Criterion.ConditionsContainer<T>> listeners = Lists.newArrayList();
+
+        Entry(PlayerAdvancementTracker key) {
+            advancement = key;
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/AbstractTrigger.java b/src/main/java/com/minelittlepony/unicopia/advancements/AbstractTrigger.java
deleted file mode 100644
index 5feaa4ee..00000000
--- a/src/main/java/com/minelittlepony/unicopia/advancements/AbstractTrigger.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package com.minelittlepony.unicopia.advancements;
-
-import java.util.List;
-import java.util.Map;
-
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-
-import net.minecraft.advancements.ICriterionTrigger;
-import net.minecraft.advancements.PlayerAdvancements;
-import net.minecraft.advancements.critereon.AbstractCriterionInstance;
-
-public abstract class AbstractTrigger<E extends AbstractTrigger.Entry<T>, T extends AbstractCriterionInstance> implements ICriterionTrigger<T> {
-
-    protected final Map<PlayerAdvancements, E> listeners = Maps.newHashMap();
-
-    @Override
-    public void addListener(PlayerAdvancements key, Listener<T> listener) {
-        listeners.computeIfAbsent(key, this::createEntry).listeners.add(listener);;
-    }
-
-    @Override
-    public void removeListener(PlayerAdvancements key, Listener<T> listener) {
-        if (listeners.containsKey(key)) {
-            E entry = listeners.get(key);
-
-            entry.listeners.remove(listener);
-            if (entry.listeners.isEmpty()) {
-                listeners.remove(key);
-            }
-        }
-    }
-
-    @Override
-    public void removeAllListeners(PlayerAdvancements key) {
-        if (listeners.containsKey(key)) {
-            listeners.remove(key);
-        }
-    }
-
-    protected abstract E createEntry(PlayerAdvancements advancement);
-
-    protected static class Entry<T extends AbstractCriterionInstance> {
-        protected final PlayerAdvancements advancement;
-
-        protected final List<Listener<T>> listeners = Lists.newArrayList();
-
-        Entry(PlayerAdvancements key) {
-            advancement = key;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java b/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java
index 9c11bb93..dbbef2ca 100644
--- a/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java
+++ b/src/main/java/com/minelittlepony/unicopia/advancements/AdvancementPredicate.java
@@ -2,30 +2,30 @@ package com.minelittlepony.unicopia.advancements;
 
 import com.google.gson.JsonElement;
 
-import net.minecraft.advancements.Advancement;
-import net.minecraft.advancements.PlayerAdvancements;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.WorldServer;
+import net.minecraft.advancement.Advancement;
+import net.minecraft.advancement.PlayerAdvancementTracker;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
 
 /**
  * Predicate for testing whether a player has a previous advancement.
  * Allows for unlocking advancements in linear succession.
  */
-public class AdvancementPredicate {
+class AdvancementPredicate {
 
     public static AdvancementPredicate deserialize(JsonElement json) {
         return new AdvancementPredicate(json.getAsString());
     }
 
-    private final ResourceLocation id;
+    private final Identifier id;
 
     public AdvancementPredicate(String advancement) {
-        this.id = new ResourceLocation(advancement);
+        this.id = new Identifier(advancement);
     }
 
-    public boolean test(WorldServer world, PlayerAdvancements playerAdvancements) {
-        Advancement advancement = world.getAdvancementManager().getAdvancement(id);
+    public boolean test(ServerWorld world, PlayerAdvancementTracker tracker) {
+        Advancement advancement = world.getServer().getAdvancementManager().get(id);
 
-        return advancement != null && playerAdvancements.getProgress(advancement).isDone();
+        return advancement != null && tracker.getProgress(advancement).isDone();
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java b/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java
new file mode 100644
index 00000000..8b4215c4
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathCriterion.java
@@ -0,0 +1,74 @@
+package com.minelittlepony.unicopia.advancements;
+
+import java.util.Optional;
+
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonObject;
+
+import net.minecraft.advancement.PlayerAdvancementTracker;
+import net.minecraft.advancement.criterion.AbstractCriterionConditions;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
+
+/**
+ * Advantement trigger for the book of holding. It's an achievement to die so spectacularly! :D
+ */
+public class BOHDeathCriterion extends AbstractCriterion<BOHDeathCriterion.Entry, BOHDeathCriterion.Conditions> {
+    // TODO:  Need to register this
+    public static final BOHDeathCriterion INSTANCE = new BOHDeathCriterion();
+
+    private static final Identifier ID = new Identifier("unicopia", "death_by_bag_of_holding");
+
+    @Override
+    public Identifier getId() {
+        return ID;
+    }
+
+    @Override
+    public Conditions conditionsFromJson(JsonObject json, JsonDeserializationContext context) {
+        return new Conditions(AdvancementPredicate.deserialize(json.get("advancement")));
+    }
+
+    @Override
+    protected Entry createEntry(PlayerAdvancementTracker advancement) {
+        return new Entry(advancement);
+    }
+
+    public void trigger(ServerPlayerEntity player) {
+        PlayerAdvancementTracker key = player.getAdvancementManager();
+
+        Optional.ofNullable(listeners.get(key)).ifPresent(e -> {
+            e.trigger((ServerWorld)player.world, key);
+        });
+    }
+
+    static class Conditions extends AbstractCriterionConditions {
+
+        private final AdvancementPredicate requirement;
+
+        public Conditions(AdvancementPredicate key) {
+            super(ID);
+
+            requirement = key;
+        }
+
+        public boolean test(ServerWorld world, PlayerAdvancementTracker stracker) {
+            return requirement.test(world, stracker);
+        }
+
+    }
+
+    static class Entry extends AbstractCriterion.Entry<BOHDeathCriterion.Conditions> {
+
+        Entry(PlayerAdvancementTracker key) {
+            super(key);
+        }
+
+        public void trigger(ServerWorld world, PlayerAdvancementTracker tracker) {
+            listeners.stream()
+                .filter(listener -> listener.getConditions().test(world, tracker))
+                .forEach(winner -> winner.apply(advancement));
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathTrigger.java b/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathTrigger.java
deleted file mode 100644
index 7a6a3e4b..00000000
--- a/src/main/java/com/minelittlepony/unicopia/advancements/BOHDeathTrigger.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package com.minelittlepony.unicopia.advancements;
-
-import java.util.Optional;
-
-import com.google.gson.JsonDeserializationContext;
-import com.google.gson.JsonObject;
-
-import net.minecraft.advancements.PlayerAdvancements;
-import net.minecraft.advancements.critereon.AbstractCriterionInstance;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.WorldServer;
-
-/**
- * Advantement trigger for the book of holding. It's an achievement to die so spectacularly! :D
- */
-public class BOHDeathTrigger extends AbstractTrigger<BOHDeathTrigger.Entry, BOHDeathTrigger.Instance> {
-
-    private static final ResourceLocation ID = new ResourceLocation("unicopia", "death_by_bag_of_holding");
-
-    @Override
-    public ResourceLocation getId() {
-        return ID;
-    }
-
-    @Override
-    public Instance deserializeInstance(JsonObject json, JsonDeserializationContext context) {
-        return new Instance(AdvancementPredicate.deserialize(json.get("advancement")));
-    }
-
-    @Override
-    protected Entry createEntry(PlayerAdvancements advancement) {
-        return new Entry(advancement);
-    }
-
-    public void trigger(EntityPlayerMP player) {
-        PlayerAdvancements key = player.getAdvancements();
-
-        Optional.ofNullable(listeners.get(key)).ifPresent(e -> {
-            e.trigger((WorldServer)player.world, key);
-        });
-    }
-
-    static class Instance extends AbstractCriterionInstance {
-
-        private final AdvancementPredicate requirement;
-
-        public Instance(AdvancementPredicate key) {
-            super(ID);
-
-            requirement = key;
-        }
-
-        public boolean test(WorldServer world, PlayerAdvancements playerAdvancements) {
-            return requirement.test(world, playerAdvancements);
-        }
-
-    }
-
-    static class Entry extends AbstractTrigger.Entry<BOHDeathTrigger.Instance> {
-
-        Entry(PlayerAdvancements key) {
-            super(key);
-        }
-
-        public void trigger(WorldServer world, PlayerAdvancements playerAdvancements) {
-            listeners.stream()
-                .filter(listener -> listener.getCriterionInstance().test(world, playerAdvancements))
-                .forEach(winner -> winner.grantCriterion(advancement));;
-        }
-    }
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/advancements/UAdvancements.java b/src/main/java/com/minelittlepony/unicopia/advancements/UAdvancements.java
deleted file mode 100644
index 5c0b4e03..00000000
--- a/src/main/java/com/minelittlepony/unicopia/advancements/UAdvancements.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.minelittlepony.unicopia.advancements;
-
-import net.minecraft.advancements.CriteriaTriggers;
-
-public class UAdvancements {
-    public static final BOHDeathTrigger BOH_DEATH = new BOHDeathTrigger();
-
-    public static void init() {
-        CriteriaTriggers.register(BOH_DEATH);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockAlfalfa.java b/src/main/java/com/minelittlepony/unicopia/block/BlockAlfalfa.java
index 90e55429..fab1ab10 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockAlfalfa.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockAlfalfa.java
@@ -4,55 +4,51 @@ import java.util.Random;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.init.UItems;
+import com.minelittlepony.unicopia.UItems;
 
-import net.minecraft.block.BlockCrops;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.CropBlock;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.item.Items;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.IntProperty;
+import net.minecraft.util.StringIdentifiable;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.Box;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.ForgeHooks;
 
-public class BlockAlfalfa extends BlockCrops {
+public class BlockAlfalfa extends CropBlock {
 
-    public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 4);
-    public static final PropertyEnum<Half> HALF = PropertyEnum.create("half", Half.class);
+    public static final IntProperty AGE = IntProperty.of("age", 0, 4);
+    public static final EnumProperty<Half> HALF = EnumProperty.of("half", Half.class);
 
-    private static final AxisAlignedBB[] BOUNDS = new AxisAlignedBB[] {
-        new AxisAlignedBB(0, 0, 0, 1, 0.1, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 0.2, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 0.4, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 0.6, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 0.8, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 1,   1),
-        new AxisAlignedBB(0, 0, 0, 1, 1.2, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 1.4, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 1.6, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 1.8, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 2,   1),
-        new AxisAlignedBB(0, 0, 0, 1, 2.2, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 2.4, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 2.6, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 2.8, 1),
-        new AxisAlignedBB(0, 0, 0, 1, 3,   1)
+    private static final Box[] BOUNDS = new Box[] {
+        new Box(0, 0, 0, 1, 0.1, 1),
+        new Box(0, 0, 0, 1, 0.2, 1),
+        new Box(0, 0, 0, 1, 0.4, 1),
+        new Box(0, 0, 0, 1, 0.6, 1),
+        new Box(0, 0, 0, 1, 0.8, 1),
+        new Box(0, 0, 0, 1, 1,   1),
+        new Box(0, 0, 0, 1, 1.2, 1),
+        new Box(0, 0, 0, 1, 1.4, 1),
+        new Box(0, 0, 0, 1, 1.6, 1),
+        new Box(0, 0, 0, 1, 1.8, 1),
+        new Box(0, 0, 0, 1, 2,   1),
+        new Box(0, 0, 0, 1, 2.2, 1),
+        new Box(0, 0, 0, 1, 2.4, 1),
+        new Box(0, 0, 0, 1, 2.6, 1),
+        new Box(0, 0, 0, 1, 2.8, 1),
+        new Box(0, 0, 0, 1, 3,   1)
     };
 
     public BlockAlfalfa(String domain, String name) {
         setRegistryName(domain, name);
         setTranslationKey(name);
 
-        setDefaultState(getDefaultState().withProperty(HALF, Half.BOTTOM));
+        setDefaultState(getDefaultState().with(HALF, Half.BOTTOM));
     }
 
     @Override
@@ -61,7 +57,7 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    protected PropertyInteger getAgeProperty() {
+    public IntProperty getAgeProperty() {
         return AGE;
     }
 
@@ -71,7 +67,7 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    protected Item getSeed() {
+    protected Item getSeedsItem() {
         return UItems.alfalfa_seeds;
     }
 
@@ -81,37 +77,32 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random rand) {
         checkAndDropBlock(world, pos, state);
         if (rand.nextInt(10) != 0) {
 
-            if (world.isAreaLoaded(pos, 1) && world.getLightFromNeighbors(pos.up()) >= 9) {
-                if (canGrow(world, pos, state, false)) {
-                    float f = getGrowthChance(this, world, pos);
-
-                    if(ForgeHooks.onCropsGrowPre(world, pos, state, rand.nextInt((int)(25 / f) + 1) == 0)) {
-                        growUpwards(world, pos, state, 1);
-                        ForgeHooks.onCropsGrowPost(world, pos, state, world.getBlockState(pos));
-                    }
+            if (world.isBlockLoaded(pos) && world.getLightLevel(pos.up()) >= 9) {
+                if (canGrow(world, rand, pos, state)) {
+                    growUpwards(world, pos, state, 1);
                 }
             }
         }
     }
 
     @Override
-    protected boolean canSustainBush(IBlockState state) {
+    protected boolean canSustainBush(BlockState state) {
         return super.canSustainBush(state) || state.getBlock() == this;
     }
 
-    protected void growUpwards(World world, BlockPos pos, IBlockState state, int increase) {
+    protected void growUpwards(World world, BlockPos pos, BlockState state, int increase) {
         boolean hasDown = world.getBlockState(pos.down()).getBlock() == this;
         boolean hasTrunk = world.getBlockState(pos.down(2)).getBlock() == this;
         boolean hasRoot = world.getBlockState(pos.down(3)).getBlock() == this;
 
         if (state.getBlock() != this) {
-            if (state.getBlock().isAir(state, world, pos)) {
+            if (state.isAir()) {
                 if (!(hasDown && hasTrunk && hasRoot)) {
-                    world.setBlockState(pos, withAge(increase).withProperty(HALF, Half.TOP));
+                    world.setBlockState(pos, withAge(increase).with(HALF, Half.TOP));
                 }
             }
             return;
@@ -130,17 +121,17 @@ public class BlockAlfalfa extends BlockCrops {
         boolean hasUp = world.getBlockState(pos.up()).getBlock() == this;
 
         if (hasDown && hasUp) {
-            world.setBlockState(pos, withAge(age).withProperty(HALF, Half.MIDDLE));
+            world.setBlockState(pos, withAge(age).with(HALF, Half.MIDDLE));
         } else if (hasUp) {
-            world.setBlockState(pos, withAge(age).withProperty(HALF, Half.BOTTOM));
+            world.setBlockState(pos, withAge(age).with(HALF, Half.BOTTOM));
         } else {
-            world.setBlockState(pos, withAge(age).withProperty(HALF, Half.TOP));
+            world.setBlockState(pos, withAge(age).with(HALF, Half.TOP));
         }
     }
 
     @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        if (state.getValue(HALF) != Half.BOTTOM) {
+    public Item getItemDropped(BlockState state, Random rand, int fortune) {
+        if (state.get(HALF) != Half.BOTTOM) {
             return Items.AIR;
         }
 
@@ -148,8 +139,8 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-        Random rand = world instanceof World ? ((World)world).rand : RANDOM;
+    public void getDrops(NonNullList<ItemStack> drops, BlockView world, BlockPos pos, BlockState state, int fortune) {
+        Random rand = world instanceof World ? ((World)world).random : RANDOM;
 
         Item item = getItemDropped(state, rand, fortune);
         if (item != Items.AIR) {
@@ -162,40 +153,32 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    public int quantityDropped(IBlockState state, int fortune, Random random) {
+    public int quantityDropped(BlockState state, int fortune, Random random) {
         return 1;
     }
 
     @Override
-    public boolean canBlockStay(World world, BlockPos pos, IBlockState state) {
+    public boolean canBlockStay(World world, BlockPos pos, BlockState state) {
         return getHalf(state) != Half.BOTTOM || super.canBlockStay(world, pos, state);
     }
 
-    public void onPlayerDestroy(World worldIn, BlockPos pos, IBlockState state) {
+    public void onPlayerDestroy(World worldIn, BlockPos pos, BlockState state) {
         breakConnectedBlocks(worldIn, pos, null);
     }
 
     @Override
-    public void onBlockHarvested(World worldIn, BlockPos pos, IBlockState state, EntityPlayer player) {
+    public void onBlockHarvested(World worldIn, BlockPos pos, BlockState state, PlayerEntity player) {
         breakConnectedBlocks(worldIn, pos, player);
     }
 
-    protected void breakConnectedBlocks(World worldIn, BlockPos pos, @Nullable EntityPlayer player) {
-        IBlockState state = worldIn.getBlockState(pos);
+    protected void breakConnectedBlocks(World worldIn, BlockPos pos, @Nullable PlayerEntity player) {
+        BlockState state = worldIn.getBlockState(pos);
 
         if (state.getBlock() != this) {
             return;
         }
 
-        if (player != null && player.capabilities.isCreativeMode) {
-            worldIn.setBlockToAir(pos);
-        } else {
-            if (worldIn.isRemote) {
-                worldIn.setBlockToAir(pos);
-            } else {
-                worldIn.destroyBlock(pos, true);
-            }
-        }
+        worldIn.breakBlock(pos, true);
 
         Half half = getHalf(state);
 
@@ -218,26 +201,25 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    public boolean canCollideCheck(IBlockState state, boolean hitIfLiquid) {
+    public boolean canCollideCheck(BlockState state, boolean hitIfLiquid) {
         return getHalf(state) != Half.MIDDLE;
     }
 
-    @Deprecated
     @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
+    public Box getBoundingBox(BlockState state, BlockView source, BlockPos pos) {
         return BOUNDS[Math.min(BOUNDS.length - 1, getFullAge(source, pos))].offset(getOffset(state, source, pos));
     }
 
     @Override
-    public boolean canGrow(World world, BlockPos pos, IBlockState state, boolean isClient) {
+    public boolean canGrow(World world, Random random, BlockPos pos, BlockState state) {
         Half half = getHalf(state);
 
         if (half == Half.MIDDLE || (half == Half.TOP && world.getBlockState(pos.down()).getBlock() == this)) {
             return false;
         }
 
-        IBlockState above = world.getBlockState(pos.up(1));
-        IBlockState higher = world.getBlockState(pos.up(2));
+        BlockState above = world.getBlockState(pos.up(1));
+        BlockState higher = world.getBlockState(pos.up(2));
 
         boolean iCanGrow = !isMaxAge(state);
         boolean aboveCanGrow = above.getBlock() != this || !isMaxAge(above);
@@ -247,13 +229,13 @@ public class BlockAlfalfa extends BlockCrops {
     }
 
     @Override
-    public void grow(World world, BlockPos pos, IBlockState state) {
+    public void applyGrowth(World world, BlockPos pos, BlockState state) {
         growUpwards(world, pos, state, getBonemealAgeIncrease(world));
     }
 
     protected BlockPos getTip(World world, BlockPos pos) {
         BlockPos above = pos.up();
-        IBlockState state = world.getBlockState(above);
+        BlockState state = world.getBlockState(above);
 
         if (state.getBlock() == this) {
             return getTip(world, above);
@@ -262,35 +244,29 @@ public class BlockAlfalfa extends BlockCrops {
         return pos;
     }
 
-    protected int getFullAge(IBlockAccess world, BlockPos pos) {
-        IBlockState state = world.getBlockState(pos);
+    protected int getFullAge(BlockView world, BlockPos pos) {
+        BlockState state = world.getBlockState(pos);
 
         int age = 0;
 
         if (state.getBlock() == this) {
-            age += state.getValue(getAgeProperty());
-
+            age += state.get(getAgeProperty());
             age += getFullAge(world, pos.up());
         }
 
         return age;
     }
 
-    protected Half getHalf(IBlockState state) {
-        return (Half)state.getValue(HALF);
+    protected Half getHalf(BlockState state) {
+        return state.get(HALF);
     }
 
     @Override
-    public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) {
-        return EnumPlantType.Crop;
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
+    public BlockState getStateFromMeta(int meta) {
         int age = meta % (getMaxAge() + 1);
         int half = (int)Math.floor(meta / (getMaxAge() + 1)) % Half.values().length;
 
-        return withAge(age).withProperty(HALF, Half.values()[half]);
+        return withAge(age).with(HALF, Half.values()[half]);
     }
 
     // 0: age:0, half:0
@@ -310,14 +286,14 @@ public class BlockAlfalfa extends BlockCrops {
     //14: age:4, half:2
 
     @Override
-    public int getMetaFromState(IBlockState state) {
+    public int getMetaFromState(BlockState state) {
         int age = getAge(state);
         int half = getHalf(state).ordinal();
 
         return (half * (getMaxAge() + 1)) + age;
     }
 
-    public static enum Half implements IStringSerializable {
+    public enum Half implements StringIdentifiable {
         TOP,
         MIDDLE,
         BOTTOM;
@@ -330,12 +306,14 @@ public class BlockAlfalfa extends BlockCrops {
             return this != BOTTOM;
         }
 
+        @Override
         public String toString() {
-            return getName();
+            return this == TOP ? "top" : this == MIDDLE ? "middle" : "bottom";
         }
 
-        public String getName() {
-            return this == TOP ? "top" : this == MIDDLE ? "middle" : "bottom";
+        @Override
+        public String asString() {
+            return toString();
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockChiselledChitin.java b/src/main/java/com/minelittlepony/unicopia/block/BlockChiselledChitin.java
deleted file mode 100644
index e5d8e81c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockChiselledChitin.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UMaterials;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockChiselledChitin extends BlockDirected {
-
-    public BlockChiselledChitin(String domain, String name) {
-        super(UMaterials.hive, domain, name);
-
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
-        setHardness(50);
-        setResistance(2000);
-    }
-
-    @Override
-    public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
-        return MapColor.BLACK;
-    }
-
-    @Deprecated
-    @Override
-    public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
-        float hardness = super.getPlayerRelativeBlockHardness(state, player, worldIn, pos);
-
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
-        Race race = iplayer.getPlayerSpecies();
-
-        if (race == Race.CHANGELING) {
-            hardness *= 80;
-        } else if (race.canInteractWithClouds()) {
-            hardness /= 4;
-        } else if (race.canUseEarth()) {
-            hardness *= 10;
-        }
-
-        return hardness;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockChitin.java b/src/main/java/com/minelittlepony/unicopia/block/BlockChitin.java
deleted file mode 100644
index 7aa5672b..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockChitin.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.init.UMaterials;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockChitin extends Block {
-
-    public static final PropertyEnum<Covering> COVERING = PropertyEnum.create("covering", Covering.class);
-
-    public BlockChitin(String domain, String name) {
-        super(UMaterials.hive);
-
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-        setDefaultState(blockState.getBaseState().withProperty(COVERING, Covering.UNCOVERED));
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
-        setHardness(50);
-        setResistance(2000);
-    }
-
-    @Override
-    public MapColor getMapColor(IBlockState state, IBlockAccess worldIn, BlockPos pos) {
-        return MapColor.BLACK;
-    }
-
-    @Override
-    public int quantityDropped(Random random) {
-        return 3;
-    }
-
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return UItems.chitin_shell;
-    }
-
-    @Deprecated
-    @Override
-    public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
-        float hardness = super.getPlayerRelativeBlockHardness(state, player, worldIn, pos);
-
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
-        Race race = iplayer.getPlayerSpecies();
-
-        if (race == Race.CHANGELING) {
-            hardness *= 80;
-        } else if (race.canInteractWithClouds()) {
-            hardness /= 4;
-        } else if (race.canUseEarth()) {
-            hardness *= 10;
-        }
-
-        return hardness;
-    }
-
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        return 0;
-    }
-
-    @Override
-    public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
-        IBlockState s = world.getBlockState(pos.up());
-        Block block = s.getBlock();
-
-        boolean snowy = block == Blocks.SNOW || block == Blocks.SNOW_LAYER;
-        boolean solid = (s.isFullBlock() && s.isFullCube()) || s.isSideSolid(world, pos.up(), EnumFacing.DOWN);
-
-        return state.withProperty(COVERING, snowy ? Covering.SNOW_COVERED : solid ? Covering.COVERED : Covering.UNCOVERED);
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, COVERING);
-    }
-
-    public static enum Covering implements IStringSerializable {
-        COVERED,
-        UNCOVERED,
-        SNOW_COVERED;
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        @Override
-        public String getName() {
-            return name().toLowerCase();
-        }
-
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloud.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloud.java
index 4c1a5a64..9ed6e63b 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloud.java
@@ -6,9 +6,9 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.CloudType;
-import com.minelittlepony.unicopia.init.UBlocks;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UBlocks;
 import com.minelittlepony.unicopia.item.ItemMoss;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
@@ -20,7 +20,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -146,7 +146,7 @@ public class BlockCloud extends Block implements ICloudBlock, ITillable {
     }
 
     @Deprecated
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
         if (getCanInteract(state, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, p_185477_7_);
         }
@@ -177,7 +177,7 @@ public class BlockCloud extends Block implements ICloudBlock, ITillable {
 
     @Override
     public boolean canBeTilled(ItemStack hoe, EntityPlayer player, World world, IBlockState state, BlockPos pos) {
-        return PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies().canInteractWithClouds()
+        return SpeciesList.instance().getPlayer(player).getSpecies().canInteractWithClouds()
                 && ITillable.super.canBeTilled(hoe, player, world, state, pos);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java
index 69e2c2ae..6c59ddd4 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudAnvil.java
@@ -20,7 +20,7 @@ import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
 import net.minecraft.util.NonNullList;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -128,7 +128,7 @@ public class BlockCloudAnvil extends BlockAnvil implements ICloudBlock {
     }
 
     @Deprecated
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
         if (getCanInteract(state, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, p_185477_7_);
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudBanister.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudBanister.java
index 1cf6e7dc..1fc44466 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudBanister.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudBanister.java
@@ -11,7 +11,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.BlockRenderLayer;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
@@ -22,28 +22,28 @@ public class BlockCloudBanister extends BlockCloudFence {
     public static final double d = 5/16D;
     public static final double h = 2/16D;
 
-    public static final AxisAlignedBB SOUTH_AABB = new AxisAlignedBB(d, 0, l, l, h, 1);
-    public static final AxisAlignedBB WEST_AABB = new AxisAlignedBB(0, 0, d, d, h, l);
-    public static final AxisAlignedBB NORTH_AABB = new AxisAlignedBB(d, 0, 0, l, h, d);
-    public static final AxisAlignedBB EAST_AABB = new AxisAlignedBB(l, 0, d, 1, h, l);
+    public static final Box SOUTH_AABB = new Box(d, 0, l, l, h, 1);
+    public static final Box WEST_AABB = new Box(0, 0, d, d, h, l);
+    public static final Box NORTH_AABB = new Box(d, 0, 0, l, h, d);
+    public static final Box EAST_AABB = new Box(l, 0, d, 1, h, l);
 
-    public static final AxisAlignedBB[] BOUNDING_BOXES = new AxisAlignedBB[] {
-            new AxisAlignedBB(d, 0, d, l, h, l),
-            new AxisAlignedBB(d, 0, d, l, h, 1),
-            new AxisAlignedBB(0, 0, d, l, h, l),
-            new AxisAlignedBB(0, 0, d, l, h, 1),
-            new AxisAlignedBB(d, 0, 0, l, h, l),
-            new AxisAlignedBB(d, 0, 0, l, h, 1),
-            new AxisAlignedBB(0, 0, 0, l, h, l),
-            new AxisAlignedBB(0, 0, 0, l, h, 1),
-            new AxisAlignedBB(d, 0, d, 1, h, l),
-            new AxisAlignedBB(d, 0, d, 1, h, 1),
-            new AxisAlignedBB(0, 0, d, 1, h, l),
-            new AxisAlignedBB(0, 0, d, 1, h, 1),
-            new AxisAlignedBB(d, 0, 0, 1, h, l),
-            new AxisAlignedBB(d, 0, 0, 1, h, 1),
-            new AxisAlignedBB(0, 0, 0, 1, h, l),
-            new AxisAlignedBB(0, 0, 0, 1, h, 1)
+    public static final Box[] BOUNDING_BOXES = new Box[] {
+            new Box(d, 0, d, l, h, l),
+            new Box(d, 0, d, l, h, 1),
+            new Box(0, 0, d, l, h, l),
+            new Box(0, 0, d, l, h, 1),
+            new Box(d, 0, 0, l, h, l),
+            new Box(d, 0, 0, l, h, 1),
+            new Box(0, 0, 0, l, h, l),
+            new Box(0, 0, 0, l, h, 1),
+            new Box(d, 0, d, 1, h, l),
+            new Box(d, 0, d, 1, h, 1),
+            new Box(0, 0, d, 1, h, l),
+            new Box(0, 0, d, 1, h, 1),
+            new Box(d, 0, 0, 1, h, l),
+            new Box(d, 0, 0, 1, h, 1),
+            new Box(0, 0, 0, 1, h, l),
+            new Box(0, 0, 0, 1, h, 1)
     };
 
     public BlockCloudBanister(Material material, String domain, String name) {
@@ -73,7 +73,7 @@ public class BlockCloudBanister extends BlockCloudFence {
 
     @Deprecated
     @Override
-    public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
+    public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
         if (!getCanInteract(state, entity)) {
             return;
         }
@@ -110,7 +110,7 @@ public class BlockCloudBanister extends BlockCloudFence {
     }
 
     @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
+    public Box getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
         state = state.getActualState(source, pos);
         return BOUNDING_BOXES[getBoundingBoxIdx(state)];
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFarm.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFarm.java
index 2dc62ed8..be266cbf 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFarm.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFarm.java
@@ -5,19 +5,18 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.CloudType;
-import com.minelittlepony.unicopia.init.UBlocks;
+import com.minelittlepony.unicopia.UBlocks;
 
-import net.minecraft.block.SoundType;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockRenderLayer;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Direction.Axis;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 public class BlockCloudFarm extends UFarmland implements ICloudBlock {
@@ -29,12 +28,7 @@ public class BlockCloudFarm extends UFarmland implements ICloudBlock {
     }
 
     @Override
-    public boolean isTranslucent(IBlockState state) {
-        return true;
-    }
-
-    @Override
-    public boolean isAir(IBlockState state, IBlockAccess world, BlockPos pos) {
+    public boolean isAir(BlockState state, IBlockAccess world, BlockPos pos) {
         return allowsFallingBlockToPass(state, world, pos);
     }
 
@@ -44,21 +38,19 @@ public class BlockCloudFarm extends UFarmland implements ICloudBlock {
     }
 
     @Override
-    public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) {
-
-        IBlockState beside = world.getBlockState(pos.offset(face));
+    public boolean isSideInvisible(BlockState state, BlockState beside, Direction face) {
 
         if (beside.getBlock() instanceof ICloudBlock) {
             ICloudBlock cloud = ((ICloudBlock)beside.getBlock());
 
-            if ((face == EnumFacing.DOWN || face == EnumFacing.UP || cloud == this)) {
+            if ((face.getAxis() == Axis.Y || cloud == this)) {
                 if (cloud.getCloudMaterialType(beside) == getCloudMaterialType(state)) {
                     return true;
                 }
             }
         }
 
-        return super.doesSideBlockRendering(state, world, pos, face);
+        return super.isSideInvisible(state, beside, face);
     }
 
     @Override
@@ -69,21 +61,21 @@ public class BlockCloudFarm extends UFarmland implements ICloudBlock {
     }
 
     @Override
-    public void onLanded(World worldIn, Entity entity) {
+    public void onEntityLand(BlockView world, Entity entity) {
         if (!applyRebound(entity)) {
-            super.onLanded(worldIn, entity);
+            super.onEntityLand(world, entity);
         }
     }
 
     @Override
-    public void onEntityCollision(World w, BlockPos pos, IBlockState state, Entity entity) {
+    public void onEntityCollision(BlockState state, World w, BlockPos pos, Entity entity) {
         if (!applyBouncyness(state, entity)) {
-            super.onEntityCollision(w, pos, state, entity);
+            super.onEntityCollision(state, w, pos, entity);
         }
     }
 
     @Override
-    public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity entity) {
+    public boolean canEntityDestroy(BlockState state, BlockView world, BlockPos pos, Entity entity) {
         return getCanInteract(state, entity) && super.canEntityDestroy(state, world, pos, entity);
     }
 
@@ -97,7 +89,7 @@ public class BlockCloudFarm extends UFarmland implements ICloudBlock {
     }
 
     @Deprecated
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
+    public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
         if (getCanInteract(state, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, p_185477_7_);
         }
@@ -105,21 +97,21 @@ public class BlockCloudFarm extends UFarmland implements ICloudBlock {
 
     @Deprecated
     @Override
-    public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
+    public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) {
         if (CloudType.NORMAL.canInteract(player)) {
-            return super.getPlayerRelativeBlockHardness(state, player, worldIn, pos);
+            return super.calcBlockBreakingDelta(state, player, world, pos);
         }
         return -1;
     }
 
 
     @Override
-    public CloudType getCloudMaterialType(IBlockState blockState) {
+    public CloudType getCloudMaterialType(BlockState blockState) {
         return CloudType.NORMAL;
     }
 
     @Override
-    protected IBlockState getDroppedState(IBlockState state) {
+    protected BlockState getDroppedState(BlockState state) {
         return UBlocks.normal_cloud.getDefaultState();
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFence.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFence.java
index 3a639331..55cf1f1e 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFence.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudFence.java
@@ -6,22 +6,17 @@ import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.CloudType;
 
-import net.minecraft.block.BlockFence;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FenceBlock;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-public class BlockCloudFence extends BlockFence implements ICloudBlock {
+public class BlockCloudFence extends FenceBlock implements ICloudBlock {
 
     private final CloudType variant;
 
@@ -71,7 +66,7 @@ public class BlockCloudFence extends BlockFence implements ICloudBlock {
 
     @Override
     public BlockRenderLayer getRenderLayer() {
-        return variant == CloudType.NORMAL ? BlockRenderLayer.TRANSLUCENT : super.getRenderLayer();
+        return BlockRenderLayer.TRANSLUCENT;
     }
 
     @Override
@@ -82,9 +77,9 @@ public class BlockCloudFence extends BlockFence implements ICloudBlock {
     }
 
     @Override
-    public void onLanded(World worldIn, Entity entity) {
+    public void onEntityLand(BlockView world, Entity entity) {
         if (!applyRebound(entity)) {
-            super.onLanded(worldIn, entity);
+            super.onEntityLand(world, entity);
         }
     }
 
@@ -96,9 +91,9 @@ public class BlockCloudFence extends BlockFence implements ICloudBlock {
     }
 
     @Override
-    public void onEntityCollision(World w, BlockPos pos, IBlockState state, Entity entity) {
+    public void onEntityCollision(BlockState state, World w, BlockPos pos, Entity entity) {
         if (!applyBouncyness(state, entity)) {
-            super.onEntityCollision(w, pos, state, entity);
+            super.onEntityCollision(state, w, pos, entity);
         }
     }
 
@@ -108,7 +103,7 @@ public class BlockCloudFence extends BlockFence implements ICloudBlock {
     }
 
     @Deprecated
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
         if (getCanInteract(state, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, isActualState);
         }
@@ -116,9 +111,9 @@ public class BlockCloudFence extends BlockFence implements ICloudBlock {
 
     @Deprecated
     @Override
-    public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
+    public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) {
         if (CloudType.NORMAL.canInteract(player)) {
-            return super.getPlayerRelativeBlockHardness(state, player, worldIn, pos);
+            return super.calcBlockBreakingDelta(state, player, world, pos);
         }
         return -1;
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java
index 9f6c35c3..1fea75ba 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudSlab.java
@@ -6,20 +6,18 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.CloudType;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockStairs;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.block.StairsBlock;
+import net.minecraft.block.enums.BlockHalf;
 import net.minecraft.entity.Entity;
 import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.state.property.Properties;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 public abstract class BlockCloudSlab<T extends Block & ICloudBlock> extends USlab<T> implements ICloudBlock {
@@ -30,19 +28,19 @@ public abstract class BlockCloudSlab<T extends Block & ICloudBlock> extends USla
 
     @SuppressWarnings("deprecation")
     @Override
-    public boolean isTopSolid(IBlockState state) {
+    public boolean isTopSolid(BlockState state) {
         return getCloudMaterialType(state) == CloudType.ENCHANTED && super.isTopSolid(state);
     }
 
     @SuppressWarnings("deprecation")
     @FUF(reason = "...Really?")
-    public boolean isSideSolid(IBlockState base_state, IBlockAccess world, BlockPos pos, EnumFacing side) {
+    public boolean isSideSolid(BlockState base_state, BlockAccess world, BlockPos pos, Direction side) {
         return getCloudMaterialType(base_state) == CloudType.ENCHANTED && super.isSideSolid(base_state, world, pos, side);
     }
 
     @Override
     @Deprecated
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
+    public void addCollisionBoxToList(BlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
         if (getCanInteract(state, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, p_185477_7_);
         }
@@ -58,7 +56,7 @@ public abstract class BlockCloudSlab<T extends Block & ICloudBlock> extends USla
     }
 
     @Override
-    public CloudType getCloudMaterialType(IBlockState blockState) {
+    public CloudType getCloudMaterialType(BlockState blockState) {
         return modelBlock.getCloudMaterialType(blockState);
     }
 
@@ -78,32 +76,30 @@ public abstract class BlockCloudSlab<T extends Block & ICloudBlock> extends USla
         }
 
         @Override
-        public boolean doesSideBlockRendering(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing face) {
-
-            IBlockState beside = world.getBlockState(pos.offset(face));
+        public boolean isSideInvisible(BlockState state, BlockState beside, Direction face) {
 
             if (beside.getBlock() instanceof ICloudBlock) {
                 ICloudBlock cloud = ((ICloudBlock)beside.getBlock());
 
                 if (cloud.getCloudMaterialType(beside) == getCloudMaterialType(state)) {
 
-                    EnumBlockHalf half = state.getValue(HALF);
+                    BlockHalf half = state.get(HALF);
 
                     if (beside.getBlock() instanceof BlockCloudStairs) {
-                        return beside.getValue(BlockStairs.HALF).ordinal() == state.getValue(HALF).ordinal()
-                           && beside.getValue(BlockStairs.FACING) == face;
+                        return beside.get(StairsBlock.HALF).ordinal() == state.get(HALF).ordinal()
+                           && beside.get(Properties.FACING) == face;
                     }
 
-                    if (face == EnumFacing.DOWN) {
-                        return half == EnumBlockHalf.BOTTOM;
+                    if (face == Direction.DOWN) {
+                        return half == BlockHalf.BOTTOM;
                     }
 
-                    if (face == EnumFacing.UP) {
-                        return half == EnumBlockHalf.TOP;
+                    if (face == Direction.UP) {
+                        return half == BlockHalf.TOP;
                     }
 
                     if (beside.getBlock() == this) {
-                        return beside.getValue(HALF) == state.getValue(HALF);
+                        return beside.get(HALF) == state.get(HALF);
                     }
                 }
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java
index a18cc891..c917ef80 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockCloudStairs.java
@@ -13,7 +13,7 @@ import net.minecraft.block.state.BlockFaceShape;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -32,7 +32,7 @@ public class BlockCloudStairs extends UStairs implements ICloudBlock {
     }
 
     @Override
-    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
+    public void addCollisionBoxToList(IBlockState state, World worldIn, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean p_185477_7_) {
         if (getCanInteract(theState, entity)) {
             super.addCollisionBoxToList(state, worldIn, pos, entityBox, collidingBoxes, entity, p_185477_7_);
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockDiamondDoor.java b/src/main/java/com/minelittlepony/unicopia/block/BlockDiamondDoor.java
index 4b3c866a..d0aa89ec 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockDiamondDoor.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockDiamondDoor.java
@@ -38,7 +38,7 @@ public class BlockDiamondDoor extends UDoor {
     @Override
     protected boolean onPowerStateChanged(World world, IBlockState state, BlockPos pos, boolean powered) {
         if (state.getValue(OPEN)) {
-            world.setBlockState(pos, state.withProperty(OPEN, false), 2);
+            world.setBlockState(pos, state.with(OPEN, false), 2);
 
             return true;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockDirected.java b/src/main/java/com/minelittlepony/unicopia/block/BlockDirected.java
deleted file mode 100644
index 1215c1c9..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockDirected.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import net.minecraft.block.BlockDirectional;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.Mirror;
-import net.minecraft.util.Rotation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public class BlockDirected extends BlockDirectional {
-
-    public BlockDirected(Material material, String domain, String name) {
-        super(material);
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setDefaultState(blockState.getBaseState().withProperty(FACING, EnumFacing.UP));
-    }
-
-    @Override
-    public IBlockState withRotation(IBlockState state, Rotation rot) {
-        return state.withProperty(FACING, rot.rotate(state.getValue(FACING)));
-    }
-
-    @Override
-    public IBlockState withMirror(IBlockState state, Mirror mirror) {
-        return state.withProperty(FACING, mirror.mirror(state.getValue(FACING)));
-    }
-
-    @Override
-    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer) {
-        return getDefaultState().withProperty(FACING, facing);
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(FACING, EnumFacing.byIndex(meta));
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        return state.getValue(FACING).getIndex();
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, FACING);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockDutchDoor.java b/src/main/java/com/minelittlepony/unicopia/block/BlockDutchDoor.java
index b9c855d5..1adef407 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockDutchDoor.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockDutchDoor.java
@@ -33,7 +33,7 @@ public class BlockDutchDoor extends UDoor {
 
         IBlockState upper = world.getBlockState(pos.up());
         if (upper.getBlock() == this && upper.getValue(OPEN) != powered) {
-            world.setBlockState(pos.up(), upper.withProperty(OPEN, powered));
+            world.setBlockState(pos.up(), upper.with(OPEN, powered));
 
             return true;
         }
@@ -52,14 +52,14 @@ public class BlockDutchDoor extends UDoor {
             IBlockState other = world.getBlockState(pos.up());
 
             if (other.getBlock() == this) {
-                return state.withProperty(HINGE, other.getValue(HINGE))
-                    .withProperty(POWERED, other.getValue(POWERED));
+                return state.with(HINGE, other.getValue(HINGE))
+                    .with(POWERED, other.getValue(POWERED));
             }
         } else {
             IBlockState other = world.getBlockState(pos.down());
 
             if (other.getBlock() == this) {
-                return state.withProperty(FACING, other.getValue(FACING));
+                return state.with(FACING, other.getValue(FACING));
             }
         }
 
@@ -72,15 +72,15 @@ public class BlockDutchDoor extends UDoor {
         boolean upper = (meta & 8) != 0;
 
         IBlockState state = getDefaultState()
-                .withProperty(HALF, upper ? EnumDoorHalf.UPPER : EnumDoorHalf.LOWER)
-                .withProperty(OPEN, (meta & 4) != 0);
+                .with(HALF, upper ? EnumDoorHalf.UPPER : EnumDoorHalf.LOWER)
+                .with(OPEN, (meta & 4) != 0);
 
         if (upper) {
-            return state.withProperty(POWERED, (meta & 1) != 0)
-                    .withProperty(HINGE, (meta & 2) != 0 ? EnumHingePosition.RIGHT : EnumHingePosition.LEFT);
+            return state.with(POWERED, (meta & 1) != 0)
+                    .with(HINGE, (meta & 2) != 0 ? EnumHingePosition.RIGHT : EnumHingePosition.LEFT);
         }
 
-        return state.withProperty(FACING, EnumFacing.byHorizontalIndex(meta & 3).rotateYCCW());
+        return state.with(FACING, EnumFacing.byHorizontalIndex(meta & 3).rotateYCCW());
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockFruitLeaves.java b/src/main/java/com/minelittlepony/unicopia/block/BlockFruitLeaves.java
deleted file mode 100644
index d97c83f9..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockFruitLeaves.java
+++ /dev/null
@@ -1,250 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-import java.util.function.Function;
-
-import javax.annotation.Nonnull;
-
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockLeaves;
-import net.minecraft.block.BlockPlanks.EnumType;
-import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.item.EnumDyeColor;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemDye;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome.TempCategory;
-
-public class BlockFruitLeaves extends BlockLeaves implements IColourful {
-
-    public static final PropertyBool HEAVY = PropertyBool.create("heavy");
-
-    private final Block sapling;
-
-    private boolean hardy;
-
-    private int baseGrowthChance;
-    private int customTint;
-
-    private Function<World, ItemStack> fruitProducer = w -> ItemStack.EMPTY;
-    private Function<World, ItemStack> compostProducer = w -> ItemStack.EMPTY;
-
-    public BlockFruitLeaves(String domain, String name, Block sapling) {
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setDefaultState(blockState.getBaseState()
-            .withProperty(HEAVY, false)
-            .withProperty(CHECK_DECAY, true)
-            .withProperty(DECAYABLE, true)
-        );
-
-        this.sapling = sapling;
-    }
-
-    public BlockFruitLeaves setHardy(boolean value) {
-        hardy = value;
-
-        return this;
-    }
-
-    public BlockFruitLeaves setHarvestFruit(@Nonnull Function<World, ItemStack> producer) {
-        fruitProducer = producer;
-
-        return this;
-    }
-
-    public BlockFruitLeaves setUnharvestFruit(@Nonnull Function<World, ItemStack> producer) {
-        compostProducer = producer;
-
-        return this;
-    }
-
-    public BlockFruitLeaves setBaseGrowthChance(int chance) {
-        baseGrowthChance = chance;
-
-        return this;
-    }
-
-    public BlockFruitLeaves setTint(int tint) {
-        customTint = tint;
-
-        return this;
-    }
-
-    @Override
-    public boolean isOpaqueCube(IBlockState state) {
-        return Blocks.LEAVES.getDefaultState().isOpaqueCube();
-    }
-
-    @Override
-    public BlockRenderLayer getRenderLayer() {
-        setGraphicsLevel(!Blocks.LEAVES.getDefaultState().isOpaqueCube());
-        return super.getRenderLayer();
-    }
-
-    @Deprecated
-    @Override
-    public boolean shouldSideBeRendered(IBlockState blockState, IBlockAccess blockAccess, BlockPos pos, EnumFacing side) {
-        setGraphicsLevel(!Blocks.LEAVES.getDefaultState().isOpaqueCube());
-        return super.shouldSideBeRendered(blockState, blockAccess, pos, side);
-    }
-
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Item.getItemFromBlock(sapling);
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-        ItemStack stack = player.getHeldItem(hand);
-
-        if (PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies().canUseEarth()) {
-            if (stack.isEmpty()) {
-
-                if (state.getValue(HEAVY)) {
-                    dropApple(world, pos, state, 0);
-                    world.setBlockState(pos, state.withProperty(HEAVY, false));
-                }
-            } else if (stack.getItem() instanceof ItemDye && EnumDyeColor.byDyeDamage(stack.getMetadata()) == EnumDyeColor.WHITE) {
-                if (!state.getValue(HEAVY)) {
-                    world.setBlockState(pos, state.withProperty(HEAVY, true));
-
-                    if (!world.isRemote) {
-                        world.playEvent(2005, pos, 0);
-                    }
-
-                    if (!player.capabilities.isCreativeMode) {
-                        stack.shrink(1);
-                    }
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-        if (!world.isRemote && world.isAreaLoaded(pos, 1)) {
-            if (state.getValue(DECAYABLE)) {
-                int growthChance = getGrowthChance(world, pos, state);
-
-                if (!state.getValue(HEAVY) && (growthChance <= 0 || rand.nextInt(growthChance) == 0)) {
-                    world.setBlockState(pos, state.withProperty(HEAVY, true));
-                } else {
-                    growthChance /= 10;
-
-                    if (state.getValue(HEAVY) && (growthChance <= 0 || rand.nextInt(growthChance) == 0)) {
-                        dropApple(world, pos, state, 0);
-                        world.setBlockState(pos, state.withProperty(HEAVY, false));
-                    } else {
-                        super.updateTick(world, pos, state, rand);
-                    }
-                }
-            }
-        }
-    }
-
-    protected int getGrowthChance(World world, BlockPos pos, IBlockState state) {
-        int chance = baseGrowthChance;
-
-        if (!hardy && !world.isDaytime()) {
-            chance *= 40;
-        }
-
-        if (world.getLight(pos) >= 4) {
-            chance /= 3;
-        }
-
-        TempCategory temp = world.getBiome(pos).getTempCategory();
-
-        if (!hardy && temp == TempCategory.COLD) {
-            chance *= 1000;
-        }
-
-        if (temp == TempCategory.WARM) {
-            chance /= 100;
-        }
-
-        if (temp == TempCategory.MEDIUM) {
-            chance /= 50;
-        }
-
-        return chance;
-    }
-
-    @Override
-    public int getCustomTint(IBlockState state, int tint) {
-        return customTint;
-    }
-
-    @Override
-    protected void dropApple(World world, BlockPos pos, IBlockState state, int chance) {
-        if (state.getValue(HEAVY)) {
-            Function<World, ItemStack> fruit = world.rand.nextInt(40) == 0 ? compostProducer : fruitProducer;
-            spawnAsEntity(world, pos, fruit.apply(world));
-
-            world.playSound(null, pos, SoundEvents.ENTITY_ITEMFRAME_PLACE, SoundCategory.BLOCKS, 0.3F, 1);
-        }
-    }
-
-    @Override
-    public NonNullList<ItemStack> onSheared(ItemStack item, net.minecraft.world.IBlockAccess world, BlockPos pos, int fortune) {
-        return NonNullList.withSize(1, new ItemStack(this, 1, 0));
-    }
-
-    @Override
-    public EnumType getWoodType(int meta) {
-        return EnumType.OAK;
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState()
-                .withProperty(HEAVY, (meta & 1) != 0)
-                .withProperty(DECAYABLE, (meta & 2) != 0)
-                .withProperty(CHECK_DECAY, (meta & 4) != 0);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        int i = 0;
-
-        if (state.getValue(HEAVY)) {
-            i |= 1;
-        }
-
-        if (!state.getValue(DECAYABLE)) {
-            i |= 2;
-        }
-
-        if (state.getValue(CHECK_DECAY)) {
-            i |= 4;
-        }
-
-        return i;
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, HEAVY, CHECK_DECAY, DECAYABLE);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockGlowingGem.java b/src/main/java/com/minelittlepony/unicopia/block/BlockGlowingGem.java
deleted file mode 100644
index b10da2c8..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockGlowingGem.java
+++ /dev/null
@@ -1,223 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-
-import com.minelittlepony.unicopia.CloudType;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
-
-import net.minecraft.block.BlockTorch;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyBool;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockGlowingGem extends BlockTorch implements ICloudBlock {
-
-    public static PropertyBool ON = PropertyBool.create("on");
-
-    private static final double A = 5/16D;
-    private static final double B = 6/16D;
-
-    private static final double C = 10/16D;
-
-    // tiltedOffWall
-    private static final double F = 10/16D;
-
-    // tiltedMinY
-    private static final double E = 3/16D;
-
-    protected static final AxisAlignedBB STANDING_AABB = new AxisAlignedBB(
-            7/16D, 0, 7/16D,
-            9/16D, 1, 9/16D
-    );
-    protected static final AxisAlignedBB TORCH_NORTH_AABB = new AxisAlignedBB(
-            B, E, F,
-            C, 1, 1
-    );
-    protected static final AxisAlignedBB TORCH_SOUTH_AABB = new AxisAlignedBB(
-            B, E, 0,
-            C, 1, A
-    );
-    protected static final AxisAlignedBB TORCH_WEST_AABB = new AxisAlignedBB(
-            F, E, B,
-            1, 1, C
-    );
-    protected static final AxisAlignedBB TORCH_EAST_AABB = new AxisAlignedBB(
-            0, E, B,
-            A, 1, C
-    );
-
-    public BlockGlowingGem(String domain, String name) {
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setHardness(0);
-        setLightLevel(1);
-        setSoundType(SoundType.GLASS);
-        setTickRandomly(true);
-
-        setDefaultState(blockState.getBaseState()
-                .withProperty(FACING, EnumFacing.UP)
-                .withProperty(ON, true)
-        );
-    }
-
-    @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-
-        switch (state.getValue(FACING)) {
-            case EAST: return TORCH_EAST_AABB;
-            case WEST: return TORCH_WEST_AABB;
-            case SOUTH: return TORCH_SOUTH_AABB;
-            case NORTH: return TORCH_NORTH_AABB;
-            default: return STANDING_AABB;
-        }
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-
-        if (!state.getValue(ON)) {
-            ItemStack held = player.getHeldItem(hand);
-            if (!held.isEmpty() && (held.getItem() == Items.FLINT_AND_STEEL || held.getItem() == Items.FIRE_CHARGE)) {
-
-                world.playSound(null, pos, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
-                world.setBlockState(pos, state.withProperty(ON, true));
-
-                if (held.getItem() == Items.FLINT_AND_STEEL) {
-                    held.damageItem(1, player);
-                } else if (!player.capabilities.isCreativeMode) {
-                    held.shrink(1);
-                }
-            }
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
-        EnumFacing facing = state.getValue(FACING);
-
-        double x = pos.getX() + 0.5;
-        double y = pos.getY() + 1;
-        double z = pos.getZ() + 0.5;
-
-        double drop = 0.22D;
-        double variance = 0.27D;
-
-        if (facing.getAxis().isHorizontal()) {
-            facing = facing.getOpposite();
-
-            x += variance * facing.getXOffset();
-            y += drop;
-            z += variance * facing.getZOffset();
-        }
-
-        if (state.getValue(ON)) {
-            for (int i = 0; i < 3; i++) {
-                Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false,
-                        x - 0.3, y - 0.3, z - 0.3,
-                        rand.nextFloat(), rand.nextFloat(), rand.nextFloat());
-            }
-        } else {
-            world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, x, y, z, 0, 0, 0);
-        }
-    }
-
-    @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-        if (world.isRainingAt(pos)) {
-            if (state.getValue(ON)) {
-                world.playSound(null, pos, SoundEvents.BLOCK_REDSTONE_TORCH_BURNOUT, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
-                world.setBlockState(pos, state.withProperty(ON, false));
-            }
-        } else {
-            if (!state.getValue(ON)) {
-                world.playSound(null, pos, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.rand.nextFloat() - world.rand.nextFloat()) * 0.8F);
-                world.setBlockState(pos, state.withProperty(ON, true));
-            }
-        }
-    }
-
-    @Override
-    public int getStrongPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
-        return state.getValue(ON) && side == EnumFacing.DOWN ? state.getWeakPower(world, pos, side) : 0;
-    }
-
-    @Override
-    public int getWeakPower(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing side) {
-        return state.getValue(ON) && state.getValue(FACING) != side ? 12 : 0;
-    }
-
-    @Override
-    public CloudType getCloudMaterialType(IBlockState blockState) {
-        return CloudType.ENCHANTED;
-    }
-
-    @Override
-    public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
-        drops.add(new ItemStack(Items.STICK));
-
-        Random rand = world instanceof World ? ((World)world).rand : RANDOM;
-
-        if (rand.nextInt(10) == 0) {
-            drops.add(new ItemStack(UItems.spell));
-        } else {
-            drops.add(new ItemStack(UItems.curse));
-        }
-    }
-
-    @Override
-    @Deprecated
-    public int getLightValue(IBlockState state) {
-        if (state.getValue(ON)) {
-            return super.getLightValue(state);
-        }
-
-        return 0;
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        IBlockState iblockstate = this.getDefaultState();
-
-        int facing = (meta % 5) + 1;
-
-        return iblockstate
-                .withProperty(FACING, EnumFacing.byIndex(facing))
-                .withProperty(ON, meta > 5);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        int meta = Math.max(0, state.getValue(FACING).getIndex() - 1);
-        if (state.getValue(ON)) {
-            meta += EnumFacing.VALUES.length;
-        }
-
-        return meta;
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, FACING, ON);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockGrowingCuccoon.java b/src/main/java/com/minelittlepony/unicopia/block/BlockGrowingCuccoon.java
index 73488fcf..e356b0e0 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockGrowingCuccoon.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockGrowingCuccoon.java
@@ -6,56 +6,47 @@ import java.util.Random;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.unicopia.init.UMaterials;
-import com.minelittlepony.unicopia.init.USounds;
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.UMaterials;
+import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.PosHelper;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.properties.PropertyInteger;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.state.property.IntProperty;
+import net.minecraft.util.StringIdentifiable;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 public class BlockGrowingCuccoon extends Block {
 
-    public static final DamageSource DAMAGE_SOURCE = new DamageSource("acid");
+    public static final DamageSource DAMAGE_SOURCE = MagicalDamageSource.mundane("acid");
 
-    public static final PropertyInteger AGE = PropertyInteger.create("age", 0, 7);
-    public static final PropertyEnum<Shape> SHAPE = PropertyEnum.create("shape", Shape.class);
+    public static final IntProperty AGE = IntProperty.of("age", 0, 7);
+    public static final EnumProperty<Shape> SHAPE = EnumProperty.of("shape", Shape.class);
 
-    public static final AxisAlignedBB[] SHAFTS = new AxisAlignedBB[] {
-            new AxisAlignedBB(7/16F, 0, 7/16F, 9/16F, 1, 7/16F),
-            new AxisAlignedBB(6/16F, 0, 6/16F, 10/16F, 1, 10/16F),
-            new AxisAlignedBB(5/16F, 0, 5/16F, 11/16F, 1, 11/16F),
-            new AxisAlignedBB(4/16F, 0, 4/16F, 12/16F, 1, 12/16F)
+    public static final Box[] SHAFTS = new Box[] {
+            new Box(7/16F, 0, 7/16F, 9/16F, 1, 7/16F),
+            new Box(6/16F, 0, 6/16F, 10/16F, 1, 10/16F),
+            new Box(5/16F, 0, 5/16F, 11/16F, 1, 11/16F),
+            new Box(4/16F, 0, 4/16F, 12/16F, 1, 12/16F)
     };
-    public static final AxisAlignedBB[] BULBS = new AxisAlignedBB[] {
-            new AxisAlignedBB(6/16F, 1/16F, 6/16F, 10/16F, 8/16F, 10/16F),
-            new AxisAlignedBB(4/16F, 0, 4/16F, 12/16F, 9/16F, 12/16F),
-            new AxisAlignedBB(3/16F, 0, 3/16F, 13/16F, 10/16F, 13/16F),
-            new AxisAlignedBB(2/16F, 0, 2/16F, 14/16F, 12/16F, 14/16F),
+    public static final Box[] BULBS = new Box[] {
+            new Box(6/16F, 1/16F, 6/16F, 10/16F, 8/16F, 10/16F),
+            new Box(4/16F, 0, 4/16F, 12/16F, 9/16F, 12/16F),
+            new Box(3/16F, 0, 3/16F, 13/16F, 10/16F, 13/16F),
+            new Box(2/16F, 0, 2/16F, 14/16F, 12/16F, 14/16F),
     };
 
     public BlockGrowingCuccoon(String domain, String name) {
@@ -74,8 +65,8 @@ public class BlockGrowingCuccoon extends Block {
         useNeighborBrightness = true;
 
         setDefaultState(getBlockState().getBaseState()
-                .withProperty(AGE, 0)
-                .withProperty(SHAPE, Shape.BULB));
+                .with(AGE, 0)
+                .with(SHAPE, Shape.BULB));
     }
 
     @Override
@@ -106,7 +97,7 @@ public class BlockGrowingCuccoon extends Block {
 
     @Deprecated
     @Override
-    public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
+    public Box getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
         return getBoundingBox(state, world, pos);
     }
 
@@ -122,23 +113,23 @@ public class BlockGrowingCuccoon extends Block {
             return;
         }
 
-        int age = state.getValue(AGE);
+        int age = state.get(AGE);
 
         BlockPos below = pos.down();
 
         if (world.isBlockLoaded(below)) {
             boolean spaceBelow = world.isAirBlock(below);
 
-            Shape shape = state.getValue(SHAPE);
+            Shape shape = state.get(SHAPE);
 
             if (shape == Shape.STRING && spaceBelow) {
-                world.setBlockState(pos, state.withProperty(SHAPE, Shape.BULB).withProperty(AGE, age / 2));
+                world.setBlockState(pos, state.with(SHAPE, Shape.BULB).with(AGE, age / 2));
             } else if (shape == Shape.BULB && !spaceBelow) {
-                world.setBlockState(pos, state.withProperty(SHAPE, Shape.STRING).withProperty(AGE, age / 2));
+                world.setBlockState(pos, state.with(SHAPE, Shape.STRING).with(AGE, age / 2));
             } else if (age >= 7) {
                 if (rand.nextInt(12) == 0 && spaceBelow) {
-                    world.setBlockState(below, state.withProperty(AGE, age / 2));
-                    world.setBlockState(pos, getDefaultState().withProperty(AGE, age / 2).withProperty(SHAPE, Shape.STRING));
+                    world.setBlockState(below, state.with(AGE, age / 2));
+                    world.setBlockState(pos, getDefaultState().with(AGE, age / 2).with(SHAPE, Shape.STRING));
                     world.playSound(null, pos, USounds.SLIME_ADVANCE, SoundCategory.BLOCKS, 1, 1);
                 }
             } else {
@@ -163,14 +154,14 @@ public class BlockGrowingCuccoon extends Block {
     }
 
     protected int getMaximumAge(World world, BlockPos pos, IBlockState state, boolean spaceBelow) {
-        if (state.getValue(SHAPE) == Shape.STRING) {
+        if (state.get(SHAPE) == Shape.STRING) {
             IBlockState higher = world.getBlockState(pos.up());
 
             if (higher.getBlock() != this) {
                 return 7;
             }
 
-            return Math.min(higher.getValue(AGE),
+            return Math.min(higher.get(AGE),
                     ((BlockGrowingCuccoon)higher.getBlock()).getMaximumAge(world, pos.up(), higher, false) - 1
                 );
         }
@@ -184,7 +175,7 @@ public class BlockGrowingCuccoon extends Block {
 
     @Override
     public int quantityDropped(IBlockState state, int fortune, Random random) {
-        return random.nextInt(3) == 0 ? state.getValue(AGE) : 0;
+        return random.nextInt(3) == 0 ? state.get(AGE) : 0;
     }
 
     @Override
@@ -217,14 +208,14 @@ public class BlockGrowingCuccoon extends Block {
 
     @Override
     public void onEntityCollision(World world, BlockPos pos, IBlockState state, Entity entity) {
-        if (entity instanceof EntityLivingBase && !entity.isDead) {
-            EntityLivingBase living = (EntityLivingBase)entity;
+        if (entity instanceof LivingEntity && !entity.isDead) {
+            LivingEntity living = (LivingEntity)entity;
 
             if (!Predicates.BUGGY.test(living) && living.getHealth() > 0) {
                 living.attackEntityFrom(DAMAGE_SOURCE, 1);
                 living.setInWeb();
 
-                if (!world.isRemote) {
+                if (!world.isClient) {
                     if (living.getHealth() <= 0) {
                         living.dropItem(Items.BONE, 3);
 
@@ -274,44 +265,32 @@ public class BlockGrowingCuccoon extends Block {
 
     @Deprecated
     @Override
-    public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, AxisAlignedBB entityBox, List<AxisAlignedBB> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
+    public void addCollisionBoxToList(IBlockState state, World world, BlockPos pos, Box entityBox, List<Box> collidingBoxes, @Nullable Entity entity, boolean isActualState) {
         if (!isActualState) {
             state = state.getActualState(world, pos);
         }
 
-        int age = state.getValue(AGE) / 2;
+        int age = state.get(AGE) / 2;
 
         Vec3d offset = state.getOffset(world, pos);
 
         addCollisionBoxToList(pos, entityBox, collidingBoxes, SHAFTS[age % SHAFTS.length].offset(offset));
 
-        if (state.getValue(SHAPE) == Shape.BULB) {
+        if (state.get(SHAPE) == Shape.BULB) {
             addCollisionBoxToList(pos, entityBox, collidingBoxes, BULBS[age % BULBS.length].offset(offset));
         }
     }
 
     @Deprecated
     @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
+    public Box getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
         state = state.getActualState(source, pos);
 
-        if (state.getValue(SHAPE) == Shape.BULB) {
-            return BULBS[state.getValue(AGE) / 2].offset(state.getOffset(source, pos));
+        if (state.get(SHAPE) == Shape.BULB) {
+            return BULBS[state.get(AGE) / 2].offset(state.getOffset(source, pos));
         }
 
-        return SHAFTS[state.getValue(AGE) / 2].offset(state.getOffset(source, pos));
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState()
-                .withProperty(AGE, meta % 8)
-                .withProperty(SHAPE, Shape.VALUES[(meta >> 3) % Shape.VALUES.length]);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        return state.getValue(AGE) | (state.getValue(SHAPE).ordinal() << 3);
+        return SHAFTS[state.get(AGE) / 2].offset(state.getOffset(source, pos));
     }
 
     @Override
@@ -320,28 +299,29 @@ public class BlockGrowingCuccoon extends Block {
     }
 
     @Override
-    public boolean isLadder(IBlockState state, IBlockAccess world, BlockPos pos, EntityLivingBase entity) {
+    public boolean isLadder(BlockState state, BlockView world, BlockPos pos, LivingEntity entity) {
         return true;
     }
 
-    public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
-        if (state.getValue(SHAPE) == Shape.BULB) {
+    @Override
+    public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) {
+        if (state.get(SHAPE) == Shape.BULB) {
             if (rand.nextInt(8) == 0) {
 
-                AxisAlignedBB bounds = BULBS[state.getValue(AGE) / 2]
+                Box bounds = BULBS[state.get(AGE) / 2]
                         .offset(pos)
-                        .offset(state.getOffset(world, pos));
+                        .offset(state.getOffsetPos(world, pos));
 
                 double x = bounds.minX + (bounds.maxX - bounds.minX) * rand.nextFloat();
                 double y = bounds.minY;
                 double z = bounds.minZ + (bounds.maxZ - bounds.minZ) * rand.nextFloat();
 
-                world.spawnParticle(EnumParticleTypes.DRIP_LAVA, x, y, z, 0, 0, 0);
+                world.addParticle(ParticleTypes.DRIPPING_LAVA, x, y, z, 0, 0, 0);
             }
         }
     }
 
-    static enum Shape implements IStringSerializable {
+    enum Shape implements StringIdentifiable {
         BULB,
         STRING;
 
@@ -349,11 +329,11 @@ public class BlockGrowingCuccoon extends Block {
 
         @Override
         public String toString() {
-            return getName();
+            return asString();
         }
 
         @Override
-        public String getName() {
+        public String asString() {
             return name().toLowerCase();
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockHiveWall.java b/src/main/java/com/minelittlepony/unicopia/block/BlockHiveWall.java
deleted file mode 100644
index f8000db4..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockHiveWall.java
+++ /dev/null
@@ -1,374 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Map;
-import java.util.Random;
-
-import com.google.common.collect.Maps;
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.unicopia.init.UMaterials;
-import com.minelittlepony.unicopia.init.USounds;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.util.PosHelper;
-import com.minelittlepony.util.shape.IShape;
-import com.minelittlepony.util.shape.Sphere;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFalling;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityFallingBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-
-public class BlockHiveWall extends BlockFalling {
-
-    public static final PropertyEnum<State> STATE = PropertyEnum.create("state", State.class);
-    public static final PropertyEnum<Axis> AXIS = PropertyEnum.create("axis", Axis.class);
-
-    private static final IShape shape = new Sphere(false, 1.5);
-
-    public BlockHiveWall(String domain, String name) {
-        super(UMaterials.hive);
-
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
-        setDefaultState(blockState.getBaseState().withProperty(STATE, State.GROWING).withProperty(AXIS, Axis.Y));
-        setHardness(2);
-        setSoundType(SoundType.SAND);
-        setHarvestLevel("pickaxe", 1);
-        setResistance(10);
-    }
-
-    @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-
-        if (rand.nextInt(300) == 0) {
-            world.playSound(null, pos, USounds.INSECT, SoundCategory.BLOCKS, 1, 1);
-        }
-
-        State type = getState(state);
-
-        Axis axis = getAxis(state);
-
-        int matchedNeighbours = countNeighbours(world, pos);
-
-        if (type == State.GROWING) {
-            if (testForAxis(world, pos, axis)) {
-                world.setBlockState(pos, state.withProperty(STATE, State.STABLE));
-            } else {
-                Axis newAxis = axis;
-
-                for (Axis i : Axis.VALUES) {
-                    if (testForAxis(world, pos, i)) {
-                        newAxis = i;
-                        break;
-                    }
-                }
-
-                if (newAxis != axis) {
-                    world.setBlockState(pos, state.withProperty(AXIS, newAxis).withProperty(STATE, State.STABLE));
-                } else if (rand.nextInt(10) == 0) {
-                    EnumFacing facing = axis.randomFacing(rand);
-
-                    BlockPos other = pos.offset(facing);
-
-                    if (canSpreadInto(world, other, axis)) {
-                        world.playSound(null, pos, USounds.SLIME_RETRACT, SoundCategory.BLOCKS, 1, 1);
-                        world.setBlockState(other, state);
-                        world.setBlockState(pos, state.withProperty(STATE, State.STABLE));
-                    }
-                }
-            }
-        } else if (type == State.DYING) {
-            if (matchedNeighbours > 1 && matchedNeighbours < 17) {
-                world.setBlockState(pos, state.withProperty(STATE, State.STABLE));
-            } else {
-                die(world, pos, rand);
-            }
-        } else {
-
-            if (pos.getX() % 3 == 0 && pos.getZ() % 4 == 0 && isEmptySpace(world, pos.down()) && UBlocks.cuccoon.canPlaceBlockAt(world, pos.down())) {
-                world.setBlockState(pos.down(), UBlocks.cuccoon.getDefaultState());
-            } else if (!testForAxis(world, pos, axis)) {
-                world.setBlockState(pos, state.withProperty(STATE, State.GROWING));
-            } else if (matchedNeighbours >= 27) {
-                world.setBlockState(pos, state.withProperty(STATE, State.DYING));
-            } else {
-                return;
-            }
-        }
-
-        world.scheduleUpdate(pos, this, tickRate(world));
-    }
-
-    public State getState(IBlockState state) {
-        return state.getValue(STATE);
-    }
-
-    public Axis getAxis(IBlockState state) {
-        return state.getValue(AXIS);
-    }
-
-    @Override
-    public void onBlockAdded(World world, BlockPos pos, IBlockState state) {
-        if (state.getValue(STATE) != State.STABLE) {
-            world.scheduleUpdate(pos, this, 10);
-        }
-    }
-
-    protected boolean testForAxis(World world, BlockPos pos, Axis axis) {
-        return !PosHelper.some(pos, p -> isEmptySpace(world, p), axis.getFacings());
-    }
-
-    protected boolean isEmptySpace(World world, BlockPos pos) {
-
-        if (world.isAirBlock(pos)) {
-            return true;
-        }
-
-        IBlockState state = world.getBlockState(pos);
-
-        return !(state.getMaterial().isLiquid()
-                || state.isBlockNormalCube()
-                || state.isNormalCube()
-                || state.isFullCube()
-                || state.isOpaqueCube());
-    }
-
-    protected void die(World world, BlockPos pos, Random rand) {
-        world.destroyBlock(pos, false);
-
-        PosHelper.all(pos, p -> {
-            IBlockState s = world.getBlockState(p);
-
-            if (s.getBlock() == this) {
-                notifyDying(world, p, s, rand);
-            }
-        }, EnumFacing.VALUES);
-    }
-
-    protected void notifyDying(World world, BlockPos pos, IBlockState state, Random rand) {
-        State oldState = state.getValue(STATE);
-        State newState = oldState.downGrade();
-
-        if (newState != oldState) {
-            world.setBlockState(pos, state.withProperty(STATE, newState));
-        }
-    }
-
-    @Override
-    public void onEntityWalk(World world, BlockPos pos, Entity entity) {
-        if (entity instanceof EntityPlayer) {
-            IPlayer player = PlayerSpeciesList.instance().getPlayer((EntityPlayer)entity);
-
-            IBlockState state = world.getBlockState(pos);
-
-            if (player.getPlayerSpecies() != Race.CHANGELING) {
-                if (!world.isRemote) {
-                    if (((isEmptySpace(world, pos.down()) || canFallThrough(world.getBlockState(pos.down()))) && pos.getY() >= 0)) {
-                        EntityFallingBlock faller = new EntityFallingBlock(world, pos.getX() + 0.5D, pos.getY(), pos.getZ() + 0.5D, state);
-                        onStartFalling(faller);
-                        world.spawnEntity(faller);
-                    }
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onEndFalling(World world, BlockPos pos, IBlockState fallingState, IBlockState hitState) {
-        world.destroyBlock(pos, true);
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer playerIn, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-
-        if (hand == EnumHand.MAIN_HAND && playerIn.getHeldItem(hand).isEmpty()) {
-            IPlayer player = PlayerSpeciesList.instance().getPlayer(playerIn);
-
-            if (player.getPlayerSpecies() == Race.CHANGELING) {
-                retreat(world, pos);
-
-                PosHelper.adjacentNeighbours(pos).forEach(p -> {
-                    if (world.getBlockState(p).getBlock() == this) {
-                        retreat(world, p);
-                    }
-                });
-
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public IBlockState getStateForPlacement(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer, EnumHand hand) {
-        return getDefaultState().withProperty(AXIS, Axis.fromVanilla(facing.getAxis()));
-    }
-
-    @Override
-    public void randomDisplayTick(IBlockState state, World world, BlockPos pos, Random rand) {
-        if (rand.nextInt(16) == 0) {
-            Vec3d vel = shape.computePoint(rand);
-            Vec3d vec = vel.add(pos.getX(), pos.getY(), pos.getZ());
-
-            world.spawnParticle(EnumParticleTypes.BLOCK_DUST,
-                    vec.x, vec.y, vec.z,
-                    vel.x, vel.y, vel.z,
-                    Block.getStateId(state));
-        }
-    }
-
-    public void retreat(World world, BlockPos pos) {
-        world.setBlockState(pos, Blocks.AIR.getDefaultState());
-        world.playSound(null, pos, USounds.SLIME_RETRACT, SoundCategory.BLOCKS, 1, 1);
-    }
-
-    protected int countNeighbours(World world, BlockPos pos) {
-        int count = 0;
-        for (BlockPos i : BlockPos.getAllInBoxMutable(pos.add(-1, -1, -1), pos.add(1, 1, 1))) {
-            if (world.getBlockState(i).getBlock() == this) {
-                count++;
-            }
-        }
-
-        return count;
-    }
-
-    protected boolean exposed(World world, BlockPos pos) {
-        return PosHelper.some(pos, p -> isEmptySpace(world, p), EnumFacing.VALUES);
-    }
-
-    protected boolean canSpreadInto(World world, BlockPos pos, Axis axis) {
-        if (world.isBlockLoaded(pos) && isEmptySpace(world, pos)) {
-            boolean one = false;
-
-            for (EnumFacing facing : axis.getFacings()) {
-                BlockPos op = pos.offset(facing);
-
-                if (world.getBlockState(op).getMaterial() == UMaterials.hive) {
-                    if (one) {
-                        return true;
-                    }
-
-                    one = true;
-                }
-            }
-
-        }
-
-        return false;
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState()
-                .withProperty(STATE, State.VALUES[meta % State.VALUES.length])
-                .withProperty(AXIS, Axis.VALUES[(meta << 2) % Axis.VALUES.length]);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        return getState(state).ordinal() | (getAxis(state).ordinal() >> 2);
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, STATE, AXIS);
-    }
-
-    public static enum State implements IStringSerializable {
-        GROWING,
-        STABLE,
-        DYING;
-
-        static final State[] VALUES = values();
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        @Override
-        public String getName() {
-            return name().toLowerCase();
-        }
-
-        public State upgrade() {
-            switch (this) {
-                case DYING: return STABLE;
-                default: return GROWING;
-            }
-        }
-
-        public State downGrade() {
-            switch (this) {
-                case GROWING: return STABLE;
-                default: return DYING;
-            }
-        }
-    }
-
-    public static enum Axis implements IStringSerializable {
-        X(EnumFacing.Axis.X, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.UP, EnumFacing.DOWN),
-        Y(EnumFacing.Axis.Y, EnumFacing.EAST, EnumFacing.WEST, EnumFacing.NORTH, EnumFacing.SOUTH),
-        Z(EnumFacing.Axis.Z, EnumFacing.NORTH, EnumFacing.SOUTH, EnumFacing.UP, EnumFacing.DOWN);
-
-        static final Axis[] VALUES = values();
-        static final Map<EnumFacing.Axis, Axis> AXIS_MAP = Maps.newEnumMap(EnumFacing.Axis.class);
-
-        private final EnumFacing.Axis vanilla;
-        private final EnumFacing[] facings;
-
-        static {
-            for (Axis i : VALUES) {
-                AXIS_MAP.put(i.vanilla, i);
-            }
-        }
-
-        Axis(EnumFacing.Axis vanilla, EnumFacing... facings) {
-            this.vanilla = vanilla;
-            this.facings = facings;
-        }
-
-        @Override
-        public String toString() {
-            return getName();
-        }
-
-        @Override
-        public String getName() {
-            return name().toLowerCase();
-        }
-
-        public EnumFacing randomFacing(Random rand) {
-            return facings[rand.nextInt(facings.length)];
-        }
-
-        public EnumFacing[] getFacings() {
-            return facings;
-        }
-
-        public static Axis fromVanilla(EnumFacing.Axis axis) {
-            return AXIS_MAP.get(axis);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockSlimeLayer.java b/src/main/java/com/minelittlepony/unicopia/block/BlockSlimeLayer.java
deleted file mode 100644
index 1a3a70fa..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockSlimeLayer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-
-import net.minecraft.block.BlockSnow;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.Entity;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-
-public class BlockSlimeLayer extends BlockSnow {
-
-    public BlockSlimeLayer(String domain, String name) {
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setSoundType(SoundType.SLIME);
-        setCreativeTab(CreativeTabs.DECORATIONS);
-    }
-
-    @Override
-    public BlockRenderLayer getRenderLayer() {
-        return BlockRenderLayer.TRANSLUCENT;
-    }
-
-    @Deprecated
-    public Material getMaterial(IBlockState state) {
-        return Material.CLAY;
-    }
-
-    @Override
-    public MapColor getMapColor(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return MapColor.GRASS;
-    }
-
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Items.SLIME_BALL;
-    }
-
-    @Deprecated
-    @Override
-    public boolean isOpaqueCube(IBlockState state) {
-        return false;
-    }
-
-    @Override
-    public void onEntityWalk(World world, BlockPos pos, Entity entity) {
-
-        float factor = getMotionFactor(world.getBlockState(pos));
-
-        entity.motionX *= factor;
-        entity.motionY *= factor;
-        entity.motionZ *= factor;
-    }
-
-    protected float getMotionFactor(IBlockState state) {
-        return 1/state.getValue(LAYERS);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockStick.java b/src/main/java/com/minelittlepony/unicopia/block/BlockStick.java
deleted file mode 100644
index e9e533e6..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockStick.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemLead;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
-import net.minecraft.world.World;
-import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.IPlantable;
-
-public class BlockStick extends Block implements IPlantable {
-
-    static final AxisAlignedBB BOUNDING_BOX = new AxisAlignedBB(
-            7/16F, -1/16F, 7/16F,
-            9/16F, 15/16F, 9/16F
-    );
-
-    public BlockStick(String domain, String name) {
-        super(Material.PLANTS);
-
-        setRegistryName(domain, name);
-        setTranslationKey(name);
-        setHardness(0.2F);
-        setSoundType(SoundType.WOOD);
-    }
-
-    @Override
-    public boolean isOpaqueCube(IBlockState state) {
-        return false;
-    }
-
-    @Deprecated
-    @Override
-    public boolean isFullCube(IBlockState state) {
-        return false;
-    }
-
-    @Deprecated
-    @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-        return BOUNDING_BOX.offset(state.getOffset(source, pos));
-    }
-
-    @Deprecated
-    @Override
-    public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return state.getBoundingBox(world, pos);
-    }
-
-    @Override
-    public EnumOffsetType getOffsetType() {
-        return EnumOffsetType.XZ;
-    }
-
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Items.STICK;
-    }
-
-    @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float x, float y, float z) {
-        if (!world.isRemote) {
-            return ItemLead.attachToFence(player, world, pos);
-        }
-
-        ItemStack stack = player.getHeldItem(hand);
-
-        return stack.getItem() == Items.LEAD || stack.isEmpty();
-    }
-
-    public boolean canSustainPlant(IBlockAccess world, BlockPos pos, IPlantable plantable) {
-
-        pos = pos.down();
-
-        IBlockState state = world.getBlockState(pos);
-        Block block = state.getBlock();
-
-        if (block instanceof BlockStick) {
-            return ((BlockStick)block).canSustainPlant(world, pos, plantable);
-        }
-
-        return block.canSustainPlant(state, world, pos, EnumFacing.UP, plantable);
-    }
-
-    @Override
-    public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) {
-        return EnumPlantType.Crop;
-    }
-
-    @Override
-    public IBlockState getPlant(IBlockAccess world, BlockPos pos) {
-        return getDefaultState();
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java b/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
deleted file mode 100644
index 6e33ac77..00000000
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockSugar.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package com.minelittlepony.unicopia.block;
-
-import java.util.Random;
-
-import net.minecraft.block.BlockFalling;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-
-public class BlockSugar extends BlockFalling {
-
-    public BlockSugar(String domain, String name) {
-        super(Material.SAND);
-        setTranslationKey(name);
-        setRegistryName(domain, name);
-
-        setSoundType(SoundType.SAND);
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
-        setHardness(0.7F);
-    }
-
-    @Override
-    public int quantityDropped(Random random) {
-        return 9;
-    }
-
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        return Items.SUGAR;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java b/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
index 8dbfc3a6..32a6fb73 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/BlockTomatoPlant.java
@@ -2,68 +2,61 @@ package com.minelittlepony.unicopia.block;
 
 import java.util.Random;
 
-import com.minelittlepony.unicopia.init.UItems;
+import com.minelittlepony.unicopia.UItems;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockCrops;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.CropBlock;
+import net.minecraft.block.Fertilizable;
+import net.minecraft.entity.EntityContext;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.item.Items;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.util.Hand;
+import net.minecraft.util.StringIdentifiable;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.ForgeHooks;
-import net.minecraftforge.common.IPlantable;
 
-public class BlockTomatoPlant extends BlockCrops {
+public class BlockTomatoPlant extends CropBlock {
 
-    public static final PropertyEnum<Type> TYPE = PropertyEnum.create("type", Type.class);
+    public static final EnumProperty<Type> TYPE = EnumProperty.of("type", Type.class);
 
     public BlockTomatoPlant(String domain, String name) {
-        setRegistryName(domain, name);
-        setTranslationKey(name);
-
-        setDefaultState(getDefaultState().withProperty(TYPE, Type.NORMAL));
+        setDefaultState(getDefaultState().with(TYPE, Type.NORMAL));
         setHardness(0.2F);
         setSoundType(SoundType.WOOD);
     }
 
     @Deprecated
     @Override
-    public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, BlockPos pos) {
-        return BlockStick.BOUNDING_BOX.offset(state.getOffset(source, pos));
-    }
-
-    @Deprecated
-    @Override
-    public AxisAlignedBB getCollisionBoundingBox(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return state.getBoundingBox(world, pos);
+    public VoxelShape getOutlineShape(BlockState state, BlockView source, BlockPos pos, EntityContext context) {
+        Vec3d off = state.getOffsetPos(source, pos);
+        return StickBlock.BOUNDING_BOX.offset(off.x, off.y, off.z);
     }
 
     @Override
-    protected BlockStateContainer createBlockState() {
-        return new BlockStateContainer(this, TYPE, AGE);
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder);
+        builder.add(TYPE);
     }
 
     @Override
-    public EnumOffsetType getOffsetType() {
-        return EnumOffsetType.XZ;
+    public Block.OffsetType getOffsetType() {
+        return Block.OffsetType.XZ;
     }
 
     @Override
-    protected Item getSeed() {
+    protected Item getSeedsItem() {
         return UItems.tomato_seeds;
     }
 
@@ -81,9 +74,9 @@ public class BlockTomatoPlant extends BlockCrops {
     }
 
     @Override
-    public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) {
+    public boolean canSustainPlant(BlockState state, BlockView world, BlockPos pos, Direction direction, Fertilizable plantable) {
 
-        if (direction == EnumFacing.UP && state.getBlock() instanceof BlockTomatoPlant) {
+        if (direction == Direction.UP && state.getBlock() instanceof BlockTomatoPlant) {
             return true;
         }
 
@@ -91,46 +84,37 @@ public class BlockTomatoPlant extends BlockCrops {
     }
 
     @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random rand) {
         checkAndDropBlock(world, pos, state);
 
-        if (world.isAreaLoaded(pos, 1) && world.getLightFromNeighbors(pos.up()) >= 9) {
+        if (world.isBlockLoaded(pos) && world.getLightLevel(pos.up()) >= 9) {
             int i = getAge(state);
 
             if (i < getMaxAge()) {
-                float f = getGrowthChance(this, world, pos);
+                float f = getAvailableMoisture(this, world, pos);
 
-                if (ForgeHooks.onCropsGrowPre(world, pos, state, rand.nextInt((int)(25 / f) + 1) == 0)) {
-                    world.setBlockState(pos, state.withProperty(getAgeProperty(), i + 1), 2);
-
-                    ForgeHooks.onCropsGrowPost(world, pos, state, world.getBlockState(pos));
-                }
+                world.setBlockState(pos, state.with(getAgeProperty(), i + 1), 2);
             }
         }
     }
 
     @Override
-    public int quantityDropped(IBlockState state, int fortune, Random random) {
+    public int quantityDropped(BlockState state, int fortune, Random random) {
         return 1;
     }
 
     @Override
-    public EnumPlantType getPlantType(IBlockAccess world, BlockPos pos) {
-        return EnumPlantType.Crop;
-    }
+    public Item getItemDropped(BlockState state, Random rand, int fortune) {
 
-    @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-
-        if (isMaxAge(state)) {
-            return state.getValue(TYPE).getCrop();
+        if (isMature(state)) {
+            return state.get(TYPE).getCrop();
         }
 
         return getSeed();
     }
 
     @Override
-    public void getDrops(NonNullList<ItemStack> drops, IBlockAccess world, BlockPos pos, IBlockState state, int fortune) {
+    public void getDrops(NonNullList<ItemStack> drops, WorldView world, BlockPos pos, BlockState state, int fortune) {
         Random rand = world instanceof World ? ((World)world).rand : RANDOM;
 
         drops.add(new ItemStack(Items.STICK, 1, 0));
@@ -142,25 +126,25 @@ public class BlockTomatoPlant extends BlockCrops {
     }
 
     @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
 
-        if (hand == EnumHand.MAIN_HAND && isMaxAge(state)) {
-            if (player.getHeldItem(hand).isEmpty()) {
-                Type type = state.getValue(TYPE);
+        if (hand == Hand.MAIN_HAND && isMature(state)) {
+            if (player.getStackInHand(hand).isEmpty()) {
+                Type type = state.get(TYPE);
 
                 int good = getAge(state);
-                int rotten = world.rand.nextInt(good);
+                int rotten = world.random.nextInt(good);
 
                 good -= rotten;
 
                 if (good > 0) {
-                    spawnAsEntity(world, pos, new ItemStack(type.getCrop(), good));
+                    dropStack(world, pos, new ItemStack(type.getCrop(), good));
                 }
                 if (rotten > 0) {
-                    spawnAsEntity(world, pos, new ItemStack(type.getWaste(), rotten));
+                    dropStack(world, pos, new ItemStack(type.getWaste(), rotten));
                 }
 
-                world.setBlockState(pos, state.withProperty(getAgeProperty(), 0));
+                world.setBlockState(pos, state.with(getAgeProperty(), 0));
 
                 return true;
             }
@@ -170,20 +154,20 @@ public class BlockTomatoPlant extends BlockCrops {
     }
 
     @Override
-    public void grow(World worldIn, BlockPos pos, IBlockState state) {
-        int age = Math.min(getAge(state) + getBonemealAgeIncrease(worldIn), getMaxAge());
+    public void applyGrowth(World world, BlockPos pos, BlockState state) {
+        int age = Math.min(getAge(state) + getGrowthAmount(world), getMaxAge());
 
-        worldIn.setBlockState(pos, state.withProperty(getAgeProperty(), age), 2);
+        world.setBlockState(pos, state.with(getAgeProperty(), age), 2);
     }
 
-    public boolean plant(World world, BlockPos pos, IBlockState state) {
+    public boolean plant(World world, BlockPos pos, BlockState state) {
         Block block = state.getBlock();
 
-        if (block instanceof BlockStick && ((BlockStick)block).canSustainPlant(world, pos, this)) {
+        if (block instanceof StickBlock && ((StickBlock)block).canSustainPlant(world, pos, this)) {
 
-            world.setBlockState(pos, getPlacedState(world, pos, state).withProperty(getAgeProperty(), 1));
+            world.setBlockState(pos, getPlacedState(world, pos, state).with(getAgeProperty(), 1));
 
-            SoundType sound = getSoundType(state, world, pos, null);
+            BlockSoundGroup sound = getSoundGroup(state);
 
             world.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, sound.getVolume(), sound.getPitch() * 2);
 
@@ -193,48 +177,34 @@ public class BlockTomatoPlant extends BlockCrops {
         return false;
     }
 
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        int age = meta % (getMaxAge() + 1);
-        int half = meta >> 3;;
-
-        return withAge(age).withProperty(TYPE, Type.values()[half]);
-    }
-
-    public IBlockState getPlacedState(World world, BlockPos pos, IBlockState state) {
-        if (state.getBlock() instanceof BlockStick) {
+    public BlockState getPlacedState(World world, BlockPos pos, BlockState state) {
+        if (state.getBlock() instanceof StickBlock) {
             pos = pos.down();
             return getPlacedState(world, pos, world.getBlockState(pos));
         }
 
         if (state.getBlock() instanceof BlockCloudFarm) {
-            return getDefaultState().withProperty(TYPE, Type.CLOUDSDALE);
+            return getDefaultState().with(TYPE, Type.CLOUDSDALE);
         }
 
         if (state.getBlock() instanceof BlockTomatoPlant) {
-            return getDefaultState().withProperty(TYPE, state.getValue(TYPE));
+            return getDefaultState().with(TYPE, state.get(TYPE));
         }
 
         return getDefaultState();
     }
 
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        int age = getAge(state);
-        int half = state.getValue(TYPE).ordinal();
-
-        return (half << 3) + age;
-    }
-
-    public static enum Type implements IStringSerializable {
+    public enum Type implements StringIdentifiable {
         NORMAL,
         CLOUDSDALE;
 
+        @Override
         public String toString() {
-            return getName();
+            return asString();
         }
 
-        public String getName() {
+        @Override
+        public String asString() {
             return this == NORMAL ? "normal" : "cloudsdale";
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/block/ChiselledChitinBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ChiselledChitinBlock.java
new file mode 100644
index 00000000..bb4834e7
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/ChiselledChitinBlock.java
@@ -0,0 +1,79 @@
+package com.minelittlepony.unicopia.block;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UMaterials;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.MaterialColor;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.BlockMirror;
+import net.minecraft.util.BlockRotation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
+
+public class ChiselledChitinBlock extends Block {
+
+    public ChiselledChitinBlock(String domain, String name) {
+        super(FabricBlockSettings.of(UMaterials.hive)
+                .strength(50, 2000)
+                .materialColor(MaterialColor.BLACK)
+                .build()
+        );
+        setDefaultState(stateFactory.getDefaultState()
+                .with(Properties.FACING, Direction.UP)
+        );
+
+        // TODO:
+        // setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
+    }
+
+    @Override
+    public BlockState rotate(BlockState state, BlockRotation rot) {
+        return state.with(Properties.FACING, rot.rotate(state.get(Properties.FACING)));
+    }
+
+    @Override
+    public BlockState mirror(BlockState state, BlockMirror mirror) {
+        return state.with(Properties.FACING, mirror.apply(state.get(Properties.FACING)));
+    }
+
+    @Override
+    @Nullable
+    public BlockState getPlacementState(ItemPlacementContext context) {
+        return getDefaultState().with(Properties.FACING, context.getPlayerFacing());
+    }
+
+    @Override
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        builder.add(Properties.FACING);
+    }
+
+    @Deprecated
+    @Override
+    public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView worldIn, BlockPos pos) {
+        float hardness = super.calcBlockBreakingDelta(state, player, worldIn, pos);
+
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
+        Race race = iplayer.getSpecies();
+
+        if (race == Race.CHANGELING) {
+            hardness *= 80;
+        } else if (race.canInteractWithClouds()) {
+            hardness /= 4;
+        } else if (race.canUseEarth()) {
+            hardness *= 10;
+        }
+
+        return hardness;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/ChitinBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ChitinBlock.java
new file mode 100644
index 00000000..c0df0579
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/ChitinBlock.java
@@ -0,0 +1,97 @@
+package com.minelittlepony.unicopia.block;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UMaterials;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.MaterialColor;
+import net.minecraft.entity.EntityContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.util.StringIdentifiable;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.IWorld;
+
+public class ChitinBlock extends Block {
+
+    public static final EnumProperty<Covering> COVERING = EnumProperty.of("covering", Covering.class);
+
+    public ChitinBlock(String domain, String name) {
+        super(FabricBlockSettings.of(UMaterials.hive)
+                .hardness(50)
+                .strength(2000, 2000)
+                .materialColor(MaterialColor.BLACK)
+                .build()
+        );
+        setDefaultState(stateFactory.getDefaultState().with(COVERING, Covering.UNCOVERED));
+
+        // TODO: drops:
+        //  UItems.chitin_shell x 3
+        // setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
+    }
+
+    @Deprecated
+    @Override
+    public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView world, BlockPos pos) {
+        float hardness = super.calcBlockBreakingDelta(state, player, world, pos);
+
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
+        Race race = iplayer.getSpecies();
+
+        if (race == Race.CHANGELING) {
+            hardness *= 80;
+        } else if (race.canInteractWithClouds()) {
+            hardness /= 4;
+        } else if (race.canUseEarth()) {
+            hardness *= 10;
+        }
+
+        return hardness;
+    }
+
+
+    @Override
+    @Deprecated
+    public BlockState getStateForNeighborUpdate(BlockState state, Direction direction, BlockState other, IWorld world, BlockPos pos, BlockPos otherPos) {
+        if (direction == Direction.UP) {
+            Block block = other.getBlock();
+
+            boolean snowy = block == Blocks.SNOW_BLOCK || block == Blocks.SNOW;
+            boolean solid = (other.isOpaque() && other.isSimpleFullBlock(world, pos)) || Block.isFaceFullSquare(other.getCollisionShape(world, otherPos, EntityContext.absent()), Direction.DOWN);
+
+            return state.with(COVERING, snowy ? Covering.SNOW_COVERED : solid ? Covering.COVERED : Covering.UNCOVERED);
+        }
+
+        return state;
+    }
+
+    @Override
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        builder.add(COVERING);
+    }
+
+    public enum Covering implements StringIdentifiable {
+        COVERED,
+        UNCOVERED,
+        SNOW_COVERED;
+
+        @Override
+        public String toString() {
+            return asString();
+        }
+
+        @Override
+        public String asString() {
+            return name().toLowerCase();
+        }
+
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/FruitLeavesBlock.java b/src/main/java/com/minelittlepony/unicopia/block/FruitLeavesBlock.java
new file mode 100644
index 00000000..b77f89c9
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/FruitLeavesBlock.java
@@ -0,0 +1,177 @@
+package com.minelittlepony.unicopia.block;
+
+import java.util.Random;
+import java.util.function.Function;
+
+import javax.annotation.Nonnull;
+
+import com.minelittlepony.unicopia.SpeciesList;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.LeavesBlock;
+import net.minecraft.block.Material;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.DyeItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.util.DyeColor;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.biome.Biome.TemperatureGroup;
+
+public class FruitLeavesBlock extends LeavesBlock implements IColourful {
+
+    public static final BooleanProperty HEAVY = BooleanProperty.of("heavy");
+
+    private boolean hardy;
+
+    private int baseGrowthChance;
+    private int customTint;
+
+    private Function<World, ItemStack> fruitProducer = w -> ItemStack.EMPTY;
+    private Function<World, ItemStack> compostProducer = w -> ItemStack.EMPTY;
+
+    public FruitLeavesBlock() {
+        super(FabricBlockSettings.of(Material.LEAVES)
+                .strength(0.2F, 0.2F)
+                .ticksRandomly()
+                .sounds(BlockSoundGroup.GRASS)
+                .build()
+        );
+
+        setDefaultState(stateFactory.getDefaultState()
+            .with(HEAVY, false)
+            .with(DISTANCE, 7)
+            .with(PERSISTENT, false)
+        );
+    }
+
+    public FruitLeavesBlock hardy(boolean value) {
+        hardy = value;
+        return this;
+    }
+
+    public FruitLeavesBlock fruit(@Nonnull Function<World, ItemStack> producer) {
+        fruitProducer = producer;
+        return this;
+    }
+
+    public FruitLeavesBlock compost(@Nonnull Function<World, ItemStack> producer) {
+        compostProducer = producer;
+        return this;
+    }
+
+    public FruitLeavesBlock growthChance(int chance) {
+        baseGrowthChance = chance;
+        return this;
+    }
+
+    public FruitLeavesBlock tint(int tint) {
+        customTint = tint;
+        return this;
+    }
+
+    @Override
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        ItemStack stack = player.getStackInHand(hand);
+
+        if (SpeciesList.instance().getPlayer(player).getSpecies().canUseEarth()) {
+            if (stack.isEmpty()) {
+
+                if (state.get(HEAVY)) {
+                    dropContents(world, pos, state, 0);
+                }
+            } else if (stack.getItem() instanceof DyeItem && ((DyeItem)stack.getItem()).getColor() == DyeColor.WHITE) {
+                if (!state.get(HEAVY)) {
+                    world.setBlockState(pos, state.with(HEAVY, true));
+
+                    if (!world.isClient) {
+                        world.playGlobalEvent(2005, pos, 0);
+                    }
+
+                    if (!player.abilities.creativeMode) {
+                        stack.decrement(1);
+                    }
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random rand) {
+        if (!world.isClient && world.isBlockLoaded(pos) && !state.get(PERSISTENT)) {
+            int growthChance = getGrowthChance(world, pos, state);
+
+            if (!state.get(HEAVY) && (growthChance <= 0 || rand.nextInt(growthChance) == 0)) {
+                world.setBlockState(pos, state.with(HEAVY, true));
+            } else {
+                growthChance /= 10;
+
+                if (state.get(HEAVY) && (growthChance <= 0 || rand.nextInt(growthChance) == 0)) {
+                    dropContents(world, pos, state, 0);
+                } else {
+                    super.onScheduledTick(state, world, pos, rand);
+                }
+            }
+        }
+    }
+
+    protected int getGrowthChance(World world, BlockPos pos, BlockState state) {
+        int chance = baseGrowthChance;
+
+        if (!hardy && !world.isDaylight()) {
+            chance *= 40;
+        }
+
+        if (world.getLightLevel(pos) >= 4) {
+            chance /= 3;
+        }
+
+        TemperatureGroup temp = world.getBiome(pos).getTemperatureGroup();
+
+        if (!hardy && temp == TemperatureGroup.COLD) {
+            chance *= 1000;
+        }
+
+        if (temp == TemperatureGroup.WARM) {
+            chance /= 100;
+        }
+
+        if (temp == TemperatureGroup.MEDIUM) {
+            chance /= 50;
+        }
+
+        return chance;
+    }
+
+    @Override
+    public int getCustomTint(BlockState state, int tint) {
+        return customTint;
+    }
+
+    protected void dropContents(World world, BlockPos pos, BlockState state, int chance) {
+        Function<World, ItemStack> fruit = world.random.nextInt(40) == 0 ? compostProducer : fruitProducer;
+        dropStack(world, pos, fruit.apply(world));
+
+        world.playSound(null, pos, SoundEvents.ENTITY_ITEM_FRAME_PLACE, SoundCategory.BLOCKS, 0.3F, 1);
+        world.setBlockState(pos, state.with(HEAVY, false));
+    }
+
+    @Override
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        super.appendProperties(builder);
+        builder.add(HEAVY);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/GlowingGemBlock.java b/src/main/java/com/minelittlepony/unicopia/block/GlowingGemBlock.java
new file mode 100644
index 00000000..62144b8a
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/GlowingGemBlock.java
@@ -0,0 +1,194 @@
+package com.minelittlepony.unicopia.block;
+
+import java.util.Random;
+import com.minelittlepony.unicopia.CloudType;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.block.TorchBlock;
+import net.minecraft.entity.EntityContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.BooleanProperty;
+import net.minecraft.state.property.Properties;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.World;
+
+public class GlowingGemBlock extends TorchBlock implements ICloudBlock {
+
+    public static BooleanProperty ON = BooleanProperty.of("on");
+
+    private static final double A = 5/16D;
+    private static final double B = 6/16D;
+
+    private static final double C = 10/16D;
+
+    // tiltedOffWall
+    private static final double F = 10/16D;
+
+    // tiltedMinY
+    private static final double E = 3/16D;
+
+    protected static final VoxelShape STANDING_AABB = VoxelShapes.cuboid(new Box(
+            7/16D, 0, 7/16D,
+            9/16D, 1, 9/16D
+    ));
+    protected static final VoxelShape TORCH_NORTH_AABB = VoxelShapes.cuboid(new Box(B, E, F, C, 1, 1));
+    protected static final VoxelShape TORCH_SOUTH_AABB = VoxelShapes.cuboid(new Box(B, E, 0, C, 1, A));
+    protected static final VoxelShape TORCH_WEST_AABB  = VoxelShapes.cuboid(new Box(F, E, B, 1, 1, C));
+    protected static final VoxelShape TORCH_EAST_AABB  = VoxelShapes.cuboid(new Box(0, E, B, A, 1, C));
+
+    public GlowingGemBlock(String domain, String name) {
+        super(FabricBlockSettings.of(Material.PART)
+                .noCollision()
+                .strength(0, 0)
+                .ticksRandomly()
+                .lightLevel(1)
+                .sounds(BlockSoundGroup.GLASS)
+                .build()
+        );
+        setDefaultState(stateFactory.getDefaultState()
+                .with(Properties.FACING, Direction.UP)
+                .with(ON, true)
+        );
+    }
+
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView source, BlockPos pos, EntityContext context) {
+        switch (state.get(Properties.FACING)) {
+            case EAST: return TORCH_EAST_AABB;
+            case WEST: return TORCH_WEST_AABB;
+            case SOUTH: return TORCH_SOUTH_AABB;
+            case NORTH: return TORCH_NORTH_AABB;
+            default: return STANDING_AABB;
+        }
+    }
+
+    @Override
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+
+        if (!state.get(ON)) {
+            ItemStack held = player.getStackInHand(hand);
+            if (!held.isEmpty() && (held.getItem() == Items.FLINT_AND_STEEL || held.getItem() == Items.FIRE_CHARGE)) {
+
+                world.playSound(null, pos, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
+                world.setBlockState(pos, state.with(ON, true));
+
+                if (held.getItem() == Items.FLINT_AND_STEEL) {
+                    held.damage(1, player, p -> p.sendToolBreakStatus(hand));
+                } else if (!player.abilities.creativeMode) {
+                    held.decrement(1);
+                }
+            }
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) {
+        Direction facing = state.get(Properties.FACING);
+
+        double x = pos.getX() + 0.5;
+        double y = pos.getY() + 1;
+        double z = pos.getZ() + 0.5;
+
+        double drop = 0.22D;
+        double variance = 0.27D;
+
+        if (facing.getAxis().isHorizontal()) {
+            facing = facing.getOpposite();
+
+            x += variance * facing.getOffsetX();
+            y += drop;
+            z += variance * facing.getOffsetZ();
+        }
+
+        if (state.get(ON)) {
+            for (int i = 0; i < 3; i++) {
+                // TODO:
+               // ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false,
+               //         x - 0.3, y - 0.3, z - 0.3,
+               //         rand.nextFloat(), rand.nextFloat(), rand.nextFloat());
+            }
+        } else {
+            world.addParticle(ParticleTypes.SMOKE, x, y, z, 0, 0, 0);
+        }
+    }
+
+    @Override
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random random) {
+        if (world.hasRain(pos)) {
+            if (state.get(ON)) {
+                world.playSound(null, pos, SoundEvents.BLOCK_REDSTONE_TORCH_BURNOUT, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
+                world.setBlockState(pos, state.with(ON, false));
+            }
+        } else {
+            if (!state.get(ON)) {
+                world.playSound(null, pos, SoundEvents.ITEM_FLINTANDSTEEL_USE, SoundCategory.BLOCKS, 0.5F, 2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
+                world.setBlockState(pos, state.with(ON, true));
+            }
+        }
+    }
+
+    @Override
+    public int getStrongRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction side) {
+        return state.get(ON) && side == Direction.DOWN ? state.getWeakRedstonePower(world, pos, side) : 0;
+    }
+
+    @Override
+    public int getWeakRedstonePower(BlockState state, BlockView world, BlockPos pos, Direction side) {
+        return state.get(ON) && state.get(Properties.FACING) != side ? 12 : 0;
+    }
+
+    @Override
+    public CloudType getCloudMaterialType(BlockState blockState) {
+        return CloudType.ENCHANTED;
+    }
+
+    // TODO: this is a loot table now
+    /*@Override
+    public List<ItemStack> getDroppedStacks(BlockState state, LootContext.Builder context) {
+
+        Random rand = context.world instanceof World ? ((World)world).random : random;
+
+        if (rand.nextInt(10) == 0) {
+            drops.add(new ItemStack(UItems.spell));
+        } else {
+            drops.add(new ItemStack(UItems.curse));
+        }
+
+        return drops;
+    }*/
+
+    @Override
+    public int getLuminance(BlockState state) {
+        if (state.get(ON)) {
+            return super.getLuminance(state);
+        }
+
+        return 0;
+    }
+
+    @Override
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        builder.add(Properties.FACING).add(ON);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java b/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java
new file mode 100644
index 00000000..3f6bae64
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/HiveWallBlock.java
@@ -0,0 +1,366 @@
+package com.minelittlepony.unicopia.block;
+
+import java.util.Map;
+import java.util.Random;
+
+import com.google.common.collect.Maps;
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.UMaterials;
+import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.util.PosHelper;
+import com.minelittlepony.util.shape.IShape;
+import com.minelittlepony.util.shape.Sphere;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.FallingBlock;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.FallingBlockEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemPlacementContext;
+import net.minecraft.particle.BlockStateParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.state.StateFactory;
+import net.minecraft.state.property.EnumProperty;
+import net.minecraft.util.Hand;
+import net.minecraft.util.StringIdentifiable;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.ViewableWorld;
+import net.minecraft.world.World;
+
+public class HiveWallBlock extends FallingBlock {
+
+    public static final EnumProperty<State> STATE = EnumProperty.of("state", State.class);
+    public static final EnumProperty<Axis> AXIS = EnumProperty.of("axis", Axis.class);
+
+    private static final IShape shape = new Sphere(false, 1.5);
+
+    public HiveWallBlock(String domain, String name) {
+        super(FabricBlockSettings.of(UMaterials.hive)
+                .noCollision()
+                .strength(10, 10)
+                .hardness(2)
+                .ticksRandomly()
+                .lightLevel(1)
+                .sounds(BlockSoundGroup.SAND)
+                .build()
+        );
+        setDefaultState(stateFactory.getDefaultState()
+                .with(STATE, State.GROWING).with(AXIS, Axis.Y)
+        );
+
+        // TODO:
+       // setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
+       // setHarvestLevel("pickaxe", 1);
+    }
+
+    @Override
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random rand) {
+
+        if (rand.nextInt(300) == 0) {
+            world.playSound(null, pos, USounds.INSECT, SoundCategory.BLOCKS, 1, 1);
+        }
+
+        State type = getState(state);
+
+        Axis axis = getAxis(state);
+
+        int matchedNeighbours = countNeighbours(world, pos);
+
+        if (type == State.GROWING) {
+            if (testForAxis(world, pos, axis)) {
+                world.setBlockState(pos, state.with(STATE, State.STABLE));
+            } else {
+                Axis newAxis = axis;
+
+                for (Axis i : Axis.VALUES) {
+                    if (testForAxis(world, pos, i)) {
+                        newAxis = i;
+                        break;
+                    }
+                }
+
+                if (newAxis != axis) {
+                    world.setBlockState(pos, state.with(AXIS, newAxis).with(STATE, State.STABLE));
+                } else if (rand.nextInt(10) == 0) {
+                    Direction facing = axis.randomFacing(rand);
+
+                    BlockPos other = pos.offset(facing);
+
+                    if (canSpreadInto(world, other, axis)) {
+                        world.playSound(null, pos, USounds.SLIME_RETRACT, SoundCategory.BLOCKS, 1, 1);
+                        world.setBlockState(other, state);
+                        world.setBlockState(pos, state.with(STATE, State.STABLE));
+                    }
+                }
+            }
+        } else if (type == State.DYING) {
+            if (matchedNeighbours > 1 && matchedNeighbours < 17) {
+                world.setBlockState(pos, state.with(STATE, State.STABLE));
+            } else {
+                die(world, pos, rand);
+            }
+        } else {
+
+            if (pos.getX() % 3 == 0 && pos.getZ() % 4 == 0 && isEmptySpace(world, pos.down()) && UBlocks.cuccoon.canPlaceBlockAt(world, pos.down())) {
+                world.setBlockState(pos.down(), UBlocks.cuccoon.getDefaultState());
+            } else if (!testForAxis(world, pos, axis)) {
+                world.setBlockState(pos, state.with(STATE, State.GROWING));
+            } else if (matchedNeighbours >= 27) {
+                world.setBlockState(pos, state.with(STATE, State.DYING));
+            } else {
+                return;
+            }
+        }
+
+        world.getBlockTickScheduler().schedule(pos, this, getTickRate(world));
+    }
+
+    public State getState(BlockState state) {
+        return state.get(STATE);
+    }
+
+    public Axis getAxis(BlockState state) {
+        return state.get(AXIS);
+    }
+
+    @Override
+    public void onBlockAdded(BlockState state, World world, BlockPos pos, BlockState oldState, boolean uuuuh) {
+        if (state.get(STATE) != State.STABLE) {
+            super.onBlockAdded(state, world, pos, oldState, uuuuh);
+        }
+    }
+
+    @Override
+    public int getTickRate(ViewableWorld view) {
+       return 10;
+    }
+
+    protected boolean testForAxis(World world, BlockPos pos, Axis axis) {
+        return !PosHelper.some(pos, p -> isEmptySpace(world, p), axis.getFacings());
+    }
+
+    protected boolean isEmptySpace(World world, BlockPos pos) {
+
+        if (world.isAir(pos)) {
+            return true;
+        }
+
+        BlockState state = world.getBlockState(pos);
+
+        return !(state.getMaterial().isLiquid()
+                || state.isFullOpaque(world, pos)
+                || state.isOpaque());
+    }
+
+    protected void die(World world, BlockPos pos, Random rand) {
+        world.breakBlock(pos, false);
+
+        PosHelper.all(pos, p -> {
+            BlockState s = world.getBlockState(p);
+
+            if (s.getBlock() == this) {
+                notifyDying(world, p, s, rand);
+            }
+        }, Direction.values());
+    }
+
+    protected void notifyDying(World world, BlockPos pos, BlockState state, Random rand) {
+        State oldState = state.get(STATE);
+        State newState = oldState.downGrade();
+
+        if (newState != oldState) {
+            world.setBlockState(pos, state.with(STATE, newState));
+        }
+    }
+
+    @Override
+    public void onSteppedOn(World world, BlockPos pos, Entity entity) {
+        if (entity instanceof PlayerEntity) {
+            IPlayer player = SpeciesList.instance().getPlayer((PlayerEntity)entity);
+
+            if (player.getSpecies() != Race.CHANGELING && !world.isClient) {
+                if (((isEmptySpace(world, pos.down()) || canFallThrough(world.getBlockState(pos.down()))) && pos.getY() >= 0)) {
+                    FallingBlockEntity faller = new FallingBlockEntity(world, pos.getX() + 0.5D, pos.getY(), pos.getZ() + 0.5D, world.getBlockState(pos));
+                    configureFallingBlockEntity(faller);
+                    world.spawnEntity(faller);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onLanding(World world, BlockPos pos, BlockState fallingState, BlockState hitState) {
+        world.breakBlock(pos, true);
+    }
+
+    @Override
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+
+        if (hand == Hand.MAIN_HAND && player.getStackInHand(hand).isEmpty()) {
+            IPlayer iplayer = SpeciesList.instance().getPlayer(player);
+
+            if (iplayer.getSpecies() == Race.CHANGELING) {
+                retreat(world, pos);
+
+                PosHelper.adjacentNeighbours(pos).forEach(p -> {
+                    if (world.getBlockState(p).getBlock() == this) {
+                        retreat(world, p);
+                    }
+                });
+
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public BlockState getPlacementState(ItemPlacementContext context) {
+        return getDefaultState().with(AXIS, Axis.fromVanilla(context.getPlayerFacing().getAxis()));
+    }
+
+    @Override
+    public void randomDisplayTick(BlockState state, World world, BlockPos pos, Random rand) {
+        if (rand.nextInt(16) == 0) {
+            Vec3d vel = shape.computePoint(rand);
+            Vec3d vec = vel.add(pos.getX(), pos.getY(), pos.getZ());
+
+            world.addParticle(new BlockStateParticleEffect(ParticleTypes.BLOCK, state), vec.x, vec.y, vec.z, vel.x, vel.y, vel.z);
+        }
+    }
+
+    public void retreat(World world, BlockPos pos) {
+        world.setBlockState(pos, Blocks.AIR.getDefaultState());
+        world.playSound(null, pos, USounds.SLIME_RETRACT, SoundCategory.BLOCKS, 1, 1);
+    }
+
+    protected int countNeighbours(World world, BlockPos pos) {
+        int count = 0;
+        for (BlockPos i : BlockPos.iterate(pos.add(-1, -1, -1), pos.add(1, 1, 1))) {
+            if (world.getBlockState(i).getBlock() == this) {
+                count++;
+            }
+        }
+
+        return count;
+    }
+
+    protected boolean exposed(World world, BlockPos pos) {
+        return PosHelper.some(pos, p -> isEmptySpace(world, p), Direction.values());
+    }
+
+    protected boolean canSpreadInto(World world, BlockPos pos, Axis axis) {
+        if (world.isBlockLoaded(pos) && isEmptySpace(world, pos)) {
+            boolean one = false;
+
+            for (Direction facing : axis.getFacings()) {
+                BlockPos op = pos.offset(facing);
+
+                if (world.getBlockState(op).getMaterial() == UMaterials.hive) {
+                    if (one) {
+                        return true;
+                    }
+
+                    one = true;
+                }
+            }
+
+        }
+
+        return false;
+    }
+
+    @Override
+    protected void appendProperties(StateFactory.Builder<Block, BlockState> builder) {
+        builder.add(STATE).add(AXIS);
+    }
+
+    public enum State implements StringIdentifiable {
+        GROWING,
+        STABLE,
+        DYING;
+
+        static final State[] VALUES = values();
+
+        @Override
+        public String toString() {
+            return asString();
+        }
+
+        @Override
+        public String asString() {
+            return name().toLowerCase();
+        }
+
+        public State upgrade() {
+            switch (this) {
+                case DYING: return STABLE;
+                default: return GROWING;
+            }
+        }
+
+        public State downGrade() {
+            switch (this) {
+                case GROWING: return STABLE;
+                default: return DYING;
+            }
+        }
+    }
+
+    public enum Axis implements StringIdentifiable {
+        X(Direction.Axis.X, Direction.EAST, Direction.WEST, Direction.UP, Direction.DOWN),
+        Y(Direction.Axis.Y, Direction.EAST, Direction.WEST, Direction.NORTH, Direction.SOUTH),
+        Z(Direction.Axis.Z, Direction.NORTH, Direction.SOUTH, Direction.UP, Direction.DOWN);
+
+        static final Axis[] VALUES = values();
+        static final Map<Direction.Axis, Axis> AXIS_MAP = Maps.newEnumMap(Direction.Axis.class);
+
+        private final Direction.Axis vanilla;
+        private final Direction[] facings;
+
+        static {
+            for (Axis i : VALUES) {
+                AXIS_MAP.put(i.vanilla, i);
+            }
+        }
+
+        Axis(Direction.Axis vanilla, Direction... facings) {
+            this.vanilla = vanilla;
+            this.facings = facings;
+        }
+
+        @Override
+        public String toString() {
+            return asString();
+        }
+
+        @Override
+        public String asString() {
+            return name().toLowerCase();
+        }
+
+        public Direction randomFacing(Random rand) {
+            return facings[rand.nextInt(facings.length)];
+        }
+
+        public Direction[] getFacings() {
+            return facings;
+        }
+
+        public static Axis fromVanilla(Direction.Axis axis) {
+            return AXIS_MAP.get(axis);
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/ICloudBlock.java b/src/main/java/com/minelittlepony/unicopia/block/ICloudBlock.java
index ab7e682e..9b9ccaa5 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/ICloudBlock.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/ICloudBlock.java
@@ -3,32 +3,31 @@ package com.minelittlepony.unicopia.block;
 import com.minelittlepony.unicopia.CloudType;
 import com.minelittlepony.unicopia.Predicates;
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
+import net.minecraft.block.BedBlock;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockBed;
-import net.minecraft.block.BlockChest;
-import net.minecraft.block.BlockFalling;
-import net.minecraft.block.BlockTorch;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.ChestBlock;
+import net.minecraft.block.FallingBlock;
+import net.minecraft.block.TorchBlock;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
 public interface ICloudBlock {
 
-    CloudType getCloudMaterialType(IBlockState blockState);
+    CloudType getCloudMaterialType(BlockState blockState);
 
-    default boolean handleRayTraceSpecialCases(World world, BlockPos pos, IBlockState state) {
-        if (world.isRemote) {
-            EntityPlayer player = UClient.instance().getPlayer();
+    default boolean handleRayTraceSpecialCases(World world, BlockPos pos, BlockState state) {
+        if (world.isClient) {
+            PlayerEntity player = UClient.instance().getPlayer();
 
-            if (player.capabilities.isCreativeMode) {
+            if (player.abilities.creativeMode) {
                 return false;
             }
 
@@ -38,20 +37,21 @@ public interface ICloudBlock {
 
             CloudType type = getCloudMaterialType(state);
 
-            ItemStack main = player.getHeldItemMainhand();
+            ItemStack main = player.getMainHandStack();
             if (main.isEmpty()) {
-                main = player.getHeldItemOffhand();
+                main = player.getOffHandStack();
             }
 
-            if (!main.isEmpty() && main.getItem() instanceof ItemBlock) {
-                Block block = ((ItemBlock)main.getItem()).getBlock();
+            if (!main.isEmpty() && main.getItem() instanceof BlockItem) {
+                Block block = ((BlockItem)main.getItem()).getBlock();
+                BlockState heldState = block.getDefaultState();
 
-                if (block == null || block == Blocks.AIR) {
+                if (block == null || block.isAir(heldState)) {
                     return false;
                 }
 
                 if (block instanceof ICloudBlock) {
-                    CloudType other = ((ICloudBlock)block).getCloudMaterialType(block.getDefaultState());
+                    CloudType other = ((ICloudBlock)block).getCloudMaterialType(heldState);
 
                     if (other.canInteract(player)) {
                         return false;
@@ -72,14 +72,14 @@ public interface ICloudBlock {
     }
 
     default boolean isPlacementExcempt(Block block) {
-        return block instanceof BlockTorch
-            || block instanceof BlockBed
-            || block instanceof BlockChest;
+        return block instanceof TorchBlock
+            || block instanceof BedBlock
+            || block instanceof ChestBlock;
     }
 
     default boolean applyLanding(Entity entity, float fallDistance) {
         if (!entity.isSneaking()) {
-            entity.fall(fallDistance, 0);
+            entity.handleFallDamage(fallDistance, 0);
 
             return false;
         }
@@ -88,12 +88,17 @@ public interface ICloudBlock {
     }
 
     default boolean applyRebound(Entity entity) {
-        if (!entity.isSneaking() && entity.motionY < 0) {
-            if (Math.abs(entity.motionY) >= 0.25) {
-                entity.motionY = -entity.motionY * 1.2;
+
+        Vec3d vel = entity.getVelocity();
+        double y = vel.y;
+
+        if (!entity.isSneaking() && y < 0) {
+            if (Math.abs(y) >= 0.25) {
+                y = -y * 1.2;
             } else {
-                entity.motionY = 0;
+                y = 0;
             }
+            entity.setVelocity(vel.x, y, vel.z);
 
             return true;
         }
@@ -101,13 +106,17 @@ public interface ICloudBlock {
         return false;
     }
 
-    default boolean applyBouncyness(IBlockState state, Entity entity) {
+    default boolean applyBouncyness(BlockState state, Entity entity) {
         if (getCanInteract(state, entity)) {
-            if (!entity.isSneaking() && Math.abs(entity.motionY) >= 0.25) {
-                entity.motionY += 0.0155 * (entity.fallDistance < 1 ? 1 : entity.fallDistance);
+            Vec3d vel = entity.getVelocity();
+            double y = vel.y;
+
+            if (!entity.isSneaking() && Math.abs(y) >= 0.25) {
+                y += 0.0155 * (entity.fallDistance < 1 ? 1 : entity.fallDistance);
             } else {
-                entity.motionY = 0;
+                y = 0;
             }
+            entity.setVelocity(vel.x, y, vel.z);
 
             return true;
         }
@@ -116,9 +125,9 @@ public interface ICloudBlock {
     }
 
 
-    default boolean getCanInteract(IBlockState state, Entity e) {
+    default boolean getCanInteract(BlockState state, Entity e) {
         if (getCloudMaterialType(state).canInteract(e)) {
-            if (e instanceof EntityItem) {
+            if (e instanceof ItemEntity) {
                 // @FUF(reason = "There is no TickEvents.EntityTickEvent. Waiting on mixins...")
                 e.setNoGravity(true);
             }
@@ -128,7 +137,7 @@ public interface ICloudBlock {
         return false;
     }
 
-    default boolean isDense(IBlockState blockState) {
+    default boolean isDense(BlockState blockState) {
         return getCloudMaterialType(blockState) != CloudType.NORMAL;
     }
 
@@ -139,14 +148,15 @@ public interface ICloudBlock {
      * @param pos   The current position
      *
      * @return True to allow blocks to pass.
+     *
+     * @fuf Hacked until we can get mixins to implement a proper hook
      */
-    @FUF(reason = "Hacked until we can get mixins to implement a proper hook")
-    default boolean allowsFallingBlockToPass(IBlockState state, IBlockAccess world, BlockPos pos) {
+    default boolean allowsFallingBlockToPass(BlockState state, BlockView world, BlockPos pos) {
         if (isDense(state)) {
             return false;
         }
 
         Block above = world.getBlockState(pos.up()).getBlock();
-        return !(above instanceof ICloudBlock) && above instanceof BlockFalling;
+        return !(above instanceof ICloudBlock) && above instanceof FallingBlock;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/IColourful.java b/src/main/java/com/minelittlepony/unicopia/block/IColourful.java
index a413a9c7..540daf46 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/IColourful.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/IColourful.java
@@ -1,8 +1,8 @@
 package com.minelittlepony.unicopia.block;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 
 @FunctionalInterface
 public interface IColourful {
-    int getCustomTint(IBlockState state, int tint);
+    int getCustomTint(BlockState state, int tint);
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/ITillable.java b/src/main/java/com/minelittlepony/unicopia/block/ITillable.java
index 57d7750f..8c1ccd54 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/ITillable.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/ITillable.java
@@ -2,8 +2,8 @@ package com.minelittlepony.unicopia.block;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -16,9 +16,9 @@ public interface ITillable {
      * Gets the farmland/tilled state for this block when attacked by a hoe.
      */
     @Nonnull
-    IBlockState getFarmlandState(ItemStack hoe, EntityPlayer player, World world, IBlockState state, BlockPos pos);
+    BlockState getFarmlandState(ItemStack hoe, PlayerEntity player, World world, BlockState state, BlockPos pos);
 
-    default boolean canBeTilled(ItemStack hoe, EntityPlayer player, World world, IBlockState state, BlockPos pos) {
-        return world.isAirBlock(pos.up());
+    default boolean canBeTilled(ItemStack hoe, PlayerEntity player, World world, BlockState state, BlockPos pos) {
+        return world.isAir(pos.up());
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/ITreeGen.java b/src/main/java/com/minelittlepony/unicopia/block/ITreeGen.java
index a1434916..47b536c2 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/ITreeGen.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/ITreeGen.java
@@ -1,12 +1,11 @@
 package com.minelittlepony.unicopia.block;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.world.World;
-import net.minecraft.world.gen.feature.WorldGenAbstractTree;
 
 @FunctionalInterface
 public interface ITreeGen {
-    WorldGenAbstractTree getTreeGen(World world, IBlockState state, boolean massive);
+    WorldGenAbstractTree getTreeGen(World world, BlockState state, boolean massive);
 
     default boolean canGrowMassive() {
         return false;
diff --git a/src/main/java/com/minelittlepony/unicopia/block/SlimeLayerBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SlimeLayerBlock.java
new file mode 100644
index 00000000..7294011b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/SlimeLayerBlock.java
@@ -0,0 +1,43 @@
+package com.minelittlepony.unicopia.block;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.BlockRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
+import net.minecraft.block.MaterialColor;
+import net.minecraft.block.SnowBlock;
+import net.minecraft.entity.Entity;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public class SlimeLayerBlock extends SnowBlock {
+
+    public SlimeLayerBlock(String domain, String name) {
+        super(FabricBlockSettings.of(Material.CLAY)
+                .sounds(BlockSoundGroup.SLIME)
+                .materialColor(MaterialColor.GRASS)
+                .build()
+        );
+
+        // TODO:
+        // drops Items.SLIME_BALL x1
+        // setCreativeTab(CreativeTabs.DECORATIONS);
+    }
+
+    @Override
+    public BlockRenderLayer getRenderLayer() {
+        return BlockRenderLayer.TRANSLUCENT;
+    }
+
+    @Override
+    public void onSteppedOn(World world, BlockPos pos, Entity entity) {
+        float factor = getMotionFactor(world.getBlockState(pos));
+
+        entity.setVelocity(entity.getVelocity().multiply(factor));
+    }
+
+    protected float getMotionFactor(BlockState state) {
+        return 1/state.get(LAYERS);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/StickBlock.java b/src/main/java/com/minelittlepony/unicopia/block/StickBlock.java
new file mode 100644
index 00000000..3f562abc
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/StickBlock.java
@@ -0,0 +1,81 @@
+package com.minelittlepony.unicopia.block;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FarmlandBlock;
+import net.minecraft.block.Material;
+import net.minecraft.entity.EntityContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.item.LeadItem;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.shape.VoxelShape;
+import net.minecraft.util.shape.VoxelShapes;
+import net.minecraft.world.BlockView;
+import net.minecraft.world.ViewableWorld;
+import net.minecraft.world.World;
+
+public class StickBlock extends Block {
+
+    static final VoxelShape BOUNDING_BOX = VoxelShapes.cuboid(new Box(
+            7/16F, -1/16F, 7/16F,
+            9/16F, 15/16F, 9/16F
+    ));
+
+    public StickBlock(String domain, String name) {
+        super(FabricBlockSettings.of(Material.PLANT)
+                .noCollision()
+                .strength(0.2F, 0.2F)
+                .ticksRandomly()
+                .lightLevel(1)
+                .sounds(BlockSoundGroup.WOOD)
+                .build()
+        );
+
+        // TODO:
+        // drops Items.STICK x1
+    }
+
+    @Override
+    public BlockRenderLayer getRenderLayer() {
+        return BlockRenderLayer.TRANSLUCENT;
+    }
+
+    @Deprecated
+    @Override
+    public VoxelShape getOutlineShape(BlockState state, BlockView source, BlockPos pos, EntityContext context) {
+        Vec3d off = state.getOffsetPos(source, pos);
+        return BOUNDING_BOX.offset(off.x, off.y, off.z);
+    }
+
+    @Override
+    public Block.OffsetType getOffsetType() {
+        return Block.OffsetType.XZ;
+    }
+
+    @Override
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
+        if (!world.isClient) {
+            return LeadItem.attachHeldMobsToBlock(player, world, pos);
+        }
+
+        ItemStack stack = player.getStackInHand(hand);
+
+        return stack.getItem() == Items.LEAD || stack.isEmpty();
+    }
+
+    @Override
+    public boolean canPlaceAt(BlockState state, ViewableWorld world, BlockPos pos) {
+        Block block = state.getBlock();
+
+        return block instanceof StickBlock || block instanceof FarmlandBlock;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/SugarBlock.java b/src/main/java/com/minelittlepony/unicopia/block/SugarBlock.java
new file mode 100644
index 00000000..64392f93
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/block/SugarBlock.java
@@ -0,0 +1,21 @@
+package com.minelittlepony.unicopia.block;
+
+import net.fabricmc.fabric.api.block.FabricBlockSettings;
+import net.minecraft.block.FallingBlock;
+import net.minecraft.block.Material;
+import net.minecraft.sound.BlockSoundGroup;
+
+public class SugarBlock extends FallingBlock {
+    public SugarBlock(String domain, String name) {
+        super(FabricBlockSettings.of(Material.SAND)
+                .strength(10, 10)
+                .hardness(0.7F)
+                .sounds(BlockSoundGroup.SAND)
+                .build()
+        );
+        // setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
+        //TODO:
+        // Loot table drops:
+        // // Items.SUGAR x 9;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UDoor.java b/src/main/java/com/minelittlepony/unicopia/block/UDoor.java
index fd401999..34d69003 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UDoor.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/UDoor.java
@@ -8,20 +8,21 @@ import javax.annotation.Nullable;
 import com.minelittlepony.util.WorldEvent;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockDoor;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Items;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.DoorBlock;
+import net.minecraft.block.Material;
+import net.minecraft.block.enums.DoubleBlockHalf;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.item.Items;
+import net.minecraft.util.Hand;
+import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
-public abstract class UDoor extends BlockDoor {
+public abstract class UDoor extends DoorBlock {
 
     private final Supplier<Item> theItem;
 
@@ -40,12 +41,12 @@ public abstract class UDoor extends BlockDoor {
     }
 
     @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
+    public Item getItemDropped(BlockState state, Random rand, int fortune) {
         return state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER ? Items.AIR : getItem();
     }
 
     @Override
-    public ItemStack getItem(World world, BlockPos pos, IBlockState state) {
+    public ItemStack getItem(World world, BlockPos pos, BlockState state) {
         return new ItemStack(getItem());
     }
 
@@ -62,33 +63,33 @@ public abstract class UDoor extends BlockDoor {
     }
 
     @Override
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+    public boolean activate(BlockState state, World world, BlockPos pos, PlayerEntity player, Hand hand, BlockHitResult hit) {
         return toggleDoor(world, pos, false, true, player);
     }
 
     @Override
-    public void toggleDoor(World world, BlockPos pos, boolean open) {
+    public void setOpen(World world, BlockPos pos, boolean open) {
         toggleDoor(world, pos, open, false, null);
     }
 
     protected boolean isLockable() {
-        return material == Material.IRON;
+        return material == Material.METAL;
     }
 
     protected boolean canBePowered() {
         return true;
     }
 
-    protected boolean canOpen(@Nullable EntityPlayer player) {
-        return player == null || material != Material.IRON;
+    protected boolean canOpen(@Nullable PlayerEntity player) {
+        return player == null || material != Material.METAL;
     }
 
-    protected boolean toggleDoor(World world, BlockPos pos, boolean open, boolean force, @Nullable EntityPlayer player) {
+    protected boolean toggleDoor(World world, BlockPos pos, boolean open, boolean force, @Nullable PlayerEntity player) {
         if (!canOpen(player)) {
             return false;
         }
 
-        IBlockState state = world.getBlockState(pos);
+        BlockState state = world.getBlockState(pos);
 
         if (state.getBlock() != this) {
             return false;
@@ -96,17 +97,17 @@ public abstract class UDoor extends BlockDoor {
 
         BlockPos lower = getPrimaryDoorPos(state, pos);
 
-        IBlockState mainDoor = pos == lower ? state : world.getBlockState(lower);
+        BlockState mainDoor = pos == lower ? state : world.getBlockState(lower);
 
         if (mainDoor.getBlock() != this) {
             return false;
         }
 
-        if (!force && mainDoor.getValue(OPEN) == open) {
+        if (!force && mainDoor.get(OPEN) == open) {
             return false;
         }
 
-        state = mainDoor.cycleProperty(OPEN);
+        state = mainDoor.cycle(OPEN);
 
         world.setBlockState(lower, state, 10);
 
@@ -119,22 +120,22 @@ public abstract class UDoor extends BlockDoor {
         return true;
     }
 
-    protected BlockPos getPrimaryDoorPos(IBlockState state, BlockPos pos) {
-        return state.getValue(HALF) == BlockDoor.EnumDoorHalf.LOWER ? pos : pos.down();
+    protected BlockPos getPrimaryDoorPos(BlockState state, BlockPos pos) {
+        return state.get(HALF) == DoubleBlockHalf.LOWER ? pos : pos.down();
     }
 
     @Override
-    public void neighborChanged(IBlockState state, World world, BlockPos pos, Block sender, BlockPos fromPos) {
-        if (state.getValue(HALF) == BlockDoor.EnumDoorHalf.UPPER) {
+    public void neighborUpdate(BlockState state, World world, BlockPos pos, Block sender, BlockPos fromPos, boolean v) {
+        if (state.get(HALF) == DoubleBlockHalf.UPPER) {
             BlockPos lower = pos.down();
 
-            IBlockState lowerDoor = world.getBlockState(lower);
+            BlockState lowerDoor = world.getBlockState(lower);
 
             // pop us off if we don't have a lower door
             if (lowerDoor.getBlock() != this) {
-                world.setBlockToAir(pos);
+                world.breakBlock(pos, true);
             } else if (sender != this) {
-                lowerDoor.neighborChanged(world, lower, sender, fromPos);
+                lowerDoor.neighborUpdate(world, lower, sender, fromPos, v);
             }
 
             return;
@@ -143,41 +144,41 @@ public abstract class UDoor extends BlockDoor {
         boolean destroyed = false;
 
         BlockPos upper = pos.up();
-        IBlockState upperDoor = world.getBlockState(upper);
+        BlockState upperDoor = world.getBlockState(upper);
 
         // pop us off if we don't have an upper door
         if (upperDoor.getBlock() != this) {
-            world.setBlockToAir(pos);
+            world.breakBlock(pos, true);
             destroyed = true;
         }
 
         // pop us off if we don't have support
-        if (!world.getBlockState(pos.down()).isSideSolid(world,  pos.down(), EnumFacing.UP)) {
-            world.setBlockToAir(pos);
+        if (!world.getBlockState(pos.down()).hasSolidTopSurface(world,  pos.down(), null)) {
+            world.breakBlock(pos, true);
 
             destroyed = true;
 
             if (upperDoor.getBlock() == this) {
-                world.setBlockToAir(upper);
+                world.breakBlock(upper, true);
             }
         }
 
         if (destroyed) {
-            if (!world.isRemote) {
+            if (!world.isClient) {
                 dropBlockAsItem(world, pos, state, 0);
             }
         } else if (canBePowered()) {
-            boolean powered = world.isBlockPowered(pos) || world.isBlockPowered(upper);
+            boolean powered = world.isReceivingRedstonePower(pos) || world.isReceivingRedstonePower(upper);
 
-            if (sender != this && (powered || sender.getDefaultState().canProvidePower()) && powered != upperDoor.getValue(POWERED)) {
-                world.setBlockState(upper, upperDoor.withProperty(POWERED, powered), 2);
+            if (sender != this && (powered || sender.getDefaultState().emitsRedstonePower()) && powered != upperDoor.get(POWERED)) {
+                world.setBlockState(upper, upperDoor.with(POWERED, powered), 2);
 
                 if (onPowerStateChanged(world, state, pos, powered)) {
                     world.markBlockRangeForRenderUpdate(pos, upper);
 
                     WorldEvent sound = powered ? getOpenSound() : getCloseSound();
 
-                    world.playEvent(null, sound.getId(), pos, 0);
+                    world.playGlobalEvent(null, sound.getId(), pos, 0);
                 }
             }
         }
@@ -186,9 +187,9 @@ public abstract class UDoor extends BlockDoor {
     /**
      * Called by the lower block when the powered state changes.
      */
-    protected boolean onPowerStateChanged(World world, IBlockState state, BlockPos pos, boolean powered) {
-        if (powered != state.getValue(OPEN)) {
-            world.setBlockState(pos, state.withProperty(OPEN, powered), 2);
+    protected boolean onPowerStateChanged(World world, BlockState state, BlockPos pos, boolean powered) {
+        if (powered != state.get(OPEN)) {
+            world.setBlockState(pos, state.with(OPEN, powered), 2);
 
             return true;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java b/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java
index 45b18ba6..fd892b68 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/UFarmland.java
@@ -5,22 +5,20 @@ import java.util.Random;
 import com.minelittlepony.util.PosHelper;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockFarmland;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.FarmlandBlock;
+import net.minecraft.block.Fertilizable;
+import net.minecraft.block.Material;
 import net.minecraft.entity.Entity;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.Box;
+import net.minecraft.util.math.Direction;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
-import net.minecraftforge.common.EnumPlantType;
-import net.minecraftforge.common.IPlantable;
 
-public abstract class UFarmland extends BlockFarmland {
+public abstract class UFarmland extends FarmlandBlock {
 
     public UFarmland(String domain, String name) {
         setTranslationKey(name);
@@ -30,17 +28,17 @@ public abstract class UFarmland extends BlockFarmland {
     }
 
     @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-        int i = state.getValue(MOISTURE);
+    public void updateTick(World world, BlockPos pos, BlockState state, Random rand) {
+        int i = state.get(MOISTURE);
 
-        if (!hasWater(world, pos) && !world.isRainingAt(pos.up())) {
+        if (!hasWater(world, pos) && !world.hasRain(pos.up())) {
             if (i > 0) {
-                world.setBlockState(pos, state.withProperty(MOISTURE, i - 1), 2);
+                world.setBlockState(pos, state.with(MOISTURE, i - 1), 2);
             } else if (!hasCrops(world, pos)) {
                 turnToDirt(world, pos, state);
             }
         } else if (i < 7) {
-            world.setBlockState(pos, state.withProperty(MOISTURE, 7), 2);
+            world.setBlockState(pos, state.with(MOISTURE, 7), 2);
         }
     }
 
@@ -50,18 +48,18 @@ public abstract class UFarmland extends BlockFarmland {
             turnToDirt(world, pos, world.getBlockState(pos));
         }
 
-        entity.fall(fallDistance, 1);
+        entity.handleFallDamage(fallDistance, 1);
     }
 
     @Override
-    public void neighborChanged(IBlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) {
+    public void neighborChanged(BlockState state, World world, BlockPos pos, Block block, BlockPos fromPos) {
         if (shouldTurnToDirt(world, pos, state)) {
             turnToDirt(world, pos, state);
         }
     }
 
     @Override
-    public void onBlockAdded(World world, BlockPos pos, IBlockState state) {
+    public void onBlockAdded(World world, BlockPos pos, BlockState state) {
         if (shouldTurnToDirt(world, pos, state)) {
             turnToDirt(world, pos, state);
         }
@@ -69,8 +67,8 @@ public abstract class UFarmland extends BlockFarmland {
 
     public boolean hasCrops(World worldIn, BlockPos pos) {
         Block block = worldIn.getBlockState(pos.up()).getBlock();
-        return block instanceof IPlantable
-                && canSustainPlant(worldIn.getBlockState(pos), worldIn, pos, EnumFacing.UP, (IPlantable)block);
+        return block instanceof Fertilizable
+                && canSustainPlant(worldIn.getBlockState(pos), worldIn, pos, Direction.UP, (Fertilizable)block);
     }
 
     public boolean hasWater(World world, BlockPos pos) {
@@ -80,14 +78,14 @@ public abstract class UFarmland extends BlockFarmland {
     }
 
     @Override
-    public boolean canSustainPlant(IBlockState state, IBlockAccess world, BlockPos pos, EnumFacing direction, IPlantable plantable) {
+    public boolean canSustainPlant(BlockState state, BlockView world, BlockPos pos, Direction direction, Fertilizable plantable) {
         return super.canSustainPlant(state, world, pos, direction, plantable)
                 || plantable.getPlantType(world, pos.offset(direction)) == EnumPlantType.Crop;
     }
 
     @Override
-    public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-        IBlockState dirtState = getDroppedState(state);
+    public Item getItemDropped(BlockState state, Random rand, int fortune) {
+        BlockState dirtState = getDroppedState(state);
 
         return dirtState.getBlock().getItemDropped(dirtState, rand, fortune);
     }
@@ -96,47 +94,47 @@ public abstract class UFarmland extends BlockFarmland {
      * Determines if this farmland should be trampled when an entity walks on it.
      */
     public boolean shouldTrample(World world, BlockPos pos, Entity entity, float fallDistance) {
-        return !world.isRemote && entity.canTrample(world, this, pos, fallDistance);
+        return !world.isClient && entity.canTrample(world, this, pos, fallDistance);
     }
 
     /**
      * Determines if this farmland meets all the conditions for turning into dirt.
      */
-    public boolean shouldTurnToDirt(World world, BlockPos pos, IBlockState state) {
+    public boolean shouldTurnToDirt(World world, BlockPos pos, BlockState state) {
         return world.getBlockState(pos.up()).getMaterial().isSolid();
     }
 
     /**
      * Turns this farmland into dirt or its dirt equivalent.
      */
-    public void turnToDirt(World world, BlockPos pos, IBlockState state) {
+    public void turnToDirt(World world, BlockPos pos, BlockState state) {
         world.setBlockState(pos, getDirtState(world, pos, state));
 
-        AxisAlignedBB bounds = getUpdateCollissionBounds(world, pos, state);
+        Box bounds = getUpdateCollissionBounds(world, pos, state);
 
         if (bounds != null) {
             // Update entity positions so they don't fall through the block
-            for (Entity entity : world.getEntitiesWithinAABBExcludingEntity(null, bounds)) {
+            for (Entity entity : world.getEntities(Entity.class, bounds)) {
 
-                double offset = Math.min(bounds.maxY - bounds.minY, bounds.maxY - entity.getEntityBoundingBox().minY);
+                double offset = Math.min(bounds.maxY - bounds.minY, bounds.maxY - entity.getBoundingBox().minY);
 
-                entity.setPositionAndUpdate(entity.posX, entity.posY + offset + 0.001D, entity.posZ);
+                entity.setPosition(entity.x, entity.y + offset + 0.001D, entity.z);
             }
         }
     }
 
-    protected AxisAlignedBB getUpdateCollissionBounds(World world, BlockPos pos, IBlockState state) {
+    protected Box getUpdateCollissionBounds(World world, BlockPos pos, BlockState state) {
         return field_194405_c.offset(pos);
     }
 
-    protected IBlockState getDroppedState(IBlockState state) {
+    protected BlockState getDroppedState(BlockState state) {
         return Blocks.DIRT.getDefaultState();
     }
 
     /**
      * Gets the state used to represent this block as a piece of dirt.
      */
-    protected IBlockState getDirtState(World world, BlockPos pos, IBlockState state) {
+    protected BlockState getDirtState(World world, BlockPos pos, BlockState state) {
         return getDroppedState(state);
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/block/UPot.java b/src/main/java/com/minelittlepony/unicopia/block/UPot.java
index 2f232169..07149169 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/UPot.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/UPot.java
@@ -2,31 +2,14 @@ package com.minelittlepony.unicopia.block;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.util.LenientState;
-
-import net.minecraft.block.BlockFlowerPot;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.FlowerPotBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.tileentity.TileEntityFlowerPot;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.IStringSerializable;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
-public class UPot extends BlockFlowerPot {
-
-    public static final PropertyEnum<Plant> PLANT = PropertyEnum.create("plant", Plant.class);
+public class UPot extends FlowerPotBlock {
 
     public UPot(String domain, String name) {
         setTranslationKey(name);
@@ -35,118 +18,16 @@ public class UPot extends BlockFlowerPot {
         setSoundType(SoundType.STONE);
     }
 
-    public boolean onBlockActivated(World world, BlockPos pos, IBlockState state, EntityPlayer player, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-        ItemStack itemstack = player.getHeldItem(hand);
-        TileEntityFlowerPot tile = getTileEntity(world, pos);
 
-        if (tile == null) {
-            return false;
-        }
-
-        ItemStack current = tile.getFlowerItemStack();
-        IBlockState newState = state;
-
-        if (current.isEmpty()) {
-            Plant contents = getContentType(itemstack);
-
-            if (contents.isEmpty()) {
-                return false;
-            }
-
-            tile.setItemStack(itemstack);
-
-            if (world.getBlockState(pos).getBlock() != this) {
-                newState = getDefaultState().withProperty(PLANT, contents);
-
-                world.setBlockState(pos, newState, 0);
-                tile = getTileEntity(world, pos);
-                tile.setItemStack(itemstack);
-            }
-
-            player.addStat(StatList.FLOWER_POTTED);
-
-            if (!player.capabilities.isCreativeMode) {
-                itemstack.shrink(1);
-            }
-        } else {
-            if (itemstack.isEmpty()) {
-                player.setHeldItem(hand, current);
-            } else if (!player.addItemStackToInventory(current)) {
-                player.dropItem(current, false);
-            }
-
-            tile.setItemStack(ItemStack.EMPTY);
-            world.setBlockState(pos, Blocks.FLOWER_POT.getDefaultState(), 0);
-        }
-
-        tile.markDirty();
-        world.notifyBlockUpdate(pos, state, newState, 3);
-
-        return true;
-    }
-
-    @Nullable
-    protected TileEntityFlowerPot getTileEntity(IBlockAccess world, BlockPos pos) {
-        TileEntity tileentity = world.getTileEntity(pos);
-
-        return tileentity instanceof TileEntityFlowerPot ? (TileEntityFlowerPot)tileentity : null;
-    }
-
-    protected Plant getContentType(ItemStack stack) {
-        for (Plant i : Plant.values()) {
-            if (i.matches(stack)) {
-                return i;
-            }
-        }
-
-        return Plant.EMPTY;
-    }
-
-    public TileEntity createNewTileEntity(World worldIn, int meta) {
-        return new TileEntityFlowerPot(Items.AIR, 0);
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        return new LenientState(this, PLANT);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        return 0;
-    }
-
-    @Override
-    public IBlockState getActualState(IBlockState state, IBlockAccess world, BlockPos pos) {
-        TileEntityFlowerPot tile = getTileEntity(world, pos);
-
-        return state.withProperty(PLANT, tile == null ? Plant.EMPTY : getContentType(tile.getFlowerItemStack()));
-    }
-
-    enum Plant implements IStringSerializable {
+    enum Plant {
         EMPTY("minecraft:air", -1),
         QUILL("minecraft:feather", -1),
         MEADOWBROOK("unicopia:staff_meadow_brook", -1);
 
-        private final int damage;
-        private final ResourceLocation item;
+        public final Identifier item;
 
         Plant(String item, int damage) {
-            this.damage = damage;
-            this.item = new ResourceLocation(item);
-        }
-
-        @Override
-        public String getName() {
-            return name().toLowerCase();
-        }
-
-        public boolean matches(ItemStack stack) {
-            if (damage >= 0 && stack.getItemDamage() != damage) {
-                return false;
-            }
-
-            return !stack.isEmpty() && stack.getItem().getRegistryName().equals(item);
+            this.item = new Identifier(item);
         }
 
         public boolean isEmpty() {
diff --git a/src/main/java/com/minelittlepony/unicopia/block/USapling.java b/src/main/java/com/minelittlepony/unicopia/block/USapling.java
index 9ff54455..4b8b9266 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/USapling.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/USapling.java
@@ -28,7 +28,7 @@ public class USapling extends BlockSapling implements ITreeGen {
         setTranslationKey(name);
         setSoundType(SoundType.PLANT);
 
-        setDefaultState(blockState.getBaseState().withProperty(STAGE, 0));
+        setDefaultState(stateFactory.getDefaultState().with(STAGE, 0));
     }
 
     public USapling setTreeGen(ITreeGen gen) {
@@ -142,7 +142,7 @@ public class USapling extends BlockSapling implements ITreeGen {
 
     @Override
     public IBlockState getStateFromMeta(int meta) {
-        return getDefaultState().withProperty(STAGE, (meta & 8) >> 3);
+        return getDefaultState().with(STAGE, (meta & 8) >> 3);
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/block/USlab.java b/src/main/java/com/minelittlepony/unicopia/block/USlab.java
index 5c1dbeb2..e248ce66 100644
--- a/src/main/java/com/minelittlepony/unicopia/block/USlab.java
+++ b/src/main/java/com/minelittlepony/unicopia/block/USlab.java
@@ -3,80 +3,49 @@ package com.minelittlepony.unicopia.block;
 import java.util.Random;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockSlab;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.properties.PropertyEnum;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.block.BlockRenderLayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.block.enums.SlabType;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.BlockRenderLayer;
-import net.minecraft.util.IStringSerializable;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.BlockView;
 import net.minecraft.world.World;
 
-public abstract class USlab<T extends Block> extends BlockSlab {
-
-    public static final PropertyEnum<Variant> VARIANT = PropertyEnum.<Variant>create("variant", Variant.class);
+public abstract class USlab<T extends Block> extends SlabBlock {
 
     protected final T modelBlock;
 
-    public USlab(T modelBlock, USlab<? extends T> single, Material material, String domain, String name) {
-        super(material);
-
-        setCreativeTab(CreativeTabs.BUILDING_BLOCKS);
-        setHardness(0.5F);
-        setResistance(1);
-        setSoundType(SoundType.CLOTH);
-        setLightOpacity(20);
-        setTranslationKey(name);
-        setTickRandomly(modelBlock.getTickRandomly());
-        setRegistryName(domain, name);
-
-        useNeighborBrightness = true;
-
-        this.modelBlock = modelBlock;
-        this.fullBlock = isDouble();
+    public USlab(T model, Block.Settings settings) {
+        super(settings);
+        this.modelBlock = model;
     }
 
     @Deprecated
     @Override
-    public boolean isTranslucent(IBlockState state) {
-        return modelBlock.isTranslucent(state);
+    public boolean isTranslucent(BlockState state, BlockView world, BlockPos pos) {
+        return modelBlock.isTranslucent(state, world, pos);
     }
 
     @Override
-    public boolean isAir(IBlockState state, IBlockAccess world, BlockPos pos) {
-        return modelBlock.isAir(state, world, pos);
+    public boolean isAir(BlockState state) {
+        return modelBlock.isAir(state);
+    }
+
+    public boolean isDouble(BlockState state) {
+        return state.get(TYPE) == SlabType.DOUBLE;
     }
 
     @Deprecated
     @Override
-    public boolean isOpaqueCube(IBlockState state) {
-        return isDouble() && modelBlock != null && modelBlock.isOpaqueCube(state);
-    }
-
-    @Deprecated
-    @Override
-    public boolean isFullCube(IBlockState state) {
-        return isDouble() && modelBlock.isFullCube(state);
-    }
-
-    @Deprecated
-    @Override
-    public boolean isNormalCube(IBlockState state) {
-        return isDouble() && modelBlock.isNormalCube(state);
+    public boolean isOpaque(BlockState state) {
+        return isDouble(state) && modelBlock != null && modelBlock.isOpaque(state);
     }
 
     @Override
-    public void updateTick(World world, BlockPos pos, IBlockState state, Random rand) {
-        modelBlock.updateTick(world, pos, state, rand);
+    public void onScheduledTick(BlockState state, World world, BlockPos pos, Random rand) {
+        modelBlock.onScheduledTick(state, world, pos, rand);
     }
 
     @Override
@@ -85,128 +54,23 @@ public abstract class USlab<T extends Block> extends BlockSlab {
     }
 
     @Override
-    public void onFallenUpon(World w, BlockPos pos, Entity entity, float fallDistance) {
-        modelBlock.onFallenUpon(w, pos, entity, fallDistance);
+    public void onLandedUpon(World w, BlockPos pos, Entity entity, float fallDistance) {
+        modelBlock.onLandedUpon(w, pos, entity, fallDistance);
     }
 
     @Override
-    public void onLanded(World w, Entity entity) {
-        modelBlock.onLanded(w, entity);
+    public void onEntityLand(BlockView w, Entity entity) {
+        modelBlock.onEntityLand(w, entity);
     }
 
     @Override
-    public void onEntityCollision(World w, BlockPos pos, IBlockState state, Entity entity) {
-        modelBlock.onEntityCollision(w, pos, state, entity);
+    public void onEntityCollision(BlockState state, World w, BlockPos pos, Entity entity) {
+        modelBlock.onEntityCollision(state, w, pos, entity);
     }
 
     @Deprecated
     @Override
-    public float getPlayerRelativeBlockHardness(IBlockState state, EntityPlayer player, World worldIn, BlockPos pos) {
-        return modelBlock.getPlayerRelativeBlockHardness(state, player, worldIn, pos);
-    }
-
-    @Override
-    public boolean canEntityDestroy(IBlockState state, IBlockAccess world, BlockPos pos, Entity entity) {
-        return modelBlock.canEntityDestroy(state, world, pos, entity);
-    }
-
-    @Override
-    public String getTranslationKey(int meta) {
-        return super.getTranslationKey();
-    }
-
-    @Override
-    public IProperty<Variant> getVariantProperty() {
-        return VARIANT;
-    }
-
-    @Override
-    public Comparable<Variant> getTypeForItem(ItemStack stack) {
-        return Variant.DEFAULT;
-    }
-
-    @Override
-    public ItemStack getItem(World world, BlockPos pos, IBlockState state) {
-        return new ItemStack(getItemDropped(state, world.rand, 0));
-    }
-
-    @Override
-    public IBlockState getStateFromMeta(int meta) {
-        if (isDouble()) {
-            return getDefaultState().withProperty(VARIANT, Variant.DEFAULT);
-        }
-
-        return getDefaultState()
-                .withProperty(VARIANT, Variant.DEFAULT)
-                .withProperty(HALF, (meta & 8) == 0 ? BlockSlab.EnumBlockHalf.BOTTOM : BlockSlab.EnumBlockHalf.TOP);
-    }
-
-    @Override
-    public int getMetaFromState(IBlockState state) {
-        if (isDouble()) {
-            return 0;
-        }
-
-        int i = 0;
-
-        if (state.getValue(HALF) == BlockSlab.EnumBlockHalf.TOP) {
-            i |= 8;
-        }
-
-        return i;
-    }
-
-    @Override
-    protected BlockStateContainer createBlockState() {
-        if (isDouble()) {
-            return new BlockStateContainer(this, VARIANT);
-        }
-
-        return new BlockStateContainer(this, HALF, VARIANT);
-    }
-
-    public static class Single<T extends Block> extends USlab<T> {
-
-        public final Double<T> doubleSlab;
-
-        public Single(T modelBlock, Material material, String domain, String name) {
-            super(modelBlock, null, material, domain, name);
-
-            doubleSlab = new Double<>(this, domain, "double_" + name);
-        }
-
-        @Override
-        public boolean isDouble() {
-            return false;
-        }
-    }
-
-    public static class Double<T extends Block> extends USlab<T> {
-
-        public final Single<T> singleSlab;
-
-        public Double(Single<T> single, String domain, String name) {
-            super(single.modelBlock, single, single.material, domain, name);
-
-            this.singleSlab = single;
-        }
-
-        @Override
-        public boolean isDouble() {
-            return true;
-        }
-
-        @Override
-        public Item getItemDropped(IBlockState state, Random rand, int fortune) {
-            return Item.getItemFromBlock(singleSlab);
-        }
-    }
-
-    private static enum Variant implements IStringSerializable {
-        DEFAULT;
-
-        public String getName() {
-            return "normal";
-        }
+    public float calcBlockBreakingDelta(BlockState state, PlayerEntity player, BlockView worldIn, BlockPos pos) {
+        return modelBlock.calcBlockBreakingDelta(state, player, worldIn, pos);
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/FlightExperienceBar.java b/src/main/java/com/minelittlepony/unicopia/client/gui/FlightExperienceBar.java
new file mode 100644
index 00000000..004ac580
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/gui/FlightExperienceBar.java
@@ -0,0 +1,74 @@
+package com.minelittlepony.unicopia.client.gui;
+
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.mojang.blaze3d.platform.GlStateManager;
+
+import net.minecraft.client.gui.DrawableHelper;
+import net.minecraft.util.Identifier;
+
+class FlightExperienceBar extends DrawableHelper implements IHudElement {
+
+    static final Identifier TEXTURE = new Identifier("textures/gui/bars.png");
+
+    @Override
+    public boolean shouldRender(IPlayer player) {
+        return player.getSpecies().canFly()
+                && !player.getOwner().abilities.creativeMode;
+    }
+
+    @Override
+    public void renderHud(UHud context) {
+        float xp = context.player.getFlight().getFlightExperience();
+        float length = context.player.getFlight().getFlightDuration();
+
+        context.mc.getTextureManager().bindTexture(TEXTURE);
+        int x = (context.width - 182) / 2;
+        int y = context.height - 29;
+
+        int xpFill = (int)Math.floor(xp * 182);
+        int xpBuff = (int)Math.floor((183 - xpFill) * length);
+
+        int baseV = 0;
+
+        if (context.player.getFlight().isExperienceCritical()) {
+
+            int tickCount = (int)(context.mc.getTickDelta() * 10);
+
+            baseV += (tickCount % 3) * 10;
+        }
+
+        blit(x, y, 0, baseV, 256, 5, 256, 256);
+        blit(x, y, 0, baseV + 5, xpFill, 5, 256, 256);
+
+        blit(x + xpFill, y, xpFill, baseV + 10, xpBuff, 5, 256, 256);
+    }
+
+    @Override
+    public void repositionHud(UHud context) {
+        int offset = 6;
+
+        GlStateManager.translatef(0, context.begin ? -offset : offset, 0);
+    }
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/main/java/com/minelittlepony/unicopia/hud/IHudElement.java b/src/main/java/com/minelittlepony/unicopia/client/gui/IHudElement.java
similarity index 58%
rename from src/main/java/com/minelittlepony/unicopia/hud/IHudElement.java
rename to src/main/java/com/minelittlepony/unicopia/client/gui/IHudElement.java
index 3db213da..1e34d5b8 100644
--- a/src/main/java/com/minelittlepony/unicopia/hud/IHudElement.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/gui/IHudElement.java
@@ -1,6 +1,6 @@
-package com.minelittlepony.unicopia.hud;
+package com.minelittlepony.unicopia.client.gui;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 public interface IHudElement {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java b/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java
new file mode 100644
index 00000000..97a5c51b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/gui/SettingsScreen.java
@@ -0,0 +1,26 @@
+package com.minelittlepony.unicopia.client.gui;
+
+import com.minelittlepony.common.client.gui.GameGui;
+import com.minelittlepony.common.client.gui.element.Button;
+import com.minelittlepony.common.client.gui.element.Label;
+
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.text.TranslatableText;
+
+public class SettingsScreen extends GameGui {
+
+    public SettingsScreen(Screen parent) {
+        super(new TranslatableText("options.title"), parent);
+    }
+
+    @Override
+    public void init() {
+        addButton(new Label(width / 2, 15))
+            .getStyle()
+                .setColor(16777215)
+                .setText(title.asString());
+        addButton(new Button(width / 2 - 100, height / 6 + 168))
+            .onClick(s -> finish())
+            .getStyle().setText("gui.done");
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/hud/UHud.java b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java
similarity index 77%
rename from src/main/java/com/minelittlepony/unicopia/hud/UHud.java
rename to src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java
index 8d0c3ff5..6266f9a1 100644
--- a/src/main/java/com/minelittlepony/unicopia/hud/UHud.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/gui/UHud.java
@@ -1,28 +1,26 @@
-package com.minelittlepony.unicopia.hud;
+package com.minelittlepony.unicopia.client.gui;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.lwjgl.opengl.GL11;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.mojang.blaze3d.platform.GlStateManager;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraftforge.client.event.RenderGameOverlayEvent.ElementType;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gui.screen.Screen;
 
-public class UHud extends Gui {
+public class UHud {
 
     public static final UHud instance = new UHud();
 
     private List<IHudElement> elements = new ArrayList<>();
 
-    Minecraft mc = Minecraft.getMinecraft();
+    MinecraftClient mc = MinecraftClient.getInstance();
 
-    FontRenderer fonts = mc.fontRenderer;
+    TextRenderer fonts = mc.textRenderer;
 
     IPlayer player;
 
@@ -87,7 +85,7 @@ public class UHud extends Gui {
 
         GlStateManager.pushMatrix();
         GlStateManager.disableLighting();
-        GlStateManager.color(1, 1, 1, 1);
+        GlStateManager.color4f(1, 1, 1, 1);
 
         element.renderHud(this);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/input/IKeyBindingHandler.java b/src/main/java/com/minelittlepony/unicopia/client/input/IKeyBindingHandler.java
new file mode 100644
index 00000000..ba1f7f2c
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/input/IKeyBindingHandler.java
@@ -0,0 +1,20 @@
+package com.minelittlepony.unicopia.client.input;
+
+public interface IKeyBindingHandler {
+
+    void addKeybind(IKeyBinding bind);
+
+    default void onKeyInput() {
+
+    }
+
+    public interface IKeyBinding {
+
+        String getKeyCategory();
+
+        String getKeyName();
+
+        int getKeyCode();
+
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/input/InversionAwareKeyboardInput.java b/src/main/java/com/minelittlepony/unicopia/client/input/InversionAwareKeyboardInput.java
new file mode 100644
index 00000000..893db26d
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/input/InversionAwareKeyboardInput.java
@@ -0,0 +1,60 @@
+package com.minelittlepony.unicopia.client.input;
+
+import com.minelittlepony.unicopia.UClient;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.input.Input;
+import net.minecraft.client.input.KeyboardInput;
+
+public class InversionAwareKeyboardInput extends KeyboardInput {
+
+    private static boolean recurseCheck;
+
+    private Input proxy;
+
+    public InversionAwareKeyboardInput(MinecraftClient client, Input inherited) {
+        super(client.options);
+        proxy = inherited;
+    }
+
+    @Override
+    public void tick(boolean one, boolean two) {
+        // Other mods might wrap us, in which case let's just pretend to be the vanilla one.
+        // We'll replace them at the top level and let go of the inner to prevent the chain from growing.
+        if (recurseCheck) {
+            proxy = null;
+            super.tick(one, two);
+        }
+
+        recurseCheck = true;
+        proxy.tick(one, two);
+        recurseCheck = false;
+
+        this.pressingForward = proxy.pressingForward;
+        this.pressingBack = proxy.pressingBack;
+        this.pressingLeft = proxy.pressingLeft;
+        this.pressingRight = proxy.pressingRight;
+        this.jumping = proxy.jumping;
+        this.sneaking = proxy.sneaking;
+        this.movementSideways = proxy.movementSideways;
+        this.movementForward = proxy.movementForward;
+
+        IPlayer player = UClient.instance().getIPlayer();
+
+        if (player.getGravity().getGravitationConstant() < 0) {
+            boolean tmp = pressingLeft;
+
+            pressingLeft = pressingRight;
+            pressingRight = tmp;
+
+            movementSideways = -movementSideways;
+
+            if (player.getOwner().abilities.flying) {
+                tmp = jumping;
+                jumping = sneaking;
+                sneaking = tmp;
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/input/KeyBindingsHandler.java b/src/main/java/com/minelittlepony/unicopia/client/input/KeyBindingsHandler.java
new file mode 100644
index 00000000..a10f2543
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/input/KeyBindingsHandler.java
@@ -0,0 +1,75 @@
+package com.minelittlepony.unicopia.client.input;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.ability.powers.PowersRegistry;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+
+import net.fabricmc.fabric.api.client.keybinding.FabricKeyBinding;
+import net.fabricmc.fabric.api.client.keybinding.KeyBindingRegistry;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.options.KeyBinding;
+import net.minecraft.client.util.InputUtil;
+import net.minecraft.util.Identifier;
+
+
+class KeyBindingsHandler implements IKeyBindingHandler {
+    private final MinecraftClient client = MinecraftClient.getInstance();
+
+    private final List<KeyBinding> bindings = new ArrayList<>();
+    private final List<KeyBinding> removed = new ArrayList<>();
+
+    private final List<KeyBinding> pressed = new ArrayList<>();
+
+    @Override
+    public void addKeybind(IKeyBinding p) {
+        KeyBindingRegistry.INSTANCE.addCategory(p.getKeyCategory());
+
+        FabricKeyBinding b = FabricKeyBinding.Builder.create(new Identifier(Unicopia.MODID, p.getKeyName()), InputUtil.Type.KEYSYM, p.getKeyCode(), p.getKeyCategory()).build();
+        KeyBindingRegistry.INSTANCE.register(b);
+
+        bindings.add(b);
+    }
+
+    @Override
+    public void onKeyInput() {
+        if (client.currentScreen != null
+            || client.player == null) {
+            return;
+        }
+        IPlayer iplayer = SpeciesList.instance().getPlayer(client.player);
+
+        for (KeyBinding i : bindings) {
+            if (i.isPressed()) {
+
+                if (!pressed.contains(i)) {
+                    pressed.add(i);
+
+                    if (!PowersRegistry.instance().hasRegisteredPower(i.getDefaultKeyCode().getKeyCode())) {
+                        removed.add(i);
+                        System.out.println("Error: Keybinding(" + i.getLocalizedName() + ") does not have a registered pony power. Keybinding will be removed from event.");
+                    } else {
+                        PowersRegistry.instance()
+                            .getCapablePowerFromKey(i.getDefaultKeyCode().getKeyCode(), iplayer.getSpecies())
+                            .ifPresent(iplayer.getAbilities()::tryUseAbility);
+                    }
+                }
+            } else {
+                if (pressed.contains(i)) {
+                    pressed.remove(i);
+
+                    iplayer.getAbilities().tryClearAbility();
+                }
+            }
+        }
+
+        for (KeyBinding i : removed) {
+            removed.remove(i);
+            bindings.remove(i);
+            pressed.remove(i);
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/Keyboard.java b/src/main/java/com/minelittlepony/unicopia/client/input/Keyboard.java
similarity index 56%
rename from src/main/java/com/minelittlepony/unicopia/input/Keyboard.java
rename to src/main/java/com/minelittlepony/unicopia/client/input/Keyboard.java
index d59403b8..f0b89141 100644
--- a/src/main/java/com/minelittlepony/unicopia/input/Keyboard.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/input/Keyboard.java
@@ -1,15 +1,15 @@
-package com.minelittlepony.unicopia.input;
+package com.minelittlepony.unicopia.client.input;
 
 import com.minelittlepony.unicopia.UClient;
 
 public final class Keyboard {
-    private static IKeyHandler keyHandler;
+    private static IKeyBindingHandler keyHandler;
 
-    public static IKeyHandler getKeyHandler() {
+    public static IKeyBindingHandler getKeyHandler() {
 
         if (keyHandler == null) {
             if (UClient.isClientSide()) {
-                keyHandler = new UKeyHandler();
+                keyHandler = new KeyBindingsHandler();
             } else {
                 keyHandler = bind -> {};
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/client/input/MouseControl.java b/src/main/java/com/minelittlepony/unicopia/client/input/MouseControl.java
new file mode 100644
index 00000000..d44e0c9d
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/input/MouseControl.java
@@ -0,0 +1,23 @@
+package com.minelittlepony.unicopia.client.input;
+
+import com.minelittlepony.unicopia.UClient;
+
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.Mouse;
+
+// TODO: we need mixins for this
+public class MouseControl extends Mouse {
+    public MouseControl(MinecraftClient client) {
+        super(client);
+    }
+
+    @Override
+    public void updateMouse() {
+        if (UClient.instance().getIPlayer().getGravity().getGravitationConstant() < 0) {
+            //cursorDeltaX = -cursorDeltaX;
+            //cursorDeltaY = -cursorDeltaY;
+        }
+
+        super.updateMouse();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleChangelingMagic.java b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleChangelingMagic.java
new file mode 100644
index 00000000..3b3c3321
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleChangelingMagic.java
@@ -0,0 +1,33 @@
+package com.minelittlepony.unicopia.client.particle;
+
+import net.minecraft.client.particle.Particle;
+import net.minecraft.client.particle.ParticleFactory;
+import net.minecraft.client.particle.PortalParticle;
+import net.minecraft.client.particle.SpriteProvider;
+import net.minecraft.particle.DefaultParticleType;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.world.World;
+
+public class ParticleChangelingMagic extends PortalParticle {
+
+    private int baseTextureIndex = 128;
+
+    public ParticleChangelingMagic(ParticleEffect type, World world, double x, double y, double z, double dx, double dy, double dz) {
+        super(world, x, y, z, dx, dy, dz);
+
+        float intensity = rand.nextFloat() * 0.6F + 0.4F;
+
+        colorRed = intensity * 0.5F;
+        colorGreen = intensity;
+        colorBlue = intensity * 0.4f;
+
+        setParticleTextureIndex((int)(Math.random() * 8.0D));
+    }
+
+    @Override
+    public void tick() {
+        setParticleTextureIndex(baseTextureIndex + (7 - age * 8 / maxAge));
+
+        super.tick();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleDisk.java b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleDisk.java
new file mode 100644
index 00000000..2509d76f
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleDisk.java
@@ -0,0 +1,41 @@
+package com.minelittlepony.unicopia.client.particle;
+
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.entity.Entity;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.world.World;
+
+import com.minelittlepony.unicopia.client.render.model.DiskModel;
+import com.mojang.blaze3d.platform.GlStateManager;
+
+public class ParticleDisk extends ParticleSphere {
+
+    private static final DiskModel model = new DiskModel();
+
+    protected float rotX;
+    protected float rotY;
+    protected float rotZ;
+
+    public ParticleDisk(ParticleEffect type, World w, double x, double y, double z, double rX, double rY, double rZ) {
+        super(w, x, y, z, radius, tint, alpha);
+
+        rotX = rX;
+        rotY = rY;
+        rotZ = rZ;
+    }
+
+    @Override
+    public void renderParticle(BufferBuilder buffer, Entity viewer, float partialTicks, float x, float z, float yz, float xy, float xz) {
+        if (alpha <= 0) {
+            return;
+        }
+
+        Color.glColor(tint, alpha);
+
+        model.setPosition(this.x, this.y, this.z);
+        model.render(radius);
+
+        GlStateManager.color(1, 1, 1, 1);
+    }
+}
+
diff --git a/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleRaindrops.java b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleRaindrops.java
new file mode 100644
index 00000000..4afc399f
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleRaindrops.java
@@ -0,0 +1,25 @@
+package com.minelittlepony.unicopia.client.particle;
+
+import net.minecraft.client.particle.RainSplashParticle;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.world.World;
+
+public class ParticleRaindrops extends RainSplashParticle {
+
+    public ParticleRaindrops(ParticleEffect type, World world, double x, double y, double z, double dx, double dy, double dz) {
+        super(world, x, y, z);
+        velocityY = -0.1;
+        maxAge += 19;
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+
+        if (onGround) {
+            velocityX *= 0.30000001192092896D;
+            velocityY = Math.random() * 0.20000000298023224D + 0.10000000149011612D;
+            velocityZ *= 0.30000001192092896D;
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleSphere.java
similarity index 56%
rename from src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java
rename to src/main/java/com/minelittlepony/unicopia/client/particle/ParticleSphere.java
index 3af55247..76cab45e 100644
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleSphere.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleSphere.java
@@ -1,17 +1,20 @@
-package com.minelittlepony.unicopia.particle.client;
+package com.minelittlepony.unicopia.client.particle;
 
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.particle.Particle;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.particle.ParticleTextureSheet;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Camera;
 import net.minecraft.entity.Entity;
+import net.minecraft.particle.ParticleEffect;
 import net.minecraft.world.World;
 
 import org.lwjgl.opengl.GL11;
-import com.minelittlepony.unicopia.model.ModelSphere;
-import com.minelittlepony.unicopia.particle.IAttachableParticle;
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.util.render.Color;
+
+import com.minelittlepony.unicopia.client.render.model.SphereModel;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.particles.ParticleConnection.IAttachableParticle;
+import com.mojang.blaze3d.platform.GlStateManager;
 
 public class ParticleSphere extends Particle implements IAttachableParticle {
 
@@ -22,14 +25,14 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
 
     private ICaster<?> caster;
 
-    private static final ModelSphere model = new ModelSphere();
+    private static final SphereModel model = new SphereModel();
 
-    public ParticleSphere(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
+    public ParticleSphere(ParticleEffect type, World w, double x, double y, double z, double vX, double vY, double vZ) {
         this(w, x, y, z, args[0] / 1000F, args[1], args[2]/100F);
 
-        this.motionX = vX;
-        this.motionY = vY;
-        this.motionZ = vZ;
+        this.velocityX = vX;
+        this.velocityY = vY;
+        this.velocityZ = vZ;
     }
 
     public ParticleSphere(World w, double x, double y, double z, float radius, int tint, float alpha) {
@@ -44,7 +47,7 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
 
     @Override
     public boolean isStillAlive() {
-        return particleAge < (particleMaxAge - 1);
+        return age < (maxAge - 1);
     }
 
     @Override
@@ -53,20 +56,34 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
         this.caster = caster;
     }
 
-    public void onUpdate() {
-        super.onUpdate();
+    @Override
+    public void buildGeometry(BufferBuilder var1, Camera var2, float var3, float var4, float var5, float var6,
+            float var7, float var8) {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public ParticleTextureSheet getType() {
+        // TODO Auto-generated method stub
+        return null;
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
 
         if (caster != null) {
-            if (!caster.hasEffect() || caster.getEffect().getDead() || caster.getEntity().isDead) {
-                setExpired();
+            if (!caster.hasEffect() || caster.getEffect().getDead() || caster.getEntity().removed) {
+                markDead();
             } else {
                 Entity e = caster.getEntity();
 
                 if (!caster.getWorld().loadedEntityList.contains(caster.getEntity())) {
-                    setExpired();
+                    markDead();
                 }
 
-                setPosition(e.posX, e.posY, e.posZ);
+                setPos(e.x, e.y, e.z);
             }
         } else {
             radius *= 0.9998281;
@@ -82,26 +99,26 @@ public class ParticleSphere extends Particle implements IAttachableParticle {
         GlStateManager.depthMask(false);
         GlStateManager.shadeModel(GL11.GL_SMOOTH);
 
-        GlStateManager.enableAlpha();
+        GlStateManager.enableAlphaTest();
         GlStateManager.enableBlend();
-        Minecraft.getMinecraft().entityRenderer.disableLightmap();
+        MinecraftClient.getInstance().gameRenderer.disableLightmap();
         GlStateManager.enableLighting();
 
         Color.glColor(tint, alpha);
 
         GlStateManager.blendFunc(GlStateManager.SourceFactor.SRC_COLOR, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA);
-        GlStateManager.disableTexture2D();
+        GlStateManager.disableTexture();
 
-        model.setPosition(posX, posY, posZ);
+        model.setPosition(this.x, this.y, this.z);
         model.render(radius);
 
-        GlStateManager.enableTexture2D();
+        GlStateManager.enableTexture();
         GlStateManager.disableLighting();
-        Minecraft.getMinecraft().entityRenderer.enableLightmap();
+        MinecraftClient.getInstance().gameRenderer.enableLightmap();
 
         GlStateManager.disableBlend();
         GlStateManager.depthMask(true);
-        GlStateManager.color(1, 1, 1, 1);
+        GlStateManager.color4f(1, 1, 1, 1);
         GL11.glPopAttrib();
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleUnicornMagic.java b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleUnicornMagic.java
similarity index 85%
rename from src/main/java/com/minelittlepony/unicopia/particle/client/ParticleUnicornMagic.java
rename to src/main/java/com/minelittlepony/unicopia/client/particle/ParticleUnicornMagic.java
index 91ef2804..e2338411 100644
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleUnicornMagic.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/particle/ParticleUnicornMagic.java
@@ -1,11 +1,10 @@
-package com.minelittlepony.unicopia.particle.client;
-
-import com.minelittlepony.util.render.Color;
+package com.minelittlepony.unicopia.client.particle;
 
 import net.minecraft.client.particle.Particle;
 
-import net.minecraft.client.renderer.BufferBuilder;
 import net.minecraft.entity.Entity;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleType;
 import net.minecraft.world.World;
 
 public class ParticleUnicornMagic extends Particle {
@@ -14,11 +13,7 @@ public class ParticleUnicornMagic extends Particle {
     private double portalPosY;
     private double portalPosZ;
 
-    public ParticleUnicornMagic(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
-        this(w, x, y, z, vX, vY, vZ, args.length > 0 ? args[0] : -1);
-    }
-
-    public ParticleUnicornMagic(World w, double x, double y, double z, double vX, double vY, double vZ, int tint) {
+    public ParticleUnicornMagic(ParticleEffect type, World w, double x, double y, double z, double vX, double vY, double vZ/*, int tint*/) {
         super(w, x, y, z, vX, vY, vZ);
         motionX = vX;
         motionY = vY;
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java
new file mode 100644
index 00000000..1a30d8bf
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/ButterflyEntityRenderer.java
@@ -0,0 +1,37 @@
+package com.minelittlepony.unicopia.client.render.entity;
+
+import com.minelittlepony.unicopia.client.render.entity.model.ButterflyEntityModel;
+import com.minelittlepony.unicopia.entity.EntityButterfly;
+import com.mojang.blaze3d.platform.GlStateManager;
+
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.MathHelper;
+
+public class ButterflyEntityRenderer extends LivingEntityRenderer<EntityButterfly, ButterflyEntityModel> {
+
+    public ButterflyEntityRenderer(EntityRenderDispatcher rm) {
+        super(rm, new ButterflyEntityModel(), 0.25F);
+    }
+
+    @Override
+    protected Identifier getTexture(EntityButterfly entity) {
+        return entity.getVariety().getSkin();
+    }
+
+    @Override
+    protected void scale(EntityButterfly entity, float ticks) {
+        GlStateManager.scalef(0.35F, 0.35F, 0.35F);
+    }
+
+    @Override
+    protected void setupTransforms(EntityButterfly entity, float age, float yaw, float ticks) {
+
+        if (!entity.isResting()) {
+            GlStateManager.translated(0, MathHelper.cos(age / 3F) / 10F, 0);
+        }
+
+        super.setupTransforms(entity, age, yaw, ticks);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCloud.java
similarity index 75%
rename from src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCloud.java
index 7505c27e..7bac0b85 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCloud.java
@@ -1,19 +1,19 @@
-package com.minelittlepony.unicopia.render;
+package com.minelittlepony.unicopia.client.render.entity;
 
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 import org.lwjgl.opengl.GL11;
 
+import com.minelittlepony.unicopia.client.render.entity.model.ModelCloud;
 import com.minelittlepony.unicopia.entity.EntityCloud;
-import com.minelittlepony.unicopia.model.ModelCloud;
 import com.minelittlepony.util.WorldHelper;
 
 public class RenderCloud extends RenderLiving<EntityCloud> {
-    private static final ResourceLocation cloud = new ResourceLocation("unicopia", "textures/entity/clouds.png");
-    private static final ResourceLocation rainCloud = new ResourceLocation("unicopia", "textures/entity/clouds_storm.png");
+    private static final Identifier cloud = new Identifier("unicopia", "textures/entity/clouds.png");
+    private static final Identifier rainCloud = new Identifier("unicopia", "textures/entity/clouds_storm.png");
 
     public RenderCloud(RenderManager rendermanagerIn) {
         super(rendermanagerIn, new ModelCloud(), 1f);
@@ -54,7 +54,7 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
     }
 
     @Override
-    protected ResourceLocation getEntityTexture(EntityCloud entity) {
+    protected Identifier getEntityTexture(EntityCloud entity) {
         if (entity.getIsRaining() && entity.getIsThundering()) {
             return rainCloud;
         }
@@ -62,12 +62,12 @@ public class RenderCloud extends RenderLiving<EntityCloud> {
     }
 
     @Override
-    protected int getColorMultiplier(EntityCloud par1EntityLivingBase, float yaw, float pitch) {
+    protected int getColorMultiplier(EntityCloud par1LivingEntity, float yaw, float pitch) {
         return 0;
     }
 
     @Override
-    protected float getDeathMaxRotation(EntityCloud par1EntityLivingBase) {
+    protected float getDeathMaxRotation(EntityCloud par1LivingEntity) {
         return 0;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderCuccoon.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCuccoon.java
similarity index 74%
rename from src/main/java/com/minelittlepony/unicopia/render/RenderCuccoon.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCuccoon.java
index 5d105858..a942a8ad 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderCuccoon.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderCuccoon.java
@@ -1,27 +1,27 @@
-package com.minelittlepony.unicopia.render;
+package com.minelittlepony.unicopia.client.render.entity;
 
 import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.client.render.entity.model.ModelCuccoon;
 import com.minelittlepony.unicopia.entity.EntityCuccoon;
-import com.minelittlepony.unicopia.model.ModelCuccoon;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.RenderLivingBase;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.entity.Entity;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class RenderCuccoon extends RenderLivingBase<EntityCuccoon> {
 
-    private static final ResourceLocation TEXTURE = new ResourceLocation(Unicopia.MODID, "textures/entity/cuccoon.png");
+    private static final Identifier TEXTURE = new Identifier(Unicopia.MODID, "textures/entity/cuccoon.png");
 
     public RenderCuccoon(RenderManager manager) {
         super(manager, new ModelCuccoon(), 1);
     }
 
     @Override
-    protected ResourceLocation getEntityTexture(EntityCuccoon entity) {
+    protected Identifier getEntityTexture(EntityCuccoon entity) {
         return TEXTURE;
     }
 
@@ -36,7 +36,7 @@ public class RenderCuccoon extends RenderLivingBase<EntityCuccoon> {
         if (entity.isBeingRidden()) {
             Entity rider = entity.getPassengers().get(0);
 
-            if (!(rider == Minecraft.getMinecraft().player) || UClient.instance().getViewMode() != 0) {
+            if (!(rider == MinecraftClient.getInstance().player) || UClient.instance().getViewMode() != 0) {
                 GlStateManager.enableAlpha();
                 GlStateManager.enableBlend();
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderGem.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderGem.java
new file mode 100644
index 00000000..1cf15bad
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderGem.java
@@ -0,0 +1,38 @@
+package com.minelittlepony.unicopia.client.render.entity;
+
+import com.minelittlepony.unicopia.client.render.entity.model.ModelGem;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+
+import net.minecraft.client.render.entity.EntityRenderDispatcher;
+import net.minecraft.client.render.entity.LivingEntityRenderer;
+import net.minecraft.util.Identifier;
+
+public class RenderGem extends LivingEntityRenderer<SpellcastEntity, ModelGem> {
+
+    private static final Identifier gem = new Identifier("unicopia", "textures/entity/gem.png");
+
+    public RenderGem(EntityRenderDispatcher rendermanagerIn) {
+        super(rendermanagerIn, new ModelGem(), 0);
+    }
+
+    @Override
+    protected Identifier getTexture(SpellcastEntity entity) {
+        return gem;
+    }
+
+    @Override
+    public boolean shouldRender(SpellcastEntity livingEntity, ICamera camera, double camX, double camY, double camZ) {
+        return true;
+    }
+
+    @Override
+    protected float getDeathMaxRotation(SpellcastEntity entity) {
+        return 0;
+    }
+
+    @Override
+    protected boolean canRenderName(SpellcastEntity targetEntity) {
+        return super.canRenderName(targetEntity) && (targetEntity.getAlwaysRenderNameTagForRender()
+                 || targetEntity.hasCustomName() && targetEntity == renderManager.pointedEntity);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderProjectile.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderProjectile.java
new file mode 100644
index 00000000..0e3664d0
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderProjectile.java
@@ -0,0 +1,21 @@
+package com.minelittlepony.unicopia.client.render.entity;
+
+import com.minelittlepony.unicopia.entity.item.AdvancedProjectileEntity;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.renderer.entity.RenderSnowball;
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+
+public class RenderProjectile extends RenderSnowball<AdvancedProjectileEntity> {
+
+    public RenderProjectile(RenderManager renderManager) {
+        super(renderManager, Items.POTIONITEM, MinecraftClient.getInstance().getRenderItem());
+    }
+
+    @Override
+    public ItemStack getStackToRender(AdvancedProjectileEntity entity) {
+        return entity.getItem();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderRainbow.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderRainbow.java
similarity index 82%
rename from src/main/java/com/minelittlepony/unicopia/render/RenderRainbow.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderRainbow.java
index 496f506e..c4df7d86 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderRainbow.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderRainbow.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.render;
+package com.minelittlepony.unicopia.client.render.entity;
 
 import org.lwjgl.opengl.GL11;
 
@@ -12,7 +12,7 @@ import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class RenderRainbow extends Render<EntityRainbow> {
 
@@ -20,11 +20,11 @@ public class RenderRainbow extends Render<EntityRainbow> {
         super(renderManager);
     }
 
-    private static final ResourceLocation TEXTURE = new ResourceLocation("unicopia", "textures/environment/rainbow.png");
+    private static final Identifier TEXTURE = new Identifier("unicopia", "textures/environment/rainbow.png");
 
     public void doRender(EntityRainbow entity, double x, double y, double z, float entityYaw, float partialTicks) {
-        float distance = Minecraft.getMinecraft().getRenderViewEntity().getDistance(entity);
-        float maxDistance = 16 * Minecraft.getMinecraft().gameSettings.renderDistanceChunks;
+        float distance = MinecraftClient.getInstance().getRenderViewEntity().getDistance(entity);
+        float maxDistance = 16 * MinecraftClient.getInstance().gameSettings.renderDistanceChunks;
         double r = entity.getRadius();
         float light = WorldHelper.getDaylightBrightness(entity.getEntityWorld(), partialTicks);
 
@@ -67,7 +67,7 @@ public class RenderRainbow extends Render<EntityRainbow> {
     }
 
     @Override
-    protected ResourceLocation getEntityTexture(EntityRainbow entity) {
+    protected Identifier getEntityTexture(EntityRainbow entity) {
         return TEXTURE;
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderSpear.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpear.java
similarity index 58%
rename from src/main/java/com/minelittlepony/unicopia/render/RenderSpear.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpear.java
index 5294d9e0..6f8f098b 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderSpear.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpear.java
@@ -1,21 +1,21 @@
-package com.minelittlepony.unicopia.render;
+package com.minelittlepony.unicopia.client.render.entity;
 
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.entity.EntitySpear;
 
 import net.minecraft.client.renderer.entity.RenderArrow;
 import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class RenderSpear extends RenderArrow<EntitySpear> {
-    public static final ResourceLocation TEXTURE = new ResourceLocation(Unicopia.MODID, "textures/entity/projectiles/spear.png");
+    public static final Identifier TEXTURE = new Identifier(Unicopia.MODID, "textures/entity/projectiles/spear.png");
 
     public RenderSpear(RenderManager manager) {
         super(manager);
     }
 
     @Override
-    protected ResourceLocation getEntityTexture(EntitySpear entity) {
+    protected Identifier getEntityTexture(EntitySpear entity) {
         return TEXTURE;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderSpellbook.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpellbook.java
similarity index 83%
rename from src/main/java/com/minelittlepony/unicopia/render/RenderSpellbook.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpellbook.java
index 5b5a4752..317bb57c 100644
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderSpellbook.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/RenderSpellbook.java
@@ -1,25 +1,25 @@
-package com.minelittlepony.unicopia.render;
+package com.minelittlepony.unicopia.client.render.entity;
 
+import com.minelittlepony.unicopia.client.render.entity.model.ModelSpellbook;
 import com.minelittlepony.unicopia.entity.EntitySpellbook;
-import com.minelittlepony.unicopia.model.ModelSpellbook;
 
 import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.entity.RenderLiving;
 import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class RenderSpellbook extends RenderLiving<EntitySpellbook> {
 
-    private static final ResourceLocation BLUE = new ResourceLocation("unicopia", "textures/entity/enchanting_table_book_blue.png");
-    private static final ResourceLocation NORMAL = new ResourceLocation("unicopia", "textures/entity/enchanting_table_book.png");
+    private static final Identifier BLUE = new Identifier("unicopia", "textures/entity/enchanting_table_book_blue.png");
+    private static final Identifier NORMAL = new Identifier("unicopia", "textures/entity/enchanting_table_book.png");
 
     public RenderSpellbook(RenderManager rendermanagerIn) {
         super(rendermanagerIn, new ModelSpellbook(), 0);
     }
 
     @Override
-    protected ResourceLocation getEntityTexture(EntitySpellbook entity) {
+    protected Identifier getEntityTexture(EntitySpellbook entity) {
         return entity.getIsAltered() ? BLUE : NORMAL;
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ButterflyEntityModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ButterflyEntityModel.java
new file mode 100644
index 00000000..9f635c95
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ButterflyEntityModel.java
@@ -0,0 +1,84 @@
+package com.minelittlepony.unicopia.client.render.entity.model;
+
+import com.minelittlepony.unicopia.entity.EntityButterfly;
+import com.mojang.blaze3d.platform.GlStateManager;
+
+import net.minecraft.client.model.Cuboid;
+import net.minecraft.client.render.entity.model.EntityModel;
+import net.minecraft.util.math.MathHelper;
+
+public class ButterflyEntityModel extends EntityModel<EntityButterfly> {
+
+    private Cuboid body;
+
+    private Cuboid leftWingInner;
+    private Cuboid leftWingOuter;
+
+    private Cuboid rightWingInner;
+    private Cuboid rightWingOuter;
+
+    public ButterflyEntityModel() {
+        textureWidth = 64;
+        textureHeight = 64;
+
+        body = new Cuboid(this, 0, 0);
+        body.rotationPointZ = -10;
+        body.rotationPointY = 12;
+
+        rightWingInner = new Cuboid(this, 42, 0);
+        rightWingInner.roll = -0.2F;
+        rightWingInner.addBox(-13, -5, 0, 10, 19, 1);
+
+        body.addChild(rightWingInner);
+
+        rightWingOuter = new Cuboid(this, 24, 16);
+        rightWingOuter.setRotationPoint(-13, 10, 0.1F);
+        rightWingOuter.roll = -0.2F;
+        rightWingOuter.addBox(0, 0, 0, 10, 12, 1);
+
+        rightWingInner.addChild(rightWingOuter);
+
+        leftWingInner = new Cuboid(this, 42, 0);
+        leftWingInner.mirror = true;
+        leftWingInner.roll = 0.2F;
+        leftWingInner.addBox(2, -5, 0, 10, 19, 1);
+
+        body.addChild(leftWingInner);
+
+        leftWingOuter = new Cuboid(this, 24, 16);
+        leftWingOuter.mirror = true;
+        leftWingOuter.roll = -0.2F;
+        leftWingOuter.setRotationPoint(2, 10, 0.1F);
+        leftWingOuter.addBox(0, 0, 0, 10, 12, 1);
+
+        leftWingInner.addChild(leftWingOuter);
+    }
+
+    @Override
+    public void render(EntityButterfly entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
+
+        setAngles(entityIn, limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale);
+
+        GlStateManager.disableLighting();
+
+        body.render(scale);
+
+        GlStateManager.enableLighting();
+    }
+
+    @Override
+    public void setAngles(EntityButterfly entity, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor) {
+
+        float flap = MathHelper.cos(ageInTicks) * (float)Math.PI / 4;
+
+        if (entity.isResting()) {
+            body.pitch = 0.8F;
+            flap = MathHelper.cos(ageInTicks / 10) * (float)Math.PI / 6 + 0.7F;
+        } else {
+            body.pitch = ((float)Math.PI / 4) + MathHelper.cos(ageInTicks * 0.1F) * 0.15F;
+        }
+
+        rightWingInner.yaw = flap;
+        leftWingInner.yaw = -flap;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCloud.java
similarity index 92%
rename from src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCloud.java
index db45d4ad..f9b07d59 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCloud.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.model;
+package com.minelittlepony.unicopia.client.render.entity.model;
 
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelCuccoon.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCuccoon.java
similarity index 97%
rename from src/main/java/com/minelittlepony/unicopia/model/ModelCuccoon.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCuccoon.java
index a06378d0..0f3ad5ee 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelCuccoon.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelCuccoon.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.model;
+package com.minelittlepony.unicopia.client.render.entity.model;
 
 import com.minelittlepony.unicopia.entity.EntityCuccoon;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelGem.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelGem.java
similarity index 58%
rename from src/main/java/com/minelittlepony/unicopia/model/ModelGem.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelGem.java
index 33c633f3..54e8a957 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelGem.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelGem.java
@@ -1,31 +1,30 @@
-package com.minelittlepony.unicopia.model;
+package com.minelittlepony.unicopia.client.render.entity.model;
 
-import com.minelittlepony.render.model.ModelQuads;
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.util.render.Color;
-import com.minelittlepony.util.render.Vertex;
+import com.minelittlepony.unicopia.client.render.model.ModelQuads;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.mojang.blaze3d.platform.GlStateManager;
 
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.model.Cuboid;
+import net.minecraft.client.model.Vertex;
+import net.minecraft.client.render.entity.model.EntityModel;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityPose;
 import net.minecraft.util.math.MathHelper;
 
-public class ModelGem extends ModelBase {
+public class ModelGem extends EntityModel<SpellcastEntity> {
 
-    private ModelRenderer body;
+    private Cuboid body;
 
     public ModelGem() {
         textureWidth = 256;
         textureHeight = 256;
 
-        body = new ModelRenderer(this);
-        body.offsetY = 1.2f;
+        body = new Cuboid(this);
+        body.y = 1.2f;
 
         int size = 1;
 
-        body.cubeList.add(new ModelQuads(body).addFace(
+        body.boxes.add(new ModelQuads(body).addFace(
             new Vertex( size, 0,     size, 0,     0.5f),
             new Vertex(-size, 0,     size, 0.25f, 0.25f),
             new Vertex( 0, size * 2, 0, 0,     0.25f),
@@ -69,59 +68,57 @@ public class ModelGem extends ModelBase {
     }
 
     @Override
-    public void render(Entity entity, float time, float walkSpeed, float stutter, float yaw, float pitch, float scale) {
+    public void render(SpellcastEntity entity, float time, float walkSpeed, float stutter, float yaw, float pitch, float scale) {
 
         GlStateManager.pushMatrix();
 
-        EntitySpell spell = (EntitySpell)entity;
+        float floatOffset = MathHelper.sin((entity.age + stutter) / 10 + entity.hoverStart) / 10 + 0.1F;
+        GlStateManager.translated(0, floatOffset - entity.getEyeHeight(EntityPose.STANDING), 0);
 
-        float floatOffset = MathHelper.sin((spell.ticksExisted + stutter) / 10 + spell.hoverStart) / 10 + 0.1F;
-        GlStateManager.translate(0, floatOffset - entity.getEyeHeight(), 0);
-
-        floatOffset = (spell.ticksExisted + stutter) / 20;
-        if (spell.getCurrentLevel() > 0) {
-            floatOffset *= spell.getCurrentLevel() + 1;
+        floatOffset = (entity.age + stutter) / 20;
+        if (entity.getCurrentLevel() > 0) {
+            floatOffset *= entity.getCurrentLevel() + 1;
         }
 
-        floatOffset += spell.hoverStart;
+        floatOffset += entity.hoverStart;
         floatOffset *= 180 / (float)Math.PI;
 
         GlStateManager.pushMatrix();
 
-        if (spell.overLevelCap()) {
-            GlStateManager.translate(Math.sin(stutter) / 5, 0, Math.cos(stutter) / 5);
+        if (entity.overLevelCap()) {
+            GlStateManager.translated(Math.sin(stutter) / 5, 0, Math.cos(stutter) / 5);
 
-            GlStateManager.rotate((float)Math.sin(stutter), 0, 1, 0);
+            GlStateManager.rotatef((float)Math.sin(stutter), 0, 1, 0);
         }
 
-        GlStateManager.rotate(floatOffset, 0, 1, 0);
+        GlStateManager.rotated(floatOffset, 0, 1, 0);
 
         body.render(scale);
 
         GlStateManager.enableBlend();
-        GlStateManager.disableAlpha();
+        GlStateManager.disableAlphaTest();
         GlStateManager.blendFunc(1, 1);
 
         setLightingConditionsBrightness(0xF0F0);
 
-        if (spell.hasEffect()) {
-            Color.glColor(spell.getEffect().getTint(), 1);
+        if (entity.hasEffect()) {
+            Color.glColor(entity.getEffect().getTint(), 1);
         }
 
-        int tiers = Math.min(spell.getCurrentLevel(), 5);
+        int tiers = Math.min(entity.getCurrentLevel(), 5);
 
         for (int i = 0; i <= tiers; i++) {
             float grow = (1 + i) * 0.2F;
 
-            GlStateManager.scale(1 + grow, 1 + grow, 1 + grow);
-            GlStateManager.translate(0, -grow, 0);
+            GlStateManager.scalef(1 + grow, 1 + grow, 1 + grow);
+            GlStateManager.translatef(0, -grow, 0);
             renderOverlay(grow, scale);
 
             if (i == 5) {
                 GlStateManager.pushMatrix();
-                GlStateManager.rotate(-floatOffset * 0.9F, 0, 1, 0);
-                GlStateManager.translate(0.6F, 0.8F, 0);
-                GlStateManager.scale(0.4F, 0.4F, 0.4F);
+                GlStateManager.rotatef(-floatOffset * 0.9F, 0, 1, 0);
+                GlStateManager.translatef(0.6F, 0.8F, 0);
+                GlStateManager.scalef(0.4F, 0.4F, 0.4F);
                 renderOverlay(grow, scale);
                 GlStateManager.popMatrix();
             }
@@ -129,18 +126,18 @@ public class ModelGem extends ModelBase {
         }
         GlStateManager.popMatrix();
 
-        for (int i = spell.getCurrentLevel(); i > 0; i--) {
+        for (int i = entity.getCurrentLevel(); i > 0; i--) {
             GlStateManager.pushMatrix();
-            GlStateManager.rotate(floatOffset / i, 0, 1, 0);
-            GlStateManager.translate(0.6F, 0, 0);
+            GlStateManager.rotatef(floatOffset / i, 0, 1, 0);
+            GlStateManager.translatef(0.6F, 0, 0);
             renderOverlay(0.6F, scale);
             GlStateManager.popMatrix();
         }
 
-        setLightingConditionsBrightness(entity.getBrightnessForRender());
+        setLightingConditionsBrightness(entity.getLightmapCoordinates());
 
         GlStateManager.disableBlend();
-        GlStateManager.enableAlpha();
+        GlStateManager.enableAlphaTest();
 
         GlStateManager.popMatrix();
     }
@@ -155,9 +152,4 @@ public class ModelGem extends ModelBase {
 
         OpenGlHelper.setLightmapTextureCoords(OpenGlHelper.lightmapTexUnit, texX, texY);
     }
-
-    @Override
-    public void setRotationAngles(float time, float walkSpeed, float stutter, float yaw, float pitch, float increment, Entity entity) {
-
-    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelSpellbook.java b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelSpellbook.java
similarity index 85%
rename from src/main/java/com/minelittlepony/unicopia/model/ModelSpellbook.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelSpellbook.java
index eaad3495..3c1bcd99 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelSpellbook.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/entity/model/ModelSpellbook.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.model;
+package com.minelittlepony.unicopia.client.render.entity.model;
 
 import net.minecraft.client.model.ModelBook;
 import net.minecraft.client.model.ModelRenderer;
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/model/DiskModel.java b/src/main/java/com/minelittlepony/unicopia/client/render/model/DiskModel.java
new file mode 100644
index 00000000..481ef7bd
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/model/DiskModel.java
@@ -0,0 +1,13 @@
+package com.minelittlepony.unicopia.client.render.model;
+
+public class DiskModel extends SphereModel {
+
+    @Override
+    protected void drawShape() {
+        Disk sphere = new Disk();
+
+        sphere.setDrawStyle(GLU.GLU_FILL);
+        sphere.setNormals(GL.GLU_SMOOTH);
+        sphere.draw(0, 1, 32, 32);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/model/ModelQuads.java b/src/main/java/com/minelittlepony/unicopia/client/render/model/ModelQuads.java
new file mode 100644
index 00000000..02d41260
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/model/ModelQuads.java
@@ -0,0 +1,32 @@
+package com.minelittlepony.unicopia.client.render.model;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.model.Box;
+import net.minecraft.client.model.Cuboid;
+import net.minecraft.client.model.Quad;
+import net.minecraft.client.model.Vertex;
+import net.minecraft.client.render.BufferBuilder;
+
+public class ModelQuads extends Box {
+
+    public ModelQuads(Cuboid renderer) {
+        super(renderer, 0, 0, 0, 0, 0, 0, 0, 0, 0);
+    }
+
+    protected List<Quad> quadList = new ArrayList<>();
+
+    public ModelQuads addFace(Vertex... vertices) {
+        quadList.add(new TexturedShape2d(vertices));
+
+        return this;
+    }
+
+    @Override
+    public void render(BufferBuilder renderer, float scale) {
+        for (Quad i : quadList) {
+            i.render(renderer, scale);
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java b/src/main/java/com/minelittlepony/unicopia/client/render/model/SphereModel.java
similarity index 72%
rename from src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java
rename to src/main/java/com/minelittlepony/unicopia/client/render/model/SphereModel.java
index 48270edc..4c30cff7 100644
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelSphere.java
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/model/SphereModel.java
@@ -1,14 +1,13 @@
-package com.minelittlepony.unicopia.model;
+package com.minelittlepony.unicopia.client.render.model;
 
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.util.glu.GLU;
-import org.lwjgl.util.glu.Sphere;
 
-import net.minecraft.client.renderer.GLAllocation;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.tileentity.TileEntityRendererDispatcher;
+import com.mojang.blaze3d.platform.GlStateManager;
 
-public class ModelSphere {
+import net.minecraft.client.util.GlAllocationUtils;
+
+
+public class SphereModel {
 
     private int displayList;
     private boolean baked;
@@ -46,7 +45,7 @@ public class ModelSphere {
         GlStateManager.pushMatrix();
 
         if (posX != 0 && posY != 9 && posZ != 0) {
-            GlStateManager.translate(posX, posY, posZ);
+            GlStateManager.translated(posX, posY, posZ);
         }
 
         glRotate(rotX, 1, 0, 0);
@@ -61,12 +60,12 @@ public class ModelSphere {
     }
 
     private void bake() {
-        displayList = GLAllocation.generateDisplayLists(1);
-        GlStateManager.glNewList(displayList, GL11.GL_COMPILE);
+        displayList = GlAllocationUtils.generateDisplayLists(1);
+        GlStateManager.newList(displayList, GL11.GL_COMPILE);
 
         drawShape();
 
-        GlStateManager.glEndList();
+        GlStateManager.endList();
     }
 
     protected void drawShape() {
@@ -79,7 +78,7 @@ public class ModelSphere {
 
     static void glRotate(float angle, float x, float y, float z) {
         if (angle != 0) {
-            GlStateManager.rotate(angle, x, y, z);
+            GlStateManager.rotatef(angle, x, y, z);
         }
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/client/render/model/TexturedShape2d.java b/src/main/java/com/minelittlepony/unicopia/client/render/model/TexturedShape2d.java
new file mode 100644
index 00000000..bab4da03
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/client/render/model/TexturedShape2d.java
@@ -0,0 +1,55 @@
+package com.minelittlepony.unicopia.client.render.model;
+
+import net.minecraft.client.model.Quad;
+import net.minecraft.client.model.Vertex;
+import net.minecraft.client.render.BufferBuilder;
+import net.minecraft.client.render.Tessellator;
+import net.minecraft.client.render.VertexFormats;
+import net.minecraft.util.math.Vec3d;
+
+public class TexturedShape2d extends Quad {
+
+    protected boolean invertNormal;
+
+    public TexturedShape2d(Vertex... vertices) {
+        super(vertices);
+    }
+
+    public TexturedShape2d(Vertex[] vertices, int texcoordU1, int texcoordV1, int texcoordU2, int texcoordV2, float textureWidth, float textureHeight) {
+        super(vertices, texcoordU1, texcoordV1, texcoordU2, texcoordV2, textureWidth, textureHeight);
+    }
+
+    public TexturedShape2d setInvertNormal() {
+        invertNormal = true;
+        return this;
+    }
+
+    @Override
+    public void render(BufferBuilder renderer, float scale) {
+        Vec3d vec3d = vertices[1].pos.reverseSubtract(vertices[0].pos);
+        Vec3d vec3d1 = vertices[1].pos.reverseSubtract(vertices[2].pos);
+        Vec3d vec3d2 = vec3d1.crossProduct(vec3d).normalize();
+        float f = (float)vec3d2.x;
+        float f1 = (float)vec3d2.y;
+        float f2 = (float)vec3d2.z;
+
+        if (invertNormal) {
+            f = -f;
+            f1 = -f1;
+            f2 = -f2;
+        }
+
+        renderer.begin(7, VertexFormats.POSITION_UV_NORMAL);
+
+        for (int i = 0; i < vertexCount; ++i) {
+            Vertex positiontexturevertex = vertices[i];
+            renderer
+                .vertex(positiontexturevertex.pos.x * scale, positiontexturevertex.pos.y * scale, positiontexturevertex.pos.z * scale)
+                .texture(positiontexturevertex.u, positiontexturevertex.v)
+                .normal(f, f1, f2)
+                .end();
+        }
+
+        Tessellator.getInstance().draw();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/command/CommandDisguise.java b/src/main/java/com/minelittlepony/unicopia/command/CommandDisguise.java
index 8d37ec7e..5eb0229e 100644
--- a/src/main/java/com/minelittlepony/unicopia/command/CommandDisguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/command/CommandDisguise.java
@@ -2,27 +2,17 @@ package com.minelittlepony.unicopia.command;
 
 import java.util.List;
 
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.spell.SpellDisguise;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.spells.SpellDisguise;
 
-import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.nbt.JsonToNBT;
-import net.minecraft.nbt.NBTException;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentTranslation;
 import net.minecraft.world.World;
-import net.minecraft.world.chunk.storage.AnvilChunkLoader;
 
-class CommandDisguise extends CommandBase {
+class CommandDisguise extends Command {
 
     @Override
     public String getName() {
@@ -45,9 +35,9 @@ class CommandDisguise extends CommandBase {
             throw new WrongUsageException(getUsage(sender));
         }
 
-        EntityPlayerMP player = args.length > 1 ? getPlayer(server, sender, args[0]) : getCommandSenderAsPlayer(sender);
+        ServerPlayerEntity player = args.length > 1 ? getPlayer(server, sender, args[0]) : getCommandSenderAsPlayer(sender);
 
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
 
         Entity entity = constructDisguiseEntity(player.world, args);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/command/CommandGravity.java b/src/main/java/com/minelittlepony/unicopia/command/CommandGravity.java
index 50110fe8..3e81e6fb 100644
--- a/src/main/java/com/minelittlepony/unicopia/command/CommandGravity.java
+++ b/src/main/java/com/minelittlepony/unicopia/command/CommandGravity.java
@@ -2,8 +2,8 @@ package com.minelittlepony.unicopia.command;
 
 import java.util.List;
 
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -34,7 +34,7 @@ class CommandGravity extends CommandBase {
         }
 
         EntityPlayer player = getCommandSenderAsPlayer(sender);
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
 
 
 
diff --git a/src/main/java/com/minelittlepony/unicopia/command/CommandOverrideGameMode.java b/src/main/java/com/minelittlepony/unicopia/command/CommandOverrideGameMode.java
index 2bc9000a..bea1e7e2 100644
--- a/src/main/java/com/minelittlepony/unicopia/command/CommandOverrideGameMode.java
+++ b/src/main/java/com/minelittlepony/unicopia/command/CommandOverrideGameMode.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.unicopia.command;
 
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 import net.minecraft.command.CommandException;
 import net.minecraft.command.CommandGameMode;
@@ -44,8 +44,8 @@ class CommandOverrideGameMode extends CommandGameMode {
     protected void updateGameMode(EntityPlayer player, GameType m) {
         player.setGameType(m);
 
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
 
-        iplayer.setPlayerSpecies(iplayer.getPlayerSpecies());
+        iplayer.setSpecies(iplayer.getSpecies());
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/command/CommandRacelist.java b/src/main/java/com/minelittlepony/unicopia/command/CommandRacelist.java
index 3bccfce0..bba5c9d6 100644
--- a/src/main/java/com/minelittlepony/unicopia/command/CommandRacelist.java
+++ b/src/main/java/com/minelittlepony/unicopia/command/CommandRacelist.java
@@ -4,7 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
@@ -48,7 +48,7 @@ class CommandRacelist extends CommandBase {
         } else if (args[0].contentEquals("allow")) {
             String translationKey = "commands.racelist.allowed";
 
-            if (!PlayerSpeciesList.instance().whiteListRace(race)) {
+            if (!SpeciesList.instance().whiteListRace(race)) {
                 translationKey += ".failed";
             }
 
@@ -62,7 +62,7 @@ class CommandRacelist extends CommandBase {
         } else if (args[0].contentEquals("disallow")) {
             String translationKey = "commands.racelist.disallowed";
 
-            if (!PlayerSpeciesList.instance().unwhiteListRace(race)) {
+            if (!SpeciesList.instance().unwhiteListRace(race)) {
                 translationKey += ".failed";
             }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/command/CommandSpecies.java b/src/main/java/com/minelittlepony/unicopia/command/CommandSpecies.java
index d907d3af..e00ab709 100644
--- a/src/main/java/com/minelittlepony/unicopia/command/CommandSpecies.java
+++ b/src/main/java/com/minelittlepony/unicopia/command/CommandSpecies.java
@@ -4,14 +4,14 @@ import java.util.ArrayList;
 import java.util.List;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
 
 import net.minecraft.command.CommandBase;
 import net.minecraft.command.CommandException;
 import net.minecraft.command.ICommandSender;
 import net.minecraft.command.WrongUsageException;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.ITextComponent;
@@ -56,7 +56,7 @@ class CommandSpecies extends CommandBase {
 
         int playerIndex = this.getPlayerIndex(args);
 
-        EntityPlayerMP player = args.length > playerIndex ? getPlayer(server, sender, args[playerIndex]) : getCommandSenderAsPlayer(sender);
+        ServerPlayerEntity player = args.length > playerIndex ? getPlayer(server, sender, args[playerIndex]) : getCommandSenderAsPlayer(sender);
 
         if (args.length >= 2) {
             switch (args[0]) {
@@ -91,8 +91,8 @@ class CommandSpecies extends CommandBase {
 
                 player.sendMessage(message);
             }
-        } else if (PlayerSpeciesList.instance().speciesPermitted(species, player)) {
-            PlayerSpeciesList.instance().getPlayer(player).setPlayerSpecies(species);
+        } else if (SpeciesList.instance().speciesPermitted(species, player)) {
+            SpeciesList.instance().getPlayer(player).setSpecies(species);
 
             ITextComponent formattedName = new TextComponentTranslation(species.name().toLowerCase());
 
@@ -112,7 +112,7 @@ class CommandSpecies extends CommandBase {
     }
 
     protected boolean printSpecies(ICommandSender sender, EntityPlayer player) {
-        Race spec = PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies();
+        Race spec = SpeciesList.instance().getPlayer(player).getSpecies();
 
         String name = "commands.race.tell.";
         name += player == sender ? "self" : "other";
@@ -136,7 +136,7 @@ class CommandSpecies extends CommandBase {
 
         boolean first = true;
         for (Race i : Race.values()) {
-            if (!i.isDefault() && PlayerSpeciesList.instance().speciesPermitted(i, player)) {
+            if (!i.isDefault() && SpeciesList.instance().speciesPermitted(i, player)) {
                 message.appendSibling(new TextComponentString((!first ? "\n" : "") + " - " + i.name().toLowerCase()));
                 first = false;
             }
@@ -191,7 +191,7 @@ class CommandSpecies extends CommandBase {
             EntityPlayer player = sender instanceof EntityPlayer ? (EntityPlayer)sender : null;
 
             for (Race i : Race.values()) {
-                if (args[0].contentEquals("describe") || (!i.isDefault() && PlayerSpeciesList.instance().speciesPermitted(i, player))) {
+                if (args[0].contentEquals("describe") || (!i.isDefault() && SpeciesList.instance().speciesPermitted(i, player))) {
                     names.add(i.name().toLowerCase());
                 }
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/ducks/IRaceContainerHolder.java b/src/main/java/com/minelittlepony/unicopia/ducks/IRaceContainerHolder.java
new file mode 100644
index 00000000..df25789d
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/ducks/IRaceContainerHolder.java
@@ -0,0 +1,25 @@
+package com.minelittlepony.unicopia.ducks;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.entity.IEntity;
+import com.minelittlepony.unicopia.magic.ICaster;
+
+import net.minecraft.entity.LivingEntity;
+
+public interface IRaceContainerHolder<T extends IEntity> {
+    T getRaceContainer();
+
+    @SuppressWarnings("unchecked")
+    @Nullable
+    default <E extends LivingEntity> ICaster<E> getCaster() {
+        T ientity = getRaceContainer();
+
+        if (ientity instanceof ICaster) {
+            return (ICaster<E>)ientity;
+        }
+        return null;
+    }
+
+    IEntity createRaceContainer();
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/edibles/ItemEdible.java b/src/main/java/com/minelittlepony/unicopia/edibles/ItemEdible.java
index 3c7a37cd..4b40ae66 100644
--- a/src/main/java/com/minelittlepony/unicopia/edibles/ItemEdible.java
+++ b/src/main/java/com/minelittlepony/unicopia/edibles/ItemEdible.java
@@ -5,14 +5,14 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UEffects;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UEffects;
 
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.init.MobEffects;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.EnumAction;
@@ -53,7 +53,7 @@ public abstract class ItemEdible extends ItemFood implements IEdible {
     }
 
     protected void onFoodEaten(ItemStack stack, World worldIn, EntityPlayer player) {
-        Race race = PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies();
+        Race race = SpeciesList.instance().getPlayer(player).getSpecies();
         Toxicity toxicity = (race.isDefault() || race == Race.CHANGELING) ? Toxicity.LETHAL : getToxicityLevel(stack);
 
         addSecondaryEffects(player, toxicity, stack);
@@ -65,7 +65,7 @@ public abstract class ItemEdible extends ItemFood implements IEdible {
     }
 
     @Override
-    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
+    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, LivingEntity entityLiving) {
 
         EntityPlayer entityplayer = entityLiving instanceof EntityPlayer ? (EntityPlayer)entityLiving : null;
 
@@ -79,8 +79,8 @@ public abstract class ItemEdible extends ItemFood implements IEdible {
             // replaced "this" with "stack.getItem()"
             entityplayer.addStat(StatList.getObjectUseStats(stack.getItem()));
 
-            if (entityplayer instanceof EntityPlayerMP) {
-                CriteriaTriggers.CONSUME_ITEM.trigger((EntityPlayerMP)entityplayer, stack);
+            if (entityplayer instanceof ServerPlayerEntity) {
+                CriteriaTriggers.CONSUME_ITEM.trigger((ServerPlayerEntity)entityplayer, stack);
             }
         }
 
@@ -103,10 +103,10 @@ public abstract class ItemEdible extends ItemFood implements IEdible {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        Race race = PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies();
+        Race race = SpeciesList.instance().getPlayer(player).getSpecies();
 
         if (race.isDefault() || race == Race.CHANGELING) {
-            return new ActionResult<ItemStack>(EnumActionResult.FAIL, player.getHeldItem(hand));
+            return new ActionResult<ItemStack>(EnumActionResult.FAIL, player.getStackInHand(hand));
         }
 
         return super.onItemRightClick(world, player, hand);
diff --git a/src/main/java/com/minelittlepony/unicopia/edibles/UItemFoodDelegate.java b/src/main/java/com/minelittlepony/unicopia/edibles/UItemFoodDelegate.java
index 6b3d3914..1ef2cb36 100644
--- a/src/main/java/com/minelittlepony/unicopia/edibles/UItemFoodDelegate.java
+++ b/src/main/java/com/minelittlepony/unicopia/edibles/UItemFoodDelegate.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.ItemFood;
@@ -37,7 +37,7 @@ public class UItemFoodDelegate extends ItemMultiTexture implements IEdible {
     }
 
     @Override
-    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
+    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, LivingEntity entityLiving) {
         return foodItem.onItemUseFinish(stack, worldIn, entityLiving);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/AbstractSpecialRecipe.java b/src/main/java/com/minelittlepony/unicopia/enchanting/AbstractSpecialRecipe.java
index 9d2dc87b..ee2f15f7 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/AbstractSpecialRecipe.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/AbstractSpecialRecipe.java
@@ -7,7 +7,7 @@ import com.google.common.collect.Lists;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
-import com.minelittlepony.unicopia.inventory.InventorySpellBook;
+import com.minelittlepony.unicopia.inventory.gui.SpellBookInventory;
 
 import net.minecraft.inventory.InventoryCrafting;
 import net.minecraft.item.ItemStack;
@@ -57,7 +57,7 @@ public abstract class AbstractSpecialRecipe extends Impl<IRecipe> implements IRe
 
     @Override
     public boolean matches(InventoryCrafting inv, World worldIn) {
-        ItemStack enchantedStack = ((InventorySpellBook)inv).getCraftResultMatrix().getStackInSlot(0);
+        ItemStack enchantedStack = ((SpellBookInventory)inv).getCraftResultMatrix().getStackInSlot(0);
 
         if (enchantedStack.isEmpty() || enchantedStack.getItem() == null) {
             return false;
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/AffineIngredients.java b/src/main/java/com/minelittlepony/unicopia/enchanting/AffineIngredients.java
index 19c6b5ae..e153095e 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/AffineIngredients.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/AffineIngredients.java
@@ -12,7 +12,7 @@ import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.util.AssetWalker;
 
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class AffineIngredients {
 
@@ -22,9 +22,9 @@ public class AffineIngredients {
         return instance;
     }
 
-    private final Map<ResourceLocation, SpellIngredient> storedIngredients = Maps.newHashMap();
+    private final Map<Identifier, SpellIngredient> storedIngredients = Maps.newHashMap();
 
-    private final AssetWalker walker = new AssetWalker(new ResourceLocation(Unicopia.MODID, "enchanting/ingredients"), this::handleJson);
+    private final AssetWalker walker = new AssetWalker(new Identifier(Unicopia.MODID, "enchanting/ingredients"), this::handleJson);
 
     public void load() {
         storedIngredients.clear();
@@ -32,7 +32,7 @@ public class AffineIngredients {
         walker.walk();
     }
 
-    public SpellIngredient getIngredient(ResourceLocation res) {
+    public SpellIngredient getIngredient(Identifier res) {
         SpellIngredient result = storedIngredients.get(res);
 
         if (result == null) {
@@ -43,7 +43,7 @@ public class AffineIngredients {
         return result;
     }
 
-    protected void handleJson(ResourceLocation id, JsonObject json) throws JsonParseException {
+    protected void handleJson(Identifier id, JsonObject json) throws JsonParseException {
         SpellIngredient ingredient = SpellIngredient.parse(json.get("items"));
 
         if (ingredient != null) {
@@ -53,9 +53,9 @@ public class AffineIngredients {
 
     static class AffineIngredient implements SpellIngredient {
 
-        private final ResourceLocation res;
+        private final Identifier res;
 
-        AffineIngredient(ResourceLocation res) {
+        AffineIngredient(Identifier res) {
             this.res = res;
         }
 
@@ -76,7 +76,7 @@ public class AffineIngredients {
 
         @Nonnull
         static SpellIngredient parse(JsonObject json) {
-            return new AffineIngredient(new ResourceLocation(json.get("id").getAsString()));
+            return new AffineIngredient(new Identifier(json.get("id").getAsString()));
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/IPage.java b/src/main/java/com/minelittlepony/unicopia/enchanting/IPage.java
index e720c794..d5e36329 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/IPage.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/IPage.java
@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.enchanting;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 /**
  * A spellbook page
@@ -15,7 +15,7 @@ public interface IPage extends Comparable<IPage> {
     /**
      * The unique name of this page.
      */
-    ResourceLocation getName();
+    Identifier getName();
 
     /**
      * Tests unlock conditions for this page.
@@ -27,7 +27,7 @@ public interface IPage extends Comparable<IPage> {
      * Gets the texture.
      * This is what's shown when this page is opened in the book gui.
      */
-    ResourceLocation getTexture();
+    Identifier getTexture();
 
     /**
      * The default state.
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/IPageOwner.java b/src/main/java/com/minelittlepony/unicopia/enchanting/IPageOwner.java
index 2a86c8fc..eead7efc 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/IPageOwner.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/IPageOwner.java
@@ -6,7 +6,7 @@ import javax.annotation.Nonnull;
 
 import com.minelittlepony.unicopia.network.ITransmittable;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 /**
  * Interface for things that own and can unlock pages.
@@ -15,7 +15,7 @@ import net.minecraft.util.ResourceLocation;
 public interface IPageOwner extends ITransmittable {
 
     @Nonnull
-    Map<ResourceLocation, PageState> getPageStates();
+    Map<Identifier, PageState> getPageStates();
 
     default void setPageState(IPage page, PageState state) {
         if (state == PageState.LOCKED) {
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/PageInstance.java b/src/main/java/com/minelittlepony/unicopia/enchanting/PageInstance.java
index 8218d066..34f2d08a 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/PageInstance.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/PageInstance.java
@@ -6,20 +6,20 @@ import javax.annotation.Nullable;
 import com.google.gson.JsonObject;
 import com.google.gson.annotations.Expose;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 class PageInstance implements IPage {
 
     int index;
 
     @Nullable
-    ResourceLocation parent;
+    Identifier parent;
 
     @Nonnull
-    ResourceLocation name;
+    Identifier name;
 
     @Nonnull
-    ResourceLocation texture;
+    Identifier texture;
 
     @Nullable
     IUnlockCondition<IUnlockEvent> condition;
@@ -27,11 +27,11 @@ class PageInstance implements IPage {
     @Expose
     PageState state = PageState.LOCKED;
 
-    PageInstance(ResourceLocation id, JsonObject json) {
+    PageInstance(Identifier id, JsonObject json) {
         this.name = id;
 
         if (json.has("parent")) {
-            parent = new ResourceLocation(json.get("parent").getAsString());
+            parent = new Identifier(json.get("parent").getAsString());
         }
 
         if (json.has("state")) {
@@ -52,7 +52,7 @@ class PageInstance implements IPage {
             loc[0] = id.getNamespace();
         }
 
-        texture = new ResourceLocation(loc[0], String.format("textures/pages/%s.png", loc[1]));
+        texture = new Identifier(loc[0], String.format("textures/pages/%s.png", loc[1]));
     }
 
     @Override
@@ -61,12 +61,12 @@ class PageInstance implements IPage {
     }
 
     @Override
-    public ResourceLocation getName() {
+    public Identifier getName() {
         return name;
     }
 
     @Override
-    public ResourceLocation getTexture() {
+    public Identifier getTexture() {
         return texture;
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/PageStateCondition.java b/src/main/java/com/minelittlepony/unicopia/enchanting/PageStateCondition.java
index dfa4062e..b4561509 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/PageStateCondition.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/PageStateCondition.java
@@ -2,11 +2,11 @@ package com.minelittlepony.unicopia.enchanting;
 
 import com.google.gson.JsonObject;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class PageStateCondition implements IUnlockCondition<IUnlockEvent> {
 
-    ResourceLocation page;
+    Identifier page;
 
     PageState state;
 
@@ -14,7 +14,7 @@ public class PageStateCondition implements IUnlockCondition<IUnlockEvent> {
         require(json, "page");
         require(json, "state");
 
-        page = new ResourceLocation(json.get("page").getAsString());
+        page = new Identifier(json.get("page").getAsString());
         state = PageState.of(json.get("state").getAsString());
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java b/src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java
index 20984c26..8e0cba37 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/Pages.java
@@ -14,7 +14,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.minelittlepony.util.AssetWalker;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class Pages {
 
@@ -24,12 +24,12 @@ public class Pages {
         return instance;
     }
 
-    private final Map<ResourceLocation, PageInstance> pages = Maps.newHashMap();
+    private final Map<Identifier, PageInstance> pages = Maps.newHashMap();
     private List<PageInstance> pagesByIndex = Lists.newArrayList();
 
     private final Map<String, IConditionFactory> conditionFactories = Maps.newHashMap();
 
-    private final AssetWalker assets = new AssetWalker(new ResourceLocation("unicopia", "pages"), this::addPage);
+    private final AssetWalker assets = new AssetWalker(new Identifier("unicopia", "pages"), this::addPage);
 
     Pages() {
         registerConditionFactory("unicopia:compound_condition", CompoundCondition::new);
@@ -74,7 +74,7 @@ public class Pages {
         return a.name.compareTo(b.name);
     }
 
-    void addPage(ResourceLocation id, JsonObject json) throws JsonParseException {
+    void addPage(Identifier id, JsonObject json) throws JsonParseException {
         pages.put(id, new PageInstance(id, json));
     }
 
@@ -86,7 +86,7 @@ public class Pages {
     }
 
     @Nullable
-    public IPage getByName(ResourceLocation name) {
+    public IPage getByName(Identifier name) {
         return pages.get(name);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/SpellIngredient.java b/src/main/java/com/minelittlepony/unicopia/enchanting/SpellIngredient.java
index 1527fb53..917b1cd1 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/SpellIngredient.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/SpellIngredient.java
@@ -146,7 +146,7 @@ public interface SpellIngredient {
                 ItemStack stack = new ItemStack(item, size, metadata);
 
                 if (spell != null) {
-                    stack = SpellRegistry.instance().enchantStack(stack, spell);
+                    stack = SpellRegistry.getInstance().enchantStack(stack, spell);
                 }
 
                 return new Single(stack, !(json.has("spell") || json.has("data")));
diff --git a/src/main/java/com/minelittlepony/unicopia/enchanting/SpellRecipe.java b/src/main/java/com/minelittlepony/unicopia/enchanting/SpellRecipe.java
index 4fa4a483..01df38d5 100644
--- a/src/main/java/com/minelittlepony/unicopia/enchanting/SpellRecipe.java
+++ b/src/main/java/com/minelittlepony/unicopia/enchanting/SpellRecipe.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.unicopia.enchanting;
 
 import com.google.gson.JsonObject;
-import com.minelittlepony.unicopia.inventory.InventorySpellBook;
+import com.minelittlepony.unicopia.inventory.gui.SpellBookInventory;
 import com.minelittlepony.unicopia.spell.SpellRegistry;
 
 import net.minecraft.inventory.IInventory;
@@ -32,16 +32,16 @@ public class SpellRecipe extends AbstractSpecialRecipe {
 
 	@Override
 	public ItemStack getCraftingResult(InventoryCrafting inv) {
-        InventorySpellBook inventory = (InventorySpellBook)inv;
+        SpellBookInventory inventory = (SpellBookInventory)inv;
 
         IInventory craftResult = inventory.getCraftResultMatrix();
         ItemStack stackToEnchant = craftResult.getStackInSlot(0);
 
-        return SpellRegistry.instance().enchantStack(stackToEnchant, spellId);
+        return SpellRegistry.getInstance().enchantStack(stackToEnchant, spellId);
 	}
 
 	@Override
 	public ItemStack getRecipeOutput() {
-		return SpellRegistry.instance().enchantStack(super.getRecipeOutput(), spellId);
+		return SpellRegistry.getInstance().enchantStack(super.getRecipeOutput(), spellId);
 	}
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityButterfly.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityButterfly.java
index 30c43121..343e936f 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityButterfly.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityButterfly.java
@@ -6,41 +6,45 @@ import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Unicopia;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.monster.IMob;
-import net.minecraft.entity.passive.EntityAmbientCreature;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.entity.EntityCategory;
+import net.minecraft.entity.EntityPose;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.SpawnType;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.mob.AmbientEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IWorld;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome.SpawnListEntry;
+import net.minecraft.world.biome.Biome.SpawnEntry;
 
-public class EntityButterfly extends EntityAmbientCreature {
+public class EntityButterfly extends AmbientEntity {
 
-    public static final SpawnListEntry SPAWN_ENTRY = new SpawnListEntry(EntityButterfly.class, 15, 9, 15);
+    public static final EntityType<EntityButterfly> TYPE = EntityType.Builder.create(EntityButterfly::new, EntityCategory.AMBIENT)
+            .setDimensions(0.1F, 0.1F)
+            .build("butterfly");
 
-    private static final DataParameter<Boolean> RESTING = EntityDataManager.createKey(EntityButterfly.class, DataSerializers.BOOLEAN);
+    public static final SpawnEntry SPAWN_ENTRY = new SpawnEntry(TYPE, 15, 9, 15);
 
-    private static final DataParameter<Integer> VARIANT = EntityDataManager.createKey(EntityButterfly.class, DataSerializers.VARINT);
+    private static final TrackedData<Boolean> RESTING = DataTracker.registerData(EntityButterfly.class, TrackedDataHandlerRegistry.BOOLEAN);
+
+    private static final TrackedData<Integer> VARIANT = DataTracker.registerData(EntityButterfly.class, TrackedDataHandlerRegistry.INTEGER);
 
     private BlockPos hoveringPosition;
 
-    public EntityButterfly(World world) {
-        super(world);
-
-        preventEntitySpawning = false;
-        width = 0.1F;
-        height = 0.1F;
-
-        setVariaty(Variant.random(world.rand));
+    public EntityButterfly(EntityType<EntityButterfly> type, World world) {
+        super(type, world);
+        setVariaty(Variant.random(world.random));
         setResting(true);
     }
 
@@ -57,53 +61,51 @@ public class EntityButterfly extends EntityAmbientCreature {
     }
 
     @Override
-    protected void applyEntityAttributes() {
-        super.applyEntityAttributes();
-        getEntityAttribute(SharedMonsterAttributes.MAX_HEALTH).setBaseValue(2);
+    protected void initAttributes() {
+        super.initAttributes();
+        getAttributeInstance(EntityAttributes.MAX_HEALTH).setBaseValue(2);
     }
 
     @Override
-    protected void entityInit() {
-        super.entityInit();
-        dataManager.register(VARIANT, Variant.BUTTERFLY.ordinal());
-        dataManager.register(RESTING, false);
+    protected void initDataTracker() {
+        super.initDataTracker();
+        getDataTracker().startTracking(VARIANT, Variant.BUTTERFLY.ordinal());
+        getDataTracker().startTracking(RESTING, false);
     }
 
     @Override
-    public boolean canBePushed() {
+    public boolean isPushable() {
         return false;
     }
 
     @Override
-    protected void collideWithEntity(Entity entity) {
-    }
+    public boolean collides() {
+        return false;
+     }
 
     @Override
-    protected void collideWithNearbyEntities() {
-    }
+    public void tick() {
+        super.tick();
 
-    @Override
-    public void onUpdate() {
-        super.onUpdate();
-
-        motionY *= 0.6;
+        Vec3d vel = getVelocity();
+        setVelocity(vel.x, y * 0.6, vel.z);
     }
 
     public boolean isResting() {
-        return dataManager.get(RESTING);
+        return getDataTracker().get(RESTING);
     }
 
     public void setResting(boolean resting) {
-        dataManager.set(RESTING, resting);
+        getDataTracker().set(RESTING, resting);
     }
 
     public Variant getVariety() {
         Variant[] values = Variant.values();
-        return values[dataManager.get(VARIANT) % values.length];
+        return values[getDataTracker().get(VARIANT) % values.length];
     }
 
     public void setVariaty(Variant variant) {
-        dataManager.set(VARIANT, variant.ordinal());
+        getDataTracker().set(VARIANT, variant.ordinal());
     }
 
     protected boolean isAggressor(Entity e) {
@@ -111,32 +113,34 @@ public class EntityButterfly extends EntityAmbientCreature {
             return false;
         }
 
-        if (e instanceof EntityPlayer) {
-            EntityPlayer player = (EntityPlayer)e;
+        if (e instanceof PlayerEntity) {
+            PlayerEntity player = (PlayerEntity)e;
 
             if (player.isCreative() || player.isSpectator()) {
                 return false;
             }
 
-            if (player.isSprinting() || player.isSwingInProgress || player.moveForward > 0 || player.moveStrafing > 0) {
+            if (player.isSprinting() || player.isHandSwinging || player.forwardSpeed > 0 || player.sidewaysSpeed > 0) {
                 return true;
             }
-        } else if (!IMob.VISIBLE_MOB_SELECTOR.test(e)) {
+            // TODO:
+        }/* else if (!IMob.VISIBLE_MOB_SELECTOR.test(e)) {
             return false;
-        }
+        }*/
 
-        return Math.abs(e.motionX) > 0 || Math.abs(e.motionZ) > 0;
+        return e.getVelocity().x != 0 || e.getVelocity().z != 0;
     }
 
-    protected void updateAITasks() {
-        super.updateAITasks();
+    @Override
+    public void tickMovement() {
+        super.tickMovement();
 
-        BlockPos pos = getPosition();
+        BlockPos pos = getBlockPos();
         BlockPos below = pos.down();
 
         if (isResting()) {
-            if (world.getBlockState(below).isNormalCube()) {
-                if (world.getEntitiesWithinAABBExcludingEntity(this, getEntityBoundingBox().grow(7)).stream().anyMatch(this::isAggressor)) {
+            if (world.getBlockState(below).isOpaque()) {
+                if (world.getEntities(this, getBoundingBox().expand(7)).stream().anyMatch(this::isAggressor)) {
                     setResting(false);
                 }
             } else {
@@ -146,70 +150,62 @@ public class EntityButterfly extends EntityAmbientCreature {
         } else {
 
             // invalidate the hovering position
-            if (hoveringPosition != null && (!world.isAirBlock(hoveringPosition) || hoveringPosition.getY() < 1)) {
+            if (hoveringPosition != null && (!world.isAir(hoveringPosition) || hoveringPosition.getY() < 1)) {
                 hoveringPosition = null;
             }
 
             // select a new hovering position
-            if (hoveringPosition == null || rand.nextInt(30) == 0 || hoveringPosition.distanceSq(posX, posY, posZ) < 4) {
-                hoveringPosition = new BlockPos(posX + rand.nextInt(7) - rand.nextInt(7), posY + rand.nextInt(6) - 2, posZ + rand.nextInt(7) - rand.nextInt(7));
+            if (hoveringPosition == null || random.nextInt(30) == 0 || hoveringPosition.getSquaredDistance(pos) < 4) {
+                hoveringPosition = new BlockPos(x + random.nextInt(7) - random.nextInt(7), y + random.nextInt(6) - 2, z + random.nextInt(7) - random.nextInt(7));
             }
 
             // hover casually towards the chosen position
 
-            double changedX = hoveringPosition.getX() + 0.5D - posX;
-            double changedY = hoveringPosition.getY() + 0.1D - posY;
-            double changedZ = hoveringPosition.getZ() + 0.5D - posZ;
+            double changedX = hoveringPosition.getX() + 0.5D - x;
+            double changedY = hoveringPosition.getY() + 0.1D - y;
+            double changedZ = hoveringPosition.getZ() + 0.5D - z;
 
-            motionX += (Math.signum(changedX) * 0.5D - motionX) * 0.10000000149011612D;
-            motionY += (Math.signum(changedY) * 0.699999988079071D - motionY) * 0.10000000149011612D;
-            motionZ += (Math.signum(changedZ) * 0.5D - motionZ) * 0.10000000149011612D;
+            Vec3d vel = getVelocity();
 
-            float f = (float)(MathHelper.atan2(motionZ, motionX) * (180 / Math.PI)) - 90;
+            setVelocity(
+                vel.x + (Math.signum(changedX) * 0.5D - vel.x) * 0.10000000149011612D,
+                vel.y + (Math.signum(changedY) * 0.699999988079071D - vel.y) * 0.10000000149011612D,
+                vel.z + (Math.signum(changedZ) * 0.5D - vel.z) * 0.10000000149011612D
+            );
 
-            moveForward = 0.5F;
-            rotationYaw += MathHelper.wrapDegrees(f - rotationYaw);
+            float f = (float)(MathHelper.atan2(vel.z, vel.x) * (180 / Math.PI)) - 90;
 
-            if (rand.nextInt(100) == 0 && world.getBlockState(below).isNormalCube()) {
+            forwardSpeed = 0.5F;
+            headYaw += MathHelper.wrapDegrees(f - headYaw);
+
+            if (random.nextInt(100) == 0 && world.getBlockState(below).isOpaque()) {
                 setResting(true);
             }
         }
     }
 
     @Override
-    protected boolean canTriggerWalking() {
-        return false;
+    public void handleFallDamage(float distance, float damageMultiplier) {
     }
 
     @Override
-    public void fall(float distance, float damageMultiplier) {
+    protected void fall(double y, boolean onGroundIn, BlockState state, BlockPos pos) {
     }
 
     @Override
-    protected void updateFallState(double y, boolean onGroundIn, IBlockState state, BlockPos pos) {
-    }
-
-    @Override
-    public boolean doesEntityNotTriggerPressurePlate() {
+    public boolean canSpawn(IWorld world, SpawnType type) {
+        if (type == SpawnType.NATURAL) {
+            return y < world.getSeaLevel() && world.getLightLevel(getBlockPos()) > 7;
+        }
         return true;
     }
 
     @Override
-    public boolean getCanSpawnHere() {
-        if (posY < world.getSeaLevel()) {
-            return false;
-        }
-
-        return world.getLightFromNeighbors(getPosition()) > 7
-                && super.getCanSpawnHere();
+    public float getEyeHeight(EntityPose pos) {
+        return getHeight() / 2;
     }
 
-    @Override
-    public float getEyeHeight() {
-        return height / 2;
-    }
-
-    public static enum Variant {
+    public enum Variant {
         BUTTERFLY,
         YELLOW,
         LIME,
@@ -226,9 +222,9 @@ public class EntityButterfly extends EntityAmbientCreature {
         WHITE_MONARCH,
         BRIMSTONE;
 
-        private final ResourceLocation skin = new ResourceLocation(Unicopia.MODID, "textures/entity/butterfly/" + name().toLowerCase() + ".png");
+        private final Identifier skin = new Identifier(Unicopia.MODID, "textures/entity/butterfly/" + name().toLowerCase() + ".png");
 
-        public ResourceLocation getSkin() {
+        public Identifier getSkin() {
             return skin;
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
index aa4259c0..8e7e4bf1 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityCloud.java
@@ -4,57 +4,48 @@ import java.util.Map;
 
 import com.minelittlepony.unicopia.Predicates;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.UItems;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.powers.PowerCloudBase.ICloudEntity;
 
-import net.minecraft.block.BlockCrops;
-import net.minecraft.block.BlockFarmland;
-import net.minecraft.block.BlockFire;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.CropBlock;
+import net.minecraft.block.FarmlandBlock;
+import net.minecraft.block.FireBlock;
 import net.minecraft.enchantment.Enchantment;
 import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.enchantment.Enchantments;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityFlying;
-import net.minecraft.entity.IEntityLivingData;
-import net.minecraft.entity.MoverType;
-import net.minecraft.entity.effect.EntityLightningBolt;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.passive.IAnimals;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Enchantments;
-import net.minecraft.init.SoundEvents;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.LightningEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.mob.FlyingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemSpade;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemSword;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.DifficultyInstance;
+import net.minecraft.world.Heightmap;
 import net.minecraft.world.World;
 
-public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
+public class EntityCloud extends FlyingEntity implements ICloudEntity, IAnimals, IInAnimate {
 
-    private static final DataParameter<Integer> RAINTIMER = EntityDataManager.createKey(EntityCloud.class, DataSerializers.VARINT);
-    private static final DataParameter<Boolean> THUNDERING = EntityDataManager.createKey(EntityCloud.class, DataSerializers.BOOLEAN);
-    private static final DataParameter<Integer> SCALE = EntityDataManager.createKey(EntityCloud.class, DataSerializers.VARINT);
+    private static final TrackedData<Integer> RAINTIMER = DataTracker.registerData(EntityCloud.class, TrackedDataHandlerRegistry.INTEGER);
+    private static final TrackedData<Boolean> THUNDERING = DataTracker.registerData(EntityCloud.class, TrackedDataHandlerRegistry.BOOLEAN);
+    private static final TrackedData<Integer> SCALE = DataTracker.registerData(EntityCloud.class, TrackedDataHandlerRegistry.INTEGER);
 
-    private static final DataParameter<Boolean> STATIONARY = EntityDataManager.createKey(EntityCloud.class, DataSerializers.BOOLEAN);
+    private static final TrackedData<Boolean> STATIONARY = DataTracker.registerData(EntityCloud.class, TrackedDataHandlerRegistry.BOOLEAN);
 
     protected double targetAltitude;
 
@@ -64,29 +55,29 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     private final double baseWidth = 3f;
     private final double baseHeight = 0.8f;
 
-    public EntityCloud(World world) {
-        super(world);
-        ignoreFrustumCheck = true;
+    public EntityCloud(EntityType<EntityCloud> type, World world) {
+        super(type, world);
+        ignoreCameraFrustum = true;
         targetAltitude = getRandomFlyingHeight();
     }
 
     @Override
-    protected void entityInit() {
-        super.entityInit();
-        dataManager.register(RAINTIMER, 0);
-        dataManager.register(THUNDERING, false);
-        dataManager.register(STATIONARY, false);
-        dataManager.register(SCALE, 1);
+    protected void initDataTracker() {
+        super.initDataTracker();
+        dataTracker.startTracking(RAINTIMER, 0);
+        dataTracker.startTracking(THUNDERING, false);
+        dataTracker.startTracking(STATIONARY, false);
+        dataTracker.startTracking(SCALE, 1);
     }
 
     @Override
     protected SoundEvent getHurtSound(DamageSource damageSource) {
-        return SoundEvents.BLOCK_CLOTH_HIT;
+        return SoundEvents.BLOCK_WOOL_HIT;
     }
 
     @Override
     protected SoundEvent getDeathSound() {
-        return SoundEvents.BLOCK_CLOTH_STEP;
+        return SoundEvents.BLOCK_WOOL_BREAK;
     }
 
     @Override
@@ -105,33 +96,27 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     @Override
-    public boolean canRenderOnFire() {
+    public boolean doesRenderOnFire() {
         return false;
     }
 
-    /**
-     * Gets the render brightness of this entity based on the surrounding world light values.
-     */
     @Override
-    public int getBrightnessForRender() {
+    public int getLightmapCoordinates() {
         return 0xF000F0;
     }
 
-    /**
-     * Gets the brightness percentage for this entity based on the surrounding world light values.
-     */
     @Override
-    public float getBrightness() {
-        return 1;
+    public float getBrightnessAtEyes() {
+        return 0xF000F0;
     }
 
     @Override
-    protected boolean canDespawn() {
-        return !hasCustomName() && !getStationary() && !getOpaque();
+    public boolean cannotDespawn() {
+        return hasCustomName() || getStationary() || getOpaque();
     }
 
     @Override
-    public int getMaxSpawnedInChunk() {
+    public int getLimitPerChunk() {
         return 6;
     }
 
@@ -147,14 +132,14 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
 
     @Override
     public IEntityLivingData onInitialSpawn(DifficultyInstance difficulty, IEntityLivingData pack) {
-        if (world.rand.nextInt(20) == 0 && canRainHere()) {
+        if (world.random.nextInt(20) == 0 && canRainHere()) {
             setRaining();
-            if (world.rand.nextInt(20) == 0) {
+            if (world.random.nextInt(20) == 0) {
                 setIsThundering(true);
             }
         }
 
-        setCloudSize(1 + rand.nextInt(4));
+        setCloudSize(1 + random.nextInt(4));
 
         return super.onInitialSpawn(difficulty, pack);
     }
@@ -183,50 +168,50 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
 
     @Override
     public void onUpdate() {
-        AxisAlignedBB boundingbox = getEntityBoundingBox();
+        Box boundingbox = getBoundingBox();
 
         if (getIsRaining()) {
-            if (world.isRemote) {
+            if (world.isClient) {
                 for (int i = 0; i < 30 * getCloudSize(); i++) {
-                    double x = MathHelper.nextDouble(rand, boundingbox.minX, boundingbox.maxX);
-                    double y = getEntityBoundingBox().minY + height/2;
+                    double x = MathHelper.nextDouble(random, boundingbox.minX, boundingbox.maxX);
+                    double y = getBoundingBox().minY + getHeight()/2;
                     double z = MathHelper.nextDouble(rand, boundingbox.minZ, boundingbox.maxZ);
 
-                    int particleId = canSnowHere(new BlockPos(x, y, z)) ? EnumParticleTypes.SNOW_SHOVEL.getParticleID() : UParticles.RAIN_DROPS;
+                    int particleId = canSnowHere(new BlockPos(x, y, z)) ? ParticleTypes.ITEM_SNOWBALL.getType() : UParticles.RAIN_DROPS;
 
-                    Particles.instance().spawnParticle(particleId, false, x, y, z, 0, 0, 0);
+                    ParticleTypeRegistry.getTnstance().spawnParticle(particleId, false, x, y, z, 0, 0, 0);
                 }
 
-                AxisAlignedBB rainedArea = boundingbox
+                Box rainedArea = boundingbox
                         .expand(1, 0, 1)
-                        .expand(0, -(posY - getGroundPosition(posX, posZ).getY()), 0);
+                        .expand(0, -(y - getGroundPosition(x, z).getY()), 0);
 
 
-                for (EntityPlayer j : world.getEntitiesWithinAABB(EntityPlayer.class, rainedArea)) {
-                    if (!canSnowHere(j.getPosition())) {
-                        j.world.playSound(j, j.getPosition(), SoundEvents.WEATHER_RAIN, SoundCategory.AMBIENT, 0.1F, 0.6F);
+                for (PlayerEntity j : world.getEntities(PlayerEntity.class, rainedArea)) {
+                    if (!canSnowHere(j.getBlockPos())) {
+                        j.world.playSound(j, j.getBlockPos(), SoundEvents.WEATHER_RAIN, SoundCategory.AMBIENT, 0.1F, 0.6F);
                     }
                 }
             }
 
             BlockPos pos = getGroundPosition(
-                posX + rand.nextFloat() * width,
-                posZ + rand.nextFloat() * width
+                x + random.nextFloat() * width,
+                z + random.nextFloat() * width
             );
 
             if (getIsThundering()) {
-                if (rand.nextInt(3000) == 0) {
+                if (random.nextInt(3000) == 0) {
                     spawnThunderbolt(pos);
                 }
 
-                if (rand.nextInt(200) == 0) {
+                if (random.nextInt(200) == 0) {
                     setIsThundering(false);
                 }
             }
 
-            IBlockState state = world.getBlockState(pos);
+            BlockState state = world.getBlockState(pos);
 
-            if (state.getBlock() instanceof BlockFire) {
+            if (state.getBlock() instanceof FireBlock) {
                 world.setBlockState(pos, Blocks.AIR.getDefaultState());
             }
 
@@ -239,20 +224,20 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
                     }
 
                     if (world.canSnowAt(pos, false)) {
-                        world.setBlockState(pos, Blocks.SNOW_LAYER.getDefaultState());
+                        world.setBlockState(pos, Blocks.SNOW.getDefaultState());
                     }
 
-                    if (state.getBlock() instanceof BlockFarmland) {
-                        int moisture = state.getValue(BlockFarmland.MOISTURE);
+                    if (state.getBlock() instanceof FarmlandBlock) {
+                        int moisture = state.getValue(FarmlandBlock.MOISTURE);
 
                         if (moisture < 7) {
-                            world.setBlockState(below, state.withProperty(BlockFarmland.MOISTURE, moisture + 1));
+                            world.setBlockState(below, state.with(FarmlandBlock.MOISTURE, moisture + 1));
                         }
-                    } else if (state.getBlock() instanceof BlockCrops) {
-                        int age = state.getValue(BlockCrops.AGE);
+                    } else if (state.getBlock() instanceof CropBlock) {
+                        int age = state.getValue(CropBlock.AGE);
 
                         if (age < 7) {
-                            world.setBlockState(below, state.withProperty(BlockCrops.AGE, age + 1), 2);
+                            world.setBlockState(below, state.with(CropBlock.AGE, age + 1), 2);
                         }
                     }
 
@@ -268,14 +253,14 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
                         setIsRaining(false);
                         setCloudSize(getCloudSize() - 1);
                     } else {
-                        setDead();
+                        remove();
                     }
                 }
             }
         } else {
-            if (rand.nextInt(8000) == 0 && canRainHere()) {
+            if (random.nextInt(8000) == 0 && canRainHere()) {
                 setRaining();
-                if (rand.nextInt(7000) == 0) {
+                if (random.nextInt(7000) == 0) {
                     setIsThundering(true);
                 }
             }
@@ -294,17 +279,15 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
 
         if (isBurning() && !dead) {
             for (int i = 0; i < 5; i++) {
-                world.spawnParticle(EnumParticleTypes.CLOUD,
-                        MathHelper.nextDouble(rand, boundingbox.minX, boundingbox.maxX),
-                        MathHelper.nextDouble(rand, boundingbox.minY, boundingbox.maxY),
-                        MathHelper.nextDouble(rand, boundingbox.minZ, boundingbox.maxZ), 0, 0.25, 0);
+                world.spawnParticle(ParticleTypes.CLOUD,
+                        MathHelper.nextDouble(random, boundingbox.minX, boundingbox.maxX),
+                        MathHelper.nextDouble(random, boundingbox.minY, boundingbox.maxY),
+                        MathHelper.nextDouble(random, boundingbox.minZ, boundingbox.maxZ), 0, 0.25, 0);
             }
         }
 
         if (getStationary()) {
-            motionX = 0;
-            motionY = 0;
-            motionZ = 0;
+            setVelocity(0, 0, 0);
         }
 
         super.onUpdate();
@@ -340,7 +323,7 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
                 player.distanceWalkedModified = (float)(player.distanceWalkedModified + MathHelper.sqrt(difX * difX + difZ * difZ) * 0.6);
                 player.distanceWalkedOnStepModified = (float)(player.distanceWalkedOnStepModified + MathHelper.sqrt(difX * difX + difY * difY + difZ * difZ) * 0.6);
 
-                if (PlayerSpeciesList.instance().getPlayer(player).stepOnCloud()) {
+                if (SpeciesList.instance().getPlayer(player).stepOnCloud()) {
                     SoundType soundtype = SoundType.CLOTH;
                     player.playSound(soundtype.getStepSound(), soundtype.getVolume() * 0.15F, soundtype.getPitch());
                 }
@@ -351,26 +334,26 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     @Override
-    protected void updateAITasks() {
+    protected void mobTick() {
         if (!getStationary()) {
-            if (!isBeingRidden()) {
-                double distance = targetAltitude - posY;
+            if (!hasVehicle()) {
+                double distance = targetAltitude - y;
 
-                if (targetAltitude < posY && !world.isAirBlock(getPosition())) {
+                if (targetAltitude < y && !world.isAir(getBlockPos())) {
                     distance = 0;
                 }
 
-                if (Math.abs(distance) < 1 && rand.nextInt(7000) == 0) {
+                if (Math.abs(distance) < 1 && random.nextInt(7000) == 0) {
                     targetAltitude = getRandomFlyingHeight();
-                    distance = targetAltitude - posY;
+                    distance = targetAltitude - y;
                 }
 
                 if (Math.abs(distance) < 1) {
                     distance = 0;
                 }
 
-                motionX -= 0.002;
-                motionY += (Math.signum(distance) * 0.699999988079071D - motionY) * 0.10000000149011612D;
+                getVelocity().y -= 0.002;
+                getVelocity().y += (Math.signum(distance) * 0.699999988079071D - getVelocity().y) * 0.10000000149011612D;
             }
         }
     }
@@ -382,12 +365,12 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
         float min = Math.min(a, b);
         float max = Math.max(a, b);
 
-        return min + world.rand.nextFloat() * (max - min);
+        return min + world.random.nextFloat() * (max - min);
     }
 
     protected float getMinimumFlyingHeight() {
-        float ground = world.provider.getAverageGroundLevel();
-        float cloud = world.getWorldType().getCloudHeight();
+        float ground = world.getDimension().getAverageGroundLevel();
+        float cloud = world.getDimension().getCloudHeight();
 
         float min = Math.min(ground, cloud);
         float max = Math.max(ground, cloud);
@@ -396,23 +379,24 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     protected float getMaximumFlyingHeight() {
-        return world.provider.getActualHeight() - 5;
+        return world.getDimension().getCloudHeight() - 5;
     }
 
     @Override
-    public void handleStatusUpdate(byte type) {
+    public void handleStatus(byte type) {
         if (type == 2) {
-            if (!isBurning()) {
+            if (!isOnFire()) {
                 for (int i = 0; i < 50 * getCloudSize(); i++) {
-                    Particles.instance().getEntityEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
+                    ParticleTypeRegistry.getTnstance().getEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
                 }
             }
         }
-        super.handleStatusUpdate(type);
+        super.handleStatus(type);
     }
 
+    @Override
     public void handlePegasusInteration(int interationType) {
-        if (!world.isRemote) {
+        if (!world.isClient) {
             switch (interationType) {
                 case 1:
                     setIsRaining(!getIsRaining());
@@ -428,35 +412,35 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
 
     public void pomf() {
         for (int i = 0; i < 50 * getCloudSize(); i++) {
-            Particles.instance().getEntityEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
+            ParticleTypeRegistry.getTnstance().getEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
         }
 
         playHurtSound(DamageSource.GENERIC);
     }
 
     @Override
-    public boolean attackEntityFrom(DamageSource source, float amount) {
-        Entity attacker = source.getImmediateSource();
+    public boolean damage(DamageSource source, float amount) {
+        Entity attacker = source.getAttacker();
 
-        if (attacker instanceof EntityPlayer) {
-            return onAttackByPlayer(source, amount, (EntityPlayer)attacker);
+        if (attacker instanceof PlayerEntity) {
+            return onAttackByPlayer(source, amount, (PlayerEntity)attacker);
         }
 
-        return source == DamageSource.IN_WALL || super.attackEntityFrom(source, amount);
+        return source == DamageSource.IN_WALL || super.damage(source, amount);
     }
 
-    private boolean onAttackByPlayer(DamageSource source, float amount, EntityPlayer player) {
+    private boolean onAttackByPlayer(DamageSource source, float amount, PlayerEntity player) {
 
-        ItemStack stack = player.getHeldItemMainhand();
+        ItemStack stack = player.getMainHandStack();
 
         boolean canFly = EnchantmentHelper.getEnchantments(stack).containsKey(Enchantments.FEATHER_FALLING)
                 || Predicates.INTERACT_WITH_CLOUDS.test(player);
         boolean stat = getStationary();
 
         if (stat || canFly) {
-            if (!isBurning()) {
+            if (!isOnFire()) {
                 for (int i = 0; i < 50 * getCloudSize(); i++) {
-                    Particles.instance().getEntityEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
+                    ParticleTypeRegistry.getTnstance().getEmitter().emitDiggingParticles(this, UBlocks.normal_cloud.getDefaultState());
                 }
             }
 
@@ -465,10 +449,10 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
             } else if (stack != null && stack.getItem() instanceof ItemSpade) {
                 return super.attackEntityFrom(source, amount * 1.5f);
             } else if (canFly) {
-                if (player.posY < posY || !world.isAirBlock(getPosition())) {
-                    targetAltitude = posY + 5;
-                } else if (player.posY > posY) {
-                    targetAltitude = posY - 5;
+                if (player.y < y || !world.isAirBlock(getPosition())) {
+                    targetAltitude = y + 5;
+                } else if (player.y > y) {
+                    targetAltitude = y - 5;
                 }
             }
         }
@@ -477,8 +461,8 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
 
     @Override
     public void onDeath(DamageSource s) {
-        if (s == DamageSource.GENERIC || (s.getTrueSource() != null && s.getTrueSource() instanceof EntityPlayer)) {
-            setDead();
+        if (s == DamageSource.GENERIC || (s.getSource() != null && s.getSource() instanceof PlayerEntity)) {
+            remove();
         }
 
         super.onDeath(s);
@@ -486,14 +470,14 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     @Override
-    public void setDead() {
-        super.setDead();
+    public void remove() {
+        super.remove();
         clearItemFloatingState();
     }
 
     @FUF(reason = "There is no TickEvent.EntityTickEvent. Waiting on mixins...")
     protected void clearItemFloatingState() {
-        AxisAlignedBB bounds = getEntityBoundingBox().grow(1 / (1 + getCloudSize())).grow(5);
+        Box bounds = getEntityBoundingBox().grow(1 / (1 + getCloudSize())).grow(5);
 
         for (Entity i : world.getEntitiesInAABBexcluding(this, bounds, this::entityIsFloatingItem)) {
             i.setNoGravity(false);
@@ -501,8 +485,8 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     private boolean entityIsFloatingItem(Entity e) {
-        return e instanceof EntityItem
-                && Predicates.ITEM_INTERACT_WITH_CLOUDS.test((EntityItem)e);
+        return e instanceof ItemEntity
+                && Predicates.ITEM_INTERACT_WITH_CLOUDS.test((ItemEntity)e);
     }
 
     @Override
@@ -523,7 +507,7 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     public EntityItem entityDropItem(ItemStack stack, float offsetY) {
         EntityItem item = super.entityDropItem(stack, offsetY);
 
-        PlayerSpeciesList.instance().getEntity(item).setPlayerSpecies(Race.PEGASUS);
+        SpeciesList.instance().getEntity(item).setSpecies(Race.PEGASUS);
         item.setNoGravity(true);
         item.motionY = 0;
 
@@ -592,19 +576,19 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
             return 3;
         }
 
-        if (entity instanceof EntityPlayer) {
-            return getFeatherEnchantStrength((EntityPlayer)entity);
+        if (entity instanceof PlayerEntity) {
+            return getFeatherEnchantStrength((PlayerEntity)entity);
         }
 
         return 0;
     }
 
-    public static int getFeatherEnchantStrength(EntityPlayer player) {
-        for (ItemStack stack : player.getArmorInventoryList()) {
+    public static int getFeatherEnchantStrength(PlayerEntity player) {
+        for (ItemStack stack : player.getArmorItems()) {
             if (stack != null) {
                 Map<Enchantment, Integer> enchantments = EnchantmentHelper.getEnchantments(stack);
                 if (enchantments.containsKey(Enchantments.FEATHER_FALLING)) {
-                    return (Integer)enchantments.get(Enchantments.FEATHER_FALLING);
+                    return enchantments.get(Enchantments.FEATHER_FALLING);
                 }
             }
         }
@@ -612,23 +596,23 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     private boolean canRainHere() {
-        return world.getBiome(new BlockPos(posX, posY, posZ)).canRain();
+        return world.getBiome(getBlockPos()).canRain();
     }
 
     private boolean canSnowHere(BlockPos pos) {
-        return world.getBiome(pos).getTemperature(pos) <= 0.15f;
+        return world.getBiome(pos).canSetSnow(world, pos);
     }
 
     public void spawnThunderbolt() {
-        spawnThunderbolt(getGroundPosition(posX, posZ));
+        spawnThunderbolt(getGroundPosition(x, z));
     }
 
     public void spawnThunderbolt(BlockPos pos) {
-        world.addWeatherEffect(new EntityLightningBolt(world, pos.getX(), pos.getY(), pos.getZ(), false));
+        world.addWeatherEffect(new LightningEntity(world, pos.getX(), pos.getY(), pos.getZ(), false));
     }
 
     private BlockPos getGroundPosition(double x, double z) {
-        BlockPos pos = world.getTopSolidOrLiquidBlock(new BlockPos(x, posY, z));
+        BlockPos pos = world.getTopPosition(Heightmap.Type.WORLD_SURFACE, new BlockPos(x, y, z));
 
         if (pos.getY() >= posY) {
             while (world.isValid(pos)) {
@@ -643,17 +627,17 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     public int getRainTimer() {
-        return dataManager.get(RAINTIMER);
+        return dataTracker.get(RAINTIMER);
     }
 
     public int setRainTimer(int val) {
         val = Math.max(0, val);
-        dataManager.set(RAINTIMER, val);
+        dataTracker.set(RAINTIMER, val);
         return val;
     }
 
     private void setRaining() {
-        setRainTimer(700 + rand.nextInt(20));
+        setRainTimer(700 + random.nextInt(20));
     }
 
     public void setIsRaining(boolean val) {
@@ -669,19 +653,19 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     public boolean getIsThundering() {
-        return dataManager.get(THUNDERING);
+        return dataTracker.get(THUNDERING);
     }
 
     public void setIsThundering(boolean val) {
-        dataManager.set(THUNDERING, val);
+        dataTracker.set(THUNDERING, val);
     }
 
     public boolean getStationary() {
-        return dataManager.get(STATIONARY);
+        return dataTracker.get(STATIONARY);
     }
 
     public void setStationary(boolean val) {
-        dataManager.set(STATIONARY, val);
+        dataTracker.set(STATIONARY, val);
     }
 
     public boolean getOpaque() {
@@ -689,7 +673,7 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     }
 
     public int getCloudSize() {
-        int size = dataManager.get(SCALE);
+        int size = dataTracker.get(SCALE);
         updateSize(size);
         return size;
     }
@@ -709,6 +693,6 @@ public class EntityCloud extends EntityFlying implements IAnimals, IInAnimate {
     public void setCloudSize(int val) {
         val = Math.max(1, val);
         updateSize(val);
-        dataManager.set(SCALE, val);
+        dataTracker.set(SCALE, val);
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityConstructionCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityConstructionCloud.java
index e96039a9..318413bb 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityConstructionCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityConstructionCloud.java
@@ -13,7 +13,7 @@ import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
@@ -44,7 +44,7 @@ public class EntityConstructionCloud extends EntityCloud {
                     return EnumActionResult.FAIL;
                 }
 
-                ItemStack stack = player.getHeldItem(hand);
+                ItemStack stack = player.getStackInHand(hand);
 
                 if (stack != null) {
                     if (stack.getItem() instanceof ItemBlock || stack.getItem() == Items.SPAWN_EGG && stack.getItemDamage() == EntityList.getID(EntityCloud.class)) {
@@ -59,11 +59,11 @@ public class EntityConstructionCloud extends EntityCloud {
     }
 
     private void placeBlock(EntityPlayer player, ItemStack stack, EnumHand hand) {
-        if (!world.isRemote || !(player instanceof EntityPlayerSP)) {
+        if (!world.isClient || !(player instanceof EntityPlayerSP)) {
             return;
         }
 
-        Minecraft mc = Minecraft.getMinecraft();
+        Minecraft mc = MinecraftClient.getInstance();
 
         double distance = mc.playerController.getBlockReachDistance();
 
@@ -73,7 +73,7 @@ public class EntityConstructionCloud extends EntityCloud {
         Vec3d look = player.getLook(ticks);
         Vec3d ray = eye.add(look.x * distance, look.y * distance, look.z * distance);
 
-        AxisAlignedBB bounds = getEntityBoundingBox();
+        Box bounds = getEntityBoundingBox();
 
         float s = 0.5F;
         RayTraceResult trace = bounds
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java
index b1a6aed7..14c20bd1 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityCuccoon.java
@@ -7,14 +7,14 @@ import javax.annotation.Nullable;
 import com.google.common.collect.Lists;
 import com.minelittlepony.unicopia.Predicates;
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.init.USounds;
-import com.minelittlepony.unicopia.power.IPower;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.unicopia.ability.IPower;
 import com.minelittlepony.util.MagicalDamageSource;
 
 import net.minecraft.block.Block;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.item.EntityXPOrb;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -23,8 +23,8 @@ import net.minecraft.init.SoundEvents;
 import net.minecraft.inventory.EntityEquipmentSlot;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
+import net.minecraft.network.datasync.TrackedData;
+import net.minecraft.network.datasync.TrackedDataHandlerRegistry;
 import net.minecraft.network.datasync.EntityDataManager;
 import net.minecraft.potion.PotionEffect;
 import net.minecraft.util.DamageSource;
@@ -33,15 +33,15 @@ import net.minecraft.util.EnumHand;
 import net.minecraft.util.EnumHandSide;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import net.minecraftforge.event.ForgeEventFactory;
 
-public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAnimate {
+public class EntityCuccoon extends LivingEntity implements IMagicals, IInAnimate {
 
-    private static final DataParameter<Integer> STRUGGLE_COUNT = EntityDataManager.createKey(EntityCuccoon.class, DataSerializers.VARINT);
+    private static final TrackedData<Integer> STRUGGLE_COUNT = DataTracker.registerData(EntityCuccoon.class, TrackedDataHandlerRegistry.INTEGER);
 
     private final List<ItemStack> armour = Lists.newArrayList();
 
@@ -56,9 +56,9 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
     }
 
     @Override
-    protected void entityInit() {
-        super.entityInit();
-        getDataManager().register(STRUGGLE_COUNT, 0);
+    protected void initDataTracker() {
+        super.initDataTracker();
+        getDataTracker().startTracking(STRUGGLE_COUNT, 0);
     }
 
     public int getStruggleCount() {
@@ -95,7 +95,7 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
         return super.canBeRidden(entity)
                 && !entity.isSneaking()
                 && !isBeingRidden()
-                && entity instanceof EntityLivingBase
+                && entity instanceof LivingEntity
                 && !Predicates.BUGGY.test(entity);
     }
 
@@ -134,8 +134,8 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
 
             captiveLastSneakState = sneaking;
 
-            if (passenger instanceof EntityLivingBase) {
-                EntityLivingBase living = (EntityLivingBase)passenger;
+            if (passenger instanceof LivingEntity) {
+                LivingEntity living = (LivingEntity)passenger;
 
                 if (!living.isPotionActive(MobEffects.REGENERATION) && living.getHealth() < living.getMaxHealth()) {
                     living.addPotionEffect(new PotionEffect(MobEffects.REGENERATION, 20, 2));
@@ -147,7 +147,7 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
             }
         }
 
-        if (world.isRemote) {
+        if (world.isClient) {
             double x = posX + width * world.rand.nextFloat() - width/2;
             double y = posY + height * world.rand.nextFloat();
             double z = posZ + width * world.rand.nextFloat() - width/2;
@@ -170,11 +170,11 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
 
                     IPower.spawnParticles(UParticles.CHANGELING_MAGIC, this, 7);
 
-                    if (passenger instanceof EntityLivingBase) {
+                    if (passenger instanceof LivingEntity) {
                         if (player.isPotionActive(MobEffects.NAUSEA)) {
-                            ((EntityLivingBase)passenger).addPotionEffect(player.removeActivePotionEffect(MobEffects.NAUSEA));
+                            ((LivingEntity)passenger).addPotionEffect(player.removeActivePotionEffect(MobEffects.NAUSEA));
                         } else if (world.rand.nextInt(2300) == 0) {
-                            ((EntityLivingBase)passenger).addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1));
+                            ((LivingEntity)passenger).addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1));
                         }
                     }
 
@@ -242,7 +242,7 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
     @Override
     protected void onDeathUpdate() {
         if (++deathTime == 20) {
-            if (!world.isRemote && (isPlayer() || recentlyHit > 0 && canDropLoot() && world.getGameRules().getBoolean("doMobLoot"))) {
+            if (!world.isClient && (isPlayer() || recentlyHit > 0 && canDropLoot() && world.getGameRules().getBoolean("doMobLoot"))) {
                 int i = ForgeEventFactory.getExperienceDrop(this, attackingPlayer, getExperiencePoints(attackingPlayer));
 
                 while (i > 0) {
@@ -273,12 +273,12 @@ public class EntityCuccoon extends EntityLivingBase implements IMagicals, IInAni
     }
 
     @Nullable
-    public AxisAlignedBB getCollisionBox(Entity entity) {
+    public Box getCollisionBox(Entity entity) {
         return entity.canBeCollidedWith() ? entity.getEntityBoundingBox() : null;
     }
 
     @Nullable
-    public AxisAlignedBB getCollisionBoundingBox() {
+    public Box getCollisionBoundingBox() {
         return getEntityBoundingBox().shrink(0.2);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeClientPlayer.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeClientPlayer.java
index 8ef1be07..f7ef3171 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeClientPlayer.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeClientPlayer.java
@@ -3,7 +3,6 @@ package com.minelittlepony.unicopia.entity;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.player.IOwned;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.client.Minecraft;
@@ -29,7 +28,7 @@ public class EntityFakeClientPlayer extends AbstractClientPlayer implements IOwn
     @Nullable
     protected NetworkPlayerInfo getPlayerInfo() {
         if (playerInfo == null) {
-            NetHandlerPlayClient connection = Minecraft.getMinecraft().getConnection();
+            NetHandlerPlayClient connection = MinecraftClient.getInstance().getConnection();
 
             playerInfo = connection.getPlayerInfo(getGameProfile().getId());
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeServerPlayer.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeServerPlayer.java
index 4c36c507..ff895f97 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeServerPlayer.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityFakeServerPlayer.java
@@ -1,7 +1,6 @@
 package com.minelittlepony.unicopia.entity;
 
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.player.IOwned;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityProjectile.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityProjectile.java
deleted file mode 100644
index 64eabf08..00000000
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityProjectile.java
+++ /dev/null
@@ -1,262 +0,0 @@
-package com.minelittlepony.unicopia.entity;
-
-import com.minelittlepony.unicopia.network.EffectSync;
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-import com.minelittlepony.unicopia.tossable.ITossable;
-import com.minelittlepony.unicopia.tossable.ITossableItem;
-import com.minelittlepony.unicopia.tossable.ITossed;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.projectile.EntitySnowball;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.World;
-
-/**
- * A generalised version of Mojang's projectile entity class with added support for a custom appearance and water phobia.
- *
- * Can also carry a spell if needed.
- */
-public class EntityProjectile extends EntitySnowball implements IMagicals, ITossed, ICaster<EntityLivingBase> {
-
-    private static final DataParameter<ItemStack> ITEM = EntityDataManager
-            .createKey(EntityProjectile.class, DataSerializers.ITEM_STACK);
-
-    private static final DataParameter<Float> DAMAGE = EntityDataManager
-            .createKey(EntityProjectile.class, DataSerializers.FLOAT);
-
-    private static final DataParameter<Boolean> HYDROPHOBIC = EntityDataManager
-            .createKey(EntityProjectile.class, DataSerializers.BOOLEAN);
-
-    private static final DataParameter<NBTTagCompound> EFFECT = EntityDataManager
-            .createKey(EntityProjectile.class, DataSerializers.COMPOUND_TAG);
-
-    private final EffectSync<EntityLivingBase> effectDelegate = new EffectSync<>(this, EFFECT);
-
-    public EntityProjectile(World world) {
-        super(world);
-    }
-
-    public EntityProjectile(World world, double x, double y, double z) {
-        super(world, x, y, z);
-    }
-
-    public EntityProjectile(World world, EntityLivingBase thrower) {
-        super(world, thrower);
-    }
-
-    @Override
-    protected void entityInit() {
-        getDataManager().register(ITEM, ItemStack.EMPTY);
-        getDataManager().register(DAMAGE, (float)0);
-        getDataManager().register(EFFECT, new NBTTagCompound());
-        getDataManager().register(HYDROPHOBIC, false);
-    }
-
-    public ItemStack getItem() {
-        ItemStack stack = getDataManager().get(ITEM);
-
-        return stack == null ? ItemStack.EMPTY : stack;
-    }
-
-    @Override
-    public Entity getEntity() {
-        return this;
-    }
-
-    @Override
-    public void setOwner(EntityLivingBase owner) {
-        thrower = owner;
-    }
-
-    @Override
-    public EntityLivingBase getOwner() {
-        return getThrower();
-    }
-
-    @Override
-    public int getCurrentLevel() {
-        return 1;
-    }
-
-    @Override
-    public void setCurrentLevel(int level) {
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return hasEffect() ? SpellAffinity.NEUTRAL : getEffect().getAffinity();
-    }
-
-    @Override
-    public void setEffect(IMagicEffect effect) {
-        effectDelegate.set(effect);
-
-        if (effect != null) {
-            effect.onPlaced(this);
-        }
-    }
-
-    @Override
-    public <T extends IMagicEffect> T getEffect(Class<T> type, boolean update) {
-        return effectDelegate.get(type, update);
-    }
-
-    @Override
-    public boolean hasEffect() {
-        return effectDelegate.has();
-    }
-
-    @Override
-    public void setItem(ItemStack stack) {
-        getDataManager().set(ITEM, stack);
-        getDataManager().setDirty(ITEM);
-    }
-
-    @Override
-    public void setThrowDamage(float damage) {
-        getDataManager().set(DAMAGE, Math.max(0, damage));
-    }
-
-    @Override
-    public float getThrowDamage() {
-        return getDataManager().get(DAMAGE);
-    }
-
-    @Override
-    public void setHydrophobic() {
-        getDataManager().set(HYDROPHOBIC, true);
-    }
-
-    @Override
-    public boolean getHydrophobic() {
-        return getDataManager().get(HYDROPHOBIC);
-    }
-
-    @Override
-    public void readEntityFromNBT(NBTTagCompound compound) {
-        super.readEntityFromNBT(compound);
-
-        ItemStack itemstack = new ItemStack(compound.getCompoundTag("Item"));
-
-        if (itemstack.isEmpty()) {
-            setDead();
-        } else {
-            setItem(itemstack);
-        }
-
-        if (compound.hasKey("effect")) {
-            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompoundTag("effect")));
-        }
-    }
-
-    @Override
-    public void onUpdate() {
-
-        if (!world.isRemote) {
-            if (Math.abs(motionX) < 0.01 && Math.abs(motionZ) < 0.01 && Math.abs(motionY) < 0.01) {
-                setDead();
-            }
-        }
-
-        super.onUpdate();
-
-        if (ticksExisted % 1000 == 0) {
-            setNoGravity(false);
-        }
-
-        if (hasEffect()) {
-            if (getEffect().getDead()) {
-                setDead();
-            } else {
-                getEffect().update(this);
-            }
-
-            if (world.isRemote) {
-                getEffect().render(this);
-            }
-        }
-
-        if (getHydrophobic()) {
-            if (world.getBlockState(getPosition()).getMaterial().isLiquid()) {
-                motionY *= -1;
-
-                if (!hasNoGravity()) {
-                    motionY += 0.16;
-                }
-            }
-        }
-    }
-
-    @Override
-    public void launch(Entity entityThrower, float rotationPitchIn, float rotationYawIn, float pitchOffset, float velocity, float inaccuracy) {
-        shoot(entityThrower, rotationPitchIn, rotationYawIn, pitchOffset, velocity, inaccuracy);
-    }
-
-    @Override
-    public void handleStatusUpdate(byte id) {
-        if (id == 3) {
-            ItemStack stack = getItem();
-
-            for (int i = 0; i < 8; i++) {
-                world.spawnParticle(EnumParticleTypes.ITEM_CRACK, posX, posY, posZ, 0, 0, 0, Item.getIdFromItem(stack.getItem()), stack.getMetadata());
-            }
-        }
-    }
-
-    @Override
-    public void writeEntityToNBT(NBTTagCompound compound) {
-        super.writeEntityToNBT(compound);
-
-        ItemStack itemstack = this.getItem();
-
-        if (!itemstack.isEmpty()) {
-            compound.setTag("Item", itemstack.writeToNBT(new NBTTagCompound()));
-        }
-
-        if (hasEffect()) {
-            compound.setTag("effect", SpellRegistry.instance().serializeEffectToNBT(getEffect()));
-        }
-    }
-
-    @Override
-    protected void onImpact(RayTraceResult result) {
-        if (result.entityHit != this && !(result.entityHit instanceof IProjectile)) {
-            if (result.typeOfHit == RayTraceResult.Type.BLOCK) {
-                Item item = getItem().getItem();
-
-                if (item instanceof ITossableItem) {
-                    ((ITossableItem)item).onImpact(this, result.getBlockPos(), world.getBlockState(result.getBlockPos()));
-                }
-
-                if (hasEffect()) {
-                    IMagicEffect effect = this.getEffect();
-                    if (effect instanceof ITossable) {
-                        ((ITossable<?>)effect).onImpact(this, result.getBlockPos(), world.getBlockState(result.getBlockPos()));
-                    }
-                }
-            }
-
-            if (result.entityHit != null) {
-                result.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, getThrower()), getThrowDamage());
-            }
-
-            if (!world.isRemote) {
-                world.setEntityState(this, (byte)3);
-                setDead();
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityRacingCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityRacingCloud.java
index 366b684d..b8578cc0 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityRacingCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityRacingCloud.java
@@ -7,7 +7,7 @@ import javax.annotation.Nullable;
 import com.minelittlepony.unicopia.Predicates;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
@@ -56,7 +56,7 @@ public class EntityRacingCloud extends EntityCloud {
         Entity riddenByEntity = getControllingPassenger();
 
         if (riddenByEntity != null && canPassengerSteer()) {
-            EntityLivingBase rider = (EntityLivingBase)riddenByEntity;
+            LivingEntity rider = (LivingEntity)riddenByEntity;
 
             double speed = 1.5F * rider.moveForward / 5;
             double horizontalDriving = (riddenByEntity.rotationYaw - rider.moveStrafing * 90) * Math.PI / 180;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
index d08fbef3..c61567a6 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityRainbow.java
@@ -2,17 +2,23 @@ package com.minelittlepony.unicopia.entity;
 
 import com.minelittlepony.unicopia.Race;
 
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.network.packet.EntitySpawnGlobalS2CPacket;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.effect.EntityWeatherEffect;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.LightningEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.NetworkThreadUtils;
+import net.minecraft.network.Packet;
+import net.minecraft.network.listener.ClientPlayPacketListener;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.util.ThreadExecutor;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
-import net.minecraft.world.biome.Biome.SpawnListEntry;
 
-public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
+public class EntityRainbow extends Entity implements IInAnimate {
 
     public static final SpawnListEntry SPAWN_ENTRY = new SpawnListEntry(EntityRainbow.Spawner.class, 1, 1, 1);
 
@@ -23,11 +29,13 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
     public static final int RAINBOW_MAX_SIZE = 180;
     public static final int RAINBOW_MIN_SIZE = 50;
 
-    public static final AxisAlignedBB SPAWN_COLLISSION_RADIUS = new AxisAlignedBB(
+    public static final Box SPAWN_COLLISSION_RADIUS = new Box(
             -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE, -RAINBOW_MAX_SIZE,
              RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE,  RAINBOW_MAX_SIZE
      ).grow(RAINBOW_MAX_SIZE);
 
+
+
     public EntityRainbow(World world) {
         this(world, 0, 0, 0);
     }
@@ -35,11 +43,11 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
     public EntityRainbow(World world, double x, double y, double z) {
         super(world);
 
-        float yaw = (int)MathHelper.nextDouble((world == null ? rand : world.rand), 0, 360);
+        float yaw = (int)MathHelper.nextDouble((world == null ? rand : world.random), 0, 360);
 
         setLocationAndAngles(x, y, z, yaw, 0);
 
-        radius = MathHelper.nextDouble(world == null ? rand : world.rand, RAINBOW_MIN_SIZE, RAINBOW_MAX_SIZE);
+        radius = MathHelper.nextDouble(world == null ? rand : world.random, RAINBOW_MIN_SIZE, RAINBOW_MAX_SIZE);
         ticksAlive = 10000;
 
         ignoreFrustumCheck = true;
@@ -64,7 +72,7 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
         posY = y;
         posZ = z;
 
-        setEntityBoundingBox(new AxisAlignedBB(
+        setBoundingBox(new Box(
                 x - width, y - radius/2, z,
                 x + width, y + radius/2, z
         ));
@@ -85,40 +93,45 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
     }
 
     @Override
-    public void onUpdate() {
-        super.onUpdate();
+    public void tick() {
+        super.tick();
 
         if (ticksAlive-- <= 0) {
-            setDead();
+            remove();
         }
 
-        if (!isDead) {
-            AxisAlignedBB bounds = SPAWN_COLLISSION_RADIUS.offset(getPosition());
+        if (!removed) {
+            Box bounds = SPAWN_COLLISSION_RADIUS.offset(getPosition());
 
-            world.getEntitiesWithinAABB(EntityRainbow.class, bounds).forEach(this::attackCompetitor);
-            world.getEntitiesWithinAABB(EntityRainbow.Spawner.class, bounds).forEach(this::attackCompetitor);
+            world.getEntities(EntityRainbow.class, bounds).forEach(this::attackCompetitor);
+            world.getEntities(EntityRainbow.Spawner.class, bounds).forEach(this::attackCompetitor);
         }
     }
 
     private void attackCompetitor(Entity other) {
         if (other != this) {
-            other.setDead();
+            other.remove();
         }
     }
 
     @Override
-    protected void entityInit() {
+    protected void initDataTracker() {
     }
 
     @Override
-    protected void readEntityFromNBT(NBTTagCompound compound) {
+    protected void readCustomDataFromTag(CompoundTag var1) {
     }
 
     @Override
-    protected void writeEntityToNBT(NBTTagCompound compound) {
+    protected void writeCustomDataToTag(CompoundTag var1) {
     }
 
-    public static class Spawner extends EntityLiving {
+    @Override
+    public Packet<?> createSpawnPacket() {
+        return new SpawnPacket(this);
+    }
+
+    public static class Spawner extends MobEntity {
 
         public Spawner(World worldIn) {
             super(worldIn);
@@ -127,11 +140,11 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
 
         @Override
         public boolean getCanSpawnHere() {
-            AxisAlignedBB bounds = SPAWN_COLLISSION_RADIUS.offset(getPosition());
+            Box bounds = SPAWN_COLLISSION_RADIUS.offset(getPos());
 
             return super.getCanSpawnHere()
-                    && world.getEntitiesWithinAABB(EntityRainbow.class, bounds).isEmpty()
-                    && world.getEntitiesWithinAABB(EntityRainbow.Spawner.class, bounds).isEmpty();
+                    && world.getEntities(EntityRainbow.class, bounds).isEmpty()
+                    && world.getEntities(EntityRainbow.Spawner.class, bounds).isEmpty();
         }
 
         @Override
@@ -140,18 +153,41 @@ public class EntityRainbow extends EntityWeatherEffect implements IInAnimate {
         }
 
         @Override
-        public void onUpdate() {
-            super.onUpdate();
+        public void tick() {
+            super.tick();
             if (!this.dead) {
-                setDead();
+                remove();
                 trySpawnRainbow();
             }
         }
 
         public void trySpawnRainbow() {
             EntityRainbow rainbow = new EntityRainbow(world);
-            rainbow.setPosition(posX, posY, posZ);
+            rainbow.setPosition(x, y, z);
             world.spawnEntity(rainbow);
         }
     }
+
+    static class SpawnPacket extends EntitySpawnGlobalS2CPacket {
+        public SpawnPacket(EntityRainbow entity) {
+            super(entity);
+        }
+
+        @Override
+        public void method_11188(ClientPlayPacketListener listener) {
+            // TODO: Packet needs to be registered, and handling separated
+            MinecraftClient client = MinecraftClient.getInstance();
+
+            NetworkThreadUtils.forceMainThread(this, listener, client);
+            double x = getX();
+            double y = getY();
+            double z = getZ();
+            LightningEntity entity = new LightningEntity(client.world, x, y, z, false);
+            entity.updateTrackedPosition(x, y, z);
+            entity.yaw = 0;
+            entity.pitch = 0;
+            entity.setEntityId(getId());
+            client.world.addLightning(entity);
+        }
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpear.java b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpear.java
index 6ecb9463..23e9dcfe 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpear.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpear.java
@@ -1,34 +1,28 @@
 package com.minelittlepony.unicopia.entity;
 
-import com.minelittlepony.unicopia.tossable.ITossed;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
 import com.minelittlepony.util.MagicalDamageSource;
 
 import net.minecraft.enchantment.EnchantmentHelper;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.MoverType;
-import net.minecraft.entity.monster.EntityEnderman;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.init.SoundEvents;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.mob.EndermanEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.projectile.ArrowEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.network.play.server.SPacketChangeGameState;
-import net.minecraft.util.DamageSource;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
-public class EntitySpear extends EntityArrow implements ITossed {
+public class EntitySpear extends ArrowEntity implements IAdvancedProjectile {
 
-    private static final DataParameter<ItemStack> ITEM = EntityDataManager
-            .createKey(EntitySpear.class, DataSerializers.ITEM_STACK);
+    private static final TrackedData<ItemStack> ITEM = DataTracker.registerData(EntitySpear.class, TrackedDataHandlerRegistry.ITEM_STACK);
 
-    private static final DataParameter<Integer> KNOCKBACK = EntityDataManager
-            .createKey(EntitySpear.class, DataSerializers.VARINT);
+    private static final TrackedData<Integer> KNOCKBACK = DataTracker.registerData(EntitySpear.class, TrackedDataHandlerRegistry.INTEGER);
 
     public EntitySpear(World world) {
         super(world);
@@ -38,15 +32,15 @@ public class EntitySpear extends EntityArrow implements ITossed {
         super(world, x, y, z);
     }
 
-    public EntitySpear(World world, EntityLivingBase shooter) {
+    public EntitySpear(World world, LivingEntity shooter) {
         super(world, shooter);
     }
 
     @Override
-    protected void entityInit() {
-        super.entityInit();
-        getDataManager().register(ITEM, ItemStack.EMPTY);
-        getDataManager().register(KNOCKBACK, 0);
+    protected void initDataTracker() {
+        super.initDataTracker();
+        getDataTracker().startTracking(ITEM, ItemStack.EMPTY);
+        getDataTracker().startTracking(KNOCKBACK, 0);
     }
 
     @Override
@@ -74,12 +68,16 @@ public class EntitySpear extends EntityArrow implements ITossed {
     protected void onHit(RayTraceResult raytraceResultIn) {
         Entity entity = raytraceResultIn.entityHit;
 
+
+
         if (entity != null) {
-            float speed = MathHelper.sqrt(motionX * motionX + motionY * motionY + motionZ * motionZ);
+            Vec3d vel = getVelocity();
+
+            double speed = vel.length();
             int damage = MathHelper.ceil(speed * getDamage());
 
             if (getIsCritical()) {
-                damage += rand.nextInt(damage / 2 + 2);
+                damage += random.nextInt(damage / 2 + 2);
             }
 
             DamageSource damagesource = MagicalDamageSource.causeIndirect("spear", this, shootingEntity == null ? this : shootingEntity);
@@ -89,42 +87,43 @@ public class EntitySpear extends EntityArrow implements ITossed {
             }
 
             if (entity.attackEntityFrom(damagesource, damage)) {
-                if (entity instanceof EntityLivingBase) {
-                    EntityLivingBase entitylivingbase = (EntityLivingBase)entity;
+                if (entity instanceof LivingEntity) {
+                    LivingEntity entitylivingbase = (LivingEntity)entity;
 
-                    if (!world.isRemote) {
-                        entitylivingbase.setArrowCountInEntity(entitylivingbase.getArrowCountInEntity() + 1);
+                    if (!world.isClient) {
+                        entitylivingbase.setStuckArrows(entitylivingbase.getStuckArrows() + 1);
                     }
 
-                    int knockback = getDataManager().get(KNOCKBACK);
+                    int knockback = getDataTracker().get(KNOCKBACK);
 
                     if (knockback > 0) {
-                        float f1 = MathHelper.sqrt(motionX * motionX + motionZ * motionZ);
 
-                        if (f1 > 0.0F) {
+                        double f1 = MathHelper.sqrt(vel.x * vel.x + vel.z * vel.z);
+
+                        if (f1 > 0) {
                             entitylivingbase.addVelocity(
-                                    motionX * knockback * 0.6000000238418579D / f1,
+                                    vel.x * knockback * 0.6000000238418579D / f1,
                                     0.1D,
-                                    motionZ * knockback * 0.6000000238418579D / f1);
+                                    vel.z * knockback * 0.6000000238418579D / f1);
                         }
                     }
 
-                    if (shootingEntity instanceof EntityLivingBase) {
+                    if (shootingEntity instanceof LivingEntity) {
                         EnchantmentHelper.applyThornEnchantments(entitylivingbase, shootingEntity);
-                        EnchantmentHelper.applyArthropodEnchantments((EntityLivingBase)shootingEntity, entitylivingbase);
+                        EnchantmentHelper.applyArthropodEnchantments((LivingEntity)shootingEntity, entitylivingbase);
                     }
 
                     arrowHit(entitylivingbase);
 
-                    if (shootingEntity != null && entitylivingbase != shootingEntity && entitylivingbase instanceof EntityPlayer && shootingEntity instanceof EntityPlayerMP) {
-                        ((EntityPlayerMP)shootingEntity).connection.sendPacket(new SPacketChangeGameState(6, 0));
+                    if (shootingEntity != null && entitylivingbase != shootingEntity && entitylivingbase instanceof PlayerEntity && shootingEntity instanceof ServerPlayerEntity) {
+                        ((ServerPlayerEntity)shootingEntity).connection.sendPacket(new SPacketChangeGameState(6, 0));
                     }
                 }
 
-                playSound(SoundEvents.ENTITY_ARROW_HIT, 1.0F, 1.2F / (rand.nextFloat() * 0.2F + 0.9F));
+                playSound(SoundEvents.ENTITY_ARROW_HIT, 1.0F, 1.2F / (random.nextFloat() * 0.2F + 0.9F));
 
-                if (!(entity instanceof EntityEnderman)) {
-                    setDead();
+                if (!(entity instanceof EndermanEntity)) {
+                    remove();
                 }
 
                 return;
@@ -135,13 +134,13 @@ public class EntitySpear extends EntityArrow implements ITossed {
     }
 
     @Override
-    protected ItemStack getArrowStack() {
-        return getDataManager().get(ITEM);
+    protected ItemStack asItemStack() {
+        return getDataTracker().get(ITEM);
     }
 
     @Override
     public void setItem(ItemStack stack) {
-        getDataManager().set(ITEM, new ItemStack(stack.getItem(), 1, stack.getMetadata()));
+        getDataTracker().set(ITEM, new ItemStack(stack.getItem(), 1, stack.getMetadata()));
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
deleted file mode 100644
index 367ead36..00000000
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpell.java
+++ /dev/null
@@ -1,369 +0,0 @@
-package com.minelittlepony.unicopia.entity;
-
-import javax.annotation.Nullable;
-
-import org.apache.commons.lang3.StringUtils;
-
-import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.item.ICastable;
-import com.minelittlepony.unicopia.network.EffectSync;
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import net.minecraft.block.SoundType;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-
-public class EntitySpell extends EntityCreature implements IMagicals, ICaster<EntityLivingBase>, IInAnimate {
-
-    private EntityLivingBase owner = null;
-
-    public float hoverStart;
-
-    private static final DataParameter<Integer> LEVEL = EntityDataManager
-            .createKey(EntitySpell.class, DataSerializers.VARINT);
-
-    private static final DataParameter<String> OWNER = EntityDataManager
-            .createKey(EntitySpell.class, DataSerializers.STRING);
-
-    private static final DataParameter<NBTTagCompound> EFFECT = EntityDataManager
-            .createKey(EntitySpell.class, DataSerializers.COMPOUND_TAG);
-
-    private static final DataParameter<Integer> AFFINITY = EntityDataManager
-            .createKey(EntitySpell.class, DataSerializers.VARINT);
-
-    private final EffectSync<EntityLivingBase> effectDelegate = new EffectSync<>(this, EFFECT);
-
-    public EntitySpell(World w) {
-        super(w);
-        setSize(0.6f, 0.25f);
-        hoverStart = (float)(Math.random() * Math.PI * 2.0D);
-        setRenderDistanceWeight(getRenderDistanceWeight() + 1);
-        preventEntitySpawning = false;
-        enablePersistence();
-    }
-
-    @Override
-    public boolean isInRangeToRenderDist(double distance) {
-        if (getCurrentLevel() > 0) {
-            distance /= getCurrentLevel();
-        }
-        return super.isInRangeToRenderDist(distance);
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.values()[dataManager.get(AFFINITY)];
-    }
-
-    public void setAffinity(SpellAffinity affinity) {
-        dataManager.set(AFFINITY, affinity.ordinal());
-    }
-
-    @Override
-    public void setEffect(@Nullable IMagicEffect effect) {
-        effectDelegate.set(effect);
-
-        if (effect != null) {
-            effect.onPlaced(this);
-        }
-    }
-
-    @Override
-    public boolean canInteract(Race race) {
-        return race.canCast();
-    }
-
-    @Nullable
-    @Override
-    public <T extends IMagicEffect> T getEffect(@Nullable Class<T> type, boolean update) {
-        return effectDelegate.get(type, update);
-    }
-
-    @Override
-    public boolean hasEffect() {
-        return effectDelegate.has();
-    }
-
-    @Override
-    protected void entityInit() {
-        super.entityInit();
-        dataManager.register(LEVEL, 0);
-        dataManager.register(EFFECT, new NBTTagCompound());
-        dataManager.register(OWNER, "");
-        dataManager.register(AFFINITY, SpellAffinity.NEUTRAL.ordinal());
-    }
-
-    @Override
-    public ItemStack getPickedResult(RayTraceResult target) {
-        return SpellRegistry.instance().enchantStack(new ItemStack(getItem()), getEffect().getName());
-    }
-
-    protected Item getItem() {
-        return getAffinity() == SpellAffinity.BAD ? UItems.curse : UItems.spell;
-    }
-
-    @Override
-    protected boolean canTriggerWalking() {
-        return false;
-    }
-
-    @Override
-    public boolean isPushedByWater() {
-        return false;
-    }
-
-    @Override
-    public boolean canRenderOnFire() {
-        return false;
-    }
-
-    @Override
-    public void setOwner(EntityLivingBase owner) {
-        this.owner = owner;
-        setOwner(owner.getName());
-    }
-
-    protected void setOwner(String ownerName) {
-        if (!StringUtils.isEmpty(ownerName)) {
-            dataManager.set(OWNER, ownerName);
-        }
-    }
-
-    protected String getOwnerName() {
-        String ownerName = dataManager.get(OWNER);
-
-        if (!StringUtils.isEmpty(ownerName)) {
-            if (owner instanceof EntityPlayer) {
-                return owner.getName();
-            }
-
-            return "";
-        }
-
-        return ownerName;
-    }
-
-    @Override
-    public EntityLivingBase getOwner() {
-        if (owner == null) {
-            String ownerName = dataManager.get(OWNER);
-            if (ownerName != null && ownerName.length() > 0) {
-                owner = world.getPlayerEntityByName(ownerName);
-            }
-        }
-
-        return owner;
-    }
-
-    protected void displayTick() {
-        if (hasEffect()) {
-            getEffect().render(this);
-        }
-    }
-
-    @Override
-    public void onUpdate() {
-        if (world.isRemote) {
-            displayTick();
-        }
-
-        if (!hasEffect()) {
-            setDead();
-        } else {
-            if (getEffect().getDead()) {
-                setDead();
-                onDeath();
-            } else {
-                getEffect().update(this);
-            }
-
-            if (getEffect().allowAI()) {
-                height = 1.5F;
-                super.onUpdate();
-            }
-        }
-
-        if (overLevelCap()) {
-            if (world.rand.nextInt(10) == 0) {
-                spawnExplosionParticle();
-            }
-
-            if (!world.isRemote && hasEffect()) {
-                float exhaustionChance = getEffect().getExhaustion(this);
-
-                if (exhaustionChance == 0 || world.rand.nextInt((int)(exhaustionChance / 500)) == 0) {
-                    addLevels(-1);
-                } else if (world.rand.nextInt((int)(exhaustionChance * 500)) == 0) {
-                    setEffect(null);
-                } else if (world.rand.nextInt((int)(exhaustionChance * 3500)) == 0) {
-                    world.createExplosion(this, posX, posY, posZ, getCurrentLevel()/2, true);
-                    setDead();
-                }
-            }
-        }
-
-        if (getCurrentLevel() < 0) {
-            setDead();
-        }
-    }
-
-    @Override
-    public void fall(float distance, float damageMultiplier) {
-
-    }
-
-    public boolean overLevelCap() {
-        return getCurrentLevel() > getMaxLevel();
-    }
-
-    @Override
-    protected void updateFallState(double y, boolean onGround, IBlockState state, BlockPos pos) {
-        this.onGround = true;
-    }
-
-    @Override
-    public boolean attackEntityFrom(DamageSource source, float amount) {
-        if (!world.isRemote) {
-            setDead();
-            onDeath();
-        }
-        return false;
-    }
-
-    protected void onDeath() {
-        SoundType sound = SoundType.STONE;
-
-        world.playSound(posX, posY, posZ, sound.getBreakSound(), SoundCategory.NEUTRAL, sound.getVolume(), sound.getPitch(), true);
-
-        if (world.getGameRules().getBoolean("doTileDrops")) {
-            int level = getCurrentLevel();
-
-            ItemStack stack = new ItemStack(getItem(), level + 1);
-            if (hasEffect()) {
-                SpellRegistry.instance().enchantStack(stack, getEffect().getName());
-            }
-
-            entityDropItem(stack, 0);
-        }
-    }
-
-    @Override
-    public void setDead() {
-        if (hasEffect()) {
-            getEffect().setDead();
-        }
-        super.setDead();
-    }
-
-    @Override
-    public EnumActionResult applyPlayerInteraction(EntityPlayer player, Vec3d vec, EnumHand hand) {
-        if (Predicates.MAGI.test(player)) {
-            ItemStack currentItem = player.getHeldItem(EnumHand.MAIN_HAND);
-
-            if (currentItem != null
-                    && currentItem.getItem() instanceof ICastable
-                    && ((ICastable)currentItem.getItem()).canFeed(this, currentItem)
-                    && tryLevelUp(currentItem)) {
-
-                if (!player.capabilities.isCreativeMode) {
-                    currentItem.shrink(1);
-
-                    if (currentItem.isEmpty()) {
-                        player.renderBrokenItemStack(currentItem);
-                    }
-                }
-
-                return EnumActionResult.SUCCESS;
-            }
-        }
-
-        return EnumActionResult.FAIL;
-    }
-
-    public boolean tryLevelUp(ItemStack stack) {
-        if (hasEffect() && SpellRegistry.stackHasEnchantment(stack)) {
-            if (!getEffect().getName().contentEquals(SpellRegistry.getKeyFromStack(stack))) {
-                return false;
-            }
-
-            addLevels(1);
-
-            playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 0.1f, 1);
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public int getMaxLevel() {
-        return hasEffect() ? getEffect().getMaxLevelCutOff(this) : 0;
-    }
-
-    @Override
-    public int getCurrentLevel() {
-        return dataManager.get(LEVEL);
-    }
-
-    @Override
-    public void setCurrentLevel(int level) {
-        dataManager.set(LEVEL, Math.max(level, 0));
-    }
-
-    @Override
-    public Entity getEntity() {
-        return this;
-    }
-
-    @Override
-    public void readEntityFromNBT(NBTTagCompound compound) {
-        super.readEntityFromNBT(compound);
-        if (compound.hasKey("affinity")) {
-            setAffinity(SpellAffinity.of(compound.getString("affinity")));
-        }
-
-        setOwner(compound.getString("ownerName"));
-        setCurrentLevel(compound.getInteger("level"));
-
-        if (compound.hasKey("effect")) {
-            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompoundTag("effect")));
-        }
-    }
-
-    @Override
-    public void writeEntityToNBT(NBTTagCompound compound) {
-        super.writeEntityToNBT(compound);
-
-        compound.setString("affinity", getAffinity().name());
-        compound.setString("ownerName", getOwnerName());
-        compound.setInteger("level", getCurrentLevel());
-
-        if (hasEffect()) {
-            compound.setTag("effect", SpellRegistry.instance().serializeEffectToNBT(getEffect()));
-        }
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpellbook.java b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpellbook.java
index 1623f1c5..93df2bf0 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntitySpellbook.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntitySpellbook.java
@@ -1,8 +1,8 @@
 package com.minelittlepony.unicopia.entity;
 
 import com.minelittlepony.unicopia.Predicates;
+import com.minelittlepony.unicopia.UItems;
 import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.init.UItems;
 
 import net.minecraft.block.SoundType;
 import net.minecraft.entity.EntityLiving;
@@ -10,8 +10,8 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
+import net.minecraft.network.datasync.TrackedData;
+import net.minecraft.network.datasync.TrackedDataHandlerRegistry;
 import net.minecraft.network.datasync.EntityDataManager;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumActionResult;
@@ -24,9 +24,9 @@ import net.minecraft.world.World;
 
 public class EntitySpellbook extends EntityLiving implements IMagicals {
 
-    private static final DataParameter<Boolean> OPENED = EntityDataManager.createKey(EntitySpellbook.class, DataSerializers.BOOLEAN);
-    private static final DataParameter<Boolean> ALTERED = EntityDataManager.createKey(EntitySpellbook.class, DataSerializers.BOOLEAN);
-    private static final DataParameter<Byte> OPENED_USER = EntityDataManager.createKey(EntitySpellbook.class, DataSerializers.BYTE);
+    private static final TrackedData<Boolean> OPENED = DataTracker.registerData(EntitySpellbook.class, TrackedDataHandlerRegistry.BOOLEAN);
+    private static final TrackedData<Boolean> ALTERED = DataTracker.registerData(EntitySpellbook.class, TrackedDataHandlerRegistry.BOOLEAN);
+    private static final TrackedData<Byte> OPENED_USER = DataTracker.registerData(EntitySpellbook.class, TrackedDataHandlerRegistry.BYTE);
 
     public EntitySpellbook(World worldIn) {
         super(worldIn);
@@ -39,8 +39,8 @@ public class EntitySpellbook extends EntityLiving implements IMagicals {
     }
 
     @Override
-    protected void entityInit() {
-        super.entityInit();
+    protected void initDataTracker() {
+        super.initDataTracker();
         dataManager.register(OPENED, true);
         dataManager.register(OPENED_USER, (byte)1);
         dataManager.register(ALTERED, false);
@@ -91,7 +91,7 @@ public class EntitySpellbook extends EntityLiving implements IMagicals {
         boolean open = getIsOpen();
         this.isJumping = open && isInWater();
         super.onUpdate();
-        if (open && world.isRemote) {
+        if (open && world.isClient) {
 
             for (int offX = -2; offX <= 1; ++offX) {
                 for (int offZ = -2; offZ <= 1; ++offZ) {
@@ -135,7 +135,7 @@ public class EntitySpellbook extends EntityLiving implements IMagicals {
 
     @Override
     public boolean attackEntityFrom(DamageSource source, float amount) {
-        if (!world.isRemote) {
+        if (!world.isClient) {
             setDead();
 
             SoundType sound = SoundType.WOOD;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java b/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
index 140916b0..17362895 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/EntityWildCloud.java
@@ -5,7 +5,7 @@ import java.util.Iterator;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.IEntityLivingData;
 import net.minecraft.util.ClassInheritanceMultiMap;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.DifficultyInstance;
@@ -26,7 +26,7 @@ public class EntityWildCloud extends EntityCloud {
 
     @Override
     public boolean isNotColliding() {
-        AxisAlignedBB boundingbox = getEntityBoundingBox();
+        Box boundingbox = getEntityBoundingBox();
 
         return checkNoEntityCollision(boundingbox, this)
                 && world.canBlockSeeSky(new BlockPos(this))
@@ -35,11 +35,11 @@ public class EntityWildCloud extends EntityCloud {
     }
 
     /**
-     * Returns true if there are no solid, live entities in the specified AxisAlignedBB, excluding the given entity
+     * Returns true if there are no solid, live entities in the specified Box, excluding the given entity
      *
-     * @ref World.checkNoEntityCollision(AxisAlignedBB area, Entity entity)
+     * @ref World.checkNoEntityCollision(Box area, Entity entity)
      */
-    public boolean checkNoEntityCollision(AxisAlignedBB area, Entity entity) {
+    public boolean checkNoEntityCollision(Box area, Entity entity) {
 
         for (Entity i : world.getEntitiesWithinAABBExcludingEntity(entity, area)) {
             if (!i.isDead && (i.preventEntitySpawning || i instanceof EntityCloud) && (!entity.isRiding() || !entity.isRidingOrBeingRiddenBy(i))) {
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/IEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/IEntity.java
new file mode 100644
index 00000000..21f985c9
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IEntity.java
@@ -0,0 +1,57 @@
+package com.minelittlepony.unicopia.entity;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.util.InbtSerialisable;
+
+import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.item.ItemStack;
+
+public interface IEntity extends InbtSerialisable, IUpdatable {
+    Race getSpecies();
+
+    void setSpecies(Race race);
+
+    void onDimensionalTravel(int destinationDimension);
+
+    /**
+     * Returns true if this player is fully invisible.
+     * Held items and other effects will be hidden as well.
+     */
+    default boolean isInvisible() {
+        return false;
+    }
+
+    /**
+     * Sets whether this player should be invisible.
+     */
+    default void setInvisible(boolean invisible) {
+
+    }
+
+    /**
+     * Called at the beginning of a player's update cycle.
+     */
+    void beforeUpdate();
+
+
+    /**
+     * Event triggered when this player is hit by a projectile.
+     */
+    default boolean onProjectileImpact(ProjectileEntity projectile) {
+        return false;
+    }
+
+    /**
+     * Called when this player finishes eating food.
+     */
+    default void onUse(ItemStack stack) {
+
+    }
+
+    /**
+     * Called when this entity jumps
+     */
+    default void onJump() {
+
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/IFlight.java b/src/main/java/com/minelittlepony/unicopia/entity/IFlight.java
new file mode 100644
index 00000000..f0f29322
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IFlight.java
@@ -0,0 +1,18 @@
+package com.minelittlepony.unicopia.entity;
+
+/**
+ * Interface for controlling flight.
+ */
+public interface IFlight {
+    /**
+     * True is we're currently flying.
+     */
+    boolean isFlying();
+
+    float getFlightExperience();
+
+    float getFlightDuration();
+
+    boolean isExperienceCritical();
+
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IFood.java b/src/main/java/com/minelittlepony/unicopia/entity/IFood.java
similarity index 87%
rename from src/main/java/com/minelittlepony/unicopia/player/IFood.java
rename to src/main/java/com/minelittlepony/unicopia/entity/IFood.java
index 15ffef1e..0776e29e 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IFood.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IFood.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity;
 
 import net.minecraft.item.ItemStack;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IGravity.java b/src/main/java/com/minelittlepony/unicopia/entity/IGravity.java
similarity index 54%
rename from src/main/java/com/minelittlepony/unicopia/player/IGravity.java
rename to src/main/java/com/minelittlepony/unicopia/entity/IGravity.java
index 05be5bd7..ad308121 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IGravity.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IGravity.java
@@ -1,13 +1,9 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity;
 
+/**
+ * Interface for controlling the gravity applicable to a specific entity.
+ */
 public interface IGravity {
-    boolean isFlying();
-
-    float getFlightExperience();
-
-    float getFlightDuration();
-
-    boolean isExperienceCritical();
 
     void setGraviationConstant(float constant);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IInventory.java b/src/main/java/com/minelittlepony/unicopia/entity/IInventory.java
similarity index 81%
rename from src/main/java/com/minelittlepony/unicopia/player/IInventory.java
rename to src/main/java/com/minelittlepony/unicopia/entity/IInventory.java
index 02d045a7..45a93bf2 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IInventory.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IInventory.java
@@ -1,7 +1,7 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity;
 
-import com.minelittlepony.unicopia.item.IDependable;
-import com.minelittlepony.unicopia.item.IMagicalItem;
+import com.minelittlepony.unicopia.magic.items.IDependable;
+import com.minelittlepony.unicopia.magic.items.IMagicalItem;
 
 public interface IInventory {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/IMagicals.java b/src/main/java/com/minelittlepony/unicopia/entity/IMagicals.java
index af62721b..fdf6dc79 100644
--- a/src/main/java/com/minelittlepony/unicopia/entity/IMagicals.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IMagicals.java
@@ -1,11 +1,9 @@
 package com.minelittlepony.unicopia.entity;
 
-import net.minecraft.entity.passive.IAnimals;
-
 /**
  * Any entities with magical abilities.
  * Casters are automatically considered magic, for obvious reasons.
  */
-public interface IMagicals extends IAnimals {
+public interface IMagicals {
 
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IOwned.java b/src/main/java/com/minelittlepony/unicopia/entity/IOwned.java
similarity index 90%
rename from src/main/java/com/minelittlepony/unicopia/player/IOwned.java
rename to src/main/java/com/minelittlepony/unicopia/entity/IOwned.java
index ae964eb4..8f63258d 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IOwned.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IOwned.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity;
 
 /**
  * Interface for things that can be owned.
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/IRaceContainer.java b/src/main/java/com/minelittlepony/unicopia/entity/IRaceContainer.java
new file mode 100644
index 00000000..9d99faab
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IRaceContainer.java
@@ -0,0 +1,12 @@
+package com.minelittlepony.unicopia.entity;
+
+import net.minecraft.entity.Entity;
+
+/**
+ * Generic container for an entity that has a race.
+ *
+ * @param <T> The type of owner
+ */
+public interface IRaceContainer<T extends Entity> extends IEntity {
+
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ITrap.java b/src/main/java/com/minelittlepony/unicopia/entity/ITrap.java
new file mode 100644
index 00000000..6e9b387a
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/ITrap.java
@@ -0,0 +1,7 @@
+package com.minelittlepony.unicopia.entity;
+
+import net.minecraft.entity.Entity;
+
+public interface ITrap {
+    boolean attemptDismount(Entity passenger);
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IUpdatable.java b/src/main/java/com/minelittlepony/unicopia/entity/IUpdatable.java
similarity index 81%
rename from src/main/java/com/minelittlepony/unicopia/player/IUpdatable.java
rename to src/main/java/com/minelittlepony/unicopia/entity/IUpdatable.java
index 9cb82c3c..bf8b5bcd 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IUpdatable.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/IUpdatable.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity;
 
 /**
  * Interface for objects that receive regular updates.
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/SpellcastEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/SpellcastEntity.java
new file mode 100644
index 00000000..06747372
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/SpellcastEntity.java
@@ -0,0 +1,377 @@
+package com.minelittlepony.unicopia.entity;
+
+import java.util.Optional;
+import java.util.UUID;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+
+import com.minelittlepony.unicopia.Predicates;
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.UItems;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.items.ICastable;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.network.EffectSync;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityCategory;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ai.goal.GoalSelector;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.mob.MobEntityWithAi;
+import net.minecraft.entity.passive.AnimalEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.GameRules;
+import net.minecraft.world.World;
+import net.minecraft.world.explosion.Explosion.DestructionType;
+
+public class SpellcastEntity extends MobEntityWithAi implements IMagicals, ICaster<LivingEntity>, IInAnimate {
+
+    public static EntityType<SpellcastEntity> TYPE = EntityType.Builder.create(SpellcastEntity::new, EntityCategory.MISC)
+            .setDimensions(0.6F, 0.25F)
+            .build("spell");
+
+    private LivingEntity owner = null;
+
+    public float hoverStart;
+
+    private static final TrackedData<Integer> LEVEL = DataTracker.registerData(SpellcastEntity.class, TrackedDataHandlerRegistry.INTEGER);
+
+    private static final TrackedData<Optional<UUID>> OWNER = DataTracker.registerData(SpellcastEntity.class, TrackedDataHandlerRegistry.OPTIONAL_UUID);
+
+    private static final TrackedData<CompoundTag> EFFECT = DataTracker.registerData(SpellcastEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
+
+    private static final TrackedData<Integer> AFFINITY = DataTracker.registerData(SpellcastEntity.class, TrackedDataHandlerRegistry.INTEGER);
+
+    private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
+
+    public SpellcastEntity(EntityType<SpellcastEntity> type, World w) {
+        super(type, w);
+        hoverStart = (float)(Math.random() * Math.PI * 2.0D);
+        setPersistent();
+    }
+
+    public GoalSelector getGoals() {
+        return goalSelector;
+    }
+
+    @Override
+    public boolean cannotDespawn() {
+        return true;
+    }
+
+    @Override
+    public boolean shouldRenderAtDistance(double distance) {
+        if (getCurrentLevel() > 0) {
+            distance /= getCurrentLevel();
+        }
+        if (distance > 0) {
+            distance--;
+        }
+        return super.shouldRenderAtDistance(distance);
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return Affinity.values()[dataTracker.get(AFFINITY)];
+    }
+
+    public void setAffinity(Affinity affinity) {
+        dataTracker.set(AFFINITY, affinity.ordinal());
+    }
+
+    @Override
+    public void setEffect(@Nullable IMagicEffect effect) {
+        effectDelegate.set(effect);
+
+        if (effect != null) {
+            effect.onPlaced(this);
+        }
+    }
+
+    @Override
+    public boolean canInteract(Race race) {
+        return race.canCast();
+    }
+
+    @Nullable
+    @Override
+    public <T extends IMagicEffect> T getEffect(@Nullable Class<T> type, boolean update) {
+        return effectDelegate.get(type, update);
+    }
+
+    @Override
+    public boolean hasEffect() {
+        return effectDelegate.has();
+    }
+
+    @Override
+    protected void initDataTracker() {
+        super.initDataTracker();
+        dataTracker.startTracking(LEVEL, 0);
+        dataTracker.startTracking(EFFECT, new CompoundTag());
+        dataTracker.startTracking(OWNER, Optional.empty());
+        dataTracker.startTracking(AFFINITY, Affinity.NEUTRAL.ordinal());
+    }
+
+    @Override
+    public ItemStack getPickedResult(RayTraceResult target) {
+        return SpellRegistry.instance().enchantStack(new ItemStack(getItem()), getEffect().getName());
+    }
+
+    protected Item getItem() {
+        return getAffinity() == Affinity.BAD ? UItems.curse : UItems.spell;
+    }
+
+    @Override
+    protected boolean canTriggerWalking() {
+        return false;
+    }
+
+    @Override
+    public boolean isPushable() {
+        return false;
+    }
+
+    @Override
+    public boolean doesRenderOnFire() {
+        return false;
+    }
+
+    @Override
+    public void setOwner(LivingEntity owner) {
+        this.owner = owner;
+        setOwner(owner.getUuid());
+    }
+
+    protected void setOwner(UUID ownerId) {
+        dataTracker.set(OWNER, Optional.ofNullable(ownerId));
+    }
+
+    protected String getOwnerName() {
+        LivingEntity owner = getOwner();
+
+        if (owner != null) {
+            return owner.getEntityName();
+        }
+
+        return "";
+    }
+
+    @Nullable
+    @Override
+    public LivingEntity getOwner() {
+        if (owner == null) {
+            owner = dataTracker.get(OWNER).map(world::getPlayerByUuid).orElse(null);
+        }
+
+        return owner;
+    }
+
+    protected void displayTick() {
+        if (hasEffect()) {
+            getEffect().render(this);
+        }
+    }
+
+    @Override
+    public void tickMovement() {
+        super.mobTick();
+        if (world.isClient) {
+            displayTick();
+        }
+
+        if (!hasEffect()) {
+            remove();
+        } else {
+            if (getEffect().getDead()) {
+                remove();
+                onDeath();
+            } else {
+                getEffect().update(this);
+            }
+
+            if (getEffect().allowAI()) {
+                dimensions.height = 1.5F;
+                super.tickMovement();
+            }
+        }
+
+        if (overLevelCap()) {
+            if (world.random.nextInt(10) == 0) {
+                playSpawnEffects();
+            }
+
+            if (!world.isClient && hasEffect()) {
+                float exhaustionChance = getEffect().getExhaustion(this);
+
+                if (exhaustionChance == 0 || world.random.nextInt((int)(exhaustionChance / 500)) == 0) {
+                    addLevels(-1);
+                } else if (world.random.nextInt((int)(exhaustionChance * 500)) == 0) {
+                    setEffect(null);
+                } else if (world.random.nextInt((int)(exhaustionChance * 3500)) == 0) {
+                    world.createExplosion(this, x, y, z, getCurrentLevel()/2, DestructionType.BREAK);
+                    remove();
+                }
+            }
+        }
+
+        if (getCurrentLevel() < 0) {
+            remove();
+        }
+    }
+
+    public boolean overLevelCap() {
+        return getCurrentLevel() > getMaxLevel();
+    }
+
+    @Override
+    protected void fall(double y, boolean onGround, BlockState state, BlockPos pos) {
+        this.onGround = true;
+    }
+
+    @Override
+    public boolean damage(DamageSource source, float amount) {
+        if (!world.isClient) {
+            remove();
+            onDeath();
+        }
+        return false;
+    }
+
+    protected void onDeath() {
+        BlockSoundGroup sound = BlockSoundGroup.STONE;
+
+        world.playSound(x, y, z, sound.getBreakSound(), SoundCategory.NEUTRAL, sound.getVolume(), sound.getPitch(), true);
+
+        if (world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
+            int level = getCurrentLevel();
+
+            ItemStack stack = new ItemStack(getItem(), level + 1);
+            if (hasEffect()) {
+                SpellRegistry.instance().enchantStack(stack, getEffect().getName());
+            }
+
+            dropStack(stack, 0);
+        }
+    }
+
+    @Override
+    public void remove() {
+        if (hasEffect()) {
+            getEffect().setDead();
+        }
+        super.remove();
+    }
+
+    @Override
+    public ActionResult interactAt(PlayerEntity player, Vec3d vec, Hand hand) {
+        if (Predicates.MAGI.test(player)) {
+            ItemStack currentItem = player.getStackInHand(Hand.MAIN_HAND);
+
+            if (currentItem != null
+                    && currentItem.getItem() instanceof ICastable
+                    && ((ICastable)currentItem.getItem()).canFeed(this, currentItem)
+                    && tryLevelUp(currentItem)) {
+
+                if (!player.abilities.creativeMode) {
+                    currentItem.decrement(1);
+
+                    if (currentItem.isEmpty()) {
+                        player.sendEquipmentBreakStatus(EquipmentSlot.MAINHAND);
+                    }
+                }
+
+                return ActionResult.SUCCESS;
+            }
+        }
+
+        return ActionResult.FAIL;
+    }
+
+    public boolean tryLevelUp(ItemStack stack) {
+        if (hasEffect() && SpellRegistry.stackHasEnchantment(stack)) {
+            if (!getEffect().getName().contentEquals(SpellRegistry.getKeyFromStack(stack))) {
+                return false;
+            }
+
+            addLevels(1);
+
+            playSound(SoundEvents.ENTITY_ZOMBIE_VILLAGER_CURE, 0.1f, 1);
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public int getMaxLevel() {
+        return hasEffect() ? getEffect().getMaxLevelCutOff(this) : 0;
+    }
+
+    @Override
+    public int getCurrentLevel() {
+        return dataTracker.get(LEVEL);
+    }
+
+    @Override
+    public void setCurrentLevel(int level) {
+        dataTracker.set(LEVEL, Math.max(level, 0));
+    }
+
+    @Override
+    public Entity getEntity() {
+        return this;
+    }
+
+    @Override
+    public void readCustomDataFromTag(CompoundTag compound) {
+        super.readCustomDataFromTag(compound);
+        if (compound.containsKey("affinity")) {
+            setAffinity(Affinity.of(compound.getString("affinity")));
+        }
+
+        setOwner(compound.getUuid("owner"));
+        setCurrentLevel(compound.getInt("level"));
+
+        if (compound.containsKey("effect")) {
+            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompound("effect")));
+        }
+    }
+
+    @Override
+    public void writeCustomDataToTag(CompoundTag compound) {
+        super.writeCustomDataToTag(compound);
+
+        compound.putString("affinity", getAffinity().name());
+        compound.putString("owner", getOwnerName());
+        compound.putInt("level", getCurrentLevel());
+
+        if (hasEffect()) {
+            compound.put("effect", SpellRegistry.instance().serializeEffectToNBT(getEffect()));
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ai/EntityAIFollowCaster.java b/src/main/java/com/minelittlepony/unicopia/entity/ai/EntityAIFollowCaster.java
deleted file mode 100644
index e844d835..00000000
--- a/src/main/java/com/minelittlepony/unicopia/entity/ai/EntityAIFollowCaster.java
+++ /dev/null
@@ -1,142 +0,0 @@
-package com.minelittlepony.unicopia.entity.ai;
-
-import com.minelittlepony.unicopia.spell.ICaster;
-
-import net.minecraft.block.state.BlockFaceShape;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.pathfinding.PathNavigate;
-import net.minecraft.pathfinding.PathNavigateFlying;
-import net.minecraft.pathfinding.PathNavigateGround;
-import net.minecraft.pathfinding.PathNodeType;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-
-public class EntityAIFollowCaster<T extends EntityLivingBase> extends EntityAIBase {
-
-    protected final ICaster<?> casted;
-
-    protected final EntityLiving entity;
-
-    protected EntityLivingBase owner;
-
-    protected final World world;
-
-    public final double followSpeed;
-
-    private final PathNavigate petPathfinder;
-
-    private int timeout;
-
-    public float maxDist;
-    public float minDist;
-
-    private float oldWaterCost;
-
-    public EntityAIFollowCaster(ICaster<T> casted, double followSpeed, float minDist, float maxDist) {
-        this.casted = casted;
-
-        this.entity = (EntityLiving)casted.getEntity();
-        this.world = casted.getWorld();
-
-        this.followSpeed = followSpeed;
-        this.petPathfinder = entity.getNavigator();
-        this.minDist = minDist;
-        this.maxDist = maxDist;
-        this.setMutexBits(3);
-
-        if (!(petPathfinder instanceof PathNavigateGround || petPathfinder instanceof PathNavigateFlying)) {
-            throw new IllegalArgumentException("Unsupported mob type for FollowOwnerGoal");
-        }
-    }
-
-    /**
-     * Returns whether the EntityAIBase should begin execution.
-     */
-    public boolean shouldExecute() {
-        EntityLivingBase owner = casted.getOwner();
-
-        if (owner == null
-                || (owner instanceof EntityPlayer && ((EntityPlayer)owner).isSpectator())
-                || entity.getDistanceSq(owner) < (minDist * minDist)) {
-            return false;
-        }
-
-        this.owner = owner;
-
-        return true;
-    }
-
-    @Override
-    public boolean shouldContinueExecuting() {
-        return !petPathfinder.noPath()
-                && entity.getDistanceSq(owner) > (maxDist * maxDist);
-    }
-
-    @Override
-    public void startExecuting() {
-        timeout = 0;
-        oldWaterCost = entity.getPathPriority(PathNodeType.WATER);
-        entity.setPathPriority(PathNodeType.WATER, 0);
-    }
-
-    @Override
-    public void resetTask() {
-        owner = null;
-        petPathfinder.clearPath();
-        entity.setPathPriority(PathNodeType.WATER, oldWaterCost);
-    }
-
-    @Override
-    public void updateTask() {
-        entity.getLookHelper().setLookPositionWithEntity(owner, 10, entity.getVerticalFaceSpeed());
-
-        if (--timeout > 0) {
-            return;
-        }
-
-        timeout = 10;
-
-        if (petPathfinder.tryMoveToEntityLiving(owner, followSpeed)
-                || entity.getLeashed()
-                || entity.isRiding()
-                || entity.getDistanceSq(owner) < 144) {
-            return;
-        }
-
-        int x = MathHelper.floor(owner.posX) - 2;
-        int y = MathHelper.floor(owner.getEntityBoundingBox().minY);
-        int z = MathHelper.floor(owner.posZ) - 2;
-
-        for (int offX = 0; offX <= 4; offX++) {
-            for (int offZ = 0; offZ <= 4; offZ++) {
-                if (canTeleport(x, y, z, offX, offZ)) {
-
-                    entity.setLocationAndAngles((x + offX) + 0.5F, y, (z + offZ) + 0.5F, entity.rotationYaw, entity.rotationPitch);
-                    petPathfinder.clearPath();
-
-                    return;
-                }
-            }
-        }
-    }
-
-    protected boolean canTeleport(int x, int y, int z, int xOffset, int zOffset) {
-        if (xOffset < 1 || zOffset < 1 || xOffset > 3 || zOffset > 3) {
-            return true;
-        }
-
-        BlockPos pos = new BlockPos(x + xOffset, y - 1, z + zOffset);
-        IBlockState state = world.getBlockState(pos);
-
-        return state.getBlockFaceShape(world, pos, EnumFacing.DOWN) == BlockFaceShape.SOLID
-                && state.canEntitySpawn(entity)
-                && world.isAirBlock(pos.up())
-                && world.isAirBlock(pos.up(2));
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/ai/FollowCasterGoal.java b/src/main/java/com/minelittlepony/unicopia/entity/ai/FollowCasterGoal.java
new file mode 100644
index 00000000..7eeb0d47
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/ai/FollowCasterGoal.java
@@ -0,0 +1,134 @@
+package com.minelittlepony.unicopia.entity.ai;
+
+import java.util.EnumSet;
+
+import com.minelittlepony.unicopia.magic.ICaster;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ai.goal.Goal;
+import net.minecraft.entity.ai.pathing.BirdNavigation;
+import net.minecraft.entity.ai.pathing.EntityNavigation;
+import net.minecraft.entity.ai.pathing.MobNavigation;
+import net.minecraft.entity.ai.pathing.PathNodeType;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.world.ViewableWorld;
+
+public class FollowCasterGoal<T extends MobEntity> extends Goal {
+
+    protected final ICaster<?> caster;
+
+    protected final MobEntity entity;
+
+    protected LivingEntity owner;
+
+    protected final ViewableWorld world;
+
+    public final double followSpeed;
+
+    private final EntityNavigation navigation;
+
+    private int timeout;
+
+    public float maxDistance;
+    public float minDistance;
+
+    private float oldWaterCost;
+
+    public FollowCasterGoal(ICaster<T> caster, double followSpeed, float minDist, float maxDist) {
+        this.caster = caster;
+
+        this.entity = (MobEntity)caster.getEntity();
+        this.world = caster.getWorld();
+
+        this.followSpeed = followSpeed;
+        navigation = entity.getNavigation();
+        minDistance = minDist;
+        maxDistance = maxDist;
+        setControls(EnumSet.of(Goal.Control.MOVE, Goal.Control.LOOK));
+
+        if (!(navigation instanceof MobNavigation || navigation instanceof BirdNavigation)) {
+            throw new IllegalArgumentException("Unsupported mob type for FollowCasterGoal");
+        }
+    }
+
+    @Override
+    public boolean canStart() {
+        LivingEntity owner = caster.getOwner();
+
+        if (owner == null
+                || (owner instanceof PlayerEntity && ((PlayerEntity)owner).isSpectator())
+                || entity.squaredDistanceTo(owner) < (minDistance * minDistance)) {
+            return false;
+        }
+
+        this.owner = owner;
+
+        return true;
+    }
+
+    @Override
+    public boolean shouldContinue() {
+        return !navigation.isIdle()
+                && entity.squaredDistanceTo(owner) > (maxDistance * maxDistance);
+    }
+
+    @Override
+    public void start() {
+        timeout = 0;
+        oldWaterCost = entity.getPathNodeTypeWeight(PathNodeType.WATER);
+        entity.setPathNodeTypeWeight(PathNodeType.WATER, 0);
+    }
+
+    @Override
+    public void stop() {
+        owner = null;
+        navigation.stop();
+        entity.setPathNodeTypeWeight(PathNodeType.WATER, oldWaterCost);
+    }
+
+    @Override
+    public void tick() {
+        entity.getLookControl().lookAt(owner, 10, entity.getLookPitchSpeed());
+
+        if (--timeout > 0) {
+            return;
+        }
+
+        timeout = 10;
+
+        if (navigation.startMovingTo(owner, followSpeed)
+                || entity.isLeashed()
+                || entity.hasVehicle()
+                || entity.squaredDistanceTo(owner) < 144) {
+            return;
+        }
+
+        int x = MathHelper.floor(owner.x) - 2;
+        int y = MathHelper.floor(owner.getBoundingBox().minY);
+        int z = MathHelper.floor(owner.z) - 2;
+
+        for (int offX = 0; offX <= 4; offX++) {
+            for (int offZ = 0; offZ <= 4; offZ++) {
+                if ((offX < 1 || offZ < 1 || offX > 3 || offZ > 3) && canMoveInto(new BlockPos(x + offX, y - 1, z + offZ))) {
+
+                    entity.setPositionAndAngles((x + offX) + 0.5F, y, (z + offZ) + 0.5F, entity.headYaw, entity.pitch);
+                    navigation.stop();
+
+                    return;
+                }
+            }
+        }
+    }
+
+    protected boolean canMoveInto(BlockPos pos) {
+        BlockState state = world.getBlockState(pos);
+
+        return state.allowsSpawning(world, pos, entity.getType())
+                && world.isAir(pos.up())
+                && world.isAir(pos.up(2));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/item/AdvancedProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/entity/item/AdvancedProjectileEntity.java
new file mode 100644
index 00000000..9f2c6e93
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/item/AdvancedProjectileEntity.java
@@ -0,0 +1,293 @@
+package com.minelittlepony.unicopia.entity.item;
+
+import java.util.UUID;
+
+import com.minelittlepony.unicopia.entity.IMagicals;
+import com.minelittlepony.unicopia.item.ITossableItem;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.ITossedEffect;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.network.EffectSync;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
+import com.minelittlepony.unicopia.projectile.ITossable;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.thrown.ThrownItemEntity;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.particle.ItemStackParticleEffect;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+/**
+ * A generalised version of Mojang's projectile entity class with added support for a custom appearance and water phobia.
+ *
+ * Can also carry a spell if needed.
+ */
+public class AdvancedProjectileEntity extends ThrownItemEntity implements IMagicals, IAdvancedProjectile, ICaster<LivingEntity> {
+
+    private static final TrackedData<Float> DAMAGE = DataTracker.registerData(AdvancedProjectileEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    private static final TrackedData<Boolean> HYDROPHOBIC = DataTracker.registerData(AdvancedProjectileEntity.class, TrackedDataHandlerRegistry.BOOLEAN);
+    private static final TrackedData<CompoundTag> EFFECT = DataTracker.registerData(AdvancedProjectileEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
+
+    private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
+
+    private UUID ownerUuid;
+
+    public AdvancedProjectileEntity(EntityType<AdvancedProjectileEntity> type, World world) {
+        super(type, world);
+    }
+
+    public AdvancedProjectileEntity(EntityType<AdvancedProjectileEntity> type, World world, LivingEntity thrower) {
+        this(type, world, thrower.x, thrower.y + thrower.getStandingEyeHeight(), thrower.z);
+        setOwner(thrower);
+    }
+
+    public AdvancedProjectileEntity(EntityType<AdvancedProjectileEntity> type, World world, double x, double y, double z) {
+        super(type, world);
+
+        setPosition(x, y, z);
+    }
+
+    @Override
+    protected void initDataTracker() {
+        super.initDataTracker();
+        getDataTracker().startTracking(DAMAGE, (float)0);
+        getDataTracker().startTracking(EFFECT, new CompoundTag());
+        getDataTracker().startTracking(HYDROPHOBIC, false);
+    }
+
+    @Override
+    protected Item getDefaultItem() {
+        return Items.AIR;
+     }
+
+    @Override
+    public Entity getEntity() {
+        return this;
+    }
+
+    @Override
+    public void setOwner(LivingEntity owner) {
+        ownerUuid = owner == null ? null : owner.getUuid();
+    }
+
+    @Override
+    public LivingEntity getOwner() {
+        if (ownerUuid == null || !(world instanceof ServerWorld)) {
+            return null;
+        }
+
+        return (LivingEntity) ((ServerWorld)world).getEntity(ownerUuid);
+    }
+
+    @Override
+    public int getCurrentLevel() {
+        return 1;
+    }
+
+    @Override
+    public void setCurrentLevel(int level) {
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return hasEffect() ? Affinity.NEUTRAL : getEffect().getAffinity();
+    }
+
+    @Override
+    public void setGravity(boolean gravity) {
+        setNoGravity(gravity);
+    }
+
+    @Override
+    public void setEffect(ITossedEffect effect) {
+        setEffect((IMagicEffect)effect);
+    }
+
+    @Override
+    public void setEffect(IMagicEffect effect) {
+        effectDelegate.set(effect);
+
+        if (effect != null) {
+            effect.onPlaced(this);
+        }
+    }
+
+    @Override
+    public <T extends IMagicEffect> T getEffect(Class<T> type, boolean update) {
+        return effectDelegate.get(type, update);
+    }
+
+    @Override
+    public boolean hasEffect() {
+        return effectDelegate.has();
+    }
+
+    @Override
+    public void setThrowDamage(float damage) {
+        getDataTracker().set(DAMAGE, Math.max(0, damage));
+    }
+
+    @Override
+    public float getThrowDamage() {
+        return getDataTracker().get(DAMAGE);
+    }
+
+    @Override
+    public void setHydrophobic() {
+        getDataTracker().set(HYDROPHOBIC, true);
+    }
+
+    @Override
+    public boolean getHydrophobic() {
+        return getDataTracker().get(HYDROPHOBIC);
+    }
+
+    @Override
+    public void tick() {
+
+        if (!world.isClient()) {
+            if (Math.abs(getVelocity().x) < 0.01 && Math.abs(getVelocity().x) < 0.01 && Math.abs(getVelocity().y) < 0.01) {
+                remove();
+            }
+        }
+
+        super.tick();
+
+        if (age % 1000 == 0) {
+            setNoGravity(false);
+        }
+
+        if (hasEffect()) {
+            if (getEffect().getDead()) {
+                remove();
+            } else {
+                getEffect().update(this);
+            }
+
+            if (world.isClient()) {
+                getEffect().render(this);
+            }
+        }
+
+        if (getHydrophobic()) {
+            if (world.getBlockState(getBlockPos()).getMaterial().isLiquid()) {
+                Vec3d vel = getVelocity();
+
+                double velY = vel.y;
+
+                velY *= -1;
+
+                if (!hasNoGravity()) {
+                    velY += 0.16;
+                }
+
+                setVelocity(new Vec3d(vel.x, velY, vel.z));
+            }
+        }
+    }
+
+    @Override
+    public void launch(Entity entityThrower, float pitch, float yaw, float wobble, float velocity, float inaccuracy) {
+        setVelocity(pitch, yaw, wobble, velocity, inaccuracy);
+    }
+
+    private ParticleEffect getParticleParameters() {
+       ItemStack stack = getItem();
+
+       if (stack.isEmpty()) {
+           return ParticleTypes.ITEM_SNOWBALL;
+       }
+
+       return new ItemStackParticleEffect(ParticleTypes.ITEM, stack);
+    }
+
+    @Override
+    public void handleStatus(byte byte_1) {
+       if (byte_1 == 3) {
+          ParticleEffect effect = getParticleParameters();
+
+          for(int i = 0; i < 8; i++) {
+             world.addParticle(effect, x, y, z, 0, 0, 0);
+          }
+       }
+
+    }
+
+    @Override
+    public void readCustomDataFromTag(CompoundTag compound) {
+        super.readCustomDataFromTag(compound);
+
+        if (compound.containsKey("effect")) {
+            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompound("effect")));
+        }
+    }
+
+    @Override
+    public void writeCustomDataToTag(CompoundTag compound) {
+        super.writeCustomDataToTag(compound);
+
+        if (hasEffect()) {
+            compound.put("effect", SpellRegistry.instance().serializeEffectToNBT(getEffect()));
+        }
+    }
+
+    @Override
+    protected void onCollision(HitResult result) {
+        if (result.getType() == HitResult.Type.BLOCK) {
+            onHitBlock((BlockHitResult)result);
+        } else if (result.getType() == HitResult.Type.ENTITY) {
+            onHitEntity((EntityHitResult)result);
+        }
+    }
+
+    protected void onHitBlock(BlockHitResult hit) {
+        Item item = getItem().getItem();
+
+        if (item instanceof ITossableItem) {
+            ((ITossableItem)item).onImpact(this, hit.getBlockPos(), world.getBlockState(hit.getBlockPos()));
+        }
+
+        if (hasEffect()) {
+            IMagicEffect effect = getEffect();
+
+            if (effect instanceof ITossable) {
+                ((ITossable<?>)effect).onImpact(this, hit.getBlockPos(), world.getBlockState(hit.getBlockPos()));
+            }
+        }
+    }
+
+    protected void onHitEntity(EntityHitResult hit) {
+        Entity entity = hit.getEntity();
+
+        if (entity instanceof IAdvancedProjectile) {
+            return;
+        }
+
+        if (entity != null) {
+            entity.damage(DamageSource.thrownProjectile(this, getOwner()), getThrowDamage());
+        }
+
+        if (!world.isClient()) {
+            world.sendEntityStatus(this, (byte)3);
+            remove();
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/item/ItemEntityCapabilities.java b/src/main/java/com/minelittlepony/unicopia/entity/item/ItemEntityCapabilities.java
new file mode 100644
index 00000000..02720de5
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/item/ItemEntityCapabilities.java
@@ -0,0 +1,65 @@
+package com.minelittlepony.unicopia.entity.item;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.entity.IOwned;
+import com.minelittlepony.unicopia.entity.IRaceContainer;
+
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.nbt.CompoundTag;
+
+public class ItemEntityCapabilities implements IRaceContainer<ItemEntity>, IOwned<ItemEntity> {
+
+    private Race race = Race.HUMAN;
+
+    private final ItemEntity owner;
+
+    public ItemEntityCapabilities(ItemEntity owner) {
+        this.owner = owner;
+    }
+
+    @Override
+    public void onUpdate() {
+
+    }
+
+    @Override
+    public void beforeUpdate() {
+
+    }
+
+    @Override
+    public Race getSpecies() {
+        return race;
+    }
+
+    @Override
+    public void setSpecies(Race race) {
+        this.race = race;
+    }
+
+    @Override
+    public void toNBT(CompoundTag compound) {
+        compound.putString("owner_species", race.name());
+    }
+
+
+    @Override
+    public void fromNBT(CompoundTag compound) {
+        race = Race.fromName(compound.getString("owner_species"));
+    }
+
+    @Override
+    public void setOwner(ItemEntity owner) {
+
+    }
+
+    @Override
+    public void onDimensionalTravel(int destinationDimension) {
+
+    }
+
+    @Override
+    public ItemEntity getOwner() {
+        return owner;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/living/LivingEntityCapabilities.java b/src/main/java/com/minelittlepony/unicopia/entity/living/LivingEntityCapabilities.java
new file mode 100644
index 00000000..7f52c437
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/living/LivingEntityCapabilities.java
@@ -0,0 +1,128 @@
+package com.minelittlepony.unicopia.entity.living;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.entity.IRaceContainer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IAffine;
+import com.minelittlepony.unicopia.magic.IAttachedEffect;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.network.EffectSync;
+
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.nbt.CompoundTag;
+
+public class LivingEntityCapabilities implements IRaceContainer<LivingEntity>, ICaster<LivingEntity> {
+
+    private static final TrackedData<CompoundTag> EFFECT = DataTracker.registerData(LivingEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
+
+    public static void boostrap() {}
+
+    private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
+
+    private final LivingEntity entity;
+
+    public LivingEntityCapabilities(LivingEntity entity) {
+        this.entity = entity;
+
+        entity.getDataTracker().startTracking(EFFECT, new CompoundTag());
+    }
+
+    @Override
+    public Race getSpecies() {
+        return Race.HUMAN;
+    }
+
+    @Override
+    public void setSpecies(Race race) {
+    }
+
+    @Override
+    public void setEffect(IMagicEffect effect) {
+        effectDelegate.set(effect);
+    }
+
+    @Override
+    public <T extends IMagicEffect> T getEffect(Class<T> type, boolean update) {
+        return effectDelegate.get(type, update);
+    }
+
+    @Override
+    public boolean hasEffect() {
+        return effectDelegate.has();
+    }
+
+    @Override
+    public void beforeUpdate() {
+
+    }
+
+    @Override
+    public void onUpdate() {
+        if (hasEffect()) {
+            IAttachedEffect effect = getEffect(IAttachedEffect.class, true);
+
+            if (effect != null) {
+                if (entity.getEntityWorld().isClient()) {
+                    effect.renderOnPerson(this);
+                }
+
+                if (!effect.updateOnPerson(this)) {
+                    setEffect(null);
+                }
+            }
+        }
+    }
+
+    @Override
+    public void onDimensionalTravel(int destinationDimension) {
+
+    }
+
+    @Override
+    public void setOwner(LivingEntity owner) {
+
+    }
+
+    @Override
+    public LivingEntity getOwner() {
+        return entity;
+    }
+
+    @Override
+    public int getCurrentLevel() {
+        return 0;
+    }
+
+    @Override
+    public void setCurrentLevel(int level) {
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        if (getOwner() instanceof IAffine) {
+            return ((IAffine)getOwner()).getAffinity();
+        }
+        return Affinity.NEUTRAL;
+    }
+
+    @Override
+    public void toNBT(CompoundTag compound) {
+        IMagicEffect effect = getEffect();
+
+        if (effect != null) {
+            compound.put("effect", SpellRegistry.instance().serializeEffectToNBT(effect));
+        }
+    }
+
+    @Override
+    public void fromNBT(CompoundTag compound) {
+        if (compound.containsKey("effect")) {
+            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompound("effect")));
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java b/src/main/java/com/minelittlepony/unicopia/entity/player/AbilityDelegate.java
similarity index 76%
rename from src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/AbilityDelegate.java
index 9172ebf1..d8e212f4 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerAbilityDelegate.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/AbilityDelegate.java
@@ -1,19 +1,20 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.minelittlepony.jumpingcastle.api.Target;
 import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.ability.IAbilityReceiver;
+import com.minelittlepony.unicopia.ability.IData;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.powers.PowersRegistry;
+import com.minelittlepony.unicopia.entity.IUpdatable;
 import com.minelittlepony.unicopia.network.MsgPlayerAbility;
-import com.minelittlepony.unicopia.power.IData;
-import com.minelittlepony.unicopia.power.IPower;
-import com.minelittlepony.unicopia.power.PowersRegistry;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
+import com.minelittlepony.util.InbtSerialisable;
 
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundTag;
 
-class PlayerAbilityDelegate implements IAbilityReceiver, IUpdatable, InbtSerialisable {
+class AbilityDelegate implements IAbilityReceiver, IUpdatable, InbtSerialisable {
 
     private final IPlayer player;
 
@@ -35,7 +36,7 @@ class PlayerAbilityDelegate implements IAbilityReceiver, IUpdatable, InbtSeriali
     @Nullable
     private IPower<?> activeAbility = null;
 
-    public PlayerAbilityDelegate(IPlayer player) {
+    public AbilityDelegate(IPlayer player) {
         this.player = player;
     }
 
@@ -71,7 +72,7 @@ class PlayerAbilityDelegate implements IAbilityReceiver, IUpdatable, InbtSeriali
 
     @Nullable
     protected synchronized IPower<?> getUsableAbility() {
-        if (!(activeAbility == null || (triggered && warmup == 0 && cooldown == 0)) && activeAbility.canUse(player.getPlayerSpecies())) {
+        if (!(activeAbility == null || (triggered && warmup == 0 && cooldown == 0)) && activeAbility.canUse(player.getSpecies())) {
             return activeAbility;
         }
         return null;
@@ -123,27 +124,27 @@ class PlayerAbilityDelegate implements IAbilityReceiver, IUpdatable, InbtSeriali
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        compound.setBoolean("triggered", triggered);
-        compound.setInteger("warmup", warmup);
-        compound.setInteger("cooldown", cooldown);
+    public void toNBT(CompoundTag compound) {
+        compound.putBoolean("triggered", triggered);
+        compound.putInt("warmup", warmup);
+        compound.putInt("cooldown", cooldown);
 
         IPower<?> ability = getUsableAbility();
 
         if (ability != null) {
-            compound.setString("activeAbility", ability.getKeyName());
+            compound.putString("activeAbility", ability.getKeyName());
         }
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
+    public void fromNBT(CompoundTag compound) {
         activeAbility = null;
 
         triggered = compound.getBoolean("triggered");
-        warmup = compound.getInteger("warmup");
-        cooldown = compound.getInteger("cooldown");
+        warmup = compound.getInt("warmup");
+        cooldown = compound.getInt("cooldown");
 
-        if (compound.hasKey("activeAbility")) {
+        if (compound.containsKey("activeAbility")) {
             PowersRegistry.instance()
                 .getPowerFromName(compound.getString("activeAbility"))
                 .ifPresent(p -> activeAbility = p);
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java b/src/main/java/com/minelittlepony/unicopia/entity/player/GravityDelegate.java
similarity index 52%
rename from src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/GravityDelegate.java
index 463ee6da..a400827b 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerGravityDelegate.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/GravityDelegate.java
@@ -1,33 +1,37 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
 import java.util.Random;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.init.USounds;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.USounds;
+import com.minelittlepony.unicopia.ability.IFlyingPredicate;
+import com.minelittlepony.unicopia.ability.IHeightPredicate;
+import com.minelittlepony.unicopia.entity.IFlight;
+import com.minelittlepony.unicopia.entity.IGravity;
+import com.minelittlepony.unicopia.entity.IUpdatable;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
 import com.minelittlepony.unicopia.mixin.MixinEntity;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
+import com.minelittlepony.util.InbtSerialisable;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Material;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.MobEffects;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.sound.BlockSoundGroup;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
 
-class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, IFlyingPredicate, IPlayerHeightPredicate {
+class GravityDelegate implements IUpdatable, IGravity, IFlight, InbtSerialisable, IFlyingPredicate, IHeightPredicate {
 
     private final IPlayer player;
 
@@ -44,13 +48,13 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
 
     private float gravity = 0;
 
-    public PlayerGravityDelegate(IPlayer player) {
+    public GravityDelegate(IPlayer player) {
         this.player = player;
     }
 
     @Override
     public boolean checkCanFly(IPlayer player) {
-        if (player.getOwner().capabilities.isCreativeMode) {
+        if (player.getOwner().abilities.creativeMode) {
             return true;
         }
 
@@ -61,7 +65,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             }
         }
 
-        return player.getPlayerSpecies().canFly();
+        return player.getSpecies().canFly();
     }
 
     protected boolean isRainboom(IPlayer player) {
@@ -72,8 +76,8 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
     public float getTargetEyeHeight(IPlayer player) {
         if (player.hasEffect()) {
             IMagicEffect effect = player.getEffect();
-            if (!effect.getDead() && effect instanceof IPlayerHeightPredicate) {
-                float val = ((IPlayerHeightPredicate)effect).getTargetEyeHeight(player);
+            if (!effect.getDead() && effect instanceof IHeightPredicate) {
+                float val = ((IHeightPredicate)effect).getTargetEyeHeight(player);
                 if (val > 0) {
                     return val;
                 }
@@ -84,15 +88,15 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             return 0.5F;
         }
 
-        return player.getOwner().getDefaultEyeHeight();
+        return player.getOwner().getStandingEyeHeight();
     }
 
     @Override
     public float getTargetBodyHeight(IPlayer player) {
         if (player.hasEffect()) {
             IMagicEffect effect = player.getEffect();
-            if (!effect.getDead() && effect instanceof IPlayerHeightPredicate) {
-                float val = ((IPlayerHeightPredicate)effect).getTargetBodyHeight(player);
+            if (!effect.getDead() && effect instanceof IHeightPredicate) {
+                float val = ((IHeightPredicate)effect).getTargetBodyHeight(player);
                 if (val > 0) {
                     return val;
                 }
@@ -102,10 +106,10 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
         // Player height is reset at this point, so we can use it as our baseline.
 
         if (isFlying && isRainboom(player)) {
-            return player.getOwner().height / 2;
+            return player.getOwner().getHeight() / 2;
         }
 
-        return player.getOwner().height;
+        return player.getOwner().getHeight();
     }
 
     @Override
@@ -125,42 +129,44 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
 
     @Override
     public void onUpdate() {
-        EntityPlayer entity = player.getOwner();
+        PlayerEntity entity = player.getOwner();
 
-        if (isExperienceCritical() && player.isRemote()) {
-            Random rnd = player.getWorld().rand;
+        Vec3d velocity = entity.getVelocity();
+
+        if (isExperienceCritical() && player.isClient()) {
+            Random rnd = player.getWorld().random;
 
             for (int i = 0; i < 360 + getHorizontalMotion(entity); i += 10) {
                 Vec3d pos = player.getOriginVector().add(
-                        rnd.nextGaussian() * entity.width,
-                        rnd.nextGaussian() * entity.height/2,
-                        rnd.nextGaussian() * entity.width
+                        rnd.nextGaussian() * entity.getWidth(),
+                        rnd.nextGaussian() * entity.getHeight()/2,
+                        rnd.nextGaussian() * entity.getWidth()
                 );
-                Vec3d vel = new Vec3d(entity.motionX, entity.motionY, entity.motionZ);
 
-                Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, true, pos, vel);
+                ParticleTypeRegistry.getTnstance().getSpawner().spawnParticle(entity.world, UParticles.UNICORN_MAGIC, pos, velocity);
             }
         }
 
-        entity.capabilities.allowFlying = checkCanFly(player);
+        entity.abilities.allowFlying = checkCanFly(player);
 
-        if (!entity.capabilities.isCreativeMode) {
-            entity.capabilities.isFlying |= entity.capabilities.allowFlying && isFlying && !entity.onGround && !entity.isWet();
+        if (!entity.abilities.creativeMode) {
+            entity.abilities.flying |= entity.abilities.allowFlying && isFlying && !entity.onGround && !entity.isInWater();
         }
 
-        isFlying = entity.capabilities.isFlying && !entity.capabilities.isCreativeMode;
+        isFlying = entity.abilities.flying && !entity.abilities.creativeMode;
 
         if (gravity != 0) {
-            if (!entity.capabilities.isFlying) {
-                entity.motionY += 0.038;
-                entity.motionY -= gravity;
+            if (!entity.abilities.flying) {
+                velocity.y += 0.038;
+                velocity.y -= gravity;
             }
 
             if (gravity < 0) {
-                entity.onGround = !entity.world.isAirBlock(new BlockPos(entity.posX, entity.posY + entity.height + 0.5F, entity.posZ));
+                entity.onGround = !entity.world.isAir(new BlockPos(entity.x, entity.y + entity.getHeight() + 0.5F, entity.z));
 
                 if (entity.onGround) {
-                    entity.capabilities.isFlying = isFlying = false;
+                    entity.abilities.flying = false;
+                    isFlying = false;
                 }
             }
         }
@@ -172,12 +178,13 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             eyeHeight = bodyHeight - eyeHeight;
         }
 
-        if (entity.ticksExisted > 10) {
+        if (entity.age > 10) {
             bodyHeight = player.getInterpolator().interpolate("standingHeight", bodyHeight, 10);
             eyeHeight = player.getInterpolator().interpolate("eyeHeight", eyeHeight, 10);
         }
 
-        MixinEntity.setSize(entity, entity.width, bodyHeight);
+
+        ((MixinEntity)entity).setSize(entity.getWidth(), bodyHeight);
         entity.eyeHeight = eyeHeight;
 
         if (gravity < 0) {
@@ -186,8 +193,8 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             }
         }
 
-        if (!entity.capabilities.isCreativeMode && !entity.isElytraFlying()) {
-            if (isFlying && !entity.isRiding()) {
+        if (!entity.abilities.creativeMode && !entity.isFallFlying()) {
+            if (isFlying && !entity.hasVehicle()) {
 
                 if (!isRainbooming && getHorizontalMotion(entity) > 0.2 && flightExperience < MAXIMUM_FLIGHT_EXPERIENCE) {
                     flightExperience++;
@@ -195,7 +202,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
 
                 entity.fallDistance = 0;
 
-                if (player.getPlayerSpecies() != Race.CHANGELING && entity.world.rand.nextInt(100) == 0) {
+                if (player.getSpecies() != Race.CHANGELING && entity.world.random.nextInt(100) == 0) {
                     float exhaustion = (0.3F * ticksNextLevel) / 70;
                     if (entity.isSprinting()) {
                         exhaustion *= 3.11F;
@@ -214,7 +221,7 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
                     entity.playSound(SoundEvents.ENTITY_GUARDIAN_FLOP, 1, 1);
                 }
 
-                moveFlying(entity);
+                moveFlying(entity, velocity);
 
                 if (isExperienceCritical()) {
 
@@ -225,12 +232,12 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
                     if (isRainbooming || (entity.isSneaking() && isRainboom(player))) {
                         float forward = 0.5F * flightExperience / MAXIMUM_FLIGHT_EXPERIENCE;
 
-                        entity.motionX += - forward * MathHelper.sin(entity.rotationYaw * 0.017453292F);
-                        entity.motionZ += forward * MathHelper.cos(entity.rotationYaw * 0.017453292F);
-                        entity.motionY += forward * MathHelper.sin(entity.rotationPitch * 0.017453292F);
+                        velocity.x += - forward * MathHelper.sin(entity.yaw * 0.017453292F);
+                        velocity.z +=   forward * MathHelper.cos(entity.yaw * 0.017453292F);
+                        velocity.y +=   forward * MathHelper.sin(entity.pitch * 0.017453292F);
 
-                        if (!isRainbooming || entity.world.rand.nextInt(5) == 0) {
-                            entity.playSound(SoundEvents.ENTITY_LIGHTNING_THUNDER, 1, 1);
+                        if (!isRainbooming || entity.world.random.nextInt(5) == 0) {
+                            entity.playSound(SoundEvents.ENTITY_LIGHTNING_BOLT_THUNDER, 1, 1);
                         }
 
                         if (flightExperience > 0) {
@@ -264,15 +271,17 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             }
         }
 
-        lastTickPosX = entity.posX;
-        lastTickPosZ = entity.posZ;
+        lastTickPosX = entity.x;
+        lastTickPosZ = entity.z;
+
+        entity.setVelocity(velocity);
     }
 
     public SoundEvent getWingSound() {
-        return player.getPlayerSpecies() == Race.CHANGELING ? USounds.CHANGELING_BUZZ : USounds.WING_FLAP;
+        return player.getSpecies() == Race.CHANGELING ? USounds.CHANGELING_BUZZ : USounds.WING_FLAP;
     }
 
-    protected void moveFlying(EntityPlayer player) {
+    protected void moveFlying(Entity player, Vec3d velocity) {
 
         float forward = 0.000015F * flightExperience * (float)Math.sqrt(getHorizontalMotion(player));
         int factor = gravity < 0 ? -1 : 1;
@@ -280,37 +289,37 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
 
         // vertical drop due to gravity
         if (sneak) {
-            player.motionY -= (0.005F - getHorizontalMotion(player) / 100) * factor;
+            velocity.y -= (0.005F - getHorizontalMotion(player) / 100) * factor;
         } else {
             forward += 0.005F;
-            player.motionY -= 0.0001F * factor;
+            velocity.y -= 0.0001F * factor;
         }
 
-        player.motionX += - forward * MathHelper.sin(player.rotationYaw * 0.017453292F);
-        player.motionZ += forward * MathHelper.cos(player.rotationYaw * 0.017453292F);
+        velocity.x += - forward * MathHelper.sin(player.yaw * 0.017453292F);
+        velocity.z += forward * MathHelper.cos(player.yaw * 0.017453292F);
 
-        if (player.world.isRainingAt(player.getPosition())) {
-            float glance = 360 * player.world.rand.nextFloat();
+        if (player.world.hasRain(player.getBlockPos())) {
+            float glance = 360 * player.world.random.nextFloat();
 
 
-            forward = 0.015F * player.world.rand.nextFloat() *  player.world.getRainStrength(1);
+            forward = 0.015F * player.world.random.nextFloat() *  player.world.getRainGradient(1);
 
-            if (player.world.rand.nextInt(30) == 0) {
+            if (player.world.random.nextInt(30) == 0) {
                 forward *= 10;
             }
-            if (player.world.rand.nextInt(30) == 0) {
+            if (player.world.random.nextInt(30) == 0) {
                 forward *= 10;
             }
-            if (player.world.rand.nextInt(40) == 0) {
+            if (player.world.random.nextInt(40) == 0) {
                 forward *= 100;
             }
 
-            if (player.world.isThundering() && player.world.rand.nextInt(60) == 0) {
-                player.motionY += forward * 3;
+            if (player.world.isThundering() && player.world.random.nextInt(60) == 0) {
+                velocity.y += forward * 3;
             }
 
             if (forward >= 1) {
-                player.world.playSound(null, player.getPosition(), USounds.WIND_RUSH, SoundCategory.AMBIENT, 3, 1);
+                player.world.playSound(null, player.getPos(), USounds.WIND_RUSH, SoundCategory.AMBIENT, 3, 1);
             }
 
             if (forward > 4) {
@@ -318,45 +327,14 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
             }
 
             //player.knockBack(player, forward, 1, 1);
-            player.motionX += - forward * MathHelper.sin((player.rotationYaw + glance) * 0.017453292F);
-            player.motionZ += forward * MathHelper.cos((player.rotationYaw + glance) * 0.017453292F);
-        }
-    }
-
-    public void landHard(EntityPlayer player, float distance, float damageMultiplier) {
-        if (distance <= 0) {
-            return;
-        }
-
-        PotionEffect potioneffect = player.getActivePotionEffect(MobEffects.JUMP_BOOST);
-        float potion = potioneffect != null ? potioneffect.getAmplifier() + 1 : 0;
-        int i = MathHelper.ceil((distance - 8.0F - potion) * damageMultiplier);
-
-        if (i > 0) {
-            int j = MathHelper.floor(player.posX);
-            int k = MathHelper.floor(player.posY - 0.20000000298023224D);
-            int l = MathHelper.floor(player.posZ);
-
-            BlockPos pos = new BlockPos(j, k, l);
-
-            IBlockState state = player.world.getBlockState(pos);
-            Block block = state.getBlock();
-
-            if (state.getMaterial() != Material.AIR) {
-
-                player.playSound(getFallSound(i), 1, 1);
-                player.attackEntityFrom(DamageSource.FALL, i);
-
-                SoundType soundtype = block.getSoundType(state, player.getEntityWorld(), pos, player);
-
-                player.playSound(soundtype.getStepSound(), soundtype.getVolume() * 0.5f, soundtype.getPitch() * 0.75f);
-            }
+            velocity.x += - forward * MathHelper.sin((player.yaw + glance) * 0.017453292F);
+            velocity.z += forward * MathHelper.cos((player.yaw + glance) * 0.017453292F);
         }
     }
 
     protected double getHorizontalMotion(Entity e) {
-        double motionX = e.posX - lastTickPosX;
-        double motionZ = e.posZ - lastTickPosZ;
+        double motionX = e.x - lastTickPosX;
+        double motionZ = e.z - lastTickPosZ;
 
         return (motionX * motionX)
                + (motionZ * motionZ);
@@ -366,53 +344,53 @@ class PlayerGravityDelegate implements IUpdatable, IGravity, InbtSerialisable, I
         return distance > 4 ? SoundEvents.ENTITY_PLAYER_BIG_FALL : SoundEvents.ENTITY_PLAYER_SMALL_FALL;
     }
 
-    private void addFlightExperience(EntityPlayer entity, float factor) {
+    private void addFlightExperience(PlayerEntity entity, float factor) {
         float maximumGain = MAXIMUM_FLIGHT_EXPERIENCE - flightExperience;
         float gainSteps = 20;
 
         flightExperience = Math.max(0, flightExperience + factor * maximumGain / gainSteps);
     }
 
-    public void updateFlightStat(EntityPlayer entity, boolean flying) {
-        if (!entity.capabilities.isCreativeMode) {
-            entity.capabilities.allowFlying = player.getPlayerSpecies().canFly();
+    public void updateFlightStat(PlayerEntity entity, boolean flying) {
+        if (!entity.abilities.creativeMode) {
+            entity.abilities.allowFlying = player.getSpecies().canFly();
 
-            if (entity.capabilities.allowFlying) {
-                entity.capabilities.isFlying |= flying;
+            if (entity.abilities.allowFlying) {
+                entity.abilities.flying |= flying;
 
-                isFlying = entity.capabilities.isFlying;
+                isFlying = entity.abilities.flying;
 
                 if (isFlying) {
                     ticksNextLevel = 0;
                 }
 
             } else {
-                entity.capabilities.isFlying = false;
+                entity.abilities.flying = false;
                 isFlying = false;
             }
         }
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        compound.setInteger("flightDuration", ticksNextLevel);
-        compound.setFloat("flightExperience", flightExperience);
-        compound.setBoolean("isFlying", isFlying);
-        compound.setBoolean("isRainbooming", isRainbooming);
+    public void toNBT(CompoundTag compound) {
+        compound.putInt("flightDuration", ticksNextLevel);
+        compound.putFloat("flightExperience", flightExperience);
+        compound.putBoolean("isFlying", isFlying);
+        compound.putBoolean("isRainbooming", isRainbooming);
 
         if (gravity != 0) {
-            compound.setFloat("gravity", gravity);
+            compound.putFloat("gravity", gravity);
         }
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        ticksNextLevel = compound.getInteger("flightDuration");
+    public void fromNBT(CompoundTag compound) {
+        ticksNextLevel = compound.getInt("flightDuration");
         flightExperience = compound.getFloat("flightExperience");
         isFlying = compound.getBoolean("isFlying");
         isRainbooming = compound.getBoolean("isRainbooming");
 
-        if (compound.hasKey("gravity")) {
+        if (compound.containsKey("gravity")) {
             gravity = compound.getFloat("gravity");
         } else {
             gravity = 0;
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IView.java b/src/main/java/com/minelittlepony/unicopia/entity/player/ICamera.java
similarity index 73%
rename from src/main/java/com/minelittlepony/unicopia/player/IView.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/ICamera.java
index 30612027..5fc0f145 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IView.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/ICamera.java
@@ -1,6 +1,6 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
-public interface IView {
+public interface ICamera {
     float calculateRoll();
 
     float calculatePitch(float pitch);
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java b/src/main/java/com/minelittlepony/unicopia/entity/player/IPlayer.java
similarity index 63%
rename from src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/IPlayer.java
index fafd9a55..28e2a0f1 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/IPlayer.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/IPlayer.java
@@ -1,32 +1,36 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
 import java.util.UUID;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.model.anim.IInterpolator;
 import com.minelittlepony.unicopia.UClient;
+import com.minelittlepony.unicopia.ability.IAbilityReceiver;
 import com.minelittlepony.unicopia.enchanting.IPageOwner;
+import com.minelittlepony.unicopia.entity.IFlight;
+import com.minelittlepony.unicopia.entity.IFood;
+import com.minelittlepony.unicopia.entity.IGravity;
+import com.minelittlepony.unicopia.entity.IInventory;
+import com.minelittlepony.unicopia.entity.IRaceContainer;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IHeldEffect;
 import com.minelittlepony.unicopia.network.ITransmittable;
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.spell.IHeldEffect;
 import com.mojang.authlib.GameProfile;
+import com.mojang.datafixers.util.Either;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayer.SleepResult;
-import net.minecraft.item.ItemFood;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.Unit;
 import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.fml.common.FMLCommonHandler;
 
 /**
  * The player.
  *
  * This is the core of unicopia.
  */
-public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPlayer>, ITransmittable, IPageOwner {
+public interface IPlayer extends ICaster<PlayerEntity>, IRaceContainer<PlayerEntity>, ITransmittable, IPageOwner {
 
     /**
      * Gets the player's magical abilities delegate responsible for all spell casting and persisting/updating.
@@ -39,14 +43,14 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
     IGravity getGravity();
 
     /**
-     * Gets the player's viewport.
+     * Gets the flight delegate.
      */
-    IView getCamera();
+    IFlight getFlight();
 
     /**
-     * Gets the food delegate to handle player eating.
+     * Gets the player's viewport.
      */
-    IFood getFood();
+    ICamera getCamera();
 
     /**
      * Gets the inventory delegate for this player.
@@ -94,17 +98,6 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
         setEnergy(getEnergy() + energy / 100F);
     }
 
-    /**
-     * Returns true if this player is fully invisible.
-     * Held items and other effects will be hidden as well.
-     */
-    boolean isInvisible();
-
-    /**
-     * Sets whether this player should be invisible.
-     */
-    void setInvisible(boolean invisible);
-
     void copyFrom(IPlayer oldPlayer);
 
     /**
@@ -112,16 +105,6 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
      */
     boolean stepOnCloud();
 
-    /**
-     * Called when this player finishes eating food.
-     */
-    void onEat(ItemStack stack, @Nullable ItemFood food);
-
-    /**
-     * Called when this player falls.
-     */
-    void onFall(float distance, float damageMultiplier);
-
     /**
      * Gets the held effect for the given item.
      * Updates it if the current held effect doesn't match or is empty.
@@ -132,12 +115,9 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
     IHeldEffect getHeldEffect(ItemStack stack);
 
     /**
-     * Event triggered when this player is hit by a projectile.
-     * @param projectile The projectile doing the hitting.
-     *
-     * @return True if the hit was successful.
+     * Called when this player falls.
      */
-    boolean onProjectileImpact(Entity projectile);
+    float onImpact(float distance);
 
     /**
      * Attempts to sleep in a bed.
@@ -146,7 +126,7 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
      *
      * @return The sleep result.
      */
-    SleepResult trySleep(BlockPos pos);
+    Either<PlayerEntity.SleepFailureReason, Unit> trySleep(BlockPos pos);
 
     /**
      * Returns true if this player is the use.
@@ -155,17 +135,18 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
         return UClient.instance().isClientPlayer(getOwner());
     }
 
-    static EntityPlayer getPlayerFromServer(UUID playerId) {
-        MinecraftServer server = FMLCommonHandler.instance().getMinecraftServerInstance();
+    static PlayerEntity fromServer(UUID playerId) {
+
+        MinecraftServer server = FMLCommonHandler.getInstance().getMinecraftServerInstance();
 
         if (server == null) {
             return UClient.instance().getPlayerByUUID(playerId);
         }
 
-        Entity e = server.getEntityFromUuid(playerId);
+        Entity e = server.getPlayerManager().getPlayer(playerId);
 
-        if (e instanceof EntityPlayer) {
-            return (EntityPlayer)e;
+        if (e instanceof PlayerEntity) {
+            return (PlayerEntity)e;
         }
 
         return null;
@@ -175,7 +156,7 @@ public interface IPlayer extends ICaster<EntityPlayer>, IRaceContainer<EntityPla
         return one == two || (one != null && two != null && one.getId().equals(two.getId()));
     }
 
-    static boolean equal(EntityPlayer one, EntityPlayer two) {
+    static boolean equal(PlayerEntity one, PlayerEntity two) {
         return one == two || (one != null && two != null && equal(one.getGameProfile(), two.getGameProfile()));
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java
new file mode 100644
index 00000000..98be0ec1
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerAttributes.java
@@ -0,0 +1,52 @@
+package com.minelittlepony.unicopia.entity.player;
+
+import java.util.UUID;
+
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.inventory.gui.InventoryOfHolding;
+import com.minelittlepony.unicopia.mixin.IWalker;
+
+import net.minecraft.entity.attribute.EntityAttribute;
+import net.minecraft.entity.attribute.EntityAttributeInstance;
+import net.minecraft.entity.attribute.EntityAttributeModifier;
+import net.minecraft.entity.attribute.EntityAttributeModifier.Operation;
+import net.minecraft.entity.attribute.EntityAttributes;
+import net.minecraft.entity.player.PlayerEntity;
+
+public class PlayerAttributes {
+
+    private static final EntityAttributeModifier EARTH_PONY_STRENGTH =
+            new EntityAttributeModifier(UUID.fromString("777a5505-521e-480b-b9d5-6ea54f259564"), "Earth Pony Strength", 0.6, Operation.MULTIPLY_TOTAL);
+    private static final EntityAttributeModifier PEGASUS_SPEED =
+            new EntityAttributeModifier(UUID.fromString("9e2699fc-3b8d-4f71-9d2d-fb92ee19b4f7"), "Pegasus Speed", 0.2, Operation.MULTIPLY_TOTAL);
+    //private static final EntityAttributeModifier PEGASUS_REACH =
+    //        new EntityAttributeModifier(UUID.fromString("707b50a8-03e8-40f4-8553-ecf67025fd6d"), "Pegasus Reach", 1.5, Operation.ADDITION);
+
+    private double loadStrength = 0;
+
+    public void applyAttributes(PlayerEntity entity, Race race) {
+        loadStrength = InventoryOfHolding.getContentsTotalWorth(entity.inventory, false);
+
+        ((IWalker)entity.abilities).setWalkSpeed(0.1F - (float)(loadStrength / 100000));
+
+        applyAttribute(entity, EntityAttributes.ATTACK_DAMAGE, EARTH_PONY_STRENGTH, race.canUseEarth());
+        applyAttribute(entity, EntityAttributes.KNOCKBACK_RESISTANCE, EARTH_PONY_STRENGTH, race.canUseEarth());
+        applyAttribute(entity, EntityAttributes.MOVEMENT_SPEED, PEGASUS_SPEED, race.canFly());
+        applyAttribute(entity, EntityAttributes.ATTACK_SPEED, PEGASUS_SPEED, race.canFly());
+        // applyAttribute(entity, PlayerEntity.REACH_DISTANCE, PEGASUS_REACH, race.canFly());
+    }
+
+    private void applyAttribute(PlayerEntity entity, EntityAttribute attribute, EntityAttributeModifier modifier, boolean enable) {
+        EntityAttributeInstance instance = entity.getAttributeInstance(attribute);
+
+        if (enable) {
+            if (!instance.hasModifier(modifier)) {
+                instance.addModifier(modifier);
+            }
+        } else {
+            if (instance.hasModifier(modifier)) {
+                instance.removeModifier(modifier);
+            }
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerView.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCamera.java
similarity index 74%
rename from src/main/java/com/minelittlepony/unicopia/player/PlayerView.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCamera.java
index faf8378f..bfcaa46e 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerView.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCamera.java
@@ -1,14 +1,12 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
-import com.minelittlepony.transform.MotionCompositor;
-
-class PlayerView extends MotionCompositor implements IView {
+class PlayerCamera extends MotionCompositor implements ICamera {
 
     private final IPlayer player;
 
     private double baseRoll = 0;
 
-    public PlayerView(IPlayer player) {
+    public PlayerCamera(IPlayer player) {
         this.player = player;
     }
 
@@ -17,8 +15,8 @@ class PlayerView extends MotionCompositor implements IView {
 
         double roll = baseRoll;
 
-        if (player.getGravity().isFlying()) {
-            roll -= super.calculateRoll(player.getOwner(), player.getOwner().motionX, player.getOwner().motionY, player.getOwner().motionZ);
+        if (player.getFlight().isFlying()) {
+            roll -= super.calculateRoll(player.getOwner(), player.getOwner().getVelocity().motionX, player.getOwner().motionY, player.getOwner().motionZ);
         }
 
         if (player.getGravity().getGravitationConstant() < 0) {
@@ -26,7 +24,7 @@ class PlayerView extends MotionCompositor implements IView {
             roll += 180;
         }
 
-        if (player.getEntity().ticksExisted > 10) {
+        if (player.getEntity().age > 10) {
             roll = player.getInterpolator().interpolate("roll", (float)roll, 250);
         }
 
@@ -58,7 +56,7 @@ class PlayerView extends MotionCompositor implements IView {
             return 0;
         }
 
-        float energyAddition = (player.getWorld().rand.nextInt(maxE) - maxE/2) / 100F;
+        float energyAddition = (player.getWorld().random.nextInt(maxE) - maxE/2) / 100F;
 
         if (Math.abs(energyAddition) <= 0.001) {
             return 0;
diff --git a/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCapabilities.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCapabilities.java
new file mode 100644
index 00000000..7e0fc31d
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerCapabilities.java
@@ -0,0 +1,497 @@
+package com.minelittlepony.unicopia.entity.player;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import com.google.common.collect.Maps;
+import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UEffects;
+import com.minelittlepony.unicopia.UItems;
+import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.ability.IAbilityReceiver;
+import com.minelittlepony.unicopia.enchanting.PageState;
+import com.minelittlepony.unicopia.entity.EntityCuccoon;
+import com.minelittlepony.unicopia.entity.IFlight;
+import com.minelittlepony.unicopia.entity.IFood;
+import com.minelittlepony.unicopia.entity.IGravity;
+import com.minelittlepony.unicopia.entity.IInventory;
+import com.minelittlepony.unicopia.entity.ITrap;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IAttachedEffect;
+import com.minelittlepony.unicopia.magic.IHeldEffect;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.items.ICastable;
+import com.minelittlepony.unicopia.magic.spells.SpellDisguise;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.network.EffectSync;
+import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
+import com.mojang.datafixers.util.Either;
+
+import net.minecraft.client.network.packet.EntityPassengersSetS2CPacket;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.data.DataTracker;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.entity.data.TrackedDataHandlerRegistry;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerEntity.SleepFailureReason;
+import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.item.FoodComponent;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.Packet;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.stat.Stats;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Hand;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.Unit;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.Difficulty;
+
+public class PlayerCapabilities implements IPlayer {
+
+    private static final TrackedData<Integer> PLAYER_RACE = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.INTEGER);
+    private static final TrackedData<Float> ENERGY = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    private static final TrackedData<Float> EXERTION = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.FLOAT);
+    private static final TrackedData<CompoundTag> EFFECT = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
+    private static final TrackedData<CompoundTag> HELD_EFFECT = DataTracker.registerData(PlayerEntity.class, TrackedDataHandlerRegistry.TAG_COMPOUND);
+
+    private final Map<Identifier, PageState> pageStates = new HashMap<>();
+
+    private final AbilityDelegate powers = new AbilityDelegate(this);
+
+    private final GravityDelegate gravity = new GravityDelegate(this);
+
+    private final PlayerAttributes attributes = new PlayerAttributes();
+
+    private final PlayerCamera view = new PlayerCamera(this);
+
+    private final PlayerInventory inventory = new PlayerInventory(this);
+
+    private final EffectSync effectDelegate = new EffectSync(this, EFFECT);
+    private final EffectSync heldEffectDelegate = new EffectSync(this, HELD_EFFECT);
+
+    private final IInterpolator interpolator = new BasicEasingInterpolator();
+
+    private float nextStepDistance = 1;
+
+    private final PlayerEntity entity;
+
+    private boolean dirty = false;
+
+    private boolean invisible = false;
+
+    public PlayerCapabilities(PlayerEntity player) {
+        this.entity = player;
+
+        player.getDataTracker().startTracking(PLAYER_RACE, Race.EARTH.ordinal());
+        player.getDataTracker().startTracking(EXERTION, 0F);
+        player.getDataTracker().startTracking(ENERGY, 0F);
+        player.getDataTracker().startTracking(EFFECT, new CompoundTag());
+        player.getDataTracker().startTracking(HELD_EFFECT, new CompoundTag());
+    }
+
+    @Override
+    public Race getSpecies() {
+        if (getOwner() == null) {
+            return Race.HUMAN;
+        }
+
+        return Race.fromId(getOwner().getDataTracker().get(PLAYER_RACE));
+    }
+
+    @Override
+    public void setSpecies(Race race) {
+        race = SpeciesList.instance().validate(race, entity);
+
+        entity.getDataTracker().set(PLAYER_RACE, race.ordinal());
+
+        entity.abilities.allowFlying = race.canFly();
+        gravity.updateFlightStat(entity, entity.abilities.flying);
+        entity.sendAbilitiesUpdate();
+
+        sendCapabilities(false);
+    }
+
+    @Override
+    public float getExertion() {
+        return getOwner().getDataTracker().get(EXERTION);
+    }
+
+    @Override
+    public void setExertion(float exertion) {
+        entity.getDataTracker().set(EXERTION, Math.max(0, exertion));
+    }
+
+    @Override
+    public float getEnergy() {
+        return entity.getDataTracker().get(ENERGY);
+    }
+
+    @Override
+    public void setEnergy(float energy) {
+        entity.getDataTracker().set(ENERGY, Math.max(0, energy));
+    }
+
+    @Override
+    public boolean isInvisible() {
+        return invisible && hasEffect();
+    }
+
+    @Override
+    public void setInvisible(boolean invisible) {
+        this.invisible = invisible;
+    }
+
+    @Nullable
+    @Override
+    public IHeldEffect getHeldEffect(ItemStack stack) {
+
+        if (!getSpecies().canCast()) {
+            heldEffectDelegate.set(null);
+
+            return null;
+        }
+
+        IHeldEffect heldEffect = heldEffectDelegate.get(IHeldEffect.class, true);
+
+        if (heldEffect == null || !heldEffect.getName().equals(SpellRegistry.getKeyFromStack(stack))) {
+            heldEffect = SpellRegistry.instance().getHeldFrom(stack);
+            heldEffectDelegate.set(heldEffect);
+        }
+
+        return heldEffect;
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
+    }
+
+    @Override
+    public void sendCapabilities(boolean full) {
+        dirty = false;
+
+        if (!getWorld().isClient()) {
+            if (full) {
+                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(this));
+            } else {
+                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(getSpecies(), getOwner()));
+            }
+        }
+    }
+
+    @Override
+    public void onDimensionalTravel(int destinationDimension) {
+        if (!getWorld().isClient()) {
+            dirty = true;
+        }
+    }
+
+    @Override
+    public IAbilityReceiver getAbilities() {
+        return powers;
+    }
+
+    @Override
+    public IGravity getGravity() {
+        return gravity;
+    }
+
+    @Override
+    public IFlight getFlight() {
+        return gravity;
+    }
+
+    @Override
+    public ICamera getCamera() {
+        return view;
+    }
+
+    @Override
+    public IInterpolator getInterpolator() {
+        return interpolator;
+    }
+
+    @Override
+    public void beforeUpdate() {
+        if (entity.world.isClient()) {
+            if (entity.hasVehicle() && entity.isSneaking()) {
+
+                Entity ridee = entity.getVehicle();
+
+                if (ridee instanceof ITrap) {
+                    if (((ITrap)ridee).attemptDismount(entity)) {
+                        entity.stopRiding();
+                    } else {
+                        entity.setSneaking(false);
+                    }
+                } else {
+                    entity.stopRiding();
+
+                    if (ridee instanceof ServerPlayerEntity) {
+                        ((ServerPlayerEntity)ridee).networkHandler.sendPacket(new EntityPassengersSetS2CPacket(ridee));
+                    }
+                }
+            }
+        }
+
+        powers.onUpdate();
+        inventory.onUpdate();
+    }
+
+    @Override
+    public void onUpdate() {
+        gravity.onUpdate();
+
+        if (hasEffect()) {
+            IAttachedEffect effect = getEffect(IAttachedEffect.class, true);
+
+            if (effect != null) {
+                if (entity.getEntityWorld().isClient()) {
+                    effect.renderOnPerson(this);
+                }
+
+                if (!effect.updateOnPerson(this)) {
+                    setEffect(null);
+                }
+            }
+        }
+
+        ItemStack stack = entity.getStackInHand(Hand.MAIN_HAND);
+
+        IHeldEffect effect = getHeldEffect(stack);
+
+        if (effect != null) {
+            Affinity affinity = stack.getItem() instanceof ICastable ? ((ICastable)stack.getItem()).getAffinity(stack) : Affinity.NEUTRAL;
+
+            effect.updateInHand(this, affinity);
+        }
+
+        addExertion(-1);
+        addEnergy(-1);
+
+        attributes.applyAttributes(entity, getSpecies());
+
+        if (dirty) {
+            sendCapabilities(true);
+        }
+    }
+
+    @Override
+    public float onImpact(float distance) {
+        if (getSpecies().canFly()) {
+            distance = Math.max(0, distance - 5);
+        }
+        return distance;
+    }
+
+    @Override
+    public void onJump() {
+        if (gravity.getGravitationConstant() < 0) {
+            Vec3d velocity = entity.getVelocity();
+            velocity.y *= -1;
+            entity.setVelocity(velocity);
+        }
+    }
+
+    @Override
+    public boolean onProjectileImpact(ProjectileEntity projectile) {
+        if (hasEffect()) {
+            IMagicEffect effect = getEffect();
+            if (effect instanceof SpellDisguise && !effect.getDead()) {
+                if (((SpellDisguise)effect).getDisguise() == projectile) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+
+    @Override
+    public boolean subtractEnergyCost(double foodSubtract) {
+        if (!entity.abilities.creativeMode) {
+            int food = (int)(entity.getHungerManager().getFoodLevel() - foodSubtract);
+
+            if (food < 0) {
+                entity.getHungerManager().add(-entity.getHungerManager().getFoodLevel(), 0);
+                entity.damage(DamageSource.MAGIC, -food/2);
+            } else {
+                entity.getHungerManager().add((int)-foodSubtract, 0);
+            }
+        }
+
+        return entity.getHealth() > 0;
+    }
+
+    @Override
+    public boolean stepOnCloud() {
+        if (entity.fallDistance > 1 || entity.distanceWalked > nextStepDistance) {
+            nextStepDistance = entity.distanceWalked + 2;
+            entity.fallDistance = 0;
+
+            return true;
+        }
+
+        return false;
+    }
+
+    @Override
+    public Either<SleepFailureReason, Unit> trySleep(BlockPos pos) {
+
+        if (getInventory().isWearing(UItems.alicorn_amulet)) {
+            if (!isClient()) {
+                entity.addChatMessage(new TranslatableText("tile.bed.youAreAMonster"), true);
+            }
+            return Either.left(SleepFailureReason.OTHER_PROBLEM);
+        }
+
+        if (findAllSpellsInRange(10).anyMatch(c -> c instanceof IPlayer && ((IPlayer)c).getInventory().isWearing(UItems.alicorn_amulet))) {
+            return Either.left(SleepFailureReason.NOT_SAFE);
+        }
+
+        return Either.right(Unit.INSTANCE);
+    }
+
+    @Override
+    public IInventory getInventory() {
+        return inventory;
+    }
+
+    @Override
+    public void onUse(ItemStack stack) {
+        if (getSpecies() == Race.CHANGELING) {
+            PlayerEntity player = getOwner();
+
+            FoodComponent food = stack.getItem().getFoodComponent();
+
+            if (food != null) {
+                int health = food.getHunger();
+                float saturation = food.getSaturationModifier();
+
+                player.getHungerManager().add(-health/2, -saturation/2);
+
+                player.addPotionEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 100, 3, true, true));
+            } else {
+                player.addPotionEffect(new StatusEffectInstance(StatusEffects.NAUSEA, 200, 3, true, true));
+            }
+
+            if (player.world.getDifficulty() != Difficulty.PEACEFUL && player.world.random.nextInt(20) == 0) {
+                player.addPotionEffect(new StatusEffectInstance(UEffects.FOOD_POISONING, 3, 2, true, true));
+            }
+
+            player.addPotionEffect(new StatusEffectInstance(StatusEffects.WEAKNESS, 2000, 2, true, true));
+        }
+    }
+
+    @Override
+    public void toNBT(CompoundTag compound) {
+        compound.putString("playerSpecies", getSpecies().name());
+
+        compound.put("powers", powers.toNBT());
+        compound.put("gravity", gravity.toNBT());
+
+        IMagicEffect effect = getEffect();
+
+        if (effect != null) {
+            compound.put("effect", SpellRegistry.instance().serializeEffectToNBT(effect));
+        }
+
+        if (!pageStates.isEmpty()) {
+            CompoundTag pages = new CompoundTag();
+            boolean written = false;
+
+            for (Map.Entry<Identifier, PageState> entry : pageStates.entrySet()) {
+                if (entry.getValue() != PageState.LOCKED) {
+                    pages.putString(entry.getKey().toString(), entry.getValue().name());
+                    written = true;
+                }
+            }
+
+            if (written) {
+                compound.put("pageStates", pages);
+            }
+        }
+    }
+
+    @Override
+    public void fromNBT(CompoundTag compound) {
+        setSpecies(Race.fromName(compound.getString("playerSpecies")));
+
+        powers.fromNBT(compound.getCompound("powers"));
+        gravity.fromNBT(compound.getCompound("gravity"));
+
+        if (compound.containsKey("effect")) {
+            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompound("effect")));
+        }
+
+        pageStates.clear();
+        if (compound.containsKey("pageStates")) {
+            CompoundTag pages = compound.getCompound("pageStates");
+
+            pages.getKeys().forEach(key -> {
+                PageState state = PageState.of(pages.getString(key));
+
+                if (state != PageState.LOCKED) {
+                    pageStates.put(new Identifier(key), state);
+                }
+            });
+        }
+    }
+
+    @Override
+    public void copyFrom(IPlayer oldPlayer) {
+        setEffect(oldPlayer.getEffect());
+        setSpecies(oldPlayer.getSpecies());
+    }
+
+    @Override
+    public void setEffect(@Nullable IMagicEffect effect) {
+        effectDelegate.set(effect);
+
+        sendCapabilities(true);
+    }
+
+    @Override
+    public boolean hasEffect() {
+        return effectDelegate.has();
+    }
+
+    @Nullable
+    @Override
+    public <T extends IMagicEffect> T getEffect(@Nullable Class<T> type, boolean update) {
+        return effectDelegate.get(type, update);
+    }
+
+    @Override
+    public void setOwner(PlayerEntity owner) {
+        entity = owner;
+    }
+
+    @Override
+    public PlayerEntity getOwner() {
+        return entity;
+    }
+
+    @Override
+    public int getCurrentLevel() {
+        return 0;
+    }
+
+    @Override
+    public void setCurrentLevel(int level) {
+    }
+
+    @Override
+    public Map<Identifier, PageState> getPageStates() {
+        return pageStates;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerInventory.java b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
similarity index 67%
rename from src/main/java/com/minelittlepony/unicopia/player/PlayerInventory.java
rename to src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
index 6082780a..e88ad510 100644
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerInventory.java
+++ b/src/main/java/com/minelittlepony/unicopia/entity/player/PlayerInventory.java
@@ -1,18 +1,21 @@
-package com.minelittlepony.unicopia.player;
+package com.minelittlepony.unicopia.entity.player;
 
 import java.util.Iterator;
 import java.util.Map;
 
 import com.google.common.collect.Maps;
-import com.minelittlepony.unicopia.extern.Baubles;
-import com.minelittlepony.unicopia.item.IDependable;
-import com.minelittlepony.unicopia.item.IMagicalItem;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
+import com.minelittlepony.unicopia.entity.IInventory;
+import com.minelittlepony.unicopia.entity.IUpdatable;
+import com.minelittlepony.unicopia.magic.items.IDependable;
+import com.minelittlepony.unicopia.magic.items.IMagicalItem;
+import com.minelittlepony.util.InbtSerialisable;
 
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.registry.Registry;
 
 public class PlayerInventory implements IInventory, IUpdatable, InbtSerialisable {
     private final Map<IDependable, Entry> dependencies = Maps.newHashMap();
@@ -70,35 +73,34 @@ public class PlayerInventory implements IInventory, IUpdatable, InbtSerialisable
 
     @Override
     public boolean isWearing(IMagicalItem item) {
-        for (ItemStack i : player.getOwner().getArmorInventoryList()) {
+        for (ItemStack i : player.getOwner().getArmorItems()) {
             if (!i.isEmpty() && i.getItem() == item) {
                 return true;
             }
         }
 
-        return item instanceof Item && Baubles.isBaubleEquipped(player.getOwner(), (Item)item) != -1;
+        return item instanceof Item;
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        NBTTagList items = new NBTTagList();
+    public void toNBT(CompoundTag compound) {
+        ListTag items = new ListTag();
 
         for (Entry entry : dependencies.values()) {
-            items.appendTag(entry.toNBT());
+            items.add(entry.toNBT());
         }
 
-        compound.setTag("dependencies", items);
+        compound.put("dependencies", items);
     }
 
-    @SuppressWarnings("unchecked")
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
+    public void fromNBT(CompoundTag compound) {
         dependencies.clear();
 
-        compound.getTagList("dependencies", 10).forEach(res -> {
+        compound.getList("dependencies", 10).forEach(res -> {
             Entry entry = new Entry();
 
-            entry.readFromNBT((NBTTagCompound)res);
+            entry.fromNBT((CompoundTag)res);
 
             if (entry.item != null) {
                 dependencies.put(entry.item, entry);
@@ -137,18 +139,18 @@ public class PlayerInventory implements IInventory, IUpdatable, InbtSerialisable
         }
 
         @Override
-        public void writeToNBT(NBTTagCompound compound) {
-            compound.setInteger("ticksAttached", ticksAttached);
-            compound.setFloat("needfulness", needfulness);
-            compound.setString("item", ((Item)item).getRegistryName().toString());
+        public void toNBT(CompoundTag compound) {
+            compound.putInt("ticksAttached", ticksAttached);
+            compound.putFloat("needfulness", needfulness);
+            compound.putString("item", Registry.ITEM.getId(((Item)item)).toString());
         }
 
         @Override
-        public void readFromNBT(NBTTagCompound compound) {
-            ticksAttached = compound.getInteger("ticksAttached");
+        public void fromNBT(CompoundTag compound) {
+            ticksAttached = compound.getInt("ticksAttached");
             needfulness = compound.getFloat("needfulness");
 
-            Item item = Item.getByNameOrId(compound.getString("item"));
+            Item item = Registry.ITEM.get(new Identifier(compound.getString("item")));
 
             this.item = item instanceof IDependable ? (IDependable)item : null;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/extern/BaubleAlicornAmulet.java b/src/main/java/com/minelittlepony/unicopia/extern/BaubleAlicornAmulet.java
deleted file mode 100644
index c1d6dfce..00000000
--- a/src/main/java/com/minelittlepony/unicopia/extern/BaubleAlicornAmulet.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package com.minelittlepony.unicopia.extern;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.item.ItemAlicornAmulet;
-
-import baubles.api.BaubleType;
-import baubles.api.BaublesApi;
-import baubles.api.IBauble;
-import baubles.api.cap.IBaublesItemHandler;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumHand;
-import net.minecraft.world.World;
-
-class BaubleAlicornAmulet extends ItemAlicornAmulet implements IBauble {
-
-    static {
-        Unicopia.log.warn("Loaded BaubleAlicornAmulet.class If this is called, baubles must be present. Otherwise the game has probably already crashed...");
-    }
-
-    public BaubleAlicornAmulet(String domain, String name) {
-        super(domain, name);
-    }
-
-    @Override
-    public BaubleType getBaubleType(ItemStack itemstack) {
-        return BaubleType.AMULET;
-    }
-
-    @Override
-    public void onEquipped(ItemStack itemstack, EntityLivingBase player) {
-        player.getAttributeMap().applyAttributeModifiers(itemstack.getAttributeModifiers(getEquipmentSlot(itemstack)));
-    }
-
-    @Override
-    public void onUnequipped(ItemStack itemstack, EntityLivingBase player) {
-        player.getAttributeMap().removeAttributeModifiers(itemstack.getAttributeModifiers(getEquipmentSlot(itemstack)));
-    }
-
-    @Override
-    public void onWornTick(ItemStack itemstack, EntityLivingBase player) {
-        if (player instanceof EntityPlayer) {
-            onArmorTick(player.world, (EntityPlayer)player, itemstack);
-        }
-    }
-
-    @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        ItemStack itemstack = player.getHeldItem(hand);
-        IBaublesItemHandler iplayer = BaublesApi.getBaublesHandler(player);
-
-        for (int slot : getBaubleType(itemstack).getValidSlots()) {
-            if (iplayer.getStackInSlot(slot).isEmpty()) {
-                iplayer.setStackInSlot(slot, itemstack.copy());
-                itemstack.setCount(0);
-
-                return new ActionResult<ItemStack>(EnumActionResult.SUCCESS, itemstack);
-            }
-        }
-
-        return new ActionResult<ItemStack>(EnumActionResult.FAIL, itemstack);
-    }
-
-    @Override
-    public boolean isValidArmor(ItemStack stack, EntityEquipmentSlot armorType, Entity entity) {
-        return false;
-    }
-
-    @Override
-    public EntityEquipmentSlot getEquipmentSlot() {
-        return EntityEquipmentSlot.MAINHAND;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/extern/Baubles.java b/src/main/java/com/minelittlepony/unicopia/extern/Baubles.java
deleted file mode 100644
index 76d22a25..00000000
--- a/src/main/java/com/minelittlepony/unicopia/extern/Baubles.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.minelittlepony.unicopia.extern;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-import com.minelittlepony.unicopia.item.ItemAlicornAmulet;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-
-public class Baubles {
-
-    private static boolean checkComplete;
-    private static boolean modIsActive;
-
-    @FUF(reason = "Forge is so strict with their class loading it's a ff**8 joke")
-    public static boolean isModActive() {
-        if (!checkComplete) {
-            checkComplete = true;
-
-            try {
-                modIsActive = baubles.api.BaubleType.AMULET.getValidSlots().length > 0;
-            } catch (Throwable e) {
-                Unicopia.log.error("Baubles are not present. Continuing without them.");
-
-                modIsActive = false;
-            }
-        }
-
-        if (modIsActive) {
-            Unicopia.log.debug("Baubles detected. baubles.api.BaubleType.AMULET.getValidSlots().length > 0 is true.");
-        }
-
-        return modIsActive;
-    }
-
-    public static ItemAlicornAmulet alicornAmulet() {
-        try {
-            if (isModActive()) {
-                Unicopia.log.debug("Constructing BaubleAlicornAmulet.");
-
-                // FUCK YOU FORGE YOU PIECE OF SHIT
-                // DON'T LOAD THIS GOD DAMN CLASS UNTIL I FUCKING TELL YOU TO
-
-                Class<?> cls = ClassLoader.getSystemClassLoader().loadClass("com.minelittlepony.unicopia.extern.BaubleAlicornAmulet");
-
-                return (ItemAlicornAmulet)cls.getConstructor(String.class, String.class).newInstance(Unicopia.MODID, "alicorn_amulet");
-            }
-        } catch (Throwable e) {
-            Unicopia.log.error("Unicopia-Baubles support failed to load.", e);
-        }
-
-        return new ItemAlicornAmulet(Unicopia.MODID, "alicorn_amulet");
-    }
-
-    public static int isBaubleEquipped(EntityPlayer player, Item bauble) {
-        if (isModActive()) {
-            return baubles.api.BaublesApi.isBaubleEquipped(player, bauble);
-        }
-
-        return -1;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/BiomeBS.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/BiomeBS.java
index c04a0cb9..1b9e2d91 100644
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/BiomeBS.java
+++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/BiomeBS.java
@@ -6,16 +6,12 @@ import java.util.function.Function;
 
 import com.google.common.collect.Lists;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.biome.Biome.SpawnListEntry;
-import net.minecraftforge.common.BiomeManager;
-import net.minecraftforge.common.BiomeManager.BiomeType;
 
 /**
  * Provides methods and apis that forge seems to be sorely lacking.
  */
+@Deprecated
 public class BiomeBS {
 
     /**
@@ -33,7 +29,7 @@ public class BiomeBS {
     /**
      * Adds a spawn entry for the specified entity if one does not already exist.
      */
-    public static void addSpawnEntry(Biome biome, EnumCreatureType list, Class<? extends EntityLivingBase> type, Function<Biome, SpawnListEntry> func) {
+    public static void addSpawnEntry(Biome biome, EnumCreatureType list, Class<? extends LivingEntity> type, Function<Biome, SpawnListEntry> func) {
         List<SpawnListEntry> entries = biome.getSpawnableList(list);
 
         entries.stream().filter(p -> p.entityClass == type).findFirst().orElseGet(() -> {
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/BuildInTexturesBakery.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/BuildInTexturesBakery.java
index e4a16f11..60f27ed1 100644
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/BuildInTexturesBakery.java
+++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/BuildInTexturesBakery.java
@@ -2,21 +2,20 @@ package com.minelittlepony.unicopia.forgebullshit;
 
 import java.util.Set;
 
-import net.minecraft.client.renderer.block.model.ModelBakery;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 /**
  * Provides access to the built in texture locations.
  * This is needed to add things like custom backgrounds for slots.
  *
  */
-@FUF(reason = "Forge doesn't provide this, for some unknown reason...")
+@Deprecated
 public final class BuildInTexturesBakery extends ModelBakery {
     private BuildInTexturesBakery() {
         super(null, null, null);
     }
 
-    public static Set<ResourceLocation> getBuiltInTextures() {
+    public static Set<Identifier> getBuiltInTextures() {
         return LOCATIONS_BUILTIN_TEXTURES;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/DefaultEntityCapabilitiesProxyContainer.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/DefaultEntityCapabilitiesProxyContainer.java
deleted file mode 100644
index 60573fdc..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/DefaultEntityCapabilitiesProxyContainer.java
+++ /dev/null
@@ -1,79 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.player.IOwned;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.IRaceContainer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-
-class DefaultEntityCapabilitiesProxyContainer<T extends Entity> implements ICapabilitiesProxyContainer<T> {
-
-    @Nullable
-    @CapabilityInject(ICapabilitiesProxyContainer.class)
-    public static Capability<ICapabilitiesProxyContainer<?>> CAPABILITY = null;
-
-    @FUF(reason = "We can't guarantee {CABILITY} won't be null. Whoever thought @CapabilityInject annotations were ever a good idea?")
-    @SuppressWarnings("unchecked")
-    static boolean updateAndCompare(Capability<?> capability) {
-        if (CAPABILITY == null && capability != null) {
-            if (capability.getDefaultInstance() instanceof ICapabilitiesProxyContainer) {
-                CAPABILITY = (Capability<ICapabilitiesProxyContainer<?>>)capability;
-            }
-        }
-
-        return capability() == capability;
-    }
-
-    static <T extends Entity> ICapabilitiesProxyContainer<T> newInstance() {
-        if (capability() == null) {
-            return null;
-        }
-        return capability().cast(capability().getDefaultInstance());
-    }
-
-    @Nullable
-    static Capability<ICapabilitiesProxyContainer<?>> capability() {
-        if (CAPABILITY == null) {
-            new RuntimeException("Warning: Capability is null").printStackTrace();
-        }
-        return CAPABILITY;
-    }
-
-    private IRaceContainer<T> container;
-
-
-    @Override
-    public IRaceContainer<T> getRaceContainer() {
-        return container;
-    }
-
-    @Override
-    public IPlayer getPlayer() {
-        return (IPlayer)container;
-    }
-
-    public void writeToNBT(NBTTagCompound compound) {
-        container.writeToNBT(compound);
-    }
-
-    public void readFromNBT(NBTTagCompound compound) {
-        container.readFromNBT(compound);
-    }
-
-    @SuppressWarnings("unchecked")
-    public ICapabilitiesProxyContainer<T> withEntity(T entity) {
-        if (this.container == null) {
-            this.container = (IRaceContainer<T>)PlayerSpeciesList.instance().emptyContainer(entity);
-        } else if (container instanceof IOwned<?>) {
-            ((IOwned<T>)container).setOwner(entity);
-        }
-
-        return this;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/EntityType.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/EntityType.java
deleted file mode 100644
index ba559347..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/EntityType.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityList.EntityEggInfo;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.fml.common.registry.EntityEntry;
-import net.minecraftforge.fml.common.registry.EntityEntryBuilder;
-
-public class EntityType {
-
-    private int projectilNetworkId = 0;
-    private final String modid;
-
-    public EntityType(String modid) {
-        this.modid = modid;
-    }
-
-
-    public static EntityType builder(String modid) {
-        return new EntityType(modid);
-    }
-
-    public Entry creature(Class<? extends Entity> cls, String name) {
-        return new Entry(cls, name);
-    }
-
-    public EntityEntry projectile(Class<? extends Entity> cls, String name, int range, int frequency) {
-        return projectile(cls, name, range, frequency, true);
-    }
-
-    @FUF(reason = "...and it's much shorter than typing out this factory mess every time.")
-    public EntityEntry projectile(Class<? extends Entity> cls, String name, int range, int frequency, boolean includeVelocity) {
-        return EntityEntryBuilder.create().entity(cls)
-            .name(name)
-            .id(new ResourceLocation(modid, name), projectilNetworkId++).tracker(range, frequency, includeVelocity)
-            .build();
-    }
-
-    @FUF(reason = "This makes it easier to register an egg...")
-    public class Entry extends EntityEntry {
-
-        public Entry(Class<? extends Entity> cls, String name) {
-            super(cls, name);
-            setRegistryName(modid, name);
-        }
-
-        public Entry withEgg(int a, int b) {
-            setEgg(new EntityEggInfo(getRegistryName(), a, b));
-
-            return this;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/FBS.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/FBS.java
deleted file mode 100644
index dc90ed5a..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/FBS.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.entity.IMagicals;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.event.entity.EntityTravelToDimensionEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-
-/**
- * Wraps the forge Capabilities API into an easier to manage, simple interface.
- */
-@FUF(reason = "Capabilities API is such a mess. I'm not going to rewrite it all just to add capabilities to more stuff.")
-@EventBusSubscriber(modid = Unicopia.MODID)
-public class FBS {
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-    public static void init() {
-        CapabilityManager.INSTANCE.register(ICapabilitiesProxyContainer.class,
-                new Storage(), DefaultEntityCapabilitiesProxyContainer::new);
-    }
-
-    @SubscribeEvent
-    public static void attach(AttachCapabilitiesEvent<Entity> event) {
-        Entity obj = event.getObject();
-
-        if ((obj instanceof EntityLivingBase && !(obj instanceof IMagicals))
-         || obj instanceof EntityItem) {
-            event.addCapability(new ResourceLocation("unicopia", "race"), new Provider(obj));
-        }
-    }
-
-    @SubscribeEvent
-    public static void clone(PlayerEvent.Clone event) {
-        final ICapabilitiesProxyContainer<EntityPlayer> original = of(event.getOriginal());
-
-        if (original == null) {
-            return;
-        }
-
-        final ICapabilitiesProxyContainer<EntityPlayer> clone = of((EntityPlayer)event.getEntity());
-
-        clone.getPlayer().copyFrom(original.getPlayer());
-    }
-
-    @SubscribeEvent
-    public static void onDimensionalTravel(EntityTravelToDimensionEvent event) {
-        final ICapabilitiesProxyContainer<?> original = of(event.getEntity());
-
-        if (original == null) {
-            return;
-        }
-
-        original.getRaceContainer().onDimensionalTravel(event.getDimension());
-    }
-
-    @SuppressWarnings("unchecked")
-    public static <T extends Entity> ICapabilitiesProxyContainer<T> of(T entity) {
-        if (entity.hasCapability(DefaultEntityCapabilitiesProxyContainer.CAPABILITY, EnumFacing.DOWN)) {
-            return ((ICapabilitiesProxyContainer<T>)entity
-                    .getCapability(DefaultEntityCapabilitiesProxyContainer.CAPABILITY, EnumFacing.DOWN))
-                    .withEntity(entity);
-        }
-
-        return null;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/FUF.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/FUF.java
deleted file mode 100644
index 25295d01..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/FUF.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import static java.lang.annotation.ElementType.*;
-import static java.lang.annotation.RetentionPolicy.SOURCE;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
-
-/**
- * Workaround because forge freaks out at the nearest mention
- * of the possibility of a client class in a server environment
- * even when the logic in the code means it would never be executed.
- *
- * #FuckUForge
- */
-@Documented
-@Retention(SOURCE)
-@Target({METHOD, FIELD, TYPE, CONSTRUCTOR, PACKAGE})
-public @interface FUF {
-    String reason() default "";
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ICapabilitiesProxyContainer.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/ICapabilitiesProxyContainer.java
deleted file mode 100644
index 11e9c392..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ICapabilitiesProxyContainer.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.IRaceContainer;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
-
-import net.minecraft.entity.Entity;
-
-public interface ICapabilitiesProxyContainer<T extends Entity> extends InbtSerialisable {
-    IPlayer getPlayer();
-
-    IRaceContainer<T> getRaceContainer();
-
-    ICapabilitiesProxyContainer<T> withEntity(T entity);
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/IMultiItem.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/IMultiItem.java
deleted file mode 100644
index f3275ca9..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/IMultiItem.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-/**
- * An item that has multiple subtypes.
- */
-public interface IMultiItem {
-    /**
-     * Returns the names for all subtypes this item supports.
-     * Used to register models and textures on the client.
-     */
-    String[] getVariants();
-
-    /**
-     * Returns true if variants should all share the same model as the {0} data value
-     */
-    default boolean variantsAreHidden() {
-        return false;
-    }
-
-    /**
-     * Gets the highest metadata value allowed for this item.
-     */
-    default int getMaxMetadata() {
-        return getVariants().length;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemModels.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemModels.java
index 4208b8c3..14197c0e 100644
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemModels.java
+++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemModels.java
@@ -4,10 +4,9 @@ import java.util.Objects;
 
 import javax.annotation.Nonnull;
 
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 import net.minecraft.item.Item;
-import net.minecraftforge.client.model.ModelLoader;
 
+@Deprecated
 public class ItemModels {
 
     /**
@@ -15,27 +14,13 @@ public class ItemModels {
      */
     public static void registerAll(Item...items) {
         for (Item i : items) {
-
-            Objects.requireNonNull(i, "Cannot register models: Null is not a valid item.");
-            Objects.requireNonNull(i.getRegistryName(), "You canot register an item with no registry name.");
-
-            if (i instanceof IMultiItem && i.getHasSubtypes()) {
-                IMultiItem multi = (IMultiItem)i;
-
-                if (multi.variantsAreHidden()) {
-                    registerAll(i, multi.getMaxMetadata(), new ModelResourceLocation(i.getRegistryName().toString()));
-                } else {
-                    registerAllVariants(i, multi.getVariants());
-                }
-            } else {
-                registerAll(i, 1, new ModelResourceLocation(i.getRegistryName().toString()));
-            }
+            registerAll(i, 1, new ModelIdentifier(i.getRegistryName().toString()));
         }
     }
 
-    private static void registerAll(@Nonnull Item item, int maxMeta, ModelResourceLocation resource) {
+    private static void registerAll(@Nonnull Item item, int maxMeta, ModelIdentifier resource) {
         for (int i = 0; i < maxMeta; i++) {
-            ModelLoader.setCustomModelResourceLocation(item, i, resource);
+            ModelLoader.setCustomModelIdentifier(item, i, resource);
         }
     }
 
@@ -48,7 +33,7 @@ public class ItemModels {
 
     public static void registerAllVariants(@Nonnull Item item, String domain, String... variants) {
         for (int i = 0; i < variants.length; i++) {
-            ModelLoader.setCustomModelResourceLocation(item, i, new ModelResourceLocation(domain + ":" + variants[i]));
+            ModelLoader.setCustomModelIdentifier(item, i, new ModelIdentifier(domain + ":" + variants[i]));
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemRegistrar.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemRegistrar.java
deleted file mode 100644
index 0ca41df6..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/ItemRegistrar.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import com.minelittlepony.unicopia.UClient;
-
-import net.minecraft.item.Item;
-import net.minecraftforge.registries.IForgeRegistry;
-
-public class ItemRegistrar {
-    /**
-     * Registers items and all the necessary chaff that comes with.
-     */
-    public static void registerAll(IForgeRegistry<Item> registry, Item...items) {
-        registry.registerAll(items);
-
-        if (UClient.isClientSide()) {
-            ItemModels.registerAll(items);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java
index dd55c263..bda03472 100644
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java
+++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/OreReplacer.java
@@ -9,20 +9,14 @@ import org.apache.logging.log4j.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Streams;
 
-import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.Ingredient;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraft.util.NonNullList;
-import net.minecraftforge.fml.common.registry.ForgeRegistries;
 
 /**
  * An Ore Replacer.
  * Similar to what the OreDictionary does
  * except this is configurable and works for vanilla and modded recipes.
  */
+@Deprecated
 public class OreReplacer {
 
     /**
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/Provider.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/Provider.java
deleted file mode 100644
index b00fef3b..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/Provider.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import javax.annotation.Nullable;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.ICapabilitySerializable;
-
-@FUF(reason = "Required to provide capability containers. Why can't forge implement this themselves!?")
-class Provider implements ICapabilitySerializable<NBTTagCompound> {
-
-    private final Entity entity;
-
-    @Nullable
-    private ICapabilitiesProxyContainer<Entity> container;
-
-    Provider(Entity entity) {
-        this.entity = entity;
-    }
-
-    private ICapabilitiesProxyContainer<Entity> getContainerObject() {
-        if (container == null) {
-            container = DefaultEntityCapabilitiesProxyContainer.newInstance();
-        }
-
-        return container;
-    }
-
-    @Override
-    public boolean hasCapability(Capability<?> capability, EnumFacing facing) {
-        return DefaultEntityCapabilitiesProxyContainer.updateAndCompare(capability);
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public <T> T getCapability(Capability<T> capability, EnumFacing facing) {
-        if (hasCapability(capability, facing)) {
-            return (T)getContainerObject().withEntity(entity);
-        }
-
-        return null;
-    }
-
-    @Override
-    public NBTTagCompound serializeNBT() {
-        return (NBTTagCompound) DefaultEntityCapabilitiesProxyContainer.capability().getStorage()
-                .writeNBT(DefaultEntityCapabilitiesProxyContainer.capability(), getContainerObject().withEntity(entity), null);
-    }
-
-    @Override
-    public void deserializeNBT(NBTTagCompound nbt) {
-        DefaultEntityCapabilitiesProxyContainer.capability().getStorage()
-                .readNBT(DefaultEntityCapabilitiesProxyContainer.capability(), getContainerObject().withEntity(entity), null, nbt);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java
deleted file mode 100644
index 48e9c6a6..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/RegistryLockSpinner.java
+++ /dev/null
@@ -1,93 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
-import java.util.function.Consumer;
-
-import net.minecraft.util.registry.RegistryNamespaced;
-import net.minecraftforge.registries.ILockableRegistry;
-
-@FUF(reason = "Forge locks the registries. We need a way to unlock them.")
-public final class RegistryLockSpinner {
-
-    public static <K, V> void open(RegistryNamespaced<K, V> registry, Class<?> containersClazz, Consumer<UnlockedRegistry<K, V>> action) {
-        unlock(registry);
-
-        try {
-            action.accept(new UnlockedRegistry<K, V>() {
-                @Override
-                public UnlockedRegistry<K, V> replace(V from, V to) {
-                    commit(registry, from, to, containersClazz);
-                    return this;
-                }
-
-            });
-        } finally {
-            lock(registry);
-        }
-    }
-
-    private static void unlock(RegistryNamespaced<?, ?> registry) {
-        if (registry instanceof ILockableRegistry) {
-            try {
-                Field f = registry.getClass().getDeclaredField("locked");
-
-                f.setAccessible(true);
-                f.setBoolean(registry, false);
-            } catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException | SecurityException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static <K, V> void commit(RegistryNamespaced<K, V> registry, V from, V to, Class<?> inClass) {
-        registry.register(registry.getIDForObject(from), registry.getNameForObject(from), to);
-
-        for (Field i : inClass.getDeclaredFields()) {
-            try {
-                if (i.get(null) == from) {
-                    i.setAccessible(true);
-                    makeNonFinal(i).set(null, to);
-                }
-            } catch (IllegalArgumentException | IllegalAccessException | SecurityException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    private static boolean init = false;
-    private static Field modifieres = null;
-
-    private static void initModifiersField() {
-        if (!init) {
-            init = true;
-            try {
-                modifieres = Field.class.getDeclaredField("modifiers");
-                modifieres.setAccessible(true);
-            } catch (NoSuchFieldException | SecurityException e1) {
-                e1.printStackTrace();
-            }
-        }
-    }
-
-    @FUF(reason = "Not exactly forge's fault, but it was would be nice of them to not leave these as final")
-    public static Field makeNonFinal(Field f) throws IllegalArgumentException, IllegalAccessException {
-        initModifiersField();
-        if (Modifier.isFinal(f.getModifiers()) && modifieres != null) {
-            modifieres.setInt(f, f.getModifiers() & ~Modifier.FINAL);
-        }
-
-        return f;
-    }
-
-    private static void lock(RegistryNamespaced<?, ?> registry) {
-        if (registry instanceof ILockableRegistry) {
-            ((ILockableRegistry) registry).lock();
-        }
-    }
-
-    @FunctionalInterface
-    public interface UnlockedRegistry<K, V> {
-        UnlockedRegistry<K, V> replace(V from, V to);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/Storage.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/Storage.java
deleted file mode 100644
index e55aca68..00000000
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/Storage.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.minelittlepony.unicopia.forgebullshit;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.Capability.IStorage;
-
-@FUF(reason = "Required to persist capabilities. Why can't forge implement this themselves!?")
-class Storage<T extends Entity> implements IStorage<ICapabilitiesProxyContainer<T>> {
-
-    @Override
-    public NBTBase writeNBT(Capability<ICapabilitiesProxyContainer<T>> capability, ICapabilitiesProxyContainer<T> instance, EnumFacing side) {
-        return instance.toNBT();
-    }
-
-    @Override
-    public void readNBT(Capability<ICapabilitiesProxyContainer<T>> capability, ICapabilitiesProxyContainer<T> instance, EnumFacing side, NBTBase nbt) {
-        instance.readFromNBT((NBTTagCompound)nbt);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/forgebullshit/UnFuckedItemSnow.java b/src/main/java/com/minelittlepony/unicopia/forgebullshit/UnFuckedItemSnow.java
index 522c260f..7bb16d18 100644
--- a/src/main/java/com/minelittlepony/unicopia/forgebullshit/UnFuckedItemSnow.java
+++ b/src/main/java/com/minelittlepony/unicopia/forgebullshit/UnFuckedItemSnow.java
@@ -1,19 +1,17 @@
 package com.minelittlepony.unicopia.forgebullshit;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockSnow;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemSnow;
+import net.minecraft.block.SnowBlock;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 /**
  * A fixed ItemSnow class
  */
-@FUF(reason = "GG Forge. I have to undo your changes so this class will work again.")
+@Deprecated
 public class UnFuckedItemSnow extends ItemSnow {
 
     public UnFuckedItemSnow(Block block) {
@@ -21,12 +19,12 @@ public class UnFuckedItemSnow extends ItemSnow {
     }
 
     @Override
-    public boolean canPlaceBlockOnSide(World world, BlockPos pos, EnumFacing side, EntityPlayer player, ItemStack stack) {
-        IBlockState state = world.getBlockState(pos);
+    public boolean canPlaceBlockOnSide(World world, BlockPos pos, Direction side, PlayerEntity player, ItemStack stack) {
+        BlockState state = world.getBlockState(pos);
 
         // Check explicitly for the maximum layers.
         // Without this layered blocks get stuck on the second layer because of a change introduced with Forge's patches.
-        if (state.getBlock() instanceof BlockSnow && state.getValue(BlockSnow.LAYERS) < 8) {
+        if (state.getBlock() instanceof SnowBlock && state.getValue(SnowBlock.LAYERS) < 8) {
             return true;
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/gui/GuiScreenSettings.java b/src/main/java/com/minelittlepony/unicopia/gui/GuiScreenSettings.java
deleted file mode 100644
index 78f4ff3d..00000000
--- a/src/main/java/com/minelittlepony/unicopia/gui/GuiScreenSettings.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.minelittlepony.unicopia.gui;
-
-import com.minelittlepony.gui.Button;
-import com.minelittlepony.gui.GameGui;
-import com.minelittlepony.util.lang.ClientLocale;
-
-import net.minecraft.client.gui.GuiScreen;
-
-public class GuiScreenSettings extends GameGui {
-
-    private String title = "";
-
-    private final GuiScreen parent;
-
-    public GuiScreenSettings(GuiScreen parent) {
-        this.parent = parent;
-    }
-
-    @Override
-    public void initGui() {
-        title = ClientLocale.format("options.title");
-
-        addButton(new Button(width / 2 - 100, height / 6 + 168, 200, 20, "gui.done", sender -> mc.displayGuiScreen(parent)));
-    }
-
-    @Override
-    protected void drawContents(int mouseX, int mouseY, float partialTicks) {
-        drawDefaultBackground();
-        drawCenteredString(fontRenderer, title, width / 2, 15, 16777215);
-
-        super.drawContents(mouseX, mouseY, partialTicks);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/hud/FlightExperienceBar.java b/src/main/java/com/minelittlepony/unicopia/hud/FlightExperienceBar.java
deleted file mode 100644
index 7450a7f1..00000000
--- a/src/main/java/com/minelittlepony/unicopia/hud/FlightExperienceBar.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.minelittlepony.unicopia.hud;
-
-import com.minelittlepony.unicopia.player.IPlayer;
-
-import net.minecraft.client.gui.Gui;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.util.ResourceLocation;
-
-class FlightExperienceBar implements IHudElement {
-
-    static final ResourceLocation TEXTURE = new ResourceLocation("textures/gui/bars.png");
-
-    @Override
-    public boolean shouldRender(IPlayer player) {
-        return player.getPlayerSpecies().canFly()
-                && !player.getOwner().capabilities.isCreativeMode;
-    }
-
-    @Override
-    public void renderHud(UHud context) {
-        float xp = context.player.getGravity().getFlightExperience();
-        float length = context.player.getGravity().getFlightDuration();
-
-        context.mc.getTextureManager().bindTexture(TEXTURE);
-        int x = (context.width - 182) / 2;
-        int y = context.height - 29;
-
-        int xpFill = (int)Math.floor(xp * 182);
-        int xpBuff = (int)Math.floor((183 - xpFill) * length);
-
-        int baseV = 0;
-
-        if (context.player.getGravity().isExperienceCritical()) {
-
-            int tickCount = (int)(context.mc.getRenderPartialTicks() * 10);
-
-            baseV += (tickCount % 3) * 10;
-        }
-
-        Gui.drawModalRectWithCustomSizedTexture(x, y, 0, baseV, 256, 5, 256, 256);
-        Gui.drawModalRectWithCustomSizedTexture(x, y, 0, baseV + 5, xpFill, 5, 256, 256);
-
-        Gui.drawModalRectWithCustomSizedTexture(x + xpFill, y, xpFill, baseV + 10, xpBuff, 5, 256, 256);
-    }
-
-    @Override
-    public void repositionHud(UHud context) {
-        int offset = 6;
-
-        GlStateManager.translate(0, context.begin ? -offset : offset, 0);
-    }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/main/java/com/minelittlepony/unicopia/init/ClientHooks.java b/src/main/java/com/minelittlepony/unicopia/init/ClientHooks.java
deleted file mode 100644
index 321c65fd..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/ClientHooks.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import com.minelittlepony.unicopia.Unicopia;
-
-import net.minecraftforge.client.event.ColorHandlerEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-
-@EventBusSubscriber(value = Side.CLIENT, modid = Unicopia.MODID)
-class ClientHooks {
-
-    @SubscribeEvent
-    public static void registerItemColours(ColorHandlerEvent.Item event) {
-        UItems.registerColors(event.getItemColors());
-        UBlocks.registerColors(event.getItemColors(), event.getBlockColors());
-    }
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/Hooks.java b/src/main/java/com/minelittlepony/unicopia/init/Hooks.java
deleted file mode 100644
index cbdc8687..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/Hooks.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import com.minelittlepony.unicopia.Unicopia;
-
-import net.minecraft.block.Block;
-import net.minecraft.item.Item;
-import net.minecraft.potion.Potion;
-import net.minecraft.util.SoundEvent;
-import net.minecraftforge.event.RegistryEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.registry.EntityEntry;
-
-@EventBusSubscriber(modid = Unicopia.MODID)
-class Hooks {
-
-    @SubscribeEvent
-    public static void registerItems(RegistryEvent.Register<Item> event) {
-        UItems.init(event.getRegistry());
-    }
-
-    @SubscribeEvent
-    public static void registerBlocks(RegistryEvent.Register<Block> event) {
-        UBlocks.init(event.getRegistry());
-    }
-
-    @SubscribeEvent
-    public static void registerPotions(RegistryEvent.Register<Potion> event) {
-        UEffects.init(event.getRegistry());
-    }
-
-    @SubscribeEvent
-    public static void registerSounds(RegistryEvent.Register<SoundEvent> event) {
-        USounds.init(event.getRegistry());
-    }
-
-    @SubscribeEvent
-    public static void registerEntities(RegistryEvent.Register<EntityEntry> event) {
-        UEntities.init(event.getRegistry());
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java b/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java
deleted file mode 100644
index 7ecbfb3f..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/UBlocks.java
+++ /dev/null
@@ -1,151 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.CloudType;
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.block.BlockAlfalfa;
-import com.minelittlepony.unicopia.block.BlockChiselledChitin;
-import com.minelittlepony.unicopia.block.BlockChitin;
-import com.minelittlepony.unicopia.block.BlockFruitLeaves;
-import com.minelittlepony.unicopia.block.BlockGlowingGem;
-import com.minelittlepony.unicopia.block.BlockGrowingCuccoon;
-import com.minelittlepony.unicopia.block.BlockHiveWall;
-import com.minelittlepony.unicopia.block.BlockSlimeLayer;
-import com.minelittlepony.unicopia.block.BlockStick;
-import com.minelittlepony.unicopia.block.BlockCloudAnvil;
-import com.minelittlepony.unicopia.block.BlockCloudBanister;
-import com.minelittlepony.unicopia.block.BlockCloudSlab;
-import com.minelittlepony.unicopia.block.BlockCloudStairs;
-import com.minelittlepony.unicopia.block.BlockDutchDoor;
-import com.minelittlepony.unicopia.block.BlockSugar;
-import com.minelittlepony.unicopia.block.BlockTomatoPlant;
-import com.minelittlepony.unicopia.block.IColourful;
-import com.minelittlepony.unicopia.block.UPot;
-import com.minelittlepony.unicopia.block.USapling;
-import com.minelittlepony.unicopia.item.ItemApple;
-import com.minelittlepony.unicopia.block.BlockCloudDoor;
-import com.minelittlepony.unicopia.block.BlockDiamondDoor;
-import com.minelittlepony.unicopia.block.BlockCloudFarm;
-import com.minelittlepony.unicopia.block.BlockCloudFence;
-import com.minelittlepony.unicopia.block.BlockCloud;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.SoundType;
-import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.renderer.color.BlockColors;
-import net.minecraft.client.renderer.color.ItemColors;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.world.ColorizerFoliage;
-import net.minecraft.world.biome.BiomeColorHelper;
-import net.minecraft.world.gen.feature.WorldGenTrees;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import net.minecraftforge.registries.IForgeRegistry;
-
-public class UBlocks {
-    public static final BlockCloud normal_cloud = new BlockCloud(UMaterials.cloud, CloudType.NORMAL, Unicopia.MODID, "cloud_block");
-    public static final BlockCloud enchanted_cloud = new BlockCloud(UMaterials.cloud, CloudType.ENCHANTED, Unicopia.MODID, "enchanted_cloud_block");
-    public static final BlockCloud packed_cloud = new BlockCloud(UMaterials.cloud, CloudType.PACKED, Unicopia.MODID, "packed_cloud_block");
-
-    public static final BlockCloudStairs cloud_stairs = new BlockCloudStairs(normal_cloud.getDefaultState(), Unicopia.MODID, "cloud_stairs");
-
-    public static final BlockCloudSlab.Single<?> cloud_slab = new BlockCloudSlab.Single<>(normal_cloud, UMaterials.cloud, Unicopia.MODID, "cloud_slab");
-    public static final BlockCloudSlab.Single<?> enchanted_cloud_slab = new BlockCloudSlab.Single<>(enchanted_cloud, UMaterials.cloud, Unicopia.MODID, "enchanted_cloud_slab");
-    public static final BlockCloudSlab.Single<?> packed_cloud_slab = new BlockCloudSlab.Single<>(enchanted_cloud, UMaterials.cloud, Unicopia.MODID, "packed_cloud_slab");
-
-    public static final BlockCloudDoor mist_door = new BlockCloudDoor(UMaterials.cloud, Unicopia.MODID, "mist_door", () -> UItems.mist_door);
-    public static final Block library_door = new BlockDutchDoor(Material.WOOD, Unicopia.MODID, "library_door", () -> UItems.library_door)
-            .setSoundType(SoundType.WOOD)
-            .setHardness(3);
-    public static final Block bakery_door = new BlockDutchDoor(Material.WOOD, Unicopia.MODID, "bakery_door", () -> UItems.bakery_door)
-            .setSoundType(SoundType.WOOD)
-            .setHardness(3);
-    public static final Block diamond_door = new BlockDiamondDoor(Unicopia.MODID, "diamond_door", () -> UItems.diamond_door);
-
-    public static final BlockGlowingGem enchanted_torch = new BlockGlowingGem(Unicopia.MODID, "enchanted_torch");
-
-    public static final BlockCloudAnvil anvil = new BlockCloudAnvil(Unicopia.MODID, "anvil");
-
-    public static final BlockCloudFence cloud_fence = new BlockCloudFence(UMaterials.cloud, CloudType.NORMAL, Unicopia.MODID, "cloud_fence");
-    public static final BlockCloudBanister cloud_banister = new BlockCloudBanister(UMaterials.cloud, Unicopia.MODID, "cloud_banister");
-
-    public static final BlockAlfalfa alfalfa = new BlockAlfalfa(Unicopia.MODID, "alfalfa");
-
-    public static final BlockStick stick = new BlockStick(Unicopia.MODID, "stick");
-    public static final BlockTomatoPlant tomato_plant = new BlockTomatoPlant(Unicopia.MODID, "tomato_plant");
-
-    public static final BlockCloudFarm cloud_farmland = new BlockCloudFarm(Unicopia.MODID, "cloud_farmland");
-
-    public static final BlockHiveWall hive = new BlockHiveWall(Unicopia.MODID, "hive");
-    public static final BlockChitin chitin = new BlockChitin(Unicopia.MODID, "chitin_block");
-    public static final Block chissled_chitin = new BlockChiselledChitin(Unicopia.MODID, "chissled_chitin");
-
-    public static final BlockGrowingCuccoon cuccoon = new BlockGrowingCuccoon(Unicopia.MODID, "cuccoon");
-    public static final BlockSlimeLayer slime_layer = new BlockSlimeLayer(Unicopia.MODID, "slime_layer");
-
-    public static final Block sugar_block = new BlockSugar(Unicopia.MODID, "sugar_block");
-    public static final UPot flower_pot = new UPot(Unicopia.MODID, "flower_pot");
-
-    public static final USapling apple_tree = new USapling(Unicopia.MODID, "apple_sapling")
-            .setTreeGen((w, s, m) -> new WorldGenTrees(true, 5, Blocks.LOG.getDefaultState(), UBlocks.apple_leaves.getDefaultState(), false));
-    public static final Block apple_leaves = new BlockFruitLeaves(Unicopia.MODID, "apple_leaves", apple_tree)
-            .setBaseGrowthChance(1200)
-            .setTint(0xFFEE81)
-            .setHarvestFruit(ItemApple::getRandomItemStack)
-            .setUnharvestFruit(w -> new ItemStack(UItems.rotten_apple));
-
-    static void init(IForgeRegistry<Block> registry) {
-        registry.registerAll(normal_cloud, enchanted_cloud, packed_cloud,
-                             cloud_stairs,
-                             cloud_slab, cloud_slab.doubleSlab,
-                             enchanted_cloud_slab, enchanted_cloud_slab.doubleSlab,
-                             packed_cloud_slab, packed_cloud_slab.doubleSlab,
-                             cloud_fence, cloud_banister,
-                             mist_door, library_door, bakery_door, diamond_door,
-                             hive, chitin, chissled_chitin, cuccoon, slime_layer,
-                             anvil, cloud_farmland,
-                             sugar_block, flower_pot,
-                             alfalfa,
-                             stick, tomato_plant,
-                             enchanted_torch,
-                             apple_tree, apple_leaves);
-    }
-
-    @SideOnly(Side.CLIENT)
-    static void registerColors(ItemColors items, BlockColors blocks) {
-        items.registerItemColorHandler((stack, tint) -> {
-            @SuppressWarnings("deprecation")
-            IBlockState state = ((ItemBlock)stack.getItem()).getBlock().getStateFromMeta(stack.getMetadata());
-
-            return blocks.colorMultiplier(state, null, null, tint);
-        }, apple_leaves);
-        blocks.registerBlockColorHandler((state, world, pos, tint) -> {
-            Block block = state.getBlock();
-
-            if (block instanceof IColourful) {
-                return ((IColourful)block).getCustomTint(state, tint);
-            }
-
-            if (world != null && pos != null) {
-                return BiomeColorHelper.getFoliageColorAtPos(world, pos);
-            }
-
-            return ColorizerFoliage.getFoliageColorBasic();
-        }, apple_leaves);
-    }
-
-    public static class Shills {
-        @Nullable
-        public static Block getShill(Block blockIn) {
-            if (blockIn == Blocks.FLOWER_POT) {
-                return flower_pot;
-            }
-
-            return null;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UEffects.java b/src/main/java/com/minelittlepony/unicopia/init/UEffects.java
deleted file mode 100644
index 946fd158..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/UEffects.java
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.potion.UPotion;
-
-import net.minecraft.init.MobEffects;
-import net.minecraft.potion.Potion;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraftforge.registries.IForgeRegistry;
-
-public class UEffects {
-
-    public static final DamageSource food_poisoning = new DamageSource("food_poisoning").setDamageBypassesArmor();
-
-    public static final Potion FOOD_POISONING = new UPotion(Unicopia.MODID, "food_poisoning", true, 3484199)
-            .setIconIndex(3, 1)
-            .setSilent()
-            .setEffectiveness(0.25)
-            .setApplicator((p, e, i) -> {
-
-                PotionEffect nausea = e.getActivePotionEffect(MobEffects.NAUSEA);
-                if (nausea == null) {
-                    PotionEffect foodEffect = e.getActivePotionEffect(p);
-                    nausea = new PotionEffect(MobEffects.NAUSEA, foodEffect.getDuration(), foodEffect.getAmplifier(), foodEffect.getIsAmbient(), foodEffect.doesShowParticles());
-
-                    e.addPotionEffect(nausea);
-                }
-
-                e.attackEntityFrom(food_poisoning, i);
-            });
-
-    static void init(IForgeRegistry<Potion> registry) {
-        registry.registerAll(
-                FOOD_POISONING
-        );
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UMaterials.java b/src/main/java/com/minelittlepony/unicopia/init/UMaterials.java
deleted file mode 100644
index 27438a6a..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/UMaterials.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import net.minecraft.block.material.MapColor;
-import net.minecraft.block.material.Material;
-
-public class UMaterials {
-    public static final Material cloud = new Material(MapColor.SNOW);
-    public static final Material hive = new Material(MapColor.NETHERRACK);
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/UParticles.java b/src/main/java/com/minelittlepony/unicopia/init/UParticles.java
deleted file mode 100644
index 9f8bf9a5..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/UParticles.java
+++ /dev/null
@@ -1,31 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.particle.client.ParticleUnicornMagic;
-import com.minelittlepony.unicopia.particle.client.ParticleRaindrops;
-import com.minelittlepony.unicopia.particle.client.ParticleSphere;
-import com.minelittlepony.unicopia.particle.client.ParticleChanglingMagic;
-import com.minelittlepony.unicopia.particle.client.ParticleDisk;
-
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-public class UParticles {
-
-    public static int UNICORN_MAGIC;
-    public static int CHANGELING_MAGIC;
-
-    public static int RAIN_DROPS;
-
-    public static int SPHERE;
-    public static int DISK;
-
-    @SideOnly(Side.CLIENT)
-    public static void init() {
-        UNICORN_MAGIC = Particles.instance().registerParticle(ParticleUnicornMagic::new);
-        RAIN_DROPS = Particles.instance().registerParticle(ParticleRaindrops::new);
-        CHANGELING_MAGIC = Particles.instance().registerParticle(ParticleChanglingMagic::new);
-        SPHERE = Particles.instance().registerParticle(ParticleSphere::new);
-        DISK = Particles.instance().registerParticle(ParticleDisk::new);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/init/USounds.java b/src/main/java/com/minelittlepony/unicopia/init/USounds.java
deleted file mode 100644
index 59d49f06..00000000
--- a/src/main/java/com/minelittlepony/unicopia/init/USounds.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package com.minelittlepony.unicopia.init;
-
-import com.minelittlepony.unicopia.Unicopia;
-
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
-import net.minecraftforge.registries.IForgeRegistry;
-
-public class USounds {
-
-    public static final SoundEvent WING_FLAP = new USound(Unicopia.MODID, "wing_flap");
-    public static final SoundEvent WIND_RUSH = new USound(Unicopia.MODID, "wind_rush");
-
-    public static final SoundEvent INSECT = new USound(Unicopia.MODID, "insect");
-    public static final SoundEvent CHANGELING_BUZZ = new USound(Unicopia.MODID, "changeling_buzz");
-
-    public static final SoundEvent SLIME_ADVANCE = new USound(Unicopia.MODID, "slime_advance");
-    public static final SoundEvent SLIME_RETRACT = new USound(Unicopia.MODID, "slime_retract");
-
-    public static final SoundEvent RECORD_CRUSADE = new USound(Unicopia.MODID, "record.crusade");
-    public static final SoundEvent RECORD_PET = new USound(Unicopia.MODID, "record.pet");
-    public static final SoundEvent RECORD_POPULAR = new USound(Unicopia.MODID, "record.popular");
-    public static final SoundEvent RECORD_FUNK = new USound(Unicopia.MODID, "record.funk");
-
-    static void init(IForgeRegistry<SoundEvent> registry) {
-        registry.registerAll(WING_FLAP, WIND_RUSH,
-                CHANGELING_BUZZ, INSECT, SLIME_ADVANCE, SLIME_RETRACT,
-                RECORD_CRUSADE, RECORD_PET, RECORD_POPULAR, RECORD_FUNK);
-    }
-
-    static class USound extends SoundEvent {
-        USound(String domain, String name) {
-            this(new ResourceLocation(domain, name));
-        }
-
-        USound(ResourceLocation id) {
-            super(id);
-            setRegistryName(id);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/IKeyBind.java b/src/main/java/com/minelittlepony/unicopia/input/IKeyBind.java
deleted file mode 100644
index c28cb852..00000000
--- a/src/main/java/com/minelittlepony/unicopia/input/IKeyBind.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.minelittlepony.unicopia.input;
-
-public interface IKeyBind {
-
-    String getKeyCategory();
-
-    String getKeyName();
-
-    int getKeyCode();
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/IKeyHandler.java b/src/main/java/com/minelittlepony/unicopia/input/IKeyHandler.java
deleted file mode 100644
index d83d4fbb..00000000
--- a/src/main/java/com/minelittlepony/unicopia/input/IKeyHandler.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package com.minelittlepony.unicopia.input;
-
-public interface IKeyHandler {
-
-    void addKeybind(IKeyBind bind);
-
-    default void onKeyInput() {
-
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/MouseControl.java b/src/main/java/com/minelittlepony/unicopia/input/MouseControl.java
deleted file mode 100644
index f7b22ae5..00000000
--- a/src/main/java/com/minelittlepony/unicopia/input/MouseControl.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.minelittlepony.unicopia.input;
-
-import com.minelittlepony.unicopia.UClient;
-
-import net.minecraft.util.MouseHelper;
-
-public class MouseControl extends MouseHelper {
-    public void mouseXYChange() {
-        super.mouseXYChange();
-
-        if (UClient.instance().getIPlayer().getGravity().getGravitationConstant() < 0) {
-            deltaX = -deltaX;
-            deltaY = -deltaY;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/MovementControl.java b/src/main/java/com/minelittlepony/unicopia/input/MovementControl.java
deleted file mode 100644
index 6d328f29..00000000
--- a/src/main/java/com/minelittlepony/unicopia/input/MovementControl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.minelittlepony.unicopia.input;
-
-import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-import com.minelittlepony.unicopia.player.IPlayer;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.MovementInput;
-import net.minecraft.util.MovementInputFromOptions;
-
-@FUF(reason = "Back to the ancient art of proxy classes...")
-public class MovementControl extends MovementInputFromOptions {
-
-    static boolean recurseCheck;
-
-    private MovementInput wrappedInstance;
-
-    public MovementControl(MovementInput inherited) {
-        super(Minecraft.getMinecraft().gameSettings);
-        wrappedInstance = inherited;
-    }
-
-    @Override
-    public void updatePlayerMoveState() {
-        // Other mods might wrap us, in which case let's just pretend to be the vanilla one.
-        // We'll replace them at the top level and let go of the inner to prevent the chain from growing.
-        if (recurseCheck) {
-            wrappedInstance = null;
-            super.updatePlayerMoveState();
-        }
-
-        recurseCheck = true;
-        wrappedInstance.updatePlayerMoveState();
-        recurseCheck = false;
-
-        this.moveStrafe = wrappedInstance.moveStrafe;
-        this.moveForward = wrappedInstance.moveForward;
-        this.forwardKeyDown = wrappedInstance.forwardKeyDown;
-        this.backKeyDown = wrappedInstance.backKeyDown;
-        this.leftKeyDown = wrappedInstance.leftKeyDown;
-        this.rightKeyDown = wrappedInstance.rightKeyDown;
-        this.jump = wrappedInstance.jump;
-        this.sneak = wrappedInstance.sneak;
-
-        IPlayer player = UClient.instance().getIPlayer();
-
-        if (player.getGravity().getGravitationConstant() < 0) {
-            boolean tmp = leftKeyDown;
-
-            leftKeyDown = rightKeyDown;
-            rightKeyDown = tmp;
-
-            moveStrafe = -moveStrafe;
-
-            if (player.getOwner().capabilities.isFlying) {
-                tmp = jump;
-                jump = sneak;
-                sneak = tmp;
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/input/UKeyHandler.java b/src/main/java/com/minelittlepony/unicopia/input/UKeyHandler.java
deleted file mode 100644
index e76ac979..00000000
--- a/src/main/java/com/minelittlepony/unicopia/input/UKeyHandler.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.minelittlepony.unicopia.input;
-
-import java.util.ArrayList;
-
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.power.PowersRegistry;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.settings.GameSettings;
-import net.minecraft.client.settings.KeyBinding;
-import net.minecraftforge.fml.client.registry.ClientRegistry;
-
-class UKeyHandler implements IKeyHandler {
-    private static ArrayList<KeyBinding> bindings = new ArrayList<KeyBinding>();
-    private static ArrayList<KeyBinding> removed = new ArrayList<KeyBinding>();
-
-    private static ArrayList<KeyBinding> pressed = new ArrayList<KeyBinding>();
-
-    @Override
-    public void addKeybind(IKeyBind p) {
-        KeyBinding b = new KeyBinding(p.getKeyName(), p.getKeyCode(), p.getKeyCategory());
-
-        ClientRegistry.registerKeyBinding(b);
-
-        bindings.add(b);
-    }
-
-    @Override
-    public void onKeyInput() {
-        if (Minecraft.getMinecraft().currentScreen != null
-            || Minecraft.getMinecraft().player == null) {
-            return;
-        }
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(Minecraft.getMinecraft().player);
-
-        for (KeyBinding i : bindings) {
-            if (GameSettings.isKeyDown(i)) {
-
-                if (!pressed.contains(i)) {
-                    pressed.add(i);
-
-                    if (!PowersRegistry.instance().hasRegisteredPower(i.getKeyCodeDefault())) {
-                        removed.add(i);
-                        System.out.println("Error: Keybinding(" + i.getKeyDescription() + ") does not have a registered pony power. Keybinding will be removed from event.");
-                    } else {
-                        PowersRegistry.instance()
-                            .getCapablePowerFromKey(i.getKeyCodeDefault(), iplayer.getPlayerSpecies())
-                            .ifPresent(iplayer.getAbilities()::tryUseAbility);
-                    }
-                }
-            } else {
-                if (pressed.contains(i)) {
-                    pressed.remove(i);
-
-                    iplayer.getAbilities().tryClearAbility();
-                }
-            }
-        }
-
-        for (KeyBinding i : removed) {
-            removed.remove(i);
-            bindings.remove(i);
-            pressed.remove(i);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/ContainerOfHolding.java b/src/main/java/com/minelittlepony/unicopia/inventory/ContainerOfHolding.java
deleted file mode 100644
index a723f7a0..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/ContainerOfHolding.java
+++ /dev/null
@@ -1,114 +0,0 @@
-package com.minelittlepony.unicopia.inventory;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.world.IWorldNameable;
-
-public class ContainerOfHolding extends Container implements IWorldNameable {
-
-    private final InventoryOfHolding inventory;
-
-    private ItemStack sourceStack;
-
-    public ContainerOfHolding(EntityPlayer player) {
-        sourceStack = player.getHeldItem(EnumHand.MAIN_HAND);
-        inventory = InventoryOfHolding.getInventoryFromStack(sourceStack);
-
-        inventory.openInventory(player);
-        this.onContainerClosed(player);
-
-        final int LEFT_MARGIN = 8;
-        final int TOP_MARGIN = 18;
-
-        final int containerRows = (int)Math.ceil(inventory.getSizeInventory() / 9);
-        final int inventoryRows = (int)Math.ceil((player.inventory.getSizeInventory() - 9) / 9);
-
-        for (int i = 0; i < inventory.getSizeInventory(); i++) {
-            int slotX = (i % 9) * 18;
-            int slotY = (int)Math.floor(i / 9) * 18;
-
-            addSlotToContainer(new SlotOfHolding(inventory, i, LEFT_MARGIN + slotX, TOP_MARGIN + slotY));
-        }
-
-        int inventoryY = (containerRows * 18) + 8;
-        int hotbarY = inventoryY + TOP_MARGIN + (inventoryRows * 18) + 4;
-
-        for (int i = 9; i < player.inventory.getSizeInventory() - 5; i++) {
-            int slotX = (i % 9) * 18;
-            int slotY = (int)Math.floor(i / 9) * 18;
-
-            addSlotToContainer(new Slot(player.inventory, i, LEFT_MARGIN + slotX, inventoryY + slotY));
-        }
-
-        for (int i = 0; i < 9; i++) {
-            addSlotToContainer(new Slot(player.inventory, i, LEFT_MARGIN + i * 18, hotbarY));
-        }
-    }
-
-    @Override
-    public void onContainerClosed(EntityPlayer player) {
-        inventory.writeTostack(sourceStack);
-        inventory.closeInventory(player);
-
-        super.onContainerClosed(player);
-    }
-
-    @Override
-    public boolean canInteractWith(EntityPlayer playerIn) {
-        return true;
-    }
-
-
-    @Override
-    public String getName() {
-        return getDisplayName().getUnformattedText();
-    }
-
-    @Override
-    public boolean hasCustomName() {
-        return inventory.hasCustomName();
-    }
-
-    @Override
-    public ITextComponent getDisplayName() {
-        return inventory.getDisplayName();
-    }
-
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) {
-        ItemStack resultingStack = ItemStack.EMPTY;
-        Slot slot = inventorySlots.get(index);
-
-        if (slot != null && slot.getHasStack()) {
-            ItemStack originalStack = slot.getStack();
-            resultingStack = originalStack.copy();
-
-            if (index < inventory.getSizeInventory()) {
-                if (!mergeItemStack(originalStack, inventory.getSizeInventory(), this.inventorySlots.size(), true)) {
-                    return ItemStack.EMPTY;
-                }
-            } else if (!this.mergeItemStack(originalStack, 0, inventory.getSizeInventory(), false)) {
-                return ItemStack.EMPTY;
-            }
-
-            if (originalStack.isEmpty()) {
-                slot.putStack(ItemStack.EMPTY);
-            } else {
-                slot.onSlotChanged();
-            }
-        }
-
-        return resultingStack;
-    }
-
-    class SlotOfHolding extends Slot {
-        public SlotOfHolding(IInventory inventoryIn, int index, int xPosition, int yPosition) {
-            super(inventoryIn, index, xPosition, yPosition);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/InventoryOfHolding.java b/src/main/java/com/minelittlepony/unicopia/inventory/InventoryOfHolding.java
deleted file mode 100644
index 3e599f2a..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/InventoryOfHolding.java
+++ /dev/null
@@ -1,248 +0,0 @@
-package com.minelittlepony.unicopia.inventory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.BiFunction;
-
-import com.minelittlepony.unicopia.advancements.UAdvancements;
-import com.minelittlepony.unicopia.item.IMagicalItem;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
-import com.minelittlepony.util.MagicalDamageSource;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockEnderChest;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryBasic;
-import net.minecraft.item.ItemShulkerBox;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public class InventoryOfHolding extends InventoryBasic implements InbtSerialisable {
-
-    public static final int NBT_COMPOUND = 10;
-    public static final int MIN_SIZE = 18;
-
-    static InventoryOfHolding empty() {
-        return new InventoryOfHolding(new ArrayList<>());
-    }
-
-    public static InventoryOfHolding getInventoryFromStack(ItemStack stack) {
-        List<ItemStack> items = new ArrayList<>();
-
-        iterateContents(stack, (i, item) -> {
-            items.add(item);
-            return true;
-        });
-
-        InventoryOfHolding result = new InventoryOfHolding(items);
-
-        if (stack.hasDisplayName()) {
-            result.setCustomName(stack.getDisplayName());
-        }
-
-        return result;
-    }
-
-    public static void iterateContents(ItemStack stack, BiFunction<Integer, ItemStack, Boolean> itemConsumer) {
-        if (stack.hasTagCompound() && stack.getTagCompound().hasKey("inventory")) {
-            NBTTagCompound compound = stack.getOrCreateSubCompound("inventory");
-
-            if (compound.hasKey("items")) {
-                NBTTagList list = compound.getTagList("items", NBT_COMPOUND);
-                for (int i = 0; i < list.tagCount(); i++) {
-                    ItemStack item = new ItemStack(list.getCompoundTagAt(i));
-                    if (!item.isEmpty()) {
-                        if (!itemConsumer.apply(i, item)) {
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private InventoryOfHolding(List<ItemStack> items) {
-        super("unicopia.gui.title.bagofholding", false, items.size() + 9 - (items.size() % 9));
-
-
-        for (int i = 0; i < items.size(); i++) {
-            setInventorySlotContents(i, items.get(i));
-        }
-    }
-
-    public <T extends TileEntity & IInventory> void addBlockEntity(World world, BlockPos pos, T blockInventory) {
-        IBlockState state = world.getBlockState(pos);
-        ItemStack blockStack = new ItemStack(state.getBlock(), 1, state.getBlock().damageDropped(state));
-
-        blockInventory.writeToNBT(blockStack.getOrCreateSubCompound("BlockEntityTag"));
-
-        for (int i = 0; i < blockInventory.getSizeInventory(); i++) {
-            ItemStack stack = blockInventory.getStackInSlot(i);
-
-            if (isIllegalItem(stack)) {
-                blockStack.getOrCreateSubCompound("inventory").setBoolean("invalid", true);
-                break;
-            }
-        }
-
-        encodeStackWeight(blockStack, getContentsTotalWorth(blockInventory, true), true);
-
-        world.removeTileEntity(pos);
-        world.setBlockState(pos, Blocks.AIR.getDefaultState());
-
-        addItem(blockStack);
-        world.playSound(null, pos, SoundEvents.UI_TOAST_IN, SoundCategory.PLAYERS, 3.5F, 0.25F);
-    }
-
-    public void addItem(EntityItem entity) {
-        addItem(entity.getItem());
-        entity.setDead();
-
-        entity.playSound(SoundEvents.UI_TOAST_IN, 3.5F, 0.25F);
-    }
-
-    @Override
-    public void closeInventory(EntityPlayer player) {
-        if (checkExplosionConditions()) {
-            if (player instanceof EntityPlayerMP) {
-                UAdvancements.BOH_DEATH.trigger((EntityPlayerMP)player);
-            }
-            player.attackEntityFrom(MagicalDamageSource.create("paradox"), 1000);
-            player.world.createExplosion(player, player.posX, player.posY, player.posZ, 5, true);
-        }
-    }
-
-    protected boolean checkExplosionConditions() {
-        for (int i = 0; i < getSizeInventory(); i++) {
-            if (isIllegalItem(getStackInSlot(i))) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
-    protected boolean isIllegalItem(ItemStack stack) {
-        NBTTagCompound compound = stack.getSubCompound("inventory");
-
-        return isIllegalBlock(Block.getBlockFromItem(stack.getItem()))
-                || stack.getItem() instanceof ItemShulkerBox
-                || (compound != null && compound.hasKey("invalid"))
-                || (stack.getItem() instanceof IMagicalItem && ((IMagicalItem) stack.getItem()).hasInnerSpace());
-    }
-
-    protected boolean isIllegalBlock(Block block) {
-        return block instanceof BlockEnderChest;
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        NBTTagList nbtItems = new NBTTagList();
-
-        for (int i = 0; i < getSizeInventory(); i++) {
-            NBTTagCompound comp = new NBTTagCompound();
-            ItemStack stack = getStackInSlot(i);
-            if (!isIllegalItem(stack)) {
-                if (!stack.isEmpty()) {
-                    stack.writeToNBT(comp);
-                    nbtItems.appendTag(comp);
-                }
-            }
-        }
-        compound.setTag("items", nbtItems);
-        compound.setDouble("weight", getContentsTotalWorth());
-    }
-
-    public double getContentsTotalWorth() {
-        return getContentsTotalWorth(this, true);
-    }
-
-    public void writeTostack(ItemStack stack) {
-        writeToNBT(stack.getOrCreateSubCompound("inventory"));
-    }
-
-    public static double getContentsTotalWorth(IInventory inventory, boolean deep) {
-        double total = 0;
-
-        for (int i = 0; i < inventory.getSizeInventory(); i++) {
-            ItemStack stack = inventory.getStackInSlot(i);
-
-            double weightOfOne = decodeStackWeight(stack, deep);
-
-            if (weightOfOne == 0) {
-                total += stack.getCount();
-            } else {
-                total += weightOfOne * stack.getCount();
-            }
-        }
-
-        return total;
-    }
-
-    public static void encodeStackWeight(ItemStack stack, double weight, boolean deep) {
-        NBTTagCompound compound = stack.getSubCompound("inventory");
-        if (weight == 0 && compound != null) {
-            compound.removeTag("weight");
-            compound.removeTag("deep");
-            if (compound.isEmpty()) {
-                stack.removeSubCompound("inventory");
-            }
-        } else {
-            if (weight != 0) {
-                if (compound == null) {
-                    compound = stack.getOrCreateSubCompound("inventory");
-                }
-
-                compound.setDouble("weight", weight);
-                if (deep) {
-                    compound.setBoolean("deep", deep);
-                }
-            }
-        }
-    }
-
-    public static double decodeStackWeight(ItemStack stack, boolean deep) {
-        if (!stack.isEmpty() && stack.hasTagCompound()) {
-            NBTTagCompound bet = stack.getSubCompound("BlockEntityTag");
-            NBTTagCompound compound = stack.getSubCompound("inventory");
-
-            boolean hasWeight = compound != null && compound.hasKey("weight");
-
-            if (deep) {
-                if (!hasWeight && bet != null) {
-                    Block b = Block.getBlockFromItem(stack.getItem());
-                    TileEntity te = b.createTileEntity(null, b.getDefaultState());
-
-                    double weight = 0;
-
-                    if (te instanceof IInventory) {
-                        te.readFromNBT(bet);
-
-                        weight = getContentsTotalWorth((IInventory)te, deep);
-                    }
-
-                    encodeStackWeight(stack, weight, deep);
-
-                    return weight;
-                }
-            }
-
-            if (hasWeight && (deep || !compound.hasKey("deep"))) {
-                return compound.getDouble("weight");
-            }
-        }
-
-        return 0;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/InventorySpellBook.java b/src/main/java/com/minelittlepony/unicopia/inventory/InventorySpellBook.java
deleted file mode 100644
index 9c5750e3..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/InventorySpellBook.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.minelittlepony.unicopia.inventory;
-
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryCrafting;
-
-public class InventorySpellBook extends InventoryCrafting {
-
-    private final IInventory craftResult;
-
-    public InventorySpellBook(IInventory resultMatrix, Container eventHandler, int width, int height) {
-        super(eventHandler, width, height);
-        craftResult = resultMatrix;
-    }
-
-    public IInventory getCraftResultMatrix() {
-        return craftResult;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerOfHolding.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerOfHolding.java
new file mode 100644
index 00000000..5437fd29
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerOfHolding.java
@@ -0,0 +1,99 @@
+package com.minelittlepony.unicopia.inventory.gui;
+
+import net.minecraft.container.Container;
+import net.minecraft.container.Slot;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Hand;
+
+public class ContainerOfHolding extends Container {
+
+    private final InventoryOfHolding inventory;
+
+    private ItemStack sourceStack;
+
+    public ContainerOfHolding(PlayerEntity player) {
+        // TODO
+        super(null, 0);
+
+        sourceStack = player.getStackInHand(Hand.MAIN_HAND);
+        inventory = InventoryOfHolding.getInventoryFromStack(sourceStack);
+
+        inventory.onInvOpen(player);
+        close(player);
+
+        final int LEFT_MARGIN = 8;
+        final int TOP_MARGIN = 18;
+
+        final int containerRows = (int)Math.ceil(inventory.getInvSize() / 9);
+        final int inventoryRows = (int)Math.ceil((player.inventory.getInvSize() - 9) / 9);
+
+        for (int i = 0; i < inventory.getInvSize(); i++) {
+            int slotX = (i % 9) * 18;
+            int slotY = (int)Math.floor(i / 9) * 18;
+
+            addSlot(new SlotOfHolding(inventory, i, LEFT_MARGIN + slotX, TOP_MARGIN + slotY));
+        }
+
+        int inventoryY = (containerRows * 18) + 8;
+        int hotbarY = inventoryY + TOP_MARGIN + (inventoryRows * 18) + 4;
+
+        for (int i = 9; i < player.inventory.getInvSize() - 5; i++) {
+            int slotX = (i % 9) * 18;
+            int slotY = (int)Math.floor(i / 9) * 18;
+
+            addSlot(new Slot(player.inventory, i, LEFT_MARGIN + slotX, inventoryY + slotY));
+        }
+
+        for (int i = 0; i < 9; i++) {
+            addSlot(new Slot(player.inventory, i, LEFT_MARGIN + i * 18, hotbarY));
+        }
+    }
+
+    @Override
+    public void close(PlayerEntity player) {
+        inventory.writeTostack(sourceStack);
+        inventory.onInvClose(player);
+
+        super.close(player);
+    }
+
+    @Override
+    public boolean canUse(PlayerEntity playerIn) {
+        return true;
+    }
+
+    @Override
+    public ItemStack transferSlot(PlayerEntity playerIn, int index) {
+        ItemStack resultingStack = ItemStack.EMPTY;
+        Slot slot = slotList.get(index);
+
+        if (slot != null && slot.hasStack()) {
+            ItemStack originalStack = slot.getStack();
+            resultingStack = originalStack.copy();
+
+            if (index < inventory.getInvSize()) {
+                if (!insertItem(originalStack, inventory.getInvSize(), slotList.size(), true)) {
+                    return ItemStack.EMPTY;
+                }
+            } else if (!insertItem(originalStack, 0, inventory.getInvSize(), false)) {
+                return ItemStack.EMPTY;
+            }
+
+            if (originalStack.isEmpty()) {
+                slot.setStack(ItemStack.EMPTY);
+            } else {
+                slot.markDirty();
+            }
+        }
+
+        return resultingStack;
+    }
+
+    class SlotOfHolding extends Slot {
+        public SlotOfHolding(Inventory inventoryIn, int index, int xPosition, int yPosition) {
+            super(inventoryIn, index, xPosition, yPosition);
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerSpellBook.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerSpellBook.java
deleted file mode 100644
index b3dd1f12..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/gui/ContainerSpellBook.java
+++ /dev/null
@@ -1,170 +0,0 @@
-package com.minelittlepony.unicopia.inventory.gui;
-
-import javax.annotation.Nonnull;
-
-import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
-import com.minelittlepony.unicopia.inventory.InventorySpellBook;
-import com.minelittlepony.unicopia.inventory.slot.SlotEnchanting;
-import com.minelittlepony.unicopia.inventory.slot.SlotEnchantingResult;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-import com.minelittlepony.unicopia.world.UWorld;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.inventory.Container;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.InventoryBasic;
-import net.minecraft.inventory.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public class ContainerSpellBook extends Container {
-
-    private final World worldObj;
-
-    private IInventory craftResult = new InventoryBasic("Spell Result", false, 1);
-
-    private InventorySpellBook craftMatrix = new InventorySpellBook(craftResult, this, 5, 1);
-
-    private IPageUnlockListener listener;
-
-    private SlotEnchantingResult resultSlot = null;
-
-    private final EntityPlayer player;
-
-    public ContainerSpellBook(InventoryPlayer inventory, World world, BlockPos pos) {
-        super();
-        worldObj = world;
-        player = inventory.player;
-
-        initCraftingSlots();
-
-        for (int i = 0; i < 9; ++i) {
-            addSlotToContainer(new Slot(inventory, i, 121 + i * 18, 195));
-        }
-
-        onCraftMatrixChanged(craftMatrix);
-    }
-
-    public void setListener(IPageUnlockListener listener) {
-        this.listener = listener;
-
-        if (resultSlot != null) {
-            resultSlot.setListener(listener);
-        }
-    }
-
-    public void initCraftingSlots() {
-        addSlotToContainer(new SlotEnchanting(craftMatrix, 0, 175, 50));
-        addSlotToContainer(new SlotEnchanting(craftMatrix, 1, 149, 94));
-        addSlotToContainer(new SlotEnchanting(craftMatrix, 2, 175, 134));
-        addSlotToContainer(new SlotEnchanting(craftMatrix, 3, 226, 120));
-        addSlotToContainer(new SlotEnchanting(craftMatrix, 4, 227, 65));
-        addSlotToContainer(resultSlot = new SlotEnchantingResult(listener, PlayerSpeciesList.instance().getPlayer(player), craftMatrix, craftResult, 0, 191, 92));
-    }
-
-    @Override
-    public void onCraftMatrixChanged(IInventory inventoryIn) {
-        ItemStack current = craftResult.getStackInSlot(0);
-
-        if (!current.isEmpty()) {
-            ItemStack crafted = Unicopia.getCraftingManager().findMatchingResult(craftMatrix, worldObj);
-
-            if (!crafted.isEmpty()) {
-                resultSlot.setCrafted(true);
-
-                if  (crafted.getItem() != current.getItem()) {
-
-                    craftResult.setInventorySlotContents(0, ItemStack.EMPTY);
-                    resultSlot.onTake(player, crafted);
-
-                    player.dropItem(crafted, true);
-
-                    player.playSound(SoundEvents.BLOCK_NOTE_SNARE, 1, 1);
-
-                    worldObj.newExplosion(null, player.posX, player.posY, player.posZ, 0, false, false);
-                    worldObj.newExplosion(null, player.posX, player.posY, player.posZ, 0, false, false);
-
-                    worldObj.spawnParticle(EnumParticleTypes.EXPLOSION_HUGE, player.posX, player.posY, player.posZ, 1, 0, 0);
-
-                    UWorld.enqueueTask(w -> {
-                        player.closeScreen();
-                    });
-
-                    return;
-                }
-
-                current = crafted;
-                player.playSound(SoundEvents.BLOCK_NOTE_CHIME, 1, 1);
-            } else {
-                current = SpellRegistry.instance().disenchantStack(current);
-
-                resultSlot.setCrafted(false);
-                player.playSound(SoundEvents.BLOCK_NOTE_BASS, 1, 1);
-            }
-
-            craftResult.setInventorySlotContents(0, current);
-        }
-    }
-
-    @Nonnull
-    @Override
-    public ItemStack transferStackInSlot(EntityPlayer playerIn, int index) {
-        ItemStack stack = ItemStack.EMPTY;
-        Slot slot = inventorySlots.get(index);
-
-        if (slot != null && slot.getHasStack()) {
-            ItemStack slotStack = slot.getStack();
-            stack = slotStack.copy();
-
-            if (index > 5) {
-                if (!resultSlot.getHasStack() && resultSlot.isItemValid(stack)) {
-                    if (!mergeItemStack(slotStack, 5, 6, false)) {
-                        return ItemStack.EMPTY;
-                    }
-                } else if (!mergeItemStack(slotStack, 0, 5, false)) {
-                    return ItemStack.EMPTY;
-                }
-            } else {
-                if (!mergeItemStack(slotStack, 6, 15, false)) {
-                    return ItemStack.EMPTY;
-                }
-
-                slot.onSlotChange(slotStack, stack);
-                onCraftMatrixChanged(craftMatrix);
-            }
-
-            if (slotStack.getCount() == stack.getCount()) {
-                return ItemStack.EMPTY;
-            }
-
-            slot.onTake(playerIn, slotStack);
-        }
-
-        return stack;
-    }
-
-    @Override
-    public void onContainerClosed(EntityPlayer player) {
-        clearContainer(player, worldObj, craftMatrix);
-        clearContainer(player, worldObj, craftResult);
-
-        ItemStack held = player.inventory.getItemStack();
-
-        if (!held.isEmpty()) {
-            player.inventory.setItemStack(ItemStack.EMPTY);
-            player.inventory.placeItemBackInInventory(worldObj, held);
-        }
-    }
-
-    @Override
-    public boolean canInteractWith(EntityPlayer player) {
-        return Predicates.MAGI.test(player);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiOfHolding.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiOfHolding.java
index 69c2cd77..b5f448cc 100644
--- a/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiOfHolding.java
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiOfHolding.java
@@ -2,17 +2,14 @@ package com.minelittlepony.unicopia.inventory.gui;
 
 import java.io.IOException;
 
-import com.minelittlepony.unicopia.inventory.ContainerOfHolding;
+import com.mojang.blaze3d.platform.GlStateManager;
 
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.inventory.GuiContainer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.IInteractionObject;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gui.screen.ingame.ContainerScreen9;
+import net.minecraft.util.Identifier;
 
-public class GuiOfHolding extends GuiContainer {
-    private static final ResourceLocation CHEST_GUI_TEXTURE = new ResourceLocation("textures/gui/container/generic_54.png");
+public class GuiOfHolding extends ContainerScreen9 {
+    private static final Identifier CHEST_GUI_TEXTURE = new Identifier("textures/gui/container/generic_54.png");
 
     private final int inventoryRows;
     private final int playerRows;
@@ -20,9 +17,9 @@ public class GuiOfHolding extends GuiContainer {
     private final Scrollbar scrollbar = new Scrollbar();
 
     public GuiOfHolding(IInteractionObject interaction) {
-        super(interaction.createContainer(Minecraft.getMinecraft().player.inventory, Minecraft.getMinecraft().player));
+        super(interaction.createContainer(MinecraftClient.getInstance().player.inventory, MinecraftClient.getInstance().player));
 
-        playerRows = Minecraft.getMinecraft().player.inventory.getSizeInventory() / 9;
+        playerRows = MinecraftClient.getInstance().player.inventory.getSizeInventory() / 9;
         inventoryRows = (inventorySlots.inventorySlots.size() / 9) - 1;
     }
 
@@ -53,7 +50,7 @@ public class GuiOfHolding extends GuiContainer {
         int scroll = -scrollbar.getScrollAmount();
 
         GlStateManager.pushMatrix();
-        GlStateManager.translate(0, scroll, 0);
+        GlStateManager.translatef(0, scroll, 0);
 
         super.drawScreen(mouseX, mouseY - scroll, partialTicks);
 
@@ -95,7 +92,7 @@ public class GuiOfHolding extends GuiContainer {
 
     @Override
     protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
-        GlStateManager.color(1, 1, 1, 1);
+        GlStateManager.color4f(1, 1, 1, 1);
 
         mc.getTextureManager().bindTexture(CHEST_GUI_TEXTURE);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiSpellBook.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiSpellBook.java
index 7d210f0a..cf62e14c 100644
--- a/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiSpellBook.java
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/GuiSpellBook.java
@@ -4,14 +4,13 @@ import java.io.IOException;
 
 import org.lwjgl.opengl.GL11;
 
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.Unicopia;
 import com.minelittlepony.unicopia.enchanting.IPage;
 import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
 import com.minelittlepony.unicopia.enchanting.PageState;
 import com.minelittlepony.unicopia.enchanting.Pages;
-import com.minelittlepony.unicopia.inventory.slot.SlotEnchanting;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiButton;
@@ -21,13 +20,13 @@ import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Slot;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class GuiSpellBook extends GuiContainer implements IPageUnlockListener {
 
     private static IPage currentIPage;
 
-    public static final ResourceLocation spellBookGuiTextures = new ResourceLocation("unicopia", "textures/gui/container/book.png");
+    public static final Identifier spellBookGuiTextures = new Identifier("unicopia", "textures/gui/container/book.png");
 
     private IPlayer playerExtension;
 
@@ -35,13 +34,13 @@ public class GuiSpellBook extends GuiContainer implements IPageUnlockListener {
     private PageButton prevPage;
 
     public GuiSpellBook(EntityPlayer player) {
-        super(new ContainerSpellBook(player.inventory, player.world, new BlockPos(player)));
+        super(new SpellBookContainer(player.inventory, player.world, new BlockPos(player)));
         player.openContainer = inventorySlots;
 
         xSize = 405;
         ySize = 219;
         allowUserInput = true;
-        playerExtension = PlayerSpeciesList.instance().getPlayer(player);
+        playerExtension = SpeciesList.instance().getPlayer(player);
     }
 
     @Override
@@ -115,7 +114,7 @@ public class GuiSpellBook extends GuiContainer implements IPageUnlockListener {
     }
 
     protected boolean drawSlotOverlay(Slot slot) {
-        if (slot instanceof SlotEnchanting) {
+        if (slot instanceof SpellbookSlot) {
             GlStateManager.enableBlend();
             GL11.glDisable(GL11.GL_ALPHA_TEST);
 
@@ -163,7 +162,7 @@ public class GuiSpellBook extends GuiContainer implements IPageUnlockListener {
         drawModalRectWithCustomSizedTexture(left + 147, top + 49, 407, 2, 100, 101, 512, 256);
 
         if (playerExtension.getPageState(currentIPage) != PageState.LOCKED) {
-            ResourceLocation texture = currentIPage.getTexture();
+            Identifier texture = currentIPage.getTexture();
 
             if (mc.getTextureManager().getTexture(texture) != TextureUtil.MISSING_TEXTURE) {
                 GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/InventoryOfHolding.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/InventoryOfHolding.java
new file mode 100644
index 00000000..fd841d1b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/InventoryOfHolding.java
@@ -0,0 +1,269 @@
+package com.minelittlepony.unicopia.inventory.gui;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.function.BiFunction;
+
+import com.minelittlepony.unicopia.advancements.UAdvancements;
+import com.minelittlepony.unicopia.magic.items.IMagicalItem;
+import com.minelittlepony.util.InbtSerialisable;
+import com.minelittlepony.util.MagicalDamageSource;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockEntityProvider;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.EnderChestBlock;
+import net.minecraft.block.ShulkerBoxBlock;
+import net.minecraft.block.entity.BlockEntity;
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.BasicInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.text.Text;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.EmptyBlockView;
+import net.minecraft.world.World;
+import net.minecraft.world.explosion.Explosion.DestructionType;
+import net.minecraft.world.loot.context.LootContext;
+import net.minecraft.world.loot.context.LootContextParameters;
+
+public class InventoryOfHolding extends BasicInventory implements InbtSerialisable {
+
+    public static final int NBT_COMPOUND = 10;
+    public static final int MIN_SIZE = 18;
+
+    static InventoryOfHolding empty() {
+        return new InventoryOfHolding(new ArrayList<>(), ItemStack.EMPTY);
+    }
+
+    public static InventoryOfHolding getInventoryFromStack(ItemStack stack) {
+        List<ItemStack> items = new ArrayList<>();
+
+        iterateContents(stack, (i, item) -> {
+            items.add(item);
+            return true;
+        });
+
+        return new InventoryOfHolding(items, stack);
+    }
+
+    public static void iterateContents(ItemStack stack, BiFunction<Integer, ItemStack, Boolean> itemConsumer) {
+        if (stack.hasTag() && stack.getTag().containsKey("inventory")) {
+            CompoundTag compound = stack.getSubTag("inventory");
+
+            if (compound.containsKey("items")) {
+                ListTag list = compound.getList("items", NBT_COMPOUND);
+
+                for (int i = 0; i < list.size(); i++) {
+                    ItemStack item = ItemStack.fromTag(list.getCompoundTag(i));
+                    if (!item.isEmpty() && !itemConsumer.apply(i, item)) {
+                        break;
+                    }
+                }
+            }
+        }
+    }
+
+    private final Optional<Text> name;
+
+    private InventoryOfHolding(List<ItemStack> items, ItemStack source) {
+        super(items.size() + 9 - (items.size() % 9));
+
+        for (int i = 0; i < items.size(); i++) {
+            setInvStack(i, items.get(i));
+        }
+
+        if (source.hasCustomName()) {
+            name = Optional.of(source.getName());
+        } else {
+            name = Optional.empty();
+        }
+    }
+
+    public Optional<Text> getName() {
+        return name;
+    }
+
+    public <T extends BlockEntity & Inventory> void addBlockEntity(World world, BlockPos pos, T blockInventory) {
+        BlockState state = world.getBlockState(pos);
+
+        BlockEntity tile = state.getBlock().hasBlockEntity() ? world.getBlockEntity(pos) : null;
+        LootContext.Builder context = new LootContext.Builder((ServerWorld)world)
+                .setRandom(world.random).put(LootContextParameters.POSITION, pos)
+                .put(LootContextParameters.TOOL, ItemStack.EMPTY)
+                .putNullable(LootContextParameters.BLOCK_ENTITY, tile);
+
+        ItemStack blockStack = state.getDroppedStacks(context).get(0);
+
+        blockInventory.toTag(blockStack.getSubTag("BlockEntityTag"));
+
+        for (int i = 0; i < blockInventory.getInvSize(); i++) {
+            ItemStack stack = blockInventory.getInvStack(i);
+
+            if (isIllegalItem(stack)) {
+                blockStack.getSubTag("inventory").putBoolean("invalid", true);
+                break;
+            }
+        }
+
+        encodeStackWeight(blockStack, getContentsTotalWorth(blockInventory, true), true);
+
+        world.removeBlockEntity(pos);
+        world.setBlockState(pos, Blocks.AIR.getDefaultState());
+
+        add(blockStack);
+        world.playSound(null, pos, SoundEvents.UI_TOAST_IN, SoundCategory.PLAYERS, 3.5F, 0.25F);
+    }
+
+    public void addItem(ItemEntity entity) {
+        add(entity.getStack());
+        entity.remove();
+
+        entity.playSound(SoundEvents.UI_TOAST_IN, 3.5F, 0.25F);
+    }
+
+    @Override
+    public void onInvClose(PlayerEntity player) {
+        if (checkExplosionConditions()) {
+            if (player instanceof ServerPlayerEntity) {
+                UAdvancements.BOH_DEATH.trigger((ServerPlayerEntity)player);
+            }
+            player.damage(MagicalDamageSource.create("paradox"), 1000);
+            player.world.createExplosion(player, player.x, player.y, player.z, 5, DestructionType.DESTROY);
+        }
+    }
+
+    protected boolean checkExplosionConditions() {
+        for (int i = 0; i < getInvSize(); i++) {
+            if (isIllegalItem(getInvStack(i))) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    protected boolean isIllegalItem(ItemStack stack) {
+        CompoundTag compound = stack.getSubTag("inventory");
+
+        return isIllegalBlock(Block.getBlockFromItem(stack.getItem()))
+                // TODO: tag for items that are invalid for the inventory of holding
+                || stack.getItem() instanceof BlockItem && (((BlockItem)stack.getItem()).getBlock() instanceof ShulkerBoxBlock)
+                || (compound != null && compound.containsKey("invalid"))
+                || (stack.getItem() instanceof IMagicalItem && ((IMagicalItem) stack.getItem()).hasInnerSpace());
+    }
+
+    protected boolean isIllegalBlock(Block block) {
+        return block instanceof EnderChestBlock;
+    }
+
+    @Override
+    public void toNBT(CompoundTag compound) {
+        ListTag nbtItems = new ListTag();
+
+        for (int i = 0; i < getInvSize(); i++) {
+            CompoundTag comp = new CompoundTag();
+            ItemStack stack = getInvStack(i);
+            if (!isIllegalItem(stack)) {
+                if (!stack.isEmpty()) {
+                    stack.toTag(comp);
+                    nbtItems.add(comp);
+                }
+            }
+        }
+        compound.put("items", nbtItems);
+        compound.putDouble("weight", getContentsTotalWorth());
+    }
+
+    public double getContentsTotalWorth() {
+        return getContentsTotalWorth(this, true);
+    }
+
+    public void writeTostack(ItemStack stack) {
+        toNBT(stack.getOrCreateSubTag("inventory"));
+    }
+
+    public static double getContentsTotalWorth(Inventory inventory, boolean deep) {
+        double total = 0;
+
+        for (int i = 0; i < inventory.getInvSize(); i++) {
+            ItemStack stack = inventory.getInvStack(i);
+
+            double weightOfOne = decodeStackWeight(stack, deep);
+
+            if (weightOfOne == 0) {
+                total += stack.getCount();
+            } else {
+                total += weightOfOne * stack.getCount();
+            }
+        }
+
+        return total;
+    }
+
+    public static void encodeStackWeight(ItemStack stack, double weight, boolean deep) {
+        CompoundTag compound = stack.getSubTag("inventory");
+        if (weight == 0 && compound != null) {
+            compound.remove("weight");
+            compound.remove("deep");
+            if (compound.isEmpty()) {
+                stack.removeSubTag("inventory");
+            }
+        } else {
+            if (weight != 0) {
+                if (compound == null) {
+                    compound = stack.getOrCreateSubTag("inventory");
+                }
+
+                compound.putDouble("weight", weight);
+                if (deep) {
+                    compound.putBoolean("deep", deep);
+                }
+            }
+        }
+    }
+
+    public static double decodeStackWeight(ItemStack stack, boolean deep) {
+        if (!stack.isEmpty() && stack.hasTag()) {
+            CompoundTag bet = stack.getSubTag("BlockEntityTag");
+            CompoundTag compound = stack.getSubTag("inventory");
+
+            boolean hasWeight = compound != null && compound.containsKey("weight");
+
+            if (deep) {
+                if (!hasWeight && bet != null) {
+                    Block b = Block.getBlockFromItem(stack.getItem());
+                    BlockEntity te = b.hasBlockEntity() ? ((BlockEntityProvider)b).createBlockEntity(EmptyBlockView.INSTANCE) : null;
+
+                    double weight = 0;
+
+                    if (te instanceof Inventory) {
+                        te.fromTag(bet);
+
+                        weight = getContentsTotalWorth((Inventory)te, deep);
+                    }
+
+                    encodeStackWeight(stack, weight, deep);
+
+                    return weight;
+                }
+            }
+
+            if (hasWeight && (deep || !compound.containsKey("deep"))) {
+                return compound.getDouble("weight");
+            }
+        }
+
+        return 0;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/Scrollbar.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/Scrollbar.java
deleted file mode 100644
index 96dc22f8..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/gui/Scrollbar.java
+++ /dev/null
@@ -1,212 +0,0 @@
-package com.minelittlepony.unicopia.inventory.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.math.MathHelper;
-
-public class Scrollbar {
-
-    private boolean dragging = false;
-    private boolean touching = false;
-
-    private int scrollY = 0;
-
-    private int thickness = 6;
-
-    private float scrollMomentum = 0;
-    private float scrollFactor = 0;
-
-    private int maxScrollY = 0;
-    private int shiftFactor = 0;
-
-    private int elementHeight;
-    private int contentHeight;
-
-    private int x;
-    private int y;
-
-    private int initialMouseY;
-
-    public Scrollbar() {
-
-    }
-
-    public void reposition(int x, int y, int elementHeight, int contentHeight) {
-        this.x = x;
-        this.y = y;
-        this.elementHeight = elementHeight;
-        this.contentHeight = contentHeight;
-
-        maxScrollY = contentHeight - elementHeight;
-        if (maxScrollY < 0) {
-            maxScrollY = 0;
-        }
-        scrollFactor = elementHeight == 0 ? 1 : contentHeight / elementHeight;
-
-        scrollBy(0);
-    }
-
-    public int getScrollAmount() {
-        return scrollY;
-    }
-
-    public void render(int mouseX, int mouseY, float partialTicks) {
-        if (!touching && !dragging) {
-            scrollMomentum *= partialTicks;
-            if (scrollMomentum > 0) {
-                scrollBy(scrollMomentum);
-            }
-
-            if (shiftFactor != 0) {
-                scrollBy(shiftFactor * scrollFactor);
-                shiftFactor = computeShiftFactor(mouseX, mouseY);
-            }
-        }
-
-        if (maxScrollY <= 0) return;
-
-        renderVertical();
-    }
-
-    protected void renderVertical() {
-        int scrollbarHeight = getScrubberLength(elementHeight, contentHeight);
-        int scrollbarTop = getScrubberStart(scrollbarHeight, elementHeight, contentHeight);
-
-        renderBackground(y, x, y + elementHeight, x + thickness);
-        renderBar(x, x + thickness, scrollbarTop, scrollbarTop + scrollbarHeight);
-    }
-
-    protected int getScrubberStart(int scrollbarHeight, int elementHeight, int contentHeight) {
-        if (maxScrollY == 0) {
-            return 0;
-        }
-
-        int scrollbarTop = y + getScrollAmount() * (elementHeight - scrollbarHeight) / maxScrollY;
-        if (scrollbarTop < 0) {
-            return 0;
-        }
-        return scrollbarTop;
-    }
-
-    protected int getScrubberLength(int elementL, int contentL) {
-        return MathHelper.clamp(elementL * elementL / contentL, 32, elementL - 8);
-    }
-
-    public boolean isFocused(int mouseX, int mouseY) {
-        return mouseY >= y
-            && mouseY <= y + elementHeight
-            && mouseX >= (x - 10)
-            && mouseX <= (x + thickness + 1);
-    }
-
-    private void renderBackground(int top, int left, int bottom, int right) {
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferbuilder = tessellator.getBuffer();
-
-        GlStateManager.color(1, 1, 1, 1);
-        GlStateManager.disableTexture2D();
-
-        GlStateManager.enableBlend();
-        GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-        GlStateManager.disableAlpha();
-        GlStateManager.shadeModel(7425);
-
-        bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-        bufferbuilder.pos(left, bottom, 0).tex(0, 1).color(0, 0, 0, 150).endVertex();
-        bufferbuilder.pos(right, bottom, 0).tex(1, 1).color(0, 0, 0, 150).endVertex();
-        bufferbuilder.pos(right, top, 0).tex(1, 0).color(0, 0, 0, 150).endVertex();
-        bufferbuilder.pos(left, top, 0).tex(0, 0).color(0, 0, 0, 150).endVertex();
-        tessellator.draw();
-
-        GlStateManager.shadeModel(7424);
-        GlStateManager.enableAlpha();
-        GlStateManager.disableBlend();
-    }
-
-    private void renderBar(int left, int right, int top, int bottom) {
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferbuilder = tessellator.getBuffer();
-
-        GlStateManager.color(1, 1, 1, 1);
-        GlStateManager.disableTexture2D();
-
-        int B = dragging ? 170 : 128;
-        int b = dragging ? 252 : 192;
-
-        //actual bar
-        bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-        bufferbuilder.pos(left, bottom, 0).tex(0, 1).color(128, 128, B, 255).endVertex();
-        bufferbuilder.pos(right, bottom, 0).tex(1, 1).color(128, 128, B, 255).endVertex();
-        bufferbuilder.pos(right, top, 0).tex(1, 0).color(128, 128, B, 255).endVertex();
-        bufferbuilder.pos(left, top, 0).tex(0, 0).color(128, 128, B, 255).endVertex();
-        tessellator.draw();
-
-        bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-        bufferbuilder.pos(left, bottom - 1, 0).tex(0, 1).color(192, 192, b, 255).endVertex();
-        bufferbuilder.pos(right - 1, bottom - 1, 0).tex(1, 1).color(192, b, 192, 255).endVertex();
-        bufferbuilder.pos(right - 1, top, 0).tex(1, 0).color(192, 192, b, 255).endVertex();
-        bufferbuilder.pos(left, top, 0.0D).tex(0, 0).color(192, 192, b, 255).endVertex();
-        tessellator.draw();
-
-        GlStateManager.enableTexture2D();
-    }
-
-    private int computeShiftFactor(int mouseX, int mouseY) {
-        int pos = mouseY;
-
-        int scrubberLength = getScrubberLength(elementHeight, contentHeight);
-        int scrubberStart = getScrubberStart(scrubberLength, elementHeight, contentHeight);
-
-        if (pos < scrubberStart) {
-            return 1;
-        } else if (pos > scrubberStart + scrubberLength) {
-            return -1;
-        }
-
-        return 0;
-    }
-
-    public boolean performAction(int mouseX, int mouseY) {
-
-        if (!isFocused(mouseX, mouseY)) {
-            touching = true;
-            return true;
-        }
-
-        shiftFactor = computeShiftFactor(mouseX, mouseY);
-
-        if (shiftFactor == 0) {
-            Minecraft.getMinecraft().getSoundHandler().playSound(PositionedSoundRecord.getMasterRecord(SoundEvents.UI_BUTTON_CLICK, 1));
-            dragging = true;
-        }
-
-        return true;
-    }
-
-    public void mouseMove(int mouseX, int mouseY, float partialTicks) {
-        if (dragging) {
-            scrollBy(initialMouseY - mouseY);
-        } else if (touching) {
-            scrollMomentum = mouseY - initialMouseY;
-
-            scrollBy((mouseY - initialMouseY) / 4);
-        }
-
-        initialMouseY = mouseY;
-    }
-
-    public void mouseUp(int mouseX, int mouseY) {
-        dragging = touching = false;
-        shiftFactor = 0;
-    }
-
-    public void scrollBy(float y) {
-        scrollY = MathHelper.clamp((int)Math.floor(scrollY - y * scrollFactor), 0, maxScrollY);
-    }
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookContainer.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookContainer.java
new file mode 100644
index 00000000..fcff5013
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookContainer.java
@@ -0,0 +1,172 @@
+package com.minelittlepony.unicopia.inventory.gui;
+
+import javax.annotation.Nonnull;
+
+import com.minelittlepony.unicopia.Predicates;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.Unicopia;
+import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.world.UWorld;
+
+import net.minecraft.container.Container;
+import net.minecraft.container.Slot;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.BasicInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.SoundEvents;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraft.world.explosion.Explosion.DestructionType;
+
+public class SpellBookContainer extends Container {
+
+    private final World worldObj;
+
+    private Inventory craftResult = new BasicInventory(1);
+
+    private SpellBookInventory craftMatrix = new SpellBookInventory(craftResult, this, 5, 1);
+
+    private IPageUnlockListener listener;
+
+    private SpellbookResultSlot resultSlot = null;
+
+    private final PlayerEntity player;
+
+    public SpellBookContainer(PlayerInventory inventory, World world, BlockPos pos) {
+        super(null, 0);// TODO
+        worldObj = world;
+        player = inventory.player;
+
+        initCraftingSlots();
+
+        for (int i = 0; i < 9; ++i) {
+            addSlot(new Slot(inventory, i, 121 + i * 18, 195));
+        }
+
+        onContentChanged(craftMatrix);
+    }
+
+    public void setListener(IPageUnlockListener listener) {
+        this.listener = listener;
+
+        if (resultSlot != null) {
+            resultSlot.setListener(listener);
+        }
+    }
+
+    public void initCraftingSlots() {
+        addSlot(new SpellbookSlot(craftMatrix, 0, 175, 50));
+        addSlot(new SpellbookSlot(craftMatrix, 1, 149, 94));
+        addSlot(new SpellbookSlot(craftMatrix, 2, 175, 134));
+        addSlot(new SpellbookSlot(craftMatrix, 3, 226, 120));
+        addSlot(new SpellbookSlot(craftMatrix, 4, 227, 65));
+        addSlot(resultSlot = new SpellbookResultSlot(listener, SpeciesList.instance().getPlayer(player), craftMatrix, craftResult, 0, 191, 92));
+    }
+
+    @Override
+    public void onContentChanged(Inventory inventoryIn) {
+        ItemStack current = craftResult.getInvStack(0);
+
+        if (!current.isEmpty()) {
+            ItemStack crafted = Unicopia.getCraftingManager().findMatchingResult(craftMatrix, worldObj);
+
+            if (!crafted.isEmpty()) {
+                resultSlot.setCrafted(true);
+
+                if  (crafted.getItem() != current.getItem()) {
+
+                    craftResult.setInvStack(0, ItemStack.EMPTY);
+                    resultSlot.onTakeItem(player, crafted);
+
+                    player.dropItem(crafted, true);
+
+                    player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_SNARE, 1, 1);
+
+                    worldObj.createExplosion(null, player.x, player.y, player.z, 0, DestructionType.NONE);
+                    worldObj.createExplosion(null, player.x, player.y, player.z, 0, DestructionType.NONE);
+                    worldObj.addParticle(ParticleTypes.EXPLOSION, player.x, player.y, player.z, 1, 0, 0);
+
+                    UWorld.enqueueTask(w -> {
+                        player.container.close(player);
+                    });
+
+                    return;
+                }
+
+                current = crafted;
+                player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_CHIME, 1, 1);
+            } else {
+                current = SpellRegistry.instance().disenchantStack(current);
+
+                resultSlot.setCrafted(false);
+                player.playSound(SoundEvents.BLOCK_NOTE_BLOCK_BASS, 1, 1);
+            }
+
+            craftResult.setInvStack(0, current);
+        }
+    }
+
+    @Nonnull
+    @Override
+    public ItemStack transferSlot(PlayerEntity player, int index) {
+        ItemStack stack = ItemStack.EMPTY;
+        Slot slot = slotList.get(index);
+
+        if (slot != null && slot.hasStack()) {
+            ItemStack slotStack = slot.getStack();
+            stack = slotStack.copy();
+
+            if (index > 5) {
+                if (!resultSlot.hasStack() && resultSlot.canInsert(stack)) {
+                    if (!insertItem(slotStack, 5, 6, false)) {
+                        return ItemStack.EMPTY;
+                    }
+                } else if (!insertItem(slotStack, 0, 5, false)) {
+                    return ItemStack.EMPTY;
+                }
+            } else {
+                if (!insertItem(slotStack, 6, 15, false)) {
+                    return ItemStack.EMPTY;
+                }
+
+                slot.onStackChanged(slotStack, stack);
+                onContentChanged(craftMatrix);
+            }
+
+            if (slotStack.getCount() == stack.getCount()) {
+                return ItemStack.EMPTY;
+            }
+
+            slot.onTakeItem(player, slotStack);
+        }
+
+        return stack;
+    }
+
+    @Override
+    public void close(PlayerEntity player) {
+        dropInventory(player, worldObj, craftMatrix);
+        dropInventory(player, worldObj, craftResult);
+        super.close(player);
+    }
+
+    @Override
+    public boolean canUse(PlayerEntity player) {
+        return Predicates.MAGI.test(player);
+    }
+
+    static class SpellbookSlot extends Slot {
+
+        public SpellbookSlot(Inventory inventoryIn, int index, int xPosition, int yPosition) {
+            super(inventoryIn, index, xPosition, yPosition);
+        }
+
+        public boolean canBeHovered() {
+            return true;
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookInventory.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookInventory.java
new file mode 100644
index 00000000..9cc14a69
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellBookInventory.java
@@ -0,0 +1,19 @@
+package com.minelittlepony.unicopia.inventory.gui;
+
+import net.minecraft.container.Container;
+import net.minecraft.inventory.CraftingInventory;
+import net.minecraft.inventory.Inventory;
+
+public class SpellBookInventory extends CraftingInventory {
+
+    private final Inventory craftResult;
+
+    public SpellBookInventory(Inventory resultMatrix, Container eventHandler, int width, int height) {
+        super(eventHandler, width, height);
+        craftResult = resultMatrix;
+    }
+
+    public Inventory getCraftResultMatrix() {
+        return craftResult;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellbookResultSlot.java b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellbookResultSlot.java
new file mode 100644
index 00000000..11ae8318
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/inventory/gui/SpellbookResultSlot.java
@@ -0,0 +1,101 @@
+package com.minelittlepony.unicopia.inventory.gui;
+
+import com.minelittlepony.unicopia.enchanting.IPageOwner;
+import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
+import com.minelittlepony.unicopia.enchanting.SpellCraftingEvent;
+import com.minelittlepony.unicopia.item.ItemSpell;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.MusicDiscItem;
+import net.minecraft.recipe.RecipeType;
+import net.minecraft.util.DefaultedList;
+
+public class SpellbookResultSlot extends SpellBookContainer.SpellbookSlot {
+
+    private final IPageOwner owner;
+    private final SpellBookInventory craftMatrix;
+
+    private IPageUnlockListener listener;
+
+    private boolean crafted;
+
+    public SpellbookResultSlot(IPageUnlockListener listener, IPageOwner owner, SpellBookInventory craftMatric, Inventory inventory, int index, int xPosition, int yPosition) {
+        super(inventory, index, xPosition, yPosition);
+        this.owner = owner;
+        this.listener = listener;
+        craftMatrix = craftMatric;
+    }
+
+    public void setListener(IPageUnlockListener listener) {
+        this.listener = listener;
+    }
+
+    public void setCrafted(boolean crafted) {
+        this.crafted = crafted;
+    }
+
+    @Override
+    public ItemStack onTakeItem(PlayerEntity player, ItemStack stack) {
+        if (crafted) {
+            onCrafted(stack);
+
+            ItemStack current = craftMatrix.getCraftResultMatrix().getInvStack(0);
+            craftMatrix.getCraftResultMatrix().setInvStack(0, stack);
+
+            // TODO: URecipeType.GEM_ENCHANTMENT
+            DefaultedList<ItemStack> remaining = player.world.getRecipeManager().getRemainingStacks(RecipeType.CRAFTING,  craftMatrix, player.world);
+
+            craftMatrix.getCraftResultMatrix().setInvStack(0, current);
+
+            for (int i = 0; i < remaining.size(); ++i) {
+                current = craftMatrix.getInvStack(i);
+                ItemStack remainder = remaining.get(i);
+
+                if (!current.isEmpty()) {
+                    if (current.getCount() < stack.getCount()) {
+                        craftMatrix.setInvStack(i, ItemStack.EMPTY);
+                    } else {
+                        craftMatrix.takeInvStack(i, stack.getCount());
+                    }
+
+                    if (!remainder.isEmpty()) {
+                        if (craftMatrix.getInvStack(i).isEmpty()) {
+                            craftMatrix.setInvStack(i, remainder);
+                        } else {
+                            remainder.setCount(stack.getCount());
+                            if (!player.inventory.insertStack(remainder)) {
+                                player.dropItem(remainder, true);
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        return super.onTakeItem(player, stack);
+    }
+
+    @Override
+    protected void onCrafted(ItemStack stack, int amount) {
+        onCrafted(stack);
+    }
+
+    @Override
+    protected void onCrafted(ItemStack stack) {
+        SpellCraftingEvent.trigger(owner, stack, listener);
+    }
+
+    @Override
+    public boolean canInsert(ItemStack stack) {
+        return (stack.getItem() instanceof ItemSpell || stack.getItem() instanceof MusicDiscItem)
+                && !SpellRegistry.stackHasEnchantment(stack);
+    }
+
+    @Override
+    public String getBackgroundSprite() {
+        return "unicopia:items/empty_slot_gem";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchanting.java b/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchanting.java
deleted file mode 100644
index 9817865c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchanting.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.minelittlepony.unicopia.inventory.slot;
-
-import net.minecraft.inventory.IInventory;
-import net.minecraft.inventory.Slot;
-
-public class SlotEnchanting extends Slot {
-
-    public SlotEnchanting(IInventory inventoryIn, int index, int xPosition, int yPosition) {
-        super(inventoryIn, index, xPosition, yPosition);
-    }
-
-    public boolean canBeHovered() {
-        return true;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchantingResult.java b/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchantingResult.java
deleted file mode 100644
index 32a30fbc..00000000
--- a/src/main/java/com/minelittlepony/unicopia/inventory/slot/SlotEnchantingResult.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.minelittlepony.unicopia.inventory.slot;
-
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.enchanting.IPageOwner;
-import com.minelittlepony.unicopia.enchanting.IPageUnlockListener;
-import com.minelittlepony.unicopia.enchanting.SpellCraftingEvent;
-import com.minelittlepony.unicopia.inventory.InventorySpellBook;
-import com.minelittlepony.unicopia.item.ItemSpell;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.inventory.IInventory;
-import net.minecraft.item.ItemRecord;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.NonNullList;
-
-public class SlotEnchantingResult extends SlotEnchanting {
-
-    private final IPageOwner owner;
-    private final InventorySpellBook craftMatrix;
-
-    private IPageUnlockListener listener;
-
-    private boolean crafted;
-
-    public SlotEnchantingResult(IPageUnlockListener listener, IPageOwner owner, InventorySpellBook craftMatric, IInventory inventory, int index, int xPosition, int yPosition) {
-        super(inventory, index, xPosition, yPosition);
-        this.owner = owner;
-        this.listener = listener;
-        craftMatrix = craftMatric;
-    }
-
-    public void setListener(IPageUnlockListener listener) {
-        this.listener = listener;
-    }
-
-    public void setCrafted(boolean crafted) {
-        this.crafted = crafted;
-    }
-
-    @Override
-    public ItemStack onTake(EntityPlayer player, ItemStack stack) {
-        if (crafted) {
-            onCrafting(stack);
-
-            ItemStack current = craftMatrix.getCraftResultMatrix().getStackInSlot(0);
-            craftMatrix.getCraftResultMatrix().setInventorySlotContents(0, stack);
-
-            NonNullList<ItemStack> remaining = Unicopia.getCraftingManager().getRemainingItems(craftMatrix, player.world);
-
-            craftMatrix.getCraftResultMatrix().setInventorySlotContents(0, current);
-
-            for (int i = 0; i < remaining.size(); ++i) {
-                current = craftMatrix.getStackInSlot(i);
-                ItemStack remainder = remaining.get(i);
-
-                if (!current.isEmpty()) {
-                    if (current.getCount() < stack.getCount()) {
-                        craftMatrix.setInventorySlotContents(i, ItemStack.EMPTY);
-                    } else {
-                        craftMatrix.decrStackSize(i, stack.getCount());
-                    }
-
-                    if (!remainder.isEmpty()) {
-                        if (craftMatrix.getStackInSlot(i).isEmpty()) {
-                            craftMatrix.setInventorySlotContents(i, remainder);
-                        } else {
-                            remainder.setCount(stack.getCount());
-                            if (!player.inventory.addItemStackToInventory(remainder)) {
-                                player.dropItem(remainder, true);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-
-        return super.onTake(player, stack);
-    }
-
-    @Override
-    protected void onCrafting(ItemStack stack, int amount) {
-        onCrafting(stack);
-    }
-
-    @Override
-    protected void onCrafting(ItemStack stack) {
-        SpellCraftingEvent.trigger(owner, stack, listener);
-    }
-
-    @Override
-    public boolean isItemValid(ItemStack stack) {
-        return (stack.getItem() instanceof ItemSpell || stack.getItem() instanceof ItemRecord)
-                && !SpellRegistry.stackHasEnchantment(stack);
-    }
-
-    @Override
-    public String getSlotTexture() {
-        return "unicopia:items/empty_slot_gem";
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ICastable.java b/src/main/java/com/minelittlepony/unicopia/item/ICastable.java
deleted file mode 100644
index ae907f05..00000000
--- a/src/main/java/com/minelittlepony/unicopia/item/ICastable.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.minelittlepony.unicopia.item;
-
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.spell.IDispenceable;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellCastResult;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-
-public interface ICastable extends IMagicalItem, IDispensable {
-
-    @Override
-    default ActionResult<ItemStack> dispenseStack(IBlockSource source, ItemStack stack) {
-        IDispenceable effect = SpellRegistry.instance().getDispenseActionFrom(stack);
-
-        if (effect == null) {
-            return new ActionResult<>(EnumActionResult.FAIL, stack);
-        }
-
-        SpellCastResult dispenceResult = onDispenseSpell(source, stack, effect);
-
-        if (dispenceResult == SpellCastResult.DEFAULT) {
-            return new ActionResult<>(EnumActionResult.PASS, stack);
-        }
-
-        if (dispenceResult == SpellCastResult.PLACE) {
-            castContainedSpell(source.getWorld(), source.getBlockPos(), stack, effect);
-
-            stack.shrink(1);
-        }
-
-        return new ActionResult<>(EnumActionResult.SUCCESS, stack);
-    }
-
-    SpellCastResult onDispenseSpell(IBlockSource source, ItemStack stack, IDispenceable effect);
-
-    SpellCastResult onCastSpell(EntityPlayer player, World world, BlockPos pos, ItemStack stack, IMagicEffect effect, EnumFacing side, float hitX, float hitY, float hitZ);
-
-    boolean canFeed(EntitySpell spell, ItemStack stack);
-
-    /**
-     * Called to cast a spell. The result is an entity spawned with the spell attached.
-     */
-    default EntitySpell castContainedSpell(World world, BlockPos pos, ItemStack stack, IMagicEffect effect) {
-        EntitySpell spell = new EntitySpell(world);
-
-        spell.setAffinity(getAffinity(stack));
-        spell.setLocationAndAngles(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0);
-        spell.setEffect(effect);
-
-        world.spawnEntity(spell);
-
-        return spell;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/tossable/ITossableItem.java b/src/main/java/com/minelittlepony/unicopia/item/ITossableItem.java
similarity index 75%
rename from src/main/java/com/minelittlepony/unicopia/tossable/ITossableItem.java
rename to src/main/java/com/minelittlepony/unicopia/item/ITossableItem.java
index ad4250f7..94b12a90 100644
--- a/src/main/java/com/minelittlepony/unicopia/tossable/ITossableItem.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ITossableItem.java
@@ -1,9 +1,11 @@
-package com.minelittlepony.unicopia.tossable;
+package com.minelittlepony.unicopia.item;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntityProjectile;
-import com.minelittlepony.unicopia.item.IDispensable;
+import com.minelittlepony.unicopia.entity.item.AdvancedProjectileEntity;
+import com.minelittlepony.unicopia.magic.items.IDispensable;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
+import com.minelittlepony.unicopia.projectile.ITossable;
 
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.dispenser.IBlockSource;
@@ -37,21 +39,21 @@ public interface ITossableItem extends ITossable<ItemStack>, IDispensable {
     }
 
     @Nullable
-    default ITossed createProjectile(World world, EntityPlayer player) {
-        return new EntityProjectile(world, player);
+    default IAdvancedProjectile createProjectile(World world, EntityPlayer player) {
+        return new AdvancedProjectileEntity(world, player);
     }
 
     @Nullable
-    default ITossed createProjectile(World world, IPosition pos) {
-        return new EntityProjectile(world, pos.getX(), pos.getY(), pos.getZ());
+    default IAdvancedProjectile createProjectile(World world, IPosition pos) {
+        return new AdvancedProjectileEntity(world, pos.getX(), pos.getY(), pos.getZ());
     }
 
     default void toss(World world, ItemStack itemstack, EntityPlayer player) {
 
         world.playSound(null, player.posX, player.posY, player.posZ, getThrowSound(itemstack), SoundCategory.NEUTRAL, 0.5F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F));
 
-        if (!world.isRemote) {
-            ITossed projectile = createProjectile(world, player);
+        if (!world.isClient) {
+            IAdvancedProjectile projectile = createProjectile(world, player);
 
             if (projectile == null) {
                 return;
@@ -72,7 +74,7 @@ public interface ITossableItem extends ITossable<ItemStack>, IDispensable {
     }
 
     default ItemStack toss(World world, IPosition pos, EnumFacing facing, ItemStack stack) {
-        ITossed projectile = createProjectile(world, pos);
+        IAdvancedProjectile projectile = createProjectile(world, pos);
 
         if (projectile == null) {
             return stack;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java b/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java
index 2fd2b885..2d26a5f7 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemAlicornAmulet.java
@@ -7,14 +7,15 @@ import javax.annotation.Nullable;
 
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.items.IDependable;
 import com.minelittlepony.unicopia.spell.SpellAffinity;
 import com.minelittlepony.unicopia.world.UWorld;
 import com.minelittlepony.util.MagicalDamageSource;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.lang.ClientLocale;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
@@ -103,7 +104,7 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable {
 
         entity.move(MoverType.SELF, diffX / 50, diffY / 50, diffZ / 50);
 
-        if (!player.world.isRemote && !entity.isDead) {
+        if (!player.world.isClient && !entity.isDead) {
             if (player.getPositionVector().distanceTo(entity.getPositionVector()) < 3) {
                if (entity.world.rand.nextInt(150) == 0) {
 
@@ -156,7 +157,7 @@ public class ItemAlicornAmulet extends ItemArmor implements IDependable {
             player.getFoodStats().addStats(1, 0);
         }
 
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
 
         float attachedTime = iplayer.getInventory().getTicksAttached(this);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
index 829f6cdf..5e042b37 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemApple.java
@@ -5,9 +5,9 @@ import java.util.function.Supplier;
 
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.UItems;
 import com.minelittlepony.unicopia.edibles.IEdible;
 import com.minelittlepony.unicopia.edibles.Toxicity;
-import com.minelittlepony.unicopia.init.UItems;
 import com.minelittlepony.util.collection.Pool;
 import com.minelittlepony.util.collection.Weighted;
 
@@ -75,7 +75,7 @@ public class ItemApple extends ItemFood implements IEdible {
 
             if (!item.isDead && item.ticksExisted > item.lifespan * 0.9) {
 
-                if (!item.world.isRemote) {
+                if (!item.world.isClient) {
                     item.setDead();
 
                     EntityItem neu = new EntityItem(item.world);
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemCereal.java b/src/main/java/com/minelittlepony/unicopia/item/ItemCereal.java
index f2461051..aa3e2fa9 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemCereal.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemCereal.java
@@ -1,8 +1,8 @@
 package com.minelittlepony.unicopia.item;
 
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
 
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemFood;
@@ -22,7 +22,7 @@ public class ItemCereal extends ItemFood {
         setContainerItem(Items.BOWL);
     }
 
-    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
+    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, LivingEntity entityLiving) {
         super.onItemUseFinish(stack, worldIn, entityLiving);
 
         return getContainerItem(stack);
@@ -33,7 +33,7 @@ public class ItemCereal extends ItemFood {
         super.onFoodEaten(stack, worldIn, player);
 
         if (sugarAmount != 0) {
-            PlayerSpeciesList.instance().getPlayer(player).addEnergy(sugarAmount);
+            SpeciesList.instance().getPlayer(player).addEnergy(sugarAmount);
         }
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemCloudPlacer.java b/src/main/java/com/minelittlepony/unicopia/item/ItemCloudPlacer.java
index 2a5d939e..badda6c2 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemCloudPlacer.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemCloudPlacer.java
@@ -2,8 +2,9 @@ package com.minelittlepony.unicopia.item;
 
 import java.util.function.Function;
 
+import com.minelittlepony.unicopia.UItems;
 import com.minelittlepony.unicopia.entity.EntityCloud;
-import com.minelittlepony.unicopia.init.UItems;
+import com.minelittlepony.unicopia.magic.items.IDispensable;
 
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.creativetab.CreativeTabs;
@@ -54,9 +55,9 @@ public class ItemCloudPlacer extends Item implements IDispensable {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        ItemStack stack = player.getHeldItem(hand);
+        ItemStack stack = player.getStackInHand(hand);
 
-        if (!world.isRemote) {
+        if (!world.isClient) {
             RayTraceResult mop = rayTrace(world, player, true);
 
             BlockPos pos;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemMagicStaff.java b/src/main/java/com/minelittlepony/unicopia/item/ItemMagicStaff.java
index e45ab79d..d48a1bbb 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemMagicStaff.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemMagicStaff.java
@@ -6,20 +6,19 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 import com.minelittlepony.unicopia.spell.CasterUtils;
 import com.minelittlepony.unicopia.spell.IAligned;
 import com.minelittlepony.unicopia.spell.ICaster;
 import com.minelittlepony.unicopia.spell.ITossedEffect;
 import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.unicopia.tossable.ITossableItem;
 import com.minelittlepony.util.lang.ClientLocale;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
@@ -54,7 +53,7 @@ public class ItemMagicStaff extends ItemStaff implements IAligned, ITossableItem
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         if (Predicates.MAGI.test(player) && hand == EnumHand.MAIN_HAND) {
-            ItemStack itemstack =  player.getHeldItem(hand);
+            ItemStack itemstack =  player.getStackInHand(hand);
 
             player.setActiveHand(hand);
 
@@ -65,7 +64,7 @@ public class ItemMagicStaff extends ItemStaff implements IAligned, ITossableItem
     }
 
     @Override
-    public void onPlayerStoppedUsing(ItemStack itemstack, World world, EntityLivingBase entity, int timeLeft) {
+    public void onPlayerStoppedUsing(ItemStack itemstack, World world, LivingEntity entity, int timeLeft) {
         if (Predicates.MAGI.test(entity) && entity instanceof EntityPlayer) {
 
             int i = getMaxItemUseDuration(itemstack) - timeLeft;
@@ -79,7 +78,7 @@ public class ItemMagicStaff extends ItemStaff implements IAligned, ITossableItem
     }
 
     @Override
-    protected boolean castContainedEffect(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) {
+    protected boolean castContainedEffect(ItemStack stack, LivingEntity target, LivingEntity attacker) {
         if (attacker.isSneaking()) {
             stack.damageItem(50, attacker);
 
@@ -99,8 +98,8 @@ public class ItemMagicStaff extends ItemStaff implements IAligned, ITossableItem
 
     public void onUpdate(ItemStack stack, World world, Entity entity, int itemSlot, boolean isSelected) {
 
-        if (entity instanceof EntityLivingBase) {
-            EntityLivingBase living = (EntityLivingBase)entity;
+        if (entity instanceof LivingEntity) {
+            LivingEntity living = (LivingEntity)entity;
 
             if (living.getActiveItemStack().getItem() == this) {
                 Vec3d eyes = entity.getPositionEyes(1);
@@ -135,7 +134,7 @@ public class ItemMagicStaff extends ItemStaff implements IAligned, ITossableItem
 
     @Override
     public void toss(World world, ItemStack stack, EntityPlayer player) {
-        IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer iplayer = SpeciesList.instance().getPlayer(player);
 
         iplayer.subtractEnergyCost(4);
         effect.toss(iplayer);
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemMoss.java b/src/main/java/com/minelittlepony/unicopia/item/ItemMoss.java
index 341f2d38..d6f9e79c 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemMoss.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemMoss.java
@@ -2,10 +2,10 @@ package com.minelittlepony.unicopia.item;
 
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.edibles.ItemEdible;
 import com.minelittlepony.unicopia.edibles.Toxicity;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
 import com.minelittlepony.util.collection.ReversableStateMapList;
 import com.mojang.authlib.GameProfile;
 
@@ -18,7 +18,7 @@ import net.minecraft.block.state.IBlockState;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
 import net.minecraft.dispenser.IBehaviorDispenseItem;
 import net.minecraft.dispenser.IBlockSource;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.init.Items;
@@ -60,7 +60,7 @@ public class ItemMoss extends ItemEdible {
 
             EntityPlayer player = null;
 
-            for (EntityLivingBase e : w.getEntitiesWithinAABB(EntityLivingBase.class, Block.FULL_BLOCK_AABB.offset(pos), e ->
+            for (LivingEntity e : w.getEntitiesWithinAABB(LivingEntity.class, Block.FULL_BLOCK_AABB.offset(pos), e ->
                     e instanceof IShearable && ((IShearable)e).isShearable(stack, w, pos)
             )) {
                 if (player == null) {
@@ -102,7 +102,7 @@ public class ItemMoss extends ItemEdible {
 
             int amount = 1;
 
-            if (player != null && PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies().canUseEarth()) {
+            if (player != null && SpeciesList.instance().getPlayer(player).getSpecies().canUseEarth()) {
                 amount = world.rand.nextInt(4);
             }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemOfHolding.java b/src/main/java/com/minelittlepony/unicopia/item/ItemOfHolding.java
index 5e4a9d14..aeff94fe 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemOfHolding.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemOfHolding.java
@@ -8,10 +8,11 @@ import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Predicates;
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.inventory.ContainerOfHolding;
-import com.minelittlepony.unicopia.inventory.InventoryOfHolding;
+import com.minelittlepony.unicopia.inventory.gui.ContainerOfHolding;
+import com.minelittlepony.unicopia.inventory.gui.InventoryOfHolding;
+import com.minelittlepony.unicopia.magic.items.IMagicalItem;
 import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.util.vector.VecHelper;
+import com.minelittlepony.util.VecHelper;
 
 import net.minecraft.client.util.ITooltipFlag;
 
@@ -29,7 +30,7 @@ import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.EnumActionResult;
 import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.text.ITextComponent;
@@ -75,7 +76,7 @@ public class ItemOfHolding extends Item implements IMagicalItem {
             return super.onItemRightClick(world, player, hand);
         }
 
-        ItemStack stack = player.getHeldItem(hand);
+        ItemStack stack = player.getStackInHand(hand);
 
         if (player.isSneaking()) {
             RayTraceResult hit = VecHelper.getObjectMouseOver(player, 5, 0);
@@ -96,7 +97,7 @@ public class ItemOfHolding extends Item implements IMagicalItem {
                         return new ActionResult<>(EnumActionResult.SUCCESS, stack);
                     }
 
-                    AxisAlignedBB box = new AxisAlignedBB(pos.offset(hit.sideHit)).grow(0.5);
+                    Box box = new Box(pos.offset(hit.sideHit)).grow(0.5);
 
                     List<Entity> itemsAround = world.getEntitiesInAABBexcluding(player, box, Predicates.ITEMS);
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemRottenTomato.java b/src/main/java/com/minelittlepony/unicopia/item/ItemRottenTomato.java
index 6a9a0be1..3f5eb633 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemRottenTomato.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemRottenTomato.java
@@ -1,8 +1,7 @@
 package com.minelittlepony.unicopia.item;
 
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.tossable.ITossableItem;
 
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
@@ -26,7 +25,7 @@ public class ItemRottenTomato extends ItemTomato implements ITossableItem {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        ItemStack itemstack = player.getHeldItem(hand);
+        ItemStack itemstack = player.getStackInHand(hand);
 
         if (canBeThrown(itemstack) && !player.canEat(false)) {
             toss(world, itemstack, player);
@@ -39,7 +38,7 @@ public class ItemRottenTomato extends ItemTomato implements ITossableItem {
 
     protected boolean isSickening(ItemStack stack, EntityPlayer player) {
         return canBeThrown(stack)
-                && !PlayerSpeciesList.instance().getPlayer(player).getPlayerSpecies().canUseEarth();
+                && !SpeciesList.instance().getPlayer(player).getSpecies().canUseEarth();
     }
 
     @Override
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemSpear.java b/src/main/java/com/minelittlepony/unicopia/item/ItemSpear.java
index b9b7c8ff..3bd05551 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemSpear.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemSpear.java
@@ -3,13 +3,12 @@ package com.minelittlepony.unicopia.item;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.entity.EntitySpear;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
 import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.tossable.ITossableItem;
-import com.minelittlepony.unicopia.tossable.ITossed;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.dispenser.IPosition;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.EnumAction;
 import net.minecraft.item.Item;
@@ -47,8 +46,8 @@ public class ItemSpear extends Item implements ITossableItem {
 
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        if (!world.isRemote) {
-            ItemStack itemstack = player.getHeldItem(hand);
+        if (!world.isClient) {
+            ItemStack itemstack = player.getStackInHand(hand);
 
             if (canBeThrown(itemstack)) {
                 player.setActiveHand(hand);
@@ -62,7 +61,7 @@ public class ItemSpear extends Item implements ITossableItem {
     }
 
     @Override
-    public void onPlayerStoppedUsing(ItemStack itemstack, World world, EntityLivingBase entity, int timeLeft) {
+    public void onPlayerStoppedUsing(ItemStack itemstack, World world, LivingEntity entity, int timeLeft) {
         if (entity instanceof EntityPlayer) {
 
             int i = getMaxItemUseDuration(itemstack) - timeLeft;
@@ -92,13 +91,13 @@ public class ItemSpear extends Item implements ITossableItem {
 
     @Nullable
     @Override
-    public ITossed createProjectile(World world, EntityPlayer player) {
+    public IAdvancedProjectile createProjectile(World world, EntityPlayer player) {
         return new EntitySpear(world, player);
     }
 
     @Nullable
     @Override
-    public ITossed createProjectile(World world, IPosition pos) {
+    public IAdvancedProjectile createProjectile(World world, IPosition pos) {
         return null;
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemSpell.java b/src/main/java/com/minelittlepony/unicopia/item/ItemSpell.java
index 2f54a9eb..7ea6cc10 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemSpell.java
@@ -5,15 +5,16 @@ import java.util.List;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.entity.EntitySpell;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.magic.items.ICastable;
 import com.minelittlepony.unicopia.spell.IMagicEffect;
 import com.minelittlepony.unicopia.spell.IUseAction;
 import com.minelittlepony.unicopia.spell.SpellAffinity;
 import com.minelittlepony.unicopia.spell.SpellCastResult;
 import com.minelittlepony.unicopia.spell.IDispenceable;
 import com.minelittlepony.unicopia.spell.SpellRegistry;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.lang.ClientLocale;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.client.util.ITooltipFlag;
@@ -87,13 +88,13 @@ public class ItemSpell extends Item implements ICastable {
             return EnumActionResult.PASS;
         }
 
-        ItemStack stack = player.getHeldItem(hand);
+        ItemStack stack = player.getStackInHand(hand);
 
         if (!SpellRegistry.stackHasEnchantment(stack)) {
             return EnumActionResult.FAIL;
         }
 
-        IMagicEffect effect = SpellRegistry.instance().getSpellFrom(stack);
+        IMagicEffect effect = SpellRegistry.getInstance().getSpellFrom(stack);
 
         if (effect == null) {
             return EnumActionResult.FAIL;
@@ -101,7 +102,7 @@ public class ItemSpell extends Item implements ICastable {
 
         SpellCastResult result = onCastSpell(player, world, pos, stack, effect, side, hitX, hitY, hitZ);
 
-        if (!world.isRemote) {
+        if (!world.isClient) {
             pos = pos.offset(side);
 
             if (result == SpellCastResult.PLACE) {
@@ -123,7 +124,7 @@ public class ItemSpell extends Item implements ICastable {
     @Override
     public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
 
-        ItemStack stack = player.getHeldItem(hand);
+        ItemStack stack = player.getStackInHand(hand);
 
         if (!Predicates.MAGI.test(player)) {
             return new ActionResult<ItemStack>(EnumActionResult.PASS, stack);
@@ -133,7 +134,7 @@ public class ItemSpell extends Item implements ICastable {
             return new ActionResult<ItemStack>(EnumActionResult.FAIL, stack);
         }
 
-        IUseAction effect = SpellRegistry.instance().getUseActionFrom(stack);
+        IUseAction effect = SpellRegistry.getInstance().getUseActionFrom(stack);
 
         if (effect != null) {
             SpellCastResult result = effect.onUse(stack, getAffinity(stack), player, world, VecHelper.getLookedAtEntity(player, 5));
@@ -184,8 +185,8 @@ public class ItemSpell extends Item implements ICastable {
         super.getSubItems(tab, subItems);
 
         if (isInCreativeTab(tab)) {
-            for (String name : SpellRegistry.instance().getAllNames(getAffinity())) {
-                subItems.add(SpellRegistry.instance().enchantStack(new ItemStack(this, 1), name));
+            for (String name : SpellRegistry.getInstance().getAllNames(getAffinity())) {
+                subItems.add(SpellRegistry.getInstance().enchantStack(new ItemStack(this, 1), name));
             }
         }
     }
@@ -200,7 +201,7 @@ public class ItemSpell extends Item implements ICastable {
     }
 
     @Override
-    public boolean canFeed(EntitySpell entity, ItemStack stack) {
+    public boolean canFeed(SpellcastEntity entity, ItemStack stack) {
         IMagicEffect effect = entity.getEffect();
 
         return effect != null
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemSpellbook.java b/src/main/java/com/minelittlepony/unicopia/item/ItemSpellbook.java
index e9eb71de..eafa1c03 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemSpellbook.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemSpellbook.java
@@ -58,7 +58,7 @@ public class ItemSpellbook extends ItemBook {
 
     public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing side, float hitX, float hitY, float hitZ) {
 
-        if (!world.isRemote && Predicates.MAGI.test(player)) {
+        if (!world.isClient && Predicates.MAGI.test(player)) {
             pos = pos.offset(side);
 
             double diffX = player.posX - (pos.getX() + 0.5);
@@ -68,7 +68,7 @@ public class ItemSpellbook extends ItemBook {
             placeBook(world, pos.getX(), pos.getY(), pos.getZ(), yaw);
 
             if (!player.capabilities.isCreativeMode) {
-                player.getHeldItem(hand).shrink(1);
+                player.getStackInHand(hand).shrink(1);
             }
 
             return EnumActionResult.SUCCESS;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemStaff.java b/src/main/java/com/minelittlepony/unicopia/item/ItemStaff.java
index ef1091fb..d265178f 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemStaff.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemStaff.java
@@ -13,7 +13,7 @@ import com.minelittlepony.util.lang.ClientLocale;
 import net.minecraft.block.Block;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.AttributeModifier;
 import net.minecraft.entity.player.EntityPlayer;
@@ -63,7 +63,7 @@ public class ItemStaff extends ItemSword {
     }
 
     @Override
-    public boolean hitEntity(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) {
+    public boolean hitEntity(ItemStack stack, LivingEntity target, LivingEntity attacker) {
         super.hitEntity(stack, target, attacker);
 
         if (Predicates.MAGI.test(attacker)) {
@@ -73,7 +73,7 @@ public class ItemStaff extends ItemSword {
         return false;
     }
 
-    protected boolean castContainedEffect(ItemStack stack, EntityLivingBase target, EntityLivingBase attacker) {
+    protected boolean castContainedEffect(ItemStack stack, LivingEntity target, LivingEntity attacker) {
         target.getEntityWorld().playSound(null, target.getPosition(), SoundEvents.ENTITY_PLAYER_ATTACK_CRIT, attacker.getSoundCategory(), 1, 1);
 
         target.knockBack(attacker, 2,
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemTomato.java b/src/main/java/com/minelittlepony/unicopia/item/ItemTomato.java
index 332a0826..dd0d21b6 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemTomato.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemTomato.java
@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.item;
 
-import com.minelittlepony.unicopia.init.UItems;
+import com.minelittlepony.unicopia.UItems;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.player.EntityPlayer;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java b/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
index 647d86a4..df4751bc 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemTomatoSeeds.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.unicopia.item;
 
-import com.minelittlepony.unicopia.block.BlockStick;
-import com.minelittlepony.unicopia.init.UBlocks;
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.block.StickBlock;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.state.IBlockState;
@@ -29,10 +29,10 @@ public class ItemTomatoSeeds extends Item {
 
         Block block = state.getBlock();
 
-        if (block instanceof BlockStick) {
+        if (block instanceof StickBlock) {
             if (UBlocks.tomato_plant.plant(world, pos, state)) {
                 if (!player.capabilities.isCreativeMode) {
-                    player.getHeldItem(hand).shrink(1);
+                    player.getStackInHand(hand).shrink(1);
                 }
 
                 return EnumActionResult.SUCCESS;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/ItemZapApple.java b/src/main/java/com/minelittlepony/unicopia/item/ItemZapApple.java
index fb64716c..4e9243c8 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/ItemZapApple.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/ItemZapApple.java
@@ -3,7 +3,7 @@ package com.minelittlepony.unicopia.item;
 
 import com.minelittlepony.unicopia.edibles.Toxicity;
 import com.minelittlepony.util.MagicalDamageSource;
-import com.minelittlepony.util.vector.VecHelper;
+import com.minelittlepony.util.VecHelper;
 
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.entity.Entity;
@@ -33,7 +33,7 @@ public class ItemZapApple extends ItemAppleMultiType {
         RayTraceResult mop = VecHelper.getObjectMouseOver(player, 5, 0);
 
         if (mop != null && mop.typeOfHit == RayTraceResult.Type.ENTITY) {
-            ItemStack stack = player.getHeldItem(hand);
+            ItemStack stack = player.getStackInHand(hand);
 
             if (canFeedTo(stack, mop.entityHit)) {
                 return onFedTo(stack, player, mop.entityHit);
diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItemBlock.java b/src/main/java/com/minelittlepony/unicopia/item/UItemBlock.java
index 5cb188ff..3e77b338 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/UItemBlock.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/UItemBlock.java
@@ -6,7 +6,7 @@ import net.minecraft.block.Block;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -20,7 +20,7 @@ public class UItemBlock extends UItemDecoration {
         this.abilityTest = abilityTest;
     }
 
-    public UItemBlock(Block block, ResourceLocation res, Predicate<EntityPlayer> abilityTest) {
+    public UItemBlock(Block block, Identifier res, Predicate<EntityPlayer> abilityTest) {
         super(block, res);
 
         this.abilityTest = abilityTest;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/UItemDecoration.java b/src/main/java/com/minelittlepony/unicopia/item/UItemDecoration.java
index fb9e198d..6d0aa230 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/UItemDecoration.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/UItemDecoration.java
@@ -2,7 +2,7 @@ package com.minelittlepony.unicopia.item;
 
 import net.minecraft.block.Block;
 import net.minecraft.item.ItemBlock;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class UItemDecoration extends ItemBlock {
 
@@ -11,10 +11,10 @@ public class UItemDecoration extends ItemBlock {
     }
 
     public UItemDecoration(Block block, String domain, String name) {
-        this(block, new ResourceLocation(domain, name));
+        this(block, new Identifier(domain, name));
     }
 
-    public UItemDecoration(Block block, ResourceLocation res) {
+    public UItemDecoration(Block block, Identifier res) {
         super(block);
 
         setTranslationKey(res.getPath());
diff --git a/src/main/java/com/minelittlepony/unicopia/item/override/ItemShear.java b/src/main/java/com/minelittlepony/unicopia/item/override/ItemShear.java
index e059f5f9..06cf7f79 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/override/ItemShear.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/override/ItemShear.java
@@ -1,6 +1,6 @@
 package com.minelittlepony.unicopia.item.override;
 
-import com.minelittlepony.unicopia.init.UItems;
+import com.minelittlepony.unicopia.UItems;
 
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
@@ -18,7 +18,7 @@ public class ItemShear extends ItemShears {
         IBlockState state = world.getBlockState(pos);
 
         if (UItems.moss.tryConvert(world, state, pos, player)) {
-            ItemStack stack = player.getHeldItem(hand);
+            ItemStack stack = player.getStackInHand(hand);
 
             if (!player.isCreative()) {
                 stack.damageItem(1, player);
diff --git a/src/main/java/com/minelittlepony/unicopia/item/override/ItemStick.java b/src/main/java/com/minelittlepony/unicopia/item/override/ItemStick.java
index 7f946b5e..8f5b0c5a 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/override/ItemStick.java
+++ b/src/main/java/com/minelittlepony/unicopia/item/override/ItemStick.java
@@ -1,12 +1,12 @@
 package com.minelittlepony.unicopia.item.override;
 
-import com.minelittlepony.unicopia.init.UBlocks;
+import com.minelittlepony.unicopia.UBlocks;
 
 import net.minecraft.advancements.CriteriaTriggers;
 import net.minecraft.block.SoundType;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.EnumActionResult;
@@ -19,7 +19,7 @@ import net.minecraft.world.World;
 public class ItemStick extends Item {
     @Override
     public EnumActionResult onItemUse(EntityPlayer player, World worldIn, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-        ItemStack itemstack = player.getHeldItem(hand);
+        ItemStack itemstack = player.getStackInHand(hand);
         IBlockState state = worldIn.getBlockState(pos);
 
         if (facing == EnumFacing.UP && player.canPlayerEdit(pos.offset(facing), facing, itemstack) && worldIn.isAirBlock(pos.up())) {
@@ -30,8 +30,8 @@ public class ItemStick extends Item {
 
             worldIn.playSound(null, pos, sound.getPlaceSound(), SoundCategory.BLOCKS, (sound.getVolume() + 1) / 2, sound.getPitch());
 
-            if (player instanceof EntityPlayerMP) {
-                CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP)player, pos.up(), itemstack);
+            if (player instanceof ServerPlayerEntity) {
+                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity)player, pos.up(), itemstack);
             }
 
             if (!(player instanceof EntityPlayer && ((EntityPlayer)player).capabilities.isCreativeMode)) {
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellAffinity.java b/src/main/java/com/minelittlepony/unicopia/magic/Affinity.java
similarity index 58%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellAffinity.java
rename to src/main/java/com/minelittlepony/unicopia/magic/Affinity.java
index 8897cae8..7e1166f4 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellAffinity.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/Affinity.java
@@ -1,24 +1,24 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
-import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.Formatting;
 
-public enum SpellAffinity {
-    GOOD(TextFormatting.BLUE, -1),
-    NEUTRAL(TextFormatting.WHITE, 0),
-    BAD(TextFormatting.RED, 1);
+public enum Affinity {
+    GOOD(Formatting.BLUE, -1),
+    NEUTRAL(Formatting.WHITE, 0),
+    BAD(Formatting.RED, 1);
 
-    private final TextFormatting color;
+    private final Formatting color;
 
     private final int corruption;
 
-    private SpellAffinity[] implications;
+    private Affinity[] implications;
 
-    SpellAffinity(TextFormatting color, int corruption) {
+    Affinity(Formatting color, int corruption) {
         this.color = color;
         this.corruption = corruption;
     }
 
-    public TextFormatting getColourCode() {
+    public Formatting getColourCode() {
         return color;
     }
 
@@ -38,7 +38,7 @@ public enum SpellAffinity {
         return this == NEUTRAL;
     }
 
-    public SpellAffinity[] getImplicators() {
+    public Affinity[] getImplicators() {
         if (implications != null) {
             return implications;
         }
@@ -46,18 +46,18 @@ public enum SpellAffinity {
         if (this == NEUTRAL) {
             implications = values();
         } else {
-            implications = new SpellAffinity[] { this };
+            implications = new Affinity[] { this };
         }
 
         return implications;
     }
 
-    public static SpellAffinity of(String s) {
+    public static Affinity of(String s) {
         try {
             if (s != null)
                 return valueOf(s.toUpperCase());
         } catch (Throwable e) {}
 
-        return SpellAffinity.NEUTRAL;
+        return Affinity.NEUTRAL;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/CasterUtils.java b/src/main/java/com/minelittlepony/unicopia/magic/CasterUtils.java
similarity index 53%
rename from src/main/java/com/minelittlepony/unicopia/spell/CasterUtils.java
rename to src/main/java/com/minelittlepony/unicopia/magic/CasterUtils.java
index a0582903..9da4a357 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/CasterUtils.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/CasterUtils.java
@@ -1,22 +1,22 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 import java.util.Optional;
 import java.util.stream.Stream;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.google.common.collect.Streams;
 import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.entity.EntitySpell;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.ducks.IRaceContainerHolder;
 import com.minelittlepony.unicopia.entity.IMagicals;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
 
 public class CasterUtils {
 
@@ -30,13 +30,13 @@ public class CasterUtils {
         BlockPos begin = origin.add(-radius, -radius, -radius);
         BlockPos end = origin.add(radius, radius, radius);
 
-        AxisAlignedBB bb = new AxisAlignedBB(begin, end);
+        Box bb = new Box(begin, end);
 
-        return source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e ->
-            !e.isDead && (e instanceof ICaster || e instanceof EntityPlayer)
+        return source.getWorld().getEntities(source.getEntity(), bb, e ->
+            !e.removed && (e instanceof ICaster || e instanceof PlayerEntity)
         ).stream().filter(e -> {
-                double dist = e.getDistance(origin.getX(), origin.getY(), origin.getZ());
-                double dist2 = e.getDistance(origin.getX(), origin.getY() - e.getEyeHeight(), origin.getZ());
+                double dist = e.squaredDistanceTo(origin.getX(), origin.getY(), origin.getZ());
+                double dist2 = e.squaredDistanceTo(origin.getX(), origin.getY() - e.getStandingEyeHeight(), origin.getZ());
 
                 return dist <= radius || dist2 <= radius;
             })
@@ -48,25 +48,24 @@ public class CasterUtils {
     /**
      * Finds all magically capabable entities in the world.
      */
+    @Deprecated
     static Stream<ICaster<?>> findAllSpells(ICaster<?> source) {
-        return source.getWorld().getEntities(EntityLivingBase.class, e -> {
-            return e instanceof ICaster || e instanceof EntityPlayer;
+        // TODO:
+        return source.getWorld().getEntities(LivingEntity.class, new Box(0, 0, 0, 0, 0, 0), e -> {
+            return e instanceof ICaster || e instanceof PlayerEntity;
         }).stream()
                 .map(CasterUtils::toCaster)
                 .filter(Optional::isPresent)
                 .map(Optional::get);
     }
 
-    static Stream<ICaster<?>> findAllSpellsInRange(ICaster<?> source, AxisAlignedBB bb) {
-        return source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e ->
-            !e.isDead && (e instanceof ICaster || Predicates.MAGI.test(e))
-        ).stream()
+    static Stream<ICaster<?>> findAllSpellsInRange(ICaster<?> source, Box bb) {
+        return source.getWorld().getEntities(source.getEntity(), bb, e -> !e.removed && (e instanceof ICaster || Predicates.MAGI.test(e))).stream()
             .map(CasterUtils::toCaster)
             .filter(o -> o.isPresent() && o.get() != source)
             .map(Optional::get);
     }
 
-    @SuppressWarnings("unchecked")
     static <T extends IMagicEffect> Optional<T> toMagicEffect(Class<T> type, @Nullable Entity entity) {
         return toCaster(entity)
                 .filter(ICaster::hasEffect)
@@ -79,45 +78,24 @@ public class CasterUtils {
      * By holding that meant the effect must be attached to the caster associated with the entity.
      */
     public static boolean isHoldingEffect(String effectName, Entity entity) {
-        return Streams.stream(entity.getEquipmentAndArmor())
+        return Streams.stream(entity.getArmorItems())
             .map(SpellRegistry::getKeyFromStack)
             .anyMatch(s -> s.equals(effectName));
     }
 
-    /**
-     * Creates a new caster at the position of the given entity.
-     * First attempts to convert the passed entity into a caster.
-     */
-    @Nonnull
-    public static ICaster<?> near(@Nonnull Entity entity) {
-        ICaster<?> result = toCasterRaw(entity);
-
-        if (result != null) {
-            return result;
-        }
-
-        EntitySpell caster = new EntitySpell(entity.world);
-        caster.copyLocationAndAnglesFrom(entity);
-
-        return caster;
-    }
-
     /**
      * Attempts to convert the passed entity into a caster using all the known methods.
      */
     public static Optional<ICaster<?>> toCaster(@Nullable Entity entity) {
-        return Optional.ofNullable(toCasterRaw(entity));
-    }
-
-    private static ICaster<?> toCasterRaw(Entity entity) {
         if (entity instanceof ICaster<?>) {
-            return (ICaster<?>)entity;
+            return Optional.of((ICaster<?>)entity);
         }
 
-        if (entity instanceof EntityLivingBase && !(entity instanceof IMagicals)) {
-            return PlayerSpeciesList.instance().getCaster((EntityLivingBase)entity);
+        if (entity instanceof LivingEntity && !(entity instanceof IMagicals)) {
+            return SpeciesList.instance().getForEntity(entity)
+                    .map(IRaceContainerHolder::getCaster);
         }
 
-        return null;
+        return Optional.empty();
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IAligned.java b/src/main/java/com/minelittlepony/unicopia/magic/IAffine.java
similarity index 57%
rename from src/main/java/com/minelittlepony/unicopia/spell/IAligned.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IAffine.java
index 29144a07..7b04fd22 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IAligned.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IAffine.java
@@ -1,12 +1,12 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 /**
  * Interface for things that have an affine alignment.
  */
-public interface IAligned {
+public interface IAffine {
     /**
      * Gets the current alignment.
      * Good/Bad/Neutral
      */
-    SpellAffinity getAffinity();
+    Affinity getAffinity();
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IAttachedEffect.java b/src/main/java/com/minelittlepony/unicopia/magic/IAttachedEffect.java
similarity index 92%
rename from src/main/java/com/minelittlepony/unicopia/spell/IAttachedEffect.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IAttachedEffect.java
index 1af01866..35f1b1b9 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IAttachedEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IAttachedEffect.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 public interface IAttachedEffect extends IMagicEffect {
     /**
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/ICaster.java b/src/main/java/com/minelittlepony/unicopia/magic/ICaster.java
similarity index 62%
rename from src/main/java/com/minelittlepony/unicopia/spell/ICaster.java
rename to src/main/java/com/minelittlepony/unicopia/magic/ICaster.java
index 86e62505..84eefe9c 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/ICaster.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/ICaster.java
@@ -1,31 +1,29 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
-import java.util.Random;
+import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Consumer;
 import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.entity.IMagicals;
-import com.minelittlepony.unicopia.player.IOwned;
-import com.minelittlepony.unicopia.power.IPower;
+import com.minelittlepony.unicopia.entity.IOwned;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.shape.IShape;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.particle.ParticleEffect;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 
 /**
  * Interface for any magically capable entities that can cast and persist spells.
  */
-public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelled, IAligned, IMagicals {
+public interface ICaster<E extends LivingEntity> extends IOwned<E>, ILevelled, IAffine, IMagicals {
 
     void setEffect(@Nullable IMagicEffect effect);
 
@@ -52,6 +50,17 @@ public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelle
         return getEffect(true);
     }
 
+    @SuppressWarnings("unchecked")
+    default <T extends IMagicEffect> Optional<T> getEffect(Class<T> type) {
+        IMagicEffect effect = getEffect();
+
+        if (effect == null || effect.getDead() || !type.isAssignableFrom(effect.getClass())) {
+            return Optional.empty();
+        }
+
+        return Optional.of((T)effect);
+    }
+
     /**
      * Returns true if this caster has an active effect attached to it.
      */
@@ -68,7 +77,7 @@ public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelle
      * Gets the unique id associated with this caste.
      */
     default UUID getUniqueId() {
-        return getEntity().getUniqueID();
+        return getEntity().getUuid();
     }
 
     /**
@@ -81,59 +90,46 @@ public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelle
     /**
      * Returns true if we're executing on the client.
      */
-    default boolean isRemote() {
-        return getWorld().isRemote;
+    default boolean isClient() {
+        return getWorld().isClient();
     }
 
     /**
      * Returns true if we're executing on the server.
      */
     default boolean isLocal() {
-        return !isRemote();
+        return !isClient();
     }
 
     /**
      * Gets the center position where this caster is located.
      */
     default BlockPos getOrigin() {
-        return getEntity().getPosition();
+        return getEntity().getBlockPos();
     }
 
     /**
      * Gets the center position where this caster is located.
      */
     default Vec3d getOriginVector() {
-        return getEntity().getPositionVector();
+        return getEntity().getPos();
     }
 
-    /**
-     * Returns a new caster at the given position.
-     * This one is not altered, rather the method will return an entirely new caster with the same owner as this one.
-     */
-    default ICaster<?> at(BlockPos newOrigin) {
-        EntitySpell spell = new EntitySpell(getWorld());
-        spell.setPosition(newOrigin.getX(), newOrigin.getY(), newOrigin.getZ());
-        spell.setOwner(getOwner());
-
-        return spell;
-    }
-
-    default void spawnParticles(int particleId, int count, int...args) {
-        IPower.spawnParticles(particleId, getEntity(), count, args);
+    default void spawnParticles(ParticleEffect particleId, int count) {
+        // TODO:
+        // ParticleTypeRegistry.getTnstance().getSpawner().spawnParticles(particleId, getEntity(), count);
     }
 
     default void spawnParticles(IShape area, int count, Consumer<Vec3d> particleSpawner) {
-        Random rand = getWorld().rand;
-
         Vec3d pos = getOriginVector();
 
-        for (int i = 0; i < count; i++) {
-            particleSpawner.accept(area.computePoint(rand).add(pos));
-        }
+        area.randomPoints(count, getWorld().random).stream()
+            .map(point -> point.add(pos))
+            .forEach(particleSpawner);
     }
 
     default boolean subtractEnergyCost(double amount) {
-        getOwner().attackEntityFrom(DamageSource.MAGIC, (int)amount/2);
+        getOwner().damage(DamageSource.MAGIC, (int)amount/2);
 
         return getOwner().getHealth() > 0;
     }
@@ -146,7 +142,7 @@ public interface ICaster<E extends EntityLivingBase> extends IOwned<E>, ILevelle
         return CasterUtils.findAllSpellsInRange(this, radius);
     }
 
-    default Stream<ICaster<?>> findAllSpellsInRange(AxisAlignedBB bb) {
+    default Stream<ICaster<?>> findAllSpellsInRange(Box bb) {
         return CasterUtils.findAllSpellsInRange(this, bb);
     }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IDispenceable.java b/src/main/java/com/minelittlepony/unicopia/magic/IDispenceable.java
similarity index 65%
rename from src/main/java/com/minelittlepony/unicopia/spell/IDispenceable.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IDispenceable.java
index 8b6fdf8f..556a1a80 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IDispenceable.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IDispenceable.java
@@ -1,8 +1,10 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
+
+import com.minelittlepony.unicopia.magic.spells.SpellCastResult;
 
-import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Position;
 
 /**
  * Represents an object with an action to perform when dispensed from a dispenser.
@@ -18,5 +20,5 @@ public interface IDispenceable extends IMagicEffect {
      * @param affinity  The affinity of the casting artifact
      * @return    an ActionResult for the type of action to perform.
      */
-    public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity);
+    SpellCastResult onDispenced(BlockPos pos, Direction facing, Position source, Affinity affinity);
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IHeldEffect.java b/src/main/java/com/minelittlepony/unicopia/magic/IHeldEffect.java
similarity index 64%
rename from src/main/java/com/minelittlepony/unicopia/spell/IHeldEffect.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IHeldEffect.java
index 67bb0846..83d32728 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IHeldEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IHeldEffect.java
@@ -1,6 +1,6 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 /**
  * Represents a passive spell that does something when held in the player's hand.
@@ -11,5 +11,5 @@ public interface IHeldEffect extends IMagicEffect {
      *
      * @param source    The entity we are currently attached to.
      */
-    void updateInHand(IPlayer caster, SpellAffinity affinity);
+    void updateInHand(IPlayer caster, Affinity affinity);
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/ILevelled.java b/src/main/java/com/minelittlepony/unicopia/magic/ILevelled.java
similarity index 93%
rename from src/main/java/com/minelittlepony/unicopia/spell/ILevelled.java
rename to src/main/java/com/minelittlepony/unicopia/magic/ILevelled.java
index bb451028..19ae0586 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/ILevelled.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/ILevelled.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 /**
  * Object with levelling capabilities.
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IMagicEffect.java b/src/main/java/com/minelittlepony/unicopia/magic/IMagicEffect.java
similarity index 90%
rename from src/main/java/com/minelittlepony/unicopia/spell/IMagicEffect.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IMagicEffect.java
index 2e31b47e..de6debff 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IMagicEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IMagicEffect.java
@@ -1,11 +1,12 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.util.InbtSerialisable;
 
 /**
  * Interface for a magic spells
  */
-public interface IMagicEffect extends InbtSerialisable, IAligned {
+public interface IMagicEffect extends InbtSerialisable, IAffine {
 
     /**
      * Gets the name used to identify this effect.
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/IMagicals.java b/src/main/java/com/minelittlepony/unicopia/magic/IMagicals.java
new file mode 100644
index 00000000..7ac13a6a
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IMagicals.java
@@ -0,0 +1,5 @@
+package com.minelittlepony.unicopia.magic;
+
+public interface IMagicals {
+
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/ISuppressable.java b/src/main/java/com/minelittlepony/unicopia/magic/ISuppressable.java
similarity index 92%
rename from src/main/java/com/minelittlepony/unicopia/spell/ISuppressable.java
rename to src/main/java/com/minelittlepony/unicopia/magic/ISuppressable.java
index 9c40f42b..12f57da7 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/ISuppressable.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/ISuppressable.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 /**
  * Magic effects that can be suppressed by other nearby effects.
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/ITossedEffect.java b/src/main/java/com/minelittlepony/unicopia/magic/ITossedEffect.java
similarity index 55%
rename from src/main/java/com/minelittlepony/unicopia/spell/ITossedEffect.java
rename to src/main/java/com/minelittlepony/unicopia/magic/ITossedEffect.java
index 588859c4..2305fa35 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/ITossedEffect.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/ITossedEffect.java
@@ -1,17 +1,19 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntityProjectile;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.tossable.ITossable;
+import com.minelittlepony.unicopia.UItems;
+import com.minelittlepony.unicopia.entity.item.AdvancedProjectileEntity;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
+import com.minelittlepony.unicopia.projectile.ITossable;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.init.SoundEvents;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.world.World;
 
 /**
@@ -19,6 +21,7 @@ import net.minecraft.world.World;
  */
 public interface ITossedEffect extends IMagicEffect, ITossable<ICaster<?>> {
 
+    @Override
     default SoundEvent getThrowSound(ICaster<?> caster) {
         return SoundEvents.ITEM_CHORUS_FRUIT_TELEPORT;
     }
@@ -27,7 +30,7 @@ public interface ITossedEffect extends IMagicEffect, ITossable<ICaster<?>> {
      * Gets the appearance to be used when projecting this spell.
      */
     default ItemStack getCastAppearance(ICaster<?> caster) {
-        Item item = getAffinity() == SpellAffinity.BAD ? UItems.curse : UItems.spell;
+        Item item = getAffinity() == Affinity.BAD ? UItems.curse : UItems.spell;
 
         return SpellRegistry.instance().enchantStack(new ItemStack(item), getName());
     }
@@ -38,24 +41,24 @@ public interface ITossedEffect extends IMagicEffect, ITossable<ICaster<?>> {
      * Returns the resulting projectile entity for customization (or null if on the client).
      */
     @Nullable
-    default EntityProjectile toss(ICaster<?> caster) {
+    default IAdvancedProjectile toss(ICaster<?> caster) {
         World world = caster.getWorld();
 
         Entity entity = caster.getOwner();
 
-        world.playSound(null, entity.posX, entity.posY, entity.posZ, getThrowSound(caster), SoundCategory.NEUTRAL, 0.7F, 0.4F / (world.rand.nextFloat() * 0.4F + 0.8F));
+        world.playSound(null, entity.x, entity.y, entity.z, getThrowSound(caster), SoundCategory.NEUTRAL, 0.7F, 0.4F / (world.random.nextFloat() * 0.4F + 0.8F));
 
         if (caster.isLocal()) {
-            EntityProjectile projectile = new EntityProjectile(world, caster.getOwner());
+            IAdvancedProjectile projectile = new AdvancedProjectileEntity(null, world, caster.getOwner());
 
             projectile.setItem(getCastAppearance(caster));
             projectile.setThrowDamage(getThrowDamage(caster));
             projectile.setOwner(caster.getOwner());
             projectile.setEffect(this);
             projectile.setHydrophobic();
-            projectile.shoot(entity, entity.rotationPitch, entity.rotationYaw, 0, 1.5F, 1);
+            projectile.launch(entity, entity.pitch, entity.yaw, 0, 1.5F, 1);
 
-            world.spawnEntity(projectile);
+            projectile.spawn(world);
 
             return projectile;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/IUseAction.java b/src/main/java/com/minelittlepony/unicopia/magic/IUseable.java
similarity index 70%
rename from src/main/java/com/minelittlepony/unicopia/spell/IUseAction.java
rename to src/main/java/com/minelittlepony/unicopia/magic/IUseable.java
index 33642726..423f60bd 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/IUseAction.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/IUseable.java
@@ -1,19 +1,21 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic;
 
 import javax.annotation.Nullable;
 
+import com.minelittlepony.unicopia.magic.spells.SpellCastResult;
+
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 /**
  * Interface for right-click actions.
  *
  */
-public interface IUseAction {
+public interface IUseable {
 
     /**
      * Triggered when the player right clicks a block
@@ -30,7 +32,7 @@ public interface IUseAction {
      *
      * @return    ActionResult for the type of action to perform
      */
-    SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ);
+    SpellCastResult onUse(ItemStack stack, Affinity affinity, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ);
 
     /**
      * Triggered when the player right clicks
@@ -43,5 +45,5 @@ public interface IUseAction {
      *
      * @return    ActionResult for the type of action to perform
      */
-    SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity);
+    SpellCastResult onUse(ItemStack stack, Affinity affinity, PlayerEntity player, World world, @Nullable Entity hitEntity);
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/items/ICastable.java b/src/main/java/com/minelittlepony/unicopia/magic/items/ICastable.java
new file mode 100644
index 00000000..481829d6
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/magic/items/ICastable.java
@@ -0,0 +1,61 @@
+package com.minelittlepony.unicopia.magic.items;
+
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.magic.IDispenceable;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.spells.SpellCastResult;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+
+public interface ICastable extends IMagicalItem, IDispensable {
+
+    @Override
+    default ActionResult<ItemStack> dispenseStack(IBlockSource source, ItemStack stack) {
+        IDispenceable effect = SpellRegistry.instance().getDispenseActionFrom(stack);
+
+        if (effect == null) {
+            return new ActionResult<>(ActionResult.FAIL, stack);
+        }
+
+        SpellCastResult dispenceResult = onDispenseSpell(source, stack, effect);
+
+        if (dispenceResult == SpellCastResult.DEFAULT) {
+            return new ActionResult<>(ActionResult.PASS, stack);
+        }
+
+        if (dispenceResult == SpellCastResult.PLACE) {
+            castContainedSpell(source.getWorld(), source.getBlockPos(), stack, effect);
+
+            stack.shrink(1);
+        }
+
+        return new ActionResult(ActionResult.SUCCESS, stack);
+    }
+
+    SpellCastResult onDispenseSpell(BlockState source, ItemStack stack, IDispenceable effect);
+
+    SpellCastResult onCastSpell(PlayerEntity player, World world, BlockPos pos, ItemStack stack, IMagicEffect effect, Direction side, float hitX, float hitY, float hitZ);
+
+    boolean canFeed(SpellcastEntity spell, ItemStack stack);
+
+    /**
+     * Called to cast a spell. The result is an entity spawned with the spell attached.
+     */
+    default SpellcastEntity castContainedSpell(World world, BlockPos pos, ItemStack stack, IMagicEffect effect) {
+        SpellcastEntity spell = new SpellcastEntity(world);
+
+        spell.setAffinity(getAffinity(stack));
+        spell.setLocationAndAngles(pos.getX() + 0.5, pos.getY() + 0.5, pos.getZ() + 0.5, 0, 0);
+        spell.setEffect(effect);
+
+        world.spawnEntity(spell);
+
+        return spell;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/item/IDependable.java b/src/main/java/com/minelittlepony/unicopia/magic/items/IDependable.java
similarity index 50%
rename from src/main/java/com/minelittlepony/unicopia/item/IDependable.java
rename to src/main/java/com/minelittlepony/unicopia/magic/items/IDependable.java
index 9b8bca3e..0a78e184 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/IDependable.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/items/IDependable.java
@@ -1,6 +1,6 @@
-package com.minelittlepony.unicopia.item;
+package com.minelittlepony.unicopia.magic.items;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 public interface IDependable extends IMagicalItem {
     void onRemoved(IPlayer player, float needfulness);
diff --git a/src/main/java/com/minelittlepony/unicopia/item/IDispensable.java b/src/main/java/com/minelittlepony/unicopia/magic/items/IDispensable.java
similarity index 96%
rename from src/main/java/com/minelittlepony/unicopia/item/IDispensable.java
rename to src/main/java/com/minelittlepony/unicopia/magic/items/IDispensable.java
index 089e55cb..5fef0072 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/IDispensable.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/items/IDispensable.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.item;
+package com.minelittlepony.unicopia.magic.items;
 
 import net.minecraft.block.BlockDispenser;
 import net.minecraft.dispenser.BehaviorDefaultDispenseItem;
diff --git a/src/main/java/com/minelittlepony/unicopia/item/IMagicalItem.java b/src/main/java/com/minelittlepony/unicopia/magic/items/IMagicalItem.java
similarity index 66%
rename from src/main/java/com/minelittlepony/unicopia/item/IMagicalItem.java
rename to src/main/java/com/minelittlepony/unicopia/magic/items/IMagicalItem.java
index a21d634b..a46039ce 100644
--- a/src/main/java/com/minelittlepony/unicopia/item/IMagicalItem.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/items/IMagicalItem.java
@@ -1,11 +1,11 @@
-package com.minelittlepony.unicopia.item;
+package com.minelittlepony.unicopia.magic.items;
 
-import com.minelittlepony.unicopia.spell.IAligned;
-import com.minelittlepony.unicopia.spell.SpellAffinity;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IAffine;
 
 import net.minecraft.item.ItemStack;
 
-public interface IMagicalItem extends IAligned {
+public interface IMagicalItem extends IAffine {
     /**
      * If true this item serves as host to its own inner dimensional space.
      * Bag of Holding will explode if you try to store items of this kind inside of it.
@@ -18,7 +18,7 @@ public interface IMagicalItem extends IAligned {
      * Gets the affinity of this magical artifact. Either good, bad, or unaligned.
      * What this returns may have effects on the behaviour of certain spells and effects.
      */
-    default SpellAffinity getAffinity(ItemStack stack) {
+    default Affinity getAffinity(ItemStack stack) {
         return getAffinity();
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/AbstractAttachableSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractAttachableSpell.java
similarity index 50%
rename from src/main/java/com/minelittlepony/unicopia/spell/AbstractAttachableSpell.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractAttachableSpell.java
index 353c8b2d..4f840da9 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/AbstractAttachableSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractAttachableSpell.java
@@ -1,15 +1,16 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.UUID;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.magic.ICaster;
 
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
 
 public abstract class AbstractAttachableSpell extends AbstractSpell {
 
@@ -19,17 +20,17 @@ public abstract class AbstractAttachableSpell extends AbstractSpell {
     private UUID targettedEntityId;
 
     @Nullable
-    private EntitySpell targettedEntity;
+    private SpellcastEntity targettedEntity;
 
-    protected void setTarget(@Nonnull EntitySpell e) {
+    protected void setTarget(@Nonnull SpellcastEntity e) {
         searching = false;
         targettedEntity = e;
-        targettedEntityId = e.getUniqueID();
+        targettedEntityId = e.getUuid();
         setDirty(true);
     }
 
     public boolean hasTarget() {
-        if (targettedEntity != null && targettedEntity.isDead) {
+        if (targettedEntity != null && targettedEntity.removed) {
             targettedEntity = null;
             targettedEntityId = null;
             searching = true;
@@ -40,15 +41,15 @@ public abstract class AbstractAttachableSpell extends AbstractSpell {
     }
 
     @Nullable
-    protected EntitySpell getTarget(ICaster<?> source) {
+    protected SpellcastEntity getTarget(ICaster<?> source) {
         if (targettedEntity == null && targettedEntityId != null) {
-            source.getWorld().getEntities(EntitySpell.class, e -> e.getUniqueID().equals(targettedEntityId))
+            source.getWorld().getEntities(SpellcastEntity.class, e -> e.getUuid().equals(targettedEntityId))
                 .stream()
                 .findFirst()
                 .ifPresent(this::setTarget);
         }
 
-        if (targettedEntity != null && targettedEntity.isDead) {
+        if (targettedEntity != null && targettedEntity.removed) {
             targettedEntity = null;
             targettedEntityId = null;
             searching = true;
@@ -73,34 +74,34 @@ public abstract class AbstractAttachableSpell extends AbstractSpell {
     protected void searchForTarget(ICaster<?> source) {
         BlockPos origin = source.getOrigin();
 
-        source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), getSearchArea(source), e -> {
-            return e instanceof EntitySpell && canTargetEntity((EntitySpell)e);
+        source.getWorld().getEntities(source.getEntity(), getSearchArea(source), e -> {
+            return e instanceof SpellcastEntity && canTargetEntity((SpellcastEntity)e);
         }).stream()
-                .sorted((a, b) -> (int)(a.getDistanceSq(origin) - b.getDistanceSq(origin)))
+                .sorted((a, b) -> (int)(a.getBlockPos().getSquaredDistance(origin) - b.getBlockPos().getSquaredDistance(origin)))
                 .findFirst()
-                .map(EntitySpell.class::cast)
+                .map(SpellcastEntity.class::cast)
                 .ifPresent(this::setTarget);
     }
 
-    protected abstract AxisAlignedBB getSearchArea(ICaster<?> source);
+    protected abstract Box getSearchArea(ICaster<?> source);
 
-    protected abstract boolean canTargetEntity(EntitySpell e);
+    protected abstract boolean canTargetEntity(SpellcastEntity e);
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+    public void toNBT(CompoundTag compound) {
+        super.toNBT(compound);
 
         if (targettedEntityId != null) {
-            compound.setUniqueId("target", targettedEntityId);
+            compound.putUuid("target", targettedEntityId);
         }
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+    public void fromNBT(CompoundTag compound) {
+        super.fromNBT(compound);
 
-        if (compound.hasKey("target")) {
-            targettedEntityId = compound.getUniqueId("target");
+        if (compound.containsKey("target")) {
+            targettedEntityId = compound.getUuid("target");
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/AbstractSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractSpell.java
similarity index 82%
rename from src/main/java/com/minelittlepony/unicopia/spell/AbstractSpell.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractSpell.java
index e7b077ed..ac70272d 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/AbstractSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/AbstractSpell.java
@@ -1,6 +1,9 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
-import net.minecraft.nbt.NBTTagCompound;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+
+import net.minecraft.nbt.CompoundTag;
 
 public abstract class AbstractSpell implements IMagicEffect {
 
@@ -37,21 +40,23 @@ public abstract class AbstractSpell implements IMagicEffect {
         return 1;
     }
 
+    @Override
     public float getMaxExhaustion(ICaster<?> caster) {
         return 1;
     }
 
+    @Override
     public float getExhaustion(ICaster<?> caster) {
         return 0;
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        compound.setBoolean("dead", isDead);
+    public void toNBT(CompoundTag compound) {
+        compound.putBoolean("dead", isDead);
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
+    public void fromNBT(CompoundTag compound) {
         setDirty(false);
         isDead = compound.getBoolean("dead");
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/GenericSpell.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/GenericSpell.java
similarity index 65%
rename from src/main/java/com/minelittlepony/unicopia/spell/GenericSpell.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/GenericSpell.java
index b93dc4aa..b51c6f7b 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/GenericSpell.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/GenericSpell.java
@@ -1,8 +1,11 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.function.Supplier;
 
-import com.minelittlepony.unicopia.init.UParticles;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
 
 public class GenericSpell extends AbstractSpell {
 
@@ -10,13 +13,13 @@ public class GenericSpell extends AbstractSpell {
 
     private final int tint;
 
-    private final SpellAffinity affinity;
+    private final Affinity affinity;
 
-    static Supplier<IMagicEffect> factory(String name, int tint, SpellAffinity affinity) {
+    static Supplier<IMagicEffect> factory(String name, int tint, Affinity affinity) {
         return () -> new GenericSpell(name, tint, affinity);
     }
 
-    public GenericSpell(String name, int tint, SpellAffinity affinity) {
+    public GenericSpell(String name, int tint, Affinity affinity) {
         this.name = name;
         this.tint = tint;
         this.affinity = affinity;
@@ -43,7 +46,7 @@ public class GenericSpell extends AbstractSpell {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
+    public Affinity getAffinity() {
         return affinity;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellAwkward.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellAwkward.java
new file mode 100644
index 00000000..900bf464
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellAwkward.java
@@ -0,0 +1,99 @@
+package com.minelittlepony.unicopia.magic.spells;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.CasterUtils;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.ITossedEffect;
+import com.minelittlepony.unicopia.magic.IUseable;
+import com.minelittlepony.util.shape.Sphere;
+import com.mojang.brigadier.StringReader;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.particle.ParticleEffect;
+import net.minecraft.particle.ParticleType;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.world.World;
+
+public class SpellAwkward extends AbstractSpell implements ITossedEffect, IUseable {
+
+    @Override
+    public String getName() {
+        return "awkward";
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
+    }
+
+    @Override
+    public int getTint() {
+        return 0xE1239C;
+    }
+
+    @Override
+    public boolean update(ICaster<?> source) {
+        return true;
+    }
+
+    @Override
+    public void render(ICaster<?> source) {
+        source.spawnParticles(new Sphere(false, (1 + source.getCurrentLevel()) * 8), 10, pos -> {
+
+            List<Identifier> names = new ArrayList<>(Registry.PARTICLE_TYPE.getIds());
+
+            int index = (int)MathHelper.nextDouble(source.getWorld().random, 0, names.size());
+
+            @SuppressWarnings("unchecked")
+            ParticleType<ParticleEffect> type = (ParticleType<ParticleEffect>)Registry.PARTICLE_TYPE.get(names.get(index));
+
+            if (shouldSpawnParticle(type)) {
+                try {
+                    source.getWorld().addParticle(type.getParametersFactory().read(type, new StringReader("0 0 0")), pos.x, pos.y, pos.z, 0, 0, 0);
+                } catch (CommandSyntaxException e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
+    protected boolean shouldSpawnParticle(ParticleType<?> type) {
+        return type != ParticleTypes.BARRIER
+            && type != ParticleTypes.SMOKE
+            && type != ParticleTypes.EXPLOSION
+            && type != ParticleTypes.EXPLOSION_EMITTER
+            && type != ParticleTypes.AMBIENT_ENTITY_EFFECT;
+    }
+
+    @Override
+    public void onImpact(ICaster<?> caster, BlockPos pos, BlockState state) {
+        // noop
+    }
+
+    @Override
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, PlayerEntity player, World world, BlockPos pos, Direction side, float hitX, float hitY, float hitZ) {
+        return SpellCastResult.PLACE;
+    }
+
+    @Override
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, PlayerEntity player, World world, @Nullable Entity hitEntity) {
+
+        CasterUtils.toCaster(player).ifPresent(this::toss);
+
+        return SpellCastResult.NONE;
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellCastResult.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCastResult.java
similarity index 89%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellCastResult.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCastResult.java
index 65213171..429d5fa8 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellCastResult.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCastResult.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 /**
  * A type of action to perform after a spell has completed its handling.
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellChangelingTrap.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellChangelingTrap.java
similarity index 61%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellChangelingTrap.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellChangelingTrap.java
index 1a462891..99f4fd7d 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellChangelingTrap.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellChangelingTrap.java
@@ -1,27 +1,30 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.USounds;
 import com.minelittlepony.unicopia.entity.EntityCuccoon;
 import com.minelittlepony.unicopia.entity.IMagicals;
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.unicopia.init.USounds;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IAttachedEffect;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.ITossedEffect;
 import com.minelittlepony.util.WorldEvent;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
-import net.minecraft.init.MobEffects;
-import net.minecraft.init.SoundEvents;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTUtil;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.item.Items;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 
 public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect, IAttachedEffect {
@@ -57,15 +60,15 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
 
     private boolean checkStruggleCondition(ICaster<?> caster) {
         return !caster.getOrigin().equals(previousTrappedPosition)
-            || (!(caster.getOwner() instanceof EntityPlayer) && caster.getWorld().rand.nextInt(20) == 0);
+            || (!(caster.getOwner() instanceof PlayerEntity) && caster.getWorld().random.nextInt(20) == 0);
     }
 
     @Override
     public boolean updateOnPerson(ICaster<?> caster) {
-        EntityLivingBase entity = caster.getOwner();
+        LivingEntity entity = caster.getOwner();
 
-        if (entity.motionY > 0) {
-            entity.playSound(SoundEvents.BLOCK_SLIME_HIT, 1, 1);
+        if (entity.getVelocity().y > 0) {
+            entity.playSound(SoundEvents.BLOCK_SLIME_BLOCK_HIT, 1, 1);
         }
 
         BlockPos origin = caster.getOrigin();
@@ -88,7 +91,7 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
             Block block = caster.getWorld().getBlockState(origin).getBlock();
 
             if (UBlocks.slime_layer.canPlaceBlockAt(caster.getWorld(), origin)) {
-                if (caster.getWorld().isAirBlock(origin) || (block != UBlocks.slime_layer && block.isReplaceable(caster.getWorld(), origin))) {
+                if (caster.getWorld().isAir(origin) || (block != UBlocks.slime_layer && block.isReplaceable(caster.getWorld(), origin))) {
                     caster.getWorld().setBlockState(origin, UBlocks.slime_layer.getDefaultState());
                 }
             }
@@ -107,18 +110,18 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
         entity.limbSwing = 0;
         entity.prevLimbSwingAmount = 0;
 
-        entity.posX = Math.floor(entity.posX) + 0.4;
-        entity.posZ = Math.floor(entity.posZ) + 0.4;
+        entity.x = Math.floor(entity.x) + 0.4;
+        entity.z = Math.floor(entity.z) + 0.4;
 
         entity.hurtTime = 2;
-        entity.collidedHorizontally = true;
+        entity.horizontalCollision = true;
         entity.collided = true;
 
-        if (entity instanceof EntityPlayer) {
-            ((EntityPlayer)entity).capabilities.isFlying = false;
+        if (entity instanceof PlayerEntity) {
+            ((PlayerEntity)entity).abilities.flying = false;
         }
 
-        PotionEffect SLIME_REGEN = new PotionEffect(MobEffects.REGENERATION, 0);
+        StatusEffectInstance SLIME_REGEN = new StatusEffectInstance(StatusEffects.REGENERATION, 0);
 
         entity.addPotionEffect(SLIME_REGEN);
 
@@ -131,17 +134,17 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
             }
         }
 
-        return !entity.isRiding() && struggleCounter > 0;
+        return !entity.hasVehicle() && struggleCounter > 0;
     }
 
     @Override
     public boolean update(ICaster<?> source) {
-        return !source.getEntity().isRiding();
+        return !source.getEntity().hasVehicle();
     }
 
     @Override
     public void render(ICaster<?> source) {
-        source.spawnParticles(EnumParticleTypes.DRIP_LAVA.getParticleID(), 1);
+        source.spawnParticles(ParticleTypes.DRIPPING_LAVA, 1);
     }
 
     @Override
@@ -150,8 +153,8 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
+    public Affinity getAffinity() {
+        return Affinity.BAD;
     }
 
     public void enforce(ICaster<?> caster) {
@@ -182,40 +185,39 @@ public class SpellChangelingTrap extends AbstractSpell implements ITossedEffect,
 
     protected boolean canAffect(Entity e) {
         return !(e instanceof IMagicals)
-            && e instanceof EntityLivingBase
-            && !e.isRiding();
+            && e instanceof LivingEntity
+            && !e.hasVehicle();
     }
 
     @Override
-    public void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state) {
+    public void onImpact(ICaster<?> caster, BlockPos pos, BlockState state) {
         if (caster.isLocal()) {
             caster.findAllEntitiesInRange(5)
                 .filter(this::canAffect)
-                .map(e -> PlayerSpeciesList.instance().getCaster((EntityLivingBase)e))
+                .map(e -> SpeciesList.instance().getCaster((LivingEntity)e))
                 .forEach(this::entrap);
         }
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+    public void toNBT(CompoundTag compound) {
+        super.toNBT(compound);
 
         if (previousTrappedPosition != null) {
-            compound.setTag("previousTrappedPosition", NBTUtil.createPosTag(previousTrappedPosition));
+            compound.put("previousTrappedPosition", NBTUtils.createPosTag(previousTrappedPosition));
         }
-        compound.setInteger("struggle", struggleCounter);
+        compound.putInt("struggle", struggleCounter);
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+    public void fromNBT(CompoundTag compound) {
+        super.fromNBT(compound);
 
-        struggleCounter = compound.getInteger("struggle");
+        previousTrappedPosition = null;
+        struggleCounter = compound.getInt("struggle");
 
-        if (compound.hasKey("previousTrappedPosition")) {
-            previousTrappedPosition = NBTUtil.getPosFromTag(compound.getCompoundTag("previousTrappedPosition"));
-        } else {
-            previousTrappedPosition = null;
+        if (compound.containsKey("previousTrappedPosition")) {
+            previousTrappedPosition = NBTUtil.getPosFromTag(compound.getCompound("previousTrappedPosition"));
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCharge.java
similarity index 62%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCharge.java
index 2008750f..253b88c3 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellCharge.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellCharge.java
@@ -1,17 +1,18 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Line;
 
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 
 public class SpellCharge extends AbstractAttachableSpell {
 
-    private static final AxisAlignedBB searchArea = new AxisAlignedBB(-15, -15, -15, 15, 15, 15);
+    private static final Box searchArea = new Box(-15, -15, -15, 15, 15, 15);
 
     @Override
     public String getName() {
@@ -19,8 +20,8 @@ public class SpellCharge extends AbstractAttachableSpell {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
     @Override
@@ -29,19 +30,19 @@ public class SpellCharge extends AbstractAttachableSpell {
     }
 
     @Override
-    protected boolean canTargetEntity(EntitySpell e) {
+    protected boolean canTargetEntity(SpellcastEntity e) {
         return e.hasEffect();
     }
 
     @Override
-    protected AxisAlignedBB getSearchArea(ICaster<?> source) {
+    protected Box getSearchArea(ICaster<?> source) {
         return searchArea.offset(source.getOriginVector());
     }
 
     @Override
     public void render(ICaster<?> source) {
         if (source.getWorld().rand.nextInt(4 + source.getCurrentLevel() * 4) == 0) {
-            EntitySpell target = getTarget(source);
+            SpellcastEntity target = getTarget(source);
 
             if (target != null) {
                 Vec3d start = source.getEntity().getPositionVector();
@@ -49,7 +50,7 @@ public class SpellCharge extends AbstractAttachableSpell {
                 IShape line = new Line(start, target.getPositionVector());
 
                 source.spawnParticles(line, (int)line.getVolumeOfSpawnableSpace(), pos -> {
-                    Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos.add(start), 0, 0, 0, getTint());
+                    ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos.add(start), 0, 0, 0, getTint());
                 });
             }
 
@@ -61,7 +62,7 @@ public class SpellCharge extends AbstractAttachableSpell {
         super.update(source);
 
         if (!searching) {
-            EntitySpell target = getTarget(source);
+            SpellcastEntity target = getTarget(source);
 
             if (target != null && !target.overLevelCap() && source.getCurrentLevel() > 0) {
                 source.addLevels(-1);
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDarkness.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDarkness.java
similarity index 53%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellDarkness.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDarkness.java
index fa394f5f..9d7c47be 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDarkness.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDarkness.java
@@ -1,34 +1,38 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.Random;
 import java.util.function.Consumer;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.CasterUtils;
+import com.minelittlepony.unicopia.magic.ICaster;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.PosHelper;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
 
-import net.minecraft.block.IGrowable;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.CactusBlock;
+import net.minecraft.block.Fertilizable;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.ai.EntityAIAvoidEntity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.MobEffects;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.ai.goal.FleeEntityGoal;
+import net.minecraft.entity.effect.StatusEffectInstance;
+import net.minecraft.entity.effect.StatusEffects;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
 
 public class SpellDarkness extends AbstractAttachableSpell {
 
-    private static final AxisAlignedBB searchArea = new AxisAlignedBB(-5, -5, -5, 5, 5, 5);
+    private static final Box searchArea = new Box(-5, -5, -5, 5, 5, 5);
 
     final SoundEvent[] scarySounds = new SoundEvent[] {
             SoundEvents.AMBIENT_CAVE,
@@ -37,8 +41,8 @@ public class SpellDarkness extends AbstractAttachableSpell {
             SoundEvents.ENTITY_GHAST_AMBIENT,
             SoundEvents.ENTITY_SKELETON_AMBIENT,
             SoundEvents.ENTITY_SKELETON_SHOOT,
-            SoundEvents.ENTITY_ENDERDRAGON_GROWL,
-            SoundEvents.ENTITY_ENDERMEN_SCREAM,
+            SoundEvents.ENTITY_ENDER_DRAGON_GROWL,
+            SoundEvents.ENTITY_ENDERMAN_SCREAM,
             SoundEvents.ENTITY_ZOMBIE_VILLAGER_AMBIENT
     };
 
@@ -59,12 +63,11 @@ public class SpellDarkness extends AbstractAttachableSpell {
 
     @Override
     public void onPlaced(ICaster<?> caster) {
-        if (caster.getEntity() instanceof EntitySpell) {
-            EntitySpell living = (EntitySpell)caster.getEntity();
+        if (caster.getEntity() instanceof SpellcastEntity) {
+            SpellcastEntity living = (SpellcastEntity)caster.getEntity();
 
-            living.tasks.addTask(1, new EntityAIAvoidEntity<>(living, EntityPlayer.class, 3, 4, 4));
-
-            living.setPosition(living.posX, living.posY, living.posZ);
+            living.getGoals().add(1, new FleeEntityGoal<>(living, PlayerEntity.class, 3, 4, 4));
+            living.setPosition(living.x, living.y, living.z);
         }
     }
 
@@ -79,7 +82,7 @@ public class SpellDarkness extends AbstractAttachableSpell {
         if (hasTarget()) {
             soundChance *= 10;
 
-            source.getEntity().motionY -= 0.01;
+            source.getEntity().getVelocity().y -= 0.01;
 
             applyBlocks(source, radius);
             applyEntities(source, radius, e -> applyLight(source, e));
@@ -87,10 +90,10 @@ public class SpellDarkness extends AbstractAttachableSpell {
             applyEntities(source, radius, e -> applyDark(source, e));
         }
 
-        if (source.getWorld().rand.nextInt(soundChance) == 0) {
+        if (source.getWorld().random.nextInt(soundChance) == 0) {
             source.getWorld().playSound(null, source.getOrigin(),
-                    getSoundEffect(source.getWorld().rand), SoundCategory.AMBIENT,
-                    0.2F + source.getWorld().rand.nextFloat(), 0.3F);
+                    getSoundEffect(source.getWorld().random), SoundCategory.AMBIENT,
+                    0.2F + source.getWorld().random.nextFloat(), 0.3F);
         }
 
 
@@ -99,14 +102,14 @@ public class SpellDarkness extends AbstractAttachableSpell {
 
     private void applyBlocks(ICaster<?> source, int radius) {
         for (BlockPos pos : PosHelper.getAllInRegionMutable(source.getOrigin(), new Sphere(false, radius))) {
-            if (source.getWorld().rand.nextInt(500) == 0) {
-                IBlockState state = source.getWorld().getBlockState(pos);
+            if (source.getWorld().random.nextInt(500) == 0) {
+                BlockState state = source.getWorld().getBlockState(pos);
 
-                if (state.getBlock() instanceof IGrowable) {
-                    IGrowable growable = (IGrowable)state.getBlock();
+                if (state.getBlock() instanceof Fertilizable) {
+                    Fertilizable growable = (Fertilizable)state.getBlock();
 
-                    if (growable.canGrow(source.getWorld(), pos, state, source.getWorld().isRemote)) {
-                        growable.grow(source.getWorld(), source.getWorld().rand, pos, state);
+                    if (growable.canGrow(source.getWorld(), source.getWorld().random, pos, state)) {
+                        growable.grow(source.getWorld(), source.getWorld().random, pos, state);
 
                         return;
                     }
@@ -115,46 +118,46 @@ public class SpellDarkness extends AbstractAttachableSpell {
         }
     }
 
-    private void applyEntities(ICaster<?> source, int radius, Consumer<EntityLivingBase> consumer) {
+    private void applyEntities(ICaster<?> source, int radius, Consumer<LivingEntity> consumer) {
         source.findAllEntitiesInRange(radius * 1.5F)
-                .filter(e -> e instanceof EntityLivingBase)
-                .map(EntityLivingBase.class::cast)
-                .forEach(consumer);;
+                .filter(e -> e instanceof LivingEntity)
+                .map(LivingEntity.class::cast)
+                .forEach(consumer);
     }
 
-    private void applyLight(ICaster<?> source, EntityLivingBase entity) {
-        if (entity.getHealth() < entity.getMaxHealth()) {
+    private void applyLight(ICaster<?> source, LivingEntity entity) {
+        if (entity.getHealth() < entity.getHealthMaximum()) {
             entity.heal(1);
         }
     }
 
-    private void applyDark(ICaster<?> source, EntityLivingBase entity) {
+    private void applyDark(ICaster<?> source, LivingEntity entity) {
 
-        if (isAreaOccupied(source, entity.getPositionVector())) {
+        if (isAreaOccupied(source, entity.getPosVector())) {
             return;
         }
 
         if (!isLightholder(entity)) {
-            entity.addPotionEffect(new PotionEffect(MobEffects.BLINDNESS, 100, 3));
+            entity.addPotionEffect(new StatusEffectInstance(StatusEffects.BLINDNESS, 100, 3));
 
             Vec3d origin = source.getOriginVector();
-            Vec3d to = entity.getPositionVector();
-            double distance = origin.distanceTo(entity.getPositionVector());
+            Vec3d to = entity.getPosVector();
+            double distance = origin.distanceTo(entity.getPosVector());
 
-            if (entity.world.rand.nextInt(30) == 0) {
-                double appliedForce = distance / 10 + entity.world.rand.nextInt(3);
-                Vec3d force = origin.subtract(to).normalize().scale(appliedForce);
+            if (entity.world.random.nextInt(30) == 0) {
+                double appliedForce = distance / 10 + entity.world.random.nextInt(3);
+                Vec3d force = origin.subtract(to).normalize().multiply(appliedForce);
 
                 entity.addVelocity(force.x, force.y, force.z);
             }
 
-            if (distance < 3 && entity.world.rand.nextInt(30) == 0) {
-                entity.attackEntityFrom(MagicalDamageSource.create("darkness"), 3);
+            if (distance < 3 && entity.world.random.nextInt(30) == 0) {
+                entity.damage(MagicalDamageSource.create("darkness"), 3);
             }
 
         } else {
-            if (entity.isPotionActive(MobEffects.BLINDNESS)) {
-                entity.removeActivePotionEffect(MobEffects.BLINDNESS);
+            if (entity.hasStatusEffect(StatusEffects.BLINDNESS)) {
+                entity.removePotionEffect(StatusEffects.BLINDNESS);
             }
         }
     }
@@ -162,7 +165,7 @@ public class SpellDarkness extends AbstractAttachableSpell {
     public SoundEvent getSoundEffect(Random rand) {
 
         if (hasTarget()) {
-            return SoundEvents.BLOCK_NOTE_CHIME;
+            return SoundEvents.BLOCK_NOTE_BLOCK_CHIME;
         }
 
         return scarySounds[rand.nextInt(scarySounds.length)];
@@ -187,22 +190,22 @@ public class SpellDarkness extends AbstractAttachableSpell {
         });
 
         source.findAllEntitiesInRange(radius * 1.5F).filter(this::isLightholder).forEach(e -> {
-            Vec3d pos = shape.computePoint(source.getWorld().rand).add(e.getPositionEyes(1));
+            Vec3d pos = shape.computePoint(source.getWorld().random).add(e.getPosVector().add(0, e.getEyeHeight(e.getPose()), 0));
 
             spawnSphere(source, pos, 0xFFFFFF, 1);
         });
     }
 
     public boolean isLightholder(Entity e) {
-        if (e instanceof EntitySpell) {
+        if (e instanceof SpellcastEntity) {
             return true;
         }
 
-        return e instanceof EntityLivingBase && CasterUtils.isHoldingEffect("light", (EntityLivingBase)e);
+        return e instanceof LivingEntity && CasterUtils.isHoldingEffect("light", e);
     }
 
     public boolean isAreaOccupied(ICaster<?> source, Vec3d pos) {
-        if (source.getWorld().isAirBlock(new BlockPos(pos).down())) {
+        if (source.getWorld().isAir(new BlockPos(pos).down())) {
             return source.findAllSpells().anyMatch(spell -> {
                 SpellShield effect = spell.getEffect(SpellShield.class, false);
 
@@ -227,25 +230,25 @@ public class SpellDarkness extends AbstractAttachableSpell {
         float particleSpeed = hasTarget() ? 0.3F : 0.5F;
 
         if (size > 0) {
-            double vX = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed;
-            double vZ = (source.getWorld().rand.nextFloat() - 0.5) * particleSpeed;
+            double vX = (source.getWorld().random.nextFloat() - 0.5) * particleSpeed;
+            double vZ = (source.getWorld().random.nextFloat() - 0.5) * particleSpeed;
 
-            Particles.instance().spawnParticle(UParticles.SPHERE, true, pos, vX, 0, vZ, (int)(size * 1000), tint, 30);
+            ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.SPHERE, true, pos, vX, 0, vZ, (int)(size * 1000), tint, 30);
         }
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
+    public Affinity getAffinity() {
+        return Affinity.BAD;
     }
 
     @Override
-    protected AxisAlignedBB getSearchArea(ICaster<?> source) {
+    protected Box getSearchArea(ICaster<?> source) {
         return searchArea.offset(source.getOriginVector());
     }
 
     @Override
-    protected boolean canTargetEntity(EntitySpell e) {
+    protected boolean canTargetEntity(SpellcastEntity e) {
         return e.hasEffect() && "light".equals(e.getEffect().getName());
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDisguise.java
similarity index 52%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDisguise.java
index e67f40d6..4aef3a90 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDisguise.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDisguise.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.UUID;
 
@@ -6,41 +6,44 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.init.UParticles;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.ability.IFlyingPredicate;
+import com.minelittlepony.unicopia.ability.IHeightPredicate;
+import com.minelittlepony.unicopia.entity.IOwned;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.CasterUtils;
+import com.minelittlepony.unicopia.magic.IAttachedEffect;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.ISuppressable;
 import com.minelittlepony.unicopia.mixin.MixinEntity;
-import com.minelittlepony.unicopia.player.IFlyingPredicate;
-import com.minelittlepony.unicopia.player.IOwned;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.IPlayerHeightPredicate;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.util.ProjectileUtil;
+import com.minelittlepony.unicopia.projectile.ProjectileUtil;
 import com.mojang.authlib.GameProfile;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityFlying;
-import net.minecraft.entity.EntityHanging;
-import net.minecraft.entity.EntityList;
-import net.minecraft.entity.EntityLiving;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.IRangedAttackMob;
-import net.minecraft.entity.boss.EntityDragon;
-import net.minecraft.entity.item.EntityFallingBlock;
-import net.minecraft.entity.item.EntityMinecart;
-import net.minecraft.entity.monster.EntityShulker;
-import net.minecraft.entity.monster.EntityVex;
-import net.minecraft.entity.passive.EntityAmbientCreature;
-import net.minecraft.entity.passive.EntityTameable;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityShulkerBullet;
-import net.minecraft.inventory.EntityEquipmentSlot;
-import net.minecraft.item.EnumAction;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.EquipmentSlot;
+import net.minecraft.entity.FallingBlockEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.boss.dragon.EnderDragonEntity;
+import net.minecraft.entity.decoration.AbstractDecorationEntity;
+import net.minecraft.entity.mob.AmbientEntity;
+import net.minecraft.entity.mob.FlyingEntity;
+import net.minecraft.entity.mob.ShulkerEntity;
+import net.minecraft.entity.mob.VexEntity;
+import net.minecraft.entity.passive.TameableEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.projectile.ShulkerBulletEntity;
+import net.minecraft.entity.vehicle.MinecartEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.tileentity.TileEntitySkull;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.util.UseAction;
 import net.minecraft.util.math.MathHelper;
 
-public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISuppressable, IFlyingPredicate, IPlayerHeightPredicate {
+public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISuppressable, IFlyingPredicate, IHeightPredicate {
 
     @Nonnull
     private String entityId = "";
@@ -49,7 +52,7 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
     private Entity entity;
 
     @Nullable
-    private NBTTagCompound entityNbt;
+    private CompoundTag entityNbt;
 
     private int suppressionCounter;
 
@@ -64,8 +67,8 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
+    public Affinity getAffinity() {
+        return Affinity.BAD;
     }
 
     @Override
@@ -114,36 +117,40 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
     protected void removeDisguise() {
         if (entity != null) {
-            entity.setDead();
+            entity.remove();
             entity = null;
         }
     }
 
-    protected NBTTagCompound encodeEntityToNBT(Entity entity) {
-        NBTTagCompound entityNbt = new NBTTagCompound();
+    protected CompoundTag encodeEntityToNBT(Entity entity) {
+        CompoundTag entityNbt = new CompoundTag();
 
-        if (entity instanceof EntityPlayer) {
-            GameProfile profile = ((EntityPlayer)entity).getGameProfile();
+        if (entity instanceof PlayerEntity) {
+            GameProfile profile = ((PlayerEntity)entity).getGameProfile();
 
-            entityNbt.setString("id", "player");
-            entityNbt.setUniqueId("playerId", profile.getId());
-            entityNbt.setString("playerName", profile.getName());
-            entityNbt.setTag("playerNbt", entity.writeToNBT(new NBTTagCompound()));
+            entityNbt.putString("id", "player");
+            entityNbt.putUuid("playerId", profile.getId());
+            entityNbt.putString("playerName", profile.getName());
+
+            CompoundTag tag = new CompoundTag();
+
+            entity.saveToTag(tag);
+
+            entityNbt.put("playerNbt", tag);
         } else {
-            entityNbt = entity.writeToNBT(entityNbt);
-            entityNbt.setString("id", EntityList.getKey(entity).toString());
+            entity.saveToTag(entityNbt);
         }
 
         return entityNbt;
     }
 
-    protected synchronized void createPlayer(NBTTagCompound nbt, GameProfile profile, ICaster<?> source) {
+    protected synchronized void createPlayer(CompoundTag nbt, GameProfile profile, ICaster<?> source) {
         removeDisguise();
 
         entity = UClient.instance().createPlayer(source.getEntity(), profile);
-        entity.setCustomNameTag(source.getOwner().getName());
-        ((EntityPlayer)entity).readFromNBT(nbt.getCompoundTag("playerNbt"));
-        entity.setUniqueId(UUID.randomUUID());
+        entity.setCustomName(source.getOwner().getName());
+        ((PlayerEntity)entity).fromTag(nbt.getCompound("playerNbt"));
+        entity.setUuid(UUID.randomUUID());
         entity.extinguish();
 
         onEntityLoaded(source);
@@ -151,21 +158,24 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
     protected void checkAndCreateDisguiseEntity(ICaster<?> source) {
         if (entity == null && entityNbt != null) {
-            NBTTagCompound nbt = entityNbt;
+            CompoundTag nbt = entityNbt;
             entityNbt = null;
 
             if ("player".equals(entityId)) {
                 createPlayer(nbt, new GameProfile(
-                        nbt.getUniqueId("playerId"),
+                        nbt.getUuid("playerId"),
                         nbt.getString("playerName")
                     ), source);
-                new Thread(() -> createPlayer(nbt, TileEntitySkull.updateGameProfile(new GameProfile(
+                new Thread(() -> createPlayer(nbt, SkullBlockEntity.updateGameProfile(new GameProfile(
                     null,
                     nbt.getString("playerName")
                 )), source)).start();
             } else {
-                entity = EntityList.createEntityFromNBT(nbt, source.getWorld());
-                entity.extinguish();
+                entity = EntityType.loadEntityWithPassengers(nbt, source.getWorld(), e -> {
+                    e.extinguish();
+
+                    return e;
+                });
             }
 
             onEntityLoaded(source);
@@ -179,64 +189,62 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
         CasterUtils.toCaster(entity).ifPresent(c -> c.setEffect(null));
 
-        if (source.getWorld().isRemote) {
+        if (source.isClient()) {
             source.getWorld().spawnEntity(entity);
         }
     }
 
-    protected void copyBaseAttributes(EntityLivingBase from, Entity to) {
+    protected void copyBaseAttributes(LivingEntity from, Entity to) {
 
         // Set first because position calculations rely on it
-        to.isDead = from.isDead;
+        to.removed = from.removed;
         to.onGround = from.onGround;
 
         if (isAttachedEntity(entity)) {
-            to.posX = Math.floor(from.posX) + 0.5;
-            to.posY = Math.floor(from.posY);
-            to.posZ = Math.floor(from.posZ) + 0.5;
+            to.x = Math.floor(from.x) + 0.5;
+            to.y = Math.floor(from.y);
+            to.z = Math.floor(from.z) + 0.5;
 
-            to.lastTickPosX = to.posX;
-            to.lastTickPosY = to.posY;
-            to.lastTickPosZ = to.posZ;
+            to.prevX = to.x;
+            to.prevY = to.y;
+            to.prevZ = to.z;
 
-            to.prevPosX = to.posX;
-            to.prevPosY = to.posY;
-            to.prevPosZ = to.posZ;
+            to.prevRenderX = to.x;
+            to.prevRenderY = to.x;
+            to.prevRenderZ = to.x;
 
-            to.setPosition(to.posX, to.posY, to.posZ);
+            to.setPosition(to.x, to.y, to.z);
         } else {
-            to.copyLocationAndAnglesFrom(from);
+            to.copyPositionAndRotation(from);
 
-            to.lastTickPosX = from.lastTickPosX;
-            to.lastTickPosY = from.lastTickPosY;
-            to.lastTickPosZ = from.lastTickPosZ;
+            to.prevX = from.prevX;
+            to.prevY = from.prevY;
+            to.prevZ = from.prevZ;
 
-            to.prevPosX = from.prevPosX;
-            to.prevPosY = from.prevPosY;
-            to.prevPosZ = from.prevPosZ;
+            to.prevRenderX = from.prevRenderX;
+            to.prevRenderY = from.prevRenderY;
+            to.prevRenderZ = from.prevRenderZ;
         }
 
-        if (to instanceof EntityPlayer) {
-            EntityPlayer l = (EntityPlayer)to;
+        if (to instanceof PlayerEntity) {
+            PlayerEntity l = (PlayerEntity)to;
 
-            l.chasingPosX = l.posX;
-            l.chasingPosY = l.posY;
-            l.chasingPosZ = l.posZ;
+            l.field_7500 = l.x;
+            l.field_7521 = l.y;
+            l.field_7499 = l.z;
         }
 
-        to.motionX = from.motionX;
-        to.motionY = from.motionY;
-        to.motionZ = from.motionZ;
+        to.setVelocity(from.getVelocity());
 
-        to.prevRotationPitch = from.prevRotationPitch;
-        to.prevRotationYaw = from.prevRotationYaw;
+        to.prevPitch = from.prevPitch;
+        to.prevYaw = from.prevYaw;
 
         to.distanceWalkedOnStepModified = from.distanceWalkedOnStepModified;
         to.distanceWalkedModified = from.distanceWalkedModified;
         to.prevDistanceWalkedModified = from.prevDistanceWalkedModified;
 
-        if (to instanceof EntityLivingBase) {
-            EntityLivingBase l = (EntityLivingBase)to;
+        if (to instanceof LivingEntity) {
+            LivingEntity l = (LivingEntity)to;
 
             l.rotationYawHead = from.rotationYawHead;
             l.prevRotationYawHead = from.prevRotationYawHead;
@@ -256,11 +264,11 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
             l.deathTime = from.deathTime;
             l.setHealth(from.getHealth());
 
-            for (EntityEquipmentSlot i : EntityEquipmentSlot.values()) {
-                ItemStack neu = from.getItemStackFromSlot(i);
-                ItemStack old = l.getItemStackFromSlot(i);
+            for (EquipmentSlot i : EquipmentSlot.values()) {
+                ItemStack neu = from.getEquippedStack(i);
+                ItemStack old = l.getEquippedStack(i);
                 if (old != neu) {
-                    l.setItemStackToSlot(i, neu);
+                    l.setEquippedStack(i, neu);
                 }
             }
         }
@@ -268,19 +276,19 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
         if (to instanceof IRangedAttackMob) {
             ItemStack activeItem = from.getActiveItemStack();
 
-            ((IRangedAttackMob)to).setSwingingArms(!activeItem.isEmpty() && activeItem.getItemUseAction() == EnumAction.BOW);
+            ((IRangedAttackMob)to).setSwingingArms(!activeItem.isEmpty() && activeItem.getUseAction() == UseAction.BOW);
         }
 
-        if (to instanceof EntityTameable) {
-            ((EntityTameable)to).setSitting(from.isSneaking());
+        if (to instanceof TameableEntity) {
+            ((TameableEntity)to).setSitting(from.isSneaking());
         }
 
-        if (from.ticksExisted < 100 || from instanceof EntityPlayer && ((EntityPlayer)from).isCreative()) {
+        if (from.age < 100 || from instanceof PlayerEntity && ((PlayerEntity)from).isCreative()) {
             to.extinguish();
         }
 
-        if (to.isBurning()) {
-            from.setFire(1);
+        if (to.isOnFire()) {
+            from.setOnFireFor(1);
         } else {
             from.extinguish();
         }
@@ -296,7 +304,7 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
     @SuppressWarnings("unchecked")
     @Override
     public boolean update(ICaster<?> source) {
-        EntityLivingBase owner = source.getOwner();
+        LivingEntity owner = source.getOwner();
 
         if (getSuppressed()) {
             suppressionCounter--;
@@ -308,7 +316,7 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
             if (entity != null) {
                 entity.setInvisible(true);
-                entity.posY = Integer.MIN_VALUE;
+                entity.y = Integer.MIN_VALUE;
             }
 
             return true;
@@ -334,8 +342,8 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
         entity.getEntityData().setBoolean("disguise", true);
 
-        if (entity instanceof EntityLiving) {
-            ((EntityLiving)entity).setNoAI(true);
+        if (entity instanceof LivingEntity) {
+            ((LivingEntity)entity).setNoAI(true);
         }
 
         entity.setInvisible(false);
@@ -344,19 +352,19 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
         copyBaseAttributes(owner, entity);
 
         if (!skipsUpdate(entity)) {
-            entity.onUpdate();
+            entity.tick();
         }
 
-        if (entity instanceof EntityShulker) {
-            EntityShulker shulker = ((EntityShulker)entity);
+        if (entity instanceof ShulkerEntity) {
+            ShulkerEntity shulker = ((ShulkerEntity)entity);
 
-            shulker.rotationYaw = 0;
+            shulker.yaw = 0;
             shulker.renderYawOffset = 0;
             shulker.prevRenderYawOffset = 0;
 
             shulker.setAttachmentPos(null);
 
-            if (source.getWorld().isRemote && source instanceof IPlayer) {
+            if (source.isClient() && source instanceof IPlayer) {
                 IPlayer player = (IPlayer)source;
 
 
@@ -370,13 +378,13 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
 
                 peekAmount = player.getInterpolator().interpolate("peek", peekAmount, 5);
 
-                MixinEntity.Shulker.setPeek(shulker, peekAmount);
+                shulker.setPeekAmount(peekAmount);
             }
         }
 
-        if (entity instanceof EntityMinecart) {
-            entity.rotationYaw += 90;
-            entity.rotationPitch = 0;
+        if (entity instanceof MinecartEntity) {
+            entity.yaw += 90;
+            entity.pitch = 0;
         }
 
         if (source instanceof IPlayer) {
@@ -389,19 +397,19 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
                 IOwned.cast(entity).setOwner(player.getOwner());
             }
 
-            if (entity instanceof EntityPlayer) {
-                entity.getDataManager().set(MixinEntity.Player.getModelFlag(), owner.getDataManager().get(MixinEntity.Player.getModelFlag()));
+            if (entity instanceof PlayerEntity) {
+                entity.getDataTracker().set(MixinEntity.Player.getModelFlag(), owner.getDataTracker().get(MixinEntity.Player.getModelFlag()));
             }
 
             if (player.isClientPlayer() && UClient.instance().getViewMode() == 0) {
                 entity.setInvisible(true);
-                entity.posY = Integer.MIN_VALUE;
+                entity.y = Integer.MIN_VALUE;
             }
 
-            return player.getPlayerSpecies() == Race.CHANGELING;
+            return player.getSpecies() == Race.CHANGELING;
         }
 
-        return !source.getOwner().isDead;
+        return !source.getOwner().removed;
     }
 
     @Override
@@ -415,30 +423,30 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
         if (getSuppressed()) {
             source.spawnParticles(UParticles.UNICORN_MAGIC, 5);
             source.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
-        } else if (source.getWorld().rand.nextInt(30) == 0) {
+        } else if (source.getWorld().random.nextInt(30) == 0) {
             source.spawnParticles(UParticles.CHANGELING_MAGIC, 2);
         }
     }
 
     @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+    public void toNBT(CompoundTag compound) {
+        super.toNBT(compound);
 
-        compound.setInteger("suppressionCounter", suppressionCounter);
-        compound.setString("entityId", entityId);
+        compound.putInt("suppressionCounter", suppressionCounter);
+        compound.putString("entityId", entityId);
 
         if (entityNbt != null) {
-            compound.setTag("entity", entityNbt);
+            compound.put("entity", entityNbt);
         } else if (entity != null) {
-            compound.setTag("entity", encodeEntityToNBT(entity));
+            compound.put("entity", encodeEntityToNBT(entity));
         }
     }
 
     @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+    public void fromNBT(CompoundTag compound) {
+        super.fromNBT(compound);
 
-        suppressionCounter = compound.getInteger("suppressionCounter");
+        suppressionCounter = compound.getInt("suppressionCounter");
 
         String newId = compound.getString("entityId");
 
@@ -447,45 +455,44 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
             removeDisguise();
         }
 
-        if (compound.hasKey("entity")) {
+        if (compound.containsKey("entity")) {
             entityId = newId;
 
-            entityNbt = compound.getCompoundTag("entity");
+            entityNbt = compound.getCompound("entity");
 
             if (entity != null) {
-                entity.readFromNBT(entityNbt);
+                entity.fromTag(entityNbt);
             }
         }
     }
 
     @Override
     public boolean checkCanFly(IPlayer player) {
-        if (entity == null || !player.getPlayerSpecies().canFly()) {
+        if (entity == null || !player.getSpecies().canFly()) {
             return false;
         }
 
         if (entity instanceof IOwned) {
-            IPlayer iplayer = PlayerSpeciesList.instance().getPlayer(IOwned.<EntityPlayer>cast(entity).getOwner());
+            IPlayer iplayer = SpeciesList.instance().getPlayer(((IOwned<PlayerEntity>)entity).getOwner());
 
-            return iplayer != null && iplayer.getPlayerSpecies().canFly();
+            return iplayer != null && iplayer.getSpecies().canFly();
         }
 
-        return entity instanceof EntityFlying
-                || entity instanceof net.minecraft.entity.passive.EntityFlying
-                || entity instanceof EntityDragon
-                || entity instanceof EntityVex
-                || entity instanceof EntityAmbientCreature
-                || entity instanceof EntityShulkerBullet
+        return entity instanceof FlyingEntity
+                || entity instanceof AmbientEntity
+                || entity instanceof EnderDragonEntity
+                || entity instanceof VexEntity
+                || entity instanceof ShulkerBulletEntity
                 || ProjectileUtil.isProjectile(entity);
     }
 
     @Override
     public float getTargetEyeHeight(IPlayer player) {
         if (entity != null && !getSuppressed()) {
-            if (entity instanceof EntityFallingBlock) {
+            if (entity instanceof FallingBlockEntity) {
                 return 0.5F;
             }
-            return entity.getEyeHeight();
+            return entity.getStandingEyeHeight();
         }
         return -1;
     }
@@ -493,23 +500,23 @@ public class SpellDisguise extends AbstractSpell implements IAttachedEffect, ISu
     @Override
     public float getTargetBodyHeight(IPlayer player) {
         if (entity != null && !getSuppressed()) {
-            if (entity instanceof EntityFallingBlock) {
+            if (entity instanceof FallingBlockEntity) {
                 return 0.9F;
             }
-            return entity.height - 0.1F;
+            return entity.getHeight() - 0.1F;
         }
         return -1;
     }
 
     public static boolean skipsUpdate(Entity entity) {
-        return entity instanceof EntityFallingBlock
-            || entity instanceof EntityHanging
-            || entity instanceof EntityPlayer;
+        return entity instanceof FallingBlockEntity
+            || entity instanceof AbstractDecorationEntity
+            || entity instanceof PlayerEntity;
     }
 
     public static boolean isAttachedEntity(Entity entity) {
-        return entity instanceof EntityShulker
-            || entity instanceof EntityHanging
-            || entity instanceof EntityFallingBlock;
+        return entity instanceof ShulkerEntity
+            || entity instanceof AbstractDecorationEntity
+            || entity instanceof FallingBlockEntity;
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDrake.java
similarity index 70%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDrake.java
index 9ca8613b..a3d9c6cb 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellDrake.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellDrake.java
@@ -1,18 +1,21 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.entity.ai.EntityAIFollowCaster;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
+import com.minelittlepony.unicopia.entity.ai.FollowCasterGoal;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
 
 import net.minecraft.entity.ai.EntityAISwimming;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.pathfinding.PathNavigateGround;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 
 public class SpellDrake extends AbstractSpell {
 
-    private static final AxisAlignedBB EFFECT_BOUNDS = new AxisAlignedBB(-2, -2, -2, 2, 2, 2);
+    private static final Box EFFECT_BOUNDS = new Box(-2, -2, -2, 2, 2, 2);
 
     @Nullable
     private IMagicEffect piggyBackSpell;
@@ -23,8 +26,8 @@ public class SpellDrake extends AbstractSpell {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
     @Override
@@ -57,12 +60,12 @@ public class SpellDrake extends AbstractSpell {
 
     @Override
     public void onPlaced(ICaster<?> caster) {
-        if (caster.getEntity() instanceof EntitySpell) {
-            EntitySpell living = (EntitySpell)caster.getEntity();
+        if (caster.getEntity() instanceof SpellcastEntity) {
+            SpellcastEntity living = (SpellcastEntity)caster.getEntity();
 
             ((PathNavigateGround)living.getNavigator()).setCanSwim(false);
             living.tasks.addTask(1, new EntityAISwimming(living));
-            living.tasks.addTask(2, new EntityAIFollowCaster<>(caster, 1, 4, 70));
+            living.tasks.addTask(2, new FollowCasterGoal<>(caster, 1, 4, 70));
 
             living.setPosition(living.posX, living.posY, living.posZ);
         }
@@ -71,10 +74,10 @@ public class SpellDrake extends AbstractSpell {
     @Override
     public boolean update(ICaster<?> source) {
         if (piggyBackSpell == null) {
-            AxisAlignedBB bb = EFFECT_BOUNDS.offset(source.getOriginVector());
+            Box bb = EFFECT_BOUNDS.offset(source.getOriginVector());
 
-            source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e -> e instanceof EntitySpell).stream()
-                .map(i -> (EntitySpell)i)
+            source.getWorld().getEntitiesInAABBexcluding(source.getEntity(), bb, e -> e instanceof SpellcastEntity).stream()
+                .map(i -> (SpellcastEntity)i)
                 .filter(i -> i.hasEffect() && !(i.getEffect() instanceof SpellDrake))
                 .findFirst().ifPresent(i -> {
                     piggyBackSpell = i.getEffect().copy();
@@ -100,7 +103,7 @@ public class SpellDrake extends AbstractSpell {
 
     @Override
     public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+        super.toNBT(compound);
 
         if (piggyBackSpell != null) {
             compound.setTag("effect", SpellRegistry.instance().serializeEffectToNBT(piggyBackSpell));
@@ -109,11 +112,11 @@ public class SpellDrake extends AbstractSpell {
 
     @Override
     public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+        super.fromNBT(compound);
 
         if (compound.hasKey("effect")) {
             if (piggyBackSpell != null) {
-                piggyBackSpell.readFromNBT(compound.getCompoundTag("effect"));
+                piggyBackSpell.fromNBT(compound.getCompoundTag("effect"));
             } else {
                 piggyBackSpell = SpellRegistry.instance().createEffectFromNBT(compound.getCompoundTag("effect"));
             }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFire.java
similarity index 88%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFire.java
index ce07f9ea..1e057bfa 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellFire.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFire.java
@@ -1,16 +1,20 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import javax.annotation.Nullable;
 
 import com.minelittlepony.unicopia.Predicates;
 import com.minelittlepony.unicopia.entity.IMagicals;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IDispenceable;
+import com.minelittlepony.unicopia.magic.IUseable;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.PosHelper;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.collection.IStateMapping;
 import com.minelittlepony.util.collection.StateMapList;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
@@ -25,7 +29,7 @@ import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.dispenser.IBlockSource;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
@@ -38,7 +42,7 @@ import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.world.World;
 
-public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseAction, IDispenceable {
+public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseable, IDispenceable {
 
     public final StateMapList affected = new StateMapList();
 
@@ -63,7 +67,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
 
         affected.add(IStateMapping.build(
                 s -> s.getBlock() == Blocks.DIRT && s.getValue(BlockDirt.VARIANT) == BlockDirt.DirtType.DIRT,
-                s -> (Math.random() <= 0.15 ? s.withProperty(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) : s)));
+                s -> (Math.random() <= 0.15 ? s.with(BlockDirt.VARIANT, BlockDirt.DirtType.COARSE_DIRT) : s)));
     }
 
     @Override
@@ -72,8 +76,8 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
     @Override
@@ -94,7 +98,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
         boolean result = false;
 
         if (player == null || player.isSneaking()) {
@@ -114,7 +118,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
         if (hitEntity == null) {
             return SpellCastResult.NONE;
         }
@@ -123,7 +127,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
     }
 
     @Override
-    public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity) {
+    public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, Affinity affinity) {
         pos = pos.offset(facing, 4);
 
         boolean result = false;
@@ -205,7 +209,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
                 (owner instanceof EntityPlayer && !Predicates.MAGI.test(owner))) && !(e instanceof EntityItem)
         && !(e instanceof IMagicals)) {
             e.setFire(60);
-            e.attackEntityFrom(getDamageCause(e, (EntityLivingBase)owner), 0.1f);
+            e.attackEntityFrom(getDamageCause(e, (LivingEntity)owner), 0.1f);
             playEffect(world, e.getPosition());
             return true;
         }
@@ -213,7 +217,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
         return false;
     }
 
-    protected DamageSource getDamageCause(Entity target, EntityLivingBase attacker) {
+    protected DamageSource getDamageCause(Entity target, LivingEntity attacker) {
         return MagicalDamageSource.causeMobDamage("fire", attacker);
     }
 
@@ -227,7 +231,7 @@ public class SpellFire extends AbstractSpell.RangedAreaSpell implements IUseActi
         if (i < max && id == Blocks.REDSTONE_WIRE) {
             i++;
 
-            w.setBlockState(pos, state.withProperty(BlockRedstoneWire.POWER, power));
+            w.setBlockState(pos, state.with(BlockRedstoneWire.POWER, power));
 
             sendPower(w, pos.up(), power, max, i);
             sendPower(w, pos.down(), power, max, i);
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellFlame.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFlame.java
similarity index 67%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellFlame.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFlame.java
index 36f9ea2d..de860e7c 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellFlame.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellFlame.java
@@ -1,6 +1,9 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IHeldEffect;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
@@ -14,8 +17,8 @@ public class SpellFlame extends AbstractSpell implements IHeldEffect {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
     }
 
     @Override
@@ -33,7 +36,7 @@ public class SpellFlame extends AbstractSpell implements IHeldEffect {
     }
 
     @Override
-    public void updateInHand(IPlayer caster, SpellAffinity affinity) {
+    public void updateInHand(IPlayer caster, Affinity affinity) {
         EntityPlayer player = caster.getOwner();
 
         if (player.ticksExisted % 15 == 0) {
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellIce.java
similarity index 87%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellIce.java
index 272c1a8c..fcd6d2f2 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellIce.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellIce.java
@@ -1,15 +1,19 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.init.UMaterials;
+import com.minelittlepony.unicopia.UMaterials;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IDispenceable;
+import com.minelittlepony.unicopia.magic.IUseable;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.PosHelper;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.collection.IStateMapping;
 import com.minelittlepony.util.collection.StateMapList;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
-import com.minelittlepony.util.vector.VecHelper;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockBush;
@@ -29,7 +33,7 @@ import net.minecraft.util.EnumFacing;
 import net.minecraft.util.EnumParticleTypes;
 import net.minecraft.world.World;
 
-public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseAction, IDispenceable {
+public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseable, IDispenceable {
 
     public final StateMapList affected = new StateMapList();
 
@@ -63,8 +67,8 @@ public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseActio
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
     @Override
@@ -82,12 +86,12 @@ public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseActio
     }
 
     @Override
-    public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, SpellAffinity affinity) {
+    public SpellCastResult onDispenced(BlockPos pos, EnumFacing facing, IBlockSource source, Affinity affinity) {
         return applyBlocks(null, source.getWorld(), pos.offset(facing, rad)) ? SpellCastResult.NONE : SpellCastResult.DEFAULT;
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
         if (player != null && player.isSneaking()) {
             applyBlockSingle(world, pos);
         } else {
@@ -98,7 +102,7 @@ public class SpellIce extends AbstractSpell.RangedAreaSpell implements IUseActio
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
         if (hitEntity != null && applyEntitySingle(player, hitEntity)) {
             return SpellCastResult.DEFAULT;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellInferno.java
similarity index 86%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellInferno.java
index f4a6bb75..08f354fa 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellInferno.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellInferno.java
@@ -1,5 +1,7 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.collection.IStateMapping;
 import com.minelittlepony.util.collection.StateMapList;
@@ -11,7 +13,7 @@ import net.minecraft.block.BlockOre;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
@@ -52,8 +54,8 @@ public class SpellInferno extends SpellFire {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
+    public Affinity getAffinity() {
+        return Affinity.BAD;
     }
 
     @Override
@@ -62,7 +64,7 @@ public class SpellInferno extends SpellFire {
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
         return SpellCastResult.PLACE;
     }
 
@@ -70,7 +72,7 @@ public class SpellInferno extends SpellFire {
     public boolean update(ICaster<?> source) {
         World w = source.getWorld();
 
-        if (!w.isRemote) {
+        if (!w.isClient) {
             int radius = 4 + (source.getCurrentLevel() * 4);
             IShape shape = new Sphere(false, radius);
 
@@ -104,7 +106,7 @@ public class SpellInferno extends SpellFire {
     }
 
     @Override
-    protected DamageSource getDamageCause(Entity target, EntityLivingBase attacker) {
+    protected DamageSource getDamageCause(Entity target, LivingEntity attacker) {
         if (attacker != null && attacker.getUniqueID().equals(target.getUniqueID())) {
             return MagicalDamageSource.causeMobDamage("fire.own", null);
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellLight.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellLight.java
similarity index 78%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellLight.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellLight.java
index 72cef031..22d1c131 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellLight.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellLight.java
@@ -1,6 +1,9 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
-import com.minelittlepony.unicopia.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IHeldEffect;
 
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.math.BlockPos;
@@ -13,7 +16,7 @@ public class SpellLight extends GenericSpell implements IHeldEffect {
     private ICaster<?> source;
 
     public SpellLight() {
-        super("light", 0xF7FACB, SpellAffinity.GOOD);
+        super("light", 0xF7FACB, Affinity.GOOD);
     }
 
     @Override
@@ -31,8 +34,8 @@ public class SpellLight extends GenericSpell implements IHeldEffect {
     }
 
     @Override
-    public void updateInHand(IPlayer caster, SpellAffinity affinity) {
-        if (caster.getPlayerSpecies().canCast()) {
+    public void updateInHand(IPlayer caster, Affinity affinity) {
+        if (caster.getSpecies().canCast()) {
             update(caster);
         }
     }
@@ -65,7 +68,7 @@ public class SpellLight extends GenericSpell implements IHeldEffect {
 
     @Override
     public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+        super.toNBT(compound);
 
         if (compound.hasKey("lastX")) {
             lastPos = new BlockPos(compound.getInteger("lastX"), compound.getInteger("lastY"), compound.getInteger("lastZ"));
@@ -76,7 +79,7 @@ public class SpellLight extends GenericSpell implements IHeldEffect {
 
     @Override
     public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+        super.fromNBT(compound);
 
         if (lastPos != null) {
             compound.setInteger("lastX", lastPos.getX());
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellNecromancy.java
similarity index 53%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellNecromancy.java
index 23eda4cc..11b92057 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellNecromancy.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellNecromancy.java
@@ -1,31 +1,36 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.List;
 
 import com.google.common.collect.Lists;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.util.VecHelper;
 import com.minelittlepony.util.WorldEvent;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
-import com.minelittlepony.util.vector.VecHelper;
 
-import net.minecraft.entity.EntityCreature;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.monster.EntityHusk;
-import net.minecraft.entity.monster.EntityPigZombie;
-import net.minecraft.entity.monster.EntityZombie;
-import net.minecraft.util.EnumParticleTypes;
+import net.minecraft.entity.EntityType;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.mob.HuskEntity;
+import net.minecraft.entity.mob.MobEntity;
+import net.minecraft.entity.mob.MobEntityWithAi;
+import net.minecraft.entity.mob.ZombieEntity;
+import net.minecraft.entity.mob.ZombiePigmanEntity;
+import net.minecraft.entity.passive.AnimalEntity;
+import net.minecraft.particle.ParticleTypes;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.EnumDifficulty;
+import net.minecraft.world.Difficulty;
 import net.minecraft.world.World;
 
 public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
 
-    private final List<IMonsterSpawn<?>> spawns = Lists.newArrayList(
-            EntityZombie::new,
-            EntityHusk::new,
-            EntityPigZombie::new
+    private final List<EntityType<? extends LivingEntity>> spawns = Lists.newArrayList(
+            EntityType.ZOMBIE,
+            EntityType.HUSK,
+            EntityType.ZOMBIE_PIGMAN
     );
 
     @Override
@@ -34,8 +39,8 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
+    public Affinity getAffinity() {
+        return Affinity.BAD;
     }
 
     @Override
@@ -46,35 +51,35 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
     @Override
     public boolean update(ICaster<?> source) {
 
-        if (source.getWorld().isRemote || source.getWorld().getDifficulty() == EnumDifficulty.PEACEFUL) {
+        if (source.getWorld().isClient || source.getWorld().getDifficulty() == Difficulty.PEACEFUL) {
             return true;
         }
 
 
-        float additional = source.getWorld().getDifficultyForLocation(source.getOrigin()).getAdditionalDifficulty();
+        float additional = source.getWorld().getLocalDifficulty(source.getOrigin()).getLocalDifficulty();
 
         int radius = source.getCurrentLevel() + 1;
 
         IShape affectRegion = new Sphere(false, radius * 4);
 
-        if (source.getWorld().rand.nextInt(100) != 0) {
+        if (source.getWorld().random.nextInt(100) != 0) {
             return true;
         }
 
         Vec3d origin = source.getOriginVector();
 
         if (VecHelper.findAllEntitiesInRange(source.getEntity(), source.getWorld(), source.getOrigin(), radius * 4)
-                .filter(e -> e instanceof EntityZombie)
+                .filter(e -> e instanceof ZombieEntity)
                 .count() >= 10 * (1 + additional)) {
             return true;
         }
 
         for (int i = 0; i < 10; i++) {
-            Vec3d pos = affectRegion.computePoint(source.getWorld().rand).add(origin);
+            Vec3d pos = affectRegion.computePoint(source.getWorld().random).add(origin);
 
             BlockPos loc = new BlockPos(pos);
 
-            if (source.getWorld().isAirBlock(loc.up()) && !source.getWorld().isAirBlock(loc)) {
+            if (source.getWorld().isAir(loc.up()) && !source.getWorld().isAir(loc)) {
                 spawnMonster(source, pos);
 
                 return true;
@@ -86,17 +91,13 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
     }
 
     protected void spawnMonster(ICaster<?> source, Vec3d pos) {
-        int index = (int)MathHelper.nextDouble(source.getWorld().rand, 0, spawns.size());
-        EntityLivingBase zombie = spawns.get(index).create(source.getWorld());
+        int index = (int)MathHelper.nextDouble(source.getWorld().random, 0, spawns.size());
+        LivingEntity zombie = spawns.get(index).create(source.getWorld());
         zombie.setPosition(pos.x, pos.y, pos.z);
 
+        zombie.setVelocity(0, 0.3, 0);
 
-        if (zombie instanceof EntityCreature) {
-            ((EntityCreature)zombie).setHomePosAndDistance(source.getOrigin(), 10);
-        }
-        zombie.motionY += 0.3F;
-
-        WorldEvent.DOOR_BROKEN.play(source.getWorld(), zombie.getPosition());
+        WorldEvent.DOOR_BROKEN.play(source.getWorld(), zombie.getBlockPos());
 
         source.getWorld().spawnEntity(zombie);
     }
@@ -106,13 +107,9 @@ public class SpellNecromancy extends AbstractSpell.RangedAreaSpell {
         IShape affectRegion = new Sphere(false, (1 + source.getCurrentLevel()) * 4);
 
         source.spawnParticles(affectRegion, 5, pos -> {
-            if (!source.getWorld().isAirBlock(new BlockPos(pos).down())) {
-                source.getWorld().spawnParticle(EnumParticleTypes.FLAME, pos.x, pos.y, pos.z, 0, 0, 0);
+            if (!source.getWorld().isAir(new BlockPos(pos).down())) {
+                source.getWorld().spawnParticle(ParticleTypes.FLAME., pos.x, pos.y, pos.z, 0, 0, 0);
             }
         });
     }
-
-    interface IMonsterSpawn<T extends EntityLivingBase> {
-        T create(World w);
-    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellPortal.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellPortal.java
similarity index 82%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellPortal.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellPortal.java
index 7852bc7c..141a77b9 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellPortal.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellPortal.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.Locale;
 import java.util.Optional;
@@ -6,36 +6,40 @@ import java.util.UUID;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.entity.EntitySpell;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.entity.SpellcastEntity;
 import com.minelittlepony.unicopia.entity.IMagicals;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.IUseable;
+import com.minelittlepony.util.InbtSerialisable;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
 
+import net.fabricmc.fabric.api.particles.ParticleTypeRegistry;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.EnumFacing;
 import net.minecraft.util.SoundCategory;
 import net.minecraft.world.World;
 import net.minecraft.world.WorldServer;
 
-public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAction {
+public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseable {
 
     private static final IShape portalZone_X = new Sphere(true, 1, 0, 2, 1);
     private static final IShape portalZone_Y = new Sphere(true, 1, 2, 0, 2);
     private static final IShape portalZone_Z = new Sphere(true, 1, 1, 2, 0);
 
-    private static final AxisAlignedBB TELEPORT_BOUNDS_VERT = new AxisAlignedBB(-1, -0.5, -1, 1, 0.5, 1);
-    private static final AxisAlignedBB TELEPORT_BOUNDS = new AxisAlignedBB(-0.5, -0.5, -0.5, 0.5, 3, 0.5);
+    private static final Box TELEPORT_BOUNDS_VERT = new Box(-1, -0.5, -1, 1, 0.5, 1);
+    private static final Box TELEPORT_BOUNDS = new Box(-0.5, -0.5, -0.5, 0.5, 3, 0.5);
 
     @Nullable
     private SpellPortal sibling = null;
@@ -67,8 +71,8 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
     @Override
@@ -101,21 +105,21 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
         position = pos.offset(side);
         axis = EnumFacing.getDirectionFromEntityLiving(position, player).getAxis();
 
-        IPlayer prop = PlayerSpeciesList.instance().getPlayer(player);
+        IPlayer prop = SpeciesList.instance().getPlayer(player);
 
         SpellPortal other = prop.getEffect(SpellPortal.class, true);
         if (other != null) {
             other.getActualInstance().setDestinationPortal(this);
 
-            if (!world.isRemote) {
+            if (!world.isClient) {
                 prop.setEffect(null);
             }
         } else {
-            if (!world.isRemote) {
+            if (!world.isClient) {
                 bridge = (SpellPortal)copy();
 
                 prop.setEffect(bridge);
@@ -126,7 +130,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
     }
 
     @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
+    public SpellCastResult onUse(ItemStack stack, Affinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
         return SpellCastResult.NONE;
     }
 
@@ -145,7 +149,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
 
     @Override
     public boolean update(ICaster<?> source) {
-        if (!source.getWorld().isRemote) {
+        if (!source.getWorld().isClient) {
             getDestinationPortal().ifPresent(dest ->
                 source.getWorld().getEntitiesWithinAABB(Entity.class, getTeleportBounds().offset(source.getOrigin())).stream()
                     .filter(this::canTeleport)
@@ -158,7 +162,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
     @Override
     public void render(ICaster<?> source) {
         source.spawnParticles(getPortalZone(), 10, pos -> {
-            Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
+            ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
         });
     }
 
@@ -171,7 +175,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
         }
     }
 
-    public AxisAlignedBB getTeleportBounds() {
+    public Box getTeleportBounds() {
         if (axis == EnumFacing.Axis.Y) {
             return TELEPORT_BOUNDS_VERT;
         }
@@ -228,8 +232,8 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
                 i = ((WorldServer)world).getEntityFromUuid(casterId);
             }
 
-            if (i instanceof EntitySpell) {
-                IMagicEffect effect = ((EntitySpell) i).getEffect();
+            if (i instanceof SpellcastEntity) {
+                IMagicEffect effect = ((SpellcastEntity) i).getEffect();
 
                 if (effect instanceof SpellPortal) {
                     return (SpellPortal)effect;
@@ -266,8 +270,8 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
             }
         }
 
-        if (i instanceof EntitySpell) {
-            IMagicEffect effect = ((EntitySpell) i).getEffect();
+        if (i instanceof SpellcastEntity) {
+            IMagicEffect effect = ((SpellcastEntity) i).getEffect();
 
             if (effect instanceof SpellPortal) {
                 sibling = (SpellPortal)effect;
@@ -287,7 +291,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
 
     @Override
     public void writeToNBT(NBTTagCompound compound) {
-        super.writeToNBT(compound);
+        super.toNBT(compound);
 
         if (destinationPos != null) {
             compound.setTag("destination", InbtSerialisable.writeBlockPos(destinationPos));
@@ -306,7 +310,7 @@ public class SpellPortal extends AbstractSpell.RangedAreaSpell implements IUseAc
 
     @Override
     public void readFromNBT(NBTTagCompound compound) {
-        super.readFromNBT(compound);
+        super.fromNBT(compound);
 
         if (compound.hasKey("destination")) {
             destinationPos = InbtSerialisable.readBlockPos(compound.getCompoundTag("destination"));
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellRegistry.java
similarity index 76%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellRegistry.java
index 7f406941..f7c4d2ce 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellRegistry.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellRegistry.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -11,8 +11,14 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.annotation.concurrent.Immutable;
 
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IDispenceable;
+import com.minelittlepony.unicopia.magic.IHeldEffect;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.IUseable;
+
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.nbt.CompoundTag;
 
 public class SpellRegistry {
 
@@ -22,13 +28,9 @@ public class SpellRegistry {
         return instance;
     }
 
-    public static boolean stackHasEnchantment(ItemStack stack) {
-        return stack.hasTagCompound() && stack.getTagCompound().hasKey("spell");
-    }
-
     private final Map<String, Entry<?>> entries = new HashMap<>();
 
-    private final Map<SpellAffinity, Set<String>> keysByAffinity = new HashMap<>();
+    private final Map<Affinity, Set<String>> keysByAffinity = new HashMap<>();
 
     private SpellRegistry() {
         registerSpell(SpellShield::new);
@@ -65,12 +67,13 @@ public class SpellRegistry {
         return (T)createEffectFromNBT(serializeEffectToNBT(effect));
     }
 
-    public IMagicEffect createEffectFromNBT(NBTTagCompound compound) {
-        if (compound.hasKey("effect_id")) {
+    @Nullable
+    public IMagicEffect createEffectFromNBT(CompoundTag compound) {
+        if (compound.containsKey("effect_id")) {
             IMagicEffect effect = getSpellFromName(compound.getString("effect_id"));
 
             if (effect != null) {
-                effect.readFromNBT(compound);
+                effect.fromNBT(compound);
             }
 
             return effect;
@@ -79,10 +82,10 @@ public class SpellRegistry {
         return null;
     }
 
-    public NBTTagCompound serializeEffectToNBT(IMagicEffect effect) {
-        NBTTagCompound compound = effect.toNBT();
+    public CompoundTag serializeEffectToNBT(IMagicEffect effect) {
+        CompoundTag compound = effect.toNBT();
 
-        compound.setString("effect_id", effect.getName());
+        compound.putString("effect_id", effect.getName());
 
         return compound;
     }
@@ -97,7 +100,7 @@ public class SpellRegistry {
     }
 
     @Nullable
-    public IUseAction getUseActionFrom(ItemStack stack) {
+    public IUseable getUseActionFrom(ItemStack stack) {
         return getEntryFromStack(stack).map(Entry::useable).orElse(null);
     }
 
@@ -113,7 +116,7 @@ public class SpellRegistry {
 
     public <T extends IMagicEffect> void registerSpell(Supplier<T> factory) {
         try {
-            new Entry<T>(factory);
+            new Entry<>(factory);
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -121,10 +124,10 @@ public class SpellRegistry {
 
     public ItemStack disenchantStack(ItemStack stack) {
         if (stackHasEnchantment(stack)) {
-            stack.getTagCompound().removeTag("spell");
+            stack.getTag().remove("spell");
 
-            if (stack.getTagCompound().isEmpty()) {
-                stack.setTagCompound(null);
+            if (stack.getTag().isEmpty()) {
+                stack.setTag(null);
             }
         }
 
@@ -136,21 +139,22 @@ public class SpellRegistry {
     }
 
     public ItemStack enchantStack(ItemStack stack, String name) {
-        if (!stack.hasTagCompound()) {
-            stack.setTagCompound(new NBTTagCompound());
-        }
-        stack.getTagCompound().setString("spell", name);
+        stack.getOrCreateTag().putString("spell", name);
 
         return stack;
     }
 
+    public static boolean stackHasEnchantment(ItemStack stack) {
+        return !stack.isEmpty() && stack.hasTag() && stack.getTag().containsKey("spell");
+    }
+
     @Nonnull
     public static String getKeyFromStack(ItemStack stack) {
-        if (stack.isEmpty() || !stack.hasTagCompound() || !stack.getTagCompound().hasKey("spell")) {
-            return "";
+        if (stackHasEnchantment(stack)) {
+            return stack.getTag().getString("spell");
         }
 
-        return stack.getTagCompound().getString("spell");
+        return "";
     }
 
     public int getSpellTintFromStack(ItemStack stack) {
@@ -165,7 +169,7 @@ public class SpellRegistry {
         return 0xffffff;
     }
 
-    public Set<String> getAllNames(SpellAffinity affinity) {
+    public Set<String> getAllNames(Affinity affinity) {
         return keysByAffinity.get(affinity);
     }
 
@@ -179,7 +183,7 @@ public class SpellRegistry {
         final boolean canUse;
         final boolean canHold;
 
-        final SpellAffinity affinity;
+        final Affinity affinity;
 
         Entry(Supplier<T> factory) throws Exception {
             T inst = factory.get();
@@ -187,12 +191,12 @@ public class SpellRegistry {
             this.factory = factory;
             this.color = inst.getTint();
             this.canDispense = inst instanceof IDispenceable;
-            this.canUse = inst instanceof IUseAction;
+            this.canUse = inst instanceof IUseable;
             this.canHold = inst instanceof IHeldEffect;
             this.affinity = inst.getAffinity();
 
             if (inst.isCraftable()) {
-                for (SpellAffinity affinity : affinity.getImplicators()) {
+                for (Affinity affinity : affinity.getImplicators()) {
                     keysByAffinity.computeIfAbsent(affinity, a -> new HashSet<>()).add(inst.getName());
                 }
             }
@@ -200,12 +204,12 @@ public class SpellRegistry {
             entries.put(inst.getName(), this);
         }
 
-        IUseAction useable() {
+        IUseable useable() {
             if (!canUse) {
                 return null;
             }
 
-            return (IUseAction)create();
+            return (IUseable)create();
         }
 
         IHeldEffect holdable() {
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellReveal.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellReveal.java
similarity index 68%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellReveal.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellReveal.java
index 69e64746..38ea0dc5 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellReveal.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellReveal.java
@@ -1,12 +1,15 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.ISuppressable;
 import com.minelittlepony.util.shape.IShape;
 import com.minelittlepony.util.shape.Sphere;
 
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.SoundCategory;
+import net.minecraft.sound.SoundCategory;
+import net.minecraft.sound.SoundEvents;
+
 
 public class SpellReveal extends AbstractSpell {
 
@@ -44,15 +47,15 @@ public class SpellReveal extends AbstractSpell {
         IShape area = new Sphere(false, 15);
 
         source.spawnParticles(area, 5, pos -> {
-            Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
+            ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
         });
 
         source.spawnParticles(UParticles.UNICORN_MAGIC, 5, getTint());
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.GOOD;
+    public Affinity getAffinity() {
+        return Affinity.GOOD;
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellScorch.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellScorch.java
new file mode 100644
index 00000000..416d44d9
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellScorch.java
@@ -0,0 +1,86 @@
+package com.minelittlepony.unicopia.magic.spells;
+
+import javax.annotation.Nullable;
+
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.entity.item.AdvancedProjectileEntity;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.ITossedEffect;
+import com.minelittlepony.unicopia.projectile.IAdvancedProjectile;
+import com.minelittlepony.util.PosHelper;
+import com.minelittlepony.util.shape.Sphere;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.explosion.Explosion.DestructionType;
+
+public class SpellScorch extends SpellFire implements ITossedEffect {
+
+    @Override
+    public String getName() {
+        return "scorch";
+    }
+
+    @Override
+    public boolean isCraftable() {
+        return false;
+    }
+
+    @Override
+    public int getTint() {
+        return 0;
+    }
+
+    @Override
+    public boolean update(ICaster<?> source) {
+
+        BlockPos pos = PosHelper.findSolidGroundAt(source.getWorld(), source.getOrigin());
+
+        BlockState state = source.getWorld().getBlockState(pos);
+
+        BlockState newState = affected.getConverted(state);
+
+        if (!state.equals(newState)) {
+            source.getWorld().setBlockState(pos, newState, 3);
+            source.spawnParticles(new Sphere(false, 1), 5, p -> {
+                p = PosHelper.offset(p, pos);
+
+                source.getWorld().addParticle(ParticleTypes.SMOKE, p.x, p.y, p.z, 0, 0, 0);
+            });
+        }
+
+        return true;
+    }
+
+    @Override
+    public void render(ICaster<?> source) {
+        source.spawnParticles(ParticleTypes.FLAME, 3);
+        source.spawnParticles(UParticles.UNICORN_MAGIC, 3, getTint());
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return Affinity.BAD;
+    }
+
+    @Override
+    @Nullable
+    public IAdvancedProjectile toss(ICaster<?> caster) {
+        IAdvancedProjectile projectile = ITossedEffect.super.toss(caster);
+
+        if (projectile != null) {
+            projectile.setGravity(false);
+        }
+
+        return projectile;
+    }
+
+    @Override
+    public void onImpact(ICaster<?> caster, BlockPos pos, BlockState state) {
+        if (caster.isLocal()) {
+            caster.getWorld().createExplosion(caster.getOwner(), pos.getX(), pos.getY(), pos.getZ(), 2, DestructionType.DESTROY);
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellShield.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellShield.java
similarity index 76%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellShield.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellShield.java
index 862be4b0..da1bd64f 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellShield.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellShield.java
@@ -1,19 +1,22 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.minelittlepony.unicopia.Predicates;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.ParticleConnection;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.util.ProjectileUtil;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.IAttachedEffect;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.particles.ParticleConnection;
+import com.minelittlepony.unicopia.projectile.ProjectileUtil;
 import com.minelittlepony.util.shape.Sphere;
 
+import net.fabricmc.fabric.api.particles.ParticleTypeRegistry;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.SoundEvents;
 import net.minecraft.util.math.Vec3d;
@@ -28,8 +31,8 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell implements IAttac
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
     }
 
     @Override
@@ -47,11 +50,11 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell implements IAttac
         float radius = 4 + (source.getCurrentLevel() * 2);
 
         source.spawnParticles(new Sphere(true, radius), (int)(radius * 6), pos -> {
-            Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
+            ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false, pos, 0, 0, 0, getTint());
         });
 
         particlEffect
-            .ifMissing(source, () -> Particles.instance().spawnParticle(UParticles.SPHERE, true, source.getOriginVector(), 0, 0, 0, 1, getTint(), 10))
+            .ifMissing(source, () -> ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.SPHERE, true, source.getOriginVector(), 0, 0, 0, 1, getTint(), 10))
             .ifPresent(p -> p.setAttribute(0, radius));
     }
 
@@ -89,7 +92,7 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell implements IAttac
 
         Entity owner = source.getOwner();
 
-        boolean ownerIsValid = source.getAffinity() != SpellAffinity.BAD && Predicates.MAGI.test(owner);
+        boolean ownerIsValid = source.getAffinity() != Affinity.BAD && Predicates.MAGI.test(owner);
 
         Vec3d origin = source.getOriginVector();
 
@@ -122,11 +125,11 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell implements IAttac
                     ricochet(target, pos);
                 }
             }
-        } else if (target instanceof EntityLivingBase) {
+        } else if (target instanceof LivingEntity) {
             double force = Math.max(0.1, radius / 4);
 
-            if (source.getAffinity() != SpellAffinity.BAD && target instanceof EntityPlayer) {
-                force *= calculateAdjustedForce(PlayerSpeciesList.instance().getPlayer((EntityPlayer)target));
+            if (source.getAffinity() != Affinity.BAD && target instanceof EntityPlayer) {
+                force *= calculateAdjustedForce(SpeciesList.instance().getPlayer((EntityPlayer)target));
             } else {
                 force *= 0.75;
             }
@@ -154,13 +157,13 @@ public class SpellShield extends AbstractSpell.RangedAreaSpell implements IAttac
     protected double calculateAdjustedForce(IPlayer player) {
         double force = 0.75;
 
-        if (player.getPlayerSpecies().canUseEarth()) {
+        if (player.getSpecies().canUseEarth()) {
             force /= 2;
 
             if (player.getOwner().isSneaking()) {
                 force /= 6;
             }
-        } else if (player.getPlayerSpecies().canFly()) {
+        } else if (player.getSpecies().canFly()) {
             force *= 2;
         }
 
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellSiphon.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellSiphon.java
similarity index 77%
rename from src/main/java/com/minelittlepony/unicopia/spell/SpellSiphon.java
rename to src/main/java/com/minelittlepony/unicopia/magic/spells/SpellSiphon.java
index d3b707e0..6303541c 100644
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellSiphon.java
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellSiphon.java
@@ -1,15 +1,17 @@
-package com.minelittlepony.unicopia.spell;
+package com.minelittlepony.unicopia.magic.spells;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
 import com.minelittlepony.util.MagicalDamageSource;
 import com.minelittlepony.util.shape.Sphere;
 
-import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.EnumParticleTypes;
@@ -33,16 +35,16 @@ public class SpellSiphon extends AbstractSpell.RangedAreaSpell {
 
         int radius = 4 + source.getCurrentLevel();
 
-        EntityLivingBase owner = source.getOwner();
+        LivingEntity owner = source.getOwner();
 
-        List<EntityLivingBase> target = source.findAllEntitiesInRange(radius)
-                .filter(e -> e instanceof EntityLivingBase)
-                .map(e -> (EntityLivingBase)e)
+        List<LivingEntity> target = source.findAllEntitiesInRange(radius)
+                .filter(e -> e instanceof LivingEntity)
+                .map(e -> (LivingEntity)e)
                 .collect(Collectors.toList());
 
         DamageSource damage = damageSource(owner);
 
-        if (source.getAffinity() == SpellAffinity.BAD) {
+        if (source.getAffinity() == Affinity.BAD) {
             if (owner != null) {
                 float healthGain = 0;
                 float maxHealthGain = owner.getMaxHealth() - owner.getHealth();
@@ -50,14 +52,14 @@ public class SpellSiphon extends AbstractSpell.RangedAreaSpell {
                 if (maxHealthGain > 0) {
                     float attackAmount = Math.max(maxHealthGain / target.size(), 0.5F);
 
-                    for (EntityLivingBase e : target) {
+                    for (LivingEntity e : target) {
                         if (!e.equals(owner)) {
                             float dealt = Math.min(e.getHealth(), attackAmount);
 
                             if (e instanceof EntityPlayer) {
-                                IPlayer player = PlayerSpeciesList.instance().getPlayer((EntityPlayer)e);
+                                IPlayer player = SpeciesList.instance().getPlayer((EntityPlayer)e);
 
-                                Race race = player.getPlayerSpecies();
+                                Race race = player.getSpecies();
 
                                 if (race.canCast()) {
                                     dealt /= 2;
@@ -96,7 +98,7 @@ public class SpellSiphon extends AbstractSpell.RangedAreaSpell {
         return false;
     }
 
-    protected DamageSource damageSource(EntityLivingBase actor) {
+    protected DamageSource damageSource(LivingEntity actor) {
         if (actor == null) {
             return MagicalDamageSource.create("drain");
         }
@@ -109,7 +111,7 @@ public class SpellSiphon extends AbstractSpell.RangedAreaSpell {
         int radius = 4 + source.getCurrentLevel();
 
         Vec3d origin = source.getOriginVector();
-        int direction = source.getAffinity() == SpellAffinity.GOOD ? 1 : -1;
+        int direction = source.getAffinity() == Affinity.GOOD ? 1 : -1;
 
         source.spawnParticles(new Sphere(true, radius, 1, 0, 1), 1, pos -> {
             if (!source.getWorld().isAirBlock(new BlockPos(pos).down())) {
@@ -126,8 +128,8 @@ public class SpellSiphon extends AbstractSpell.RangedAreaSpell {
     }
 
     @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
     }
 
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellVortex.java b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellVortex.java
new file mode 100644
index 00000000..86da50d5
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/magic/spells/SpellVortex.java
@@ -0,0 +1,77 @@
+package com.minelittlepony.unicopia.magic.spells;
+
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.UParticles;
+import com.minelittlepony.unicopia.magic.Affinity;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.util.MagicalDamageSource;
+import com.minelittlepony.util.shape.Sphere;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.Vec3d;
+
+public class SpellVortex extends SpellShield {
+
+    @Override
+    public String getName() {
+        return "vortex";
+    }
+
+    @Override
+    public int getTint() {
+        return 0x4CDEE7;
+    }
+
+    @Override
+    public Affinity getAffinity() {
+        return Affinity.NEUTRAL;
+    }
+
+    @Override
+    public void render(ICaster<?> source) {
+        int range = 4 + (source.getCurrentLevel() * 2);
+        Vec3d pos = source.getOriginVector();
+
+        source.spawnParticles(new Sphere(false, range), range * 9, p -> {
+            ParticleTypeRegistry.getTnstance().spawnParticle(UParticles.UNICORN_MAGIC, false, p, p.subtract(pos), getTint());
+        });
+    }
+
+    @Override
+    public double getDrawDropOffRange(ICaster<?> caster) {
+        return 10 + (caster.getCurrentLevel() * 2);
+    }
+
+    @Override
+    protected void applyRadialEffect(ICaster<?> source, Entity target, double distance, double radius) {
+        Vec3d pos = source.getOriginVector();
+
+        double force = 2.5F / distance;
+
+        if (source.getAffinity() != Affinity.BAD && target instanceof PlayerEntity) {
+            force *= calculateAdjustedForce(SpeciesList.instance().getPlayer((PlayerEntity)target));
+        }
+
+        if (source.getAffinity() == Affinity.BAD && source.getWorld().random.nextInt(4500) == 0) {
+            source.getEntity().damage(MagicalDamageSource.create("vortex"), 4);
+        }
+
+        applyForce(pos, target, -force, 0);
+
+        float maxVel = source.getAffinity() == Affinity.BAD ? 1 : 1.6f;
+
+        Vec3d vel = target.getVelocity();
+
+        if (vel.x > maxVel) vel.x = maxVel;
+        if (vel.x < -maxVel) vel.x = -maxVel;
+        if (vel.y > maxVel) vel.y = maxVel;
+        if (vel.y < -maxVel) vel.y = -maxVel;
+        if (vel.z > maxVel) vel.z = maxVel;
+        if (vel.z < -maxVel) vel.z = -maxVel;
+
+        if (distance < 0.5) {
+            vel.z += maxVel * 2;
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/FieldAccessor.java b/src/main/java/com/minelittlepony/unicopia/mixin/FieldAccessor.java
deleted file mode 100644
index 5e0fe3b1..00000000
--- a/src/main/java/com/minelittlepony/unicopia/mixin/FieldAccessor.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.minelittlepony.unicopia.mixin;
-
-import java.lang.reflect.Field;
-
-class FieldAccessor<Owner, Type> {
-
-    private boolean init;
-    private Field field;
-
-    private final Class<Owner> ownerClass;
-
-    private final int fieldIndex;
-
-    FieldAccessor(Class<Owner> type, int index) {
-        ownerClass = type;
-        fieldIndex = index;
-    }
-
-    void set(Owner instance, Type value) {
-        init = false;
-        field = null;
-        init();
-
-        try {
-            if (field != null) {
-                field.set(instance, value);
-            }
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void init() {
-        if (!init && field == null) {
-            Field[] fields = ownerClass.getDeclaredFields();
-            field = fields[fieldIndex < 0 ? (fields.length + fieldIndex) : fieldIndex];
-            field.setAccessible(true);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/IWalker.java b/src/main/java/com/minelittlepony/unicopia/mixin/IWalker.java
new file mode 100644
index 00000000..94b3f54c
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/IWalker.java
@@ -0,0 +1,12 @@
+package com.minelittlepony.unicopia.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import net.minecraft.entity.player.PlayerAbilities;
+
+@Mixin(PlayerAbilities.class)
+public interface IWalker {
+    @Accessor("walkSpeed")
+    void setWalkSpeed(float speed);
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinEntity.java
index ae326af7..6cfcd9b8 100644
--- a/src/main/java/com/minelittlepony/unicopia/mixin/MixinEntity.java
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinEntity.java
@@ -1,52 +1,12 @@
 package com.minelittlepony.unicopia.mixin;
 
-import com.minelittlepony.unicopia.forgebullshit.FUF;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.MoverType;
-import net.minecraft.entity.monster.EntityShulker;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.util.math.AxisAlignedBB;
 
-@FUF(reason = "Waiting for mixins?")
+@Mixin(Entity.class)
 public interface MixinEntity {
-
-    abstract class Player extends net.minecraft.entity.player.EntityPlayer {
-        private Player() { super(null, null);}
-
-        public static DataParameter<Byte> getModelFlag() {
-            return PLAYER_MODEL_FLAG;
-        }
-    }
-
-    abstract class Shulker {
-        private static final FieldAccessor<EntityShulker, Float> __peekAmount = new FieldAccessor<>(EntityShulker.class, 8);
-
-        public static void setPeek(EntityShulker shulker, float peekAmount) {
-            __peekAmount.set(shulker, peekAmount);
-        }
-    }
-
-    static void setSize(Entity self, float width, float height) {
-        if (self.width != width || self.height != height) {
-            float f = self.width;
-            self.width = width;
-            self.height = height;
-
-            if (self.width < f) {
-                double d0 = width / 2;
-                self.setEntityBoundingBox(new AxisAlignedBB(
-                        self.posX - d0, self.posY, self.posZ - d0,
-                        self.posX + d0, self.posY + self.height, self.posZ + d0));
-                return;
-            }
-
-            AxisAlignedBB axisalignedbb = self.getEntityBoundingBox();
-            self.setEntityBoundingBox(new AxisAlignedBB(axisalignedbb.minX, axisalignedbb.minY, axisalignedbb.minZ, axisalignedbb.minX + (double)self.width, axisalignedbb.minY + (double)self.height, axisalignedbb.minZ + (double)self.width));
-
-            if (self.width > f/* && !self.firstUpdate*/ && !self.world.isRemote) {
-                self.move(MoverType.SELF, (double)(f - self.width), 0, (double)(f - self.width));
-            }
-        }
-    }
+    @Accessor("setSize")
+    void setSize(float width, float height);
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinItemEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinItemEntity.java
new file mode 100644
index 00000000..5a53bba6
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinItemEntity.java
@@ -0,0 +1,40 @@
+package com.minelittlepony.unicopia.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.minelittlepony.unicopia.ducks.IRaceContainerHolder;
+import com.minelittlepony.unicopia.entity.IEntity;
+import com.minelittlepony.unicopia.entity.item.ItemEntityCapabilities;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.ItemEntity;
+
+@Mixin(ItemEntity.class)
+public abstract class MixinItemEntity extends Entity implements IRaceContainerHolder<IEntity> {
+
+    private final IEntity caster = createRaceContainer();
+
+    private MixinItemEntity() { super(null, null); }
+
+    @Override
+    public IEntity createRaceContainer() {
+        return new ItemEntityCapabilities((ItemEntity)(Object)this);
+    }
+
+    @Override
+    public IEntity getRaceContainer() {
+        return caster;
+    }
+
+    @Inject(method = "tick()V", at = @At("HEAD"))
+    private void beforeTick(CallbackInfo info) {
+        caster.beforeUpdate();
+    }
+
+    @Inject(method = "tick()V", at = @At("RETURN"))
+    private void afterTick(CallbackInfo info) {
+        caster.onUpdate();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
new file mode 100644
index 00000000..9d147d96
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinLivingEntity.java
@@ -0,0 +1,68 @@
+package com.minelittlepony.unicopia.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.minelittlepony.unicopia.ducks.IRaceContainerHolder;
+import com.minelittlepony.unicopia.entity.IEntity;
+import com.minelittlepony.unicopia.entity.living.LivingEntityCapabilities;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+
+@Mixin(LivingEntity.class)
+public abstract class MixinLivingEntity extends Entity implements IRaceContainerHolder<IEntity> {
+
+    private final IEntity caster = createRaceContainer();
+
+    private MixinLivingEntity() { super(null, null); }
+
+    @Override
+    public IEntity createRaceContainer() {
+        return new LivingEntityCapabilities((LivingEntity)(Object)this);
+    }
+
+    @Override
+    public IEntity getRaceContainer() {
+        return caster;
+    }
+
+    @Inject(method = "canSee(Lnet/minecraft/entity/Entity)Z", at = @At("HEAD"))
+    private void onCanSee(Entity other, CallbackInfoReturnable<Boolean> info) {
+        if (caster.isInvisible()) {
+            info.setReturnValue(false);
+        }
+    }
+
+    @Inject(method = "method_6040()V", at = @At("HEAD"))
+    protected void onFinishUsing(CallbackInfo info) {
+        LivingEntity self = (LivingEntity)(Object)this;
+
+        if (!self.getActiveItem().isEmpty() && self.isUsingItem()) {
+            caster.onUse(self.getActiveItem());
+        }
+    }
+
+    @Inject(method = "jump()V", at = @At("RETURN"))
+    private void onJump(CallbackInfo info) {
+        caster.onJump();
+    }
+
+    @Inject(method = "tick()V", at = @At("HEAD"))
+    private void beforeTick(CallbackInfo info) {
+        caster.beforeUpdate();
+    }
+
+    @Inject(method = "tick()V", at = @At("RETURN"))
+    private void afterTick(CallbackInfo info) {
+        caster.onUpdate();
+    }
+
+    @Inject(method = "<clinit>()V", at = @At("RETURN"))
+    private static void clinit(CallbackInfo info) {
+        LivingEntityCapabilities.boostrap();
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinPlayerEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinPlayerEntity.java
new file mode 100644
index 00000000..145f1e6b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinPlayerEntity.java
@@ -0,0 +1,58 @@
+package com.minelittlepony.unicopia.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.ducks.IRaceContainerHolder;
+import com.minelittlepony.unicopia.entity.IEntity;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
+import com.minelittlepony.unicopia.entity.player.PlayerCapabilities;
+import com.mojang.datafixers.util.Either;
+
+import net.minecraft.entity.ItemEntity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Unit;
+import net.minecraft.util.math.BlockPos;
+
+@Mixin(PlayerEntity.class)
+public abstract class MixinPlayerEntity extends LivingEntity implements IRaceContainerHolder<IPlayer> {
+
+    private MixinPlayerEntity() { super(null, null); }
+
+    @Override
+    public IEntity createRaceContainer() {
+        return new PlayerCapabilities((PlayerEntity)(Object)this);
+    }
+
+    @ModifyArg(method = "Lnet/minecraft/entity/LivingEntity;handleFallDamage(FF)V",
+            at = @At("HEAD"),
+            index = 0)
+    private float onHandleFallDamage(float distance) {
+        return getRaceContainer().onImpact(distance);
+    }
+
+    @Inject(method = "trySleep(Lnet/minecraft/util/math/BlockPos;)Lcom/mojang/datafixers/util/Either;",
+            at = @At("HEAD"),
+            cancellable = true)
+    private void onTrySleep(BlockPos pos, CallbackInfoReturnable<Either<PlayerEntity.SleepFailureReason, Unit>> info) {
+        if (!world.isClient) {
+            Either<PlayerEntity.SleepFailureReason, Unit> result = getRaceContainer().trySleep(pos);
+
+            result.ifLeft(reason -> info.setReturnValue(result));
+        }
+    }
+
+    @Inject(method = "dropItem(Lnet/minecraft/item/ItemStack;ZZ)Lnet/minecraft/entity/ItemEntity;",
+            at = @At("HEAD"))
+    private void onDropItem(ItemStack itemStack_1, boolean a, boolean b, CallbackInfoReturnable<ItemEntity> info) {
+        SpeciesList.instance().getForEntity(info.getReturnValue()).ifPresent(o -> {
+            o.getRaceContainer().setSpecies(getRaceContainer().getSpecies());
+        });
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/mixin/MixinProjectileEntity.java b/src/main/java/com/minelittlepony/unicopia/mixin/MixinProjectileEntity.java
new file mode 100644
index 00000000..8e7019bb
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/mixin/MixinProjectileEntity.java
@@ -0,0 +1,31 @@
+package com.minelittlepony.unicopia.mixin;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import com.minelittlepony.unicopia.SpeciesList;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.projectile.Projectile;
+import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.util.hit.EntityHitResult;
+
+@Mixin(ProjectileEntity.class)
+public abstract class MixinProjectileEntity extends Entity implements Projectile {
+
+    public MixinProjectileEntity() { super(null, null); }
+
+    @Inject(method = "onEntityHit(Lnet/minecraft/util/hit/EntityHitResult;)V",
+            at = @At("HEAD"),
+            cancellable = true)
+    private void onOnEntityHit(EntityHitResult hit, CallbackInfo info) {
+        SpeciesList.instance().getForEntity(hit.getEntity())
+        .ifPresent(container -> {
+            if (container.getRaceContainer().onProjectileImpact((ProjectileEntity)(Object)this)) {
+                info.cancel();
+            }
+        });
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelButterfly.java b/src/main/java/com/minelittlepony/unicopia/model/ModelButterfly.java
deleted file mode 100644
index 95a6678b..00000000
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelButterfly.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package com.minelittlepony.unicopia.model;
-
-import com.minelittlepony.unicopia.entity.EntityButterfly;
-
-import net.minecraft.client.model.ModelBase;
-import net.minecraft.client.model.ModelRenderer;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.math.MathHelper;
-
-public class ModelButterfly extends ModelBase {
-
-    private ModelRenderer body;
-
-    private ModelRenderer leftWingInner;
-    private ModelRenderer leftWingOuter;
-
-    private ModelRenderer rightWingInner;
-    private ModelRenderer rightWingOuter;
-
-    public ModelButterfly() {
-        textureWidth = 64;
-        textureHeight = 64;
-        init();
-
-    }
-
-    void init() {
-        this.boxList.clear();
-
-        body = new ModelRenderer(this, 0, 0);
-        body.rotationPointZ = -10;
-        body.rotationPointY = 12;
-
-        rightWingInner = new ModelRenderer(this, 42, 0);
-        rightWingInner.rotateAngleZ = -0.2F;
-        rightWingInner.addBox(-13, -5, 0, 10, 19, 1);
-
-        body.addChild(rightWingInner);
-
-        rightWingOuter = new ModelRenderer(this, 24, 16);
-        rightWingOuter.setRotationPoint(-13, 10, 0.1F);
-        rightWingOuter.rotateAngleZ = -0.2F;
-        rightWingOuter.addBox(0, 0, 0, 10, 12, 1);
-
-        rightWingInner.addChild(rightWingOuter);
-
-        leftWingInner = new ModelRenderer(this, 42, 0);
-        leftWingInner.mirror = true;
-        leftWingInner.rotateAngleZ = 0.2F;
-        leftWingInner.addBox(2, -5, 0, 10, 19, 1);
-
-        body.addChild(leftWingInner);
-
-        leftWingOuter = new ModelRenderer(this, 24, 16);
-        leftWingOuter.mirror = true;
-        leftWingOuter.rotateAngleZ = -0.2F;
-        leftWingOuter.setRotationPoint(2, 10, 0.1F);
-        leftWingOuter.addBox(0, 0, 0, 10, 12, 1);
-
-        leftWingInner.addChild(leftWingOuter);
-    }
-
-    @Override
-    public void render(Entity entityIn, float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scale) {
-
-        setRotationAngles(limbSwing, limbSwingAmount, ageInTicks, netHeadYaw, headPitch, scale, entityIn);
-
-        GlStateManager.disableLighting();
-
-        body.render(scale);
-
-        GlStateManager.enableLighting();
-    }
-
-    @Override
-    public void setRotationAngles(float limbSwing, float limbSwingAmount, float ageInTicks, float netHeadYaw, float headPitch, float scaleFactor, Entity entity) {
-
-        float flap = MathHelper.cos(ageInTicks) * (float)Math.PI / 4;
-
-        if (((EntityButterfly)entity).isResting()) {
-            body.rotateAngleX = 0.8F;
-            flap = MathHelper.cos(ageInTicks / 10) * (float)Math.PI / 6 + 0.7F;
-        } else {
-            body.rotateAngleX = ((float)Math.PI / 4) + MathHelper.cos(ageInTicks * 0.1F) * 0.15F;
-        }
-
-        rightWingInner.rotateAngleY = flap;
-        leftWingInner.rotateAngleY = -flap;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/model/ModelDisk.java b/src/main/java/com/minelittlepony/unicopia/model/ModelDisk.java
deleted file mode 100644
index d85cddd3..00000000
--- a/src/main/java/com/minelittlepony/unicopia/model/ModelDisk.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.minelittlepony.unicopia.model;
-
-import org.lwjgl.util.glu.Disk;
-import org.lwjgl.util.glu.GLU;
-
-public class ModelDisk extends ModelSphere {
-
-    @Override
-    protected void drawShape() {
-        Disk sphere = new Disk();
-
-        sphere.setDrawStyle(GLU.GLU_FILL);
-        sphere.setNormals(GLU.GLU_SMOOTH);
-        sphere.draw(0, 1, 32, 32);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/network/EffectSync.java b/src/main/java/com/minelittlepony/unicopia/network/EffectSync.java
index 1f2bc49d..c4556993 100644
--- a/src/main/java/com/minelittlepony/unicopia/network/EffectSync.java
+++ b/src/main/java/com/minelittlepony/unicopia/network/EffectSync.java
@@ -2,13 +2,12 @@ package com.minelittlepony.unicopia.network;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
+import com.minelittlepony.unicopia.magic.ICaster;
+import com.minelittlepony.unicopia.magic.IMagicEffect;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
 
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
+import net.minecraft.entity.data.TrackedData;
+import net.minecraft.nbt.CompoundTag;
 
 /**
  * Synchronisation class for spell effects.
@@ -17,24 +16,24 @@ import net.minecraft.network.datasync.DataParameter;
  *
  * @param <T> The owning entity
  */
-public class EffectSync<T extends EntityLivingBase> {
+public class EffectSync {
 
     @Nullable
     private IMagicEffect effect;
 
-    private final ICaster<T> owned;
+    private final ICaster<?> owned;
 
-    private final DataParameter<NBTTagCompound> param;
+    private final TrackedData<CompoundTag> param;
 
-    public EffectSync(ICaster<T> owned, DataParameter<NBTTagCompound> param) {
+    public EffectSync(ICaster<?> owned, TrackedData<CompoundTag> param) {
         this.owned = owned;
         this.param = param;
     }
 
     public boolean has() {
-        NBTTagCompound comp = owned.getEntity().getDataManager().get(param);
+        CompoundTag comp = owned.getEntity().getDataTracker().get(param);
 
-        if (comp == null || !comp.hasKey("effect_id")) {
+        if (comp == null || !comp.containsKey("effect_id")) {
             if (effect != null) {
                 effect.setDead();
                 effect = null;
@@ -47,7 +46,7 @@ public class EffectSync<T extends EntityLivingBase> {
                     effect.setDead();
                 }
                 effect = SpellRegistry.instance().createEffectFromNBT(comp);
-            } else if (!owned.getEntity().world.isRemote && effect.isDirty()) {
+            } else if (!owned.getEntity().world.isClient() && effect.isDirty()) {
                 set(effect);
             }
         }
@@ -65,9 +64,9 @@ public class EffectSync<T extends EntityLivingBase> {
             return null;
         }
 
-        NBTTagCompound comp = owned.getEntity().getDataManager().get(param);
+        CompoundTag comp = owned.getEntity().getDataTracker().get(param);
 
-        if (comp == null || !comp.hasKey("effect_id")) {
+        if (comp == null || !comp.containsKey("effect_id")) {
             if (effect != null) {
                 effect.setDead();
                 effect = null;
@@ -80,8 +79,8 @@ public class EffectSync<T extends EntityLivingBase> {
                     effect.setDead();
                 }
                 effect = SpellRegistry.instance().createEffectFromNBT(comp);
-            } else if (owned.getEntity().world.isRemote) {
-                effect.readFromNBT(comp);
+            } else if (owned.getEntity().world.isClient()) {
+                effect.fromNBT(comp);
             } else if (effect.isDirty()) {
                 set(effect);
             }
@@ -101,9 +100,9 @@ public class EffectSync<T extends EntityLivingBase> {
         this.effect = effect;
 
         if (effect == null) {
-            owned.getEntity().getDataManager().set(param, new NBTTagCompound());
+            owned.getEntity().getDataTracker().set(param, new CompoundTag());
         } else {
-            owned.getEntity().getDataManager().set(param, SpellRegistry.instance().serializeEffectToNBT(effect));
+            owned.getEntity().getDataTracker().set(param, SpellRegistry.instance().serializeEffectToNBT(effect));
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerAbility.java b/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerAbility.java
index f7ac08e2..f34f0c6b 100644
--- a/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerAbility.java
+++ b/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerAbility.java
@@ -5,19 +5,15 @@ import java.util.UUID;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.annotations.Expose;
-import com.minelittlepony.jumpingcastle.api.IChannel;
-import com.minelittlepony.jumpingcastle.api.IMessage;
-import com.minelittlepony.jumpingcastle.api.IMessageHandler;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.power.IData;
-import com.minelittlepony.unicopia.power.IPower;
-import com.minelittlepony.unicopia.power.PowersRegistry;
+import com.minelittlepony.unicopia.SpeciesList;
+import com.minelittlepony.unicopia.ability.IData;
+import com.minelittlepony.unicopia.ability.IPower;
+import com.minelittlepony.unicopia.ability.powers.PowersRegistry;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
 
-@IMessage.Id(2)
-public class MsgPlayerAbility implements IMessage, IMessageHandler<MsgPlayerAbility> {
+public class MsgPlayerAbility {
 
     private static final Gson gson = new GsonBuilder()
             .excludeFieldsWithoutExposeAnnotation()
@@ -32,14 +28,14 @@ public class MsgPlayerAbility implements IMessage, IMessageHandler<MsgPlayerAbil
     @Expose
     private String abilityJson;
 
-    public MsgPlayerAbility(EntityPlayer player, IPower<?> power, IData data) {
-        senderId = player.getUniqueID();
+    public MsgPlayerAbility(PlayerEntity player, IPower<?> power, IData data) {
+        senderId = player.getUuid();
         powerIdentifier = power.getKeyName();
         abilityJson = gson.toJson(data, power.getPackageType());
     }
 
     private <T extends IData> void apply(IPower<T> power) {
-        IPlayer player = PlayerSpeciesList.instance().getPlayer(senderId);
+        IPlayer player = SpeciesList.instance().getPlayer(senderId);
         if (player == null) {
             return;
         }
diff --git a/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java b/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java
index e3698aba..c0850f53 100644
--- a/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java
+++ b/src/main/java/com/minelittlepony/unicopia/network/MsgPlayerCapabilities.java
@@ -12,10 +12,10 @@ import com.minelittlepony.jumpingcastle.api.IChannel;
 import com.minelittlepony.jumpingcastle.api.IMessage;
 import com.minelittlepony.jumpingcastle.api.IMessageHandler;
 import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.UClient;
 import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.nbt.CompressedStreamTools;
@@ -39,7 +39,7 @@ public class MsgPlayerCapabilities implements IMessage, IMessageHandler<MsgPlaye
     }
 
     public MsgPlayerCapabilities(IPlayer player) {
-        newRace = player.getPlayerSpecies();
+        newRace = player.getSpecies();
         senderId = player.getOwner().getUniqueID();
 
         try (ByteArrayOutputStream bytes = new ByteArrayOutputStream()) {
@@ -59,18 +59,18 @@ public class MsgPlayerCapabilities implements IMessage, IMessageHandler<MsgPlaye
         if (self == null) {
             Unicopia.log.warn("[Unicopia] [CLIENT] [MsgPlayerCapabilities] Player with id %s was not found!\n", senderId.toString());
         } else {
-            IPlayer player = PlayerSpeciesList.instance().getPlayer(self);
+            IPlayer player = SpeciesList.instance().getPlayer(self);
 
             if (compoundTag.length > 0) {
                 try (ByteArrayInputStream input = new ByteArrayInputStream(compoundTag)) {
                     NBTTagCompound nbt = CompressedStreamTools.read(new DataInputStream(input));
 
-                    player.readFromNBT(nbt);
+                    player.fromNBT(nbt);
                 } catch (IOException e) {
 
                 }
             } else {
-                player.setPlayerSpecies(newRace);
+                player.setSpecies(newRace);
             }
         }
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/network/MsgRequestCapabilities.java b/src/main/java/com/minelittlepony/unicopia/network/MsgRequestCapabilities.java
index 16bf54d5..a68f0140 100644
--- a/src/main/java/com/minelittlepony/unicopia/network/MsgRequestCapabilities.java
+++ b/src/main/java/com/minelittlepony/unicopia/network/MsgRequestCapabilities.java
@@ -7,9 +7,9 @@ import com.minelittlepony.jumpingcastle.api.IChannel;
 import com.minelittlepony.jumpingcastle.api.IMessage;
 import com.minelittlepony.jumpingcastle.api.IMessageHandler;
 import com.minelittlepony.unicopia.Race;
+import com.minelittlepony.unicopia.SpeciesList;
 import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
+import com.minelittlepony.unicopia.entity.player.IPlayer;
 
 import net.minecraft.entity.player.EntityPlayer;
 
@@ -29,10 +29,10 @@ public class MsgRequestCapabilities implements IMessage, IMessageHandler<MsgRequ
     @Override
     public void onPayload(MsgRequestCapabilities message, IChannel channel) {
         Unicopia.log.warn("[Unicopia] [SERVER] [MsgRequestCapabilities] Sending capabilities to player %s\n", senderId.toString());
-        IPlayer player = PlayerSpeciesList.instance().getPlayer(senderId);
+        IPlayer player = SpeciesList.instance().getPlayer(senderId);
 
-        if (player.getPlayerSpecies().isDefault()) {
-            player.setPlayerSpecies(message.race);
+        if (player.getSpecies().isDefault()) {
+            player.setSpecies(message.race);
         }
 
         channel.respond(new MsgPlayerCapabilities(player), senderId);
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/EntityParticleEmitter.java b/src/main/java/com/minelittlepony/unicopia/particle/EntityParticleEmitter.java
deleted file mode 100644
index afe60159..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/EntityParticleEmitter.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.minelittlepony.unicopia.particle;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-import net.minecraft.world.WorldServer;
-
-public class EntityParticleEmitter {
-
-    public void emitDestructionParticles(Entity e, IBlockState blockState) {
-        float f = 0.1f;
-        int total = 64 * (int)(e.width * e.height * e.width);
-        for (int i = 0; i < total; i++) {
-            double x = MathHelper.nextDouble(e.getEntityWorld().rand, e.posX - e.width/2 - f, e.posX + e.width/2 + f);
-            double y = MathHelper.nextDouble(e.getEntityWorld().rand, e.posY - f, e.posY + e.height + f);
-            double z = MathHelper.nextDouble(e.getEntityWorld().rand, e.posZ - e.width/2 - f, e.posZ + e.width/2 + f);
-            spawnDiggingFX(e.getEntityWorld(), x, y, z, x - (int)x - 0.5, y - (int)y - 0.5, z - (int)z - 0.5, blockState, 1, 1);
-        }
-    }
-
-    public void emitDiggingParticles(Entity e, IBlockState blockState) {
-        for (int side = 0; side < 6; side++) {
-            addBlockHitEffectsToEntity(e, blockState, side);
-        }
-    }
-
-    private void addBlockHitEffectsToEntity(Entity e, IBlockState blockState, int side) {
-        side = side % 6;
-        float f = 0.25f;
-        double x = MathHelper.nextDouble(e.getEntityWorld().rand, e.posX - e.width/2 - f, e.posX + e.width/2 + f);
-        double y = MathHelper.nextDouble(e.getEntityWorld().rand, e.posY - f, e.posY + e.height + f);
-        double z = MathHelper.nextDouble(e.getEntityWorld().rand, e.posZ - e.width/2 - f, e.posZ + e.width/2 + f);
-
-        double vX = 0;
-        double vY = 0;
-        double vZ = 0;
-
-        if (side == 0) y = e.posY - f;
-        if (side == 1) {
-            y = e.posY + e.height + f;
-            vY += 0.5;
-        }
-        if (side == 2) {
-            z = e.posZ - e.width/2 - f;
-            vZ -= 0.5;
-        }
-        if (side == 3) {
-            z = e.posZ + e.width/2 + f;
-            vZ += 0.5;
-        }
-        if (side == 4) {
-            x = e.posX - e.width/2 - f;
-            vX -= 0.5;
-        }
-        if (side == 5) {
-            x = e.posX + e.width/2 + f;
-            vX += 0.5;
-        }
-
-        spawnDiggingFX(e.getEntityWorld(), x, y, z, vX, vY, vZ, blockState, 0.2F, 0.6F);
-    }
-
-    protected void spawnDiggingFX(World w, double x, double y, double z, double vX, double vY, double vZ, IBlockState blockState, float multScale, float multVel) {
-        if (w instanceof WorldServer) {
-            ((WorldServer)w).spawnParticle(EnumParticleTypes.BLOCK_CRACK, false, x, y, z, 1, 0, 0, 0, Math.sqrt(vX * vX + vY * vY + vZ * vZ) * multVel, Block.getStateId(blockState));
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/IAttachableParticle.java b/src/main/java/com/minelittlepony/unicopia/particle/IAttachableParticle.java
deleted file mode 100644
index d4d39eb1..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/IAttachableParticle.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package com.minelittlepony.unicopia.particle;
-
-import com.minelittlepony.unicopia.spell.ICaster;
-
-public interface IAttachableParticle {
-
-    boolean isStillAlive();
-
-    void attachTo(ICaster<?> caster);
-
-    void setAttribute(int key, Object value);
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/Particles.java b/src/main/java/com/minelittlepony/unicopia/particle/Particles.java
deleted file mode 100644
index 39dc6ee1..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/Particles.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package com.minelittlepony.unicopia.particle;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.UClient;
-import com.minelittlepony.unicopia.particle.client.ParticlesClient;
-
-import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.World;
-
-public class Particles<Particle> {
-
-    private static Particles<?> instance;
-
-    @SuppressWarnings("unchecked")
-    public static <T> Particles<T> instance() {
-        if (instance == null) {
-            if (UClient.isClientSide()) {
-                instance = new ParticlesClient();
-            } else {
-                instance = new Particles<>();
-            }
-        }
-        return (Particles<T>)instance;
-    }
-
-    protected final List<IFactory<Particle>> registeredParticles = new ArrayList<>();
-
-    private final EntityParticleEmitter entityEmitter = new EntityParticleEmitter();
-
-    public EntityParticleEmitter getEntityEmitter() {
-        return entityEmitter;
-    }
-
-    public int registerParticle(IFactory<Particle> factory) {
-        int id = registeredParticles.size();
-        registeredParticles.add(factory);
-        return -id - 1;
-    }
-
-    @Nullable
-    public Optional<IAttachableParticle> spawnParticle(int particleId, boolean ignoreDistance, Vec3d pos, Vec3d vel, int ...pars) {
-        return spawnParticle(particleId, ignoreDistance, pos.x, pos.y, pos.z, vel.x, vel.y, vel.z, pars);
-    }
-
-    @Nullable
-    public Optional<IAttachableParticle> spawnParticle(int particleId, boolean ignoreDistance, Vec3d pos, double speedX, double speedY, double speedZ, int ...pars) {
-        return spawnParticle(particleId, ignoreDistance, pos.x, pos.y, pos.z, speedX, speedY, speedZ, pars);
-    }
-
-    @Nullable
-    public Optional<IAttachableParticle> spawnParticle(int particleId, boolean ignoreDistance, double posX, double posY, double posZ, double speedX, double speedY, double speedZ, int ...pars) {
-        /* noop */
-        /* or network */
-        /* i don't know */
-        /* ... */
-        /* maybe later */
-
-        return Optional.empty();
-    }
-
-    public static interface IFactory<T> {
-        @Nonnull
-        T createParticle(int id, World world, double x, double y, double z, double dx, double dy, double dz, int... args);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleChanglingMagic.java b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleChanglingMagic.java
deleted file mode 100644
index bec88f1c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleChanglingMagic.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.minelittlepony.unicopia.particle.client;
-
-import net.minecraft.client.particle.ParticlePortal;
-import net.minecraft.world.World;
-
-public class ParticleChanglingMagic extends ParticlePortal {
-
-    private int baseTextureIndex = 128;
-
-    public ParticleChanglingMagic(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
-        this(w, x, y, z, vX, vY, vZ);
-    }
-
-    public ParticleChanglingMagic(World world, double x, double y, double z, double dx, double dy, double dz) {
-        super(world, x, y, z, dx, dy, dz);
-
-        float intensity = rand.nextFloat() * 0.6F + 0.4F;
-
-        particleRed = intensity * 0.5F;
-        particleGreen = intensity;
-        particleBlue = intensity * 0.4f;
-
-        setParticleTextureIndex((int)(Math.random() * 8.0D));
-    }
-
-    @Override
-    public void onUpdate() {
-        setParticleTextureIndex(baseTextureIndex + (7 - particleAge * 8 / particleMaxAge));
-
-        super.onUpdate();
-    }
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleDisk.java b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleDisk.java
deleted file mode 100644
index c1b0ecd6..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleDisk.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.minelittlepony.unicopia.particle.client;
-
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.entity.Entity;
-import net.minecraft.world.World;
-
-import com.minelittlepony.unicopia.model.ModelDisk;
-import com.minelittlepony.util.render.Color;
-
-public class ParticleDisk extends ParticleSphere {
-
-    private static final ModelDisk model = new ModelDisk();
-
-    protected float rotX;
-    protected float rotY;
-    protected float rotZ;
-
-    public ParticleDisk(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
-        this(w, x, y, z, args[0]/255F, args[1]/255F, args[2]/255F, args[3], args[4], args[5]/255F);
-    }
-
-    public ParticleDisk(World w, double x, double y, double z, float rX, float rY, float rZ, int radius, int tint, float alpha) {
-        super(w, x, y, z, radius, tint, alpha);
-
-        rotX = rX;
-        rotY = rY;
-        rotZ = rZ;
-    }
-
-    public void renderParticle(BufferBuilder buffer, Entity viewer, float partialTicks, float x, float z, float yz, float xy, float xz) {
-        if (alpha <= 0) {
-            return;
-        }
-
-        Color.glColor(tint, alpha);
-
-        model.setPosition(posX, posY, posZ);
-        model.render(radius);
-
-        GlStateManager.color(1, 1, 1, 1);
-    }
-}
-
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleRaindrops.java b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleRaindrops.java
deleted file mode 100644
index 65fe3b84..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticleRaindrops.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.minelittlepony.unicopia.particle.client;
-
-import net.minecraft.client.particle.ParticleRain;
-import net.minecraft.world.World;
-
-public class ParticleRaindrops extends ParticleRain {
-
-    public ParticleRaindrops(int id, World w, double x, double y, double z, double vX, double vY, double vZ, int... args) {
-        this(w, x, y, z);
-    }
-
-    public ParticleRaindrops(World w, double x, double y, double z) {
-        super(w, x, y, z);
-        motionY = -0.1;
-        particleMaxAge += 19;
-    }
-
-    public void onUpdate() {
-        super.onUpdate();
-
-        if (onGround) {
-            motionX *= 0.30000001192092896D;
-            motionY = Math.random() * 0.20000000298023224D + 0.10000000149011612D;
-            motionZ *= 0.30000001192092896D;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticlesClient.java b/src/main/java/com/minelittlepony/unicopia/particle/client/ParticlesClient.java
deleted file mode 100644
index 626e09f7..00000000
--- a/src/main/java/com/minelittlepony/unicopia/particle/client/ParticlesClient.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.minelittlepony.unicopia.particle.client;
-
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.particle.IAttachableParticle;
-import com.minelittlepony.unicopia.particle.Particles;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.particle.Particle;
-import net.minecraft.entity.Entity;
-
-public class ParticlesClient extends Particles<Particle> {
-
-    static final int PARTICLES_ALL = 0;
-    static final int PARTICLES_DECREASED = 1;
-    static final int PARTICLES_MINIMAL = 2;
-
-    private final Minecraft mc = Minecraft.getMinecraft();
-
-    @Override
-    public Optional<IAttachableParticle> spawnParticle(int particleId, boolean ignoreDistance, double posX, double posY, double posZ, double speedX, double speedY, double speedZ, int ...pars) {
-        Entity entity = mc.getRenderViewEntity();
-
-        if (entity != null && mc.effectRenderer != null) {
-            if (ignoreDistance || (entity.getDistanceSq(posX, posY, posZ) <= 1024 && calculateParticleLevel(false) < 2)) {
-                return spawnEffectParticle(particleId, posX, posY, posZ, speedX, speedY, speedZ, pars);
-            }
-        }
-
-        return Optional.empty();
-    }
-
-    @Nullable
-    private Optional<IAttachableParticle> spawnEffectParticle(int particleId, double posX, double posY, double posZ, double speedX, double speedY, double speedZ, int ...pars) {
-        if (particleId >= 0) {
-            // Not ours, delegate to mojang
-            mc.effectRenderer.spawnEffectParticle(particleId, posX, posY, posZ, speedX, speedY, speedZ, pars);
-        } else {
-            IFactory<Particle> factory = registeredParticles.get(-(particleId + 1));
-
-
-
-            if (factory != null) {
-                Particle particle = factory.createParticle(particleId, mc.world, posX, posY, posZ, speedX, speedY, speedZ, pars);
-
-                mc.effectRenderer.addEffect(particle);
-
-                if (particle instanceof IAttachableParticle) {
-                    return Optional.ofNullable((IAttachableParticle)particle);
-                }
-            }
-        }
-
-        return Optional.empty();
-    }
-
-    private int calculateParticleLevel(boolean minimiseLevel) {
-        int level = mc.gameSettings.particleSetting;
-
-        if (minimiseLevel && level == PARTICLES_MINIMAL && mc.world.rand.nextInt(10) == PARTICLES_ALL) {
-            level = PARTICLES_DECREASED;
-        }
-
-        if (level == PARTICLES_DECREASED && mc.world.rand.nextInt(3) == PARTICLES_ALL) {
-            level = PARTICLES_MINIMAL;
-        }
-
-        return level;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/particle/ParticleConnection.java b/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
similarity index 70%
rename from src/main/java/com/minelittlepony/unicopia/particle/ParticleConnection.java
rename to src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
index b08cbaa5..e026bbb8 100644
--- a/src/main/java/com/minelittlepony/unicopia/particle/ParticleConnection.java
+++ b/src/main/java/com/minelittlepony/unicopia/particles/ParticleConnection.java
@@ -1,9 +1,9 @@
-package com.minelittlepony.unicopia.particle;
+package com.minelittlepony.unicopia.particles;
 
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import com.minelittlepony.unicopia.spell.ICaster;
+import com.minelittlepony.unicopia.magic.ICaster;
 
 /**
  * A connection class for updating and persisting an attached particle effect.
@@ -21,4 +21,13 @@ public class ParticleConnection {
 
         return particleEffect;
     }
+
+    public interface IAttachableParticle {
+
+        boolean isStillAlive();
+
+        void attachTo(ICaster<?> caster);
+
+        void setAttribute(int key, Object value);
+    }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/particles/ParticleEmitter.java b/src/main/java/com/minelittlepony/unicopia/particles/ParticleEmitter.java
new file mode 100644
index 00000000..fa1b3082
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/particles/ParticleEmitter.java
@@ -0,0 +1,94 @@
+package com.minelittlepony.unicopia.particles;
+
+import java.util.EnumSet;
+import java.util.Random;
+
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.Entity;
+import net.minecraft.particle.BlockStateParticleEffect;
+import net.minecraft.particle.ParticleTypes;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.math.Direction;
+import net.minecraft.util.math.Direction.Axis;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.World;
+
+public class ParticleEmitter {
+
+    static final ParticleEmitter INSTANCE = new ParticleEmitter();
+
+    public static ParticleEmitter getInstance() {
+        return INSTANCE;
+    }
+
+    private static final Vec3d BUFFER = new Vec3d(0.25, 0.25, 0.25);
+    private static final Vec3d HALF = new Vec3d(0.5, 0.5, 0.5);
+
+    private static final EnumSet<Axis> ALL_EXES = EnumSet.allOf(Axis.class);
+
+    public void emitDestructionParticles(Entity entity, BlockState state) {
+
+        float height = entity.getHeight();
+        float width = entity.getWidth();
+
+        Vec3d dim = new Vec3d(width, height, width).add(BUFFER);
+        Vec3d origin = entity.getPos();
+
+        int total = (int)(32 * dim.length());
+
+        for (int i = 0; i < total; i++) {
+            Vec3d pos = centeredRange(entity.world.random, origin, dim);
+            Vec3d vel = pos.subtract(pos.floorAlongAxes(ALL_EXES).subtract(HALF));
+
+            spawnDiggingFX(entity.world, pos, vel, state, 1);
+        }
+    }
+
+    public void emitDiggingParticles(Entity entity, BlockState state) {
+
+        Vec3d area = new Vec3d(entity.getWidth(), entity.getHeight(), entity.getWidth()).add(BUFFER);
+        Vec3d origin = entity.getPos();
+
+        for (Direction side : Direction.values()) {
+            Vec3d plane = new Vec3d(side.getVector());
+
+            spawnDiggingFX(entity.getEntityWorld(),
+                    clampPlane(side.getAxis(),
+                            centeredRange(entity.world.random, origin, area),
+                            origin.add(area.multiply(plane))
+                    ),
+                    plane.multiply(0.5), state, 0.6F);
+        }
+    }
+
+    private Vec3d clampPlane(Axis axis, Vec3d vector, Vec3d plane) {
+        return new Vec3d(
+                axis == Axis.X ? plane.x : vector.x,
+                axis == Axis.Y ? plane.y : vector.y,
+                axis == Axis.Z ? plane.z : vector.z
+        );
+    }
+
+    private Vec3d centeredRange(Random rand, Vec3d center, Vec3d max) {
+        return center
+                .add(new Vec3d(
+                            rand.nextFloat(),
+                            rand.nextFloat(), rand.nextFloat()
+                    ).multiply(max))
+                .subtract(max.multiply(0.5D));
+    }
+
+    protected void spawnDiggingFX(World w, Vec3d pos, Vec3d vel, BlockState blockState, float multVel) {
+        if (w instanceof ServerWorld) {
+
+            double speed = vel.length() * multVel;
+            vel = vel.normalize();
+
+            ((ServerWorld)w).spawnParticles(new BlockStateParticleEffect(ParticleTypes.BLOCK, blockState),
+                    pos.x, pos.y, pos.z, 1,
+                    vel.x, vel.y, vel.z,
+                    speed
+            );
+        }
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/particles/ParticleUtils.java b/src/main/java/com/minelittlepony/unicopia/particles/ParticleUtils.java
new file mode 100644
index 00000000..6c11b99b
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/particles/ParticleUtils.java
@@ -0,0 +1,28 @@
+package com.minelittlepony.unicopia.particles;
+
+import com.minelittlepony.util.shape.IShape;
+import com.minelittlepony.util.shape.Sphere;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.particle.ParticleEffect;
+
+/**
+ * Utility interface for spawning particles.
+ */
+public final class ParticleUtils {
+
+    public static void spawnParticles(ParticleEffect particleId, Entity entity, int count) {
+        double halfDist = entity.getStandingEyeHeight() / 1.5;
+        double middle = entity.getBoundingBox().minY + halfDist;
+
+        IShape shape = new Sphere(false, (float)halfDist + entity.getWidth());
+
+        shape.randomPoints(count, entity.world.random).forEach(point -> {
+            entity.world.addParticle(particleId,
+                    entity.x + point.x,
+                    middle + point.y,
+                    entity.z + point.z,
+                    0, 0, 0);
+        });
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/EntityCapabilities.java b/src/main/java/com/minelittlepony/unicopia/player/EntityCapabilities.java
deleted file mode 100644
index 61a0fbba..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/EntityCapabilities.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import java.util.Map;
-
-import com.google.common.collect.Maps;
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.network.EffectSync;
-import com.minelittlepony.unicopia.spell.IAligned;
-import com.minelittlepony.unicopia.spell.IAttachedEffect;
-import com.minelittlepony.unicopia.spell.ICaster;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-
-public class EntityCapabilities implements IRaceContainer<EntityLivingBase>, ICaster<EntityLivingBase> {
-
-    private static final Map<Class<? extends EntityLivingBase>, DataParameter<NBTTagCompound>> EFFECT_KEYS = Maps.newHashMap();
-
-    private final DataParameter<NBTTagCompound> EFFECT;
-
-    private final EffectSync<EntityLivingBase> effectDelegate;
-
-    private EntityLivingBase entity;
-
-    EntityCapabilities(EntityLivingBase entity) {
-        setOwner(entity);
-
-        EFFECT = EFFECT_KEYS.computeIfAbsent(entity.getClass(), c -> {
-            return EntityDataManager.createKey(c, DataSerializers.COMPOUND_TAG);
-        });
-        effectDelegate = new EffectSync<>(this, EFFECT);
-
-        entity.getDataManager().register(EFFECT, new NBTTagCompound());
-    }
-
-    @Override
-    public Race getPlayerSpecies() {
-        return Race.HUMAN;
-    }
-
-    @Override
-    public void setPlayerSpecies(Race race) {
-    }
-
-    @Override
-    public void setEffect(IMagicEffect effect) {
-        effectDelegate.set(effect);
-    }
-
-    @Override
-    public <T extends IMagicEffect> T getEffect(Class<T> type, boolean update) {
-        return effectDelegate.get(type, update);
-    }
-
-    @Override
-    public boolean hasEffect() {
-        return effectDelegate.has();
-    }
-
-    @Override
-    public void beforeUpdate() {
-
-    }
-
-    @Override
-    public void onUpdate() {
-        if (hasEffect()) {
-            IAttachedEffect effect = getEffect(IAttachedEffect.class, true);
-
-            if (effect != null) {
-                if (entity.getEntityWorld().isRemote) {
-                    effect.renderOnPerson(this);
-                }
-
-                if (!effect.updateOnPerson(this)) {
-                    setEffect(null);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void onDimensionalTravel(int destinationDimension) {
-
-    }
-
-    @Override
-    public void setOwner(EntityLivingBase owner) {
-        entity = owner;
-    }
-
-    @Override
-    public EntityLivingBase getOwner() {
-        return entity;
-    }
-
-    @Override
-    public int getCurrentLevel() {
-        return 0;
-    }
-
-    @Override
-    public void setCurrentLevel(int level) {
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        if (getOwner() instanceof IAligned) {
-            return ((IAligned)getOwner()).getAffinity();
-        }
-        return SpellAffinity.NEUTRAL;
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        IMagicEffect effect = getEffect();
-
-        if (effect != null) {
-            compound.setTag("effect", SpellRegistry.instance().serializeEffectToNBT(effect));
-        }
-    }
-
-    @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        if (compound.hasKey("effect")) {
-            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompoundTag("effect")));
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/Hooks.java b/src/main/java/com/minelittlepony/unicopia/player/Hooks.java
deleted file mode 100644
index 4b1a3a70..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/Hooks.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.entity.IMagicals;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.math.RayTraceResult;
-
-import net.minecraftforge.event.entity.ProjectileImpactEvent;
-import net.minecraftforge.event.entity.item.ItemTossEvent;
-import net.minecraftforge.event.entity.living.LivingEntityUseItemEvent;
-import net.minecraftforge.event.entity.living.LivingEvent;
-import net.minecraftforge.event.entity.player.PlayerDropsEvent;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.entity.player.PlayerFlyableFallEvent;
-import net.minecraftforge.event.entity.player.PlayerSleepInBedEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
-
-@EventBusSubscriber(modid = Unicopia.MODID)
-class Hooks {
-    @SubscribeEvent
-    public static void onPlayerTick(TickEvent.PlayerTickEvent event) {
-        if (event.phase == Phase.END) {
-            PlayerSpeciesList.instance().getPlayer(event.player).onUpdate();
-        } else {
-            PlayerSpeciesList.instance().getPlayer(event.player).beforeUpdate();
-        }
-    }
-
-    @SubscribeEvent
-    public static void onLivingUpdate(LivingEvent.LivingUpdateEvent event) {
-        if (!(event.getEntityLiving() instanceof IMagicals)) {
-            PlayerSpeciesList.instance().getEntity(event.getEntityLiving()).onUpdate();
-        }
-    }
-
-    @SubscribeEvent
-    public static void onPlayerJump(LivingEvent.LivingJumpEvent event) {
-        if (event.getEntityLiving() instanceof EntityPlayer) {
-            if (PlayerSpeciesList.instance().getPlayer((EntityPlayer)event.getEntityLiving()).getGravity().getGravitationConstant() < 0) {
-                event.getEntityLiving().motionY = -event.getEntityLiving().motionY;
-            }
-        }
-    }
-
-    @SubscribeEvent
-    public static void onPlayerVisibilityCheck(PlayerEvent.Visibility event) {
-        if (PlayerSpeciesList.instance().getPlayer(event.getEntityPlayer()).isInvisible()) {
-            event.modifyVisibility(0);
-        }
-    }
-
-    @SubscribeEvent
-    public static void onPlayerTossItem(ItemTossEvent event) {
-        Race race = PlayerSpeciesList.instance().getPlayer(event.getPlayer()).getPlayerSpecies();
-
-        PlayerSpeciesList.instance().getEntity(event.getEntityItem()).setPlayerSpecies(race);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerDropItems(PlayerDropsEvent event) {
-
-        Race race = PlayerSpeciesList.instance().getPlayer(event.getEntityPlayer()).getPlayerSpecies();
-
-        event.getDrops().stream()
-            .map(PlayerSpeciesList.instance()::getEntity)
-            .forEach(item -> item.setPlayerSpecies(race));
-    }
-
-    @SubscribeEvent
-    public static void onPlayerTrySleep(PlayerSleepInBedEvent event) {
-        if (event.getResultStatus() == null) {
-            event.setResult(PlayerSpeciesList.instance().getPlayer(event.getEntityPlayer()).trySleep(event.getPos()));
-        }
-    }
-
-    @SubscribeEvent
-    public static void onPlayerFall(PlayerFlyableFallEvent event) {
-        PlayerSpeciesList.instance().getPlayer(event.getEntityPlayer()).onFall(event.getDistance(), event.getMultiplier());
-    }
-
-    @SubscribeEvent
-    public static void onProjectileHit(ProjectileImpactEvent event) {
-        RayTraceResult ray = event.getRayTraceResult();
-
-        if (!event.isCanceled()
-            && ray.typeOfHit == RayTraceResult.Type.ENTITY
-            && ray.entityHit instanceof EntityPlayer
-            && !PlayerSpeciesList.instance().getPlayer((EntityPlayer)ray.entityHit).onProjectileImpact(event.getEntity())) {
-            event.setCanceled(true);
-        }
-    }
-
-    @SubscribeEvent
-    public static void onItemUseBegin(LivingEntityUseItemEvent.Start event) {
-        Entity e = event.getEntity();
-
-        if (!event.isCanceled() && e instanceof EntityPlayer) {
-            PlayerSpeciesList.instance().getPlayer((EntityPlayer)e).getFood().begin(event.getItem());
-        }
-    }
-
-    @SubscribeEvent
-    public static void onItemUseCancel(LivingEntityUseItemEvent.Stop event) {
-        Entity e = event.getEntity();
-
-        if (!event.isCanceled() && e instanceof EntityPlayer) {
-            PlayerSpeciesList.instance().getPlayer((EntityPlayer)e).getFood().end();
-        }
-    }
-
-    @SubscribeEvent
-    public static void onItemUseFinish(LivingEntityUseItemEvent.Finish event) {
-        Entity e = event.getEntity();
-
-        if (!event.isCanceled() && e instanceof EntityPlayer) {
-            PlayerSpeciesList.instance().getPlayer((EntityPlayer)e).getFood().finish();
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/IRaceContainer.java b/src/main/java/com/minelittlepony/unicopia/player/IRaceContainer.java
deleted file mode 100644
index ac284035..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/IRaceContainer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.util.serialisation.InbtSerialisable;
-
-import net.minecraft.entity.Entity;
-
-/**
- * Generic container for an entity that has a race.
- *
- * @param <T> The type of owner
- */
-public interface IRaceContainer<T extends Entity> extends InbtSerialisable, IUpdatable {
-    Race getPlayerSpecies();
-
-    void setPlayerSpecies(Race race);
-
-    void onDimensionalTravel(int destinationDimension);
-
-    /**
-     * Called at the beginning of a player's update cycle.
-     */
-    void beforeUpdate();
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/ItemCapabilities.java b/src/main/java/com/minelittlepony/unicopia/player/ItemCapabilities.java
deleted file mode 100644
index 249aa4ef..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/ItemCapabilities.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import com.minelittlepony.unicopia.Race;
-
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.nbt.NBTTagCompound;
-
-class ItemCapabilities implements IRaceContainer<EntityItem>, IOwned<EntityItem> {
-
-    private Race race = Race.HUMAN;
-
-    private EntityItem owner;
-
-    @Override
-    public void onUpdate() {
-
-    }
-
-    @Override
-    public void beforeUpdate() {
-
-    }
-
-    @Override
-    public Race getPlayerSpecies() {
-        return race;
-    }
-
-    @Override
-    public void setPlayerSpecies(Race race) {
-        this.race = race;
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        compound.setString("owner_species", race.name());
-    }
-
-
-    @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        race = Race.fromName(compound.getString("owner_species"));
-    }
-
-    @Override
-    public void setOwner(EntityItem owner) {
-        this.owner = owner;
-    }
-
-    @Override
-    public void onDimensionalTravel(int destinationDimension) {
-
-    }
-
-    @Override
-    public EntityItem getOwner() {
-        return owner;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerAttributes.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerAttributes.java
deleted file mode 100644
index aa0d2fca..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerAttributes.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import java.util.UUID;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.inventory.InventoryOfHolding;
-
-import net.minecraft.entity.SharedMonsterAttributes;
-import net.minecraft.entity.ai.attributes.AttributeModifier;
-import net.minecraft.entity.ai.attributes.IAttribute;
-import net.minecraft.entity.ai.attributes.IAttributeInstance;
-import net.minecraft.entity.player.EntityPlayer;
-
-class PlayerAttributes {
-    public static final int ADD = 0;
-    public static final int ADD_PERCENTAGE = 1;
-    public static final int MULTIPLY = 2;
-
-    private static final AttributeModifier EARTH_PONY_STRENGTH =
-            new AttributeModifier(UUID.fromString("777a5505-521e-480b-b9d5-6ea54f259564"), "Earth Pony Strength", 0.6, MULTIPLY);
-
-    private static final AttributeModifier PEGASUS_SPEED =
-            new AttributeModifier(UUID.fromString("9e2699fc-3b8d-4f71-9d2d-fb92ee19b4f7"), "Pegasus Speed", 0.2, MULTIPLY);
-
-    private static final AttributeModifier PEGASUS_REACH =
-            new AttributeModifier(UUID.fromString("707b50a8-03e8-40f4-8553-ecf67025fd6d"), "Pegasus Reach", 1.5, ADD);
-
-    private double loadStrength = 0;
-
-    private final WalkSpeed walker = new WalkSpeed();
-
-    public void applyAttributes(EntityPlayer entity, Race race) {
-        loadStrength = InventoryOfHolding.getContentsTotalWorth(entity.inventory, false);
-
-        walker.setPlayerWalkSpeed(entity.capabilities, 0.1F - (float)(loadStrength / 100000));
-
-        applyAttribute(entity, SharedMonsterAttributes.ATTACK_DAMAGE, EARTH_PONY_STRENGTH, race.canUseEarth());
-        applyAttribute(entity, SharedMonsterAttributes.KNOCKBACK_RESISTANCE, EARTH_PONY_STRENGTH, race.canUseEarth());
-        applyAttribute(entity, SharedMonsterAttributes.MOVEMENT_SPEED, PEGASUS_SPEED, race.canFly());
-        applyAttribute(entity, SharedMonsterAttributes.ATTACK_SPEED, PEGASUS_SPEED, race.canFly());
-        applyAttribute(entity, EntityPlayer.REACH_DISTANCE, PEGASUS_REACH, race.canFly());
-    }
-
-    private void applyAttribute(EntityPlayer entity, IAttribute attribute, AttributeModifier modifier, boolean enable) {
-        IAttributeInstance instance = entity.getEntityAttribute(attribute);
-
-        if (enable) {
-            if (instance.getModifier(modifier.getID()) == null) {
-                instance.applyModifier(modifier);
-            }
-        } else {
-            if (instance.getModifier(modifier.getID()) != null) {
-                instance.removeModifier(modifier);
-            }
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
deleted file mode 100644
index 0798d947..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerCapabilities.java
+++ /dev/null
@@ -1,498 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.Maps;
-import com.minelittlepony.model.anim.BasicEasingInterpolator;
-import com.minelittlepony.model.anim.IInterpolator;
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.enchanting.PageState;
-import com.minelittlepony.unicopia.entity.EntityCuccoon;
-import com.minelittlepony.unicopia.init.UEffects;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.item.ICastable;
-import com.minelittlepony.unicopia.network.EffectSync;
-import com.minelittlepony.unicopia.network.MsgPlayerCapabilities;
-import com.minelittlepony.unicopia.spell.IAttachedEffect;
-import com.minelittlepony.unicopia.spell.IHeldEffect;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellAffinity;
-import com.minelittlepony.unicopia.spell.SpellDisguise;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.entity.player.EntityPlayer.SleepResult;
-import net.minecraft.init.MobEffects;
-import net.minecraft.item.ItemFood;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.network.datasync.DataParameter;
-import net.minecraft.network.datasync.DataSerializers;
-import net.minecraft.network.datasync.EntityDataManager;
-import net.minecraft.network.play.server.SPacketSetPassengers;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.stats.StatList;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextComponentTranslation;
-import net.minecraft.world.EnumDifficulty;
-
-class PlayerCapabilities implements IPlayer {
-
-    private static final DataParameter<Integer> PLAYER_RACE = EntityDataManager
-            .createKey(EntityPlayer.class, DataSerializers.VARINT);
-
-    private static final DataParameter<Float> ENERGY = EntityDataManager
-            .createKey(EntityPlayer.class, DataSerializers.FLOAT);
-
-    private static final DataParameter<Float> EXERTION = EntityDataManager
-            .createKey(EntityPlayer.class, DataSerializers.FLOAT);
-
-    private static final DataParameter<NBTTagCompound> EFFECT = EntityDataManager
-            .createKey(EntityPlayer.class, DataSerializers.COMPOUND_TAG);
-    private static final DataParameter<NBTTagCompound> HELD_EFFECT = EntityDataManager
-            .createKey(EntityPlayer.class, DataSerializers.COMPOUND_TAG);
-
-    private final Map<ResourceLocation, PageState> pageStates = Maps.newHashMap();
-
-    private final PlayerAbilityDelegate powers = new PlayerAbilityDelegate(this);
-
-    private final PlayerGravityDelegate gravity = new PlayerGravityDelegate(this);
-
-    private final PlayerAttributes attributes = new PlayerAttributes();
-
-    private final PlayerView view = new PlayerView(this);
-
-    private final PlayerFood food = new PlayerFood(this);
-
-    private final PlayerInventory inventory = new PlayerInventory(this);
-
-    private final EffectSync<EntityPlayer> effectDelegate = new EffectSync<>(this, EFFECT);
-    private final EffectSync<EntityPlayer> heldEffectDelegate = new EffectSync<>(this, HELD_EFFECT);
-
-    private final IInterpolator interpolator = new BasicEasingInterpolator();
-
-    private float nextStepDistance = 1;
-
-    private EntityPlayer entity;
-
-    private boolean dirty = false;
-
-    private boolean invisible = false;
-
-    PlayerCapabilities(EntityPlayer player) {
-        setOwner(player);
-
-        player.getDataManager().register(PLAYER_RACE, Race.EARTH.ordinal());
-        player.getDataManager().register(EXERTION, 0F);
-        player.getDataManager().register(ENERGY, 0F);
-        player.getDataManager().register(EFFECT, new NBTTagCompound());
-        player.getDataManager().register(HELD_EFFECT, new NBTTagCompound());
-    }
-
-    @Override
-    public Race getPlayerSpecies() {
-        if (getOwner() == null) {
-            return Race.HUMAN;
-        }
-
-        return Race.fromId(getOwner().getDataManager().get(PLAYER_RACE));
-    }
-
-    @Override
-    public void setPlayerSpecies(Race race) {
-        EntityPlayer player = getOwner();
-
-        race = PlayerSpeciesList.instance().validate(race, player);
-
-        player.getDataManager().set(PLAYER_RACE, race.ordinal());
-
-        player.capabilities.allowFlying = race.canFly();
-        gravity.updateFlightStat(player, player.capabilities.isFlying);
-
-        player.sendPlayerAbilities();
-        sendCapabilities(false);
-    }
-
-    @Override
-    public float getExertion() {
-        return getOwner().getDataManager().get(EXERTION);
-    }
-
-    @Override
-    public void setExertion(float exertion) {
-        getOwner().getDataManager().set(EXERTION, Math.max(0, exertion));
-    }
-
-    @Override
-    public float getEnergy() {
-        return getOwner().getDataManager().get(ENERGY);
-    }
-
-    @Override
-    public void setEnergy(float energy) {
-        getOwner().getDataManager().set(ENERGY, Math.max(0, energy));
-    }
-
-    @Override
-    public boolean isInvisible() {
-        return invisible && hasEffect();
-    }
-
-    @Override
-    public void setInvisible(boolean invisible) {
-        this.invisible = invisible;
-    }
-
-    @Nullable
-    @Override
-    public IHeldEffect getHeldEffect(ItemStack stack) {
-
-        if (!getPlayerSpecies().canCast()) {
-            heldEffectDelegate.set(null);
-
-            return null;
-        }
-
-        IHeldEffect heldEffect = heldEffectDelegate.get(IHeldEffect.class, true);
-
-        if (heldEffect == null || !heldEffect.getName().equals(SpellRegistry.getKeyFromStack(stack))) {
-            heldEffect = SpellRegistry.instance().getHeldFrom(stack);
-            heldEffectDelegate.set(heldEffect);
-        }
-
-        return heldEffect;
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
-    }
-
-    @Override
-    public void sendCapabilities(boolean full) {
-        dirty = false;
-
-        if (!getWorld().isRemote) {
-            if (full) {
-                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(this));
-            } else {
-                Unicopia.getConnection().broadcast(new MsgPlayerCapabilities(getPlayerSpecies(), getOwner()));
-            }
-        }
-    }
-
-    @Override
-    public void onDimensionalTravel(int destinationDimension) {
-        if (!getWorld().isRemote) {
-            dirty = true;
-        }
-    }
-
-    @Override
-    public IAbilityReceiver getAbilities() {
-        return powers;
-    }
-
-    @Override
-    public IGravity getGravity() {
-        return gravity;
-    }
-
-    @Override
-    public IView getCamera() {
-        return view;
-    }
-
-    @Override
-    public IInterpolator getInterpolator() {
-        return interpolator;
-    }
-
-    @Override
-    public void beforeUpdate() {
-        if (entity.world.isRemote) {
-            if (entity.isRiding() && entity.isSneaking()) {
-
-                Entity ridee = entity.getRidingEntity();
-
-                if (ridee instanceof EntityCuccoon) {
-                    if (((EntityCuccoon)ridee).attemptDismount(entity)) {
-                        entity.dismountRidingEntity();
-                    } else {
-                        entity.setSneaking(false);
-                    }
-                } else {
-                    entity.dismountRidingEntity();
-
-                    if (ridee instanceof EntityPlayerMP) {
-                        ((EntityPlayerMP)ridee).getServerWorld().getEntityTracker().sendToTrackingAndSelf(ridee, new SPacketSetPassengers(ridee));
-                    }
-                }
-            }
-        }
-
-        powers.onUpdate();
-        inventory.onUpdate();
-    }
-
-    @Override
-    public void onUpdate() {
-        gravity.onUpdate();
-
-        if (hasEffect()) {
-            IAttachedEffect effect = getEffect(IAttachedEffect.class, true);
-
-            if (effect != null) {
-                if (entity.getEntityWorld().isRemote) {
-                    effect.renderOnPerson(this);
-                }
-
-                if (!effect.updateOnPerson(this)) {
-                    setEffect(null);
-                }
-            }
-        }
-
-        ItemStack stack = getOwner().getHeldItem(EnumHand.MAIN_HAND);
-
-        IHeldEffect effect = getHeldEffect(stack);
-
-        if (effect != null) {
-            SpellAffinity affinity = stack.getItem() instanceof ICastable ? ((ICastable)stack.getItem()).getAffinity(stack) : SpellAffinity.NEUTRAL;
-
-            effect.updateInHand(this, affinity);
-        }
-
-        addExertion(-1);
-        addEnergy(-1);
-
-        attributes.applyAttributes(entity, getPlayerSpecies());
-
-        if (dirty) {
-            sendCapabilities(true);
-        }
-    }
-
-    @Override
-    public void onFall(float distance, float damageMultiplier) {
-        if (!getWorld().isRemote) {
-            if (getPlayerSpecies().canFly()) {
-                if (entity.fallDistance > 2) {
-                    entity.addStat(StatList.FALL_ONE_CM, (int)Math.round(distance * 100));
-                }
-
-                gravity.landHard(entity, distance, damageMultiplier);
-            }
-        }
-    }
-
-    @Override
-    public boolean onProjectileImpact(Entity projectile) {
-
-        if (hasEffect()) {
-            IMagicEffect effect = getEffect();
-            if (effect instanceof SpellDisguise && !effect.getDead()) {
-                Entity disguise = ((SpellDisguise)effect).getDisguise();
-
-                if (disguise == projectile) {
-                    return false;
-                }
-            }
-        }
-
-        return true;
-    }
-
-    @Override
-    public boolean subtractEnergyCost(double foodSubtract) {
-        if (!entity.capabilities.isCreativeMode) {
-            int food = (int)(entity.getFoodStats().getFoodLevel() - foodSubtract);
-
-            if (food < 0) {
-                entity.getFoodStats().addStats(-entity.getFoodStats().getFoodLevel(), 0);
-                entity.attackEntityFrom(DamageSource.MAGIC, -food/2);
-            } else {
-                entity.getFoodStats().addStats((int)-foodSubtract, 0);
-            }
-        }
-
-        return entity.getHealth() > 0;
-    }
-
-    @Override
-    public boolean stepOnCloud() {
-        EntityPlayer player = getOwner();
-
-        if (player.fallDistance > 1 || player.distanceWalkedOnStepModified > nextStepDistance) {
-            nextStepDistance = player.distanceWalkedOnStepModified + 2;
-            player.fallDistance = 0;
-
-            return true;
-        }
-
-        return false;
-    }
-
-    @Override
-    public SleepResult trySleep(BlockPos pos) {
-
-
-        if (getInventory().isWearing(UItems.alicorn_amulet)) {
-            if (!getWorld().isRemote) {
-                entity.sendStatusMessage(new TextComponentTranslation("tile.bed.youAreAMonster"), true);
-            }
-            return SleepResult.OTHER_PROBLEM;
-        }
-
-        if (findAllSpellsInRange(10).anyMatch(c -> c instanceof IPlayer && ((IPlayer)c).getInventory().isWearing(UItems.alicorn_amulet))) {
-            return SleepResult.NOT_SAFE;
-        }
-
-        return null;
-    }
-
-    @Override
-    public IFood getFood() {
-        return food;
-    }
-
-    @Override
-    public IInventory getInventory() {
-        return inventory;
-    }
-
-    @Override
-    public void onEat(ItemStack stack, @Nullable ItemFood food) {
-        if (getPlayerSpecies() == Race.CHANGELING) {
-            EntityPlayer player = getOwner();
-
-            if (food != null) {
-                int health = food.getHealAmount(stack);
-                float saturation = food.getSaturationModifier(stack);
-
-                player.getFoodStats().addStats(-health/2, -saturation/2);
-
-                player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 100, 3, true, true));
-            } else {
-                player.addPotionEffect(new PotionEffect(MobEffects.NAUSEA, 200, 3, true, true));
-            }
-
-            if (player.world.getDifficulty() != EnumDifficulty.PEACEFUL && player.world.rand.nextInt(20) == 0) {
-                player.addPotionEffect(new PotionEffect(UEffects.FOOD_POISONING, 3, 2, true, true));
-            }
-
-            player.addPotionEffect(new PotionEffect(MobEffects.WEAKNESS, 2000, 2, true, true));
-        }
-    }
-
-    @Override
-    public void writeToNBT(NBTTagCompound compound) {
-        compound.setString("playerSpecies", getPlayerSpecies().name());
-
-        compound.setTag("powers", powers.toNBT());
-        compound.setTag("gravity", gravity.toNBT());
-
-        IMagicEffect effect = getEffect();
-
-        if (effect != null) {
-            compound.setTag("effect", SpellRegistry.instance().serializeEffectToNBT(effect));
-        }
-
-        if (!pageStates.isEmpty()) {
-            NBTTagCompound pages = new NBTTagCompound();
-            boolean written = false;
-
-            for (Map.Entry<ResourceLocation, PageState> entry : pageStates.entrySet()) {
-                if (entry.getValue() != PageState.LOCKED) {
-                    pages.setString(entry.getKey().toString(), entry.getValue().name());
-                    written = true;
-                }
-            }
-
-            if (written) {
-                compound.setTag("pageStates", pages);
-            }
-        }
-    }
-
-    @Override
-    public void readFromNBT(NBTTagCompound compound) {
-        setPlayerSpecies(Race.fromName(compound.getString("playerSpecies")));
-
-        powers.readFromNBT(compound.getCompoundTag("powers"));
-        gravity.readFromNBT(compound.getCompoundTag("gravity"));
-
-        if (compound.hasKey("effect")) {
-            setEffect(SpellRegistry.instance().createEffectFromNBT(compound.getCompoundTag("effect")));
-        }
-
-        pageStates.clear();
-        if (compound.hasKey("pageStates")) {
-            NBTTagCompound pages = compound.getCompoundTag("pageStates");
-
-            for (String key : pages.getKeySet()) {
-                PageState state = PageState.of(pages.getString(key));
-
-                if (state != PageState.LOCKED) {
-                    pageStates.put(new ResourceLocation(key), state);
-                }
-            }
-        }
-    }
-
-    @Override
-    public void copyFrom(IPlayer oldPlayer) {
-        setEffect(oldPlayer.getEffect());
-        setPlayerSpecies(oldPlayer.getPlayerSpecies());
-    }
-
-    @Override
-    public void setEffect(@Nullable IMagicEffect effect) {
-        effectDelegate.set(effect);
-
-        sendCapabilities(true);
-    }
-
-    @Override
-    public boolean hasEffect() {
-        return effectDelegate.has();
-    }
-
-    @Nullable
-    @Override
-    public <T extends IMagicEffect> T getEffect(@Nullable Class<T> type, boolean update) {
-        return effectDelegate.get(type, update);
-    }
-
-    @Override
-    public void setOwner(EntityPlayer owner) {
-        entity = owner;
-    }
-
-    @Override
-    public EntityPlayer getOwner() {
-        return entity;
-    }
-
-    @Override
-    public int getCurrentLevel() {
-        return 0;
-    }
-
-    @Override
-    public void setCurrentLevel(int level) {
-    }
-
-    @Override
-    public Map<ResourceLocation, PageState> getPageStates() {
-        return pageStates;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerFood.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerFood.java
deleted file mode 100644
index aa3a797c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerFood.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import net.minecraft.item.EnumAction;
-import net.minecraft.item.ItemFood;
-import net.minecraft.item.ItemStack;
-
-class PlayerFood implements IFood {
-
-    private final IPlayer player;
-
-    private ItemStack eatingStack = ItemStack.EMPTY;
-
-
-    public PlayerFood(IPlayer player) {
-        this.player = player;
-    }
-
-
-    @Override
-    public void begin(ItemStack stack) {
-        eatingStack = ItemStack.EMPTY;
-
-        if (!stack.isEmpty()) {
-            EnumAction action = stack.getItemUseAction();
-
-            if (action == EnumAction.EAT && stack.getItem() instanceof ItemFood) {
-                eatingStack = stack.copy();
-            }
-        }
-    }
-
-    @Override
-    public void end() {
-        eatingStack = ItemStack.EMPTY;
-    }
-
-    @Override
-    public void finish() {
-        if (!eatingStack.isEmpty()) {
-            player.onEat(eatingStack, (ItemFood)eatingStack.getItem());
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java b/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java
deleted file mode 100644
index 4d05be23..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/PlayerSpeciesList.java
+++ /dev/null
@@ -1,100 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import java.util.UUID;
-
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.UConfig;
-import com.minelittlepony.unicopia.forgebullshit.FBS;
-import com.minelittlepony.unicopia.spell.ICaster;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.item.EntityItem;
-import net.minecraft.entity.player.EntityPlayer;
-
-public class PlayerSpeciesList {
-
-    private static final PlayerSpeciesList instance = new PlayerSpeciesList();
-
-    public static PlayerSpeciesList instance() {
-        return instance;
-    }
-
-    public boolean whiteListRace(Race race) {
-        boolean result = UConfig.instance().getSpeciesWhiteList().add(race);
-
-        UConfig.instance().save();
-
-        return result;
-    }
-
-    public boolean unwhiteListRace(Race race) {
-        boolean result = UConfig.instance().getSpeciesWhiteList().remove(race);
-
-        UConfig.instance().save();
-
-        return result;
-    }
-
-    public boolean speciesPermitted(Race race, EntityPlayer sender) {
-        if (race.isOp() && (sender == null || !sender.capabilities.isCreativeMode)) {
-            return false;
-        }
-
-        return race.isDefault() || UConfig.instance().getSpeciesWhiteList().isEmpty() || UConfig.instance().getSpeciesWhiteList().contains(race);
-    }
-
-    public Race validate(Race race, EntityPlayer sender) {
-        if (!speciesPermitted(race, sender)) {
-            race = Race.EARTH;
-
-            if (!speciesPermitted(race, sender)) {
-                race = Race.HUMAN;
-            }
-        }
-
-        return race;
-    }
-
-    public IRaceContainer<?> emptyContainer(Entity entity) {
-        if (entity instanceof EntityPlayer) {
-            return new PlayerCapabilities((EntityPlayer)entity);
-        }
-
-        if (entity instanceof EntityItem) {
-            return new ItemCapabilities();
-        }
-
-        if (entity instanceof EntityLivingBase) {
-            return new EntityCapabilities((EntityLivingBase)entity);
-        }
-
-        throw new IllegalArgumentException("entity");
-    }
-
-    @Nullable
-    public IPlayer getPlayer(@Nullable EntityPlayer player) {
-        if (player == null) {
-            return null;
-        }
-
-        return FBS.of(player).getPlayer();
-    }
-
-    @Nullable
-    public IPlayer getPlayer(UUID playerId) {
-        return getPlayer(IPlayer.getPlayerFromServer(playerId));
-    }
-
-    @SuppressWarnings("unchecked")
-    @Nullable
-    public <T extends EntityLivingBase> ICaster<T> getCaster(T entity) {
-        return (ICaster<T>)getEntity(entity);
-    }
-
-    public <T extends Entity> IRaceContainer<T> getEntity(T entity) {
-        return FBS.of(entity).getRaceContainer();
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/player/WalkSpeed.java b/src/main/java/com/minelittlepony/unicopia/player/WalkSpeed.java
deleted file mode 100644
index 441bfe8f..00000000
--- a/src/main/java/com/minelittlepony/unicopia/player/WalkSpeed.java
+++ /dev/null
@@ -1,72 +0,0 @@
-package com.minelittlepony.unicopia.player;
-
-import java.lang.reflect.Field;
-
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-
-import net.minecraft.entity.player.PlayerCapabilities;
-import net.minecraft.nbt.NBTTagCompound;;
-
-/**
- * Workaround for setting the player's walking speed.
- */
-@FUF(reason = "`setPlayerWalkSpeed(v)` is marked as client-only. Waiting on mixins...")
-class WalkSpeed {
-
-    private static boolean regularMethodCheck = true;
-
-    private static boolean reflexiveMethodCheck = true;
-    private static Field walkSpeed;
-
-    public void setPlayerWalkSpeed(PlayerCapabilities capabilities, float speed) {
-        if (capabilities.getWalkSpeed() == speed) {
-            return;
-        }
-
-        if (!setNormally(capabilities, speed)) {
-            if (!setReflexively(capabilities, speed)) {
-                setTheMostSlow(capabilities, speed);
-            }
-        }
-    }
-
-    private boolean setNormally(PlayerCapabilities capabilities, float speed) {
-        if (regularMethodCheck) {
-            try {
-                capabilities.setPlayerWalkSpeed(speed);
-            } catch (Throwable t) {
-                regularMethodCheck = false;
-            }
-        }
-
-        return regularMethodCheck;
-    }
-
-    private boolean setReflexively(PlayerCapabilities capabilities, float speed) {
-        if (reflexiveMethodCheck) {
-            try {
-                if (walkSpeed == null) {
-                    Field[] f = PlayerCapabilities.class.getDeclaredFields();
-                    walkSpeed = f[f.length - 1];
-                    walkSpeed.setAccessible(true);
-                }
-
-                walkSpeed.set(capabilities, speed);
-            } catch (Throwable t) {
-                reflexiveMethodCheck = false;
-            }
-        }
-
-        return reflexiveMethodCheck;
-    }
-
-    private void setTheMostSlow(PlayerCapabilities capabilities, float speed) {
-        NBTTagCompound comp = new NBTTagCompound();
-
-        capabilities.writeCapabilitiesToNBT(comp);
-
-        comp.getCompoundTag("capabilities").setFloat("walkSpeed", speed);
-
-        capabilities.readCapabilitiesFromNBT(comp);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/IData.java b/src/main/java/com/minelittlepony/unicopia/power/IData.java
deleted file mode 100644
index be5f6efc..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/IData.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.minelittlepony.unicopia.power;
-
-public interface IData {
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java b/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
deleted file mode 100644
index b6755f6c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerDisguise.java
+++ /dev/null
@@ -1,98 +0,0 @@
-package com.minelittlepony.unicopia.power;
-
-
-import javax.annotation.Nullable;
-
-import org.lwjgl.input.Keyboard;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.entity.IInAnimate;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.unicopia.power.data.Hit;
-import com.minelittlepony.unicopia.spell.IMagicEffect;
-import com.minelittlepony.unicopia.spell.SpellDisguise;
-import com.minelittlepony.util.vector.VecHelper;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.effect.EntityWeatherEffect;
-import net.minecraft.entity.item.EntityFallingBlock;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.RayTraceResult;
-
-public class PowerDisguise extends PowerFeed {
-
-    @Override
-    public String getKeyName() {
-        return "unicopia.power.disguise";
-    }
-
-    @Override
-    public int getKeyCode() {
-        return Keyboard.KEY_P;
-    }
-
-    @Nullable
-    @Override
-    public Hit tryActivate(IPlayer player) {
-        return new Hit();
-    }
-
-    @Override
-    public void apply(IPlayer iplayer, Hit data) {
-        EntityPlayer player = iplayer.getOwner();
-        RayTraceResult trace = VecHelper.getObjectMouseOver(player, 10, 1);
-
-        Entity looked = trace.entityHit;
-
-        if (trace.typeOfHit == RayTraceResult.Type.BLOCK) {
-            IBlockState state = player.getEntityWorld().getBlockState(trace.getBlockPos());
-
-            if (!state.getBlock().isAir(state, player.getEntityWorld(), trace.getBlockPos())) {
-                looked = new EntityFallingBlock(player.getEntityWorld(), 0, 0, 0, state);
-            }
-        }
-
-        if (looked instanceof EntityWeatherEffect || (looked instanceof IInAnimate && !((IInAnimate)looked).canInteract(Race.CHANGELING))) {
-            looked = null;
-        }
-
-        if (looked instanceof EntityPlayer) {
-            IPlayer ilooked = PlayerSpeciesList.instance().getPlayer((EntityPlayer)looked);
-            IMagicEffect ef = ilooked.getEffect();
-            if (ef instanceof SpellDisguise && !ef.getDead()) {
-                Entity e = ((SpellDisguise)ef).getDisguise();
-                if (e != null) {
-                    looked = e;
-                }
-            }
-        }
-
-        player.getEntityWorld().playSound(null, player.getPosition(), SoundEvents.E_PARROT_IM_POLAR_BEAR, SoundCategory.PLAYERS, 1.4F, 0.4F);
-
-        IMagicEffect effect = iplayer.getEffect();
-        if (effect instanceof SpellDisguise && !effect.getDead()) {
-            ((SpellDisguise)effect).setDisguise(looked);
-        } else if (looked != null) {
-            iplayer.setEffect(new SpellDisguise().setDisguise(looked));
-        }
-
-        iplayer.sendCapabilities(true);
-    }
-
-    @Override
-    public void preApply(IPlayer player) {
-        player.addEnergy(2);
-        player.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
-    }
-
-    @Override
-    public void postApply(IPlayer player) {
-        player.setEnergy(0);
-        player.spawnParticles(UParticles.CHANGELING_MAGIC, 5);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java b/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java
deleted file mode 100644
index b2f2f3d6..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerFeed.java
+++ /dev/null
@@ -1,168 +0,0 @@
-package com.minelittlepony.unicopia.power;
-
-import java.util.List;
-import java.util.stream.Collectors;
-
-import javax.annotation.Nullable;
-
-import org.lwjgl.input.Keyboard;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Hit;
-import com.minelittlepony.util.MagicalDamageSource;
-import com.minelittlepony.util.vector.VecHelper;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.EnumCreatureType;
-import net.minecraft.entity.passive.EntityCow;
-import net.minecraft.entity.passive.EntityPig;
-import net.minecraft.entity.passive.EntitySheep;
-import net.minecraft.entity.passive.EntityVillager;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.MobEffects;
-import net.minecraft.potion.PotionEffect;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EnumParticleTypes;
-
-public class PowerFeed implements IPower<Hit> {
-
-    @Override
-    public String getKeyName() {
-        return "unicopia.power.feed";
-    }
-
-    @Override
-    public int getKeyCode() {
-        return Keyboard.KEY_O;
-    }
-
-    @Override
-    public int getWarmupTime(IPlayer player) {
-        return 5;
-    }
-
-    @Override
-    public int getCooldownTime(IPlayer player) {
-        return canFeed(player) ? 15 : 80;
-    }
-
-    @Override
-    public boolean canUse(Race playerSpecies) {
-        return playerSpecies == Race.CHANGELING;
-    }
-
-    @Nullable
-    @Override
-    public Hit tryActivate(IPlayer player) {
-        if (canFeed(player)) {
-            if (!getTargets(player).isEmpty()) {
-                return new Hit();
-            }
-        }
-
-        return null;
-    }
-
-    private boolean canFeed(IPlayer player) {
-        return player.getOwner().getHealth() < player.getOwner().getMaxHealth() || player.getOwner().canEat(false);
-    }
-
-    private boolean canDrain(Entity e) {
-        return (e instanceof EntityLivingBase)
-            && (e instanceof EntityCow
-            || e instanceof EntityVillager
-            || e instanceof EntityPlayer
-            || e instanceof EntitySheep
-            || e instanceof EntityPig
-            || EnumCreatureType.MONSTER.getCreatureClass().isAssignableFrom(e.getClass()));
-    }
-
-    @Override
-    public Class<Hit> getPackageType() {
-        return Hit.class;
-    }
-
-    protected List<EntityLivingBase> getTargets(IPlayer player) {
-        List<Entity> list = VecHelper.getWithinRange(player.getOwner(), 3, this::canDrain);
-
-        Entity looked = VecHelper.getLookedAtEntity(player.getOwner(), 17);
-        if (looked != null && !list.contains(looked) && canDrain(looked)) {
-            list.add(looked);
-        }
-
-        return list.stream().map(i -> (EntityLivingBase)i).collect(Collectors.toList());
-    }
-
-    @Override
-    public void apply(IPlayer iplayer, Hit data) {
-        EntityPlayer player = iplayer.getOwner();
-
-        float maximumHealthGain = player.getMaxHealth() - player.getHealth();
-        int maximumFoodGain = player.canEat(false) ? (20 - player.getFoodStats().getFoodLevel()) : 0;
-
-        if (maximumHealthGain > 0 || maximumFoodGain > 0) {
-
-            float healAmount = 0;
-
-            for (EntityLivingBase i : getTargets(iplayer)) {
-                healAmount += drainFrom(player, i);
-            }
-
-            int foodAmount = (int)Math.floor(Math.min(healAmount / 3, maximumFoodGain));
-
-            if (foodAmount > 0) {
-                healAmount -= foodAmount;
-                player.getFoodStats().addStats(foodAmount, 0.125f);
-            }
-
-            if (healAmount > 0) {
-                player.heal(Math.min(healAmount, maximumHealthGain));
-            }
-        }
-    }
-
-    public float drainFrom(EntityPlayer changeling, EntityLivingBase living) {
-        DamageSource d = MagicalDamageSource.causePlayerDamage("feed", changeling);
-
-        float damage = living.getHealth()/2;
-
-        if (damage > 0) {
-            living.attackEntityFrom(d, damage);
-        }
-
-        IPower.spawnParticles(UParticles.CHANGELING_MAGIC, living, 7);
-
-        if (changeling.isPotionActive(MobEffects.NAUSEA)) {
-            living.addPotionEffect(changeling.removeActivePotionEffect(MobEffects.NAUSEA));
-        } else if (changeling.getEntityWorld().rand.nextInt(2300) == 0) {
-            living.addPotionEffect(new PotionEffect(MobEffects.WITHER, 20, 1));
-        }
-
-        if (living instanceof EntityPlayer) {
-            damage ++;
-            damage *= 1.6F;
-
-            if (!changeling.isPotionActive(MobEffects.HEALTH_BOOST)) {
-                changeling.addPotionEffect(new PotionEffect(MobEffects.HEALTH_BOOST, 13000, 1));
-            }
-        }
-
-        return damage;
-    }
-
-    @Override
-    public void preApply(IPlayer player) {
-        player.addExertion(6);
-    }
-
-    @Override
-    public void postApply(IPlayer player) {
-        EntityPlayer entity = player.getOwner();
-
-        IPower.spawnParticles(EnumParticleTypes.HEART.getParticleID(), entity, 1);
-    }
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java b/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java
deleted file mode 100644
index c8b5dc88..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerGrow.java
+++ /dev/null
@@ -1,115 +0,0 @@
-package com.minelittlepony.unicopia.power;
-
-import org.lwjgl.input.Keyboard;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Location;
-import com.minelittlepony.util.WorldEvent;
-import com.minelittlepony.util.vector.VecHelper;
-
-import net.minecraft.block.BlockDoublePlant;
-import net.minecraft.block.BlockGrass;
-import net.minecraft.block.IGrowable;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemDye;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.World;
-
-public class PowerGrow implements IPower<Location> {
-
-    @Override
-    public String getKeyName() {
-        return "unicopia.power.grow";
-    }
-
-    @Override
-    public int getKeyCode() {
-        return Keyboard.KEY_N;
-    }
-
-    @Override
-    public int getWarmupTime(IPlayer player) {
-        return 10;
-    }
-
-    @Override
-    public int getCooldownTime(IPlayer player) {
-        return 50;
-    }
-
-    @Override
-    public boolean canUse(Race playerSpecies) {
-        return playerSpecies == Race.EARTH;
-    }
-
-    @Override
-    public Location tryActivate(IPlayer player) {
-        RayTraceResult ray = VecHelper.getObjectMouseOver(player.getOwner(), 3, 1);
-
-        if (ray != null && ray.typeOfHit == RayTraceResult.Type.BLOCK) {
-            return new Location(ray.getBlockPos());
-        }
-
-        return null;
-    }
-
-    @Override
-    public Class<Location> getPackageType() {
-        return Location.class;
-    }
-
-    @Override
-    public void apply(IPlayer player, Location data) {
-        int count = 0;
-
-        for (BlockPos pos : BlockPos.getAllInBox(
-                new BlockPos(data.x - 2, data.y - 2, data.z - 2),
-                new BlockPos(data.x + 2, data.y + 2, data.z + 2))) {
-            count += applySingle(player.getWorld(), player.getWorld().getBlockState(pos), pos);
-        }
-
-        if (count > 0) {
-            player.subtractEnergyCost(count * 5);
-        }
-    }
-
-    protected int applySingle(World w, IBlockState state, BlockPos pos) {
-        if (state.getBlock() instanceof IGrowable
-                && !(state.getBlock() instanceof BlockGrass)) {
-
-            IGrowable g = ((IGrowable)state.getBlock());
-
-            if (g.canGrow(w, pos, state, w.isRemote) && g.canUseBonemeal(w, w.rand, pos, state)) {
-                if (ItemDye.applyBonemeal(new ItemStack(Items.DYE, 1), w, pos)) {
-                    WorldEvent.BONEMEAL.play(w, pos);
-
-                    if (g instanceof BlockDoublePlant) {
-                        WorldEvent.BONEMEAL.play(w, pos.up());
-                    }
-                }
-
-                return 1;
-            }
-        }
-        return 0;
-    }
-
-    @Override
-    public void preApply(IPlayer player) {
-        player.addExertion(3);
-
-        if (player.getWorld().isRemote) {
-            player.spawnParticles(UParticles.UNICORN_MAGIC, 1);
-        }
-    }
-
-    @Override
-    public void postApply(IPlayer player) {
-
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/PowerTeleport.java b/src/main/java/com/minelittlepony/unicopia/power/PowerTeleport.java
deleted file mode 100644
index 153d10df..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/PowerTeleport.java
+++ /dev/null
@@ -1,169 +0,0 @@
-package com.minelittlepony.unicopia.power;
-
-import org.lwjgl.input.Keyboard;
-
-import com.minelittlepony.unicopia.Race;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.power.data.Location;
-import com.minelittlepony.util.vector.VecHelper;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockFence;
-import net.minecraft.block.BlockLeaves;
-import net.minecraft.block.BlockWall;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.network.play.server.SPacketSetPassengers;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.World;
-
-public class PowerTeleport implements IPower<Location> {
-
-    @Override
-    public String getKeyName() {
-        return "unicopia.power.teleport";
-    }
-
-    @Override
-    public int getKeyCode() {
-        return Keyboard.KEY_O;
-    }
-
-    @Override
-    public int getWarmupTime(IPlayer player) {
-        return 20;
-    }
-
-    @Override
-    public int getCooldownTime(IPlayer player) {
-        return 50;
-    }
-
-    @Override
-    public boolean canUse(Race playerSpecies) {
-        return playerSpecies.canCast();
-    }
-
-    @Override
-    public Location tryActivate(IPlayer player) {
-        RayTraceResult ray = VecHelper.getObjectMouseOver(player.getOwner(), 100, 1);
-
-        World w = player.getWorld();
-
-        if (ray != null && ray.typeOfHit != RayTraceResult.Type.MISS) {
-            BlockPos pos;
-
-            if (ray.typeOfHit == RayTraceResult.Type.ENTITY) {
-                pos = new BlockPos(ray.entityHit);
-            } else {
-                pos = ray.getBlockPos();
-            }
-
-            boolean airAbove = enterable(w, pos.up()) && enterable(w, pos.up(2));
-            if (exception(w, pos)) {
-                EnumFacing sideHit = ray.sideHit;
-
-                if (player.getOwner().isSneaking()) {
-                    sideHit = sideHit.getOpposite();
-                }
-
-                pos = pos.offset(sideHit);
-            }
-
-            if (enterable(w, pos.down())) {
-                pos = pos.down();
-
-                if (enterable(w, pos.down())) {
-                    if (airAbove) {
-                        pos = new BlockPos(
-                                ray.getBlockPos().getX(),
-                                pos.getY() + 2,
-                                ray.getBlockPos().getZ());
-                    } else {
-                        return null;
-                    }
-                }
-            }
-
-            if ((!enterable(w, pos) && exception(w, pos))
-             || (!enterable(w, pos.up()) && exception(w, pos.up()))) {
-                return null;
-            }
-
-            return new Location(pos.getX(), pos.getY(), pos.getZ());
-        }
-
-        return null;
-    }
-
-
-
-    @Override
-    public Class<Location> getPackageType() {
-        return Location.class;
-    }
-
-    @Override
-    public void apply(IPlayer iplayer, Location data) {
-        iplayer.getWorld().playSound(null, iplayer.getOrigin(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 1, 1);
-
-        EntityPlayer player = iplayer.getOwner();
-        double distance = player.getDistance(data.x, data.y, data.z) / 10;
-
-        if (player.isRiding()) {
-            Entity mount = player.getRidingEntity();
-
-            player.dismountRidingEntity();
-
-            if (mount instanceof EntityPlayerMP) {
-                ((EntityPlayerMP)player).getServerWorld().getEntityTracker().sendToTrackingAndSelf(player, new SPacketSetPassengers(mount));
-            }
-        }
-
-        player.setPositionAndUpdate(data.x + (player.posX - Math.floor(player.posX)), data.y, data.z + (player.posZ - Math.floor(player.posZ)));
-        iplayer.subtractEnergyCost(distance);
-
-        player.fallDistance /= distance;
-
-        player.world.playSound(null, data.pos(), SoundEvents.ENTITY_ITEM_PICKUP, SoundCategory.PLAYERS, 1, 1);
-    }
-
-    private boolean enterable(World w, BlockPos pos) {
-        IBlockState state = w.getBlockState(pos);
-
-        Block block = state.getBlock();
-
-        return w.isAirBlock(pos)
-                || block.isReplaceable(w, pos)
-                || (block instanceof BlockLeaves);
-    }
-
-    private boolean exception(World w, BlockPos pos) {
-        IBlockState state = w.getBlockState(pos);
-
-        Block c = state.getBlock();
-        return state.isSideSolid(w, pos, EnumFacing.UP)
-                || state.getMaterial().isLiquid()
-                || (c instanceof BlockWall)
-                || (c instanceof BlockFence)
-                || (c instanceof BlockLeaves);
-    }
-
-    @Override
-    public void preApply(IPlayer player) {
-        player.addExertion(3);
-        player.spawnParticles(UParticles.UNICORN_MAGIC, 5);
-    }
-
-    @Override
-    public void postApply(IPlayer player) {
-        player.spawnParticles(UParticles.UNICORN_MAGIC, 5);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/power/data/Hit.java b/src/main/java/com/minelittlepony/unicopia/power/data/Hit.java
deleted file mode 100644
index 85303334..00000000
--- a/src/main/java/com/minelittlepony/unicopia/power/data/Hit.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package com.minelittlepony.unicopia.power.data;
-
-import com.minelittlepony.unicopia.power.IData;
-
-public class Hit implements IData {
-
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/projectile/IAdvancedProjectile.java b/src/main/java/com/minelittlepony/unicopia/projectile/IAdvancedProjectile.java
new file mode 100644
index 00000000..12241161
--- /dev/null
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/IAdvancedProjectile.java
@@ -0,0 +1,38 @@
+package com.minelittlepony.unicopia.projectile;
+
+import com.minelittlepony.unicopia.magic.ITossedEffect;
+
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.projectile.Projectile;
+import net.minecraft.item.ItemStack;
+import net.minecraft.world.World;
+
+public interface IAdvancedProjectile extends Projectile {
+
+    void setGravity(boolean gravity);
+
+    void setItem(ItemStack stack);
+
+    void setOwner(LivingEntity owner);
+
+    void setEffect(ITossedEffect effect);
+
+    void setThrowDamage(float damage);
+
+    float getThrowDamage();
+
+    void setHydrophobic();
+
+    boolean getHydrophobic();
+
+    void launch(Entity entityThrower, float pitch, float yaw, float offset, float velocity, float inaccuracy);
+
+    default void spawn(World world) {
+        world.spawnEntity((Entity)this);
+    }
+
+    default void launch(double x, double y, double z, float velocity, float inaccuracy) {
+        setVelocity(x, y, z, velocity, inaccuracy);
+    }
+}
diff --git a/src/main/java/com/minelittlepony/unicopia/tossable/ITossable.java b/src/main/java/com/minelittlepony/unicopia/projectile/ITossable.java
similarity index 63%
rename from src/main/java/com/minelittlepony/unicopia/tossable/ITossable.java
rename to src/main/java/com/minelittlepony/unicopia/projectile/ITossable.java
index 913f6e8f..5e4f03bd 100644
--- a/src/main/java/com/minelittlepony/unicopia/tossable/ITossable.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/ITossable.java
@@ -1,10 +1,10 @@
-package com.minelittlepony.unicopia.tossable;
+package com.minelittlepony.unicopia.projectile;
 
-import com.minelittlepony.unicopia.spell.ICaster;
+import com.minelittlepony.unicopia.magic.ICaster;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.block.BlockState;
+import net.minecraft.sound.SoundEvent;
+import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.math.BlockPos;
 
 public interface ITossable<T> {
@@ -12,7 +12,7 @@ public interface ITossable<T> {
     /**
      * Called once the projectile lands either hitting the ground or an entity.
      */
-    void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state);
+    void onImpact(ICaster<?> caster, BlockPos pos, BlockState state);
 
     /**
      * The sound made when thrown.
diff --git a/src/main/java/com/minelittlepony/util/ProjectileUtil.java b/src/main/java/com/minelittlepony/unicopia/projectile/ProjectileUtil.java
similarity index 51%
rename from src/main/java/com/minelittlepony/util/ProjectileUtil.java
rename to src/main/java/com/minelittlepony/unicopia/projectile/ProjectileUtil.java
index ecd720e4..5296f9d4 100644
--- a/src/main/java/com/minelittlepony/util/ProjectileUtil.java
+++ b/src/main/java/com/minelittlepony/unicopia/projectile/ProjectileUtil.java
@@ -1,13 +1,14 @@
-package com.minelittlepony.util;
+package com.minelittlepony.unicopia.projectile;
 
 import javax.annotation.Nullable;
 
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.entity.projectile.EntityArrow;
-import net.minecraft.entity.projectile.EntityFireball;
-import net.minecraft.entity.projectile.EntityLlamaSpit;
-import net.minecraft.entity.projectile.EntityThrowable;
+import net.minecraft.entity.projectile.ArrowEntity;
+import net.minecraft.entity.projectile.FireballEntity;
+import net.minecraft.entity.projectile.LlamaSpitEntity;
+import net.minecraft.entity.projectile.Projectile;
+import net.minecraft.entity.projectile.ProjectileEntity;
+import net.minecraft.entity.thrown.ThrownEntity;
 import net.minecraft.util.math.Vec3d;
 
 public class ProjectileUtil {
@@ -16,23 +17,22 @@ public class ProjectileUtil {
      * Checks if the given entity is a projectile.
      */
     public static boolean isProjectile(Entity e) {
-        return e instanceof IProjectile
-                || e instanceof EntityFireball;
+        return e instanceof Projectile
+            || e instanceof FireballEntity;
     }
 
     /**
      * Checks if an entity is a thrown projectile.
      */
     public static boolean isThrowable(Entity e) {
-        return e instanceof EntityThrowable ||
-                e instanceof EntityArrow ||
-                e instanceof EntityFireball;
+        return e instanceof ThrownEntity
+            || e instanceof ArrowEntity
+            || e instanceof FireballEntity;
     }
 
     /**
      * Checks if the given projectile was thrown by the given entity
      */
-    @SuppressWarnings("unchecked")
     public static <T extends Entity> boolean isProjectileThrownBy(Entity throwable, @Nullable T e) {
         if (e == null || !isThrowable(throwable)) {
             return false;
@@ -48,20 +48,20 @@ public class ProjectileUtil {
     @SuppressWarnings("unchecked")
     public static <T extends Entity> T getThrowingEntity(Entity throwable) {
 
-        if (throwable instanceof EntityArrow) {
-            return (T)((EntityArrow) throwable).shootingEntity;
+        if (throwable instanceof ProjectileEntity) {
+            return (T)((ProjectileEntity) throwable).getOwner();
         }
 
-        if (throwable instanceof EntityFireball) {
-            return (T)((EntityFireball) throwable).shootingEntity;
+        if (throwable instanceof FireballEntity) {
+            return (T)((FireballEntity) throwable).owner;
         }
 
-        if (throwable instanceof EntityLlamaSpit) {
-           return (T)((EntityLlamaSpit) throwable).owner;
+        if (throwable instanceof LlamaSpitEntity) {
+           return (T)((LlamaSpitEntity) throwable).owner;
         }
 
-        if (throwable instanceof EntityThrowable) {
-            return (T)((EntityThrowable) throwable).getThrower();
+        if (throwable instanceof ThrownEntity) {
+            return (T)((ThrownEntity) throwable).getOwner();
         }
 
         return null;
@@ -78,12 +78,14 @@ public class ProjectileUtil {
      */
     public static void setThrowableHeading(Entity throwable, Vec3d heading, float velocity, float inaccuracy) {
 
-        if (throwable instanceof IProjectile) {
-            ((IProjectile)throwable).shoot(heading.x, heading.y, heading.z, velocity, inaccuracy);
+        if (throwable instanceof Projectile) {
+            ((Projectile)throwable).setVelocity(heading.x, heading.y, heading.z, velocity, inaccuracy);
         } else {
-            heading = heading.normalize().scale(velocity);
+            heading = heading.normalize().multiply(velocity);
 
-            throwable.addVelocity(heading.x - throwable.motionX, heading.y - throwable.motionY, heading.z - throwable.motionZ);
+            Vec3d vel = throwable.getVelocity();
+
+            throwable.addVelocity(heading.x - vel.x, heading.y - vel.y, heading.z - vel.z);
         }
     }
 }
diff --git a/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java b/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java
deleted file mode 100644
index 79c1831c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/render/DisguiseRenderer.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.minelittlepony.unicopia.render;
-
-import com.minelittlepony.unicopia.player.IPlayer;
-import com.minelittlepony.unicopia.spell.SpellDisguise;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.entity.Entity;
-
-public class DisguiseRenderer {
-
-    private static final DisguiseRenderer instance = new DisguiseRenderer();
-
-    public static DisguiseRenderer instance() {
-        return instance;
-    }
-
-    public boolean renderDisguise(Entity entity, float usedPartialTick) {
-        Minecraft mc = Minecraft.getMinecraft();
-
-        RenderManager renderMan = mc.getRenderManager();
-
-        if (entity.getEntityData().hasKey("disguise") && entity.getEntityData().getBoolean("disguise")) {
-
-            renderMan.setRenderShadow(true);
-            renderStaticDisguise(renderMan, entity);
-            renderMan.setRenderShadow(false);
-
-            return true;
-        } else {
-            renderMan.setRenderShadow(renderMan.isRenderShadow() || usedPartialTick != 1);
-        }
-
-        return false;
-    }
-
-    protected void renderDisguise(RenderManager renderMan, Entity entity, double x, double y, double z) {
-        entity.getEntityData().setBoolean("disguise", false);
-        renderMan.renderEntity(entity, x, y, z, 0, 1, false);
-        entity.getEntityData().setBoolean("disguise", true);
-    }
-
-    protected void renderStaticDisguise(RenderManager renderMan, Entity entity) {
-        Entity observer = Minecraft.getMinecraft().getRenderViewEntity();
-
-        double x = entity.posX - observer.posX;
-        double y = entity.posY - observer.posY;
-        double z = entity.posZ - observer.posZ;
-
-        renderDisguise(renderMan, entity, x, y, z);
-    }
-
-    public boolean renderDisguiseToGui(IPlayer player) {
-        SpellDisguise effect = player.getEffect(SpellDisguise.class, false);
-
-        if (effect == null || effect.getDead()) {
-            return false;
-        }
-
-        Minecraft mc = Minecraft.getMinecraft();
-        RenderManager renderMan = mc.getRenderManager();
-
-        if (renderMan.isRenderShadow()) {
-            return false;
-        }
-
-        Entity e = effect.getDisguise();
-
-        // Check for a disguise and render it in our place.
-        if (e != null) {
-            effect.update(player);
-
-            e.setAlwaysRenderNameTag(false);
-            e.setInvisible(false);
-            e.posY = player.getOwner().posY;
-
-            renderDisguise(renderMan, e, 0, 0, 0);
-        }
-
-        return true;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderButterfly.java b/src/main/java/com/minelittlepony/unicopia/render/RenderButterfly.java
deleted file mode 100644
index d42d9945..00000000
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderButterfly.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package com.minelittlepony.unicopia.render;
-
-import com.minelittlepony.unicopia.entity.EntityButterfly;
-import com.minelittlepony.unicopia.model.ModelButterfly;
-
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.MathHelper;
-
-public class RenderButterfly extends RenderLiving<EntityButterfly> {
-
-    public RenderButterfly(RenderManager rm) {
-        super(rm, new ModelButterfly(), 0.25F);
-    }
-
-    @Override
-    protected ResourceLocation getEntityTexture(EntityButterfly entity) {
-        return entity.getVariety().getSkin();
-    }
-
-    @Override
-    protected void preRenderCallback(EntityButterfly entity, float ticks) {
-        GlStateManager.scale(0.35F, 0.35F, 0.35F);
-    }
-
-    @Override
-    protected void applyRotations(EntityButterfly entity, float age, float yaw, float ticks) {
-
-        if (!entity.isResting()) {
-            GlStateManager.translate(0, MathHelper.cos(age / 3F) / 10F, 0);
-        }
-
-        super.applyRotations(entity, age, yaw, ticks);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderGem.java b/src/main/java/com/minelittlepony/unicopia/render/RenderGem.java
deleted file mode 100644
index eefaba3a..00000000
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderGem.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package com.minelittlepony.unicopia.render;
-
-import com.minelittlepony.unicopia.entity.EntitySpell;
-import com.minelittlepony.unicopia.model.ModelGem;
-
-import net.minecraft.client.renderer.culling.ICamera;
-import net.minecraft.client.renderer.entity.RenderLiving;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.util.ResourceLocation;
-
-public class RenderGem extends RenderLiving<EntitySpell> {
-
-    private static final ResourceLocation gem = new ResourceLocation("unicopia", "textures/entity/gem.png");
-
-    public RenderGem(RenderManager rendermanagerIn) {
-        super(rendermanagerIn, new ModelGem(), 0);
-    }
-
-    @Override
-    protected ResourceLocation getEntityTexture(EntitySpell entity) {
-        return gem;
-    }
-
-    @Override
-    public boolean shouldRender(EntitySpell livingEntity, ICamera camera, double camX, double camY, double camZ) {
-        return true;
-    }
-
-    @Override
-    protected float getDeathMaxRotation(EntitySpell entity) {
-        return 0;
-    }
-
-    @Override
-    protected boolean canRenderName(EntitySpell targetEntity) {
-        return super.canRenderName(targetEntity) && (targetEntity.getAlwaysRenderNameTagForRender()
-                 || targetEntity.hasCustomName() && targetEntity == renderManager.pointedEntity);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/render/RenderProjectile.java b/src/main/java/com/minelittlepony/unicopia/render/RenderProjectile.java
deleted file mode 100644
index 0ef0a90c..00000000
--- a/src/main/java/com/minelittlepony/unicopia/render/RenderProjectile.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package com.minelittlepony.unicopia.render;
-
-import com.minelittlepony.unicopia.entity.EntityProjectile;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.entity.RenderManager;
-import net.minecraft.client.renderer.entity.RenderSnowball;
-import net.minecraft.init.Items;
-import net.minecraft.item.ItemStack;
-
-public class RenderProjectile extends RenderSnowball<EntityProjectile> {
-
-    public RenderProjectile(RenderManager renderManager) {
-        super(renderManager, Items.POTIONITEM, Minecraft.getMinecraft().getRenderItem());
-    }
-
-    @Override
-    public ItemStack getStackToRender(EntityProjectile entity) {
-        return entity.getItem();
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java
deleted file mode 100644
index ab05017d..00000000
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellAwkward.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.minelittlepony.unicopia.spell;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.Lists;
-import com.minelittlepony.util.shape.Sphere;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.World;
-
-public class SpellAwkward extends AbstractSpell implements ITossedEffect, IUseAction {
-
-    private final List<String> names = Lists.newArrayList(EnumParticleTypes.getParticleNames());
-
-    private final int max = names.size();
-
-    @Override
-    public String getName() {
-        return "awkward";
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
-    }
-
-    @Override
-    public int getTint() {
-        return 0xE1239C;
-    }
-
-    @Override
-    public boolean update(ICaster<?> source) {
-        return true;
-    }
-
-    @Override
-    public void render(ICaster<?> source) {
-        source.spawnParticles(new Sphere(false, (1 + source.getCurrentLevel()) * 8), 10, pos -> {
-            int index = (int)MathHelper.nextDouble(source.getWorld().rand, 0, max);
-
-            EnumParticleTypes type = EnumParticleTypes.getByName(names.get(index));
-
-            if (shouldSpawnParticle(type)) {
-                int[] arguments = new int[type.getArgumentCount()];
-
-                source.getWorld().spawnParticle(type, pos.x, pos.y, pos.z, 0, 0, 0, arguments);
-            }
-        });
-    }
-
-    protected boolean shouldSpawnParticle(EnumParticleTypes type) {
-        switch (type) {
-            case BARRIER:
-            case SMOKE_LARGE:
-            case MOB_APPEARANCE:
-            case EXPLOSION_HUGE:
-            case EXPLOSION_LARGE:
-            case EXPLOSION_NORMAL: return false;
-            default: return true;
-        }
-    }
-
-    @Override
-    public void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state) {
-        // noop
-    }
-
-    @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, BlockPos pos, EnumFacing side, float hitX, float hitY, float hitZ) {
-        return SpellCastResult.PLACE;
-    }
-
-    @Override
-    public SpellCastResult onUse(ItemStack stack, SpellAffinity affinity, EntityPlayer player, World world, @Nullable Entity hitEntity) {
-
-        CasterUtils.toCaster(player).ifPresent(this::toss);
-
-        return SpellCastResult.NONE;
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellScorch.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellScorch.java
deleted file mode 100644
index cbf50779..00000000
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellScorch.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package com.minelittlepony.unicopia.spell;
-
-import javax.annotation.Nullable;
-
-import com.minelittlepony.unicopia.entity.EntityProjectile;
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.util.PosHelper;
-import com.minelittlepony.util.shape.Sphere;
-
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.util.EnumParticleTypes;
-import net.minecraft.util.math.BlockPos;
-
-public class SpellScorch extends SpellFire implements ITossedEffect {
-
-    @Override
-    public String getName() {
-        return "scorch";
-    }
-
-    @Override
-    public boolean isCraftable() {
-        return false;
-    }
-
-    @Override
-    public int getTint() {
-        return 0;
-    }
-
-    @Override
-    public boolean update(ICaster<?> source) {
-
-        BlockPos pos = PosHelper.findSolidGroundAt(source.getWorld(), source.getOrigin());
-
-        IBlockState state = source.getWorld().getBlockState(pos);
-
-        IBlockState newState = affected.getConverted(state);
-
-        if (!state.equals(newState)) {
-            source.getWorld().setBlockState(pos, newState, 3);
-            source.spawnParticles(new Sphere(false, 1), 5, p -> {
-                p = PosHelper.offset(p, pos);
-
-                source.getWorld().spawnParticle(EnumParticleTypes.SMOKE_NORMAL,
-                        p.x, p.y, p.z, 0, 0, 0);
-            });
-        }
-
-        return true;
-    }
-
-    @Override
-    public void render(ICaster<?> source) {
-        source.spawnParticles(EnumParticleTypes.FLAME.getParticleID(), 3);
-        source.spawnParticles(UParticles.UNICORN_MAGIC, 3, getTint());
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.BAD;
-    }
-
-    @Override
-    @Nullable
-    public EntityProjectile toss(ICaster<?> caster) {
-        EntityProjectile projectile = ITossedEffect.super.toss(caster);
-
-        if (projectile != null) {
-            projectile.setNoGravity(true);
-        }
-
-        return projectile;
-    }
-
-    @Override
-    public void onImpact(ICaster<?> caster, BlockPos pos, IBlockState state) {
-        if (caster.isLocal()) {
-            caster.getWorld().newExplosion(caster.getOwner(), pos.getX(), pos.getY(), pos.getZ(), 2, true, true);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java b/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java
deleted file mode 100644
index c2cbd0de..00000000
--- a/src/main/java/com/minelittlepony/unicopia/spell/SpellVortex.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package com.minelittlepony.unicopia.spell;
-
-import com.minelittlepony.unicopia.init.UParticles;
-import com.minelittlepony.unicopia.particle.Particles;
-import com.minelittlepony.unicopia.player.PlayerSpeciesList;
-import com.minelittlepony.util.MagicalDamageSource;
-import com.minelittlepony.util.shape.Sphere;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.math.Vec3d;
-
-public class SpellVortex extends SpellShield {
-
-    @Override
-    public String getName() {
-        return "vortex";
-    }
-
-    @Override
-    public int getTint() {
-        return 0x4CDEE7;
-    }
-
-    @Override
-    public SpellAffinity getAffinity() {
-        return SpellAffinity.NEUTRAL;
-    }
-
-    @Override
-    public void render(ICaster<?> source) {
-        int range = 4 + (source.getCurrentLevel() * 2);
-        Vec3d pos = source.getOriginVector();
-
-        source.spawnParticles(new Sphere(false, range), range * 9, p -> {
-            Particles.instance().spawnParticle(UParticles.UNICORN_MAGIC, false, p, p.subtract(pos), getTint());
-        });
-    }
-
-    @Override
-    public double getDrawDropOffRange(ICaster<?> caster) {
-        return 10 + (caster.getCurrentLevel() * 2);
-    }
-
-    @Override
-    protected void applyRadialEffect(ICaster<?> source, Entity target, double distance, double radius) {
-        Vec3d pos = source.getOriginVector();
-
-        double force = 2.5F / distance;
-
-        if (source.getAffinity() != SpellAffinity.BAD && target instanceof EntityPlayer) {
-            force *= calculateAdjustedForce(PlayerSpeciesList.instance().getPlayer((EntityPlayer)target));
-        }
-
-        if (source.getAffinity() == SpellAffinity.BAD && source.getWorld().rand.nextInt(4500) == 0) {
-            source.getEntity().attackEntityFrom(MagicalDamageSource.create("vortex"), 4);
-        }
-
-        applyForce(pos, target, -force, 0);
-
-        float maxVel = source.getAffinity() == SpellAffinity.BAD ? 1 : 1.6f;
-
-        if (target.motionX > maxVel) target.motionX = maxVel;
-        if (target.motionX < -maxVel) target.motionX = -maxVel;
-        if (target.motionY > maxVel) target.motionY = maxVel;
-        if (target.motionY < -maxVel) target.motionY = -maxVel;
-        if (target.motionZ > maxVel) target.motionZ = maxVel;
-        if (target.motionZ < -maxVel) target.motionZ = -maxVel;
-
-        if (distance < 0.5) {
-            target.motionZ += maxVel * 2;
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/tossable/ITossed.java b/src/main/java/com/minelittlepony/unicopia/tossable/ITossed.java
deleted file mode 100644
index 616750de..00000000
--- a/src/main/java/com/minelittlepony/unicopia/tossable/ITossed.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package com.minelittlepony.unicopia.tossable;
-
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.IProjectile;
-import net.minecraft.item.ItemStack;
-
-public interface ITossed extends IProjectile {
-
-    void setItem(ItemStack stack);
-
-    void setThrowDamage(float damage);
-
-    float getThrowDamage();
-
-    void setHydrophobic();
-
-    boolean getHydrophobic();
-
-    void launch(Entity entityThrower, float rotationPitchIn, float rotationYawIn, float pitchOffset, float velocity, float inaccuracy);
-
-    default void launch(double x, double y, double z, float velocity, float inaccuracy) {
-        shoot(x, y, z, velocity, inaccuracy);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/util/crafting/CraftingManager.java b/src/main/java/com/minelittlepony/unicopia/util/crafting/CraftingManager.java
index fed51c02..49667b36 100644
--- a/src/main/java/com/minelittlepony/unicopia/util/crafting/CraftingManager.java
+++ b/src/main/java/com/minelittlepony/unicopia/util/crafting/CraftingManager.java
@@ -13,41 +13,39 @@ import com.google.gson.JsonParseException;
 import com.google.gson.JsonSyntaxException;
 import com.minelittlepony.util.AssetWalker;
 
-import net.minecraft.inventory.InventoryCrafting;
+import net.minecraft.inventory.CraftingInventory;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.crafting.IRecipe;
-import net.minecraft.item.crafting.ShapedRecipes;
-import net.minecraft.item.crafting.ShapelessRecipes;
-import net.minecraft.util.JsonUtils;
-import net.minecraft.util.NonNullList;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.recipe.Recipe;
+import net.minecraft.util.DefaultedList;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.JsonHelper;
 import net.minecraft.world.World;
 
 public class CraftingManager {
 
-    private final Map<ResourceLocation, IRecipe> REGISTRY = Maps.newHashMap();
+    private final Map<Identifier, Recipe<? super CraftingInventory>> REGISTRY = Maps.newHashMap();
 
-    private final Map<String, Function<JsonObject, IRecipe>> JSON_PARSERS = Maps.newHashMap();
+    private final Map<String, Function<JsonObject, Recipe<? super CraftingInventory>>> JSON_PARSERS = Maps.newHashMap();
 
     @Nonnull
-    private final ResourceLocation crafting_id;
+    private final Identifier crafting_id;
 
     private final AssetWalker assets;
 
     public CraftingManager(String modid, String resourcename) {
-        this(new ResourceLocation(modid, resourcename + "/recipes"));
+        this(new Identifier(modid, resourcename + "/recipes"));
     }
 
-    public CraftingManager(@Nonnull ResourceLocation id) {
+    public CraftingManager(@Nonnull Identifier id) {
         crafting_id = id;
         assets = new AssetWalker(id, this::handleJson);
     }
 
-    protected void handleJson(ResourceLocation id, JsonObject json) throws JsonParseException {
+    protected void handleJson(Identifier id, JsonObject json) throws JsonParseException {
         REGISTRY.put(id, parseRecipeJson(json));
     }
 
-    protected void registerRecipeTypes(Map<String, Function<JsonObject, IRecipe>> types) {
+    protected void registerRecipeTypes(Map<String, Function<JsonObject, Recipe<? super CraftingInventory>>> types) {
         types.put("crafting_shaped", ShapedRecipes::deserialize);
         types.put("crafting_shapeless", ShapelessRecipes::deserialize);
     }
@@ -61,8 +59,8 @@ public class CraftingManager {
         assets.walk();
     }
 
-    protected IRecipe parseRecipeJson(JsonObject json) {
-        String s = JsonUtils.getString(json, "type");
+    protected Recipe<? super CraftingInventory> parseRecipeJson(JsonObject json) {
+        String s = JsonHelper.getString(json, "type");
 
         if (!JSON_PARSERS.containsKey(s)) {
             throw new JsonSyntaxException("Invalid or unsupported recipe type '" + s + "'");
@@ -71,9 +69,10 @@ public class CraftingManager {
         return JSON_PARSERS.get(s).apply(json);
     }
 
+    @Deprecated
     @Nonnull
-    public ItemStack findMatchingResult(InventoryCrafting craftMatrix, World worldIn) {
-        IRecipe recipe = findMatchingRecipe(craftMatrix, worldIn);
+    public ItemStack findMatchingResult(CraftingInventory craftMatrix, World worldIn) {
+        Recipe<? super CraftingInventory> recipe = findMatchingRecipe(craftMatrix, worldIn);
 
         if (recipe != null) {
             return recipe.getCraftingResult(craftMatrix);
@@ -82,10 +81,11 @@ public class CraftingManager {
         return ItemStack.EMPTY;
     }
 
+    @Deprecated
     @Nullable
-    public IRecipe findMatchingRecipe(InventoryCrafting craftMatrix, World worldIn) {
-        for (IRecipe irecipe : getRecipes()) {
-            if (irecipe.matches(craftMatrix, worldIn)) {
+    public Recipe<? super CraftingInventory> findMatchingRecipe(CraftingInventory craftMatrix, World world) {
+        for (Recipe<? super CraftingInventory> irecipe : getRecipes()) {
+            if (irecipe.matches(craftMatrix, world)) {
                 return irecipe;
             }
         }
@@ -93,15 +93,17 @@ public class CraftingManager {
         return null;
     }
 
-    public Collection<IRecipe> getRecipes() {
+    @Deprecated
+    public Collection<Recipe<? super CraftingInventory>> getRecipes() {
         if (REGISTRY.isEmpty()) {
             load();
         }
         return REGISTRY.values();
     }
 
-    public NonNullList<ItemStack> getRemainingItems(InventoryCrafting craftMatrix, World worldIn) {
-        IRecipe recipe = findMatchingRecipe(craftMatrix, worldIn);
+    @Deprecated
+    public DefaultedList<ItemStack> getRemainingItems(CraftingInventory craftMatrix, World worldIn) {
+        Recipe<? super CraftingInventory> recipe = findMatchingRecipe(craftMatrix, worldIn);
 
         if (recipe != null) {
             return recipe.getRemainingItems(craftMatrix);
@@ -110,11 +112,11 @@ public class CraftingManager {
         return cloneInventoryContents(craftMatrix);
     }
 
-    public static NonNullList<ItemStack> cloneInventoryContents(InventoryCrafting craftMatrix) {
-        NonNullList<ItemStack> result = NonNullList.withSize(craftMatrix.getSizeInventory(), ItemStack.EMPTY);
+    public static DefaultedList<ItemStack> cloneInventoryContents(CraftingInventory craftMatrix) {
+        DefaultedList<ItemStack> result = DefaultedList.ofSize(craftMatrix.getInvSize(), ItemStack.EMPTY);
 
         for (int i = 0; i < result.size(); ++i) {
-            result.set(i, craftMatrix.getStackInSlot(i));
+            result.set(i, craftMatrix.getInvStack(i));
         }
 
         return result;
diff --git a/src/main/java/com/minelittlepony/unicopia/util/serialisation/InbtSerialisable.java b/src/main/java/com/minelittlepony/unicopia/util/serialisation/InbtSerialisable.java
deleted file mode 100644
index 4bad2969..00000000
--- a/src/main/java/com/minelittlepony/unicopia/util/serialisation/InbtSerialisable.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package com.minelittlepony.unicopia.util.serialisation;
-
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.math.BlockPos;
-
-public interface InbtSerialisable {
-    /**
-     * Called to save this to nbt to persist state on file or to transmit over the network
-     *
-     * @param compound  Compound tag to write to.
-     */
-    default void writeToNBT(NBTTagCompound compound) {
-
-    }
-
-    /**
-     * Called to load this state from nbt
-     *
-     * @param compound  Compound tag to read from.
-     */
-    default void readFromNBT(NBTTagCompound compound) {
-
-    }
-
-    default NBTTagCompound toNBT() {
-        NBTTagCompound compound = new NBTTagCompound();
-        writeToNBT(compound);
-        return compound;
-    }
-
-    static NBTTagCompound writeBlockPos(BlockPos pos) {
-        NBTTagCompound dest = new NBTTagCompound();
-
-        dest.setInteger("X", pos.getX());
-        dest.setInteger("Y", pos.getY());
-        dest.setInteger("Z", pos.getZ());
-
-        return dest;
-    }
-
-    static BlockPos readBlockPos(NBTTagCompound compound) {
-        return new BlockPos(
-                compound.getInteger("X"),
-                compound.getInteger("Y"),
-                compound.getInteger("Z")
-        );
-    }
-}
diff --git a/src/main/java/com/minelittlepony/unicopia/world/AbstractFeaturesGen.java b/src/main/java/com/minelittlepony/unicopia/world/AbstractFeaturesGen.java
index db57d600..00a6c7ee 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/AbstractFeaturesGen.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/AbstractFeaturesGen.java
@@ -10,7 +10,6 @@ import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.structure.MapGenStructure;
 
 public abstract class AbstractFeaturesGen extends MapGenStructure {
 
@@ -26,10 +25,10 @@ public abstract class AbstractFeaturesGen extends MapGenStructure {
     public AbstractFeaturesGen(Map<String, String> properties) {
         for (Entry<String, String> entry : properties.entrySet()) {
             if (entry.getKey().equals("distance")) {
-                maxDistance = MathHelper.getInt(entry.getValue(), maxDistance, 9);
+                maxDistance = MathHelper.parseInt(entry.getValue(), maxDistance, 9);
             }
             if (entry.getKey().equals("MinDistance")) {
-                minDistance = MathHelper.getInt(entry.getValue(), minDistance, 9);
+                minDistance = MathHelper.parseInt(entry.getValue(), minDistance, 9);
             }
         }
     }
diff --git a/src/main/java/com/minelittlepony/unicopia/world/BlockInteractions.java b/src/main/java/com/minelittlepony/unicopia/world/BlockInteractions.java
index b7f359fb..04a01d89 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/BlockInteractions.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/BlockInteractions.java
@@ -2,27 +2,27 @@ package com.minelittlepony.unicopia.world;
 
 import java.util.List;
 
+import com.minelittlepony.unicopia.UBlocks;
+import com.minelittlepony.unicopia.UItems;
 import com.minelittlepony.unicopia.block.ITillable;
-import com.minelittlepony.unicopia.init.UBlocks;
-import com.minelittlepony.unicopia.init.UItems;
-import com.minelittlepony.unicopia.spell.SpellRegistry;
+import com.minelittlepony.unicopia.magic.spells.SpellRegistry;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockTallGrass;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.block.GrassBlock;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.world.World;
 
 public class BlockInteractions {
-    public boolean onBlockTilled(World world, BlockPos pos, EntityPlayer player, ItemStack hoe) {
-        IBlockState state = world.getBlockState(pos);
+    public boolean onBlockTilled(World world, BlockPos pos, PlayerEntity player, ItemStack hoe) {
+        BlockState state = world.getBlockState(pos);
 
         if (!(state.getBlock() instanceof ITillable)) {
             return false;
@@ -39,13 +39,13 @@ public class BlockInteractions {
         return true;
     }
 
-    public EnumActionResult onBlockInteract(World world, IBlockState state, BlockPos pos, EntityPlayer player, ItemStack stack, EnumFacing facing, EnumHand hand) {
+    public ActionResult onBlockInteract(World world, BlockState state, BlockPos pos, PlayerEntity player, ItemStack stack, Direction facing, Hand hand) {
         Item shill = UItems.Shills.getShill(stack.getItem());
 
         if (shill != null) {
-            EnumActionResult result = shill.onItemUse(player, world, pos, hand, facing, 0, 0, 0);
+            ActionResult result = shill.onItemUse(player, world, pos, hand, facing, 0, 0, 0);
 
-            if (result == EnumActionResult.SUCCESS) {
+            if (result == ActionResult.SUCCESS) {
                 return result;
             }
         }
@@ -53,21 +53,21 @@ public class BlockInteractions {
         Block shillBlock = UBlocks.Shills.getShill(state.getBlock());
 
         if (shillBlock != null && shillBlock.onBlockActivated(world, pos, state, player, hand, player.getHorizontalFacing(), 0.5F, 0.5F, 0.5F)) {
-            return EnumActionResult.SUCCESS;
+            return ActionResult.SUCCESS;
         }
 
-        return EnumActionResult.PASS;
+        return ActionResult.PASS;
     }
 
-    public void addAuxiliaryDrops(World world, IBlockState state, BlockPos pos, List<ItemStack> drops, int fortune) {
+    public void addAuxiliaryDrops(World world, BlockState state, BlockPos pos, List<ItemStack> drops, int fortune) {
         Block block = state.getBlock();
 
         int fortuneFactor = 1 + fortune * 15;
 
         if (block == Blocks.STONE) {
-            if (world.rand.nextInt(500 / fortuneFactor) == 0) {
+            if (world.random.nextInt(500 / fortuneFactor) == 0) {
                 for (int i = 0; i < 1 + fortune; i++) {
-                    if (world.rand.nextInt(10) > 3) {
+                    if (world.random.nextInt(10) > 3) {
                         drops.add(new ItemStack(UItems.curse));
                     } else {
                         drops.add(new ItemStack(UItems.spell));
@@ -75,17 +75,17 @@ public class BlockInteractions {
                 }
             }
 
-            if (world.rand.nextInt(5000) == 0) {
+            if (world.random.nextInt(5000) == 0) {
                 drops.add(SpellRegistry.instance().enchantStack(new ItemStack(UItems.spell), "awkward"));
             }
         } else if (block == Blocks.DIRT || block == Blocks.CLAY || block == Blocks.GRASS_PATH || block == Blocks.GRASS || block == UBlocks.hive) {
-            if (world.rand.nextInt(25 / fortuneFactor) == 0) {
+            if (world.random.nextInt(25 / fortuneFactor) == 0) {
                 drops.add(new ItemStack(UItems.wheat_worms, 1 + fortune));
             }
-        } else if (block instanceof BlockTallGrass) {
-            if (world.rand.nextInt(25 / fortuneFactor) == 0) {
+        } else if (block instanceof GrassBlock) {
+            if (world.random.nextInt(25 / fortuneFactor) == 0) {
                 for (int i = 0; i < 1 + fortune; i++) {
-                    int chance = world.rand.nextInt(3);
+                    int chance = world.random.nextInt(3);
 
                     if (chance == 0) {
                         drops.add(new ItemStack(UItems.alfalfa_seeds));
diff --git a/src/main/java/com/minelittlepony/unicopia/world/CloudGen.java b/src/main/java/com/minelittlepony/unicopia/world/CloudGen.java
index 8e36acbf..f9849fc3 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/CloudGen.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/CloudGen.java
@@ -6,13 +6,12 @@ import java.util.Random;
 
 import javax.annotation.Nonnull;
 
-import com.minelittlepony.unicopia.structure.AbstractFeature;
-import com.minelittlepony.unicopia.structure.CloudDungeon;
+import com.minelittlepony.unicopia.world.structure.AbstractFeature;
+import com.minelittlepony.unicopia.world.structure.CloudDungeon;
 
-import net.minecraft.init.Biomes;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.structure.StructureStart;
+import net.minecraft.world.biome.Biomes;
 
 public class CloudGen extends AbstractFeaturesGen {
 
@@ -21,8 +20,8 @@ public class CloudGen extends AbstractFeaturesGen {
             Biomes.MESA,
             Biomes.DESERT, Biomes.DESERT_HILLS,
             Biomes.JUNGLE, Biomes.JUNGLE_HILLS,
-            Biomes.SWAMPLAND,
-            Biomes.ICE_PLAINS, Biomes.COLD_TAIGA
+            Biomes.SWAMP, Biomes.SWAMP_HILLS,
+            Biomes.ICE_SPIKES, Biomes.COLD_TAIGA
     );
 
     public CloudGen() {
diff --git a/src/main/java/com/minelittlepony/unicopia/world/Hooks.java b/src/main/java/com/minelittlepony/unicopia/world/Hooks.java
index 4521373c..c0a88d2e 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/Hooks.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/Hooks.java
@@ -1,61 +1,47 @@
+/*
 package com.minelittlepony.unicopia.world;
 
 import com.minelittlepony.unicopia.Unicopia;
 
-import net.minecraft.util.EnumActionResult;
-import net.minecraftforge.event.entity.player.PlayerInteractEvent;
-import net.minecraftforge.event.entity.player.UseHoeEvent;
-import net.minecraftforge.event.terraingen.PopulateChunkEvent;
-import net.minecraftforge.event.terraingen.PopulateChunkEvent.Populate.EventType;
-import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.eventhandler.Event.Result;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent.Phase;
+import net.minecraft.util.ActionResult;
 
-@EventBusSubscriber(modid = Unicopia.MODID)
 public class Hooks {
 
-    @SubscribeEvent
     public static void onPlayerRightClickBlock(PlayerInteractEvent.RightClickBlock event) {
 
         if (event.isCanceled()) {
             return;
         }
 
-        EnumActionResult result = UWorld.instance().getBlocks().onBlockInteract(
+        ActionResult result = UWorld.instance().getBlocks().onBlockInteract(
                 event.getWorld(), event.getWorld().getBlockState(event.getPos()), event.getPos(), event.getEntityPlayer(), event.getItemStack(), event.getFace(), event.getHand());
 
-        if (result != EnumActionResult.PASS) {
+        if (result != ActionResult.PASS) {
             event.setCanceled(true);
             event.setCancellationResult(result);
         }
     }
 
-    @SubscribeEvent
     public static void onBlockHarvested(BlockEvent.HarvestDropsEvent event) {
         UWorld.instance().getBlocks().addAuxiliaryDrops(event.getWorld(), event.getState(), event.getPos(), event.getDrops(), event.getFortuneLevel());
     }
 
-    @SubscribeEvent
     public static void onBlockTilled(UseHoeEvent event) {
         if (UWorld.instance().getBlocks().onBlockTilled(event.getWorld(), event.getPos(), event.getEntityPlayer(), event.getCurrent())) {
             event.setResult(Result.ALLOW);
         }
     }
 
-    @SubscribeEvent
     public static void onStructureGen(PopulateChunkEvent.Populate event) {
         if (event.getType() == EventType.DUNGEON) {
             UWorld.instance().generateStructures(event.getWorld(), event.getChunkX(), event.getChunkZ(), event.getGen());
         }
     }
 
-    @SubscribeEvent
     public static void onWorldTick(TickEvent.WorldTickEvent event) {
         if (event.phase == Phase.START) {
             UWorld.instance().onUpdate(event.world);
         }
     }
 }
+*/
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/unicopia/world/StructuresGen.java b/src/main/java/com/minelittlepony/unicopia/world/StructuresGen.java
index b18165ca..20c7df66 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/StructuresGen.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/StructuresGen.java
@@ -4,13 +4,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
-import com.minelittlepony.unicopia.structure.AbstractFeature;
-import com.minelittlepony.unicopia.structure.GroundDungeon;
+import com.minelittlepony.unicopia.world.structure.AbstractFeature;
+import com.minelittlepony.unicopia.world.structure.GroundDungeon;
 
-import net.minecraft.init.Biomes;
 import net.minecraft.world.World;
 import net.minecraft.world.biome.Biome;
-import net.minecraft.world.gen.structure.StructureStart;
+import net.minecraft.world.biome.Biomes;
 
 public class StructuresGen extends AbstractFeaturesGen {
 
diff --git a/src/main/java/com/minelittlepony/unicopia/world/UWorld.java b/src/main/java/com/minelittlepony/unicopia/world/UWorld.java
index 73f9299d..37201e6c 100644
--- a/src/main/java/com/minelittlepony/unicopia/world/UWorld.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/UWorld.java
@@ -10,8 +10,8 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Queues;
 import com.minelittlepony.jumpingcastle.Exceptions;
 import com.minelittlepony.unicopia.Unicopia;
-import com.minelittlepony.unicopia.structure.CloudDungeon;
-import com.minelittlepony.unicopia.structure.GroundDungeon;
+import com.minelittlepony.unicopia.world.structure.CloudDungeon;
+import com.minelittlepony.unicopia.world.structure.GroundDungeon;
 
 import net.minecraft.util.math.ChunkPos;
 import net.minecraft.world.World;
diff --git a/src/main/java/com/minelittlepony/unicopia/structure/AbstractFeature.java b/src/main/java/com/minelittlepony/unicopia/world/structure/AbstractFeature.java
similarity index 98%
rename from src/main/java/com/minelittlepony/unicopia/structure/AbstractFeature.java
rename to src/main/java/com/minelittlepony/unicopia/world/structure/AbstractFeature.java
index c103bb93..3dd1719a 100644
--- a/src/main/java/com/minelittlepony/unicopia/structure/AbstractFeature.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/structure/AbstractFeature.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.structure;
+package com.minelittlepony.unicopia.world.structure;
 
 import java.util.Random;
 
diff --git a/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java b/src/main/java/com/minelittlepony/unicopia/world/structure/CloudDungeon.java
similarity index 72%
rename from src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java
rename to src/main/java/com/minelittlepony/unicopia/world/structure/CloudDungeon.java
index ca9c7b45..a51c3d66 100644
--- a/src/main/java/com/minelittlepony/unicopia/structure/CloudDungeon.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/structure/CloudDungeon.java
@@ -1,10 +1,10 @@
-package com.minelittlepony.unicopia.structure;
+package com.minelittlepony.unicopia.world.structure;
 
 import java.util.Random;
 
 import com.minelittlepony.unicopia.Unicopia;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.structure.StructureBoundingBox;
@@ -13,10 +13,10 @@ import net.minecraft.world.gen.structure.template.TemplateManager;
 
 public class CloudDungeon extends TemplateBasedFeature {
 
-    private static final ResourceLocation[] VARIANTS = new ResourceLocation[] {
-            new ResourceLocation(Unicopia.MODID, "cloud/temple_small"),
-            new ResourceLocation(Unicopia.MODID, "cloud/house_small"),
-            new ResourceLocation(Unicopia.MODID, "cloud/island_small")
+    private static final Identifier[] VARIANTS = new Identifier[] {
+            new Identifier(Unicopia.MODID, "cloud/temple_small"),
+            new Identifier(Unicopia.MODID, "cloud/house_small"),
+            new Identifier(Unicopia.MODID, "cloud/island_small")
     };
 
     public CloudDungeon() {
diff --git a/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java b/src/main/java/com/minelittlepony/unicopia/world/structure/GroundDungeon.java
similarity index 59%
rename from src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java
rename to src/main/java/com/minelittlepony/unicopia/world/structure/GroundDungeon.java
index 2e5fc002..6007f61e 100644
--- a/src/main/java/com/minelittlepony/unicopia/structure/GroundDungeon.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/structure/GroundDungeon.java
@@ -1,10 +1,10 @@
-package com.minelittlepony.unicopia.structure;
+package com.minelittlepony.unicopia.world.structure;
 
 import java.util.Random;
 
 import com.minelittlepony.unicopia.Unicopia;
 
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 import net.minecraft.world.gen.structure.template.PlacementSettings;
@@ -12,12 +12,12 @@ import net.minecraft.world.gen.structure.template.TemplateManager;
 
 public class GroundDungeon extends TemplateBasedFeature {
 
-    private static final ResourceLocation[] VARIANTS = new ResourceLocation[] {
-            new ResourceLocation(Unicopia.MODID, "ground/tower"),
-            new ResourceLocation(Unicopia.MODID, "ground/temple_with_book"),
-            new ResourceLocation(Unicopia.MODID, "ground/temple_without_book"),
-            new ResourceLocation(Unicopia.MODID, "ground/wizard_tower_red"),
-            new ResourceLocation(Unicopia.MODID, "ground/wizard_tower_blue")
+    private static final Identifier[] VARIANTS = new Identifier[] {
+            new Identifier(Unicopia.MODID, "ground/tower"),
+            new Identifier(Unicopia.MODID, "ground/temple_with_book"),
+            new Identifier(Unicopia.MODID, "ground/temple_without_book"),
+            new Identifier(Unicopia.MODID, "ground/wizard_tower_red"),
+            new Identifier(Unicopia.MODID, "ground/wizard_tower_blue")
     };
 
     public GroundDungeon() {
diff --git a/src/main/java/com/minelittlepony/unicopia/structure/TemplateBasedFeature.java b/src/main/java/com/minelittlepony/unicopia/world/structure/TemplateBasedFeature.java
similarity index 90%
rename from src/main/java/com/minelittlepony/unicopia/structure/TemplateBasedFeature.java
rename to src/main/java/com/minelittlepony/unicopia/world/structure/TemplateBasedFeature.java
index ef645e28..4446f254 100644
--- a/src/main/java/com/minelittlepony/unicopia/structure/TemplateBasedFeature.java
+++ b/src/main/java/com/minelittlepony/unicopia/world/structure/TemplateBasedFeature.java
@@ -1,4 +1,4 @@
-package com.minelittlepony.unicopia.structure;
+package com.minelittlepony.unicopia.world.structure;
 
 import java.util.Map;
 import java.util.Random;
@@ -10,7 +10,7 @@ import java.util.Map.Entry;
 import net.minecraft.init.Blocks;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.tileentity.TileEntityLockableLoot;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
@@ -51,7 +51,7 @@ public abstract class TemplateBasedFeature extends AbstractFeature {
         return addComponentParts(world, startPos, templates, placement);
     }
 
-    protected void applyTemplate(World world, BlockPos startPos, TemplateManager templates, PlacementSettings placement, ResourceLocation templateId) {
+    protected void applyTemplate(World world, BlockPos startPos, TemplateManager templates, PlacementSettings placement, Identifier templateId) {
         Template template = templates.getTemplate(world.getMinecraftServer(), templateId);
 
         template.addBlocksToWorldChunk(world, startPos, placement);
@@ -64,7 +64,7 @@ public abstract class TemplateBasedFeature extends AbstractFeature {
     }
 
     protected void applyLootTables(World world, BlockPos pos, String blockId) {
-        ResourceLocation lootTable = getLootTable(blockId);
+        Identifier lootTable = getLootTable(blockId);
 
         if (lootTable != null) {
 
@@ -78,7 +78,7 @@ public abstract class TemplateBasedFeature extends AbstractFeature {
     }
 
     @Nullable
-    protected ResourceLocation getLootTable(String blockId) {
+    protected Identifier getLootTable(String blockId) {
         if ("chest".equals(blockId)) {
             return LootTableList.CHESTS_STRONGHOLD_LIBRARY;
         }
diff --git a/src/main/java/com/minelittlepony/util/AssetWalker.java b/src/main/java/com/minelittlepony/util/AssetWalker.java
index 52e261e4..dcd4fbc3 100644
--- a/src/main/java/com/minelittlepony/util/AssetWalker.java
+++ b/src/main/java/com/minelittlepony/util/AssetWalker.java
@@ -25,8 +25,7 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.minelittlepony.unicopia.util.crafting.CraftingManager;
 
-import net.minecraft.util.JsonUtils;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.Identifier;
 
 public class AssetWalker {
     private static final Logger LOGGER = LogManager.getLogger();
@@ -42,7 +41,7 @@ public class AssetWalker {
 
     private final JsonConsumer consumer;
 
-    public AssetWalker(ResourceLocation assetLocation, JsonConsumer consumer) {
+    public AssetWalker(Identifier assetLocation, JsonConsumer consumer) {
         this.consumer = consumer;
         this.namespace = assetLocation.getNamespace();
 
@@ -89,10 +88,10 @@ public class AssetWalker {
             Path i = iterator.next();
 
             if ("json".equals(FilenameUtils.getExtension(i.toString()))) {
-                ResourceLocation id = new ResourceLocation(namespace, FilenameUtils.removeExtension(path.relativize(i).toString()).replaceAll("\\\\", "/"));
+                Identifier id = new Identifier(namespace, FilenameUtils.removeExtension(path.relativize(i).toString()).replaceAll("\\\\", "/"));
 
                 try(BufferedReader bufferedreader = Files.newBufferedReader(i)) {
-                    consumer.accept(id, JsonUtils.fromJson(GSON, bufferedreader, JsonObject.class));
+                    consumer.accept(id, GSON.fromJson(bufferedreader, JsonObject.class));
                 } catch (JsonParseException e) {
                     LOGGER.error("Parsing error loading recipe " + id, e);
 
@@ -108,6 +107,6 @@ public class AssetWalker {
 
     @FunctionalInterface
     public interface JsonConsumer {
-        void accept(ResourceLocation id, JsonObject json) throws JsonParseException;
+        void accept(Identifier id, JsonObject json) throws JsonParseException;
     }
 }
diff --git a/src/main/java/com/minelittlepony/util/InbtSerialisable.java b/src/main/java/com/minelittlepony/util/InbtSerialisable.java
new file mode 100644
index 00000000..d8af4486
--- /dev/null
+++ b/src/main/java/com/minelittlepony/util/InbtSerialisable.java
@@ -0,0 +1,48 @@
+package com.minelittlepony.util;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.util.math.BlockPos;
+
+public interface InbtSerialisable {
+    /**
+     * Called to save this to nbt to persist state on file or to transmit over the network
+     *
+     * @param compound  Compound tag to write to.
+     */
+    default void toNBT(CompoundTag compound) {
+
+    }
+
+    /**
+     * Called to load this state from nbt
+     *
+     * @param compound  Compound tag to read from.
+     */
+    default void fromNBT(CompoundTag compound) {
+
+    }
+
+    default CompoundTag toNBT() {
+        CompoundTag compound = new CompoundTag();
+        toNBT(compound);
+        return compound;
+    }
+
+    static CompoundTag writeBlockPos(BlockPos pos) {
+        CompoundTag dest = new CompoundTag();
+
+        dest.putInt("X", pos.getX());
+        dest.putInt("Y", pos.getY());
+        dest.putInt("Z", pos.getZ());
+
+        return dest;
+    }
+
+    static BlockPos readBlockPos(CompoundTag compound) {
+        return new BlockPos(
+                compound.getInt("X"),
+                compound.getInt("Y"),
+                compound.getInt("Z")
+        );
+    }
+}
diff --git a/src/main/java/com/minelittlepony/util/Iterators.java b/src/main/java/com/minelittlepony/util/Iterators.java
index eae25b7e..26f0cc65 100644
--- a/src/main/java/com/minelittlepony/util/Iterators.java
+++ b/src/main/java/com/minelittlepony/util/Iterators.java
@@ -8,11 +8,11 @@ import com.google.common.collect.AbstractIterator;
 
 public interface Iterators<T> extends Iterable<T> {
 
-    static <T> Iterators<T> iterate(Supplier<T> producer) {
+    static <T> Iterators<T> iterate(Supplier<T> supplier) {
         return () -> new AbstractIterator<T>() {
             @Override
             protected T computeNext() {
-                T next = producer.get();
+                T next = supplier.get();
 
                 if (next == null) {
                     endOfData();
diff --git a/src/main/java/com/minelittlepony/util/LenientState.java b/src/main/java/com/minelittlepony/util/LenientState.java
deleted file mode 100644
index 7f3015b0..00000000
--- a/src/main/java/com/minelittlepony/util/LenientState.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package com.minelittlepony.util;
-
-import java.util.Optional;
-
-import javax.annotation.Nullable;
-
-import com.google.common.collect.ImmutableMap;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.BlockStateContainer;
-import net.minecraft.block.state.IBlockState;
-import net.minecraftforge.common.property.IUnlistedProperty;
-
-public class LenientState extends BlockStateContainer {
-
-    public LenientState(Block blockIn, IProperty<?>... properties) {
-        super(blockIn, properties);
-    }
-
-    @Override
-    protected StateImplementation createState(Block block, ImmutableMap<IProperty<?>, Comparable<?>> properties, @Nullable ImmutableMap<IUnlistedProperty<?>, Optional<?>> unlistedProperties) {
-        return new Impl(block, properties);
-    }
-
-    class Impl extends StateImplementation {
-        protected Impl(Block blockIn, ImmutableMap<IProperty<?>, Comparable<?>> propertiesIn) {
-            super(blockIn, propertiesIn);
-        }
-
-        @Override
-        public <T extends Comparable<T>, V extends T> IBlockState withProperty(IProperty<T> property, V value) {
-            if (!getProperties().containsKey(property)) {
-                return this;
-            }
-
-            return super.withProperty(property, value);
-        }
-    }
-}
diff --git a/src/main/java/com/minelittlepony/util/MagicalDamageSource.java b/src/main/java/com/minelittlepony/util/MagicalDamageSource.java
index 98fee58c..549eb820 100644
--- a/src/main/java/com/minelittlepony/util/MagicalDamageSource.java
+++ b/src/main/java/com/minelittlepony/util/MagicalDamageSource.java
@@ -2,35 +2,38 @@ package com.minelittlepony.util;
 
 import javax.annotation.Nullable;
 
-import com.minelittlepony.util.lang.ServerLocale;
-
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.damage.DamageSource;
+import net.minecraft.entity.damage.EntityDamageSource;
+import net.minecraft.entity.damage.ProjectileDamageSource;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.projectile.ArrowEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraft.util.EntityDamageSource;
-import net.minecraft.util.EntityDamageSourceIndirect;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TextComponentTranslation;
+import net.minecraft.text.Text;
+import net.minecraft.text.TranslatableText;
+import net.minecraft.util.Language;
 
 public class MagicalDamageSource extends EntityDamageSource {
 
+    public static DamageSource mundane(String type) {
+        return new DamageSource(type) {};
+    }
+
     public static DamageSource create(String type) {
         return new MagicalDamageSource(type);
     }
 
-    public static DamageSource causePlayerDamage(String type, EntityPlayer player) {
+    public static DamageSource causePlayerDamage(String type, PlayerEntity player) {
         return causeMobDamage(type, player);
     }
 
-    public static DamageSource causeMobDamage(String type, EntityLivingBase source) {
+    public static DamageSource causeMobDamage(String type, LivingEntity source) {
         return new MagicalDamageSource(type, source);
     }
 
-    public static DamageSource causeIndirect(String type, EntityArrow source, @Nullable Entity instigator) {
-        return new EntityDamageSourceIndirect(type, source, instigator).setProjectile();
+    public static DamageSource causeIndirect(String type, ArrowEntity source, @Nullable Entity instigator) {
+        return new ProjectileDamageSource(type, source, instigator).setProjectile();
     }
 
     protected MagicalDamageSource(String type) {
@@ -39,27 +42,27 @@ public class MagicalDamageSource extends EntityDamageSource {
 
     protected MagicalDamageSource(String type, Entity source) {
         super(type, source);
-        setMagicDamage();
+        setUsesMagic();
     }
 
-    public ITextComponent getDeathMessage(EntityLivingBase target) {
-        Entity attacker = damageSourceEntity instanceof EntityLivingBase ? (EntityLivingBase)damageSourceEntity : target.getRidingEntity();
-        String basic = "death.attack." + this.damageType;
+    @Override
+    public Text getDeathMessage(LivingEntity target) {
+        Entity attacker = source instanceof LivingEntity ? (LivingEntity)source : target.getVehicle();
+        String basic = "death.attack." + name;
 
-        if (attacker != null && attacker instanceof EntityLivingBase) {
+        if (attacker != null && attacker instanceof LivingEntity) {
             String withAttecker = basic + ".player";
-            ItemStack held = attacker instanceof EntityLivingBase ? ((EntityLivingBase)attacker).getHeldItemMainhand() : ItemStack.EMPTY;
+            ItemStack held = ((LivingEntity)attacker).getMainHandStack();
 
-            String withItem = withAttecker + ".item";
-            if (held != null && held.hasDisplayName() && ServerLocale.hasKey(withItem)) {
-                return new TextComponentTranslation(withItem, target.getDisplayName(), attacker.getDisplayName(), held.getTextComponent());
+            if (!held.isEmpty() && held.hasCustomName()) {
+                return new TranslatableText(withAttecker + ".item", target.getDisplayName(), attacker.getDisplayName(), held.toHoverableText());
             }
 
-            if (ServerLocale.hasKey(withAttecker)) {
-                return new TextComponentTranslation(withAttecker, target.getDisplayName(), attacker.getDisplayName());
+            if (Language.getInstance().hasTranslation(withAttecker)) {
+                return new TranslatableText(withAttecker, target.getDisplayName(), attacker.getDisplayName());
             }
         }
 
-        return new TextComponentTranslation(basic, target.getDisplayName());
+        return new TranslatableText(basic, target.getDisplayName(), source.getDisplayName());
     }
 }
diff --git a/src/main/java/com/minelittlepony/util/PosHelper.java b/src/main/java/com/minelittlepony/util/PosHelper.java
index dcd6a741..984a4834 100644
--- a/src/main/java/com/minelittlepony/util/PosHelper.java
+++ b/src/main/java/com/minelittlepony/util/PosHelper.java
@@ -6,14 +6,12 @@ import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Streams;
 import com.minelittlepony.util.shape.IShape;
 
-import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Direction;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
-import net.minecraft.util.math.BlockPos.MutableBlockPos;
 import net.minecraft.world.World;
 
 public class PosHelper {
@@ -23,22 +21,22 @@ public class PosHelper {
     }
 
     public static BlockPos findSolidGroundAt(World world, BlockPos pos) {
-        while ((pos.getY() > 0 || !world.isOutsideBuildHeight(pos))
-                && (world.isAirBlock(pos) || world.getBlockState(pos).getBlock().isReplaceable(world, pos))) {
+        while ((pos.getY() > 0 || !World.isHeightInvalid(pos))
+                && (world.isAir(pos) || world.getBlockState(pos).canPlaceAt(world, pos))) {
             pos = pos.down();
         }
 
         return pos;
     }
 
-    public static void all(BlockPos origin, Consumer<BlockPos> consumer, EnumFacing... directions) {
-        for (EnumFacing facing : directions) {
+    public static void all(BlockPos origin, Consumer<BlockPos> consumer, Direction... directions) {
+        for (Direction facing : directions) {
             consumer.accept(origin.offset(facing));
         }
     }
 
-    public static boolean some(BlockPos origin, Predicate<BlockPos> consumer, EnumFacing... directions) {
-        for (EnumFacing facing : directions) {
+    public static boolean some(BlockPos origin, Predicate<BlockPos> consumer, Direction... directions) {
+        for (Direction facing : directions) {
             if (consumer.test(origin.offset(facing))) {
                 return true;
             }
@@ -46,15 +44,15 @@ public class PosHelper {
         return false;
     }
 
-    public static Iterators<MutableBlockPos> adjacentNeighbours(BlockPos origin) {
-        MutableBlockPos pos = new MutableBlockPos(origin);
-        Iterator<EnumFacing> directions = Lists.newArrayList(EnumFacing.VALUES).iterator();
+    public static Iterators<BlockPos> adjacentNeighbours(BlockPos origin) {
+        BlockPos.Mutable pos = new BlockPos.Mutable(origin);
+        Iterator<Direction> directions = Lists.newArrayList(Direction.values()).iterator();
 
         return Iterators.iterate(() -> {
             if (directions.hasNext()) {
-                EnumFacing next = directions.next();
+                Direction next = directions.next();
 
-                pos.setPos(origin.getX() + next.getXOffset(), origin.getY() + next.getYOffset(), origin.getZ() + next.getZOffset());
+                pos.set(origin.getX() + next.getOffsetX(), origin.getY() + next.getOffsetY(), origin.getZ() + next.getOffsetZ());
                 return pos;
             }
 
@@ -62,15 +60,15 @@ public class PosHelper {
         });
     }
 
-    public static Iterators<MutableBlockPos> getAllInRegionMutable(BlockPos origin, IShape shape) {
-        Iterator<MutableBlockPos> iter = BlockPos.getAllInBoxMutable(
+    public static Iterators<BlockPos> getAllInRegionMutable(BlockPos origin, IShape shape) {
+        Iterator<BlockPos> iter = BlockPos.iterate(
                 origin.add(new BlockPos(shape.getLowerBound())),
                 origin.add(new BlockPos(shape.getUpperBound()))
             ).iterator();
 
         return Iterators.iterate(() -> {
             while (iter.hasNext()) {
-                MutableBlockPos pos = iter.next();
+                BlockPos pos = iter.next();
 
                 if (shape.isPointInside(new Vec3d(pos.subtract(origin)))) {
                     return pos;
@@ -84,7 +82,7 @@ public class PosHelper {
     /**
      * Creates a stream of mutable block positions ranging from the beginning position to end.
      */
-    public static Stream<MutableBlockPos> inRegion(BlockPos from, BlockPos to) {
-        return Streams.stream(BlockPos.getAllInBoxMutable(from, to));
+    public static Stream<BlockPos> inRegion(BlockPos from, BlockPos to) {
+        return BlockPos.stream(from, to);
     }
 }
diff --git a/src/main/java/com/minelittlepony/util/vector/VecHelper.java b/src/main/java/com/minelittlepony/util/VecHelper.java
similarity index 50%
rename from src/main/java/com/minelittlepony/util/vector/VecHelper.java
rename to src/main/java/com/minelittlepony/util/VecHelper.java
index 6feb28ba..15c72e73 100644
--- a/src/main/java/com/minelittlepony/util/vector/VecHelper.java
+++ b/src/main/java/com/minelittlepony/util/VecHelper.java
@@ -1,20 +1,23 @@
-package com.minelittlepony.util.vector;
+package com.minelittlepony.util;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.function.Predicate;
 import java.util.stream.Stream;
 
 import javax.annotation.Nullable;
 
-import com.google.common.base.Predicate;
-
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EntitySelectors;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.entity.LivingEntity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.predicate.entity.EntityPredicates;
+import net.minecraft.util.hit.BlockHitResult;
+import net.minecraft.util.hit.EntityHitResult;
+import net.minecraft.util.hit.HitResult;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Box;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.RayTraceContext;
 import net.minecraft.world.World;
 
 public class VecHelper {
@@ -22,28 +25,35 @@ public class VecHelper {
     /**
      * Performs a ray cast from the given entity and returns a result for the first block that ray intercepts.
      *
+     * Server-available version of Entity.rayTrace
+     *
      * @param e                Entity to start from
      * @param distance        Maximum distance
      * @param partialTick    Client partial ticks
      *
      * @return    RayTraceResult result or null
      */
-    public static RayTraceResult rayTrace(Entity e, double distance, float partialTicks) {
-        Vec3d pos = e.getPositionEyes(partialTicks);
-        Vec3d look = e.getLook(partialTicks).scale(distance);
+    public static HitResult rayTrace(Entity e, double distance, float partialTick) {
+        Vec3d cam = e.getCameraPosVec(partialTick);
+        Vec3d look = e.getRotationVec(partialTick).multiply(distance);
 
-        return e.getEntityWorld().rayTraceBlocks(pos, pos.add(look), false, false, true);
+        return e.world.rayTrace(
+            new RayTraceContext(cam, cam.add(look),
+                RayTraceContext.ShapeType.OUTLINE,
+                RayTraceContext.FluidHandling.NONE,
+            e)
+        );
     }
 
     /**
      * Gets the entity the player is currently looking at, or null.
      */
     @Nullable
-    public static Entity getLookedAtEntity(EntityLivingBase e, int reach) {
-        RayTraceResult objectMouseOver = getObjectMouseOver(e, reach, 1);
+    public static Entity getLookedAtEntity(LivingEntity e, int reach) {
+        HitResult objectMouseOver = getObjectMouseOver(e, reach, 1);
 
-        if (objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.ENTITY) {
-            return objectMouseOver.entityHit;
+        if (objectMouseOver instanceof EntityHitResult && objectMouseOver.getType() == BlockHitResult.Type.ENTITY) {
+            return ((EntityHitResult)objectMouseOver).getEntity();
         }
 
         return null;
@@ -54,11 +64,11 @@ public class VecHelper {
         BlockPos begin = pos.add(-radius, -radius, -radius);
         BlockPos end = pos.add(radius, radius, radius);
 
-        AxisAlignedBB bb = new AxisAlignedBB(begin, end);
+        Box bb = new Box(begin, end);
 
-        return w.getEntitiesInAABBexcluding(origin, bb, null).stream().filter(e -> {
-            double dist = e.getDistance(pos.getX(), pos.getY(), pos.getZ());
-            double dist2 = e.getDistance(pos.getX(), pos.getY() - e.getEyeHeight(), pos.getZ());
+        return w.getEntities(origin, bb, null).stream().filter(e -> {
+            double dist = e.squaredDistanceTo(pos.getX(), pos.getY(), pos.getZ());
+            double dist2 = e.squaredDistanceTo(pos.getX(), pos.getY() - e.getStandingEyeHeight(), pos.getZ());
 
             return dist <= radius || dist2 <= radius;
         });
@@ -67,11 +77,11 @@ public class VecHelper {
     /**
      * Gets all entities within a given range from the player.
      */
-    public static List<Entity> getWithinRange(EntityPlayer player, double reach, @Nullable Predicate<? super Entity> predicate) {
-        Vec3d look = player.getLook(0).scale(reach);
+    public static List<Entity> getWithinRange(PlayerEntity player, double reach, @Nullable Predicate<? super Entity> predicate) {
+        Vec3d look = player.getCameraPosVec(1).multiply(reach);
 
-        return player.world.getEntitiesInAABBexcluding(player, player
-                .getEntityBoundingBox()
+        return player.world.getEntities(player, player
+                .getBoundingBox()
                 .expand(look.x, look.y, look.z)
                 .expand(1, 1, 1), predicate);
     }
@@ -85,8 +95,8 @@ public class VecHelper {
      *
      * @return    RayTraceResult result or null
      */
-    public static RayTraceResult getObjectMouseOver(Entity e, double distance, float partialTick) {
-        return getObjectMouseOver(e, distance, partialTick, EntitySelectors.NOT_SPECTATING);
+    public static HitResult getObjectMouseOver(Entity e, double distance, float partialTick) {
+        return getObjectMouseOver(e, distance, partialTick, EntityPredicates.EXCEPT_SPECTATOR);
     }
 
     /**
@@ -101,51 +111,53 @@ public class VecHelper {
      *
      * @return    RayTraceResult result or null
      */
-    public static RayTraceResult getObjectMouseOver(Entity e, double distance, float partialTick, Predicate<Entity> predicate) {
-        RayTraceResult tracedBlock = rayTrace(e, distance, partialTick);
+    public static HitResult getObjectMouseOver(Entity e, double distance, float partialTick, Predicate<Entity> predicate) {
+        HitResult tracedBlock = rayTrace(e, distance, partialTick);
 
         double totalTraceDistance = distance;
 
-        Vec3d pos = e.getPositionEyes(partialTick);
+        Vec3d pos = e.getCameraPosVec(partialTick);
 
         if (tracedBlock != null) {
-            totalTraceDistance = tracedBlock.hitVec.distanceTo(pos);
+            totalTraceDistance = tracedBlock.getPos().distanceTo(pos);
         }
 
-        Vec3d look = e.getLook(partialTick);
-        Vec3d ray = pos.add(look.scale(distance));
+        Vec3d look = e.getRotationVec(partialTick);
+        Vec3d ray = pos.add(look.multiply(distance));
 
         Vec3d hit = null;
         Entity pointedEntity = null;
-        List<Entity> entitiesWithinRange = e.world.getEntitiesInAABBexcluding(e, e.getEntityBoundingBox()
-                .grow(look.x * distance, look.y * distance, look.z * distance)
+        List<Entity> entitiesWithinRange = e.world.getEntities(e, e.getBoundingBox()
+                .expand(look.x * distance, look.y * distance, look.z * distance)
                 .expand(1, 1, 1), predicate);
 
         double traceDistance = totalTraceDistance;
 
         for (Entity entity : entitiesWithinRange) {
-            if (entity.canBeCollidedWith()) {
-                double size = entity.getCollisionBorderSize();
-                AxisAlignedBB entityAABB = entity.getEntityBoundingBox().expand(size, size, size);
-                RayTraceResult intercept = entityAABB.calculateIntercept(pos, ray);
+            if (entity.collides()) {
+                Box entityAABB = entity.getBoundingBox().expand(entity.getTargetingMargin());
+
+                Optional<Vec3d> intercept = entityAABB.rayTrace(pos, ray);
 
                 if (entityAABB.contains(pos)) {
-                    if (0 < traceDistance || traceDistance == 0) {
+                    if (traceDistance <= 0) {
                         pointedEntity = entity;
-                        hit = intercept == null ? pos : intercept.hitVec;
+                        hit = intercept.orElse(null);
                         traceDistance = 0;
                     }
-                } else if (intercept != null) {
-                    double distanceToHit = pos.distanceTo(intercept.hitVec);
+                } else if (intercept.isPresent()) {
+                    Vec3d inter = intercept.get();
+                    double distanceToHit = pos.distanceTo(inter);
+
                     if (distanceToHit < traceDistance || traceDistance == 0) {
-                        if (entity == e.getRidingEntity()) {
+                        if (entity.getRootVehicle() == e.getRootVehicle()) {
                             if (traceDistance == 0) {
                                 pointedEntity = entity;
-                                hit = intercept.hitVec;
+                                hit = inter;
                             }
                         } else {
                             pointedEntity = entity;
-                            hit = intercept.hitVec;
+                            hit = inter;
                             traceDistance = distanceToHit;
                         }
                     }
@@ -154,7 +166,7 @@ public class VecHelper {
         }
 
         if (pointedEntity != null && (traceDistance < totalTraceDistance || tracedBlock == null)) {
-            return new RayTraceResult(pointedEntity, hit);
+            return new EntityHitResult(pointedEntity, hit);
         }
 
         return tracedBlock;
diff --git a/src/main/java/com/minelittlepony/util/WorldEvent.java b/src/main/java/com/minelittlepony/util/WorldEvent.java
index a23a90ca..edfd106b 100644
--- a/src/main/java/com/minelittlepony/util/WorldEvent.java
+++ b/src/main/java/com/minelittlepony/util/WorldEvent.java
@@ -1,7 +1,7 @@
 package com.minelittlepony.util;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
@@ -74,8 +74,8 @@ public enum WorldEvent {
         return id;
     }
 
-    public void play(World world, BlockPos pos, IBlockState state) {
-        play(world, pos, Block.getStateId(state));
+    public void play(World world, BlockPos pos, BlockState state) {
+        play(world, pos, Block.getRawIdFromState(state));
     }
 
     public void play(World world, BlockPos pos) {
@@ -83,7 +83,7 @@ public enum WorldEvent {
     }
 
     public void play(World world, BlockPos pos, int data) {
-        world.playEvent(getId(), pos, data);
+        world.playGlobalEvent(getId(), pos, data);
     }
 
     public static WorldEvent fromId(int id) {
diff --git a/src/main/java/com/minelittlepony/util/WorldHelper.java b/src/main/java/com/minelittlepony/util/WorldHelper.java
index 6f2c5811..4384c729 100644
--- a/src/main/java/com/minelittlepony/util/WorldHelper.java
+++ b/src/main/java/com/minelittlepony/util/WorldHelper.java
@@ -12,7 +12,7 @@ public final class WorldHelper {
      * Nighttime = 0
      */
     public static float getDaylightBrightness(World w, float partialTicks) {
-        float celst = w.getCelestialAngle(partialTicks);
+        float celst = w.getSkyAngle(partialTicks);
 
         // ----------------------------
         // 0 |          0.5      |      1
@@ -53,7 +53,7 @@ public final class WorldHelper {
      * Daytime = 0
      */
     public static float getLunarBrightness(World w, float partialTicks) {
-        float celst = w.getCelestialAngle(partialTicks);
+        float celst = w.getSkyAngle(partialTicks);
 
         // ----------------------------
         // 0 |          0.5      |      1
diff --git a/src/main/java/com/minelittlepony/util/collection/IStateMapping.java b/src/main/java/com/minelittlepony/util/collection/IStateMapping.java
index 865c9178..c75df8e3 100644
--- a/src/main/java/com/minelittlepony/util/collection/IStateMapping.java
+++ b/src/main/java/com/minelittlepony/util/collection/IStateMapping.java
@@ -6,13 +6,13 @@ import java.util.function.Predicate;
 import javax.annotation.Nonnull;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.init.Blocks;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.state.property.Property;
 
-public interface IStateMapping extends Predicate<IBlockState>, Function<IBlockState, IBlockState> {
+public interface IStateMapping extends Predicate<BlockState>, Function<BlockState, BlockState> {
 
-    static IStateMapping removeBlock(Predicate<IBlockState> mapper) {
+    static IStateMapping removeBlock(Predicate<BlockState> mapper) {
         return build(
                 mapper,
                 s -> Blocks.AIR.getDefaultState());
@@ -25,34 +25,34 @@ public interface IStateMapping extends Predicate<IBlockState>, Function<IBlockSt
                 s -> replaceBlock(to, from));
     }
 
-    static <T extends Comparable<T>> IStateMapping replaceProperty(Block block, IProperty<T> property, T from, T to) {
+    static <T extends Comparable<T>> IStateMapping replaceProperty(Block block, Property<T> property, T from, T to) {
         return build(
-                s -> s.getBlock() == block && s.getValue(property) == from,
-                s -> s.withProperty(property, to),
+                s -> s.getBlock() == block && s.get(property) == from,
+                s -> s.with(property, to),
                 s -> replaceProperty(block, property, to, from));
     }
 
-    static <T extends Comparable<T>> IStateMapping setProperty(Block block, IProperty<T> property, T to) {
+    static <T extends Comparable<T>> IStateMapping setProperty(Block block, Property<T> property, T to) {
         return build(
                 s -> s.getBlock() == block,
-                s -> s.withProperty(property, to));
+                s -> s.with(property, to));
     }
 
-    static IStateMapping build(Predicate<IBlockState> predicate, Function<IBlockState, IBlockState> converter) {
+    static IStateMapping build(Predicate<BlockState> predicate, Function<BlockState, BlockState> converter) {
         return build(predicate, converter, s -> s);
     }
 
-    static IStateMapping build(Predicate<IBlockState> predicate, Function<IBlockState, IBlockState> converter, Function<IStateMapping, IStateMapping> inverter) {
+    static IStateMapping build(Predicate<BlockState> predicate, Function<BlockState, BlockState> converter, Function<IStateMapping, IStateMapping> inverter) {
         return new IStateMapping() {
             private IStateMapping inverse;
 
             @Override
-            public boolean test(IBlockState state) {
+            public boolean test(BlockState state) {
                 return predicate.test(state);
             }
 
             @Override
-            public IBlockState apply(IBlockState state) {
+            public BlockState apply(BlockState state) {
                 return converter.apply(state);
             }
 
@@ -74,7 +74,7 @@ public interface IStateMapping extends Predicate<IBlockState>, Function<IBlockSt
      * @return    True if the state can be converted
      */
     @Override
-    default boolean test(@Nonnull IBlockState state) {
+    default boolean test(@Nonnull BlockState state) {
         return true;
     }
 
@@ -87,7 +87,7 @@ public interface IStateMapping extends Predicate<IBlockState>, Function<IBlockSt
      */
     @Nonnull
     @Override
-    default IBlockState apply(@Nonnull IBlockState state) {
+    default BlockState apply(@Nonnull BlockState state) {
         return state;
     }
 
diff --git a/src/main/java/com/minelittlepony/util/collection/StateMapList.java b/src/main/java/com/minelittlepony/util/collection/StateMapList.java
index aa1ed811..f444e3f4 100644
--- a/src/main/java/com/minelittlepony/util/collection/StateMapList.java
+++ b/src/main/java/com/minelittlepony/util/collection/StateMapList.java
@@ -7,8 +7,8 @@ import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.properties.IProperty;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.state.property.Property;
 
 /**
  * A collection of block-state mappings.
@@ -17,7 +17,7 @@ import net.minecraft.block.state.IBlockState;
 public class StateMapList extends ArrayList<IStateMapping> {
     private static final long serialVersionUID = 2602772651960588745L;
 
-    public void removeBlock(Predicate<IBlockState> mapper) {
+    public void removeBlock(Predicate<BlockState> mapper) {
         add(IStateMapping.removeBlock(mapper));
     }
 
@@ -25,11 +25,11 @@ public class StateMapList extends ArrayList<IStateMapping> {
         add(IStateMapping.replaceBlock(from, to));
     }
 
-    public <T extends Comparable<T>> void replaceProperty(Block block, IProperty<T> property, T from, T to) {
+    public <T extends Comparable<T>> void replaceProperty(Block block, Property<T> property, T from, T to) {
         add(IStateMapping.replaceProperty(block, property, from, to));
     }
 
-    public <T extends Comparable<T>> void setProperty(Block block, IProperty<T> property, T to) {
+    public <T extends Comparable<T>> void setProperty(Block block, Property<T> property, T to) {
         add(IStateMapping.setProperty(block, property, to));
     }
 
@@ -40,7 +40,7 @@ public class StateMapList extends ArrayList<IStateMapping> {
      *
      * @return    True if the state can be converted
      */
-    public boolean canConvert(@Nullable IBlockState state) {
+    public boolean canConvert(@Nullable BlockState state) {
         return state != null && stream().anyMatch(i -> i.test(state));
     }
 
@@ -52,7 +52,7 @@ public class StateMapList extends ArrayList<IStateMapping> {
      * @return    The converted state if there is one, otherwise null
      */
     @Nonnull
-    public IBlockState getConverted(@Nonnull IBlockState state) {
+    public BlockState getConverted(@Nonnull BlockState state) {
         for (IStateMapping i : this) {
             if (i.test(state)) {
                 return i.apply(state);
diff --git a/src/main/java/com/minelittlepony/util/fixers/BlockFixer.java b/src/main/java/com/minelittlepony/util/fixers/BlockFixer.java
deleted file mode 100644
index 5dee01be..00000000
--- a/src/main/java/com/minelittlepony/util/fixers/BlockFixer.java
+++ /dev/null
@@ -1,101 +0,0 @@
-package com.minelittlepony.util.fixers;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.nbt.NBTTagList;
-import net.minecraft.util.datafix.IFixableData;
-import net.minecraft.world.chunk.NibbleArray;
-
-public abstract class BlockFixer implements IFixableData {
-
-    protected NBTTagCompound fixChunk(NBTTagCompound chunk) {
-        byte[] blocks = chunk.getByteArray("Blocks");
-
-        NibbleArray data = new NibbleArray(chunk.getByteArray("Data"));
-        NibbleArray add = chunk.hasKey("Add", 7) ? new NibbleArray(chunk.getByteArray("Add")) : null;
-
-        boolean altered = false;
-
-        for (int i = 0; i < 4096; i++) {
-            int xPos = i & 15;
-            int yPos = i >> 8 & 15;
-            int zPos = i >> 4 & 15;
-
-            int extendedBlockId = (add == null ? 0 : add.get(xPos, yPos, zPos));
-            int baseBlockId = blocks[i] & 255;
-
-
-            int blockid = (extendedBlockId << 8) | baseBlockId;
-            int metadata = data.get(xPos, yPos, zPos);
-
-            int blockStateId = (blockid << 4) | metadata;
-
-            Block block = Block.getBlockById(blockid);
-
-
-            if (block != null) {
-                IBlockState state = fixBlockState(blockid, metadata);
-
-                if (state != null) {
-                    @SuppressWarnings("deprecation")
-                    int newBlockStateId = Block.BLOCK_STATE_IDS.get(state);
-
-                    if (newBlockStateId != blockStateId) {
-                        metadata = newBlockStateId & 15;
-                        blockid = newBlockStateId >> 4;
-                        extendedBlockId = blockid >> 8;
-                        baseBlockId = blockid & 255;
-
-                        if (extendedBlockId != 0) {
-                            if (add == null) {
-                                add = new NibbleArray(new byte[data.getData().length]);
-                            }
-
-                            add.set(xPos, yPos, zPos, extendedBlockId);
-                        }
-
-                        data.set(xPos, yPos, zPos, metadata);
-                        blocks[i] = (byte)blockid;
-
-                        altered = true;
-                    }
-                }
-            }
-        }
-
-        if (altered) {
-            if (add != null) {
-                chunk.setByteArray("Add", add.getData());
-            }
-            chunk.setByteArray("Blocks", blocks);
-            chunk.setByteArray("Data", data.getData());
-        }
-
-        return chunk;
-    }
-
-    protected abstract IBlockState fixBlockState(int id, int metadata);
-
-    @Override
-    public NBTTagCompound fixTagCompound(NBTTagCompound compound) {
-
-        if (compound.hasKey("Level", 10)) {
-            NBTTagCompound level = compound.getCompoundTag("Level");
-
-            if (level.hasKey("Sections", 9)) {
-                NBTTagList sections = level.getTagList("Sections", 10);
-
-                for (int i = 0; i < sections.tagCount(); i++) {
-                    NBTTagCompound chunk = sections.getCompoundTagAt(i);
-
-                    if (chunk.hasKey("Blocks", 7) && chunk.hasKey("Data", 7)) {
-                        sections.set(i, fixChunk(chunk));
-                    }
-                }
-            }
-        }
-
-        return compound;
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/util/gui/ButtonGridLayout.java b/src/main/java/com/minelittlepony/util/gui/ButtonGridLayout.java
deleted file mode 100644
index 7d325579..00000000
--- a/src/main/java/com/minelittlepony/util/gui/ButtonGridLayout.java
+++ /dev/null
@@ -1,90 +0,0 @@
-package com.minelittlepony.util.gui;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
-
-import net.minecraft.client.gui.GuiButton;
-
-public class ButtonGridLayout {
-
-    private List<GuiButton> elements;
-
-    private Map<Integer, List<GuiButton>> leftLookup = new HashMap<>();
-    private Map<Integer, List<GuiButton>> topLookup = new HashMap<>();
-
-    private Map<Integer, List<GuiButton>> idLookup = new HashMap<>();
-
-    private int nextButtonId = -1;
-
-    public ButtonGridLayout(List<GuiButton> elements) {
-        elements.forEach(this::addElement);
-        this.elements = elements;
-    }
-
-    public int getNextButtonId() {
-        return nextButtonId++;
-    }
-
-    public GuiButton addElement(GuiButton button) {
-        if (elements != null) {
-            elements.add(button);
-        }
-        getColumn(button.x).add(button);
-        getRow(button.y).add(button);
-        getButton(button.id).add(button);
-
-        while (button.id >= nextButtonId) {
-            getNextButtonId();
-        }
-
-        return button;
-    }
-
-    public List<GuiButton> getElements() {
-        return elements;
-    }
-
-    public List<GuiButton> getRow(int y) {
-        return topLookup.computeIfAbsent(y, ArrayList::new);
-    }
-
-    public List<GuiButton> getColumn(int x) {
-        return leftLookup.computeIfAbsent(x, ArrayList::new);
-    }
-
-    public List<GuiButton> getButton(int id) {
-        return idLookup.computeIfAbsent(id, ArrayList::new);
-    }
-
-    public Stream<Integer> getButtonIds() {
-        return idLookup.keySet().stream().sorted();
-    }
-
-    public Stream<Integer> getColumns() {
-        return leftLookup.keySet().stream().sorted();
-    }
-
-    public Stream<Integer> getRows() {
-        return topLookup.keySet().stream().sorted();
-    }
-
-    public Stream<Integer> getIds() {
-        return idLookup.keySet().stream().sorted();
-    }
-
-    public static <T> List<T> list(Stream<T> s) {
-        return s.collect(Collectors.toList());
-    }
-
-    public static <T> T first(List<T> c, int i) {
-        return c.get(i);
-    }
-
-    public static <T> T last(List<T> c, int i) {
-        return first(c, (c.size() - 1) - i);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/util/lang/ClientLocale.java b/src/main/java/com/minelittlepony/util/lang/ClientLocale.java
deleted file mode 100644
index 99d2e3d3..00000000
--- a/src/main/java/com/minelittlepony/util/lang/ClientLocale.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package com.minelittlepony.util.lang;
-
-import net.minecraft.client.resources.I18n;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-
-/**
- * Localisation class for client-side translations.
- * Only use this in client code. Servers should use ServerLocale.
- */
-@SideOnly(Side.CLIENT)
-public class ClientLocale {
-    /**
-     * Translates the given string and then formats it. Equivalent to String.format(translate(key), parameters).
-     */
-    public static String format(String translateKey, Object... parameters) {
-        return I18n.format(translateKey, parameters);
-    }
-
-    /**
-     * Determines if a language mapping exists in the current locale for the requested key.
-     */
-    public static boolean hasKey(String key) {
-        return I18n.hasKey(key);
-    }
-}
diff --git a/src/main/java/com/minelittlepony/util/lang/ServerLocale.java b/src/main/java/com/minelittlepony/util/lang/ServerLocale.java
deleted file mode 100644
index cebde015..00000000
--- a/src/main/java/com/minelittlepony/util/lang/ServerLocale.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package com.minelittlepony.util.lang;
-
-import com.minelittlepony.unicopia.forgebullshit.FUF;
-
-import net.minecraft.util.text.translation.I18n;
-
-/**
- * Localisation class for server-side translations.
- * Use this in a server context, otherwise use ClientLocale.
- */
-@FUF(reason = "Don't deprecate classes we actually need to use")
-@SuppressWarnings("deprecation")
-public class ServerLocale {
-    /**
-     * Translates a Stat name with format args
-     */
-    public static String format(String key, Object... format) {
-        return I18n.translateToLocalFormatted(key, format);
-    }
-
-    /**
-     * Determines whether or not translateToLocal will find a translation for the given key.
-     */
-    public static boolean hasKey(String key) {
-        return I18n.canTranslate(key);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/com/minelittlepony/util/shape/IShape.java b/src/main/java/com/minelittlepony/util/shape/IShape.java
index 397a1e15..6f56b5b4 100644
--- a/src/main/java/com/minelittlepony/util/shape/IShape.java
+++ b/src/main/java/com/minelittlepony/util/shape/IShape.java
@@ -1,6 +1,9 @@
 package com.minelittlepony.util.shape;
 
 import java.util.Random;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.minelittlepony.util.Iterators;
 
 import net.minecraft.util.math.Vec3d;
 
@@ -18,54 +21,70 @@ public interface IShape {
      *
      * @return This Shape
      */
-    public IShape setRotation(float u, float v);
+    IShape setRotation(float u, float v);
 
     /**
      * Get the volume of space filled by this shape, or the surface area if hollow.
      *
      * @return double volume
      */
-    public double getVolumeOfSpawnableSpace();
+    double getVolumeOfSpawnableSpace();
 
     /**
      * X offset from the shape's origin.
      *
      * @return X
      */
-    public double getXOffset();
+    double getXOffset();
 
     /**
      * Y offset from the shape's origin.
      *
      * @return Y
      */
-    public double getYOffset();
+    double getYOffset();
 
     /**
      * Z offset from the shape's origin.
      *
      * @return Z
      */
-    public double getZOffset();
+    double getZOffset();
 
     /**
      * Gets the lower bounds of the region occupied by this shape.
      */
-    public Vec3d getLowerBound();
+    Vec3d getLowerBound();
 
     /**
      * Gets the upper bound of the region occupied by this shape.
      */
-    public Vec3d getUpperBound();
+    Vec3d getUpperBound();
 
     /**
      * Computes a random coordinate that falls within this shape's designated area.
      */
-    public Vec3d computePoint(Random rand);
+    Vec3d computePoint(Random rand);
 
     /**
      * Checks if the given point is on the edge, or if not hollow the inside, of this shape.
      * @return
      */
-    public boolean isPointInside(Vec3d point);
+    boolean isPointInside(Vec3d point);
+
+    /**
+     * Returns a sequence of N random points.
+     */
+    default Iterators<Vec3d> randomPoints(int n, Random rand) {
+        AtomicInteger atom = new AtomicInteger(n);
+        return Iterators.iterate(() -> {
+            if (atom.get() <= 0) {
+                return null;
+            }
+
+            atom.decrementAndGet();
+
+            return computePoint(rand);
+        });
+    }
 }
diff --git a/src/main/java/com/minelittlepony/util/shape/Line.java b/src/main/java/com/minelittlepony/util/shape/Line.java
index 089fed0b..197831c5 100644
--- a/src/main/java/com/minelittlepony/util/shape/Line.java
+++ b/src/main/java/com/minelittlepony/util/shape/Line.java
@@ -60,46 +60,62 @@ public class Line implements IShape {
         dZ = lenV.z / len;
     }
 
+    @Override
     public double getVolumeOfSpawnableSpace() {
         return len;
     }
 
+    @Override
     public double getXOffset() {
         return sX;
     }
 
+    @Override
     public double getYOffset() {
         return sY;
     }
 
+    @Override
     public double getZOffset() {
         return sZ;
     }
 
+    @Override
     public Vec3d computePoint(Random rand) {
         double distance = MathHelper.nextDouble(rand, 0, len);
-        return new Vec3d(dX, dY, dZ).scale(distance).add(sX, sY, sZ).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(dX, dY, dZ)
+                .multiply(distance)
+                .add(sX, sY, sZ)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 
+    @Override
     public Line setRotation(float u, float v) {
         yaw = u;
         pitch = v;
         return this;
     }
 
+    @Override
     public boolean isPointInside(Vec3d point) {
-        point = point.rotateYaw(-yaw).rotatePitch(-pitch);
+        point = point.rotateY(-yaw).rotateX(-pitch);
 
         return point.x/dX == point.y/dY && point.x/dX == point.z/dZ;
     }
 
     @Override
     public Vec3d getLowerBound() {
-        return new Vec3d(sX, sY, sZ).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(sX, sY, sZ)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 
     @Override
     public Vec3d getUpperBound() {
-        return new Vec3d(sX + dX, sY + dY, sZ + dZ).scale(len).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(sX + dX, sY + dY, sZ + dZ)
+                .multiply(len)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 }
diff --git a/src/main/java/com/minelittlepony/util/shape/Sphere.java b/src/main/java/com/minelittlepony/util/shape/Sphere.java
index 68d8d383..2e2f9bf8 100644
--- a/src/main/java/com/minelittlepony/util/shape/Sphere.java
+++ b/src/main/java/com/minelittlepony/util/shape/Sphere.java
@@ -50,6 +50,7 @@ public class Sphere implements IShape {
         volume = computeSpawnableSpace();
     }
 
+    @Override
     public double getVolumeOfSpawnableSpace() {
         return volume;
     }
@@ -82,18 +83,22 @@ public class Sphere implements IShape {
         return result;
     }
 
+    @Override
     public double getXOffset() {
         return 0;
     }
 
+    @Override
     public double getYOffset() {
         return 0;
     }
 
+    @Override
     public double getZOffset() {
         return 0;
     }
 
+    @Override
     public Vec3d computePoint(Random rand) {
         double rad = this.rad;
 
@@ -105,17 +110,21 @@ public class Sphere implements IShape {
         double phi = MathHelper.nextDouble(rand, 0, Math.PI * 2);
         double theta = Math.asin(z / rad);
 
-        return new Vec3d(rad * Math.cos(theta) * Math.cos(phi) * stretch.x, rad * Math.cos(theta) * Math.sin(phi) * stretch.y, z * stretch.z).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(rad * Math.cos(theta) * Math.cos(phi) * stretch.x, rad * Math.cos(theta) * Math.sin(phi) * stretch.y, z * stretch.z)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 
+    @Override
     public Sphere setRotation(float u, float v) {
         yaw = u;
         pitch = v;
         return this;
     }
 
+    @Override
     public boolean isPointInside(Vec3d point) {
-        point = point.rotateYaw(-yaw).rotatePitch(-pitch);
+        point = point.rotateY(-yaw).rotateX(-pitch);
         point = new Vec3d(point.x / stretch.x, point.y / stretch.y, point.z / stretch.z);
 
         double dist = point.length();
@@ -125,11 +134,15 @@ public class Sphere implements IShape {
 
     @Override
     public Vec3d getLowerBound() {
-        return new Vec3d(-rad * stretch.x, -rad * stretch.y, -rad * stretch.z).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(-rad * stretch.x, -rad * stretch.y, -rad * stretch.z)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 
     @Override
     public Vec3d getUpperBound() {
-        return new Vec3d(rad * stretch.x, rad * stretch.y, rad * stretch.z).rotateYaw(yaw).rotatePitch(pitch);
+        return new Vec3d(rad * stretch.x, rad * stretch.y, rad * stretch.z)
+                .rotateY(yaw)
+                .rotateX(pitch);
     }
 }