Skip to content
This repository has been archived by the owner on May 25, 2024. It is now read-only.

Commit

Permalink
Mark VI Naquadah Fuel (#200)
Browse files Browse the repository at this point in the history 
* Add a way to enrich tiberium dust

* Add alternate recipe for MK3 Fuel

* Bump deps

* Add new tier of catalyst and coolant to Naquadah Reactor

* Add T4 Field Restriction Coil

* Fix structure check on T4 coils

* Classic spotless

* Add Mark VI naquadah fuel

* Spotless

* Change shirabon to 1008L per recipe and make improved recipe need T4 coils

* Actually neverming, 1440L is much better for Shirabon
  • Loading branch information
@S4mpsa
S4mpsa authored Aug 24, 2023
1 parent d00a994 commit 883b1b2
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 7 deletions.
20 changes: 20 additions & 0 deletions src/main/java/goodgenerator/items/MyMaterial.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -522,6 +522,26 @@ public class MyMaterial implements Runnable {
OffsetID + 50,
TextureSet.SET_FLUID);

public static final Werkstoff naquadahBasedFuelMkVI = new Werkstoff(
new short[] { 0x30, 0x00, 0x00 },
"Naquadah Based Liquid Fuel MkVI",
"THE FUTURE",
new Werkstoff.Stats().setRadioactive(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
OffsetID + 115,
TextureSet.SET_FLUID);

public static final Werkstoff naquadahBasedFuelMkVIDepleted = new Werkstoff(
new short[] { 0x99, 0x33, 0x33 },
"Naquadah Based Liquid Fuel MkVI (Depleted)",
"THE FUTURE (achieved)",
new Werkstoff.Stats().setToxic(true),
Werkstoff.Types.MIXTURE,
new Werkstoff.GenerationFeatures().disable().addCells(),
OffsetID + 116,
TextureSet.SET_FLUID);

public static final Werkstoff zincChloride = new Werkstoff(
new short[] { 0x73, 0xa5, 0xfc },
"Zinc Chloride",
Expand Down
35 changes: 33 additions & 2 deletions src/main/java/goodgenerator/loader/FuelRecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gtPlusPlus.core.material.ELEMENT;

public class FuelRecipeLoader {

Expand Down Expand Up @@ -63,7 +64,12 @@ public static void RegisterFuel() {
MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1),
NaquadahFuelVoltage[7],
NaquadahFuelTime[7]);

MyRecipeAdder.instance.addLiquidMentalFuel(
MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(1),
MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1),
NaquadahFuelVoltage[8],
NaquadahFuelTime[8]);
// MK III Naquadah Fuel
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
new FluidStack[] { MyMaterial.heavyNaquadahFuel.getFluidOrGas(800),
MyMaterial.lightNaquadahFuel.getFluidOrGas(1000), },
Expand All @@ -86,7 +92,7 @@ public static void RegisterFuel() {
2100000,
100,
1);

// MK IV Naquadah Fuel
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
new FluidStack[] { MyMaterial.naquadahBasedFuelMkIII.getFluidOrGas(2000),
Materials.Praseodymium.getMolten(9216L) },
Expand All @@ -112,6 +118,7 @@ public static void RegisterFuel() {
160,
2);

// MK V Naquadah Fuel
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
new FluidStack[] { MyMaterial.naquadahBasedFuelMkIV.getFluidOrGas(2000),
FluidRegistry.getFluidStack("heavyradox", 1000), },
Expand All @@ -133,5 +140,29 @@ public static void RegisterFuel() {
300000000,
200,
3);

// MK VI Naquadah Fuel
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
new FluidStack[] { MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
FluidRegistry.getFluidStack("molten.shirabon", 1440), },
new ItemStack[] { ELEMENT.STANDALONE.ASTRAL_TITANIUM.getDust(64),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 32), },
MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(500),
320000000,
240,
3);

// Alternate higher tier recipe
MyRecipeAdder.instance.addNaquadahFuelRefineRecipe(
new FluidStack[] { MyMaterial.naquadahBasedFuelMkV.getFluidOrGas(2000),
FluidRegistry.getFluidStack("molten.shirabon", 1440), },
new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, MaterialsUEVplus.WhiteDwarfMatter, 8),
ELEMENT.STANDALONE.CELESTIAL_TUNGSTEN.getDust(64),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Tritanium, 48), },
MyMaterial.naquadahBasedFuelMkVI.getFluidOrGas(750),
530000000,
240,
4);

}
}
21 changes: 18 additions & 3 deletions src/main/java/goodgenerator/loader/RecipeLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1189,20 +1189,35 @@ public static void InitLoadRecipe() {
400,
30720);

GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(1),
null,
MyMaterial.naquadahBasedFuelMkVIDepleted.getFluidOrGas(1000),
MyMaterial.metastableOganesson.getMolten(122),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadria, 1),
new int[] { 1000, 500, 400, 50, 20, 5 },
250,
30000);

GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(1),
null,
MyMaterial.naquadahBasedFuelMkVDepleted.getFluidOrGas(1000),
WerkstoffLoader.Oganesson.getFluidOrGas(1),
WerkstoffLoader.Oganesson.getFluidOrGas(182),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Naquadah, 1),
new int[] { 1000, 500, 400, 50, 20, 5 },
100,
30);
250,
30000);

GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(1),
Expand Down
9 changes: 7 additions & 2 deletions src/main/java/goodgenerator/main/GG_Config_Loader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ public class GG_Config_Loader {

public static int LiquidAirConsumptionPerSecond = 2400;
public static int[] NaquadahFuelVoltage = new int[] { 12960, 2200, 32400, 975000, 2300000, 9511000, 88540000,
399576000 };
public static int[] NaquadahFuelTime = new int[] { 100, 500, 150, 20, 20, 80, 100, 160 };
399576000, 2077795200 };
public static int[] NaquadahFuelTime = new int[] { 100, 500, 150, 20, 20, 80, 100, 160, 240 };
public static int[] CoolantEfficiency = new int[] { 500, 275, 150, 105 };
public static int[] ExcitedLiquidCoe = new int[] { 64, 16, 4, 3, 2 };
public static boolean EnableNaquadahRework = true;
Expand Down Expand Up @@ -63,6 +63,11 @@ private static void loadProperty() {
.get("LargeNaquadahReactor", "Naquadah Fuel MkV Basic Output Voltage", NaquadahFuelVoltage[7]).getInt();
NaquadahFuelTime[7] = GG_Config
.get("LargeNaquadahReactor", "Naquadah Fuel MkV Burning Time", NaquadahFuelTime[7]).getInt();
NaquadahFuelVoltage[8] = GG_Config
.get("LargeNaquadahReactor", "Naquadah Fuel MkVI Basic Output Voltage", NaquadahFuelVoltage[8])
.getInt();
NaquadahFuelTime[8] = GG_Config
.get("LargeNaquadahReactor", "Naquadah Fuel MkVI Burning Time", NaquadahFuelTime[8]).getInt();
CoolantEfficiency[0] = GG_Config.get("LargeNaquadahReactor", "Tachyon Fluid Efficiency", CoolantEfficiency[0])
.getInt();
CoolantEfficiency[1] = GG_Config.get("LargeNaquadahReactor", "Cryotheum Efficiency", CoolantEfficiency[1])
Expand Down

0 comments on commit 883b1b2

Please sign in to comment.