From 46acce1582cc85e57e808d25ba9d94d321075d3a Mon Sep 17 00:00:00 2001 From: Robert Date: Mon, 9 Dec 2013 12:20:00 -0500 Subject: [PATCH] cleanup & formatting --- src/dark/api/al/coding/IArmbotUseable.java | 6 +++--- src/dark/api/al/coding/IProgram.java | 2 +- src/dark/api/al/coding/TaskRegistry.java | 6 +++--- src/dark/api/al/coding/args/ArgumentData.java | 4 ++-- src/dark/api/al/coding/args/ArgumentDoubleData.java | 2 +- src/dark/api/al/coding/args/ArgumentFloatData.java | 2 +- src/dark/api/al/coding/args/ArgumentIntData.java | 2 +- src/dark/assembly/armbot/BlockArmbot.java | 2 +- src/dark/assembly/armbot/Program.java | 2 +- src/dark/assembly/armbot/TaskBase.java | 1 + src/dark/assembly/armbot/command/TaskBreak.java | 4 +--- src/dark/assembly/armbot/command/TaskGrabPrefab.java | 2 +- src/dark/assembly/armbot/command/TaskRotateBy.java | 2 +- src/dark/assembly/armbot/command/TaskRotateTo.java | 2 +- src/dark/assembly/client/gui/EnumTaskIcon.java | 2 +- src/dark/assembly/client/gui/GuiEditTask.java | 10 +++++----- src/dark/assembly/client/gui/GuiEncoderCoder.java | 2 +- src/dark/assembly/client/gui/GuiEncoderInventory.java | 2 +- src/dark/assembly/client/gui/GuiTaskList.java | 2 +- src/dark/assembly/client/render/RenderCrate.java | 4 ++-- src/dark/assembly/imprinter/BlockImprinter.java | 2 +- src/dark/assembly/imprinter/TileEntityImprinter.java | 2 +- src/dark/assembly/machine/BlockDetector.java | 2 +- src/dark/assembly/machine/BlockManipulator.java | 2 +- src/dark/assembly/machine/BlockRejector.java | 1 + src/dark/assembly/machine/TileEntityAssembly.java | 2 +- src/dark/assembly/machine/belt/BlockConveyor.java | 2 +- src/dark/assembly/machine/belt/BlockConveyorBelt.java | 2 +- src/dark/assembly/machine/encoder/BlockEncoder.java | 2 +- .../machine/processor/TileEntityProcessor.java | 1 - 30 files changed, 39 insertions(+), 40 deletions(-) diff --git a/src/dark/api/al/coding/IArmbotUseable.java b/src/dark/api/al/coding/IArmbotUseable.java index a7245698..144e13ca 100644 --- a/src/dark/api/al/coding/IArmbotUseable.java +++ b/src/dark/api/al/coding/IArmbotUseable.java @@ -6,16 +6,16 @@ import dark.api.al.coding.args.ArgumentData; /** The IUseable inteface is used by the ArmBot so that it may interact with Tile Entities. onUse * will be called on the block an ArmBot is touching whenever the USE command is run on it. - * + * * @author Briman0094 */ public interface IArmbotUseable { /** Called when the ArmBot command "USE" is run. This is called on any IUseable the ArmBot is * touching. - * + * * @param armbot - The Armbot instance. - * + * * @return true if the use was completed correctly */ public boolean onUse(IArmbot armbot, List list); diff --git a/src/dark/api/al/coding/IProgram.java b/src/dark/api/al/coding/IProgram.java index 82b1752c..97242762 100644 --- a/src/dark/api/al/coding/IProgram.java +++ b/src/dark/api/al/coding/IProgram.java @@ -8,7 +8,7 @@ import universalelectricity.core.vector.Vector2; /** Flow chart style program. Each command in the program needs to have a stored location so it can * be saved and loaded with its correct connections. Though the location only need to be a simple * Column and row based system. - * + * * @author DarkGuardsman */ public interface IProgram extends Cloneable { diff --git a/src/dark/api/al/coding/TaskRegistry.java b/src/dark/api/al/coding/TaskRegistry.java index 0264fe91..83084642 100644 --- a/src/dark/api/al/coding/TaskRegistry.java +++ b/src/dark/api/al/coding/TaskRegistry.java @@ -6,12 +6,12 @@ import java.util.List; import java.util.Map.Entry; /** Used to both register task and fake machines for the encoder to use to create new programs. - * + * * @author DarkGuardsman */ public class TaskRegistry { /** A class of all available commands. - * + * * String - Command name. Command - The actual command class. */ private static final HashMap COMMANDS = new HashMap(); @@ -72,7 +72,7 @@ public class TaskRegistry } /** Do not edit the return or you will change the behavior of all machine that use this list - * + * * @return The list of registered sudo machines for the encoder to check against */ public static HashMap getSudoMachines() { diff --git a/src/dark/api/al/coding/args/ArgumentData.java b/src/dark/api/al/coding/args/ArgumentData.java index 278aba27..9af9c5aa 100644 --- a/src/dark/api/al/coding/args/ArgumentData.java +++ b/src/dark/api/al/coding/args/ArgumentData.java @@ -5,7 +5,7 @@ import dark.api.save.ISaveObj; import dark.api.save.NBTFileHelper; /** Used to store arguments in a way that can be easier to read, limit, and understand - * + * * @author DarkGuardsman */ public class ArgumentData implements ISaveObj { @@ -21,7 +21,7 @@ public class ArgumentData implements ISaveObj } /** Sets the value - * + * * @return true if the value was accepted */ public boolean setData(Object object) { diff --git a/src/dark/api/al/coding/args/ArgumentDoubleData.java b/src/dark/api/al/coding/args/ArgumentDoubleData.java index d4affe2b..14f4a97e 100644 --- a/src/dark/api/al/coding/args/ArgumentDoubleData.java +++ b/src/dark/api/al/coding/args/ArgumentDoubleData.java @@ -5,7 +5,7 @@ import universalelectricity.core.electricity.ElectricityDisplay; /** Used to create argument data for the encoder. Should only be used if the value needs to be * clearly limited inside the encoder display. - * + * * @author DarkGuardsman */ public class ArgumentDoubleData extends ArgumentData { diff --git a/src/dark/api/al/coding/args/ArgumentFloatData.java b/src/dark/api/al/coding/args/ArgumentFloatData.java index a34e8349..adbb1df6 100644 --- a/src/dark/api/al/coding/args/ArgumentFloatData.java +++ b/src/dark/api/al/coding/args/ArgumentFloatData.java @@ -5,7 +5,7 @@ import universalelectricity.core.electricity.ElectricityDisplay; /** Used to create argument data for the encoder. Should only be used if the value needs to be * clearly limited inside the encoder display. - * + * * @author DarkGuardsman */ public class ArgumentFloatData extends ArgumentData { diff --git a/src/dark/api/al/coding/args/ArgumentIntData.java b/src/dark/api/al/coding/args/ArgumentIntData.java index d6727128..3388eb13 100644 --- a/src/dark/api/al/coding/args/ArgumentIntData.java +++ b/src/dark/api/al/coding/args/ArgumentIntData.java @@ -4,7 +4,7 @@ import net.minecraft.util.MathHelper; /** Used to create argument data for the encoder. Should only be used if the value needs to be * clearly limited inside the encoder display. - * + * * @author DarkGuardsman */ public class ArgumentIntData extends ArgumentData { diff --git a/src/dark/assembly/armbot/BlockArmbot.java b/src/dark/assembly/armbot/BlockArmbot.java index a416ad93..43cb4fe7 100644 --- a/src/dark/assembly/armbot/BlockArmbot.java +++ b/src/dark/assembly/armbot/BlockArmbot.java @@ -73,7 +73,7 @@ public class BlockArmbot extends BlockAssembly { return 0; } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/armbot/Program.java b/src/dark/assembly/armbot/Program.java index 9856a715..c35d2c82 100644 --- a/src/dark/assembly/armbot/Program.java +++ b/src/dark/assembly/armbot/Program.java @@ -156,7 +156,7 @@ public class Program implements IProgram } /** Move all tasks at the row and in the direction given. - * + * * @param row - row number or Y value of the position from the task * @param up - true will move all the tasks up one, false will move all the tasks down one */ public void moveAll(int row, boolean up) diff --git a/src/dark/assembly/armbot/TaskBase.java b/src/dark/assembly/armbot/TaskBase.java index 2dd984be..f1019907 100644 --- a/src/dark/assembly/armbot/TaskBase.java +++ b/src/dark/assembly/armbot/TaskBase.java @@ -197,6 +197,7 @@ public abstract class TaskBase implements ITask return this.UV; } + @Override public void getToolTips(List list) { list.add(this.getMethodName()); diff --git a/src/dark/assembly/armbot/command/TaskBreak.java b/src/dark/assembly/armbot/command/TaskBreak.java index ada748f1..9ceb794c 100644 --- a/src/dark/assembly/armbot/command/TaskBreak.java +++ b/src/dark/assembly/armbot/command/TaskBreak.java @@ -18,7 +18,7 @@ import dark.assembly.armbot.TaskBaseProcess; import dark.core.helpers.ItemWorldHelper; /** Used by arms to break a specific block in a position. - * + * * @author Calclavia */ public class TaskBreak extends TaskBaseArmbot { @@ -88,6 +88,4 @@ public class TaskBreak extends TaskBaseArmbot return nbt; } - - } diff --git a/src/dark/assembly/armbot/command/TaskGrabPrefab.java b/src/dark/assembly/armbot/command/TaskGrabPrefab.java index 444ba3f7..0e262fbc 100644 --- a/src/dark/assembly/armbot/command/TaskGrabPrefab.java +++ b/src/dark/assembly/armbot/command/TaskGrabPrefab.java @@ -9,7 +9,7 @@ import dark.api.al.coding.IArmbot; import dark.assembly.armbot.TaskBaseArmbot; /** Prefab for grab based commands - * + * * @author DarkGuardsman */ public abstract class TaskGrabPrefab extends TaskBaseArmbot { diff --git a/src/dark/assembly/armbot/command/TaskRotateBy.java b/src/dark/assembly/armbot/command/TaskRotateBy.java index a3823ba1..90f811f7 100644 --- a/src/dark/assembly/armbot/command/TaskRotateBy.java +++ b/src/dark/assembly/armbot/command/TaskRotateBy.java @@ -14,7 +14,7 @@ import dark.assembly.armbot.TaskBaseProcess; import dark.core.helpers.MathHelper; /** Rotates an armbot by a set amount - * + * * @author DarkGuardsman */ public class TaskRotateBy extends TaskBaseArmbot { diff --git a/src/dark/assembly/armbot/command/TaskRotateTo.java b/src/dark/assembly/armbot/command/TaskRotateTo.java index 4e255efd..86294adc 100644 --- a/src/dark/assembly/armbot/command/TaskRotateTo.java +++ b/src/dark/assembly/armbot/command/TaskRotateTo.java @@ -14,7 +14,7 @@ import dark.assembly.armbot.TaskBaseProcess; import dark.core.helpers.MathHelper; /** Rotates the armbot to a specific direction. If not specified, it will turn right. - * + * * @author DarkGuardsman */ public class TaskRotateTo extends TaskBaseArmbot { diff --git a/src/dark/assembly/client/gui/EnumTaskIcon.java b/src/dark/assembly/client/gui/EnumTaskIcon.java index c1e39577..84964da3 100644 --- a/src/dark/assembly/client/gui/EnumTaskIcon.java +++ b/src/dark/assembly/client/gui/EnumTaskIcon.java @@ -1,7 +1,7 @@ package dark.assembly.client.gui; /** Used to reference icons in the gui coder sheet - * + * * @author DarkGuardsman */ public enum EnumTaskIcon { diff --git a/src/dark/assembly/client/gui/GuiEditTask.java b/src/dark/assembly/client/gui/GuiEditTask.java index 69c922dd..80d9dfc2 100644 --- a/src/dark/assembly/client/gui/GuiEditTask.java +++ b/src/dark/assembly/client/gui/GuiEditTask.java @@ -218,8 +218,8 @@ public class GuiEditTask extends GuiBase implements IMessageBoxDialog protected void drawForegroundLayer(int var2, int var3, float var1) { this.fontRenderer.drawString("Edit Task", (int) (this.guiSize.intX() / 2 - 7 * 2.5), 5, 4210752); - this.fontRenderer.drawString("Task: " + "\u00a77" + this.task.getMethodName(), (int) ((this.guiSize.intX() / 2) - 70), 20, 4210752); - this.fontRenderer.drawString("----Task Arguments---- ", (int) ((this.guiSize.intX() / 2) - 70), 50, 4210752); + this.fontRenderer.drawString("Task: " + "\u00a77" + this.task.getMethodName(), ((this.guiSize.intX() / 2) - 70), 20, 4210752); + this.fontRenderer.drawString("----Task Arguments---- ", ((this.guiSize.intX() / 2) - 70), 50, 4210752); int i = 0; if (task.getArgs() != null) @@ -227,14 +227,14 @@ public class GuiEditTask extends GuiBase implements IMessageBoxDialog for (ArgumentData arg : task.getArgs()) { i++; - this.fontRenderer.drawString(arg.getName() + ":", (int) ((this.guiSize.intX() / 2) - 70), 45 + (i * this.ySpacing), 4210752); - this.fontRenderer.drawString(arg.warning(), (int) ((this.guiSize.intX() / 2) + 11), 45 + (i * this.ySpacing), 4210752); + this.fontRenderer.drawString(arg.getName() + ":", ((this.guiSize.intX() / 2) - 70), 45 + (i * this.ySpacing), 4210752); + this.fontRenderer.drawString(arg.warning(), ((this.guiSize.intX() / 2) + 11), 45 + (i * this.ySpacing), 4210752); } } else { - this.fontRenderer.drawString("\u00a77" + " No editable args ", (int) ((this.guiSize.intX() / 2) - 70), 70, 4210752); + this.fontRenderer.drawString("\u00a77" + " No editable args ", ((this.guiSize.intX() / 2) - 70), 70, 4210752); } diff --git a/src/dark/assembly/client/gui/GuiEncoderCoder.java b/src/dark/assembly/client/gui/GuiEncoderCoder.java index f3b6ecee..4aaa32ae 100644 --- a/src/dark/assembly/client/gui/GuiEncoderCoder.java +++ b/src/dark/assembly/client/gui/GuiEncoderCoder.java @@ -166,7 +166,7 @@ public class GuiEncoderCoder extends GuiEncoderBase { this.helpMessage = ""; } - this.fontRenderer.drawString(this.helpMessage, (int) (this.xSize / 2 - 82), 150, 4210752); + this.fontRenderer.drawString(this.helpMessage, (this.xSize / 2 - 82), 150, 4210752); } diff --git a/src/dark/assembly/client/gui/GuiEncoderInventory.java b/src/dark/assembly/client/gui/GuiEncoderInventory.java index c88c2444..d9a49f51 100644 --- a/src/dark/assembly/client/gui/GuiEncoderInventory.java +++ b/src/dark/assembly/client/gui/GuiEncoderInventory.java @@ -33,6 +33,6 @@ public class GuiEncoderInventory extends GuiEncoderBase int containerWidth = (this.width - this.xSize) / 2; int containerHeight = (this.height - this.ySize) / 2; - this.drawTexturedModalRect(containerWidth, containerHeight-10, 0, 0, this.xSize, this.ySize); + this.drawTexturedModalRect(containerWidth, containerHeight - 10, 0, 0, this.xSize, this.ySize); } } diff --git a/src/dark/assembly/client/gui/GuiTaskList.java b/src/dark/assembly/client/gui/GuiTaskList.java index 2f4c5291..9d0d76ac 100644 --- a/src/dark/assembly/client/gui/GuiTaskList.java +++ b/src/dark/assembly/client/gui/GuiTaskList.java @@ -18,7 +18,7 @@ import dark.assembly.machine.encoder.TileEntityEncoder; import dark.core.interfaces.IScroll; /** Not a gui itself but a component used to display task as a box inside of a gui - * + * * @author DarkGuardsman */ public class GuiTaskList extends Gui implements IScroll { diff --git a/src/dark/assembly/client/render/RenderCrate.java b/src/dark/assembly/client/render/RenderCrate.java index b8037b7d..a2a87ec8 100644 --- a/src/dark/assembly/client/render/RenderCrate.java +++ b/src/dark/assembly/client/render/RenderCrate.java @@ -31,10 +31,10 @@ public class RenderCrate extends TileEntitySpecialRenderer public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float var8) { Vector3 vec = new Vector3(x, y, z); - double distance = vec.distance(new Vector3(0, 0, 0)); + double distance = vec.distance(new Vector3(0, 0, 0)); if (tileEntity instanceof TileEntityCrate) { - + TileEntityCrate tileCrate = (TileEntityCrate) tileEntity; RenderItem renderItem = ((RenderItem) RenderManager.instance.getEntityClassRenderObject(EntityItem.class)); diff --git a/src/dark/assembly/imprinter/BlockImprinter.java b/src/dark/assembly/imprinter/BlockImprinter.java index 6ccfdd0f..9f4f50c5 100644 --- a/src/dark/assembly/imprinter/BlockImprinter.java +++ b/src/dark/assembly/imprinter/BlockImprinter.java @@ -151,7 +151,7 @@ public class BlockImprinter extends BlockAssembly return false; } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/imprinter/TileEntityImprinter.java b/src/dark/assembly/imprinter/TileEntityImprinter.java index 5c32262e..2522cf5f 100644 --- a/src/dark/assembly/imprinter/TileEntityImprinter.java +++ b/src/dark/assembly/imprinter/TileEntityImprinter.java @@ -193,7 +193,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv } /** Construct an InventoryCrafting Matrix on the fly. - * + * * @return */ public InventoryCrafting getCraftingMatrix() { diff --git a/src/dark/assembly/machine/BlockDetector.java b/src/dark/assembly/machine/BlockDetector.java index c7e24dae..badc6693 100644 --- a/src/dark/assembly/machine/BlockDetector.java +++ b/src/dark/assembly/machine/BlockDetector.java @@ -180,7 +180,7 @@ public class BlockDetector extends BlockImprintable { return isProvidingStrongPower(world, x, y, z, direction); } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/machine/BlockManipulator.java b/src/dark/assembly/machine/BlockManipulator.java index d10892ec..40338d3d 100644 --- a/src/dark/assembly/machine/BlockManipulator.java +++ b/src/dark/assembly/machine/BlockManipulator.java @@ -87,7 +87,7 @@ public class BlockManipulator extends BlockImprintable return true; } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/machine/BlockRejector.java b/src/dark/assembly/machine/BlockRejector.java index 8876b1f4..5e880dbf 100644 --- a/src/dark/assembly/machine/BlockRejector.java +++ b/src/dark/assembly/machine/BlockRejector.java @@ -29,6 +29,7 @@ public class BlockRejector extends BlockImprintable { super(new BlockBuildData(BlockRejector.class, "rejector", UniversalElectricity.machine)); } + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/machine/TileEntityAssembly.java b/src/dark/assembly/machine/TileEntityAssembly.java index 9c164af3..8dd241ae 100644 --- a/src/dark/assembly/machine/TileEntityAssembly.java +++ b/src/dark/assembly/machine/TileEntityAssembly.java @@ -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 { diff --git a/src/dark/assembly/machine/belt/BlockConveyor.java b/src/dark/assembly/machine/belt/BlockConveyor.java index e60a58e7..6cad35be 100644 --- a/src/dark/assembly/machine/belt/BlockConveyor.java +++ b/src/dark/assembly/machine/belt/BlockConveyor.java @@ -257,7 +257,7 @@ public class BlockConveyor extends BlockAssembly return true; } - + @Override @SideOnly(Side.CLIENT) public void getClientTileEntityRenderers(List, TileEntitySpecialRenderer>> list) diff --git a/src/dark/assembly/machine/belt/BlockConveyorBelt.java b/src/dark/assembly/machine/belt/BlockConveyorBelt.java index 0860a5d2..086a1880 100644 --- a/src/dark/assembly/machine/belt/BlockConveyorBelt.java +++ b/src/dark/assembly/machine/belt/BlockConveyorBelt.java @@ -337,7 +337,7 @@ public class BlockConveyorBelt extends BlockAssembly { list.add(new Pair, TileEntitySpecialRenderer>(TileEntityConveyorBelt.class, new RenderConveyorBelt())); } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/machine/encoder/BlockEncoder.java b/src/dark/assembly/machine/encoder/BlockEncoder.java index eec5ff0d..a84dbbe6 100644 --- a/src/dark/assembly/machine/encoder/BlockEncoder.java +++ b/src/dark/assembly/machine/encoder/BlockEncoder.java @@ -78,7 +78,7 @@ public class BlockEncoder extends BlockAssembly return true; } - + @Override public void getTileEntities(int blockID, Set>> list) { diff --git a/src/dark/assembly/machine/processor/TileEntityProcessor.java b/src/dark/assembly/machine/processor/TileEntityProcessor.java index f64fecff..ab6a58c2 100644 --- a/src/dark/assembly/machine/processor/TileEntityProcessor.java +++ b/src/dark/assembly/machine/processor/TileEntityProcessor.java @@ -16,7 +16,6 @@ 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 *