diff --git a/client/net/minecraftforge/client/EnumHelperClient.java b/client/net/minecraftforge/client/EnumHelperClient.java index dcb471983..150b0803f 100644 --- a/client/net/minecraftforge/client/EnumHelperClient.java +++ b/client/net/minecraftforge/client/EnumHelperClient.java @@ -1,9 +1,9 @@ package net.minecraftforge.client; -import net.minecraft.src.EnumGameType; -import net.minecraft.src.EnumOS; -import net.minecraft.src.EnumOptions; -import net.minecraft.src.EnumRarity; +import net.minecraft.world.EnumGameType; +import net.minecraft.util.EnumOS; +import net.minecraft.client.settings.EnumOptions; +import net.minecraft.item.EnumRarity; import net.minecraftforge.common.EnumHelper; public class EnumHelperClient extends EnumHelper diff --git a/client/net/minecraftforge/client/ForgeHooksClient.java b/client/net/minecraftforge/client/ForgeHooksClient.java index ce76cef49..1474005c2 100644 --- a/client/net/minecraftforge/client/ForgeHooksClient.java +++ b/client/net/minecraftforge/client/ForgeHooksClient.java @@ -10,20 +10,20 @@ import org.lwjgl.opengl.GL12; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.Minecraft; -import net.minecraft.src.Block; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ITexturePack; -import net.minecraft.src.Item; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MathHelper; -import net.minecraft.src.MovingObjectPosition; -import net.minecraft.src.RenderBlocks; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.RenderGlobal; -import net.minecraft.src.Tessellator; +import net.minecraft.block.Block; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.client.texturepacks.ITexturePack; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MathHelper; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.RenderGlobal; +import net.minecraft.client.renderer.Tessellator; import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.TextureLoadEvent; diff --git a/client/net/minecraftforge/client/GuiControlsScrollPanel.java b/client/net/minecraftforge/client/GuiControlsScrollPanel.java index 27c3d8f1f..d5d69f8fe 100644 --- a/client/net/minecraftforge/client/GuiControlsScrollPanel.java +++ b/client/net/minecraftforge/client/GuiControlsScrollPanel.java @@ -4,11 +4,11 @@ import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; import net.minecraft.client.Minecraft; -import net.minecraft.src.GameSettings; -import net.minecraft.src.GuiControls; -import net.minecraft.src.GuiSlot; -import net.minecraft.src.KeyBinding; -import net.minecraft.src.Tessellator; +import net.minecraft.client.settings.GameSettings; +import net.minecraft.client.gui.GuiControls; +import net.minecraft.client.gui.GuiSlot; +import net.minecraft.client.settings.KeyBinding; +import net.minecraft.client.renderer.Tessellator; public class GuiControlsScrollPanel extends GuiSlot { diff --git a/client/net/minecraftforge/client/IItemRenderer.java b/client/net/minecraftforge/client/IItemRenderer.java index 79c4fc09a..1f36fbc6d 100644 --- a/client/net/minecraftforge/client/IItemRenderer.java +++ b/client/net/minecraftforge/client/IItemRenderer.java @@ -1,9 +1,9 @@ package net.minecraftforge.client; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.ItemStack; -import net.minecraft.src.RenderBlocks; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.EntityLiving; +import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.RenderBlocks; public interface IItemRenderer { diff --git a/client/net/minecraftforge/client/MinecraftForgeClient.java b/client/net/minecraftforge/client/MinecraftForgeClient.java index cd68a7a6c..e1da0a0d5 100644 --- a/client/net/minecraftforge/client/MinecraftForgeClient.java +++ b/client/net/minecraftforge/client/MinecraftForgeClient.java @@ -7,12 +7,12 @@ package net.minecraftforge.client; import org.lwjgl.opengl.Display; -import net.minecraft.src.Block; -import net.minecraft.src.Entity; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.RenderBlocks; -import net.minecraft.src.World; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.World; import net.minecraftforge.client.IItemRenderer.ItemRenderType; import net.minecraftforge.common.MinecraftForge; diff --git a/client/net/minecraftforge/client/SkyProvider.java b/client/net/minecraftforge/client/SkyProvider.java index c1a0e2623..effab9a38 100644 --- a/client/net/minecraftforge/client/SkyProvider.java +++ b/client/net/minecraftforge/client/SkyProvider.java @@ -3,7 +3,7 @@ package net.minecraftforge.client; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; import net.minecraft.client.Minecraft; -import net.minecraft.src.WorldClient; +import net.minecraft.client.multiplayer.WorldClient; //To-Do: Rename this to something more generic.. IRenderHandler? public abstract class SkyProvider diff --git a/client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java b/client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java index fe15fcb0f..cfef7cee3 100644 --- a/client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java +++ b/client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java @@ -1,9 +1,9 @@ package net.minecraftforge.client.event; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MovingObjectPosition; -import net.minecraft.src.RenderGlobal; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.client.renderer.RenderGlobal; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/client/net/minecraftforge/client/event/RenderWorldLastEvent.java b/client/net/minecraftforge/client/event/RenderWorldLastEvent.java index 7e541d3d9..60adeca7c 100644 --- a/client/net/minecraftforge/client/event/RenderWorldLastEvent.java +++ b/client/net/minecraftforge/client/event/RenderWorldLastEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event; -import net.minecraft.src.RenderGlobal; +import net.minecraft.client.renderer.RenderGlobal; import net.minecraftforge.event.Event; public class RenderWorldLastEvent extends Event diff --git a/client/net/minecraftforge/client/event/TextureLoadEvent.java b/client/net/minecraftforge/client/event/TextureLoadEvent.java index 96b313c06..b483db111 100644 --- a/client/net/minecraftforge/client/event/TextureLoadEvent.java +++ b/client/net/minecraftforge/client/event/TextureLoadEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event; -import net.minecraft.src.ITexturePack; +import net.minecraft.client.texturepacks.ITexturePack; import net.minecraftforge.event.Event; public class TextureLoadEvent extends Event diff --git a/client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java b/client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java index 3e0fcc1d7..bc36c5e26 100644 --- a/client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; /** * Raised when the SoundManager tries to play a Background Music file, diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java index f4e00cae7..63d86caae 100644 --- a/client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; public class PlaySoundEffectEvent extends SoundResultEvent { diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java index 03fb7fbda..4ea960626 100644 --- a/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; +import net.minecraft.client.audio.SoundManager; public class PlaySoundEffectSourceEvent extends SoundEvent { diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundEvent.java index 210b14ea8..f2eea215e 100644 --- a/client/net/minecraftforge/client/event/sound/PlaySoundEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlaySoundEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; /*** * Raised when the SoundManager tries to play a normal sound, diff --git a/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java index fb627f24e..a5f13c99e 100644 --- a/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; +import net.minecraft.client.audio.SoundManager; public class PlaySoundSourceEvent extends SoundEvent { diff --git a/client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java b/client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java index f83ff6d40..eca3c677e 100644 --- a/client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; /** * Raised when the SoundManager tries to play a 'Streaming' file, diff --git a/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java b/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java index 116e7843c..40d076bba 100644 --- a/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java +++ b/client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; +import net.minecraft.client.audio.SoundManager; public class PlayStreamingSourceEvent extends SoundEvent { diff --git a/client/net/minecraftforge/client/event/sound/SoundEvent.java b/client/net/minecraftforge/client/event/sound/SoundEvent.java index 523a9d4dd..6e3adf654 100644 --- a/client/net/minecraftforge/client/event/sound/SoundEvent.java +++ b/client/net/minecraftforge/client/event/sound/SoundEvent.java @@ -1,8 +1,8 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.Entity; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.entity.Entity; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/client/net/minecraftforge/client/event/sound/SoundLoadEvent.java b/client/net/minecraftforge/client/event/sound/SoundLoadEvent.java index 59f4da3b2..63b465c2f 100644 --- a/client/net/minecraftforge/client/event/sound/SoundLoadEvent.java +++ b/client/net/minecraftforge/client/event/sound/SoundLoadEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; +import net.minecraft.client.audio.SoundManager; /** * Raised by the SoundManager.loadSoundSettings, this would be a good place for diff --git a/client/net/minecraftforge/client/event/sound/SoundResultEvent.java b/client/net/minecraftforge/client/event/sound/SoundResultEvent.java index 7d4afbc09..495e695fb 100644 --- a/client/net/minecraftforge/client/event/sound/SoundResultEvent.java +++ b/client/net/minecraftforge/client/event/sound/SoundResultEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; -import net.minecraft.src.SoundPoolEntry; +import net.minecraft.client.audio.SoundManager; +import net.minecraft.client.audio.SoundPoolEntry; public abstract class SoundResultEvent extends SoundEvent { diff --git a/client/net/minecraftforge/client/event/sound/SoundSetupEvent.java b/client/net/minecraftforge/client/event/sound/SoundSetupEvent.java index 9f286a390..b8b6af73f 100644 --- a/client/net/minecraftforge/client/event/sound/SoundSetupEvent.java +++ b/client/net/minecraftforge/client/event/sound/SoundSetupEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.client.event.sound; -import net.minecraft.src.SoundManager; +import net.minecraft.client.audio.SoundManager; /** * This event is raised by the SoundManager when it does its first setup of the diff --git a/common/net/minecraftforge/common/AchievementPage.java b/common/net/minecraftforge/common/AchievementPage.java index 679995961..1530f6e0c 100644 --- a/common/net/minecraftforge/common/AchievementPage.java +++ b/common/net/minecraftforge/common/AchievementPage.java @@ -11,7 +11,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; -import net.minecraft.src.Achievement; +import net.minecraft.stats.Achievement; public class AchievementPage { diff --git a/common/net/minecraftforge/common/BiomeManager.java b/common/net/minecraftforge/common/BiomeManager.java index ccf6bdfc3..5b88686bc 100644 --- a/common/net/minecraftforge/common/BiomeManager.java +++ b/common/net/minecraftforge/common/BiomeManager.java @@ -5,12 +5,12 @@ import java.util.Arrays; import java.util.HashSet; import java.util.Set; -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.ChunkProviderGenerate; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.MapGenStronghold; -import net.minecraft.src.MapGenVillage; -import net.minecraft.src.WorldChunkManager; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.gen.ChunkProviderGenerate; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.structure.MapGenStronghold; +import net.minecraft.world.gen.structure.MapGenVillage; +import net.minecraft.world.biome.WorldChunkManager; import com.google.common.collect.Lists; diff --git a/common/net/minecraftforge/common/Configuration.java b/common/net/minecraftforge/common/Configuration.java index 9f05b7a2d..fb593e7e8 100644 --- a/common/net/minecraftforge/common/Configuration.java +++ b/common/net/minecraftforge/common/Configuration.java @@ -26,8 +26,8 @@ import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.Loader; import cpw.mods.fml.relauncher.FMLInjectionData; -import net.minecraft.src.Block; -import net.minecraft.src.Item; +import net.minecraft.block.Block; +import net.minecraft.item.Item; import static net.minecraftforge.common.Property.Type.*; /** diff --git a/common/net/minecraftforge/common/DungeonHooks.java b/common/net/minecraftforge/common/DungeonHooks.java index 066950953..df4030d57 100644 --- a/common/net/minecraftforge/common/DungeonHooks.java +++ b/common/net/minecraftforge/common/DungeonHooks.java @@ -3,10 +3,10 @@ package net.minecraftforge.common; import java.util.ArrayList; import java.util.Random; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.WeightedRandom; -import net.minecraft.src.WeightedRandomItem; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.WeightedRandom; +import net.minecraft.util.WeightedRandomItem; public class DungeonHooks { diff --git a/common/net/minecraftforge/common/ForgeChunkManager.java b/common/net/minecraftforge/common/ForgeChunkManager.java index 698177b7d..cc27dbae5 100644 --- a/common/net/minecraftforge/common/ForgeChunkManager.java +++ b/common/net/minecraftforge/common/ForgeChunkManager.java @@ -43,17 +43,17 @@ import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.ModContainer; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.Chunk; -import net.minecraft.src.ChunkCoordIntPair; -import net.minecraft.src.CompressedStreamTools; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.MathHelper; -import net.minecraft.src.NBTBase; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.World; -import net.minecraft.src.WorldServer; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.nbt.CompressedStreamTools; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.util.MathHelper; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.world.World; +import net.minecraft.world.WorldServer; import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/common/ForgeDummyContainer.java b/common/net/minecraftforge/common/ForgeDummyContainer.java index 24000efcc..2c4f8b922 100644 --- a/common/net/minecraftforge/common/ForgeDummyContainer.java +++ b/common/net/minecraftforge/common/ForgeDummyContainer.java @@ -4,10 +4,10 @@ import java.io.File; import java.util.Arrays; import java.util.Map; -import net.minecraft.src.NBTBase; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.SaveHandler; -import net.minecraft.src.WorldInfo; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.storage.SaveHandler; +import net.minecraft.world.storage.WorldInfo; import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; diff --git a/common/net/minecraftforge/common/IArmorTextureProvider.java b/common/net/minecraftforge/common/IArmorTextureProvider.java index 9880f3cbc..294c678e1 100644 --- a/common/net/minecraftforge/common/IArmorTextureProvider.java +++ b/common/net/minecraftforge/common/IArmorTextureProvider.java @@ -5,7 +5,7 @@ package net.minecraftforge.common; -import net.minecraft.src.ItemStack; +import net.minecraft.item.ItemStack; /** * This interface has to be implemented by an instance of ItemArmor. diff --git a/common/net/minecraftforge/common/IMinecartCollisionHandler.java b/common/net/minecraftforge/common/IMinecartCollisionHandler.java index e69c3b237..2346273d0 100644 --- a/common/net/minecraftforge/common/IMinecartCollisionHandler.java +++ b/common/net/minecraftforge/common/IMinecartCollisionHandler.java @@ -1,8 +1,8 @@ package net.minecraftforge.common; -import net.minecraft.src.AxisAlignedBB; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityMinecart; +import net.minecraft.util.AxisAlignedBB; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityMinecart; /** * This class defines a replacement for the default minecart collision code. diff --git a/common/net/minecraftforge/common/IPlantable.java b/common/net/minecraftforge/common/IPlantable.java index fbe8bfe62..c19a21d44 100644 --- a/common/net/minecraftforge/common/IPlantable.java +++ b/common/net/minecraftforge/common/IPlantable.java @@ -1,6 +1,6 @@ package net.minecraftforge.common; -import net.minecraft.src.World; +import net.minecraft.world.World; public interface IPlantable { diff --git a/common/net/minecraftforge/common/IShearable.java b/common/net/minecraftforge/common/IShearable.java index 0b0407610..190e7b264 100644 --- a/common/net/minecraftforge/common/IShearable.java +++ b/common/net/minecraftforge/common/IShearable.java @@ -2,10 +2,10 @@ package net.minecraftforge.common; import java.util.ArrayList; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MovingObjectPosition; -import net.minecraft.src.World; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; /** * diff --git a/common/net/minecraftforge/common/ISidedInventory.java b/common/net/minecraftforge/common/ISidedInventory.java index 0f4a98c8d..54bef29a6 100644 --- a/common/net/minecraftforge/common/ISidedInventory.java +++ b/common/net/minecraftforge/common/ISidedInventory.java @@ -5,7 +5,7 @@ package net.minecraftforge.common; -import net.minecraft.src.IInventory; +import net.minecraft.inventory.IInventory; /** Inventory ranges mapped by side. This class is implemented by TileEntities * that provide different inventory slot ranges to different sides. diff --git a/common/net/minecraftforge/common/ISpecialArmor.java b/common/net/minecraftforge/common/ISpecialArmor.java index 919ced9cf..0b0e106b3 100644 --- a/common/net/minecraftforge/common/ISpecialArmor.java +++ b/common/net/minecraftforge/common/ISpecialArmor.java @@ -8,11 +8,11 @@ package net.minecraftforge.common; import java.util.ArrayList; import java.util.Arrays; -import net.minecraft.src.DamageSource; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemArmor; -import net.minecraft.src.ItemStack; +import net.minecraft.util.DamageSource; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; /** * This interface is to be implemented by ItemArmor classes. It will allow to diff --git a/common/net/minecraftforge/common/IThrowableEntity.java b/common/net/minecraftforge/common/IThrowableEntity.java index 02c25cc2e..72b3ef3bd 100644 --- a/common/net/minecraftforge/common/IThrowableEntity.java +++ b/common/net/minecraftforge/common/IThrowableEntity.java @@ -1,6 +1,6 @@ package net.minecraftforge.common; -import net.minecraft.src.Entity; +import net.minecraft.entity.Entity; /** * This interface should be implemented by an Entity that can be 'thrown', like snowballs. diff --git a/common/net/minecraftforge/common/MinecartRegistry.java b/common/net/minecraftforge/common/MinecartRegistry.java index 5a3867338..43cfd23d6 100644 --- a/common/net/minecraftforge/common/MinecartRegistry.java +++ b/common/net/minecraftforge/common/MinecartRegistry.java @@ -5,9 +5,9 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -import net.minecraft.src.EntityMinecart; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.entity.item.EntityMinecart; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class MinecartRegistry { diff --git a/common/net/minecraftforge/common/WorldSpecificSaveHandler.java b/common/net/minecraftforge/common/WorldSpecificSaveHandler.java index cb0d7a7fc..2f3f2edd2 100644 --- a/common/net/minecraftforge/common/WorldSpecificSaveHandler.java +++ b/common/net/minecraftforge/common/WorldSpecificSaveHandler.java @@ -2,14 +2,14 @@ package net.minecraftforge.common; import java.io.File; -import net.minecraft.src.IChunkLoader; -import net.minecraft.src.IPlayerFileData; -import net.minecraft.src.ISaveHandler; -import net.minecraft.src.MinecraftException; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.WorldInfo; -import net.minecraft.src.WorldProvider; -import net.minecraft.src.WorldServer; +import net.minecraft.world.chunk.storage.IChunkLoader; +import net.minecraft.world.storage.IPlayerFileData; +import net.minecraft.world.storage.ISaveHandler; +import net.minecraft.world.MinecraftException; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.storage.WorldInfo; +import net.minecraft.world.WorldProvider; +import net.minecraft.world.WorldServer; //Class used internally to provide the world specific data directories. diff --git a/common/net/minecraftforge/event/CommandEvent.java b/common/net/minecraftforge/event/CommandEvent.java index 6d3a6b820..fc8f8bd93 100644 --- a/common/net/minecraftforge/event/CommandEvent.java +++ b/common/net/minecraftforge/event/CommandEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event; -import net.minecraft.src.ICommand; -import net.minecraft.src.ICommandSender; +import net.minecraft.command.ICommand; +import net.minecraft.command.ICommandSender; @Cancelable public class CommandEvent extends Event diff --git a/common/net/minecraftforge/event/ServerChatEvent.java b/common/net/minecraftforge/event/ServerChatEvent.java index 0668dd3fc..b5a150fa0 100644 --- a/common/net/minecraftforge/event/ServerChatEvent.java +++ b/common/net/minecraftforge/event/ServerChatEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event; -import net.minecraft.src.EntityPlayerMP; +import net.minecraft.entity.player.EntityPlayerMP; @Cancelable public class ServerChatEvent extends Event { diff --git a/common/net/minecraftforge/event/entity/EntityEvent.java b/common/net/minecraftforge/event/entity/EntityEvent.java index 61ef275b5..318c16d42 100644 --- a/common/net/minecraftforge/event/entity/EntityEvent.java +++ b/common/net/minecraftforge/event/entity/EntityEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity; -import net.minecraft.src.Entity; +import net.minecraft.entity.Entity; import net.minecraftforge.event.Event; public class EntityEvent extends Event diff --git a/common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java b/common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java index 0547edae9..f852b6c15 100644 --- a/common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java +++ b/common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity; -import net.minecraft.src.Entity; -import net.minecraft.src.World; +import net.minecraft.entity.Entity; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java b/common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java index f7910e65a..859debd1f 100644 --- a/common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java +++ b/common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity; -import net.minecraft.src.Entity; +import net.minecraft.entity.Entity; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/item/ItemEvent.java b/common/net/minecraftforge/event/entity/item/ItemEvent.java index ae0b7e0cb..e9667a2e9 100644 --- a/common/net/minecraftforge/event/entity/item/ItemEvent.java +++ b/common/net/minecraftforge/event/entity/item/ItemEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.item; -import net.minecraft.src.EntityItem; +import net.minecraft.entity.item.EntityItem; import net.minecraftforge.event.entity.EntityEvent; /** diff --git a/common/net/minecraftforge/event/entity/item/ItemExpireEvent.java b/common/net/minecraftforge/event/entity/item/ItemExpireEvent.java index 2fac59c3e..3f21a9d4d 100644 --- a/common/net/minecraftforge/event/entity/item/ItemExpireEvent.java +++ b/common/net/minecraftforge/event/entity/item/ItemExpireEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.item; -import net.minecraft.src.EntityItem; +import net.minecraft.entity.item.EntityItem; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.EntityEvent; diff --git a/common/net/minecraftforge/event/entity/item/ItemTossEvent.java b/common/net/minecraftforge/event/entity/item/ItemTossEvent.java index a2bb5bfe0..033fc6f20 100644 --- a/common/net/minecraftforge/event/entity/item/ItemTossEvent.java +++ b/common/net/minecraftforge/event/entity/item/ItemTossEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.item; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.EntityEvent; diff --git a/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java b/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java index b8c05967d..e8ddbce35 100644 --- a/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingAttackEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.DamageSource; -import net.minecraft.src.EntityLiving; +import net.minecraft.util.DamageSource; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java b/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java index 0c0d374bc..ad7899347 100644 --- a/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingDeathEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.DamageSource; -import net.minecraft.src.EntityLiving; +import net.minecraft.util.DamageSource; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java b/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java index c2eb9dd3c..445501df0 100644 --- a/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingDropsEvent.java @@ -2,9 +2,9 @@ package net.minecraftforge.event.entity.living; import java.util.ArrayList; -import net.minecraft.src.DamageSource; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityLiving; +import net.minecraft.util.DamageSource; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/living/LivingEvent.java b/common/net/minecraftforge/event/entity/living/LivingEvent.java index 7035f46b0..a3f6519d8 100644 --- a/common/net/minecraftforge/event/entity/living/LivingEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.EntityLiving; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.EntityEvent; diff --git a/common/net/minecraftforge/event/entity/living/LivingFallEvent.java b/common/net/minecraftforge/event/entity/living/LivingFallEvent.java index b03fa0ad0..64363198a 100644 --- a/common/net/minecraftforge/event/entity/living/LivingFallEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingFallEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.EntityLiving; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java b/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java index d5e2a0ba0..7afcaea1c 100644 --- a/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingHurtEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.DamageSource; -import net.minecraft.src.EntityLiving; +import net.minecraft.util.DamageSource; +import net.minecraft.entity.EntityLiving; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java b/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java index bb51b5906..6a5b734ad 100644 --- a/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.EntityLiving; +import net.minecraft.entity.EntityLiving; public class LivingSetAttackTargetEvent extends LivingEvent { diff --git a/common/net/minecraftforge/event/entity/living/LivingSpecialSpawnEvent.java b/common/net/minecraftforge/event/entity/living/LivingSpecialSpawnEvent.java index 2186967d1..834c1ba7a 100644 --- a/common/net/minecraftforge/event/entity/living/LivingSpecialSpawnEvent.java +++ b/common/net/minecraftforge/event/entity/living/LivingSpecialSpawnEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.living; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.World; +import net.minecraft.entity.EntityLiving; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java b/common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java index 724a42b01..a3b086714 100644 --- a/common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java +++ b/common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.minecart; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityMinecart; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityMinecart; public class MinecartCollisionEvent extends MinecartEvent { diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartEvent.java b/common/net/minecraftforge/event/entity/minecart/MinecartEvent.java index 8c595b713..4aec2efd4 100644 --- a/common/net/minecraftforge/event/entity/minecart/MinecartEvent.java +++ b/common/net/minecraftforge/event/entity/minecart/MinecartEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.minecart; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityMinecart; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityMinecart; import net.minecraftforge.event.entity.EntityEvent; public class MinecartEvent extends EntityEvent diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java b/common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java index ea22dc0b3..76ace4046 100644 --- a/common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java +++ b/common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.minecart; -import net.minecraft.src.EntityMinecart; -import net.minecraft.src.EntityPlayer; +import net.minecraft.entity.item.EntityMinecart; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java b/common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java index ab990919a..f7cbf518c 100644 --- a/common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java +++ b/common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.entity.minecart; -import net.minecraft.src.EntityMinecart; +import net.minecraft.entity.item.EntityMinecart; public class MinecartUpdateEvent extends MinecartEvent { diff --git a/common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java b/common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java index 5113c3e04..c1ed1260a 100644 --- a/common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java +++ b/common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/player/ArrowNockEvent.java b/common/net/minecraftforge/event/entity/player/ArrowNockEvent.java index b784a977b..67537e516 100644 --- a/common/net/minecraftforge/event/entity/player/ArrowNockEvent.java +++ b/common/net/minecraftforge/event/entity/player/ArrowNockEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/player/AttackEntityEvent.java b/common/net/minecraftforge/event/entity/player/AttackEntityEvent.java index 67b84be1e..00235f280 100644 --- a/common/net/minecraftforge/event/entity/player/AttackEntityEvent.java +++ b/common/net/minecraftforge/event/entity/player/AttackEntityEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/player/BonemealEvent.java b/common/net/minecraftforge/event/entity/player/BonemealEvent.java index 894d431ad..e34b59dc9 100644 --- a/common/net/minecraftforge/event/entity/player/BonemealEvent.java +++ b/common/net/minecraftforge/event/entity/player/BonemealEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.World; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java b/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java index c1c0c2eec..845584576 100644 --- a/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java +++ b/common/net/minecraftforge/event/entity/player/EntityInteractEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; @Cancelable diff --git a/common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java b/common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java index 8a690dc23..e9004f5bd 100644 --- a/common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java +++ b/common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java @@ -1,8 +1,8 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; +import net.minecraft.entity.Entity; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/event/entity/player/FillBucketEvent.java b/common/net/minecraftforge/event/entity/player/FillBucketEvent.java index e09b454c0..260353197 100644 --- a/common/net/minecraftforge/event/entity/player/FillBucketEvent.java +++ b/common/net/minecraftforge/event/entity/player/FillBucketEvent.java @@ -1,9 +1,9 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.MovingObjectPosition; -import net.minecraft.src.World; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java b/common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java index 1a3d49c32..471fafbe4 100644 --- a/common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java +++ b/common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; public class PlayerDestroyItemEvent extends PlayerEvent { diff --git a/common/net/minecraftforge/event/entity/player/PlayerEvent.java b/common/net/minecraftforge/event/entity/player/PlayerEvent.java index 7decc1faf..a63f07492 100644 --- a/common/net/minecraftforge/event/entity/player/PlayerEvent.java +++ b/common/net/minecraftforge/event/entity/player/PlayerEvent.java @@ -1,8 +1,8 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.Block; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; +import net.minecraft.block.Block; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.entity.living.LivingEvent; diff --git a/common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java b/common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java index 49afd1c3a..31c1102df 100644 --- a/common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java +++ b/common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.World; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; import static net.minecraftforge.event.Event.Result; diff --git a/common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java b/common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java index b57795ddc..060dee43a 100644 --- a/common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java +++ b/common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EnumStatus; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EnumStatus; public class PlayerSleepInBedEvent extends PlayerEvent { diff --git a/common/net/minecraftforge/event/entity/player/UseHoeEvent.java b/common/net/minecraftforge/event/entity/player/UseHoeEvent.java index ac8793b25..9a16da635 100644 --- a/common/net/minecraftforge/event/entity/player/UseHoeEvent.java +++ b/common/net/minecraftforge/event/entity/player/UseHoeEvent.java @@ -1,8 +1,8 @@ package net.minecraftforge.event.entity.player; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.ItemStack; -import net.minecraft.src.World; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/event/terraingen/WorldTypeEvent.java b/common/net/minecraftforge/event/terraingen/WorldTypeEvent.java index d93d15595..9f2fe1a96 100644 --- a/common/net/minecraftforge/event/terraingen/WorldTypeEvent.java +++ b/common/net/minecraftforge/event/terraingen/WorldTypeEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.terraingen; -import net.minecraft.src.GenLayer; -import net.minecraft.src.WorldType; +import net.minecraft.world.gen.layer.GenLayer; +import net.minecraft.world.WorldType; import net.minecraftforge.event.Event; public class WorldTypeEvent extends Event diff --git a/common/net/minecraftforge/event/world/ChunkDataEvent.java b/common/net/minecraftforge/event/world/ChunkDataEvent.java index b7b06066e..21550a685 100644 --- a/common/net/minecraftforge/event/world/ChunkDataEvent.java +++ b/common/net/minecraftforge/event/world/ChunkDataEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.event.world; -import net.minecraft.src.Chunk; -import net.minecraft.src.NBTTagCompound; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.nbt.NBTTagCompound; public class ChunkDataEvent extends ChunkEvent { diff --git a/common/net/minecraftforge/event/world/ChunkEvent.java b/common/net/minecraftforge/event/world/ChunkEvent.java index a2555f714..42540316d 100644 --- a/common/net/minecraftforge/event/world/ChunkEvent.java +++ b/common/net/minecraftforge/event/world/ChunkEvent.java @@ -1,8 +1,8 @@ package net.minecraftforge.event.world; -import net.minecraft.src.Chunk; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.World; +import net.minecraft.world.chunk.Chunk; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.world.World; public class ChunkEvent extends WorldEvent { diff --git a/common/net/minecraftforge/event/world/ChunkWatchEvent.java b/common/net/minecraftforge/event/world/ChunkWatchEvent.java index a64987550..f912975f5 100644 --- a/common/net/minecraftforge/event/world/ChunkWatchEvent.java +++ b/common/net/minecraftforge/event/world/ChunkWatchEvent.java @@ -1,9 +1,9 @@ package net.minecraftforge.event.world; -import net.minecraft.src.ChunkCoordIntPair; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.PlayerInstance; -import net.minecraft.src.WorldServer; +import net.minecraft.world.ChunkCoordIntPair; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.server.management.PlayerInstance; +import net.minecraft.world.WorldServer; import net.minecraftforge.event.Event; public class ChunkWatchEvent extends Event diff --git a/common/net/minecraftforge/event/world/WorldEvent.java b/common/net/minecraftforge/event/world/WorldEvent.java index 161be594d..4e1565128 100644 --- a/common/net/minecraftforge/event/world/WorldEvent.java +++ b/common/net/minecraftforge/event/world/WorldEvent.java @@ -1,6 +1,6 @@ package net.minecraftforge.event.world; -import net.minecraft.src.World; +import net.minecraft.world.World; import net.minecraftforge.event.Event; public class WorldEvent extends Event diff --git a/common/net/minecraftforge/liquids/IBlockLiquid.java b/common/net/minecraftforge/liquids/IBlockLiquid.java index d57a1944b..3bc6631ed 100644 --- a/common/net/minecraftforge/liquids/IBlockLiquid.java +++ b/common/net/minecraftforge/liquids/IBlockLiquid.java @@ -1,6 +1,6 @@ package net.minecraftforge.liquids; -import net.minecraft.src.NBTTagCompound; +import net.minecraft.nbt.NBTTagCompound; /** * Implementors of this interface are a liquid which may receive a block implementation and can be placed in the world. diff --git a/common/net/minecraftforge/liquids/LiquidContainerData.java b/common/net/minecraftforge/liquids/LiquidContainerData.java index 643595107..8e99a8d76 100644 --- a/common/net/minecraftforge/liquids/LiquidContainerData.java +++ b/common/net/minecraftforge/liquids/LiquidContainerData.java @@ -9,8 +9,8 @@ package net.minecraftforge.liquids; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class LiquidContainerData { diff --git a/common/net/minecraftforge/liquids/LiquidContainerRegistry.java b/common/net/minecraftforge/liquids/LiquidContainerRegistry.java index f46c38ede..06e953484 100644 --- a/common/net/minecraftforge/liquids/LiquidContainerRegistry.java +++ b/common/net/minecraftforge/liquids/LiquidContainerRegistry.java @@ -9,9 +9,9 @@ import java.util.List; import java.util.Map; import java.util.Set; -import net.minecraft.src.Block; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; public class LiquidContainerRegistry { diff --git a/common/net/minecraftforge/liquids/LiquidDictionary.java b/common/net/minecraftforge/liquids/LiquidDictionary.java index 880899a62..d81d12bb0 100644 --- a/common/net/minecraftforge/liquids/LiquidDictionary.java +++ b/common/net/minecraftforge/liquids/LiquidDictionary.java @@ -3,7 +3,7 @@ package net.minecraftforge.liquids; import java.util.HashMap; import java.util.Map; -import net.minecraft.src.ItemStack; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; diff --git a/common/net/minecraftforge/liquids/LiquidEvent.java b/common/net/minecraftforge/liquids/LiquidEvent.java index cb517d4a4..5501b75ba 100644 --- a/common/net/minecraftforge/liquids/LiquidEvent.java +++ b/common/net/minecraftforge/liquids/LiquidEvent.java @@ -1,7 +1,7 @@ package net.minecraftforge.liquids; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.event.Event; diff --git a/common/net/minecraftforge/liquids/LiquidStack.java b/common/net/minecraftforge/liquids/LiquidStack.java index 08a02c492..d41bccb42 100644 --- a/common/net/minecraftforge/liquids/LiquidStack.java +++ b/common/net/minecraftforge/liquids/LiquidStack.java @@ -1,9 +1,9 @@ package net.minecraftforge.liquids; -import net.minecraft.src.Block; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.NBTTagCompound; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; /** * ItemStack substitute for liquids diff --git a/common/net/minecraftforge/liquids/LiquidTank.java b/common/net/minecraftforge/liquids/LiquidTank.java index fe624f716..727763dd6 100644 --- a/common/net/minecraftforge/liquids/LiquidTank.java +++ b/common/net/minecraftforge/liquids/LiquidTank.java @@ -1,6 +1,6 @@ package net.minecraftforge.liquids; -import net.minecraft.src.TileEntity; +import net.minecraft.tileentity.TileEntity; /** * Reference implementation of ILiquidTank. Use this or implement your own. diff --git a/common/net/minecraftforge/oredict/ShapedOreRecipe.java b/common/net/minecraftforge/oredict/ShapedOreRecipe.java index 3a85fcb18..0dde66e5b 100644 --- a/common/net/minecraftforge/oredict/ShapedOreRecipe.java +++ b/common/net/minecraftforge/oredict/ShapedOreRecipe.java @@ -5,13 +5,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.src.Block; -import net.minecraft.src.IRecipe; -import net.minecraft.src.InventoryCrafting; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.ShapedRecipes; -import net.minecraft.src.World; +import net.minecraft.block.Block; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ShapedRecipes; +import net.minecraft.world.World; public class ShapedOreRecipe implements IRecipe { diff --git a/common/net/minecraftforge/oredict/ShapelessOreRecipe.java b/common/net/minecraftforge/oredict/ShapelessOreRecipe.java index e35e1729d..db3e605f0 100644 --- a/common/net/minecraftforge/oredict/ShapelessOreRecipe.java +++ b/common/net/minecraftforge/oredict/ShapelessOreRecipe.java @@ -6,14 +6,14 @@ import java.util.Map; import java.util.Map.Entry; import java.util.List; -import net.minecraft.src.Block; -import net.minecraft.src.CraftingManager; -import net.minecraft.src.IRecipe; -import net.minecraft.src.InventoryCrafting; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.ShapelessRecipes; -import net.minecraft.src.World; +import net.minecraft.block.Block; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.inventory.InventoryCrafting; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.ShapelessRecipes; +import net.minecraft.world.World; public class ShapelessOreRecipe implements IRecipe {