diff options
Diffstat (limited to 'src/main/java/goodgenerator/loader')
4 files changed, 217 insertions, 7 deletions
diff --git a/src/main/java/goodgenerator/loader/Loaders.java b/src/main/java/goodgenerator/loader/Loaders.java index 95c956a85a..9983c96d86 100644 --- a/src/main/java/goodgenerator/loader/Loaders.java +++ b/src/main/java/goodgenerator/loader/Loaders.java @@ -6,8 +6,10 @@ import goodgenerator.blocks.regularBlock.ComplexTextureCasing; import goodgenerator.blocks.regularBlock.Frame; import goodgenerator.blocks.regularBlock.TEBlock; import goodgenerator.blocks.tileEntity.*; +import goodgenerator.blocks.tileEntity.GTMetaTileEntity.DieselGenerator; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronAccelerator; import goodgenerator.blocks.tileEntity.GTMetaTileEntity.NeutronSensor; +import goodgenerator.crossmod.LoadedList; import goodgenerator.crossmod.nei.IMCForNEI; import goodgenerator.crossmod.nei.NEI_Config; import goodgenerator.crossmod.thaumcraft.LargeEssentiaEnergyData; @@ -92,6 +94,7 @@ public class Loaders { public static ItemStack YFT; public static ItemStack[] NeutronAccelerators = new ItemStack[9]; + public static ItemStack[] Generator_Diesel = new ItemStack[2]; public static Item Isotope = new NuclearMetaItemGenerator(); @@ -105,6 +108,8 @@ public class Loaders { Loaders.NS = new NeutronSensor(IDOffset + 11, "Neutron Sensor", "Neutron Sensor", 5).getStackForm(1L); Loaders.NA = new NeutronActivator(IDOffset + 12, "NeutronActivator", "Neutron Activator").getStackForm(1L); Loaders.YFT = new YottaFluidTank(IDOffset + 13, "YottaFluidTank", "YOTTank").getStackForm(1L); + Loaders.Generator_Diesel[0] = new DieselGenerator(1113, "basicgenerator.diesel.tier.04", "Turbo Supercharging Combustion Generator", 4).getStackForm(1); + Loaders.Generator_Diesel[1] = new DieselGenerator(1114, "basicgenerator.diesel.tier.05", "Ultimate Chemical Energy Releaser", 5).getStackForm(1); } public static void Register() { @@ -187,6 +192,7 @@ public class Loaders { compactMod(); FluidsBuilder.Register(); FuelRodLoader.RegisterRod(); + LoadedList.init(); } public static void initLoad(){ diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java index 609534d8f4..df2b4e504b 100644 --- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java +++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java @@ -1,11 +1,11 @@ package goodgenerator.loader; +import goodgenerator.crossmod.LoadedList; import goodgenerator.main.GoodGenerator; import goodgenerator.util.ItemRefer; import goodgenerator.util.MyRecipeAdder; import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -853,7 +853,7 @@ public class NaquadahReworkRecipeLoader { GT_Log.out.print("Multi Chemical Reactor done!\n"); - if (Loader.isModLoaded("miscutils")) { + if (LoadedList.GTPP) { //For Multi Centrifuge //Blame alk. She made some shit in it, NEI will break down if anyone modify the hash list directly. GTPP_Recipe.GTPP_Recipe_Map.sMultiblockCentrifugeRecipes_GT.mRecipeList.clear(); diff --git a/src/main/java/goodgenerator/loader/RecipeLoader.java b/src/main/java/goodgenerator/loader/RecipeLoader.java index f98a44a6b9..f7c472b921 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader.java @@ -1,11 +1,11 @@ package goodgenerator.loader; +import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; import goodgenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; -import cpw.mods.fml.common.Loader; import gregtech.api.enums.*; import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; @@ -690,6 +690,9 @@ public class RecipeLoader { GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 0); GT_Values.RA.addFuel(MyMaterial.ether.get(OrePrefixes.cell), null, 537, 1); GT_Values.RA.addFuel(MyMaterial.ethanolGasoline.get(OrePrefixes.cell), null, 750, 0); + GT_Values.RA.addFuel(MyMaterial.cyclopentadiene.get(OrePrefixes.cell), null, 70, 1); + GT_Values.RA.addFuel(MyMaterial.ironedFuel.get(OrePrefixes.cell), null, 2048, 0); + GT_Values.RA.addFuel(MyMaterial.ironedKerosene.get(OrePrefixes.cell), null, 1324, 0); GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ @@ -926,7 +929,7 @@ public class RecipeLoader { 65536 ); - if (Loader.isModLoaded("dreamcraft")) { + if (LoadedList.GTNH_CORE) { GT_Values.RA.addAssemblylineRecipe( MyMaterial.extremelyUnstableNaquadah.get(OrePrefixes.ingot), 300000, @@ -1237,7 +1240,7 @@ public class RecipeLoader { 120 ); - if (Loader.isModLoaded("miscutils")) { + if (LoadedList.GTPP) { GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ GT_Utility.getIntegratedCircuit(16), @@ -1290,7 +1293,7 @@ public class RecipeLoader { ); } - if (Loader.isModLoaded("botdustries")) { + if (LoadedList.BOTDUSTRIES) { GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[]{ GT_Utility.getIntegratedCircuit(16), diff --git a/src/main/java/goodgenerator/loader/RecipeLoader_02.java b/src/main/java/goodgenerator/loader/RecipeLoader_02.java index 9c66226c1b..d2bda42305 100644 --- a/src/main/java/goodgenerator/loader/RecipeLoader_02.java +++ b/src/main/java/goodgenerator/loader/RecipeLoader_02.java @@ -1,5 +1,6 @@ package goodgenerator.loader; +import goodgenerator.crossmod.LoadedList; import goodgenerator.items.MyMaterial; import goodgenerator.util.CrackRecipeAdder; import goodgenerator.util.ItemRefer; @@ -14,6 +15,7 @@ import gregtech.api.util.GT_Utility; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; +import net.minecraftforge.oredict.OreDictionary; public class RecipeLoader_02 { @@ -38,7 +40,7 @@ public class RecipeLoader_02 { CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 500, 480, 2800, true); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.zircaloy4, 513, 480, 2800, false); CrackRecipeAdder.reAddBlastRecipe(MyMaterial.incoloy903, 2400, 1920, 3700, true); - CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5000, true); + CrackRecipeAdder.reAddBlastRecipe(MyMaterial.adamantiumAlloy, 2500, 1920, 5500, true); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { @@ -580,6 +582,205 @@ public class RecipeLoader_02 { 120, 480 ); + + GT_Values.RA.addFluidExtractionRecipe( + Materials.Coal.getGems(1), + Materials.Ash.getDust(1), + FluidRegistry.getFluidStack("fluid.coaltar", 250), + 10, + 60, + 120 + ); + + if (OreDictionary.getOres("fuelCoke").size() > 0) { + GT_Values.RA.addFluidExtractionRecipe( + OreDictionary.getOres("fuelCoke").get(0), + Materials.Ash.getDust(1), + FluidRegistry.getFluidStack("fluid.coaltar", 500), + 10, + 60, + 120 + ); + } + + if (LoadedList.GTPP) { + GT_Values.RA.addDistilleryRecipe( + 24, + FluidRegistry.getFluidStack("fluid.coaltaroil", 100), + MyMaterial.cyclopentadiene.getFluidOrGas(30), + 100, + 120, + false + ); + } + else { + GT_Values.RA.addDistilleryRecipe( + 24, + FluidRegistry.getFluidStack("fluid.coaltar", 300), + MyMaterial.cyclopentadiene.getFluidOrGas(100), + 100, + 120, + false + ); + } + + GT_Values.RA.addDistilleryRecipe( + 24, + Materials.WoodTar.getFluid(500), + MyMaterial.cyclopentadiene.getFluidOrGas(20), + 100, + 120, + false + ); + + GT_Values.RA.addChemicalRecipe( + MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), + GT_Utility.getIntegratedCircuit(1), + Materials.Chlorine.getGas(1000), + null, + Materials.IronIIIChloride.getCells(1), + 40 + ); + + GT_Values.RA.addChemicalRecipe( + Materials.IronIIIChloride.getCells(1), + GT_Utility.getIntegratedCircuit(7), + Materials.Hydrogen.getGas(1000), + Materials.HydrochloricAcid.getFluid(1000), + MyMaterial.ferrousChloride.get(OrePrefixes.cell, 1), + 80, + 120 + ); + + GT_Values.RA.addChemicalRecipe( + Materials.Ammonia.getCells(1), + GT_Utility.getIntegratedCircuit(1), + Materials.Ethanol.getFluid(2000), + null, + MyMaterial.diethylamine.get(OrePrefixes.cell, 1), + 200, + 120 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(2) + }, + new FluidStack[]{ + MyMaterial.cyclopentadiene.getFluidOrGas(2000), + MyMaterial.ferrousChloride.getFluidOrGas(1000), + MyMaterial.diethylamine.getFluidOrGas(8000), + Materials.Ice.getSolid(4000) + }, + new FluidStack[]{ + MyMaterial.impureFerroceneMixture.getFluidOrGas(15000) + }, + null, + 2400, + 120 + ); + + GT_Values.RA.addMixerRecipe( + MyMaterial.ether.get(OrePrefixes.cell, 1), + GT_Utility.getIntegratedCircuit(1), + null, + null, + MyMaterial.impureFerroceneMixture.getFluidOrGas(7500), + MyMaterial.ferroceneWaste.getFluidOrGas(5000), + MyMaterial.ferroceneSolution.get(OrePrefixes.cell, 1), + 800, + 120 + ); + + GT_Values.RA.addUniversalDistillationRecipe( + MyMaterial.ferroceneWaste.getFluidOrGas(1000), + new FluidStack[] { + Materials.Water.getFluid(400), + MyMaterial.diethylamine.getFluidOrGas(800), + MyMaterial.ether.getFluidOrGas(500) + }, + null, + 600, + 120 + ); + + GT_Values.RA.addUniversalDistillationRecipe( + MyMaterial.ferroceneSolution.getFluidOrGas(2000), + new FluidStack[]{ + MyMaterial.ether.getFluidOrGas(1000) + }, + MyMaterial.ferrocene.get(OrePrefixes.dust, 1), + 600, + 120 + ); + + if (LoadedList.GTPP) { + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + MyMaterial.ferrocene.get(OrePrefixes.dust, 4), + Materials.SodiumHydroxide.getDust(8) + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("fluid.kerosene", 40000), + Materials.Naphtha.getFluid(3000), + MyMaterial.diethylamine.getFluidOrGas(1000) + }, + new FluidStack[]{ + MyMaterial.ironedKerosene.getFluidOrGas(16000) + }, + null, + 2400, + 1920 + ); + } + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + MyMaterial.ferrocene.get(OrePrefixes.dust, 4), + }, + new FluidStack[]{ + FluidRegistry.getFluidStack("combustionpromotor", 4000), + Materials.Naphtha.getFluid(40000), + Materials.LightFuel.getFluid(3000), + Materials.LPG.getFluid(1000), + Materials.Tetranitromethane.getFluid(2000), + }, + new FluidStack[]{ + MyMaterial.ironedFuel.getFluidOrGas(24000) + }, + null, + 2400, + 7680 + ); + + GT_ModHandler.addCraftingRecipe( + ItemRefer.Combustion_Generator_EV.get(1), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[] { + "PCP","MHM","GWG", + 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.Titanium,1), + 'C', "circuitData", + 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Aluminium,1), + 'P', ItemList.Electric_Piston_EV, + 'H', ItemList.Hull_EV, + 'M', ItemList.Electric_Motor_EV + } + ); + + GT_ModHandler.addCraftingRecipe( + ItemRefer.Combustion_Generator_IV.get(1), + GT_ModHandler.RecipeBits.DISMANTLEABLE, + new Object[] { + "PCP","MHM","GWG", + 'G', GT_OreDictUnificator.get(OrePrefixes.gearGt, Materials.TungstenSteel,1), + 'C', "circuitElite", + 'W', GT_OreDictUnificator.get(OrePrefixes.cableGt01, Materials.Tungsten,1), + 'P', ItemList.Electric_Piston_IV, + 'H', ItemList.Hull_IV, + 'M', ItemList.Electric_Motor_IV + } + ); + } public static void InitLoadRecipe() { |