diff options
author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2023-01-25 05:22:14 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-25 05:22:14 +0000 |
commit | d9f473283fa606662f57bbafdd49be37728b0eb0 (patch) | |
tree | 3797db9d52f714a5686675ba8a4b5d67c4ce6680 /src/main/java/gregtech/loaders/postload/chains | |
parent | e197a79a0558c6ce1b116d871a71a214962a01a3 (diff) | |
download | GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.gz GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.tar.bz2 GT5-Unofficial-d9f473283fa606662f57bbafdd49be37728b0eb0.zip |
EOH materials + Allow materials to pick their processing tier (#1671)
* Begin addition of tiered material manipulation
* Dwarf matter
* Add hardcoded EU tiers for wider usage.
* New material images etc
* Nugget processing tiers
* Move iron nugget to wrought iron smelting to the correct place
* Add white dwarf shapes
* Add white dwarf shapes
* Additional retiering options for EU consumption on material part generation
* White dwarf matter complete
* Tier neutronium processing at ZPM
* Spotless
* More adjustments
* Renaming files
* Add new overlays for magneto material and more name adjustments
* Add no recipes subtag
* Spotless + name adjustment
* Undo isCustom to maintain potential public variable references in addons.
* Undo isCustom to maintain potential public variable references in addons.
* Fix fluid registry corruption.
* Add rotor EU override
* Add rotor EU override
* Make neutronium mass more reasonable
* Add proper time adjustments to rotor (probably an old oversight)
* Adjust enums to use VP rather than recalculate
* Fix typos on EU usage
* spotlessApply (#1672)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Change setProcessingMaterialTierEU to accept long.
* Small fix
* Add space and time materials
* Add new forge hammer support
* Update tooltip
* Expand laser engraver slots.
* spotlessApply (#1673)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Reserve texture page.
* Modernise GT circuit usage
* Add oversight in assembler frame recipe
* Add missing MHDCSM overlay textures
* Remove small and tiny MHDCSM dusts
* Fix error in ingot texture
* Fix NO_RECIPES not applying to frame boxes
* Restore missing ingot
* Add rod handles for materials
* Fix frame box auto generating with NO_RECIPEs tag
* recipe
* Spotless
* Add MOD_ID_GTPP as modid
* spotlessApply (#1675)
Co-authored-by: Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* Remove smelting spacetime from furnace (why does this exist?)
* Recipes + new storage blocks for materials
* Bedrockium LuV -> EV
* SpaceTime UMV -> UIV
* TranscendentMetal UIV -> UEV
* MagnetoThingy and dward mats UXV -> UMV
* update buildscript
* yeet magic number that could be
* spotlessApply
* Make the nanite tier 3, colen request
* Up nanite tier
* Comment
* Change name
* Change name
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: adam riondy <adampoplol@gmail.com>
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/chains')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java | 79 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java | 6 |
2 files changed, 71 insertions, 14 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 bfbfd3ffd8..9fa4059d5a 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_NaniteChain.java @@ -1,10 +1,13 @@ package gregtech.loaders.postload.chains; +import static gregtech.api.enums.GT_Values.MOD_ID_DC; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; +import static gregtech.api.util.GT_ModHandler.getModItem; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; import gregtech.api.enums.OrePrefixes; -import gregtech.api.util.GT_ModHandler; import gregtech.api.util.GT_OreDictUnificator; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.Fluid; @@ -15,9 +18,9 @@ public class GT_NaniteChain { public static void run() { - ItemStack aUVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.MysteriousCrystalLens", 0); - ItemStack aUHVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.ChromaticLens", 0); - ItemStack aUEVTierLens = GT_ModHandler.getModItem("dreamcraft", "item.RadoxPolymerLens", 0); + ItemStack aUVTierLens = getModItem(MOD_ID_DC, "item.MysteriousCrystalLens", 0); + ItemStack aUHVTierLens = getModItem(MOD_ID_DC, "item.ChromaticLens", 0); + ItemStack aUEVTierLens = getModItem(MOD_ID_DC, "item.RadoxPolymerLens", 0); ItemStack aUIVTierLens = ItemList.EnergisedTesseract.get(0); ItemStack aUMVTierLens = GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 0, false); @@ -75,17 +78,17 @@ public class GT_NaniteChain { GT_Values.RA.addNanoForgeRecipe( new ItemStack[] { aUVTierLens, - GT_ModHandler.getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), + getModItem("bartworks", "bw.werkstoffblockscasingadvanced.01", 8, 31776), ItemList.Circuit_Chip_SoC.get(64) }, - new FluidStack[] {Materials.UUMatter.getFluid(200000)}, + new FluidStack[] {Materials.UUMatter.getFluid(200_000)}, new ItemStack[] { Materials.Carbon.getNanite(64), }, null, null, 500 * 20, - 10000000, + 10_000_000, 1); // Silver Nanites - Used in Tier 2 PCB Factory to improve board production @@ -96,7 +99,7 @@ public class GT_NaniteChain { null, null, 750 * 20, - 10000000, + 10_000_000, 2); // Neutronium Nanites - Used to upgrade the Nano Forge to Tier 2 @@ -112,7 +115,7 @@ public class GT_NaniteChain { null, null, 100 * 20, - 100000000, + 100_000_000, 1); // Gold Nanites - Used in Tier 3 PCB Factory to improve board production @@ -122,8 +125,8 @@ public class GT_NaniteChain { new ItemStack[] {Materials.Gold.getNanite(1)}, null, null, - 1000 * 20, - 100000000, + 1_000 * 20, + 100_000_000, 3); // Transcendent Metal Nanites - Used to upgrade the Nano Forge to Tier 3 @@ -140,7 +143,59 @@ public class GT_NaniteChain { null, null, 750 * 20, - 1000000000, + 1_000_000_000, 2); + + // White Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. + GT_Values.RA.addNanoForgeRecipe( + new ItemStack[] { + aUMVTierLens, + GT_OreDictUnificator.get("lensMagnetoResonatic", 0), + getModItem( + MOD_ID_GTPP, + "MU-metaitem.01", + 0, + 32105), // Quantum Anomaly, couldn't find any better naming + Materials.WhiteDwarfMatter.getBlocks(8), + getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + }, + new FluidStack[] { + Materials.UUMatter.getFluid(500_000), + Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("space", 720), + }, + new ItemStack[] {Materials.WhiteDwarfMatter.getNanite(4)}, + null, + null, + 750 * 20, + 2_000_000_000, + 3); + + // Black Dwarf Matter Nanites. Used to make Magnetohydrodynamically constrained star matter. + GT_Values.RA.addNanoForgeRecipe( + new ItemStack[] { + aUMVTierLens, + GT_OreDictUnificator.get("lensMagnetoResonatic", 0), + getModItem( + MOD_ID_GTPP, + "MU-metaitem.01", + 0, + 32105), // Quantum Anomaly, couldn't find any better naming + Materials.BlackDwarfMatter.getBlocks(8), + getModItem(MOD_ID_DC, "item.PicoWafer", 32), + getModItem("GoodGenerator", "huiCircuit", 1, 4) // Paradox circuit + }, + new FluidStack[] { + Materials.UUMatter.getFluid(500_000), + Materials.RawStarMatter.getFluid(50_000), + FluidRegistry.getFluidStack("time", 720), + }, + new ItemStack[] {Materials.BlackDwarfMatter.getNanite(4)}, + null, + null, + 750 * 20, + 2_000_000_000, + 3); } } 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 7cf487b162..2b6eaf212a 100644 --- a/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java +++ b/src/main/java/gregtech/loaders/postload/chains/GT_PCBFactoryRecipes.java @@ -1,5 +1,7 @@ package gregtech.loaders.postload.chains; +import static gregtech.api.enums.GT_Values.MOD_ID_GTPP; + import gregtech.api.enums.GT_Values; import gregtech.api.enums.ItemList; import gregtech.api.enums.Materials; @@ -62,7 +64,7 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[9]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("miscutils", "blockFrameGtCelestialTungsten", 1), + GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtCelestialTungsten", 1), Materials.get("Quantum").getPlates(6) }, null, @@ -71,7 +73,7 @@ public class GT_PCBFactoryRecipes { (int) GT_Values.VP[11]); GT_Values.RA.addAssemblerRecipe( new ItemStack[] { - GT_ModHandler.getModItem("miscutils", "blockFrameGtHypogen", 1), + GT_ModHandler.getModItem(MOD_ID_GTPP, "blockFrameGtHypogen", 1), GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Infinity, 2), Materials.Thulium.getPlates(6) }, |