aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/postload
diff options
context:
space:
mode:
authorGDCloud <93287602+GDCloudstrike@users.noreply.github.com>2023-04-21 19:09:47 +0200
committerGitHub <noreply@github.com>2023-04-21 19:09:47 +0200
commit285a75535d07f2037967b1208a5840fb81719514 (patch)
tree4e5fee76309ae7f184479306e452b8ce82491bca /src/main/java/gregtech/loaders/postload
parent28edf90a21fb9e281ce06c8d77ab4b05a818eaf8 (diff)
downloadGT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.gz
GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.tar.bz2
GT5-Unofficial-285a75535d07f2037967b1208a5840fb81719514.zip
Stellar catalyst + catalyst fixes + new materials class (#1893)
* add catalyst * pu plasma recipe * increase plasma mixer input slots * noOptimize + mixer recipe + voltage fix * noOptimize + PLE recipe * TPM recipe * spotlessApply (#1894) Co-authored-by: GitHub GTNH Actions <> * add two more plasma recipes * replace neptunium & fermium plasma * spotless * fix stellar plasma amount * new materials class --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java31
-rw-r--r--src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java7
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java2
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java56
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java30
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java33
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java55
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java6
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java40
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java4
-rw-r--r--src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java3
13 files changed, 178 insertions, 97 deletions
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
index 8413fc672f..b3ff9af45e 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java
@@ -11,10 +11,7 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
import gregtech.api.util.GT_OreDictUnificator;
public class GT_NaniteChain {
@@ -131,11 +128,11 @@ public class GT_NaniteChain {
// Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3
GT_Values.RA.addNanoForgeRecipe(
- new ItemStack[] { aUIVTierLens, Materials.TranscendentMetal.getBlocks(8),
+ new ItemStack[] { aUIVTierLens, MaterialsUEVplus.TranscendentMetal.getBlocks(8),
ItemList.Circuit_Chip_SoC2.get(64), ItemList.Circuit_Chip_SoC2.get(64),
ItemList.Circuit_Chip_SoC2.get(64) },
new FluidStack[] { Materials.UUMatter.getFluid(2000000) },
- new ItemStack[] { Materials.TranscendentMetal.getNanite(1) },
+ new ItemStack[] { MaterialsUEVplus.TranscendentMetal.getNanite(1) },
null,
null,
750 * 20,
@@ -148,12 +145,12 @@ public class GT_NaniteChain {
// lens
getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any
// better naming
- Materials.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
+ MaterialsUEVplus.WhiteDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
},
- new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000),
- Materials.Space.getMolten(720), },
- new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) },
+ new FluidStack[] { Materials.UUMatter.getFluid(500_000), MaterialsUEVplus.RawStarMatter.getFluid(50_000),
+ MaterialsUEVplus.Space.getMolten(720), },
+ new ItemStack[] { MaterialsUEVplus.WhiteDwarfMatter.getNanite(4) },
null,
null,
750 * 20,
@@ -166,12 +163,12 @@ public class GT_NaniteChain {
// lens
getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), // Quantum Anomaly, couldn't find any
// better naming
- Materials.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
+ MaterialsUEVplus.BlackDwarfMatter.getBlocks(8), getModItem(NewHorizonsCoreMod.ID, "item.PicoWafer", 32),
getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
},
- new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000),
- Materials.Time.getMolten(720), },
- new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) },
+ new FluidStack[] { Materials.UUMatter.getFluid(500_000), MaterialsUEVplus.RawStarMatter.getFluid(50_000),
+ MaterialsUEVplus.Time.getMolten(720), },
+ new ItemStack[] { MaterialsUEVplus.BlackDwarfMatter.getNanite(4) },
null,
null,
750 * 20,
@@ -182,14 +179,14 @@ public class GT_NaniteChain {
GT_Values.RA.addNanoForgeRecipe(
new ItemStack[] { aUMVTierLens,
// Quantum Anomaly, couldn't find any better naming.
- getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8),
+ getModItem(GTPlusPlus.ID, "MU-metaitem.01", 0, 32105), MaterialsUEVplus.Universium.getBlocks(8),
ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16),
getModItem(GoodGenerator.ID, "huiCircuit", 1, 4) // Paradox circuit
},
- new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576),
+ new FluidStack[] { MaterialsUEVplus.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576),
Materials.UUMatter.getFluid(1_000_000), },
- new ItemStack[] { Materials.Universium.getNanite(2) },
+ new ItemStack[] { MaterialsUEVplus.Universium.getNanite(2) },
null,
null,
750 * 20,
diff --git a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
index 432ee6d0bb..7a1d74466a 100644
--- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java
@@ -11,10 +11,7 @@ import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
+import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_PCBFactoryManager;
@@ -70,7 +67,7 @@ public class GT_PCBFactoryRecipes {
GT_Values.RA.addAssemblerRecipe(
new ItemStack[] { GT_ModHandler.getModItem(GTPlusPlus.ID, "blockFrameGtHypogen", 1),
GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) },
- Materials.SpaceTime.getMolten(144 * 8),
+ MaterialsUEVplus.SpaceTime.getMolten(144 * 8),
ItemList.InfinityCooledCasing.get(1),
10 * 20,
(int) GT_Values.VP[12]);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
index ab3b5b299b..437f4f51da 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java
@@ -7568,7 +7568,7 @@ public class AssemblerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(
GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33),
- GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22),
+ GT_OreDictUnificator.get(OrePrefixes.pipeTiny, MaterialsUEVplus.SpaceTime, 22),
ItemList.Electric_Pump_UMV.get(1),
GT_Utility.getIntegratedCircuit(9))
.itemOutputs(GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
index ce935cf5ec..336c45f5ec 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/BlastFurnaceRecipes.java
@@ -644,8 +644,8 @@ public class BlastFurnaceRecipes implements Runnable {
if (GTNHLanthanides.isModLoaded() && GTPlusPlus.isModLoaded()) {
GT_Values.RA.stdBuilder()
- .itemInputs(Materials.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1))
+ .itemInputs(MaterialsUEVplus.TranscendentMetal.getDust(1), GT_Utility.getIntegratedCircuit(1))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1))
.fluidInputs(Materials.Tungsten.getMolten(144))
.fluidOutputs(new FluidStack(FluidRegistry.getFluid("molten.celestialtungsten"), 72))
.duration(3 * MINUTES)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
index d5cac5c6ea..12133467e4 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java
@@ -361,7 +361,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Bottle.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -370,7 +370,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Plate.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Plate.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -379,7 +379,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Cell.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Cell.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -388,7 +388,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Ring.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ring.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -397,7 +397,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Rod.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rod.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -406,7 +406,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Bolt.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -415,7 +415,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Ingot.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -424,7 +424,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Wire.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Wire.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -433,7 +433,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Casing.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Casing.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -442,7 +442,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pipe_Tiny.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -451,7 +451,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pipe_Small.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -460,7 +460,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pipe_Medium.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -469,7 +469,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pipe_Large.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -478,7 +478,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pipe_Huge.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -487,7 +487,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Block.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Block.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -496,7 +496,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Sword.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Sword.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -505,7 +505,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Pickaxe.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -514,7 +514,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Shovel.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -523,7 +523,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Axe.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Axe.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -532,7 +532,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Hoe.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -541,7 +541,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Hammer.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -550,7 +550,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_File.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_File.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -559,7 +559,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Saw.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Saw.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -568,7 +568,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Gear.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Gear.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -577,7 +577,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Rotor.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -586,7 +586,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Turbine_Blade.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -595,7 +595,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_Small_Gear.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
@@ -604,7 +604,7 @@ public class FluidSolidifierRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Shape_Extruder_ToolHeadDrill.get(1))
.itemOutputs(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1))
- .fluidInputs(Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
+ .fluidInputs(MaterialsUEVplus.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe))
.noFluidOutputs()
.duration(whiteDwarfShapeSolidifierTime)
.eut(TierEU.RECIPE_UMV)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
index 0d61dc8b17..24cc69bd67 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/ForgeHammerRecipes.java
@@ -167,8 +167,8 @@ public class ForgeHammerRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.itemInputs(ItemList.Tesseract.get(1L), getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105))
.noItemOutputs()
- .fluidInputs(Materials.SpaceTime.getMolten(2880L))
- .fluidOutputs(Materials.Space.getMolten(1440L), Materials.Time.getMolten(1440L))
+ .fluidInputs(MaterialsUEVplus.SpaceTime.getMolten(2880L))
+ .fluidOutputs(MaterialsUEVplus.Space.getMolten(1440L), MaterialsUEVplus.Time.getMolten(1440L))
.duration(10 * SECONDS)
.eut(TierEU.RECIPE_UXV)
.addTo(sHammerRecipes);
diff --git a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
index 8243265759..26a46cfc8c 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/FusionReactorRecipes.java
@@ -330,5 +330,35 @@ public class FusionReactorRecipes implements Runnable {
.eut(98304)
.metadata(FUSION_THRESHOLD, 500000000)
.addTo(sFusionRecipes); // FT3
+
+ GT_Values.RA.stdBuilder()
+ .noItemInputs()
+ .noItemOutputs()
+ .fluidInputs(Materials.Lutetium.getMolten(144), Materials.Vanadium.getMolten(144))
+ .fluidOutputs(Materials.Plutonium241.getPlasma(144))
+ .duration(8 * TICKS)
+ .eut(TierEU.RECIPE_UEV / 2)
+ .metadata(FUSION_THRESHOLD, 1_000_000_000)
+ .addTo(sFusionRecipes); // FT5 because of UEV voltage
+
+ GT_Values.RA.stdBuilder()
+ .noItemInputs()
+ .noItemOutputs()
+ .fluidInputs(Materials.Tellurium.getMolten(144), Materials.Zinc.getMolten(144))
+ .fluidOutputs(Materials.Lead.getPlasma(144))
+ .duration(8 * TICKS)
+ .eut(TierEU.RECIPE_UEV / 2)
+ .metadata(FUSION_THRESHOLD, 1_000_000_000)
+ .addTo(sFusionRecipes); // FT5 because of UEV voltage
+
+ GT_Values.RA.stdBuilder()
+ .noItemInputs()
+ .noItemOutputs()
+ .fluidInputs(Materials.Osmium.getMolten(144), Materials.Silicon.getMolten(144))
+ .fluidOutputs(Materials.Thorium.getPlasma(144))
+ .duration(8 * TICKS)
+ .eut(TierEU.RECIPE_UEV / 2)
+ .metadata(FUSION_THRESHOLD, 1_000_000_000)
+ .addTo(sFusionRecipes); // FT5 because of UEV voltage
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
index 7808656a90..9793ab2fbd 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/LaserEngraverRecipes.java
@@ -5,7 +5,7 @@ import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.TierEU;
public class LaserEngraverRecipes implements Runnable {
@@ -16,41 +16,56 @@ public class LaserEngraverRecipes implements Runnable {
GT_Values.RA.stdBuilder()
.noItemInputs()
.noItemOutputs()
- .fluidInputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000))
- .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000))
+ .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTCC.getFluid(1000))
.requiresCleanRoom()
.duration(41 * MINUTES + 40 * SECONDS)
.eut((int) TierEU.RECIPE_ZPM)
+ .noOptimize()
.addTo(sLaserEngraverRecipes);
GT_Values.RA.stdBuilder()
.noItemInputs()
.noItemOutputs()
- .fluidInputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000))
- .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000))
+ .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTPC.getFluid(1000))
.requiresCleanRoom()
.duration(41 * MINUTES + 40 * SECONDS)
.eut((int) TierEU.RECIPE_UV)
+ .noOptimize()
.addTo(sLaserEngraverRecipes);
GT_Values.RA.stdBuilder()
.noItemInputs()
.noItemOutputs()
- .fluidInputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000))
- .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000))
+ .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000))
.requiresCleanRoom()
.duration(41 * MINUTES + 40 * SECONDS)
.eut((int) TierEU.RECIPE_UHV)
+ .noOptimize()
.addTo(sLaserEngraverRecipes);
GT_Values.RA.stdBuilder()
.noItemInputs()
.noItemOutputs()
- .fluidInputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000))
- .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000))
+ .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000))
.requiresCleanRoom()
.duration(41 * MINUTES + 40 * SECONDS)
.eut((int) TierEU.RECIPE_UEV)
+ .noOptimize()
+ .addTo(sLaserEngraverRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .noItemInputs()
+ .noItemOutputs()
+ .fluidInputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000))
+ .requiresCleanRoom()
+ .duration(41 * MINUTES + 40 * SECONDS)
+ .eut((int) TierEU.RECIPE_UIV)
+ .noOptimize()
.addTo(sLaserEngraverRecipes);
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
index 50d370c8ca..bb6abe7c20 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/MixerRecipes.java
@@ -2,13 +2,7 @@ package gregtech.loaders.postload.recipes;
import static gregtech.api.enums.GT_Values.NF;
import static gregtech.api.enums.GT_Values.NI;
-import static gregtech.api.enums.Mods.AppliedEnergistics2;
-import static gregtech.api.enums.Mods.BiomesOPlenty;
-import static gregtech.api.enums.Mods.Forestry;
-import static gregtech.api.enums.Mods.Natura;
-import static gregtech.api.enums.Mods.PamsHarvestCraft;
-import static gregtech.api.enums.Mods.Railcraft;
-import static gregtech.api.enums.Mods.Thaumcraft;
+import static gregtech.api.enums.Mods.*;
import static gregtech.api.util.GT_ModHandler.getModItem;
import static gregtech.api.util.GT_Recipe.GT_Recipe_Map.sMixerRecipes;
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
@@ -24,13 +18,7 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
-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.MaterialsOreAlum;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.enums.TierEU;
+import gregtech.api.enums.*;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -1746,51 +1734,70 @@ public class MixerRecipes implements Runnable {
Materials.Iron.getPlasma(1000L),
Materials.Calcium.getPlasma(1000L),
Materials.Niobium.getPlasma(1000L))
- .fluidOutputs(Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L))
.duration(41 * MINUTES + 40 * SECONDS)
.eut(TierEU.RECIPE_ZPM)
+ .noOptimize()
.addTo(sMixerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(10))
.noItemOutputs()
.fluidInputs(
- Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L),
+ MaterialsUEVplus.DimensionallyTranscendentCrudeCatalyst.getFluid(1000L),
Materials.Radon.getPlasma(1000L),
Materials.Nickel.getPlasma(1000L),
Materials.Boron.getPlasma(1000L),
Materials.Sulfur.getPlasma(1000L))
- .fluidOutputs(Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1