diff options
Diffstat (limited to 'src/main/java/gregtech/loaders/oreprocessing')
5 files changed, 31 insertions, 160 deletions
diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java index 9964ea541e..c37d3c614d 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingDust.java @@ -132,7 +132,8 @@ public class ProcessingDust implements gregtech.api.interfaces.IOreRecipeRegistr && (aMaterial != Materials.Glowstone) && (aMaterial != Materials.Paper) && (aMaterial != MaterialsUEVplus.TranscendentMetal) - && (aMaterial != Materials.Clay && (aMaterial != Materials.Wood))) { + && (aMaterial != Materials.Clay) + && (aMaterial != Materials.Wood)) { // compressor recipe { if (GTOreDictUnificator.get(OrePrefixes.plate, aMaterial, 1L) != null) { diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java index f60987ec9e..5bf1212faa 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingLog.java @@ -125,14 +125,12 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } for (int i = 0; i < 32767; i++) { if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(new ItemStack(aStack.getItem(), 1, i), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(new ItemStack(aStack.getItem(), 1, i)); } ItemStack tStack = GTModHandler.getRecipeOutput(new ItemStack(aStack.getItem(), 1, i)); @@ -205,7 +203,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } ItemStack tStack = GTModHandler.getRecipeOutput(GTUtility.copyAmount(1, aStack)); @@ -271,7 +268,6 @@ public class ProcessingLog implements gregtech.api.interfaces.IOreRecipeRegistra if ((GTUtility.areStacksEqual( GTModHandler.getSmeltingOutput(GTUtility.copyAmount(1, aStack), false, null), new ItemStack(Items.coal, 1, 1)))) { - addPyrolyeOvenRecipes(aStack); GTModHandler.removeFurnaceSmelting(GTUtility.copyAmount(1, aStack)); } } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java index 3d33df9711..6cac506abf 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingOreSmelting.java @@ -120,14 +120,6 @@ public class ProcessingOreSmelting implements gregtech.api.interfaces.IOreRecipe .metadata(ADDITIVE_AMOUNT, 2) .addTo(primitiveBlastRecipes); GTValues.RA.stdBuilder() - .itemInputs(aMaterial.getDust(2), Materials.Quartzite.getDust(4)) - .itemOutputs( - aMaterial.mDirectSmelting.getIngots(outputAmount), - Materials.Ferrosilite.getDustSmall(outputAmount)) - .duration(2 * MINUTES) - .metadata(ADDITIVE_AMOUNT, 2) - .addTo(primitiveBlastRecipes); - GTValues.RA.stdBuilder() .itemInputs(aMaterial.getDust(2), Materials.NetherQuartz.getDust(2)) .itemOutputs( aMaterial.mDirectSmelting.getIngots(outputAmount), diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java index 396cce0c8c..6c45761da0 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingShaping.java @@ -458,22 +458,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingadviron", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } } case "Iron", "WroughtIron" -> { GTValues.RA.stdBuilder() @@ -482,22 +466,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingiron", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } if (tAmount * 31 <= 64) { GTValues.RA.stdBuilder() .itemInputs(GTUtility.copyAmount(31, aStack), ItemList.Shape_Mold_Anvil.get(0L)) @@ -514,94 +482,6 @@ public class ProcessingShaping implements gregtech.api.interfaces.IOreRecipeRegi .duration((tAmount * 128) * TICKS) .eut(TierEU.RECIPE_LV) .addTo(extruderRecipes); - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingtin", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Lead" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinglead", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Copper", "AnnealedCopper" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingcopper", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Bronze" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casingbronze", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } - } - case "Gold" -> { - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(1, aStack), ItemList.Shape_Extruder_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 2)) - .duration((tAmount * 32) * TICKS) - .eut(3 * tVoltageMultiplier) - .addTo(extruderRecipes); - } - if (tAmount * 2 <= 64) { - GTValues.RA.stdBuilder() - .itemInputs(GTUtility.copyAmount(2, aStack), ItemList.Shape_Mold_Casing.get(0L)) - .itemOutputs(GTModHandler.getIC2Item("casinggold", tAmount * 3)) - .duration((tAmount * 128) * TICKS) - .eut(1 * tVoltageMultiplier) - .addTo(alloySmelterRecipes); - } } case "Polytetrafluoroethylene" -> { GTValues.RA.stdBuilder() 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" -> { |