diff options
| author | chochem <40274384+chochem@users.noreply.github.com> | 2024-09-04 21:44:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-04 20:44:05 +0000 |
| commit | b0364a9c8630d217daf1d9b8379253d4eeeb0b76 (patch) | |
| tree | 7ecdf2de859e7afb084df39b7a8a88fe5fbd2555 /src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java | |
| parent | 08a7e1fcc132c135ae256941c1b3f1f492b0fb26 (diff) | |
| download | GT5-Unofficial-b0364a9c8630d217daf1d9b8379253d4eeeb0b76.tar.gz GT5-Unofficial-b0364a9c8630d217daf1d9b8379253d4eeeb0b76.tar.bz2 GT5-Unofficial-b0364a9c8630d217daf1d9b8379253d4eeeb0b76.zip | |
Fix tiering of cable recipes (#3055)
Co-authored-by: boubou19 <miisterunknown@gmail.com>
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java')
| -rw-r--r-- | src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java | 66 |
1 files changed, 35 insertions, 31 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index c38c8fb72b..81b8985d05 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -335,7 +335,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } } } - case "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "Kanthal", "Gold", "Electrum", "Silver", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "BlueAlloy", "NetherStar", "RedstoneAlloy" -> { + case "RedstoneAlloy", "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "ElectricalSteel", "Kanthal", "Gold", "Electrum", "Silver", "BlueAlloy", "EnergeticAlloy", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "TPVAlloy", "VibrantAlloy" -> { if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) == null) { break; @@ -393,16 +393,18 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr } // Assembler recipes - GTValues.RA.stdBuilder() - .itemInputs( - aStack, - GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), - GTUtility.getIntegratedCircuit(24)) - .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) - .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) - .duration(5 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(assemblerRecipes); + if (GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs( + aStack, + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier), + GTUtility.getIntegratedCircuit(24)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .fluidInputs(Materials.Silicone.getMolten(costMultiplier * 72)) + .duration(5 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 8)) + .addTo(assemblerRecipes); + } GTValues.RA.stdBuilder() .itemInputs( @@ -418,16 +420,28 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr for (Materials dielectric : dielectrics) { for (Materials syntheticRubber : syntheticRubbers) { - GTValues.RA.stdBuilder() - .itemInputs( - GTUtility.copyAmount(4, aStack), - dielectric.getDust(costMultiplier), - GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L)) - .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) - .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) - .duration(20 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(assemblerRecipes); + if (GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, 1L) != null) { + GTValues.RA.stdBuilder() + .itemInputs( + GTUtility.copyAmount(4, aStack), + dielectric.getDust(costMultiplier), + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier * 4L)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 4L)) + .fluidInputs(syntheticRubber.getMolten(costMultiplier * 144L)) + .duration(20 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 8)) + .addTo(assemblerRecipes); + GTValues.RA.stdBuilder() + .itemInputs( + aStack, + dielectric.getDustSmall(costMultiplier), + GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)) + .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) + .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) + .duration(5 * SECONDS) + .eut(calculateRecipeEU(aMaterial, 8)) + .addTo(assemblerRecipes); + } GTValues.RA.stdBuilder() .itemInputs( GTUtility.copyAmount(4, aStack), @@ -443,16 +457,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr .itemInputs( aStack, dielectric.getDustSmall(costMultiplier), - GTOreDictUnificator.get(OrePrefixes.foil, aMaterial, costMultiplier)) - .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) - .fluidInputs(syntheticRubber.getMolten(costMultiplier * 36L)) - .duration(5 * SECONDS) - .eut(calculateRecipeEU(aMaterial, 8)) - .addTo(assemblerRecipes); - GTValues.RA.stdBuilder() - .itemInputs( - aStack, - dielectric.getDustSmall(costMultiplier), GTOreDictUnificator .get(OrePrefixes.foil, Materials.PolyphenyleneSulfide, costMultiplier)) .itemOutputs(GTOreDictUnificator.get(correspondingCable, aMaterial, 1L)) |