Merge pull request #1546 from leagris/fix-1545
fix #1545 GT_MachineRecipeLoader run() method too big
This commit is contained in:
Alkalus
GitHub
commit
2f5bf6eda1
1 changed files with 1332 additions and 1331 deletions
|
|
@ -1586,183 +1586,6 @@ if(Loader.isModLoaded("Railcraft")){
|
||||||
}
|
}
|
||||||
run2();
|
run2();
|
||||||
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.cobblestone), GT_ModHandler.getMaceratorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L));
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lapis, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
|
||||||
|
|
||||||
if(GregTech_API.mMagneticraft && GT_Mod.gregtechproxy.mMagneticraftRecipes){
|
|
||||||
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 8));
|
|
||||||
GT_Values.RA.addAlloySmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.WroughtIron, 1), GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 1), 600, 24);
|
|
||||||
GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenCarbide, 1), null, null, GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 8), null, 100, 120, 2600);
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 4));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 4));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 4));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 13));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 13));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 13));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 15));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 15));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 15));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 16));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 16));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 16));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 21));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 21));
|
|
||||||
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 21));
|
|
||||||
}
|
|
||||||
|
|
||||||
for (MaterialStack[] tMats : this.mAlloySmelterList) {
|
|
||||||
ItemStack tDust1 = GT_OreDictUnificator.get(OrePrefixes.dust, tMats[0].mMaterial, tMats[0].mAmount);
|
|
||||||
ItemStack tDust2 = GT_OreDictUnificator.get(OrePrefixes.dust, tMats[1].mMaterial, tMats[1].mAmount);
|
|
||||||
ItemStack tIngot1 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[0].mMaterial, tMats[0].mAmount);
|
|
||||||
ItemStack tIngot2 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[1].mMaterial, tMats[1].mAmount);
|
|
||||||
ItemStack tOutputIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[2].mMaterial, tMats[2].mAmount);
|
|
||||||
if (tOutputIngot != GT_Values.NI) {
|
|
||||||
GT_ModHandler.addAlloySmelterRecipe(tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
|
||||||
GT_ModHandler.addAlloySmelterRecipe(tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
|
||||||
GT_ModHandler.addAlloySmelterRecipe(tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
|
||||||
GT_ModHandler.addAlloySmelterRecipe(tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if(!GregTech_API.mIC2Classic){
|
|
||||||
try {
|
|
||||||
Map<String, HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager.getHeatExchangeProperties();
|
|
||||||
Iterator<Map.Entry<String, HeatExchangeProperty>> tIterator = tLiqExchange.entrySet().iterator();
|
|
||||||
while (tIterator.hasNext()) {
|
|
||||||
Map.Entry<String, HeatExchangeProperty> tEntry = tIterator.next();
|
|
||||||
if(tEntry.getKey().equals("ic2hotcoolant")){
|
|
||||||
tIterator.remove();
|
|
||||||
Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 100);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Throwable e) {/*Do nothing*/}
|
|
||||||
|
|
||||||
try {
|
|
||||||
Map<String, HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager.getHeatExchangeProperties();
|
|
||||||
Iterator<Map.Entry<String, HeatExchangeProperty>> tIterator = tLiqExchange.entrySet().iterator();
|
|
||||||
while (tIterator.hasNext()) {
|
|
||||||
Map.Entry<String, HeatExchangeProperty> tEntry = tIterator.next();
|
|
||||||
if(tEntry.getKey().equals("ic2coolant")){
|
|
||||||
tIterator.remove();
|
|
||||||
Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 100);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (Throwable e) {/*Do nothing*/}
|
|
||||||
}
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_Ferru.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
|
||||||
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_Aurelia.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
|
||||||
|
|
||||||
ItemStack tCrop;
|
|
||||||
// Metals Line
|
|
||||||
tCrop = ItemList.Crop_Drop_Coppon.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Copper, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Tetrahedrite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Chalcopyrite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Malachite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Pyrite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Stibnite, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Tine.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Tin, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Cassiterite, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Plumbilia.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Lead, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Galena, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Ferru.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Iron, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Magnetite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.BrownLimonite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.YellowLimonite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.VanadiumMagnetite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.BandedIron, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Pyrite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.MeteoricIron, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Nickel.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Nickel, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Garnierite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Pentlandite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Cobaltite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Wulfenite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Powellite, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Zinc.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Zinc, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Sphalerite, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Sulfur, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Argentia.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Silver, 100, true);
|
|
||||||
tCrop = ItemList.Crop_Drop_Aurelia.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Gold, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Magnetite, Materials.Gold, 100, false);
|
|
||||||
|
|
||||||
// Rare Metals Line
|
|
||||||
tCrop = ItemList.Crop_Drop_Bauxite.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Aluminium,60, true);
|
|
||||||
addProcess(tCrop,Materials.Bauxite,100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Manganese.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Manganese,30, true);
|
|
||||||
addProcess(tCrop,Materials.Grossular,100, false);
|
|
||||||
addProcess(tCrop,Materials.Spessartine,100, false);
|
|
||||||
addProcess(tCrop,Materials.Pyrolusite,100, false);
|
|
||||||
addProcess(tCrop,Materials.Tantalite,100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Titanium,100, true);
|
|
||||||
addProcess(tCrop,Materials.Ilmenite,100, false);
|
|
||||||
addProcess(tCrop,Materials.Bauxite,100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Scheelite.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Scheelite,100, true);
|
|
||||||
addProcess(tCrop,Materials.Tungstate,100, false);
|
|
||||||
addProcess(tCrop,Materials.Lithium,100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Platinum.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Platinum,40, true);
|
|
||||||
addProcess(tCrop,Materials.Cooperite,40, false);
|
|
||||||
addProcess(tCrop,Materials.Palladium,40, false);
|
|
||||||
addProcess(tCrop, Materials.Neodymium, 100, false);
|
|
||||||
addProcess(tCrop, Materials.Bastnasite, 100, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Iridium.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Iridium,20, true);
|
|
||||||
tCrop = ItemList.Crop_Drop_Osmium.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Osmium,20, true);
|
|
||||||
|
|
||||||
// Radioactive Line
|
|
||||||
tCrop = ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Pitchblende,50, true);
|
|
||||||
tCrop = ItemList.Crop_Drop_Uraninite.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Uraninite,50, false);
|
|
||||||
addProcess(tCrop,Materials.Uranium,50, true);
|
|
||||||
addProcess(tCrop,Materials.Pitchblende,50, false);
|
|
||||||
addProcess(tCrop,Materials.Uranium235,50, false);
|
|
||||||
tCrop = ItemList.Crop_Drop_Thorium.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Thorium,50, true);
|
|
||||||
tCrop = ItemList.Crop_Drop_Naquadah.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop,Materials.Naquadah,10, true);
|
|
||||||
addProcess(tCrop,Materials.NaquadahEnriched,10, false);
|
|
||||||
addProcess(tCrop,Materials.Naquadria,10, false);
|
|
||||||
|
|
||||||
//Gem Line
|
|
||||||
tCrop = ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[0]);
|
|
||||||
addProcess(tCrop, Materials.Emerald, 100, true);
|
|
||||||
addProcess(tCrop, Materials.Beryllium, 100, false);
|
|
||||||
|
|
||||||
if (!GT_Mod.gregtechproxy.mDisableOldChemicalRecipes) {
|
|
||||||
addOldChemicalRecipes();
|
|
||||||
} else if (GT_Mod.gregtechproxy.mMoreComplicatedChemicalRecipes) {
|
|
||||||
GT_Values.RA.addChemicalRecipe(Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1), Materials.SodiumSulfide.getDust(3), 60);
|
|
||||||
GT_Values.RA.addChemicalRecipe(Materials.HydricSulfide.getCells(1), GT_Values.NI, Materials.Water.getFluid(1000), Materials.DilutedSulfuricAcid.getFluid(2000), Materials.Empty.getCells(1), 60);
|
|
||||||
GT_Values.RA.addChemicalRecipe(Materials.Water.getCells(1), GT_Values.NI, Materials.HydricSulfide.getGas(1000), Materials.DilutedSulfuricAcid.getFluid(2000), Materials.Empty.getCells(1), 60);
|
|
||||||
}
|
|
||||||
addChemicalRecipesShared();
|
|
||||||
if (GT_Mod.gregtechproxy.mMoreComplicatedChemicalRecipes) {
|
|
||||||
addChemicalRecipesComplicated();
|
|
||||||
} else {
|
|
||||||
addChemicalRecipesSimple();
|
|
||||||
}
|
|
||||||
GT_Values.RA.addAutoclaveRecipe(Materials.SiliconDioxide.getDust(1), Materials.Water.getFluid(200L), Materials.Quartzite.getGems(1), 750, 2000, 24);
|
|
||||||
GT_Values.RA.addAutoclaveRecipe(Materials.SiliconDioxide.getDust(1), GT_ModHandler.getDistilledWater(200L), Materials.Quartzite.getGems(1), 1000, 1500, 24);
|
|
||||||
|
|
||||||
addRecipesMay2017OilRefining();
|
|
||||||
addPyrometallurgicalRecipes();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void addProcess(ItemStack tCrop, Materials aMaterial, int chance, boolean aMainOutput) {
|
public void addProcess(ItemStack tCrop, Materials aMaterial, int chance, boolean aMainOutput) {
|
||||||
|
|
@ -2738,6 +2561,184 @@ if(Loader.isModLoaded("Railcraft")){
|
||||||
ItemList.Transformer_MAX_UV.get(1L),
|
ItemList.Transformer_MAX_UV.get(1L),
|
||||||
ItemList.Machine_DigitalTransformer_UV.get(2L),
|
ItemList.Machine_DigitalTransformer_UV.get(2L),
|
||||||
ItemList.Cover_Screen.get(1L)}, OrePrefixes.circuit.get(Materials.Infinite), 4, GT_Values.NF, ItemList.Machine_DigitalTransformer_MAX.get(1L), 50, 1920);
|
ItemList.Cover_Screen.get(1L)}, OrePrefixes.circuit.get(Materials.Infinite), 4, GT_Values.NF, ItemList.Machine_DigitalTransformer_MAX.get(1L), 50, 1920);
|
||||||
|
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(new ItemStack(Blocks.cobblestone), GT_ModHandler.getMaceratorRecipeList(), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Stone, 1L));
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.gem, Materials.Lapis, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), GT_ModHandler.getMaceratorRecipeList(), ItemList.IC2_Plantball.get(1L, new Object[0]));
|
||||||
|
|
||||||
|
if(GregTech_API.mMagneticraft && GT_Mod.gregtechproxy.mMagneticraftRecipes){
|
||||||
|
GT_ModHandler.removeRecipeByOutput(GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 8));
|
||||||
|
GT_Values.RA.addAlloySmelterRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.WroughtIron, 1), GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 1), 600, 24);
|
||||||
|
GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Coal, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenCarbide, 1), null, null, GT_ModHandler.getModItem("Magneticraft", "item.ingotCarbide", 8), null, 100, 120, 2600);
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 4));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 4));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 4));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 13));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 13));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 13));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 15));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 15));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 15));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 16));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 16));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 16));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.chunks", 1, 21));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.pebbles", 1, 21));
|
||||||
|
GT_ModHandler.removeFurnaceSmelting(GT_ModHandler.getModItem("Magneticraft", "item.rubble", 1, 21));
|
||||||
|
}
|
||||||
|
|
||||||
|
for (MaterialStack[] tMats : this.mAlloySmelterList) {
|
||||||
|
ItemStack tDust1 = GT_OreDictUnificator.get(OrePrefixes.dust, tMats[0].mMaterial, tMats[0].mAmount);
|
||||||
|
ItemStack tDust2 = GT_OreDictUnificator.get(OrePrefixes.dust, tMats[1].mMaterial, tMats[1].mAmount);
|
||||||
|
ItemStack tIngot1 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[0].mMaterial, tMats[0].mAmount);
|
||||||
|
ItemStack tIngot2 = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[1].mMaterial, tMats[1].mAmount);
|
||||||
|
ItemStack tOutputIngot = GT_OreDictUnificator.get(OrePrefixes.ingot, tMats[2].mMaterial, tMats[2].mAmount);
|
||||||
|
if (tOutputIngot != GT_Values.NI) {
|
||||||
|
GT_ModHandler.addAlloySmelterRecipe(tIngot1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
||||||
|
GT_ModHandler.addAlloySmelterRecipe(tIngot1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
||||||
|
GT_ModHandler.addAlloySmelterRecipe(tDust1, tIngot2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
||||||
|
GT_ModHandler.addAlloySmelterRecipe(tDust1, tDust2, tOutputIngot, (int) tMats[2].mAmount * 50, 16, false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!GregTech_API.mIC2Classic){
|
||||||
|
try {
|
||||||
|
Map<String, HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidCooldownManager.getHeatExchangeProperties();
|
||||||
|
Iterator<Map.Entry<String, HeatExchangeProperty>> tIterator = tLiqExchange.entrySet().iterator();
|
||||||
|
while (tIterator.hasNext()) {
|
||||||
|
Map.Entry<String, HeatExchangeProperty> tEntry = tIterator.next();
|
||||||
|
if(tEntry.getKey().equals("ic2hotcoolant")){
|
||||||
|
tIterator.remove();
|
||||||
|
Recipes.liquidCooldownManager.addFluid("ic2hotcoolant", "ic2coolant", 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {/*Do nothing*/}
|
||||||
|
|
||||||
|
try {
|
||||||
|
Map<String, HeatExchangeProperty> tLiqExchange = ic2.api.recipe.Recipes.liquidHeatupManager.getHeatExchangeProperties();
|
||||||
|
Iterator<Map.Entry<String, HeatExchangeProperty>> tIterator = tLiqExchange.entrySet().iterator();
|
||||||
|
while (tIterator.hasNext()) {
|
||||||
|
Map.Entry<String, HeatExchangeProperty> tEntry = tIterator.next();
|
||||||
|
if(tEntry.getKey().equals("ic2coolant")){
|
||||||
|
tIterator.remove();
|
||||||
|
Recipes.liquidHeatupManager.addFluid("ic2coolant", "ic2hotcoolant", 100);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (Throwable e) {/*Do nothing*/}
|
||||||
|
}
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_BobsYerUncleRanks.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_Ferru.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
||||||
|
GT_Utility.removeSimpleIC2MachineRecipe(ItemList.Crop_Drop_Aurelia.get(1L, new Object[0]), GT_ModHandler.getExtractorRecipeList(), null);
|
||||||
|
|
||||||
|
ItemStack tCrop;
|
||||||
|
// Metals Line
|
||||||
|
tCrop = ItemList.Crop_Drop_Coppon.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Copper, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Tetrahedrite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Chalcopyrite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Malachite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Pyrite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Stibnite, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Tine.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Tin, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Cassiterite, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Plumbilia.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Lead, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Galena, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Ferru.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Iron, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Magnetite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.BrownLimonite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.YellowLimonite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.VanadiumMagnetite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.BandedIron, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Pyrite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.MeteoricIron, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Nickel.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Nickel, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Garnierite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Pentlandite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Cobaltite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Wulfenite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Powellite, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Zinc.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Zinc, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Sphalerite, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Sulfur, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Argentia.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Silver, 100, true);
|
||||||
|
tCrop = ItemList.Crop_Drop_Aurelia.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Gold, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Magnetite, Materials.Gold, 100, false);
|
||||||
|
|
||||||
|
// Rare Metals Line
|
||||||
|
tCrop = ItemList.Crop_Drop_Bauxite.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Aluminium,60, true);
|
||||||
|
addProcess(tCrop,Materials.Bauxite,100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Manganese.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Manganese,30, true);
|
||||||
|
addProcess(tCrop,Materials.Grossular,100, false);
|
||||||
|
addProcess(tCrop,Materials.Spessartine,100, false);
|
||||||
|
addProcess(tCrop,Materials.Pyrolusite,100, false);
|
||||||
|
addProcess(tCrop,Materials.Tantalite,100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Ilmenite.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Titanium,100, true);
|
||||||
|
addProcess(tCrop,Materials.Ilmenite,100, false);
|
||||||
|
addProcess(tCrop,Materials.Bauxite,100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Scheelite.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Scheelite,100, true);
|
||||||
|
addProcess(tCrop,Materials.Tungstate,100, false);
|
||||||
|
addProcess(tCrop,Materials.Lithium,100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Platinum.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Platinum,40, true);
|
||||||
|
addProcess(tCrop,Materials.Cooperite,40, false);
|
||||||
|
addProcess(tCrop,Materials.Palladium,40, false);
|
||||||
|
addProcess(tCrop, Materials.Neodymium, 100, false);
|
||||||
|
addProcess(tCrop, Materials.Bastnasite, 100, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Iridium.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Iridium,20, true);
|
||||||
|
tCrop = ItemList.Crop_Drop_Osmium.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Osmium,20, true);
|
||||||
|
|
||||||
|
// Radioactive Line
|
||||||
|
tCrop = ItemList.Crop_Drop_Pitchblende.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Pitchblende,50, true);
|
||||||
|
tCrop = ItemList.Crop_Drop_Uraninite.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Uraninite,50, false);
|
||||||
|
addProcess(tCrop,Materials.Uranium,50, true);
|
||||||
|
addProcess(tCrop,Materials.Pitchblende,50, false);
|
||||||
|
addProcess(tCrop,Materials.Uranium235,50, false);
|
||||||
|
tCrop = ItemList.Crop_Drop_Thorium.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Thorium,50, true);
|
||||||
|
tCrop = ItemList.Crop_Drop_Naquadah.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop,Materials.Naquadah,10, true);
|
||||||
|
addProcess(tCrop,Materials.NaquadahEnriched,10, false);
|
||||||
|
addProcess(tCrop,Materials.Naquadria,10, false);
|
||||||
|
|
||||||
|
//Gem Line
|
||||||
|
tCrop = ItemList.Crop_Drop_BobsYerUncleRanks.get(1, new Object[0]);
|
||||||
|
addProcess(tCrop, Materials.Emerald, 100, true);
|
||||||
|
addProcess(tCrop, Materials.Beryllium, 100, false);
|
||||||
|
|
||||||
|
if (!GT_Mod.gregtechproxy.mDisableOldChemicalRecipes) {
|
||||||
|
addOldChemicalRecipes();
|
||||||
|
} else if (GT_Mod.gregtechproxy.mMoreComplicatedChemicalRecipes) {
|
||||||
|
GT_Values.RA.addChemicalRecipe(Materials.Sodium.getDust(2), Materials.Sulfur.getDust(1), Materials.SodiumSulfide.getDust(3), 60);
|
||||||
|
GT_Values.RA.addChemicalRecipe(Materials.HydricSulfide.getCells(1), GT_Values.NI, Materials.Water.getFluid(1000), Materials.DilutedSulfuricAcid.getFluid(2000), Materials.Empty.getCells(1), 60);
|
||||||
|
GT_Values.RA.addChemicalRecipe(Materials.Water.getCells(1), GT_Values.NI, Materials.HydricSulfide.getGas(1000), Materials.DilutedSulfuricAcid.getFluid(2000), Materials.Empty.getCells(1), 60);
|
||||||
|
}
|
||||||
|
addChemicalRecipesShared();
|
||||||
|
if (GT_Mod.gregtechproxy.mMoreComplicatedChemicalRecipes) {
|
||||||
|
addChemicalRecipesComplicated();
|
||||||
|
} else {
|
||||||
|
addChemicalRecipesSimple();
|
||||||
|
}
|
||||||
|
GT_Values.RA.addAutoclaveRecipe(Materials.SiliconDioxide.getDust(1), Materials.Water.getFluid(200L), Materials.Quartzite.getGems(1), 750, 2000, 24);
|
||||||
|
GT_Values.RA.addAutoclaveRecipe(Materials.SiliconDioxide.getDust(1), GT_ModHandler.getDistilledWater(200L), Materials.Quartzite.getGems(1), 1000, 1500, 24);
|
||||||
|
|
||||||
|
addRecipesMay2017OilRefining();
|
||||||
|
addPyrometallurgicalRecipes();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void addChemicalRecipesSimple(){
|
private void addChemicalRecipesSimple(){
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue