diff --git a/build.gradle b/build.gradle index 65b7753c..7c5609e3 100644 --- a/build.gradle +++ b/build.gradle @@ -64,6 +64,7 @@ dependencies { compile "com.mod-buildcraft:buildcraft:${buildcraft_version}:api" compile "mcp.mobius.waila:Waila:${waila_version}_${minecraft_version}:dev" compile "net.sengir.forestry:${forestry_version}:api" + compile "com.pahimar.ee3:EquivalentExchange3:${ee3_version}:dev" // WAILA ships really old CCC/CCL versions, so we force the new versions compile "codechicken:CodeChickenLib:${minecraft_version}-${ccl_version}:dev" diff --git a/gradle.properties b/gradle.properties index f556891d..859b1025 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,6 +13,7 @@ ccc_version=1.0.7.46 ccl_version=1.1.3.138 ae2_version=rv1-stable-1 endercore_version=1.7.10-0.1.0.24_beta +ee3_version=1.7.10-0.3.507 forestry_version=forestry_1.7.10:3.6.2.19 toReplace=after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,) diff --git a/src/main/java/crazypants/enderio/EnderIO.java b/src/main/java/crazypants/enderio/EnderIO.java index 79c26c2e..4702e8ee 100644 --- a/src/main/java/crazypants/enderio/EnderIO.java +++ b/src/main/java/crazypants/enderio/EnderIO.java @@ -160,6 +160,7 @@ import crazypants.enderio.teleport.telepad.BlockTelePad; import crazypants.enderio.teleport.telepad.ItemCoordSelector; import crazypants.enderio.thaumcraft.ThaumcraftCompat; import crazypants.enderio.tool.EnderIOCrashCallable; +import crazypants.util.EE3Util; import static crazypants.enderio.EnderIO.*; @Mod(modid = MODID, name = MOD_NAME, version = VERSION, dependencies = "after:endercore;after:MineFactoryReloaded;after:Waila@[1.5.8,);after:Thaumcraft;after:appliedenergistics2@[rv2-beta-8,)", guiFactory = "crazypants.enderio.config.ConfigFactoryEIO") @@ -580,6 +581,7 @@ public class EnderIO { MachineRecipes.addRecipes(); ItemRecipes.addRecipes(); TeleportRecipes.addRecipes(); + EE3Util.registerMiscRecipes(); proxy.load(); } diff --git a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java index 4788bd22..eb148499 100644 --- a/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java +++ b/src/main/java/crazypants/enderio/machine/recipe/BasicManyToOneRecipe.java @@ -8,14 +8,13 @@ import java.util.List; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; import crazypants.enderio.machine.MachineRecipeInput; +import crazypants.util.EE3Util; public class BasicManyToOneRecipe implements IManyToOneRecipe { private final int energyRequired; private final ItemStack output; - private final float expPerItem; - private final RecipeBonusType bonusType; private final Recipe recipe; @@ -23,9 +22,9 @@ public class BasicManyToOneRecipe implements IManyToOneRecipe { public BasicManyToOneRecipe(Recipe recipe) { this.recipe = recipe; this.output = recipe.getOutputs()[0].getOutput().copy(); - expPerItem = recipe.getOutputs()[0].getExperiance(); energyRequired = recipe.getEnergyRequired(); bonusType = recipe.getBonusType(); + EE3Util.registerBasicToManyRecipe(recipe); } @Override diff --git a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java index 0a9a02f5..afc61eaf 100644 --- a/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java +++ b/src/main/java/crazypants/enderio/machine/vat/VatRecipe.java @@ -11,6 +11,7 @@ import crazypants.enderio.machine.recipe.IRecipe; import crazypants.enderio.machine.recipe.RecipeBonusType; import crazypants.enderio.machine.recipe.RecipeInput; import crazypants.enderio.machine.recipe.RecipeOutput; +import crazypants.util.EE3Util; public class VatRecipe implements IRecipe { @@ -53,6 +54,7 @@ public class VatRecipe implements IRecipe { } } + EE3Util.registerVatRecipe(outputFluidStack, inputs); } @Override @@ -91,7 +93,7 @@ public class VatRecipe implements IRecipe { return false; } for (RecipeInput ri : inputs) { - if(item != null && ri.getSlotNumber() == slot && ri.isInput(item)) { + if (ri.getSlotNumber() == slot && ri.isInput(item)) { return true; } } diff --git a/src/main/java/crazypants/enderio/material/MaterialRecipes.java b/src/main/java/crazypants/enderio/material/MaterialRecipes.java index ca465b19..987e0d77 100644 --- a/src/main/java/crazypants/enderio/material/MaterialRecipes.java +++ b/src/main/java/crazypants/enderio/material/MaterialRecipes.java @@ -30,8 +30,10 @@ public class MaterialRecipes { if (hasTin()) { OreDictionary.registerOre("dustTin", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_TIN.ordinal())); } - if (hasEnderPearlDust()) { + if (PowderIngot.POWDER_ENDER.isDependancyMet()) { OreDictionary.registerOre("dustEnderPearl", new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal())); + PowderIngot.POWDER_ENDER.ignoreRuntimeDependencyCheck = true; + // because the line above would trigger it } //Enderium Base if (OreDictionaryHelper.hasEnderium()) { diff --git a/src/main/java/crazypants/enderio/material/PowderIngot.java b/src/main/java/crazypants/enderio/material/PowderIngot.java index 9b6892d0..ab991f39 100644 --- a/src/main/java/crazypants/enderio/material/PowderIngot.java +++ b/src/main/java/crazypants/enderio/material/PowderIngot.java @@ -9,7 +9,7 @@ public enum PowderIngot { POWDER_GOLD("powderGold", null), POWDER_COPPER("powderCopper", INGOT_COPPER), POWDER_TIN("powderTin", INGOT_TIN), - POWDER_ENDER("powderEnder", DUST_ENDERPEARL), + POWDER_ENDER("powderEnder", DUST_ENDERPEARL, true), INGOT_ENDERIUM_BASE("ingotEnderiumBase", INGOT_ENDERIUM), POWDER_OBSIDIAN("powderObsidian", null), FLOUR("dustWheat", null); @@ -26,18 +26,25 @@ public enum PowderIngot { public final String unlocalisedName; public final String iconKey; public final String oreDictDependancy; + public final boolean reverseDependency; + public boolean ignoreRuntimeDependencyCheck = false; - private PowderIngot(String unlocalisedName, String oreDictDependancy) { + private PowderIngot(String unlocalisedName, String oreDictDependancy, boolean reverseDependency) { this.unlocalisedName = "enderio." + unlocalisedName; iconKey = "enderio:" + unlocalisedName; this.oreDictDependancy = oreDictDependancy; + this.reverseDependency = reverseDependency; + } + + private PowderIngot(String unlocalisedName, String oreDictDependancy) { + this(unlocalisedName, oreDictDependancy, false); } public boolean isDependancyMet() { - if (oreDictDependancy == null) { + if (oreDictDependancy == null || ignoreRuntimeDependencyCheck) { return true; } - return isRegistered(oreDictDependancy); + return isRegistered(oreDictDependancy) == !reverseDependency; } } diff --git a/src/main/java/crazypants/util/EE3Util.java b/src/main/java/crazypants/util/EE3Util.java new file mode 100644 index 00000000..0c983964 --- /dev/null +++ b/src/main/java/crazypants/util/EE3Util.java @@ -0,0 +1,206 @@ +package crazypants.util; + +import static crazypants.enderio.material.Material.BINDER_COMPOSITE; +import static crazypants.enderio.material.Material.CONDUIT_BINDER; +import static crazypants.enderio.material.Material.PHASED_IRON_NUGGET; +import static crazypants.enderio.material.Material.SILICON; +import static crazypants.util.RecipeUtil.addShaped; +import static crazypants.util.RecipeUtil.addShapeless; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + +import com.pahimar.ee3.api.exchange.EnergyValueRegistryProxy; +import com.pahimar.ee3.api.exchange.RecipeRegistryProxy; + +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidContainerRegistry; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; +import cpw.mods.fml.common.Loader; +import cpw.mods.fml.common.registry.GameRegistry; +import crazypants.enderio.EnderIO; +import crazypants.enderio.config.Config; +import crazypants.enderio.item.ItemEnderFood.EnderFood; +import crazypants.enderio.machine.recipe.Recipe; +import crazypants.enderio.machine.recipe.RecipeInput; +import crazypants.enderio.material.MachinePart; +import crazypants.enderio.material.PowderIngot; + +public class EE3Util { + + public static final String EE3_ID = "EE3"; + public static final boolean IS_EE3_LOADED = Loader.isModLoaded(EE3_ID); + + public static void registerItemStack(ItemStack itemStack, int emv) { + if (IS_EE3_LOADED) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(itemStack, emv); + } + } + + public static void registerItemStackLike(ItemStack itemStack, ItemStack copyFrom) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, Collections.singletonList(copyFrom)); + } + } + + public static void registerFluidStack(FluidStack fluidStack, int emv) { + if (IS_EE3_LOADED) { + EnergyValueRegistryProxy.addPreAssignedEnergyValue(fluidStack, emv); + } + } + + public static void registerRecipe(ItemStack itemStack, List recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, recipeInputList); + } + } + + public static void registerRecipe(FluidStack fluidStack, List recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(fluidStack, recipeInputList); + } + } + + public static void registerRecipe(ItemStack itemStack, Object... recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(itemStack, Arrays.asList(recipeInputList)); + } + } + + public static void registerRecipe(FluidStack fluidStack, Object... recipeInputList) { + if (IS_EE3_LOADED) { + RecipeRegistryProxy.addRecipe(fluidStack, Arrays.asList(recipeInputList)); + } + } + + // + + /** + * Registers various recipes with EE3. + *

+ * Some of them are ManyToMany recipes (e.g. SAG Mill), others are vanilla + * crafting recipes that fail in EE3 because of too much oreDicting. Those + * ones could be removed after EE3 fixes that. + *

+ * This does not take into account changes the user may have done in the + * recipe xml files. Those are ManyToMany, they contain chances, and they + * don't usually sum up nicely (e.g. coal ore (emc 32) => 8*coal (emc 32) plus + * a chance of coal and coal dust). It is not unreasonable to require the user + * to also change emc values after changing the recipes for our core items. + *

+ * This also ignores OreDict, as it is only about the emc values. For those, + * the base vanilla items are the best source. + */ + public static void registerMiscRecipes() { + if (IS_EE3_LOADED) { + ItemStack basicGear = new ItemStack(EnderIO.itemMachinePart, 1, MachinePart.BASIC_GEAR.ordinal()); + ItemStack stick4 = new ItemStack(Items.stick, 4); + ItemStack cobble4 = new ItemStack(Blocks.cobblestone, 4); + registerRecipe(basicGear, stick4, cobble4); + + ItemStack flour10 = new ItemStack(EnderIO.itemPowderIngot, 10, PowderIngot.FLOUR.ordinal()); + ItemStack wheat5 = new ItemStack(Items.wheat, 5); + ItemStack seeds1 = new ItemStack(Items.wheat_seeds, 1); + registerRecipe(flour10, wheat5, seeds1); + + ItemStack enderios = EnderFood.ENDERIOS.getStack(); + ItemStack bowl = new ItemStack(Items.bowl, 1); + ItemStack wheat = new ItemStack(Items.wheat, 1); + ItemStack milkb = new ItemStack(Items.milk_bucket, 1); + FluidStack milk = FluidContainerRegistry.getFluidForFilledItem(milkb); + ItemStack dustEnderPearl = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_ENDER.ordinal()); + if (milk != null) { + registerRecipe(enderios, bowl, milk, wheat, dustEnderPearl); + } else { + registerRecipe(enderios, bowl, milkb, wheat, dustEnderPearl); + } + + ItemStack dustCoal = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_COAL.ordinal()); + ItemStack coal = new ItemStack(Items.coal, 1); + registerRecipe(dustCoal, coal); + + ItemStack dustIron = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_IRON.ordinal()); + ItemStack iron = new ItemStack(Items.iron_ingot, 1); + registerRecipe(dustIron, iron); + + ItemStack dustGold = new ItemStack(EnderIO.itemPowderIngot, 1, PowderIngot.POWDER_GOLD.ordinal()); + ItemStack gold = new ItemStack(Items.gold_ingot, 1); + registerRecipe(dustGold, gold); + + ItemStack dustObsidian4 = new ItemStack(EnderIO.itemPowderIngot, 4, PowderIngot.POWDER_OBSIDIAN.ordinal()); + ItemStack obsidian = new ItemStack(Blocks.obsidian, 1); + registerRecipe(dustObsidian4, obsidian); + + ItemStack enderDust9 = new ItemStack(EnderIO.itemPowderIngot, 9, PowderIngot.POWDER_ENDER.ordinal()); + ItemStack enderPearl = new ItemStack(Items.ender_pearl); + registerRecipe(enderDust9, enderPearl); + + ItemStack cbc8 = BINDER_COMPOSITE.getStack(8); + ItemStack sand2 = new ItemStack(Blocks.sand, 2); + ItemStack gravel5 = new ItemStack(Blocks.gravel, 5); + ItemStack gravel6 = new ItemStack(Blocks.gravel, 6); + ItemStack clay_ball2 = new ItemStack(Items.clay_ball, 2); + ItemStack clay_ball1 = new ItemStack(Items.clay_ball, 1); + if (Config.useAlternateBinderRecipe) { + registerRecipe(cbc8, gravel5, clay_ball2, sand2); + } else { + registerRecipe(cbc8, gravel6, clay_ball1, sand2); + } + registerRecipe(cbc8, gravel6, clay_ball1, sand2); + ItemStack cbc = BINDER_COMPOSITE.getStack(); + ItemStack binder4 = CONDUIT_BINDER.getStack(4); + registerRecipe(binder4, cbc); + + ItemStack silicon = SILICON.getStack(1); + registerRecipe(silicon, sand2); + + int numConduits = Config.numConduitsPerRecipe; + ItemStack phasedIronNugget3 = PHASED_IRON_NUGGET.getStack(3); + ItemStack binder6 = CONDUIT_BINDER.getStack(6); + ItemStack itemConduit = new ItemStack(EnderIO.itemItemConduit, numConduits, 0); + registerRecipe(itemConduit, phasedIronNugget3, binder6); + + } + + } + + public static void registerVatRecipe(FluidStack outputFluidStack, RecipeInput[] inputs) { + if (IS_EE3_LOADED) { + for (RecipeInput r0 : inputs) { + if (!r0.isFluid() && r0.getSlotNumber() == 0) { + for (RecipeInput r1 : inputs) { + if (!r1.isFluid() && r1.getSlotNumber() == 1) { + for (RecipeInput r2 : inputs) { + if (r2.isFluid()) { + float im = r0.getMulitplier() * r1.getMulitplier(); + FluidStack in = r2.getFluidInput().copy(); + in.amount = Math.round(FluidContainerRegistry.BUCKET_VOLUME * im); + FluidStack out = outputFluidStack.copy(); + out.amount = Math.round(im * r2.getMulitplier() * FluidContainerRegistry.BUCKET_VOLUME); + registerRecipe(out, r0.getInput().copy(), r1.getInput().copy(), in); + } + } + } + } + } + } + } + } + + public static void registerBasicToManyRecipe(Recipe recipe) { + if (IS_EE3_LOADED) { + List in = new ArrayList(); + for (RecipeInput r0 : recipe.getInputs()) { + in.add(r0.getInput().copy()); + } + registerRecipe(recipe.getOutputs()[0].getOutput().copy(), in); + } + } + +}