diff --git a/src/main/java/refinedstorage/proxy/CommonProxy.java b/src/main/java/refinedstorage/proxy/CommonProxy.java index 54d7cf2c9..432c96d53 100755 --- a/src/main/java/refinedstorage/proxy/CommonProxy.java +++ b/src/main/java/refinedstorage/proxy/CommonProxy.java @@ -354,9 +354,9 @@ public class CommonProxy { // Storage Parts GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K), - "ESE", + "SES", "GRG", - "EGE", + "SGS", 'R', new ItemStack(Items.REDSTONE), 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), 'S', "itemSilicon", @@ -364,9 +364,9 @@ public class CommonProxy { )); GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K), - "EPE", + "PEP", "SRS", - "ESE", + "PSP", 'R', new ItemStack(Items.REDSTONE), 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), @@ -374,9 +374,9 @@ public class CommonProxy { ); GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K), - "EPE", + "PEP", "SRS", - "ESE", + "PSP", 'R', new ItemStack(Items.REDSTONE), 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED), @@ -384,9 +384,9 @@ public class CommonProxy { ); GameRegistry.addRecipe(new ItemStack(RefinedStorageItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K), - "EPE", + "PEP", "SRS", - "ESE", + "PSP", 'R', new ItemStack(Items.REDSTONE), 'E', new ItemStack(RefinedStorageItems.QUARTZ_ENRICHED_IRON), 'P', new ItemStack(RefinedStorageItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), diff --git a/src/main/java/refinedstorage/tile/TileSolderer.java b/src/main/java/refinedstorage/tile/TileSolderer.java index dab1d6d75..b561a2522 100755 --- a/src/main/java/refinedstorage/tile/TileSolderer.java +++ b/src/main/java/refinedstorage/tile/TileSolderer.java @@ -50,9 +50,9 @@ public class TileSolderer extends TileMachine { if (newRecipe == null) { stop(); } else if (newRecipe != recipe) { - boolean isSameItem = items.getStackInSlot(3) != null ? RefinedStorageUtils.compareStackNoQuantity(items.getStackInSlot(3), newRecipe.getResult()) : false; + boolean sameItem = items.getStackInSlot(3) != null ? RefinedStorageUtils.compareStackNoQuantity(items.getStackInSlot(3), newRecipe.getResult()) : false; - if (items.getStackInSlot(3) == null || (isSameItem && ((items.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) <= items.getStackInSlot(3).getMaxStackSize()))) { + if (items.getStackInSlot(3) == null || (sameItem && ((items.getStackInSlot(3).stackSize + newRecipe.getResult().stackSize) <= items.getStackInSlot(3).getMaxStackSize()))) { recipe = newRecipe; progress = 0; working = true;