Fished moving out the rest of the default packaged classes to aproperiate packages. Updated patches and code to reflect.

fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java

@@ -16,6 +16,7 @@ import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.multiplayer.NetClientHandler;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.entity.RenderManager;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 

fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java

@@ -23,7 +23,7 @@ import org.lwjgl.input.Mouse;
 import com.google.common.collect.ObjectArrays;
 import com.google.common.primitives.Booleans;
 
-import net.minecraft.client.KeyBinding;
+import net.minecraft.client.settings.KeyBinding;
 import cpw.mods.fml.client.registry.KeyBindingRegistry;
 import cpw.mods.fml.common.TickType;
 import cpw.mods.fml.common.modloader.ModLoaderModContainer;

fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java

@@ -4,8 +4,8 @@ import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.Set;
 
-import net.minecraft.client.GameSettings;
-import net.minecraft.client.KeyBinding;
+import net.minecraft.client.settings.GameSettings;
+import net.minecraft.client.settings.KeyBinding;
 
 import org.lwjgl.input.Keyboard;
 import org.lwjgl.input.Mouse;

fml/client/net/minecraft/src/BaseMod.java

@@ -25,6 +25,7 @@ import net.minecraft.client.gui.inventory.GuiContainer;
 import net.minecraft.client.multiplayer.NetClientHandler;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.entity.Render;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.IInventory;

fml/client/net/minecraft/src/ModLoader.java

@@ -30,6 +30,7 @@ import net.minecraft.client.renderer.RenderEngine;
 import net.minecraft.client.renderer.entity.Render;
 import net.minecraft.client.renderer.texturefx.TextureFX;
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.command.ICommand;
 import net.minecraft.dispenser.IBehaviorDispenseItem;
 import net.minecraft.entity.Entity;

fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java

@@ -25,7 +25,7 @@ import com.google.common.collect.Maps;
 
 import net.minecraft.command.ICommand;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.animal.IAnimals;
+import net.minecraft.entity.passive.IAnimals;
 import net.minecraft.entity.boss.EntityDragon;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.inventory.Container;

fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java

@@ -5,7 +5,7 @@ import java.util.Random;
 
 import com.google.common.collect.Lists;
 
-import net.minecraft.entity.EntityVillager;
+import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.item.Item;
 import net.minecraft.src.TradeEntry;
 import net.minecraft.village.MerchantRecipeList;

fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java

@@ -5,7 +5,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
-import net.minecraft.entity.EntityVillager;
+import net.minecraft.entity.passive.EntityVillager;
 import net.minecraft.item.Item;
 import net.minecraft.util.Tuple;
 import net.minecraft.village.MerchantRecipeList;

fml/conf/packages.csv

@@ -123,68 +123,26 @@ MaterialLogic,net/minecraft/block/material
 MaterialPortal,net/minecraft/block/material
 MaterialTransparent,net/minecraft/block/material
 MaterialWeb,net/minecraft/block/material
-ActiveRenderInfo,net/minecraft/client
 CallableClientMemoryStats,net/minecraft/client
 CallableClientProfiler,net/minecraft/client
 CallableGLInfo,net/minecraft/client
-CallableIsModded,net/minecraft/client
 CallableLWJGLVersion,net/minecraft/client
 CallableModded,net/minecraft/client
 CallableTexturePack,net/minecraft/client
 CallableTickingScreenName,net/minecraft/client
 CallableType2,net/minecraft/client
-CallableType3,net/minecraft/client
 CallableUpdatingScreenName,net/minecraft/client
 CanvasCrashReport,net/minecraft/client
 CanvasMinecraftApplet,net/minecraft/client
 CanvasMojangLogo,net/minecraft/client
-ChatClickData,net/minecraft/client
-ChatLine,net/minecraft/client
-CreativeCrafting,net/minecraft/client
-DestroyBlockProgress,net/minecraft/client
-EnchantmentNameParts,net/minecraft/client
-EnumOS,net/minecraft/client
 EnumOSHelper,net/minecraft/client
-EnumOptions,net/minecraft/client
-EnumOptionsHelper,net/minecraft/client
-EnumRarity,net/minecraft/client
-GLAllocation,net/minecraft/client
-GameSettings,net/minecraft/client
 GameWindowListener,net/minecraft/client
-IDownloadSuccess,net/minecraft/client
-IImageBuffer,net/minecraft/client
-IntegratedPlayerList,net/minecraft/client
-IntegratedServer,net/minecraft/client
-IntegratedServerListenThread,net/minecraft/client
-KeyBinding,net/minecraft/client
-LanServer,net/minecraft/client
-LanServerList,net/minecraft/client
-LoadingScreenRenderer,net/minecraft/client
 MinecraftAppletImpl,net/minecraft/client
-MinecraftError,net/minecraft/client
 MinecraftFakeLauncher,net/minecraft/client
-MouseHelper,net/minecraft/client
-MovementInput,net/minecraft/client
-MovementInputFromOptions,net/minecraft/client
-NpcMerchant,net/minecraft/client
-OpenGlCapsChecker,net/minecraft/client
-OpenGlHelper,net/minecraft/client
 PanelCrashReport,net/minecraft/client
-ScreenChatOptions,net/minecraft/client
-ScreenShotHelper,net/minecraft/client
-ServerAddress,net/minecraft/client
-ServerData,net/minecraft/client
-ServerList,net/minecraft/client
-Session,net/minecraft/client
-SoundUpdaterMinecart,net/minecraft/client
 StatStringFormatKeyInv,net/minecraft/client
-TextureOffset,net/minecraft/client
 ThreadClientSleep,net/minecraft/client
-ThreadDownloadResources,net/minecraft/client
-ThreadLanServerFind,net/minecraft/client
-ThreadLanServerPing,net/minecraft/client
 ThreadShutdown,net/minecraft/client
-Timer,net/minecraft/client
 CodecMus,net/minecraft/client/audio
 MusInputStream,net/minecraft/client/audio
 SoundManager,net/minecraft/client/audio
@@ -193,6 +151,8 @@ SoundPoolEntry,net/minecraft/client/audio
 EntityClientPlayerMP,net/minecraft/client/entity
 EntityOtherPlayerMP,net/minecraft/client/entity
 EntityPlayerSP,net/minecraft/client/entity
+ChatClickData,net/minecraft/client/gui
+ChatLine,net/minecraft/client/gui
 FontRenderer,net/minecraft/client/gui
 Gui,net/minecraft/client/gui
 GuiButton,net/minecraft/client/gui
@@ -249,9 +209,11 @@ GuiVideoSettings,net/minecraft/client/gui
 GuiWinGame,net/minecraft/client/gui
 GuiWorldSlot,net/minecraft/client/gui
 GuiYesNo,net/minecraft/client/gui
+LoadingScreenRenderer,net/minecraft/client/gui
 MapItemRenderer,net/minecraft/client/gui
 Particle,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
+ScreenChatOptions,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
 GuiAchievements,net/minecraft/client/gui/achievement
@@ -263,6 +225,7 @@ GuiStats,net/minecraft/client/gui/achievement
 SorterStatsBlock,net/minecraft/client/gui/achievement
 SorterStatsItem,net/minecraft/client/gui/achievement
 ContainerCreative,net/minecraft/client/gui/inventory
+CreativeCrafting,net/minecraft/client/gui/inventory
 GuiBeacon,net/minecraft/client/gui/inventory
 GuiBeaconButton,net/minecraft/client/gui/inventory
 GuiBeaconButtonCancel,net/minecraft/client/gui/inventory
@@ -318,15 +281,23 @@ ModelWolf,net/minecraft/client/model
 ModelZombie,net/minecraft/client/model
 ModelZombieVillager,net/minecraft/client/model
 PositionTextureVertex,net/minecraft/client/model
+TextureOffset,net/minecraft/client/model
 TexturedQuad,net/minecraft/client/model
 CallableMPL1,net/minecraft/client/multiplayer
 CallableMPL2,net/minecraft/client/multiplayer
 ChunkProviderClient,net/minecraft/client/multiplayer
 GuiConnecting,net/minecraft/client/multiplayer
+LanServer,net/minecraft/client/multiplayer
+LanServerList,net/minecraft/client/multiplayer
 NetClientHandler,net/minecraft/client/multiplayer
 NetClientWebTextures,net/minecraft/client/multiplayer
 PlayerControllerMP,net/minecraft/client/multiplayer
+ServerAddress,net/minecraft/client/multiplayer
+ServerData,net/minecraft/client/multiplayer
+ServerList,net/minecraft/client/multiplayer
 ThreadConnectToServer,net/minecraft/client/multiplayer
+ThreadLanServerFind,net/minecraft/client/multiplayer
+ThreadLanServerPing,net/minecraft/client/multiplayer
 WorldClient,net/minecraft/client/multiplayer
 CallableLastTickedParticle,net/minecraft/client/particle
 EffectRenderer,net/minecraft/client/particle
@@ -357,17 +328,23 @@ EntitySnowShovelFX,net/minecraft/client/particle
 EntitySpellParticleFX,net/minecraft/client/particle
 EntitySplashFX,net/minecraft/client/particle
 EntitySuspendFX,net/minecraft/client/particle
+ActiveRenderInfo,net/minecraft/client/renderer
 CallableMouseLocation,net/minecraft/client/renderer
 CallableParticlePositionInfo,net/minecraft/client/renderer
 CallableParticleScreenName,net/minecraft/client/renderer
 CallableScreenName,net/minecraft/client/renderer
 CallableScreenSize,net/minecraft/client/renderer
 ChestItemRenderHelper,net/minecraft/client/renderer
+DestroyBlockProgress,net/minecraft/client/renderer
 EntityRenderer,net/minecraft/client/renderer
 EntitySorter,net/minecraft/client/renderer
+GLAllocation,net/minecraft/client/renderer
+IImageBuffer,net/minecraft/client/renderer
 ImageBufferDownload,net/minecraft/client/renderer
 InventoryEffectRenderer,net/minecraft/client/renderer
 ItemRenderer,net/minecraft/client/renderer
+OpenGlCapsChecker,net/minecraft/client/renderer
+OpenGlHelper,net/minecraft/client/renderer
 RenderBlocks,net/minecraft/client/renderer
 RenderEngine,net/minecraft/client/renderer
 RenderGlobal,net/minecraft/client/renderer
@@ -449,6 +426,10 @@ TileEntityRendererPiston,net/minecraft/client/renderer/tileentity
 TileEntitySignRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySkullRenderer,net/minecraft/client/renderer/tileentity
 TileEntitySpecialRenderer,net/minecraft/client/renderer/tileentity
+EnumOptions,net/minecraft/client/settings
+EnumOptionsHelper,net/minecraft/client/settings
+GameSettings,net/minecraft/client/settings
+KeyBinding,net/minecraft/client/settings
 GuiTexturePackSlot,net/minecraft/client/texturepacks
 GuiTexturePacks,net/minecraft/client/texturepacks
 ITexturePack,net/minecraft/client/texturepacks
@@ -595,21 +576,18 @@ EntityFlying,net/minecraft/entity
 EntityHanging,net/minecraft/entity
 EntityList,net/minecraft/entity
 EntityLiving,net/minecraft/entity
-EntityPainting,net/minecraft/entity
 EntityTracker,net/minecraft/entity
 EntityTrackerEntry,net/minecraft/entity
-EntityVillager,net/minecraft/entity
-EntityWitch,net/minecraft/entity
-EntityXPOrb,net/minecraft/entity
-EnumArt,net/minecraft/entity
 EnumCreatureAttribute,net/minecraft/entity
 EnumCreatureType,net/minecraft/entity
 EnumEntitySize,net/minecraft/entity
 EnumEntitySizeHelper,net/minecraft/entity
 IEntityMultiPart,net/minecraft/entity
+IMerchant,net/minecraft/entity
 INpc,net/minecraft/entity
 IProjectile,net/minecraft/entity
 IRangedAttackMob,net/minecraft/entity
+NpcMerchant,net/minecraft/entity
 WatchableObject,net/minecraft/entity
 EntityAIArrowAttack,net/minecraft/entity/ai
 EntityAIAttackOnCollide,net/minecraft/entity/ai
@@ -664,21 +642,6 @@ EntityLookHelper,net/minecraft/entity/ai
 EntityMoveHelper,net/minecraft/entity/ai
 EntitySenses,net/minecraft/entity/ai
 RandomPositionGenerator,net/minecraft/entity/ai
-ContainerSheep,net/minecraft/entity/animal
-EntityAmbientCreature,net/minecraft/entity/animal
-EntityAnimal,net/minecraft/entity/animal
-EntityBat,net/minecraft/entity/animal
-EntityChicken,net/minecraft/entity/animal
-EntityCow,net/minecraft/entity/animal
-EntityMooshroom,net/minecraft/entity/animal
-EntityOcelot,net/minecraft/entity/animal
-EntityPig,net/minecraft/entity/animal
-EntitySheep,net/minecraft/entity/animal
-EntitySquid,net/minecraft/entity/animal
-EntityTameable,net/minecraft/entity/animal
-EntityWaterMob,net/minecraft/entity/animal
-EntityWolf,net/minecraft/entity/animal
-IAnimals,net/minecraft/entity/animal
 BossStatus,net/minecraft/entity/boss
 EntityDragon,net/minecraft/entity/boss
 EntityDragonPart,net/minecraft/entity/boss
@@ -696,7 +659,10 @@ EntityFallingSand,net/minecraft/entity/item
 EntityItem,net/minecraft/entity/item
 EntityItemFrame,net/minecraft/entity/item
 EntityMinecart,net/minecraft/entity/item
+EntityPainting,net/minecraft/entity/item
 EntityTNTPrimed,net/minecraft/entity/item
+EntityXPOrb,net/minecraft/entity/item
+SoundUpdaterMinecart,net/minecraft/entity/item
 EntityBlaze,net/minecraft/entity/monster
 EntityCaveSpider,net/minecraft/entity/monster
 EntityCreeper,net/minecraft/entity/monster
@@ -713,9 +679,26 @@ EntitySkeleton,net/minecraft/entity/monster
 EntitySlime,net/minecraft/entity/monster
 EntitySnowman,net/minecraft/entity/monster
 EntitySpider,net/minecraft/entity/monster
+EntityWitch,net/minecraft/entity/monster
 EntityZombie,net/minecraft/entity/monster
 FilterIMob,net/minecraft/entity/monster
 IMob,net/minecraft/entity/monster
+ContainerSheep,net/minecraft/entity/passive
+EntityAmbientCreature,net/minecraft/entity/passive
+EntityAnimal,net/minecraft/entity/passive
+EntityBat,net/minecraft/entity/passive
+EntityChicken,net/minecraft/entity/passive
+EntityCow,net/minecraft/entity/passive
+EntityMooshroom,net/minecraft/entity/passive
+EntityOcelot,net/minecraft/entity/passive
+EntityPig,net/minecraft/entity/passive
+EntitySheep,net/minecraft/entity/passive
+EntitySquid,net/minecraft/entity/passive
+EntityTameable,net/minecraft/entity/passive
+EntityVillager,net/minecraft/entity/passive
+EntityWaterMob,net/minecraft/entity/passive
+EntityWolf,net/minecraft/entity/passive
+IAnimals,net/minecraft/entity/passive
 EntityPlayer,net/minecraft/entity/player
 EntityPlayerMP,net/minecraft/entity/player
 EnumStatus,net/minecraft/entity/player
@@ -765,6 +748,7 @@ SlotMerchantResult,net/minecraft/inventory
 SlotRepair,net/minecraft/inventory
 EnumAction,net/minecraft/item
 EnumArmorMaterial,net/minecraft/item
+EnumRarity,net/minecraft/item
 EnumToolMaterial,net/minecraft/item
 Item,net/minecraft/item
 ItemAnvilBlock,net/minecraft/item
@@ -857,7 +841,6 @@ NBTTagList,net/minecraft/nbt
 NBTTagLong,net/minecraft/nbt
 NBTTagShort,net/minecraft/nbt
 NBTTagString,net/minecraft/nbt
-IMerchant,net/minecraft/network
 INetworkManager,net/minecraft/network
 MemoryConnection,net/minecraft/network
 NetLoginHandler,net/minecraft/network
@@ -998,6 +981,11 @@ ServerGUI,net/minecraft/server/gui
 ServerGuiCommandListener,net/minecraft/server/gui
 ServerGuiFocusAdapter,net/minecraft/server/gui
 ServerWindowAdapter,net/minecraft/server/gui
+CallableIsModded,net/minecraft/server/integrated
+CallableType3,net/minecraft/server/integrated
+IntegratedPlayerList,net/minecraft/server/integrated
+IntegratedServer,net/minecraft/server/integrated
+IntegratedServerListenThread,net/minecraft/server/integrated
 BanEntry,net/minecraft/server/management
 BanList,net/minecraft/server/management
 LowerStringMap,net/minecraft/server/management
@@ -1045,14 +1033,18 @@ ChunkCoordinates,net/minecraft/util
 CryptManager,net/minecraft/util
 DamageSource,net/minecraft/util
 Direction,net/minecraft/util
+EnchantmentNameParts,net/minecraft/util
 EntityDamageSource,net/minecraft/util
 EntityDamageSourceIndirect,net/minecraft/util
+EnumArt,net/minecraft/util
 EnumFacing,net/minecraft/util
 EnumMovingObjectType,net/minecraft/util
+EnumOS,net/minecraft/util
 Facing,net/minecraft/util
 FoodStats,net/minecraft/util
 HttpUtil,net/minecraft/util
 HttpUtilRunnable,net/minecraft/util
+IDownloadSuccess,net/minecraft/util
 IProgressUpdate,net/minecraft/util
 IntHashMap,net/minecraft/util
 IntHashMapEntry,net/minecraft/util
@@ -1060,12 +1052,20 @@ LongHashMap,net/minecraft/util
 LongHashMapEntry,net/minecraft/util
 MD5String,net/minecraft/util
 MathHelper,net/minecraft/util
+MinecraftError,net/minecraft/util
 MouseFilter,net/minecraft/util
+MouseHelper,net/minecraft/util
+MovementInput,net/minecraft/util
+MovementInputFromOptions,net/minecraft/util
 MovingObjectPosition,net/minecraft/util
 ReportedException,net/minecraft/util
+ScreenShotHelper,net/minecraft/util
+Session,net/minecraft/util
 StatCollector,net/minecraft/util
 StringTranslate,net/minecraft/util
 StringUtils,net/minecraft/util
+ThreadDownloadResources,net/minecraft/util
+Timer,net/minecraft/util
 Tuple,net/minecraft/util
 Vec3,net/minecraft/util
 Vec3Pool,net/minecraft/util

fml/patches/minecraft/net/minecraft/client/Minecraft.java.patch

@@ -15,7 +15,7 @@
  import java.awt.BorderLayout;
  import java.awt.Canvas;
  import java.awt.Color;
-@@ -104,6 +111,8 @@
+@@ -120,6 +127,8 @@
  import org.lwjgl.opengl.PixelFormat;
  import org.lwjgl.util.glu.GLU;
  
@@ -24,7 +24,7 @@
  @SideOnly(Side.CLIENT)
  public abstract class Minecraft implements Runnable, IPlayerUsage
  {
-@@ -286,6 +295,8 @@
+@@ -302,6 +311,8 @@
          this.field_71466_p = new FontRenderer(this.field_71474_y, "/font/default.png", this.field_71446_o, false);
          this.field_71464_q = new FontRenderer(this.field_71474_y, "/font/alternate.png", this.field_71446_o, false);
  
@@ -33,7 +33,7 @@
          if (this.field_71474_y.field_74363_ab != null)
          {
              StringTranslate.func_74808_a().func_74810_a(this.field_71474_y.field_74363_ab);
-@@ -330,6 +341,8 @@
+@@ -346,6 +357,8 @@
          GL11.glViewport(0, 0, this.field_71443_c, this.field_71440_d);
          this.field_71452_i = new EffectRenderer(this.field_71441_e, this.field_71446_o);
  
@@ -42,7 +42,7 @@
          try
          {
              this.field_71430_V = new ThreadDownloadResources(this.field_71412_D, this);
-@@ -358,6 +371,8 @@
+@@ -374,6 +387,8 @@
          {
              this.func_71352_k();
          }
@@ -51,7 +51,7 @@
      }
  
      private void func_71357_I() throws LWJGLException
-@@ -716,9 +731,11 @@
+@@ -732,9 +747,11 @@
  
              if (!this.field_71454_w)
              {
@@ -63,7 +63,7 @@
              }
  
              GL11.glFlush();
-@@ -1248,10 +1265,14 @@
+@@ -1264,10 +1281,14 @@
  
      public void func_71407_l()
      {
@@ -78,7 +78,7 @@
  
          this.field_71424_I.func_76320_a("stats");
          this.field_71413_E.func_77449_e();
-@@ -1708,6 +1729,8 @@
+@@ -1724,6 +1745,8 @@
              this.field_71453_ak.func_74428_b();
          }
  
@@ -87,7 +87,7 @@
          this.field_71424_I.func_76319_b();
          this.field_71423_H = func_71386_F();
      }
-@@ -1746,8 +1769,27 @@
+@@ -1762,8 +1785,27 @@
          }
  
          this.field_71413_E.func_77450_a(StatList.field_75936_f, 1);
@@ -115,7 +115,7 @@
          this.field_71455_al = true;
          this.field_71461_s.func_73720_a(StatCollector.func_74838_a("menu.loadingLevel"));
  
-@@ -1962,6 +2004,12 @@
+@@ -1978,6 +2020,12 @@
  
      public static void main(String[] p_main_0_)
      {

fml/patches/minecraft/net/minecraft/client/MinecraftApplet.java.patch

@@ -9,7 +9,7 @@
  import java.applet.Applet;
  import java.awt.BorderLayout;
  import java.awt.Canvas;
-@@ -14,6 +16,11 @@
+@@ -15,6 +17,11 @@
      private Thread field_71482_c = null;
  
      public void init()
@@ -21,7 +21,7 @@
      {
          this.field_71483_a = new CanvasMinecraftApplet(this);
          boolean var1 = "true".equalsIgnoreCase(this.getParameter("fullscreen"));
-@@ -61,6 +68,11 @@
+@@ -62,6 +69,11 @@
  
      public void start()
      {

fml/patches/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java.patch

@@ -1,6 +1,6 @@
 --- ../src-base/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
 +++ ../src-work/minecraft/net/minecraft/client/multiplayer/GuiConnecting.java
-@@ -128,4 +128,10 @@
+@@ -126,4 +126,10 @@
      {
          return p_74251_0_.field_73882_e;
      }

fml/patches/minecraft/net/minecraft/client/renderer/ItemRenderer.java.patch

@@ -7,7 +7,7 @@
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import net.minecraft.block.Block;
-@@ -41,7 +42,12 @@
+@@ -40,7 +41,12 @@
      public void func_78443_a(EntityLiving p_78443_1_, ItemStack p_78443_2_, int p_78443_3_)
      {
          GL11.glPushMatrix();
@@ -21,7 +21,7 @@
  
          if (var4 != null && RenderBlocks.func_78597_b(var4.func_71857_b()))
          {
-@@ -138,10 +144,17 @@
+@@ -137,10 +143,17 @@
          float var10;
          float var11;
  
@@ -43,7 +43,7 @@
              var11 = var6 * var9;
              p_78439_1_.func_78374_a((double)var11, 0.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_5_);
              p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -153,11 +166,11 @@
+@@ -152,11 +165,11 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(1.0F, 0.0F, 0.0F);
  
@@ -60,7 +60,7 @@
              p_78439_1_.func_78374_a((double)var11, 1.0D, (double)(0.0F - var7), (double)var10, (double)p_78439_3_);
              p_78439_1_.func_78374_a((double)var11, 1.0D, 0.0D, (double)var10, (double)p_78439_3_);
              p_78439_1_.func_78374_a((double)var11, 0.0D, 0.0D, (double)var10, (double)p_78439_5_);
-@@ -168,11 +181,11 @@
+@@ -167,11 +180,11 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(0.0F, 1.0F, 0.0F);
  
@@ -77,7 +77,7 @@
              p_78439_1_.func_78374_a(0.0D, (double)var11, 0.0D, (double)p_78439_2_, (double)var10);
              p_78439_1_.func_78374_a((double)var6, (double)var11, 0.0D, (double)p_78439_4_, (double)var10);
              p_78439_1_.func_78374_a((double)var6, (double)var11, (double)(0.0F - var7), (double)p_78439_4_, (double)var10);
-@@ -183,10 +196,10 @@
+@@ -182,10 +195,10 @@
          p_78439_1_.func_78382_b();
          p_78439_1_.func_78375_b(0.0F, -1.0F, 0.0F);
  

fml/patches/minecraft/net/minecraft/client/renderer/RenderEngine.java.patch

@@ -20,9 +20,9 @@
 +import java.util.logging.Logger;
 +
  import javax.imageio.ImageIO;
- import net.minecraft.client.GLAllocation;
- import net.minecraft.client.GameSettings;
-@@ -41,6 +47,8 @@
+ import net.minecraft.client.renderer.texturefx.TextureFX;
+ import net.minecraft.client.settings.GameSettings;
+@@ -39,6 +45,8 @@
      public TexturePackList field_78366_k;
      private BufferedImage field_78364_l = new BufferedImage(64, 64, 2);
  
@@ -31,7 +31,7 @@
      public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
      {
          this.field_78366_k = p_i3192_1_;
-@@ -104,8 +112,9 @@
+@@ -102,8 +110,9 @@
                  this.field_78359_d.put(p_78346_1_, var7);
                  return var7;
              }
@@ -43,7 +43,7 @@
                  var6.printStackTrace();
                  int[] var5 = this.func_78348_b(this.field_78364_l);
                  this.field_78359_d.put(p_78346_1_, var5);
-@@ -252,6 +261,7 @@
+@@ -250,6 +259,7 @@
  
          int var3 = p_78351_1_.getWidth();
          int var4 = p_78351_1_.getHeight();
@@ -51,7 +51,7 @@
          int[] var5 = new int[var3 * var4];
          byte[] var6 = new byte[var3 * var4 * 4];
          p_78351_1_.getRGB(0, 0, var3, var4, var5, 0, var3);
-@@ -412,6 +422,7 @@
+@@ -410,6 +420,7 @@
  
      public void func_78355_a(TextureFX p_78355_1_)
      {
@@ -59,7 +59,7 @@
          this.field_78367_h.add(p_78355_1_);
          p_78355_1_.func_76846_a();
      }
-@@ -424,28 +435,44 @@
+@@ -422,28 +433,44 @@
          {
              TextureFX var3 = (TextureFX)this.field_78367_h.get(var2);
              var3.field_76851_c = this.field_78365_j.field_74337_g;
@@ -113,7 +113,7 @@
              }
          }
  
-@@ -511,8 +538,9 @@
+@@ -509,8 +536,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -125,7 +125,7 @@
                  var7.printStackTrace();
              }
          }
-@@ -548,8 +576,9 @@
+@@ -546,8 +574,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }

fml/patches/minecraft/net/minecraft/client/settings/GameSettings.java.patch

@@ -1,13 +1,13 @@
---- ../src-base/minecraft/net/minecraft/client/GameSettings.java
-+++ ../src-work/minecraft/net/minecraft/client/GameSettings.java
+--- ../src-base/minecraft/net/minecraft/client/settings/GameSettings.java
++++ ../src-work/minecraft/net/minecraft/client/settings/GameSettings.java
 @@ -1,5 +1,6 @@
- package net.minecraft.client;
+ package net.minecraft.client.settings;
  
 +import cpw.mods.fml.client.FMLClientHandler;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.BufferedReader;
-@@ -606,6 +607,7 @@
+@@ -607,6 +608,7 @@
  
      public void func_74303_b()
      {

fml/patches/minecraft/net/minecraft/entity/EntityList.java.patch

@@ -1,17 +1,16 @@
 --- ../src-base/minecraft/net/minecraft/entity/EntityList.java
 +++ ../src-work/minecraft/net/minecraft/entity/EntityList.java
-@@ -3,6 +3,10 @@
+@@ -3,6 +3,9 @@
  import java.util.HashMap;
  import java.util.LinkedHashMap;
  import java.util.Map;
 +import java.util.logging.Level;
 +
 +import cpw.mods.fml.common.FMLLog;
-+
- import net.minecraft.entity.animal.EntityBat;
- import net.minecraft.entity.animal.EntityChicken;
- import net.minecraft.entity.animal.EntityCow;
-@@ -98,9 +102,10 @@
+ import net.minecraft.entity.boss.EntityDragon;
+ import net.minecraft.entity.boss.EntityWither;
+ import net.minecraft.entity.item.EntityBoat;
+@@ -102,9 +105,10 @@
      {
          Entity var2 = null;
  
@@ -23,7 +22,7 @@
  
              if (var3 != null)
              {
-@@ -114,7 +119,17 @@
+@@ -118,7 +122,17 @@
  
          if (var2 != null)
          {

fml/patches/minecraft/net/minecraft/entity/EntityTracker.java.patch

@@ -6,10 +6,10 @@
  import java.util.Set;
 +
 +import cpw.mods.fml.common.registry.EntityRegistry;
- import net.minecraft.entity.animal.EntityBat;
- import net.minecraft.entity.animal.EntitySquid;
- import net.minecraft.entity.animal.IAnimals;
-@@ -47,6 +49,11 @@
+ import net.minecraft.entity.boss.EntityDragon;
+ import net.minecraft.entity.boss.EntityWither;
+ import net.minecraft.entity.item.EntityBoat;
+@@ -49,6 +51,11 @@
  
      public void func_72786_a(Entity p_72786_1_)
      {

fml/patches/minecraft/net/minecraft/entity/EntityTrackerEntry.java.patch

@@ -6,10 +6,10 @@
  import java.util.Set;
 +
 +import cpw.mods.fml.common.network.FMLNetworkHandler;
- import net.minecraft.entity.animal.IAnimals;
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.item.EntityBoat;
-@@ -349,6 +351,14 @@
+ import net.minecraft.entity.item.EntityEnderCrystal;
+@@ -351,6 +353,14 @@
                      this.field_73137_j = this.field_73132_a.field_70159_w;
                      this.field_73138_k = this.field_73132_a.field_70181_x;
                      this.field_73135_l = this.field_73132_a.field_70179_y;
@@ -24,7 +24,7 @@
  
                      if (this.field_73143_t && !(var6 instanceof Packet24MobSpawn))
                      {
-@@ -422,6 +432,13 @@
+@@ -424,6 +434,13 @@
          if (this.field_73132_a.field_70128_L)
          {
              System.out.println("Fetching addPacket for removed entity");

fml/patches/minecraft/net/minecraft/entity/passive/EntityVillager.java.patch

@@ -1,5 +1,5 @@
---- ../src-base/minecraft/net/minecraft/entity/EntityVillager.java
-+++ ../src-work/minecraft/net/minecraft/entity/EntityVillager.java
+--- ../src-base/minecraft/net/minecraft/entity/passive/EntityVillager.java
++++ ../src-work/minecraft/net/minecraft/entity/passive/EntityVillager.java
 @@ -2,6 +2,8 @@
  
  import cpw.mods.fml.common.Side;
@@ -9,7 +9,7 @@
  import java.util.Collections;
  import java.util.HashMap;
  import java.util.Iterator;
-@@ -235,7 +237,7 @@
+@@ -239,7 +241,7 @@
              case 4:
                  return "/mob/villager/butcher.png";
              default:
@@ -18,7 +18,7 @@
          }
      }
  
-@@ -416,6 +418,7 @@
+@@ -420,6 +422,7 @@
  
          MerchantRecipeList var2;
          var2 = new MerchantRecipeList();
@@ -26,7 +26,7 @@
          label48:
  
          switch (this.func_70946_n())
-@@ -620,7 +623,7 @@
+@@ -624,7 +627,7 @@
  
      public void func_82163_bD()
      {

fml/patches/minecraft/net/minecraft/inventory/SlotFurnace.java.patch

@@ -4,7 +4,7 @@
  package net.minecraft.inventory;
  
 +import cpw.mods.fml.common.registry.GameRegistry;
- import net.minecraft.entity.EntityXPOrb;
+ import net.minecraft.entity.item.EntityXPOrb;
  import net.minecraft.entity.player.EntityPlayer;
  import net.minecraft.item.Item;
 @@ -82,6 +83,8 @@

fml/patches/minecraft/net/minecraft/item/Item.java.patch

@@ -9,7 +9,7 @@
  import java.util.List;
  import java.util.Random;
  import net.minecraft.block.Block;
-@@ -205,6 +207,8 @@
+@@ -204,6 +206,8 @@
          }
  
          field_77698_e[256 + p_i3659_1_] = this;

fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServer.java.patch

@@ -1,13 +1,13 @@
---- ../src-base/minecraft/net/minecraft/client/IntegratedServer.java
-+++ ../src-work/minecraft/net/minecraft/client/IntegratedServer.java
+--- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServer.java
++++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServer.java
 @@ -1,5 +1,6 @@
- package net.minecraft.client;
+ package net.minecraft.server.integrated;
  
 +import cpw.mods.fml.common.FMLCommonHandler;
  import cpw.mods.fml.common.Side;
  import cpw.mods.fml.common.asm.SideOnly;
  import java.io.File;
-@@ -108,6 +109,7 @@
+@@ -110,6 +111,7 @@
          this.func_71253_a(CryptManager.func_75891_b());
          this.func_71247_a(this.func_71270_I(), this.func_71221_J(), this.field_71350_m.func_77160_d(), this.field_71350_m.func_77165_h(), this.field_71350_m.func_82749_j());
          this.func_71205_p(this.func_71214_G() + " - " + this.field_71305_c[0].func_72912_H().func_76065_j());

fml/patches/minecraft/net/minecraft/server/integrated/IntegratedServerListenThread.java.patch

@@ -1,5 +1,5 @@
---- ../src-base/minecraft/net/minecraft/client/IntegratedServerListenThread.java
-+++ ../src-work/minecraft/net/minecraft/client/IntegratedServerListenThread.java
+--- ../src-base/minecraft/net/minecraft/server/integrated/IntegratedServerListenThread.java
++++ ../src-work/minecraft/net/minecraft/server/integrated/IntegratedServerListenThread.java
 @@ -2,6 +2,8 @@
  
  import cpw.mods.fml.common.Side;

fml/patches/minecraft/net/minecraft/tileentity/TileEntityFurnace.java.patch

@@ -1,6 +1,14 @@
 --- ../src-base/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
 +++ ../src-work/minecraft/net/minecraft/tileentity/TileEntityFurnace.java
-@@ -287,7 +287,15 @@
+@@ -2,6 +2,7 @@
+ 
+ import cpw.mods.fml.common.Side;
+ import cpw.mods.fml.common.asm.SideOnly;
++import cpw.mods.fml.common.registry.GameRegistry;
+ import net.minecraft.block.Block;
+ import net.minecraft.block.BlockFurnace;
+ import net.minecraft.block.material.Material;
+@@ -287,7 +288,15 @@
                  }
              }