$ Rewrote the Fuel Handler.

2 files changed, 21 insertions, 16 deletions

diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 2d1c38c83d..045e2b492c 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -235,7 +235,7 @@ public final class ModItems {
 
 
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
-		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "gemCoalCoke", 3200).setTextureName(CORE.MODID + ":itemCoalCoke");
+		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "gemCoalCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
 
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
diff --git a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
index 6f27bfda2f..42aadfa91d 100644
--- a/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
+++ b/src/Java/gtPlusPlus/core/item/base/BaseItemBurnable.java
@@ -1,38 +1,43 @@
 package gtPlusPlus.core.item.base;
 
-import cpw.mods.fml.common.IFuelHandler;
 import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.array.Pair;
 import gtPlusPlus.core.util.item.ItemUtils;
 import net.minecraft.creativetab.CreativeTabs;
 import net.minecraft.item.ItemStack;
 
-public class BaseItemBurnable extends CoreItem implements IFuelHandler{
-
-	final int burnTime;
+public class BaseItemBurnable extends CoreItem {
+	
+	protected final int meta;
 	
 	public BaseItemBurnable(String unlocalizedName, String displayName, CreativeTabs creativeTab,
-			int stackSize, int maxDmg, String description, String oredictName, int burnTime) {
+			int stackSize, int maxDmg, String description, String oredictName, int burnTime, int meta) {
 		super(unlocalizedName, creativeTab, stackSize, maxDmg, description);
-		this.burnTime = burnTime;
 		this.itemName = displayName;
-		
+		this.meta = meta;
 		if (!oredictName.equals("") || oredictName != null){
 			registerOrdictionary(oredictName);
 		}		
-		registerFuel();
-	}
-
-	@Override
-	public int getBurnTime(ItemStack fuel) {
-		return this.burnTime;
+		registerFuel(burnTime);
+		
 	}
 	
-	public void registerFuel(){
-		CORE.burnables.add(this);
+	public void registerFuel(int burn){
+		CORE.burnables.add(new Pair<Integer, ItemStack>(burn, ItemUtils.getSimpleStack(this, 1)));
 	}
 	
 	public void registerOrdictionary(String name){
 		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(this), name);		
 	}
 
+	@Override
+	public int getDamage(ItemStack stack) {
+		return this.meta;
+	}
+
+	@Override
+	public boolean showDurabilityBar(ItemStack stack) {
+		return false;
+	}
+
 }