From e5c071a8aad6c1e55cd2f7fae9c38985f197400f Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Tue, 6 Aug 2013 19:03:29 -0400
Subject: [PATCH] Added basic wires

---
 .../textures/blocks/wire.png                  | Bin 0 -> 3751 bytes
 src/resonantinduction/ResonantInduction.java  |   3 +
 .../multimeter/TileEntityMultimeter.java      |  15 ++--
 src/resonantinduction/wire/BlockWire.java     |  66 ++++++++++++++++++
 .../wire/TileEntityWire.java                  |  24 +++++++
 5 files changed, 101 insertions(+), 7 deletions(-)
 create mode 100644 resources/assets/resonantinduction/textures/blocks/wire.png
 create mode 100644 src/resonantinduction/wire/BlockWire.java
 create mode 100644 src/resonantinduction/wire/TileEntityWire.java

diff --git a/resources/assets/resonantinduction/textures/blocks/wire.png b/resources/assets/resonantinduction/textures/blocks/wire.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd54ce5c5ad6bf48601cb730939cb9dfa9740430
GIT binary patch
literal 3751
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
RS?d4*002ovPDHLkV1ix~0V4na

literal 0
HcmV?d00001

diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java
index b867659a..28c8bb34 100644
--- a/src/resonantinduction/ResonantInduction.java
+++ b/src/resonantinduction/ResonantInduction.java
@@ -26,6 +26,7 @@ import resonantinduction.multimeter.ItemBlockMultimeter;
 import resonantinduction.multimeter.TileEntityMultimeter;
 import resonantinduction.tesla.BlockTesla;
 import resonantinduction.tesla.TileEntityTesla;
+import resonantinduction.wire.BlockWire;
 import universalelectricity.core.item.IItemElectric;
 import cpw.mods.fml.common.FMLLog;
 import cpw.mods.fml.common.Loader;
@@ -126,6 +127,7 @@ public class ResonantInduction
 	public static Block blockMultimeter;
 	public static Block blockEMContractor;
 	public static Block blockBattery;
+	public static Block blockWire;
 
 	@EventHandler
 	public void preInit(FMLPreInitializationEvent evt)
@@ -160,6 +162,7 @@ public class ResonantInduction
 		blockMultimeter = new BlockMultimeter(getNextBlockID());
 		blockEMContractor = new BlockEMContractor(getNextBlockID());
 		blockBattery = new BlockBattery(getNextBlockID());
+		blockWire = new BlockWire(getNextBlockID());
 
 		CONFIGURATION.save();
 
diff --git a/src/resonantinduction/multimeter/TileEntityMultimeter.java b/src/resonantinduction/multimeter/TileEntityMultimeter.java
index 17b85266..860034ac 100644
--- a/src/resonantinduction/multimeter/TileEntityMultimeter.java
+++ b/src/resonantinduction/multimeter/TileEntityMultimeter.java
@@ -15,9 +15,9 @@ import net.minecraftforge.common.ForgeDirection;
 import resonantinduction.PacketHandler;
 import resonantinduction.ResonantInduction;
 import resonantinduction.base.IPacketReceiver;
-import resonantinduction.battery.TileEntityBattery;
-import resonantinduction.tesla.TileEntityTesla;
+import universalelectricity.core.block.IElectricalStorage;
 import universalelectricity.prefab.tile.TileEntityAdvanced;
+import universalelectricity.prefab.tile.TileEntityElectrical;
 
 import com.google.common.io.ByteArrayDataInput;
 
@@ -25,6 +25,8 @@ import cpw.mods.fml.common.network.PacketDispatcher;
 import cpw.mods.fml.common.network.Player;
 
 /**
+ * Block that detects power.
+ * 
  * @author Calclavia
  * 
  */
@@ -155,14 +157,13 @@ public class TileEntityMultimeter extends TileEntityAdvanced implements IPacketR
 
 	public static float getDetectedEnergy(TileEntity tileEntity)
 	{
-		// TODO: Universal Compatiblity in the future.
-		if (tileEntity instanceof TileEntityTesla)
+		if (tileEntity instanceof TileEntityElectrical)
 		{
-			return ((TileEntityTesla) tileEntity).getEnergyStored();
+			return ((TileEntityElectrical) tileEntity).getEnergyStored();
 		}
-		else if (tileEntity instanceof TileEntityBattery)
+		else if (tileEntity instanceof IElectricalStorage)
 		{
-			return ((TileEntityBattery) tileEntity).getEnergyStored();
+			return ((IElectricalStorage) tileEntity).getEnergyStored();
 		}
 
 		return 0;
diff --git a/src/resonantinduction/wire/BlockWire.java b/src/resonantinduction/wire/BlockWire.java
new file mode 100644
index 00000000..006833a0
--- /dev/null
+++ b/src/resonantinduction/wire/BlockWire.java
@@ -0,0 +1,66 @@
+package resonantinduction.wire;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.material.Material;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.world.World;
+import resonantinduction.ResonantInduction;
+import universalelectricity.prefab.block.BlockConductor;
+
+/**
+ * A copper wire block that can change its collision bounds based on the connection.
+ * 
+ * @author Calclavia, Aidancbrady
+ */
+public class BlockWire extends BlockConductor
+{
+	public BlockWire(int id)
+	{
+		super(ResonantInduction.CONFIGURATION.getItem("wire", id).getInt(id), Material.cloth);
+		this.setUnlocalizedName(ResonantInduction.PREFIX + "wire");
+		this.setStepSound(soundClothFootstep);
+		this.setResistance(0.2F);
+		this.setHardness(0.1f);
+		this.setBlockBounds(0.3f, 0.3f, 0.3f, 0.7f, 0.7f, 0.7f);
+		this.setCreativeTab(CreativeTabs.tabRedstone);
+		Block.setBurnProperties(this.blockID, 30, 60);
+		this.func_111022_d(ResonantInduction.PREFIX + "wire");
+	}
+
+	/**
+	 * Is this block (a) opaque and (b) a full 1m cube? This determines whether or not to render the
+	 * shared face of two adjacent blocks and also whether the player can attach torches, redstone
+	 * wire, etc to this block.
+	 */
+	@Override
+	public boolean isOpaqueCube()
+	{
+		return false;
+	}
+
+	/**
+	 * If this block doesn't render as an ordinary block it will return False (examples: signs,
+	 * buttons, stairs, etc)
+	 */
+	@Override
+	public boolean renderAsNormalBlock()
+	{
+		return false;
+	}
+
+	/**
+	 * The type of render function that is called for this block
+	 */
+	@Override
+	public int getRenderType()
+	{
+		return -1;
+	}
+
+	@Override
+	public TileEntity createNewTileEntity(World var1)
+	{
+		return new TileEntityWire();
+	}
+}
\ No newline at end of file
diff --git a/src/resonantinduction/wire/TileEntityWire.java b/src/resonantinduction/wire/TileEntityWire.java
new file mode 100644
index 00000000..98e3e735
--- /dev/null
+++ b/src/resonantinduction/wire/TileEntityWire.java
@@ -0,0 +1,24 @@
+package resonantinduction.wire;
+
+import universalelectricity.compatibility.TileEntityUniversalConductor;
+
+public class TileEntityWire extends TileEntityUniversalConductor
+{
+	/**
+	 * Changed this if your mod wants to nerf Basic Component's copper wire.
+	 */
+	public static float RESISTANCE = 0.05F;
+	public static float MAX_AMPS = 200;
+
+	@Override
+	public float getResistance()
+	{
+		return RESISTANCE;
+	}
+
+	@Override
+	public float getCurrentCapacity()
+	{
+		return MAX_AMPS;
+	}
+}