Solderer efficiency

src/main/java/refinedstorage/proxy/CommonProxy.java

@@ -185,7 +185,13 @@ public class CommonProxy {
         );
 
         // Disk Drive
-        SoldererRegistry.addRecipe(new SoldererRecipeDiskDrive());
+        SoldererRegistry.addRecipe(new SoldererRecipeBasic(
+            new ItemStack(RefinedStorageBlocks.DISK_DRIVE),
+            500,
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+            new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
+            new ItemStack(Blocks.CHEST)
+        ));
 
         // Cable
         GameRegistry.addRecipe(new ItemStack(RefinedStorageBlocks.CABLE, 6),
@@ -221,10 +227,22 @@ public class CommonProxy {
         );
 
         // Crafting Grid
-        SoldererRegistry.addRecipe(new SoldererRecipeCraftingGrid());
+        SoldererRegistry.addRecipe(new SoldererRecipeBasic(
+            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
+            500,
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+            new ItemStack(Blocks.CRAFTING_TABLE)
+        ));
 
         // Pattern Grid
-        SoldererRegistry.addRecipe(new SoldererRecipePatternGrid());
+        SoldererRegistry.addRecipe(new SoldererRecipeBasic(
+            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
+            500,
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
+            new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId()),
+            new ItemStack(RefinedStorageItems.PATTERN)
+        ));
 
         // Wireless Grid
         GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.WIRELESS_GRID, 1, ItemWirelessGrid.TYPE_NORMAL),
@@ -444,7 +462,13 @@ public class CommonProxy {
         );
 
         // Interface
-        SoldererRegistry.addRecipe(new SoldererRecipeInterface());
+        SoldererRegistry.addRecipe(new SoldererRecipeBasic(
+            new ItemStack(RefinedStorageBlocks.INTERFACE),
+            200,
+            new ItemStack(RefinedStorageBlocks.IMPORTER),
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
+            new ItemStack(RefinedStorageBlocks.EXPORTER)
+        ));
     }
 
     public void init(FMLInitializationEvent e) {

src/main/java/refinedstorage/tile/solderer/SoldererRecipeBasic.java

@@ -0,0 +1,34 @@
+package refinedstorage.tile.solderer;
+
+import net.minecraft.item.ItemStack;
+
+public class SoldererRecipeBasic implements ISoldererRecipe {
+    private int duration;
+    private ItemStack result;
+    private ItemStack[] rows;
+
+    public SoldererRecipeBasic(ItemStack result, int duration, ItemStack... rows) {
+        this.duration = duration;
+        this.result = result;
+        this.rows = rows;
+
+        if (rows.length != 3) {
+            throw new IllegalArgumentException("Solderer recipe expects 3 rows, got " + rows.length + " rows");
+        }
+    }
+
+    @Override
+    public ItemStack getRow(int row) {
+        return rows[row];
+    }
+
+    @Override
+    public ItemStack getResult() {
+        return result;
+    }
+
+    @Override
+    public int getDuration() {
+        return duration;
+    }
+}

src/main/java/refinedstorage/tile/solderer/SoldererRecipeCraftingGrid.java

@@ -1,33 +0,0 @@
-package refinedstorage.tile.solderer;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.block.EnumGridType;
-import refinedstorage.item.ItemProcessor;
-
-public class SoldererRecipeCraftingGrid implements ISoldererRecipe {
-    @Override
-    public ItemStack getRow(int row) {
-        if (row == 0) {
-            return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
-        } else if (row == 1) {
-            return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId());
-        } else if (row == 2) {
-            return new ItemStack(Blocks.CRAFTING_TABLE);
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack getResult() {
-        return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.CRAFTING.getId());
-    }
-
-    @Override
-    public int getDuration() {
-        return 500;
-    }
-}

src/main/java/refinedstorage/tile/solderer/SoldererRecipeDiskDrive.java

@@ -1,32 +0,0 @@
-package refinedstorage.tile.solderer;
-
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.item.ItemProcessor;
-
-public class SoldererRecipeDiskDrive implements ISoldererRecipe {
-    @Override
-    public ItemStack getRow(int row) {
-        if (row == 0) {
-            return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
-        } else if (row == 1) {
-            return new ItemStack(RefinedStorageBlocks.MACHINE_CASING);
-        } else if (row == 2) {
-            return new ItemStack(Blocks.CHEST);
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack getResult() {
-        return new ItemStack(RefinedStorageBlocks.DISK_DRIVE);
-    }
-
-    @Override
-    public int getDuration() {
-        return 500;
-    }
-}

src/main/java/refinedstorage/tile/solderer/SoldererRecipeInterface.java

@@ -1,31 +0,0 @@
-package refinedstorage.tile.solderer;
-
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.item.ItemProcessor;
-
-public class SoldererRecipeInterface implements ISoldererRecipe {
-    @Override
-    public ItemStack getRow(int row) {
-        if (row == 0) {
-            return new ItemStack(RefinedStorageBlocks.IMPORTER);
-        } else if (row == 1) {
-            return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC);
-        } else if (row == 2) {
-            return new ItemStack(RefinedStorageBlocks.EXPORTER);
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack getResult() {
-        return new ItemStack(RefinedStorageBlocks.INTERFACE);
-    }
-
-    @Override
-    public int getDuration() {
-        return 200;
-    }
-}

src/main/java/refinedstorage/tile/solderer/SoldererRecipePatternGrid.java

@@ -1,32 +0,0 @@
-package refinedstorage.tile.solderer;
-
-import net.minecraft.item.ItemStack;
-import refinedstorage.RefinedStorageBlocks;
-import refinedstorage.RefinedStorageItems;
-import refinedstorage.block.EnumGridType;
-import refinedstorage.item.ItemProcessor;
-
-public class SoldererRecipePatternGrid implements ISoldererRecipe {
-    @Override
-    public ItemStack getRow(int row) {
-        if (row == 0) {
-            return new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED);
-        } else if (row == 1) {
-            return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.NORMAL.getId());
-        } else if (row == 2) {
-            return new ItemStack(RefinedStorageItems.PATTERN);
-        }
-
-        return null;
-    }
-
-    @Override
-    public ItemStack getResult() {
-        return new ItemStack(RefinedStorageBlocks.GRID, 1, EnumGridType.PATTERN.getId());
-    }
-
-    @Override
-    public int getDuration() {
-        return 500;
-    }
-}