diff --git a/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java b/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java index 0af960ef..17162e3d 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java +++ b/src/main/java/resonantinduction/electrical/multimeter/MultimeterNetwork.java @@ -1,6 +1,7 @@ package resonantinduction.electrical.multimeter; -import universalelectricity.api.vector.Vector2; +import net.minecraft.nbt.NBTTagCompound; +import universalelectricity.api.vector.Vector3; import universalelectricity.core.net.Network; public class MultimeterNetwork extends Network @@ -8,75 +9,48 @@ public class MultimeterNetwork extends Network upperBound.x) + if (upperBound == null) { - upperBound.x = node.getPosition().y; + upperBound = node.getPosition().translate(0.5); } - if (node.getDirection().offsetX == 0) + if (lowerBound == null) { - if (node.getPosition().x > upperBound.y) - { - upperBound.y = node.getPosition().x; - } + lowerBound = node.getPosition().translate(0.5); } - if (node.getDirection().offsetZ == 0) - { - if (node.getPosition().z > upperBound.y) - { - upperBound.y = node.getPosition().z; - } - } - - /** - * Computer lower bound - */ - if (node.getPosition().y < lowerBound.x) - { - lowerBound.x = node.getPosition().y; - } - - if (node.getDirection().offsetX == 0) - { - if (node.getPosition().x < lowerBound.y) - { - lowerBound.y = node.getPosition().x; - } - } - - if (node.getDirection().offsetZ == 0) - { - if (node.getPosition().z < lowerBound.y) - { - lowerBound.y = node.getPosition().z; - } - } + upperBound = upperBound.max(node.getPosition().translate(0.5)); + lowerBound = lowerBound.min(node.getPosition().translate(0.5)); } @Override diff --git a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java index b1986c77..dad60fe0 100644 --- a/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java +++ b/src/main/java/resonantinduction/electrical/multimeter/PartMultimeter.java @@ -82,6 +82,7 @@ public class PartMultimeter extends JCuboidPart implements IConnector playersUsing = new HashSet(); private DetectMode detectMode = DetectMode.NONE; + private long peakDetection; private long energyLimit; private long detectedEnergy; @@ -107,15 +108,18 @@ public class PartMultimeter extends JCuboidPart implements IConnector