diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
4 files changed, 252 insertions, 12 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 0146f3a10e..f5dd2dcc05 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -151,7 +151,7 @@ public class GT_NaniteChain { getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("spatialFluid", 720), }, + Materials.Space.getMolten(720), }, new ItemStack[] { Materials.WhiteDwarfMatter.getNanite(4) }, null, null, @@ -169,12 +169,31 @@ public class GT_NaniteChain { getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit }, new FluidStack[] { Materials.UUMatter.getFluid(500_000), Materials.RawStarMatter.getFluid(50_000), - FluidRegistry.getFluidStack("temporalFluid", 720), }, + Materials.Time.getMolten(720), }, new ItemStack[] { Materials.BlackDwarfMatter.getNanite(4) }, null, null, 750 * 20, 2_000_000_000, 3); + + // Universium nanites. + GT_Values.RA.addNanoForgeRecipe( + new ItemStack[] { aUMVTierLens, + // Quantum Anomaly, couldn't find any better naming. + getModItem(MOD_ID_GTPP, "MU-metaitem.01", 0, 32105), Materials.Universium.getBlocks(8), + + ItemList.Optically_Perfected_CPU.get(16), ItemList.Optically_Compatible_Memory.get(16), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + }, + new FluidStack[] { Materials.SpaceTime.getMolten(144), Materials.Infinity.getMolten(576), + Materials.UUMatter.getFluid(1_000_000), }, + new ItemStack[] { Materials.Universium.getNanite(2) }, + null, + null, + 750 * 20, + 2_000_000_000, + 3); + } } diff --git a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java index 352b860724..f269344b46 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/FluidSolidifierRecipes.java @@ -252,5 +252,234 @@ public class FluidSolidifierRecipes implements Runnable { getModItem(MOD_ID_RC, "tile.railcraft.anvil", 1L, 0), 128, 16); + + final int whiteDwarfShapeSolidifierTime = 10 * 20; + final int fluidPerShapeSolidifierRecipe = 576; + { + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Bottle.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Bottle.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Plate.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Plate.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Cell.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Cell.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Ring.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Ring.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Rod.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Rod.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Bolt.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Bolt.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Ingot.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Ingot.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Wire.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Wire.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Casing.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Casing.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pipe_Tiny.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Tiny.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pipe_Small.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Small.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pipe_Medium.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Medium.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pipe_Large.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Large.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pipe_Huge.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pipe_Huge.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Block.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Block.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Sword.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Sword.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Pickaxe.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Pickaxe.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Shovel.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Shovel.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Axe.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Axe.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Hoe.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Hoe.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Hammer.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Hammer.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_File.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_File.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Saw.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Saw.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Gear.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Gear.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Rotor.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Rotor.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Turbine_Blade.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Turbine_Blade.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_Small_Gear.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_Small_Gear.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + GT_Values.RA.addFluidSolidifierRecipe( + new ItemStack[] { ItemList.Shape_Extruder_ToolHeadDrill.get(1) }, + new FluidStack[] { Materials.WhiteDwarfMatter.getMolten(fluidPerShapeSolidifierRecipe) }, + new ItemStack[] { ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill.get(1) }, + new FluidStack[] { GT_Values.NF }, + (int) TierEU.RECIPE_UMV, + whiteDwarfShapeSolidifierTime); + + } } } 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 59da1c074b..9fa931d4a9 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 @@ -606,7 +606,7 @@ public class GT_Loader_Item_Block_And_Fluid implements Runnable { "gt.blockmetal9", new Materials[] { Materials.Cryolite, Materials.SiliconSG, MaterialsKevlar.NickelAluminide, Materials.SpaceTime, Materials.TranscendentMetal, Materials.Oriharukon, - Materials.WhiteDwarfMatter, Materials.BlackDwarfMatter }, + Materials.WhiteDwarfMatter, Materials.BlackDwarfMatter, Materials.Universium }, OrePrefixes.block, gregtech.api.enums.Textures.BlockIcons.STORAGE_BLOCKS12); 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 91bfc45f65..f8eca60b6c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -9864,15 +9864,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC gregtech.api.enums.GT_Values.V[11], false, false); - makeWires( - Materials.SuperconductorUMVBase, - 2072, - 2L, - 1048576L, - 32L, - gregtech.api.enums.GT_Values.V[12], - false, - false); + makeWires(Materials.SuperconductorUMVBase, 2072, 2L, 1048576L, 32L, GT_Values.V[12], false, false); // Actual superconductors. makeWires(Materials.SuperconductorMV, 2320, 0L, 0L, 4L, gregtech.api.enums.GT_Values.V[2], false, true); |