aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
diff options
context:
space:
mode:
authorDaniel Mendes <70096037+Steelux8@users.noreply.github.com>2024-08-03 21:01:43 +0100
committerGitHub <noreply@github.com>2024-08-03 21:01:43 +0100
commite180e49fc6305f71b1f1b18141b946f794a7012b (patch)
tree03cb2ca4cfcb76ebc5a928fad899669f67b8b22e /src/main/java/gtPlusPlus
parentbcf90eff5fea4df64c1a9e34e12491ca4bd6b814 (diff)
downloadGT5-Unofficial-e180e49fc6305f71b1f1b18141b946f794a7012b.tar.gz
GT5-Unofficial-e180e49fc6305f71b1f1b18141b946f794a7012b.tar.bz2
GT5-Unofficial-e180e49fc6305f71b1f1b18141b946f794a7012b.zip
Swap Tiering of XL Gas and SH Steam and Lower Ichorium Turbine Multipliers (#2806)
* Reduce multipliers in Ichorium rotors -> Reduce multipliers for steam and gas from 30 to 6. * Swap costs and tiering between XL Gas and SH Steam - Changed the tiering of material inputs for the recipes of the two turbines, so they swap tiers (Gas becomes LuV, SH Steam becomes IV). * Fix tiered LuV material in some GT++ recipes - Change Chrome to Rhodium-Plated Palladium in the tiered material list used in some GT++ recipes. * Spotless apply for branch XLGT_Changes for #2806 (#2807) spotlessApply Co-authored-by: GitHub GTNH Actions <> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/main/java/gtPlusPlus')
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java40
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java5
2 files changed, 23 insertions, 22 deletions
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
index dce9b56645..c312149cfc 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java
@@ -469,50 +469,50 @@ public class RECIPES_Machines {
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
ItemList.Casing_Turbine1.get(1),
- CI.getPlate(4, 4),
- CI.getScrew(4, 8))
+ CI.getPlate(5, 4),
+ CI.getScrew(5, 8))
.itemOutputs(GregtechItemList.Casing_Turbine_Gas.get(1))
- .fluidInputs(CI.tieredMaterials[3].getMolten(144 * 2))
+ .fluidInputs(CI.tieredMaterials[4].getMolten(144 * 2))
.duration(5 * SECONDS)
- .eut(TierEU.RECIPE_EV)
+ .eut(TierEU.RECIPE_IV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
ItemList.LargeGasTurbine.get(1),
- CI.getPlate(5, 8),
- CI.getScrew(5, 16),
- CI.getGear(5, 4),
- CI.getCircuit(5, 8))
+ CI.getPlate(6, 8),
+ CI.getScrew(6, 16),
+ CI.getGear(6, 4),
+ CI.getCircuit(6, 8))
.itemOutputs(GregtechItemList.Large_Gas_Turbine.get(1))
- .fluidInputs(CI.tieredMaterials[5].getMolten(144 * 8))
+ .fluidInputs(CI.tieredMaterials[6].getMolten(144 * 8))
.duration(60 * SECONDS)
- .eut(TierEU.RECIPE_IV)
+ .eut(TierEU.RECIPE_LuV)
.addTo(assemblerRecipes);
// HP Steam
GT_Values.RA.stdBuilder()
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
ItemList.Casing_Turbine2.get(1),
- CI.getPlate(5, 4),
- CI.getScrew(5, 8))
+ CI.getPlate(4, 4),
+ CI.getScrew(4, 8))
.itemOutputs(GregtechItemList.Casing_Turbine_HP.get(1))
- .fluidInputs(CI.tieredMaterials[4].getMolten(144 * 2))
+ .fluidInputs(CI.tieredMaterials[3].getMolten(144 * 2))
.duration(5 * SECONDS)
- .eut(TierEU.RECIPE_IV)
+ .eut(TierEU.RECIPE_EV)
.addTo(assemblerRecipes);
GT_Values.RA.stdBuilder()
.itemInputs(
CI.getNumberedAdvancedCircuit(18),
ItemList.LargeHPSteamTurbine.get(1),
- CI.getPlate(6, 8),
- CI.getScrew(6, 16),
- CI.getGear(6, 4),
- CI.getCircuit(6, 8))
+ CI.getPlate(5, 8),
+ CI.getScrew(5, 16),
+ CI.getGear(5, 4),
+ CI.getCircuit(5, 8))
.itemOutputs(GregtechItemList.Large_HPSteam_Turbine.get(1))
- .fluidInputs(CI.tieredMaterials[6].getMolten(144 * 8))
+ .fluidInputs(CI.tieredMaterials[5].getMolten(144 * 8))
.duration(60 * SECONDS)
- .eut(TierEU.RECIPE_LuV)
+ .eut(TierEU.RECIPE_IV)
.addTo(assemblerRecipes);
// Plasma
GT_Values.RA.stdBuilder()
diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
index bab786549a..e7119430e6 100644
--- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java
+++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java
@@ -8,6 +8,7 @@ import gregtech.api.GregTech_API;
import gregtech.api.enums.ItemList;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.ExternalMaterials;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
@@ -181,8 +182,8 @@ public class CI {
public static ItemStack explosiveITNT;
public static Materials[] tieredMaterials = new Materials[] { Materials.Iron, Materials.Steel, Materials.Aluminium,
- Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel, Materials.Chrome, Materials.Iridium,
- Materials.Osmium, Materials.Neutronium };
+ Materials.StainlessSteel, Materials.Titanium, Materials.TungstenSteel,
+ ExternalMaterials.getRhodiumPlatedPalladium(), Materials.Iridium, Materials.Osmium, Materials.Neutronium };
public static void preInit() {