From 500eca7ea62c9fafd7f038a4baedfca887424cc4 Mon Sep 17 00:00:00 2001
From: Calclavia <admin@calclavia.com>
Date: Tue, 25 Feb 2014 20:23:09 +0800
Subject: [PATCH] Some filter and wire IC2 compatibility fixes

---
 .../electrical/wire/ItemWire.java             |   3 +-
 .../electrical/wire/PartConductor.java        |   4 +-
 .../wire/framed/PartFramedWire.java           |  70 ++++++++++++++++++
 .../wire/trait/TraitEnergySink.java           |  36 +++++----
 .../mechanical/process/BlockFilter.java       |   2 +-
 .../textures/blocks/glyph_3.png               | Bin 0 -> 957 bytes
 6 files changed, 98 insertions(+), 17 deletions(-)
 create mode 100644 src/main/resources/assets/resonantinduction/textures/blocks/glyph_3.png

diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java
index 5bfa374f..65d0fc0f 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/ItemWire.java
@@ -27,6 +27,7 @@ import calclavia.lib.render.EnumColor;
 import calclavia.lib.utility.LanguageUtility;
 import codechicken.lib.vec.BlockCoord;
 import codechicken.lib.vec.Vector3;
+import codechicken.multipart.ControlKeyModifer;
 import codechicken.multipart.JItemMultiPart;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.TMultiPart;
@@ -55,7 +56,7 @@ public class ItemWire extends JItemMultiPart
 	{
 		BlockCoord onPos = pos.copy().offset(side ^ 1);
 
-		if (player.isSneaking())
+		if (player.isSneaking() && !ControlKeyModifer.isControlDown(player))
 		{
 			PartFramedWire wire = (PartFramedWire) MultiPartRegistry.createPart("resonant_induction_wire", false);
 
diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/PartConductor.java b/electrical/src/main/java/resonantinduction/electrical/wire/PartConductor.java
index 36c3e123..5dcaa71b 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/PartConductor.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/PartConductor.java
@@ -124,7 +124,7 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 			{
 				TMultiPart part = tile().partMap(i);
 
-				if (part instanceof IEnergyTile)
+				if (part instanceof IEnergyTile && part != this)
 				{
 					foundAnotherPart = true;
 					break;
@@ -154,7 +154,7 @@ public abstract class PartConductor extends PartAdvanced implements IConductor
 				{
 					TMultiPart part = tile().partMap(i);
 
-					if (part instanceof IEnergyTile)
+					if (part instanceof IEnergyTile && part != this)
 					{
 						foundAnotherPart = true;
 						break;
diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
index b4162ba8..e571a309 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/framed/PartFramedWire.java
@@ -1,5 +1,9 @@
 package resonantinduction.electrical.wire.framed;
 
+import ic2.api.energy.event.EnergyTileLoadEvent;
+import ic2.api.energy.event.EnergyTileUnloadEvent;
+import ic2.api.energy.tile.IEnergyTile;
+
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
@@ -13,11 +17,13 @@ import net.minecraft.util.Icon;
 import net.minecraft.util.MovingObjectPosition;
 import net.minecraft.world.World;
 import net.minecraftforge.common.ForgeDirection;
+import net.minecraftforge.common.MinecraftForge;
 import resonantinduction.core.prefab.part.PartFramedConnection;
 import resonantinduction.electrical.Electrical;
 import resonantinduction.electrical.wire.EnumWireMaterial;
 import resonantinduction.electrical.wire.PartAdvancedWire;
 import universalelectricity.api.CompatibilityModule;
+import universalelectricity.api.UniversalClass;
 import universalelectricity.api.energy.EnergyNetworkLoader;
 import universalelectricity.api.energy.IConductor;
 import universalelectricity.api.energy.IEnergyNetwork;
@@ -34,12 +40,14 @@ import codechicken.multipart.JIconHitEffects;
 import codechicken.multipart.JNormalOcclusion;
 import codechicken.multipart.MultiPartRegistry;
 import codechicken.multipart.PartMap;
+import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TSlottedPart;
 import codechicken.multipart.TileMultipart;
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 
+@UniversalClass
 public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, IConductor, IEnergyNetwork> implements IConductor, TSlottedPart, JNormalOcclusion, IHollowConnect, JIconHitEffects
 {
 	public PartFramedWire()
@@ -66,6 +74,68 @@ public class PartFramedWire extends PartFramedConnection<EnumWireMaterial, ICond
 		return "resonant_induction_wire";
 	}
 
+	/**
+	 * IC2 Functions
+	 */
+	@Override
+	public void onWorldJoin()
+	{
+		if (tile() instanceof IEnergyTile && !world().isRemote)
+		{
+			// Check if there's another part that's an IEnergyTile
+			boolean foundAnotherPart = false;
+
+			for (int i = 0; i < tile().partList().size(); i++)
+			{
+				TMultiPart part = tile().partMap(i);
+
+				if (part instanceof IEnergyTile && part != this)
+				{
+					foundAnotherPart = true;
+					break;
+				}
+			}
+
+			if (!foundAnotherPart)
+			{
+				MinecraftForge.EVENT_BUS.post(new EnergyTileLoadEvent((IEnergyTile) tile()));
+			}
+		}
+	}
+
+	@Override
+	public void preRemove()
+	{
+		if (!world().isRemote)
+		{
+			this.getNetwork().split(this);
+
+			if (tile() instanceof IEnergyTile)
+			{
+				// Check if there's another part that's an IEnergyTile
+				boolean foundAnotherPart = false;
+
+				for (int i = 0; i < tile().partList().size(); i++)
+				{
+					TMultiPart part = tile().partMap(i);
+
+					if (part instanceof IEnergyTile && part != this)
+					{
+						foundAnotherPart = true;
+						break;
+					}
+				}
+
+				if (!foundAnotherPart)
+				{
+					MinecraftForge.EVENT_BUS.post(new EnergyTileUnloadEvent((IEnergyTile) tile()));
+				}
+			}
+		}
+
+		super.preRemove();
+	}
+
 	@Override
 	public boolean doesTick()
 	{
diff --git a/electrical/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java b/electrical/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
index 8c28ff29..cfbe8168 100644
--- a/electrical/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
+++ b/electrical/src/main/java/resonantinduction/electrical/wire/trait/TraitEnergySink.java
@@ -7,6 +7,7 @@ import java.util.Set;
 
 import net.minecraft.tileentity.TileEntity;
 import net.minecraftforge.common.ForgeDirection;
+import codechicken.multipart.PartMap;
 import codechicken.multipart.TMultiPart;
 import codechicken.multipart.TileMultipart;
 
@@ -85,9 +86,9 @@ public class TraitEnergySink extends TileMultipart implements IEnergySink
 		{
 			TMultiPart part = this.partMap(dir.ordinal());
 
-			if (this.icInterfaces.contains(part))
+			if (part instanceof IEnergySink)
 			{
-				return ((IEnergySink) part).demandedEnergyUnits();
+				demanded += ((IEnergySink) part).demandedEnergyUnits();
 			}
 		}
 
@@ -97,22 +98,32 @@ public class TraitEnergySink extends TileMultipart implements IEnergySink
 	@Override
 	public double injectEnergyUnits(ForgeDirection from, double amount)
 	{
-		if (this.partMap(from.ordinal()) == null)
+		/**
+		 * Try out different sides to try to inject energy into.
+		 */
+		if (partMap(from.ordinal()) instanceof IEnergySink)
 		{
-			for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
-			{
-				if (dir != from.getOpposite())
-				{
-					TMultiPart part = this.partMap(dir.ordinal());
+			return ((IEnergySink) partMap(from.ordinal())).injectEnergyUnits(from, amount);
+		}
 
-					if (this.icInterfaces.contains(part))
-					{
-						return ((IEnergySink) part).injectEnergyUnits(from, amount);
-					}
+		for (ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS)
+		{
+			if (dir != from.getOpposite())
+			{
+				TMultiPart part = this.partMap(dir.ordinal());
+
+				if (part instanceof IEnergySink)
+				{
+					return ((IEnergySink) part).injectEnergyUnits(from, amount);
 				}
 			}
 		}
 
+		if (partMap(PartMap.CENTER.ordinal()) instanceof IEnergySink)
+		{
+			return ((IEnergySink) partMap(PartMap.CENTER.ordinal())).injectEnergyUnits(from, amount);
+		}
+
 		return amount;
 	}
 
@@ -121,5 +132,4 @@ public class TraitEnergySink extends TileMultipart implements IEnergySink
 	{
 		return Integer.MAX_VALUE;
 	}
-
 }
diff --git a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java
index 28033132..23ecbfe9 100644
--- a/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java
+++ b/mechanical/src/main/java/resonantinduction/mechanical/process/BlockFilter.java
@@ -80,7 +80,7 @@ public class BlockFilter extends BlockTile
 			/**
 			 * Add liquid to bottom.
 			 */
-			checkBelow.setBlock(world, Block.waterStill.blockID, 0, 3);
+			checkBelow.setBlock(world, Block.waterMoving.blockID);
 		}
 	}
 
diff --git a/src/main/resources/assets/resonantinduction/textures/blocks/glyph_3.png b/src/main/resources/assets/resonantinduction/textures/blocks/glyph_3.png
new file mode 100644
index 0000000000000000000000000000000000000000..5b34119f5e86ecc621b4fc8b7d1f897173f8a22a
GIT binary patch
literal 957
zcmV;u148_XP)<h;3K|Lk000e1NJLTq001BW001Be0ssI2{21+{00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9
za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0009lNkl<ZNK3VqJ#Ldh6h&DCjpf+Jzr?sk
z5l|q30HvX!LdpWN5@^yPiim)e0wfB8L_@_IXlPP;0bYZ1<~uL%8yi=Vauq$@cW2(c
zGh-X>bZ!|Xpx^J`+XPCl*BcB55Nb`(<q|n{uYufIe0Bu5BRAz%MUWfnok<iO0TGbB
zTWeE!LWP>3RdH3oHH-io)Eq8m)mgILf}$@Y6g32G01LWXRe)pVkedewE=5zJagH-Z
zfQ?{BO{ludQ><Zjj(9i-h=A-N0`Uf5uy)s{{gCNBDL~wBFqurI)9GwBqryj{(Qr6~
zJZQiMmLQA8LLaa@z&_Uy=kxjf2D(6uAp?#nl@{1C;<#rO5fEL24AAt&kF^09SvkH-
z0CM<qjaUZ=zFNFT1kmd)Xc2Y1d%DI*)8jwI3%vdn1hMleI3s@AK+*=(mjW(~$79@i
zaR~Ro>*!)d1uws@NPTrtE(c*7Ct$>brn^4v4O|e2yftIEo5UHPe7wXFLIA|e(Q*hc
zt*H(WUMT`p*_26$_!0mfek;ev>-p!Up9cZ>LJVdnZ@>t%m=^nMM1YMkR>b}DHGjAp
zgWa>UB^6`<l??wFaaI%Hwb~n4y#yjh#)5~!#kW5AaOs;oK3!7b2AjkPgLwnoyjFY$
zx`PaGjO#-Td-J_~$e7OG|J7Pu&WK-4t?+3BQgRs}@<YR&8!+s*=+T$*GUdhJ{X_RB
z0tm<(0LCR4Mt}`~a0-Cvq{Dt;o}RB%_D;%&fyf>R8!|w5t-wZrzXo;~;B#}{+Q<Mz
zRuNfJr|KhcGpP-*_xJ#j;kUob*Mni8of!}U{KpFJpFZUsuHC6^fPDfHM^4I*$OGyH
zp@pyt5CIBEAI^t^H3DD;xC0>KMF2=Ijkp0ErQECfS5KcUs|Ya7+vUOyz+idb#w~r~
z1}W9cHS%Rey-h+@q;|Vqm)Zb(kUVcA(6^8own+?7*>M8^uicZQJE=8D-HI+zVQ}LH
z8vTFp{NJLUms4{p2{n}nfZ+mE-6333%!5l@t*fi>6eB=)f$AnJ`<&EN?n42$G37Q|
fk!=LrB08Nbc@em3p|3PO00000NkvXXu0mjf&vuvN

literal 0
HcmV?d00001