diff options
| author | Steelux <70096037+Steelux8@users.noreply.github.com> | 2022-10-28 19:56:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-28 20:56:35 +0200 |
| commit | 4f21c73ae0a1de98bee6f2a9c8d36e1ab77c96a3 (patch) | |
| tree | 93df21c520b2d5938a10acd538275528c49d3a94 | |
| parent | bd9b9963bc71afd247b5075cdf37478016a0e0e8 (diff) | |
| download | GT5-Unofficial-4f21c73ae0a1de98bee6f2a9c8d36e1ab77c96a3.tar.gz GT5-Unofficial-4f21c73ae0a1de98bee6f2a9c8d36e1ab77c96a3.tar.bz2 GT5-Unofficial-4f21c73ae0a1de98bee6f2a9c8d36e1ab77c96a3.zip | |
Fix Material Progression and Semifluid Gen Cost (#403)
- Changed some materials used in GT++ material tier progression, because they require EBF coils above what is possible for the tier;
- Changed fluid input on LV Semifluid Generator recipe from Bronze to Tin, since Bronze cannot be fluid extracted in LV;
- Reduced the input count of items for those recipes, to bring it closer to the other generators.
| -rw-r--r-- | src/main/java/gtPlusPlus/core/item/ModItems.java | 2 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java | 28 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/core/recipe/common/CI.java | 10 |
3 files changed, 20 insertions, 20 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/ModItems.java b/src/main/java/gtPlusPlus/core/item/ModItems.java index db0ffb00f7..d35c2c6d74 100644 --- a/src/main/java/gtPlusPlus/core/item/ModItems.java +++ b/src/main/java/gtPlusPlus/core/item/ModItems.java @@ -633,7 +633,7 @@ public final class ModItems { MaterialGenerator.generate(ALLOY.MARAGING350); MaterialGenerator.generate(ALLOY.AQUATIC_STEEL); - MaterialGenerator.generate(ALLOY.NITINOL_60, true, false); + MaterialGenerator.generate(ALLOY.NITINOL_60, true); // Composite Alloys MaterialGenerator.generate(ALLOY.STELLITE); diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java index 4e7827d864..bba2b652cc 100644 --- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java +++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_Machines.java @@ -2046,30 +2046,30 @@ public class RECIPES_Machines { aSemiFluidInputs[0] = new ItemStack[] { CI.getNumberedBioCircuit(14), CI.getTieredMachineHull(1, 1), - CI.getElectricPiston(1, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 1, GTNH ? 4 : 2), - CI.getPlate(1, GTNH ? 8 : 4), - CI.getGear(1, GTNH ? 4 : 2) + CI.getElectricPiston(1, 2), + CI.getTieredComponent(OrePrefixes.circuit, 1, 2), + CI.getPlate(1, 4), + CI.getGear(1, 2) }; aSemiFluidInputs[1] = new ItemStack[] { CI.getNumberedCircuit(14), CI.getTieredMachineHull(2, 1), - CI.getElectricPiston(2, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 2, GTNH ? 4 : 2), - CI.getPlate(2, GTNH ? 8 : 4), - CI.getGear(2, GTNH ? 4 : 2) + CI.getElectricPiston(2, 2), + CI.getTieredComponent(OrePrefixes.circuit, 2, 2), + CI.getPlate(2, 4), + CI.getGear(2, 2) }; aSemiFluidInputs[2] = new ItemStack[] { CI.getNumberedAdvancedCircuit(14), CI.getTieredMachineHull(3, 1), - CI.getElectricPiston(3, GTNH ? 4 : 2), - CI.getTieredComponent(OrePrefixes.circuit, 3, GTNH ? 4 : 2), - CI.getPlate(3, GTNH ? 8 : 4), - CI.getGear(3, GTNH ? 4 : 2) + CI.getElectricPiston(3, 2), + CI.getTieredComponent(OrePrefixes.circuit, 3, 2), + CI.getPlate(3, 4), + CI.getGear(3, 2) }; FluidStack[] aSemiFluidFluidInputs = new FluidStack[] { - ALLOY.BRONZE.getFluidStack(144 * 8), - ALLOY.STEEL.getFluidStack(144 * 8), + ELEMENT.getInstance().TIN.getFluidStack(144 * 4), + ALLOY.STEEL.getFluidStack(144 * 6), ELEMENT.getInstance().ALUMINIUM.getFluidStack(144 * 8), }; diff --git a/src/main/java/gtPlusPlus/core/recipe/common/CI.java b/src/main/java/gtPlusPlus/core/recipe/common/CI.java index f3689897e5..8718cd05fd 100644 --- a/src/main/java/gtPlusPlus/core/recipe/common/CI.java +++ b/src/main/java/gtPlusPlus/core/recipe/common/CI.java @@ -497,8 +497,8 @@ public class CI { ALLOY.POTIN, ALLOY.TUMBAGA, ALLOY.EGLIN_STEEL, - ALLOY.INCONEL_792, - ALLOY.INCOLOY_MA956, + ALLOY.INCONEL_625, + ALLOY.INCOLOY_DS, ALLOY.NITINOL_60, ALLOY.ZERON_100, ALLOY.PIKYONIUM, @@ -511,9 +511,9 @@ public class CI { private static final Material[] aMaterial_Secondary = new Material[] { ALLOY.STEEL, ALLOY.SILICON_CARBIDE, - ALLOY.BABBIT_ALLOY, - ALLOY.INCONEL_690, - ALLOY.STELLITE, + ALLOY.BLOODSTEEL, + ALLOY.TANTALUM_CARBIDE, + ALLOY.INCONEL_792, ALLOY.ARCANITE, ALLOY.LAFIUM, ALLOY.CINOBITE, |