diff options
Diffstat (limited to 'src/main/java/gregtech/loaders')
3 files changed, 82 insertions, 11 deletions
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); diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java index aee66594ea..f0b9814db8 100644 --- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java +++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java @@ -5469,7 +5469,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 1, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, - 1, + 2, 1, 0, 0, @@ -5501,7 +5501,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 2, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, - 1, + 2, 1, 0, 0, @@ -5533,7 +5533,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 3, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, - 1, + 2, 1, 0, 0, @@ -5565,7 +5565,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 4, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, - 1, + 2, 1, 0, 0, @@ -5597,7 +5597,7 @@ public class GT_Loader_MetaTileEntities implements Runnable { // TODO CHECK CIRC 5, "Produces Wires more efficiently", GT_Recipe.GT_Recipe_Map.sWiremillRecipes, - 1, + 2, 1, 0, 0, |