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

cleanup and package changes

Browse source
This commit is contained in:
Robert Seifert 2013-05-08 03:14:46 -04:00
parent 0850129263
commit 290631cf8a
44 changed files with 65 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/minecraft/assemblyline/client/ClientProxy.java
View file

@ -17,16 +17,16 @@ import assemblyline.client.render.RenderDetector;
import assemblyline.client.render.RenderManipulator;
import assemblyline.client.render.RenderRejector;
import assemblyline.common.CommonProxy;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.TileEntityImprinter;
import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.crane.TileEntityCraneController;
import assemblyline.common.machine.crane.TileEntityCraneRail;
import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.TileEntityEncoder;
import assemblyline.common.machine.imprinter.TileEntityImprinter;
import cpw.mods.fml.client.registry.ClientRegistry;
import cpw.mods.fml.client.registry.RenderingRegistry;

4
src/minecraft/assemblyline/client/gui/GuiImprinter.java
View file

@ -7,8 +7,8 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.prefab.TranslationHelper;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.imprinter.ContainerImprinter;
import assemblyline.common.machine.imprinter.TileEntityImprinter;
import assemblyline.common.imprinter.ContainerImprinter;
import assemblyline.common.imprinter.TileEntityImprinter;
public class GuiImprinter extends GuiContainer
{

2
src/minecraft/assemblyline/client/render/RenderArmbot.java
View file

@ -16,7 +16,7 @@ import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import assemblyline.client.model.ModelArmbot;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.armbot.TileEntityArmbot;
public class RenderArmbot extends TileEntitySpecialRenderer
{

3
src/minecraft/assemblyline/client/render/RenderCrate.java
View file

@ -9,10 +9,8 @@ import net.minecraft.client.renderer.entity.RenderItem;
import net.minecraft.client.renderer.entity.RenderManager;
import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.world.World;
import net.minecraftforge.client.ForgeHooksClient;
import net.minecraftforge.common.ForgeDirection;
@ -20,7 +18,6 @@ import net.minecraftforge.common.ForgeDirection;
import org.lwjgl.opengl.GL11;
import universalelectricity.core.vector.Vector3;
import assemblyline.common.block.TileEntityCrate;
public class RenderCrate extends TileEntitySpecialRenderer

4
src/minecraft/assemblyline/client/render/RenderImprintable.java
View file

@ -8,8 +8,8 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.MovingObjectPosition;
import assemblyline.common.machine.imprinter.ItemImprinter;
import assemblyline.common.machine.imprinter.TileEntityFilterable;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.imprinter.prefab.TileEntityFilterable;
/**
* @author Briman0094

11
src/minecraft/assemblyline/common/AssemblyLine.java
View file

@ -1,7 +1,6 @@
package assemblyline.common;
import ic2.api.item.Items;
import ic2.api.recipe.Recipes;
import java.io.File;
import java.util.Arrays;
@ -16,21 +15,21 @@ import net.minecraftforge.oredict.ShapelessOreRecipe;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.multiblock.BlockMulti;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.armbot.BlockArmbot;
import assemblyline.common.armbot.command.GrabDictionary;
import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.BlockTurntable;
import assemblyline.common.block.ItemBlockCrate;
import assemblyline.common.imprinter.BlockImprinter;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.machine.BlockManipulator;
import assemblyline.common.machine.BlockRejector;
import assemblyline.common.machine.armbot.BlockArmbot;
import assemblyline.common.machine.belt.BlockConveyorBelt;
import assemblyline.common.machine.command.GrabDictionary;
import assemblyline.common.machine.crane.BlockCraneController;
import assemblyline.common.machine.crane.BlockCraneFrame;
import assemblyline.common.machine.detector.BlockDetector;
import assemblyline.common.machine.encoder.BlockEncoder;
import assemblyline.common.machine.encoder.ItemDisk;
import assemblyline.common.machine.imprinter.BlockImprinter;
import assemblyline.common.machine.imprinter.ItemImprinter;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.FMLLog;
import cpw.mods.fml.common.Loader;
@ -192,7 +191,7 @@ public class AssemblyLine
{
createIC2Recipes();
}
}
private void createVanillaRecipes()

6
src/minecraft/assemblyline/common/CommonProxy.java
View file

@ -10,18 +10,18 @@ import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.world.World;
import universalelectricity.prefab.multiblock.TileEntityMulti;
import assemblyline.common.armbot.TileEntityArmbot;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.imprinter.ContainerImprinter;
import assemblyline.common.imprinter.TileEntityImprinter;
import assemblyline.common.machine.TileEntityManipulator;
import assemblyline.common.machine.TileEntityRejector;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.machine.belt.TileEntityConveyorBelt;
import assemblyline.common.machine.crane.TileEntityCraneController;
import assemblyline.common.machine.crane.TileEntityCraneRail;
import assemblyline.common.machine.detector.TileEntityDetector;
import assemblyline.common.machine.encoder.ContainerEncoder;
import assemblyline.common.machine.encoder.TileEntityEncoder;
import assemblyline.common.machine.imprinter.ContainerImprinter;
import assemblyline.common.machine.imprinter.TileEntityImprinter;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.IGuiHandler;
import cpw.mods.fml.common.registry.GameRegistry;

2
src/minecraft/assemblyline/common/machine/armbot/BlockArmbot.java → src/minecraft/assemblyline/common/armbot/BlockArmbot.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.armbot;
package assemblyline.common.armbot;
import java.util.Random;

20
src/minecraft/assemblyline/common/machine/armbot/TileEntityArmbot.java → src/minecraft/assemblyline/common/armbot/TileEntityArmbot.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.armbot;
package assemblyline.common.armbot;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@ -30,16 +30,16 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IArmbot;
import assemblyline.common.AssemblyLine;
import assemblyline.common.armbot.command.Command;
import assemblyline.common.armbot.command.CommandDrop;
import assemblyline.common.armbot.command.CommandFire;
import assemblyline.common.armbot.command.CommandGrab;
import assemblyline.common.armbot.command.CommandManager;
import assemblyline.common.armbot.command.CommandReturn;
import assemblyline.common.armbot.command.CommandRotateBy;
import assemblyline.common.armbot.command.CommandRotateTo;
import assemblyline.common.armbot.command.CommandUse;
import assemblyline.common.machine.TileEntityAssemblyNetwork;
import assemblyline.common.machine.command.Command;
import assemblyline.common.machine.command.CommandDrop;
import assemblyline.common.machine.command.CommandFire;
import assemblyline.common.machine.command.CommandGrab;
import assemblyline.common.machine.command.CommandManager;
import assemblyline.common.machine.command.CommandReturn;
import assemblyline.common.machine.command.CommandRotateBy;
import assemblyline.common.machine.command.CommandRotateTo;
import assemblyline.common.machine.command.CommandUse;
import assemblyline.common.machine.encoder.ItemDisk;
import com.google.common.io.ByteArrayDataInput;

4
src/minecraft/assemblyline/common/machine/command/Command.java → src/minecraft/assemblyline/common/armbot/command/Command.java
View file

@ -1,10 +1,10 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.HashMap;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.world.World;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.armbot.TileEntityArmbot;
/**
* An AI Commands that is used by TileEntities with AI.

2
src/minecraft/assemblyline/common/machine/command/CommandBreak.java → src/minecraft/assemblyline/common/armbot/command/CommandBreak.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.ArrayList;

2
src/minecraft/assemblyline/common/machine/command/CommandDrop.java → src/minecraft/assemblyline/common/armbot/command/CommandDrop.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
public class CommandDrop extends Command
{

2
src/minecraft/assemblyline/common/machine/command/CommandFire.java → src/minecraft/assemblyline/common/armbot/command/CommandFire.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.Random;

2
src/minecraft/assemblyline/common/machine/command/CommandGrab.java → src/minecraft/assemblyline/common/armbot/command/CommandGrab.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.List;

2
src/minecraft/assemblyline/common/machine/command/CommandHarvest.java → src/minecraft/assemblyline/common/armbot/command/CommandHarvest.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
/**
* Used by arms to break a specific block in a position.

2
src/minecraft/assemblyline/common/machine/command/CommandIdle.java → src/minecraft/assemblyline/common/armbot/command/CommandIdle.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.nbt.NBTTagCompound;

4
src/minecraft/assemblyline/common/machine/command/CommandManager.java → src/minecraft/assemblyline/common/armbot/command/CommandManager.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.ArrayList;
import java.util.List;
@ -6,7 +6,7 @@ import java.util.List;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList;
import net.minecraft.nbt.NBTTagString;
import assemblyline.common.machine.armbot.TileEntityArmbot;
import assemblyline.common.armbot.TileEntityArmbot;
import cpw.mods.fml.common.FMLLog;
public class CommandManager

2
src/minecraft/assemblyline/common/machine/command/CommandPlace.java → src/minecraft/assemblyline/common/armbot/command/CommandPlace.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.block.Block;
import net.minecraft.entity.Entity;

2
src/minecraft/assemblyline/common/machine/command/CommandPowerTo.java → src/minecraft/assemblyline/common/armbot/command/CommandPowerTo.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.ArrayList;
import java.util.List;

2
src/minecraft/assemblyline/common/machine/command/CommandRepeat.java → src/minecraft/assemblyline/common/armbot/command/CommandRepeat.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.nbt.NBTTagCompound;

2
src/minecraft/assemblyline/common/machine/command/CommandReturn.java → src/minecraft/assemblyline/common/armbot/command/CommandReturn.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
public class CommandReturn extends Command
{

2
src/minecraft/assemblyline/common/machine/command/CommandRotateBy.java → src/minecraft/assemblyline/common/armbot/command/CommandRotateBy.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.nbt.NBTTagCompound;

2
src/minecraft/assemblyline/common/machine/command/CommandRotateTo.java → src/minecraft/assemblyline/common/armbot/command/CommandRotateTo.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.nbt.NBTTagCompound;

2
src/minecraft/assemblyline/common/machine/command/CommandUse.java → src/minecraft/assemblyline/common/armbot/command/CommandUse.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import net.minecraft.block.Block;
import net.minecraft.nbt.NBTTagCompound;

2
src/minecraft/assemblyline/common/machine/command/GrabDictionary.java → src/minecraft/assemblyline/common/armbot/command/GrabDictionary.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.command;
package assemblyline.common.armbot.command;
import java.util.ArrayList;
import java.util.List;

2
src/minecraft/assemblyline/common/machine/imprinter/BlockImprinter.java → src/minecraft/assemblyline/common/imprinter/BlockImprinter.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import java.util.Random;

2
src/minecraft/assemblyline/common/machine/imprinter/ContainerImprinter.java → src/minecraft/assemblyline/common/imprinter/ContainerImprinter.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.InventoryPlayer;

2
src/minecraft/assemblyline/common/machine/imprinter/ISlotWatcher.java → src/minecraft/assemblyline/common/imprinter/ISlotWatcher.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
public interface ISlotWatcher
{

2
src/minecraft/assemblyline/common/machine/imprinter/ItemImprinter.java → src/minecraft/assemblyline/common/imprinter/ItemImprinter.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import java.util.ArrayList;
import java.util.List;

2
src/minecraft/assemblyline/common/machine/imprinter/SlotCraftingResult.java → src/minecraft/assemblyline/common/imprinter/SlotCraftingResult.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;

2
src/minecraft/assemblyline/common/machine/imprinter/SlotCustom.java → src/minecraft/assemblyline/common/imprinter/SlotCustom.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;

2
src/minecraft/assemblyline/common/machine/imprinter/SlotImprintResult.java → src/minecraft/assemblyline/common/imprinter/SlotImprintResult.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.inventory.IInventory;

2
src/minecraft/assemblyline/common/machine/imprinter/TileEntityImprinter.java → src/minecraft/assemblyline/common/imprinter/TileEntityImprinter.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import java.util.ArrayList;
import java.util.List;

2
src/minecraft/assemblyline/common/machine/imprinter/WatchedSlot.java → src/minecraft/assemblyline/common/imprinter/WatchedSlot.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter;
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.Slot;

3
src/minecraft/assemblyline/common/machine/imprinter/BlockImprintable.java → src/minecraft/assemblyline/common/imprinter/prefab/BlockImprintable.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter.prefab;
import net.minecraft.block.material.Material;
import net.minecraft.creativetab.CreativeTabs;
@ -12,6 +12,7 @@ import net.minecraft.world.World;
import universalelectricity.prefab.implement.IRedstoneReceptor;
import assemblyline.api.IFilterable;
import assemblyline.common.block.BlockALMachine;
import assemblyline.common.imprinter.ItemImprinter;
/**
* Extend this block class if a filter is allowed to be placed inside of this block.

3
src/minecraft/assemblyline/common/machine/imprinter/TileEntityFilterable.java → src/minecraft/assemblyline/common/imprinter/prefab/TileEntityFilterable.java
View file

@ -1,4 +1,4 @@
package assemblyline.common.machine.imprinter;
package assemblyline.common.imprinter.prefab;
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
@ -19,6 +19,7 @@ import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IFilterable;
import assemblyline.common.AssemblyLine;
import assemblyline.common.imprinter.ItemImprinter;
import assemblyline.common.machine.TileEntityAssemblyNetwork;
import com.google.common.io.ByteArrayDataInput;

2
src/minecraft/assemblyline/common/machine/BlockManipulator.java
View file

@ -7,7 +7,7 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.machine.imprinter.BlockImprintable;
import assemblyline.common.imprinter.prefab.BlockImprintable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/BlockRejector.java
View file

@ -5,7 +5,7 @@ import net.minecraft.world.World;
import universalelectricity.core.UniversalElectricity;
import assemblyline.client.render.BlockRenderingHandler;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.machine.imprinter.BlockImprintable;
import assemblyline.common.imprinter.prefab.BlockImprintable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/TileEntityManipulator.java
View file

@ -19,7 +19,7 @@ import universalelectricity.prefab.network.PacketManager;
import assemblyline.api.IManipulator;
import assemblyline.common.block.BlockCrate;
import assemblyline.common.block.TileEntityCrate;
import assemblyline.common.machine.imprinter.TileEntityFilterable;
import assemblyline.common.imprinter.prefab.TileEntityFilterable;
import cpw.mods.fml.common.network.PacketDispatcher;
public class TileEntityManipulator extends TileEntityFilterable implements IRotatable, IRedstoneReceptor, IManipulator

2
src/minecraft/assemblyline/common/machine/TileEntityRejector.java
View file

@ -11,7 +11,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.machine.imprinter.TileEntityFilterable;
import assemblyline.common.imprinter.prefab.TileEntityFilterable;
/**
*

2
src/minecraft/assemblyline/common/machine/detector/BlockDetector.java
View file

@ -13,7 +13,7 @@ import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.UniversalElectricity;
import assemblyline.common.AssemblyLine;
import assemblyline.common.TabAssemblyLine;
import assemblyline.common.machine.imprinter.BlockImprintable;
import assemblyline.common.imprinter.prefab.BlockImprintable;
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;

2
src/minecraft/assemblyline/common/machine/detector/TileEntityDetector.java
View file

@ -10,7 +10,7 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.PacketManager;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.imprinter.TileEntityFilterable;
import assemblyline.common.imprinter.prefab.TileEntityFilterable;
public class TileEntityDetector extends TileEntityFilterable
{

2
src/minecraft/assemblyline/common/machine/encoder/ContainerEncoder.java
View file

@ -6,7 +6,7 @@ import net.minecraft.inventory.Container;
import net.minecraft.inventory.Slot;
import net.minecraft.item.ItemStack;
import assemblyline.common.AssemblyLine;
import assemblyline.common.machine.imprinter.SlotCustom;
import assemblyline.common.imprinter.SlotCustom;
public class ContainerEncoder extends Container
{

2
src/minecraft/assemblyline/common/machine/encoder/TileEntityEncoder.java
View file

@ -11,7 +11,7 @@ import net.minecraftforge.common.ForgeDirection;
import net.minecraftforge.common.ISidedInventory;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.tile.TileEntityAdvanced;
import assemblyline.common.machine.command.Command;
import assemblyline.common.armbot.command.Command;
import com.google.common.io.ByteArrayDataInput;