From 9075692951f06996778819896737a172546e86cc Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Sat, 30 May 2015 11:47:01 +0100 Subject: [PATCH] Added basic ee3 support for all machines, will not work right when it has two outputs --- src/main/java/techreborn/Core.java | 2 ++ src/main/java/techreborn/compat/CompatManager.java | 14 +++++++++----- src/main/java/techreborn/compat/ee3/EmcValues.java | 12 +++++++++++- src/main/java/techreborn/init/ModRecipes.java | 2 +- 4 files changed, 23 insertions(+), 7 deletions(-) diff --git a/src/main/java/techreborn/Core.java b/src/main/java/techreborn/Core.java index aca439b93..a38f5d705 100644 --- a/src/main/java/techreborn/Core.java +++ b/src/main/java/techreborn/Core.java @@ -90,6 +90,8 @@ public class Core { { // Has to be done here as Buildcraft registers there recipes late RecipeManager.init(); + //Has to be done after the recipes have been added + CompatManager.postInit(event); //RecipeHanderer.addOreDicRecipes(); LogHelper.info(RecipeHanderer.recipeList.size() + " recipes loaded"); } diff --git a/src/main/java/techreborn/compat/CompatManager.java b/src/main/java/techreborn/compat/CompatManager.java index 905bdd286..d6621cb2e 100644 --- a/src/main/java/techreborn/compat/CompatManager.java +++ b/src/main/java/techreborn/compat/CompatManager.java @@ -1,5 +1,6 @@ package techreborn.compat; +import cpw.mods.fml.common.event.FMLPostInitializationEvent; import techreborn.compat.ee3.EmcValues; import techreborn.compat.waila.CompatModuleWaila; import techreborn.init.ModParts; @@ -21,10 +22,13 @@ public class CompatManager { // Register Multiparts ModParts.init(); } - if(Loader.isModLoaded("EE3")) - { - // Register Emc Values - EmcValues.init(); - } } + + public static void postInit(FMLPostInitializationEvent event){ + if(Loader.isModLoaded("EE3")) + { + // Register Emc Values and machine crafting handlers + EmcValues.init(); + } + } } diff --git a/src/main/java/techreborn/compat/ee3/EmcValues.java b/src/main/java/techreborn/compat/ee3/EmcValues.java index 0a6dc2986..6c535e113 100644 --- a/src/main/java/techreborn/compat/ee3/EmcValues.java +++ b/src/main/java/techreborn/compat/ee3/EmcValues.java @@ -1,10 +1,20 @@ package techreborn.compat.ee3; +import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; +import net.minecraft.item.ItemStack; +import techreborn.api.recipe.IBaseRecipeType; +import techreborn.api.recipe.RecipeHanderer; + public class EmcValues { public static void init() { - //TODO + for(IBaseRecipeType recipeType : RecipeHanderer.recipeList){ + for(ItemStack output : recipeType.getOutputs()){ + //TODO this does not handle multi outputs + RecipeRegistryProxy.addRecipe(output, recipeType.getInputs()); + } + } } } diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index 1e7ae2108..f8cee69af 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -173,7 +173,7 @@ public class ModRecipes { TechRebornAPI.addRollingMachinceRecipe(new ItemStack(Blocks.furnace, 4), "ccc", "c c", "ccc", 'c', Blocks.cobblestone); TechRebornAPI.registerBlastFurnaceRecipe(new BlastFurnaceRecipe(new ItemStack(Items.apple), new ItemStack(Items.ender_pearl), new ItemStack(Items.golden_apple), new ItemStack(Items.diamond), 120, 1000)); - RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.end_stone, 4), null, new ItemStack(Items.brewing_stand), new ItemStack(Items.carrot), 120, 5)); + RecipeHanderer.addRecipe(new ImplosionCompressorRecipe(new ItemStack(Blocks.netherrack, 4), new ItemStack(Blocks.diamond_block, 1), new ItemStack(ModItems.bucketTritium), null, 120, 5)); RecipeHanderer.addRecipe(new AlloySmelterRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5)); RecipeHanderer.addRecipe(new AssemblingMachineRecipe(new ItemStack(Items.coal), new ItemStack(Blocks.sand), new ItemStack(Items.diamond), 120, 5));