diff options
| author | Connor-Colenso <52056774+Connor-Colenso@users.noreply.github.com> | 2022-06-19 19:47:52 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-19 20:47:52 +0200 |
| commit | 18c7ac051b3e7c392666c63b7b439560ae915c07 (patch) | |
| tree | bcd6e968f38852bc51a6c509d2c1a273455e32d5 /src/main/java/gregtech/loaders/postload | |
| parent | fc067041e63fe5feae6c0498e69622944229942f (diff) | |
| download | GT5-Unofficial-18c7ac051b3e7c392666c63b7b439560ae915c07.tar.gz GT5-Unofficial-18c7ac051b3e7c392666c63b7b439560ae915c07.tar.bz2 GT5-Unofficial-18c7ac051b3e7c392666c63b7b439560ae915c07.zip | |
Add Plasma Forge (Endgame multi) (#1076)
* Basis of changes.
* Fix item stack and fluid vanishing.
* Add new plasma forge UI, change tooltip and fix recipe map.
* Fix corrupted fluid registry.
* Fix fluids in recipes. Items still need adjusting.
* Working.
* Liquid spacetime and rename multi to D.T.P.S. so it can fit in GUI properly.
* Make animation of spacetime fluid slower.
* Fix recipe map (again).
* Remove screwdriver junk. Clean up code slightly.
* More cleaning.
* Comments
* Add hatch limitations and add some additional information. Also update NEI GUI.
* Add proper recipes and change SpaceTime to a fluid not a gas.
* Remove depreciated coil check (since I stole the IDs).
* Remove depreciated coil check (since I stole the IDs). Add more comments.
* Change temp of SpaceTime.
* Add catalyst recipes + support for 16:16 fusion recipes.
* Add comments.
* Scala fix maybe?
* Change plasma forge GUI.
* Uncap temperature of materials. (Short -> Int)
* Add chunkloading support (when multi is active).
* Fix NEI merge issues.
* fix used ids in kevlar
* Add fluid support for laser engraver.
* fix sh***t
(cherry picked from commit 01851c100c52fd8292028cf6dda2cb136c617afc)
* Add new intermediate materials to facilitate crafting. Also fix fusion typo.
* Fix heat/fluid quantity display to be formatted correctly.
* Change recipes to be more balanced.
* Change residue fluid texture.
* Restore better naming for multiblock.
* Fix recipe typo.
* Fix text not wrapping in multi controller.
* Give laser engraver internal fluid storage.
* Add IMC NEI support.
* Update material properties.
* Remove old dev comments.
* Fix NEI texture.
Co-authored-by: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload')
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 184 |
1 files changed, 182 insertions, 2 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 567aa35940..a89623a1ab 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -578,8 +578,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Coated_Basic.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Basic, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Bronze, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Bronze, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Bronze, 1),GT_Utility.getIntegratedCircuit(1)}, tMat.getMolten(1152L * tMultiplier / 2L), GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 1), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Good.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Good, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Steel, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Steel, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Steel, 1),GT_Utility.getIntegratedCircuit(1)}, tMat.getMolten(1152L * tMultiplier / 2L), GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 2), 200, 30); GT_Values.RA.addCircuitAssemblerRecipe(new ItemStack[]{ItemList.Circuit_Board_Phenolic_Good.get(1L), GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Advanced, 2), GT_OreDictUnificator.get(OrePrefixes.foil, Materials.Electrum, 2), GT_OreDictUnificator.get(OrePrefixes.screw, Materials.Electrum, 4), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Electrum, 1),GT_Utility.getIntegratedCircuit(1)}, tMat.getMolten(1152L * tMultiplier / 2L), GT_ModHandler.getModItem("Forestry", "chipsets", 1L, 3), 200, 30); - //Circuit soldering - //Integraded Circuits + // Circuit soldering + // Integraded Circuits for (ItemStack tPlate : new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.WroughtIron, 1L), GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Aluminium, 1L)}) { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{new ItemStack(Blocks.lever, 1, 32767), tPlate, GT_Utility.getIntegratedCircuit(1)}, tMat.getMolten(144L * tMultiplier / 2L), ItemList.Cover_Controller.get(1L), 800, 16); @@ -601,6 +601,186 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addBlastRecipe(GT_OreDictUnificator.get(OrePrefixes.block, Materials.Silicon, 64), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 4), Materials.Radon.getGas(16000), null, ItemList.Circuit_Silicon_Ingot5.get(1), null, 21000, 30720, 9000); GT_Values.RA.addCutterRecipe(ItemList.Circuit_Silicon_Ingot5.get(1), GT_Values.NI, ItemList.Circuit_Silicon_Wafer5.get(64), ItemList.Circuit_Silicon_Wafer5.get(64), 3200, 7680, true); + // ----------------------------------- Plasma Forge ------------------------------------------------------------------------------------------ + + // See https://docs.google.com/spreadsheets/d/1_n2HSFyzfNzkJHYBPFu3HTZvkh69GBi5LXw2c9FyG9o/edit?usp=sharing for details on plasma forge maths. + + // Neutronium Smelting. + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTCC.getFluid(20645L), Materials.Iron.getMolten(73728L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(2580L), Materials.Neutronium.getMolten(73728L)}, + 2500, 50331648, 10900); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTPC.getFluid(9861L), Materials.Iron.getMolten(147456L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(2465L), Materials.Neutronium.getMolten(147456L)}, + 1250, 100663296, 11800); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTRC.getFluid(4456L), Materials.Iron.getMolten(294912L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(2228L), Materials.Neutronium.getMolten(294912L)}, + 625, 201326592, 12700); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTEC.getFluid(1905L), Materials.Iron.getMolten(589824L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(1905L), Materials.Neutronium.getMolten(589824L)}, + 312, 402653184, 13600); + + // Cosmic Neutronium Smelting. + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTCC.getFluid(35283L), Materials.Copper.getMolten(73728L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(4410), Materials.CosmicNeutronium.getMolten(73728L)}, + 4200, 51200000, 10900); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTPC.getFluid(16853L), Materials.Copper.getMolten(147456L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(4213L), Materials.CosmicNeutronium.getMolten(147456L)}, + 2100, 102400000, 11800); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTRC.getFluid(7616L), Materials.Copper.getMolten(294912L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(3808L), Materials.CosmicNeutronium.getMolten(294912L)}, + 1050, 204800000, 12700); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTEC.getFluid(3256L), Materials.Copper.getMolten(589824L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(3256L), Materials.CosmicNeutronium.getMolten(589824L)}, + 525, 409600000, 13600); + + // Infinity Smelting. + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTCC.getFluid(91933L), Materials.InfinityCatalyst.getMolten(28800L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(11491L), Materials.Infinity.getMolten(28800L)}, + 4200, 112066560, 10900); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTPC.getFluid(43917), Materials.InfinityCatalyst.getMolten(57600L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(10979), Materials.Infinity.getMolten(57600L)}, + 2100, 224133120, 11800); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTRC.getFluid(19843L), Materials.InfinityCatalyst.getMolten(115200L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(9921L), Materials.Infinity.getMolten(115200L)}, + 1050, 448266240, 12700); + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTEC.getFluid(8484L), Materials.InfinityCatalyst.getMolten(230400L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(8484L), Materials.Infinity.getMolten(230400L)}, + 525, 896532480, 13600); + + // Misc + + GT_Values.RA.addPlasmaForgeRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResidue.getFluid(10000L), Materials.Infinity.getMolten(9216L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.SpaceTime.getFluid(1L)}, + 2000, 2000000000, 12700); + + // ----------------------------------------------------------------------------------------------------------------------------- + + // Catalysts for Plasma Forge. + GT_Values.RA.addFusionReactorRecipe( + new FluidStack[]{Materials.Helium.getPlasma(10L), Materials.Iron.getPlasma(10L), Materials.Calcium.getPlasma(10L), Materials.Niobium.getPlasma(10L)}, + new FluidStack[]{Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(10L)}, + 20, 32500, 150000000 + ); + + GT_Values.RA.addFusionReactorRecipe( + new FluidStack[]{Materials.Helium.getPlasma(10L), Materials.Iron.getPlasma(10L), Materials.Calcium.getPlasma(10L), Materials.Niobium.getPlasma(10L), Materials.Radon.getPlasma(10L), Materials.Nickel.getPlasma(10L), Materials.Boron.getPlasma(10L), Materials.Sulfur.getPlasma(10L)}, + new FluidStack[]{Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(10L)}, + 20, 65000, 300000000 + ); + + GT_Values.RA.addFusionReactorRecipe( + new FluidStack[]{Materials.Helium.getPlasma(10L), Materials.Iron.getPlasma(10L), Materials.Calcium.getPlasma(10L), Materials.Niobium.getPlasma(10L), Materials.Radon.getPlasma(10L), Materials.Nickel.getPlasma(10L), Materials.Boron.getPlasma(10L), Materials.Sulfur.getPlasma(10L), Materials.Nitrogen.getPlasma(10L), Materials.Zinc.getPlasma(10L), Materials.Silver.getPlasma(10L), Materials.Titanium.getPlasma(10L)}, + new FluidStack[]{Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(10L)}, + 20, 130000, 600000000 + ); + + GT_Values.RA.addFusionReactorRecipe( + new FluidStack[]{Materials.Helium.getPlasma(10L), Materials.Iron.getPlasma(10L), Materials.Calcium.getPlasma(10L), Materials.Niobium.getPlasma(10L), Materials.Radon.getPlasma(10L), Materials.Nickel.getPlasma(10L), Materials.Boron.getPlasma(10L), Materials.Sulfur.getPlasma(10L), Materials.Nitrogen.getPlasma(10L), Materials.Zinc.getPlasma(10L), Materials.Silver.getPlasma(10L), Materials.Titanium.getPlasma(10L), Materials.Americium.getPlasma(10L), Materials.Bismuth.getPlasma(10L), Materials.Oxygen.getPlasma(10L), Materials.Tin.getPlasma(10L)}, + new FluidStack[]{Materials.DimensionallyTranscendentExoticCatalyst.getFluid(10L)}, + 20, 260000, 1200000000 + ); + + // ----------------------------------------------------------------------------------------------------------------------------- + + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentCrudeCatalyst.getFluid(1L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTCC.getFluid(1L)}, + 5, 8000000, true + ); + + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentProsaicCatalyst.getFluid(1L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTPC.getFluid(1L)}, + 5, 32000000, true + ); + + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentResplendentCatalyst.getFluid(1L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTRC.getFluid(1L)}, + 5, 128000000, true + ); + + GT_Values.RA.addLaserEngraverRecipe( + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.DimensionallyTranscendentExoticCatalyst.getFluid(1L)}, + + new ItemStack[]{GT_Values.NI}, + new FluidStack[]{Materials.ExcitedDTEC.getFluid(1L)}, + 5, 512000000, true + ); + + // ----------------------------------------------------------------------------------------------------------------------------- + GT_Values.RA.addAssemblerRecipe(new ItemStack(Blocks.redstone_torch, 2, 32767), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Redstone, 1L), Materials.Concrete.getMolten(144L), new ItemStack(Items.repeater, 1, 0), 80, 10); GT_Values.RA.addAssemblerRecipe(new ItemStack(Items.leather, 1, 32767), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(72L), new ItemStack(Items.name_tag, 1, 0), 100, 8); GT_Values.RA.addAssemblerRecipe(GT_ModHandler.getModItem(MOD_ID_DC, "item.ArtificialLeather", 1L, 0), new ItemStack(Items.lead, 1, 32767), Materials.Glue.getFluid(72L), new ItemStack(Items.name_tag, 1, 0), 100, 8); |
