diff options
author | GlodBlock <1356392126@qq.com> | 2021-05-08 22:54:32 +0800 |
---|---|---|
committer | GlodBlock <1356392126@qq.com> | 2021-05-08 22:54:32 +0800 |
commit | eeb6aa2d61a7f8a8fdfe2ef348d64a395762cc90 (patch) | |
tree | 476d73bc3a8a8a676c7886d1cde624d2ebed39a1 /src | |
parent | dc008e9fd230a28c0499ae17bc0f29b2a96cbeed (diff) | |
download | GT5-Unofficial-eeb6aa2d61a7f8a8fdfe2ef348d64a395762cc90.tar.gz GT5-Unofficial-eeb6aa2d61a7f8a8fdfe2ef348d64a395762cc90.tar.bz2 GT5-Unofficial-eeb6aa2d61a7f8a8fdfe2ef348d64a395762cc90.zip |
add Nq Based Fuel Mk I/II
Diffstat (limited to 'src')
-rw-r--r-- | src/main/java/GoodGenerator/Items/MyMaterial.java | 74 | ||||
-rw-r--r-- | src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java | 4 | ||||
-rw-r--r-- | src/main/java/GoodGenerator/Loader/RecipeLoader.java | 63 |
3 files changed, 139 insertions, 2 deletions
diff --git a/src/main/java/GoodGenerator/Items/MyMaterial.java b/src/main/java/GoodGenerator/Items/MyMaterial.java index 2d8ec04361..a050f5e1de 100644 --- a/src/main/java/GoodGenerator/Items/MyMaterial.java +++ b/src/main/java/GoodGenerator/Items/MyMaterial.java @@ -447,6 +447,80 @@ public class MyMaterial implements Runnable { TextureSet.SET_FLUID ); + public static final Werkstoff naquadahBasedFuelMkI = new Werkstoff( + new short[]{0x62,0x5c,0x5b}, + "Naquadah Based Liquid Fuel MkI", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31038, + TextureSet.SET_FLUID + ); + + public static final Werkstoff naquadahBasedFuelMkIDepleted = new Werkstoff( + new short[]{0xcb,0xc3,0xc1}, + "Naquadah Based Liquid Fuel MkI (Depleted)", + new Werkstoff.Stats().setToxic(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31039, + TextureSet.SET_FLUID + ); + + public static final Werkstoff naquadahBasedFuelMkII = new Werkstoff( + new short[]{0x52,0x4e,0x4d}, + "Naquadah Based Liquid Fuel MkII", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31040, + TextureSet.SET_FLUID + ); + + public static final Werkstoff naquadahBasedFuelMkIIDepleted = new Werkstoff( + new short[]{0xb5,0xb0,0xae}, + "Naquadah Based Liquid Fuel MkII (Depleted)", + new Werkstoff.Stats().setRadioactive(true), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + 31041, + TextureSet.SET_FLUID + ); + /*These materials will be enable when they are removed in GregTech*/ + /* + public static final Werkstoff praseodymium = new Werkstoff( + new short[]{0xff,0xff,0xff}, + "praseodymium", + "Pr", + new Werkstoff.Stats(), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), + 31042, + TextureSet.SET_METALLIC + ); + + public static final Werkstoff rubidium = new Werkstoff( + new short[]{0xff,0x2a,0x00}, + "rubidium", + "Rb", + new Werkstoff.Stats(), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), + 31043, + TextureSet.SET_SHINY + ); + + public static final Werkstoff thulium = new Werkstoff( + new short[]{0xff,0xff,0xff}, + "Thulium", + "Tm", + new Werkstoff.Stats(), + Werkstoff.Types.ELEMENT, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), + 31044, + TextureSet.SET_METALLIC + ); + */ @Override public void run() { } } diff --git a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java index 99c96d4d06..93f3f99bad 100644 --- a/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/FuelRecipeLoader.java @@ -6,11 +6,13 @@ import gregtech.api.enums.Materials; public class FuelRecipeLoader { public static void RegisterFuel(){ - MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100); + //MyRecipeAdder.instance.addLiquidMentalFuel(Materials.NaquadahEnriched.getMolten(1L),Materials.Naquadah.getMolten(1L),32768,100); MyRecipeAdder.instance.addLiquidMentalFuel(Materials.Naquadria.getMolten(1L),Materials.Naquadah.getMolten(1L),262144,120); MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.uraniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.uraniumBasedLiquidFuelDepleted.getFluidOrGas(1),12960,100); MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.thoriumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.thoriumBasedLiquidFuelDepleted.getFluidOrGas(1),4320,500); MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.plutoniumBasedLiquidFuelExcited.getFluidOrGas(1),MyMaterial.plutoniumBasedLiquidFuelDepleted.getFluidOrGas(1),32400,150); + MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1),96000,950); + MyRecipeAdder.instance.addLiquidMentalFuel(MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1),MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1),145000,850); } } diff --git a/src/main/java/GoodGenerator/Loader/RecipeLoader.java b/src/main/java/GoodGenerator/Loader/RecipeLoader.java index 03561db74b..badd6c9567 100644 --- a/src/main/java/GoodGenerator/Loader/RecipeLoader.java +++ b/src/main/java/GoodGenerator/Loader/RecipeLoader.java @@ -6,6 +6,7 @@ import GoodGenerator.util.MaterialFix; import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader; import gregtech.api.enums.*; import gregtech.api.util.GT_OreDictUnificator; +import javafx.scene.paint.Material; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; @@ -602,7 +603,7 @@ public class RecipeLoader { new FluidStack[]{ MyMaterial.lightNaquadahFuel.getFluidOrGas(600), Materials.Uranium.getMolten(1152), - Materials.Promethium.getMolten(864), + Materials.Thorium.getMolten(864), Materials.Plutonium.getMolten(792), Materials.Thulium.getMolten(216), MyMaterial.heavyNaquadahFuel.getFluidOrGas(350) @@ -769,7 +770,67 @@ public class RecipeLoader { 2040 ); + GT_Values.RA.addFuel(MyMaterial.naquadahGas.get(OrePrefixes.cell),null,1024,1); + GT_Values.RA.addFusionReactorRecipe( + MyMaterial.lightNaquadahFuel.getFluidOrGas(200), + MyMaterial.heavyNaquadahFuel.getFluidOrGas(20), + MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(100), + 5, + 32768, + 330000000 + ); + + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(1), + null, + MyMaterial.naquadahBasedFuelMkIDepleted.getFluidOrGas(1000), + WerkstoffLoader.Xenon.getFluidOrGas(144), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,48), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,32), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Neodymium,32), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Europium,32), + null, + new int[]{9000,8500,5000,4000,2000}, + 6000, + 2040 + ); + + GT_Values.RA.addMultiblockChemicalRecipe( + new ItemStack[]{ + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Praseodymium,16), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Samarium,24), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.ElectrumFlux,32), + }, + new FluidStack[]{ + MyMaterial.naquadahBasedFuelMkI.getFluidOrGas(1000), + MyMaterial.naquadahGas.getFluidOrGas(2500) + }, + new FluidStack[]{ + MyMaterial.naquadahBasedFuelMkII.getFluidOrGas(1000) + }, + null, + 18000, + 120 + ); + + GT_Values.RA.addCentrifugeRecipe( + GT_Utility.getIntegratedCircuit(1), + null, + MyMaterial.naquadahBasedFuelMkIIDepleted.getFluidOrGas(1000), + WerkstoffLoader.Oganesson.getFluidOrGas(144), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,64), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Naquadah,32), + GT_OreDictUnificator.get(OrePrefixes.dust,Materials.Americium,32), + WerkstoffLoader.Californium.get(OrePrefixes.dust,32), + null, + new int[]{9000,8500,5000,4000,2000}, + 8000, + 2040 + ); } public static void Fixer(){ |