keith/ForgePatch
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

Update FML imports

Browse source
This commit is contained in:
LexManos 2012-11-20 03:14:36 -08:00
parent 73a22bb571
commit 586807c2c8
80 changed files with 184 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fml/client/cpw/mods/fml/client/CustomModLoadingErrorDisplayException.java
View file

@ -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

26
fml/client/cpw/mods/fml/client/FMLClientHandler.java
View file

@ -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;

6
fml/client/cpw/mods/fml/client/FMLTextureFX.java
View file

@ -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;

2
fml/client/cpw/mods/fml/client/GuiCustomModLoadingErrorScreen.java
View file

@ -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
{

2
fml/client/cpw/mods/fml/client/GuiDupesFound.java
View file

@ -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
{

12
fml/client/cpw/mods/fml/client/GuiModList.java
View file

@ -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;

2
fml/client/cpw/mods/fml/client/GuiModsMissing.java
View file

@ -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
{

8
fml/client/cpw/mods/fml/client/GuiModsMissingForServer.java
View file

@ -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;

4
fml/client/cpw/mods/fml/client/GuiScrollingList.java
View file

@ -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;

2
fml/client/cpw/mods/fml/client/GuiSlotModList.java
View file

@ -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;

4
fml/client/cpw/mods/fml/client/GuiWrongMinecraft.java
View file

@ -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
{

4
fml/client/cpw/mods/fml/client/ITextureFX.java
View file

@ -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
{

2
fml/client/cpw/mods/fml/client/OverrideInfo.java
View file

@ -14,7 +14,7 @@
package cpw.mods.fml.client;
import net.minecraft.src.TextureFX;
import net.minecraft.client.TextureFX;
class OverrideInfo
{

6
fml/client/cpw/mods/fml/client/TextureFXManager.java
View file

@ -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;

6
fml/client/cpw/mods/fml/client/modloader/ModLoaderBlockRendererHandler.java
View file

@ -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;
/**

12
fml/client/cpw/mods/fml/client/modloader/ModLoaderClientHelper.java
View file

@ -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;

2
fml/client/cpw/mods/fml/client/modloader/ModLoaderKeyBindingHandler.java
View file

@ -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;

6
fml/client/cpw/mods/fml/client/registry/ClientRegistry.java
View file

@ -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

6
fml/client/cpw/mods/fml/client/registry/ISimpleBlockRenderingHandler.java
View file

@ -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
{

4
fml/client/cpw/mods/fml/client/registry/KeyBindingRegistry.java
View file

@ -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;

10
fml/client/cpw/mods/fml/client/registry/RenderingRegistry.java
View file

@ -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;

3
fml/client/net/minecraft/src/BaseMod.java
View file

@ -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;

1
fml/client/net/minecraft/src/EntityRendererProxy.java
View file

@ -14,6 +14,7 @@
package net.minecraft.src;
import net.minecraft.client.EntityRenderer;
import net.minecraft.client.Minecraft;
public class EntityRendererProxy extends EntityRenderer

7
fml/client/net/minecraft/src/FMLRenderAccessLibrary.java
View file

@ -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;

5
fml/client/net/minecraft/src/ModLoader.java
View file

@ -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;

2
fml/client/net/minecraft/src/ModTextureAnimation.java
View file

@ -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;

2
fml/client/net/minecraft/src/ModTextureStatic.java
View file

@ -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;

16
fml/common/cpw/mods/fml/common/FMLCommonHandler.java
View file

@ -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;

7
fml/common/cpw/mods/fml/common/FMLDummyContainer.java
View file

@ -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;

4
fml/common/cpw/mods/fml/common/ICraftingHandler.java
View file

@ -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

3
fml/common/cpw/mods/fml/common/IDispenseHandler.java
View file

@ -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

3
fml/common/cpw/mods/fml/common/IDispenserHandler.java
View file

@ -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

5
fml/common/cpw/mods/fml/common/IFMLSidedHandler.java
View file

@ -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;

2
fml/common/cpw/mods/fml/common/IFuelHandler.java
View file

@ -1,6 +1,6 @@
package cpw.mods.fml.common;
import net.minecraft.src.ItemStack;
import net.minecraft.shared.ItemStack;
public interface IFuelHandler
{

4
fml/common/cpw/mods/fml/common/IPickupNotifier.java
View file

@ -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
{

2
fml/common/cpw/mods/fml/common/IPlayerTracker.java
View file

@ -14,7 +14,7 @@
package cpw.mods.fml.common;
import net.minecraft.src.EntityPlayer;
import net.minecraft.shared.EntityPlayer;
/**
* @author cpw

4
fml/common/cpw/mods/fml/common/IWorldGenerator.java
View file

@ -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.

2
fml/common/cpw/mods/fml/common/Loader.java
View file

@ -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;

2
fml/common/cpw/mods/fml/common/Mod.java
View file

@ -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

5
fml/common/cpw/mods/fml/common/WorldAccessContainer.java
View file

@ -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
{

4
fml/common/cpw/mods/fml/common/event/FMLServerStartingEvent.java
View file

@ -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

14
fml/common/cpw/mods/fml/common/modloader/BaseModProxy.java
View file

@ -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;

6
fml/common/cpw/mods/fml/common/modloader/IModLoaderSidedHelper.java
View file

@ -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
{

4
fml/common/cpw/mods/fml/common/modloader/ModLoaderChatListener.java
View file

@ -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

6
fml/common/cpw/mods/fml/common/modloader/ModLoaderConnectionHandler.java
View file

@ -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;

4
fml/common/cpw/mods/fml/common/modloader/ModLoaderCraftingHelper.java
View file

@ -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

3
fml/common/cpw/mods/fml/common/modloader/ModLoaderDispenseHelper.java
View file

@ -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;

2
fml/common/cpw/mods/fml/common/modloader/ModLoaderEntitySpawnCallback.java
View file

@ -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<EntitySpawnPacket, Entity>
{

2
fml/common/cpw/mods/fml/common/modloader/ModLoaderFuelHelper.java
View file

@ -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

4
fml/common/cpw/mods/fml/common/modloader/ModLoaderGuiHelper.java
View file

@ -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

7
fml/common/cpw/mods/fml/common/modloader/ModLoaderHelper.java
View file

@ -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;

2
fml/common/cpw/mods/fml/common/modloader/ModLoaderModContainer.java
View file

@ -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;

5
fml/common/cpw/mods/fml/common/modloader/ModLoaderPacketHandler.java
View file

@ -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;

3
fml/common/cpw/mods/fml/common/modloader/ModLoaderPickupNotifier.java
View file

@ -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

4
fml/common/cpw/mods/fml/common/modloader/ModLoaderVillageTradeHandler.java
View file

@ -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;

5
fml/common/cpw/mods/fml/common/modloader/ModLoaderWorldGenerator.java
View file

@ -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

3
fml/common/cpw/mods/fml/common/network/EntitySpawnAdjustmentPacket.java
View file

@ -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;

7
fml/common/cpw/mods/fml/common/network/EntitySpawnPacket.java
View file

@ -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;

18
fml/common/cpw/mods/fml/common/network/FMLNetworkHandler.java
View file

@ -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;

3
fml/common/cpw/mods/fml/common/network/FMLPacket.java
View file

@ -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;

4
fml/common/cpw/mods/fml/common/network/IChatListener.java
View file

@ -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
{

5
fml/common/cpw/mods/fml/common/network/IConnectionHandler.java
View file

@ -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
{

3
fml/common/cpw/mods/fml/common/network/IGuiHandler.java
View file

@ -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
{

3
fml/common/cpw/mods/fml/common/network/IPacketHandler.java
View file

@ -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
{

3
fml/common/cpw/mods/fml/common/network/ITinyPacketHandler.java
View file

@ -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
{

3
fml/common/cpw/mods/fml/common/network/ModIdentifiersPacket.java
View file

@ -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;

4
fml/common/cpw/mods/fml/common/network/ModListRequestPacket.java
View file

@ -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;

5
fml/common/cpw/mods/fml/common/network/ModListResponsePacket.java
View file

@ -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;

3
fml/common/cpw/mods/fml/common/network/ModMissingPacket.java
View file

@ -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
{

2
fml/common/cpw/mods/fml/common/network/NetworkMod.java
View file

@ -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)

2
fml/common/cpw/mods/fml/common/network/NetworkModHandler.java
View file

@ -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;

24
fml/common/cpw/mods/fml/common/network/NetworkRegistry.java
View file

@ -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;

6
fml/common/cpw/mods/fml/common/network/OpenGuiPacket.java
View file

@ -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;

8
fml/common/cpw/mods/fml/common/network/PacketDispatcher.java
View file

@ -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;

2
fml/common/cpw/mods/fml/common/registry/BlockTracker.java
View file

@ -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
{

14
fml/common/cpw/mods/fml/common/registry/EntityRegistry.java
View file

@ -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;

32
fml/common/cpw/mods/fml/common/registry/GameRegistry.java
View file

@ -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<? extends ItemBlock> itemclass)
public static void registerBlock(net.minecraft.shared.Block block, Class<? extends ItemBlock> itemclass)
{
if (Loader.instance().isInState(LoaderState.CONSTRUCTING))
{

8
fml/common/cpw/mods/fml/common/registry/LanguageRegistry.java
View file

@ -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
{

16
fml/common/cpw/mods/fml/common/registry/VillagerRegistry.java
View file

@ -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;

13
fml/common/cpw/mods/fml/server/FMLServerHandler.java
View file

@ -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