diff options
author | RIONDY 'POPlol333' Adam <76914762+POPlol333@users.noreply.github.com> | 2022-08-06 05:53:40 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-08-06 04:53:40 +0100 |
commit | 4b30e9d836a97dff624dd6f5325a3e1b2297c6c3 (patch) | |
tree | e2cfa159076ea6e752f977bd0e55144ead6624aa /src/main/java/gregtech/loaders | |
parent | 479e3a1db86c810d27c8be0c5ba7d8220b607d31 (diff) | |
download | GT5-Unofficial-4b30e9d836a97dff624dd6f5325a3e1b2297c6c3.tar.gz GT5-Unofficial-4b30e9d836a97dff624dd6f5325a3e1b2297c6c3.tar.bz2 GT5-Unofficial-4b30e9d836a97dff624dd6f5325a3e1b2297c6c3.zip |
Adding UIV and UMV SC (#1213)
* fixing sphalerite electrolyze recipe
* beginning of UIV/UMV SC
* real sc mat
* real umv sc craft
* fixes sc umv heat temp
Diffstat (limited to 'src/main/java/gregtech/loaders')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 54 | ||||
-rw-r--r-- | src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java | 5 |
2 files changed, 59 insertions, 0 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index 527b3132b8..7d1da09e51 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -790,6 +790,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuvwire, 21L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Neutronium, 14L), ItemList.Electric_Pump_UV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(20000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUV, 21L), 1600, 491520); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.Longasssuperconductornameforuhvwire, 24L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Bedrockium, 16L), ItemList.Electric_Pump_UHV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(24000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUHV, 24L), 3200, 1966080); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 27L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.Infinity, 18L), ItemList.Electric_Pump_UEV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(28000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEV, 27L), 3200, 7864320); + GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 33L), GT_OreDictUnificator.get(OrePrefixes.pipeTiny, Materials.SpaceTime, 22L), ItemList.Electric_Pump_UMV.get(1L), GT_Utility.getIntegratedCircuit(9)}, Materials.Helium.getGas(36000L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMV, 33L), 3200, 125829120); GT_Values.RA.addAssemblerRecipe(new ItemStack[]{GT_OreDictUnificator.get(OrePrefixes.stick, Materials.IronMagnetic, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Lead, 16L), GT_Utility.getIntegratedCircuit(1)}, GT_Values.NF, ItemList.ULV_Coil.get(1L), 200, 8); @@ -867,6 +868,9 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.stick, Materials.Americium, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 4L), 200, 16); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Americium, 1L), GT_OreDictUnificator.get(OrePrefixes.wireFine, Materials.Americium, 8L), 400, 30); GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SpaceTime, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SpaceTime, 2L), 400, 32000); + GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUEVBase, 2L), 50, 4); + GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUIVBase, 2L), 50, 4); + GT_Values.RA.addWiremillRecipe(GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.wireGt01, Materials.SuperconductorUMVBase, 2L), 50, 4); GT_Values.RA.addDistilleryRecipe(GT_Utility.getIntegratedCircuit(24), Materials.Creosote.getFluid(100L), Materials.Lubricant.getFluid(32L), 240, 30, false); GT_Values.RA.addDistilleryRecipe(GT_Utility.getIntegratedCircuit(24), Materials.SeedOil.getFluid(32L), Materials.Lubricant.getFluid(8L), 80, 30, false); @@ -1536,6 +1540,8 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuvwire, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuvwire, 1L), 800, 491520); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.Longasssuperconductornameforuhvwire, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Longasssuperconductornameforuhvwire, 1L), 1600, 1966080); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUEVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUEVBase, 1L), 3200, 7864320); + GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUIVBase, 1L), 3200, 30198988); + GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.SuperconductorUMVBase, 1L), 3200, 120795955); GT_Values.RA.addBlastRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUEVBase, 1L), @@ -1561,6 +1567,54 @@ public class GT_MachineRecipeLoader implements Runnable { 11800 ); // 0.45 * 19660 = 8847 + GT_Values.RA.addBlastRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1L), + GT_Utility.getIntegratedCircuit(1), + GT_Values.NF, + GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L), + GT_Values.NI, + 19660, + 491520*4, + 12700 + ); + + GT_Values.RA.addBlastRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUIVBase, 1L), + GT_Utility.getIntegratedCircuit(11), + Materials.Radon.getGas(1000L), + GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUIVBase, 1L), + GT_Values.NI, + 8847, + 491520*4, + 12700 + ); // 0.45 * 19660 = 8847 + + GT_Values.RA.addBlastRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1L), + GT_Utility.getIntegratedCircuit(1), + GT_Values.NF, + GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L), + GT_Values.NI, + 19660, + 1966080*4, + 13600 + ); + + GT_Values.RA.addBlastRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SuperconductorUMVBase, 1L), + GT_Utility.getIntegratedCircuit(11), + Materials.Radon.getGas(1000L), + GT_Values.NF, + GT_OreDictUnificator.get(OrePrefixes.ingotHot, Materials.SuperconductorUMVBase, 1L), + GT_Values.NI, + 8847, + 1966080*4, + 13600 + ); // 0.45 * 19660 = 8847 + //Plasma Freezing GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Americium, 1L), GT_OreDictUnificator.get(OrePrefixes.cellMolten, Materials.Americium, 1L), 20, 30720); GT_Values.RA.addVacuumFreezerRecipe(GT_OreDictUnificator.get(OrePrefixes.cellPlasma, Materials.Helium, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Helium, 1L), 5, 120); 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 32f67857dd..f11b598b1c 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -1397,6 +1397,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI makeWires(Materials.Longasssuperconductornameforuvwire , 2500, 2L, 4096L, 12L, gregtech.api.enums.GT_Values.V[8], false, false); makeWires(Materials.Longasssuperconductornameforuhvwire , 2520, 2L, 16384L, 16L, gregtech.api.enums.GT_Values.V[9], false, false); makeWires(Materials.SuperconductorUEVBase , 2032, 2L, 65536L, 24L, gregtech.api.enums.GT_Values.V[10], false, false); + makeWires(Materials.SuperconductorUIVBase , 2052, 2L, 262144L, 32L, 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); // Actual superconductors. makeWires(Materials.SuperconductorMV , 2320, 0L, 0L, 4L , gregtech.api.enums.GT_Values.V[2] , false, true); @@ -1408,6 +1410,8 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI makeWires(Materials.SuperconductorUV , 2440, 0L, 0L, 32L, gregtech.api.enums.GT_Values.V[8] , false, true); makeWires(Materials.SuperconductorUHV, 2020, 0L, 0L, 48L, gregtech.api.enums.GT_Values.V[9] , false, true); makeWires(Materials.SuperconductorUEV, 2026, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[10], false, true); + makeWires(Materials.SuperconductorUIV, 2081, 0L, 0L, 64L, gregtech.api.enums.GT_Values.V[11], false, true); + 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); @@ -1425,6 +1429,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI GT_OreDictUnificator.registerOre(OrePrefixes.pipeLarge.get(Materials.Wood), new GT_MetaPipeEntity_Fluid(5103, "GT_Pipe_Wood_Large", "Large Wooden Fluid Pipe", 0.75F, Materials.Wood, 60, 350, false).getStackForm(1L)); generateFluidPipes(Materials.Copper, Materials.Copper.mName, 5110, 20, 1000, true); + generateFluidPipes(Materials.SpaceTime, Materials.SpaceTime.mName, 5730, 250000, 10000000, true); generateFluidMultiPipes(Materials.Copper, Materials.Copper.mName, 5115, 20, 1000, true); generateFluidPipes(Materials.Bronze, Materials.Bronze.mName, 5120, 120, 2000, true); generateFluidMultiPipes(Materials.Bronze, Materials.Bronze.mName, 5125, 120, 2000, true); |