Anvilcraft/buildcraft
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Repackage for new Forge.

Browse source
This commit is contained in:
SirSengir 2012-12-17 23:29:42 +01:00
parent 1cd36231fb
commit 6ed78f37b2
283 changed files with 943 additions and 943 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/buildcraft/BuildCraftBuilders.java
View file

@ -77,10 +77,10 @@ import buildcraft.core.blueprints.BptPlayerIndex;
import buildcraft.core.blueprints.BptRootIndex; import buildcraft.core.blueprints.BptRootIndex;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
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;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.Property; import net.minecraftforge.common.Property;

12
common/buildcraft/BuildCraftCore.java
View file

@ -63,12 +63,12 @@ import buildcraft.core.utils.Localization;
import buildcraft.transport.triggers.TriggerRedstoneInput; import buildcraft.transport.triggers.TriggerRedstoneInput;
import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.BlockFluid; import net.minecraft.block.BlockFluid;
import net.minecraft.src.CommandHandler; import net.minecraft.command.CommandHandler;
import net.minecraft.src.EntityList; import net.minecraft.entity.EntityList;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.Property; import net.minecraftforge.common.Property;

10
common/buildcraft/BuildCraftEnergy.java
View file

@ -44,11 +44,11 @@ import buildcraft.energy.OilPopulate;
import buildcraft.energy.TriggerEngineHeat; import buildcraft.energy.TriggerEngineHeat;
import buildcraft.energy.Engine.EnergyStage; import buildcraft.energy.Engine.EnergyStage;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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; import net.minecraft.block.material.Material;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.common.MinecraftForge;
import net.minecraftforge.common.Property; import net.minecraftforge.common.Property;

8
common/buildcraft/BuildCraftFactory.java
View file

@ -48,10 +48,10 @@ import buildcraft.factory.TileQuarry;
import buildcraft.factory.TileRefinery; import buildcraft.factory.TileRefinery;
import buildcraft.factory.TileTank; import buildcraft.factory.TileTank;
import buildcraft.factory.network.PacketHandlerFactory; import buildcraft.factory.network.PacketHandlerFactory;
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.World; import net.minecraft.world.World;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.ForgeChunkManager; import net.minecraftforge.common.ForgeChunkManager;
import net.minecraftforge.common.ForgeChunkManager.Ticket; import net.minecraftforge.common.ForgeChunkManager.Ticket;

6
common/buildcraft/BuildCraftSilicon.java
View file

@ -8,9 +8,9 @@
package buildcraft; package buildcraft;
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.minecraftforge.common.Property; import net.minecraftforge.common.Property;
import buildcraft.api.bptblocks.BptBlockInventory; import buildcraft.api.bptblocks.BptBlockInventory;
import buildcraft.api.bptblocks.BptBlockRotateMeta; import buildcraft.api.bptblocks.BptBlockRotateMeta;

10
common/buildcraft/BuildCraftTransport.java
View file

@ -81,11 +81,11 @@ import buildcraft.transport.triggers.TriggerPipeContents;
import buildcraft.transport.triggers.TriggerPipeSignal; import buildcraft.transport.triggers.TriggerPipeSignal;
import buildcraft.transport.triggers.TriggerPipeContents.Kind; import buildcraft.transport.triggers.TriggerPipeContents.Kind;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
import net.minecraftforge.common.Configuration; import net.minecraftforge.common.Configuration;
import net.minecraftforge.common.Property; import net.minecraftforge.common.Property;

2
common/buildcraft/api/blueprints/BlockSignature.java
View file

@ -74,4 +74,4 @@ public class BlockSignature {
customField = "*"; customField = "*";
} }
} }
} }

6
common/buildcraft/api/blueprints/BlueprintManager.java
View file

@ -1,9 +1,9 @@
package buildcraft.api.blueprints; package buildcraft.api.blueprints;
import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.BuildCraftAPI;
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 BlueprintManager { public class BlueprintManager {

10
common/buildcraft/api/blueprints/BptBlock.java
View file

@ -14,11 +14,11 @@ import java.util.LinkedList;
import buildcraft.api.core.BuildCraftAPI; import buildcraft.api.core.BuildCraftAPI;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
/** /**
* This class allow to specify specific behavior for blocks stored in * This class allow to specify specific behavior for blocks stored in

10
common/buildcraft/api/blueprints/BptBlockUtils.java
View file

@ -12,10 +12,10 @@ package buildcraft.api.blueprints;
import java.util.LinkedList; import java.util.LinkedList;
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;
public class BptBlockUtils { public class BptBlockUtils {
@ -84,4 +84,4 @@ public class BptBlockUtils {
slot.cpt.setTag("inv", nbttaglist); slot.cpt.setTag("inv", nbttaglist);
} }
} }

6
common/buildcraft/api/blueprints/BptSlotInfo.java
View file

@ -11,8 +11,8 @@ package buildcraft.api.blueprints;
import java.util.LinkedList; import java.util.LinkedList;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
/** /**
* This class records a slot, either from a blueprint or from a block placed in * This class records a slot, either from a blueprint or from a block placed in
@ -55,4 +55,4 @@ public class BptSlotInfo {
return obj; return obj;
} }
} }

4
common/buildcraft/api/blueprints/IBptContext.java
View file

@ -11,8 +11,8 @@ package buildcraft.api.blueprints;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* This interface provide contextual information when building or initializing * This interface provide contextual information when building or initializing

2
common/buildcraft/api/blueprints/ItemSignature.java
View file

@ -44,4 +44,4 @@ public class ItemSignature {
itemName = "*"; itemName = "*";
} }
} }
} }

4
common/buildcraft/api/bptblocks/BptBlockBed.java
View file

@ -15,8 +15,8 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockBed extends BptBlock { public class BptBlockBed extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockCustomStack.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockCustomStack extends BptBlock { public class BptBlockCustomStack extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockDelegate.java
View file

@ -16,7 +16,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockDelegate extends BptBlock { public class BptBlockDelegate extends BptBlock {

4
common/buildcraft/api/bptblocks/BptBlockDirt.java
View file

@ -15,8 +15,8 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockDirt extends BptBlock { public class BptBlockDirt extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockDoor.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockDoor extends BptBlock { public class BptBlockDoor extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockIgnore.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockIgnore extends BptBlock { public class BptBlockIgnore extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockIgnoreMeta.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockIgnoreMeta extends BptBlock { public class BptBlockIgnoreMeta extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockInventory.java
View file

@ -3,7 +3,7 @@ package buildcraft.api.bptblocks;
import buildcraft.api.blueprints.BptBlock; import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
public class BptBlockInventory extends BptBlock { public class BptBlockInventory extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockLever.java
View file

@ -14,7 +14,7 @@ import java.util.LinkedList;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockLever extends BptBlockWallSide { public class BptBlockLever extends BptBlockWallSide {

2
common/buildcraft/api/bptblocks/BptBlockLiquid.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockLiquid extends BptBlock { public class BptBlockLiquid extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockPumpkin.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockPumpkin extends BptBlock { public class BptBlockPumpkin extends BptBlock {

4
common/buildcraft/api/bptblocks/BptBlockRedstoneRepeater.java
View file

@ -15,8 +15,8 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockRedstoneRepeater extends BptBlock { public class BptBlockRedstoneRepeater extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockRotateInventory.java
View file

@ -2,7 +2,7 @@ package buildcraft.api.bptblocks;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
public class BptBlockRotateInventory extends BptBlockRotateMeta { public class BptBlockRotateInventory extends BptBlockRotateMeta {

2
common/buildcraft/api/bptblocks/BptBlockRotateMeta.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockRotateMeta extends BptBlock { public class BptBlockRotateMeta extends BptBlock {

8
common/buildcraft/api/bptblocks/BptBlockSign.java
View file

@ -16,9 +16,9 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
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 BptBlockSign extends BptBlock { public class BptBlockSign extends BptBlock {
@ -62,4 +62,4 @@ public class BptBlockSign extends BptBlock {
return sig; return sig;
} }
} }

2
common/buildcraft/api/bptblocks/BptBlockStairs.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockStairs extends BptBlock { public class BptBlockStairs extends BptBlock {

2
common/buildcraft/api/bptblocks/BptBlockWallSide.java
View file

@ -15,7 +15,7 @@ import buildcraft.api.blueprints.BptBlock;
import buildcraft.api.blueprints.BptSlotInfo; import buildcraft.api.blueprints.BptSlotInfo;
import buildcraft.api.blueprints.IBptContext; import buildcraft.api.blueprints.IBptContext;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class BptBlockWallSide extends BptBlock { public class BptBlockWallSide extends BptBlock {

4
common/buildcraft/api/core/BuildCraftAPI.java
View file

@ -9,8 +9,8 @@
package buildcraft.api.core; package buildcraft.api.core;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.World; import net.minecraft.world.World;
public class BuildCraftAPI { public class BuildCraftAPI {

2
common/buildcraft/api/core/IBox.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.core; package buildcraft.api.core;
import net.minecraft.src.World; import net.minecraft.world.World;
public interface IBox { public interface IBox {

6
common/buildcraft/api/core/Position.java
View file

@ -9,8 +9,8 @@
package buildcraft.api.core; package buildcraft.api.core;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
public class Position { public class Position {
@ -139,4 +139,4 @@ public class Position {
return new Position(p.x < x ? x : p.x, p.y < y ? y : p.y, p.z < z ? z : p.z); return new Position(p.x < x ? x : p.x, p.y < y ? y : p.y, p.z < z ? z : p.z);
} }
} }

2
common/buildcraft/api/core/SafeTimeTracker.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.core; package buildcraft.api.core;
import net.minecraft.src.World; import net.minecraft.world.World;
public class SafeTimeTracker { public class SafeTimeTracker {

4
common/buildcraft/api/filler/IFillerPattern.java
View file

@ -1,8 +1,8 @@
package buildcraft.api.filler; package buildcraft.api.filler;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface IFillerPattern { public interface IFillerPattern {

2
common/buildcraft/api/filler/IFillerRegistry.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.filler; package buildcraft.api.filler;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
public interface IFillerRegistry { public interface IFillerRegistry {

4
common/buildcraft/api/gates/ActionManager.java
View file

@ -4,8 +4,8 @@ import java.util.LinkedList;
import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class ActionManager { public class ActionManager {

2
common/buildcraft/api/gates/IAction.java
View file

@ -8,4 +8,4 @@ public interface IAction {
boolean hasParameter(); boolean hasParameter();
String getDescription(); String getDescription();
} }

4
common/buildcraft/api/gates/IActionProvider.java
View file

@ -11,8 +11,8 @@ package buildcraft.api.gates;
import java.util.LinkedList; import java.util.LinkedList;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface IActionProvider { public interface IActionProvider {

4
common/buildcraft/api/gates/ITrigger.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.gates; package buildcraft.api.gates;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface ITrigger { public interface ITrigger {
@ -38,4 +38,4 @@ public interface ITrigger {
*/ */
public abstract ITriggerParameter createParameter(); public abstract ITriggerParameter createParameter();
} }

4
common/buildcraft/api/gates/ITriggerDirectional.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.gates; package buildcraft.api.gates;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
// TODO: Merge with ITrigger // TODO: Merge with ITrigger
@ -17,4 +17,4 @@ public interface ITriggerDirectional extends ITrigger {
* the parameters. * the parameters.
*/ */
public abstract boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter); public abstract boolean isTriggerActive(ForgeDirection side, TileEntity tile, ITriggerParameter parameter);
} }

6
common/buildcraft/api/gates/ITriggerParameter.java
View file

@ -1,7 +1,7 @@
package buildcraft.api.gates; package buildcraft.api.gates;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public interface ITriggerParameter { public interface ITriggerParameter {
@ -15,4 +15,4 @@ public interface ITriggerParameter {
public abstract ItemStack getItem(); public abstract ItemStack getItem();
} }

4
common/buildcraft/api/gates/ITriggerProvider.java
View file

@ -13,8 +13,8 @@ import java.util.LinkedList;
import buildcraft.api.transport.IPipe; import buildcraft.api.transport.IPipe;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface ITriggerProvider { public interface ITriggerProvider {

2
common/buildcraft/api/gates/Trigger.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.gates; package buildcraft.api.gates;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
/** /**
* This class has to be implemented to create new triggers kinds to BuildCraft * This class has to be implemented to create new triggers kinds to BuildCraft

4
common/buildcraft/api/gates/TriggerParameter.java
View file

@ -9,8 +9,8 @@
package buildcraft.api.gates; package buildcraft.api.gates;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public class TriggerParameter implements ITriggerParameter { public class TriggerParameter implements ITriggerParameter {

2
common/buildcraft/api/inventory/ISelectiveInventory.java
View file

@ -1,7 +1,7 @@
package buildcraft.api.inventory; package buildcraft.api.inventory;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public interface ISelectiveInventory extends ISpecialInventory { public interface ISelectiveInventory extends ISpecialInventory {
/** /**

4
common/buildcraft/api/inventory/ISpecialInventory.java
View file

@ -1,8 +1,8 @@
package buildcraft.api.inventory; package buildcraft.api.inventory;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public interface ISpecialInventory extends IInventory { public interface ISpecialInventory extends IInventory {

2
common/buildcraft/api/power/IPowerProvider.java
View file

@ -2,7 +2,7 @@ package buildcraft.api.power;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.core.SafeTimeTracker;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public interface IPowerProvider { public interface IPowerProvider {

2
common/buildcraft/api/power/PowerFramework.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.power; package buildcraft.api.power;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public abstract class PowerFramework { public abstract class PowerFramework {

4
common/buildcraft/api/power/PowerProvider.java
View file

@ -11,8 +11,8 @@ package buildcraft.api.power;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.core.SafeTimeTracker;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public abstract class PowerProvider implements IPowerProvider { public abstract class PowerProvider implements IPowerProvider {

2
common/buildcraft/api/recipes/AssemblyRecipe.java
View file

@ -2,7 +2,7 @@ package buildcraft.api.recipes;
import java.util.LinkedList; import java.util.LinkedList;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class AssemblyRecipe { public class AssemblyRecipe {

2
common/buildcraft/api/tools/IToolPipette.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.tools; package buildcraft.api.tools;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.liquids.LiquidStack; import net.minecraftforge.liquids.LiquidStack;
public interface IToolPipette { public interface IToolPipette {

2
common/buildcraft/api/tools/IToolWrench.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.tools; package buildcraft.api.tools;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
/*** /***
* Implement this interface on subclasses of Item to have that item work as a * Implement this interface on subclasses of Item to have that item work as a

2
common/buildcraft/api/transport/FacadeManager.java
View file

@ -1,7 +1,7 @@
package buildcraft.api.transport; package buildcraft.api.transport;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class FacadeManager public class FacadeManager
{ {

2
common/buildcraft/api/transport/IExtractionHandler.java
View file

@ -1,6 +1,6 @@
package buildcraft.api.transport; package buildcraft.api.transport;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* Implement and register with the PipeManager if you want to suppress connections from wooden pipes. * Implement and register with the PipeManager if you want to suppress connections from wooden pipes.

2
common/buildcraft/api/transport/IPassiveItemContribution.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.transport; package buildcraft.api.transport;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public interface IPassiveItemContribution { public interface IPassiveItemContribution {

2
common/buildcraft/api/transport/IPipe.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.transport; package buildcraft.api.transport;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public interface IPipe { public interface IPipe {

2
common/buildcraft/api/transport/IPipeEntry.java
View file

@ -9,7 +9,7 @@
package buildcraft.api.transport; package buildcraft.api.transport;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
/** /**

12
common/buildcraft/api/transport/IPipedItem.java
View file

@ -3,11 +3,11 @@ package buildcraft.api.transport;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import buildcraft.api.core.SafeTimeTracker; import buildcraft.api.core.SafeTimeTracker;
import net.minecraft.src.EntityItem; import net.minecraft.entity.item.EntityItem;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
public interface IPipedItem { public interface IPipedItem {
@ -101,4 +101,4 @@ public interface IPipedItem {
public abstract boolean hasContributions(); public abstract boolean hasContributions();
} }

2
common/buildcraft/api/transport/PipeManager.java
View file

@ -7,7 +7,7 @@ import java.util.List;
import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.Side; import cpw.mods.fml.common.Side;
import net.minecraft.src.World; import net.minecraft.world.World;
public abstract class PipeManager { public abstract class PipeManager {

20
common/buildcraft/builders/BlockArchitect.java
View file

@ -11,16 +11,16 @@ package buildcraft.builders;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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.IBlockAccess; import net.minecraft.world.IBlockAccess;
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; import net.minecraft.block.material.Material;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;

16
common/buildcraft/builders/BlockBlueprintLibrary.java
View file

@ -11,14 +11,14 @@ package buildcraft.builders;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import buildcraft.core.GuiIds; import buildcraft.core.GuiIds;

18
common/buildcraft/builders/BlockBuilder.java
View file

@ -11,15 +11,15 @@ package buildcraft.builders;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;

16
common/buildcraft/builders/BlockFiller.java
View file

@ -11,14 +11,14 @@ package buildcraft.builders;
import java.util.ArrayList; import java.util.ArrayList;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
import buildcraft.BuildCraftBuilders; import buildcraft.BuildCraftBuilders;
import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerPattern;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;

22
common/buildcraft/builders/BlockMarker.java
View file

@ -17,17 +17,17 @@ import buildcraft.builders.BuildersProxy;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.BlockContainer; import net.minecraft.block.BlockContainer;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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.Material; import net.minecraft.block.material.Material;
import net.minecraft.src.MovingObjectPosition; import net.minecraft.util.MovingObjectPosition;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.Vec3; import net.minecraft.util.Vec3;
import net.minecraft.src.World; import net.minecraft.world.World;
public class BlockMarker extends BlockContainer { public class BlockMarker extends BlockContainer {

8
common/buildcraft/builders/BlockPathMarker.java
View file

@ -13,10 +13,10 @@ import java.util.ArrayList;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.IBlockAccess; import net.minecraft.world.IBlockAccess;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
public class BlockPathMarker extends BlockMarker { public class BlockPathMarker extends BlockMarker {

4
common/buildcraft/builders/BptBlockFiller.java
View file

@ -20,8 +20,8 @@ import buildcraft.api.core.LaserKind;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import buildcraft.core.Box; import buildcraft.core.Box;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
public class BptBlockFiller extends BptBlock { public class BptBlockFiller extends BptBlock {

4
common/buildcraft/builders/BuildersProxy.java
View file

@ -10,8 +10,8 @@
package buildcraft.builders; package buildcraft.builders;
import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.TileBlueprintLibrary;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.World; import net.minecraft.world.World;
public class BuildersProxy { public class BuildersProxy {

4
common/buildcraft/builders/FillerFillAll.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerFillAll extends FillerPattern { public class FillerFillAll extends FillerPattern {

4
common/buildcraft/builders/FillerFillPyramid.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerFillPyramid extends FillerPattern { public class FillerFillPyramid extends FillerPattern {

4
common/buildcraft/builders/FillerFillStairs.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerFillStairs extends FillerPattern { public class FillerFillStairs extends FillerPattern {

4
common/buildcraft/builders/FillerFillWalls.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerFillWalls extends FillerPattern { public class FillerFillWalls extends FillerPattern {

4
common/buildcraft/builders/FillerFlattener.java
View file

@ -13,8 +13,8 @@ import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.BlockUtil; import buildcraft.core.utils.BlockUtil;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerFlattener extends FillerPattern { public class FillerFlattener extends FillerPattern {

6
common/buildcraft/builders/FillerPattern.java
View file

@ -14,9 +14,9 @@ import buildcraft.api.core.IBox;
import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerPattern;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.BlockUtil; import buildcraft.core.utils.BlockUtil;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
public abstract class FillerPattern implements IFillerPattern { public abstract class FillerPattern implements IFillerPattern {

8
common/buildcraft/builders/FillerRegistry.java
View file

@ -15,10 +15,10 @@ import java.util.LinkedList;
import buildcraft.api.filler.IFillerPattern; import buildcraft.api.filler.IFillerPattern;
import buildcraft.api.filler.IFillerRegistry; import buildcraft.api.filler.IFillerRegistry;
import net.minecraft.src.Block; import net.minecraft.block.Block;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.Item; import net.minecraft.item.Item;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
public class FillerRegistry implements IFillerRegistry { public class FillerRegistry implements IFillerRegistry {

4
common/buildcraft/builders/FillerRemover.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders;
import buildcraft.api.core.IBox; import buildcraft.api.core.IBox;
import buildcraft.core.DefaultProps; import buildcraft.core.DefaultProps;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class FillerRemover extends FillerPattern { public class FillerRemover extends FillerPattern {

6
common/buildcraft/builders/GuiHandler.java
View file

@ -10,9 +10,9 @@ import buildcraft.builders.gui.GuiBuilder;
import buildcraft.builders.gui.GuiFiller; import buildcraft.builders.gui.GuiFiller;
import buildcraft.builders.gui.GuiTemplate; import buildcraft.builders.gui.GuiTemplate;
import buildcraft.core.GuiIds; import buildcraft.core.GuiIds;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
public class GuiHandler implements IGuiHandler { public class GuiHandler implements IGuiHandler {

10
common/buildcraft/builders/ItemBptBase.java
View file

@ -16,11 +16,11 @@ import buildcraft.core.ItemBuildCraft;
import buildcraft.core.blueprints.BptBase; import buildcraft.core.blueprints.BptBase;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.CreativeTabs; import net.minecraft.creativetab.CreativeTabs;
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.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.World; import net.minecraft.world.World;
public abstract class ItemBptBase extends ItemBuildCraft { public abstract class ItemBptBase extends ItemBuildCraft {

10
common/buildcraft/builders/TileArchitect.java
View file

@ -23,11 +23,11 @@ import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData; import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
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;
public class TileArchitect extends TileBuildCraft implements IInventory { public class TileArchitect extends TileBuildCraft implements IInventory {

8
common/buildcraft/builders/TileBlueprintLibrary.java
View file

@ -12,10 +12,10 @@ import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
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;
public class TileBlueprintLibrary extends TileBuildCraft implements IInventory { public class TileBlueprintLibrary extends TileBuildCraft implements IInventory {
public static final int COMMAND_NEXT = 1, public static final int COMMAND_NEXT = 1,

12
common/buildcraft/builders/TileBuilder.java
View file

@ -41,12 +41,12 @@ import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.SurroundingInventory; import buildcraft.core.utils.SurroundingInventory;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.AxisAlignedBB; import net.minecraft.util.AxisAlignedBB;
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.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.NBTTagList; import net.minecraft.nbt.NBTTagList;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IPowerReceptor, IMachine { public class TileBuilder extends TileBuildCraft implements IBuilderInventory, IPowerReceptor, IMachine {

6
common/buildcraft/builders/TileFiller.java
View file

@ -28,9 +28,9 @@ import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.triggers.ActionMachineControl; import buildcraft.core.triggers.ActionMachineControl;
import buildcraft.core.triggers.ActionMachineControl.Mode; import buildcraft.core.triggers.ActionMachineControl.Mode;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
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.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection; import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.ISidedInventory; import net.minecraftforge.common.ISidedInventory;

6
common/buildcraft/builders/TileMarker.java
View file

@ -19,8 +19,8 @@ import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData; import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
public class TileMarker extends TileBuildCraft implements IAreaProvider { public class TileMarker extends TileBuildCraft implements IAreaProvider {
@ -488,4 +488,4 @@ public class TileMarker extends TileBuildCraft implements IAreaProvider {
createLasers(); createLasers();
} }
} }

8
common/buildcraft/builders/TilePathMarker.java
View file

@ -14,9 +14,9 @@ import buildcraft.core.network.PacketUpdate;
import buildcraft.core.network.TileNetworkData; import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import net.minecraft.src.World; import net.minecraft.world.World;
public class TilePathMarker extends TileMarker { public class TilePathMarker extends TileMarker {
@ -273,4 +273,4 @@ public class TilePathMarker extends TileMarker {
worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); worldObj.markBlockForUpdate(xCoord, yCoord, zCoord);
} }
} }
} }

10
common/buildcraft/builders/gui/ContainerBlueprintLibrary.java
View file

@ -12,10 +12,10 @@ package buildcraft.builders.gui;
import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.BuildCraftContainer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ICrafting; import net.minecraft.inventory.ICrafting;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.Slot; import net.minecraft.inventory.Slot;
public class ContainerBlueprintLibrary extends BuildCraftContainer { public class ContainerBlueprintLibrary extends BuildCraftContainer {
@ -74,4 +74,4 @@ public class ContainerBlueprintLibrary extends BuildCraftContainer {
public boolean canInteractWith(EntityPlayer entityplayer) { public boolean canInteractWith(EntityPlayer entityplayer) {
return library.isUseableByPlayer(entityplayer); return library.isUseableByPlayer(entityplayer);
} }
} }

8
common/buildcraft/builders/gui/ContainerBuilder.java
View file

@ -11,9 +11,9 @@ package buildcraft.builders.gui;
import buildcraft.builders.TileBuilder; import buildcraft.builders.TileBuilder;
import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.BuildCraftContainer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.Slot; import net.minecraft.inventory.Slot;
public class ContainerBuilder extends BuildCraftContainer { public class ContainerBuilder extends BuildCraftContainer {
@ -51,4 +51,4 @@ public class ContainerBuilder extends BuildCraftContainer {
return builder.isUseableByPlayer(entityplayer); return builder.isUseableByPlayer(entityplayer);
} }
} }

10
common/buildcraft/builders/gui/ContainerFiller.java
View file

@ -10,10 +10,10 @@
package buildcraft.builders.gui; package buildcraft.builders.gui;
import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.BuildCraftContainer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import net.minecraft.src.Slot; import net.minecraft.inventory.Slot;
public class ContainerFiller extends BuildCraftContainer { public class ContainerFiller extends BuildCraftContainer {
@ -74,4 +74,4 @@ public class ContainerFiller extends BuildCraftContainer {
return itemstack; return itemstack;
} }
} }

10
common/buildcraft/builders/gui/ContainerTemplate.java
View file

@ -11,10 +11,10 @@ package buildcraft.builders.gui;
import buildcraft.builders.TileArchitect; import buildcraft.builders.TileArchitect;
import buildcraft.core.gui.BuildCraftContainer; import buildcraft.core.gui.BuildCraftContainer;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.ICrafting; import net.minecraft.inventory.ICrafting;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.Slot; import net.minecraft.inventory.Slot;
public class ContainerTemplate extends BuildCraftContainer { public class ContainerTemplate extends BuildCraftContainer {
@ -74,4 +74,4 @@ public class ContainerTemplate extends BuildCraftContainer {
return template.isUseableByPlayer(entityplayer); return template.isUseableByPlayer(entityplayer);
} }
} }

4
common/buildcraft/builders/gui/GuiBlueprintLibrary.java
View file

@ -9,8 +9,8 @@
package buildcraft.builders.gui; package buildcraft.builders.gui;
import net.minecraft.src.EntityPlayer; import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.src.GuiButton; import net.minecraft.client.gui.GuiButton;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

4
common/buildcraft/builders/gui/GuiBuilder.java
View file

@ -11,8 +11,8 @@ package buildcraft.builders.gui;
import java.util.Collection; import java.util.Collection;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import net.minecraft.src.ItemStack; import net.minecraft.item.ItemStack;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
common/buildcraft/builders/gui/GuiFiller.java
View file

@ -9,7 +9,7 @@
package buildcraft.builders.gui; package buildcraft.builders.gui;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

2
common/buildcraft/builders/gui/GuiTemplate.java
View file

@ -11,7 +11,7 @@ package buildcraft.builders.gui;
import java.util.Date; import java.util.Date;
import net.minecraft.src.IInventory; import net.minecraft.inventory.IInventory;
import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL11;

8
common/buildcraft/builders/network/PacketHandlerBuilders.java
View file

@ -3,10 +3,10 @@ package buildcraft.builders.network;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
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.Packet250CustomPayload; import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraft.src.TileEntity; import net.minecraft.tileentity.TileEntity;
import buildcraft.builders.TileArchitect; import buildcraft.builders.TileArchitect;
import buildcraft.builders.TileBlueprintLibrary; import buildcraft.builders.TileBlueprintLibrary;
import buildcraft.core.network.PacketIds; import buildcraft.core.network.PacketIds;

6
common/buildcraft/core/BlockBuildCraft.java
View file

@ -4,9 +4,9 @@ import java.util.Random;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
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.World; import net.minecraft.world.World;
public abstract class BlockBuildCraft extends BlockContainer { public abstract class BlockBuildCraft extends BlockContainer {

4
common/buildcraft/core/BlockIndex.java
View file

@ -9,8 +9,8 @@
package buildcraft.core; package buildcraft.core;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
/** /**
* This class is a comparable container for block positions. TODO: should this * This class is a comparable container for block positions. TODO: should this

4
common/buildcraft/core/Box.java
View file

@ -20,8 +20,8 @@ import buildcraft.core.network.TileNetworkData;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import buildcraft.core.utils.Utils; import buildcraft.core.utils.Utils;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
public class Box implements IBox { public class Box implements IBox {

8
common/buildcraft/core/CommandBuildCraft.java
View file

@ -4,10 +4,10 @@ import java.util.List;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.CommandBase; import net.minecraft.command.CommandBase;
import net.minecraft.src.ICommand; import net.minecraft.command.ICommand;
import net.minecraft.src.ICommandSender; import net.minecraft.command.ICommandSender;
import net.minecraft.src.WrongUsageException; import net.minecraft.command.WrongUsageException;
public class CommandBuildCraft extends CommandBase { public class CommandBuildCraft extends CommandBase {

6
common/buildcraft/core/EntityBlock.java
View file

@ -9,9 +9,9 @@
package buildcraft.core; package buildcraft.core;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
public class EntityBlock extends Entity { public class EntityBlock extends Entity {

2
common/buildcraft/core/EntityEnergyLaser.java
View file

@ -10,7 +10,7 @@
package buildcraft.core; package buildcraft.core;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import net.minecraft.src.World; import net.minecraft.world.World;
public class EntityEnergyLaser extends EntityLaser { public class EntityEnergyLaser extends EntityLaser {

6
common/buildcraft/core/EntityLaser.java
View file

@ -12,9 +12,9 @@ package buildcraft.core;
import buildcraft.api.core.Position; import buildcraft.api.core.Position;
import buildcraft.core.proxy.CoreProxy; import buildcraft.core.proxy.CoreProxy;
import net.minecraft.src.Entity; import net.minecraft.entity.Entity;
import net.minecraft.src.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.src.World; import net.minecraft.world.World;
public abstract class EntityLaser extends Entity { public abstract class EntityLaser extends Entity {

Some files were not shown because too many files have changed in this diff Show more