diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe')
4 files changed, 42 insertions, 52 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java index 1ae84685db..19f70dfb08 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_ChemicalSkips.java @@ -1,5 +1,8 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GoodGenerator; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; import static gregtech.api.util.GT_ModHandler.getModItem; import net.minecraft.item.ItemStack; @@ -9,7 +12,12 @@ import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import com.github.technus.tectech.recipe.TT_recipeAdder; import com.github.technus.tectech.thing.block.QuantumGlassBlock; -import gregtech.api.enums.*; +import gregtech.api.enums.GT_Values; +import gregtech.api.enums.ItemList; +import gregtech.api.enums.Materials; +import gregtech.api.enums.MaterialsKevlar; +import gregtech.api.enums.OrePrefixes; +import gregtech.api.enums.TierEU; import gregtech.api.util.GT_OreDictUnificator; import gregtech.api.util.GT_Utility; import gregtech.common.items.CombType; @@ -144,8 +152,8 @@ public class RecipeLoader_ChemicalSkips { new FluidStack[] {}, new FluidStack[] {}, new ItemStack[] { Materials.Cerium.getDust(64), Materials.Gadolinium.getDust(64), - Materials.Samarium.getDust(64), getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia - getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium + Materials.Samarium.getDust(64), getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11002), // Hafnia + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 11007), // Zirconium ItemList.SuperconductorComposite.get(1) }, new int[] { 1667, 1667, 1667, 1667, 1667, 1667 }, 20 * 20, @@ -169,7 +177,7 @@ public class RecipeLoader_ChemicalSkips { // Stem Cells CORE.RA.addQuantumTransformerRecipe( new ItemStack[] { Materials.Calcium.getDust(32), Materials.MeatRaw.getDust(32), - getModItem("dreamcraft", "GTNHBioItems", 32, 2), + getModItem(NewHorizonsCoreMod.ID, "GTNHBioItems", 32, 2), ItemUtils.getSimpleStack(GenericChem.mRawIntelligenceCatalyst, 0) }, new FluidStack[] {}, new FluidStack[] { Materials.GrowthMediumRaw.getFluid(1000 * 1024), @@ -242,7 +250,7 @@ public class RecipeLoader_ChemicalSkips { private static void catalystRecipes() { CORE.RA.addSixSlotAssemblingRecipe( new ItemStack[] { CI.getNumberedCircuit(10), CI.getEmptyCatalyst(1), - getModItem("bartworks", "gt.bwMetaGenerateddust", 64L, 88), Materials.Osmiridium.getDust(64), + getModItem(BartWorks.ID, "gt.bwMetaGenerateddust", 64L, 88), Materials.Osmiridium.getDust(64), Materials.Carbon.getNanite(64) }, ELEMENT.STANDALONE.HYPOGEN.getFluidStack(360), ItemUtils.getSimpleStack(GenericChem.mPlatinumGroupCatalyst, 1), @@ -352,7 +360,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUHV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 2) }, + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 2) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 10), Materials.ExcitedDTCC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 500), new FluidStack(ELEMENT.getInstance().FERMIUM.getPlasma(), 500) }, @@ -370,7 +378,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UEV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUEV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 4), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 4), ItemList.StableAdhesive.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 12), Materials.ExcitedDTPC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2500), @@ -389,7 +397,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UIV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUIV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 8), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 8), ItemList.SuperconductorComposite.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 15), Materials.ExcitedDTRC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 1000 * 10), @@ -407,7 +415,7 @@ public class RecipeLoader_ChemicalSkips { ItemList.Emitter_UMV.get(4), GT_OreDictUnificator.get(OrePrefixes.wireGt16, Materials.SuperconductorUMV, 8), GregtechItemList.Laser_Lens_Special.get(1), - getModItem("GoodGenerator", "advancedRadiationProtectionPlate", 16), + getModItem(GoodGenerator.ID, "advancedRadiationProtectionPlate", 16), ItemList.NaquadriaSupersolid.get(4) }, new FluidStack[] { Materials.Thulium.getMolten(144 * 20), Materials.ExcitedDTEC.getFluid(5000), new FluidStack(ELEMENT.getInstance().NEPTUNIUM.getPlasma(), 2000 * 10), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java index 0edc2a2d00..9bb9200107 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_GlueLine.java @@ -1,5 +1,10 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; +import static gregtech.api.enums.Mods.BartWorks; +import static gregtech.api.enums.Mods.GalacticraftCore; +import static gregtech.api.enums.Mods.NewHorizonsCoreMod; +import static gregtech.api.enums.Mods.TecTech; + import net.minecraft.init.Items; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; @@ -15,7 +20,6 @@ import gtPlusPlus.core.item.ModItems; import gtPlusPlus.core.item.chemistry.AgriculturalChem; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.recipe.common.CI; import gtPlusPlus.core.util.minecraft.FluidUtils; @@ -34,7 +38,6 @@ public class RecipeLoader_GlueLine { chemicalReactorRecipes(); dehydratorRecipes(); distillationTowerRecipes(); - electrolyzerRecipes(); fluidHeaterRecipes(); mixerRecipes(); @@ -145,7 +148,7 @@ public class RecipeLoader_GlueLine { 30); // CaCO3 + 2HCl = CaCl2 + CO2 + H2O - if (LoadedMods.BartWorks) { + if (BartWorks.isModLoaded()) { GT_Values.RA.addChemicalRecipe( CI.getNumberedCircuit(18), ItemUtils.getSimpleStack(ModItems.dustCalciumCarbonate, 5), @@ -205,25 +208,6 @@ public class RecipeLoader_GlueLine { MaterialUtils.getVoltageForTier(5)); } - private static void electrolyzerRecipes() { - if (!LoadedMods.BartWorks) { - GT_Values.RA.addElectrolyzerRecipe( - CI.getNumberedCircuit(1), - MISC_MATERIALS.CALCIUM_CHLORIDE.getDust(3), - null, - Materials.Chlorine.getFluid(2000), // Out - Materials.Calcium.getDust(1), - null, - null, - null, - null, - null, - new int[] { 10000, 10000, 10000 }, - 20 * 30, - 120); - } - } - private static void fluidHeaterRecipes() { CORE.RA.addFluidHeaterRecipe( @@ -327,7 +311,7 @@ public class RecipeLoader_GlueLine { 32, 8); - if (LoadedMods.TecTech) { + if (TecTech.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Naquadah, 2), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.RedSteel, 18), @@ -392,7 +376,7 @@ public class RecipeLoader_GlueLine { 1200, 1966080); } - if (LoadedMods.DreamCraft && LoadedMods.GalacticraftCore) { + if (NewHorizonsCoreMod.isModLoaded() && GalacticraftCore.isModLoaded()) { GT_Values.RA.addAssemblerRecipe( new ItemStack[] { ItemUtils.getItemStackFromFQRN("GalacticraftMars:item.itemBasicAsteroids:7", 1), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Titanium, 8), diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java index 44115ea7d0..c31500d084 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_MolecularTransformer.java @@ -1,10 +1,12 @@ package gtPlusPlus.xmod.gregtech.loaders.recipe; import static advsolar.utils.MTRecipeManager.transformerRecipes; +import static gregtech.api.enums.Mods.AdvancedSolarPanel; +import static gregtech.api.enums.Mods.GalaxySpace; import advsolar.utils.MTRecipeRecord; -import cpw.mods.fml.common.Loader; -import gregtech.api.enums.*; +import gregtech.api.enums.Materials; +import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; @@ -34,41 +36,41 @@ public class RecipeLoader_MolecularTransformer { } transformerRecipes.clear(); - if (Loader.isModLoaded("AdvancedSolarPanel") && Loader.isModLoaded("GalaxySpace")) { + if (AdvancedSolarPanel.isModLoaded() && GalaxySpace.isModLoaded()) { CORE.RA.addMolecularTransformerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Glowstone, 1L), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 600, 1920, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 0), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 0), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 150, 7680, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 1), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 1), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 38, 30720, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 2), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 2), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 10, 122880, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 3), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 3), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 3, 491520, 2); CORE.RA.addMolecularTransformerRecipe( - GT_ModHandler.getModItem("GalaxySpace", "item.GlowstoneDusts", 1L, 4), - GT_ModHandler.getModItem("AdvancedSolarPanel", "asp_crafting_items", 1L, 9), + GT_ModHandler.getModItem(GalaxySpace.ID, "item.GlowstoneDusts", 1L, 4), + GT_ModHandler.getModItem(AdvancedSolarPanel.ID, "asp_crafting_items", 1L, 9), 1, 1996080, 2); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java index e382e0b26c..16bb025215 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/recipe/RecipeLoader_Nuclear.java @@ -12,7 +12,6 @@ import gregtech.api.util.GT_OreDictUnificator; import gtPlusPlus.api.objects.Logger; import gtPlusPlus.core.item.chemistry.GenericChem; import gtPlusPlus.core.lib.CORE; -import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.material.ELEMENT; import gtPlusPlus.core.material.MISC_MATERIALS; import gtPlusPlus.core.material.nuclear.FLUORIDES; @@ -322,8 +321,7 @@ public class RecipeLoader_Nuclear { 1000); // EU // Calcium Hydroxide - if ((ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) - || LoadedMods.IHL) { + if (ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { // CaO + H2O = Ca(OH)2 CORE.RA.addDehydratorRecipe( new ItemStack[] { CI.getNumberedBioCircuit(20), @@ -338,8 +336,6 @@ public class RecipeLoader_Nuclear { Logger.INFO("[dustCalciumHydroxide] FAILED TO LOAD RECIPE"); if (!ItemUtils.checkForInvalidItems(ItemUtils.getItemStackOfAmountFromOreDict("dustQuicklime", 1))) { Logger.INFO("Could not find dustQuicklime, cannot make dustCalciumHydroxide."); - } else if (!LoadedMods.IHL) { - Logger.INFO("IHL not loaded."); } } |