tilera/electrodynamics
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Wiki Activity

Import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-04 11:48:11 -05:00
parent 6dea7410b2
commit 0ef16b6312
46 changed files with 61 additions and 81 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dark/api/al/coding/IArmbotUseable.java
View file

@ -1,6 +1,5 @@
package dark.api.al.coding;
import java.util.HashMap;
import java.util.List;
import dark.api.al.coding.args.ArgumentData;

1
src/dark/api/al/coding/ITask.java
View file

@ -1,6 +1,5 @@
package dark.api.al.coding;
import java.util.HashMap;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;

1
src/dark/api/al/coding/args/ArgumentData.java
View file

@ -3,7 +3,6 @@ package dark.api.al.coding.args;
import net.minecraft.nbt.NBTTagCompound;
import dark.api.save.ISaveObj;
import dark.api.save.NBTFileHelper;
import dark.api.save.SaveManager;
/** Used to store arguments in a way that can be easier to read, limit, and understand
*

2
src/dark/assembly/ALRecipeLoader.java
View file

@ -8,7 +8,7 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import cpw.mods.fml.common.registry.GameRegistry;
import dark.assembly.machine.BlockCrate;
import dark.assembly.machine.processor.BlockProcessor;
import dark.core.common.RecipeLoader;
import dark.machines.common.RecipeLoader;
public class ALRecipeLoader extends RecipeLoader
{

6
src/dark/assembly/AssemblyLine.java
View file

@ -57,11 +57,11 @@ import dark.assembly.machine.encoder.BlockEncoder;
import dark.assembly.machine.encoder.ItemDisk;
import dark.assembly.machine.processor.BlockProcessor;
import dark.assembly.machine.red.BlockAdvancedHopper;
import dark.core.common.DMCreativeTab;
import dark.core.common.DarkMain;
import dark.core.ModObjectRegistry;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab;
import dark.core.registration.ModObjectRegistry;
import dark.machines.common.DMCreativeTab;
import dark.machines.common.DarkMain;
@ModstatInfo(prefix = "asmline")
@Mod(modid = AssemblyLine.MOD_ID, name = AssemblyLine.MOD_NAME, version = DarkMain.VERSION, dependencies = "required-after:DarkCore", useMetadata = true)

3
src/dark/assembly/armbot/BlockArmbot.java
View file

@ -19,9 +19,8 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderArmbot;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityRejector;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.interfaces.IMultiBlock;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
public class BlockArmbot extends BlockAssembly
{

2
src/dark/assembly/armbot/TaskBase.java
View file

@ -1,9 +1,7 @@
package dark.assembly.armbot;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;

2
src/dark/assembly/armbot/TileEntityArmbot.java
View file

@ -33,12 +33,12 @@ import dark.api.al.coding.ProgramHelper;
import dark.assembly.ALRecipeLoader;
import dark.assembly.machine.TileEntityAssembly;
import dark.assembly.machine.encoder.ItemDisk;
import dark.core.common.DarkMain;
import dark.core.helpers.ItemWorldHelper;
import dark.core.helpers.MathHelper;
import dark.core.interfaces.IMultiBlock;
import dark.core.network.PacketHandler;
import dark.core.prefab.machine.BlockMulti;
import dark.machines.common.DarkMain;
public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, IArmbot, IPeripheral
{

2
src/dark/assembly/armbot/command/TaskBreak.java
View file

@ -6,9 +6,7 @@ import net.minecraft.block.Block;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraft.world.World;
import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;

1
src/dark/assembly/armbot/command/TaskGrabEntity.java
View file

@ -10,7 +10,6 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.AxisAlignedBB;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.args.ArgumentData;
import dark.api.al.coding.args.ArgumentListData;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.EntityDictionary;

1
src/dark/assembly/armbot/command/TaskIF.java
View file

@ -3,7 +3,6 @@ package dark.assembly.armbot.command;
import java.util.ArrayList;
import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import dark.api.al.coding.IProgrammableMachine;
import dark.api.al.coding.ITask;

2
src/dark/assembly/armbot/command/TaskRotateBy.java
View file

@ -2,8 +2,8 @@ package dark.assembly.armbot.command;
import java.util.List;
import universalelectricity.core.vector.Vector2;
import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;

2
src/dark/assembly/armbot/command/TaskRotateTo.java
View file

@ -2,8 +2,8 @@ package dark.assembly.armbot.command;
import java.util.List;
import universalelectricity.core.vector.Vector2;
import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;

4
src/dark/assembly/client/gui/GuiEditTask.java
View file

@ -1,9 +1,5 @@
package dark.assembly.client.gui;
import java.util.HashMap;
import java.util.List;
import java.util.Map.Entry;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.client.gui.GuiTextField;
import net.minecraft.nbt.NBTTagCompound;

2
src/dark/assembly/client/gui/GuiEncoderBase.java
View file

@ -4,9 +4,9 @@ import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.inventory.Container;
import dark.assembly.AssemblyLine;
import dark.assembly.CommonProxy;
import dark.core.client.gui.GuiMachineContainer;
import dark.core.prefab.invgui.ContainerFake;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.client.gui.GuiMachineContainer;
public class GuiEncoderBase extends GuiMachineContainer
{

8
src/dark/assembly/client/gui/GuiEncoderCoder.java
View file

@ -1,13 +1,11 @@
package dark.assembly.client.gui;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import net.minecraft.client.gui.GuiButton;
import net.minecraft.entity.player.InventoryPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ResourceLocation;
import dark.assembly.AssemblyLine;
import dark.assembly.machine.encoder.TileEntityEncoder;
import dark.core.prefab.invgui.GuiButtonImage;
import dark.core.prefab.invgui.GuiButtonImage.ButtonIcon;

2
src/dark/assembly/client/gui/GuiManipulator.java
View file

@ -4,8 +4,8 @@ import net.minecraft.entity.player.EntityPlayer;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.client.gui.GuiMachineBase;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.client.gui.GuiMachineBase;
@SideOnly(Side.CLIENT)
public class GuiManipulator extends GuiMachineBase

2
src/dark/assembly/client/gui/GuiTask.java
View file

@ -11,8 +11,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.al.coding.IRedirectTask;
import dark.api.al.coding.ITask;
import dark.core.common.DarkMain;
import dark.core.prefab.ModPrefab;
import dark.machines.common.DarkMain;
@SideOnly(Side.CLIENT)
public class GuiTask extends Gui

2
src/dark/assembly/client/render/RenderProcessor.java
View file

@ -12,8 +12,8 @@ import dark.assembly.AssemblyLine;
import dark.assembly.client.model.ModelCrusher;
import dark.assembly.client.model.ModelGrinder;
import dark.assembly.machine.processor.TileEntityProcessor;
import dark.core.client.renders.RenderTileMachine;
import dark.core.prefab.ModPrefab;
import dark.machines.client.renders.RenderTileMachine;
@SideOnly(Side.CLIENT)
public class RenderProcessor extends RenderTileMachine

8
src/dark/assembly/imprinter/BlockImprinter.java
View file

@ -3,8 +3,6 @@ package dark.assembly.imprinter;
import java.util.Random;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.item.EntityItem;
@ -15,13 +13,15 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.CommonProxy;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityRejector;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
public class BlockImprinter extends BlockAssembly
{

2
src/dark/assembly/imprinter/ItemImprinter.java
View file

@ -16,7 +16,7 @@ import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.common.DMCreativeTab;
import dark.machines.common.DMCreativeTab;
public class ItemImprinter extends Item
{

2
src/dark/assembly/imprinter/TileEntityImprinter.java
View file

@ -29,12 +29,12 @@ import dark.api.al.coding.IArmbot;
import dark.api.al.coding.IArmbotUseable;
import dark.api.al.coding.args.ArgumentData;
import dark.api.events.AutoCraftEvent;
import dark.core.common.DarkMain;
import dark.core.helpers.AutoCraftingManager;
import dark.core.helpers.AutoCraftingManager.IAutoCrafter;
import dark.core.network.PacketHandler;
import dark.core.prefab.invgui.ISlotPickResult;
import dark.core.prefab.machine.TileEntityMulti;
import dark.machines.common.DarkMain;
public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInventory, IArmbotUseable, IPacketReceiver, ISlotPickResult, IAutoCrafter
{

2
src/dark/assembly/imprinter/prefab/BlockImprintable.java
View file

@ -10,7 +10,7 @@ import net.minecraft.world.World;
import dark.api.al.IFilterable;
import dark.assembly.imprinter.ItemImprinter;
import dark.assembly.machine.BlockAssembly;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
/** Extend this block class if a filter is allowed to be placed inside of this block.
*

4
src/dark/assembly/machine/BlockAssembly.java
View file

@ -6,9 +6,9 @@ import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.assembly.AssemblyLine;
import dark.core.common.DMCreativeTab;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.prefab.machine.BlockMachine;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.machines.common.DMCreativeTab;
public class BlockAssembly extends BlockMachine
{

3
src/dark/assembly/machine/BlockCrate.java
View file

@ -23,8 +23,7 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.render.RenderCrate;
import dark.assembly.machine.belt.TileEntityConveyorBelt;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
/** A block that allows the placement of mass amount of a specific item within it. It will be allowed
* to go on Conveyor Belts

2
src/dark/assembly/machine/BlockDetector.java
View file

@ -23,7 +23,7 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.render.RenderDetector;
import dark.assembly.imprinter.prefab.BlockImprintable;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
/** @author Briman0094 */
public class BlockDetector extends BlockImprintable

2
src/dark/assembly/machine/BlockManipulator.java
View file

@ -19,7 +19,7 @@ import dark.assembly.CommonProxy;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderManipulator;
import dark.assembly.imprinter.prefab.BlockImprintable;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
/** A block that manipulates item movement between inventories.
*

3
src/dark/assembly/machine/BlockRejector.java
View file

@ -12,14 +12,13 @@ import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import cpw.mods.fml.common.registry.GameRegistry;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderRejector;
import dark.assembly.imprinter.prefab.BlockImprintable;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
public class BlockRejector extends BlockImprintable
{

2
src/dark/assembly/machine/BlockTurntable.java
View file

@ -19,7 +19,7 @@ import universalelectricity.prefab.tile.IRotatable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
public class BlockTurntable extends BlockAssembly
{

4
src/dark/assembly/machine/NetworkAssembly.java
View file

@ -10,8 +10,8 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IElectrical;
import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3;
import dark.api.parts.INetworkEnergyPart;
import dark.api.parts.INetworkPart;
import dark.api.tilenetwork.INetworkEnergyPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.tilenetwork.NetworkSharedPower;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;

5
src/dark/assembly/machine/TileEntityAssembly.java
View file

@ -9,9 +9,8 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
import dark.api.parts.INetworkEnergyPart;
import dark.api.parts.ITileNetwork;
import dark.assembly.AssemblyLine;
import dark.api.tilenetwork.INetworkEnergyPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.prefab.machine.TileEntityEnergyMachine;
import dark.core.prefab.tilenetwork.NetworkSharedPower;
import dark.core.prefab.tilenetwork.NetworkTileEntities;

2
src/dark/assembly/machine/TileEntityCrate.java
View file

@ -14,9 +14,9 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import dark.api.IExtendedStorage;
import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
import dark.core.prefab.machine.TileEntityInv;
import dark.machines.common.DarkMain;
/** Basic single stack inventory
*

11
src/dark/assembly/machine/belt/BlockConveyor.java
View file

@ -2,8 +2,6 @@ package dark.assembly.machine.belt;
import java.util.List;
import com.builtbroken.common.Pair;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
@ -15,17 +13,18 @@ import net.minecraft.util.MathHelper;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderConveyorBelt;
import dark.assembly.client.render.RenderCrate;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityCrate;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.common.DarkMain;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.prefab.tilenetwork.NetworkItemSupply;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.machines.common.DarkMain;
public class BlockConveyor extends BlockAssembly
{

5
src/dark/assembly/machine/belt/BlockConveyorBelt.java
View file

@ -25,10 +25,9 @@ import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderConveyorBelt;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityCrate;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.common.DarkMain;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.machines.common.DarkMain;
/** The block for the actual conveyor belt!
*

6
src/dark/assembly/machine/belt/TileEntityConveyor.java
View file

@ -10,9 +10,9 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.api.al.IBelt;
import dark.api.parts.IMotionPath;
import dark.api.parts.INetworkPart;
import dark.api.parts.ITileNetwork;
import dark.api.tilenetwork.IMotionPath;
import dark.api.tilenetwork.INetworkPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.assembly.machine.TileEntityAssembly;
import dark.core.prefab.machine.TileEntityEnergyMachine;
import dark.core.prefab.tilenetwork.NetworkItemSupply;

2
src/dark/assembly/machine/belt/TileEntityConveyorBelt.java
View file

@ -19,8 +19,8 @@ import cpw.mods.fml.common.network.Player;
import dark.api.al.IBelt;
import dark.assembly.ALRecipeLoader;
import dark.assembly.machine.TileEntityAssembly;
import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
import dark.machines.common.DarkMain;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved
*

8
src/dark/assembly/machine/encoder/BlockEncoder.java
View file

@ -2,8 +2,6 @@ package dark.assembly.machine.encoder;
import java.util.Set;
import com.builtbroken.common.Pair;
import net.minecraft.block.material.Material;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
@ -11,13 +9,15 @@ import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.Icon;
import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.CommonProxy;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.TileEntityRejector;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.core.ModObjectRegistry.BlockBuildData;
public class BlockEncoder extends BlockAssembly
{

2
src/dark/assembly/machine/encoder/ItemDisk.java
View file

@ -12,7 +12,7 @@ import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.common.DMCreativeTab;
import dark.machines.common.DMCreativeTab;
public class ItemDisk extends Item
{

2
src/dark/assembly/machine/encoder/TileEntityEncoder.java
View file

@ -19,9 +19,9 @@ import dark.api.al.coding.ITask;
import dark.api.al.coding.TaskRegistry;
import dark.assembly.armbot.Program;
import dark.assembly.armbot.command.TaskRotateTo;
import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.common.DarkMain;
public class TileEntityEncoder extends TileEntityMachine implements ISidedInventory
{

2
src/dark/assembly/machine/frame/BlockFrame.java
View file

@ -12,8 +12,8 @@ import com.builtbroken.common.Pair;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.core.common.DarkMain;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.common.DarkMain;
public class BlockFrame extends BlockMachine
{

2
src/dark/assembly/machine/frame/NetworkFrameRail.java
View file

@ -1,6 +1,6 @@
package dark.assembly.machine.frame;
import dark.api.parts.INetworkPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.tilenetwork.NetworkTileEntities;
/** This is a sub network for the frames that handles only one rail of frames

6
src/dark/assembly/machine/frame/TileEntityFrame.java
View file

@ -17,12 +17,12 @@ import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.parts.INetworkPart;
import dark.api.parts.ITileNetwork;
import dark.core.common.DarkMain;
import dark.api.tilenetwork.INetworkPart;
import dark.api.tilenetwork.ITileNetwork;
import dark.core.interfaces.IBlockActivated;
import dark.core.network.ISimplePacketReceiver;
import dark.core.network.PacketHandler;
import dark.machines.common.DarkMain;
/** A non-updating tileEntity that represents the logic behind the frame. It contains rotation and
* connection information. As well provides a way for a tile network to be created to provide a

4
src/dark/assembly/machine/processor/BlockProcessor.java
View file

@ -25,9 +25,9 @@ import dark.assembly.AssemblyLine;
import dark.assembly.CommonProxy;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderProcessor;
import dark.core.common.DMCreativeTab;
import dark.core.ModObjectRegistry.BlockBuildData;
import dark.core.prefab.machine.BlockMachine;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
import dark.machines.common.DMCreativeTab;
public class BlockProcessor extends BlockMachine
{

1
src/dark/assembly/machine/processor/TileEntityProcessor.java
View file

@ -16,6 +16,7 @@ import dark.core.interfaces.IInvBox;
import dark.core.network.PacketHandler;
import dark.core.prefab.invgui.InvChest;
import dark.core.prefab.machine.TileEntityEnergyMachine;
import dark.core.prefab.machine.TileEntityMachine.SimplePacketTypes;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks
*

2
src/dark/assembly/machine/red/BlockAdvancedHopper.java
View file

@ -20,8 +20,8 @@ import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.assembly.client.render.RenderAdvancedHopper;
import dark.core.common.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.common.DMCreativeTab;
/** Block for an advanced version of the vanilla minecraft hopper
*

2
src/dark/assembly/machine/red/BlockPistonPlus.java
View file

@ -1,8 +1,8 @@
package dark.assembly.machine.red;
import net.minecraft.block.material.Material;
import dark.core.common.DarkMain;
import dark.core.prefab.machine.BlockMachine;
import dark.machines.common.DarkMain;
/** This will be a piston that can extend from 1 - 20 depending on teir and user settings
*