diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2023-05-12 20:53:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-12 21:53:38 +0200 |
| commit | e56ccbbad79b915db3515f24894c5c5aa5aab881 (patch) | |
| tree | a142abfea3738aee4b730071055655df7c826b27 /src/main/java | |
| parent | 092520083038503f21e88c536e96aa42d77e2ba5 (diff) | |
| download | GT5-Unofficial-e56ccbbad79b915db3515f24894c5c5aa5aab881.tar.gz GT5-Unofficial-e56ccbbad79b915db3515f24894c5c5aa5aab881.tar.bz2 GT5-Unofficial-e56ccbbad79b915db3515f24894c5c5aa5aab881.zip | |
Rhodium plated palladium fix (#1980)
* part 1
* part2
Diffstat (limited to 'src/main/java')
| -rw-r--r-- | src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java | 2 | ||||
| -rw-r--r-- | src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java index 2479448a40..cfc2107d14 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_BasicMachine_GT_Recipe.java @@ -397,7 +397,7 @@ public class GT_MetaTileEntity_BasicMachine_GT_Recipe extends GT_MetaTileEntity_ case 3 -> OrePrefixes.rotor.get(Materials.Steel); case 4 -> OrePrefixes.rotor.get(Materials.StainlessSteel); case 5 -> OrePrefixes.rotor.get(Materials.TungstenSteel); - case 6 -> OrePrefixes.rotor.get(Materials.Chrome); + case 6 -> OrePrefixes.rotor.get(BartWorks.isModLoaded() ? Materials.get("Rhodium-PlatedPalladium") : Materials.Chrome); case 7 -> OrePrefixes.rotor.get(Materials.Iridium); default -> OrePrefixes.rotor.get(Materials.Osmium); }; diff --git a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java index 20fc243335..9658a3c0dc 100644 --- a/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java +++ b/src/main/java/gregtech/loaders/postload/recipes/AssemblerRecipes.java @@ -36,6 +36,9 @@ public class AssemblerRecipes implements Runnable { this.loadOutputHatchesRecipes(); this.withIC2NuclearControl(); + Materials LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium; + Materials LuVMat2 = BartWorks.isModLoaded() ? Materials.get("Rhodium-PlatedPalladium") : Materials.Chrome; + GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.frameGt, Materials.BlackSteel, 1), @@ -1580,7 +1583,6 @@ public class AssemblerRecipes implements Runnable { .eut(TierEU.RECIPE_IV) .addTo(sAssemblerRecipes); - Materials LuVMat = BartWorks.isModLoaded() ? Materials.get("Ruridit") : Materials.Osmiridium; GT_Values.RA.stdBuilder() .itemInputs( GT_OreDictUnificator.get(OrePrefixes.stick, Materials.SamariumMagnetic, 1), @@ -2090,9 +2092,7 @@ public class AssemblerRecipes implements Runnable { .addTo(sAssemblerRecipes); GT_Values.RA.stdBuilder() - .itemInputs( - GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Chrome, 8), - GT_Utility.getIntegratedCircuit(8)) + .itemInputs(GT_OreDictUnificator.get(OrePrefixes.plate, LuVMat2, 8), GT_Utility.getIntegratedCircuit(8)) .itemOutputs(ItemList.Casing_LuV.get(1)) .noFluidInputs() .noFluidOutputs() |