diff --git a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java index 55a01eb60..bacee6a59 100644 --- a/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java +++ b/src/main/java/com/dreammaster/gthandler/recipes/SpaceAssemblerRecipes.java @@ -2,10 +2,14 @@ import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; +import static gregtech.api.enums.Mods.Avaritia; +import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.GTNHIntergalactic; import static gregtech.api.enums.Mods.IndustrialCraft2; import static gregtech.api.enums.Mods.OpenComputers; import static gregtech.api.enums.Mods.SuperSolarPanels; +import static gregtech.api.enums.Mods.Thaumcraft; +import static gregtech.api.enums.Mods.ThaumicEnergistics; import static gregtech.api.util.GTModHandler.getModItem; import static gregtech.api.util.GTRecipeBuilder.MINUTES; import static gregtech.api.util.GTRecipeBuilder.SECONDS; @@ -383,6 +387,22 @@ public void run() { (int) TierEU.RECIPE_UXV, null, null); + + // Digital Singularity ME Storage Cell + IG_RecipeAdder.addSpaceAssemblerRecipe( + new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1), + getModItem(AppliedEnergistics2.ID, "item.ItemMultiMaterial", 12, 60), + ItemList.Quantum_Chest_IV.get(8L), + GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), + getModItem(Avaritia.ID, "Resource", 4, 5), + GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) }, + new FluidStack[] { new FluidStack(solderUEV, 2304) }, + getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_UHV, + null, + null); } if (AE2FluidCraft.isModLoaded()) { // Artificial Fluid Universe Cell @@ -400,6 +420,42 @@ public void run() { (int) TierEU.RECIPE_UXV, null, null); + + // ME Fluid Digital Singularity Storage Cell + IG_RecipeAdder.addSpaceAssemblerRecipe( + new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1), + new ItemStack(Loaders.yottaFluidTankCell, 4, 6), + getModItem(AE2FluidCraft.ID, "fluid_part", 8, 7), ItemList.Quantum_Tank_IV.get(8L), + GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), + getModItem(Avaritia.ID, "Resource", 4, 5), + GTOreDictUnificator.get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) }, + new FluidStack[] { new FluidStack(solderUEV, 2304) }, + getModItem(AE2FluidCraft.ID, "fluid_storage.singularity", 1, 0), + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_UHV, + null, + null); + + // ME Essentia Digital Singularity Storage Cell + if (ThaumicEnergistics.isModLoaded()) { + IG_RecipeAdder + .addSpaceAssemblerRecipe( + new ItemStack[] { getModItem(EternalSingularity.ID, "eternal_singularity", 1), + getModItem(ThaumicEnergistics.ID, "storage.component", 12, 8), + getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 8, 0), + GTOreDictUnificator.get(OrePrefixes.block, Materials.Infinity, 4L), + getModItem(Avaritia.ID, "Resource", 4, 5), + GTOreDictUnificator + .get(OrePrefixes.block, Materials.CosmicNeutronium, 12L) }, + new FluidStack[] { new FluidStack(solderUEV, 2304) }, + getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10), + 1, + 10 * SECONDS, + (int) TierEU.RECIPE_UHV, + null, + null); + } } } } diff --git a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java index 24640c97e..728ac161a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAE2FC.java @@ -2,7 +2,6 @@ import static gregtech.api.enums.Mods.AE2FluidCraft; import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.GTPlusPlus; import static gregtech.api.enums.Mods.GoodGenerator; @@ -719,32 +718,6 @@ public void loadRecipes() { COMPONENT_16384, 'e', AE2FC_ADVANCED_FLUID_STORAGE_HOUSING); - // ME Digital Singularity - ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( - AE2FC_SINGULARITY_CELL, - "----a----", - "---aba---", - "--ecdce--", - "-acdgdca-", - "abdgfgdba", - "-acdgdca-", - "--ecdce--", - "---aba---", - "----a----", - 'a', - "blockCosmicNeutronium", - 'b', - getModItem(Avaritia.ID, "Resource", 1, 5), - 'c', - ItemList.Quantum_Tank_IV.get(1L), - 'd', - COMPONENT_16384, - 'e', - "blockInfinity", - 'f', - getModItem(EternalSingularity.ID, "eternal_singularity", 1), - 'g', - T7_YOT); // level maintainer addShapedRecipe( diff --git a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java index edc0f4d40..e2051752a 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java +++ b/src/main/java/com/dreammaster/scripts/ScriptAppliedEnergistics2.java @@ -472,31 +472,6 @@ public void loadRecipes() { 'e', AE2_ADVANCED_HOUSING); - // ME Digital Singularity - ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( - getModItem(AppliedEnergistics2.ID, "item.ItemExtremeStorageCell.Singularity", 1), - "----a----", - "---aba---", - "--ecdce--", - "-acdddca-", - "abddfddba", - "-acdddca-", - "--ecdce--", - "---aba---", - "----a----", - 'a', - "blockCosmicNeutronium", - 'b', - getModItem(Avaritia.ID, "Resource", 1, 5), - 'c', - ItemList.Quantum_Chest_IV.get(1L), - 'd', - components[3], - 'e', - "blockInfinity", - 'f', - getModItem(EternalSingularity.ID, "eternal_singularity", 1)); - // ME Singularity crafting storage ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( getModItem(AppliedEnergistics2.ID, "tile.BlockSingularityCraftingStorage", 1), diff --git a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java index 749426107..974290cc2 100644 --- a/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java +++ b/src/main/java/com/dreammaster/scripts/ScriptThaumicEnergistics.java @@ -2,7 +2,6 @@ import static gregtech.api.enums.Mods.AE2Stuff; import static gregtech.api.enums.Mods.AppliedEnergistics2; -import static gregtech.api.enums.Mods.Avaritia; import static gregtech.api.enums.Mods.BartWorks; import static gregtech.api.enums.Mods.EternalSingularity; import static gregtech.api.enums.Mods.Gadomancy; @@ -111,7 +110,7 @@ public void loadRecipes() { getModItem(Gadomancy.ID, "BlockEssentiaCompressor", 1) }; // ItemStacks for in/out - ItemStack SingularityDrive = getModItem(EternalSingularity.ID, "eternal_singularity", 1); + ItemStack DigitalSingularity = getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10); // Creative Essentia Cell ItemStack CEC = EssentialCellCreative; @@ -121,7 +120,7 @@ public void loadRecipes() { 10, new AspectList().add(Aspect.AIR, 2000).add(Aspect.FIRE, 2000).add(Aspect.ORDER, 2000) .add(Aspect.ENTROPY, 2000).add(Aspect.EARTH, 2000).add(Aspect.WATER, 2000), - SingularityDrive, + DigitalSingularity, CECInfusionItems); GTValues.RA.stdBuilder() @@ -1381,30 +1380,6 @@ public void loadRecipes() { EssentialComponent16384K, 'e', getModItem(ThaumicEnergistics.ID, "storage.casing", 1, 0, missing)); - // ME Digital Singularity - ExtremeCraftingManager.getInstance().addExtremeShapedOreRecipe( - getModItem(ThaumicEnergistics.ID, "storage.essentia", 1, 10, missing), - "----a----", - "---aba---", - "--ecdce--", - "-acdddca-", - "abddfddba", - "-acdddca-", - "--ecdce--", - "---aba---", - "----a----", - 'a', - "blockCosmicNeutronium", - 'b', - getModItem(Avaritia.ID, "Resource", 1, 5), - 'c', - getModItem(Thaumcraft.ID, "blockEssentiaReservoir", 1, 0, missing), - 'd', - EssentialComponent16384K, - 'e', - "blockInfinity", - 'f', - getModItem(EternalSingularity.ID, "eternal_singularity", 1)); ThaumcraftApi.addArcaneCraftingRecipe( "thaumicenergistics.TESTORAGE",