Recipes for upgrades.-

src/main/java/refinedstorage/item/ItemUpgrade.java

@@ -7,8 +7,8 @@ import net.minecraft.item.ItemStack;
 import java.util.List;
 
 public class ItemUpgrade extends ItemBase {
-    public static final int TYPE_RANGE = 0;
-    public static final int TYPE_SPEED = 1;
+    public static final int TYPE_RANGE = 1;
+    public static final int TYPE_SPEED = 2;
 
     public ItemUpgrade() {
         super("upgrade");
@@ -20,7 +20,7 @@ public class ItemUpgrade extends ItemBase {
 
     @Override
     public void getSubItems(Item item, CreativeTabs tab, List list) {
-        for (int i = 0; i <= 1; ++i) {
+        for (int i = 0; i <= 2; ++i) {
             list.add(new ItemStack(item, 1, i));
         }
     }

src/main/java/refinedstorage/proxy/ClientProxy.java

@@ -51,6 +51,7 @@ public class ClientProxy extends CommonProxy {
         );
 
         ModelBakery.registerItemVariants(RefinedStorageItems.UPGRADE,
+            new ResourceLocation("refinedstorage:upgrade"),
             new ResourceLocation("refinedstorage:range_upgrade"),
             new ResourceLocation("refinedstorage:speed_upgrade")
         );
@@ -86,6 +87,7 @@ public class ClientProxy extends CommonProxy {
 
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.PATTERN, 0, new ModelResourceLocation("refinedstorage:pattern", "inventory"));
 
+        ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, 0, new ModelResourceLocation("refinedstorage:upgrade", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_RANGE, new ModelResourceLocation("refinedstorage:range_upgrade", "inventory"));
         ModelLoader.setCustomModelResourceLocation(RefinedStorageItems.UPGRADE, ItemUpgrade.TYPE_SPEED, new ModelResourceLocation("refinedstorage:speed_upgrade", "inventory"));
 

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

@@ -230,14 +230,14 @@ public class CommonProxy {
         GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.IMPORTER),
             new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
             new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_CONSTRUCTION),
-            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Exporter
         GameRegistry.addShapelessRecipe(new ItemStack(RefinedStorageBlocks.EXPORTER),
             new ItemStack(RefinedStorageBlocks.MACHINE_CASING),
             new ItemStack(RefinedStorageItems.CORE, 1, ItemCore.TYPE_DESTRUCTION),
-            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC)
+            new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED)
         );
 
         // Destructor
@@ -368,6 +368,19 @@ public class CommonProxy {
             'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
         );
 
+        // Upgrade
+        GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.UPGRADE, 1, 0),
+            "EGE",
+            "EPE",
+            "EGE",
+            'G', new ItemStack(Blocks.glass),
+            'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
+            'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON)
+        );
+
+        SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
+        SoldererRegistry.addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
+
         // Storage Blocks
         SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_1K, ItemStoragePart.TYPE_1K));
         SoldererRegistry.addRecipe(new SoldererRecipeStorage(EnumStorageType.TYPE_4K, ItemStoragePart.TYPE_4K));

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

@@ -0,0 +1,48 @@
+package refinedstorage.tile.solderer;
+
+import net.minecraft.init.Items;
+import net.minecraft.item.ItemStack;
+import refinedstorage.RefinedStorageItems;
+import refinedstorage.item.ItemUpgrade;
+
+public class SoldererRecipeUpgrade implements ISoldererRecipe {
+    private int type;
+
+    public SoldererRecipeUpgrade(int type) {
+        this.type = type;
+    }
+
+    @Override
+    public ItemStack getRow(int row) {
+        if (row == 0) {
+            return getBottomAndTopItem();
+        } else if (row == 1) {
+            return new ItemStack(RefinedStorageItems.UPGRADE, 1, 0);
+        } else if (row == 2) {
+            return getBottomAndTopItem();
+        }
+
+        return null;
+    }
+
+    private ItemStack getBottomAndTopItem() {
+        switch (type) {
+            case ItemUpgrade.TYPE_RANGE:
+                return new ItemStack(Items.ender_pearl);
+            case ItemUpgrade.TYPE_SPEED:
+                return new ItemStack(Items.redstone);
+        }
+
+        return null;
+    }
+
+    @Override
+    public ItemStack getResult() {
+        return new ItemStack(RefinedStorageItems.UPGRADE, 1, type);
+    }
+
+    @Override
+    public int getDuration() {
+        return 250;
+    }
+}

src/main/resources/assets/refinedstorage/lang/en_US.lang

@@ -125,5 +125,6 @@ item.refinedstorage:storage_part.1.name=4k Storage Part
 item.refinedstorage:storage_part.2.name=16k Storage Part
 item.refinedstorage:storage_part.3.name=64k Storage Part
 item.refinedstorage:pattern.name=Pattern
-item.refinedstorage:upgrade.0.name=Range Upgrade
-item.refinedstorage:upgrade.1.name=Speed Upgrade
+item.refinedstorage:upgrade.0.name=Upgrade
+item.refinedstorage:upgrade.1.name=Range Upgrade
+item.refinedstorage:upgrade.2.name=Speed Upgrade

src/main/resources/assets/refinedstorage/lang/nl_NL.lang

@@ -125,5 +125,6 @@ item.refinedstorage:storage_part.1.name=4k Opslagdeel
 item.refinedstorage:storage_part.2.name=16k Opslagdeel
 item.refinedstorage:storage_part.3.name=64k Opslagdeel
 item.refinedstorage:pattern.name=Patroon
-item.refinedstorage:upgrade.0.name=Afstand Upgrade
-item.refinedstorage:upgrade.1.name=Snelheid Upgrade
+item.refinedstorage:upgrade.0.name=Upgrade
+item.refinedstorage:upgrade.1.name=Afstand Upgrade
+item.refinedstorage:upgrade.2.name=Snelheid Upgrade

src/main/resources/assets/refinedstorage/models/item/upgrade.json

@@ -0,0 +1,6 @@
+{
+  "parent": "item/generated",
+  "textures": {
+    "layer0": "refinedstorage:items/upgrade"
+  }
+}