+ Added some legacy burnables.

9 files changed, 97 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index 0f689325a3..d6a24d718a 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -12,6 +12,7 @@ import gtPlusPlus.xmod.galacticraft.HANDLER_GalactiCraft;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
+import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
 import gtPlusPlus.xmod.sc2.HANDLER_SC2;
 import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
@@ -33,6 +34,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.preInit();
 		HANDLER_GalactiCraft.preInit();
 		HANDLER_CropsPlusPlus.preInit(preinit);
+		HANDLER_Railcraft.preInit();
 	}
 
 	public static void init(FMLInitializationEvent init){
@@ -49,6 +51,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.init();
 		HANDLER_GalactiCraft.init();
 		HANDLER_CropsPlusPlus.init(init);
+		HANDLER_Railcraft.init();
 	}
 
 	public static void postInit(FMLPostInitializationEvent postinit){
@@ -65,6 +68,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_SC2.postInit();
 		HANDLER_GalactiCraft.postInit();
 		HANDLER_CropsPlusPlus.postInit(postinit);
+		HANDLER_Railcraft.postInit();
 	}
 
 	public static void onLoadComplete(FMLLoadCompleteEvent event) {
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index de22821127..3b919ee431 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -288,6 +288,10 @@ public final class ModItems {
 	public static Item itemAirFilter;
 
 	public static Item itemCoalCoke;
+	public static Item itemCactusCharcoal;
+	public static Item itemSugarCharcoal;
+	public static Item itemCactusCoke;
+	public static Item itemSugarCoke;
 
 	public static Item itemCircuitLFTR;
 
@@ -394,11 +398,8 @@ public final class ModItems {
 		//Some Simple forms of materials
 		itemStickyRubber = new Item().setUnlocalizedName("itemStickyRubber").setCreativeTab(tabMachines).setTextureName(CORE.MODID + ":itemStickyRubber");
 		GameRegistry.registerItem(itemStickyRubber, "itemStickyRubber");
-		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));
-
-
-		itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
-
+		GT_OreDictUnificator.registerOre("ingotRubber", ItemUtils.getItemStackFromFQRN(CORE.MODID+":itemStickyRubber", 1));		
+		
 		//Register Hydrogen Blobs first, so we can replace old helium blobs.
 		itemHydrogenBlob = new CoreItem("itemHydrogenBlob", "Mysterious Hydrogen Blob", tabMisc).setTextureName(CORE.MODID + ":itemHeliumBlob");
 		//Register Old Helium Blob, this will be replaced when held by a player.
diff --git a/src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java b/src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
new file mode 100644
index 0000000000..0a02e0a6be
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/railcraft/HANDLER_Railcraft.java
@@ -0,0 +1,74 @@
+package gtPlusPlus.xmod.railcraft;
+
+import static gtPlusPlus.core.creative.AddToCreativeTab.tabMisc;
+
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.item.base.BaseItemBurnable;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.recipe.common.CI;
+import gtPlusPlus.core.util.minecraft.FluidUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.railcraft.utils.RailcraftUtils;
+import net.minecraft.item.ItemStack;
+
+public class HANDLER_Railcraft {
+	
+	
+
+	public static void preInit() {
+		if (LoadedMods.Railcraft) {
+			
+		}
+		
+		//Register Custom Coal Coke
+		ModItems.itemCoalCoke = new BaseItemBurnable("itemCoalCoke", "Coking Coal", tabMisc, 64, 0, "Used for metallurgy.", "fuelCoke", 3200, 0).setTextureName(CORE.MODID + ":itemCoalCoke");
+		
+		//Add in things that once existed in 1.5.2
+		ModItems.itemCactusCharcoal = new BaseItemBurnable("itemCactusCharcoal", "Cactus Charcoal", tabMisc, 64, 0, "Used for smelting.", "fuelCactusCharcoal", 400, 0).setTextureName(CORE.MODID + ":itemCactusCharcoal");
+		ModItems.itemSugarCharcoal = new BaseItemBurnable("itemSugarCharcoal", "Sugar Charcoal", tabMisc, 64, 0, "Used for smelting.", "fuelSugarCharcoal", 400, 0).setTextureName(CORE.MODID + ":itemSugarCharcoal");
+		ModItems.itemCactusCoke = new BaseItemBurnable("itemCactusCoke", "Cactus Coke", tabMisc, 64, 0, "Used for smelting.", "fuelCactusCoke", 800, 0).setTextureName(CORE.MODID + ":itemCactusCoke");
+		ModItems.itemSugarCoke = new BaseItemBurnable("itemSugarCoke", "Sugar Coke", tabMisc, 64, 0, "Used for smelting.", "fuelSugarCoke", 800, 0).setTextureName(CORE.MODID + ":itemSugarCoke");
+
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal), "itemCharcoalCactus");
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemCactusCoke), "itemCokeCactus");
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal), "itemCharcoalSugar");
+		ItemUtils.addItemToOreDictionary(ItemUtils.getSimpleStack(ModItems.itemSugarCoke), "itemCokeSugar");
+		
+	}
+
+	public static void init() {
+		if (LoadedMods.Railcraft) {
+			
+		}
+	}
+
+	public static void postInit() {
+		if (LoadedMods.Railcraft) {
+			
+		}
+		generateCokeOvenRecipes();
+	}
+	
+	
+	private static void generateCokeOvenRecipes() {
+		ItemStack[] aInputs = new ItemStack[] {
+				ItemUtils.getSimpleStack(ModItems.itemCactusCharcoal),
+				ItemUtils.getSimpleStack(ModItems.itemSugarCharcoal)
+		};
+		ItemStack[] aOutputs = new ItemStack[] {
+				ItemUtils.getSimpleStack(ModItems.itemCactusCoke),
+				ItemUtils.getSimpleStack(ModItems.itemSugarCoke)
+				};
+		for (int i=0;i<aOutputs.length;i++) {
+			CORE.RA.addCokeOvenRecipe(aInputs[i], CI.getNumberedCircuit(4), null, FluidUtils.getFluidStack("creosote", 30), aOutputs[i], 750, 16);			
+		}
+
+		if (LoadedMods.Railcraft) {			
+			for (int i=0;i<aOutputs.length;i++) {
+				RailcraftUtils.addCokeOvenRecipe(aInputs[i], true, true, aOutputs[i], FluidUtils.getFluidStack("creosote", 30), 750);			
+			}			
+		}		
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java b/src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java
new file mode 100644
index 0000000000..eb1456d53e
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/railcraft/utils/RailcraftUtils.java
@@ -0,0 +1,13 @@
+package gtPlusPlus.xmod.railcraft.utils;
+
+import mods.railcraft.common.util.crafting.CokeOvenCraftingManager;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
+public class RailcraftUtils {
+
+	public static void addCokeOvenRecipe(ItemStack input, boolean matchDamage, boolean matchNBT, ItemStack output, FluidStack fluidOutput, int cookTime) {
+		CokeOvenCraftingManager.getInstance().addRecipe(input, matchDamage, matchNBT, output, fluidOutput, cookTime);
+	}
+	
+}
diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png b/src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png
new file mode 100644
index 0000000000..3cb0ac7097
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/burnables/itemCactusCharcoal.png
diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png b/src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png
new file mode 100644
index 0000000000..9dc98ba18d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/burnables/itemCactusCoke.png
diff --git a/src/resources/assets/miscutils/textures/items/itemCoalCoke.png b/src/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png
index 4f8fd406d4..4f8fd406d4 100644
--- a/src/resources/assets/miscutils/textures/items/itemCoalCoke.png
+++ b/src/resources/assets/miscutils/textures/items/burnables/itemCoalCoke.png
diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png b/src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png
new file mode 100644
index 0000000000..f66a217c78
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/burnables/itemSugarCharcoal.png
diff --git a/src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png b/src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png
new file mode 100644
index 0000000000..055655ebe1
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/items/burnables/itemSugarCoke.png