From d6efc5540b789f87697df273be76f7a2e223bd52 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Thu, 1 Aug 2013 22:19:01 -0400
Subject: [PATCH] Got Tesla transfer working

---
 .../textures/models/fadedSphere.png           | Bin 0 -> 3066 bytes
 src/resonantinduction/ClientProxy.java        |   6 ++++++
 src/resonantinduction/CommonProxy.java        |   6 ++++++
 src/resonantinduction/ResonantInduction.java  |   3 +--
 src/resonantinduction/base/Vector3.java       |   2 +-
 src/resonantinduction/fx/FxElectric.java      |  15 +++++++++++++
 .../model/ModelTeslaBottom.java               |   3 +++
 .../model/ModelTeslaMiddle.java               |   3 +++
 .../render/BlockRenderingHandler.java         |   3 ++-
 .../tesla/TileEntityTesla.java                |  20 +++++++++---------
 10 files changed, 47 insertions(+), 14 deletions(-)
 create mode 100644 resources/assets/resonantinduction/textures/models/fadedSphere.png
 create mode 100644 src/resonantinduction/fx/FxElectric.java

diff --git a/resources/assets/resonantinduction/textures/models/fadedSphere.png b/resources/assets/resonantinduction/textures/models/fadedSphere.png
new file mode 100644
index 0000000000000000000000000000000000000000..c1a45319d30da4dcee1972cff72b866cc6a8149e
GIT binary patch
literal 3066
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
IM6N<$f|FLT<NyEw

literal 0
HcmV?d00001

diff --git a/src/resonantinduction/ClientProxy.java b/src/resonantinduction/ClientProxy.java
index 5ecea24f..68c6d830 100644
--- a/src/resonantinduction/ClientProxy.java
+++ b/src/resonantinduction/ClientProxy.java
@@ -5,6 +5,7 @@ package resonantinduction;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
+import resonantinduction.base.Vector3;
 import resonantinduction.render.BlockRenderingHandler;
 import resonantinduction.render.RenderTesla;
 import resonantinduction.tesla.TileEntityTesla;
@@ -33,4 +34,9 @@ public class ClientProxy extends CommonProxy
 		return null;
 	}
 
+	@Override
+	public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b)
+	{
+		
+	}
 }
diff --git a/src/resonantinduction/CommonProxy.java b/src/resonantinduction/CommonProxy.java
index a1ab2b7b..26d4a010 100644
--- a/src/resonantinduction/CommonProxy.java
+++ b/src/resonantinduction/CommonProxy.java
@@ -3,6 +3,7 @@
  */
 package resonantinduction;
 
+import resonantinduction.base.Vector3;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.World;
 import cpw.mods.fml.common.network.IGuiHandler;
@@ -30,4 +31,9 @@ public class CommonProxy implements IGuiHandler
 		return null;
 	}
 
+	public void renderElectricShock(World world, Vector3 start, Vector3 target, float r, float g, float b)
+	{
+
+	}
+
 }
diff --git a/src/resonantinduction/ResonantInduction.java b/src/resonantinduction/ResonantInduction.java
index 4f2c274a..980a729a 100644
--- a/src/resonantinduction/ResonantInduction.java
+++ b/src/resonantinduction/ResonantInduction.java
@@ -67,7 +67,7 @@ public class ResonantInduction
 	public static final String ITEM_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "items/";
 	public static final String MODEL_TEXTURE_DIRECTORY = TEXTURE_DIRECTORY + "models/";
 
-	public static final String LANGUAGE_DIRECTORY = TEXTURE_DIRECTORY + "languages/";
+	public static final String LANGUAGE_DIRECTORY = DIRECTORY + "languages/";
 	public static final String[] LANGUAGES = new String[] { "en_US" };
 
 	/**
@@ -111,7 +111,6 @@ public class ResonantInduction
 		CONFIGURATION.save();
 
 		GameRegistry.registerBlock(blockTesla, blockTesla.getUnlocalizedName());
-
 		GameRegistry.registerTileEntity(TileEntityTesla.class, blockTesla.getUnlocalizedName());
 		this.proxy.registerRenderers();
 
diff --git a/src/resonantinduction/base/Vector3.java b/src/resonantinduction/base/Vector3.java
index 8e969ee6..b45b5bcd 100644
--- a/src/resonantinduction/base/Vector3.java
+++ b/src/resonantinduction/base/Vector3.java
@@ -48,6 +48,6 @@ public class Vector3
 	public double distance(Vector3 compare)
 	{
 		Vector3 difference = this.difference(compare);
-		return this.getMagnitude();
+		return difference.getMagnitude();
 	}
 }
diff --git a/src/resonantinduction/fx/FxElectric.java b/src/resonantinduction/fx/FxElectric.java
new file mode 100644
index 00000000..1618ec63
--- /dev/null
+++ b/src/resonantinduction/fx/FxElectric.java
@@ -0,0 +1,15 @@
+/**
+ * 
+ */
+package resonantinduction.fx;
+
+/**
+ * Electric shock Fxs.
+ * 
+ * @author Calclavia
+ * 
+ */
+public class FxElectric
+{
+
+}
diff --git a/src/resonantinduction/model/ModelTeslaBottom.java b/src/resonantinduction/model/ModelTeslaBottom.java
index 3d0348e1..e977a215 100644
--- a/src/resonantinduction/model/ModelTeslaBottom.java
+++ b/src/resonantinduction/model/ModelTeslaBottom.java
@@ -1,8 +1,11 @@
 package resonantinduction.model;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 
+@SideOnly(Side.CLIENT)
 public class ModelTeslaBottom extends ModelBase
 {
 	// fields
diff --git a/src/resonantinduction/model/ModelTeslaMiddle.java b/src/resonantinduction/model/ModelTeslaMiddle.java
index 0d18fc67..590a99cc 100644
--- a/src/resonantinduction/model/ModelTeslaMiddle.java
+++ b/src/resonantinduction/model/ModelTeslaMiddle.java
@@ -1,8 +1,11 @@
 package resonantinduction.model;
 
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.client.model.ModelBase;
 import net.minecraft.client.model.ModelRenderer;
 
+@SideOnly(Side.CLIENT)
 public class ModelTeslaMiddle extends ModelBase
 {
 	// fields
diff --git a/src/resonantinduction/render/BlockRenderingHandler.java b/src/resonantinduction/render/BlockRenderingHandler.java
index 6a95b658..f83eddd5 100644
--- a/src/resonantinduction/render/BlockRenderingHandler.java
+++ b/src/resonantinduction/render/BlockRenderingHandler.java
@@ -24,6 +24,7 @@ import cpw.mods.fml.relauncher.SideOnly;
 public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 {
 	public static final BlockRenderingHandler INSTANCE = new BlockRenderingHandler();
+	private static final int ID = RenderingRegistry.getNextAvailableRenderId();
 
 	@Override
 	public void renderInventoryBlock(Block block, int metadata, int modelID, RenderBlocks renderer)
@@ -54,7 +55,7 @@ public class BlockRenderingHandler implements ISimpleBlockRenderingHandler
 	@Override
 	public int getRenderId()
 	{
-		return RenderingRegistry.getNextAvailableRenderId();
+		return ID;
 	}
 
 }
diff --git a/src/resonantinduction/tesla/TileEntityTesla.java b/src/resonantinduction/tesla/TileEntityTesla.java
index cdb5553a..1e167e22 100644
--- a/src/resonantinduction/tesla/TileEntityTesla.java
+++ b/src/resonantinduction/tesla/TileEntityTesla.java
@@ -46,12 +46,15 @@ public class TileEntityTesla extends TileEntityBase implements ITesla
 				}
 			}
 
-			float transferEnergy = this.getEnergyStored() / transferTeslaCoils.size();
-
-			for (ITesla tesla : transferTeslaCoils)
+			if (transferTeslaCoils.size() > 0)
 			{
-				tesla.transfer(transferEnergy);
-				this.transfer(-transferEnergy);
+				float transferEnergy = this.getEnergyStored() / transferTeslaCoils.size();
+
+				for (ITesla tesla : transferTeslaCoils)
+				{
+					tesla.transfer(transferEnergy * (1 - (this.worldObj.rand.nextFloat() * 0.1f)));
+					this.transfer(-transferEnergy);
+				}
 			}
 		}
 
@@ -66,7 +69,7 @@ public class TileEntityTesla extends TileEntityBase implements ITesla
 		{
 			TileEntityFurnace furnaceTile = (TileEntityFurnace) tileEntity;
 
-			boolean doBlockStateUpdate = false;
+			boolean doBlockStateUpdate = furnaceTile.furnaceBurnTime > 0;
 
 			if (furnaceTile.furnaceBurnTime == 0)
 			{
@@ -76,7 +79,6 @@ public class TileEntityTesla extends TileEntityBase implements ITesla
 					furnaceTile.decrStackSize(1, 1);
 					furnaceTile.furnaceBurnTime = burnTime;
 				}
-				doBlockStateUpdate = true;
 			}
 			else
 			{
@@ -84,9 +86,8 @@ public class TileEntityTesla extends TileEntityBase implements ITesla
 				furnaceTile.furnaceBurnTime--;
 			}
 
-			if (doBlockStateUpdate)
+			if (doBlockStateUpdate != furnaceTile.furnaceBurnTime > 0)
 			{
-
 				BlockFurnace.updateFurnaceBlockState(furnaceTile.furnaceBurnTime > 0, furnaceTile.worldObj, furnaceTile.xCoord, furnaceTile.yCoord, furnaceTile.zCoord);
 			}
 		}
@@ -95,7 +96,6 @@ public class TileEntityTesla extends TileEntityBase implements ITesla
 	@Override
 	public void transfer(float transferEnergy)
 	{
-		System.out.println(transferEnergy);
 		this.energy += transferEnergy;
 		this.doTransfer = true;
 	}