Some multimeter refactor

src/main/java/resonantinduction/ClientProxy.java

@@ -7,9 +7,8 @@ import net.minecraft.world.World;
 import net.minecraftforge.client.MinecraftForgeClient;
 import net.minecraftforge.common.MinecraftForge;
 import resonantinduction.core.render.BlockRenderingHandler;
+import resonantinduction.core.render.RenderRIItem;
 import resonantinduction.machine.crusher.ItemDust;
-import resonantinduction.multimeter.PartMultimeter;
-import resonantinduction.multimeter.RenderRIItem;
 import resonantinduction.transport.battery.RenderBattery;
 import resonantinduction.transport.battery.TileBattery;
 import resonantinduction.transport.fx.FXElectricBolt;
@@ -18,6 +17,7 @@ import resonantinduction.transport.levitator.RenderLevitator;
 import resonantinduction.transport.levitator.TileEMLevitator;
 import resonantinduction.transport.tesla.RenderTesla;
 import resonantinduction.transport.tesla.TileTesla;
+import resonantinduction.utility.multimeter.PartMultimeter;
 import universalelectricity.api.vector.Vector3;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;

src/main/java/resonantinduction/CommonProxy.java

@@ -6,8 +6,8 @@ package resonantinduction;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.world.World;
-import resonantinduction.multimeter.ContainerMultimeter;
-import resonantinduction.multimeter.PartMultimeter;
+import resonantinduction.utility.multimeter.ContainerMultimeter;
+import resonantinduction.utility.multimeter.PartMultimeter;
 import universalelectricity.api.vector.Vector3;
 import codechicken.lib.colour.ColourRGBA;
 import codechicken.multipart.TMultiPart;

src/main/java/resonantinduction/MultipartRI.java

@@ -1,11 +1,11 @@
 package resonantinduction;
 
-import resonantinduction.multimeter.PartMultimeter;
 import resonantinduction.transport.transformer.PartTransformer;
 import resonantinduction.transport.wire.flat.PartFlatSwitchWire;
 import resonantinduction.transport.wire.flat.PartFlatWire;
 import resonantinduction.transport.wire.framed.PartFramedSwitchWire;
 import resonantinduction.transport.wire.framed.PartFramedWire;
+import resonantinduction.utility.multimeter.PartMultimeter;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.MultiPartRegistry.IPartFactory;
 import codechicken.multipart.MultipartGenerator;

src/main/java/resonantinduction/ResonantInduction.java

@@ -24,7 +24,6 @@ import resonantinduction.machine.BlockMachinePart;
 import resonantinduction.machine.crusher.ItemDust;
 import resonantinduction.machine.furnace.BlockAdvancedFurnace;
 import resonantinduction.machine.furnace.TileAdvancedFurnace;
-import resonantinduction.multimeter.ItemMultimeter;
 import resonantinduction.transport.battery.BlockBattery;
 import resonantinduction.transport.battery.ItemBlockBattery;
 import resonantinduction.transport.battery.TileBattery;
@@ -37,6 +36,7 @@ import resonantinduction.transport.tesla.TileTesla;
 import resonantinduction.transport.transformer.ItemTransformer;
 import resonantinduction.transport.wire.EnumWireMaterial;
 import resonantinduction.transport.wire.ItemWire;
+import resonantinduction.utility.multimeter.ItemMultimeter;
 import calclavia.lib.UniversalRecipe;
 import calclavia.lib.network.PacketHandler;
 import calclavia.lib.network.PacketTile;

src/main/java/resonantinduction/core/render/RenderRIItem.java

@@ -1,4 +1,4 @@
-package resonantinduction.multimeter;
+package resonantinduction.core.render;
 
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.client.IItemRenderer;
@@ -7,6 +7,8 @@ import org.lwjgl.opengl.GL11;
 
 import resonantinduction.transport.transformer.ItemTransformer;
 import resonantinduction.transport.transformer.RenderTransformer;
+import resonantinduction.utility.multimeter.ItemMultimeter;
+import resonantinduction.utility.multimeter.RenderMultimeter;
 import cpw.mods.fml.client.FMLClientHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;

src/main/java/resonantinduction/transport/battery/TileBattery.java

@@ -32,10 +32,10 @@ import cpw.mods.fml.common.network.PacketDispatcher;
  */
 public class TileBattery extends TileElectrical implements IConnector<BatteryStructure>, IVoltageInput, IVoltageOutput, IPacketSender, IPacketReceiver, IEnergyInterface, IEnergyContainer
 {
-	public static final long STORAGE = 100000000;
+	public static final long STORAGE = 1000000000;
 
 	/** The transfer rate **/
-	public static final long DEFAULT_WATTAGE = 1000000;
+	public static final long DEFAULT_WATTAGE = (long) (STORAGE * 0.01);
 
 	/** Voltage increases as series connection increases */
 	public static final long DEFAULT_VOLTAGE = UniversalElectricity.DEFAULT_VOLTAGE;

src/main/java/resonantinduction/transport/gui/GuiMultimeter.java

@@ -8,8 +8,8 @@ import net.minecraft.client.gui.GuiTextField;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.util.ResourceLocation;
 import resonantinduction.ResonantInduction;
-import resonantinduction.multimeter.ContainerMultimeter;
-import resonantinduction.multimeter.PartMultimeter;
+import resonantinduction.utility.multimeter.ContainerMultimeter;
+import resonantinduction.utility.multimeter.PartMultimeter;
 import universalelectricity.api.energy.UnitDisplay.Unit;
 import calclavia.lib.gui.GuiContainerBase;
 import calclavia.lib.prefab.TranslationHelper;

src/main/java/resonantinduction/utility/multimeter/ContainerMultimeter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.multimeter;
+package resonantinduction.utility.multimeter;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/main/java/resonantinduction/utility/multimeter/ItemMultimeter.java

@@ -1,4 +1,4 @@
-package resonantinduction.multimeter;
+package resonantinduction.utility.multimeter;
 
 import java.util.List;
 

src/main/java/resonantinduction/utility/multimeter/PartMultimeter.java

@@ -1,7 +1,7 @@
 /**
  * 
  */
-package resonantinduction.multimeter;
+package resonantinduction.utility.multimeter;
 
 import java.util.ArrayList;
 import java.util.Arrays;

src/main/java/resonantinduction/utility/multimeter/RenderMultimeter.java

@@ -1,4 +1,4 @@
-package resonantinduction.multimeter;
+package resonantinduction.utility.multimeter;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;