diff --git a/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java b/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java index 4daaeacb13..59bfdb78bb 100644 --- a/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java +++ b/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java @@ -1,10 +1,10 @@ package cpw.mods.fml.client; +import net.minecraft.client.gui.FontRenderer; +import net.minecraft.client.gui.GuiErrorScreen; import cpw.mods.fml.common.IFMLHandledException; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import net.minecraft.client.FontRenderer; -import net.minecraft.client.GuiErrorScreen; /** * If a mod throws this exception during loading, it will be called back to render diff --git a/client/cpw/mods/fml/client/FMLClientHandler.java b/client/cpw/mods/fml/client/FMLClientHandler.java index c554d74741..5b747a3b5a 100644 --- a/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/client/cpw/mods/fml/client/FMLClientHandler.java @@ -21,20 +21,22 @@ import java.util.logging.Level; import java.util.logging.Logger; import net.minecraft.client.Minecraft; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.multiplayer.GuiConnecting; +import net.minecraft.client.multiplayer.NetClientHandler; +import net.minecraft.client.multiplayer.WorldClient; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.crash.CrashReport; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet131MapData; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.CrashReport; -import net.minecraft.shared.Entity; -import net.minecraft.shared.EntityLiving; -import net.minecraft.shared.EntityPlayer; -import net.minecraft.client.GuiScreen; -import net.minecraft.client.NetClientHandler; -import net.minecraft.shared.NetHandler; -import net.minecraft.shared.Packet; -import net.minecraft.shared.Packet131MapData; -import net.minecraft.client.Render; -import net.minecraft.client.RenderManager; -import net.minecraft.shared.World; -import net.minecraft.client.WorldClient; +import net.minecraft.world.World; import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; diff --git a/client/cpw/mods/fml/client/FMLTextureFX.java b/client/cpw/mods/fml/client/FMLTextureFX.java index 83dbbe1c00..d31ee54fa0 100644 --- a/client/cpw/mods/fml/client/FMLTextureFX.java +++ b/client/cpw/mods/fml/client/FMLTextureFX.java @@ -18,9 +18,10 @@ import java.awt.Dimension; import java.util.List; import java.util.logging.Logger; -import net.minecraft.client.RenderEngine; -import net.minecraft.client.TextureFX; -import net.minecraft.client.ITexturePack; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.texturefx.TextureFX; +import net.minecraft.client.texturepacks.ITexturePack; + import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java index 273eef8387..9893ad6ddb 100644 --- a/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java @@ -1,8 +1,8 @@ package cpw.mods.fml.client; +import net.minecraft.client.gui.GuiErrorScreen; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.WrongMinecraftVersionException; -import net.minecraft.client.GuiErrorScreen; public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen { diff --git a/client/cpw/mods/fml/client/GuiDupesFound.java b/client/cpw/mods/fml/client/GuiDupesFound.java index 4c4ac17814..9cc3ab4edc 100644 --- a/client/cpw/mods/fml/client/GuiDupesFound.java +++ b/client/cpw/mods/fml/client/GuiDupesFound.java @@ -3,11 +3,12 @@ package cpw.mods.fml.client; import java.io.File; import java.util.Map.Entry; +import net.minecraft.client.gui.GuiErrorScreen; + import cpw.mods.fml.common.DuplicateModsFoundException; import cpw.mods.fml.common.MissingModsException; import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.client.GuiErrorScreen; public class GuiDupesFound extends GuiErrorScreen { diff --git a/client/cpw/mods/fml/client/GuiIdMismatchScreen.java b/client/cpw/mods/fml/client/GuiIdMismatchScreen.java index 7ecb8b90c3..e4a3fcbe29 100644 --- a/client/cpw/mods/fml/client/GuiIdMismatchScreen.java +++ b/client/cpw/mods/fml/client/GuiIdMismatchScreen.java @@ -3,15 +3,16 @@ package cpw.mods.fml.client; import java.util.List; import java.util.Map.Entry; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiYesNo; +import net.minecraft.util.StringTranslate; + import com.google.common.collect.Lists; import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference.ValueDifference; import cpw.mods.fml.common.registry.ItemData; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.src.GuiButton; -import net.minecraft.src.GuiYesNo; -import net.minecraft.src.StringTranslate; public class GuiIdMismatchScreen extends GuiYesNo { private List missingIds = Lists.newArrayList(); diff --git a/client/cpw/mods/fml/client/GuiModList.java b/client/cpw/mods/fml/client/GuiModList.java index a3d35ffa03..8e0ee720bc 100644 --- a/client/cpw/mods/fml/client/GuiModList.java +++ b/client/cpw/mods/fml/client/GuiModList.java @@ -18,12 +18,12 @@ import java.awt.Dimension; import java.util.ArrayList; import net.minecraft.client.Minecraft; -import net.minecraft.client.FontRenderer; -import net.minecraft.client.GuiButton; -import net.minecraft.client.GuiScreen; -import net.minecraft.client.GuiSmallButton; -import net.minecraft.shared.StringTranslate; -import net.minecraft.client.Tessellator; +import net.minecraft.client.gui.FontRenderer; +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.util.StringTranslate; import org.lwjgl.opengl.GL11; diff --git a/client/cpw/mods/fml/client/GuiModsMissing.java b/client/cpw/mods/fml/client/GuiModsMissing.java index c3d5efabe1..0670e94639 100644 --- a/client/cpw/mods/fml/client/GuiModsMissing.java +++ b/client/cpw/mods/fml/client/GuiModsMissing.java @@ -1,8 +1,8 @@ package cpw.mods.fml.client; +import net.minecraft.client.gui.GuiErrorScreen; import cpw.mods.fml.common.MissingModsException; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.client.GuiErrorScreen; public class GuiModsMissing extends GuiErrorScreen { diff --git a/client/cpw/mods/fml/client/GuiModsMissingForServer.java b/client/cpw/mods/fml/client/GuiModsMissingForServer.java index 55f037140e..f7ef9662e0 100644 --- a/client/cpw/mods/fml/client/GuiModsMissingForServer.java +++ b/client/cpw/mods/fml/client/GuiModsMissingForServer.java @@ -1,9 +1,9 @@ package cpw.mods.fml.client; -import net.minecraft.client.GuiButton; -import net.minecraft.client.GuiScreen; -import net.minecraft.client.GuiSmallButton; -import net.minecraft.shared.StringTranslate; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.gui.GuiSmallButton; +import net.minecraft.util.StringTranslate; import cpw.mods.fml.common.network.ModMissingPacket; import cpw.mods.fml.common.versioning.ArtifactVersion; diff --git a/client/cpw/mods/fml/client/GuiScrollingList.java b/client/cpw/mods/fml/client/GuiScrollingList.java index f74eefa9fa..f45b276c3c 100644 --- a/client/cpw/mods/fml/client/GuiScrollingList.java +++ b/client/cpw/mods/fml/client/GuiScrollingList.java @@ -3,8 +3,8 @@ package cpw.mods.fml.client; import java.util.List; import net.minecraft.client.Minecraft; -import net.minecraft.client.GuiButton; -import net.minecraft.client.Tessellator; +import net.minecraft.client.gui.GuiButton; +import net.minecraft.client.renderer.Tessellator; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/client/cpw/mods/fml/client/GuiSlotModList.java b/client/cpw/mods/fml/client/GuiSlotModList.java index 9b6cdd9987..42afe1c05b 100644 --- a/client/cpw/mods/fml/client/GuiSlotModList.java +++ b/client/cpw/mods/fml/client/GuiSlotModList.java @@ -16,7 +16,8 @@ package cpw.mods.fml.client; import java.util.ArrayList; -import net.minecraft.client.Tessellator; +import net.minecraft.client.renderer.Tessellator; + import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.ModContainer; diff --git a/client/cpw/mods/fml/client/GuiWrongMinecraft.java b/client/cpw/mods/fml/client/GuiWrongMinecraft.java index 478c03b4db..986729f425 100644 --- a/client/cpw/mods/fml/client/GuiWrongMinecraft.java +++ b/client/cpw/mods/fml/client/GuiWrongMinecraft.java @@ -1,10 +1,9 @@ package cpw.mods.fml.client; +import net.minecraft.client.gui.GuiErrorScreen; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.WrongMinecraftVersionException; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.client.GuiErrorScreen; -import net.minecraft.client.GuiScreen; public class GuiWrongMinecraft extends GuiErrorScreen { diff --git a/client/cpw/mods/fml/client/ITextureFX.java b/client/cpw/mods/fml/client/ITextureFX.java index fa1db59f39..0dca2852eb 100644 --- a/client/cpw/mods/fml/client/ITextureFX.java +++ b/client/cpw/mods/fml/client/ITextureFX.java @@ -16,8 +16,8 @@ package cpw.mods.fml.client; import java.awt.Dimension; -import net.minecraft.client.RenderEngine; -import net.minecraft.client.ITexturePack; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.texturepacks.ITexturePack; public interface ITextureFX { diff --git a/client/cpw/mods/fml/client/OverrideInfo.java b/client/cpw/mods/fml/client/OverrideInfo.java index 4deb073bc3..f0d6fe2a1a 100644 --- a/client/cpw/mods/fml/client/OverrideInfo.java +++ b/client/cpw/mods/fml/client/OverrideInfo.java @@ -14,7 +14,7 @@ package cpw.mods.fml.client; -import net.minecraft.client.TextureFX; +import net.minecraft.client.renderer.texturefx.TextureFX; class OverrideInfo { diff --git a/client/cpw/mods/fml/client/TextureFXManager.java b/client/cpw/mods/fml/client/TextureFXManager.java index b3fa38ebc0..d041348aee 100644 --- a/client/cpw/mods/fml/client/TextureFXManager.java +++ b/client/cpw/mods/fml/client/TextureFXManager.java @@ -19,10 +19,10 @@ import java.util.Map; import javax.imageio.ImageIO; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.texturefx.TextureFX; +import net.minecraft.client.texturepacks.ITexturePack; import net.minecraft.src.ModTextureStatic; -import net.minecraft.client.RenderEngine; -import net.minecraft.client.TextureFX; -import net.minecraft.client.ITexturePack; import org.lwjgl.opengl.GL11; diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java b/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java index d392f08d60..83313a4571 100644 --- a/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java +++ b/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java @@ -14,10 +14,10 @@ package cpw.mods.fml.client.modloader; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.src.BaseMod; -import net.minecraft.shared.Block; -import net.minecraft.shared.IBlockAccess; -import net.minecraft.client.RenderBlocks; +import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** diff --git a/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java index b2fa229ec0..134eb3d027 100644 --- a/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java +++ b/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java @@ -7,9 +7,17 @@ import java.util.Map.Entry; import java.util.logging.Level; import net.minecraft.client.Minecraft; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.src.BaseMod; import net.minecraft.client.*; -import net.minecraft.shared.*; +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.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; import com.google.common.base.Equivalences; import com.google.common.base.Supplier; diff --git a/client/cpw/mods/fml/client/registry/ClientRegistry.java b/client/cpw/mods/fml/client/registry/ClientRegistry.java index b1ba94e6f2..3ac6153bd3 100644 --- a/client/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/client/cpw/mods/fml/client/registry/ClientRegistry.java @@ -1,9 +1,9 @@ package cpw.mods.fml.client.registry; -import net.minecraft.shared.TileEntity; -import net.minecraft.client.TileEntityRenderer; -import net.minecraft.client.TileEntitySpecialRenderer; import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.client.renderer.tileentity.TileEntityRenderer; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.tileentity.TileEntity; public class ClientRegistry { diff --git a/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java b/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java index 37b7fcc1e1..d8e76d21f5 100644 --- a/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java +++ b/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java @@ -1,8 +1,8 @@ package cpw.mods.fml.client.registry; -import net.minecraft.shared.Block; -import net.minecraft.shared.IBlockAccess; -import net.minecraft.client.RenderBlocks; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.world.IBlockAccess; public interface ISimpleBlockRenderingHandler { diff --git a/client/cpw/mods/fml/client/registry/RenderingRegistry.java b/client/cpw/mods/fml/client/registry/RenderingRegistry.java index 9438b71f77..240aa47705 100644 --- a/client/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/client/cpw/mods/fml/client/registry/RenderingRegistry.java @@ -3,8 +3,11 @@ package cpw.mods.fml.client.registry; import java.util.List; import java.util.Map; -import net.minecraft.shared.*; -import net.minecraft.client.*; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.*; +import net.minecraft.entity.Entity; +import net.minecraft.world.IBlockAccess; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/client/net/minecraft/src/BaseMod.java b/client/net/minecraft/src/BaseMod.java index e24c4e4ad8..aec07dad13 100644 --- a/client/net/minecraft/src/BaseMod.java +++ b/client/net/minecraft/src/BaseMod.java @@ -17,9 +17,25 @@ import static cpw.mods.fml.common.Side.CLIENT; import java.util.Map; import java.util.Random; +import net.minecraft.block.Block; import net.minecraft.client.*; +import net.minecraft.client.entity.EntityClientPlayerMP; +import net.minecraft.client.gui.GuiScreen; +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.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetServerHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.TickType; diff --git a/client/net/minecraft/src/EntityRendererProxy.java b/client/net/minecraft/src/EntityRendererProxy.java index b03c374510..60532f9ab8 100644 --- a/client/net/minecraft/src/EntityRendererProxy.java +++ b/client/net/minecraft/src/EntityRendererProxy.java @@ -14,8 +14,8 @@ package net.minecraft.src; -import net.minecraft.client.EntityRenderer; import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.EntityRenderer; public class EntityRendererProxy extends EntityRenderer { diff --git a/client/net/minecraft/src/FMLRenderAccessLibrary.java b/client/net/minecraft/src/FMLRenderAccessLibrary.java index 3508133392..2032e8aed3 100644 --- a/client/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/client/net/minecraft/src/FMLRenderAccessLibrary.java @@ -19,12 +19,12 @@ import java.util.List; import java.util.logging.Level; import java.util.logging.Logger; -import net.minecraft.client.ITexturePack; -import net.minecraft.client.RenderBlocks; -import net.minecraft.client.RenderEngine; -import net.minecraft.client.TextureFX; -import net.minecraft.shared.Block; -import net.minecraft.shared.IBlockAccess; +import net.minecraft.block.Block; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.RenderEngine; +import net.minecraft.client.renderer.texturefx.TextureFX; +import net.minecraft.client.texturepacks.ITexturePack; +import net.minecraft.world.IBlockAccess; import cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.registry.RenderingRegistry; diff --git a/client/net/minecraft/src/ModLoader.java b/client/net/minecraft/src/ModLoader.java index 712dd45af9..0f1bfe4dd0 100644 --- a/client/net/minecraft/src/ModLoader.java +++ b/client/net/minecraft/src/ModLoader.java @@ -20,9 +20,40 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; +import net.minecraft.block.Block; +import net.minecraft.block.BlockDispenser; import net.minecraft.client.*; +import net.minecraft.client.gui.GuiScreen; +import net.minecraft.client.multiplayer.NetClientHandler; +import net.minecraft.client.renderer.RenderBlocks; +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.command.ICommand; +import net.minecraft.dispenser.IBehaviorDispenseItem; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.network.NetServerHandler; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet1Login; +import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.server.*; -import net.minecraft.shared.*; +import net.minecraft.stats.Achievement; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.IBlockAccess; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.IChunkProvider; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; diff --git a/client/net/minecraft/src/ModTextureAnimation.java b/client/net/minecraft/src/ModTextureAnimation.java index 34e46baae6..8b6b870a63 100644 --- a/client/net/minecraft/src/ModTextureAnimation.java +++ b/client/net/minecraft/src/ModTextureAnimation.java @@ -18,7 +18,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; -import net.minecraft.client.RenderEngine; +import net.minecraft.client.renderer.RenderEngine; import org.lwjgl.opengl.GL11; diff --git a/client/net/minecraft/src/ModTextureStatic.java b/client/net/minecraft/src/ModTextureStatic.java index d4fcccd30a..77d033ba11 100644 --- a/client/net/minecraft/src/ModTextureStatic.java +++ b/client/net/minecraft/src/ModTextureStatic.java @@ -20,7 +20,7 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; -import net.minecraft.client.RenderEngine; +import net.minecraft.client.renderer.RenderEngine; import org.lwjgl.opengl.GL11; diff --git a/common/cpw/mods/fml/common/FMLCommonHandler.java b/common/cpw/mods/fml/common/FMLCommonHandler.java index 046c71498b..05bb77cd89 100644 --- a/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -20,8 +20,21 @@ import java.util.Properties; import java.util.Set; import java.util.logging.Logger; -import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; +import net.minecraft.crash.CrashReport; +import net.minecraft.crash.CrashReportCategory; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.nbt.NBTBase; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet131MapData; +import net.minecraft.server.*; +import net.minecraft.server.dedicated.DedicatedServer; +import net.minecraft.world.World; +import net.minecraft.world.storage.SaveHandler; +import net.minecraft.world.storage.WorldInfo; import com.google.common.base.Objects; import com.google.common.base.Strings; diff --git a/common/cpw/mods/fml/common/FMLDummyContainer.java b/common/cpw/mods/fml/common/FMLDummyContainer.java index c9fb528309..5ae51ebf5e 100644 --- a/common/cpw/mods/fml/common/FMLDummyContainer.java +++ b/common/cpw/mods/fml/common/FMLDummyContainer.java @@ -19,7 +19,9 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import net.minecraft.shared.*; +import net.minecraft.nbt.*; +import net.minecraft.world.storage.SaveHandler; +import net.minecraft.world.storage.WorldInfo; import com.google.common.collect.MapMaker; import com.google.common.collect.Sets; diff --git a/common/cpw/mods/fml/common/ICraftingHandler.java b/common/cpw/mods/fml/common/ICraftingHandler.java index fdd81f8f8c..03df7cc282 100644 --- a/common/cpw/mods/fml/common/ICraftingHandler.java +++ b/common/cpw/mods/fml/common/ICraftingHandler.java @@ -13,7 +13,9 @@ */ package cpw.mods.fml.common; -import net.minecraft.shared.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; /** * Return a crafting handler for the mod container to call diff --git a/common/cpw/mods/fml/common/IDispenseHandler.java b/common/cpw/mods/fml/common/IDispenseHandler.java index ee74580274..7794882292 100644 --- a/common/cpw/mods/fml/common/IDispenseHandler.java +++ b/common/cpw/mods/fml/common/IDispenseHandler.java @@ -14,7 +14,8 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.shared.*; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; /** diff --git a/common/cpw/mods/fml/common/IDispenserHandler.java b/common/cpw/mods/fml/common/IDispenserHandler.java index bcaafcaf12..acbb407cf6 100644 --- a/common/cpw/mods/fml/common/IDispenserHandler.java +++ b/common/cpw/mods/fml/common/IDispenserHandler.java @@ -2,7 +2,8 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.shared.*; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; /** * diff --git a/common/cpw/mods/fml/common/IFMLSidedHandler.java b/common/cpw/mods/fml/common/IFMLSidedHandler.java index 9036c755f8..1ccc0984c8 100644 --- a/common/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/common/cpw/mods/fml/common/IFMLSidedHandler.java @@ -4,8 +4,12 @@ import java.util.List; import com.google.common.collect.MapDifference; +import net.minecraft.entity.Entity; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet131MapData; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.network.ModMissingPacket; diff --git a/common/cpw/mods/fml/common/IFuelHandler.java b/common/cpw/mods/fml/common/IFuelHandler.java index eb83075ee4..67e8a7f87d 100644 --- a/common/cpw/mods/fml/common/IFuelHandler.java +++ b/common/cpw/mods/fml/common/IFuelHandler.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common; -import net.minecraft.shared.ItemStack; +import net.minecraft.item.ItemStack; public interface IFuelHandler { diff --git a/common/cpw/mods/fml/common/IPickupNotifier.java b/common/cpw/mods/fml/common/IPickupNotifier.java index 51f88fbcaa..ad4221bd53 100644 --- a/common/cpw/mods/fml/common/IPickupNotifier.java +++ b/common/cpw/mods/fml/common/IPickupNotifier.java @@ -13,8 +13,8 @@ */ package cpw.mods.fml.common; -import net.minecraft.shared.EntityItem; -import net.minecraft.shared.EntityPlayer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; public interface IPickupNotifier { diff --git a/common/cpw/mods/fml/common/IPlayerTracker.java b/common/cpw/mods/fml/common/IPlayerTracker.java index 9a0fe15199..d38020788c 100644 --- a/common/cpw/mods/fml/common/IPlayerTracker.java +++ b/common/cpw/mods/fml/common/IPlayerTracker.java @@ -14,7 +14,7 @@ package cpw.mods.fml.common; -import net.minecraft.shared.EntityPlayer; +import net.minecraft.entity.player.EntityPlayer; /** * @author cpw diff --git a/common/cpw/mods/fml/common/IWorldGenerator.java b/common/cpw/mods/fml/common/IWorldGenerator.java index 65adb66841..1520e550b6 100644 --- a/common/cpw/mods/fml/common/IWorldGenerator.java +++ b/common/cpw/mods/fml/common/IWorldGenerator.java @@ -15,8 +15,9 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.shared.IChunkProvider; -import net.minecraft.shared.World; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; + /** * This is called back during world generation. diff --git a/common/cpw/mods/fml/common/Loader.java b/common/cpw/mods/fml/common/Loader.java index c5d91b17c7..115c88c4fb 100644 --- a/common/cpw/mods/fml/common/Loader.java +++ b/common/cpw/mods/fml/common/Loader.java @@ -26,7 +26,7 @@ import java.util.Set; import java.util.concurrent.Callable; import java.util.logging.Level; -import net.minecraft.shared.CallableMinecraftVersion; +import net.minecraft.crash.CallableMinecraftVersion; import com.google.common.base.CharMatcher; import com.google.common.base.Function; diff --git a/common/cpw/mods/fml/common/Mod.java b/common/cpw/mods/fml/common/Mod.java index b37e802b6d..9cf63fa0f1 100644 --- a/common/cpw/mods/fml/common/Mod.java +++ b/common/cpw/mods/fml/common/Mod.java @@ -18,11 +18,11 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; +import net.minecraft.item.ItemBlock; + import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraft.shared.ItemBlock; - /** * The new mod style in FML 1.3 * diff --git a/common/cpw/mods/fml/common/WorldAccessContainer.java b/common/cpw/mods/fml/common/WorldAccessContainer.java index 6f5fcb99fe..b2b81e1bee 100644 --- a/common/cpw/mods/fml/common/WorldAccessContainer.java +++ b/common/cpw/mods/fml/common/WorldAccessContainer.java @@ -2,7 +2,9 @@ package cpw.mods.fml.common; import java.util.Map; -import net.minecraft.shared.*; +import net.minecraft.nbt.*; +import net.minecraft.world.storage.*; + public interface WorldAccessContainer { diff --git a/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java b/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java index df763a8a88..5e98bc62c7 100644 --- a/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java +++ b/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java @@ -1,8 +1,8 @@ package cpw.mods.fml.common.event; +import net.minecraft.command.CommandHandler; +import net.minecraft.command.ICommand; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.CommandHandler; -import net.minecraft.shared.ICommand; import cpw.mods.fml.common.LoaderState.ModState; public class FMLServerStartingEvent extends FMLStateEvent diff --git a/common/cpw/mods/fml/common/modloader/BaseModProxy.java b/common/cpw/mods/fml/common/modloader/BaseModProxy.java index 2cca5ad708..ae3485244d 100644 --- a/common/cpw/mods/fml/common/modloader/BaseModProxy.java +++ b/common/cpw/mods/fml/common/modloader/BaseModProxy.java @@ -16,8 +16,15 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.shared.*; -import net.minecraft.client.WorldClient; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetServerHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet250CustomPayload; +import net.minecraft.world.World; + import cpw.mods.fml.common.Side; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.asm.SideOnly; diff --git a/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java b/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java index 2234635d05..06dcc6ed46 100644 --- a/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java +++ b/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java @@ -1,8 +1,12 @@ package cpw.mods.fml.common.modloader; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet250CustomPayload; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import net.minecraft.shared.*; public interface IModLoaderSidedHelper { diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java b/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java index 51a7b4ec0e..8fa71e30db 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java @@ -1,6 +1,7 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.*; +import net.minecraft.network.NetServerHandler; +import net.minecraft.network.packet.*; import cpw.mods.fml.common.network.IChatListener; public class ModLoaderChatListener implements IChatListener diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java b/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java index 477402d18a..ba62fa3477 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java @@ -1,7 +1,11 @@ package cpw.mods.fml.common.modloader; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetLoginHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet1Login; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.Player; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java index 1e5be7350c..e484667114 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java @@ -1,6 +1,8 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.ICraftingHandler; public class ModLoaderCraftingHelper implements ICraftingHandler diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java index 00dc9ce4e8..19e1a23663 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java @@ -2,7 +2,9 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.shared.*; +import net.minecraft.item.ItemStack; +import net.minecraft.world.World; + import cpw.mods.fml.common.IDispenseHandler; import cpw.mods.fml.common.IDispenserHandler; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java b/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java index f4b0c0978b..940d9ab3dc 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java @@ -2,14 +2,14 @@ package cpw.mods.fml.common.modloader; import java.util.concurrent.Callable; +import net.minecraft.entity.Entity; + import com.google.common.base.Function; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import net.minecraft.shared.Entity; - public class ModLoaderEntitySpawnCallback implements Function { diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java index ebe45c5986..df911f334a 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.ItemStack; +import net.minecraft.item.ItemStack; import cpw.mods.fml.common.IFuelHandler; public class ModLoaderFuelHelper implements IFuelHandler diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java index b8d96e598b..ce49493f08 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java @@ -1,6 +1,8 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.world.World; import cpw.mods.fml.common.network.IGuiHandler; public class ModLoaderGuiHelper implements IGuiHandler diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java index 6cb4a0aa83..0905b3d0e9 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java @@ -23,8 +23,13 @@ import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ListMultimap; 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.boss.EntityDragon; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.Container; import net.minecraft.src.BaseMod; -import net.minecraft.shared.*; import net.minecraft.src.TradeEntry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java index d3f9ba63ae..dfeddaede9 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java @@ -28,7 +28,7 @@ import java.util.Properties; import java.util.Set; import java.util.logging.Level; -import net.minecraft.shared.ICommand; +import net.minecraft.command.ICommand; import com.google.common.base.Strings; import com.google.common.base.Throwables; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java b/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java index 4819aba792..3fa16b3f03 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java @@ -1,6 +1,8 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.*; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java b/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java index 6201271df0..e86d3d85dc 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java @@ -1,6 +1,7 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.shared.*; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; import cpw.mods.fml.common.IPickupNotifier; public class ModLoaderPickupNotifier implements IPickupNotifier diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java b/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java index f121a630c2..9d3eed4ef5 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java @@ -5,8 +5,10 @@ import java.util.Random; import com.google.common.collect.Lists; -import net.minecraft.shared.*; +import net.minecraft.entity.EntityVillager; +import net.minecraft.item.Item; import net.minecraft.src.TradeEntry; +import net.minecraft.village.MerchantRecipeList; import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; diff --git a/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java b/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java index 2a80a2359b..b8e6bba94d 100644 --- a/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java +++ b/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java @@ -2,7 +2,11 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.shared.*; +import net.minecraft.world.World; +import net.minecraft.world.chunk.IChunkProvider; +import net.minecraft.world.gen.ChunkProviderGenerate; +import net.minecraft.world.gen.ChunkProviderHell; + import cpw.mods.fml.common.IWorldGenerator; public class ModLoaderWorldGenerator implements IWorldGenerator diff --git a/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java b/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java index 3e86592f4c..166eaf1c73 100644 --- a/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java +++ b/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java @@ -1,6 +1,7 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/common/cpw/mods/fml/common/network/EntitySpawnPacket.java index 1bc908f172..ddd68b78ef 100644 --- a/common/cpw/mods/fml/common/network/EntitySpawnPacket.java +++ b/common/cpw/mods/fml/common/network/EntitySpawnPacket.java @@ -8,7 +8,10 @@ import java.io.IOException; import java.util.List; import java.util.logging.Level; -import net.minecraft.shared.*; +import net.minecraft.entity.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.util.MathHelper; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index f25cefac8d..7877306a03 100644 --- a/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/common/cpw/mods/fml/common/network/FMLNetworkHandler.java @@ -11,8 +11,17 @@ import java.util.List; import java.util.Map; import java.util.Set; +import net.minecraft.entity.Entity; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.Item; +import net.minecraft.network.*; +import net.minecraft.network.packet.*; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; +import net.minecraft.server.management.ServerConfigurationManager; +import net.minecraft.world.EnumGameType; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/common/cpw/mods/fml/common/network/FMLPacket.java b/common/cpw/mods/fml/common/network/FMLPacket.java index ba40c3d477..f1207fd1a3 100644 --- a/common/cpw/mods/fml/common/network/FMLPacket.java +++ b/common/cpw/mods/fml/common/network/FMLPacket.java @@ -4,7 +4,8 @@ import java.util.Arrays; import java.util.concurrent.ConcurrentMap; import java.util.logging.Level; -import net.minecraft.shared.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; import com.google.common.base.Throwables; import com.google.common.collect.MapMaker; diff --git a/common/cpw/mods/fml/common/network/IChatListener.java b/common/cpw/mods/fml/common/network/IChatListener.java index 23e1ea4664..6ae4bbe518 100644 --- a/common/cpw/mods/fml/common/network/IChatListener.java +++ b/common/cpw/mods/fml/common/network/IChatListener.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.*; +import net.minecraft.network.packet.*; public interface IChatListener { diff --git a/common/cpw/mods/fml/common/network/IConnectionHandler.java b/common/cpw/mods/fml/common/network/IConnectionHandler.java index 927169f861..8eae0f1a58 100644 --- a/common/cpw/mods/fml/common/network/IConnectionHandler.java +++ b/common/cpw/mods/fml/common/network/IConnectionHandler.java @@ -1,7 +1,10 @@ package cpw.mods.fml.common.network; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.NetLoginHandler; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet1Login; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.*; public interface IConnectionHandler { diff --git a/common/cpw/mods/fml/common/network/IGuiHandler.java b/common/cpw/mods/fml/common/network/IGuiHandler.java index 73c1eecd8c..2b4ae19c61 100644 --- a/common/cpw/mods/fml/common/network/IGuiHandler.java +++ b/common/cpw/mods/fml/common/network/IGuiHandler.java @@ -1,6 +1,7 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.*; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.world.World; public interface IGuiHandler { diff --git a/common/cpw/mods/fml/common/network/IPacketHandler.java b/common/cpw/mods/fml/common/network/IPacketHandler.java index 489829cf22..fc6b61b659 100644 --- a/common/cpw/mods/fml/common/network/IPacketHandler.java +++ b/common/cpw/mods/fml/common/network/IPacketHandler.java @@ -1,6 +1,7 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.Packet250CustomPayload; public interface IPacketHandler { diff --git a/common/cpw/mods/fml/common/network/ITinyPacketHandler.java b/common/cpw/mods/fml/common/network/ITinyPacketHandler.java index a2f0b03ebf..851d7dd021 100644 --- a/common/cpw/mods/fml/common/network/ITinyPacketHandler.java +++ b/common/cpw/mods/fml/common/network/ITinyPacketHandler.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.*; +import net.minecraft.network.packet.*; public interface ITinyPacketHandler { diff --git a/common/cpw/mods/fml/common/network/ModIdMapPacket.java b/common/cpw/mods/fml/common/network/ModIdMapPacket.java index 566339723d..04f0ac8d78 100644 --- a/common/cpw/mods/fml/common/network/ModIdMapPacket.java +++ b/common/cpw/mods/fml/common/network/ModIdMapPacket.java @@ -5,6 +5,10 @@ import java.util.BitSet; import java.util.Set; import java.util.logging.Level; +import net.minecraft.nbt.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; + import com.google.common.collect.MapDifference; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteStreams; @@ -17,12 +21,6 @@ import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.ItemData; -import net.minecraft.src.CompressedStreamTools; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.NetHandler; -import net.minecraft.src.WorldClient; import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDMAP; public class ModIdMapPacket extends FMLPacket { diff --git a/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java b/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java index 9d3cfbe92b..be2e03ee0f 100644 --- a/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java +++ b/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java @@ -6,7 +6,8 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.shared.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; import com.google.common.collect.Maps; import com.google.common.io.ByteArrayDataInput; diff --git a/common/cpw/mods/fml/common/network/ModListRequestPacket.java b/common/cpw/mods/fml/common/network/ModListRequestPacket.java index 1287a1546f..7a2d733228 100644 --- a/common/cpw/mods/fml/common/network/ModListRequestPacket.java +++ b/common/cpw/mods/fml/common/network/ModListRequestPacket.java @@ -8,7 +8,8 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.minecraft.shared.*; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/common/cpw/mods/fml/common/network/ModListResponsePacket.java b/common/cpw/mods/fml/common/network/ModListResponsePacket.java index 86151052af..a81bb5d178 100644 --- a/common/cpw/mods/fml/common/network/ModListResponsePacket.java +++ b/common/cpw/mods/fml/common/network/ModListResponsePacket.java @@ -10,7 +10,9 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Logger; -import net.minecraft.shared.*; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.*; +import net.minecraft.network.packet.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/common/cpw/mods/fml/common/network/ModMissingPacket.java b/common/cpw/mods/fml/common/network/ModMissingPacket.java index 20b066a344..4f5b50eacf 100644 --- a/common/cpw/mods/fml/common/network/ModMissingPacket.java +++ b/common/cpw/mods/fml/common/network/ModMissingPacket.java @@ -16,7 +16,8 @@ import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.VersionRange; -import net.minecraft.shared.* +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; public class ModMissingPacket extends FMLPacket { diff --git a/common/cpw/mods/fml/common/network/NetworkMod.java b/common/cpw/mods/fml/common/network/NetworkMod.java index 9fc8ab4528..3f3bc24d07 100644 --- a/common/cpw/mods/fml/common/network/NetworkMod.java +++ b/common/cpw/mods/fml/common/network/NetworkMod.java @@ -5,8 +5,6 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import net.minecraft.shared.Packet131MapData; - @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) public @interface NetworkMod diff --git a/common/cpw/mods/fml/common/network/NetworkModHandler.java b/common/cpw/mods/fml/common/network/NetworkModHandler.java index b7b3d63253..c69d4edec7 100644 --- a/common/cpw/mods/fml/common/network/NetworkModHandler.java +++ b/common/cpw/mods/fml/common/network/NetworkModHandler.java @@ -4,7 +4,7 @@ import java.lang.reflect.Method; import java.util.Set; import java.util.logging.Level; -import net.minecraft.shared.Item; +import net.minecraft.item.Item; import com.google.common.base.Strings; diff --git a/common/cpw/mods/fml/common/network/NetworkRegistry.java b/common/cpw/mods/fml/common/network/NetworkRegistry.java index a49bcb86e0..f691fb9477 100644 --- a/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -6,19 +6,13 @@ import java.util.Map; import java.util.Set; import java.util.logging.Level; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.inventory.Container; +import net.minecraft.network.*; +import net.minecraft.network.packet.*; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.Container; -import net.minecraft.shared.EntityPlayer; -import net.minecraft.shared.EntityPlayerMP; -import net.minecraft.shared.NetHandler; -import net.minecraft.shared.NetLoginHandler; -import net.minecraft.shared.NetServerHandler; -import net.minecraft.shared.INetworkManager; -import net.minecraft.shared.Packet131MapData; -import net.minecraft.shared.Packet1Login; -import net.minecraft.shared.Packet250CustomPayload; -import net.minecraft.shared.Packet3Chat; -import net.minecraft.shared.World; +import net.minecraft.world.World; import com.google.common.base.Charsets; import com.google.common.base.Joiner; diff --git a/common/cpw/mods/fml/common/network/OpenGuiPacket.java b/common/cpw/mods/fml/common/network/OpenGuiPacket.java index 2e77b3c5d0..3b5ab47a10 100644 --- a/common/cpw/mods/fml/common/network/OpenGuiPacket.java +++ b/common/cpw/mods/fml/common/network/OpenGuiPacket.java @@ -1,8 +1,8 @@ package cpw.mods.fml.common.network; -import net.minecraft.shared.EntityPlayer; -import net.minecraft.shared.NetHandler; -import net.minecraft.shared.INetworkManager; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/common/cpw/mods/fml/common/network/PacketDispatcher.java b/common/cpw/mods/fml/common/network/PacketDispatcher.java index 5f511859fb..533734f1a5 100644 --- a/common/cpw/mods/fml/common/network/PacketDispatcher.java +++ b/common/cpw/mods/fml/common/network/PacketDispatcher.java @@ -1,10 +1,10 @@ package cpw.mods.fml.common.network; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet131MapData; +import net.minecraft.network.packet.Packet250CustomPayload; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.EntityPlayerMP; -import net.minecraft.shared.Packet; -import net.minecraft.shared.Packet131MapData; -import net.minecraft.shared.Packet250CustomPayload; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/common/cpw/mods/fml/common/registry/BlockTracker.java b/common/cpw/mods/fml/common/registry/BlockTracker.java index 2080c9279d..ee46a2a44f 100644 --- a/common/cpw/mods/fml/common/registry/BlockTracker.java +++ b/common/cpw/mods/fml/common/registry/BlockTracker.java @@ -2,7 +2,7 @@ package cpw.mods.fml.common.registry; import java.util.BitSet; -import net.minecraft.shared.Block; +import net.minecraft.block.Block; class BlockTracker { diff --git a/common/cpw/mods/fml/common/registry/EntityRegistry.java b/common/cpw/mods/fml/common/registry/EntityRegistry.java index 9b5ae0cd13..6059502b5d 100644 --- a/common/cpw/mods/fml/common/registry/EntityRegistry.java +++ b/common/cpw/mods/fml/common/registry/EntityRegistry.java @@ -7,13 +7,13 @@ import java.util.Map; import java.util.concurrent.Callable; import java.util.logging.Level; -import net.minecraft.shared.BiomeGenBase; -import net.minecraft.shared.Entity; -import net.minecraft.shared.EntityList; -import net.minecraft.shared.EntityLiving; -import net.minecraft.shared.EntityTracker; -import net.minecraft.shared.EnumCreatureType; -import net.minecraft.shared.SpawnListEntry; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityList; +import net.minecraft.entity.EntityLiving; +import net.minecraft.entity.EntityTracker; +import net.minecraft.entity.EnumCreatureType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.biome.SpawnListEntry; import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; diff --git a/common/cpw/mods/fml/common/registry/GameRegistry.java b/common/cpw/mods/fml/common/registry/GameRegistry.java index b755d92cd2..2d2846aac3 100644 --- a/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -7,19 +7,22 @@ import java.util.Set; import java.util.concurrent.CountDownLatch; import java.util.logging.Level; -import net.minecraft.shared.BiomeGenBase; -import net.minecraft.shared.CraftingManager; -import net.minecraft.shared.EntityItem; -import net.minecraft.shared.EntityPlayer; -import net.minecraft.shared.FurnaceRecipes; -import net.minecraft.shared.IChunkProvider; -import net.minecraft.shared.IInventory; -import net.minecraft.shared.IRecipe; -import net.minecraft.shared.ItemBlock; -import net.minecraft.shared.ItemStack; -import net.minecraft.shared.TileEntity; -import net.minecraft.shared.World; -import net.minecraft.shared.WorldType; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.item.crafting.CraftingManager; +import net.minecraft.item.crafting.FurnaceRecipes; +import net.minecraft.item.crafting.IRecipe; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; +import net.minecraft.world.WorldType; +import net.minecraft.world.biome.BiomeGenBase; +import net.minecraft.world.chunk.IChunkProvider; import com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; @@ -136,7 +139,7 @@ public class GameRegistry public static Object buildBlock(ModContainer container, Class type, Block annotation) throws Exception { Object o = type.getConstructor(int.class).newInstance(findSpareBlockId()); - registerBlock((net.minecraft.shared.Block) o); + registerBlock((net.minecraft.block.Block) o); return o; } @@ -154,7 +157,7 @@ public class GameRegistry * Register a block with the world * */ - public static void registerBlock(net.minecraft.shared.Block block) + public static void registerBlock(net.minecraft.block.Block block) { registerBlock(block, ItemBlock.class); } @@ -165,7 +168,7 @@ public class GameRegistry * @param block * @param itemclass */ - public static void registerBlock(net.minecraft.shared.Block block, Class itemclass) + public static void registerBlock(net.minecraft.block.Block block, Class itemclass) { if (Loader.instance().isInState(LoaderState.CONSTRUCTING)) { diff --git a/common/cpw/mods/fml/common/registry/IThrowableEntity.java b/common/cpw/mods/fml/common/registry/IThrowableEntity.java index 091c71014d..49e7523459 100644 --- a/common/cpw/mods/fml/common/registry/IThrowableEntity.java +++ b/common/cpw/mods/fml/common/registry/IThrowableEntity.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.registry; -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/cpw/mods/fml/common/registry/ItemData.java b/common/cpw/mods/fml/common/registry/ItemData.java index 96eebd4c36..255ff542f1 100644 --- a/common/cpw/mods/fml/common/registry/ItemData.java +++ b/common/cpw/mods/fml/common/registry/ItemData.java @@ -2,6 +2,9 @@ package cpw.mods.fml.common.registry; import java.util.Map; +import net.minecraft.item.Item; +import net.minecraft.nbt.NBTTagCompound; + import com.google.common.base.Objects; import com.google.common.collect.HashMultiset; import com.google.common.collect.Maps; @@ -9,9 +12,6 @@ import com.google.common.collect.Multiset; import cpw.mods.fml.common.ModContainer; -import net.minecraft.src.Item; -import net.minecraft.src.NBTTagCompound; - public class ItemData { private static Map> modOrdinals = Maps.newHashMap(); diff --git a/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/common/cpw/mods/fml/common/registry/LanguageRegistry.java index 156603713a..2556185f4f 100644 --- a/common/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/common/cpw/mods/fml/common/registry/LanguageRegistry.java @@ -7,10 +7,10 @@ import java.util.HashMap; import java.util.Map; import java.util.Properties; -import net.minecraft.shared.Block; -import net.minecraft.shared.Item; -import net.minecraft.shared.ItemStack; -import net.minecraft.shared.StringTranslate; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.StringTranslate; public class LanguageRegistry { diff --git a/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/common/cpw/mods/fml/common/registry/VillagerRegistry.java index 1199e61177..f31757cf5b 100644 --- a/common/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/common/cpw/mods/fml/common/registry/VillagerRegistry.java @@ -5,14 +5,12 @@ import java.util.List; import java.util.Map; import java.util.Random; -import net.minecraft.shared.ComponentVillageStartPiece; -import net.minecraft.shared.EntityVillager; -import net.minecraft.shared.Item; -import net.minecraft.shared.MapGenVillage; -import net.minecraft.shared.MerchantRecipeList; -import net.minecraft.shared.StructureVillagePieceWeight; -import net.minecraft.shared.StructureVillagePieces; -import net.minecraft.shared.Tuple; +import net.minecraft.entity.EntityVillager; +import net.minecraft.item.Item; +import net.minecraft.util.Tuple; +import net.minecraft.village.MerchantRecipeList; +import net.minecraft.world.gen.structure.ComponentVillageStartPiece; +import net.minecraft.world.gen.structure.StructureVillagePieceWeight; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; diff --git a/common/cpw/mods/fml/server/FMLServerHandler.java b/common/cpw/mods/fml/server/FMLServerHandler.java index 1245b041e8..bbe1561741 100644 --- a/common/cpw/mods/fml/server/FMLServerHandler.java +++ b/common/cpw/mods/fml/server/FMLServerHandler.java @@ -17,12 +17,13 @@ import java.util.List; import com.google.common.collect.ImmutableList; import com.google.common.collect.MapDifference; +import net.minecraft.entity.Entity; +import net.minecraft.network.INetworkManager; +import net.minecraft.network.packet.NetHandler; +import net.minecraft.network.packet.Packet; +import net.minecraft.network.packet.Packet131MapData; import net.minecraft.server.MinecraftServer; -import net.minecraft.shared.Entity; -import net.minecraft.shared.NetHandler; -import net.minecraft.shared.Packet; -import net.minecraft.shared.Packet131MapData; -import net.minecraft.shared.World; +import net.minecraft.world.World; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.Loader;