dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed solderer recipe conflicts, fixes #832

Browse Source
This commit is contained in:
raoulvdberge
2017-01-07 02:11:48 +01:00
parent c191b41682
commit a51865e5c5
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/solderer/SoldererRecipeUpgrade.java
View File

@@ -17,16 +17,16 @@ public class SoldererRecipeUpgrade implements ISoldererRecipe {
this.result = new ItemStack(RSItems.UPGRADE, 1, type); this.result = new ItemStack(RSItems.UPGRADE, 1, type);
this.rows.add(ItemUpgrade.getRequirement(result)); this.rows.add(ItemUpgrade.getRequirement(result));
this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
this.rows.add(new ItemStack(Items.REDSTONE)); this.rows.add(new ItemStack(Items.REDSTONE));
this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
} }
public SoldererRecipeUpgrade(ItemStack result) { public SoldererRecipeUpgrade(ItemStack result) {
this.result = result; this.result = result;
this.rows.add(ItemUpgrade.getRequirement(result)); this.rows.add(ItemUpgrade.getRequirement(result));
this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
this.rows.add(new ItemStack(Items.REDSTONE)); this.rows.add(new ItemStack(Items.REDSTONE));
this.rows.add(new ItemStack(RSItems.UPGRADE, 1, 0));
} }
@Override @Override

18
src/main/java/com/raoulvdberge/refinedstorage/proxy/ProxyCommon.java
View File

@@ -328,27 +328,27 @@ public class ProxyCommon {
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.CRAFTING.getId()),
500, 500,
new ItemStack(Blocks.CRAFTING_TABLE),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
new ItemStack(Blocks.CRAFTING_TABLE)
)); ));
// Pattern Grid // Pattern Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.PATTERN.getId()),
500, 500,
new ItemStack(RSItems.PATTERN),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
new ItemStack(RSItems.PATTERN)
)); ));
// Fluid Grid // Fluid Grid
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.FLUID.getId()),
500, 500,
new ItemStack(Items.BUCKET),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId()), new ItemStack(RSBlocks.GRID, 1, EnumGridType.NORMAL.getId())
new ItemStack(Items.BUCKET)
)); ));
// Wireless Grid // Wireless Grid
@@ -667,8 +667,8 @@ public class ProxyCommon {
API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe( API.instance().getSoldererRegistry().addRecipe(API.instance().getSoldererRegistry().createSimpleRecipe(
new ItemStack(RSBlocks.INTERFACE), new ItemStack(RSBlocks.INTERFACE),
200, 200,
new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC), new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
new ItemStack(RSBlocks.IMPORTER),
new ItemStack(RSBlocks.EXPORTER) new ItemStack(RSBlocks.EXPORTER)
)); ));
@@ -677,8 +677,8 @@ public class ProxyCommon {
new ItemStack(RSBlocks.FLUID_INTERFACE), new ItemStack(RSBlocks.FLUID_INTERFACE),
200, 200,
new ItemStack(Items.BUCKET), new ItemStack(Items.BUCKET),
new ItemStack(RSBlocks.INTERFACE), new ItemStack(Items.REDSTONE),
new ItemStack(Items.BUCKET) new ItemStack(RSBlocks.INTERFACE)
)); ));
// Grid Filter // Grid Filter