From 586807c2c8d4fa065b6e189385792af7aec981a7 Mon Sep 17 00:00:00 2001 From: LexManos Date: Tue, 20 Nov 2012 03:14:36 -0800 Subject: [PATCH] Update FML imports --- ...CustomModLoadingErrorDisplayException.java | 4 +-- .../cpw/mods/fml/client/FMLClientHandler.java | 26 +++++++-------- .../cpw/mods/fml/client/FMLTextureFX.java | 6 ++-- .../GuiCustomModLoadingErrorScreen.java | 2 +- .../cpw/mods/fml/client/GuiDupesFound.java | 2 +- .../cpw/mods/fml/client/GuiModList.java | 12 +++---- .../cpw/mods/fml/client/GuiModsMissing.java | 2 +- .../fml/client/GuiModsMissingForServer.java | 8 ++--- .../cpw/mods/fml/client/GuiScrollingList.java | 4 +-- .../cpw/mods/fml/client/GuiSlotModList.java | 2 +- .../mods/fml/client/GuiWrongMinecraft.java | 4 +-- .../cpw/mods/fml/client/ITextureFX.java | 4 +-- .../cpw/mods/fml/client/OverrideInfo.java | 2 +- .../cpw/mods/fml/client/TextureFXManager.java | 6 ++-- .../ModLoaderBlockRendererHandler.java | 6 ++-- .../modloader/ModLoaderClientHelper.java | 12 ++----- .../modloader/ModLoaderKeyBindingHandler.java | 2 +- .../fml/client/registry/ClientRegistry.java | 6 ++-- .../ISimpleBlockRenderingHandler.java | 6 ++-- .../client/registry/KeyBindingRegistry.java | 4 +-- .../client/registry/RenderingRegistry.java | 10 ++---- fml/client/net/minecraft/src/BaseMod.java | 3 +- .../minecraft/src/EntityRendererProxy.java | 1 + .../minecraft/src/FMLRenderAccessLibrary.java | 7 ++++ fml/client/net/minecraft/src/ModLoader.java | 5 +-- .../minecraft/src/ModTextureAnimation.java | 2 ++ .../net/minecraft/src/ModTextureStatic.java | 2 ++ .../cpw/mods/fml/common/FMLCommonHandler.java | 16 +--------- .../mods/fml/common/FMLDummyContainer.java | 7 +--- .../cpw/mods/fml/common/ICraftingHandler.java | 4 +-- .../cpw/mods/fml/common/IDispenseHandler.java | 3 +- .../mods/fml/common/IDispenserHandler.java | 3 +- .../cpw/mods/fml/common/IFMLSidedHandler.java | 5 +-- .../cpw/mods/fml/common/IFuelHandler.java | 2 +- .../cpw/mods/fml/common/IPickupNotifier.java | 4 +-- .../cpw/mods/fml/common/IPlayerTracker.java | 2 +- .../cpw/mods/fml/common/IWorldGenerator.java | 4 +-- fml/common/cpw/mods/fml/common/Loader.java | 2 +- fml/common/cpw/mods/fml/common/Mod.java | 2 +- .../mods/fml/common/WorldAccessContainer.java | 5 +-- .../common/event/FMLServerStartingEvent.java | 4 +-- .../fml/common/modloader/BaseModProxy.java | 14 ++------ .../modloader/IModLoaderSidedHelper.java | 6 +--- .../modloader/ModLoaderChatListener.java | 4 +-- .../modloader/ModLoaderConnectionHandler.java | 6 +--- .../modloader/ModLoaderCraftingHelper.java | 4 +-- .../modloader/ModLoaderDispenseHelper.java | 3 +- .../ModLoaderEntitySpawnCallback.java | 2 +- .../common/modloader/ModLoaderFuelHelper.java | 2 +- .../common/modloader/ModLoaderGuiHelper.java | 4 +-- .../fml/common/modloader/ModLoaderHelper.java | 7 +--- .../modloader/ModLoaderModContainer.java | 2 +- .../modloader/ModLoaderPacketHandler.java | 5 +-- .../modloader/ModLoaderPickupNotifier.java | 3 +- .../ModLoaderVillageTradeHandler.java | 4 +-- .../modloader/ModLoaderWorldGenerator.java | 5 +-- .../network/EntitySpawnAdjustmentPacket.java | 3 +- .../fml/common/network/EntitySpawnPacket.java | 7 +--- .../fml/common/network/FMLNetworkHandler.java | 18 +---------- .../mods/fml/common/network/FMLPacket.java | 3 +- .../fml/common/network/IChatListener.java | 4 +-- .../common/network/IConnectionHandler.java | 5 +-- .../mods/fml/common/network/IGuiHandler.java | 3 +- .../fml/common/network/IPacketHandler.java | 3 +- .../common/network/ITinyPacketHandler.java | 3 +- .../common/network/ModIdentifiersPacket.java | 3 +- .../common/network/ModListRequestPacket.java | 4 +-- .../common/network/ModListResponsePacket.java | 5 +-- .../fml/common/network/ModMissingPacket.java | 3 +- .../mods/fml/common/network/NetworkMod.java | 2 +- .../fml/common/network/NetworkModHandler.java | 2 +- .../fml/common/network/NetworkRegistry.java | 24 +++++++------- .../fml/common/network/OpenGuiPacket.java | 6 ++-- .../fml/common/network/PacketDispatcher.java | 8 ++--- .../fml/common/registry/BlockTracker.java | 2 +- .../fml/common/registry/EntityRegistry.java | 14 ++++---- .../fml/common/registry/GameRegistry.java | 32 +++++++++---------- .../fml/common/registry/LanguageRegistry.java | 8 ++--- .../fml/common/registry/VillagerRegistry.java | 16 +++++----- .../cpw/mods/fml/server/FMLServerHandler.java | 13 ++++---- 80 files changed, 184 insertions(+), 291 deletions(-) diff --git a/fml/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java b/fml/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java index cbc5f6e16..4daaeacb1 100644 --- a/fml/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java +++ b/fml/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java @@ -3,8 +3,8 @@ package cpw.mods.fml.client; import cpw.mods.fml.common.IFMLHandledException; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.asm.SideOnly; -import net.minecraft.src.FontRenderer; -import net.minecraft.src.GuiErrorScreen; +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/fml/client/cpw/mods/fml/client/FMLClientHandler.java b/fml/client/cpw/mods/fml/client/FMLClientHandler.java index 2e7a8795a..b19ae2f37 100644 --- a/fml/client/cpw/mods/fml/client/FMLClientHandler.java +++ b/fml/client/cpw/mods/fml/client/FMLClientHandler.java @@ -22,19 +22,19 @@ import java.util.logging.Logger; import net.minecraft.client.Minecraft; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.CrashReport; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.GuiScreen; -import net.minecraft.src.NetClientHandler; -import net.minecraft.src.NetHandler; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.Render; -import net.minecraft.src.RenderManager; -import net.minecraft.src.World; -import net.minecraft.src.WorldClient; +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 com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; diff --git a/fml/client/cpw/mods/fml/client/FMLTextureFX.java b/fml/client/cpw/mods/fml/client/FMLTextureFX.java index 8fe9102b2..83dbbe1c0 100644 --- a/fml/client/cpw/mods/fml/client/FMLTextureFX.java +++ b/fml/client/cpw/mods/fml/client/FMLTextureFX.java @@ -18,9 +18,9 @@ import java.awt.Dimension; import java.util.List; import java.util.logging.Logger; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.TextureFX; -import net.minecraft.src.ITexturePack; +import net.minecraft.client.RenderEngine; +import net.minecraft.client.TextureFX; +import net.minecraft.client.ITexturePack; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/fml/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java b/fml/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java index 6f6e60b8c..273eef838 100644 --- a/fml/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java +++ b/fml/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java @@ -2,7 +2,7 @@ package cpw.mods.fml.client; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.WrongMinecraftVersionException; -import net.minecraft.src.GuiErrorScreen; +import net.minecraft.client.GuiErrorScreen; public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen { diff --git a/fml/client/cpw/mods/fml/client/GuiDupesFound.java b/fml/client/cpw/mods/fml/client/GuiDupesFound.java index 44a01d4c9..4c4ac1781 100644 --- a/fml/client/cpw/mods/fml/client/GuiDupesFound.java +++ b/fml/client/cpw/mods/fml/client/GuiDupesFound.java @@ -7,7 +7,7 @@ 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.src.GuiErrorScreen; +import net.minecraft.client.GuiErrorScreen; public class GuiDupesFound extends GuiErrorScreen { diff --git a/fml/client/cpw/mods/fml/client/GuiModList.java b/fml/client/cpw/mods/fml/client/GuiModList.java index 02a37c8c9..59ca011c3 100644 --- a/fml/client/cpw/mods/fml/client/GuiModList.java +++ b/fml/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.src.FontRenderer; -import net.minecraft.src.GuiButton; -import net.minecraft.src.GuiScreen; -import net.minecraft.src.GuiSmallButton; -import net.minecraft.src.StringTranslate; -import net.minecraft.src.Tessellator; +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 org.lwjgl.opengl.GL11; diff --git a/fml/client/cpw/mods/fml/client/GuiModsMissing.java b/fml/client/cpw/mods/fml/client/GuiModsMissing.java index 0383a25d0..c3d5efabe 100644 --- a/fml/client/cpw/mods/fml/client/GuiModsMissing.java +++ b/fml/client/cpw/mods/fml/client/GuiModsMissing.java @@ -2,7 +2,7 @@ package cpw.mods.fml.client; import cpw.mods.fml.common.MissingModsException; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.src.GuiErrorScreen; +import net.minecraft.client.GuiErrorScreen; public class GuiModsMissing extends GuiErrorScreen { diff --git a/fml/client/cpw/mods/fml/client/GuiModsMissingForServer.java b/fml/client/cpw/mods/fml/client/GuiModsMissingForServer.java index 14e297e15..55f037140 100644 --- a/fml/client/cpw/mods/fml/client/GuiModsMissingForServer.java +++ b/fml/client/cpw/mods/fml/client/GuiModsMissingForServer.java @@ -1,9 +1,9 @@ package cpw.mods.fml.client; -import net.minecraft.src.GuiButton; -import net.minecraft.src.GuiScreen; -import net.minecraft.src.GuiSmallButton; -import net.minecraft.src.StringTranslate; +import net.minecraft.client.GuiButton; +import net.minecraft.client.GuiScreen; +import net.minecraft.client.GuiSmallButton; +import net.minecraft.shared.StringTranslate; import cpw.mods.fml.common.network.ModMissingPacket; import cpw.mods.fml.common.versioning.ArtifactVersion; diff --git a/fml/client/cpw/mods/fml/client/GuiScrollingList.java b/fml/client/cpw/mods/fml/client/GuiScrollingList.java index 998139d3f..f74eefa9f 100644 --- a/fml/client/cpw/mods/fml/client/GuiScrollingList.java +++ b/fml/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.src.GuiButton; -import net.minecraft.src.Tessellator; +import net.minecraft.client.GuiButton; +import net.minecraft.client.Tessellator; import org.lwjgl.input.Mouse; import org.lwjgl.opengl.GL11; diff --git a/fml/client/cpw/mods/fml/client/GuiSlotModList.java b/fml/client/cpw/mods/fml/client/GuiSlotModList.java index bccb26a41..9b6cdd998 100644 --- a/fml/client/cpw/mods/fml/client/GuiSlotModList.java +++ b/fml/client/cpw/mods/fml/client/GuiSlotModList.java @@ -16,7 +16,7 @@ package cpw.mods.fml.client; import java.util.ArrayList; -import net.minecraft.src.Tessellator; +import net.minecraft.client.Tessellator; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.ModContainer; diff --git a/fml/client/cpw/mods/fml/client/GuiWrongMinecraft.java b/fml/client/cpw/mods/fml/client/GuiWrongMinecraft.java index 25d039bbc..478c03b4d 100644 --- a/fml/client/cpw/mods/fml/client/GuiWrongMinecraft.java +++ b/fml/client/cpw/mods/fml/client/GuiWrongMinecraft.java @@ -3,8 +3,8 @@ package cpw.mods.fml.client; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.WrongMinecraftVersionException; import cpw.mods.fml.common.versioning.ArtifactVersion; -import net.minecraft.src.GuiErrorScreen; -import net.minecraft.src.GuiScreen; +import net.minecraft.client.GuiErrorScreen; +import net.minecraft.client.GuiScreen; public class GuiWrongMinecraft extends GuiErrorScreen { diff --git a/fml/client/cpw/mods/fml/client/ITextureFX.java b/fml/client/cpw/mods/fml/client/ITextureFX.java index 6231c63d1..fa1db59f3 100644 --- a/fml/client/cpw/mods/fml/client/ITextureFX.java +++ b/fml/client/cpw/mods/fml/client/ITextureFX.java @@ -16,8 +16,8 @@ package cpw.mods.fml.client; import java.awt.Dimension; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.ITexturePack; +import net.minecraft.client.RenderEngine; +import net.minecraft.client.ITexturePack; public interface ITextureFX { diff --git a/fml/client/cpw/mods/fml/client/OverrideInfo.java b/fml/client/cpw/mods/fml/client/OverrideInfo.java index 453bdc576..4deb073bc 100644 --- a/fml/client/cpw/mods/fml/client/OverrideInfo.java +++ b/fml/client/cpw/mods/fml/client/OverrideInfo.java @@ -14,7 +14,7 @@ package cpw.mods.fml.client; -import net.minecraft.src.TextureFX; +import net.minecraft.client.TextureFX; class OverrideInfo { diff --git a/fml/client/cpw/mods/fml/client/TextureFXManager.java b/fml/client/cpw/mods/fml/client/TextureFXManager.java index a5ad1b040..b3fa38ebc 100644 --- a/fml/client/cpw/mods/fml/client/TextureFXManager.java +++ b/fml/client/cpw/mods/fml/client/TextureFXManager.java @@ -20,9 +20,9 @@ import javax.imageio.ImageIO; import net.minecraft.client.Minecraft; import net.minecraft.src.ModTextureStatic; -import net.minecraft.src.RenderEngine; -import net.minecraft.src.TextureFX; -import net.minecraft.src.ITexturePack; +import net.minecraft.client.RenderEngine; +import net.minecraft.client.TextureFX; +import net.minecraft.client.ITexturePack; import org.lwjgl.opengl.GL11; diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java index a67c40a6e..d392f08d6 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java @@ -15,9 +15,9 @@ package cpw.mods.fml.client.modloader; import net.minecraft.src.BaseMod; -import net.minecraft.src.Block; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.RenderBlocks; +import net.minecraft.shared.Block; +import net.minecraft.shared.IBlockAccess; +import net.minecraft.client.RenderBlocks; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; /** diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java index ca3357519..b2fa229ec 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java @@ -8,16 +8,8 @@ import java.util.logging.Level; import net.minecraft.client.Minecraft; import net.minecraft.src.BaseMod; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityClientPlayerMP; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.KeyBinding; -import net.minecraft.src.NetClientHandler; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.Render; -import net.minecraft.src.RenderManager; +import net.minecraft.client.*; +import net.minecraft.shared.*; import com.google.common.base.Equivalences; import com.google.common.base.Supplier; diff --git a/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java b/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java index 034734f70..8a7dd6372 100644 --- a/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java +++ b/fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java @@ -23,7 +23,7 @@ import org.lwjgl.input.Mouse; import com.google.common.collect.ObjectArrays; import com.google.common.primitives.Booleans; -import net.minecraft.src.KeyBinding; +import net.minecraft.client.KeyBinding; import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.modloader.ModLoaderModContainer; diff --git a/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java b/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java index d7f3a2a20..b1ba94e6f 100644 --- a/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/ClientRegistry.java @@ -1,8 +1,8 @@ package cpw.mods.fml.client.registry; -import net.minecraft.src.TileEntity; -import net.minecraft.src.TileEntityRenderer; -import net.minecraft.src.TileEntitySpecialRenderer; +import net.minecraft.shared.TileEntity; +import net.minecraft.client.TileEntityRenderer; +import net.minecraft.client.TileEntitySpecialRenderer; import cpw.mods.fml.common.registry.GameRegistry; public class ClientRegistry diff --git a/fml/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java b/fml/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java index 99182c06e..37b7fcc1e 100644 --- a/fml/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java +++ b/fml/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java @@ -1,8 +1,8 @@ package cpw.mods.fml.client.registry; -import net.minecraft.src.Block; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.RenderBlocks; +import net.minecraft.shared.Block; +import net.minecraft.shared.IBlockAccess; +import net.minecraft.client.RenderBlocks; public interface ISimpleBlockRenderingHandler { diff --git a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java index 23894c1d1..0a3b4fffd 100644 --- a/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java @@ -4,8 +4,8 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.Set; -import net.minecraft.src.GameSettings; -import net.minecraft.src.KeyBinding; +import net.minecraft.client.GameSettings; +import net.minecraft.client.KeyBinding; import org.lwjgl.input.Keyboard; import org.lwjgl.input.Mouse; diff --git a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java index 132d0daef..9438b71f7 100644 --- a/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java +++ b/fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java @@ -3,14 +3,8 @@ package cpw.mods.fml.client.registry; import java.util.List; import java.util.Map; -import net.minecraft.src.Block; -import net.minecraft.src.Entity; -import net.minecraft.src.IBlockAccess; -import net.minecraft.src.Render; -import net.minecraft.src.RenderBiped; -import net.minecraft.src.RenderBlocks; -import net.minecraft.src.RenderManager; -import net.minecraft.src.RenderPlayer; +import net.minecraft.shared.*; +import net.minecraft.client.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/fml/client/net/minecraft/src/BaseMod.java b/fml/client/net/minecraft/src/BaseMod.java index 287822b52..e24c4e4ad 100644 --- a/fml/client/net/minecraft/src/BaseMod.java +++ b/fml/client/net/minecraft/src/BaseMod.java @@ -17,8 +17,9 @@ import static cpw.mods.fml.common.Side.CLIENT; import java.util.Map; import java.util.Random; -import net.minecraft.client.Minecraft; +import net.minecraft.client.*; import net.minecraft.server.MinecraftServer; +import net.minecraft.shared.*; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.TickType; diff --git a/fml/client/net/minecraft/src/EntityRendererProxy.java b/fml/client/net/minecraft/src/EntityRendererProxy.java index 4994b1f74..b03c37451 100644 --- a/fml/client/net/minecraft/src/EntityRendererProxy.java +++ b/fml/client/net/minecraft/src/EntityRendererProxy.java @@ -14,6 +14,7 @@ package net.minecraft.src; +import net.minecraft.client.EntityRenderer; import net.minecraft.client.Minecraft; public class EntityRendererProxy extends EntityRenderer diff --git a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java index 8e2c09607..350813339 100644 --- a/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java +++ b/fml/client/net/minecraft/src/FMLRenderAccessLibrary.java @@ -19,6 +19,13 @@ 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 cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.common.FMLLog; diff --git a/fml/client/net/minecraft/src/ModLoader.java b/fml/client/net/minecraft/src/ModLoader.java index db4c63f5a..712dd45af 100644 --- a/fml/client/net/minecraft/src/ModLoader.java +++ b/fml/client/net/minecraft/src/ModLoader.java @@ -20,8 +20,9 @@ import java.util.List; import java.util.Map; import java.util.logging.Logger; -import net.minecraft.client.Minecraft; -import net.minecraft.server.MinecraftServer; +import net.minecraft.client.*; +import net.minecraft.server.*; +import net.minecraft.shared.*; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.TextureFXManager; diff --git a/fml/client/net/minecraft/src/ModTextureAnimation.java b/fml/client/net/minecraft/src/ModTextureAnimation.java index 0b407cb06..34e46baae 100644 --- a/fml/client/net/minecraft/src/ModTextureAnimation.java +++ b/fml/client/net/minecraft/src/ModTextureAnimation.java @@ -18,6 +18,8 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; +import net.minecraft.client.RenderEngine; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; diff --git a/fml/client/net/minecraft/src/ModTextureStatic.java b/fml/client/net/minecraft/src/ModTextureStatic.java index 734771e42..d4fcccd30 100644 --- a/fml/client/net/minecraft/src/ModTextureStatic.java +++ b/fml/client/net/minecraft/src/ModTextureStatic.java @@ -20,6 +20,8 @@ import java.awt.Graphics2D; import java.awt.image.BufferedImage; import java.awt.image.ImageObserver; +import net.minecraft.client.RenderEngine; + import org.lwjgl.opengl.GL11; import cpw.mods.fml.client.FMLClientHandler; diff --git a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java index 25818190d..11c2b8a14 100644 --- a/fml/common/cpw/mods/fml/common/FMLCommonHandler.java +++ b/fml/common/cpw/mods/fml/common/FMLCommonHandler.java @@ -21,21 +21,7 @@ import java.util.Set; import java.util.logging.Logger; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.CrashReport; -import net.minecraft.src.CrashReportCategory; -import net.minecraft.src.DedicatedServer; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.NBTBase; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NetHandler; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.SaveHandler; -import net.minecraft.src.ServerListenThread; -import net.minecraft.src.ThreadMinecraftServer; -import net.minecraft.src.World; -import net.minecraft.src.WorldInfo; +import net.minecraft.shared.*; import com.google.common.base.Objects; import com.google.common.base.Strings; diff --git a/fml/common/cpw/mods/fml/common/FMLDummyContainer.java b/fml/common/cpw/mods/fml/common/FMLDummyContainer.java index 364f58046..fb4b03efe 100644 --- a/fml/common/cpw/mods/fml/common/FMLDummyContainer.java +++ b/fml/common/cpw/mods/fml/common/FMLDummyContainer.java @@ -19,12 +19,7 @@ import java.util.Map; import java.util.Set; import java.util.concurrent.ConcurrentMap; -import net.minecraft.src.NBTBase; -import net.minecraft.src.NBTTagCompound; -import net.minecraft.src.NBTTagList; -import net.minecraft.src.NBTTagString; -import net.minecraft.src.SaveHandler; -import net.minecraft.src.WorldInfo; +import net.minecraft.shared.*; import com.google.common.collect.MapMaker; import com.google.common.collect.Sets; diff --git a/fml/common/cpw/mods/fml/common/ICraftingHandler.java b/fml/common/cpw/mods/fml/common/ICraftingHandler.java index c297058bc..fdd81f8f8 100644 --- a/fml/common/cpw/mods/fml/common/ICraftingHandler.java +++ b/fml/common/cpw/mods/fml/common/ICraftingHandler.java @@ -13,9 +13,7 @@ */ package cpw.mods.fml.common; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.ItemStack; +import net.minecraft.shared.*; /** * Return a crafting handler for the mod container to call diff --git a/fml/common/cpw/mods/fml/common/IDispenseHandler.java b/fml/common/cpw/mods/fml/common/IDispenseHandler.java index e51387a63..b21383030 100644 --- a/fml/common/cpw/mods/fml/common/IDispenseHandler.java +++ b/fml/common/cpw/mods/fml/common/IDispenseHandler.java @@ -14,8 +14,7 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.src.ItemStack; -import net.minecraft.src.World; +import net.minecraft.shared.*; public interface IDispenseHandler diff --git a/fml/common/cpw/mods/fml/common/IDispenserHandler.java b/fml/common/cpw/mods/fml/common/IDispenserHandler.java index f4b7fa721..ee8502f89 100644 --- a/fml/common/cpw/mods/fml/common/IDispenserHandler.java +++ b/fml/common/cpw/mods/fml/common/IDispenserHandler.java @@ -2,8 +2,7 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.src.ItemStack; -import net.minecraft.src.World; +import net.minecraft.shared.*; /** * @author cpw diff --git a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java index d3db4165b..df7bc9cc3 100644 --- a/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java +++ b/fml/common/cpw/mods/fml/common/IFMLSidedHandler.java @@ -3,10 +3,7 @@ package cpw.mods.fml.common; import java.util.List; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.Entity; -import net.minecraft.src.NetHandler; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet131MapData; +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/fml/common/cpw/mods/fml/common/IFuelHandler.java b/fml/common/cpw/mods/fml/common/IFuelHandler.java index e7d01ffd0..eb83075ee 100644 --- a/fml/common/cpw/mods/fml/common/IFuelHandler.java +++ b/fml/common/cpw/mods/fml/common/IFuelHandler.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common; -import net.minecraft.src.ItemStack; +import net.minecraft.shared.ItemStack; public interface IFuelHandler { diff --git a/fml/common/cpw/mods/fml/common/IPickupNotifier.java b/fml/common/cpw/mods/fml/common/IPickupNotifier.java index 9f3d721f3..51f88fbca 100644 --- a/fml/common/cpw/mods/fml/common/IPickupNotifier.java +++ b/fml/common/cpw/mods/fml/common/IPickupNotifier.java @@ -13,8 +13,8 @@ */ package cpw.mods.fml.common; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; +import net.minecraft.shared.EntityItem; +import net.minecraft.shared.EntityPlayer; public interface IPickupNotifier { diff --git a/fml/common/cpw/mods/fml/common/IPlayerTracker.java b/fml/common/cpw/mods/fml/common/IPlayerTracker.java index eff8c7844..9a0fe1519 100644 --- a/fml/common/cpw/mods/fml/common/IPlayerTracker.java +++ b/fml/common/cpw/mods/fml/common/IPlayerTracker.java @@ -14,7 +14,7 @@ package cpw.mods.fml.common; -import net.minecraft.src.EntityPlayer; +import net.minecraft.shared.EntityPlayer; /** * @author cpw diff --git a/fml/common/cpw/mods/fml/common/IWorldGenerator.java b/fml/common/cpw/mods/fml/common/IWorldGenerator.java index 68903fc6b..65adb6684 100644 --- a/fml/common/cpw/mods/fml/common/IWorldGenerator.java +++ b/fml/common/cpw/mods/fml/common/IWorldGenerator.java @@ -15,8 +15,8 @@ package cpw.mods.fml.common; import java.util.Random; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.World; +import net.minecraft.shared.IChunkProvider; +import net.minecraft.shared.World; /** * This is called back during world generation. diff --git a/fml/common/cpw/mods/fml/common/Loader.java b/fml/common/cpw/mods/fml/common/Loader.java index b710807e9..b9621027c 100644 --- a/fml/common/cpw/mods/fml/common/Loader.java +++ b/fml/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.src.CallableMinecraftVersion; +import net.minecraft.shared.CallableMinecraftVersion; import com.google.common.base.CharMatcher; import com.google.common.base.Function; diff --git a/fml/common/cpw/mods/fml/common/Mod.java b/fml/common/cpw/mods/fml/common/Mod.java index 099dbe2bf..b37e802b6 100644 --- a/fml/common/cpw/mods/fml/common/Mod.java +++ b/fml/common/cpw/mods/fml/common/Mod.java @@ -21,7 +21,7 @@ import java.lang.annotation.Target; import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; -import net.minecraft.src.ItemBlock; +import net.minecraft.shared.ItemBlock; /** * The new mod style in FML 1.3 diff --git a/fml/common/cpw/mods/fml/common/WorldAccessContainer.java b/fml/common/cpw/mods/fml/common/WorldAccessContainer.java index c8a6c8d7d..6f5fcb99f 100644 --- a/fml/common/cpw/mods/fml/common/WorldAccessContainer.java +++ b/fml/common/cpw/mods/fml/common/WorldAccessContainer.java @@ -2,10 +2,7 @@ package cpw.mods.fml.common; 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.shared.*; public interface WorldAccessContainer { diff --git a/fml/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java b/fml/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java index d9c8ff6e5..df763a8a8 100644 --- a/fml/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java +++ b/fml/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java @@ -1,8 +1,8 @@ package cpw.mods.fml.common.event; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.CommandHandler; -import net.minecraft.src.ICommand; +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/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java b/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java index 5a68386b7..2cca5ad70 100644 --- a/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java +++ b/fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java @@ -16,18 +16,8 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.GuiScreen; -import net.minecraft.src.IInventory; -import net.minecraft.src.ItemStack; -import net.minecraft.src.NetClientHandler; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.World; -import net.minecraft.src.WorldClient; +import net.minecraft.shared.*; +import net.minecraft.client.WorldClient; import cpw.mods.fml.common.Side; import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.asm.SideOnly; diff --git a/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java b/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java index a4dc87a59..2234635d0 100644 --- a/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java @@ -2,11 +2,7 @@ package cpw.mods.fml.common.modloader; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; +import net.minecraft.shared.*; public interface IModLoaderSidedHelper { diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java index 8bc5e32b6..51a7b4ec0 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java @@ -1,8 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.Packet3Chat; +import net.minecraft.shared.*; import cpw.mods.fml.common.network.IChatListener; public class ModLoaderChatListener implements IChatListener diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java index f3eadd90d..477402d18 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java @@ -1,11 +1,7 @@ package cpw.mods.fml.common.modloader; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet1Login; +import net.minecraft.shared.*; import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.Player; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java index 8c76ac9c1..1e5be7350 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java @@ -1,8 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IInventory; -import net.minecraft.src.ItemStack; +import net.minecraft.shared.*; import cpw.mods.fml.common.ICraftingHandler; public class ModLoaderCraftingHelper implements ICraftingHandler diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java index 27bcb82c2..00dc9ce4e 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java @@ -2,8 +2,7 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.src.ItemStack; -import net.minecraft.src.World; +import net.minecraft.shared.*; import cpw.mods.fml.common.IDispenseHandler; import cpw.mods.fml.common.IDispenserHandler; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java index 952ceacb6..f4b0c0978 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java @@ -8,7 +8,7 @@ import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; -import net.minecraft.src.Entity; +import net.minecraft.shared.Entity; public class ModLoaderEntitySpawnCallback implements Function { diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java index 1e6015d88..ebe45c598 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java @@ -1,6 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.ItemStack; +import net.minecraft.shared.ItemStack; import cpw.mods.fml.common.IFuelHandler; public class ModLoaderFuelHelper implements IFuelHandler diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java index 97eba7800..b8d96e598 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java @@ -1,8 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.Container; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.World; +import net.minecraft.shared.*; import cpw.mods.fml.common.network.IGuiHandler; public class ModLoaderGuiHelper implements IGuiHandler diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java index 6ad96699a..6cb4a0aa8 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java @@ -24,12 +24,7 @@ import com.google.common.collect.ListMultimap; import com.google.common.collect.Maps; import net.minecraft.src.BaseMod; -import net.minecraft.src.Container; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityDragon; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.IAnimals; -import net.minecraft.src.ICommand; +import net.minecraft.shared.*; import net.minecraft.src.TradeEntry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLLog; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java index 298a930e5..d3f9ba63a 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java +++ b/fml/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.src.ICommand; +import net.minecraft.shared.ICommand; import com.google.common.base.Strings; import com.google.common.base.Throwables; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java index 9b1c47073..4819aba79 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java @@ -1,9 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; +import net.minecraft.shared.*; import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.Player; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java index 3c4a0e75b..6201271df 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java @@ -1,7 +1,6 @@ package cpw.mods.fml.common.modloader; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; +import net.minecraft.shared.*; import cpw.mods.fml.common.IPickupNotifier; public class ModLoaderPickupNotifier implements IPickupNotifier diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java index 195112b5e..f121a630c 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java @@ -5,9 +5,7 @@ import java.util.Random; import com.google.common.collect.Lists; -import net.minecraft.src.EntityVillager; -import net.minecraft.src.Item; -import net.minecraft.src.MerchantRecipeList; +import net.minecraft.shared.*; import net.minecraft.src.TradeEntry; import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; diff --git a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java index fcf23621f..2a80a2359 100644 --- a/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java +++ b/fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java @@ -2,10 +2,7 @@ package cpw.mods.fml.common.modloader; import java.util.Random; -import net.minecraft.src.ChunkProviderGenerate; -import net.minecraft.src.ChunkProviderHell; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.World; +import net.minecraft.shared.*; import cpw.mods.fml.common.IWorldGenerator; public class ModLoaderWorldGenerator implements IWorldGenerator diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java index bbe7db8f2..3e86592f4 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java @@ -1,7 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.*; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java index dbe0ced59..1bc908f17 100644 --- a/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java +++ b/fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java @@ -8,12 +8,7 @@ import java.io.IOException; import java.util.List; import java.util.logging.Level; -import net.minecraft.src.DataWatcher; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.MathHelper; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.*; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java index 29c4e3e61..ca48566b4 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java +++ b/fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java @@ -12,23 +12,7 @@ import java.util.Map; import java.util.Set; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.EnumGameType; -import net.minecraft.src.Item; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.Packet1Login; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.Packet3Chat; -import net.minecraft.src.ServerConfigurationManager; -import net.minecraft.src.World; -import net.minecraft.src.WorldType; +import net.minecraft.shared.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/fml/common/cpw/mods/fml/common/network/FMLPacket.java b/fml/common/cpw/mods/fml/common/network/FMLPacket.java index 806347452..af84b6a69 100644 --- a/fml/common/cpw/mods/fml/common/network/FMLPacket.java +++ b/fml/common/cpw/mods/fml/common/network/FMLPacket.java @@ -3,8 +3,7 @@ package cpw.mods.fml.common.network; import java.util.Arrays; import java.util.logging.Level; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.*; import com.google.common.base.Throwables; import com.google.common.primitives.Bytes; diff --git a/fml/common/cpw/mods/fml/common/network/IChatListener.java b/fml/common/cpw/mods/fml/common/network/IChatListener.java index 789ae46d7..23e1ea466 100644 --- a/fml/common/cpw/mods/fml/common/network/IChatListener.java +++ b/fml/common/cpw/mods/fml/common/network/IChatListener.java @@ -1,8 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.Packet3Chat; +import net.minecraft.shared.*; public interface IChatListener { diff --git a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java index e0addd437..927169f86 100644 --- a/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IConnectionHandler.java @@ -1,10 +1,7 @@ package cpw.mods.fml.common.network; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet1Login; +import net.minecraft.shared.*; public interface IConnectionHandler { diff --git a/fml/common/cpw/mods/fml/common/network/IGuiHandler.java b/fml/common/cpw/mods/fml/common/network/IGuiHandler.java index 73f01aa43..73c1eecd8 100644 --- a/fml/common/cpw/mods/fml/common/network/IGuiHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IGuiHandler.java @@ -1,7 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.World; +import net.minecraft.shared.*; public interface IGuiHandler { diff --git a/fml/common/cpw/mods/fml/common/network/IPacketHandler.java b/fml/common/cpw/mods/fml/common/network/IPacketHandler.java index aee9fad52..489829cf2 100644 --- a/fml/common/cpw/mods/fml/common/network/IPacketHandler.java +++ b/fml/common/cpw/mods/fml/common/network/IPacketHandler.java @@ -1,7 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; +import net.minecraft.shared.*; public interface IPacketHandler { diff --git a/fml/common/cpw/mods/fml/common/network/ITinyPacketHandler.java b/fml/common/cpw/mods/fml/common/network/ITinyPacketHandler.java index 191f665eb..a2f0b03eb 100644 --- a/fml/common/cpw/mods/fml/common/network/ITinyPacketHandler.java +++ b/fml/common/cpw/mods/fml/common/network/ITinyPacketHandler.java @@ -1,7 +1,6 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.NetHandler; -import net.minecraft.src.Packet131MapData; +import net.minecraft.shared.*; public interface ITinyPacketHandler { diff --git a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java index 6f4eebc37..9d3cfbe92 100644 --- a/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java @@ -6,8 +6,7 @@ import java.util.Collection; import java.util.Map; import java.util.Map.Entry; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.*; import com.google.common.collect.Maps; import com.google.common.io.ByteArrayDataInput; diff --git a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java index 3b754904b..1287a1546 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java @@ -8,9 +8,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.Set; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; +import net.minecraft.shared.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java index 0f51ca26b..3d6570c8b 100644 --- a/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java @@ -9,10 +9,7 @@ import java.util.Map; import java.util.Map.Entry; import java.util.logging.Logger; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet250CustomPayload; +import net.minecraft.shared.*; import com.google.common.collect.Lists; import com.google.common.collect.Maps; diff --git a/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java b/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java index 045c899d5..20b066a34 100644 --- a/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java +++ b/fml/common/cpw/mods/fml/common/network/ModMissingPacket.java @@ -16,8 +16,7 @@ import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.VersionRange; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.* public class ModMissingPacket extends FMLPacket { diff --git a/fml/common/cpw/mods/fml/common/network/NetworkMod.java b/fml/common/cpw/mods/fml/common/network/NetworkMod.java index 18d66d403..9fc8ab452 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkMod.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkMod.java @@ -5,7 +5,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import net.minecraft.src.Packet131MapData; +import net.minecraft.shared.Packet131MapData; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java b/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java index c4ec85bb2..b7b3d6325 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkModHandler.java +++ b/fml/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.src.Item; +import net.minecraft.shared.Item; import com.google.common.base.Strings; diff --git a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java index e86ea046a..a49bcb86e 100644 --- a/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java +++ b/fml/common/cpw/mods/fml/common/network/NetworkRegistry.java @@ -7,18 +7,18 @@ import java.util.Set; import java.util.logging.Level; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.Container; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.NetHandler; -import net.minecraft.src.NetLoginHandler; -import net.minecraft.src.NetServerHandler; -import net.minecraft.src.INetworkManager; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.Packet1Login; -import net.minecraft.src.Packet250CustomPayload; -import net.minecraft.src.Packet3Chat; -import net.minecraft.src.World; +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 com.google.common.base.Charsets; import com.google.common.base.Joiner; diff --git a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java index cc1d3b296..2e77b3c5d 100644 --- a/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java +++ b/fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java @@ -1,8 +1,8 @@ package cpw.mods.fml.common.network; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.NetHandler; -import net.minecraft.src.INetworkManager; +import net.minecraft.shared.EntityPlayer; +import net.minecraft.shared.NetHandler; +import net.minecraft.shared.INetworkManager; import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataOutput; diff --git a/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java b/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java index f11a220b8..5f511859f 100644 --- a/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java +++ b/fml/common/cpw/mods/fml/common/network/PacketDispatcher.java @@ -1,10 +1,10 @@ package cpw.mods.fml.common.network; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.EntityPlayerMP; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.Packet250CustomPayload; +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/fml/common/cpw/mods/fml/common/registry/BlockTracker.java b/fml/common/cpw/mods/fml/common/registry/BlockTracker.java index 6075e83dc..2080c9279 100644 --- a/fml/common/cpw/mods/fml/common/registry/BlockTracker.java +++ b/fml/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.src.Block; +import net.minecraft.shared.Block; class BlockTracker { diff --git a/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java b/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java index c5e86bd42..9b5ae0cd1 100644 --- a/fml/common/cpw/mods/fml/common/registry/EntityRegistry.java +++ b/fml/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.src.BiomeGenBase; -import net.minecraft.src.Entity; -import net.minecraft.src.EntityList; -import net.minecraft.src.EntityLiving; -import net.minecraft.src.EntityTracker; -import net.minecraft.src.EnumCreatureType; -import net.minecraft.src.SpawnListEntry; +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 com.google.common.base.Function; import com.google.common.collect.ArrayListMultimap; diff --git a/fml/common/cpw/mods/fml/common/registry/GameRegistry.java b/fml/common/cpw/mods/fml/common/registry/GameRegistry.java index 5692680cb..589751c18 100644 --- a/fml/common/cpw/mods/fml/common/registry/GameRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/GameRegistry.java @@ -5,19 +5,19 @@ import java.util.Random; import java.util.Set; import java.util.logging.Level; -import net.minecraft.src.BiomeGenBase; -import net.minecraft.src.CraftingManager; -import net.minecraft.src.EntityItem; -import net.minecraft.src.EntityPlayer; -import net.minecraft.src.FurnaceRecipes; -import net.minecraft.src.IChunkProvider; -import net.minecraft.src.IInventory; -import net.minecraft.src.IRecipe; -import net.minecraft.src.ItemBlock; -import net.minecraft.src.ItemStack; -import net.minecraft.src.TileEntity; -import net.minecraft.src.World; -import net.minecraft.src.WorldType; +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 com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; @@ -141,7 +141,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.src.Block) o); + registerBlock((net.minecraft.shared.Block) o); return o; } @@ -159,7 +159,7 @@ public class GameRegistry * Register a block with the world * */ - public static void registerBlock(net.minecraft.src.Block block) + public static void registerBlock(net.minecraft.shared.Block block) { registerBlock(block, ItemBlock.class); } @@ -170,7 +170,7 @@ public class GameRegistry * @param block * @param itemclass */ - public static void registerBlock(net.minecraft.src.Block block, Class itemclass) + public static void registerBlock(net.minecraft.shared.Block block, Class itemclass) { if (Loader.instance().isInState(LoaderState.CONSTRUCTING)) { diff --git a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java b/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java index e0702046c..156603713 100644 --- a/fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java +++ b/fml/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.src.Block; -import net.minecraft.src.Item; -import net.minecraft.src.ItemStack; -import net.minecraft.src.StringTranslate; +import net.minecraft.shared.Block; +import net.minecraft.shared.Item; +import net.minecraft.shared.ItemStack; +import net.minecraft.shared.StringTranslate; public class LanguageRegistry { diff --git a/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java b/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java index 966b5262f..1199e6117 100644 --- a/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java +++ b/fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java @@ -5,14 +5,14 @@ import java.util.List; import java.util.Map; import java.util.Random; -import net.minecraft.src.ComponentVillageStartPiece; -import net.minecraft.src.EntityVillager; -import net.minecraft.src.Item; -import net.minecraft.src.MapGenVillage; -import net.minecraft.src.MerchantRecipeList; -import net.minecraft.src.StructureVillagePieceWeight; -import net.minecraft.src.StructureVillagePieces; -import net.minecraft.src.Tuple; +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 com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Lists; diff --git a/fml/common/cpw/mods/fml/server/FMLServerHandler.java b/fml/common/cpw/mods/fml/server/FMLServerHandler.java index f075b1b31..45635e36d 100644 --- a/fml/common/cpw/mods/fml/server/FMLServerHandler.java +++ b/fml/common/cpw/mods/fml/server/FMLServerHandler.java @@ -17,12 +17,11 @@ import java.util.List; import com.google.common.collect.ImmutableList; import net.minecraft.server.MinecraftServer; -import net.minecraft.src.Entity; -import net.minecraft.src.NetClientHandler; -import net.minecraft.src.NetHandler; -import net.minecraft.src.Packet; -import net.minecraft.src.Packet131MapData; -import net.minecraft.src.World; +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 cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.Loader; @@ -38,7 +37,7 @@ import cpw.mods.fml.common.registry.LanguageRegistry; * Handles primary communication from hooked code into the system * * The FML entry point is {@link #beginServerLoading(MinecraftServer)} called from - * {@link net.minecraft.src.DedicatedServer} + * {@link net.minecraft.shared.DedicatedServer} * * Obfuscated code should focus on this class and other members of the "server" * (or "client") code