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

Added disk and storage part recipes

Browse Source
This commit is contained in:
raoulvdberge
2017-06-16 00:55:34 +02:00
parent d12078d921
commit 54c3158690
27 changed files with 667 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskFluid.java
View File

@@ -250,10 +250,4 @@ public class StorageDiskFluid implements IStorageDisk<FluidStack> {
return tag;
}
public static ItemStack initDisk(ItemStack stack) {
stack.setTagCompound(getTag());
return stack;
}
}

6
src/main/java/com/raoulvdberge/refinedstorage/apiimpl/storage/StorageDiskItem.java
View File

@@ -304,10 +304,4 @@ public class StorageDiskItem implements IStorageDisk<ItemStack> {
return tag;
}
public static ItemStack initDisk(ItemStack stack) {
stack.setTagCompound(getTag());
return stack;
}
}

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

@@ -252,129 +252,7 @@ public class ProxyCommon {
NonNullList.withSize(1, new ItemStack(RSBlocks.GRID, 1, GridType.NORMAL.getId()))
));
/*
// Storage Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K),
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
));
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_1K)
);
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_4K)
);
GameRegistry.addRecipe(new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_64K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.REDSTONE),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.STORAGE_PART, 1, ItemStoragePart.TYPE_16K)
);
// Fluid Storage Parts
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K),
"SES",
"GRG",
"SGS",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'S', "itemSilicon",
'G', "blockGlass"
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_BASIC),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_64K)
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_IMPROVED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_128K)
));
GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_512K),
"PEP",
"SRS",
"PSP",
'R', new ItemStack(Items.BUCKET),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON),
'P', new ItemStack(RSItems.PROCESSOR, 1, ItemProcessor.TYPE_ADVANCED),
'S', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, ItemFluidStoragePart.TYPE_256K)
));
// Storage Disks
for (int type = 0; type <= 3; ++type) {
ItemStack disk = StorageDiskItem.initDisk(new ItemStack(RSItems.STORAGE_DISK, 1, type));
GameRegistry.addRecipe(new ShapedOreRecipe(disk,
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
GameRegistry.addShapelessRecipe(disk,
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.STORAGE_PART, 1, type)
);
}
// Fluid Storage Disks
for (int type = 0; type <= 3; ++type) {
ItemStack disk = StorageDiskFluid.initDisk(new ItemStack(RSItems.FLUID_STORAGE_DISK, 1, type));
GameRegistry.addRecipe(new ShapedOreRecipe(disk,
"GRG",
"RPR",
"EEE",
'G', "blockGlass",
'R', new ItemStack(Items.REDSTONE),
'P', new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type),
'E', new ItemStack(RSItems.QUARTZ_ENRICHED_IRON)
));
GameRegistry.addShapelessRecipe(disk,
new ItemStack(RSItems.STORAGE_HOUSING),
new ItemStack(RSItems.FLUID_STORAGE_PART, 1, type)
);
}*/
// Upgrades
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_RANGE));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_SPEED));
API.instance().getSoldererRegistry().addRecipe(new SoldererRecipeUpgrade(ItemUpgrade.TYPE_INTERDIMENSIONAL));