Moved multimeter graph classes into separate package

This commit is contained in:
Calclavia 2014-09-30 09:27:05 +08:00
parent 909b8910e7
commit 92603a456d
7 changed files with 12 additions and 15 deletions

View file

@ -7,13 +7,14 @@ import java.util.List;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;
import resonant.lib.utility.LanguageUtility; import resonant.lib.utility.LanguageUtility;
import resonantinduction.electrical.multimeter.graph.*;
import universalelectricity.api.UnitDisplay; import universalelectricity.api.UnitDisplay;
import universalelectricity.api.core.grid.IUpdate; import universalelectricity.api.core.grid.IUpdate;
import universalelectricity.core.grid.Grid; import universalelectricity.core.grid.Grid;
import universalelectricity.core.grid.UpdateTicker; import universalelectricity.core.grid.UpdateTicker;
import universalelectricity.core.transform.vector.Vector3; import universalelectricity.core.transform.vector.Vector3;
public class MultimeterNetwork extends Grid<PartMultimeter> implements IUpdate public class MultimeterGrid extends Grid<PartMultimeter> implements IUpdate
{ {
public final List<String> displayInformation = new ArrayList<String>(); public final List<String> displayInformation = new ArrayList<String>();
@ -62,7 +63,7 @@ public class MultimeterNetwork extends Grid<PartMultimeter> implements IUpdate
public boolean isEnabled = true; public boolean isEnabled = true;
public PartMultimeter primaryMultimeter = null; public PartMultimeter primaryMultimeter = null;
public MultimeterNetwork() public MultimeterGrid()
{ {
super(PartMultimeter.class); super(PartMultimeter.class);
graphs.add(energyGraph); graphs.add(energyGraph);

View file

@ -16,11 +16,9 @@ import net.minecraftforge.common.util.ForgeDirection;
import net.minecraftforge.fluids.FluidTankInfo; import net.minecraftforge.fluids.FluidTankInfo;
import net.minecraftforge.fluids.IFluidHandler; import net.minecraftforge.fluids.IFluidHandler;
import resonant.api.IRemovable; import resonant.api.IRemovable;
import resonant.engine.ResonantEngine;
import resonant.lib.network.discriminator.PacketType; import resonant.lib.network.discriminator.PacketType;
import resonant.lib.network.handle.IPacketReceiver; import resonant.lib.network.handle.IPacketReceiver;
import resonant.lib.utility.WrenchUtility; import resonant.lib.utility.WrenchUtility;
import resonantinduction.core.ResonantInduction;
import resonantinduction.core.interfaces.IMechanicalNode; import resonantinduction.core.interfaces.IMechanicalNode;
import resonantinduction.core.prefab.part.PartFace; import resonantinduction.core.prefab.part.PartFace;
import resonantinduction.electrical.Electrical; import resonantinduction.electrical.Electrical;
@ -32,8 +30,6 @@ import codechicken.multipart.IRedstonePart;
import codechicken.multipart.TMultiPart; import codechicken.multipart.TMultiPart;
import codechicken.multipart.TileMultipart; import codechicken.multipart.TileMultipart;
import com.google.common.io.ByteArrayDataInput;
import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly; import cpw.mods.fml.relauncher.SideOnly;
import resonantinduction.electrical.ElectricalContent; import resonantinduction.electrical.ElectricalContent;
@ -74,7 +70,7 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
private boolean doDetect = true; private boolean doDetect = true;
public boolean isPrimary; public boolean isPrimary;
private MultimeterNetwork network; private MultimeterGrid network;
public boolean hasMultimeter(int x, int y, int z) public boolean hasMultimeter(int x, int y, int z)
{ {
@ -451,11 +447,11 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
} }
public MultimeterNetwork getNetwork() public MultimeterGrid getNetwork()
{ {
if (network == null) if (network == null)
{ {
network = new MultimeterNetwork(); network = new MultimeterGrid();
network.add(this); network.add(this);
} }
@ -463,7 +459,7 @@ public class PartMultimeter extends PartFace implements IRedstonePart, IPacketRe
} }
public void setNetwork(MultimeterNetwork network) public void setNetwork(MultimeterGrid network)
{ {
this.network = network; this.network = network;
} }

View file

@ -1,4 +1,4 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter.graph;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import resonant.lib.type.EvictingList; import resonant.lib.type.EvictingList;

View file

@ -1,4 +1,4 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter.graph;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;

View file

@ -1,4 +1,4 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter.graph;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;

View file

@ -1,4 +1,4 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter.graph;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;

View file

@ -1,4 +1,4 @@
package resonantinduction.electrical.multimeter; package resonantinduction.electrical.multimeter.graph;
import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.nbt.NBTTagList; import net.minecraft.nbt.NBTTagList;