aboutsummaryrefslogtreecommitdiff
path: root/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/gregtech/api/enums/Materials.java2
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java40
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/common/CI.java5
3 files changed, 24 insertions, 23 deletions
diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java
index b8c902c4bb..f8f6f4636e 100644
--- a/src/main/java/gregtech/api/enums/Materials.java
+++ b/src/main/java/gregtech/api/enums/Materials.java
@@ -909,7 +909,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer {
public static Materials Infinity = new Materials( 397, new TextureSet("infinity", true), 256.0F,2621440, 17, 1|2 |64|128 , 255, 255, 255, 0, "Infinity" , "Infinity" , 5, 5000000, 10800, 10800, true, false, 40, 1, 1, Dyes.dyeLightGray ).setProcessingMaterialTierEU(TierEU.RECIPE_UV).disableAutoGeneratedVacuumFreezerRecipe();
public static Materials Bedrockium = new MaterialBuilder(395,TextureSet.SET_DULL, "Bedrockium").addOreItems().addDustItems().addMetalItems().setDurability(327680).setToolSpeed(8f).setToolQuality(9).setRGB(50,50,50).setName("Bedrockium").setBlastFurnaceRequired(true).setBlastFurnaceTemp(9900).setMeltingPoint(9900).setColor(Dyes.dyeBlack).setOreValue(4).setDensityDivider(1).setDensityMultiplier(1).constructMaterial().setProcessingMaterialTierEU(TierEU.RECIPE_EV).disableAutoGeneratedVacuumFreezerRecipe();
public static Materials Trinium = new Materials( 868, TextureSet.SET_SHINY , 128.0F, 51200, 8, 1|2 |8 |64|128 , 200, 200, 210, 0, "Trinium" , "Trinium" , 0, 0, 7200, 7200, true, false, 4, 1, 1, Dyes.dyeLightGray ).disableAutoGeneratedBlastFurnaceRecipes().disableAutoGeneratedVacuumFreezerRecipe();
- public static Materials Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(30, 30, 3).setHasCorrespondingPlasma(true);
+ public static Materials Ichorium = new Materials( 978, TextureSet.SET_SHINY , 32.0F, 850000, 12, 1|2 |8 |32|64|128 , 211, 120, 6, 0, "Ichorium" , "Ichorium" , 5, 250000, 9000, 9000, true, false, 4, 1, 1, Dyes.dyeOrange ).setTurbineMultipliers(6, 6, 3).setHasCorrespondingPlasma(true);
public static Materials CosmicNeutronium = new Materials( 982, TextureSet.SET_SHINY , 96.0F, 163840, 12, 1|2 |8 |32|64|128 , 50, 50, 50, 0, "CosmicNeutronium" , "Cosmic Neutronium" , 0, 0, 9900, 9900, true, false, 4, 1, 1, Dyes.dyeBlack ).setProcessingMaterialTierEU(TierEU.RECIPE_ZPM).disableAutoGeneratedVacuumFreezerRecipe().setHasCorrespondingPlasma(true);
// Superconductor base.
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() {
generated by cgit (git 2.46.0) at 2025-03-04 22:36:24 +0000