From 5b57572c89862f0a3016d9776dd501442d8408fe Mon Sep 17 00:00:00 2001 From: DarkGuardsman Date: Thu, 5 Sep 2013 20:04:25 -0400 Subject: [PATCH] AutoSync: source code formatting --- .../dark/assembly/common/armbot/TileEntityArmbot.java | 2 +- .../dark/assembly/common/armbot/command/CommandBreak.java | 2 +- .../assembly/common/imprinter/TileEntityImprinter.java | 2 +- .../common/imprinter/prefab/TileEntityFilterable.java | 2 +- .../dark/assembly/common/machine/BlockAssembly.java | 4 ++-- .../dark/assembly/common/machine/BlockCrate.java | 8 ++++---- .../dark/assembly/common/machine/BlockManipulator.java | 4 ++-- .../dark/assembly/common/machine/InventoryCrate.java | 2 +- .../dark/assembly/common/machine/NetworkAssembly.java | 8 ++++---- .../dark/assembly/common/machine/TileEntityAssembly.java | 2 +- .../dark/assembly/common/machine/TileEntityCrate.java | 2 +- .../common/machine/belt/TileEntityConveyorBelt.java | 2 +- 12 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java b/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java index 918fc4737..3a3fd33e5 100644 --- a/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java +++ b/src/minecraft/dark/assembly/common/armbot/TileEntityArmbot.java @@ -855,7 +855,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock, while (it.hasNext()) { - ItemWorldHelper.dropItemStack(worldObj, handPosition, it.next(),false); + ItemWorldHelper.dropItemStack(worldObj, handPosition, it.next(), false); } this.grabbedEntities.clear(); diff --git a/src/minecraft/dark/assembly/common/armbot/command/CommandBreak.java b/src/minecraft/dark/assembly/common/armbot/command/CommandBreak.java index 0bbb00a8a..326ef7741 100644 --- a/src/minecraft/dark/assembly/common/armbot/command/CommandBreak.java +++ b/src/minecraft/dark/assembly/common/armbot/command/CommandBreak.java @@ -9,7 +9,7 @@ import universalelectricity.core.vector.Vector3; import dark.core.prefab.helpers.ItemWorldHelper; /** Used by arms to break a specific block in a position. - * + * * @author Calclavia */ public class CommandBreak extends Command { diff --git a/src/minecraft/dark/assembly/common/imprinter/TileEntityImprinter.java b/src/minecraft/dark/assembly/common/imprinter/TileEntityImprinter.java index 0afdf6b18..807256241 100644 --- a/src/minecraft/dark/assembly/common/imprinter/TileEntityImprinter.java +++ b/src/minecraft/dark/assembly/common/imprinter/TileEntityImprinter.java @@ -190,7 +190,7 @@ public class TileEntityImprinter extends TileEntityAdvanced implements ISidedInv } /** Construct an InventoryCrafting Matrix on the fly. - * + * * @return */ public InventoryCrafting getCraftingMatrix() { diff --git a/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java b/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java index dad8435cb..d26c01388 100644 --- a/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java +++ b/src/minecraft/dark/assembly/common/imprinter/prefab/TileEntityFilterable.java @@ -31,7 +31,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) { diff --git a/src/minecraft/dark/assembly/common/machine/BlockAssembly.java b/src/minecraft/dark/assembly/common/machine/BlockAssembly.java index 8b8eb684f..fc5ad926c 100644 --- a/src/minecraft/dark/assembly/common/machine/BlockAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/BlockAssembly.java @@ -23,10 +23,10 @@ public abstract class BlockAssembly extends BlockMachine public boolean onMachineActivated(World world, int x, int y, int z, EntityPlayer entityPlayer, int side, float hitX, float hitY, float hitZ) { - if(entityPlayer != null && entityPlayer.getHeldItem() != null && entityPlayer.getHeldItem().itemID == Item.stick.itemID) + if (entityPlayer != null && entityPlayer.getHeldItem() != null && entityPlayer.getHeldItem().itemID == Item.stick.itemID) { TileEntity entity = world.getBlockTileEntity(x, y, z); - if(entity instanceof TileEntityAssembly) + if (entity instanceof TileEntityAssembly) { System.out.println(((TileEntityAssembly) entity).getTileNetwork().toString()); } diff --git a/src/minecraft/dark/assembly/common/machine/BlockCrate.java b/src/minecraft/dark/assembly/common/machine/BlockCrate.java index 5da7a6c80..ec600c597 100644 --- a/src/minecraft/dark/assembly/common/machine/BlockCrate.java +++ b/src/minecraft/dark/assembly/common/machine/BlockCrate.java @@ -19,7 +19,7 @@ import dark.assembly.common.AssemblyLine; /** 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 Calclavia */ public class BlockCrate extends BlockAssembly { @@ -210,7 +210,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) { @@ -255,7 +255,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. @@ -307,7 +307,7 @@ public class BlockCrate extends BlockAssembly } /** Puts an itemStack into the crate. - * + * * @param tileEntity * @param itemStack */ public static ItemStack addStackToCrate(TileEntityCrate tileEntity, ItemStack itemStack) diff --git a/src/minecraft/dark/assembly/common/machine/BlockManipulator.java b/src/minecraft/dark/assembly/common/machine/BlockManipulator.java index 12a77983b..607635107 100644 --- a/src/minecraft/dark/assembly/common/machine/BlockManipulator.java +++ b/src/minecraft/dark/assembly/common/machine/BlockManipulator.java @@ -13,7 +13,7 @@ import dark.assembly.common.TabAssemblyLine; import dark.assembly.common.imprinter.prefab.BlockImprintable; /** A block that manipulates item movement between inventories. - * + * * @author Calclavia */ public class BlockManipulator extends BlockImprintable { @@ -71,7 +71,7 @@ public class BlockManipulator extends BlockImprintable manip.toggleOutput(); manip.toggleInversion(); } - entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d("Manip. outputing = "+manip.isOutput())); + entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d("Manip. outputing = " + manip.isOutput())); } diff --git a/src/minecraft/dark/assembly/common/machine/InventoryCrate.java b/src/minecraft/dark/assembly/common/machine/InventoryCrate.java index f5819853a..b7b5080ff 100644 --- a/src/minecraft/dark/assembly/common/machine/InventoryCrate.java +++ b/src/minecraft/dark/assembly/common/machine/InventoryCrate.java @@ -15,7 +15,7 @@ public class InventoryCrate extends InvChest /** Clones the single stack into an inventory format for automation interaction */ public void buildInventory(ItemStack sampleStack) { - this.containedItems= new ItemStack[this.getSizeInventory()]; + this.containedItems = new ItemStack[this.getSizeInventory()]; if (sampleStack != null) { ItemStack baseStack = sampleStack.copy(); diff --git a/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java b/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java index 4bb94b010..cbdc17750 100644 --- a/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java +++ b/src/minecraft/dark/assembly/common/machine/NetworkAssembly.java @@ -72,19 +72,19 @@ public class NetworkAssembly extends NetworkSharedPower this.lastDemandCalcTime = time; this.lastNetDemand = currentDemand; //TODO calculate the averages over time to produce a better number - if(this.minDemand == 0) + if (this.minDemand == 0) { this.minDemand = currentDemand; } - if(this.averageDemand == 0) + if (this.averageDemand == 0) { this.averageDemand = currentDemand; } - if(currentDemand > this.maxDemand) + if (currentDemand > this.maxDemand) { this.maxDemand = currentDemand; } - if(currentDemand < this.minDemand) + if (currentDemand < this.minDemand) { this.minDemand = currentDemand; } diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java b/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java index 5614a67d8..ce5070fea 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityAssembly.java +++ b/src/minecraft/dark/assembly/common/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 TileEntityMachine implements INetworkEnergyPart { diff --git a/src/minecraft/dark/assembly/common/machine/TileEntityCrate.java b/src/minecraft/dark/assembly/common/machine/TileEntityCrate.java index b25918f3e..7fba7e412 100644 --- a/src/minecraft/dark/assembly/common/machine/TileEntityCrate.java +++ b/src/minecraft/dark/assembly/common/machine/TileEntityCrate.java @@ -51,7 +51,7 @@ public class TileEntityCrate extends TileEntityInv implements IPacketReceiver, I /** 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() { diff --git a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java index 25bd0da0e..e55e5a1d8 100644 --- a/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java +++ b/src/minecraft/dark/assembly/common/machine/belt/TileEntityConveyorBelt.java @@ -21,7 +21,7 @@ import dark.assembly.common.AssemblyLine; import dark.assembly.common.machine.TileEntityAssembly; /** Conveyer belt TileEntity that allows entities of all kinds to be moved - * + * * @author DarkGuardsman */ public class TileEntityConveyorBelt extends TileEntityAssembly implements IPacketReceiver, IBelt, IRotatable {