From a34ef725de9d79e844807d00c0915f3265394372 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 5 Aug 2013 16:22:26 -0400 Subject: [PATCH 1/4] Increased Tesla transfer rate --- src/resonantinduction/tesla/TileEntityTesla.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java index 299d9f34a..5a6b06f04 100644 --- a/src/resonantinduction/tesla/TileEntityTesla.java +++ b/src/resonantinduction/tesla/TileEntityTesla.java @@ -43,7 +43,7 @@ public class TileEntityTesla extends TileEntityBase implements ITesla, IPacketRe 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 final static int DEFAULT_COLOR = 12; - public final float TRANSFER_CAP = 1; + public final float TRANSFER_CAP = 10; private int dyeID = DEFAULT_COLOR; private float energy = 0; private boolean doTransfer = false; From d9498069a3b1dc58bcbdede71bcd0b1bf87aadbe Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 5 Aug 2013 16:39:53 -0400 Subject: [PATCH 2/4] Fixed colors --- src/resonantinduction/multimeter/TileEntityMultimeter.java | 1 - src/resonantinduction/tesla/TileEntityTesla.java | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/resonantinduction/multimeter/TileEntityMultimeter.java b/src/resonantinduction/multimeter/TileEntityMultimeter.java index b5df83745..7b3e361b4 100644 --- a/src/resonantinduction/multimeter/TileEntityMultimeter.java +++ b/src/resonantinduction/multimeter/TileEntityMultimeter.java @@ -114,7 +114,6 @@ public class TileEntityMultimeter extends TileEntityBase implements IPacketRecei this.toggleMode(); break; case 3: - System.out.println(this.energyLimit); this.energyLimit = input.readFloat(); break; } diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java index 5a6b06f04..36f57660e 100644 --- a/src/resonantinduction/tesla/TileEntityTesla.java +++ b/src/resonantinduction/tesla/TileEntityTesla.java @@ -40,7 +40,7 @@ import com.google.common.io.ByteArrayDataInput; */ 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, 1, 0), 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(0.7, 0.2, 0.2), 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 float TRANSFER_CAP = 10; From f5790d85ce6042ad8908ef4b60d83f9772da15e3 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 5 Aug 2013 16:43:11 -0400 Subject: [PATCH 3/4] Fixed pink dye color --- src/resonantinduction/tesla/TileEntityTesla.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java index 36f57660e..daa0984b1 100644 --- a/src/resonantinduction/tesla/TileEntityTesla.java +++ b/src/resonantinduction/tesla/TileEntityTesla.java @@ -40,7 +40,7 @@ import com.google.common.io.ByteArrayDataInput; */ 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.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(0.7, 0.2, 0.2), 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 static final Vector3[] dyeColors = new Vector3[] { new Vector3(), new Vector3(1, 0, 0), new Vector3(0, 1, 0), 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 float TRANSFER_CAP = 10; From 104dc30e5a78e43040f3544ac691577299be1e01 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Mon, 5 Aug 2013 16:45:23 -0400 Subject: [PATCH 4/4] Fixed green color --- src/resonantinduction/tesla/TileEntityTesla.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java index daa0984b1..bda281af7 100644 --- a/src/resonantinduction/tesla/TileEntityTesla.java +++ b/src/resonantinduction/tesla/TileEntityTesla.java @@ -40,7 +40,7 @@ import com.google.common.io.ByteArrayDataInput; */ 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.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 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 float TRANSFER_CAP = 10;