From d1a368352e731d3f37bb647f2ea405aa8d0f22b5 Mon Sep 17 00:00:00 2001
From: Anthony Fiorentini <x3n0ph0b3@yahoo.com>
Date: Tue, 8 May 2012 14:15:55 -0500
Subject: [PATCH] Altered interfaces to take itemstack references, so as to use
 NBT

---
 .../ee3/core/interfaces/IItemChargeable.java  | 10 +++--
 .../ee3/core/interfaces/IItemModal.java       |  8 ++--
 ee3_common/ee3/item/ItemPhilosopherStone.java | 38 +++++++++----------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/ee3_common/ee3/core/interfaces/IItemChargeable.java b/ee3_common/ee3/core/interfaces/IItemChargeable.java
index 3e35b7a0..4a3b2947 100644
--- a/ee3_common/ee3/core/interfaces/IItemChargeable.java
+++ b/ee3_common/ee3/core/interfaces/IItemChargeable.java
@@ -1,14 +1,16 @@
 package ee3.core.interfaces;
 
+import net.minecraft.src.ItemStack;
+
 public interface IItemChargeable {
 
-	public abstract byte getCurrentCharge();
+	public abstract byte getCurrentCharge(ItemStack ist);
 	
 	public abstract byte getMaxCharge();
 	
-	public abstract void increaseCharge();
+	public abstract void increaseCharge(ItemStack ist);
 	
-	public abstract void decreaseCharge();
+	public abstract void decreaseCharge(ItemStack ist);
 	
-	public abstract void setCurrentCharge(byte charge);
+	public abstract void setCurrentCharge(ItemStack ist, byte charge);
 }
diff --git a/ee3_common/ee3/core/interfaces/IItemModal.java b/ee3_common/ee3/core/interfaces/IItemModal.java
index b448d6af..18a80187 100644
--- a/ee3_common/ee3/core/interfaces/IItemModal.java
+++ b/ee3_common/ee3/core/interfaces/IItemModal.java
@@ -1,12 +1,14 @@
 package ee3.core.interfaces;
 
+import net.minecraft.src.ItemStack;
+
 public interface IItemModal {
 	
-	public abstract byte getCurrentMode();
+	public abstract byte getCurrentMode(ItemStack ist);
 	
 	public abstract byte getMaxMode();
 	
-	public abstract byte cycleMode();
+	public abstract byte cycleMode(ItemStack ist);
 	
-	public abstract void setMode(byte mode);
+	public abstract void setMode(ItemStack ist, byte mode);
 }
diff --git a/ee3_common/ee3/item/ItemPhilosopherStone.java b/ee3_common/ee3/item/ItemPhilosopherStone.java
index 4402e7ce..f22c22f5 100644
--- a/ee3_common/ee3/item/ItemPhilosopherStone.java
+++ b/ee3_common/ee3/item/ItemPhilosopherStone.java
@@ -23,30 +23,30 @@ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IIt
 	}
 
 	@Override
-	public void increaseCharge() {
-		if (currentCharge < maxCharge)
-			currentCharge++;			
+	public void increaseCharge(ItemStack ist) {
+		if (getCurrentCharge(ist) < getMaxCharge())
+			setCurrentCharge(ist, (byte)(getCurrentCharge(ist) + 1));			
 	}
 
 	@Override
-	public void decreaseCharge() {
-		if (currentCharge > 0)
-			currentCharge--;
+	public void decreaseCharge(ItemStack ist) {
+		if (getCurrentCharge(ist) > 0)
+			setCurrentCharge(ist, (byte)(getCurrentCharge(ist) - 1));	
 	}
 
 	@Override
-	public byte getCurrentCharge() {
-		return currentCharge;
+	public byte getCurrentCharge(ItemStack ist) {
+		return this.getByte(ist, "currentCharge");
 	}
 
 	@Override
-	public void setCurrentCharge(byte charge) {
-		currentCharge = charge;
+	public void setCurrentCharge(ItemStack ist, byte charge) {
+		this.setByte(ist, "currentCharge", charge);
 	}
 
 	@Override
-	public byte getCurrentMode() {
-		return currentMode;
+	public byte getCurrentMode(ItemStack ist) {
+		return this.getByte(ist, "currentMode");
 	}
 
 	@Override
@@ -55,17 +55,17 @@ public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IIt
 	}
 
 	@Override
-	public byte cycleMode() {
-		if (currentMode < maxMode)
-			currentMode += 1;
+	public byte cycleMode(ItemStack ist) {
+		if (getCurrentMode(ist) < getMaxMode())
+			setMode(ist, (byte)(getCurrentMode(ist) + 1));
 		else
-			currentMode = 0;
-		return currentMode;
+			setMode(ist, (byte)0);
+		return getCurrentMode(ist);
 	}
 
 	@Override
-	public void setMode(byte mode) {
-		this.currentMode = mode;
+	public void setMode(ItemStack ist, byte mode) {
+		this.setByte(ist, "currentMode", mode);
 	}
 
 	@Override