From 62ce220dae8f34b3133c095c8344ae6a2f4915d3 Mon Sep 17 00:00:00 2001 From: Calclavia Date: Thu, 30 Jan 2014 20:25:26 +0800 Subject: [PATCH] Some work on the wind turbine --- .../mechanical/network/MechanicalNetwork.java | 2 +- .../mechanical/network/PartMechanical.java | 2 +- .../mechanical/turbine/TileWindTurbine.java | 11 ++++++++--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java index 7c850cd9..9aa33d13 100644 --- a/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java +++ b/src/main/java/resonantinduction/mechanical/network/MechanicalNetwork.java @@ -65,7 +65,7 @@ public class MechanicalNetwork extends Network { IMechanical mechanical = it.next(); Object[] connections = mechanical.getConnections(); - + for (int i = 0; i < connections.length; i++) { ForgeDirection dir = ForgeDirection.getOrientation(i); diff --git a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java index baa232a1..2c59adf7 100644 --- a/src/main/java/resonantinduction/mechanical/network/PartMechanical.java +++ b/src/main/java/resonantinduction/mechanical/network/PartMechanical.java @@ -91,7 +91,7 @@ public abstract class PartMechanical extends JCuboidPart implements JNormalOcclu public void checkClientUpdate() { - if (Math.abs(prevAngularVelocity - angularVelocity) > 0.1f) + if (Math.abs(prevAngularVelocity - angularVelocity) > 0.05f) { prevAngularVelocity = angularVelocity; markPacketUpdate = true; diff --git a/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java b/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java index efe2be83..6a00275a 100644 --- a/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java +++ b/src/main/java/resonantinduction/mechanical/turbine/TileWindTurbine.java @@ -25,6 +25,12 @@ import calclavia.lib.prefab.turbine.TileTurbine; */ public class TileWindTurbine extends TileTurbine implements IMechanical { + public TileWindTurbine() + { + maxPower = 50; + torque = 50; + } + @Override public void invalidate() { @@ -42,8 +48,7 @@ public class TileWindTurbine extends TileTurbine implements IMechanical */ if (getDirection().offsetY == 0) { - power += getWindPower() * 10; - maxPower = 100; + power += getWindPower(); } } @@ -170,7 +175,7 @@ public class TileWindTurbine extends TileTurbine implements IMechanical @Override public boolean inverseRotation(ForgeDirection dir, IMechanical with) { - return true; + return false; } @Override