diff options
author | Steelux <70096037+Steelux8@users.noreply.github.com> | 2022-10-23 21:00:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-10-23 21:00:24 +0100 |
commit | d1d6c620c123c5001fb5b9670686f567991aafb5 (patch) | |
tree | 1b74f170a3213cff8018691fe4bfd2110892c6df /src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | |
parent | 3c0c9939510b0aa779b9dd0b118f1d05b4477d5b (diff) | |
download | GT5-Unofficial-d1d6c620c123c5001fb5b9670686f567991aafb5.tar.gz GT5-Unofficial-d1d6c620c123c5001fb5b9670686f567991aafb5.tar.bz2 GT5-Unofficial-d1d6c620c123c5001fb5b9670686f567991aafb5.zip |
Replace TSS Coils with Titanium-Platinum Ones (#1211)
* Replace TSS Coils with Titanium-Platinum Ones
- Created a new material, TPV-Alloy, made from Titanium, Platinum and Vanadium (3/3/1);
- Replaced the Tungstensteel Coil Block with a TPV one, to make it properly included in EV while adding a Platinum sink in that tier;
* Simplified Metal Proportion for TPV
* change tpv ebf temp to 3k to be even with TSS
(cherry picked from commit 52dda9f666d8e1b2d220a0b2d9e24513ad8a4490)
* add TPV mixer recipe
(cherry picked from commit 30b6cf62c14165add271a1ecc4a322ab0ce609d1)
* add tpv as metal via tag
(cherry picked from commit 75dba7283e26b6e2f717a3230d6369e4cbe20c8e)
* Spotless apply for branch EV_Coil_Change for #1211 (#1482)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
* move TSS and TPV to ev (Mixer recipe)
(cherry picked from commit 74dc0da61db49102cc3e073f5c506e8c494c508f)
* add info to Nei
* Spotless apply for branch EV_Coil_Change for #1211 (#1483)
* Remove convert gendustry bees code (#1187)
* Remove convert gendustry bees code
* fix derp. run BS update
Co-authored-by: Martin Robertz <dream-master@gmx.net>
* Added check to API if the block should drop its inventory on break (#1479)
* Added check to API if the block should drop its inventory on break
* Apply spotless
* Changed should drop flag to take index argument
* spotlessApply
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: Maxim <maxim235@gmx.de>
Co-authored-by: Steelux <70096037+Steelux8@users.noreply.github.com>
Co-authored-by: GitHub GTNH Actions <>
Co-authored-by: Martin Robertz <dream-master@gmx.net>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: DianeXD <64360468+DianeXD@users.noreply.github.com>
Co-authored-by: Maxim <maxim235@gmx.de>
Diffstat (limited to 'src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java')
-rw-r--r-- | src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java index c747f50b72..32aa0f36ac 100644 --- a/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java +++ b/src/main/java/gregtech/loaders/postload/GT_MachineRecipeLoader.java @@ -616,8 +616,20 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.getDust(Materials.TungstenSteel, 2L * OrePrefixes.dust.mMaterialAmount), - (int) (200L * OrePrefixes.dust.mMaterialAmount / 3628800L), - 500); + (int) (50L * OrePrefixes.dust.mMaterialAmount / 3628800L), + 1920); + GT_Values.RA.addMixerRecipe( + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Titanium, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Platinum, 3L), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 1L), + GT_Values.NI, + GT_Values.NI, + GT_Utility.getIntegratedCircuit(1), + GT_Values.NF, + GT_Values.NF, + GT_OreDictUnificator.getDust(Materials.TPV, 7L * OrePrefixes.dust.mMaterialAmount), + (int) (175L * OrePrefixes.dust.mMaterialAmount / 3628800L), + 1920); GT_Values.RA.addMixerRecipe( GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 1L), @@ -9796,7 +9808,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addArcFurnaceRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 8), GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.Nichrome, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 5) }, @@ -9807,7 +9819,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Casing_Coil_HSSG.get(1L), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.ingot, Materials.TPV, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Ash, 6) }, null, @@ -9907,7 +9919,7 @@ public class GT_MachineRecipeLoader implements Runnable { GT_Values.RA.addPulveriserRecipe( ItemList.Casing_Coil_TungstenSteel.get(1L), new ItemStack[] { - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 8), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 8), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Nichrome, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 5) }, @@ -9918,7 +9930,7 @@ public class GT_MachineRecipeLoader implements Runnable { ItemList.Casing_Coil_HSSG.get(1L), new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.dust, Materials.HSSG, 8), - GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TungstenSteel, 1), + GT_OreDictUnificator.get(OrePrefixes.dust, Materials.TPV, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.QuartzSand, 6) }, null, |