Another packaging update. I think we're done now.

fml/client/cpw/mods/fml/client/GuiModList.java

@@ -24,8 +24,8 @@ import net.minecraft.client.gui.GuiButton;
 import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.gui.GuiSmallButton;
 import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.Texture;
+import net.minecraft.client.renderer.texture.Texture;
-import net.minecraft.client.renderer.TextureManager;
+import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.util.StringTranslate;
 
 import org.lwjgl.opengl.GL11;

fml/conf/packages.csv

@@ -1,9 +1,47 @@
 class,package
-Block,net/minecraft/block
+IconRegister,net/minecraft/client/renderer/texture
-BlockAnvil,net/minecraft/block
+Rect2i,net/minecraft/client/renderer/texture
+RenderTntMinecart,net/minecraft/client/renderer/entity
+ScreenHopper,net/minecraft/client/gui
+StitchHolder,net/minecraft/client/renderer/texture
+StitchSlot,net/minecraft/client/renderer/texture
+Stitcher,net/minecraft/client/renderer/texture
+Texture,net/minecraft/client/renderer/texture
+TextureClock,net/minecraft/client/renderer/texture
+TextureCompass,net/minecraft/client/renderer/texture
+TextureManager,net/minecraft/client/renderer/texture
+TextureMap,net/minecraft/client/renderer/texture
+TextureStitched,net/minecraft/client/renderer/texture
 BlockBasePressurePlate,net/minecraft/block
 BlockBaseRail,net/minecraft/block
 BlockBaseRailLogic,net/minecraft/block
+BlockComparator,net/minecraft/block
+BlockDaylightDetector,net/minecraft/block
+BlockHopper,net/minecraft/block
+BlockPoweredMetal,net/minecraft/block
+BlockPoweredRail,net/minecraft/block
+BlockQuartz,net/minecraft/block
+BlockRepeater,net/minecraft/block
+BlockStoneButton,net/minecraft/block
+BlockWeightedPressurePlate,net/minecraft/block
+BlockWoodButton,net/minecraft/block
+CallableTileEntityData,net/minecraft/tileentity
+CallableTileEntityID,net/minecraft/tileentity
+CombatEntry,net/minecraft/util
+CombatTracker,net/minecraft/util
+ContainerWorldly,net/minecraft/inventory
+EntitySelectorAlive,net/minecraft/command
+EntitySelectorHopperInventory,net/minecraft/tileentity
+Icon,net/minecraft/util
+ItemChestMinecart,net/minecraft/entity
+ItemFurnaceMinecart,net/minecraft/entity
+ItemRideableMinecart,net/minecraft/entity
+ItemTntMinecart,net/minecraft/entity
+MenuHopper,net/minecraft/inventory
+TileEntityDaylightDetector,net/minecraft/tileentity
+TileEntityHopper,net/minecraft/tileentity
+Block,net/minecraft/block
+BlockAnvil,net/minecraft/block
 BlockBeacon,net/minecraft/block
 BlockBed,net/minecraft/block
 BlockBookshelf,net/minecraft/block
@@ -19,10 +57,8 @@ BlockClay,net/minecraft/block
 BlockCloth,net/minecraft/block
 BlockCocoa,net/minecraft/block
 BlockCommandBlock,net/minecraft/block
-BlockComparator,net/minecraft/block
 BlockContainer,net/minecraft/block
 BlockCrops,net/minecraft/block
-BlockDaylightDetector,net/minecraft/block
 BlockDeadBush,net/minecraft/block
 BlockDetectorRail,net/minecraft/block
 BlockDirectional,net/minecraft/block
@@ -49,7 +85,6 @@ BlockGlowStone,net/minecraft/block
 BlockGrass,net/minecraft/block
 BlockGravel,net/minecraft/block
 BlockHalfSlab,net/minecraft/block
-BlockHopper,net/minecraft/block
 BlockIce,net/minecraft/block
 BlockJukeBox,net/minecraft/block
 BlockLadder,net/minecraft/block
@@ -76,11 +111,8 @@ BlockPistonExtension,net/minecraft/block
 BlockPistonMoving,net/minecraft/block
 BlockPortal,net/minecraft/block
 BlockPotato,net/minecraft/block
-BlockPoweredMetal,net/minecraft/block
-BlockPoweredRail,net/minecraft/block
 BlockPressurePlate,net/minecraft/block
 BlockPumpkin,net/minecraft/block
-BlockQuartz,net/minecraft/block
 BlockRail,net/minecraft/block
 BlockRedstoneLight,net/minecraft/block
 BlockRedstoneOre,net/minecraft/block
@@ -88,7 +120,6 @@ BlockRedstoneRepeater,net/minecraft/block
 BlockRedstoneTorch,net/minecraft/block
 BlockRedstoneWire,net/minecraft/block
 BlockReed,net/minecraft/block
-BlockRepeater,net/minecraft/block
 BlockSand,net/minecraft/block
 BlockSandStone,net/minecraft/block
 BlockSapling,net/minecraft/block
@@ -106,7 +137,6 @@ BlockStem,net/minecraft/block
 BlockStep,net/minecraft/block
 BlockStone,net/minecraft/block
 BlockStoneBrick,net/minecraft/block
-BlockStoneButton,net/minecraft/block
 BlockTNT,net/minecraft/block
 BlockTallGrass,net/minecraft/block
 BlockTorch,net/minecraft/block
@@ -116,9 +146,7 @@ BlockTripWireSource,net/minecraft/block
 BlockVine,net/minecraft/block
 BlockWall,net/minecraft/block
 BlockWeb,net/minecraft/block
-BlockWeightedPressurePlate,net/minecraft/block
 BlockWood,net/minecraft/block
-BlockWoodButton,net/minecraft/block
 BlockWoodSlab,net/minecraft/block
 BlockWorkbench,net/minecraft/block
 EnumMobType,net/minecraft/block
@@ -228,7 +256,6 @@ MapItemRenderer,net/minecraft/client/gui
 Particle,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ScreenChatOptions,net/minecraft/client/gui
-ScreenHopper,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
 GuiAchievements,net/minecraft/client/gui/achievement
@@ -358,29 +385,18 @@ EntityRenderer,net/minecraft/client/renderer
 EntitySorter,net/minecraft/client/renderer
 GLAllocation,net/minecraft/client/renderer
 IImageBuffer,net/minecraft/client/renderer
-IconRegister,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
-Rect2i,net/minecraft/client/renderer
 RenderBlocks,net/minecraft/client/renderer
 RenderEngine,net/minecraft/client/renderer
 RenderGlobal,net/minecraft/client/renderer
 RenderHelper,net/minecraft/client/renderer
 RenderList,net/minecraft/client/renderer
 RenderSorter,net/minecraft/client/renderer
-StitchHolder,net/minecraft/client/renderer
-StitchSlot,net/minecraft/client/renderer
-Stitcher,net/minecraft/client/renderer
 Tessellator,net/minecraft/client/renderer
-Texture,net/minecraft/client/renderer
-TextureClock,net/minecraft/client/renderer
-TextureCompass,net/minecraft/client/renderer
-TextureManager,net/minecraft/client/renderer
-TextureMap,net/minecraft/client/renderer
-TextureStitched,net/minecraft/client/renderer
 ThreadDownloadImage,net/minecraft/client/renderer
 ThreadDownloadImageData,net/minecraft/client/renderer
 WorldRenderer,net/minecraft/client/renderer
@@ -427,7 +443,6 @@ RenderSnowball,net/minecraft/client/renderer/entity
 RenderSpider,net/minecraft/client/renderer/entity
 RenderSquid,net/minecraft/client/renderer/entity
 RenderTNTPrimed,net/minecraft/client/renderer/entity
-RenderTntMinecart,net/minecraft/client/renderer/entity
 RenderVillager,net/minecraft/client/renderer/entity
 RenderWitch,net/minecraft/client/renderer/entity
 RenderWither,net/minecraft/client/renderer/entity
@@ -508,7 +523,6 @@ CommandTime,net/minecraft/command
 CommandToggleDownfall,net/minecraft/command
 CommandWeather,net/minecraft/command
 CommandXP,net/minecraft/command
-EntitySelectorAlive,net/minecraft/command
 IAdminCommand,net/minecraft/command
 ICommand,net/minecraft/command
 ICommandManager,net/minecraft/command
@@ -620,10 +634,6 @@ IMerchant,net/minecraft/entity
 INpc,net/minecraft/entity
 IProjectile,net/minecraft/entity
 IRangedAttackMob,net/minecraft/entity
-ItemChestMinecart,net/minecraft/entity
-ItemFurnaceMinecart,net/minecraft/entity
-ItemRideableMinecart,net/minecraft/entity
-ItemTntMinecart,net/minecraft/entity
 NpcMerchant,net/minecraft/entity
 WatchableObject,net/minecraft/entity
 EntityAIArrowAttack,net/minecraft/entity/ai
@@ -763,7 +773,6 @@ ContainerMerchant,net/minecraft/inventory
 ContainerPlayer,net/minecraft/inventory
 ContainerRepair,net/minecraft/inventory
 ContainerWorkbench,net/minecraft/inventory
-ContainerWorldly,net/minecraft/inventory
 ICrafting,net/minecraft/inventory
 IInvBasic,net/minecraft/inventory
 IInventory,net/minecraft/inventory
@@ -774,7 +783,6 @@ InventoryEnderChest,net/minecraft/inventory
 InventoryLargeChest,net/minecraft/inventory
 InventoryMerchant,net/minecraft/inventory
 InventoryRepair,net/minecraft/inventory
-MenuHopper,net/minecraft/inventory
 Slot,net/minecraft/inventory
 SlotArmor,net/minecraft/inventory
 SlotBeacon,net/minecraft/inventory
@@ -1054,22 +1062,17 @@ StatTypeTime,net/minecraft/stats
 StatsSyncher,net/minecraft/stats
 ThreadStatSyncherReceive,net/minecraft/stats
 ThreadStatSyncherSend,net/minecraft/stats
-CallableTileEntityData,net/minecraft/tileentity
-CallableTileEntityID,net/minecraft/tileentity
 CallableTileEntityName,net/minecraft/tileentity
-EntitySelectorHopperInventory,net/minecraft/tileentity
 TileEntity,net/minecraft/tileentity
 TileEntityBeacon,net/minecraft/tileentity
 TileEntityBrewingStand,net/minecraft/tileentity
 TileEntityChest,net/minecraft/tileentity
 TileEntityCommandBlock,net/minecraft/tileentity
-TileEntityDaylightDetector,net/minecraft/tileentity
 TileEntityDispenser,net/minecraft/tileentity
 TileEntityEnchantmentTable,net/minecraft/tileentity
 TileEntityEndPortal,net/minecraft/tileentity
 TileEntityEnderChest,net/minecraft/tileentity
 TileEntityFurnace,net/minecraft/tileentity
-TileEntityHopper,net/minecraft/tileentity
 TileEntityMobSpawner,net/minecraft/tileentity
 TileEntityMobSpawnerSpawnData,net/minecraft/tileentity
 TileEntityNote,net/minecraft/tileentity
@@ -1081,8 +1084,6 @@ AABBPool,net/minecraft/util
 AxisAlignedBB,net/minecraft/util
 ChatAllowedCharacters,net/minecraft/util
 ChunkCoordinates,net/minecraft/util
-CombatEntry,net/minecraft/util
-CombatTracker,net/minecraft/util
 CryptManager,net/minecraft/util
 DamageSource,net/minecraft/util
 Direction,net/minecraft/util
@@ -1099,7 +1100,6 @@ HttpUtil,net/minecraft/util
 HttpUtilRunnable,net/minecraft/util
 IDownloadSuccess,net/minecraft/util
 IProgressUpdate,net/minecraft/util
-Icon,net/minecraft/util
 IntHashMap,net/minecraft/util
 IntHashMapEntry,net/minecraft/util
 LongHashMap,net/minecraft/util

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

@@ -1,13 +1,13 @@
 --- ../src-base/minecraft/net/minecraft/client/renderer/RenderBlocks.java
 +++ ../src-work/minecraft/net/minecraft/client/renderer/RenderBlocks.java
-@@ -35,6 +35,7 @@
+@@ -34,6 +34,7 @@
+ import net.minecraft.block.BlockWall;
  import net.minecraft.block.material.Material;
  import net.minecraft.client.Minecraft;
- import net.minecraft.item.Icon;
 +import net.minecraft.src.FMLRenderAccessLibrary;
  import net.minecraft.util.Direction;
+ import net.minecraft.util.Icon;
  import net.minecraft.util.MathHelper;
- import net.minecraft.util.Vec3;
 @@ -231,7 +232,84 @@
          int l = p_78612_1_.func_71857_b();
          p_78612_1_.func_71902_a(this.field_78669_a, p_78612_2_, p_78612_3_, p_78612_4_);

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.renderer.texture.TextureMap;
  import net.minecraft.client.settings.GameSettings;
- import net.minecraft.client.texturepacks.ITexturePack;
+@@ -39,6 +45,8 @@
-@@ -38,6 +44,8 @@
      private final TextureMap field_94155_m;
      private int field_94153_n;
  
@@ -31,7 +31,7 @@
      public RenderEngine(TexturePackList p_i3192_1_, GameSettings p_i3192_2_)
      {
          this.field_78366_k = p_i3192_1_;
-@@ -116,8 +124,9 @@
+@@ -117,8 +125,9 @@
                  this.field_78359_d.put(p_78346_1_, aint1);
                  return aint1;
              }
@@ -43,7 +43,7 @@
                  ioexception.printStackTrace();
                  int[] aint2 = this.func_78348_b(this.field_78364_l);
                  this.field_78359_d.put(p_78346_1_, aint2);
-@@ -504,8 +513,9 @@
+@@ -505,8 +514,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }
@@ -55,7 +55,7 @@
                  ioexception.printStackTrace();
              }
          }
-@@ -541,8 +551,9 @@
+@@ -542,8 +552,9 @@
                  this.field_78361_b = false;
                  this.field_78363_a = false;
              }

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

@@ -10,7 +10,7 @@
  import net.minecraft.entity.boss.EntityDragon;
  import net.minecraft.entity.boss.EntityWither;
  import net.minecraft.entity.item.EntityBoat;
-@@ -123,9 +126,10 @@
+@@ -119,9 +122,10 @@
              p_75615_0_.func_82580_o("Type");
          }
  
@@ -22,7 +22,7 @@
  
              if (oclass != null)
              {
-@@ -139,7 +143,17 @@
+@@ -135,7 +139,17 @@
  
          if (entity != null)
          {

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

@@ -7,7 +7,7 @@
  import cpw.mods.fml.relauncher.Side;
  import cpw.mods.fml.relauncher.SideOnly;
  import java.util.List;
-@@ -213,6 +214,8 @@
+@@ -214,6 +215,8 @@
          }
  
          field_77698_e[256 + p_i3659_1_] = this;