aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders
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
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')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java8
-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
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java65
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java26
-rw-r--r--src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java3
17 files changed, 234 insertions, 143 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
index ab17077c16..e7f2f52de0 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java
@@ -5,11 +5,7 @@ import java.util.ArrayList;
import net.minecraft.item.ItemStack;
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.SubTag;
+import gregtech.api.enums.*;
import gregtech.api.objects.MaterialStack;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
@@ -97,7 +93,7 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr
&& (aMaterial != Materials.Obsidian)
&& (aMaterial != Materials.Glowstone)
&& (aMaterial != Materials.Paper)
- && (aMaterial != Materials.TranscendentMetal)
+ && (aMaterial != MaterialsUEVplus.TranscendentMetal)
&& (aMaterial != Materials.Clay)) {
GT_ModHandler.addCompressionRecipe(
GT_Utility.copyAmount(1L, aStack),
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(1000L))
+ .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L))
.duration(41 * MINUTES + 40 * SECONDS)
- .eut(TierEU.RECIPE_ZPM)
+ .eut(TierEU.RECIPE_UV)
+ .noOptimize()
.addTo(sMixerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(11))
.noItemOutputs()
.fluidInputs(
- Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L),
+ MaterialsUEVplus.DimensionallyTranscendentProsaicCatalyst.getFluid(1000L),
Materials.Nitrogen.getPlasma(1000L),
Materials.Zinc.getPlasma(1000L),
Materials.Silver.getPlasma(1000L),
Materials.Titanium.getPlasma(1000L))
- .fluidOutputs(Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L))
.duration(41 * MINUTES + 40 * SECONDS)
- .eut(TierEU.RECIPE_ZPM)
+ .eut(TierEU.RECIPE_UHV)
+ .noOptimize()
.addTo(sMixerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(GT_Utility.getIntegratedCircuit(12))
.noItemOutputs()
.fluidInputs(
- Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L),
+ MaterialsUEVplus.DimensionallyTranscendentResplendentCatalyst.getFluid(1000L),
Materials.Americium.getPlasma(1000L),
Materials.Bismuth.getPlasma(1000L),
Materials.Oxygen.getPlasma(1000L),
Materials.Tin.getPlasma(1000L))
- .fluidOutputs(Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L))
.duration(41 * MINUTES + 40 * SECONDS)
- .eut(TierEU.RECIPE_ZPM)
+ .eut(TierEU.RECIPE_UEV)
+ .noOptimize()
+ .addTo(sMixerRecipes);
+
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(13))
+ .noItemOutputs()
+ .fluidInputs(
+ MaterialsUEVplus.DimensionallyTranscendentExoticCatalyst.getFluid(1000L),
+ Materials.Lead.getPlasma(1000),
+ Materials.Thorium.getPlasma(1000),
+ Materials.Plutonium241.getPlasma(1000L),
+ MaterialsUEVplus.RawStarMatter.getFluid(25L))
+ .fluidOutputs(MaterialsUEVplus.DimensionallyTranscendentStellarCatalyst.getFluid(1000L))
+ .duration(41 * MINUTES + 40 * SECONDS)
+ .eut(TierEU.RECIPE_UIV)
+ .noOptimize()
.addTo(sMixerRecipes);
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
index 5546dadc86..df6f37f299 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/PlasmaForgeRecipes.java
@@ -18,7 +18,9 @@ public class PlasmaForgeRecipes implements Runnable {
ItemList.Field_Generator_UEV.get(64),
ItemList.Field_Generator_UIV.get(64),
ItemList.Field_Generator_UMV.get(64))
- .fluidInputs(Materials.ExcitedDTEC.getFluid(100_000_000), Materials.SpaceTime.getMolten(64 * 2 * 9 * 144))
+ .fluidInputs(
+ MaterialsUEVplus.ExcitedDTEC.getFluid(100_000_000),
+ MaterialsUEVplus.SpaceTime.getMolten(64 * 2 * 9 * 144))
.itemOutputs(ItemList.GigaChad.get(1))
.noFluidOutputs()
.duration(86400 * 20 * 2)
@@ -32,7 +34,7 @@ public class PlasmaForgeRecipes implements Runnable {
getModItem(GTPlusPlus.ID, "particleBase", 1, 24),
getModItem(NewHorizonsCoreMod.ID, "item.ChromaticLens", 0),
getModItem(GoodGenerator.ID, "huiCircuit", 0, 4))
- .fluidInputs(Materials.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144))
+ .fluidInputs(MaterialsUEVplus.ExcitedDTRC.getFluid(92), Materials.Duranium.getMolten(144))
.itemOutputs(getModItem(GTPlusPlus.ID, "MU-metaitem.01", 1, 32105))
.noFluidOutputs()
.duration(60 * SECONDS)
diff --git a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
index 53cb4524b5..3c53b565ce 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/TranscendentPlasmaMixerRecipes.java
@@ -7,6 +7,7 @@ import net.minecraftforge.fluids.FluidStack;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.util.GT_Utility;
public class TranscendentPlasmaMixerRecipes implements Runnable {
@@ -15,6 +16,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
private static final int PROSAIC_EU_PER_L = 66_768_460;
private static final int RESPLENDENT_EU_PER_L = 269_326_451;
private static final int EXOTIC_EU_PER_L = 1_073_007_393;
+ private static final int STELLAR_EU_PER_HALF_L = 2_138_383_760;
@Deprecated
private static void addTranscendentPlasmaMixerRecipe(final FluidStack fluidOutput, final int circuitNumber,
@@ -42,7 +44,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
Materials.Iron.getPlasma(1000),
Materials.Calcium.getPlasma(1000),
Materials.Niobium.getPlasma(1000))
- .fluidOutputs(Materials.ExcitedDTCC.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTCC.getFluid(1000L))
.duration(100)
.eut(CRUDE_EU_PER_L)
.noOptimize()
@@ -60,7 +62,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
Materials.Nickel.getPlasma(1000),
Materials.Boron.getPlasma(1000),
Materials.Sulfur.getPlasma(1000))
- .fluidOutputs(Materials.ExcitedDTPC.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTPC.getFluid(1000L))
.duration(100)
.eut(PROSAIC_EU_PER_L)
.noOptimize()
@@ -82,7 +84,7 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
Materials.Zinc.getPlasma(1000),
Materials.Silver.getPlasma(1000),
Materials.Titanium.getPlasma(1000))
- .fluidOutputs(Materials.ExcitedDTRC.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTRC.getFluid(1000L))
.duration(100)
.eut(RESPLENDENT_EU_PER_L)
.noOptimize()
@@ -108,11 +110,41 @@ public class TranscendentPlasmaMixerRecipes implements Runnable {
Materials.Bismuth.getPlasma(1000),
Materials.Oxygen.getPlasma(1000),
Materials.Tin.getPlasma(1000))
- .fluidOutputs(Materials.ExcitedDTEC.getFluid(1000L))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTEC.getFluid(1000L))
.duration(100)
.eut(EXOTIC_EU_PER_L)
.noOptimize()
.addTo(sTranscendentPlasmaMixerRecipes);
+ GT_Values.RA.stdBuilder()
+ .itemInputs(GT_Utility.getIntegratedCircuit(5))
+ .noItemOutputs()
+ .fluidInputs(
+ Materials.Helium.getPlasma(1000),
+ Materials.Iron.getPlasma(1000),
+ Materials.Calcium.getPlasma(1000),
+ Materials.Niobium.getPlasma(1000),
+ Materials.Radon.getPlasma(1000),
+ Materials.Nickel.getPlasma(1000),
+ Materials.Boron.getPlasma(1000),
+ Materials.Sulfur.getPlasma(1000),
+ Materials.Nitrogen.getPlasma(1000),
+ Materials.Zinc.getPlasma(1000),
+ Materials.Silver.getPlasma(1000),
+ Materials.Titanium.getPlasma(1000),
+ Materials.Americium.getPlasma(1000),
+ Materials.Bismuth.getPlasma(1000),
+ Materials.Oxygen.getPlasma(1000),
+ Materials.Tin.getPlasma(1000),
+ Materials.Lead.getPlasma(1000),
+ Materials.Thorium.getPlasma(1000),
+ Materials.Plutonium241.getPlasma(1000L),
+ MaterialsUEVplus.RawStarMatter.getFluid(25L))
+ .fluidOutputs(MaterialsUEVplus.ExcitedDTSC.getFluid(1000L))
+ .duration(200)
+ .eut(STELLAR_EU_PER_HALF_L)
+ .noOptimize()
+ .addTo(sTranscendentPlasmaMixerRecipes);
+
}
}
diff --git a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
index cb71eaf766..e60a2bd6b6 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/VacuumFreezerRecipes.java
@@ -492,8 +492,8 @@ public class VacuumFreezerRecipes implements Runnable {
if (GTPlusPlus.isModLoaded()) {
// hot transcendent metal ingot cooling
GT_Values.RA.stdBuilder()
- .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.TranscendentMetal, 1L))
- .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TranscendentMetal, 1L))
+ .itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingotHot, MaterialsUEVplus.TranscendentMetal, 1L))
+ .itemOutputs(GT_OreDictUnificator.get(OrePrefixes.ingot, MaterialsUEVplus.TranscendentMetal, 1L))
.fluidInputs(
new FluidStack(FluidRegistry.getFluid("molten.titansteel"), 144),
Materials.SuperCoolant.getFluid(1000))
diff --git a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
index 37161f3e28..e162c932ec 100644
--- a/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
+++ b/src/main/java/gregtech/loaders/postload/recipes/WiremillRecipes.java
@@ -11,6 +11,7 @@ import net.minecraft.item.ItemStack;
import gregtech.GT_Mod;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.*;
@@ -189,7 +190,7 @@ public class WiremillRecipes implements Runnable {
registerWiremillRecipes(Materials.Graphene, 20 * SECONDS, 2, OrePrefixes.dust, OrePrefixes.stick, 1);
- registerWiremillRecipes(Materials.SpaceTime, 20 * SECONDS, 32_000);
+ registerWiremillRecipes(MaterialsUEVplus.SpaceTime, 20 * SECONDS, 32_000);
GT_Values.RA.stdBuilder()
.itemInputs(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Polycaprolactam, 1L))
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
index 4180ad6e12..817b1c5d0b 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java
@@ -26,14 +26,7 @@ import cpw.mods.fml.common.event.FMLInterModComms;
import cpw.mods.fml.common.registry.GameRegistry;
import gregtech.GT_Mod;
import gregtech.api.GregTech_API;
-import gregtech.api.enums.ConfigCategories;
-import gregtech.api.enums.Dyes;
-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.SubTag;
+import gregtech.api.enums.*;
import gregtech.api.fluid.GT_FluidFactory;
import gregtech.api.items.GT_Block_LongDistancePipe;
import gregtech.api.items.GT_BreederCell_Item;
@@ -606,8 +599,8 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
GregTech_API.sBlockMetal9 = new GT_Block_Metal(
"gt.blockmetal9",
new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide,
- Materials.SpaceTime, Materials.TranscendentMetal, Materials.Oriharukon, Materials.WhiteDwarfMatter,
- Materials.BlackDwarfMatter, Materials.Universium },
+ MaterialsUEVplus.SpaceTime, MaterialsUEVplus.TranscendentMetal, Materials.Oriharukon,
+ MaterialsUEVplus.WhiteDwarfMatter, MaterialsUEVplus.BlackDwarfMatter, MaterialsUEVplus.Universium },
OrePrefixes.block,
gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12);
@@ -1121,68 +1114,76 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable {
.withLocalizedName("Dimensionally Transcendent Residue")
.withStateAndTemperature(LIQUID, 2000000000)
.buildAndRegister()
- .configureMaterials(Materials.DimensionallyTranscendentResidue)
+ .configureMaterials(MaterialsUEVplus.DimensionallyTranscendentResidue)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.DimensionallyTranscendentResidue, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.DimensionallyTranscendentResidue, 1L),
ItemList.Cell_Empty.get(1L));
GT_FluidFactory.builder("ExcitedDTCC")
.withLocalizedName("Excited Dimensionally Transcendent Crude Catalyst")
.withStateAndTemperature(LIQUID, 500000000)
.buildAndRegister()
- .configureMaterials(Materials.ExcitedDTCC)
+ .configureMaterials(MaterialsUEVplus.ExcitedDTCC)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTCC, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTCC, 1L),
ItemList.Cell_Empty.get(1L));
GT_FluidFactory.builder("ExcitedDTPC")
.withLocalizedName("Excited Dimensionally Transcendent Prosaic Catalyst")
.withStateAndTemperature(LIQUID, 500000000)
.buildAndRegister()
- .configureMaterials(Materials.ExcitedDTPC)
+ .configureMaterials(MaterialsUEVplus.ExcitedDTPC)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTPC, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTPC, 1L),
ItemList.Cell_Empty.get(1L));
GT_FluidFactory.builder("ExcitedDTRC")
.withLocalizedName("Excited Dimensionally Transcendent Resplendent Catalyst")
.withStateAndTemperature(LIQUID, 500000000)
.buildAndRegister()
- .configureMaterials(Materials.ExcitedDTRC)
+ .configureMaterials(MaterialsUEVplus.ExcitedDTRC)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTRC, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTRC, 1L),
ItemList.Cell_Empty.get(1L));
GT_FluidFactory.builder("ExcitedDTEC")
.withLocalizedName("Excited Dimensionally Transcendent Exotic Catalyst")
.withStateAndTemperature(LIQUID, 500000000)
.buildAndRegister()
- .configureMaterials(Materials.ExcitedDTEC)
+ .configureMaterials(MaterialsUEVplus.ExcitedDTEC)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.ExcitedDTEC, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTEC, 1L),
+ ItemList.Cell_Empty.get(1L));
+ GT_FluidFactory.builder("ExcitedDTSC")
+ .withLocalizedName("Excited Dimensionally Transcendent Stellar Catalyst")
+ .withStateAndTemperature(LIQUID, 500000000)
+ .buildAndRegister()
+ .configureMaterials(MaterialsUEVplus.ExcitedDTSC)
+ .registerBContainers(
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.ExcitedDTSC, 1L),
ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder(Materials.RawStarMatter.mName)
- .withLocalizedName(Materials.RawStarMatter.mLocalizedName)
+ GT_FluidFactory.builder(MaterialsUEVplus.RawStarMatter.mName)
+ .withLocalizedName(MaterialsUEVplus.RawStarMatter.mLocalizedName)
.withStateAndTemperature(LIQUID, 10_000_000)
.buildAndRegister()
- .configureMaterials(Materials.RawStarMatter)
+ .configureMaterials(MaterialsUEVplus.RawStarMatter)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.RawStarMatter, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.RawStarMatter, 1L),
ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder(Materials.Space.mName)
- .withLocalizedName(Materials.Space.mLocalizedName)
+ GT_FluidFactory.builder(MaterialsUEVplus.Space.mName)
+ .withLocalizedName(MaterialsUEVplus.Space.mLocalizedName)
.withStateAndTemperature(MOLTEN, 0)
.buildAndRegister()
- .configureMaterials(Materials.Space)
+ .configureMaterials(MaterialsUEVplus.Space)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Space, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Space, 1L),
ItemList.Cell_Empty.get(1L));
- GT_FluidFactory.builder(Materials.Time.mName)
- .withLocalizedName(Materials.Time.mLocalizedName)
+ GT_FluidFactory.builder(MaterialsUEVplus.Time.mName)
+ .withLocalizedName(MaterialsUEVplus.Time.mLocalizedName)
.withStateAndTemperature(MOLTEN, 0)
.buildAndRegister()
- .configureMaterials(Materials.Time)
+ .configureMaterials(MaterialsUEVplus.Time)
.registerBContainers(
- GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Time, 1L),
+ GT_OreDictUnificator.get(OrePrefixes.cell, MaterialsUEVplus.Time, 1L),
ItemList.Cell_Empty.get(1L));
GT_FluidFactory.builder("fieryblood")
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 86069b8327..f30347e94b 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -9549,7 +9549,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
makeWires(Materials.SuperconductorUMV, 2089, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[12], false, true);
makeWires(Materials.Ichorium, 2600, 2L, 2L, 12L, GT_Values.V[9], false, true);
- makeWires(Materials.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true);
+ makeWires(MaterialsUEVplus.SpaceTime, 2606, 0L, 0L, 1_000_000L, GT_Values.V[14], false, true);
if (!GT_Mod.gregtechproxy.mDisableIC2Cables) {
GT_ModHandler.addCraftingRecipe(
@@ -9676,18 +9676,30 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC
480,
600,
true);
- generateFluidPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5300, 250000, 2147483647, true);
- generateFluidMultiPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5305, 250000, 2147483647, true);
generateFluidPipes(
- Materials.TranscendentMetal,
- Materials.TranscendentMetal.mName,
+ MaterialsUEVplus.SpaceTime,
+ MaterialsUEVplus.SpaceTime.mName,
+ 5300,
+ 250000,
+ 2147483647,
+ true);
+ generateFluidMultiPipes(
+ MaterialsUEVplus.SpaceTime,
+ MaterialsUEVplus.SpaceTime.mName,
+ 5305,
+ 250000,
+ 2147483647,
+ true);
+ generateFluidPipes(
+ MaterialsUEVplus.TranscendentMetal,
+ MaterialsUEVplus.TranscendentMetal.mName,
5310,
220000,
2147483647,
true);
generateFluidMultiPipes(
- Materials.TranscendentMetal,
- Materials.TranscendentMetal.mName,
+ MaterialsUEVplus.TranscendentMetal,
+ MaterialsUEVplus.TranscendentMetal.mName,
5315,
220000,
2147483647,
diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
index a43cb8f89d..9bb65b2230 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MultiTileEntities.java
@@ -7,6 +7,7 @@ import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import gregtech.api.enums.Materials;
+import gregtech.api.enums.MaterialsUEVplus;
import gregtech.api.multitileentity.MultiTileEntityBlock;
import gregtech.api.multitileentity.MultiTileEntityRegistry;
import gregtech.api.multitileentity.multiblock.base.WallShareablePart;
@@ -74,7 +75,7 @@ public class GT_Loader_MultiTileEntities implements Runnable {
.name("Inventory Upgrade LV")
.category("MultiBlock Special Casing")
.setBlock(casing)
- .material(Materials.SpaceTime)
+ .material(MaterialsUEVplus.SpaceTime)
.texture("metalwall")
.upgradeInventorySize(16)
.tier(1)