Anvilcraft/resonant-induction
2
1
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

CleanUp

Browse source
This commit is contained in:
DarkGuardsman 2013-09-27 19:03:16 -04:00
parent 74fb3882a6
commit 6aa1a705d2
11 changed files with 35 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java
View file

@ -1,13 +1,9 @@
package dark.assembly.common.armbot;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.google.common.io.ByteArrayDataInput;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityList;
import net.minecraft.entity.item.EntityItem;
@ -21,7 +17,9 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.TranslationHelper;
import universalelectricity.prefab.network.IPacketReceiver;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.common.network.Player;
import cpw.mods.fml.relauncher.Side;
@ -902,7 +900,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
/** gets the facing direction using the yaw angle */
public ForgeDirection getFacingDirectionFromAngle()
{
float angle = MathHelper.wrapAngleTo180_float(this.rotationYaw);
float angle = net.minecraft.util.MathHelper.wrapAngleTo180_float(this.rotationYaw);
if (angle >= -45 && angle <= 45)
{
return ForgeDirection.SOUTH;

3
src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java
View file

@ -5,7 +5,6 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.tile.IRotatable;
import dark.assembly.api.IFilterable;
import dark.assembly.common.imprinter.ItemImprinter;
@ -28,7 +27,7 @@ public abstract class TileEntityFilterable extends TileEntityAssembly implements
}
/** Looks through the things in the filter and finds out which item is being filtered.
*
*
* @return Is this filterable block filtering this specific ItemStack? */
public boolean isFiltering(ItemStack itemStack)
{

8
src/minecraft/dark/assembly/common/machine/BlockCrate.java
View file

@ -20,7 +20,7 @@ import dark.core.registration.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
*
*
* @author DarkGuardsman */
public class BlockCrate extends BlockAssembly
{
@ -216,7 +216,7 @@ public class BlockCrate extends BlockAssembly
}
/** Inserts all items of the same type this player has into the crate.
*
*
* @return True on success */
public boolean insertAllItems(TileEntityCrate tileEntity, EntityPlayer player)
{
@ -261,7 +261,7 @@ public class BlockCrate extends BlockAssembly
}
/** Ejects and item out of the crate and spawn it under the player entity.
*
*
* @param tileEntity
* @param player
* @param requestSize - The maximum stack size to take out. Default should be 64.
@ -313,7 +313,7 @@ public class BlockCrate extends BlockAssembly
}
/** Puts an itemStack into the crate.
*
*
* @param tileEntity
* @param itemStack */
public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack)

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

@ -13,7 +13,7 @@ import dark.assembly.common.imprinter.prefab.BlockImprintable;
import dark.core.registration.ModObjectRegistry.BlockBuildData;
/** A block that manipulates item movement between inventories.
*
*
* @author Calclavia */
public class BlockManipulator extends BlockImprintable
{

2
src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java
View file

@ -17,7 +17,7 @@ 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
*
*
* @author DarkGuardsman */
public abstract class TileEntityAssembly extends TileEntityEnergyMachine implements INetworkEnergyPart
{

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

@ -18,7 +18,7 @@ import dark.core.network.PacketHandler;
import dark.core.prefab.machine.TileEntityInv;
/** Basic single stack inventory
*
*
* @author DarkGuardsman */
public class TileEntityCrate extends TileEntityInv implements IPacketReceiver
{
@ -64,7 +64,7 @@ public class TileEntityCrate extends TileEntityInv implements IPacketReceiver
/** Turns the inventory array into a single stack of matching items. This assumes that all items
* in the crate are the same TODO eject minority items and only keep the majority that are the
* same to prevent duplication issues
*
*
* @param force - force a rebuild of the inventory from the single stack created */
public void buildSampleStack()
{

12
src/minecraft/dark/assembly/common/machine/TileEntityDetector.java
View file

@ -1,25 +1,21 @@
package dark.assembly.common.machine;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.ArrayList;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
import dark.core.network.PacketHandler;
import dark.core.prefab.machine.TileEntityMachine.SimplePacketTypes;
public class TileEntityDetector extends TileEntityFilterable
{

11
src/minecraft/dark/assembly/common/machine/TileEntityManipulator.java
View file

@ -1,15 +1,8 @@
package dark.assembly.common.machine;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.List;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
@ -17,6 +10,10 @@ import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.tile.IRotatable;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.assembly.api.IManipulator;
import dark.assembly.common.imprinter.ItemImprinter;
import dark.assembly.common.imprinter.prefab.TileEntityFilterable;

11
src/minecraft/dark/assembly/common/machine/TileEntityRejector.java
View file

@ -1,22 +1,19 @@
package dark.assembly.common.machine;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.List;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.network.packet.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.assembly.api.IBelt;
import dark.assembly.common.imprinter.prefab.TileEntityFilterable;
import dark.core.network.PacketHandler;

14
src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java
View file

@ -1,25 +1,21 @@
package dark.assembly.common.machine.belt;
import java.io.DataInputStream;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.Entity;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.network.packet.Packet;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.AxisAlignedBB;
import net.minecraftforge.common.ForgeDirection;
import universalelectricity.core.vector.Vector3;
import universalelectricity.prefab.network.IPacketReceiver;
import universalelectricity.prefab.tile.IRotatable;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.assembly.api.IBelt;
import dark.assembly.common.AssemblyLine;
import dark.assembly.common.machine.TileEntityAssembly;
@ -27,7 +23,7 @@ import dark.core.common.DarkMain;
import dark.core.network.PacketHandler;
/** Conveyer belt TileEntity that allows entities of all kinds to be moved
*
*
* @author DarkGuardsman */
public class TileEntityConveyorBelt extends TileEntityAssembly implements IBelt, IRotatable
{

13
src/minecraft/dark/assembly/common/machine/processor/TileEntityProcessor.java
View file

@ -1,17 +1,14 @@
package dark.assembly.common.machine.processor;
import java.io.DataInputStream;
import java.io.IOException;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.item.ItemStack;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.common.ForgeDirection;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.common.network.Player;
import dark.api.ProcessorRecipes;
import dark.api.ProcessorRecipes.ProcessorType;
import dark.assembly.common.machine.processor.BlockProcessor.ProcessorData;
@ -21,7 +18,7 @@ import dark.core.prefab.invgui.InvChest;
import dark.core.prefab.machine.TileEntityEnergyMachine;
/** Basic A -> B recipe processor machine designed mainly to handle ore blocks
*
*
* @author DarkGuardsman */
public class TileEntityProcessor extends TileEntityEnergyMachine
{