aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
diff options
context:
space:
mode:
authorMary <33456283+FourIsTheNumber@users.noreply.github.com>2024-09-25 06:48:46 -0400
committerGitHub <noreply@github.com>2024-09-25 12:48:46 +0200
commit683e0970aea98b5d59fb0de928d130cd8e44360e (patch)
tree40bad7e9bb301f56a4ae0f9b1d08b2175b066668 /src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
parent00b6c43af283b0a7a33e039718a63826d635576e (diff)
downloadGT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.gz
GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.tar.bz2
GT5-Unofficial-683e0970aea98b5d59fb0de928d130cd8e44360e.zip
So, so, so many collisions (#3278)
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java')
-rw-r--r--src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java56
1 files changed, 29 insertions, 27 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
index 81b8985d05..d3e6750f33 100644
--- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
+++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java
@@ -258,33 +258,6 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
.eut(8)
.addTo(packagerRecipes);
}
- // alloy smelter recipes
- {
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
- GTOreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L))
- .duration(5 * SECONDS)
- .eut(8)
- .addTo(alloySmelterRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
- GTOreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L))
- .duration(10 * SECONDS)
- .eut(16)
- .addTo(alloySmelterRecipes);
- GTValues.RA.stdBuilder()
- .itemInputs(
- GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L),
- GTOreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L))
- .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L))
- .duration(15 * SECONDS)
- .eut(TierEU.RECIPE_LV)
- .addTo(alloySmelterRecipes);
- }
// Assembler recipes
{
if (GTOreDictUnificator.get(correspondingCable, aMaterial, 1L) != null) {
@@ -334,6 +307,35 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr
}
}
}
+ // Alloy Smelter recipes
+ if (correspondingCable == OrePrefixes.cableGt01) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
+ GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L))
+ .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt01, aMaterial, 1L))
+ .duration(5 * SECONDS)
+ .eut(8)
+ .addTo(alloySmelterRecipes);
+ } else if (correspondingCable == OrePrefixes.cableGt02) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 2L),
+ GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L))
+ .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt02, aMaterial, 1L))
+ .duration(10 * SECONDS)
+ .eut(16)
+ .addTo(alloySmelterRecipes);
+ } else if (correspondingCable == OrePrefixes.cableGt04) {
+ GTValues.RA.stdBuilder()
+ .itemInputs(
+ GTOreDictUnificator.get(OrePrefixes.ingot, Materials.Rubber, 4L),
+ GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L))
+ .itemOutputs(GTOreDictUnificator.get(OrePrefixes.cableGt04, aMaterial, 1L))
+ .duration(15 * SECONDS)
+ .eut(TierEU.RECIPE_LV)
+ .addTo(alloySmelterRecipes);
+ }
}
case "RedstoneAlloy", "Iron", "Nickel", "Cupronickel", "Copper", "AnnealedCopper", "ElectricalSteel", "Kanthal", "Gold", "Electrum", "Silver", "BlueAlloy", "EnergeticAlloy", "Nichrome", "Steel", "BlackSteel", "Titanium", "Aluminium", "TPVAlloy", "VibrantAlloy" -> {