10 more rejects down.

98 errors 6 rejects left.

src/main/java/net/minecraftforge/client/ClientCommandHandler.java

@@ -103,7 +103,7 @@ public class ClientCommandHandler extends CommandHandler
         return ret;
     }
 
-    public void autoComplete(String leftOfCursor, String full)
+    public void autoComplete(String leftOfCursor)
     {
         latestAutoComplete = null;
 
@@ -142,4 +142,4 @@ public class ClientCommandHandler extends CommandHandler
     protected MinecraftServer func_184879_a() {
         return Minecraft.getMinecraft().getIntegratedServer();
     }
-}
+}

src/main/java/net/minecraftforge/client/ForgeHooksClient.java

@@ -113,9 +113,9 @@ public class ForgeHooksClient
     {
         Block block = state.getBlock();
 
-        if (block != null && block.isBed(world, pos, entity))
+        if (block != null && block.isBed(state, world, pos, entity))
         {
-            glRotatef((float)(block.getBedDirection(world, pos).getHorizontalIndex() * 90), 0.0F, 1.0F, 0.0F);
+            glRotatef((float)(block.getBedDirection(state, world, pos).getHorizontalIndex() * 90), 0.0F, 1.0F, 0.0F);
         }
     }
 
@@ -297,8 +297,7 @@ public class ForgeHooksClient
 
     public static ISound playSound(SoundManager manager, ISound sound)
     {
-        SoundEventAccessorComposite accessor = manager.sndHandler.getSound(sound.getSoundLocation());
-        PlaySoundEvent e = new PlaySoundEvent(manager, sound, (accessor == null ? null : accessor.getSoundCategory()));
+        PlaySoundEvent e = new PlaySoundEvent(manager, sound);
         MinecraftForge.EVENT_BUS.post(e);
         return e.result;
     }
@@ -361,7 +360,7 @@ public class ForgeHooksClient
         modelLoader.onPostBakeEvent(modelRegistry);
     }
 
-	public static Matrix4f getMatrix(ItemTransformVec3f transform)
+    public static Matrix4f getMatrix(ItemTransformVec3f transform)
     {
         javax.vecmath.Matrix4f m = new javax.vecmath.Matrix4f(), t = new javax.vecmath.Matrix4f();
         m.setIdentity();
@@ -383,7 +382,7 @@ public class ForgeHooksClient
         return m;
     }
 
-	public static IBakedModel handleCameraTransforms(IBakedModel model, ItemCameraTransforms.TransformType cameraTransformType)
+    public static IBakedModel handleCameraTransforms(IBakedModel model, ItemCameraTransforms.TransformType cameraTransformType)
     {
         if(model instanceof IPerspectiveAwareModel)
         {
@@ -598,20 +597,20 @@ public class ForgeHooksClient
         }
     }
 
-	public static IBakedModel getDamageModel(IBakedModel ibakedmodel, TextureAtlasSprite texture, IBlockState state, IBlockAccess world, BlockPos pos)
-	{
-		// TODO custom damage models
-		// state = state.block.getExtendedState(state, world, pos);
-		return (new SimpleBakedModel.Builder(state, ibakedmodel, texture, pos)).makeBakedModel();
-	}
+    public static IBakedModel getDamageModel(IBakedModel ibakedmodel, TextureAtlasSprite texture, IBlockState state, IBlockAccess world, BlockPos pos)
+    {
+        // TODO custom damage models
+        // state = state.block.getExtendedState(state, world, pos);
+        return (new SimpleBakedModel.Builder(state, ibakedmodel, texture, pos)).makeBakedModel();
+    }
 
-	public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to)
-	{
-		if(!Objects.equal(from, to) || from == null)
-		{
-			return false;
-		}
-		// FIXME: 3rd argument?
-		return from.getItem().shouldCauseReequipAnimation(from, to);
-	}
+    public static boolean shouldCauseReequipAnimation(ItemStack from, ItemStack to)
+    {
+        if(!Objects.equal(from, to) || from == null)
+        {
+            return false;
+        }
+        // FIXME: 3rd argument?
+        return from.getItem().shouldCauseReequipAnimation(from, to);
+    }
 }

src/main/java/net/minecraftforge/client/GuiIngameForge.java

@@ -23,9 +23,9 @@ import net.minecraft.entity.SharedMonsterAttributes;
 import net.minecraft.entity.ai.attributes.IAttributeInstance;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Blocks;
+import net.minecraft.init.MobEffects;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
-import net.minecraft.potion.Potion;
 import net.minecraft.scoreboard.ScoreObjective;
 import net.minecraft.scoreboard.ScorePlayerTeam;
 import net.minecraft.scoreboard.Scoreboard;
@@ -88,8 +88,8 @@ public class GuiIngameForge extends GuiIngame
         eventParent = new RenderGameOverlayEvent(partialTicks, res);
         int width = res.getScaledWidth();
         int height = res.getScaledHeight();
-        renderHealthMount = mc.thePlayer.ridingEntity instanceof EntityLivingBase;
-        renderFood = mc.thePlayer.ridingEntity == null;
+        renderHealthMount = mc.thePlayer.func_184187_bx() instanceof EntityLivingBase;
+        renderFood = mc.thePlayer.func_184187_bx() == null;
         renderJumpBar = mc.thePlayer.isRidingHorse();
 
         right_height = 39;
@@ -107,12 +107,13 @@ public class GuiIngameForge extends GuiIngame
         }
         else
         {
-            GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+            GlStateManager.enableDepth();
+            GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
         }
 
         if (renderHelmet) renderHelmet(res, partialTicks);
 
-        if (renderPortal && !mc.thePlayer.isPotionActive(Potion.confusion))
+        if (renderPortal && !mc.thePlayer.isPotionActive(MobEffects.confusion))
         {
             renderPortal(res, partialTicks);
         }
@@ -123,9 +124,10 @@ public class GuiIngameForge extends GuiIngame
         zLevel = -90.0F;
         rand.setSeed((long)(updateCounter * 312871));
 
-        if (renderCrosshairs) renderCrosshairs(width, height);
+        if (renderCrosshairs) renderCrosshairs(partialTicks);
         if (renderBossHealth) renderBossHealth();
 
+        GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
         if (this.mc.playerController.shouldDrawHUD() && this.mc.getRenderViewEntity() instanceof EntityPlayer)
         {
             if (renderHealth) renderHealth(width, height);
@@ -134,6 +136,7 @@ public class GuiIngameForge extends GuiIngame
             if (renderHealthMount) renderHealthMount(width, height);
             if (renderAir)    renderAir(width, height);
         }
+
         renderSleepFade(width, height);
 
         if (renderJumpBar)
@@ -147,7 +150,9 @@ public class GuiIngameForge extends GuiIngame
 
         renderToolHightlight(res);
         renderHUDText(width, height);
+        renderPotionIcons(res);
         renderRecordOverlay(width, height, partialTicks);
+        renderSubtitles(res);
         renderTitle(width, height, partialTicks);
 
 
@@ -185,31 +190,37 @@ public class GuiIngameForge extends GuiIngame
         return res;
     }
 
-    protected void renderCrosshairs(int width, int height)
+    protected void renderCrosshairs(float partialTicks)
     {
         if (pre(CROSSHAIRS)) return;
-        if (this.showCrosshair())
-        {
-            bind(Gui.icons);
-            GlStateManager.enableBlend();
-            GlStateManager.tryBlendFuncSeparate(GL11.GL_ONE_MINUS_DST_COLOR, GL11.GL_ONE_MINUS_SRC_COLOR, 1, 0);
-            GlStateManager.enableAlpha();
-            drawTexturedModalRect(width / 2 - 7, height / 2 - 7, 0, 0, 16, 16);
-            GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
-            GlStateManager.disableBlend();
-        }
+        bind(Gui.icons);
+        super.func_184045_a(partialTicks, res);
         post(CROSSHAIRS);
     }
 
-    @Override
+    protected void renderPotionIcons(ScaledResolution resolution)
+    {
+        if (pre(POTION_ICONS)) return;
+        super.func_184048_a(resolution);
+        post(POTION_ICONS);
+    }
+
+    protected void renderSubtitles(ScaledResolution resolution)
+    {
+        if (pre(SUBTITLES)) return;
+        this.field_184049_t.func_184068_a(res);
+        post(SUBTITLES);
+    }
+
+    //@Override
     protected void renderBossHealth()
     {
         if (pre(BOSSHEALTH)) return;
         bind(Gui.icons);
-        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+        GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
         mc.mcProfiler.startSection("bossHealth");
         GlStateManager.enableBlend();
-        super.renderBossHealth();
+        this.field_184050_w.func_184051_a();
         GlStateManager.disableBlend();
         mc.mcProfiler.endSection();
         post(BOSSHEALTH);
@@ -361,7 +372,7 @@ public class GuiIngameForge extends GuiIngame
 
         IAttributeInstance attrMaxHealth = player.getEntityAttribute(SharedMonsterAttributes.maxHealth);
         float healthMax = (float)attrMaxHealth.getAttributeValue();
-        float absorb = player.getAbsorptionAmount();
+        float absorb = MathHelper.ceiling_float_int(player.getAbsorptionAmount());
 
         int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F);
         int rowHeight = Math.max(10 - (healthRows - 2), 3);
@@ -374,7 +385,7 @@ public class GuiIngameForge extends GuiIngame
         if (rowHeight != 10) left_height += 10 - rowHeight;
 
         int regen = -1;
-        if (player.isPotionActive(Potion.regeneration))
+        if (player.isPotionActive(MobEffects.regeneration))
         {
             regen = updateCounter % 25;
         }
@@ -382,8 +393,8 @@ public class GuiIngameForge extends GuiIngame
         final int TOP =  9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0);
         final int BACKGROUND = (highlight ? 25 : 16);
         int MARGIN = 16;
-        if (player.isPotionActive(Potion.poison))      MARGIN += 36;
-        else if (player.isPotionActive(Potion.wither)) MARGIN += 72;
+        if (player.isPotionActive(MobEffects.poison))      MARGIN += 36;
+        else if (player.isPotionActive(MobEffects.wither)) MARGIN += 72;
         float absorbRemaining = absorb;
 
         for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i)
@@ -409,10 +420,15 @@ public class GuiIngameForge extends GuiIngame
             if (absorbRemaining > 0.0F)
             {
                 if (absorbRemaining == absorb && absorb % 2.0F == 1.0F)
+                {
                     drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17
+                    absorbRemaining -= 1.0F;
+                }
                 else
+                {
                     drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16
-                absorbRemaining -= 2.0F;
+                    absorbRemaining -= 2.0F;
+                }
             }
             else
             {
@@ -452,7 +468,7 @@ public class GuiIngameForge extends GuiIngame
             int icon = 16;
             byte backgound = 0;
 
-            if (mc.thePlayer.isPotionActive(Potion.hunger))
+            if (mc.thePlayer.isPotionActive(MobEffects.hunger))
             {
                 icon += 36;
                 backgound = 13;
@@ -610,7 +626,7 @@ public class GuiIngameForge extends GuiIngame
 
                     GlStateManager.pushMatrix();
                     GlStateManager.enableBlend();
-                    GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+                    GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
                     FontRenderer font = highlightingItemStack.getItem().getFontRenderer(highlightingItemStack);
                     if (font != null)
                     {
@@ -704,7 +720,7 @@ public class GuiIngameForge extends GuiIngame
                 GlStateManager.pushMatrix();
                 GlStateManager.translate((float)(width / 2), (float)(height - 68), 0.0F);
                 GlStateManager.enableBlend();
-                GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+                GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
                 int color = (recordIsPlaying ? Color.HSBtoRGB(hue / 50.0F, 0.7F, 0.6F) & WHITE : WHITE);
                 fontrenderer.drawString(recordPlaying, -fontrenderer.getStringWidth(recordPlaying) / 2, -4, color | (opacity << 24));
                 GlStateManager.disableBlend();
@@ -737,7 +753,7 @@ public class GuiIngameForge extends GuiIngame
                 GlStateManager.pushMatrix();
                 GlStateManager.translate((float)(width / 2), (float)(height / 2), 0.0F);
                 GlStateManager.enableBlend();
-                GlStateManager.tryBlendFuncSeparate(770, 771, 1, 0);
+                GlStateManager.func_187428_a(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ONE, GlStateManager.DestFactor.ZERO);
                 GlStateManager.pushMatrix();
                 GlStateManager.scale(4.0F, 4.0F, 4.0F);
                 int l = opacity << 24 & -16777216;
@@ -793,7 +809,7 @@ public class GuiIngameForge extends GuiIngame
     protected void renderHealthMount(int width, int height)
     {
         EntityPlayer player = (EntityPlayer)mc.getRenderViewEntity();
-        Entity tmp = player.ridingEntity;
+        Entity tmp = player.func_184187_bx();
         if (!(tmp instanceof EntityLivingBase)) return;
 
         bind(icons);

src/main/java/net/minecraftforge/client/event/DrawBlockHighlightEvent.java

@@ -3,7 +3,6 @@ package net.minecraftforge.client.event;
 import net.minecraftforge.fml.common.eventhandler.Cancelable;
 import net.minecraftforge.fml.common.eventhandler.Event;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.client.renderer.RenderGlobal;
 
@@ -16,7 +15,7 @@ public class DrawBlockHighlightEvent extends Event
     public final int subID;
     public final float partialTicks;
 
-    public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, ItemStack currentItem, float partialTicks)
+    public DrawBlockHighlightEvent(RenderGlobal context, EntityPlayer player, RayTraceResult target, int subID, float partialTicks)
     {
         this.context = context;
         this.player = player;

src/main/java/net/minecraftforge/client/event/RenderGameOverlayEvent.java

@@ -28,7 +28,9 @@ public class RenderGameOverlayEvent extends Event
         JUMPBAR,
         CHAT,
         PLAYER_LIST,
-        DEBUG
+        DEBUG,
+        POTION_ICONS,
+        SUBTITLES
     }
 
     public final float partialTicks;

src/main/java/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-
-/**
- * Raised when the SoundManager tries to play a Background Music file,
- * If you return null from this function it will prevent the sound from being played,
- * you can return a different entry if you want to change the sound being played.
- */
-@Deprecated // Remove in 1.8
-public class PlayBackgroundMusicEvent extends SoundResultEvent
-{
-    public PlayBackgroundMusicEvent(SoundManager manager, SoundPoolEntry entry)
-    { super(manager, entry, null, 0.0f, 0.0f); }
-}

src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java

@@ -1,11 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-
-@Deprecated //Remove in 1.8
-public class PlaySoundEffectEvent extends SoundResultEvent
-{
-    public PlaySoundEffectEvent(SoundManager manager, SoundPoolEntry source, String name, float volume, float pitch)
-    { super(manager, source, name, volume, pitch); }
-}

src/main/java/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java

@@ -1,16 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-
-@Deprecated //Remove in 1.8
-public class PlaySoundEffectSourceEvent extends SoundEvent
-{
-    public final SoundManager manager;
-    public final String name;
-    public PlaySoundEffectSourceEvent(SoundManager manager, String name)
-    {
-        super(manager);
-        this.manager = manager;
-        this.name = name;
-    }
-}

src/main/java/net/minecraftforge/client/event/sound/PlaySoundEvent.java

@@ -1,7 +1,6 @@
 package net.minecraftforge.client.event.sound;
 
 import net.minecraft.client.audio.ISound;
-import net.minecraft.client.audio.SoundCategory;
 import net.minecraft.client.audio.SoundManager;
 
 /***
@@ -14,14 +13,12 @@ public class PlaySoundEvent extends SoundEvent
 {
     public final String name;
     public final ISound sound;
-    public final SoundCategory category;
     public ISound result;
 
-    public PlaySoundEvent(SoundManager manager, ISound sound, SoundCategory category)
+    public PlaySoundEvent(SoundManager manager, ISound sound)
     {
         super(manager);
         this.sound = sound;
-        this.category = category;
         this.name = sound.getSoundLocation().getResourcePath();
         this.result = sound;
     }

src/main/java/net/minecraftforge/client/event/sound/PlayStreamingEvent.java

@@ -1,27 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-
-/**
- * Raised when the SoundManager tries to play a 'Streaming' file,
- * in vanilla it is only the Jukebox that uses this function.
- * 
- * If you return null from this function it will prevent the sound from being played,
- * you can return a different entry if you want to change the sound being played.
- * 
- */
-@Deprecated
-public class PlayStreamingEvent extends SoundResultEvent
-{
-    public final float x;
-    public final float y;
-    public final float z;
-    public PlayStreamingEvent(SoundManager manager, SoundPoolEntry source, String name, float x, float y, float z)
-    { 
-        super(manager, source, name, 0.0f, 0.0f);
-        this.x = x;
-        this.y = y;
-        this.z = z;
-    }
-}

src/main/java/net/minecraftforge/client/event/sound/SoundEvent.java

@@ -3,8 +3,6 @@ package net.minecraftforge.client.event.sound;
 import net.minecraftforge.fml.common.eventhandler.Event;
 import net.minecraft.client.audio.ISound;
 import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-import net.minecraftforge.common.MinecraftForge;
 
 public class SoundEvent extends Event
 {
@@ -14,13 +12,6 @@ public class SoundEvent extends Event
         this.manager = manager;
     }
 
-    @Deprecated
-    public static SoundPoolEntry getResult(SoundResultEvent event)
-    {
-        MinecraftForge.EVENT_BUS.post(event);
-        return event.result;
-    }
-
     public static class SoundSourceEvent extends SoundEvent
     {
         public final ISound sound;
@@ -35,4 +26,4 @@ public class SoundEvent extends Event
             this.uuid = uuid;
         }
     }
-}
+}

src/main/java/net/minecraftforge/client/event/sound/SoundLoadEvent.java

@@ -3,16 +3,13 @@ package net.minecraftforge.client.event.sound;
 import net.minecraft.client.audio.SoundManager;
 
 /**
- * Raised by the SoundManager.loadSoundSettings, this would be a good place for 
+ * Raised by the SoundManager.loadSoundSettings, this would be a good place for
  * adding your custom sounds to the SoundPool.
  */
 public class SoundLoadEvent extends SoundEvent
 {
-    @Deprecated
-    public final SoundManager manager;
     public SoundLoadEvent(SoundManager manager)
     {
         super(manager);
-        this.manager = manager;
     }
 }

src/main/java/net/minecraftforge/client/event/sound/SoundResultEvent.java

@@ -1,26 +0,0 @@
-package net.minecraftforge.client.event.sound;
-
-import net.minecraft.client.audio.SoundManager;
-import net.minecraft.client.audio.SoundPoolEntry;
-
-@Deprecated //Remove in 1.8
-public abstract class SoundResultEvent extends SoundEvent
-{
-    public final SoundManager manager;
-    public final SoundPoolEntry source;
-    public final String name;
-    public final float volume;
-    public final float pitch;
-    public SoundPoolEntry result;
-    
-    public SoundResultEvent(SoundManager manager, SoundPoolEntry source, String name, float volume, float pitch)
-    {
-        super(manager);
-        this.manager = manager;
-        this.source = source;
-        this.name = name;
-        this.volume = volume;
-        this.pitch = pitch;
-        this.result = source;
-    }
-}

src/main/java/net/minecraftforge/client/event/sound/SoundSetupEvent.java

@@ -3,16 +3,13 @@ package net.minecraftforge.client.event.sound;
 import net.minecraft.client.audio.SoundManager;
 
 /**
- * This event is raised by the SoundManager when it does its first setup of the 
+ * This event is raised by the SoundManager when it does its first setup of the
  * SoundSystemConfig's codecs, use this function to add your own codecs.
  */
 public class SoundSetupEvent extends SoundEvent
 {
-    @Deprecated
-    public final SoundManager manager;
     public SoundSetupEvent(SoundManager manager)
     {
         super(manager);
-        this.manager = manager;
     }
 }

src/main/java/net/minecraftforge/common/DimensionManager.java

@@ -186,19 +186,19 @@ public class DimensionManager
         return worlds.keySet().toArray(new Integer[worlds.size()]); //Only loaded dims, since usually used to cycle through loaded worlds
     }
 
-    public static void setWorld(int id, WorldServer world)
+    public static void setWorld(int id, WorldServer world, MinecraftServer server)
     {
         if (world != null)
         {
             worlds.put(id, world);
             weakWorldMap.put(world, world);
-            MinecraftServer.getServer().worldTickTimes.put(id, new long[100]);
+            server.worldTickTimes.put(id, new long[100]);
             FMLLog.info("Loading dimension %d (%s) (%s)", id, world.getWorldInfo().getWorldName(), world.getMinecraftServer());
         }
         else
         {
             worlds.remove(id);
-            MinecraftServer.getServer().worldTickTimes.remove(id);
+            server.worldTickTimes.remove(id);
             FMLLog.info("Unloading dimension %d", id);
         }
 
@@ -220,7 +220,7 @@ public class DimensionManager
             tmp.add(entry.getValue());
         }
 
-        MinecraftServer.getServer().worldServers = tmp.toArray(new WorldServer[tmp.size()]);
+        server.worldServers = tmp.toArray(new WorldServer[tmp.size()]);
     }
 
     public static void initDimension(int dim)
@@ -334,7 +334,7 @@ public class DimensionManager
                 {
                     MinecraftForge.EVENT_BUS.post(new WorldEvent.Unload(w));
                     w.flush();
-                    setWorld(id, null);
+                    setWorld(id, null, w.getMinecraftServer());
                 }
             }
         }
@@ -414,16 +414,16 @@ public class DimensionManager
         if (DimensionManager.getWorld(0) != null)
         {
             return ((SaveHandler)DimensionManager.getWorld(0).getSaveHandler()).getWorldDirectory();
-        }
+        }/*
         else if (MinecraftServer.getServer() != null)
         {
             MinecraftServer srv = MinecraftServer.getServer();
             SaveHandler saveHandler = (SaveHandler) srv.getActiveAnvilConverter().getSaveLoader(srv.getFolderName(), false);
             return saveHandler.getWorldDirectory();
-        }
+        }*/
         else
         {
             return null;
         }
     }
-}
+}

src/main/java/net/minecraftforge/common/ForgeHooks.java

@@ -20,6 +20,7 @@ import java.util.regex.Pattern;
 
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockTrapDoor;
 import net.minecraft.block.material.Material;
 import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
@@ -73,6 +74,7 @@ import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.ITextComponent;
 import net.minecraft.util.text.TextComponentString;
 import net.minecraft.util.text.TextFormatting;
@@ -487,13 +489,13 @@ public class ForgeHooks
         return (MinecraftForge.EVENT_BUS.post(event) ? null : new float[]{event.distance, event.damageMultiplier});
     }
 
-    public static boolean isLivingOnLadder(Block block, World world, BlockPos pos, EntityLivingBase entity)
+    public static boolean isLivingOnLadder(IBlockState state, World world, BlockPos pos, EntityLivingBase entity)
     {
         boolean isSpectator = (entity instanceof EntityPlayer && ((EntityPlayer)entity).isSpectator());
         if (isSpectator) return false;
         if (!ForgeModContainer.fullBoundingBoxLadders)
         {
-            return block != null && block.isLadder(world, pos, entity);
+            return state != null && state.getBlock().isLadder(state, world, pos, entity);
         }
         else
         {
@@ -508,7 +510,8 @@ public class ForgeHooks
                     for (int z2 = mZ; z2 < bb.maxZ; z2++)
                     {
                         BlockPos tmp = new BlockPos(x2, y2, z2);
-                        if (world.getBlockState(tmp).getBlock().isLadder(world, tmp, entity))
+                        state = world.getBlockState(tmp);
+                        if (state.getBlock().isLadder(state, world, tmp, entity))
                         {
                             return true;
                         }
@@ -542,7 +545,7 @@ public class ForgeHooks
             return null;
         }
 
-        player.joinEntityItemWithWorld(event.entityItem);
+        player.getEntityWorld().spawnEntityInWorld(event.entityItem);
         return event.entityItem;
     }
 
@@ -870,11 +873,6 @@ public class ForgeHooks
         return null;
     }
 
-    public static WorldGeneratorBonusChest getBonusChest(Random rand)
-    {
-        return new WorldGeneratorBonusChest(ChestGenHooks.getItems(ChestGenHooks.BONUS_CHEST, rand), ChestGenHooks.getCount(ChestGenHooks.BONUS_CHEST, rand));
-    }
-
     public static boolean isInsideOfMaterial(Material material, Entity entity, BlockPos pos)
     {
         IBlockState state = entity.worldObj.getBlockState(pos);
@@ -926,16 +924,16 @@ public class ForgeHooks
         return !event.isCanceled();
     }
 
-    public static MovingObjectPosition rayTraceEyes(EntityLivingBase entity, double length)
+    public static RayTraceResult rayTraceEyes(EntityLivingBase entity, double length)
     {
-        Vec3 startPos = new Vec3(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ);
-        Vec3 endPos = startPos.add(new Vec3(entity.getLookVec().xCoord * length, entity.getLookVec().yCoord * length, entity.getLookVec().zCoord * length));
+        Vec3d startPos = new Vec3d(entity.posX, entity.posY + entity.getEyeHeight(), entity.posZ);
+        Vec3d endPos = startPos.add(new Vec3d(entity.getLookVec().xCoord * length, entity.getLookVec().yCoord * length, entity.getLookVec().zCoord * length));
         return entity.worldObj.rayTraceBlocks(startPos, endPos);
     }
 
-    public static Vec3 rayTraceEyeHitVec(EntityLivingBase entity, double length)
+    public static Vec3d rayTraceEyeHitVec(EntityLivingBase entity, double length)
     {
-        MovingObjectPosition movingObjectPosition = rayTraceEyes(entity, length);
-        return movingObjectPosition == null ? null : movingObjectPosition.hitVec;
+        RayTraceResult git = rayTraceEyes(entity, length);
+        return git == null ? null : git.hitVec;
     }
 }

src/main/java/net/minecraftforge/common/brewing/BrewingRecipeRegistry.java

@@ -17,7 +17,7 @@ public class BrewingRecipeRegistry {
     /**
      * Adds a recipe to the registry. Due to the nature of the brewing stand
      * inputs that stack (a.k.a max stack size > 1) are not allowed.
-     * 
+     *
      * @param input
      *            The ItemStack that goes in same slots as the water bottles
      *            would.
@@ -36,7 +36,7 @@ public class BrewingRecipeRegistry {
     /**
      * Adds a recipe to the registry. Due to the nature of the brewing stand
      * inputs that stack (a.k.a max stack size > 1) are not allowed.
-     * 
+     *
      * @param input
      *            The ItemStack that goes in same slots as the water bottles
      *            would.
@@ -168,4 +168,4 @@ public class BrewingRecipeRegistry {
     {
         return Collections.unmodifiableList(recipes);
     }
-}
+}