aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java49
1 files changed, 47 insertions, 2 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
index ac96cc4d07..c48885df21 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/registration/gregtech/GregtechConduits.java
@@ -1064,6 +1064,7 @@ public class GregtechConduits {
ItemStack aPlate = aMaterial.getPlate(1);
ItemStack aIngot = aMaterial.getIngot(1);
+ ItemStack aRod = aMaterial.getRod(1);
ItemStack aWire01 = aMaterial.getWire01(1);
ItemStack aWire02 = aMaterial.getWire02(1);
ItemStack aWire04 = aMaterial.getWire04(1);
@@ -1076,6 +1077,7 @@ public class GregtechConduits {
ItemStack aCable08 = aMaterial.getCable08(1);
ItemStack aCable12 = aMaterial.getCable12(1);
ItemStack aCable16 = aMaterial.getCable16(1);
+ ItemStack aFineWire = aMaterial.getFineWire(1);
// Adds manual crafting recipe
if (ItemUtils.checkForInvalidItems(new ItemStack[] {aPlate, aWire01})) {
@@ -1084,8 +1086,51 @@ public class GregtechConduits {
}
// Wire mill
- if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aWire01})) {
- GT_Values.RA.addWiremillRecipe(aIngot, aMaterial.getWire01(2), 5 * 20, 4);
+ if (ItemUtils.checkForInvalidItems(
+ new ItemStack[] {aIngot, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) {
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(2), 100, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 150, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(2), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 200, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(4), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 250, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(6), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 300, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(8), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 350, 4);
+ }
+
+ if (ItemUtils.checkForInvalidItems(
+ new ItemStack[] {aRod, aWire01, aWire02, aWire04, aWire08, aWire12, aWire16})) {
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getWire01(1), 50, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(2), GT_Utility.getIntegratedCircuit(2), aMaterial.getWire02(1), 100, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(4), GT_Utility.getIntegratedCircuit(4), aMaterial.getWire04(1), 150, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(8), GT_Utility.getIntegratedCircuit(8), aMaterial.getWire08(1), 200, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(12), GT_Utility.getIntegratedCircuit(12), aMaterial.getWire12(1), 250, 4);
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(16), GT_Utility.getIntegratedCircuit(16), aMaterial.getWire16(1), 300, 4);
+ }
+
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] {aIngot, aFineWire})) {
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getIngot(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(8), 100, 4);
+ }
+
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] {aRod, aFineWire})) {
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getRod(1), GT_Utility.getIntegratedCircuit(3), aMaterial.getFineWire(4), 50, 4);
+ }
+
+ if (ItemUtils.checkForInvalidItems(new ItemStack[] {aWire01, aFineWire})) {
+ GT_Values.RA.addWiremillRecipe(
+ aMaterial.getWire01(1), GT_Utility.getIntegratedCircuit(1), aMaterial.getFineWire(4), 200, 8);
}
// Extruder