diff --git a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java
index 15aa044a..0db785d3 100644
--- a/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java
+++ b/src/client/java/com/minelittlepony/client/model/armour/DefaultPonyArmorTextureResolver.java
@@ -53,7 +53,7 @@ public class DefaultPonyArmorTextureResolver<T extends EntityLivingBase> impleme
 
     private ResourceLocation resolve(ResourceLocation... resources) {
         // check resource packs for either texture.
-        for (ResourcePackInfoClient entry : Minecraft.getInstance().getResourcePackList().getPackInfos()) {
+        for (ResourcePackInfoClient entry : Minecraft.getInstance().getResourcePackList().getAllPacks()) {
             for (ResourceLocation candidate : resources) {
                 if (entry.getResourcePack().resourceExists(ResourcePackType.CLIENT_RESOURCES, candidate)) {
                     // ponies are more important
diff --git a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
index c43faf4e..af9f3559 100644
--- a/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
+++ b/src/client/java/com/minelittlepony/client/render/LevitatingItemRenderer.java
@@ -27,7 +27,7 @@ public class LevitatingItemRenderer {
     public static void enableItemGlowRenderProfile() {
         enableBlend();
         blendFuncSeparate(SourceFactor.CONSTANT_COLOR, DestFactor.ONE, SourceFactor.ONE, DestFactor.ZERO);
-        Minecraft.getInstance().entityRenderer.disableLightmap();
+        Minecraft.getInstance().gameRenderer.disableLightmap();
     }
 
     /**
diff --git a/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java
index 3a18db91..b5908819 100644
--- a/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java
+++ b/src/client/java/com/minelittlepony/client/render/entities/RenderEnderStallion.java
@@ -42,7 +42,7 @@ public class RenderEnderStallion extends RenderPonyMob<EntityEnderman> implement
         return new LayerHeldPonyItemMagical<EntityEnderman>(this) {
             @Override
             protected ItemStack getRightItem(EntityEnderman entity) {
-                IBlockState state = entity.func_195405_dq();
+                IBlockState state = entity.getHeldBlockState();
                 if (state == null) {
                     return ItemStack.EMPTY;
                 }
@@ -61,7 +61,7 @@ public class RenderEnderStallion extends RenderPonyMob<EntityEnderman> implement
     public void doRender(EntityEnderman entity, double x, double y, double z, float entityYaw, float partialTicks) {
         ModelEnderStallion modelenderman = (ModelEnderStallion)getMainModel();
 
-        modelenderman.isCarrying = entity.func_195405_dq() != null;
+        modelenderman.isCarrying = entity.getHeldBlockState() != null;
         modelenderman.isAttacking = entity.isScreaming();
 
         if (entity.isScreaming()) {
diff --git a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java
index 7810bf67..a9f8e7f1 100644
--- a/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java
+++ b/src/client/java/com/minelittlepony/client/render/entities/player/RenderSeaponyPlayer.java
@@ -36,7 +36,7 @@ public class RenderSeaponyPlayer extends RenderPonyPlayer {
             double y = player.posY + (player.getEntityWorld().rand.nextFloat() * 2);
             double z = player.posZ + (player.getEntityWorld().rand.nextFloat() * 2) - 1;
 
-            player.getEntityWorld().spawnParticle(Particles.END_ROD, x, y, z, 0, 0, 0);
+            player.getEntityWorld().addParticle(Particles.END_ROD, x, y, z, 0, 0, 0);
         }
 
         return pony;
diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java b/src/client/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java
index ae798e8a..067814b4 100644
--- a/src/client/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java
+++ b/src/client/java/com/minelittlepony/client/render/layer/LayerEyeGlow.java
@@ -32,11 +32,11 @@ public class LayerEyeGlow<T extends EntityLiving> extends AbstractPonyLayer<T> {
 
         color4f(1, 1, 1, 1);
 
-        Minecraft.getInstance().entityRenderer.setupFogColor(true);
+        Minecraft.getInstance().gameRenderer.setupFogColor(true);
 
         getMainModel().render(entity, move, swing, ticks, headYaw, headPitch, scale);
 
-        Minecraft.getInstance().entityRenderer.setupFogColor(false);
+        Minecraft.getInstance().gameRenderer.setupFogColor(false);
 
         ((RenderLiving<T>)getRenderer()).setLightmap(entity);
 
diff --git a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
index 69775a30..c06c317f 100644
--- a/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
+++ b/src/client/java/com/minelittlepony/client/render/layer/LayerPonyCustomHead.java
@@ -98,7 +98,7 @@ public class LayerPonyCustomHead<T extends EntityLivingBase> implements LayerRen
                 profile = NBTUtil.readGameProfile(nbt.getCompound("SkullOwner"));
             } else if (nbt.contains("SkullOwner", 8)) {
                 profile = TileEntitySkull.updateGameProfile(new GameProfile(null, nbt.getString("SkullOwner")));
-                nbt.setTag("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), profile));
+                nbt.put("SkullOwner", NBTUtil.writeGameProfile(new NBTTagCompound(), profile));
             }
         }
 
diff --git a/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java
index 7b294bca..6612cab7 100644
--- a/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java
+++ b/src/client/java/com/minelittlepony/client/util/render/GlowRenderer.java
@@ -38,7 +38,7 @@ public class GlowRenderer extends AbstractRenderer<GlowRenderer> {
     @Override
     public void render(float scale) {
         GL11.glPushAttrib(GL11.GL_ALL_ATTRIB_BITS);
-        Minecraft.getInstance().entityRenderer.disableLightmap();
+        Minecraft.getInstance().gameRenderer.disableLightmap();
         super.render(scale);
         GL11.glPopAttrib();
     }
diff --git a/src/common/java/com/minelittlepony/common/client/gui/GameGui.java b/src/common/java/com/minelittlepony/common/client/gui/GameGui.java
index 2e023837..f74a2156 100644
--- a/src/common/java/com/minelittlepony/common/client/gui/GameGui.java
+++ b/src/common/java/com/minelittlepony/common/client/gui/GameGui.java
@@ -30,7 +30,7 @@ public abstract class GameGui extends GuiScreen {
     }
 
     protected void playSound(SoundEvent event) {
-        mc.getSoundHandler().play(SimpleSound.getMasterRecord(event, 1));
+        mc.getSoundHandler().play(SimpleSound.master(event, 1));
     }
 
     /**
diff --git a/src/common/java/com/minelittlepony/common/client/gui/IconicButton.java b/src/common/java/com/minelittlepony/common/client/gui/IconicButton.java
index d6526d7a..9b0931d8 100644
--- a/src/common/java/com/minelittlepony/common/client/gui/IconicButton.java
+++ b/src/common/java/com/minelittlepony/common/client/gui/IconicButton.java
@@ -17,7 +17,7 @@ public class IconicButton extends Button {
     }
 
     public IconicButton setIcon(ItemStack stack, int colour) {
-        stack.getOrCreateChildTag("display").setInt("color", colour);
+        stack.getOrCreateChildTag("display").putInt("color", colour);
         return setIcon(stack);
     }
 
diff --git a/src/common/java/com/minelittlepony/common/client/gui/Style.java b/src/common/java/com/minelittlepony/common/client/gui/Style.java
index 28b74f99..437da787 100644
--- a/src/common/java/com/minelittlepony/common/client/gui/Style.java
+++ b/src/common/java/com/minelittlepony/common/client/gui/Style.java
@@ -21,7 +21,7 @@ public class Style implements IGuiTooltipped<Style> {
     }
 
     public Style setIcon(ItemStack stack, int colour) {
-        stack.getOrCreateChildTag("display").setInt("color", colour);
+        stack.getOrCreateChildTag("display").putInt("color", colour);
         return setIcon(stack);
     }