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

AutoSync: source code formatting

Browse source
This commit is contained in:
DarkGuardsman 2013-09-05 20:04:25 -04:00
parent cb385a284b
commit 5b57572c89
12 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -855,7 +855,7 @@ public class TileEntityArmbot extends TileEntityAssembly implements IMultiBlock,
while (it.hasNext()) while (it.hasNext())
{ {
ItemWorldHelper.dropItemStack(worldObj, handPosition, it.next(),false); ItemWorldHelper.dropItemStack(worldObj, handPosition, it.next(), false);
} }
this.grabbedEntities.clear(); this.grabbedEntities.clear();

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

@ -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) 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); TileEntity entity = world.getBlockTileEntity(x, y, z);
if(entity instanceof TileEntityAssembly) if (entity instanceof TileEntityAssembly)
{ {
System.out.println(((TileEntityAssembly) entity).getTileNetwork().toString()); System.out.println(((TileEntityAssembly) entity).getTileNetwork().toString());
} }

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

@ -71,7 +71,7 @@ public class BlockManipulator extends BlockImprintable
manip.toggleOutput(); manip.toggleOutput();
manip.toggleInversion(); manip.toggleInversion();
} }
entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d("Manip. outputing = "+manip.isOutput())); entityPlayer.sendChatToPlayer(ChatMessageComponent.func_111066_d("Manip. outputing = " + manip.isOutput()));
} }

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

@ -15,7 +15,7 @@ public class InventoryCrate extends InvChest
/** Clones the single stack into an inventory format for automation interaction */ /** Clones the single stack into an inventory format for automation interaction */
public void buildInventory(ItemStack sampleStack) public void buildInventory(ItemStack sampleStack)
{ {
this.containedItems= new ItemStack[this.getSizeInventory()]; this.containedItems = new ItemStack[this.getSizeInventory()];
if (sampleStack != null) if (sampleStack != null)
{ {
ItemStack baseStack = sampleStack.copy(); ItemStack baseStack = sampleStack.copy();

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

@ -72,19 +72,19 @@ public class NetworkAssembly extends NetworkSharedPower
this.lastDemandCalcTime = time; this.lastDemandCalcTime = time;
this.lastNetDemand = currentDemand; this.lastNetDemand = currentDemand;
//TODO calculate the averages over time to produce a better number //TODO calculate the averages over time to produce a better number
if(this.minDemand == 0) if (this.minDemand == 0)
{ {
this.minDemand = currentDemand; this.minDemand = currentDemand;
} }
if(this.averageDemand == 0) if (this.averageDemand == 0)
{ {
this.averageDemand = currentDemand; this.averageDemand = currentDemand;
} }
if(currentDemand > this.maxDemand) if (currentDemand > this.maxDemand)
{ {
this.maxDemand = currentDemand; this.maxDemand = currentDemand;
} }
if(currentDemand < this.minDemand) if (currentDemand < this.minDemand)
{ {
this.minDemand = currentDemand; this.minDemand = currentDemand;
} }