diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
3 files changed, 67 insertions, 11 deletions
diff --git a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java index 41181d858c..195b6deaa5 100644 --- a/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java +++ b/src/main/java/goodgenerator/loader/ComponentAssemblyLineMiscRecipes.java @@ -7,6 +7,7 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.google.common.collect.HashBiMap; import cpw.mods.fml.common.registry.GameRegistry; +import goodgenerator.util.StackUtils; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -211,7 +212,7 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - CI.getAlternativeTieredFluid(t, 144 * t), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_LuV.get(1), @@ -237,7 +238,7 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - CI.getAlternativeTieredFluid(t, 144 * t), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_ZPM.get(1), @@ -263,7 +264,7 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - CI.getAlternativeTieredFluid(t, 144 * t), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UV.get(1), @@ -291,8 +292,8 @@ public class ComponentAssemblyLineMiscRecipes { }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), - Materials.Naquadria.getMolten(144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UHV.get(1), @@ -321,8 +322,8 @@ public class ComponentAssemblyLineMiscRecipes { }, new FluidStack[] { new FluidStack(sold, 144 * t * 4), - Materials.Quantium.getMolten(144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UEV.get(1), @@ -351,7 +352,7 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t, 144 * t * 2), - CI.getAlternativeTieredFluid(t - 1, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UIV.get(1), @@ -380,7 +381,7 @@ public class ComponentAssemblyLineMiscRecipes { new FluidStack[] { new FluidStack(sold, 144 * t * 4), CI.getTieredFluid(t - 1, 144 * t * 2), - CI.getAlternativeTieredFluid(t - 2, 144 * t * 2), + StackUtils.getTieredFluid(t, 144 * t), Materials.Lubricant.getFluid(1000 * (t - 2)) }, Compassline_Casing_UMV.get(1), @@ -395,26 +396,35 @@ public class ComponentAssemblyLineMiscRecipes { private static void generateWrapRecipes() { for (int i = 0; i <= 10; i++) { GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {getCircuit(i, 16)}, + new ItemStack[] {getCircuit(i, 16), GT_Utility.getIntegratedCircuit(16)}, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, i), 30 * 20, 30); } GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GameRegistry.findItemStack("dreamcraft", "item.NanoCircuit", 16)}, + new ItemStack[] { + GameRegistry.findItemStack("dreamcraft", "item.NanoCircuit", 16), + GT_Utility.getIntegratedCircuit(16) + }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 11), 30 * 20, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16)}, + new ItemStack[] { + GameRegistry.findItemStack("dreamcraft", "item.PikoCircuit", 16), + GT_Utility.getIntegratedCircuit(16) + }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 12), 30 * 20, 30); GT_Values.RA.addAssemblerRecipe( - new ItemStack[] {GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16)}, + new ItemStack[] { + GameRegistry.findItemStack("dreamcraft", "item.QuantumCircuit", 16), + GT_Utility.getIntegratedCircuit(16) + }, Materials.SolderingAlloy.getMolten(72L), new ItemStack(Loaders.circuitWrap, 1, 13), 30 * 20, diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index 01f570adf0..088e96693d 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1577,5 +1577,7 @@ public class RecipeLoader { public static void Fixer() { MaterialFix.MaterialFluidExtractionFix(MyMaterial.atomicSeparationCatalyst); MaterialFix.MaterialFluidExtractionFix(MyMaterial.extremelyUnstableNaquadah); + MaterialFix.MaterialFluidExtractionFix(MyMaterial.metastableOganesson); + MaterialFix.MaterialFluidExtractionFix(MyMaterial.shirabon); } } diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index c520800538..3c973b208a 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -22,6 +22,7 @@ import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import net.minecraftforge.oredict.OreDictionary; +@SuppressWarnings("deprecation") public class RecipeLoader_02 { public static void RecipeLoad() { @@ -87,6 +88,12 @@ public class RecipeLoader_02 { CrackRecipeAdder.reAddBlastRecipe(MyMaterial.dalisenite, 800, 491520, 8700, true); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.hikarium, 1200, 30720, 5400, true); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.tairitsu, 1200, 1966080, 7400, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.preciousMetalAlloy, 2400, 7864320, 10000, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.enrichedNaquadahAlloy, 2400, 7864320, 11000, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.metastableOganesson, 600, 7864320, 12000, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.shirabon, 600, 31457280, 13000, true); + + GT_ModHandler.removeFurnaceSmelting(MyMaterial.dalisenite.get(OrePrefixes.dust)); // :doom: GT_Values.RA.addVacuumFreezerRecipe( MyMaterial.dalisenite.get(OrePrefixes.ingotHot, 1), @@ -94,6 +101,12 @@ public class RecipeLoader_02 { 315, 120); + GT_Values.RA.addVacuumFreezerRecipe( + MyMaterial.shirabon.get(OrePrefixes.ingotHot, 1), + MyMaterial.shirabon.get(OrePrefixes.ingot, 1), + 2400, + 1966080); + GT_Values.RA.addAssemblerRecipe( new ItemStack[] { MyMaterial.zircaloy4.get(OrePrefixes.plate, 4), @@ -1854,6 +1867,37 @@ public class RecipeLoader_02 { MyMaterial.lumiium.get(OrePrefixes.dust, 1), 240, 120); + + GT_Values.RA.addFusionReactorRecipe( + MyMaterial.enrichedNaquadahAlloy.getMolten(144), + WerkstoffLoader.Oganesson.getFluidOrGas(250), + MyMaterial.metastableOganesson.getMolten(36), + 600, + 491520, + 1000000000); + + MyRecipeAdder.instance.addNeutronActivatorRecipe( + null, + new ItemStack[] {MyMaterial.metastableOganesson.get(OrePrefixes.dust)}, + new FluidStack[] {WerkstoffLoader.Oganesson.getFluidOrGas(250)}, + null, + 2000, + 1100, + 1000); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[] {ItemRefer.HiC_T5.get(0)}, + new FluidStack[] { + MyMaterial.metastableOganesson.getMolten(1152), + MyMaterial.preciousMetalAlloy.getMolten(2304), + Materials.SpaceTime.getMolten(288), + Materials.DimensionallyTranscendentResidue.getFluid(5000) + }, + new ItemStack[] {}, + new FluidStack[] {MyMaterial.shirabon.getMolten(144)}, + 200, + 1500000000, + 13500); } public static void FinishLoadRecipe() { |