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

Merge branch 'master' of https://github.com/calclavia/Resonant-Induction

Browse source
This commit is contained in:
Aidan Brady 2013-08-05 16:50:31 -04:00
commit 4e35a9f6d5
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/resonantinduction/multimeter/TileEntityMultimeter.java
View file

@ -114,7 +114,6 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei
this.toggleMode(); this.toggleMode();
break; break;
case 3: case 3:
System.out.println(this.energyLimit);
this.energyLimit = input.readFloat(); this.energyLimit = input.readFloat();
break; break;
} }

4
src/resonantinduction/tesla/TileEntityTesla.java
View file

@ -40,10 +40,10 @@ import com.google.common.io.ByteArrayDataInput;
*/ */
public class TileEntityTesla extends TileEntityBase implements ITesla, IPacketReceiver public class TileEntityTesla extends TileEntityBase implements ITesla, IPacketReceiver
{ {
public static final Vector3[] dyeColors = new Vector3[] { new Vector3(), new Vector3(1, 0, 0), new Vector3(0, 1, 0), new Vector3(0.5, 0.5, 0), new Vector3(0, 0, 1), new Vector3(0.5, 0, 05), new Vector3(0, 0.3, 1), new Vector3(0.8, 0.8, 0.8), new Vector3(0.3, 0.3, 0.3), new Vector3(0.7, 0.2, 0.2), new Vector3(0.1, 0.872, 0.884), new Vector3(0, 0.8, 0.8), new Vector3(0.46f, 0.932, 1), new Vector3(0.5, 0.2, 0.5), new Vector3(0.7, 0.5, 0.1), new Vector3(1, 1, 1) }; public static final Vector3[] dyeColors = new Vector3[] { new Vector3(), new Vector3(1, 0, 0), new Vector3(0, 0.608, 0.232), new Vector3(0.9, 0.8, 0.8), new Vector3(0, 0, 1), new Vector3(0.5, 0, 05), new Vector3(0, 0.3, 1), new Vector3(0.8, 0.8, 0.8), new Vector3(0.3, 0.3, 0.3), new Vector3(1, 0.872, 0.884), new Vector3(0.616, 1, 0), new Vector3(1, 1, 0), new Vector3(0.46f, 0.932, 1), new Vector3(0.5, 0.2, 0.5), new Vector3(0.7, 0.5, 0.1), new Vector3(1, 1, 1) };
public final static int DEFAULT_COLOR = 12; public final static int DEFAULT_COLOR = 12;
public final float TRANSFER_CAP = 1; public final float TRANSFER_CAP = 10;
private int dyeID = DEFAULT_COLOR; private int dyeID = DEFAULT_COLOR;
private float energy = 0; private float energy = 0;
private boolean doTransfer = false; private boolean doTransfer = false;