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

Clean up and import changes

Browse source
This commit is contained in:
DarkGuardsman 2013-12-18 16:01:14 -05:00
parent 82f65af734
commit 2da4c62035
29 changed files with 80 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,9 @@ import org.modstats.ModstatInfo;
import universalelectricity.prefab.TranslationHelper;
import com.dark.DarkCore;
import com.dark.ModObjectRegistry;
import com.dark.CoreRegistry;
import com.dark.IndustryCreativeTab;
import com.dark.prefab.ItemBlockHolder;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
@ -61,8 +63,6 @@ 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.DMCreativeTab;
import dark.core.prefab.ItemBlockHolder;
import dark.core.prefab.ModPrefab;
import dark.machines.DarkMain;
@ -142,7 +142,7 @@ public class AssemblyLine extends ModPrefab
proxy.init();
FMLog.info("Loaded: " + TranslationHelper.loadLanguages(LANGUAGE_PATH, LANGUAGES_SUPPORTED) + " languages.");
DMCreativeTab.tabAutomation().setIconItemStack(new ItemStack(ALRecipeLoader.blockConveyorBelt));
IndustryCreativeTab.tabAutomation().setIconItemStack(new ItemStack(ALRecipeLoader.blockConveyorBelt));
}
@Override
@ -161,17 +161,17 @@ public class AssemblyLine extends ModPrefab
recipeLoader = new ALRecipeLoader();
}
CONFIGURATION.load();
ALRecipeLoader.blockConveyorBelt = ModObjectRegistry.createNewBlock("ALBlockConveyor", AssemblyLine.MOD_ID, BlockConveyorBelt.class);
ALRecipeLoader.blockManipulator = ModObjectRegistry.createNewBlock("Manipulator", AssemblyLine.MOD_ID, BlockManipulator.class);
ALRecipeLoader.blockCrate = (BlockCrate) ModObjectRegistry.createNewBlock("Crate", AssemblyLine.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
ALRecipeLoader.blockImprinter = ModObjectRegistry.createNewBlock("Imprinter", AssemblyLine.MOD_ID, BlockImprinter.class);
ALRecipeLoader.blockDetector = ModObjectRegistry.createNewBlock("Detector", AssemblyLine.MOD_ID, BlockDetector.class);
ALRecipeLoader.blockRejector = ModObjectRegistry.createNewBlock("Rejector", AssemblyLine.MOD_ID, BlockRejector.class);
ALRecipeLoader.blockEncoder = ModObjectRegistry.createNewBlock("Encoder", AssemblyLine.MOD_ID, BlockEncoder.class);
ALRecipeLoader.blockArmbot = ModObjectRegistry.createNewBlock("Armbot", AssemblyLine.MOD_ID, BlockArmbot.class);
ALRecipeLoader.blockTurntable = ModObjectRegistry.createNewBlock("Turntable", AssemblyLine.MOD_ID, BlockTurntable.class);
ALRecipeLoader.processorMachine = ModObjectRegistry.createNewBlock("ALBlockProcessor", AssemblyLine.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
ALRecipeLoader.blockAdvancedHopper = ModObjectRegistry.createNewBlock("ALBlockHopper", AssemblyLine.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
ALRecipeLoader.blockConveyorBelt = CoreRegistry.createNewBlock("ALBlockConveyor", AssemblyLine.MOD_ID, BlockConveyorBelt.class);
ALRecipeLoader.blockManipulator = CoreRegistry.createNewBlock("Manipulator", AssemblyLine.MOD_ID, BlockManipulator.class);
ALRecipeLoader.blockCrate = (BlockCrate) CoreRegistry.createNewBlock("Crate", AssemblyLine.MOD_ID, BlockCrate.class, ItemBlockCrate.class);
ALRecipeLoader.blockImprinter = CoreRegistry.createNewBlock("Imprinter", AssemblyLine.MOD_ID, BlockImprinter.class);
ALRecipeLoader.blockDetector = CoreRegistry.createNewBlock("Detector", AssemblyLine.MOD_ID, BlockDetector.class);
ALRecipeLoader.blockRejector = CoreRegistry.createNewBlock("Rejector", AssemblyLine.MOD_ID, BlockRejector.class);
ALRecipeLoader.blockEncoder = CoreRegistry.createNewBlock("Encoder", AssemblyLine.MOD_ID, BlockEncoder.class);
ALRecipeLoader.blockArmbot = CoreRegistry.createNewBlock("Armbot", AssemblyLine.MOD_ID, BlockArmbot.class);
ALRecipeLoader.blockTurntable = CoreRegistry.createNewBlock("Turntable", AssemblyLine.MOD_ID, BlockTurntable.class);
ALRecipeLoader.processorMachine = CoreRegistry.createNewBlock("ALBlockProcessor", AssemblyLine.MOD_ID, BlockProcessor.class, ItemBlockHolder.class);
ALRecipeLoader.blockAdvancedHopper = CoreRegistry.createNewBlock("ALBlockHopper", AssemblyLine.MOD_ID, BlockAdvancedHopper.class, ItemBlockHolder.class);
ALRecipeLoader.itemImprint = new ItemImprinter(CONFIGURATION.getItem("Imprint", DarkCore.getNextItemId()).getInt());
ALRecipeLoader.itemDisk = new ItemDisk(CONFIGURATION.getItem("Disk", DarkCore.getNextItemId()).getInt());

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

@ -19,6 +19,9 @@ import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
import com.builtbroken.common.Pair;
import com.dark.helpers.ItemWorldHelper;
import com.dark.helpers.MathHelper;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;
@ -33,10 +36,7 @@ import dark.api.al.coding.ProgramHelper;
import dark.assembly.ALRecipeLoader;
import dark.assembly.machine.TileEntityAssembly;
import dark.assembly.machine.encoder.ItemDisk;
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.DarkMain;

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

@ -10,12 +10,12 @@ import net.minecraft.world.World;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.Pair;
import com.dark.helpers.ItemWorldHelper;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.ITask;
import dark.assembly.armbot.TaskBaseArmbot;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.ItemWorldHelper;
/** Used by arms to break a specific block in a position.
*

4
src/dark/assembly/armbot/command/TaskGive.java
View file

@ -12,14 +12,14 @@ import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.MathHelper;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.IProgrammableMachine;
import dark.api.al.coding.args.ArgumentIntData;
import dark.assembly.armbot.TaskBaseArmbot;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.InvInteractionHelper;
import dark.core.helpers.MathHelper;
public class TaskGive extends TaskBaseArmbot
{

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

@ -2,6 +2,8 @@ package dark.assembly.armbot.command;
import java.util.List;
import com.dark.helpers.EntityDictionary;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityAgeable;
import net.minecraft.entity.player.EntityPlayer;
@ -11,7 +13,6 @@ import net.minecraft.util.AxisAlignedBB;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.args.ArgumentData;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.EntityDictionary;
public class TaskGrabEntity extends TaskGrabPrefab
{

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

@ -6,12 +6,12 @@ import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.MathHelper;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.args.ArgumentIntData;
import dark.assembly.armbot.TaskBaseArmbot;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.MathHelper;
/** Rotates an armbot by a set amount
*

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

@ -6,12 +6,12 @@ import net.minecraft.nbt.NBTTagCompound;
import universalelectricity.core.vector.Vector2;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.MathHelper;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.args.ArgumentIntData;
import dark.assembly.armbot.TaskBaseArmbot;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.MathHelper;
/** Rotates the armbot to a specific direction. If not specified, it will turn right.
*

4
src/dark/assembly/armbot/command/TaskTake.java
View file

@ -12,13 +12,13 @@ import universalelectricity.core.vector.Vector2;
import universalelectricity.core.vector.Vector3;
import com.builtbroken.common.science.units.UnitHelper;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.MathHelper;
import dark.api.al.coding.IArmbot;
import dark.api.al.coding.args.ArgumentIntData;
import dark.assembly.armbot.TaskBaseArmbot;
import dark.assembly.armbot.TaskBaseProcess;
import dark.core.helpers.InvInteractionHelper;
import dark.core.helpers.MathHelper;
public class TaskTake extends TaskBaseArmbot
{

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

@ -3,6 +3,8 @@ package dark.assembly.imprinter;
import java.util.ArrayList;
import java.util.List;
import com.dark.IndustryCreativeTab;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
@ -16,7 +18,6 @@ import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.DMCreativeTab;
public class ItemImprinter extends Item
{
@ -24,7 +25,7 @@ public class ItemImprinter extends Item
{
super(id);
this.setUnlocalizedName("imprint");
this.setCreativeTab(DMCreativeTab.tabAutomation());
this.setCreativeTab(IndustryCreativeTab.tabAutomation());
this.setHasSubtypes(true);
this.maxStackSize = 1;
}

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

@ -23,15 +23,15 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import com.builtbroken.common.Pair;
import com.dark.helpers.AutoCraftingManager;
import com.dark.helpers.AutoCraftingManager.IAutoCrafter;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
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.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.DarkMain;

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

@ -1,12 +1,13 @@
package dark.assembly.machine;
import com.dark.IndustryCreativeTab;
import net.minecraft.block.material.Material;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import dark.assembly.AssemblyLine;
import dark.core.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
public class BlockAssembly extends BlockMachine
@ -14,7 +15,7 @@ public class BlockAssembly extends BlockMachine
public BlockAssembly(String blockName, Material material)
{
super(AssemblyLine.CONFIGURATION, blockName, material);
this.setCreativeTab(DMCreativeTab.tabAutomation());
this.setCreativeTab(IndustryCreativeTab.tabAutomation());
}
@Override

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

@ -5,15 +5,16 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
import com.dark.prefab.tile.network.NetworkSharedPower;
import com.dark.prefab.tile.network.NetworkUpdateHandler;
import com.dark.tile.network.INetworkEnergyPart;
import com.dark.tile.network.INetworkPart;
import net.minecraft.tileentity.TileEntity;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.block.IElectrical;
import universalelectricity.core.block.IElectricalStorage;
import universalelectricity.core.vector.Vector3;
import dark.api.tilenetwork.INetworkEnergyPart;
import dark.api.tilenetwork.INetworkPart;
import dark.core.prefab.tilenetwork.NetworkSharedPower;
import dark.core.prefab.tilenetwork.NetworkUpdateHandler;
public class NetworkAssembly extends NetworkSharedPower
{

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

@ -4,16 +4,17 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Random;
import com.dark.prefab.tile.network.NetworkSharedPower;
import com.dark.prefab.tile.network.NetworkTileEntities;
import com.dark.tile.network.INetworkEnergyPart;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.electricity.ElectricityPack;
import universalelectricity.core.vector.Vector3;
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;
/** A class to be inherited by all machines on the assembly line. This class acts as a single peace
* in a network of similar tiles allowing all to share power from one or more sources

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

@ -9,12 +9,12 @@ import net.minecraft.network.packet.Packet250CustomPayload;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.IPacketReceiver;
import com.dark.interfaces.IExtendedStorage;
import com.dark.network.PacketHandler;
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.network.PacketHandler;
import dark.core.prefab.machine.TileEntityInv;
import dark.machines.DarkMain;

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

@ -10,12 +10,12 @@ import net.minecraft.network.packet.Packet;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.assembly.ALRecipeLoader;
import dark.assembly.imprinter.prefab.TileEntityFilterable;
import dark.core.network.PacketHandler;
public class TileEntityDetector extends TileEntityFilterable
{

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

@ -11,14 +11,14 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.tile.IRotatable;
import com.dark.helpers.InvInteractionHelper;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.al.IManipulator;
import dark.assembly.imprinter.ItemImprinter;
import dark.assembly.imprinter.prefab.TileEntityFilterable;
import dark.core.helpers.InvInteractionHelper;
import dark.core.network.PacketHandler;
public class TileEntityManipulator extends TileEntityFilterable implements IRotatable, IManipulator
{

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

@ -11,12 +11,12 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.al.IBelt;
import dark.assembly.imprinter.prefab.TileEntityFilterable;
import dark.core.network.PacketHandler;
/** @author Darkguardsman */
public class TileEntityRejector extends TileEntityFilterable

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

@ -16,6 +16,7 @@ import net.minecraft.world.World;
import net.minecraftforge.common.ForgeDirection;
import com.builtbroken.common.Pair;
import com.dark.prefab.tile.network.NetworkItemSupply;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
@ -23,7 +24,6 @@ import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderConveyorBelt;
import dark.assembly.machine.BlockAssembly;
import dark.assembly.machine.belt.TileEntityConveyorBelt.SlantType;
import dark.core.prefab.tilenetwork.NetworkItemSupply;
import dark.machines.DarkMain;
public class BlockConveyor extends BlockAssembly

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

@ -3,6 +3,11 @@ package dark.assembly.machine.belt;
import java.util.ArrayList;
import java.util.List;
import com.dark.prefab.tile.network.NetworkItemSupply;
import com.dark.tile.network.IMotionPath;
import com.dark.tile.network.INetworkPart;
import com.dark.tile.network.ITileNetwork;
import net.minecraft.entity.Entity;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.tileentity.TileEntity;
@ -10,12 +15,8 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.api.al.IBelt;
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;
public class TileEntityConveyor extends TileEntityEnergyMachine implements IMotionPath, IBelt, INetworkPart
{

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

@ -13,13 +13,13 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.tile.IRotatable;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.al.IBelt;
import dark.assembly.ALRecipeLoader;
import dark.assembly.machine.TileEntityAssembly;
import dark.core.network.PacketHandler;
import dark.machines.DarkMain;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved

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

@ -3,6 +3,8 @@ package dark.assembly.machine.encoder;
import java.util.ArrayList;
import java.util.List;
import com.dark.IndustryCreativeTab;
import net.minecraft.client.renderer.texture.IconRegister;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
@ -12,7 +14,6 @@ import net.minecraft.nbt.NBTTagList;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.assembly.AssemblyLine;
import dark.core.DMCreativeTab;
public class ItemDisk extends Item
{
@ -20,7 +21,7 @@ public class ItemDisk extends Item
{
super(id);
this.setUnlocalizedName("disk");
this.setCreativeTab(DMCreativeTab.tabAutomation());
this.setCreativeTab(IndustryCreativeTab.tabAutomation());
this.setHasSubtypes(true);
}

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

@ -10,6 +10,7 @@ import net.minecraft.network.packet.Packet;
import universalelectricity.core.vector.Vector2;
import universalelectricity.prefab.network.PacketManager;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.PacketDispatcher;
@ -19,7 +20,6 @@ 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.network.PacketHandler;
import dark.core.prefab.machine.TileEntityMachine;
import dark.machines.DarkMain;

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

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

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

@ -12,16 +12,16 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.tile.IRotatable;
import com.dark.network.ISimplePacketReceiver;
import com.dark.network.PacketHandler;
import com.dark.tile.network.INetworkPart;
import com.dark.tile.network.ITileNetwork;
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.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.DarkMain;
/** A non-updating tileEntity that represents the logic behind the frame. It contains rotation and

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

@ -16,6 +16,7 @@ import net.minecraftforge.oredict.OreDictionary;
import universalelectricity.core.UniversalElectricity;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
@ -25,7 +26,6 @@ import dark.assembly.AssemblyLine;
import dark.assembly.CommonProxy;
import dark.assembly.client.render.BlockRenderingHandler;
import dark.assembly.client.render.RenderProcessor;
import dark.core.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
public class BlockProcessor extends BlockMachine
@ -34,7 +34,7 @@ public class BlockProcessor extends BlockMachine
public BlockProcessor()
{
super(AssemblyLine.CONFIGURATION, "OreProcessor", UniversalElectricity.machine);
this.setCreativeTab(DMCreativeTab.tabIndustrial());
this.setCreativeTab(IndustryCreativeTab.tabIndustrial());
}
@Override

2
src/dark/assembly/machine/processor/ContainerProcessor.java
View file

@ -10,7 +10,7 @@ import net.minecraft.item.ItemStack;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import dark.api.reciepes.MachineRecipeHandler;
import dark.core.helpers.EnergyHelper;
import dark.core.prefab.machine.EnergyHelper;
public class ContainerProcessor extends Container
{

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

@ -5,16 +5,16 @@ import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraftforge.common.ForgeDirection;
import com.dark.network.PacketHandler;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.reciepes.MachineRecipeHandler;
import dark.api.reciepes.ProcessorType;
import dark.assembly.machine.processor.BlockProcessor.ProcessorData;
import dark.core.helpers.EnergyHelper;
import dark.core.interfaces.IInvBox;
import dark.core.network.PacketHandler;
import dark.core.prefab.invgui.InvChest;
import dark.core.prefab.machine.EnergyHelper;
import dark.core.prefab.machine.TileEntityEnergyMachine;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks

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

@ -15,12 +15,12 @@ import net.minecraft.world.IBlockAccess;
import net.minecraft.world.World;
import com.builtbroken.common.Pair;
import com.dark.IndustryCreativeTab;
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.DMCreativeTab;
import dark.core.prefab.machine.BlockMachine;
/** Block for an advanced version of the vanilla minecraft hopper
@ -38,7 +38,7 @@ public class BlockAdvancedHopper extends BlockMachine
public BlockAdvancedHopper()
{
super(AssemblyLine.CONFIGURATION, "DMHopper", Material.iron);
this.setCreativeTab(DMCreativeTab.tabAutomation());
this.setCreativeTab(IndustryCreativeTab.tabAutomation());
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}

5
src/dark/assembly/machine/red/TileEntityAdvancedHopper.java
View file

@ -2,6 +2,9 @@ package dark.assembly.machine.red;
import java.util.List;
import com.dark.helpers.InvInteractionHelper;
import com.dark.helpers.ItemWorldHelper;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
@ -9,8 +12,6 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import dark.assembly.imprinter.ItemImprinter;
import dark.assembly.imprinter.prefab.TileEntityFilterable;
import dark.core.helpers.InvInteractionHelper;
import dark.core.helpers.ItemWorldHelper;
/** Advanced version of the hopper with features such as redstone control, sorting, filtering, and
* crate version.