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

Update all imports for repackaging. Branch is compileable.

Browse source
This commit is contained in:
LexManos 2012-12-08 20:21:03 -08:00
parent e63311b4d0
commit 804e597aca
82 changed files with 331 additions and 190 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

@ -1,10 +1,10 @@
package cpw.mods.fml.client; package cpw.mods.fml.client;
import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.IFMLHandledException; import cpw.mods.fml.common.IFMLHandledException;
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;
import net.minecraft.client.FontRenderer;
import net.minecraft.client.GuiErrorScreen;
/** /**
* If a mod throws this exception during loading, it will be called back to render * If a mod throws this exception during loading, it will be called back to render

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

@ -21,20 +21,22 @@ import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.multiplayer.GuiConnecting;
import net.minecraft.client.multiplayer.NetClientHandler;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.crash.CrashReport;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.CrashReport; import net.minecraft.world.World;
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.base.Throwables;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;

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

@ -18,9 +18,10 @@ import java.awt.Dimension;
import java.util.List; import java.util.List;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.client.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.TextureFX; import net.minecraft.client.renderer.texturefx.TextureFX;
import net.minecraft.client.ITexturePack; import net.minecraft.client.texturepacks.ITexturePack;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;

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

@ -1,8 +1,8 @@
package cpw.mods.fml.client; package cpw.mods.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.WrongMinecraftVersionException; import cpw.mods.fml.common.WrongMinecraftVersionException;
import net.minecraft.client.GuiErrorScreen;
public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen public class GuiCustomModLoadingErrorScreen extends GuiErrorScreen
{ {

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

@ -3,11 +3,12 @@ package cpw.mods.fml.client;
import java.io.File; import java.io.File;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.DuplicateModsFoundException; import cpw.mods.fml.common.DuplicateModsFoundException;
import cpw.mods.fml.common.MissingModsException; import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.ArtifactVersion;
import net.minecraft.client.GuiErrorScreen;
public class GuiDupesFound extends GuiErrorScreen public class GuiDupesFound extends GuiErrorScreen
{ {

7
fml/client/cpw/mods/fml/client/GuiIdMismatchScreen.java
View file

@ -3,15 +3,16 @@ package cpw.mods.fml.client;
import java.util.List; import java.util.List;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiYesNo;
import net.minecraft.util.StringTranslate;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference;
import com.google.common.collect.MapDifference.ValueDifference; import com.google.common.collect.MapDifference.ValueDifference;
import cpw.mods.fml.common.registry.ItemData; import cpw.mods.fml.common.registry.ItemData;
import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.ArtifactVersion;
import net.minecraft.src.GuiButton;
import net.minecraft.src.GuiYesNo;
import net.minecraft.src.StringTranslate;
public class GuiIdMismatchScreen extends GuiYesNo { public class GuiIdMismatchScreen extends GuiYesNo {
private List<String> missingIds = Lists.newArrayList(); private List<String> missingIds = Lists.newArrayList();

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

@ -18,12 +18,12 @@ import java.awt.Dimension;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.client.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.GuiSmallButton; import net.minecraft.client.gui.GuiSmallButton;
import net.minecraft.shared.StringTranslate; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.client.Tessellator; import net.minecraft.util.StringTranslate;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

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

@ -1,8 +1,8 @@
package cpw.mods.fml.client; package cpw.mods.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.MissingModsException; import cpw.mods.fml.common.MissingModsException;
import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.ArtifactVersion;
import net.minecraft.client.GuiErrorScreen;
public class GuiModsMissing extends 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; package cpw.mods.fml.client;
import net.minecraft.client.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.GuiScreen; import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.GuiSmallButton; import net.minecraft.client.gui.GuiSmallButton;
import net.minecraft.shared.StringTranslate; import net.minecraft.util.StringTranslate;
import cpw.mods.fml.common.network.ModMissingPacket; import cpw.mods.fml.common.network.ModMissingPacket;
import cpw.mods.fml.common.versioning.ArtifactVersion; 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 java.util.List;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.GuiButton; import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.Tessellator; import net.minecraft.client.renderer.Tessellator;
import org.lwjgl.input.Mouse; import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

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

@ -16,7 +16,8 @@ package cpw.mods.fml.client;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.client.Tessellator; import net.minecraft.client.renderer.Tessellator;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.LoaderState.ModState;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;

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

@ -1,10 +1,9 @@
package cpw.mods.fml.client; package cpw.mods.fml.client;
import net.minecraft.client.gui.GuiErrorScreen;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.WrongMinecraftVersionException; import cpw.mods.fml.common.WrongMinecraftVersionException;
import cpw.mods.fml.common.versioning.ArtifactVersion; import cpw.mods.fml.common.versioning.ArtifactVersion;
import net.minecraft.client.GuiErrorScreen;
import net.minecraft.client.GuiScreen;
public class GuiWrongMinecraft extends GuiErrorScreen 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 java.awt.Dimension;
import net.minecraft.client.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.ITexturePack; import net.minecraft.client.texturepacks.ITexturePack;
public interface ITextureFX public interface ITextureFX
{ {

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

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

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

@ -19,10 +19,10 @@ import java.util.Map;
import javax.imageio.ImageIO; import javax.imageio.ImageIO;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.renderer.texturefx.TextureFX;
import net.minecraft.client.texturepacks.ITexturePack;
import net.minecraft.src.ModTextureStatic; import net.minecraft.src.ModTextureStatic;
import net.minecraft.client.RenderEngine;
import net.minecraft.client.TextureFX;
import net.minecraft.client.ITexturePack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

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

@ -14,10 +14,10 @@
package cpw.mods.fml.client.modloader; package cpw.mods.fml.client.modloader;
import net.minecraft.block.Block;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.src.BaseMod; import net.minecraft.src.BaseMod;
import net.minecraft.shared.Block; import net.minecraft.world.IBlockAccess;
import net.minecraft.shared.IBlockAccess;
import net.minecraft.client.RenderBlocks;
import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
/** /**

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

@ -7,9 +7,17 @@ import java.util.Map.Entry;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.src.BaseMod; import net.minecraft.src.BaseMod;
import net.minecraft.client.*; import net.minecraft.client.*;
import net.minecraft.shared.*; import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.multiplayer.NetClientHandler;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import com.google.common.base.Equivalences; import com.google.common.base.Equivalences;
import com.google.common.base.Supplier; import com.google.common.base.Supplier;

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

@ -1,9 +1,9 @@
package cpw.mods.fml.client.registry; package cpw.mods.fml.client.registry;
import net.minecraft.shared.TileEntity;
import net.minecraft.client.TileEntityRenderer;
import net.minecraft.client.TileEntitySpecialRenderer;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import net.minecraft.client.renderer.tileentity.TileEntityRenderer;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.tileentity.TileEntity;
public class ClientRegistry 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; package cpw.mods.fml.client.registry;
import net.minecraft.shared.Block; import net.minecraft.block.Block;
import net.minecraft.shared.IBlockAccess; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.RenderBlocks; import net.minecraft.world.IBlockAccess;
public interface ISimpleBlockRenderingHandler public interface ISimpleBlockRenderingHandler
{ {

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

@ -3,8 +3,11 @@ package cpw.mods.fml.client.registry;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import net.minecraft.shared.*; import net.minecraft.block.Block;
import net.minecraft.client.*; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.*;
import net.minecraft.entity.Entity;
import net.minecraft.world.IBlockAccess;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

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

@ -17,9 +17,25 @@ import static cpw.mods.fml.common.Side.CLIENT;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import net.minecraft.block.Block;
import net.minecraft.client.*; import net.minecraft.client.*;
import net.minecraft.client.entity.EntityClientPlayerMP;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.client.multiplayer.NetClientHandler;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetServerHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.*; import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.TickType;

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

@ -14,8 +14,8 @@
package net.minecraft.src; package net.minecraft.src;
import net.minecraft.client.EntityRenderer;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
public class EntityRendererProxy extends EntityRenderer public class EntityRendererProxy extends EntityRenderer
{ {

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

@ -19,12 +19,12 @@ import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.client.ITexturePack; import net.minecraft.block.Block;
import net.minecraft.client.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.TextureFX; import net.minecraft.client.renderer.texturefx.TextureFX;
import net.minecraft.shared.Block; import net.minecraft.client.texturepacks.ITexturePack;
import net.minecraft.shared.IBlockAccess; import net.minecraft.world.IBlockAccess;
import cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.TextureFXManager;
import cpw.mods.fml.client.registry.RenderingRegistry; import cpw.mods.fml.client.registry.RenderingRegistry;

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

@ -20,9 +20,40 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.block.Block;
import net.minecraft.block.BlockDispenser;
import net.minecraft.client.*; import net.minecraft.client.*;
import net.minecraft.client.gui.GuiScreen;
import net.minecraft.client.multiplayer.NetClientHandler;
import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.client.renderer.entity.Render;
import net.minecraft.client.renderer.texturefx.TextureFX;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.command.ICommand;
import net.minecraft.dispenser.IBehaviorDispenseItem;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.EnumCreatureType;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.Item;
import net.minecraft.item.ItemBlock;
import net.minecraft.item.ItemStack;
import net.minecraft.network.NetServerHandler;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.*; import net.minecraft.server.*;
import net.minecraft.shared.*; import net.minecraft.stats.Achievement;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.IChunkProvider;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.SpriteHelper; import cpw.mods.fml.client.SpriteHelper;
import cpw.mods.fml.client.TextureFXManager; import cpw.mods.fml.client.TextureFXManager;

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

@ -18,7 +18,7 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver; import java.awt.image.ImageObserver;
import net.minecraft.client.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

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

@ -20,7 +20,7 @@ import java.awt.Graphics2D;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.awt.image.ImageObserver; import java.awt.image.ImageObserver;
import net.minecraft.client.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

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

@ -20,8 +20,21 @@ import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.server.MinecraftServer; import net.minecraft.crash.CrashReport;
import net.minecraft.shared.*; import net.minecraft.crash.CrashReportCategory;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.nbt.NBTBase;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.server.*;
import net.minecraft.server.dedicated.DedicatedServer;
import net.minecraft.world.World;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.base.Strings; import com.google.common.base.Strings;

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

@ -19,7 +19,9 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import net.minecraft.shared.*; import net.minecraft.nbt.*;
import net.minecraft.world.storage.SaveHandler;
import net.minecraft.world.storage.WorldInfo;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;

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

@ -13,7 +13,9 @@
*/ */
package cpw.mods.fml.common; package cpw.mods.fml.common;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
/** /**
* Return a crafting handler for the mod container to call * Return a crafting handler for the mod container to call

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

@ -14,7 +14,8 @@ package cpw.mods.fml.common;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.*; import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/** /**

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

@ -2,7 +2,8 @@ package cpw.mods.fml.common;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.*; import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
/** /**
* *

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

@ -4,8 +4,12 @@ import java.util.List;
import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference;
import net.minecraft.entity.Entity;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.*;
import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket; import cpw.mods.fml.common.network.EntitySpawnAdjustmentPacket;
import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.network.EntitySpawnPacket;
import cpw.mods.fml.common.network.ModMissingPacket; 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; package cpw.mods.fml.common;
import net.minecraft.shared.ItemStack; import net.minecraft.item.ItemStack;
public interface IFuelHandler public interface IFuelHandler
{ {

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

@ -13,8 +13,8 @@
*/ */
package cpw.mods.fml.common; package cpw.mods.fml.common;
import net.minecraft.shared.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.shared.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
public interface IPickupNotifier public interface IPickupNotifier
{ {

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

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

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

@ -15,8 +15,9 @@ package cpw.mods.fml.common;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.IChunkProvider; import net.minecraft.world.World;
import net.minecraft.shared.World; import net.minecraft.world.chunk.IChunkProvider;
/** /**
* This is called back during world generation. * 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.concurrent.Callable;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.CallableMinecraftVersion; import net.minecraft.crash.CallableMinecraftVersion;
import com.google.common.base.CharMatcher; import com.google.common.base.CharMatcher;
import com.google.common.base.Function; import com.google.common.base.Function;

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

@ -18,11 +18,11 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import net.minecraft.item.ItemBlock;
import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage;
import net.minecraft.shared.ItemBlock;
/** /**
* The new mod style in FML 1.3 * The new mod style in FML 1.3
* *

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

@ -2,7 +2,9 @@ package cpw.mods.fml.common;
import java.util.Map; import java.util.Map;
import net.minecraft.shared.*; import net.minecraft.nbt.*;
import net.minecraft.world.storage.*;
public interface WorldAccessContainer 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; package cpw.mods.fml.common.event;
import net.minecraft.command.CommandHandler;
import net.minecraft.command.ICommand;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.CommandHandler;
import net.minecraft.shared.ICommand;
import cpw.mods.fml.common.LoaderState.ModState; import cpw.mods.fml.common.LoaderState.ModState;
public class FMLServerStartingEvent extends FMLStateEvent public class FMLServerStartingEvent extends FMLStateEvent

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

@ -16,8 +16,15 @@ package cpw.mods.fml.common.modloader;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.client.WorldClient; import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetServerHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.world.World;
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.TickType;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;

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

@ -1,8 +1,12 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet250CustomPayload;
import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.network.EntitySpawnPacket;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
import net.minecraft.shared.*;
public interface IModLoaderSidedHelper public interface IModLoaderSidedHelper
{ {

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

@ -1,6 +1,7 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.*; import net.minecraft.network.NetServerHandler;
import net.minecraft.network.packet.*;
import cpw.mods.fml.common.network.IChatListener; import cpw.mods.fml.common.network.IChatListener;
public class ModLoaderChatListener implements IChatListener public class ModLoaderChatListener implements IChatListener

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

@ -1,7 +1,11 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetLoginHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.*;
import cpw.mods.fml.common.network.IConnectionHandler; import cpw.mods.fml.common.network.IConnectionHandler;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;

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

@ -1,6 +1,8 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;
import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.ICraftingHandler; import cpw.mods.fml.common.ICraftingHandler;
public class ModLoaderCraftingHelper implements ICraftingHandler public class ModLoaderCraftingHelper implements ICraftingHandler

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

@ -2,7 +2,9 @@ package cpw.mods.fml.common.modloader;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.*; import net.minecraft.item.ItemStack;
import net.minecraft.world.World;
import cpw.mods.fml.common.IDispenseHandler; import cpw.mods.fml.common.IDispenseHandler;
import cpw.mods.fml.common.IDispenserHandler; import cpw.mods.fml.common.IDispenserHandler;

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

@ -2,14 +2,14 @@ package cpw.mods.fml.common.modloader;
import java.util.concurrent.Callable; import java.util.concurrent.Callable;
import net.minecraft.entity.Entity;
import com.google.common.base.Function; import com.google.common.base.Function;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.network.EntitySpawnPacket; import cpw.mods.fml.common.network.EntitySpawnPacket;
import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration; import cpw.mods.fml.common.registry.EntityRegistry.EntityRegistration;
import net.minecraft.shared.Entity;
public class ModLoaderEntitySpawnCallback implements Function<EntitySpawnPacket, 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; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.IFuelHandler;
public class ModLoaderFuelHelper implements IFuelHandler public class ModLoaderFuelHelper implements IFuelHandler

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

@ -1,6 +1,8 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
public class ModLoaderGuiHelper implements IGuiHandler public class ModLoaderGuiHelper implements IGuiHandler

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

@ -23,8 +23,13 @@ import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.ListMultimap; import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import net.minecraft.command.ICommand;
import net.minecraft.entity.Entity;
import net.minecraft.entity.animal.IAnimals;
import net.minecraft.entity.boss.EntityDragon;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.Container;
import net.minecraft.src.BaseMod; import net.minecraft.src.BaseMod;
import net.minecraft.shared.*;
import net.minecraft.src.TradeEntry; import net.minecraft.src.TradeEntry;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; 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.Set;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.ICommand; import net.minecraft.command.ICommand;
import com.google.common.base.Strings; import com.google.common.base.Strings;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;

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

@ -1,6 +1,8 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
import cpw.mods.fml.common.network.IPacketHandler; import cpw.mods.fml.common.network.IPacketHandler;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;

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

@ -1,6 +1,7 @@
package cpw.mods.fml.common.modloader; package cpw.mods.fml.common.modloader;
import net.minecraft.shared.*; import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.common.IPickupNotifier; import cpw.mods.fml.common.IPickupNotifier;
public class ModLoaderPickupNotifier implements IPickupNotifier public class ModLoaderPickupNotifier implements IPickupNotifier

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

@ -5,8 +5,10 @@ import java.util.Random;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import net.minecraft.shared.*; import net.minecraft.entity.EntityVillager;
import net.minecraft.item.Item;
import net.minecraft.src.TradeEntry; import net.minecraft.src.TradeEntry;
import net.minecraft.village.MerchantRecipeList;
import cpw.mods.fml.common.registry.VillagerRegistry; import cpw.mods.fml.common.registry.VillagerRegistry;
import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler; import cpw.mods.fml.common.registry.VillagerRegistry.IVillageTradeHandler;

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

@ -2,7 +2,11 @@ package cpw.mods.fml.common.modloader;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.*; import net.minecraft.world.World;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.world.gen.ChunkProviderGenerate;
import net.minecraft.world.gen.ChunkProviderHell;
import cpw.mods.fml.common.IWorldGenerator; import cpw.mods.fml.common.IWorldGenerator;
public class ModLoaderWorldGenerator implements IWorldGenerator public class ModLoaderWorldGenerator implements IWorldGenerator

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

@ -1,6 +1,7 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.shared.*; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;

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

@ -8,7 +8,10 @@ import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.*; import net.minecraft.entity.*;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.util.MathHelper;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteArrayDataOutput;

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

@ -11,8 +11,17 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.Item;
import net.minecraft.network.*;
import net.minecraft.network.packet.*;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.*; import net.minecraft.server.management.ServerConfigurationManager;
import net.minecraft.world.EnumGameType;
import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

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

@ -4,7 +4,8 @@ import java.util.Arrays;
import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ConcurrentMap;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.*; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import com.google.common.base.Throwables; import com.google.common.base.Throwables;
import com.google.common.collect.MapMaker; import com.google.common.collect.MapMaker;

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

@ -1,6 +1,6 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.shared.*; import net.minecraft.network.packet.*;
public interface IChatListener public interface IChatListener
{ {

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

@ -1,7 +1,10 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.NetLoginHandler;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet1Login;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.*;
public interface IConnectionHandler public interface IConnectionHandler
{ {

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

@ -1,6 +1,7 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.shared.*; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.world.World;
public interface IGuiHandler public interface IGuiHandler
{ {

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

@ -1,6 +1,7 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.shared.*; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.Packet250CustomPayload;
public interface IPacketHandler public interface IPacketHandler
{ {

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

@ -1,6 +1,6 @@
package cpw.mods.fml.common.network; package cpw.mods.fml.common.network;
import net.minecraft.shared.*; import net.minecraft.network.packet.*;
public interface ITinyPacketHandler public interface ITinyPacketHandler
{ {

10
fml/common/cpw/mods/fml/common/network/ModIdMapPacket.java
View file

@ -5,6 +5,10 @@ import java.util.BitSet;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.nbt.*;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteStreams; import com.google.common.io.ByteStreams;
@ -17,12 +21,6 @@ import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.common.registry.ItemData; import cpw.mods.fml.common.registry.ItemData;
import net.minecraft.src.CompressedStreamTools;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.NBTTagCompound;
import net.minecraft.src.NBTTagList;
import net.minecraft.src.NetHandler;
import net.minecraft.src.WorldClient;
import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDMAP; import static cpw.mods.fml.common.network.FMLPacket.Type.MOD_IDMAP;
public class ModIdMapPacket extends FMLPacket { public class ModIdMapPacket extends FMLPacket {

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

@ -6,7 +6,8 @@ import java.util.Collection;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.shared.*; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;

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

@ -8,7 +8,8 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import net.minecraft.shared.*; import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

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

@ -10,7 +10,9 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.logging.Logger; import java.util.logging.Logger;
import net.minecraft.shared.*; import net.minecraft.nbt.NBTTagList;
import net.minecraft.network.*;
import net.minecraft.network.packet.*;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;

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

@ -16,7 +16,8 @@ import cpw.mods.fml.common.versioning.ArtifactVersion;
import cpw.mods.fml.common.versioning.DefaultArtifactVersion; import cpw.mods.fml.common.versioning.DefaultArtifactVersion;
import cpw.mods.fml.common.versioning.VersionRange; import cpw.mods.fml.common.versioning.VersionRange;
import net.minecraft.shared.* import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
public class ModMissingPacket extends FMLPacket public class ModMissingPacket extends FMLPacket
{ {

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

@ -5,8 +5,6 @@ import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import net.minecraft.shared.Packet131MapData;
@Retention(RetentionPolicy.RUNTIME) @Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE) @Target(ElementType.TYPE)
public @interface NetworkMod public @interface NetworkMod

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.Set;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.Item; import net.minecraft.item.Item;
import com.google.common.base.Strings; import com.google.common.base.Strings;

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

@ -6,19 +6,13 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.inventory.Container;
import net.minecraft.network.*;
import net.minecraft.network.packet.*;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.Container; import net.minecraft.world.World;
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.Charsets;
import com.google.common.base.Joiner; 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; package cpw.mods.fml.common.network;
import net.minecraft.shared.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.shared.NetHandler; import net.minecraft.network.INetworkManager;
import net.minecraft.shared.INetworkManager; import net.minecraft.network.packet.NetHandler;
import com.google.common.io.ByteArrayDataInput; import com.google.common.io.ByteArrayDataInput;
import com.google.common.io.ByteArrayDataOutput; 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; package cpw.mods.fml.common.network;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.EntityPlayerMP;
import net.minecraft.shared.Packet;
import net.minecraft.shared.Packet131MapData;
import net.minecraft.shared.Packet250CustomPayload;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog; 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 java.util.BitSet;
import net.minecraft.shared.Block; import net.minecraft.block.Block;
class BlockTracker 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.concurrent.Callable;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.BiomeGenBase; import net.minecraft.entity.Entity;
import net.minecraft.shared.Entity; import net.minecraft.entity.EntityList;
import net.minecraft.shared.EntityList; import net.minecraft.entity.EntityLiving;
import net.minecraft.shared.EntityLiving; import net.minecraft.entity.EntityTracker;
import net.minecraft.shared.EntityTracker; import net.minecraft.entity.EnumCreatureType;
import net.minecraft.shared.EnumCreatureType; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.shared.SpawnListEntry; import net.minecraft.world.biome.SpawnListEntry;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;

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

@ -7,19 +7,22 @@ import java.util.Set;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.shared.BiomeGenBase; import net.minecraft.entity.item.EntityItem;
import net.minecraft.shared.CraftingManager; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.shared.EntityItem; import net.minecraft.inventory.IInventory;
import net.minecraft.shared.EntityPlayer; import net.minecraft.item.Item;
import net.minecraft.shared.FurnaceRecipes; import net.minecraft.item.ItemBlock;
import net.minecraft.shared.IChunkProvider; import net.minecraft.item.ItemStack;
import net.minecraft.shared.IInventory; import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.shared.IRecipe; import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.shared.ItemBlock; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.shared.ItemStack; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.shared.TileEntity; import net.minecraft.nbt.NBTTagList;
import net.minecraft.shared.World; import net.minecraft.tileentity.TileEntity;
import net.minecraft.shared.WorldType; import net.minecraft.world.World;
import net.minecraft.world.WorldType;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.world.chunk.IChunkProvider;
import com.google.common.base.Function; import com.google.common.base.Function;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
@ -136,7 +139,7 @@ public class GameRegistry
public static Object buildBlock(ModContainer container, Class<?> type, Block annotation) throws Exception public static Object buildBlock(ModContainer container, Class<?> type, Block annotation) throws Exception
{ {
Object o = type.getConstructor(int.class).newInstance(findSpareBlockId()); Object o = type.getConstructor(int.class).newInstance(findSpareBlockId());
registerBlock((net.minecraft.shared.Block) o); registerBlock((net.minecraft.block.Block) o);
return o; return o;
} }
@ -154,7 +157,7 @@ public class GameRegistry
* Register a block with the world * Register a block with the world
* *
*/ */
public static void registerBlock(net.minecraft.shared.Block block) public static void registerBlock(net.minecraft.block.Block block)
{ {
registerBlock(block, ItemBlock.class); registerBlock(block, ItemBlock.class);
} }
@ -165,7 +168,7 @@ public class GameRegistry
* @param block * @param block
* @param itemclass * @param itemclass
*/ */
public static void registerBlock(net.minecraft.shared.Block block, Class<? extends ItemBlock> itemclass) public static void registerBlock(net.minecraft.block.Block block, Class<? extends ItemBlock> itemclass)
{ {
if (Loader.instance().isInState(LoaderState.CONSTRUCTING)) if (Loader.instance().isInState(LoaderState.CONSTRUCTING))
{ {

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

@ -1,6 +1,6 @@
package cpw.mods.fml.common.registry; package cpw.mods.fml.common.registry;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
/** /**
* This interface should be implemented by an Entity that can be 'thrown', like snowballs. * This interface should be implemented by an Entity that can be 'thrown', like snowballs.

6
fml/common/cpw/mods/fml/common/registry/ItemData.java
View file

@ -2,6 +2,9 @@ package cpw.mods.fml.common.registry;
import java.util.Map; import java.util.Map;
import net.minecraft.item.Item;
import net.minecraft.nbt.NBTTagCompound;
import com.google.common.base.Objects; import com.google.common.base.Objects;
import com.google.common.collect.HashMultiset; import com.google.common.collect.HashMultiset;
import com.google.common.collect.Maps; import com.google.common.collect.Maps;
@ -9,9 +12,6 @@ import com.google.common.collect.Multiset;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import net.minecraft.src.Item;
import net.minecraft.src.NBTTagCompound;
public class ItemData { public class ItemData {
private static Map<String, Multiset<String>> modOrdinals = Maps.newHashMap(); private static Map<String, Multiset<String>> modOrdinals = Maps.newHashMap();

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.Map;
import java.util.Properties; import java.util.Properties;
import net.minecraft.shared.Block; import net.minecraft.block.Block;
import net.minecraft.shared.Item; import net.minecraft.item.Item;
import net.minecraft.shared.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.shared.StringTranslate; import net.minecraft.util.StringTranslate;
public class LanguageRegistry public class LanguageRegistry
{ {

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

@ -5,14 +5,12 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Random; import java.util.Random;
import net.minecraft.shared.ComponentVillageStartPiece; import net.minecraft.entity.EntityVillager;
import net.minecraft.shared.EntityVillager; import net.minecraft.item.Item;
import net.minecraft.shared.Item; import net.minecraft.util.Tuple;
import net.minecraft.shared.MapGenVillage; import net.minecraft.village.MerchantRecipeList;
import net.minecraft.shared.MerchantRecipeList; import net.minecraft.world.gen.structure.ComponentVillageStartPiece;
import net.minecraft.shared.StructureVillagePieceWeight; import net.minecraft.world.gen.structure.StructureVillagePieceWeight;
import net.minecraft.shared.StructureVillagePieces;
import net.minecraft.shared.Tuple;
import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.ArrayListMultimap;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;

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

@ -17,12 +17,13 @@ import java.util.List;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.MapDifference; import com.google.common.collect.MapDifference;
import net.minecraft.entity.Entity;
import net.minecraft.network.INetworkManager;
import net.minecraft.network.packet.NetHandler;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet131MapData;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.shared.Entity; import net.minecraft.world.World;
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.FMLCommonHandler;
import cpw.mods.fml.common.IFMLSidedHandler; import cpw.mods.fml.common.IFMLSidedHandler;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;