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

Automatically resolved imports.

Browse source
This commit is contained in:
LexManos 2012-12-12 21:58:35 -08:00
parent 52e87dd165
commit 061ab81041
81 changed files with 215 additions and 215 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
client/net/minecraftforge/client/EnumHelperClient.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.client; package net.minecraftforge.client;
import net.minecraft.src.EnumGameType; import net.minecraft.world.EnumGameType;
import net.minecraft.src.EnumOS; import net.minecraft.util.EnumOS;
import net.minecraft.src.EnumOptions; import net.minecraft.client.settings.EnumOptions;
import net.minecraft.src.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraftforge.common.EnumHelper; import net.minecraftforge.common.EnumHelper;
public class EnumHelperClient extends EnumHelper public class EnumHelperClient extends EnumHelper

28
client/net/minecraftforge/client/ForgeHooksClient.java
View file

@ -10,20 +10,20 @@ import org.lwjgl.opengl.GL12;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ITexturePack; import net.minecraft.client.texturepacks.ITexturePack;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemBlock; import net.minecraft.item.ItemBlock;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.src.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.src.RenderGlobal; import net.minecraft.client.renderer.RenderGlobal;
import net.minecraft.src.Tessellator; import net.minecraft.client.renderer.Tessellator;
import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.client.event.DrawBlockHighlightEvent;
import net.minecraftforge.client.event.RenderWorldLastEvent; import net.minecraftforge.client.event.RenderWorldLastEvent;
import net.minecraftforge.client.event.TextureLoadEvent; import net.minecraftforge.client.event.TextureLoadEvent;

10
client/net/minecraftforge/client/GuiControlsScrollPanel.java
View file

@ -4,11 +4,11 @@ import org.lwjgl.input.Mouse;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.GameSettings; import net.minecraft.client.settings.GameSettings;
import net.minecraft.src.GuiControls; import net.minecraft.client.gui.GuiControls;
import net.minecraft.src.GuiSlot; import net.minecraft.client.gui.GuiSlot;
import net.minecraft.src.KeyBinding; import net.minecraft.client.settings.KeyBinding;
import net.minecraft.src.Tessellator; import net.minecraft.client.renderer.Tessellator;
public class GuiControlsScrollPanel extends GuiSlot public class GuiControlsScrollPanel extends GuiSlot
{ {

8
client/net/minecraftforge/client/IItemRenderer.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.client; package net.minecraftforge.client;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
public interface IItemRenderer public interface IItemRenderer
{ {

12
client/net/minecraftforge/client/MinecraftForgeClient.java
View file

@ -7,12 +7,12 @@ package net.minecraftforge.client;
import org.lwjgl.opengl.Display; import org.lwjgl.opengl.Display;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.RenderBlocks; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.client.IItemRenderer.ItemRenderType; import net.minecraftforge.client.IItemRenderer.ItemRenderType;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;

2
client/net/minecraftforge/client/SkyProvider.java
View file

@ -3,7 +3,7 @@ package net.minecraftforge.client;
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.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.WorldClient; import net.minecraft.client.multiplayer.WorldClient;
//To-Do: Rename this to something more generic.. IRenderHandler? //To-Do: Rename this to something more generic.. IRenderHandler?
public abstract class SkyProvider public abstract class SkyProvider

8
client/net/minecraftforge/client/event/DrawBlockHighlightEvent.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.client.event; package net.minecraftforge.client.event;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.RenderGlobal; import net.minecraft.client.renderer.RenderGlobal;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

2
client/net/minecraftforge/client/event/RenderWorldLastEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event; package net.minecraftforge.client.event;
import net.minecraft.src.RenderGlobal; import net.minecraft.client.renderer.RenderGlobal;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class RenderWorldLastEvent extends Event public class RenderWorldLastEvent extends Event

2
client/net/minecraftforge/client/event/TextureLoadEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event; package net.minecraftforge.client.event;
import net.minecraft.src.ITexturePack; import net.minecraft.client.texturepacks.ITexturePack;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class TextureLoadEvent extends Event public class TextureLoadEvent extends Event

4
client/net/minecraftforge/client/event/sound/PlayBackgroundMusicEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
/** /**
* Raised when the SoundManager tries to play a Background Music file, * Raised when the SoundManager tries to play a Background Music file,

4
client/net/minecraftforge/client/event/sound/PlaySoundEffectEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
public class PlaySoundEffectEvent extends SoundResultEvent public class PlaySoundEffectEvent extends SoundResultEvent
{ {

2
client/net/minecraftforge/client/event/sound/PlaySoundEffectSourceEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
public class PlaySoundEffectSourceEvent extends SoundEvent public class PlaySoundEffectSourceEvent extends SoundEvent
{ {

4
client/net/minecraftforge/client/event/sound/PlaySoundEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
/*** /***
* Raised when the SoundManager tries to play a normal sound, * Raised when the SoundManager tries to play a normal sound,

2
client/net/minecraftforge/client/event/sound/PlaySoundSourceEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
public class PlaySoundSourceEvent extends SoundEvent public class PlaySoundSourceEvent extends SoundEvent
{ {

4
client/net/minecraftforge/client/event/sound/PlayStreamingEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
/** /**
* Raised when the SoundManager tries to play a 'Streaming' file, * Raised when the SoundManager tries to play a 'Streaming' file,

2
client/net/minecraftforge/client/event/sound/PlayStreamingSourceEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
public class PlayStreamingSourceEvent extends SoundEvent public class PlayStreamingSourceEvent extends SoundEvent
{ {

6
client/net/minecraftforge/client/event/sound/SoundEvent.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

2
client/net/minecraftforge/client/event/sound/SoundLoadEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
/** /**
* Raised by the SoundManager.loadSoundSettings, this would be a good place for * Raised by the SoundManager.loadSoundSettings, this would be a good place for

4
client/net/minecraftforge/client/event/sound/SoundResultEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
import net.minecraft.src.SoundPoolEntry; import net.minecraft.client.audio.SoundPoolEntry;
public abstract class SoundResultEvent extends SoundEvent public abstract class SoundResultEvent extends SoundEvent
{ {

2
client/net/minecraftforge/client/event/sound/SoundSetupEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.client.event.sound; package net.minecraftforge.client.event.sound;
import net.minecraft.src.SoundManager; import net.minecraft.client.audio.SoundManager;
/** /**
* This event is raised by the SoundManager when it does its first setup of the * This event is raised by the SoundManager when it does its first setup of the

2
common/net/minecraftforge/common/AchievementPage.java
View file

@ -11,7 +11,7 @@ import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import net.minecraft.src.Achievement; import net.minecraft.stats.Achievement;
public class AchievementPage public class AchievementPage
{ {

12
common/net/minecraftforge/common/BiomeManager.java
View file

@ -5,12 +5,12 @@ import java.util.Arrays;
import java.util.HashSet; import java.util.HashSet;
import java.util.Set; import java.util.Set;
import net.minecraft.src.BiomeGenBase; import net.minecraft.world.biome.BiomeGenBase;
import net.minecraft.src.ChunkProviderGenerate; import net.minecraft.world.gen.ChunkProviderGenerate;
import net.minecraft.src.IChunkProvider; import net.minecraft.world.chunk.IChunkProvider;
import net.minecraft.src.MapGenStronghold; import net.minecraft.world.gen.structure.MapGenStronghold;
import net.minecraft.src.MapGenVillage; import net.minecraft.world.gen.structure.MapGenVillage;
import net.minecraft.src.WorldChunkManager; import net.minecraft.world.biome.WorldChunkManager;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;

4
common/net/minecraftforge/common/Configuration.java
View file

@ -26,8 +26,8 @@ import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Loader;
import cpw.mods.fml.relauncher.FMLInjectionData; import cpw.mods.fml.relauncher.FMLInjectionData;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import static net.minecraftforge.common.Property.Type.*; import static net.minecraftforge.common.Property.Type.*;
/** /**

8
common/net/minecraftforge/common/DungeonHooks.java
View file

@ -3,10 +3,10 @@ package net.minecraftforge.common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.WeightedRandom; import net.minecraft.util.WeightedRandom;
import net.minecraft.src.WeightedRandomItem; import net.minecraft.util.WeightedRandomItem;
public class DungeonHooks public class DungeonHooks
{ {

22
common/net/minecraftforge/common/ForgeChunkManager.java
View file

@ -43,17 +43,17 @@ import cpw.mods.fml.common.Loader;
import cpw.mods.fml.common.ModContainer; import cpw.mods.fml.common.ModContainer;
import net.minecraft.server.MinecraftServer; import net.minecraft.server.MinecraftServer;
import net.minecraft.src.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.src.ChunkCoordIntPair; import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.src.CompressedStreamTools; import net.minecraft.nbt.CompressedStreamTools;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.src.NBTBase; import net.minecraft.nbt.NBTBase;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraft.src.WorldServer; import net.minecraft.world.WorldServer;
import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Ticket;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

8
common/net/minecraftforge/common/ForgeDummyContainer.java
View file

@ -4,10 +4,10 @@ import java.io.File;
import java.util.Arrays; import java.util.Arrays;
import java.util.Map; import java.util.Map;
import net.minecraft.src.NBTBase; import net.minecraft.nbt.NBTBase;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.SaveHandler; import net.minecraft.world.storage.SaveHandler;
import net.minecraft.src.WorldInfo; import net.minecraft.world.storage.WorldInfo;
import com.google.common.eventbus.EventBus; import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe; import com.google.common.eventbus.Subscribe;

2
common/net/minecraftforge/common/IArmorTextureProvider.java
View file

@ -5,7 +5,7 @@
package net.minecraftforge.common; package net.minecraftforge.common;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
/** /**
* This interface has to be implemented by an instance of ItemArmor. * This interface has to be implemented by an instance of ItemArmor.

6
common/net/minecraftforge/common/IMinecartCollisionHandler.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.common; package net.minecraftforge.common;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
/** /**
* This class defines a replacement for the default minecart collision code. * This class defines a replacement for the default minecart collision code.

2
common/net/minecraftforge/common/IPlantable.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.common; package net.minecraftforge.common;
import net.minecraft.src.World; import net.minecraft.world.World;
public interface IPlantable public interface IPlantable
{ {

8
common/net/minecraftforge/common/IShearable.java
View file

@ -2,10 +2,10 @@ package net.minecraftforge.common;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* *

2
common/net/minecraftforge/common/ISidedInventory.java
View file

@ -5,7 +5,7 @@
package net.minecraftforge.common; package net.minecraftforge.common;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
/** Inventory ranges mapped by side. This class is implemented by TileEntities /** Inventory ranges mapped by side. This class is implemented by TileEntities
* that provide different inventory slot ranges to different sides. * that provide different inventory slot ranges to different sides.

10
common/net/minecraftforge/common/ISpecialArmor.java
View file

@ -8,11 +8,11 @@ package net.minecraftforge.common;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import net.minecraft.src.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemArmor; import net.minecraft.item.ItemArmor;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
/** /**
* This interface is to be implemented by ItemArmor classes. It will allow to * This interface is to be implemented by ItemArmor classes. It will allow to

2
common/net/minecraftforge/common/IThrowableEntity.java
View file

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

6
common/net/minecraftforge/common/MinecartRegistry.java
View file

@ -5,9 +5,9 @@ import java.util.HashSet;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class MinecartRegistry public class MinecartRegistry
{ {

16
common/net/minecraftforge/common/WorldSpecificSaveHandler.java
View file

@ -2,14 +2,14 @@ package net.minecraftforge.common;
import java.io.File; import java.io.File;
import net.minecraft.src.IChunkLoader; import net.minecraft.world.chunk.storage.IChunkLoader;
import net.minecraft.src.IPlayerFileData; import net.minecraft.world.storage.IPlayerFileData;
import net.minecraft.src.ISaveHandler; import net.minecraft.world.storage.ISaveHandler;
import net.minecraft.src.MinecraftException; import net.minecraft.world.MinecraftException;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.WorldInfo; import net.minecraft.world.storage.WorldInfo;
import net.minecraft.src.WorldProvider; import net.minecraft.world.WorldProvider;
import net.minecraft.src.WorldServer; import net.minecraft.world.WorldServer;
//Class used internally to provide the world specific data directories. //Class used internally to provide the world specific data directories.

4
common/net/minecraftforge/event/CommandEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event; package net.minecraftforge.event;
import net.minecraft.src.ICommand; import net.minecraft.command.ICommand;
import net.minecraft.src.ICommandSender; import net.minecraft.command.ICommandSender;
@Cancelable @Cancelable
public class CommandEvent extends Event public class CommandEvent extends Event

2
common/net/minecraftforge/event/ServerChatEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event; package net.minecraftforge.event;
import net.minecraft.src.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
@Cancelable @Cancelable
public class ServerChatEvent extends Event { public class ServerChatEvent extends Event {

2
common/net/minecraftforge/event/entity/EntityEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity; package net.minecraftforge.event.entity;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class EntityEvent extends Event public class EntityEvent extends Event

4
common/net/minecraftforge/event/entity/EntityJoinWorldEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity; package net.minecraftforge.event.entity;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

2
common/net/minecraftforge/event/entity/PlaySoundAtEntityEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity; package net.minecraftforge.event.entity;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

2
common/net/minecraftforge/event/entity/item/ItemEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.item; package net.minecraftforge.event.entity.item;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;
/** /**

2
common/net/minecraftforge/event/entity/item/ItemExpireEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.item; package net.minecraftforge.event.entity.item;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;

4
common/net/minecraftforge/event/entity/item/ItemTossEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.item; package net.minecraftforge.event.entity.item;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;

4
common/net/minecraftforge/event/entity/living/LivingAttackEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/living/LivingDeathEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

6
common/net/minecraftforge/event/entity/living/LivingDropsEvent.java
View file

@ -2,9 +2,9 @@ package net.minecraftforge.event.entity.living;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

2
common/net/minecraftforge/event/entity/living/LivingEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;

2
common/net/minecraftforge/event/entity/living/LivingFallEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/living/LivingHurtEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.DamageSource; import net.minecraft.util.DamageSource;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

2
common/net/minecraftforge/event/entity/living/LivingSetAttackTargetEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
public class LivingSetAttackTargetEvent extends LivingEvent public class LivingSetAttackTargetEvent extends LivingEvent
{ {

4
common/net/minecraftforge/event/entity/living/LivingSpecialSpawnEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.living; package net.minecraftforge.event.entity.living;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/minecart/MinecartCollisionEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.minecart; package net.minecraftforge.event.entity.minecart;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
public class MinecartCollisionEvent extends MinecartEvent public class MinecartCollisionEvent extends MinecartEvent
{ {

4
common/net/minecraftforge/event/entity/minecart/MinecartEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.minecart; package net.minecraftforge.event.entity.minecart;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
import net.minecraftforge.event.entity.EntityEvent; import net.minecraftforge.event.entity.EntityEvent;
public class MinecartEvent extends EntityEvent public class MinecartEvent extends EntityEvent

4
common/net/minecraftforge/event/entity/minecart/MinecartInteractEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.minecart; package net.minecraftforge.event.entity.minecart;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

2
common/net/minecraftforge/event/entity/minecart/MinecartUpdateEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.entity.minecart; package net.minecraftforge.event.entity.minecart;
import net.minecraft.src.EntityMinecart; import net.minecraft.entity.item.EntityMinecart;
public class MinecartUpdateEvent extends MinecartEvent public class MinecartUpdateEvent extends MinecartEvent
{ {

4
common/net/minecraftforge/event/entity/player/ArrowLooseEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/player/ArrowNockEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/player/AttackEntityEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

4
common/net/minecraftforge/event/entity/player/BonemealEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

4
common/net/minecraftforge/event/entity/player/EntityInteractEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
@Cancelable @Cancelable

6
common/net/minecraftforge/event/entity/player/EntityItemPickupEvent.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

8
common/net/minecraftforge/event/entity/player/FillBucketEvent.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

4
common/net/minecraftforge/event/entity/player/PlayerDestroyItemEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class PlayerDestroyItemEvent extends PlayerEvent public class PlayerDestroyItemEvent extends PlayerEvent
{ {

6
common/net/minecraftforge/event/entity/player/PlayerEvent.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.living.LivingEvent;

4
common/net/minecraftforge/event/entity/player/PlayerInteractEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
import static net.minecraftforge.event.Event.Result; import static net.minecraftforge.event.Event.Result;

4
common/net/minecraftforge/event/entity/player/PlayerSleepInBedEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EnumStatus; import net.minecraft.entity.player.EnumStatus;
public class PlayerSleepInBedEvent extends PlayerEvent public class PlayerSleepInBedEvent extends PlayerEvent
{ {

6
common/net/minecraftforge/event/entity/player/UseHoeEvent.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.event.entity.player; package net.minecraftforge.event.entity.player;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Cancelable; import net.minecraftforge.event.Cancelable;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

4
common/net/minecraftforge/event/terraingen/WorldTypeEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.terraingen; package net.minecraftforge.event.terraingen;
import net.minecraft.src.GenLayer; import net.minecraft.world.gen.layer.GenLayer;
import net.minecraft.src.WorldType; import net.minecraft.world.WorldType;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class WorldTypeEvent extends Event public class WorldTypeEvent extends Event

4
common/net/minecraftforge/event/world/ChunkDataEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.event.world; package net.minecraftforge.event.world;
import net.minecraft.src.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public class ChunkDataEvent extends ChunkEvent public class ChunkDataEvent extends ChunkEvent
{ {

6
common/net/minecraftforge/event/world/ChunkEvent.java
View file

@ -1,8 +1,8 @@
package net.minecraftforge.event.world; package net.minecraftforge.event.world;
import net.minecraft.src.Chunk; import net.minecraft.world.chunk.Chunk;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
public class ChunkEvent extends WorldEvent public class ChunkEvent extends WorldEvent
{ {

8
common/net/minecraftforge/event/world/ChunkWatchEvent.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.event.world; package net.minecraftforge.event.world;
import net.minecraft.src.ChunkCoordIntPair; import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.src.EntityPlayerMP; import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.src.PlayerInstance; import net.minecraft.server.management.PlayerInstance;
import net.minecraft.src.WorldServer; import net.minecraft.world.WorldServer;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class ChunkWatchEvent extends Event public class ChunkWatchEvent extends Event

2
common/net/minecraftforge/event/world/WorldEvent.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.event.world; package net.minecraftforge.event.world;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
public class WorldEvent extends Event public class WorldEvent extends Event

2
common/net/minecraftforge/liquids/IBlockLiquid.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.liquids; package net.minecraftforge.liquids;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
/** /**
* Implementors of this interface are a liquid which may receive a block implementation and can be placed in the world. * Implementors of this interface are a liquid which may receive a block implementation and can be placed in the world.

4
common/net/minecraftforge/liquids/LiquidContainerData.java
View file

@ -9,8 +9,8 @@
package net.minecraftforge.liquids; package net.minecraftforge.liquids;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class LiquidContainerData { public class LiquidContainerData {

6
common/net/minecraftforge/liquids/LiquidContainerRegistry.java
View file

@ -9,9 +9,9 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class LiquidContainerRegistry { public class LiquidContainerRegistry {

2
common/net/minecraftforge/liquids/LiquidDictionary.java
View file

@ -3,7 +3,7 @@ package net.minecraftforge.liquids;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;
import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent; import net.minecraftforge.oredict.OreDictionary.OreRegisterEvent;

4
common/net/minecraftforge/liquids/LiquidEvent.java
View file

@ -1,7 +1,7 @@
package net.minecraftforge.liquids; package net.minecraftforge.liquids;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.event.Event; import net.minecraftforge.event.Event;

8
common/net/minecraftforge/liquids/LiquidStack.java
View file

@ -1,9 +1,9 @@
package net.minecraftforge.liquids; package net.minecraftforge.liquids;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
/** /**
* ItemStack substitute for liquids * ItemStack substitute for liquids

2
common/net/minecraftforge/liquids/LiquidTank.java
View file

@ -1,6 +1,6 @@
package net.minecraftforge.liquids; package net.minecraftforge.liquids;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
/** /**
* Reference implementation of ILiquidTank. Use this or implement your own. * Reference implementation of ILiquidTank. Use this or implement your own.

14
common/net/minecraftforge/oredict/ShapedOreRecipe.java
View file

@ -5,13 +5,13 @@ import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.src.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.ShapedRecipes; import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.src.World; import net.minecraft.world.World;
public class ShapedOreRecipe implements IRecipe public class ShapedOreRecipe implements IRecipe
{ {

16
common/net/minecraftforge/oredict/ShapelessOreRecipe.java
View file

@ -6,14 +6,14 @@ import java.util.Map;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.List; import java.util.List;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.CraftingManager; import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.src.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.src.InventoryCrafting; import net.minecraft.inventory.InventoryCrafting;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.ShapelessRecipes; import net.minecraft.item.crafting.ShapelessRecipes;
import net.minecraft.src.World; import net.minecraft.world.World;
public class ShapelessOreRecipe implements IRecipe public class ShapelessOreRecipe implements IRecipe
{ {