From 0c50a48fc4d4448c084ca3535af37b4981dd2d7c Mon Sep 17 00:00:00 2001 From: Martin Robertz Date: Wed, 31 Aug 2022 10:43:06 +0200 Subject: Two slots wiremill (#1324) * add a circuit slot to wiremil * add circuits to wire recipes * add 2 input slots to Wiremil * exchange circuit and material slot * add 2x-16x wires to wiremil * add missing 12x wires * add slot migration code (#1326) * spotlessApply (#1327) Co-authored-by: Martin Robertz Co-authored-by: GitHub GTNH Actions <> Co-authored-by: Glease <4586901+Glease@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- .../loaders/oreprocessing/ProcessingFineWire.java | 82 ++++++++++++++++++++-- .../loaders/oreprocessing/ProcessingWire.java | 1 + 2 files changed, 77 insertions(+), 6 deletions(-) (limited to 'src/main/java/gregtech/loaders/oreprocessing') diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java index 458146ffd7..bd6fb6a905 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingFineWire.java @@ -21,16 +21,86 @@ public class ProcessingFineWire implements gregtech.api.interfaces.IOreRecipeReg if (!aMaterial.contains(gregtech.api.enums.SubTag.NO_SMASHING)) { GT_Values.RA.addWiremillRecipe( GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), - GT_Utility.copy( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), - GT_Utility.copyAmount(8L, aStack)), + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 2L), + 100, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), + 150, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 2L), + GT_Utility.getIntegratedCircuit(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), + 200, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 4L), + GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), + 250, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 6L), + GT_Utility.getIntegratedCircuit(12), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), + 300, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 8L), + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), + 350, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(1), + GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), + 50, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 2L), + GT_Utility.getIntegratedCircuit(2), + GT_OreDictUnificator.get(OrePrefixes.wireGt02, aMaterial, 1L), + 100, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 4L), + GT_Utility.getIntegratedCircuit(4), + GT_OreDictUnificator.get(OrePrefixes.wireGt04, aMaterial, 1L), + 150, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 8L), + GT_Utility.getIntegratedCircuit(8), + GT_OreDictUnificator.get(OrePrefixes.wireGt08, aMaterial, 1L), + 200, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 12L), + GT_Utility.getIntegratedCircuit(12), + GT_OreDictUnificator.get(OrePrefixes.wireGt12, aMaterial, 1L), + 250, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 16L), + GT_Utility.getIntegratedCircuit(16), + GT_OreDictUnificator.get(OrePrefixes.wireGt16, aMaterial, 1L), + 300, + 4); + GT_Values.RA.addWiremillRecipe( + GT_OreDictUnificator.get(OrePrefixes.ingot, aMaterial, 1L), + GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 8L), 100, 4); GT_Values.RA.addWiremillRecipe( GT_OreDictUnificator.get(OrePrefixes.stick, aMaterial, 1L), - GT_Utility.copy( - GT_OreDictUnificator.get(OrePrefixes.wireGt01, aMaterial, 1L), - GT_Utility.copyAmount(4L, aStack)), + GT_Utility.getIntegratedCircuit(3), + GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), 50, 4); } diff --git a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java index 708952ce8d..71724bf27f 100644 --- a/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java +++ b/src/main/java/gregtech/loaders/oreprocessing/ProcessingWire.java @@ -57,6 +57,7 @@ public class ProcessingWire implements gregtech.api.interfaces.IOreRecipeRegistr 8); GT_Values.RA.addWiremillRecipe( GT_Utility.copyAmount(1L, aStack), + GT_Utility.getIntegratedCircuit(1), GT_OreDictUnificator.get(OrePrefixes.wireFine, aMaterial, 4L), 200, 8); -- cgit