Moved interfaces around

Added learnable/recoverable variables to the EMC mappings
Renamed the PStone recipes

ee3_client/net/minecraft/src/ee3/client/EEProxy.java

@@ -7,7 +7,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.World;
-import net.minecraft.src.ee3.core.IProxy;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.forge.MinecraftForgeClient;
 
 public class EEProxy implements IProxy {

ee3_common/net/minecraft/src/ee3/core/EMCMapping.java

@@ -4,17 +4,23 @@ public class EMCMapping {
 	
 	private float cost;
 	private float recovery;
+	private boolean learnable;
+	private boolean recoverable;
 	
 	public EMCMapping() { }
 	
 	public EMCMapping(float cost) {
 		this.cost = cost;
 		recovery = cost;
+		learnable = true;
+		recoverable = true;
 	}
 	
-	public EMCMapping(float cost, float recovery) {
+	public EMCMapping(float cost, float recovery, boolean learnable, boolean recoverable) {
 		this.cost = cost;
 		this.recovery = recovery;
+		this.learnable = learnable;
+		this.recoverable = recoverable;
 	}
 	
 	public float getCostEMC() {
@@ -25,6 +31,14 @@ public class EMCMapping {
 		return recovery;
 	}
 	
+	public boolean isLearnable() {
+		return learnable;
+	}
+	
+	public boolean isRecoverable() {
+		return recoverable;
+	}
+	
 	public void setCostEMC(float cost) {
 		this.cost = cost;
 	}
@@ -32,4 +46,12 @@ public class EMCMapping {
 	public void setRecoveryEMC(float recovery) {
 		this.recovery = recovery;
 	}
+	
+	public void setLearnable(boolean learnable) {
+		this.learnable = learnable;
+	}
+	
+	public void setRecoverable(boolean recoverable) {
+		this.recoverable = recoverable;
+	}
 }

ee3_common/net/minecraft/src/ee3/core/IItemModal.java

@@ -1,5 +0,0 @@
-package net.minecraft.src.ee3.core;
-
-public interface IItemModal {
-
-}

ee3_common/net/minecraft/src/ee3/core/RecipesPhilStone.java

@@ -1,6 +1,6 @@
 package net.minecraft.src.ee3.core;
 
-public class PStoneRecipes {
+public class RecipesPhilStone {
 
 	public void init() {
 		// X dirt == X cobblestone == X stone == X sand

ee3_common/net/minecraft/src/ee3/core/ServerClientProxy.java

@@ -1,6 +1,7 @@
 package net.minecraft.src.ee3.core;
 
 import net.minecraft.src.ModLoader;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.ee3.lib.Reference;
 import net.minecraft.src.forge.MinecraftForge;
 

ee3_common/net/minecraft/src/ee3/interfaces/IItemChargeable.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.ee3.core;
+package net.minecraft.src.ee3.interfaces;
 
 public interface IItemChargeable {
 

ee3_common/net/minecraft/src/ee3/interfaces/IItemModal.java

@@ -0,0 +1,5 @@
+package net.minecraft.src.ee3.interfaces;
+
+public interface IItemModal {
+
+}

ee3_common/net/minecraft/src/ee3/interfaces/IProxy.java

@@ -1,4 +1,4 @@
-package net.minecraft.src.ee3.core;
+package net.minecraft.src.ee3.interfaces;
 
 import java.io.File;
 

ee3_common/net/minecraft/src/ee3/item/ItemChargeable.java

@@ -1,11 +0,0 @@
-package net.minecraft.src.ee3.item;
-
-public class ItemChargeable extends ItemMod {
-
-	private int maxCharge;
-	
-	public ItemChargeable(int i, int j) {
-		super(i);
-		maxCharge = j;
-	}
-}

ee3_common/net/minecraft/src/ee3/item/ItemEE.java

@@ -0,0 +1,8 @@
+package net.minecraft.src.ee3.item;
+
+public class ItemEE extends ItemMod {
+
+	public ItemEE(int i) {
+		super(i);
+	}
+}

ee3_common/net/minecraft/src/ee3/item/ItemEEStackable.java

@@ -0,0 +1,10 @@
+package net.minecraft.src.ee3.item;
+
+public class ItemEEStackable extends ItemMod {
+
+	public ItemEEStackable(int i) {
+		super(i);
+		maxStackSize = 64;
+	}
+
+}

ee3_common/net/minecraft/src/ee3/item/ItemMod.java

@@ -14,7 +14,6 @@ public class ItemMod extends Item implements ITextureProvider {
 	
 	@Override
 	public String getTextureFile() {
-		// TODO Proper location
 		return Reference.SPRITE_SHEET_LOCATION + Reference.ITEM_SPRITE_SHEET;
 	}
 

ee3_common/net/minecraft/src/ee3/item/ItemPhilosopherStone.java

@@ -0,0 +1,28 @@
+package net.minecraft.src.ee3.item;
+
+import net.minecraft.src.ee3.interfaces.IItemChargeable;
+import net.minecraft.src.ee3.interfaces.IItemModal;
+
+public class ItemPhilosopherStone extends ItemEE implements IItemChargeable, IItemModal {
+
+	private int maxCharge;
+	
+	public ItemPhilosopherStone(int i) {
+		super(i);
+		maxCharge = 4;
+	}
+
+	@Override
+	public int getMaxCharge() {
+		return maxCharge;
+	}
+
+	@Override
+	public void increaseCharge() {
+	}
+
+	@Override
+	public void decreaseCharge() {
+	}
+
+}

ee3_common/net/minecraft/src/mod_EE3.java

@@ -2,10 +2,10 @@ package net.minecraft.src;
 
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.ee3.core.ConfigurationManager;
-import net.minecraft.src.ee3.core.IProxy;
 import net.minecraft.src.ee3.core.ServerClientProxy;
 import net.minecraft.src.ee3.core.Version;
 import net.minecraft.src.ee3.gui.GuiHandler;
+import net.minecraft.src.ee3.interfaces.IProxy;
 import net.minecraft.src.ee3.lib.Reference;
 import net.minecraft.src.ee3.lib.Sounds;
 import net.minecraft.src.ee3.network.PacketHandler;

ee3_server/net/minecraft/src/ee3/server/EEProxy.java

@@ -6,7 +6,7 @@ import net.minecraft.src.EntityPlayer;
 import net.minecraft.src.ModLoader;
 import net.minecraft.src.NetworkManager;
 import net.minecraft.src.World;
-import net.minecraft.src.ee3.core.IProxy;
+import net.minecraft.src.ee3.interfaces.IProxy;
 
 public class EEProxy implements IProxy {