Anvilcraft/equivalent-exchange-3
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix imports for the new FML/MinecraftForge repackaging

Browse source
This commit is contained in:
pahimar 2012-12-13 10:01:41 -05:00
parent c078794880
commit 257ab2144b
55 changed files with 158 additions and 174 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ee3_client/ee3/client/core/ClientProxy.java
View file

@ -1,6 +1,6 @@
package ee3.client.core; package ee3.client.core;
import net.minecraft.src.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraftforge.client.EnumHelperClient; import net.minecraftforge.client.EnumHelperClient;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;

5
ee3_client/ee3/client/core/handlers/DrawBlockHighlightHandler.java
View file

@ -7,9 +7,8 @@ import ee3.common.item.ITransmutationStone;
import ee3.common.item.IChargeable; import ee3.common.item.IChargeable;
import ee3.common.lib.ConfigurationSettings; import ee3.common.lib.ConfigurationSettings;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import net.minecraft.src.EnumMovingObjectType; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.src.RenderEngine; import net.minecraft.util.EnumMovingObjectType;
import net.minecraft.src.Tessellator;
import net.minecraftforge.client.event.DrawBlockHighlightEvent; import net.minecraftforge.client.event.DrawBlockHighlightEvent;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;

8
ee3_client/ee3/client/core/handlers/KeyBindingHandler.java
View file

@ -3,10 +3,10 @@ package ee3.client.core.handlers;
import java.util.EnumSet; import java.util.EnumSet;
import java.util.logging.Level; import java.util.logging.Level;
import net.minecraft.src.EntityPlayer; import net.minecraft.client.settings.KeyBinding;
import net.minecraft.src.Item; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.Item;
import net.minecraft.src.KeyBinding; import net.minecraft.item.ItemStack;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.client.registry.KeyBindingRegistry; import cpw.mods.fml.client.registry.KeyBindingRegistry;
import cpw.mods.fml.common.TickType; import cpw.mods.fml.common.TickType;

16
ee3_client/ee3/client/core/handlers/RenderTickHandler.java
View file

@ -6,15 +6,13 @@ import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GL12; import org.lwjgl.opengl.GL12;
import net.minecraft.client.Minecraft; import net.minecraft.client.Minecraft;
import net.minecraft.src.Block; import net.minecraft.client.gui.ScaledResolution;
import net.minecraft.src.EntityItem; import net.minecraft.client.renderer.RenderHelper;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemBlock; import net.minecraft.block.Block;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.item.ItemBlock;
import net.minecraft.src.RenderHelper; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.RenderItem;
import net.minecraft.src.ScaledResolution;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
import cpw.mods.fml.common.ITickHandler; import cpw.mods.fml.common.ITickHandler;

3
ee3_client/ee3/client/core/helper/KeyBindingHelper.java
View file

@ -1,7 +1,8 @@
package ee3.client.core.helper; package ee3.client.core.helper;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.KeyBinding;
import net.minecraft.client.settings.KeyBinding;
/** /**
* KeyBindings * KeyBindings

14
ee3_client/ee3/client/core/helper/RenderUtils.java
View file

@ -2,13 +2,13 @@ package ee3.client.core.helper;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.FontRenderer; import net.minecraft.client.gui.FontRenderer;
import net.minecraft.src.Item; import net.minecraft.client.renderer.RenderBlocks;
import net.minecraft.src.ItemStack; import net.minecraft.client.renderer.RenderEngine;
import net.minecraft.src.RenderBlocks; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.src.RenderEngine; import net.minecraft.item.Item;
import net.minecraft.src.Tessellator; import net.minecraft.item.ItemStack;
public class RenderUtils { public class RenderUtils {

9
ee3_client/ee3/client/gui/GuiCalcinator.java
View file

@ -1,5 +1,9 @@
package ee3.client.gui; package ee3.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.util.StatCollector;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
@ -9,11 +13,6 @@ import ee3.common.container.ContainerCalcinator;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator; import ee3.common.tile.TileCalcinator;
import net.minecraft.src.Container;
import net.minecraft.src.GuiContainer;
import net.minecraft.src.InventoryPlayer;
import net.minecraft.src.StatCollector;
import net.minecraft.src.TileEntityFurnace;
/** /**
* GuiCalcinator * GuiCalcinator

10
ee3_client/ee3/client/gui/GuiPortableCrafting.java
View file

@ -1,15 +1,15 @@
package ee3.client.gui; package ee3.client.gui;
import net.minecraft.client.gui.inventory.GuiContainer;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.StatCollector;
import net.minecraft.world.World;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
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 ee3.common.container.ContainerPortableCrafting; import ee3.common.container.ContainerPortableCrafting;
import net.minecraft.src.Container;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.GuiContainer;
import net.minecraft.src.StatCollector;
import net.minecraft.src.World;
/** /**
* GuiPortableCrafting * GuiPortableCrafting

4
ee3_client/ee3/client/render/ModelCalcinator.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import ee3.common.tile.TileCalcinator; import ee3.common.tile.TileCalcinator;
import net.minecraft.src.ModelBase; import net.minecraft.client.model.ModelBase;
import net.minecraft.src.ModelRenderer; import net.minecraft.client.model.ModelRenderer;
import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.ForgeHooksClient;
/** /**

6
ee3_client/ee3/client/render/RenderCalcinator.java
View file

@ -4,10 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.tile.TileCalcinator; import ee3.common.tile.TileCalcinator;
import net.minecraft.src.ModelBase; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.src.ModelRenderer; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.TileEntity;
import net.minecraft.src.TileEntitySpecialRenderer;
/** /**
* RenderCalcinator * RenderCalcinator

4
ee3_client/ee3/client/render/RenderItemCalcinator.java
View file

@ -4,8 +4,8 @@ import org.lwjgl.opengl.GL11;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import net.minecraft.src.ItemStack; import net.minecraft.client.renderer.Tessellator;
import net.minecraft.src.Tessellator; import net.minecraft.item.ItemStack;
import net.minecraftforge.client.ForgeHooksClient; import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.client.IItemRenderer; import net.minecraftforge.client.IItemRenderer;

2
ee3_client/ee3/client/render/TextureRedWaterFX.java
View file

@ -2,7 +2,7 @@ package ee3.client.render;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;
import net.minecraft.src.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import net.minecraftforge.client.MinecraftForgeClient; import net.minecraftforge.client.MinecraftForgeClient;
import cpw.mods.fml.client.FMLTextureFX; import cpw.mods.fml.client.FMLTextureFX;
import ee3.common.block.ModBlocks; import ee3.common.block.ModBlocks;

2
ee3_client/ee3/client/render/TextureRedWaterFlowFX.java
View file

@ -1,6 +1,6 @@
package ee3.client.render; package ee3.client.render;
import net.minecraft.src.RenderEngine; import net.minecraft.client.renderer.RenderEngine;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
ee3_common/ee3/common/EquivalentExchange3.java
View file

@ -1,6 +1,6 @@
package ee3.common; package ee3.common;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod;

9
ee3_common/ee3/common/block/BlockCalcinator.java
View file

@ -5,11 +5,10 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.RenderIds; import ee3.common.lib.RenderIds;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import ee3.common.tile.TileCalcinator; import ee3.common.tile.TileCalcinator;
import net.minecraft.src.CreativeTabs; import net.minecraft.block.material.Material;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.Material; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.TileEntity; import net.minecraft.world.World;
import net.minecraft.src.World;
/** /**
* BlockCalcinator * BlockCalcinator

6
ee3_common/ee3/common/block/BlockEE.java
View file

@ -1,9 +1,7 @@
package ee3.common.block; package ee3.common.block;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.TileEntity;
import net.minecraft.src.World;
/** /**
* BlockEE * BlockEE

5
ee3_common/ee3/common/block/BlockRedWaterFlowing.java
View file

@ -4,9 +4,8 @@ import ee3.common.EquivalentExchange3;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import net.minecraft.src.BlockFlowing; import net.minecraft.block.BlockFlowing;
import net.minecraft.src.CreativeTabs; import net.minecraft.block.material.Material;
import net.minecraft.src.Material;
/** /**
* BlockRedWaterFlowing * BlockRedWaterFlowing

4
ee3_common/ee3/common/block/BlockRedWaterStill.java
View file

@ -3,8 +3,8 @@ package ee3.common.block;
import ee3.common.EquivalentExchange3; import ee3.common.EquivalentExchange3;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import net.minecraft.src.BlockStationary; import net.minecraft.block.BlockStationary;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
/** /**
* BlockRedWaterFlowing * BlockRedWaterFlowing

7
ee3_common/ee3/common/block/ModBlocks.java
View file

@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3; import ee3.common.EquivalentExchange3;
import ee3.common.lib.BlockIds; import ee3.common.lib.BlockIds;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
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.Material;
/** /**
* ModBlocks * ModBlocks

14
ee3_common/ee3/common/container/ContainerCalcinator.java
View file

@ -1,13 +1,13 @@
package ee3.common.container; package ee3.common.container;
import ee3.common.tile.TileCalcinator; import ee3.common.tile.TileCalcinator;
import net.minecraft.src.Container; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.src.FurnaceRecipes; import net.minecraft.inventory.Container;
import net.minecraft.src.InventoryPlayer; import net.minecraft.inventory.Slot;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Slot; import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.src.TileEntityFurnace; import net.minecraft.tileentity.TileEntityFurnace;
/** /**
* ContainerCalcinator * ContainerCalcinator

8
ee3_common/ee3/common/container/ContainerPortableCrafting.java
View file

@ -1,9 +1,9 @@
package ee3.common.container; package ee3.common.container;
import net.minecraft.src.ContainerWorkbench; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.src.InventoryPlayer; import net.minecraft.inventory.ContainerWorkbench;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* ContainerPortableCrafting * ContainerPortableCrafting

6
ee3_common/ee3/common/core/CommonProxy.java
View file

@ -1,8 +1,8 @@
package ee3.common.core; package ee3.common.core;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.src.World; import net.minecraft.world.World;
import cpw.mods.fml.common.network.IGuiHandler; import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
import ee3.client.gui.GuiCalcinator; import ee3.client.gui.GuiCalcinator;

4
ee3_common/ee3/common/core/CreativeTabEE3.java
View file

@ -4,8 +4,8 @@ import cpw.mods.fml.common.Side;
import cpw.mods.fml.common.asm.SideOnly; import cpw.mods.fml.common.asm.SideOnly;
import ee3.common.item.ModItems; import ee3.common.item.ModItems;
import ee3.common.lib.ItemIds; import ee3.common.lib.ItemIds;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.Item; import net.minecraft.item.Item;
public class CreativeTabEE3 extends CreativeTabs { public class CreativeTabEE3 extends CreativeTabs {

4
ee3_common/ee3/common/core/addons/AddonRedPower2.java
View file

@ -8,8 +8,8 @@ import cpw.mods.fml.common.Loader;
import ee3.common.core.helper.LogHelper; import ee3.common.core.helper.LogHelper;
import ee3.common.core.helper.RecipeHelper; import ee3.common.core.helper.RecipeHelper;
import ee3.common.recipe.RecipesTransmutationStone; import ee3.common.recipe.RecipesTransmutationStone;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.ModLoader; import net.minecraft.src.ModLoader;
public class AddonRedPower2 { public class AddonRedPower2 {

5
ee3_common/ee3/common/core/handlers/EntityLivingHandler.java
View file

@ -3,10 +3,7 @@ package ee3.common.core.handlers;
import ee3.common.core.helper.ItemDropHelper; import ee3.common.core.helper.ItemDropHelper;
import ee3.common.core.helper.RedWaterHelper; import ee3.common.core.helper.RedWaterHelper;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.Potion;
import net.minecraft.src.PotionEffect;
import net.minecraftforge.event.ForgeSubscribe; import net.minecraftforge.event.ForgeSubscribe;
import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingDeathEvent;
import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent; import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;

2
ee3_common/ee3/common/core/handlers/EquivalencyHandler.java
View file

@ -3,7 +3,7 @@ package ee3.common.core.handlers;
import java.util.ArrayList; import java.util.ArrayList;
import ee3.common.core.helper.GeneralHelper; import ee3.common.core.helper.GeneralHelper;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
/** /**
* EquivalencyHandler * EquivalencyHandler

2
ee3_common/ee3/common/core/handlers/FuelHandler.java
View file

@ -1,6 +1,6 @@
package ee3.common.core.handlers; package ee3.common.core.handlers;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.IFuelHandler; import cpw.mods.fml.common.IFuelHandler;
/** /**

5
ee3_common/ee3/common/core/handlers/PacketHandler.java
View file

@ -3,8 +3,9 @@ package ee3.common.core.handlers;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import net.minecraft.src.INetworkManager; import net.minecraft.network.INetworkManager;
import net.minecraft.src.Packet250CustomPayload; 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;
import ee3.common.network.PacketEE; import ee3.common.network.PacketEE;

10
ee3_common/ee3/common/core/helper/GeneralHelper.java
View file

@ -2,11 +2,11 @@ package ee3.common.core.helper;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.EntityLiving; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.EntityMob; import net.minecraft.entity.monster.EntityMob;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
/** /**
* GeneralHelper * GeneralHelper

5
ee3_common/ee3/common/core/helper/ItemDropHelper.java
View file

@ -1,9 +1,8 @@
package ee3.common.core.helper; package ee3.common.core.helper;
import net.minecraft.entity.EntityLiving;
import net.minecraft.entity.player.EntityPlayer;
import ee3.common.item.ModItems; import ee3.common.item.ModItems;
import net.minecraft.src.EntityAgeable;
import net.minecraft.src.EntityLiving;
import net.minecraft.src.EntityPlayer;
/** /**
* ItemDropHelper * ItemDropHelper

4
ee3_common/ee3/common/core/helper/NBTHelper.java
View file

@ -1,7 +1,7 @@
package ee3.common.core.helper; package ee3.common.core.helper;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
/** /**
* NBTHelper * NBTHelper

2
ee3_common/ee3/common/core/helper/QualityHelper.java
View file

@ -1,6 +1,6 @@
package ee3.common.core.helper; package ee3.common.core.helper;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
/** /**
* QualityHelper * QualityHelper

8
ee3_common/ee3/common/core/helper/RecipeHelper.java
View file

@ -2,10 +2,10 @@ package ee3.common.core.helper;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.FurnaceRecipes; import net.minecraft.item.crafting.FurnaceRecipes;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.common.registry.GameRegistry;
/** /**

10
ee3_common/ee3/common/core/helper/RedWaterHelper.java
View file

@ -2,11 +2,11 @@ package ee3.common.core.helper;
import ee3.common.block.ModBlocks; import ee3.common.block.ModBlocks;
import ee3.common.lib.ConfigurationSettings; import ee3.common.lib.ConfigurationSettings;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.block.Block;
import net.minecraft.src.Block; import net.minecraft.entity.EntityLiving;
import net.minecraft.src.EntityLiving; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.src.MathHelper; import net.minecraft.util.MathHelper;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* RedWaterHelper * RedWaterHelper

16
ee3_common/ee3/common/core/helper/TransmutationHelper.java
View file

@ -4,14 +4,14 @@ import java.util.ArrayList;
import ee3.common.core.handlers.EquivalencyHandler; import ee3.common.core.handlers.EquivalencyHandler;
import ee3.common.lib.Sounds; import ee3.common.lib.Sounds;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.BlockSand; import net.minecraft.block.BlockSand;
import net.minecraft.src.BlockLeaves; import net.minecraft.block.BlockLeaves;
import net.minecraft.src.EntityPlayer; import net.minecraft.item.ItemBlock;
import net.minecraft.src.ItemBlock; import net.minecraft.item.ItemStack;
import net.minecraft.src.ItemStack; import net.minecraft.world.World;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.World; import net.minecraft.entity.player.EntityPlayer;
/** /**
* TransmutationHelper * TransmutationHelper

6
ee3_common/ee3/common/emc/EMCRegistry.java
View file

@ -3,9 +3,9 @@ package ee3.common.emc;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
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;
/** /**
* EMCRegistry * EMCRegistry

5
ee3_common/ee3/common/event/ModActionEvent.java
View file

@ -1,9 +1,8 @@
package ee3.common.event; package ee3.common.event;
import static net.minecraftforge.event.Event.Result.DEFAULT; import static net.minecraftforge.event.Event.Result.*;
import static net.minecraftforge.event.Event.Result.DENY;
import ee3.common.lib.ModAction; import ee3.common.lib.ModAction;
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.player.PlayerEvent; import net.minecraftforge.event.entity.player.PlayerEvent;

4
ee3_common/ee3/common/event/WorldTransmutationEvent.java
View file

@ -1,7 +1,7 @@
package ee3.common.event; package ee3.common.event;
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.Event; import net.minecraftforge.event.Event;
public class WorldTransmutationEvent extends Event { public class WorldTransmutationEvent extends Event {

2
ee3_common/ee3/common/item/IChargeable.java
View file

@ -1,6 +1,6 @@
package ee3.common.item; package ee3.common.item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public interface IChargeable { public interface IChargeable {

4
ee3_common/ee3/common/item/IKeyBound.java
View file

@ -1,7 +1,7 @@
package ee3.common.item; package ee3.common.item;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public interface IKeyBound { public interface IKeyBound {

2
ee3_common/ee3/common/item/ITransmutationStone.java
View file

@ -1,6 +1,6 @@
package ee3.common.item; package ee3.common.item;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
/** /**
* ITransmutationStone * ITransmutationStone

6
ee3_common/ee3/common/item/ItemAlchemyBag.java
View file

@ -2,9 +2,9 @@ package ee3.common.item;
import java.util.List; import java.util.List;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.MathHelper; import net.minecraft.util.MathHelper;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
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;

10
ee3_common/ee3/common/item/ItemAlchemyDust.java
View file

@ -2,12 +2,10 @@ package ee3.common.item;
import java.util.List; import java.util.List;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.EntityPlayer; import net.minecraft.item.EnumRarity;
import net.minecraft.src.EnumRarity; import net.minecraft.item.ItemStack;
import net.minecraft.src.ItemStack; import net.minecraft.util.MathHelper;
import net.minecraft.src.MathHelper;
import net.minecraft.src.StringTranslate;
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 cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.LanguageRegistry;

2
ee3_common/ee3/common/item/ItemEE.java
View file

@ -2,7 +2,7 @@ package ee3.common.item;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import ee3.common.lib.Sprites; import ee3.common.lib.Sprites;
import net.minecraft.src.Item; import net.minecraft.item.Item;
/** /**
* ItemEE * ItemEE

8
ee3_common/ee3/common/item/ItemMiniumStone.java
View file

@ -1,9 +1,9 @@
package ee3.common.item; package ee3.common.item;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.FMLClientHandler;
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;

8
ee3_common/ee3/common/item/ItemPhilosopherStone.java
View file

@ -16,10 +16,10 @@ import ee3.common.lib.WorldEvents;
import ee3.common.network.PacketKeyPressed; import ee3.common.network.PacketKeyPressed;
import ee3.common.network.PacketTypeHandler; import ee3.common.network.PacketTypeHandler;
import ee3.common.network.PacketWorldEvent; import ee3.common.network.PacketWorldEvent;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.EnumRarity; import net.minecraft.item.EnumRarity;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* ItemPhilosopherStone * ItemPhilosopherStone

7
ee3_common/ee3/common/item/ModItems.java
View file

@ -5,10 +5,9 @@ import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3; import ee3.common.EquivalentExchange3;
import ee3.common.lib.ItemIds; import ee3.common.lib.ItemIds;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.CreativeTabs; import net.minecraft.item.Item;
import net.minecraft.src.Item; import net.minecraft.item.ItemStack;
import net.minecraft.src.ItemStack;
/** /**
* ModItems * ModItems

3
ee3_common/ee3/common/network/PacketEE.java
View file

@ -4,8 +4,9 @@ import java.io.ByteArrayOutputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.minecraft.network.INetworkManager;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
import net.minecraft.src.INetworkManager;
/** /**
* PacketEE * PacketEE

7
ee3_common/ee3/common/network/PacketKeyPressed.java
View file

@ -4,6 +4,9 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.network.INetworkManager;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.common.registry.LanguageRegistry; import cpw.mods.fml.common.registry.LanguageRegistry;
import ee3.common.EquivalentExchange3; import ee3.common.EquivalentExchange3;
@ -13,10 +16,6 @@ import ee3.common.lib.GuiIds;
import ee3.common.lib.ItemIds; import ee3.common.lib.ItemIds;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import net.minecraft.src.EntityPlayer;
import net.minecraft.src.INetworkManager;
import net.minecraft.src.Packet250CustomPayload;
/** /**
* PacketKeyPressed * PacketKeyPressed
* *

2
ee3_common/ee3/common/network/PacketTileUpdate.java
View file

@ -6,7 +6,7 @@ import java.io.IOException;
import cpw.mods.fml.common.network.Player; import cpw.mods.fml.common.network.Player;
import net.minecraft.src.INetworkManager; import net.minecraft.network.INetworkManager;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
/** /**

5
ee3_common/ee3/common/network/PacketTypeHandler.java
View file

@ -3,10 +3,11 @@ package ee3.common.network;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import net.minecraft.network.packet.Packet;
import net.minecraft.network.packet.Packet250CustomPayload;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import net.minecraft.src.Packet;
import net.minecraft.src.Packet250CustomPayload;
/** /**
* PacketTypeHandler * PacketTypeHandler

6
ee3_common/ee3/common/network/PacketWorldEvent.java
View file

@ -4,9 +4,9 @@ import java.io.DataInputStream;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.IOException; import java.io.IOException;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.INetworkManager; import net.minecraft.network.INetworkManager;
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;
import net.minecraftforge.event.Event.Result; import net.minecraftforge.event.Event.Result;

8
ee3_common/ee3/common/recipe/RecipesTransmutationStone.java
View file

@ -8,10 +8,10 @@ import java.util.Map;
import cpw.mods.fml.common.ObfuscationReflectionHelper; import cpw.mods.fml.common.ObfuscationReflectionHelper;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.FurnaceRecipes; import net.minecraft.item.Item;
import net.minecraft.src.Item; import net.minecraft.item.ItemStack;
import net.minecraft.src.ItemStack; import net.minecraft.item.crafting.FurnaceRecipes;
import ee3.common.core.handlers.EquivalencyHandler; import ee3.common.core.handlers.EquivalencyHandler;
import ee3.common.core.helper.GeneralHelper; import ee3.common.core.helper.GeneralHelper;
import ee3.common.core.helper.RecipeHelper; import ee3.common.core.helper.RecipeHelper;

8
ee3_common/ee3/common/tile/TileCalcinator.java
View file

@ -2,10 +2,10 @@ package ee3.common.tile;
import ee3.common.block.ModBlocks; import ee3.common.block.ModBlocks;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.NBTTagList; import net.minecraft.nbt.NBTTagList;
/** /**
* TileCalcinator * TileCalcinator

6
ee3_common/ee3/common/tile/TileEE.java
View file

@ -2,9 +2,9 @@ package ee3.common.tile;
import ee3.common.lib.Reference; import ee3.common.lib.Reference;
import ee3.common.lib.Strings; import ee3.common.lib.Strings;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
/** /**
* TileEE * TileEE